@oclif/core 4.0.37 → 4.1.1

package/lib/interfaces/parser.d.ts

@@ -167,6 +167,10 @@ export type FlagProps = {
      * This is helpful if the default value contains sensitive data that shouldn't be published to npm.
      */
     noCacheDefault?: boolean;
+    /**
+     * At least one of these flags must be provided.
+     */
+    atLeastOne?: string[];
 };
 export type ArgProps = {
     name: string;

package/lib/parser/validate.js

@@ -64,7 +64,10 @@ async function validate(parse) {
                 return [{ name, reason: `Missing required flag ${name}`, status: 'failed', validationFn: 'required' }];
             }
             if (flag.exactlyOne && flag.exactlyOne.length > 0) {
-                return [validateAcrossFlags(flag)];
+                return [validateExactlyOneAcrossFlags(flag)];
+            }
+            if (flag.atLeastOne && flag.atLeastOne.length > 0) {
+                return [validateAtLeastOneAcrossFlags(flag)];
             }
             return [];
         });
@@ -91,8 +94,8 @@ async function validate(parse) {
         return cachedResolvedFlags;
     }
     const getPresentFlags = (flags) => Object.keys(flags).filter((key) => key !== undefined);
-    function validateAcrossFlags(flag) {
-        const base = { name: flag.name, validationFn: 'validateAcrossFlags' };
+    function validateExactlyOneAcrossFlags(flag) {
+        const base = { name: flag.name, validationFn: 'validateExactlyOneAcrossFlags' };
         const intersection = Object.entries(parse.input.flags)
             .map((entry) => entry[0]) // array of flag names
             .filter((flagName) => parse.output.flags[flagName] !== undefined) // with values
@@ -105,6 +108,20 @@ async function validate(parse) {
         }
         return { ...base, status: 'success' };
     }
+    function validateAtLeastOneAcrossFlags(flag) {
+        const base = { name: flag.name, validationFn: 'validateAtLeastOneAcrossFlags' };
+        const intersection = Object.entries(parse.input.flags)
+            .map((entry) => entry[0]) // array of flag names
+            .filter((flagName) => parse.output.flags[flagName] !== undefined) // with values
+            .filter((flagName) => flag.atLeastOne && flag.atLeastOne.includes(flagName)); // and in the atLeastOne list
+        if (intersection.length === 0) {
+            // the command's atLeastOne may or may not include itself, so we'll use Set to add + de-dupe
+            const deduped = (0, util_1.uniq)(flag.atLeastOne?.map((flag) => `--${flag}`) ?? []).join(', ');
+            const reason = `At least one of the following must be provided: ${deduped}`;
+            return { ...base, reason, status: 'failed' };
+        }
+        return { ...base, status: 'success' };
+    }
     async function validateExclusive(name, flags) {
         const base = { name, validationFn: 'validateExclusive' };
         const resolved = await resolveFlags(flags);

package/lib/ux/index.d.ts

@@ -11,6 +11,7 @@ export { warn } from '../errors/warn';
 export { default as colorizeJson } from './colorize-json';
 export { colorize } from './theme';
 export { stderr, stdout } from './write';
+export declare const action: Simple | Spinner;
 export declare const ux: {
     action: Simple | Spinner;
     /**

package/lib/ux/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ux = exports.stdout = exports.stderr = exports.colorize = exports.colorizeJson = exports.warn = exports.exit = exports.error = void 0;
+exports.ux = exports.action = exports.stdout = exports.stderr = exports.colorize = exports.colorizeJson = exports.warn = exports.exit = exports.error = void 0;
 const error_1 = require("../errors/error");
 const exit_1 = require("../errors/exit");
 const warn_1 = require("../errors/warn");
@@ -30,8 +30,9 @@ const ACTION_TYPE = (Boolean(process.stderr.isTTY) &&
     !['dumb', 'emacs-color'].includes(process.env.TERM) &&
     'spinner') ||
     'simple';
+exports.action = ACTION_TYPE === 'spinner' ? new spinner_1.default() : new simple_1.default();
 exports.ux = {
-    action: ACTION_TYPE === 'spinner' ? new spinner_1.default() : new simple_1.default(),
+    action: exports.action,
     /**
      * Add color to text.
      * @param color color to use. Can be hex code (e.g. `#ff0000`), rgb (e.g. `rgb(255, 255, 255)`) or a standard ansi color (e.g. `red`)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "4.0.37",
+  "version": "4.1.1",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -51,7 +51,7 @@
     "cross-env": "^7.0.3",
     "eslint": "^8.57.1",
     "eslint-config-oclif": "^5.2.2",
-    "eslint-config-oclif-typescript": "^3.1.12",
+    "eslint-config-oclif-typescript": "^3.1.13",
     "eslint-config-prettier": "^9.1.0",
     "husky": "^9.1.7",
     "lint-staged": "^15",