gunshi 1.0.0-beta.0 → 1.0.0-beta.2

package/lib/agent.d.ts

@@ -1,16 +1,11 @@
 //#region ../../node_modules/.pnpm/std-env@4.1.0/node_modules/std-env/dist/index.d.mts
 //#region src/agents.d.ts
 /**
-* Represents the name of an AI coding agent.
-*/
+ * Represents the name of an AI coding agent.
+ */
 type AgentName = (string & {}) | "cursor" | "claude" | "devin" | "replit" | "gemini" | "codex" | "auggie" | "opencode" | "kiro" | "goose" | "pi";
-/**
-* Provides information about an AI coding agent.
-*/
-
 //#endregion
 //#region src/agent.d.ts
-
 /**
  * A profile that summarizes whether the current process is running on an
  * AI coding agent.

package/lib/bone.d.ts

@@ -1,12 +1,6 @@
-import { i as Args, l as ArgToken, n as ArgSchema, r as ArgValues } from "./resolver-By5dj6NT.js";
-import { C as NormalizeToGunshiParams, D as SubCommandable, E as RenderingOptions, O as ValidationErrorsDecorator, S as MergeGunshiExtensions, T as RendererDecorator, _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, c as CommandDecorator, d as CommandLoader, f as CommandRunner, g as ExtractArgExplicitlyProvided, h as ExtendContext, i as CommandCallMode, l as CommandEnvironment, m as DefaultGunshiParams, n as CliOptions, o as CommandContextCore, p as Commandable, r as Command, s as CommandContextExtension, t as Awaitable, u as CommandExamplesFetcher, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-CVwpWSau.js";
-
+import { i as Args, l as ArgToken, n as ArgSchema, r as ArgValues } from "./resolver-BezrTUr7.js";
+import { C as NormalizeToGunshiParams, D as SubCommandable, E as RenderingOptions, O as ValidationErrorsDecorator, S as MergeGunshiExtensions, T as RendererDecorator, _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, c as CommandDecorator, d as CommandLoader, f as CommandRunner, g as ExtractArgExplicitlyProvided, h as ExtendContext, i as CommandCallMode, l as CommandEnvironment, m as DefaultGunshiParams, n as CliOptions, o as CommandContextCore, p as Commandable, r as Command, s as CommandContextExtension, t as Awaitable, u as CommandExamplesFetcher, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-lD5uzpd5.js";
 //#region src/cli/bone.d.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
-
 /**
  * Run the command.
  *
@@ -47,11 +41,4 @@ declare function cli<E extends ExtendContext = ExtendContext, G extends GunshiPa
  */
 declare function cli<G extends GunshiParams = DefaultGunshiParams>(args: string[], entry: Command<G> | CommandRunner<G> | LazyCommand<G>, options?: CliOptions<G>): Promise<string | undefined>;
 //#endregion
-//#region src/bone.d.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
-
-//#endregion
-export { ArgSchema, ArgToken, ArgValues, Args, Awaitable, CliOptions, Command, CommandCallMode, CommandContext, CommandContextCore, CommandContextExtension, CommandDecorator, CommandEnvironment, CommandExamplesFetcher, CommandLoader, CommandRunner, Commandable, DefaultGunshiParams, ExtendContext, ExtractArgExplicitlyProvided, ExtractArgs, ExtractExtensions, GunshiParams, GunshiParamsConstraint, LazyCommand, MergeGunshiExtensions, NormalizeToGunshiParams, Prettify, RendererDecorator, RenderingOptions, SubCommandable, ValidationErrorsDecorator, cli };
+export { type ArgSchema, type ArgToken, type ArgValues, type Args, type Awaitable, type CliOptions, type Command, type CommandCallMode, type CommandContext, type CommandContextCore, type CommandContextExtension, type CommandDecorator, type CommandEnvironment, type CommandExamplesFetcher, type CommandLoader, type CommandRunner, type Commandable, type DefaultGunshiParams, type ExtendContext, type ExtractArgExplicitlyProvided, type ExtractArgs, type ExtractExtensions, type GunshiParams, type GunshiParamsConstraint, type LazyCommand, type MergeGunshiExtensions, type NormalizeToGunshiParams, type Prettify, type RendererDecorator, type RenderingOptions, type SubCommandable, type ValidationErrorsDecorator, cli };

package/lib/bone.js

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

package/lib/{builtin-DpTuEkZb.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-Cj5m08gX.js";
-import { t as cliCore } from "./core-DARRFBGf.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/combinators.d.ts

@@ -1,7 +1,5 @@
-import { i as Args, n as ArgSchema } from "./resolver-By5dj6NT.js";
-
+import { i as Args, n as ArgSchema } from "./resolver-BezrTUr7.js";
 //#region ../../node_modules/.pnpm/args-tokens@1.0.0-beta.1/node_modules/args-tokens/lib/combinators.d.ts
-
 //#region src/combinators.d.ts
 /**
  * A combinator produced by combinator factory functions.
@@ -474,7 +472,7 @@ type PositionalParserKey = 'parse' | 'metavar' | 'description' | 'hidden' | 'req
  * As in {@link WithFlag}, it maps the properties of the parser itself, and reads `any` in a part of
  * its own, so that TypeScript still sees them for a parser typed by a type parameter.
  */
-type PositionalWithParser<S> = { [K in keyof S as K extends PositionalParserKey ? K : never]: S[K] } & ArgSchemaPositionalType & (0 extends 1 & S ? Pick<UntypedCombinatorSchema, PositionalParserKey> : unknown);
+type PositionalWithParser<S> = { [K in keyof S as K extends PositionalParserKey ? K : never]: S[K]; } & ArgSchemaPositionalType & (0 extends 1 & S ? Pick<UntypedCombinatorSchema, PositionalParserKey> : unknown);
 /**
  * The positional argument schema that {@link positional} returns for a parser `S`:
  * {@link PositionalWithParser} for each schema of a union. For a parser typed by a type parameter,
@@ -1059,7 +1057,7 @@ type Modified<S, F> = S extends unknown ? WithFlag<S, F> : never;
  * For a type parameter, TypeScript does not take it for `Omit<S, K>`, so {@link hidden} and
  * {@link unrequired}, whose results were typed `Omit<S, K>` with their flag, return that type too.
  */
-type Without<S, K> = { [P in keyof S as P extends K ? never : NamedKey<P>]: S[P] };
+type Without<S, K> = { [P in keyof S as P extends K ? never : NamedKey<P>]: S[P]; };
 /**
  * `K` for a property name, and `never` for the `string`, `number` or `symbol` key of an index
  * signature, such as those of `any`.
@@ -1333,11 +1331,5 @@ declare function merge<T extends Args[]>(...schemas: T): MergeArgs<T>;
  */
 declare function extend<T extends Args, U extends Args>(base: T, overrides: U): Omit<T, keyof U> & U;
 //#endregion
-//#region src/combinators.d.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
-
 //#endregion
 export { type BaseOptions, type BooleanOptions, type Combinator, type CombinatorOptions, type CombinatorSchema, type FloatOptions, type IntegerOptions, type NumberOptions, type StringOptions, args, boolean, choice, combinator, describe, extend, float, hidden, integer, map, merge, multiple, number, positional, required, short, string, unrequired, withDefault };

package/lib/context.d.ts

@@ -1,14 +1,12 @@
-import { i as Args, l as ArgToken, r as ArgValues } from "./resolver-By5dj6NT.js";
-import { _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, g as ExtractArgExplicitlyProvided, h as ExtendContext, i as CommandCallMode, m as DefaultGunshiParams, n as CliOptions, r as Command, s as CommandContextExtension, x as LazyCommand, y as GunshiParams } from "./types-CVwpWSau.js";
-
+import { i as Args, l as ArgToken, r as ArgValues } from "./resolver-BezrTUr7.js";
+import { _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, g as ExtractArgExplicitlyProvided, h as ExtendContext, i as CommandCallMode, m as DefaultGunshiParams, n as CliOptions, r as Command, s as CommandContextExtension, x as LazyCommand, y as GunshiParams } from "./types-lD5uzpd5.js";
 //#region src/context.d.ts
-
 /**
  * Extract extension return types from extensions record
  *
  * @internal
  */
-type ExtractExtensionValues<E extends Record<string, CommandContextExtension>> = { [K in keyof E]: E[K] extends CommandContextExtension<infer T> ? T : never };
+type ExtractExtensionValues<E extends Record<string, CommandContextExtension>> = { [K in keyof E]: E[K] extends CommandContextExtension<infer T> ? T : never; };
 /**
  * Return type of {@link createCommandContext}
  *
@@ -89,21 +87,6 @@ interface CommandContextParams<G extends GunshiParams | {
  * @param param - A {@link CommandContextParams | parameters} to create a command context.
  * @returns A {@link CommandContext | command context}, which is readonly.
  */
-declare function createCommandContext<G extends GunshiParamsConstraint = DefaultGunshiParams, V extends ArgValues<ExtractArgs<G>> = ArgValues<ExtractArgs<G>>, C extends Command<G> | LazyCommand<G> = Command<G>, E extends Record<string, CommandContextExtension> = {}>({
-  args,
-  explicit,
-  values,
-  positionals,
-  rest,
-  argv,
-  tokens,
-  command,
-  extensions,
-  cliOptions,
-  callMode,
-  commandPath,
-  omitted,
-  validationError
-}: CommandContextParams<G, V, C, E>): Promise<CommandContextResult<G, E>>;
+declare function createCommandContext<G extends GunshiParamsConstraint = DefaultGunshiParams, V extends ArgValues<ExtractArgs<G>> = ArgValues<ExtractArgs<G>>, C extends Command<G> | LazyCommand<G> = Command<G>, E extends Record<string, CommandContextExtension> = {}>({ args, explicit, values, positionals, rest, argv, tokens, command, extensions, cliOptions, callMode, commandPath, omitted, validationError }: CommandContextParams<G, V, C, E>): Promise<CommandContextResult<G, E>>;
 //#endregion
 export { CommandContextParams, ExtractExtensionValues, createCommandContext };

package/lib/{core-DARRFBGf.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)
@@ -269,7 +310,7 @@ async function cliCore(argv, entry, options, plugins, usageOnly = false) {
 	* the merge, so the core says which ones are in effect for this command (#745).
 	*/
 	cliOptions.globalOptions = resolveEffectiveGlobalOptions(pluginContext.globalOptions, commandArgs, args);
-	const skipPositional = targetDepth > 0 ? targetDepth - 1 : -1;
+	const skipPositional = resolveSkipPositional(tokens, pluginContext.globalOptions, resolvedCommand, targetDepth);
 	const diagnostic = selection.diagnostic === true;
 	const { explicit, values, positionals, rest, error } = diagnostic ? {
 		explicit: create(),
@@ -690,6 +731,25 @@ function getEntryRoutingCommand(entry, options) {
 	return entry;
 }
 function getRoutingPositionals(tokens, globalOptions, command) {
+	/**
+	* NOTE(kazupon): an empty argument is never a command name. `getPositionalTokens()` skips it when it
+	* collects the candidates, and the routing of each candidate must skip it too; otherwise the routing
+	* looks for a sub-command named `''`, and fails with `inconsistent-options` (#781).
+	*/
+	return readPositionals(tokens, globalOptions, command).filter((value) => value !== "");
+}
+/**
+* Read the positional arguments as `resolveArgs()` reads them for a command, empty ones included.
+*
+* The schemas are projected down to the metadata that classifies the tokens, so no code of the user,
+* such as `parse`, runs.
+*
+* @param tokens - Tokenized command-line arguments
+* @param globalOptions - Global option schemas
+* @param command - The command whose arguments classify the tokens
+* @returns The positional arguments, in the order that `skipPositional` of args-tokens counts them
+*/
+function readPositionals(tokens, globalOptions, command) {
 	const effective = resolveCommandArgs(globalOptions, getCommandArgs(command));
 	const routingArgs = create();
 	for (const [name, schema] of Object.entries(effective)) {
@@ -701,15 +761,36 @@ function getRoutingPositionals(tokens, globalOptions, command) {
 			toKebab: schema.toKebab
 		};
 	}
-	/**
-	* NOTE(kazupon): an empty argument is never a command name. `getPositionalTokens()` skips it when it
-	* collects the candidates, and the routing of each candidate must skip it too; otherwise the routing
-	* looks for a sub-command named `''`, and fails with `inconsistent-options` (#781).
-	*/
 	return resolveArgs(routingArgs, tokens, {
 		shortGrouping: true,
 		toKebab: command.toKebab
-	}).positionals.filter((value) => value !== "");
+	}).positionals;
+}
+/**
+* Resolve `skipPositional` of args-tokens: the index of the last positional argument to skip.
+*
+* NOTE(kazupon): the command names are the first positional arguments that are not empty, and the
+* last one is at `depth - 1` only when no empty argument comes before it. `skipPositional` counts every
+* positional argument, the empty ones too, so `app '' build x` gave `build` to the first positional
+* argument of `build` (#793). The index is found in the reading of `resolveArgs()`, in which the values
+* of the options are already taken out, so that an empty value of an option is not counted.
+*
+* @param tokens - Tokenized command-line arguments
+* @param globalOptions - Global option schemas
+* @param command - The command whose arguments are resolved
+* @param depth - The number of command names
+* @returns The index of the last command name among the positional arguments, or `-1` for the entry
+*/
+function resolveSkipPositional(tokens, globalOptions, command, depth) {
+	if (depth === 0) return -1;
+	if (!tokens.some((token) => token.kind === "positional" && token.value === "")) return depth - 1;
+	let names = 0;
+	for (const [index, value] of readPositionals(tokens, globalOptions, command).entries()) {
+		if (value === "") continue;
+		names++;
+		if (names === depth) return index;
+	}
+	return depth - 1;
 }
 function sameCommandPath(left, right) {
 	return left.length === right.length && left.every((name, index) => name === right[index]);

package/lib/definition.d.ts

@@ -1,13 +1,7 @@
-import { i as Args, n as ArgSchema, r as ArgValues } from "./resolver-By5dj6NT.js";
-import { C as NormalizeToGunshiParams, _ as ExtractArgs, b as GunshiParamsConstraint, d as CommandLoader, f as CommandRunner, h as ExtendContext, m as DefaultGunshiParams, r as Command, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-CVwpWSau.js";
+import { i as Args, n as ArgSchema, r as ArgValues } from "./resolver-BezrTUr7.js";
+import { C as NormalizeToGunshiParams, _ as ExtractArgs, b as GunshiParamsConstraint, d as CommandLoader, f as CommandRunner, h as ExtendContext, m as DefaultGunshiParams, r as Command, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-lD5uzpd5.js";
 import { CommandContextParams, createCommandContext } from "./context.js";
-
 //#region src/definition.d.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
-
 /**
  * The result type of the {@link define} function
  *

package/lib/{error-BWBKYs9E.d.ts → error-e_--t4mB.d.ts}

@@ -1,11 +1,6 @@
-import { a as ArgsValidationError } from "./resolver-By5dj6NT.js";
-import { m as DefaultGunshiParams, n as CliOptions } from "./types-CVwpWSau.js";
-
+import { a as ArgsValidationError } from "./resolver-BezrTUr7.js";
+import { m as DefaultGunshiParams, n as CliOptions } from "./types-lD5uzpd5.js";
 //#region src/constants.d.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
 declare const ANONYMOUS_COMMAND_NAME = "(anonymous)";
 declare const CLI_OPTIONS_DEFAULT: CliOptions<DefaultGunshiParams>;
 //#endregion

package/lib/generator.d.ts

@@ -1,7 +1,5 @@
-import { b as GunshiParamsConstraint, m as DefaultGunshiParams, n as CliOptions, r as Command, x as LazyCommand } from "./types-CVwpWSau.js";
-
+import { b as GunshiParamsConstraint, m as DefaultGunshiParams, n as CliOptions, r as Command, x as LazyCommand } from "./types-lD5uzpd5.js";
 //#region src/generator.d.ts
-
 /**
  * generate options of `generate` function.
  *

package/lib/generator.js

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

package/lib/index.d.ts

@@ -1,15 +1,9 @@
-import { a as ArgsValidationError, c as resolveArgs, i as Args, l as ArgToken, n as ArgSchema, o as ArgsValidationErrorCode, r as ArgValues, s as ArgsValidationErrorKeys, u as parseArgs } from "./resolver-By5dj6NT.js";
-import { A as Plugin, C as NormalizeToGunshiParams, D as SubCommandable, E as RenderingOptions, F as PluginWithExtension, I as PluginWithoutExtension, L as plugin, M as PluginExtension, N as PluginFunction, O as ValidationErrorsDecorator, P as PluginOptions, R as PluginContext, S as MergeGunshiExtensions, T as RendererDecorator, _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, c as CommandDecorator, d as CommandLoader, f as CommandRunner, g as ExtractArgExplicitlyProvided, h as ExtendContext, i as CommandCallMode, j as PluginDependency, k as OnPluginExtension, l as CommandEnvironment, m as DefaultGunshiParams, n as CliOptions, o as CommandContextCore, p as Commandable, r as Command, s as CommandContextExtension, t as Awaitable, u as CommandExamplesFetcher, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-CVwpWSau.js";
+import { a as ArgsValidationError, c as resolveArgs, i as Args, l as ArgToken, n as ArgSchema, o as ArgsValidationErrorCode, r as ArgValues, s as ArgsValidationErrorKeys, u as parseArgs } from "./resolver-BezrTUr7.js";
+import { A as Plugin, C as NormalizeToGunshiParams, D as SubCommandable, E as RenderingOptions, F as PluginWithExtension, I as PluginWithoutExtension, L as plugin, M as PluginExtension, N as PluginFunction, O as ValidationErrorsDecorator, P as PluginOptions, R as PluginContext, S as MergeGunshiExtensions, T as RendererDecorator, _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, c as CommandDecorator, d as CommandLoader, f as CommandRunner, g as ExtractArgExplicitlyProvided, h as ExtendContext, i as CommandCallMode, j as PluginDependency, k as OnPluginExtension, l as CommandEnvironment, m as DefaultGunshiParams, n as CliOptions, o as CommandContextCore, p as Commandable, r as Command, s as CommandContextExtension, t as Awaitable, u as CommandExamplesFetcher, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-lD5uzpd5.js";
 import { CommandContextParams, createCommandContext } from "./context.js";
 import { define, defineWithTypes, lazy, lazyWithTypes } from "./definition.js";
-import { a as CommandResolutionError, c as CommandResolutionErrorOptions, d as isCommandNotFoundError, f as isCommandResolutionError, i as CommandNotFoundErrorOptions, l as hasPriorityValidationError, n as CommandNotFoundErrorCode, o as CommandResolutionErrorCode, p as ANONYMOUS_COMMAND_NAME, r as CommandNotFoundErrorKeys, s as CommandResolutionErrorKeys, t as CommandNotFoundError, u as isArgsValidationError } from "./error-BWBKYs9E.js";
-
+import { a as CommandResolutionError, c as CommandResolutionErrorOptions, d as isCommandNotFoundError, f as isCommandResolutionError, i as CommandNotFoundErrorOptions, l as hasPriorityValidationError, n as CommandNotFoundErrorCode, o as CommandResolutionErrorCode, p as ANONYMOUS_COMMAND_NAME, r as CommandNotFoundErrorKeys, s as CommandResolutionErrorKeys, t as CommandNotFoundError, u as isArgsValidationError } from "./error-e_--t4mB.js";
 //#region ../plugin-i18n/src/types.d.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
-
 /**
  * Translation adapter factory options.
  */
@@ -179,11 +173,4 @@ declare function cli<G extends GunshiParams = DefaultGunshiParams>(args: string[
  */
 declare function cli(args: string[], entry: SubCommandable, options?: CliOptions): Promise<string | undefined>;
 //#endregion
-//#region src/index.d.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
-
-//#endregion
-export { ANONYMOUS_COMMAND_NAME, ArgSchema, ArgToken, ArgValues, Args, ArgsValidationError, type ArgsValidationErrorCode, ArgsValidationErrorKeys, Awaitable, CliOptions, Command, CommandCallMode, CommandContext, CommandContextCore, CommandContextExtension, type CommandContextParams, CommandDecorator, CommandEnvironment, CommandExamplesFetcher, CommandLoader, CommandNotFoundError, type CommandNotFoundErrorCode, CommandNotFoundErrorKeys, type CommandNotFoundErrorOptions, CommandResolutionError, type CommandResolutionErrorCode, CommandResolutionErrorKeys, type CommandResolutionErrorOptions, CommandRunner, Commandable, DefaultGunshiParams, DefaultTranslation, ExtendContext, ExtractArgExplicitlyProvided, ExtractArgs, ExtractExtensions, GunshiParams, GunshiParamsConstraint, LazyCommand, MergeGunshiExtensions, NormalizeToGunshiParams, type OnPluginExtension, type Plugin, type PluginContext, type PluginDependency, type PluginExtension, type PluginFunction, type PluginOptions, type PluginWithExtension, type PluginWithoutExtension, Prettify, RendererDecorator, RenderingOptions, SubCommandable, ValidationErrorsDecorator, cli, createCommandContext, define, defineWithTypes, hasPriorityValidationError, isArgsValidationError, isCommandNotFoundError, isCommandResolutionError, lazy, lazyWithTypes, parseArgs, plugin, resolveArgs };
+export { ANONYMOUS_COMMAND_NAME, type ArgSchema, type ArgToken, type ArgValues, type Args, ArgsValidationError, type ArgsValidationErrorCode, ArgsValidationErrorKeys, type Awaitable, type CliOptions, type Command, type CommandCallMode, type CommandContext, type CommandContextCore, type CommandContextExtension, type CommandContextParams, type CommandDecorator, type CommandEnvironment, type CommandExamplesFetcher, type CommandLoader, CommandNotFoundError, type CommandNotFoundErrorCode, CommandNotFoundErrorKeys, type CommandNotFoundErrorOptions, CommandResolutionError, type CommandResolutionErrorCode, CommandResolutionErrorKeys, type CommandResolutionErrorOptions, type CommandRunner, type Commandable, type DefaultGunshiParams, DefaultTranslation, type ExtendContext, type ExtractArgExplicitlyProvided, type ExtractArgs, type ExtractExtensions, type GunshiParams, type GunshiParamsConstraint, type LazyCommand, type MergeGunshiExtensions, type NormalizeToGunshiParams, type OnPluginExtension, type Plugin, type PluginContext, type PluginDependency, type PluginExtension, type PluginFunction, type PluginOptions, type PluginWithExtension, type PluginWithoutExtension, type Prettify, type RendererDecorator, type RenderingOptions, type SubCommandable, type ValidationErrorsDecorator, cli, createCommandContext, define, defineWithTypes, hasPriorityValidationError, isArgsValidationError, isCommandNotFoundError, isCommandResolutionError, lazy, lazyWithTypes, parseArgs, plugin, resolveArgs };

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-Cj5m08gX.js";
-import { t as cli } from "./builtin-DpTuEkZb.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/plugin.d.ts

@@ -1,13 +1,5 @@
-import { a as ArgsValidationError, i as Args, l as ArgToken, n as ArgSchema, o as ArgsValidationErrorCode, r as ArgValues, s as ArgsValidationErrorKeys } from "./resolver-By5dj6NT.js";
-import { A as Plugin, C as NormalizeToGunshiParams, F as PluginWithExtension, I as PluginWithoutExtension, L as plugin, M as PluginExtension, N as PluginFunction, O as ValidationErrorsDecorator, P as PluginOptions, R as PluginContext, S as MergeGunshiExtensions, T as RendererDecorator, _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, c as CommandDecorator, f as CommandRunner, h as ExtendContext, j as PluginDependency, k as OnPluginExtension, m as DefaultGunshiParams, o as CommandContextCore, r as Command, s as CommandContextExtension, t as Awaitable, u as CommandExamplesFetcher, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-CVwpWSau.js";
+import { a as ArgsValidationError, i as Args, l as ArgToken, n as ArgSchema, o as ArgsValidationErrorCode, r as ArgValues, s as ArgsValidationErrorKeys } from "./resolver-BezrTUr7.js";
+import { A as Plugin, C as NormalizeToGunshiParams, F as PluginWithExtension, I as PluginWithoutExtension, L as plugin, M as PluginExtension, N as PluginFunction, O as ValidationErrorsDecorator, P as PluginOptions, R as PluginContext, S as MergeGunshiExtensions, T as RendererDecorator, _ as ExtractArgs, a as CommandContext, b as GunshiParamsConstraint, c as CommandDecorator, f as CommandRunner, h as ExtendContext, j as PluginDependency, k as OnPluginExtension, m as DefaultGunshiParams, o as CommandContextCore, r as Command, s as CommandContextExtension, t as Awaitable, u as CommandExamplesFetcher, v as ExtractExtensions, w as Prettify, x as LazyCommand, y as GunshiParams } from "./types-lD5uzpd5.js";
 import { CommandContextParams, createCommandContext } from "./context.js";
-import { a as CommandResolutionError, c as CommandResolutionErrorOptions, d as isCommandNotFoundError, f as isCommandResolutionError, i as CommandNotFoundErrorOptions, l as hasPriorityValidationError, m as CLI_OPTIONS_DEFAULT, n as CommandNotFoundErrorCode, o as CommandResolutionErrorCode, p as ANONYMOUS_COMMAND_NAME, r as CommandNotFoundErrorKeys, s as CommandResolutionErrorKeys, t as CommandNotFoundError, u as isArgsValidationError } from "./error-BWBKYs9E.js";
-
-//#region src/plugin.d.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
-
-//#endregion
+import { a as CommandResolutionError, c as CommandResolutionErrorOptions, d as isCommandNotFoundError, f as isCommandResolutionError, i as CommandNotFoundErrorOptions, l as hasPriorityValidationError, m as CLI_OPTIONS_DEFAULT, n as CommandNotFoundErrorCode, o as CommandResolutionErrorCode, p as ANONYMOUS_COMMAND_NAME, r as CommandNotFoundErrorKeys, s as CommandResolutionErrorKeys, t as CommandNotFoundError, u as isArgsValidationError } from "./error-e_--t4mB.js";
 export { ANONYMOUS_COMMAND_NAME, type ArgSchema, type ArgToken, type ArgValues, type Args, ArgsValidationError, type ArgsValidationErrorCode, ArgsValidationErrorKeys, type Awaitable, CLI_OPTIONS_DEFAULT, type Command, type CommandContext, type CommandContextCore, type CommandContextExtension, type CommandContextParams, type CommandDecorator, type CommandExamplesFetcher, CommandNotFoundError, type CommandNotFoundErrorCode, CommandNotFoundErrorKeys, type CommandNotFoundErrorOptions, CommandResolutionError, type CommandResolutionErrorCode, CommandResolutionErrorKeys, type CommandResolutionErrorOptions, type CommandRunner, type DefaultGunshiParams, type ExtendContext, type ExtractArgs, type ExtractExtensions, type GunshiParams, type GunshiParamsConstraint, type LazyCommand, type MergeGunshiExtensions, type NormalizeToGunshiParams, type OnPluginExtension, type Plugin, type PluginContext, type PluginDependency, type PluginExtension, type PluginFunction, type PluginOptions, type PluginWithExtension, type PluginWithoutExtension, type Prettify, type RendererDecorator, type ValidationErrorsDecorator, createCommandContext, hasPriorityValidationError, isArgsValidationError, isCommandNotFoundError, isCommandResolutionError, plugin };

package/lib/renderer.d.ts

@@ -1,11 +1,5 @@
-import { a as CommandContext, m as DefaultGunshiParams, y as GunshiParams } from "./types-CVwpWSau.js";
-
+import { a as CommandContext, m as DefaultGunshiParams, y as GunshiParams } from "./types-lD5uzpd5.js";
 //#region ../plugin-renderer/src/header.d.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
-
 /**
  * Render the header.
  *
@@ -32,12 +26,5 @@ declare function renderUsage<G extends GunshiParams = DefaultGunshiParams>(ctx:
  * @returns A rendered validation error.
  */
 declare function renderValidationErrors<G extends GunshiParams = DefaultGunshiParams>(ctx: CommandContext<G>, error: AggregateError): Promise<string>;
-//#endregion
-//#region src/renderer.d.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
-
 //#endregion
 export { renderHeader, renderUsage, renderValidationErrors };

package/lib/renderer.js

@@ -1,4 +1,4 @@
-import { i as renderHeader, n as renderValidationErrors, r as renderUsage } from "./src-Cj5m08gX.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/{resolver-By5dj6NT.d.ts → resolver-BezrTUr7.d.ts}

@@ -85,12 +85,6 @@ interface ParserOptions {
  * ```
  */
 declare function parseArgs(args: string[], options?: ParserOptions): ArgToken[];
-/**
- * Check if `arg` is a short option (e.g. `-f`).
- *
- * @param arg - An argument to check
- * @returns Whether `arg` is a short option.
- */
 //#endregion
 //#region ../../node_modules/.pnpm/args-tokens@1.0.0-beta.1/node_modules/args-tokens/lib/resolver.d.ts
 //#region src/resolver.d.ts
@@ -734,7 +728,7 @@ interface Args {
  *
  * @typeParam T - {@link Args | Arguments} which is an object that defines the command line arguments.
  */
-type ArgValues<T> = T extends Args ? ResolveArgValues<T, { [Arg in keyof T]: ExtractOptionValue<T[Arg]> }> : {
+type ArgValues<T> = T extends Args ? ResolveArgValues<T, { [Arg in keyof T]: ExtractOptionValue<T[Arg]>; }> : {
   [option: string]: string | boolean | number | (string | boolean | number)[] | undefined;
 };
 /**
@@ -766,7 +760,7 @@ type ResolveOptionValue<A extends ArgSchema, T> = A['multiple'] extends true ? T
  *
  * @internal
  */
-type ResolveArgValues<A extends Args, V extends Record<keyof A, unknown>> = { -readonly [Arg in keyof A]?: IsPresentArg<A[Arg]> extends true ? unknown : V[Arg] } & { -readonly [Arg in keyof A as IsPresentArg<A[Arg]> extends true ? Arg : never]: V[Arg] } extends (infer P) ? { [K in keyof P]: P[K] } : never;
+type ResolveArgValues<A extends Args, V extends Record<keyof A, unknown>> = { -readonly [Arg in keyof A]?: IsPresentArg<A[Arg]> extends true ? unknown : V[Arg]; } & { -readonly [Arg in keyof A as IsPresentArg<A[Arg]> extends true ? Arg : never]: V[Arg]; } extends (infer P) ? { [K in keyof P]: P[K]; } : never;
 /**
  * Whether an argument with the schema `S` has a value: with a default, with `required: true` or as
  * a required positional argument. For a union of schemas, only when each schema of the union has
@@ -774,16 +768,6 @@ type ResolveArgValues<A extends Args, V extends Record<keyof A, unknown>> = { -r
  * value, as {@link FilterArgs} does.
  */
 type IsPresentArg<S extends ArgSchema> = S extends ArgSchema ? true extends (S['default'] extends {} ? true : S['required'] extends true ? true : false) ? true : IsRequiredPositionalArg<S> : never;
-/**
- * Filters the arguments based on their default values.
- *
- * @typeParam A - {@link Args | Arguments}, which is an object that defines the command line arguments.
- * @typeParam V - Resolvable argument values.
- * @typeParam K - Key of the {@link ArgSchema | argument schema} to filter by.
- *
- * @internal
- */
-
 type IsRequiredPositionalArg<A extends ArgSchema> = A['type'] extends 'positional' ? A['multiple'] extends true ? A['required'] extends true ? true : false : MayBeUnrequired<A> extends true ? A['default'] extends {} ? true : false : true : false;
 /**
  * Whether the `required` of `A` may be `false`. An optional `required` of type `boolean`, as in
@@ -837,7 +821,7 @@ interface ResolveArgs {
  *
  * @typeParam A - {@link Args | Arguments}, which is an object that defines the command line arguments.
  */
-type ArgExplicitlyProvided<A extends Args> = { [K in keyof A]: boolean };
+type ArgExplicitlyProvided<A extends Args> = { [K in keyof A]: boolean; };
 /**
  * Resolve command line arguments.
  *
@@ -870,11 +854,7 @@ type ArgExplicitlyProvided<A extends Args> = { [K in keyof A]: boolean };
  * explicit.host // false (not provided, fallback to default)
  * ```
  */
-declare function resolveArgs<A extends Args>(args: A, tokens: ArgToken[], {
-  shortGrouping,
-  skipPositional,
-  toKebab
-}?: ResolveArgs): {
+declare function resolveArgs<A extends Args>(args: A, tokens: ArgToken[], { shortGrouping, skipPositional, toKebab }?: ResolveArgs): {
   values: ArgValues<A>;
   positionals: string[];
   rest: string[];

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

@@ -44,13 +44,14 @@ var en_US_default = {
 	help: "Display this help message",
 	version: "Display this version",
 	"err:arg:required-option": "Optional argument {$displayName} is required",
-	"err:arg:required-positional": "Positional argument {$name} is required",
+	"err:arg:required-positional": "Positional argument {$displayName} is required",
 	"err:arg:invalid-type": "Invalid value for {$displayName}: expected {$expected}",
 	"err:arg:invalid-choice": "Invalid value for {$displayName}: expected one of {$choices}",
 	"err:arg:custom-parse": "Invalid value for {$displayName}: {$reason}",
 	"err:arg:unknown-option": "Unknown option: {$rawName}",
 	"err:arg:unexpected-value": "Optional argument {$displayName} does not take a value",
 	"err:arg:missing-value": "Optional argument {$displayName} requires a value",
+	"err:arg:missing-value:hint": "(to pass '{$next}' as its value, write '{$suggestion}')",
 	"err:arg:conflict": "{$displayName} conflicts with {$conflictDisplayName}",
 	"err:arg:invalid-default": "Invalid default for {$displayName}: {$actual} is not one of {$choices}",
 	"err:cmd:not-found": "Command not found: {$commandName}",
@@ -333,10 +334,10 @@ function isHiddenArg(schema) {
 	return schema.hidden === true;
 }
 function getVisibleOptionalArgs(args) {
-	return Object.entries(args).filter(([_, schema]) => schema.type !== "positional" && !isHiddenArg(schema));
+	return Object.entries(args).filter(([, schema]) => schema.type !== "positional" && !isHiddenArg(schema));
 }
 function getVisiblePositionalArgs(args) {
-	return Object.entries(args).filter(([_, schema]) => schema.type === "positional" && !isHiddenArg(schema));
+	return Object.entries(args).filter(([, schema]) => schema.type === "positional" && !isHiddenArg(schema));
 }
 /**
 * Render the usage.
@@ -552,7 +553,7 @@ function hasAllDefaultOptions(args) {
 	* NOTE(kazupon): an argument has a default when one is declared, whatever its value. `0`, `''` and
 	* `false` are defaults like any other, and an option that has one is not required (#750).
 	*/
-	return visibleOptionalArgs.length > 0 && visibleOptionalArgs.every(([_, arg]) => arg.default !== void 0);
+	return visibleOptionalArgs.length > 0 && visibleOptionalArgs.every(([, arg]) => arg.default !== void 0);
 }
 /**
 * Generate options symbols for usage
@@ -607,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})`;
 	}
@@ -622,7 +628,7 @@ async function resolveDisplayValue(ctx, key) {
 async function generateOptionalArgsUsage(ctx, optionsPairs) {
 	const optionsPairsEntries = Object.entries(optionsPairs);
 	if (optionsPairsEntries.length === 0) return "";
-	const optionsMaxLength = Math.max(...optionsPairsEntries.map(([_, value]) => displayWidth(value)));
+	const optionsMaxLength = Math.max(...optionsPairsEntries.map(([, value]) => displayWidth(value)));
 	const optionSchemaMaxLength = ctx.env.usageOptionType ? Math.max(...optionsPairsEntries.map(([key]) => displayWidth(resolveNegatableType(key, ctx)))) : 0;
 	return (await Promise.all(optionsPairsEntries.map(async ([key, value]) => {
 		let rawDesc = await ctx.extensions[pluginId].text(resolveArgKey(key, ctx.name));
@@ -681,6 +687,7 @@ function isRequiredSinglePositionalArg(arg) {
 * @license MIT
 */
 const i18nPluginId$1 = namespacedId("i18n");
+const missingValueHintKey = "err:arg:missing-value:hint";
 /**
 * Render the validation errors.
 *
@@ -705,10 +712,31 @@ async function renderValidationError(ctx, error) {
 	if (isArgsValidationError(error) && error.code) {
 		const values = await resolveValidationValues(ctx, error);
 		const message = await localize(ctx, error.code, values);
-		if (message && message !== error.code) return message;
+		if (message && message !== error.code) {
+			const hint = await localizeHint(ctx, error, values);
+			return hint ? `${message} ${hint}` : message;
+		}
 	}
 	return error.message;
 }
+/**
+* Localize the hint that args-tokens adds to the message of an error.
+*
+* A translation replaces the whole message, hint included, so the hint is translated by a key of
+* its own and follows the translated error. args-tokens gives one today: for an option given without
+* a value, when the argument after it may be the value, the long form with `=` (`--port=-5` for
+* `--port -5`), in `values.next` and `values.suggestion`.
+*
+* @param ctx - A {@link CommandContext | command context}
+* @param error - An args validation error
+* @param values - The values of the error, as given to its translation
+* @returns The localized hint, or `undefined` when the error has none.
+*/
+async function localizeHint(ctx, error, values) {
+	if (error.code !== ArgsValidationErrorKeys.missingValue || typeof values.next !== "string" || typeof values.suggestion !== "string") return;
+	const hint = await localize(ctx, missingValueHintKey, values);
+	return hint && hint !== missingValueHintKey ? hint : void 0;
+}
 async function resolveValidationValues(ctx, error) {
 	if (error.code !== ArgsValidationErrorKeys.customParse) return error.values;
 	const { reasonKey, reasonValues } = error.values;

package/lib/{types-CVwpWSau.d.ts → types-lD5uzpd5.d.ts}

@@ -1,11 +1,5 @@
-import { i as Args, l as ArgToken, n as ArgSchema, r as ArgValues, t as ArgExplicitlyProvided } from "./resolver-By5dj6NT.js";
-
+import { i as Args, l as ArgToken, n as ArgSchema, r as ArgValues, t as ArgExplicitlyProvided } from "./resolver-BezrTUr7.js";
 //#region src/plugin/context.d.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
-
 /**
  * Gunshi plugin context interface.
  *
@@ -84,12 +78,12 @@ interface PluginContext<G extends GunshiParamsConstraint = DefaultGunshiParams>
 }
 //#endregion
 //#region src/plugin/core.d.ts
-type ProcessDependency<D, A extends ExtendContext> = D extends string ? D extends keyof A ? { [K in D]: A[K] } : {} : D extends {
+type ProcessDependency<D, A extends ExtendContext> = D extends string ? D extends keyof A ? { [K in D]: A[K]; } : {} : D extends {
   id: infer ID;
   optional?: any;
 } ? ID extends string ? ID extends keyof A ? D extends {
   optional: true;
-} ? { [K in ID]: A[K] | undefined } : { [K in ID]: A[K] } : {} : never : never;
+} ? { [K in ID]: A[K] | undefined; } : { [K in ID]: A[K]; } : {} : never : never;
 /**
  * Helper type to infer dependency extensions with optional support
  *
@@ -145,7 +139,7 @@ type PluginExtension<T = Record<string, unknown>, G extends GunshiParams = Defau
  */
 type OnPluginExtension<G extends GunshiParams = DefaultGunshiParams> = (ctx: Readonly<CommandContext<G>>, cmd: Readonly<Command<G>>) => Awaitable<void>;
 type IsStringLiteral<S extends string> = string extends S ? false : true;
-type MergeExtension<Id, ResolvedDepExt extends ExtendContext, PluginExt extends ExtendContext> = Id extends infer I ? I extends string ? IsStringLiteral<I> extends true ? ResolvedDepExt & { [K in I]: PluginExt } : ResolvedDepExt : ResolvedDepExt : ResolvedDepExt;
+type MergeExtension<Id, ResolvedDepExt extends ExtendContext, PluginExt extends ExtendContext> = Id extends (infer I) ? I extends string ? IsStringLiteral<I> extends true ? ResolvedDepExt & { [K in I]: PluginExt; } : ResolvedDepExt : ResolvedDepExt : ResolvedDepExt;
 /**
  * Extensions resolved from the declared plugin dependencies.
  *
@@ -181,15 +175,11 @@ type MergedPluginParams<Id extends string, Deps extends ReadonlyArray<PluginDepe
  *
  * @since v0.27.0
  */
-interface PluginOptions<DepExt extends ExtendContext = DefaultGunshiParams['extensions'],
-// for plugin dependency extensions
-Id extends string = string,
-// for plugin id
-Deps extends ReadonlyArray<PluginDependency | string> = (PluginDependency | string)[],
-// for plugin dependencies
-Ext extends Record<string, unknown> = {},
-// for plugin extension type
-ResolvedDepExt extends GunshiParams = DependencyParams<Deps, DepExt>, PluginExt extends PluginExtension<Ext, ResolvedDepExt> = PluginExtension<Ext, ResolvedDepExt>, MergedExt extends GunshiParams = MergedPluginParams<Id, Deps, DepExt, Awaited<ReturnType<PluginExt>>>> {
+interface PluginOptions<DepExt extends ExtendContext = DefaultGunshiParams['extensions'] // for plugin dependency extensions
+, Id extends string = string // for plugin id
+, Deps extends ReadonlyArray<PluginDependency | string> = (PluginDependency | string)[] // for plugin dependencies
+, Ext extends Record<string, unknown> = {} // for plugin extension type
+, ResolvedDepExt extends GunshiParams = DependencyParams<Deps, DepExt>, PluginExt extends PluginExtension<Ext, ResolvedDepExt> = PluginExtension<Ext, ResolvedDepExt>, MergedExt extends GunshiParams = MergedPluginParams<Id, Deps, DepExt, Awaited<ReturnType<PluginExt>>>> {
   /**
    * Plugin unique identifier.
    *
@@ -292,15 +282,11 @@ interface PluginWithoutExtension<E extends GunshiParams['extensions'] = DefaultG
  *
  * @since v0.27.0
  */
-declare function plugin<Context extends ExtendContext = DefaultGunshiParams['extensions'],
-// for plugin dependency extensions
-Id extends string = string,
-// for plugin id
-Deps extends ReadonlyArray<PluginDependency | string> = [],
-// for plugin dependencies
-Extension extends {} = {},
-// for plugin extension type
-ResolvedDepExtensions extends GunshiParams = DependencyParams<Deps, Context>, PluginExt extends PluginExtension<Extension, DefaultGunshiParams> = PluginExtension<Extension, ResolvedDepExtensions>, MergedExtensions extends GunshiParams = MergedPluginParams<Id, Deps, Context, Awaited<ReturnType<PluginExt>>>>(options: {
+declare function plugin<Context extends ExtendContext = DefaultGunshiParams['extensions'] // for plugin dependency extensions
+, Id extends string = string // for plugin id
+, Deps extends ReadonlyArray<PluginDependency | string> = [] // for plugin dependencies
+, Extension extends {} = {} // for plugin extension type
+, ResolvedDepExtensions extends GunshiParams = DependencyParams<Deps, Context>, PluginExt extends PluginExtension<Extension, DefaultGunshiParams> = PluginExtension<Extension, ResolvedDepExtensions>, MergedExtensions extends GunshiParams = MergedPluginParams<Id, Deps, Context, Awaited<ReturnType<PluginExt>>>>(options: {
   id: Id;
   name?: string;
   dependencies?: Deps;
@@ -321,15 +307,11 @@ ResolvedDepExtensions extends GunshiParams = DependencyParams<Deps, Context>, Pl
  *
  * @since v0.27.0
  */
-declare function plugin<Context extends ExtendContext = DefaultGunshiParams['extensions'],
-// for plugin dependency extensions
-Id extends string = string,
-// for plugin id
-Deps extends ReadonlyArray<PluginDependency | string> = [],
-// for plugin dependencies
-Extension extends Record<string, unknown> = {},
-// for plugin extension type
-ResolvedDepExtensions extends GunshiParams = DependencyParams<Deps, Context>, PluginExt extends PluginExtension<Extension, DefaultGunshiParams> = PluginExtension<Extension, ResolvedDepExtensions>, MergedExtensions extends GunshiParams = MergedPluginParams<Id, Deps, Context, Awaited<ReturnType<PluginExt>>>>(options: {
+declare function plugin<Context extends ExtendContext = DefaultGunshiParams['extensions'] // for plugin dependency extensions
+, Id extends string = string // for plugin id
+, Deps extends ReadonlyArray<PluginDependency | string> = [] // for plugin dependencies
+, Extension extends Record<string, unknown> = {} // for plugin extension type
+, ResolvedDepExtensions extends GunshiParams = DependencyParams<Deps, Context>, PluginExt extends PluginExtension<Extension, DefaultGunshiParams> = PluginExtension<Extension, ResolvedDepExtensions>, MergedExtensions extends GunshiParams = MergedPluginParams<Id, Deps, Context, Awaited<ReturnType<PluginExt>>>>(options: {
   id: Id;
   name?: string;
   dependencies?: Deps;
@@ -349,7 +331,7 @@ type Awaitable<T> = T | Promise<T>;
  *
  * @typeParam T - The type to be prettified.
  */
-type Prettify<T> = { [K in keyof T]: T[K] } & {};
+type Prettify<T> = { [K in keyof T]: T[K]; } & {};
 /**
  * Extend command context type. This type is used to extend the command context with additional properties at {@linkcode CommandContext.extensions}.
  *

package/lib/utils.d.ts

@@ -1,12 +1,5 @@
-import { i as Args, n as ArgSchema } from "./resolver-By5dj6NT.js";
-import { b as GunshiParamsConstraint, m as DefaultGunshiParams, p as Commandable, r as Command, x as LazyCommand } from "./types-CVwpWSau.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
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
-
 //#region src/utils.d.ts
 /**
  * Entry point of utils.
@@ -57,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.
  *
@@ -92,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.0",
+  "version": "1.0.0-beta.2",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -108,6 +108,11 @@
     }
   },
   "devDependencies": {
+    "@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",
@@ -115,13 +120,8 @@
     "jsr-exports-lint": "^0.4.2",
     "publint": "^0.3.20",
     "std-env": "^4.1.0",
-    "tsdown": "0.21.0",
-    "zod": "^4.4.3",
-    "@gunshi/plugin-global": "1.0.0-beta.0",
-    "@gunshi/plugin-renderer": "1.0.0-beta.0",
-    "@gunshi/plugin-i18n": "1.0.0-beta.0",
-    "@gunshi/resources": "1.0.0-beta.0",
-    "@gunshi/shared": "1.0.0-beta.0"
+    "tsdown": "0.22.14",
+    "zod": "^4.4.3"
   },
   "scripts": {
     "build": "tsdown",