gunshi 0.21.0 → 0.22.0

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

@@ -4,13 +4,6 @@ import { renderHeader, renderUsage, renderValidationErrors } from "./renderer-Bp
 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);
@@ -59,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;
 }
@@ -92,40 +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 },
-		"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),
+	async function doResolveCommand() {
+		if (typeof entry === "function") if ("commandName" in entry && entry.commandName) return [
+			entry.commandName,
 			await resolveLazyCommand(entry, "", needRunResolving),
 			"entry"
 		];
-		const cmd = options.subCommands?.get(sub);
-		if (cmd == null) return [
-			sub,
+		else return [
 			void 0,
-			"unexpected"
+			{ run: entry },
+			"entry"
 		];
-		return [
-			sub,
-			await resolveLazyCommand(cmd, sub, needRunResolving),
-			"subCommand"
+		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/generator.js

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

package/lib/index.d.ts

@@ -3,22 +3,8 @@ 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

package/lib/index.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gunshi",
   "description": "Modern javascript command-line library",
-  "version": "0.21.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",