@optique/core 0.7.0-dev.130 → 0.7.0-dev.131

package/dist/primitives.cjs

@@ -106,7 +106,7 @@ function option(...args) {
 				if (context.state.success && (valueParser != null || context.state.value)) return {
 					success: false,
 					consumed: 1,
-					error: options.errors?.duplicate ? typeof options.errors.duplicate === "function" ? options.errors.duplicate(context.buffer[0]) : options.errors.duplicate : require_message.message`${context.buffer[0]} cannot be used multiple times.`
+					error: options.errors?.duplicate ? typeof options.errors.duplicate === "function" ? options.errors.duplicate(context.buffer[0]) : options.errors.duplicate : require_message.message`${require_message.optionName(context.buffer[0])} cannot be used multiple times.`
 				};
 				if (valueParser == null) return {
 					success: true,

package/dist/primitives.js

@@ -106,7 +106,7 @@ function option(...args) {
 				if (context.state.success && (valueParser != null || context.state.value)) return {
 					success: false,
 					consumed: 1,
-					error: options.errors?.duplicate ? typeof options.errors.duplicate === "function" ? options.errors.duplicate(context.buffer[0]) : options.errors.duplicate : message`${context.buffer[0]} cannot be used multiple times.`
+					error: options.errors?.duplicate ? typeof options.errors.duplicate === "function" ? options.errors.duplicate(context.buffer[0]) : options.errors.duplicate : message`${optionName(context.buffer[0])} cannot be used multiple times.`
 				};
 				if (valueParser == null) return {
 					success: true,

package/dist/valueparser.cjs

@@ -16,25 +16,32 @@ function isValueParser(object) {
 * 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 values An array of valid string values that this parser can accept.
+* @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.
 */
-function choice(values, options = {}) {
-	const normalizedValues = options.caseInsensitive ? values.map((v) => v.toLowerCase()) : values;
+function choice(choices, options = {}) {
+	const normalizedValues = options.caseInsensitive ? choices.map((v) => v.toLowerCase()) : choices;
 	return {
 		metavar: options.metavar ?? "TYPE",
 		parse(input) {
 			const normalizedInput = options.caseInsensitive ? input.toLowerCase() : input;
 			const index = normalizedValues.indexOf(normalizedInput);
-			if (index < 0) return {
-				success: false,
-				error: options.errors?.invalidChoice ? typeof options.errors.invalidChoice === "function" ? options.errors.invalidChoice(input, values) : options.errors.invalidChoice : require_message.message`Expected one of ${values.join(", ")}, but got ${input}.`
-			};
+			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}.`
+				};
+			}
 			return {
 				success: true,
-				value: values[index]
+				value: choices[index]
 			};
 		},
 		format(value) {
@@ -42,7 +49,7 @@ function choice(values, options = {}) {
 		},
 		suggest(prefix) {
 			const normalizedPrefix = options.caseInsensitive ? prefix.toLowerCase() : prefix;
-			return values.filter((value) => {
+			return choices.filter((value) => {
 				const normalizedValue = options.caseInsensitive ? value.toLowerCase() : value;
 				return normalizedValue.startsWith(normalizedPrefix);
 			}).map((value) => ({

package/dist/valueparser.d.cts

@@ -138,12 +138,12 @@ declare function isValueParser<T>(object: unknown): object is ValueParser<T>;
  * 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 values An array of valid string values that this parser can accept.
+ * @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.
  */
-declare function choice<const T extends string>(values: readonly T[], options?: ChoiceOptions): ValueParser<T>;
+declare function choice<const T extends string>(choices: readonly T[], options?: ChoiceOptions): ValueParser<T>;
 /**
  * Creates a {@link ValueParser} for strings.
  *

package/dist/valueparser.d.ts

@@ -138,12 +138,12 @@ declare function isValueParser<T>(object: unknown): object is ValueParser<T>;
  * 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 values An array of valid string values that this parser can accept.
+ * @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.
  */
-declare function choice<const T extends string>(values: readonly T[], options?: ChoiceOptions): ValueParser<T>;
+declare function choice<const T extends string>(choices: readonly T[], options?: ChoiceOptions): ValueParser<T>;
 /**
  * Creates a {@link ValueParser} for strings.
  *

package/dist/valueparser.js

@@ -16,25 +16,32 @@ function isValueParser(object) {
 * 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 values An array of valid string values that this parser can accept.
+* @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.
 */
-function choice(values, options = {}) {
-	const normalizedValues = options.caseInsensitive ? values.map((v) => v.toLowerCase()) : values;
+function choice(choices, options = {}) {
+	const normalizedValues = options.caseInsensitive ? choices.map((v) => v.toLowerCase()) : choices;
 	return {
 		metavar: options.metavar ?? "TYPE",
 		parse(input) {
 			const normalizedInput = options.caseInsensitive ? input.toLowerCase() : input;
 			const index = normalizedValues.indexOf(normalizedInput);
-			if (index < 0) return {
-				success: false,
-				error: options.errors?.invalidChoice ? typeof options.errors.invalidChoice === "function" ? options.errors.invalidChoice(input, values) : options.errors.invalidChoice : message`Expected one of ${values.join(", ")}, but got ${input}.`
-			};
+			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}.`
+				};
+			}
 			return {
 				success: true,
-				value: values[index]
+				value: choices[index]
 			};
 		},
 		format(value) {
@@ -42,7 +49,7 @@ function choice(values, options = {}) {
 		},
 		suggest(prefix) {
 			const normalizedPrefix = options.caseInsensitive ? prefix.toLowerCase() : prefix;
-			return values.filter((value) => {
+			return choices.filter((value) => {
 				const normalizedValue = options.caseInsensitive ? value.toLowerCase() : value;
 				return normalizedValue.startsWith(normalizedPrefix);
 			}).map((value) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "0.7.0-dev.130+750c5ca1",
+  "version": "0.7.0-dev.131+dbb565c5",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",