Merge pull request #753 from oclif/sm/scoped-env-var-CONTENT_TYPE

fix: allow CONTENT_TYPE env to work for all oclif cmds
oclif · Aug 3, 2023 · b25ed8d · b25ed8d
2 parents 599b234 + 378a4f7
commit b25ed8d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/src/command.ts b/src/command.ts
@@ -288,7 +288,7 @@ export abstract class Command {
       return jsonIndex > -1 && (ptIndex === -1 || jsonIndex < ptIndex)
     }
 
-    return this.argv.includes('--json')
+    return this.argv.includes('--json') || this.config.scopedEnvVar?.('CONTENT_TYPE')?.toLowerCase() === 'json'
   }
 
   /**

diff --git a/test/command/command.test.ts b/test/command/command.test.ts
@@ -525,6 +525,22 @@ describe('command', () => {
     })
     .it('json enabled/pass through disabled/--json flag before --/jsonEnabled() should be true')
 
+    fancy
+    .stdout()
+    .do(async () => {
+      class CMD extends Command {
+          static enableJsonFlag = true
+          async run() {}
+      }
+
+      // mock a scopedEnvVar being set to JSON
+      const cmd = new CMD([], {
+        bin: 'FOO', scopedEnvVar: (foo: string) => foo.includes('CONTENT_TYPE') ? 'json' : undefined,
+      } as any)
+      expect(cmd.jsonEnabled()).to.equal(true)
+    })
+    .it('json enabled from env')
+
     fancy
     .stdout()
     .do(async () => {

diff --git a/test/interfaces/args.test.ts → test/interfaces/args.test-types.ts b/test/interfaces/args.test.ts → test/interfaces/args.test-types.ts
diff --git a/test/interfaces/flags.test.ts → test/interfaces/flags.test-types.ts b/test/interfaces/flags.test.ts → test/interfaces/flags.test-types.ts