gunshi 0.35.1 → 0.35.2

package/lib/bone.d.ts

@@ -1,5 +1,5 @@
-import { i as Args, n as ArgSchema, o as ArgToken, r as ArgValues } from "./resolver-mxPNDBm_.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-DZ0S_FSe.js";
+import { i as Args, n as ArgSchema, r as ArgValues, u as ArgToken } from "./resolver-CgkhQ6Tt.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-CD5eRJFK.js";
 
 //#region src/cli/bone.d.ts
 /**

package/lib/bone.js

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

package/lib/{cli-DoX4INTi.js → cli-DnXk5aCq.js}

@@ -1,6 +1,7 @@
-import { t as plugin } from "./core-CFEvRYOJ.js";
-import { a as namespacedId, o as COMMON_ARGS, t as renderer } from "./src-B4uHG_qb.js";
-import { t as cliCore } from "./core-xgWIcbHL.js";
+import { r as hasPriorityValidationError } from "./error-xSnOOdnr.js";
+import { t as plugin } from "./plugin-DhJZVIbl.js";
+import { a as namespacedId, o as COMMON_ARGS, t as renderer } from "./src-DbfZvEe0.js";
+import { t as cliCore } from "./core-CbE1I4Jl.js";
 //#region ../plugin-global/src/types.ts
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)
@@ -24,6 +25,10 @@ const pluginId = namespacedId("global");
 */
 const decorator = (baseRunner) => async (ctx) => {
 	const { values, validationError, extensions: { [pluginId]: { showVersion, showHeader, showUsage, showValidationErrors } } } = ctx;
+	if (hasPriorityValidationError(validationError)) {
+		await showValidationErrors(validationError);
+		throw validationError;
+	}
 	if (values.version) return showVersion();
 	const buf = [];
 	const header = await showHeader();

package/lib/combinators.d.ts

@@ -1,16 +1,8 @@
-import { i as Args, n as ArgSchema } from "./resolver-mxPNDBm_.js";
+import { i as Args, n as ArgSchema } from "./resolver-CgkhQ6Tt.js";
 
-//#region ../../node_modules/.pnpm/args-tokens@0.27.0/node_modules/args-tokens/lib/combinators.d.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
+//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/combinators.d.ts
 
 //#region src/combinators.d.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
 /**
  * A combinator produced by combinator factory functions.
  *

package/lib/combinators.js

@@ -1,8 +1,81 @@
-//#region ../../node_modules/.pnpm/args-tokens@0.27.0/node_modules/args-tokens/lib/combinators.js
+import { t as formatChoices } from "./utils-BKhsrjPW.js";
+import { n as ArgsValidationErrorKeys, t as ArgsValidationError } from "./resolver-UFOtObbe.js";
+//#region ../../node_modules/.pnpm/args-tokens@0.28.0/node_modules/args-tokens/lib/combinators.js
+/**
+* Parser combinator factory functions for composable argument schema construction.
+*
+* @example
+* ```ts
+* import { parseArgs, resolveArgs } from 'args-tokens'
+* import {
+*   args,
+*   string,
+*   integer,
+*   boolean,
+*   positional,
+*   choice,
+*   withDefault,
+*   multiple,
+*   required,
+*   short,
+*   map,
+*   merge,
+*   extend
+* } from 'args-tokens/combinators'
+*
+* // Define reusable schema groups with args()
+* const common = args({
+*   help: short(boolean(), 'h'),
+*   verbose: boolean()
+* })
+*
+* const network = args({
+*   port: short(withDefault(integer({ min: 1, max: 65535 }), 8080), 'p'),
+*   host: required(short(string({ minLength: 1 }), 'o'))
+* })
+*
+* // Compose schemas with merge()
+* const schema = merge(
+*   common,
+*   network,
+*   args({
+*     command: positional()
+*   })
+* )
+*
+* const argv = ['dev', '--port', '9131', '--host', 'example.com', '--verbose']
+* const tokens = parseArgs(argv)
+* const { values } = resolveArgs(schema, tokens)
+* ```
+*
+* @experimental This module is experimental and may change in future versions.
+*
+* @module
+*/
 /**
 * @author kazuya kawaguchi (a.k.a. kazupon)
 * @license MIT
 */
+function createInvalidTypeError(message, expected, actual) {
+	return new ArgsValidationError(message, {
+		code: ArgsValidationErrorKeys.invalidType,
+		values: {
+			expected,
+			actual
+		}
+	});
+}
+function createInvalidChoiceError(message, choices, actual) {
+	return new ArgsValidationError(message, {
+		code: ArgsValidationErrorKeys.invalidChoice,
+		values: {
+			expected: "enum",
+			choices: formatChoices(choices),
+			choiceValues: [...choices],
+			actual
+		}
+	});
+}
 /**
 * Create a string argument schema with optional validation.
 *
@@ -63,7 +136,7 @@ function number(opts) {
 		...opts?.required != null ? { required: opts.required } : {},
 		parse(value) {
 			const n = Number(value);
-			if (value.trim() === "" || isNaN(n)) throw new TypeError(`Expected a number, got '${value}'`);
+			if (value.trim() === "" || isNaN(n)) throw createInvalidTypeError(`Expected a number, got '${value}'`, "number", value);
 			if (opts?.min != null && n < opts.min) throw new RangeError(`Number must be >= ${opts.min}, got ${n}`);
 			if (opts?.max != null && n > opts.max) throw new RangeError(`Number must be <= ${opts.max}, got ${n}`);
 			return n;
@@ -97,9 +170,9 @@ function integer(opts) {
 		...opts?.short != null ? { short: opts.short } : {},
 		...opts?.required != null ? { required: opts.required } : {},
 		parse(value) {
-			if (!/^-?\d+$/.test(value)) throw new TypeError(`Expected an integer, got '${value}'`);
+			if (!/^-?\d+$/.test(value)) throw createInvalidTypeError(`Expected an integer, got '${value}'`, "integer", value);
 			const n = Number.parseInt(value, 10);
-			if (isNaN(n)) throw new TypeError(`Expected an integer, got '${value}'`);
+			if (isNaN(n)) throw createInvalidTypeError(`Expected an integer, got '${value}'`, "integer", value);
 			if (opts?.min != null && n < opts.min) throw new RangeError(`Integer must be >= ${opts.min}, got ${n}`);
 			if (opts?.max != null && n > opts.max) throw new RangeError(`Integer must be <= ${opts.max}, got ${n}`);
 			return n;
@@ -134,9 +207,9 @@ function float(opts) {
 		...opts?.required != null ? { required: opts.required } : {},
 		parse(value) {
 			const trimmed = value.trim();
-			if (!/^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i.test(trimmed)) throw new TypeError(`Expected a finite float, got '${value}'`);
+			if (!/^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i.test(trimmed)) throw createInvalidTypeError(`Expected a finite float, got '${value}'`, "float", value);
 			const n = Number.parseFloat(trimmed);
-			if (isNaN(n) || !isFinite(n)) throw new TypeError(`Expected a finite float, got '${value}'`);
+			if (isNaN(n) || !isFinite(n)) throw createInvalidTypeError(`Expected a finite float, got '${value}'`, "float", value);
 			if (opts?.min != null && n < opts.min) throw new RangeError(`Float must be >= ${opts.min}, got ${n}`);
 			if (opts?.max != null && n > opts.max) throw new RangeError(`Float must be <= ${opts.max}, got ${n}`);
 			return n;
@@ -229,7 +302,7 @@ function choice(values, opts) {
 		...opts?.short != null ? { short: opts.short } : {},
 		...opts?.required != null ? { required: opts.required } : {},
 		parse(value) {
-			if (!values.includes(value)) throw new Error(`Value must be one of: ${values.join(", ")}`);
+			if (!values.includes(value)) throw createInvalidChoiceError(`Value must be one of: ${values.join(", ")}`, values, value);
 			return value;
 		}
 	};

package/lib/context-CAPhwgJJ.js

@@ -0,0 +1,119 @@
+import { create, deepFreeze, isLazyCommand, log } from "./utils.js";
+//#region src/constants.ts
+/**
+* @author kazuya kawaguchi (a.k.a. kazupon)
+* @license MIT
+*/
+const ANONYMOUS_COMMAND_NAME = "(anonymous)";
+/**
+* A no-operation function.
+*/
+const NOOP = () => {};
+const CLI_OPTIONS_DEFAULT = {
+	name: void 0,
+	description: void 0,
+	version: void 0,
+	cwd: void 0,
+	usageSilent: false,
+	subCommands: void 0,
+	leftMargin: 2,
+	middleMargin: 10,
+	usageOptionType: false,
+	usageOptionValue: true,
+	strict: false,
+	renderHeader: void 0,
+	renderUsage: void 0,
+	renderValidationErrors: void 0,
+	plugins: void 0,
+	fallbackToEntry: false
+};
+//#endregion
+//#region src/context.ts
+/**
+* The entry for gunshi context.
+* This module is exported for the purpose of testing the command.
+*
+* @example
+* ```js
+* import { createCommandContext } from 'gunshi/context'
+* ```
+*
+* @module
+*/
+/**
+* @author kazuya kawaguchi (a.k.a. kazupon)
+* @license MIT
+*/
+/**
+* Create a command context.
+*
+* @param param - A {@link CommandContextParams | parameters} to create a command context.
+* @returns A {@link CommandContext | command context}, which is readonly.
+*/
+async function createCommandContext({ args = {}, explicit = {}, values = {}, positionals = [], rest = [], argv = [], tokens = [], command = {}, extensions = {}, cliOptions = {}, callMode = "entry", commandPath = [], omitted = false, validationError }) {
+	/**
+	* normailize the options schema and values, to avoid prototype pollution
+	*/
+	const _args = Object.entries(args).reduce((acc, [key, value]) => {
+		acc[key] = Object.assign(create(), value);
+		return acc;
+	}, create());
+	/**
+	* setup the environment
+	*/
+	const env = Object.assign(create(), CLI_OPTIONS_DEFAULT, cliOptions);
+	/**
+	* apply Command definition's rendering option with highest priority
+	*/
+	if (command.rendering) {
+		const { header, usage, validationErrors } = command.rendering;
+		if (header !== void 0) env.renderHeader = header;
+		if (usage !== void 0) env.renderUsage = usage;
+		if (validationErrors !== void 0) env.renderValidationErrors = validationErrors;
+	}
+	/**
+	* create the command context
+	*/
+	const core = Object.assign(create(), {
+		name: getCommandName(command),
+		description: command.description,
+		omitted,
+		callMode,
+		commandPath,
+		env,
+		args: _args,
+		explicit,
+		values,
+		positionals,
+		rest,
+		_: argv,
+		tokens,
+		toKebab: command.toKebab,
+		log: cliOptions.usageSilent ? NOOP : log,
+		validationError
+	});
+	/**
+	* extend the command context with extensions
+	*/
+	if (Object.keys(extensions).length > 0) {
+		const ext = create(null);
+		Object.defineProperty(core, "extensions", {
+			value: ext,
+			writable: false,
+			enumerable: true,
+			configurable: true
+		});
+		for (const [key, extension] of Object.entries(extensions)) {
+			ext[key] = await extension.factory(core, command);
+			if (extension.onFactory) await extension.onFactory(core, command);
+		}
+	}
+	return deepFreeze(core, ["extensions"]);
+}
+function getCommandName(cmd) {
+	if (isLazyCommand(cmd)) return cmd.commandName || cmd.name || "(anonymous)";
+	else if (typeof cmd === "object") return cmd.name || "(anonymous)";
+	else return ANONYMOUS_COMMAND_NAME;
+}
+//#endregion
+export { NOOP as i, ANONYMOUS_COMMAND_NAME as n, CLI_OPTIONS_DEFAULT as r, createCommandContext as t };

package/lib/context.d.ts

@@ -1,5 +1,5 @@
-import { i as Args, o as ArgToken, r as ArgValues } from "./resolver-mxPNDBm_.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-DZ0S_FSe.js";
+import { i as Args, r as ArgValues, u as ArgToken } from "./resolver-CgkhQ6Tt.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-CD5eRJFK.js";
 
 //#region src/context.d.ts
 

package/lib/context.js

@@ -1,91 +1,2 @@
-import { n as CLI_OPTIONS_DEFAULT, r as NOOP, t as ANONYMOUS_COMMAND_NAME } from "./constants-CQq1R_68.js";
-import { a as log, i as isLazyCommand, n as deepFreeze, t as create } from "./utils-DNVHO9MQ.js";
-//#region src/context.ts
-/**
-* The entry for gunshi context.
-* This module is exported for the purpose of testing the command.
-*
-* @example
-* ```js
-* import { createCommandContext } from 'gunshi/context'
-* ```
-*
-* @module
-*/
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
-/**
-* Create a command context.
-*
-* @param param - A {@link CommandContextParams | parameters} to create a command context.
-* @returns A {@link CommandContext | command context}, which is readonly.
-*/
-async function createCommandContext({ args = {}, explicit = {}, values = {}, positionals = [], rest = [], argv = [], tokens = [], command = {}, extensions = {}, cliOptions = {}, callMode = "entry", commandPath = [], omitted = false, validationError }) {
-	/**
-	* normailize the options schema and values, to avoid prototype pollution
-	*/
-	const _args = Object.entries(args).reduce((acc, [key, value]) => {
-		acc[key] = Object.assign(create(), value);
-		return acc;
-	}, create());
-	/**
-	* setup the environment
-	*/
-	const env = Object.assign(create(), CLI_OPTIONS_DEFAULT, cliOptions);
-	/**
-	* apply Command definition's rendering option with highest priority
-	*/
-	if (command.rendering) {
-		const { header, usage, validationErrors } = command.rendering;
-		if (header !== void 0) env.renderHeader = header;
-		if (usage !== void 0) env.renderUsage = usage;
-		if (validationErrors !== void 0) env.renderValidationErrors = validationErrors;
-	}
-	/**
-	* create the command context
-	*/
-	const core = Object.assign(create(), {
-		name: getCommandName(command),
-		description: command.description,
-		omitted,
-		callMode,
-		commandPath,
-		env,
-		args: _args,
-		explicit,
-		values,
-		positionals,
-		rest,
-		_: argv,
-		tokens,
-		toKebab: command.toKebab,
-		log: cliOptions.usageSilent ? NOOP : log,
-		validationError
-	});
-	/**
-	* extend the command context with extensions
-	*/
-	if (Object.keys(extensions).length > 0) {
-		const ext = create(null);
-		Object.defineProperty(core, "extensions", {
-			value: ext,
-			writable: false,
-			enumerable: true,
-			configurable: true
-		});
-		for (const [key, extension] of Object.entries(extensions)) {
-			ext[key] = await extension.factory(core, command);
-			if (extension.onFactory) await extension.onFactory(core, command);
-		}
-	}
-	return deepFreeze(core, ["extensions"]);
-}
-function getCommandName(cmd) {
-	if (isLazyCommand(cmd)) return cmd.commandName || cmd.name || "(anonymous)";
-	else if (typeof cmd === "object") return cmd.name || "(anonymous)";
-	else return ANONYMOUS_COMMAND_NAME;
-}
-//#endregion
+import { t as createCommandContext } from "./context-CAPhwgJJ.js";
 export { createCommandContext };