@oclif/core 1.20.4 → 1.21.0

package/lib/cli-ux/action/base.d.ts

@@ -3,7 +3,7 @@ export interface ITask {
     status: string | undefined;
     active: boolean;
 }
-export declare type ActionType = 'spinner' | 'simple' | 'debug';
+export type ActionType = 'spinner' | 'simple' | 'debug';
 export interface Options {
     stdout?: boolean;
 }

package/lib/cli-ux/config.d.ts

@@ -1,5 +1,5 @@
 import { ActionBase } from './action/base';
-export declare type Levels = 'fatal' | 'error' | 'warn' | 'info' | 'debug' | 'trace';
+export type Levels = 'fatal' | 'error' | 'warn' | 'info' | 'debug' | 'trace';
 export interface ConfigMessage {
     type: 'config';
     prop: string;

package/lib/cli-ux/list.d.ts

@@ -1,3 +1,3 @@
-export declare type IListItem = [string, string | undefined];
-export declare type IList = IListItem[];
+export type IListItem = [string, string | undefined];
+export type IList = IListItem[];
 export declare function renderList(items: IListItem[]): string;

package/lib/command.js

@@ -29,17 +29,6 @@ const jsonFlag = {
  * in your project.
  */
 class Command {
-    constructor(argv, config) {
-        this.argv = argv;
-        this.config = config;
-        this.id = this.ctor.id;
-        try {
-            this.debug = require('debug')(this.id ? `${this.config.bin}:${this.id}` : this.config.bin);
-        }
-        catch {
-            this.debug = () => { };
-        }
-    }
     static get enableJsonFlag() {
         return this._enableJsonFlag;
     }
@@ -67,6 +56,17 @@ class Command {
     static set flags(flags) {
         this._flags = Object.assign({}, this._flags ?? {}, this.globalFlags, flags);
     }
+    constructor(argv, config) {
+        this.argv = argv;
+        this.config = config;
+        this.id = this.ctor.id;
+        try {
+            this.debug = require('debug')(this.id ? `${this.config.bin}:${this.id}` : this.config.bin);
+        }
+        catch {
+            this.debug = () => { };
+        }
+    }
     get ctor() {
         return this.constructor;
     }

package/lib/errors/errors/pretty-print.d.ts

@@ -1,5 +1,5 @@
 import { PrettyPrintableError } from '../../interfaces/errors';
-declare type CLIErrorDisplayOptions = {
+type CLIErrorDisplayOptions = {
     name?: string;
     bang?: string;
 };

package/lib/help/formatter.d.ts

@@ -1,13 +1,13 @@
 import * as Interfaces from '../interfaces';
-export declare type HelpSectionKeyValueTable = {
+export type HelpSectionKeyValueTable = {
     name: string;
     description: string;
 }[];
-export declare type HelpSection = {
+export type HelpSection = {
     header: string;
     body: string | HelpSectionKeyValueTable | [string, string | undefined][] | undefined;
 } | undefined;
-export declare type HelpSectionRenderer = (data: {
+export type HelpSectionRenderer = (data: {
     cmd: Interfaces.Command;
     flags: Interfaces.Command.Flag[];
     args: Interfaces.Command.Arg[];

package/lib/help/index.js

@@ -38,10 +38,6 @@ class HelpBase extends formatter_1.HelpFormatter {
 }
 exports.HelpBase = HelpBase;
 class Help extends HelpBase {
-    constructor(config, opts = {}) {
-        super(config, opts);
-        this.CommandHelpClass = command_1.default;
-    }
     /*
      * _topics is to work around Interfaces.topics mistakenly including commands that do
      * not have children, as well as topics. A topic has children, either commands or other topics. When
@@ -69,6 +65,10 @@ class Help extends HelpBase {
         topics = (0, util_1.uniqBy)(topics, t => t.name);
         return topics;
     }
+    constructor(config, opts = {}) {
+        super(config, opts);
+        this.CommandHelpClass = command_1.default;
+    }
     async showHelp(argv) {
         const originalArgv = argv.slice(1);
         argv = argv.filter(arg => !(0, util_2.getHelpFlagAdditions)(this.config).includes(arg));

package/lib/interfaces/alphabet.d.ts

@@ -1,2 +1,2 @@
-export declare type AlphabetUppercase = 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'L' | 'M' | 'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z';
-export declare type AlphabetLowercase = 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' | 'l' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z';
+export type AlphabetUppercase = 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'L' | 'M' | 'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z';
+export type AlphabetLowercase = 'a' | 'b' | 'c' | 'd' | 'e' | 'f' | 'g' | 'h' | 'i' | 'j' | 'k' | 'l' | 'm' | 'n' | 'o' | 'p' | 'q' | 'r' | 's' | 't' | 'u' | 'v' | 'w' | 'x' | 'y' | 'z';

package/lib/interfaces/command.d.ts

@@ -1,7 +1,7 @@
 import { Config, LoadOptions } from './config';
 import { ArgInput, BooleanFlagProps, Deprecation, FlagInput, OptionFlagProps } from './parser';
 import { Plugin as IPlugin } from './plugin';
-export declare type Example = string | {
+export type Example = string | {
     description: string;
     command: string;
 };

package/lib/interfaces/config.d.ts

@@ -3,9 +3,9 @@ import { Hooks, Hook } from './hooks';
 import { Command } from './command';
 import { Plugin, Options } from './plugin';
 import { Topic } from './topic';
-export declare type LoadOptions = Options | string | Config | undefined;
-export declare type PlatformTypes = 'darwin' | 'linux' | 'win32' | 'aix' | 'freebsd' | 'openbsd' | 'sunos' | 'wsl';
-export declare type ArchTypes = 'arm' | 'arm64' | 'mips' | 'mipsel' | 'ppc' | 'ppc64' | 's390' | 's390x' | 'x32' | 'x64' | 'x86';
+export type LoadOptions = Options | string | Config | undefined;
+export type PlatformTypes = 'darwin' | 'linux' | 'win32' | 'aix' | 'freebsd' | 'openbsd' | 'sunos' | 'wsl';
+export type ArchTypes = 'arm' | 'arm64' | 'mips' | 'mipsel' | 'ppc' | 'ppc64' | 's390' | 's390x' | 'x32' | 'x64' | 'x86';
 export interface Config {
     name: string;
     version: string;

package/lib/interfaces/errors.d.ts

@@ -1,4 +1,4 @@
-export declare type CommandError = Error & {
+export type CommandError = Error & {
     exitCode?: number;
 };
 export interface OclifError {

package/lib/interfaces/flags.d.ts

@@ -29,6 +29,6 @@ import { FlagInput } from './parser';
  *   }
  * }
  */
-export declare type InferredFlags<T> = T extends FlagInput<infer F> ? F & {
+export type InferredFlags<T> = T extends FlagInput<infer F> ? F & {
     json: boolean | undefined;
 } : unknown;

package/lib/interfaces/hooks.d.ts

@@ -72,7 +72,7 @@ export interface Hooks {
         return: void;
     };
 }
-export declare type Hook<T extends keyof P, P extends Hooks = Hooks> = (this: Hook.Context, options: P[T]['options'] & {
+export type Hook<T extends keyof P, P extends Hooks = Hooks> = (this: Hook.Context, options: P[T]['options'] & {
     config: Config;
 }) => Promise<P[T]['return']>;
 export declare namespace Hook {

package/lib/interfaces/parser.d.ts

@@ -1,6 +1,6 @@
 import { AlphabetLowercase, AlphabetUppercase } from './alphabet';
 import { Config } from './config';
-export declare type ParseFn<T> = (input: string) => Promise<T>;
+export type ParseFn<T> = (input: string) => Promise<T>;
 export interface Arg<T = string> {
     name: string;
     description?: string;
@@ -21,32 +21,32 @@ export interface ArgBase<T> {
     options?: string[];
     ignoreStdin?: boolean;
 }
-export declare type RequiredArg<T> = ArgBase<T> & {
+export type RequiredArg<T> = ArgBase<T> & {
     required: true;
     value: T;
 };
-export declare type OptionalArg<T> = ArgBase<T> & {
+export type OptionalArg<T> = ArgBase<T> & {
     required: false;
     value?: T;
 };
-export declare type ParserArg<T> = RequiredArg<T> | OptionalArg<T>;
+export type ParserArg<T> = RequiredArg<T> | OptionalArg<T>;
 export interface FlagOutput {
     [name: string]: any;
 }
-export declare type ArgInput = Arg<any>[];
+export type ArgInput = Arg<any>[];
 export interface CLIParseErrorOptions {
     parse: {
         input?: ParserInput;
         output?: ParserOutput;
     };
 }
-export declare type OutputArgs = {
+export type OutputArgs = {
     [name: string]: any;
 };
-export declare type OutputFlags<T extends ParserInput['flags']> = {
+export type OutputFlags<T extends ParserInput['flags']> = {
     [P in keyof T]: any;
 };
-export declare type ParserOutput<TFlags extends OutputFlags<any> = any, GFlags extends OutputFlags<any> = any, TArgs extends OutputArgs = any> = {
+export type ParserOutput<TFlags extends OutputFlags<any> = any, GFlags extends OutputFlags<any> = any, TArgs extends OutputArgs = any> = {
     flags: TFlags & GFlags & {
         json: boolean | undefined;
     };
@@ -55,49 +55,49 @@ export declare type ParserOutput<TFlags extends OutputFlags<any> = any, GFlags e
     raw: ParsingToken[];
     metadata: Metadata;
 };
-export declare type ArgToken = {
+export type ArgToken = {
     type: 'arg';
     input: string;
 };
-export declare type FlagToken = {
+export type FlagToken = {
     type: 'flag';
     flag: string;
     input: string;
 };
-export declare type ParsingToken = ArgToken | FlagToken;
+export type ParsingToken = ArgToken | FlagToken;
 export interface FlagUsageOptions {
     displayRequired?: boolean;
 }
-export declare type Metadata = {
+export type Metadata = {
     flags: {
         [key: string]: MetadataFlag;
     };
 };
-declare type MetadataFlag = {
+type MetadataFlag = {
     setFromDefault?: boolean;
 };
-export declare type ListItem = [string, string | undefined];
-export declare type List = ListItem[];
-export declare type DefaultContext<T, P> = {
+export type ListItem = [string, string | undefined];
+export type List = ListItem[];
+export type DefaultContext<T, P> = {
     options: P & OptionFlag<T>;
     flags: Record<string, string>;
 };
-export declare type Default<T, P = Record<string, unknown>> = T | ((context: DefaultContext<T, P>) => Promise<T>);
-export declare type DefaultHelp<T, P = Record<string, unknown>> = T | ((context: DefaultContext<T, P>) => Promise<string | undefined>);
-export declare type FlagRelationship = string | {
+export type Default<T, P = Record<string, unknown>> = T | ((context: DefaultContext<T, P>) => Promise<T>);
+export type DefaultHelp<T, P = Record<string, unknown>> = T | ((context: DefaultContext<T, P>) => Promise<string | undefined>);
+export type FlagRelationship = string | {
     name: string;
     when: (flags: Record<string, unknown>) => Promise<boolean>;
 };
-export declare type Relationship = {
+export type Relationship = {
     type: 'all' | 'some' | 'none';
     flags: FlagRelationship[];
 };
-export declare type Deprecation = {
+export type Deprecation = {
     to?: string;
     message?: string;
     version?: string;
 };
-export declare type FlagProps = {
+export type FlagProps = {
     name: string;
     char?: AlphabetLowercase | AlphabetUppercase;
     /**
@@ -161,32 +161,32 @@ export declare type FlagProps = {
      */
     deprecateAliases?: boolean;
 };
-export declare type BooleanFlagProps = FlagProps & {
+export type BooleanFlagProps = FlagProps & {
     type: 'boolean';
     allowNo: boolean;
 };
-export declare type OptionFlagProps = FlagProps & {
+export type OptionFlagProps = FlagProps & {
     type: 'option';
     helpValue?: string;
     options?: string[];
     multiple?: boolean;
 };
-export declare type FlagParser<T, I, P = any> = (input: I, context: any, opts: P & OptionFlag<T>) => Promise<T>;
-export declare type FlagBase<T, I, P = any> = FlagProps & {
+export type FlagParser<T, I, P = any> = (input: I, context: any, opts: P & OptionFlag<T>) => Promise<T | T[]>;
+export type FlagBase<T, I, P = any> = FlagProps & {
     parse: FlagParser<T, I, P>;
 };
-export declare type BooleanFlag<T> = FlagBase<T, boolean> & BooleanFlagProps & {
+export type BooleanFlag<T> = FlagBase<T, boolean> & BooleanFlagProps & {
     /**
      * specifying a default of false is the same as not specifying a default
      */
     default?: Default<boolean>;
 };
-export declare type CustomOptionFlag<T, P = any, M = false> = FlagBase<T, string, P> & OptionFlagProps & {
+export type CustomOptionFlag<T, P = any, M = false> = FlagBase<T, string, P> & OptionFlagProps & {
     defaultHelp?: DefaultHelp<T>;
     input: string[];
     default?: M extends true ? Default<T[] | undefined, P> : Default<T | undefined, P>;
 };
-export declare type OptionFlag<T> = FlagBase<T, string> & OptionFlagProps & {
+export type OptionFlag<T> = FlagBase<T, string> & OptionFlagProps & {
     defaultHelp?: DefaultHelp<T>;
     input: string[];
 } & ({
@@ -196,7 +196,7 @@ export declare type OptionFlag<T> = FlagBase<T, string> & OptionFlagProps & {
     default?: Default<T[] | undefined>;
     multiple: true;
 });
-export declare type Definition<T, P = Record<string, unknown>> = {
+export type Definition<T, P = Record<string, unknown>> = {
     (options: P & {
         multiple: true;
     } & ({
@@ -214,7 +214,7 @@ export declare type Definition<T, P = Record<string, unknown>> = {
     }) & Partial<OptionFlag<T>>): OptionFlag<T>;
     (options?: P & Partial<OptionFlag<T>>): OptionFlag<T | undefined>;
 };
-export declare type EnumFlagOptions<T, M = false> = Partial<CustomOptionFlag<T, any, M>> & {
+export type EnumFlagOptions<T, M = false> = Partial<CustomOptionFlag<T, any, M>> & {
     options: T[];
 } & ({
     default?: Default<T | undefined>;
@@ -223,8 +223,8 @@ export declare type EnumFlagOptions<T, M = false> = Partial<CustomOptionFlag<T,
     default?: Default<T[] | undefined>;
     multiple: true;
 });
-export declare type Flag<T> = BooleanFlag<T> | OptionFlag<T>;
-export declare type Input<TFlags extends FlagOutput, GFlags extends FlagOutput> = {
+export type Flag<T> = BooleanFlag<T> | OptionFlag<T>;
+export type Input<TFlags extends FlagOutput, GFlags extends FlagOutput> = {
     flags?: FlagInput<TFlags>;
     globalFlags?: FlagInput<GFlags>;
     args?: ArgInput;
@@ -240,7 +240,7 @@ export interface ParserInput {
     context: any;
     '--'?: boolean;
 }
-export declare type CompletionContext = {
+export type CompletionContext = {
     args?: {
         [name: string]: string;
     };
@@ -250,17 +250,17 @@ export declare type CompletionContext = {
     argv?: string[];
     config: Config;
 };
-export declare type Completion = {
+export type Completion = {
     skipCache?: boolean;
     cacheDuration?: number;
     cacheKey?(ctx: CompletionContext): Promise<string>;
     options(ctx: CompletionContext): Promise<string[]>;
 };
-export declare type CompletableOptionFlag<T> = OptionFlag<T> & {
+export type CompletableOptionFlag<T> = OptionFlag<T> & {
     completion?: Completion;
 };
-export declare type CompletableFlag<T> = BooleanFlag<T> | CompletableOptionFlag<T>;
-export declare type FlagInput<T extends FlagOutput = {
+export type CompletableFlag<T> = BooleanFlag<T> | CompletableOptionFlag<T>;
+export type FlagInput<T extends FlagOutput = {
     [flag: string]: any;
 }> = {
     [P in keyof T]: CompletableFlag<T[P]>;

package/lib/parser/errors.d.ts

@@ -1,7 +1,7 @@
 import { CLIError } from '../errors';
 import { ParserArg, CLIParseErrorOptions, OptionFlag, Flag } from '../interfaces';
 export { CLIError } from '../errors';
-export declare type Validation = {
+export type Validation = {
     name: string;
     status: 'success' | 'failed';
     validationFn: string;

package/lib/parser/parse.js

@@ -167,7 +167,7 @@ class Parser {
                 const value = flag.parse ? await flag.parse(input, this.context, flag) : input;
                 if (flag.multiple) {
                     flags[token.flag] = flags[token.flag] || [];
-                    flags[token.flag].push(value);
+                    flags[token.flag].push(...(Array.isArray(value) ? value : [value]));
                 }
                 else {
                     flags[token.flag] = value;

package/lib/parser/util.d.ts

@@ -2,6 +2,6 @@ export declare function pickBy<T extends {
     [s: string]: T[keyof T];
 } | ArrayLike<T[keyof T]>>(obj: T, fn: (i: T[keyof T]) => boolean): Partial<T>;
 export declare function maxBy<T>(arr: T[], fn: (i: T) => number): T | undefined;
-declare type SortTypes = string | number | undefined | boolean;
+type SortTypes = string | number | undefined | boolean;
 export declare function sortBy<T>(arr: T[], fn: (i: T) => SortTypes | SortTypes[]): T[];
 export {};

package/lib/settings.d.ts

@@ -1,4 +1,4 @@
-export declare type Settings = {
+export type Settings = {
     /**
      * Show additional debug output without DEBUG. Mainly shows stackstraces.
      *

package/lib/util.d.ts

@@ -1,6 +1,6 @@
 export declare function compact<T>(a: (T | undefined)[]): T[];
 export declare function uniqBy<T>(arr: T[], fn: (cur: T) => any): T[];
-declare type SortTypes = string | number | undefined | boolean;
+type SortTypes = string | number | undefined | boolean;
 export declare function sortBy<T>(arr: T[], fn: (i: T) => SortTypes | SortTypes[]): T[];
 export declare function castArray<T>(input?: T | T[]): T[];
 export declare function isProd(): boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "1.20.4",
+  "version": "1.21.0",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -36,11 +36,11 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^12.1.4",
-    "@oclif/plugin-help": "^5.1.17",
-    "@oclif/plugin-plugins": "^2.1.6",
-    "@oclif/test": "^2.2.8",
+    "@oclif/plugin-help": "^5.1.19",
+    "@oclif/plugin-plugins": "^2.1.7",
+    "@oclif/test": "^2.2.12",
     "@types/ansi-styles": "^3.2.1",
-    "@types/chai": "^4.3.0",
+    "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
     "@types/clean-stack": "^2.1.1",
     "@types/cli-progress": "^3.9.2",
@@ -58,7 +58,7 @@
     "@types/strip-ansi": "^5.2.1",
     "@types/supports-color": "^8.1.1",
     "@types/wrap-ansi": "^3.0.0",
-    "chai": "^4.3.6",
+    "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "commitlint": "^12.1.4",
     "eslint": "^7.32.0",
@@ -74,8 +74,8 @@
     "shx": "^0.3.4",
     "sinon": "^11.1.2",
     "ts-node": "^10.9.1",
-    "tsd": "^0.22.0",
-    "typescript": "^4.8.3"
+    "tsd": "^0.25.0",
+    "typescript": "^4.9.3"
   },
   "engines": {
     "node": ">=14.0.0"