@oclif/core 3.18.2 → 3.19.1

package/lib/config/config.d.ts

@@ -93,7 +93,7 @@ export declare class Config implements IConfig {
         force: boolean;
     }): Promise<void>;
     loadThemes(): Promise<{
-        file: string;
+        file: string | undefined;
         theme: Theme | undefined;
     }>;
     protected macosCacheDir(): string | undefined;

package/lib/config/config.js

@@ -360,12 +360,21 @@ class Config {
         }
     }
     async loadThemes() {
-        const file = (0, node_path_1.resolve)(this.configDir, 'theme.json');
-        const themes = await (0, fs_1.safeReadJson)(file);
-        const theme = themes ? (0, theme_1.parseTheme)(themes) : undefined;
+        const defaultThemeFile = this.pjson.oclif.theme
+            ? (0, node_path_1.resolve)(this.root, this.pjson.oclif.theme)
+            : this.pjson.oclif.theme;
+        const userThemeFile = (0, node_path_1.resolve)(this.configDir, 'theme.json');
+        const [defaultTheme, userTheme] = await Promise.all([
+            defaultThemeFile ? await (0, fs_1.safeReadJson)(defaultThemeFile) : undefined,
+            await (0, fs_1.safeReadJson)(userThemeFile),
+        ]);
+        // Merge the default theme with the user theme, giving the user theme precedence.
+        const merged = { ...defaultTheme, ...userTheme };
         return {
-            file,
-            theme,
+            // Point to the user file if it exists, otherwise use the default file.
+            // This doesn't really serve a purpose to anyone but removing it would be a breaking change.
+            file: userTheme ? userThemeFile : defaultThemeFile,
+            theme: Object.keys(merged).length > 0 ? (0, theme_1.parseTheme)(merged) : undefined,
         };
     }
     macosCacheDir() {

package/lib/help/command.js

@@ -150,7 +150,7 @@ class CommandHelp extends formatter_1.HelpFormatter {
                     labels.push(`--${flag.name.trim()}`);
                 }
             }
-            label = labels.join((0, theme_1.colorize)(this.config?.theme?.flagSeparator, flag.char ? ', ' : '  '));
+            label = labels.join(flag.char ? (0, theme_1.colorize)(this.config?.theme?.flagSeparator, ', ') : '  ');
         }
         if (flag.type === 'option') {
             let value = flag.helpValue || (this.opts.showFlagNameInTitle ? flag.name : '<value>');
@@ -163,14 +163,14 @@ class CommandHelp extends formatter_1.HelpFormatter {
                 value = chalk_1.default.underline(value);
             label += `=${value}`;
         }
-        return label;
+        return (0, theme_1.colorize)(this.config.theme?.flag, label);
     }
     flags(flags) {
         if (flags.length === 0)
             return;
         const noChar = flags.reduce((previous, current) => previous && current.char === undefined, true);
         return flags.map((flag) => {
-            let left = (0, theme_1.colorize)(this.config?.theme?.flag, this.flagHelpLabel(flag));
+            let left = this.flagHelpLabel(flag);
             if (noChar)
                 left = left.replace('    ', '');
             let right = flag.summary || flag.description || '';

package/lib/interfaces/pjson.d.ts

@@ -49,15 +49,11 @@ export declare namespace PJSON {
                 identifier?: string;
                 sign?: string;
             };
-            windows?: {
-                homepage?: string;
-                keypath?: string;
-                name?: string;
-            };
             plugins?: string[];
             repositoryPrefix?: string;
             schema?: number;
             state?: 'beta' | 'deprecated' | string;
+            theme?: string;
             topicSeparator?: ' ' | ':';
             topics?: {
                 [k: string]: {
@@ -78,6 +74,11 @@ export declare namespace PJSON {
                 };
                 s3: S3;
             };
+            windows?: {
+                homepage?: string;
+                keypath?: string;
+                name?: string;
+            };
         };
         version: string;
     }

package/lib/parser/parse.d.ts

@@ -1,4 +1,18 @@
 import { OutputArgs, OutputFlags, ParserInput, ParserOutput } from '../interfaces/parser';
+declare global {
+    /**
+     * Cache the stdin so that it can be read multiple times.
+     *
+     * This fixes a bug where the stdin would be read multiple times (because Parser.parse() was called more than once)
+     * but only the first read would be successful - all other reads would return null.
+     *
+     * Storing in global is necessary because we want the cache to be shared across all versions of @oclif/core in
+     * in the dependency tree. Storing in a variable would only share the cache within the same version of @oclif/core.
+     */
+    var oclif: {
+        stdinCache?: string;
+    };
+}
 export declare const readStdin: () => Promise<null | string>;
 export declare class Parser<T extends ParserInput, TFlags extends OutputFlags<T['flags']>, BFlags extends OutputFlags<T['flags']>, TArgs extends OutputArgs<T['args']>> {
     private readonly input;

package/lib/parser/parse.js

@@ -32,11 +32,15 @@ const readStdin = async () => {
     // Because of this, we have to set a timeout to prevent the process from hanging.
     if (stdin.isTTY)
         return null;
+    if (global.oclif?.stdinCache) {
+        debug('resolved stdin from global cache', global.oclif.stdinCache);
+        return global.oclif.stdinCache;
+    }
     return new Promise((resolve) => {
         let result = '';
         const ac = new AbortController();
         const { signal } = ac;
-        const timeout = setTimeout(() => ac.abort(), 100);
+        const timeout = setTimeout(() => ac.abort(), 10);
         const rl = (0, node_readline_1.createInterface)({
             input: stdin,
             output: stdout,
@@ -48,6 +52,7 @@ const readStdin = async () => {
         rl.once('close', () => {
             clearTimeout(timeout);
             debug('resolved from stdin', result);
+            global.oclif = { ...global.oclif, stdinCache: result };
             resolve(result);
         });
         signal.addEventListener('abort', () => {
@@ -85,6 +90,7 @@ class Parser {
     }
     async parse() {
         this._debugInput();
+        // eslint-disable-next-line complexity
         const parseFlag = async (arg) => {
             const { isLong, name } = this.findFlag(arg);
             if (!name) {
@@ -107,19 +113,19 @@ class Parser {
                 }
                 this.currentFlag = flag;
                 let input = isLong || arg.length < 3 ? this.argv.shift() : arg.slice(arg[2] === '=' ? 3 : 2);
-                // if the value ends up being one of the command's flags, the user didn't provide an input
-                if (typeof input !== 'string' || this.findFlag(input).name) {
-                    throw new errors_1.CLIError(`Flag --${name} expects a value`);
-                }
-                if (flag.allowStdin === 'only' && input !== '-') {
-                    throw new errors_1.CLIError(`Flag --${name} can only be read from stdin. The value must be "-".`);
+                if (flag.allowStdin === 'only' && input !== '-' && input !== undefined) {
+                    throw new errors_1.CLIError(`Flag --${name} can only be read from stdin. The value must be "-" or not provided at all.`);
                 }
-                if (flag.allowStdin && input === '-') {
+                if ((flag.allowStdin && input === '-') || flag.allowStdin === 'only') {
                     const stdin = await (0, exports.readStdin)();
                     if (stdin) {
                         input = stdin.trim();
                     }
                 }
+                // if the value ends up being one of the command's flags, the user didn't provide an input
+                if (typeof input !== 'string' || this.findFlag(input).name) {
+                    throw new errors_1.CLIError(`Flag --${name} expects a value`);
+                }
                 this.raw.push({ flag: flag.name, input, type: 'flag' });
             }
             else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "3.18.2",
+  "version": "3.19.1",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -38,7 +38,7 @@
     "@oclif/plugin-help": "^6",
     "@oclif/plugin-plugins": "^4",
     "@oclif/prettier-config": "^0.2.1",
-    "@oclif/test": "^3.0.3",
+    "@oclif/test": "^3.1.12",
     "@types/ansi-styles": "^3.2.1",
     "@types/benchmark": "^2.1.5",
     "@types/chai": "^4.3.11",
@@ -51,7 +51,7 @@
     "@types/js-yaml": "^3.12.7",
     "@types/mocha": "^10.0.6",
     "@types/node": "^18",
-    "@types/node-notifier": "^8.0.2",
+    "@types/node-notifier": "^8.0.5",
     "@types/pnpapi": "^0.0.5",
     "@types/slice-ansi": "^4.0.0",
     "@types/strip-ansi": "^5.2.1",
@@ -63,7 +63,7 @@
     "chai-as-promised": "^7.1.1",
     "commitlint": "^17.7.2",
     "cross-env": "^7.0.3",
-    "eslint": "^8.50.0",
+    "eslint": "^8.56.0",
     "eslint-config-oclif": "^5.0.0",
     "eslint-config-oclif-typescript": "^3.0.35",
     "eslint-config-prettier": "^9.1.0",
@@ -74,11 +74,11 @@
     "madge": "^6.1.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.4",
     "shx": "^0.3.4",
     "sinon": "^16.1.3",
-    "ts-node": "^10.9.1",
-    "tsd": "^0.29.0",
+    "ts-node": "^10.9.2",
+    "tsd": "^0.30.4",
     "typescript": "^5"
   },
   "engines": {