gunshi 0.20.0 → 0.22.0

package/lib/{cli-rwwoCHjK.js → cli-DEuAxEk9.js}

@@ -1,21 +1,14 @@
 import { COMMAND_OPTIONS_DEFAULT, COMMON_ARGS, create, resolveLazyCommand } from "./utils-STQBqMtf.js";
-import { createCommandContext } from "./context-IwpAqLSL.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] = await resolveCommand(subCommand, entry, resolvedCommandOptions, true);
+	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, {
@@ -31,6 +24,7 @@ async function cli(argv, entry, opts = {}) {
 		argv,
 		tokens,
 		omitted,
+		callMode,
 		command,
 		commandOptions: resolvedCommandOptions
 	});
@@ -58,7 +52,10 @@ function resolveArguments(options) {
 }
 function resolveCommandOptions(options, entry) {
 	const subCommands = new Map(options.subCommands);
-	if (typeof entry === "object" && entry.name && options.subCommands) subCommands.set(entry.name, entry);
+	if (options.subCommands) {
+		if (typeof entry === "function" && "commandName" in entry && entry.commandName) 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;
 }
@@ -91,16 +88,43 @@ async function showValidationErrors(ctx, error) {
 	const render = ctx.env.renderValidationErrors || renderValidationErrors;
 	ctx.log(await render(ctx, error));
 }
+const CANNOT_RESOLVE_COMMAND = [
+	void 0,
+	void 0,
+	"unexpected"
+];
 async function resolveCommand(sub, entry, options, needRunResolving = false) {
 	const omitted = !sub;
-	if (typeof entry === "function") return [void 0, { run: entry }];
-	else if (omitted) return typeof entry === "object" ? [resolveEntryName(entry), await resolveLazyCommand(entry, "", needRunResolving)] : [void 0, void 0];
-	else {
-		if (options.subCommands == null || options.subCommands.size === 0) return [resolveEntryName(entry), await resolveLazyCommand(entry, "", needRunResolving)];
-		const cmd = options.subCommands?.get(sub);
-		if (cmd == null) return [sub, void 0];
-		return [sub, await resolveLazyCommand(cmd, sub, needRunResolving)];
+	async function doResolveCommand() {
+		if (typeof entry === "function") if ("commandName" in entry && entry.commandName) return [
+			entry.commandName,
+			await resolveLazyCommand(entry, "", needRunResolving),
+			"entry"
+		];
+		else return [
+			void 0,
+			{ run: entry },
+			"entry"
+		];
+		else if (typeof entry === "object") return [
+			resolveEntryName(entry),
+			await resolveLazyCommand(entry, "", needRunResolving),
+			"entry"
+		];
+		else return CANNOT_RESOLVE_COMMAND;
 	}
+	if (omitted || options.subCommands?.size === 0) return doResolveCommand();
+	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)";

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

@@ -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, omitted = false }) {
+async function createCommandContext({ args, values, positionals, rest, argv, tokens, command, commandOptions, callMode = "entry", omitted = false }) {
 	/**
 	* normailize the options schema and values, to avoid prototype pollution
 	*/
@@ -128,6 +128,7 @@ async function createCommandContext({ args, values, positionals, rest, argv, tok
 		name: command.name,
 		description: command.description,
 		omitted,
+		callMode,
 		locale,
 		env,
 		args: _args,

package/lib/context.d.ts

@@ -1,4 +1,4 @@
-import { Command, CommandContext, CommandOptions } from "./types-iztBdPY6.js";
+import { Command, CommandCallMode, CommandContext, CommandOptions } from "./types-BbgfNBFM.js";
 import { ArgToken, ArgValues, Args } from "args-tokens";
 
 //#region src/context.d.ts
@@ -38,6 +38,10 @@ interface CommandContextParams<A extends Args, V> {
    * Whether the command is omitted
    */
   omitted: boolean;
+  /**
+   * Command call mode.
+   */
+  callMode: CommandCallMode;
   /**
    * A target {@link Command | command}
    */
@@ -61,6 +65,7 @@ declare function createCommandContext<A extends Args = Args, V extends ArgValues
   tokens,
   command,
   commandOptions,
+  callMode,
   omitted
 }: CommandContextParams<A, V>): Promise<Readonly<CommandContext<A, V>>>; //#endregion
 export { createCommandContext };

package/lib/context.js

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

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

@@ -1,4 +1,4 @@
-import { Command, CommandLoader, LazyCommand } from "./types-iztBdPY6.js";
+import { Command, CommandLoader, LazyCommand } from "./types-BbgfNBFM.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-iztBdPY6.js";
-import { ArgSchema, ArgValues, Args, define$1 as define, lazy$1 as lazy } from "./definition-BrCD_SuG.js";
+import "./types-BbgfNBFM.js";
+import { ArgSchema, ArgValues, Args, define$1 as define, lazy$1 as lazy } from "./definition-DUNcKGVg.js";
 export { ArgSchema, ArgValues, Args, define, lazy };

package/lib/generator.d.ts

@@ -1,4 +1,4 @@
-import { Command, CommandOptions } from "./types-iztBdPY6.js";
+import { Command, CommandOptions } from "./types-BbgfNBFM.js";
 import { Args } from "args-tokens";
 
 //#region src/generator.d.ts

package/lib/generator.js

@@ -1,7 +1,7 @@
 import { create } from "./utils-STQBqMtf.js";
-import "./context-IwpAqLSL.js";
+import "./context-BefYjlE-.js";
 import "./renderer-BpwhGYRZ.js";
-import { cli } from "./cli-rwwoCHjK.js";
+import { cli } from "./cli-DEuAxEk9.js";
 
 //#region src/generator.ts
 /**

package/lib/index.d.ts

@@ -1,24 +1,10 @@
-import { Command, CommandArgKeys, CommandBuiltinArgsKeys, CommandBuiltinKeys, CommandBuiltinResourceKeys, CommandContext, CommandEnvironment, CommandExamplesFetcher, CommandLoader, CommandOptions, CommandResource, CommandResourceFetcher, CommandRunner, Commandable, DEFAULT_LOCALE, GenerateNamespacedKey, KeyOfArgs, LazyCommand, RemovedIndex, TranslationAdapter, TranslationAdapterFactory, TranslationAdapterFactoryOptions } from "./types-iztBdPY6.js";
-import { define$1 as define, lazy$1 as lazy } from "./definition-BrCD_SuG.js";
+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 { 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.
-*/
 
-/**
- * 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.
- */
-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>, opts?: CommandOptions<A>): Promise<string | undefined>;
 
 //#endregion
 //#region src/translation.d.ts
@@ -32,4 +18,4 @@ declare class DefaultTranslation implements TranslationAdapter {
 }
 
 //#endregion
-export { ArgSchema, ArgValues, Args, Command, CommandArgKeys, CommandBuiltinArgsKeys, CommandBuiltinKeys, CommandBuiltinResourceKeys, 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, 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 };

package/lib/index.js

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

package/lib/renderer.d.ts

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

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

@@ -205,6 +205,10 @@ interface CommandOptions<A extends Args = Args> {
    */
   translationAdapterFactory?: TranslationAdapterFactory;
 }
+/**
+ * Command call mode.
+ */
+type CommandCallMode = 'entry' | 'subCommand' | 'unexpected';
 /**
  * Command context.
  * Command context is the context of the command execution.
@@ -261,6 +265,11 @@ interface CommandContext<A extends Args = Args, V = ArgValues<A>> {
    * Whether the currently executing command has been executed with the sub-command name omitted.
    */
   omitted: boolean;
+  /**
+   * Command call mode.
+   * The command call mode is `entry` when the command is executed as an entry command, and `subCommand` when the command is executed as a sub-command.
+   */
+  callMode: CommandCallMode;
   /**
    * Output a message.
    * If {@link CommandEnvironment.usageSilent} is true, the message is not output.
@@ -417,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, CommandContext, CommandEnvironment, CommandExamplesFetcher, CommandLoader, CommandOptions, CommandResource, CommandResourceFetcher, CommandRunner, Commandable, DEFAULT_LOCALE, GenerateNamespacedKey, KeyOfArgs, LazyCommand, RemovedIndex, TranslationAdapter, TranslationAdapterFactory, TranslationAdapterFactoryOptions };
+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 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gunshi",
   "description": "Modern javascript command-line library",
-  "version": "0.20.0",
+  "version": "0.22.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.21.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",
+    "messageformat": "4.0.0-11",
     "mitata": "^1.0.34",
     "pkg-pr-new": "^0.0.43",
     "prettier": "^3.5.3",