gunshi 0.21.0 → 0.23.0

package/lib/cli-DBIMF97F.js

@@ -0,0 +1,146 @@
+import { COMMAND_OPTIONS_DEFAULT, COMMON_ARGS, create, isLazyCommand, resolveLazyCommand } from "./utils-GlOAgmx0.js";
+import { createCommandContext } from "./context-B_pkfbdk.js";
+import { renderHeader, renderUsage, renderValidationErrors } from "./renderer-8HgcYJqp.js";
+import { parseArgs, resolveArgs } from "args-tokens";
+
+//#region src/cli.ts
+/**
+* Run the command.
+* @param args Command line arguments
+* @param entry A {@link Command | entry command}, an {@link CommandRunner | inline command runner}, or a {@link LazyCommand | lazily-loaded command}
+* @param options A {@link CliOptions | CLI options}
+* @returns A rendered usage or undefined. if you will use {@link CliOptions.usageSilent} option, it will return rendered usage string.
+*/
+async function cli(argv, entry, options = {}) {
+	const cliOptions = resolveCliOptions(options, entry);
+	const tokens = parseArgs(argv);
+	const subCommand = getSubCommand(tokens);
+	const { commandName: name, command, callMode } = await resolveCommand(subCommand, entry, cliOptions);
+	if (!command) throw new Error(`Command not found: ${name || ""}`);
+	const args = resolveArguments(getCommandArgs(command));
+	const { values, positionals, rest, error } = resolveArgs(args, tokens, {
+		optionGrouping: true,
+		skipPositional: cliOptions.subCommands.size > 0 ? 0 : -1
+	});
+	const omitted = !subCommand;
+	const ctx = await createCommandContext({
+		args,
+		values,
+		positionals,
+		rest,
+		argv,
+		tokens,
+		omitted,
+		callMode,
+		command,
+		cliOptions
+	});
+	if (values.version) {
+		showVersion(ctx);
+		return;
+	}
+	const usageBuffer = [];
+	const header = await showHeader(ctx);
+	if (header) usageBuffer.push(header);
+	if (values.help) {
+		const usage = await showUsage(ctx);
+		if (usage) usageBuffer.push(usage);
+		return usageBuffer.join("\n");
+	}
+	if (error) {
+		await showValidationErrors(ctx, error);
+		return;
+	}
+	await executeCommand(command, ctx, name || "");
+}
+function getCommandArgs(cmd) {
+	if (isLazyCommand(cmd)) return cmd.args || create();
+	else if (typeof cmd === "object") return cmd.args || create();
+	else return create();
+}
+function resolveArguments(args) {
+	return Object.assign(create(), args, COMMON_ARGS);
+}
+function resolveCliOptions(options, entry) {
+	const subCommands = new Map(options.subCommands);
+	if (options.subCommands) {
+		if (isLazyCommand(entry)) subCommands.set(entry.commandName, entry);
+		else if (typeof entry === "object" && entry.name) subCommands.set(entry.name, entry);
+	}
+	const resolvedOptions = Object.assign(create(), COMMAND_OPTIONS_DEFAULT, options, { subCommands });
+	return resolvedOptions;
+}
+function getSubCommand(tokens) {
+	const firstToken = tokens[0];
+	return firstToken && firstToken.kind === "positional" && firstToken.index === 0 && firstToken.value ? firstToken.value : "";
+}
+async function showUsage(ctx) {
+	if (ctx.env.renderUsage === null) return;
+	const usage = await (ctx.env.renderUsage || renderUsage)(ctx);
+	if (usage) {
+		ctx.log(usage);
+		return usage;
+	}
+}
+function showVersion(ctx) {
+	ctx.log(ctx.env.version);
+}
+async function showHeader(ctx) {
+	if (ctx.env.renderHeader === null) return;
+	const header = await (ctx.env.renderHeader || renderHeader)(ctx);
+	if (header) {
+		ctx.log(header);
+		ctx.log();
+		return header;
+	}
+}
+async function showValidationErrors(ctx, error) {
+	if (ctx.env.renderValidationErrors === null) return;
+	const render = ctx.env.renderValidationErrors || renderValidationErrors;
+	ctx.log(await render(ctx, error));
+}
+const CANNOT_RESOLVE_COMMAND = { callMode: "unexpected" };
+async function resolveCommand(sub, entry, options) {
+	const omitted = !sub;
+	async function doResolveCommand() {
+		if (typeof entry === "function") if ("commandName" in entry && entry.commandName) return {
+			commandName: entry.commandName,
+			command: entry,
+			callMode: "entry"
+		};
+		else return {
+			command: { run: entry },
+			callMode: "entry"
+		};
+		else if (typeof entry === "object") return {
+			commandName: resolveEntryName(entry),
+			command: entry,
+			callMode: "entry"
+		};
+		else return CANNOT_RESOLVE_COMMAND;
+	}
+	if (omitted || options.subCommands?.size === 0) return doResolveCommand();
+	const cmd = options.subCommands?.get(sub);
+	if (cmd == null) return {
+		commandName: sub,
+		callMode: "unexpected"
+	};
+	if (isLazyCommand(cmd) && cmd.commandName == null) cmd.commandName = sub;
+	else if (typeof cmd === "object" && cmd.name == null) cmd.name = sub;
+	return {
+		commandName: sub,
+		command: cmd,
+		callMode: "subCommand"
+	};
+}
+function resolveEntryName(entry) {
+	return entry.name || "(anonymous)";
+}
+async function executeCommand(cmd, ctx, name) {
+	const resolved = isLazyCommand(cmd) ? await resolveLazyCommand(cmd, name, true) : cmd;
+	if (resolved.run == null) throw new Error(`'run' not found on Command \`${name}\``);
+	await resolved.run(ctx);
+}
+
+//#endregion
+export { cli };

package/lib/{context-BefYjlE-.js → context-B_pkfbdk.js}

@@ -1,4 +1,4 @@
-import { BUILT_IN_PREFIX, COMMAND_OPTIONS_DEFAULT, DEFAULT_LOCALE$1 as DEFAULT_LOCALE, NOOP, create, deepFreeze, log, mapResourceWithBuiltinKey, resolveArgKey, resolveExamples, resolveLazyCommand } from "./utils-STQBqMtf.js";
+import { BUILT_IN_PREFIX, COMMAND_OPTIONS_DEFAULT, DEFAULT_LOCALE$1 as DEFAULT_LOCALE, NOOP, create, deepFreeze, log, mapResourceWithBuiltinKey, resolveArgKey, resolveExamples, resolveLazyCommand } from "./utils-GlOAgmx0.js";
 
 //#region src/locales/en-US.json
 var COMMAND = "COMMAND";
@@ -72,7 +72,7 @@ const BUILT_IN_PREFIX_CODE = BUILT_IN_PREFIX.codePointAt(0);
 * @param param A {@link CommandContextParams | parameters} to create a {@link CommandContext | command context}
 * @returns A {@link CommandContext | command context}, which is readonly
 */
-async function createCommandContext({ args, values, positionals, rest, argv, tokens, command, commandOptions, callMode = "entry", omitted = false }) {
+async function createCommandContext({ args, values, positionals, rest, argv, tokens, command, cliOptions, callMode = "entry", omitted = false }) {
 	/**
 	* normailize the options schema and values, to avoid prototype pollution
 	*/
@@ -83,10 +83,10 @@ async function createCommandContext({ args, values, positionals, rest, argv, tok
 	/**
 	* setup the environment
 	*/
-	const env = Object.assign(create(), COMMAND_OPTIONS_DEFAULT, commandOptions);
-	const locale = resolveLocale(commandOptions.locale);
+	const env = Object.assign(create(), COMMAND_OPTIONS_DEFAULT, cliOptions);
+	const locale = resolveLocale(cliOptions.locale);
 	const localeStr = locale.toString();
-	const translationAdapterFactory = commandOptions.translationAdapterFactory || createTranslationAdapter;
+	const translationAdapterFactory = cliOptions.translationAdapterFactory || createTranslationAdapter;
 	const adapter = translationAdapterFactory({
 		locale: localeStr,
 		fallbackLocale: DEFAULT_LOCALE
@@ -118,7 +118,7 @@ async function createCommandContext({ args, values, positionals, rest, argv, tok
 	let cachedCommands;
 	async function loadCommands() {
 		if (cachedCommands) return cachedCommands;
-		const subCommands = [...commandOptions.subCommands || []];
+		const subCommands = [...cliOptions.subCommands || []];
 		return cachedCommands = await Promise.all(subCommands.map(async ([name, cmd]) => await resolveLazyCommand(cmd, name)));
 	}
 	/**
@@ -137,7 +137,7 @@ async function createCommandContext({ args, values, positionals, rest, argv, tok
 		rest,
 		_: argv,
 		tokens,
-		log: commandOptions.usageSilent ? NOOP : log,
+		log: cliOptions.usageSilent ? NOOP : log,
 		loadCommands,
 		translate
 	}));

package/lib/context.d.ts

@@ -1,4 +1,4 @@
-import { Command, CommandCallMode, CommandContext, CommandOptions } from "./types-BbgfNBFM.js";
+import { CliOptions, Command, CommandCallMode, CommandContext } from "./types-ZXqvU8Ti.js";
 import { ArgToken, ArgValues, Args } from "args-tokens";
 
 //#region src/context.d.ts
@@ -49,7 +49,7 @@ interface CommandContextParams<A extends Args, V> {
   /**
    * A command options, which is spicialized from `cli` function
    */
-  commandOptions: CommandOptions<A>;
+  cliOptions: CliOptions<A>;
 }
 /**
  * Create a {@link CommandContext | command context}
@@ -64,7 +64,7 @@ declare function createCommandContext<A extends Args = Args, V extends ArgValues
   argv,
   tokens,
   command,
-  commandOptions,
+  cliOptions,
   callMode,
   omitted
 }: CommandContextParams<A, V>): Promise<Readonly<CommandContext<A, V>>>; //#endregion

package/lib/context.js

@@ -1,4 +1,4 @@
-import "./utils-STQBqMtf.js";
-import { createCommandContext } from "./context-BefYjlE-.js";
+import "./utils-GlOAgmx0.js";
+import { createCommandContext } from "./context-B_pkfbdk.js";
 
 export { createCommandContext };

package/lib/{definition-DUNcKGVg.d.ts → definition-BFYUOPMR.d.ts}

@@ -1,4 +1,4 @@
-import { Command, CommandLoader, LazyCommand } from "./types-BbgfNBFM.js";
+import { Command, CommandLoader, LazyCommand } from "./types-ZXqvU8Ti.js";
 import { ArgSchema, ArgValues as ArgValues$1, Args, Args as Args$1 } from "args-tokens";
 
 //#region src/definition.d.ts

package/lib/definition.d.ts

@@ -1,3 +1,3 @@
-import "./types-BbgfNBFM.js";
-import { ArgSchema, ArgValues, Args, define$1 as define, lazy$1 as lazy } from "./definition-DUNcKGVg.js";
+import "./types-ZXqvU8Ti.js";
+import { ArgSchema, ArgValues, Args, define$1 as define, lazy$1 as lazy } from "./definition-BFYUOPMR.js";
 export { ArgSchema, ArgValues, Args, define, lazy };

package/lib/generator.d.ts

@@ -1,23 +1,23 @@
-import { Command, CommandOptions } from "./types-BbgfNBFM.js";
+import { CliOptions, Command, LazyCommand } from "./types-ZXqvU8Ti.js";
 import { Args } from "args-tokens";
 
 //#region src/generator.d.ts
 /**
-* Generate the command usage.
-* @param command - usage generate command, if you want to generate the usage of the default command where there are target commands and sub-commands, specify `null`.
-* @param entry - A {@link Command | entry command}
-* @param opts - A {@link CommandOptions | command options}
-* @returns A rendered usage.
+* generate options of `generate` function.
 */
 
+/**
+ * generate options of `generate` function.
+ */
+type GenerateOptions<A extends Args = Args> = CliOptions<A>;
 /**
  * Generate the command usage.
  * @param command - usage generate command, if you want to generate the usage of the default command where there are target commands and sub-commands, specify `null`.
  * @param entry - A {@link Command | entry command}
- * @param opts - A {@link CommandOptions | command options}
+ * @param options - A {@link CliOptions | cli options}
  * @returns A rendered usage.
  */
-declare function generate<A extends Args = Args>(command: string | null, entry: Command<A>, opts?: CommandOptions<A>): Promise<string>;
+declare function generate<A extends Args = Args>(command: string | null, entry: Command<A> | LazyCommand<A>, options?: GenerateOptions<A>): Promise<string>;
 
 //#endregion
-export { generate };
+export { GenerateOptions, generate };

package/lib/generator.js

@@ -1,23 +1,24 @@
-import { create } from "./utils-STQBqMtf.js";
-import "./context-BefYjlE-.js";
-import "./renderer-BpwhGYRZ.js";
-import { cli } from "./cli-PK_LzdQr.js";
+import { create } from "./utils-GlOAgmx0.js";
+import "./context-B_pkfbdk.js";
+import "./renderer-8HgcYJqp.js";
+import { cli } from "./cli-DBIMF97F.js";
 
 //#region src/generator.ts
 /**
 * Generate the command usage.
 * @param command - usage generate command, if you want to generate the usage of the default command where there are target commands and sub-commands, specify `null`.
 * @param entry - A {@link Command | entry command}
-* @param opts - A {@link CommandOptions | command options}
+* @param options - A {@link CliOptions | cli options}
 * @returns A rendered usage.
 */
-async function generate(command, entry, opts = {}) {
+async function generate(command, entry, options = {}) {
 	const args = ["-h"];
 	if (command != null) args.unshift(command);
-	return await cli(args, entry, Object.assign(create(), opts, {
-		usageSilent: true,
-		__proto__: null
-	})) || "";
+	return await cli(args, entry, {
+		...create(),
+		...options,
+		usageSilent: true
+	}) || "";
 }
 
 //#endregion

package/lib/index.d.ts

@@ -1,24 +1,24 @@
-import { Command, CommandArgKeys, CommandBuiltinArgsKeys, CommandBuiltinKeys, CommandBuiltinResourceKeys, CommandCallMode, CommandContext, CommandEnvironment, CommandExamplesFetcher, CommandLoader, CommandOptions, CommandResource, CommandResourceFetcher, CommandRunner, Commandable, DEFAULT_LOCALE, GenerateNamespacedKey, KeyOfArgs, LazyCommand, RemovedIndex, TranslationAdapter, TranslationAdapterFactory, TranslationAdapterFactoryOptions } from "./types-BbgfNBFM.js";
-import { define$1 as define, lazy$1 as lazy } from "./definition-DUNcKGVg.js";
+import { CliOptions, Command, CommandArgKeys, CommandBuiltinArgsKeys, CommandBuiltinKeys, CommandBuiltinResourceKeys, CommandCallMode, CommandContext, CommandEnvironment, CommandExamplesFetcher, CommandLoader, CommandResource, CommandResourceFetcher, CommandRunner, Commandable, DEFAULT_LOCALE, GenerateNamespacedKey, KeyOfArgs, LazyCommand, RemovedIndex, TranslationAdapter, TranslationAdapterFactory, TranslationAdapterFactoryOptions } from "./types-ZXqvU8Ti.js";
+import { define$1 as define, lazy$1 as lazy } from "./definition-BFYUOPMR.js";
 import { ArgSchema, ArgValues, Args, Args as Args$1, parseArgs, resolveArgs } from "args-tokens";
 
 //#region src/cli.d.ts
 /**
 * Run the command.
 * @param args Command line arguments
-* @param entry A {@link Command | entry command} or an {@link CommandRunner | inline command runner}
-* @param opts A {@link CommandOptions | command options}
-* @returns A rendered usage or undefined. if you will use {@link CommandOptions.usageSilent} option, it will return rendered usage string.
+* @param entry A {@link Command | entry command}, an {@link CommandRunner | inline command runner}, or a {@link LazyCommand | lazily-loaded command}
+* @param options A {@link CliOptions | CLI options}
+* @returns A rendered usage or undefined. if you will use {@link CliOptions.usageSilent} option, it will return rendered usage string.
 */
 
 /**
  * Run the command.
  * @param args Command line arguments
- * @param entry A {@link Command | entry command} or an {@link CommandRunner | inline command runner}
- * @param opts A {@link CommandOptions | command options}
- * @returns A rendered usage or undefined. if you will use {@link CommandOptions.usageSilent} option, it will return rendered usage string.
+ * @param entry A {@link Command | entry command}, an {@link CommandRunner | inline command runner}, or a {@link LazyCommand | lazily-loaded command}
+ * @param options A {@link CliOptions | CLI options}
+ * @returns A rendered usage or undefined. if you will use {@link CliOptions.usageSilent} option, it will return rendered usage string.
  */
-declare function cli<A extends Args$1 = Args$1>(argv: string[], entry: Command<A> | CommandRunner<A>, opts?: CommandOptions<A>): Promise<string | undefined>;
+declare function cli<A extends Args$1 = Args$1>(argv: string[], entry: Command<A> | CommandRunner<A> | LazyCommand<A>, options?: CliOptions<A>): Promise<string | undefined>;
 
 //#endregion
 //#region src/translation.d.ts
@@ -32,4 +32,4 @@ declare class DefaultTranslation implements TranslationAdapter {
 }
 
 //#endregion
-export { ArgSchema, ArgValues, Args, Command, CommandArgKeys, CommandBuiltinArgsKeys, CommandBuiltinKeys, CommandBuiltinResourceKeys, CommandCallMode, CommandContext, CommandEnvironment, CommandExamplesFetcher, CommandLoader, CommandOptions, CommandResource, CommandResourceFetcher, CommandRunner, Commandable, DEFAULT_LOCALE, DefaultTranslation, GenerateNamespacedKey, KeyOfArgs, LazyCommand, RemovedIndex, TranslationAdapter, TranslationAdapterFactory, TranslationAdapterFactoryOptions, cli, define, lazy, parseArgs, resolveArgs };
+export { ArgSchema, ArgValues, Args, CliOptions, Command, CommandArgKeys, CommandBuiltinArgsKeys, CommandBuiltinKeys, CommandBuiltinResourceKeys, CommandCallMode, CommandContext, CommandEnvironment, CommandExamplesFetcher, CommandLoader, CommandResource, CommandResourceFetcher, CommandRunner, Commandable, DEFAULT_LOCALE, DefaultTranslation, GenerateNamespacedKey, KeyOfArgs, LazyCommand, RemovedIndex, TranslationAdapter, TranslationAdapterFactory, TranslationAdapterFactoryOptions, cli, define, lazy, parseArgs, resolveArgs };

package/lib/index.js

@@ -1,8 +1,8 @@
-import { DEFAULT_LOCALE$1 as DEFAULT_LOCALE } from "./utils-STQBqMtf.js";
-import { DefaultTranslation } from "./context-BefYjlE-.js";
+import { DEFAULT_LOCALE$1 as DEFAULT_LOCALE } from "./utils-GlOAgmx0.js";
+import { DefaultTranslation } from "./context-B_pkfbdk.js";
 import { define, lazy } from "./definition-DyVBFqB7.js";
-import "./renderer-BpwhGYRZ.js";
-import { cli } from "./cli-PK_LzdQr.js";
+import "./renderer-8HgcYJqp.js";
+import { cli } from "./cli-DBIMF97F.js";
 import { parseArgs, resolveArgs } from "args-tokens";
 
 export { DEFAULT_LOCALE, DefaultTranslation, cli, define, lazy, parseArgs, resolveArgs };

package/lib/{renderer-BpwhGYRZ.js → renderer-8HgcYJqp.js}

@@ -1,4 +1,4 @@
-import { COMMON_ARGS, create, resolveArgKey, resolveBuiltInKey, resolveExamples } from "./utils-STQBqMtf.js";
+import { COMMON_ARGS, create, resolveArgKey, resolveBuiltInKey, resolveExamples } from "./utils-GlOAgmx0.js";
 
 //#region src/renderer/header.ts
 /**

package/lib/renderer.d.ts

@@ -1,4 +1,4 @@
-import { CommandContext } from "./types-BbgfNBFM.js";
+import { CommandContext } from "./types-ZXqvU8Ti.js";
 import { Args } from "args-tokens";
 
 //#region src/renderer/header.d.ts

package/lib/renderer.js

@@ -1,4 +1,4 @@
-import "./utils-STQBqMtf.js";
-import { renderHeader, renderUsage, renderValidationErrors } from "./renderer-BpwhGYRZ.js";
+import "./utils-GlOAgmx0.js";
+import { renderHeader, renderUsage, renderValidationErrors } from "./renderer-8HgcYJqp.js";
 
 export { renderHeader, renderUsage, renderValidationErrors };

package/lib/{types-BbgfNBFM.d.ts → types-ZXqvU8Ti.d.ts}

@@ -25,7 +25,7 @@ type CommonArgType = {
   };
 };
 declare const COMMON_ARGS: CommonArgType;
-declare const COMMAND_OPTIONS_DEFAULT: CommandOptions<Args>;
+declare const COMMAND_OPTIONS_DEFAULT: CliOptions<Args>;
 declare const COMMAND_BUILTIN_RESOURCE_KEYS: readonly ["USAGE", "COMMAND", "SUBCOMMAND", "COMMANDS", "ARGUMENTS", "OPTIONS", "EXAMPLES", "FORMORE", "NEGATABLE", "DEFAULT", "CHOICES"];
 
 //#endregion
@@ -72,58 +72,58 @@ type CommandArgKeys<A extends Args> = GenerateNamespacedKey<KeyOfArgs<RemovedInd
 interface CommandEnvironment<A extends Args = Args> {
   /**
    * Current working directory.
-   * @see {@link CommandOptions.cwd}
+   * @see {@link CliOptions.cwd}
    */
   cwd: string | undefined;
   /**
    * Command name.
-   * @see {@link CommandOptions.name}
+   * @see {@link CliOptions.name}
    */
   name: string | undefined;
   /**
    * Command description.
-   * @see {@link CommandOptions.description}
+   * @see {@link CliOptions.description}
    *
    */
   description: string | undefined;
   /**
    * Command version.
-   * @see {@link CommandOptions.version}
+   * @see {@link CliOptions.version}
    */
   version: string | undefined;
   /**
    * Left margin of the command output.
    * @default 2
-   * @see {@link CommandOptions.leftMargin}
+   * @see {@link CliOptions.leftMargin}
    */
   leftMargin: number;
   /**
    * Middle margin of the command output.
    * @default 10
-   * @see {@link CommandOptions.middleMargin}
+   * @see {@link CliOptions.middleMargin}
    */
   middleMargin: number;
   /**
    * Whether to display the usage option type.
    * @default false
-   * @see {@link CommandOptions.usageOptionType}
+   * @see {@link CliOptions.usageOptionType}
    */
   usageOptionType: boolean;
   /**
    * Whether to display the option value.
    * @default true
-   * @see {@link CommandOptions.usageOptionValue}
+   * @see {@link CliOptions.usageOptionValue}
    */
   usageOptionValue: boolean;
   /**
    * Whether to display the command usage.
    * @default false
-   * @see {@link CommandOptions.usageSilent}
+   * @see {@link CliOptions.usageSilent}
    */
   usageSilent: boolean;
   /**
    * Sub commands.
-   * @see {@link CommandOptions.subCommands}
+   * @see {@link CliOptions.subCommands}
    */
   subCommands: Map<string, Command<any> | LazyCommand<any>> | undefined;
   /**
@@ -140,9 +140,9 @@ interface CommandEnvironment<A extends Args = Args> {
   renderValidationErrors: ((ctx: CommandContext<A>, error: AggregateError) => Promise<string>) | null | undefined;
 }
 /**
- * Command options.
+ * CLI options of `cli` function.
  */
-interface CommandOptions<A extends Args = Args> {
+interface CliOptions<A extends Args = Args> {
   /**
    * Current working directory.
    */
@@ -426,4 +426,4 @@ type LazyCommand<A extends Args = Args> = {
  * Define a command type.
  */
 type Commandable<A extends Args> = Command<A> | LazyCommand<A>; //#endregion
-export { Command, CommandArgKeys, CommandBuiltinArgsKeys, CommandBuiltinKeys, CommandBuiltinResourceKeys, CommandCallMode, CommandContext, CommandEnvironment, CommandExamplesFetcher, CommandLoader, CommandOptions, CommandResource, CommandResourceFetcher, CommandRunner, Commandable, DEFAULT_LOCALE, GenerateNamespacedKey, KeyOfArgs, LazyCommand, RemovedIndex, TranslationAdapter, TranslationAdapterFactory, TranslationAdapterFactoryOptions };
+export { CliOptions, Command, CommandArgKeys, CommandBuiltinArgsKeys, CommandBuiltinKeys, CommandBuiltinResourceKeys, CommandCallMode, CommandContext, CommandEnvironment, CommandExamplesFetcher, CommandLoader, CommandResource, CommandResourceFetcher, CommandRunner, Commandable, DEFAULT_LOCALE, GenerateNamespacedKey, KeyOfArgs, LazyCommand, RemovedIndex, TranslationAdapter, TranslationAdapterFactory, TranslationAdapterFactoryOptions };

package/lib/{utils-STQBqMtf.js → utils-GlOAgmx0.js}

@@ -38,9 +38,12 @@ const COMMAND_OPTIONS_DEFAULT = {
 
 //#endregion
 //#region src/utils.ts
+function isLazyCommand(cmd) {
+	return typeof cmd === "function" && "commandName" in cmd && !!cmd.commandName;
+}
 async function resolveLazyCommand(cmd, name, needRunResolving = false) {
 	let command;
-	if (typeof cmd === "function") {
+	if (isLazyCommand(cmd)) {
 		command = Object.assign(create(), {
 			name: cmd.commandName,
 			description: cmd.description,
@@ -96,4 +99,4 @@ function deepFreeze(obj) {
 }
 
 //#endregion
-export { BUILT_IN_PREFIX, COMMAND_OPTIONS_DEFAULT, COMMON_ARGS, DEFAULT_LOCALE as DEFAULT_LOCALE$1, NOOP, create, deepFreeze, log, mapResourceWithBuiltinKey, resolveArgKey, resolveBuiltInKey, resolveExamples, resolveLazyCommand };
+export { BUILT_IN_PREFIX, COMMAND_OPTIONS_DEFAULT, COMMON_ARGS, DEFAULT_LOCALE as DEFAULT_LOCALE$1, NOOP, create, deepFreeze, isLazyCommand, log, mapResourceWithBuiltinKey, resolveArgKey, resolveBuiltInKey, resolveExamples, resolveLazyCommand };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gunshi",
   "description": "Modern javascript command-line library",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -103,12 +103,12 @@
     "eslint-plugin-vue-composable": "^1.0.0",
     "eslint-plugin-yml": "^1.18.0",
     "gh-changelogen": "^0.2.8",
-    "gunshi019": "npm:gunshi@0.19.0",
+    "gunshi019": "npm:gunshi@0.22.0",
     "jsr": "^0.13.4",
     "jsr-exports-lint": "^0.2.0",
     "knip": "^5.53.0",
-    "lint-staged": "^15.5.1",
-    "messageformat": "4.0.0-10",
+    "lint-staged": "^16.0.0",
+    "messageformat": "4.0.0-11",
     "mitata": "^1.0.34",
     "pkg-pr-new": "^0.0.43",
     "prettier": "^3.5.3",

package/lib/cli-PK_LzdQr.js

@@ -1,135 +0,0 @@
-import { COMMAND_OPTIONS_DEFAULT, COMMON_ARGS, create, resolveLazyCommand } from "./utils-STQBqMtf.js";
-import { createCommandContext } from "./context-BefYjlE-.js";
-import { renderHeader, renderUsage, renderValidationErrors } from "./renderer-BpwhGYRZ.js";
-import { parseArgs, resolveArgs } from "args-tokens";
-
-//#region src/cli.ts
-/**
-* Run the command.
-* @param args Command line arguments
-* @param entry A {@link Command | entry command} or an {@link CommandRunner | inline command runner}
-* @param opts A {@link CommandOptions | command options}
-* @returns A rendered usage or undefined. if you will use {@link CommandOptions.usageSilent} option, it will return rendered usage string.
-*/
-async function cli(argv, entry, opts = {}) {
-	const tokens = parseArgs(argv);
-	const subCommand = getSubCommand(tokens);
-	const resolvedCommandOptions = resolveCommandOptions(opts, entry);
-	const [name, command, callMode] = await resolveCommand(subCommand, entry, resolvedCommandOptions, true);
-	if (!command) throw new Error(`Command not found: ${name || ""}`);
-	const args = resolveArguments(command.args);
-	const { values, positionals, rest, error } = resolveArgs(args, tokens, {
-		optionGrouping: true,
-		skipPositional: resolvedCommandOptions.subCommands.size > 0 ? 0 : -1
-	});
-	const omitted = !subCommand;
-	const ctx = await createCommandContext({
-		args,
-		values,
-		positionals,
-		rest,
-		argv,
-		tokens,
-		omitted,
-		callMode,
-		command,
-		commandOptions: resolvedCommandOptions
-	});
-	if (values.version) {
-		showVersion(ctx);
-		return;
-	}
-	const usageBuffer = [];
-	const header = await showHeader(ctx);
-	if (header) usageBuffer.push(header);
-	if (values.help) {
-		const usage = await showUsage(ctx);
-		if (usage) usageBuffer.push(usage);
-		return usageBuffer.join("\n");
-	}
-	if (error) {
-		await showValidationErrors(ctx, error);
-		return;
-	}
-	if (!command.run) throw new Error(`'run' not found on Command \`${name || ""}\``);
-	await command.run(ctx);
-}
-function resolveArguments(options) {
-	return Object.assign(create(), options, COMMON_ARGS);
-}
-function resolveCommandOptions(options, entry) {
-	const subCommands = new Map(options.subCommands);
-	if (typeof entry === "object" && entry.name && options.subCommands) subCommands.set(entry.name, entry);
-	const resolvedOptions = Object.assign(create(), COMMAND_OPTIONS_DEFAULT, options, { subCommands });
-	return resolvedOptions;
-}
-function getSubCommand(tokens) {
-	const firstToken = tokens[0];
-	return firstToken && firstToken.kind === "positional" && firstToken.index === 0 && firstToken.value ? firstToken.value : "";
-}
-async function showUsage(ctx) {
-	if (ctx.env.renderUsage === null) return;
-	const usage = await (ctx.env.renderUsage || renderUsage)(ctx);
-	if (usage) {
-		ctx.log(usage);
-		return usage;
-	}
-}
-function showVersion(ctx) {
-	ctx.log(ctx.env.version);
-}
-async function showHeader(ctx) {
-	if (ctx.env.renderHeader === null) return;
-	const header = await (ctx.env.renderHeader || renderHeader)(ctx);
-	if (header) {
-		ctx.log(header);
-		ctx.log();
-		return header;
-	}
-}
-async function showValidationErrors(ctx, error) {
-	if (ctx.env.renderValidationErrors === null) return;
-	const render = ctx.env.renderValidationErrors || renderValidationErrors;
-	ctx.log(await render(ctx, error));
-}
-async function resolveCommand(sub, entry, options, needRunResolving = false) {
-	const omitted = !sub;
-	if (typeof entry === "function") return [
-		void 0,
-		{ run: entry },
-		"entry"
-	];
-	else if (omitted) return typeof entry === "object" ? [
-		resolveEntryName(entry),
-		await resolveLazyCommand(entry, "", needRunResolving),
-		"entry"
-	] : [
-		void 0,
-		void 0,
-		"unexpected"
-	];
-	else {
-		if (options.subCommands == null || options.subCommands.size === 0) return [
-			resolveEntryName(entry),
-			await resolveLazyCommand(entry, "", needRunResolving),
-			"entry"
-		];
-		const cmd = options.subCommands?.get(sub);
-		if (cmd == null) return [
-			sub,
-			void 0,
-			"unexpected"
-		];
-		return [
-			sub,
-			await resolveLazyCommand(cmd, sub, needRunResolving),
-			"subCommand"
-		];
-	}
-}
-function resolveEntryName(entry) {
-	return entry.name || "(anonymous)";
-}
-
-//#endregion
-export { cli };