@oclif/core 3.0.0-beta.13 → 3.0.0-beta.14

package/lib/help/index.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Help = exports.HelpBase = exports.normalizeArgv = exports.getHelpFlagAdditions = exports.loadHelpClass = exports.standardizeIDFromArgv = exports.CommandHelp = void 0;
-const stripAnsi = require("strip-ansi");
-const util = require("util");
-const errors_1 = require("../errors");
-const command_1 = require("./command");
-const root_1 = require("./root");
+const tslib_1 = require("tslib");
 const util_1 = require("../util");
 const util_2 = require("./util");
+const command_1 = require("./command");
 const formatter_1 = require("./formatter");
-const config_1 = require("../config/config");
+const root_1 = tslib_1.__importDefault(require("./root"));
+const errors_1 = require("../errors");
+const node_util_1 = require("node:util");
 const stream_1 = require("../cli-ux/stream");
+const config_1 = require("../config/config");
+const stripAnsi = require("strip-ansi");
 var command_2 = require("./command");
 Object.defineProperty(exports, "CommandHelp", { enumerable: true, get: function () { return command_2.CommandHelp; } });
 var util_3 = require("./util");
@@ -54,7 +55,7 @@ class Help extends HelpBase {
         });
     }
     get sortedCommands() {
-        let commands = this.config.commands;
+        let { commands } = this.config;
         commands = commands.filter(c => this.opts.all || !c.hidden);
         commands = (0, util_1.sortBy)(commands, c => c.id);
         commands = (0, util_1.uniqBy)(commands, c => c.id);
@@ -69,7 +70,7 @@ class Help extends HelpBase {
     }
     constructor(config, opts = {}) {
         super(config, opts);
-        this.CommandHelpClass = command_1.default;
+        this.CommandHelpClass = command_1.CommandHelp;
     }
     async showHelp(argv) {
         const originalArgv = argv.slice(1);
@@ -126,9 +127,9 @@ class Help extends HelpBase {
         const plugin = this.config.plugins.get(command.pluginName);
         const state = this.config.pjson?.oclif?.state || plugin?.pjson?.oclif?.state || command.state;
         if (state) {
-            this.log(state === 'deprecated' ?
-                `${(0, util_2.formatCommandDeprecationWarning)((0, util_2.toConfiguredId)(name, this.config), command.deprecationOptions)}` :
-                `This command is in ${state}.\n`);
+            this.log(state === 'deprecated'
+                ? `${(0, util_2.formatCommandDeprecationWarning)((0, util_2.toConfiguredId)(name, this.config), command.deprecationOptions)}`
+                : `This command is in ${state}.\n`);
         }
         const summary = this.summary(command);
         if (summary) {
@@ -155,9 +156,9 @@ class Help extends HelpBase {
         let rootCommands = this.sortedCommands;
         const state = this.config.pjson?.oclif?.state;
         if (state) {
-            this.log(state === 'deprecated' ?
-                `${this.config.bin} is deprecated` :
-                `${this.config.bin} is in ${state}.\n`);
+            this.log(state === 'deprecated'
+                ? `${this.config.bin} is deprecated`
+                : `${this.config.bin} is in ${state}.\n`);
         }
         this.log(this.formatRoot());
         this.log('');
@@ -176,7 +177,7 @@ class Help extends HelpBase {
         }
     }
     async showTopicHelp(topic) {
-        const name = topic.name;
+        const { name } = topic;
         const depth = name.split(':').length;
         const subTopics = this.sortedTopics.filter(t => t.name.startsWith(name + ':') && t.name.split(':').length === depth + 1);
         const commands = this.sortedCommands.filter(c => c.id.startsWith(name + ':') && c.id.split(':').length === depth + 1);
@@ -199,8 +200,8 @@ class Help extends HelpBase {
     }
     formatCommand(command) {
         if (this.config.topicSeparator !== ':') {
-            command.id = command.id.replace(/:/g, this.config.topicSeparator);
-            command.aliases = command.aliases && command.aliases.map(a => a.replace(/:/g, this.config.topicSeparator));
+            command.id = command.id.replaceAll(':', this.config.topicSeparator);
+            command.aliases = command.aliases && command.aliases.map(a => a.replaceAll(':', this.config.topicSeparator));
         }
         const help = this.getCommandHelpClass(command);
         return help.generate();
@@ -213,7 +214,7 @@ class Help extends HelpBase {
             return '';
         const body = this.renderList(commands.map(c => {
             if (this.config.topicSeparator !== ':')
-                c.id = c.id.replace(/:/g, this.config.topicSeparator);
+                c.id = c.id.replaceAll(':', this.config.topicSeparator);
             return [
                 c.id,
                 this.summary(c),
@@ -243,7 +244,7 @@ class Help extends HelpBase {
         description = description.split('\n').slice(1).join('\n');
         let topicID = `${topic.name}:COMMAND`;
         if (this.config.topicSeparator !== ':')
-            topicID = topicID.replace(/:/g, this.config.topicSeparator);
+            topicID = topicID.replaceAll(':', this.config.topicSeparator);
         let output = (0, util_1.compact)([
             summary,
             this.section(this.opts.usageHeader || 'USAGE', `$ ${this.config.bin} ${topicID}`),
@@ -258,7 +259,7 @@ class Help extends HelpBase {
             return '';
         const body = this.renderList(topics.map(c => {
             if (this.config.topicSeparator !== ':')
-                c.name = c.name.replace(/:/g, this.config.topicSeparator);
+                c.name = c.name.replaceAll(':', this.config.topicSeparator);
             return [
                 c.name,
                 c.description && this.render(c.description.split('\n')[0]),
@@ -274,7 +275,7 @@ class Help extends HelpBase {
         return this.formatCommand(command);
     }
     log(...args) {
-        stream_1.stdout.write(util.format.apply(this, args) + '\n');
+        stream_1.stdout.write(node_util_1.format.apply(this, args) + '\n');
     }
 }
 exports.Help = Help;

package/lib/help/root.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const stripAnsi = require("strip-ansi");
-const util_1 = require("../util");
 const formatter_1 = require("./formatter");
+const util_1 = require("../util");
+const stripAnsi = require("strip-ansi");
 class RootHelp extends formatter_1.HelpFormatter {
     constructor(config, opts) {
         super(config, opts);

package/lib/help/util.d.ts

@@ -1,4 +1,4 @@
-import { Config as IConfig, HelpOptions, Deprecation } from '../interfaces';
+import { Deprecation, HelpOptions, Config as IConfig } from '../interfaces';
 import { HelpBase } from '.';
 interface HelpBaseDerived {
     new (config: IConfig, opts?: Partial<HelpOptions>): HelpBase;

package/lib/help/util.js

@@ -1,19 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeArgv = exports.formatCommandDeprecationWarning = exports.formatFlagDeprecationWarning = exports.getHelpFlagAdditions = exports.standardizeIDFromArgv = exports.toConfiguredId = exports.toStandardizedId = exports.template = exports.loadHelpClass = void 0;
-const ejs = require("ejs");
+const tslib_1 = require("tslib");
+const ejs = tslib_1.__importStar(require("ejs"));
 const _1 = require(".");
-const module_loader_1 = require("../module-loader");
 const util_1 = require("../config/util");
+const module_loader_1 = require("../module-loader");
 function extractClass(exported) {
     return exported && exported.default ? exported.default : exported;
 }
 async function loadHelpClass(config) {
-    const pjson = config.pjson;
+    const { pjson } = config;
     const configuredClass = pjson && pjson.oclif && pjson.oclif.helpClass;
     if (configuredClass) {
         try {
-            const exported = await module_loader_1.default.load(config, configuredClass);
+            const exported = await (0, module_loader_1.load)(config, configuredClass);
             return extractClass(exported);
         }
         catch (error) {
@@ -23,7 +24,6 @@ async function loadHelpClass(config) {
     return _1.Help;
 }
 exports.loadHelpClass = loadHelpClass;
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 function template(context) {
     function render(t) {
         return ejs.render(t, context);
@@ -31,6 +31,8 @@ function template(context) {
     return render;
 }
 exports.template = template;
+const isFlag = (s) => s.startsWith('-');
+const isArgWithValue = (s) => s.includes('=');
 function collateSpacedCmdIDFromArgs(argv, config) {
     if (argv.length === 1)
         return argv;
@@ -38,8 +40,6 @@ function collateSpacedCmdIDFromArgs(argv, config) {
         const ids = (0, util_1.collectUsableIds)(config.commandIDs);
         const final = [];
         const idPresent = (id) => ids.has(id);
-        const isFlag = (s) => s.startsWith('-');
-        const isArgWithValue = (s) => s.includes('=');
         const finalizeId = (s) => s ? [...final, s].join(':') : final.join(':');
         const hasArgs = () => {
             const id = finalizeId();
@@ -68,12 +68,12 @@ function collateSpacedCmdIDFromArgs(argv, config) {
     return argv; // ID is argv[0]
 }
 function toStandardizedId(commandID, config) {
-    return commandID.replace(new RegExp(config.topicSeparator, 'g'), ':');
+    return commandID.replaceAll(new RegExp(config.topicSeparator, 'g'), ':');
 }
 exports.toStandardizedId = toStandardizedId;
 function toConfiguredId(commandID, config) {
     const defaultTopicSeparator = ':';
-    return commandID.replace(new RegExp(defaultTopicSeparator, 'g'), config.topicSeparator || defaultTopicSeparator);
+    return commandID.replaceAll(new RegExp(defaultTopicSeparator, 'g'), config.topicSeparator || defaultTopicSeparator);
 }
 exports.toConfiguredId = toConfiguredId;
 function standardizeIDFromArgv(argv, config) {

package/lib/index.d.ts

@@ -1,20 +1,19 @@
-import { Command } from './command';
-import run from './main';
-import execute from './execute';
-import { handle } from './errors/handle';
-import { Config, Plugin, tsPath, toCached } from './config';
-import * as Interfaces from './interfaces';
-import * as Errors from './errors';
-import * as Flags from './flags';
-import * as Args from './args';
-import { CommandHelp, HelpBase, Help, loadHelpClass } from './help';
-import { toStandardizedId, toConfiguredId } from './help/util';
-import * as Parser from './parser';
-import { Hook } from './interfaces/hooks';
-import { settings, Settings } from './settings';
-import { HelpSection, HelpSectionRenderer, HelpSectionKeyValueTable } from './help/formatter';
-import * as ux from './cli-ux';
-import { stderr, stdout } from './cli-ux/stream';
-import Performance from './performance';
-import { flush } from './cli-ux/flush';
-export { Args, Command, CommandHelp, Config, Errors, execute, Flags, flush, handle, Help, HelpBase, HelpSection, HelpSectionKeyValueTable, HelpSectionRenderer, Hook, Interfaces, loadHelpClass, Parser, Performance, Plugin, run, settings, Settings, stderr, stdout, toCached, toConfiguredId, toStandardizedId, tsPath, ux, };
+export * as Args from './args';
+export * as Errors from './errors';
+export * as Flags from './flags';
+export * as Interfaces from './interfaces';
+export * as Parser from './parser';
+export * as ux from './cli-ux';
+export { CommandHelp, HelpBase, Help, loadHelpClass } from './help';
+export { Config, toCached, Plugin, tsPath } from './config';
+export { HelpSection, HelpSectionRenderer, HelpSectionKeyValueTable } from './help/formatter';
+export { Settings, settings } from './settings';
+export { stdout, stderr } from './cli-ux/stream';
+export { toConfiguredId, toStandardizedId } from './help/util';
+export { Command } from './command';
+export { Hook } from './interfaces/hooks';
+export { Performance } from './performance';
+export { execute } from './execute';
+export { flush } from './cli-ux/flush';
+export { handle } from './errors/handle';
+export { run } from './main';

package/lib/index.js

@@ -1,48 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ux = exports.tsPath = exports.toStandardizedId = exports.toConfiguredId = exports.toCached = exports.stdout = exports.stderr = exports.settings = exports.run = exports.Plugin = exports.Performance = exports.Parser = exports.loadHelpClass = exports.Interfaces = exports.HelpBase = exports.Help = exports.handle = exports.flush = exports.Flags = exports.execute = exports.Errors = exports.Config = exports.CommandHelp = exports.Command = exports.Args = void 0;
-const command_1 = require("./command");
-Object.defineProperty(exports, "Command", { enumerable: true, get: function () { return command_1.Command; } });
-const main_1 = require("./main");
-exports.run = main_1.default;
-const execute_1 = require("./execute");
-exports.execute = execute_1.default;
-const handle_1 = require("./errors/handle");
-Object.defineProperty(exports, "handle", { enumerable: true, get: function () { return handle_1.handle; } });
-const config_1 = require("./config");
-Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return config_1.Config; } });
-Object.defineProperty(exports, "Plugin", { enumerable: true, get: function () { return config_1.Plugin; } });
-Object.defineProperty(exports, "tsPath", { enumerable: true, get: function () { return config_1.tsPath; } });
-Object.defineProperty(exports, "toCached", { enumerable: true, get: function () { return config_1.toCached; } });
-const Interfaces = require("./interfaces");
-exports.Interfaces = Interfaces;
-const Errors = require("./errors");
-exports.Errors = Errors;
-const Flags = require("./flags");
-exports.Flags = Flags;
-const Args = require("./args");
-exports.Args = Args;
-const help_1 = require("./help");
-Object.defineProperty(exports, "CommandHelp", { enumerable: true, get: function () { return help_1.CommandHelp; } });
-Object.defineProperty(exports, "HelpBase", { enumerable: true, get: function () { return help_1.HelpBase; } });
-Object.defineProperty(exports, "Help", { enumerable: true, get: function () { return help_1.Help; } });
-Object.defineProperty(exports, "loadHelpClass", { enumerable: true, get: function () { return help_1.loadHelpClass; } });
-const util_1 = require("./help/util");
-Object.defineProperty(exports, "toStandardizedId", { enumerable: true, get: function () { return util_1.toStandardizedId; } });
-Object.defineProperty(exports, "toConfiguredId", { enumerable: true, get: function () { return util_1.toConfiguredId; } });
-const Parser = require("./parser");
-exports.Parser = Parser;
-const settings_1 = require("./settings");
-Object.defineProperty(exports, "settings", { enumerable: true, get: function () { return settings_1.settings; } });
-const ux = require("./cli-ux");
-exports.ux = ux;
+exports.run = exports.handle = exports.flush = exports.execute = exports.Performance = exports.Command = exports.toStandardizedId = exports.toConfiguredId = exports.stderr = exports.stdout = exports.settings = exports.tsPath = exports.Plugin = exports.toCached = exports.Config = exports.loadHelpClass = exports.Help = exports.HelpBase = exports.CommandHelp = exports.ux = exports.Parser = exports.Interfaces = exports.Flags = exports.Errors = exports.Args = void 0;
+const tslib_1 = require("tslib");
 const stream_1 = require("./cli-ux/stream");
-Object.defineProperty(exports, "stderr", { enumerable: true, get: function () { return stream_1.stderr; } });
-Object.defineProperty(exports, "stdout", { enumerable: true, get: function () { return stream_1.stdout; } });
-const performance_1 = require("./performance");
-exports.Performance = performance_1.default;
-const flush_1 = require("./cli-ux/flush");
-Object.defineProperty(exports, "flush", { enumerable: true, get: function () { return flush_1.flush; } });
 function checkCWD() {
     try {
         process.cwd();
@@ -54,3 +14,39 @@ function checkCWD() {
     }
 }
 checkCWD();
+exports.Args = tslib_1.__importStar(require("./args"));
+exports.Errors = tslib_1.__importStar(require("./errors"));
+exports.Flags = tslib_1.__importStar(require("./flags"));
+exports.Interfaces = tslib_1.__importStar(require("./interfaces"));
+exports.Parser = tslib_1.__importStar(require("./parser"));
+exports.ux = tslib_1.__importStar(require("./cli-ux"));
+var help_1 = require("./help");
+Object.defineProperty(exports, "CommandHelp", { enumerable: true, get: function () { return help_1.CommandHelp; } });
+Object.defineProperty(exports, "HelpBase", { enumerable: true, get: function () { return help_1.HelpBase; } });
+Object.defineProperty(exports, "Help", { enumerable: true, get: function () { return help_1.Help; } });
+Object.defineProperty(exports, "loadHelpClass", { enumerable: true, get: function () { return help_1.loadHelpClass; } });
+var config_1 = require("./config");
+Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return config_1.Config; } });
+Object.defineProperty(exports, "toCached", { enumerable: true, get: function () { return config_1.toCached; } });
+Object.defineProperty(exports, "Plugin", { enumerable: true, get: function () { return config_1.Plugin; } });
+Object.defineProperty(exports, "tsPath", { enumerable: true, get: function () { return config_1.tsPath; } });
+var settings_1 = require("./settings");
+Object.defineProperty(exports, "settings", { enumerable: true, get: function () { return settings_1.settings; } });
+var stream_2 = require("./cli-ux/stream");
+Object.defineProperty(exports, "stdout", { enumerable: true, get: function () { return stream_2.stdout; } });
+Object.defineProperty(exports, "stderr", { enumerable: true, get: function () { return stream_2.stderr; } });
+var util_1 = require("./help/util");
+Object.defineProperty(exports, "toConfiguredId", { enumerable: true, get: function () { return util_1.toConfiguredId; } });
+Object.defineProperty(exports, "toStandardizedId", { enumerable: true, get: function () { return util_1.toStandardizedId; } });
+var command_1 = require("./command");
+Object.defineProperty(exports, "Command", { enumerable: true, get: function () { return command_1.Command; } });
+var performance_1 = require("./performance");
+Object.defineProperty(exports, "Performance", { enumerable: true, get: function () { return performance_1.Performance; } });
+var execute_1 = require("./execute");
+Object.defineProperty(exports, "execute", { enumerable: true, get: function () { return execute_1.execute; } });
+var flush_1 = require("./cli-ux/flush");
+Object.defineProperty(exports, "flush", { enumerable: true, get: function () { return flush_1.flush; } });
+var handle_1 = require("./errors/handle");
+Object.defineProperty(exports, "handle", { enumerable: true, get: function () { return handle_1.handle; } });
+var main_1 = require("./main");
+Object.defineProperty(exports, "run", { enumerable: true, get: function () { return main_1.run; } });

package/lib/interfaces/config.d.ts

@@ -1,10 +1,11 @@
+/// <reference types="node" />
+import { Hook, Hooks } from './hooks';
+import { Options, Plugin } from './plugin';
+import { Command } from '../command';
 import { PJSON } from './pjson';
-import { Hooks, Hook } from './hooks';
-import { Plugin, Options } from './plugin';
 import { Topic } from './topic';
-import { Command } from '../command';
 export type LoadOptions = Options | string | Config | undefined;
-export type PlatformTypes = 'darwin' | 'linux' | 'win32' | 'aix' | 'freebsd' | 'openbsd' | 'sunos' | 'wsl';
+export type PlatformTypes = NodeJS.Platform | 'wsl';
 export type ArchTypes = 'arm' | 'arm64' | 'mips' | 'mipsel' | 'ppc' | 'ppc64' | 's390' | 's390x' | 'x32' | 'x64' | 'x86';
 export type PluginVersionDetail = {
     version: string;

package/lib/interfaces/errors.d.ts

@@ -3,7 +3,7 @@ export type CommandError = Error & {
 };
 export interface OclifError {
     oclif: {
-        exit?: number | false;
+        exit?: number;
     };
 }
 export interface PrettyPrintableError {

package/lib/interfaces/parser.d.ts

@@ -1,6 +1,5 @@
-import { Command } from '../command';
 import { AlphabetLowercase, AlphabetUppercase } from './alphabet';
-import { Config } from './config';
+import { Command } from '../command';
 export type FlagOutput = {
     [name: string]: any;
 };
@@ -154,6 +153,10 @@ export type FlagProps = {
      * Alternate names that can be used for this flag.
      */
     aliases?: string[];
+    /**
+       * Alternate short chars that can be used for this flag.
+       */
+    charAliases?: (AlphabetLowercase | AlphabetUppercase)[];
     /**
      * Emit deprecation warning when a flag alias is provided
      */
@@ -201,13 +204,13 @@ export type BooleanFlagProps = FlagProps & {
 export type OptionFlagProps = FlagProps & {
     type: 'option';
     helpValue?: string;
-    options?: string[];
+    options?: readonly string[];
     multiple?: boolean;
 };
 export type FlagParserContext = Command & {
     token: FlagToken;
 };
-export type FlagParser<T, I extends string | boolean, P = CustomOptions> = (input: I, context: FlagParserContext, opts: P & OptionFlag<T, P>) => Promise<T>;
+export type FlagParser<T, I extends string | boolean, P = CustomOptions> = (input: I, context: FlagParserContext, opts: P & OptionFlag<T, P>) => T extends Array<infer U> ? Promise<U> : Promise<T>;
 export type ArgParserContext = Command & {
     token: ArgToken;
 };
@@ -234,40 +237,179 @@ export type BooleanFlag<T> = FlagProps & BooleanFlagProps & {
     default?: FlagDefault<boolean>;
     parse: (input: boolean, context: FlagParserContext, opts: FlagProps & BooleanFlagProps) => Promise<T>;
 };
-export type OptionFlagDefaults<T, P = CustomOptions, M = false> = FlagProps & OptionFlagProps & {
-    parse: FlagParser<T, string, P>;
-    defaultHelp?: FlagDefaultHelp<T>;
-    input: string[];
-    default?: M extends true ? FlagDefault<T[] | undefined, P> : FlagDefault<T | undefined, P>;
-};
 export type OptionFlag<T, P = CustomOptions> = FlagProps & OptionFlagProps & {
     parse: FlagParser<T, string, P>;
     defaultHelp?: FlagDefaultHelp<T, P>;
     input: string[];
-} & ({
     default?: FlagDefault<T | undefined, P>;
+};
+type ReturnTypeSwitches = {
+    multiple: boolean;
+    requiredOrDefaulted: boolean;
+};
+/**
+ * The logic here is as follows:
+ * - If requiredOrDefaulted is true && multiple is true, then the return type is T[]
+ *    - It's possible that T extends an Array, if so we want to return T so that the return isn't T[][]
+ * - If requiredOrDefaulted is true && multiple is false, then the return type is T
+ * - If requiredOrDefaulted is false && multiple is true, then the return type is T[] | undefined
+ *    - It's possible that T extends an Array, if so we want to return T so that the return isn't T[][]
+ * - If requiredOrDefaulted is false && multiple is false, then the return type is T | undefined
+ */
+type FlagReturnType<T, R extends ReturnTypeSwitches> = R['requiredOrDefaulted'] extends true ? R['multiple'] extends true ? [
+    T
+] extends [Array<unknown>] ? T : T[] : T : R['multiple'] extends true ? [
+    T
+] extends [Array<unknown>] ? T | undefined : T[] | undefined : T | undefined;
+/**
+ * FlagDefinition types a function that takes `options` and returns an OptionFlag<T>.
+ *
+ * This is returned by `Flags.custom()` and `Flags.option()`, which each take a `defaults` object
+ * that mirrors the OptionFlag interface.
+ *
+ * The `T` in the `OptionFlag<T>` return type is determined by a combination of the provided defaults for
+ * `multiple`, `required`, and `default` and the provided options for those same properties. If these properties
+ * are provided in the options, they override the defaults.
+ *
+ * no options or defaults -> T | undefined
+ * `required` -> T
+ * `default` -> T
+ * `multiple` -> T[] | undefined
+ * `required` + `multiple` -> T[]
+ * `default` + `multiple` -> T[]
+ */
+export type FlagDefinition<T, P = CustomOptions, R extends ReturnTypeSwitches = {
     multiple: false;
-} | {
-    default?: FlagDefault<T[] | undefined, P>;
-    multiple: true;
-});
-export type FlagDefinition<T, P = CustomOptions> = {
+    requiredOrDefaulted: false;
+}> = {
+    (options: P & {
+        multiple: false;
+        required: true;
+    } & Partial<OptionFlag<FlagReturnType<T, {
+        multiple: false;
+        requiredOrDefaulted: true;
+    }>, P>>): OptionFlag<FlagReturnType<T, {
+        multiple: false;
+        requiredOrDefaulted: true;
+    }>>;
     (options: P & {
         multiple: true;
+        required: false;
+    } & Partial<OptionFlag<FlagReturnType<T, {
+        multiple: true;
+        requiredOrDefaulted: false;
+    }>, P>>): OptionFlag<FlagReturnType<T, {
+        multiple: true;
+        requiredOrDefaulted: false;
+    }>>;
+    (options: P & {
+        multiple: false;
+        required: false;
+    } & Partial<OptionFlag<FlagReturnType<T, {
+        multiple: false;
+        requiredOrDefaulted: false;
+    }>, P>>): OptionFlag<FlagReturnType<T, {
+        multiple: false;
+        requiredOrDefaulted: false;
+    }>>;
+    (options: R['multiple'] extends true ? P & ({
+        required: true;
+    } | {
+        default: OptionFlag<FlagReturnType<T, {
+            multiple: R['multiple'];
+            requiredOrDefaulted: true;
+        }>, P>['default'];
+    }) & Partial<OptionFlag<FlagReturnType<T, {
+        multiple: R['multiple'];
+        requiredOrDefaulted: true;
+    }>, P>> : P & {
+        multiple?: false | undefined;
     } & ({
         required: true;
     } | {
-        default: FlagDefault<T[]>;
-    }) & Partial<OptionFlag<T, P>>): OptionFlag<T[]>;
-    (options: P & {
+        default: OptionFlag<FlagReturnType<T, {
+            multiple: R['multiple'];
+            requiredOrDefaulted: true;
+        }>, P>['default'];
+    }) & Partial<OptionFlag<FlagReturnType<T, {
+        multiple: R['multiple'];
+        requiredOrDefaulted: true;
+    }>, P>>): OptionFlag<FlagReturnType<T, {
+        multiple: R['multiple'];
+        requiredOrDefaulted: true;
+    }>>;
+    (options: R['multiple'] extends true ? P & ({
+        required: true;
+    } | {
+        default: OptionFlag<FlagReturnType<T, {
+            multiple: true;
+            requiredOrDefaulted: true;
+        }>, P>['default'];
+    }) & Partial<OptionFlag<FlagReturnType<T, {
         multiple: true;
-    } & Partial<OptionFlag<T>>): OptionFlag<T[] | undefined>;
-    (options: P & ({
+        requiredOrDefaulted: true;
+    }>, P>> : P & {
+        multiple: true;
+    } & ({
+        required: true;
+    } | {
+        default: OptionFlag<FlagReturnType<T, {
+            multiple: true;
+            requiredOrDefaulted: true;
+        }>, P>['default'];
+    }) & Partial<OptionFlag<FlagReturnType<T, {
+        multiple: true;
+        requiredOrDefaulted: true;
+    }>, P>>): OptionFlag<FlagReturnType<T, {
+        multiple: true;
+        requiredOrDefaulted: true;
+    }>>;
+    (options: P & {
+        multiple?: false | undefined;
+    } & ({
         required: true;
     } | {
-        default: FlagDefault<T>;
-    }) & Partial<OptionFlag<T>>): OptionFlag<T>;
-    (options?: P & Partial<OptionFlag<T>>): OptionFlag<T | undefined>;
+        default: OptionFlag<FlagReturnType<T, {
+            multiple: R['multiple'];
+            requiredOrDefaulted: true;
+        }>, P>['default'];
+    }) & Partial<OptionFlag<FlagReturnType<T, {
+        multiple: R['multiple'];
+        requiredOrDefaulted: true;
+    }>, P>>): OptionFlag<FlagReturnType<T, {
+        multiple: R['multiple'];
+        requiredOrDefaulted: true;
+    }>>;
+    (options: P & {
+        required: false;
+    } & Partial<OptionFlag<FlagReturnType<T, {
+        multiple: R['multiple'];
+        requiredOrDefaulted: false;
+    }>, P>>): OptionFlag<FlagReturnType<T, {
+        multiple: R['multiple'];
+        requiredOrDefaulted: false;
+    }>>;
+    (options: P & {
+        multiple: false;
+    } & Partial<OptionFlag<FlagReturnType<T, {
+        multiple: false;
+        requiredOrDefaulted: R['requiredOrDefaulted'];
+    }>, P>>): OptionFlag<FlagReturnType<T, {
+        multiple: false;
+        requiredOrDefaulted: R['requiredOrDefaulted'];
+    }>>;
+    (options?: P & {
+        multiple?: false | undefined;
+    } & Partial<OptionFlag<FlagReturnType<T, R>, P>>): OptionFlag<FlagReturnType<T, R>>;
+    (options: P & {
+        multiple: true;
+    } & Partial<OptionFlag<FlagReturnType<T, {
+        multiple: true;
+        requiredOrDefaulted: R['requiredOrDefaulted'];
+    }>, P>>): OptionFlag<FlagReturnType<T, {
+        multiple: true;
+        requiredOrDefaulted: R['requiredOrDefaulted'];
+    }>>;
 };
 export type Flag<T> = BooleanFlag<T> | OptionFlag<T>;
 export type Input<TFlags extends FlagOutput, BFlags extends FlagOutput, AFlags extends ArgOutput> = {
@@ -289,33 +431,14 @@ export type ParserInput = {
 export type ParserContext = Command & {
     token?: FlagToken | ArgToken;
 };
-export type CompletionContext = {
-    args?: {
-        [name: string]: string;
-    };
-    flags?: {
-        [name: string]: string;
-    };
-    argv?: string[];
-    config: Config;
-};
-export type Completion = {
-    skipCache?: boolean;
-    cacheDuration?: number;
-    cacheKey?(ctx: CompletionContext): Promise<string>;
-    options(ctx: CompletionContext): Promise<string[]>;
-};
-export type CompletableOptionFlag<T> = OptionFlag<T> & {
-    completion?: Completion;
-};
-export type CompletableFlag<T> = BooleanFlag<T> | CompletableOptionFlag<T>;
 export type FlagInput<T extends FlagOutput = {
     [flag: string]: any;
 }> = {
-    [P in keyof T]: CompletableFlag<T[P]>;
+    [P in keyof T]: Flag<T[P]>;
 };
 export type ArgInput<T extends ArgOutput = {
     [arg: string]: any;
 }> = {
     [P in keyof T]: Arg<T[P]>;
 };
+export {};

package/lib/interfaces/plugin.d.ts

@@ -75,6 +75,7 @@ export interface Plugin {
     };
     readonly commandIDs: string[];
     readonly topics: Topic[];
+    readonly hasManifest: boolean;
     findCommand(id: string, opts: {
         must: true;
     }): Promise<Command.Class>;

package/lib/main.d.ts

@@ -2,4 +2,4 @@ import * as Interfaces from './interfaces';
 import { Config } from './config';
 export declare const helpAddition: (argv: string[], config: Interfaces.Config) => boolean;
 export declare const versionAddition: (argv: string[], config?: Interfaces.Config) => boolean;
-export default function run(argv?: string[], options?: Interfaces.LoadOptions): Promise<unknown>;
+export declare function run(argv?: string[], options?: Interfaces.LoadOptions): Promise<unknown>;