gunshi 1.0.0-beta.1 → 1.0.0-beta.2

package/lib/bone.js

@@ -1,4 +1,4 @@
-import { t as cliCore } from "./core-C-EvVI4v.js";
+import { t as cliCore } from "./core-D9EEP3Ac.js";
 //#region src/cli/bone.ts
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)

package/lib/{builtin-CMCjNe-j.js → builtin-ClJbNR1q.js}

@@ -1,7 +1,7 @@
 import { a as hasPriorityValidationError } from "./error-wB83kWiv.js";
 import { t as plugin } from "./plugin-CG94VzCl.js";
-import { a as namespacedId, o as COMMON_ARGS, t as renderer } from "./src-BI37Q7Wx.js";
-import { t as cliCore } from "./core-C-EvVI4v.js";
+import { a as namespacedId, o as COMMON_ARGS, t as renderer } from "./src-Dr9mmkFc.js";
+import { t as cliCore } from "./core-D9EEP3Ac.js";
 //#region ../plugin-global/src/types.ts
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)

package/lib/{core-C-EvVI4v.js → core-D9EEP3Ac.js}

@@ -1,6 +1,6 @@
 import { i as NOOP, r as CLI_OPTIONS_DEFAULT, t as createCommandContext } from "./context-CSecf6R5.js";
 import { n as kebabnize } from "./utils-CJLgPw25.js";
-import { create, getCommandSubCommands, isLazyCommand, resolveCommandArgs, resolveLazyCommand } from "./utils.js";
+import { create, getCommandSubCommands, isLazyCommand, resolveLazyCommand } from "./utils.js";
 import { a as resolveArgs, n as ArgsValidationErrorKeys, o as parseArgs, t as ArgsValidationError } from "./resolver-CAlgxe_R-y4BytVTg.js";
 import { a as hasPriorityValidationError, i as CommandResolutionErrorKeys, n as CommandNotFoundErrorKeys, r as CommandResolutionError, t as CommandNotFoundError } from "./error-wB83kWiv.js";
 //#region src/decorators.ts
@@ -197,6 +197,47 @@ function resolveDependencies(plugins) {
 	return sorted;
 }
 //#endregion
+//#region src/cli/args.ts
+/**
+* @author kazuya kawaguchi (a.k.a. kazupon)
+* @license MIT
+*/
+/**
+* Resolve the arguments of a command, the way gunshi parses and renders them.
+*
+* The global options belong to no command definition, so they are merged into the arguments of the
+* command that runs. An argument of the command shadows the global option of the same name, and it
+* shadows the same way by short name: a global option gives up its short name to an argument of the
+* command that claims the same letter, and keeps its long name.
+*
+* NOTE(kazupon): this is not exported from the entry points. `@gunshi/plugin-completion` completes
+* the arguments the same way with the copy in `@gunshi/shared`, and the tests of that copy pin it
+* to the results of this one, so a change here has to be made there too.
+*
+* @param globalOptions - The global options that plugins registered with `addGlobalOption`
+* @param args - The arguments that the command declares
+* @returns The merged arguments
+*/
+function resolveCommandArgs(globalOptions, args) {
+	return Object.assign(create(), resolveGlobalOptions(globalOptions, args), args);
+}
+function resolveGlobalOptions(globalOptions, args) {
+	if (!globalOptions) return;
+	const shortNames = /* @__PURE__ */ new Set();
+	for (const schema of Object.values(args || {})) if (schema.type !== "positional" && schema.short) shortNames.add(schema.short);
+	const resolved = create();
+	for (const [name, schema] of globalOptions)
+ /**
+	* NOTE(kazupon): a copy, because the schema is the one that the plugin registered, which every
+	* command of the CLI shares. Only this command gives up the short name.
+	*/
+	resolved[name] = schema.short && shortNames.has(schema.short) ? {
+		...schema,
+		short: void 0
+	} : schema;
+	return resolved;
+}
+//#endregion
 //#region src/cli/core.ts
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)

package/lib/generator.js

@@ -1,5 +1,5 @@
 import { create } from "./utils.js";
-import { n as cliUsage } from "./builtin-CMCjNe-j.js";
+import { n as cliUsage } from "./builtin-ClJbNR1q.js";
 //#region src/generator.ts
 /**
 * The entry for usage generator.

package/lib/index.js

@@ -2,8 +2,8 @@ import { n as ANONYMOUS_COMMAND_NAME, t as createCommandContext } from "./contex
 import { a as resolveArgs, n as ArgsValidationErrorKeys, o as parseArgs, t as ArgsValidationError } from "./resolver-CAlgxe_R-y4BytVTg.js";
 import { a as hasPriorityValidationError, c as isCommandResolutionError, i as CommandResolutionErrorKeys, n as CommandNotFoundErrorKeys, o as isArgsValidationError, r as CommandResolutionError, s as isCommandNotFoundError, t as CommandNotFoundError } from "./error-wB83kWiv.js";
 import { t as plugin } from "./plugin-CG94VzCl.js";
-import { a as namespacedId } from "./src-BI37Q7Wx.js";
-import { t as cli } from "./builtin-CMCjNe-j.js";
+import { a as namespacedId } from "./src-Dr9mmkFc.js";
+import { t as cli } from "./builtin-ClJbNR1q.js";
 import { define, defineWithTypes, lazy, lazyWithTypes } from "./definition.js";
 //#region ../plugin-i18n/src/translation.ts
 /**

package/lib/renderer.js

@@ -1,4 +1,4 @@
-import { i as renderHeader, n as renderValidationErrors, r as renderUsage } from "./src-BI37Q7Wx.js";
+import { i as renderHeader, n as renderValidationErrors, r as renderUsage } from "./src-Dr9mmkFc.js";
 //#region src/renderer.ts
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)

package/lib/{src-BI37Q7Wx.js → src-Dr9mmkFc.js}

@@ -608,6 +608,11 @@ async function resolveDisplayValue(ctx, key) {
 	if ((schema.type === "boolean" || schema.type === "number" || schema.type === "string" || schema.type === "custom") && schema.default !== void 0) return `(${await generateDefaultDisplayValue(ctx, schema)})`;
 	if (schema.type === "enum") {
 		const _default = schema.default === void 0 ? "" : await generateDefaultDisplayValue(ctx, schema);
+		/**
+		* NOTE(kazupon): an `enum` argument that has a `parse` function needs no `choices`, as args-tokens
+		* resolves its value with the function. There is no list to show then (#800).
+		*/
+		if (!Array.isArray(schema.choices)) return _default ? `(${_default})` : "";
 		const choices = `${await ctx.extensions[pluginId].text(resolveBuiltInKey("CHOICES"))}: ${schema.choices.join(" | ")}`;
 		return `(${_default ? `${_default}, ${choices}` : choices})`;
 	}

package/lib/utils.d.ts

@@ -1,4 +1,3 @@
-import { i as Args, n as ArgSchema } from "./resolver-BezrTUr7.js";
 import { b as GunshiParamsConstraint, m as DefaultGunshiParams, p as Commandable, r as Command, x as LazyCommand } from "./types-lD5uzpd5.js";
 //#region ../../node_modules/.pnpm/args-tokens@1.0.0-beta.1/node_modules/args-tokens/lib/utils.d.ts
 //#region src/utils.d.ts
@@ -51,19 +50,6 @@ declare function resolveLazyCommand<G extends GunshiParamsConstraint = DefaultGu
  * @returns A new object with the specified prototype
  */
 declare function create<T>(obj?: object | null): T;
-/**
- * Resolve the arguments of a command, the way gunshi parses and renders them.
- *
- * The global options belong to no command definition, so they are merged into the arguments of the
- * command that runs. An argument of the command shadows the global option of the same name, and it
- * shadows the same way by short name: a global option gives up its short name to an argument of the
- * command that claims the same letter, and keeps its long name.
- *
- * @param globalOptions - The global options that plugins registered with `addGlobalOption`
- * @param args - The arguments that the command declares
- * @returns The merged arguments
- */
-declare function resolveCommandArgs<A extends Args = Args>(globalOptions?: ReadonlyMap<string, ArgSchema>, args?: A): A;
 /**
  * Log a message to the console.
  *
@@ -86,4 +72,4 @@ declare function getCommandSubCommands<G extends GunshiParamsConstraint = Defaul
  */
 declare function deepFreeze<T extends Record<string, any>>(obj: T, ignores?: string[]): Readonly<T>;
 //#endregion
-export { create, deepFreeze, getCommandSubCommands, isLazyCommand, kebabnize, log, resolveCommandArgs, resolveLazyCommand };
+export { create, deepFreeze, getCommandSubCommands, isLazyCommand, kebabnize, log, resolveLazyCommand };

package/lib/utils.js

@@ -80,37 +80,6 @@ function create(obj = null) {
 	return Object.create(obj);
 }
 /**
-* Resolve the arguments of a command, the way gunshi parses and renders them.
-*
-* The global options belong to no command definition, so they are merged into the arguments of the
-* command that runs. An argument of the command shadows the global option of the same name, and it
-* shadows the same way by short name: a global option gives up its short name to an argument of the
-* command that claims the same letter, and keeps its long name.
-*
-* @param globalOptions - The global options that plugins registered with `addGlobalOption`
-* @param args - The arguments that the command declares
-* @returns The merged arguments
-*/
-function resolveCommandArgs(globalOptions, args) {
-	return Object.assign(create(), resolveGlobalOptions(globalOptions, args), args);
-}
-function resolveGlobalOptions(globalOptions, args) {
-	if (!globalOptions) return;
-	const shortNames = /* @__PURE__ */ new Set();
-	for (const schema of Object.values(args || {})) if (schema.type !== "positional" && schema.short) shortNames.add(schema.short);
-	const resolved = create();
-	for (const [name, schema] of globalOptions)
- /**
-	* NOTE(kazupon): a copy, because the schema is the one that the plugin registered, which every
-	* command of the CLI shares. Only this command gives up the short name.
-	*/
-	resolved[name] = schema.short && shortNames.has(schema.short) ? {
-		...schema,
-		short: void 0
-	} : schema;
-	return resolved;
-}
-/**
 * Log a message to the console.
 *
 * @param args - Arguments to log
@@ -153,4 +122,4 @@ function deepFreeze(obj, ignores = []) {
 	return Object.freeze(obj);
 }
 //#endregion
-export { create, deepFreeze, getCommandSubCommands, isLazyCommand, kebabnize, log, resolveCommandArgs, resolveLazyCommand };
+export { create, deepFreeze, getCommandSubCommands, isLazyCommand, kebabnize, log, resolveLazyCommand };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gunshi",
   "description": "Modern javascript command-line library",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -108,11 +108,11 @@
     }
   },
   "devDependencies": {
-    "@gunshi/plugin-global": "1.0.0-beta.1",
-    "@gunshi/plugin-i18n": "1.0.0-beta.1",
-    "@gunshi/plugin-renderer": "1.0.0-beta.1",
-    "@gunshi/resources": "1.0.0-beta.1",
-    "@gunshi/shared": "1.0.0-beta.1",
+    "@gunshi/plugin-global": "1.0.0-beta.2",
+    "@gunshi/plugin-i18n": "1.0.0-beta.2",
+    "@gunshi/plugin-renderer": "1.0.0-beta.2",
+    "@gunshi/resources": "1.0.0-beta.2",
+    "@gunshi/shared": "1.0.0-beta.2",
     "@types/node": "^25.6.2",
     "args-tokens": "1.0.0-beta.1",
     "deno": "^2.7.14",