@optique/core 0.9.0-dev.186 → 0.9.0-dev.187

package/dist/index.d.cts

@@ -2,11 +2,11 @@ import { NonEmptyString, ensureNonEmptyString, isNonEmptyString } from "./nonemp
 import { Message, MessageFormatOptions, MessageTerm, commandLine, envVar, formatMessage, message, metavar, optionName, optionNames, text, value, values } from "./message.cjs";
 import { OptionName, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, extractArgumentMetavars, extractCommandNames, extractOptionNames, formatUsage, formatUsageTerm, normalizeUsage } from "./usage.cjs";
 import { DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, ShowDefaultOptions, formatDocPage } from "./doc.cjs";
-import { ChoiceOptions, FloatOptions, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, choice, float, integer, isValueParser, locale, string, url, uuid } from "./valueparser.cjs";
+import { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, FloatOptions, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, choice, float, integer, isValueParser, locale, string, url, uuid } from "./valueparser.cjs";
 import { MultipleErrorOptions, MultipleOptions, WithDefaultError, WithDefaultOptions, map, multiple, optional, withDefault } from "./modifiers.cjs";
 import { ArgumentErrorOptions, ArgumentOptions, CommandErrorOptions, CommandOptions, FlagErrorOptions, FlagOptions, OptionErrorOptions, OptionOptions, PassThroughFormat, PassThroughOptions, argument, command, constant, flag, option, passThrough } from "./primitives.cjs";
 import { DocState, InferValue, Parser, ParserContext, ParserResult, Result, Suggestion, getDocPage, parse, suggest } from "./parser.cjs";
 import { ConditionalErrorOptions, ConditionalOptions, DuplicateOptionError, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, NoMatchContext, ObjectErrorOptions, ObjectOptions, OrErrorOptions, OrOptions, TupleOptions, concat, conditional, group, longestMatch, merge, object, or, tuple } from "./constructs.cjs";
 import { ShellCompletion, bash, fish, nu, pwsh, zsh } from "./completion.cjs";
 import { RunError, RunOptions, RunParserError, run, runParser } from "./facade.cjs";
-export { ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, CommandErrorOptions, CommandOptions, ConditionalErrorOptions, ConditionalOptions, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DuplicateOptionError, FlagErrorOptions, FlagOptions, FloatOptions, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, Message, MessageFormatOptions, MessageTerm, MultipleErrorOptions, MultipleOptions, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OrErrorOptions, OrOptions, Parser, ParserContext, ParserResult, PassThroughFormat, PassThroughOptions, Result, RunError, RunOptions, RunParserError, ShellCompletion, ShowDefaultOptions, StringOptions, Suggestion, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, WithDefaultError, WithDefaultOptions, argument, bash, choice, command, commandLine, concat, conditional, constant, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fish, flag, float, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getDocPage, group, integer, isNonEmptyString, isValueParser, locale, longestMatch, map, merge, message, metavar, multiple, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, passThrough, pwsh, run, runParser, string, suggest, text, tuple, url, uuid, value, values, withDefault, zsh };
+export { ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CommandErrorOptions, CommandOptions, ConditionalErrorOptions, ConditionalOptions, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DuplicateOptionError, FlagErrorOptions, FlagOptions, FloatOptions, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, Message, MessageFormatOptions, MessageTerm, MultipleErrorOptions, MultipleOptions, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OrErrorOptions, OrOptions, Parser, ParserContext, ParserResult, PassThroughFormat, PassThroughOptions, Result, RunError, RunOptions, RunParserError, ShellCompletion, ShowDefaultOptions, StringOptions, Suggestion, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, WithDefaultError, WithDefaultOptions, argument, bash, choice, command, commandLine, concat, conditional, constant, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fish, flag, float, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getDocPage, group, integer, isNonEmptyString, isValueParser, locale, longestMatch, map, merge, message, metavar, multiple, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, passThrough, pwsh, run, runParser, string, suggest, text, tuple, url, uuid, value, values, withDefault, zsh };

package/dist/index.d.ts

@@ -2,11 +2,11 @@ import { NonEmptyString, ensureNonEmptyString, isNonEmptyString } from "./nonemp
 import { Message, MessageFormatOptions, MessageTerm, commandLine, envVar, formatMessage, message, metavar, optionName, optionNames, text, value, values } from "./message.js";
 import { OptionName, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, extractArgumentMetavars, extractCommandNames, extractOptionNames, formatUsage, formatUsageTerm, normalizeUsage } from "./usage.js";
 import { DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, ShowDefaultOptions, formatDocPage } from "./doc.js";
-import { ChoiceOptions, FloatOptions, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, choice, float, integer, isValueParser, locale, string, url, uuid } from "./valueparser.js";
+import { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, FloatOptions, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, choice, float, integer, isValueParser, locale, string, url, uuid } from "./valueparser.js";
 import { MultipleErrorOptions, MultipleOptions, WithDefaultError, WithDefaultOptions, map, multiple, optional, withDefault } from "./modifiers.js";
 import { ArgumentErrorOptions, ArgumentOptions, CommandErrorOptions, CommandOptions, FlagErrorOptions, FlagOptions, OptionErrorOptions, OptionOptions, PassThroughFormat, PassThroughOptions, argument, command, constant, flag, option, passThrough } from "./primitives.js";
 import { DocState, InferValue, Parser, ParserContext, ParserResult, Result, Suggestion, getDocPage, parse, suggest } from "./parser.js";
 import { ConditionalErrorOptions, ConditionalOptions, DuplicateOptionError, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, NoMatchContext, ObjectErrorOptions, ObjectOptions, OrErrorOptions, OrOptions, TupleOptions, concat, conditional, group, longestMatch, merge, object, or, tuple } from "./constructs.js";
 import { ShellCompletion, bash, fish, nu, pwsh, zsh } from "./completion.js";
 import { RunError, RunOptions, RunParserError, run, runParser } from "./facade.js";
-export { ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, CommandErrorOptions, CommandOptions, ConditionalErrorOptions, ConditionalOptions, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DuplicateOptionError, FlagErrorOptions, FlagOptions, FloatOptions, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, Message, MessageFormatOptions, MessageTerm, MultipleErrorOptions, MultipleOptions, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OrErrorOptions, OrOptions, Parser, ParserContext, ParserResult, PassThroughFormat, PassThroughOptions, Result, RunError, RunOptions, RunParserError, ShellCompletion, ShowDefaultOptions, StringOptions, Suggestion, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, WithDefaultError, WithDefaultOptions, argument, bash, choice, command, commandLine, concat, conditional, constant, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fish, flag, float, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getDocPage, group, integer, isNonEmptyString, isValueParser, locale, longestMatch, map, merge, message, metavar, multiple, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, passThrough, pwsh, run, runParser, string, suggest, text, tuple, url, uuid, value, values, withDefault, zsh };
+export { ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CommandErrorOptions, CommandOptions, ConditionalErrorOptions, ConditionalOptions, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DuplicateOptionError, FlagErrorOptions, FlagOptions, FloatOptions, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, Message, MessageFormatOptions, MessageTerm, MultipleErrorOptions, MultipleOptions, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OrErrorOptions, OrOptions, Parser, ParserContext, ParserResult, PassThroughFormat, PassThroughOptions, Result, RunError, RunOptions, RunParserError, ShellCompletion, ShowDefaultOptions, StringOptions, Suggestion, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, WithDefaultError, WithDefaultOptions, argument, bash, choice, command, commandLine, concat, conditional, constant, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fish, flag, float, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getDocPage, group, integer, isNonEmptyString, isValueParser, locale, longestMatch, map, merge, message, metavar, multiple, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, passThrough, pwsh, run, runParser, string, suggest, text, tuple, url, uuid, value, values, withDefault, zsh };

package/dist/valueparser.cjs

@@ -11,49 +11,68 @@ function isValueParser(object) {
 	return typeof object === "object" && object != null && "metavar" in object && typeof object.metavar === "string" && "parse" in object && typeof object.parse === "function" && "format" in object && typeof object.format === "function";
 }
 /**
-* Creates a {@link ValueParser} that accepts one of multiple
-* string values, so-called enumerated values.
-*
-* This parser validates that the input string matches one of
-* the specified values. If the input does not match any of the values,
-* it returns an error message indicating the valid options.
-* @param choices An array of valid string values that this parser can accept.
-* @param options Configuration options for the choice parser.
-* @returns A {@link ValueParser} that checks if the input matches one of the
-*          specified values.
+* Implementation of the choice parser for both string and number types.
 */
 function choice(choices, options = {}) {
 	const metavar = options.metavar ?? "TYPE";
 	require_nonempty.ensureNonEmptyString(metavar);
-	const normalizedValues = options.caseInsensitive ? choices.map((v) => v.toLowerCase()) : choices;
+	const isNumberChoice = choices.length > 0 && typeof choices[0] === "number";
+	if (isNumberChoice) {
+		const numberChoices = choices;
+		const numberOptions = options;
+		return {
+			metavar,
+			parse(input) {
+				const parsed = Number(input);
+				if (Number.isNaN(parsed)) return {
+					success: false,
+					error: formatNumberChoiceError(input, numberChoices, numberOptions)
+				};
+				const index = numberChoices.indexOf(parsed);
+				if (index < 0) return {
+					success: false,
+					error: formatNumberChoiceError(input, numberChoices, numberOptions)
+				};
+				return {
+					success: true,
+					value: numberChoices[index]
+				};
+			},
+			format(value) {
+				return String(value);
+			},
+			suggest(prefix) {
+				return numberChoices.map((value) => String(value)).filter((valueStr) => valueStr.startsWith(prefix)).map((valueStr) => ({
+					kind: "literal",
+					text: valueStr
+				}));
+			}
+		};
+	}
+	const stringChoices = choices;
+	const stringOptions = options;
+	const normalizedValues = stringOptions.caseInsensitive ? stringChoices.map((v) => v.toLowerCase()) : stringChoices;
 	return {
 		metavar,
 		parse(input) {
-			const normalizedInput = options.caseInsensitive ? input.toLowerCase() : input;
+			const normalizedInput = stringOptions.caseInsensitive ? input.toLowerCase() : input;
 			const index = normalizedValues.indexOf(normalizedInput);
-			if (index < 0) {
-				let choicesList = [];
-				for (let i = 0; i < choices.length; i++) {
-					if (i > 0) choicesList = [...choicesList, ...require_message.message`, `];
-					choicesList = [...choicesList, ...require_message.message`${choices[i]}`];
-				}
-				return {
-					success: false,
-					error: options.errors?.invalidChoice ? typeof options.errors.invalidChoice === "function" ? options.errors.invalidChoice(input, choices) : options.errors.invalidChoice : require_message.message`Expected one of ${choicesList}, but got ${input}.`
-				};
-			}
+			if (index < 0) return {
+				success: false,
+				error: formatStringChoiceError(input, stringChoices, stringOptions)
+			};
 			return {
 				success: true,
-				value: choices[index]
+				value: stringChoices[index]
 			};
 		},
 		format(value) {
-			return value;
+			return String(value);
 		},
 		suggest(prefix) {
-			const normalizedPrefix = options.caseInsensitive ? prefix.toLowerCase() : prefix;
-			return choices.filter((value) => {
-				const normalizedValue = options.caseInsensitive ? value.toLowerCase() : value;
+			const normalizedPrefix = stringOptions.caseInsensitive ? prefix.toLowerCase() : prefix;
+			return stringChoices.filter((value) => {
+				const normalizedValue = stringOptions.caseInsensitive ? value.toLowerCase() : value;
 				return normalizedValue.startsWith(normalizedPrefix);
 			}).map((value) => ({
 				kind: "literal",
@@ -63,6 +82,31 @@ function choice(choices, options = {}) {
 	};
 }
 /**
+* Formats error message for string choice parser.
+*/
+function formatStringChoiceError(input, choices, options) {
+	if (options.errors?.invalidChoice) return typeof options.errors.invalidChoice === "function" ? options.errors.invalidChoice(input, choices) : options.errors.invalidChoice;
+	return formatDefaultChoiceError(input, choices);
+}
+/**
+* Formats error message for number choice parser.
+*/
+function formatNumberChoiceError(input, choices, options) {
+	if (options.errors?.invalidChoice) return typeof options.errors.invalidChoice === "function" ? options.errors.invalidChoice(input, choices) : options.errors.invalidChoice;
+	return formatDefaultChoiceError(input, choices);
+}
+/**
+* Formats default error message for choice parser.
+*/
+function formatDefaultChoiceError(input, choices) {
+	let choicesList = [];
+	for (let i = 0; i < choices.length; i++) {
+		if (i > 0) choicesList = [...choicesList, ...require_message.message`, `];
+		choicesList = [...choicesList, ...require_message.message`${String(choices[i])}`];
+	}
+	return require_message.message`Expected one of ${choicesList}, but got ${input}.`;
+}
+/**
 * Creates a {@link ValueParser} for strings.
 *
 * This parser validates that the input is a string and optionally checks

package/dist/valueparser.d.cts

@@ -103,9 +103,10 @@ interface StringOptions {
   };
 }
 /**
- * Options for creating a {@link choice} parser.
+ * Base options for creating a {@link choice} parser.
+ * @since 0.9.0
  */
-interface ChoiceOptions {
+interface ChoiceOptionsBase {
   /**
    * The metavariable name for this parser.  This is used in help messages to
    * indicate what kind of value this parser expects.  Usually a single
@@ -113,6 +114,12 @@ interface ChoiceOptions {
    * @default `"TYPE"`
    */
   readonly metavar?: NonEmptyString;
+}
+/**
+ * Options for creating a {@link choice} parser with string values.
+ * @since 0.9.0
+ */
+interface ChoiceOptionsString extends ChoiceOptionsBase {
   /**
    * If `true`, the parser will perform case-insensitive matching
    * against the enumerated values. This means that input like "value",
@@ -134,6 +141,31 @@ interface ChoiceOptions {
     invalidChoice?: Message | ((input: string, choices: readonly string[]) => Message);
   };
 }
+/**
+ * Options for creating a {@link choice} parser with number values.
+ * Note: `caseInsensitive` is not available for number choices.
+ * @since 0.9.0
+ */
+interface ChoiceOptionsNumber extends ChoiceOptionsBase {
+  /**
+   * Custom error messages for choice parsing failures.
+   * @since 0.9.0
+   */
+  readonly errors?: {
+    /**
+     * Custom error message when input doesn't match any of the valid choices.
+     * Can be a static message or a function that receives the input and valid choices.
+     * @since 0.9.0
+     */
+    invalidChoice?: Message | ((input: string, choices: readonly number[]) => Message);
+  };
+}
+/**
+ * Options for creating a {@link choice} parser.
+ * @deprecated Use {@link ChoiceOptionsString} for string choices or
+ *             {@link ChoiceOptionsNumber} for number choices.
+ */
+type ChoiceOptions = ChoiceOptionsString;
 /**
  * A predicate function that checks if an object is a {@link ValueParser}.
  * @param object The object to check.
@@ -152,7 +184,21 @@ declare function isValueParser<T>(object: unknown): object is ValueParser<T>;
  * @returns A {@link ValueParser} that checks if the input matches one of the
  *          specified values.
  */
-declare function choice<const T extends string>(choices: readonly T[], options?: ChoiceOptions): ValueParser<T>;
+declare function choice<const T extends string>(choices: readonly T[], options?: ChoiceOptionsString): ValueParser<T>;
+/**
+ * Creates a {@link ValueParser} that accepts one of multiple
+ * number values.
+ *
+ * This parser validates that the input can be parsed as a number and matches
+ * one of the specified values. If the input does not match any of the values,
+ * it returns an error message indicating the valid options.
+ * @param choices An array of valid number values that this parser can accept.
+ * @param options Configuration options for the choice parser.
+ * @returns A {@link ValueParser} that checks if the input matches one of the
+ *          specified values.
+ * @since 0.9.0
+ */
+declare function choice<const T extends number>(choices: readonly T[], options?: ChoiceOptionsNumber): ValueParser<T>;
 /**
  * Creates a {@link ValueParser} for strings.
  *
@@ -497,4 +543,4 @@ interface UuidOptions {
  */
 declare function uuid(options?: UuidOptions): ValueParser<Uuid>;
 //#endregion
-export { ChoiceOptions, FloatOptions, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, type NonEmptyString, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, choice, ensureNonEmptyString, float, integer, isNonEmptyString, isValueParser, locale, string, url, uuid };
+export { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, FloatOptions, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, type NonEmptyString, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, choice, ensureNonEmptyString, float, integer, isNonEmptyString, isValueParser, locale, string, url, uuid };

package/dist/valueparser.d.ts

@@ -103,9 +103,10 @@ interface StringOptions {
   };
 }
 /**
- * Options for creating a {@link choice} parser.
+ * Base options for creating a {@link choice} parser.
+ * @since 0.9.0
  */
-interface ChoiceOptions {
+interface ChoiceOptionsBase {
   /**
    * The metavariable name for this parser.  This is used in help messages to
    * indicate what kind of value this parser expects.  Usually a single
@@ -113,6 +114,12 @@ interface ChoiceOptions {
    * @default `"TYPE"`
    */
   readonly metavar?: NonEmptyString;
+}
+/**
+ * Options for creating a {@link choice} parser with string values.
+ * @since 0.9.0
+ */
+interface ChoiceOptionsString extends ChoiceOptionsBase {
   /**
    * If `true`, the parser will perform case-insensitive matching
    * against the enumerated values. This means that input like "value",
@@ -134,6 +141,31 @@ interface ChoiceOptions {
     invalidChoice?: Message | ((input: string, choices: readonly string[]) => Message);
   };
 }
+/**
+ * Options for creating a {@link choice} parser with number values.
+ * Note: `caseInsensitive` is not available for number choices.
+ * @since 0.9.0
+ */
+interface ChoiceOptionsNumber extends ChoiceOptionsBase {
+  /**
+   * Custom error messages for choice parsing failures.
+   * @since 0.9.0
+   */
+  readonly errors?: {
+    /**
+     * Custom error message when input doesn't match any of the valid choices.
+     * Can be a static message or a function that receives the input and valid choices.
+     * @since 0.9.0
+     */
+    invalidChoice?: Message | ((input: string, choices: readonly number[]) => Message);
+  };
+}
+/**
+ * Options for creating a {@link choice} parser.
+ * @deprecated Use {@link ChoiceOptionsString} for string choices or
+ *             {@link ChoiceOptionsNumber} for number choices.
+ */
+type ChoiceOptions = ChoiceOptionsString;
 /**
  * A predicate function that checks if an object is a {@link ValueParser}.
  * @param object The object to check.
@@ -152,7 +184,21 @@ declare function isValueParser<T>(object: unknown): object is ValueParser<T>;
  * @returns A {@link ValueParser} that checks if the input matches one of the
  *          specified values.
  */
-declare function choice<const T extends string>(choices: readonly T[], options?: ChoiceOptions): ValueParser<T>;
+declare function choice<const T extends string>(choices: readonly T[], options?: ChoiceOptionsString): ValueParser<T>;
+/**
+ * Creates a {@link ValueParser} that accepts one of multiple
+ * number values.
+ *
+ * This parser validates that the input can be parsed as a number and matches
+ * one of the specified values. If the input does not match any of the values,
+ * it returns an error message indicating the valid options.
+ * @param choices An array of valid number values that this parser can accept.
+ * @param options Configuration options for the choice parser.
+ * @returns A {@link ValueParser} that checks if the input matches one of the
+ *          specified values.
+ * @since 0.9.0
+ */
+declare function choice<const T extends number>(choices: readonly T[], options?: ChoiceOptionsNumber): ValueParser<T>;
 /**
  * Creates a {@link ValueParser} for strings.
  *
@@ -497,4 +543,4 @@ interface UuidOptions {
  */
 declare function uuid(options?: UuidOptions): ValueParser<Uuid>;
 //#endregion
-export { ChoiceOptions, FloatOptions, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, type NonEmptyString, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, choice, ensureNonEmptyString, float, integer, isNonEmptyString, isValueParser, locale, string, url, uuid };
+export { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, FloatOptions, IntegerOptionsBigInt, IntegerOptionsNumber, LocaleOptions, type NonEmptyString, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, choice, ensureNonEmptyString, float, integer, isNonEmptyString, isValueParser, locale, string, url, uuid };

package/dist/valueparser.js

@@ -11,49 +11,68 @@ function isValueParser(object) {
 	return typeof object === "object" && object != null && "metavar" in object && typeof object.metavar === "string" && "parse" in object && typeof object.parse === "function" && "format" in object && typeof object.format === "function";
 }
 /**
-* Creates a {@link ValueParser} that accepts one of multiple
-* string values, so-called enumerated values.
-*
-* This parser validates that the input string matches one of
-* the specified values. If the input does not match any of the values,
-* it returns an error message indicating the valid options.
-* @param choices An array of valid string values that this parser can accept.
-* @param options Configuration options for the choice parser.
-* @returns A {@link ValueParser} that checks if the input matches one of the
-*          specified values.
+* Implementation of the choice parser for both string and number types.
 */
 function choice(choices, options = {}) {
 	const metavar = options.metavar ?? "TYPE";
 	ensureNonEmptyString(metavar);
-	const normalizedValues = options.caseInsensitive ? choices.map((v) => v.toLowerCase()) : choices;
+	const isNumberChoice = choices.length > 0 && typeof choices[0] === "number";
+	if (isNumberChoice) {
+		const numberChoices = choices;
+		const numberOptions = options;
+		return {
+			metavar,
+			parse(input) {
+				const parsed = Number(input);
+				if (Number.isNaN(parsed)) return {
+					success: false,
+					error: formatNumberChoiceError(input, numberChoices, numberOptions)
+				};
+				const index = numberChoices.indexOf(parsed);
+				if (index < 0) return {
+					success: false,
+					error: formatNumberChoiceError(input, numberChoices, numberOptions)
+				};
+				return {
+					success: true,
+					value: numberChoices[index]
+				};
+			},
+			format(value) {
+				return String(value);
+			},
+			suggest(prefix) {
+				return numberChoices.map((value) => String(value)).filter((valueStr) => valueStr.startsWith(prefix)).map((valueStr) => ({
+					kind: "literal",
+					text: valueStr
+				}));
+			}
+		};
+	}
+	const stringChoices = choices;
+	const stringOptions = options;
+	const normalizedValues = stringOptions.caseInsensitive ? stringChoices.map((v) => v.toLowerCase()) : stringChoices;
 	return {
 		metavar,
 		parse(input) {
-			const normalizedInput = options.caseInsensitive ? input.toLowerCase() : input;
+			const normalizedInput = stringOptions.caseInsensitive ? input.toLowerCase() : input;
 			const index = normalizedValues.indexOf(normalizedInput);
-			if (index < 0) {
-				let choicesList = [];
-				for (let i = 0; i < choices.length; i++) {
-					if (i > 0) choicesList = [...choicesList, ...message`, `];
-					choicesList = [...choicesList, ...message`${choices[i]}`];
-				}
-				return {
-					success: false,
-					error: options.errors?.invalidChoice ? typeof options.errors.invalidChoice === "function" ? options.errors.invalidChoice(input, choices) : options.errors.invalidChoice : message`Expected one of ${choicesList}, but got ${input}.`
-				};
-			}
+			if (index < 0) return {
+				success: false,
+				error: formatStringChoiceError(input, stringChoices, stringOptions)
+			};
 			return {
 				success: true,
-				value: choices[index]
+				value: stringChoices[index]
 			};
 		},
 		format(value) {
-			return value;
+			return String(value);
 		},
 		suggest(prefix) {
-			const normalizedPrefix = options.caseInsensitive ? prefix.toLowerCase() : prefix;
-			return choices.filter((value) => {
-				const normalizedValue = options.caseInsensitive ? value.toLowerCase() : value;
+			const normalizedPrefix = stringOptions.caseInsensitive ? prefix.toLowerCase() : prefix;
+			return stringChoices.filter((value) => {
+				const normalizedValue = stringOptions.caseInsensitive ? value.toLowerCase() : value;
 				return normalizedValue.startsWith(normalizedPrefix);
 			}).map((value) => ({
 				kind: "literal",
@@ -63,6 +82,31 @@ function choice(choices, options = {}) {
 	};
 }
 /**
+* Formats error message for string choice parser.
+*/
+function formatStringChoiceError(input, choices, options) {
+	if (options.errors?.invalidChoice) return typeof options.errors.invalidChoice === "function" ? options.errors.invalidChoice(input, choices) : options.errors.invalidChoice;
+	return formatDefaultChoiceError(input, choices);
+}
+/**
+* Formats error message for number choice parser.
+*/
+function formatNumberChoiceError(input, choices, options) {
+	if (options.errors?.invalidChoice) return typeof options.errors.invalidChoice === "function" ? options.errors.invalidChoice(input, choices) : options.errors.invalidChoice;
+	return formatDefaultChoiceError(input, choices);
+}
+/**
+* Formats default error message for choice parser.
+*/
+function formatDefaultChoiceError(input, choices) {
+	let choicesList = [];
+	for (let i = 0; i < choices.length; i++) {
+		if (i > 0) choicesList = [...choicesList, ...message`, `];
+		choicesList = [...choicesList, ...message`${String(choices[i])}`];
+	}
+	return message`Expected one of ${choicesList}, but got ${input}.`;
+}
+/**
 * Creates a {@link ValueParser} for strings.
 *
 * This parser validates that the input is a string and optionally checks

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "0.9.0-dev.186+976c1c1f",
+  "version": "0.9.0-dev.187+992128e2",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",