refactor: remove config.enableTheme

oclif · Nov 9, 2023 · 00a6ccd · 00a6ccd
1 parent caaa353
commit 00a6ccd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 51 deletions.
diff --git a/src/config/config.ts b/src/config/config.ts
@@ -80,7 +80,6 @@ export class Config implements IConfig {
   public dataDir!: string
   public debug = 0
   public dirname!: string
-  public enableTheme: boolean = false
   public errlog!: string
   public flexibleTaxonomy!: boolean
   public home!: string
@@ -92,7 +91,7 @@ export class Config implements IConfig {
   public plugins: Map<string, IPlugin> = new Map()
   public root!: string
   public shell!: string
-  public theme!: Theme
+  public theme?: Theme
   public topicSeparator: ' ' | ':' = ':'
   public userAgent!: string
   public userPJSON?: PJSON.User
@@ -328,10 +327,11 @@ export class Config implements IConfig {
 
     this.npmRegistry = this.scopedEnvVar('NPM_REGISTRY') || this.pjson.oclif.npmRegistry
 
-    const themeFilePath = resolve(this.configDir, 'theme.json')
-    const theme = this.scopedEnvVarTrue('DISABLE_THEME') ? undefined : await safeReadJson(themeFilePath)
-    this.enableTheme = Boolean(theme)
-    if (this.enableTheme) this.theme = parseTheme(theme as Record<string, string>)
+    if (!this.scopedEnvVarTrue('DISABLE_THEME')) {
+      const themeFilePath = resolve(this.configDir, 'theme.json')
+      const theme = await safeReadJson<Record<string, string>>(themeFilePath)
+      this.theme = theme ? parseTheme(theme) : undefined
+    }
 
     this.pjson.oclif.update = this.pjson.oclif.update || {}
     this.pjson.oclif.update.node = this.pjson.oclif.update.node || {}

diff --git a/src/interfaces/config.ts b/src/interfaces/config.ts
@@ -91,7 +91,6 @@ export interface Config {
    * base dirname to use in cacheDir/configDir/dataDir
    */
   readonly dirname: string
-  enableTheme: boolean
   /**
    * points to a file that should be appended to for error logs
    *
@@ -145,7 +144,7 @@ export interface Config {
    * active shell
    */
   readonly shell: string
-  readonly theme: Theme
+  readonly theme?: Theme
   topicSeparator: ' ' | ':'
   readonly topics: Topic[]
   /**

diff --git a/test/config/config.test.ts b/test/config/config.test.ts
@@ -404,62 +404,46 @@ describe('Config', () => {
     )
   })
 
-  describe('enableTheme', () => {
+  describe('theme', () => {
     testConfig({pjson, env: {FOO_DISABLE_THEME: 'true'}}, {bin: 'red'}).it(
-      'should be false when DISABLE_THEME is true and theme.json exists',
+      'should not be set when DISABLE_THEME is true and theme.json exists',
       (config) => {
-        expect(config).to.have.property('enableTheme', false)
+        expect(config).to.have.property('theme', undefined)
       },
     )
 
     testConfig({pjson, env: {FOO_DISABLE_THEME: 'false'}}, {bin: 'red'}).it(
-      'should be true when DISABLE_THEME is false and theme.json exists',
+      'should be set when DISABLE_THEME is false and theme.json exists',
       (config) => {
-        expect(config).to.have.property('enableTheme', true)
+        expect(config).to.nested.include({'theme.bin.color[0]': 255})
       },
     )
 
     testConfig({pjson, env: {}}, {bin: 'red'}).it(
-      'should be true when DISABLE_THEME is unset and theme.json exists',
+      'should be set when DISABLE_THEME is unset and theme.json exists',
       (config) => {
-        expect(config).to.have.property('enableTheme', true)
+        expect(config).to.nested.include({'theme.bin.color[0]': 255})
       },
     )
 
     testConfig({pjson, env: {FOO_DISABLE_THEME: 'true'}}).it(
-      'should be false when DISABLE_THEME is true and theme.json does not exist',
+      'should not be set when DISABLE_THEME is true and theme.json does not exist',
       (config) => {
-        expect(config).to.have.property('enableTheme', false)
+        expect(config).to.have.property('theme', undefined)
       },
     )
 
     testConfig({pjson, env: {FOO_DISABLE_THEME: 'false'}}).it(
-      'should be false when DISABLE_THEME is false and theme.json does not exist',
+      'should not be set when DISABLE_THEME is false and theme.json does not exist',
       (config) => {
-        expect(config).to.have.property('enableTheme', false)
+        expect(config).to.have.property('theme', undefined)
       },
     )
 
     testConfig({pjson, env: {}}).it(
-      'should be false when DISABLE_THEME is unset and theme.json does not exist',
-      (config) => {
-        expect(config).to.have.property('enableTheme', false)
-      },
-    )
-  })
-
-  describe('theme', () => {
-    testConfig({pjson, env: {FOO_DISABLE_THEME: 'false'}}, {bin: 'red'}).it(
-      'should be set if this.enableTheme is true',
-      (config) => {
-        expect(config.theme).to.be.not.undefined
-      },
-    )
-
-    testConfig({pjson, env: {FOO_DISABLE_THEME: 'true'}}, {bin: 'red'}).it(
-      'should not be set if this.enableTheme is false',
+      'should not be set when DISABLE_THEME is unset and theme.json does not exist',
       (config) => {
-        expect(config.theme).to.be.undefined
+        expect(config).to.have.property('theme', undefined)
       },
     )
   })

diff --git a/test/interfaces/config.test.ts b/test/interfaces/config.test.ts