@oclif/core 2.8.1 → 2.8.3-beta.1

package/lib/command.d.ts

@@ -65,9 +65,13 @@ export declare abstract class Command {
      */
     static examples: Command.Example[];
     static hasDynamicHelp: boolean;
+    protected static '_--': boolean;
     protected static _enableJsonFlag: boolean;
     static get enableJsonFlag(): boolean;
     static set enableJsonFlag(value: boolean);
+    static get '--'(): boolean;
+    static set '--'(value: boolean);
+    get passThroughEnabled(): boolean;
     /**
      * instantiate and run the command
      *
@@ -101,6 +105,11 @@ export declare abstract class Command {
     } & PrettyPrintableError): never;
     log(message?: string, ...args: any[]): void;
     logToStderr(message?: string, ...args: any[]): void;
+    /**
+     * Determine if the command is being run with the --json flag in a command that supports it.
+     *
+     * @returns {boolean} true if the command supports json and the --json flag is present
+     */
     jsonEnabled(): boolean;
     /**
      * actual command run code goes here

package/lib/command.js

@@ -47,6 +47,15 @@ class Command {
             delete this.flags?.json;
         }
     }
+    static get '--'() {
+        return Command['_--'];
+    }
+    static set '--'(value) {
+        Command['_--'] = value;
+    }
+    get passThroughEnabled() {
+        return Command['_--'];
+    }
     /**
      * instantiate and run the command
      *
@@ -141,8 +150,22 @@ class Command {
             stream_1.stderr.write((0, util_1.format)(message, ...args) + '\n');
         }
     }
+    /**
+     * Determine if the command is being run with the --json flag in a command that supports it.
+     *
+     * @returns {boolean} true if the command supports json and the --json flag is present
+     */
     jsonEnabled() {
-        return this.ctor.enableJsonFlag && this.argv.includes('--json');
+        // if the command doesn't support json, return false
+        if (!this.ctor.enableJsonFlag)
+            return false;
+        // if the command parameter pass through is enabled, return true if the --json flag is before the '--' separator
+        if (this.passThroughEnabled) {
+            const ptIndex = this.argv.indexOf('--');
+            const jsonIndex = this.argv.indexOf('--json');
+            return jsonIndex > -1 && (ptIndex === -1 || jsonIndex < ptIndex);
+        }
+        return this.argv.includes('--json');
     }
     async init() {
         this.debug('init version: %s argv: %o', this.ctor._base, this.argv);
@@ -243,4 +266,5 @@ Command.strict = true;
 /** An order-dependent object of arguments for the command */
 Command.args = {};
 Command.hasDynamicHelp = false;
+Command['_--'] = false;
 Command._enableJsonFlag = false;

package/lib/config/config.js

@@ -726,7 +726,7 @@ const defaultFlagToCached = async (flag, isWritingManifest = false) => {
     // if not specified, try the default function
     if (typeof flag.default === 'function') {
         try {
-            return await flag.default({ options: {}, flags: {} }, isWritingManifest);
+            return await flag.default({ options: flag, flags: {} }, isWritingManifest);
         }
         catch { }
     }
@@ -747,7 +747,7 @@ const defaultArgToCached = async (arg, isWritingManifest = false) => {
     // if not specified, try the default function
     if (typeof arg.default === 'function') {
         try {
-            return await arg.default({ options: arg, flags: {} }, isWritingManifest);
+            return await arg.default(isWritingManifest);
         }
         catch { }
     }

package/lib/parser/parse.js

@@ -231,10 +231,7 @@ class Parser {
             }
             if (!(k in flags) && flag.default !== undefined) {
                 this.metaData.flags[k] = { ...this.metaData.flags[k], setFromDefault: true };
-                const defaultValue = (typeof flag.default === 'function' ? await flag.default({
-                    options: flag,
-                    flags, ...this.context,
-                }) : flag.default);
+                const defaultValue = (typeof flag.default === 'function' ? await flag.default({ options: flag, flags }) : flag.default);
                 flags[k] = defaultValue;
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "2.8.1",
+  "version": "2.8.3-beta.1",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -39,7 +39,7 @@
     "@commitlint/config-conventional": "^12.1.4",
     "@oclif/plugin-help": "^5.2.8",
     "@oclif/plugin-plugins": "^2.4.3",
-    "@oclif/test": "^2.3.11",
+    "@oclif/test": "^2.3.15",
     "@types/ansi-styles": "^3.2.1",
     "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",