@optique/core 1.0.0-dev.692 → 1.0.0-dev.701

package/README.md

@@ -47,8 +47,8 @@ const parser = object({
 });
 
 const config = runParser(parser, "myapp", process.argv.slice(2), {
-  help: "both",
-  onError: process.exit,
+  help: { command: true, option: true },
+  onError: (exitCode) => process.exit(exitCode),
 });
 
 console.log(`Hello ${config.name}!`);

package/dist/valueparser.cjs

@@ -20,31 +20,68 @@ function choice(choices, options = {}) {
 	if (isNumberChoice) {
 		const numberChoices = choices;
 		const numberOptions = options;
+		const hasNaN = numberChoices.some((v) => Number.isNaN(v));
+		const validNumberChoices = hasNaN ? numberChoices.filter((v) => !Number.isNaN(v)) : numberChoices;
+		const numberStrings = numberChoices.map((v) => Object.is(v, -0) ? "-0" : String(v));
 		return {
 			$mode: "sync",
 			metavar,
-			choices,
+			choices: hasNaN ? validNumberChoices : numberChoices,
 			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 {
+				const index = numberStrings.indexOf(input);
+				if (index >= 0 && !Number.isNaN(numberChoices[index])) return {
 					success: true,
 					value: numberChoices[index]
 				};
+				if (/^[+-]?(\d+\.?\d*|\.\d+)$/.test(input)) {
+					const parsed = Number(input);
+					if (Number.isFinite(parsed)) {
+						const canonical = Object.is(parsed, -0) ? "-0" : String(parsed);
+						const normalizedInput = normalizeDecimal(input);
+						const normalizedCanonical = normalizeDecimal(expandScientific(canonical));
+						if (normalizedInput === normalizedCanonical) {
+							const fallbackIndex = numberChoices.findIndex((v) => Object.is(v, parsed));
+							if (fallbackIndex >= 0) return {
+								success: true,
+								value: numberChoices[fallbackIndex]
+							};
+						}
+						if (parsed === 0 && normalizedInput.replace(/^-/, "") === "0" && !numberChoices.some((v) => Object.is(v, -0))) {
+							const zeroIndex = numberChoices.indexOf(0);
+							if (zeroIndex >= 0) return {
+								success: true,
+								value: numberChoices[zeroIndex]
+							};
+						}
+					}
+				}
+				if (/^[+-]?(\d+\.?\d*|\.\d+)[eE][+-]?\d+$/.test(input)) {
+					const parsed = Number(input);
+					if (Number.isFinite(parsed)) {
+						const canonical = Object.is(parsed, -0) ? "-0" : String(parsed);
+						if (/[eE]/.test(canonical)) {
+							const normalizedInput = normalizeDecimal(expandScientific(input));
+							const normalizedCanonical = normalizeDecimal(expandScientific(canonical));
+							if (normalizedInput === normalizedCanonical) {
+								const fallbackIndex = numberChoices.findIndex((v) => Object.is(v, parsed));
+								if (fallbackIndex >= 0) return {
+									success: true,
+									value: numberChoices[fallbackIndex]
+								};
+							}
+						}
+					}
+				}
+				return {
+					success: false,
+					error: formatNumberChoiceError(input, validNumberChoices, numberChoices, numberOptions)
+				};
 			},
 			format(value) {
-				return String(value);
+				return Object.is(value, -0) ? "-0" : String(value);
 			},
 			suggest(prefix) {
-				return numberChoices.map((value) => String(value)).filter((valueStr) => valueStr.startsWith(prefix)).map((valueStr) => ({
+				return numberStrings.filter((valueStr, i) => !Number.isNaN(numberChoices[i]) && valueStr.startsWith(prefix)).map((valueStr) => ({
 					kind: "literal",
 					text: valueStr
 				}));
@@ -86,6 +123,54 @@ function choice(choices, options = {}) {
 	};
 }
 /**
+* Expands a numeric string in scientific notation (e.g., `"1e+21"`,
+* `"1.5e-3"`, `".1e-6"`) into plain decimal form for normalization.
+* Used for both canonical `String(number)` output and user input.
+* Returns the input unchanged if it does not contain scientific notation.
+*/
+function expandScientific(s) {
+	const match = /^([+-]?)(\d+\.?\d*|\.\d+)[eE]([+-]?\d+)$/.exec(s);
+	if (!match) return s;
+	const [, rawSign, mantissa, expStr] = match;
+	const sign = rawSign === "-" ? "-" : "";
+	const exp = parseInt(expStr, 10);
+	const dotPos = mantissa.indexOf(".");
+	const digits = mantissa.replace(".", "");
+	const intLen = dotPos >= 0 ? dotPos : digits.length;
+	const newIntLen = intLen + exp;
+	let result;
+	if (newIntLen >= digits.length) result = digits + "0".repeat(newIntLen - digits.length);
+	else if (newIntLen <= 0) result = "0." + "0".repeat(-newIntLen) + digits;
+	else result = digits.slice(0, newIntLen) + "." + digits.slice(newIntLen);
+	return sign + result;
+}
+/**
+* Normalizes a plain decimal string by stripping leading zeros from the
+* integer part and trailing zeros from the fractional part, so that two
+* strings representing the same mathematical value compare as equal.
+*/
+function normalizeDecimal(s) {
+	let sign = "";
+	let str = s;
+	if (str.startsWith("-") || str.startsWith("+")) {
+		if (str[0] === "-") sign = "-";
+		str = str.slice(1);
+	}
+	const dot = str.indexOf(".");
+	let int;
+	let frac;
+	if (dot >= 0) {
+		int = str.slice(0, dot);
+		frac = str.slice(dot + 1);
+	} else {
+		int = str;
+		frac = "";
+	}
+	int = int.replace(/^0+/, "") || "0";
+	frac = frac.replace(/0+$/, "");
+	return sign + (frac ? int + "." + frac : int);
+}
+/**
 * Formats error message for string choice parser.
 */
 function formatStringChoiceError(input, choices, options) {
@@ -95,15 +180,16 @@ function formatStringChoiceError(input, choices, options) {
 /**
 * 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);
+function formatNumberChoiceError(input, validChoices, allChoices, options) {
+	if (options.errors?.invalidChoice) return typeof options.errors.invalidChoice === "function" ? options.errors.invalidChoice(input, validChoices) : options.errors.invalidChoice;
+	return formatDefaultChoiceError(input, allChoices);
 }
 /**
 * Formats default error message for choice parser.
 */
 function formatDefaultChoiceError(input, choices) {
-	const choiceStrings = choices.map((c) => String(c));
+	const choiceStrings = choices.filter((c) => typeof c === "string" || !Number.isNaN(c)).map((c) => Object.is(c, -0) ? "-0" : String(c));
+	if (choiceStrings.length === 0 && choices.length > 0) return require_message.message`No valid choices are configured, but got ${input}.`;
 	return require_message.message`Expected one of ${require_message.valueSet(choiceStrings, { locale: "en-US" })}, but got ${input}.`;
 }
 /**

package/dist/valueparser.js

@@ -20,31 +20,68 @@ function choice(choices, options = {}) {
 	if (isNumberChoice) {
 		const numberChoices = choices;
 		const numberOptions = options;
+		const hasNaN = numberChoices.some((v) => Number.isNaN(v));
+		const validNumberChoices = hasNaN ? numberChoices.filter((v) => !Number.isNaN(v)) : numberChoices;
+		const numberStrings = numberChoices.map((v) => Object.is(v, -0) ? "-0" : String(v));
 		return {
 			$mode: "sync",
 			metavar,
-			choices,
+			choices: hasNaN ? validNumberChoices : numberChoices,
 			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 {
+				const index = numberStrings.indexOf(input);
+				if (index >= 0 && !Number.isNaN(numberChoices[index])) return {
 					success: true,
 					value: numberChoices[index]
 				};
+				if (/^[+-]?(\d+\.?\d*|\.\d+)$/.test(input)) {
+					const parsed = Number(input);
+					if (Number.isFinite(parsed)) {
+						const canonical = Object.is(parsed, -0) ? "-0" : String(parsed);
+						const normalizedInput = normalizeDecimal(input);
+						const normalizedCanonical = normalizeDecimal(expandScientific(canonical));
+						if (normalizedInput === normalizedCanonical) {
+							const fallbackIndex = numberChoices.findIndex((v) => Object.is(v, parsed));
+							if (fallbackIndex >= 0) return {
+								success: true,
+								value: numberChoices[fallbackIndex]
+							};
+						}
+						if (parsed === 0 && normalizedInput.replace(/^-/, "") === "0" && !numberChoices.some((v) => Object.is(v, -0))) {
+							const zeroIndex = numberChoices.indexOf(0);
+							if (zeroIndex >= 0) return {
+								success: true,
+								value: numberChoices[zeroIndex]
+							};
+						}
+					}
+				}
+				if (/^[+-]?(\d+\.?\d*|\.\d+)[eE][+-]?\d+$/.test(input)) {
+					const parsed = Number(input);
+					if (Number.isFinite(parsed)) {
+						const canonical = Object.is(parsed, -0) ? "-0" : String(parsed);
+						if (/[eE]/.test(canonical)) {
+							const normalizedInput = normalizeDecimal(expandScientific(input));
+							const normalizedCanonical = normalizeDecimal(expandScientific(canonical));
+							if (normalizedInput === normalizedCanonical) {
+								const fallbackIndex = numberChoices.findIndex((v) => Object.is(v, parsed));
+								if (fallbackIndex >= 0) return {
+									success: true,
+									value: numberChoices[fallbackIndex]
+								};
+							}
+						}
+					}
+				}
+				return {
+					success: false,
+					error: formatNumberChoiceError(input, validNumberChoices, numberChoices, numberOptions)
+				};
 			},
 			format(value) {
-				return String(value);
+				return Object.is(value, -0) ? "-0" : String(value);
 			},
 			suggest(prefix) {
-				return numberChoices.map((value) => String(value)).filter((valueStr) => valueStr.startsWith(prefix)).map((valueStr) => ({
+				return numberStrings.filter((valueStr, i) => !Number.isNaN(numberChoices[i]) && valueStr.startsWith(prefix)).map((valueStr) => ({
 					kind: "literal",
 					text: valueStr
 				}));
@@ -86,6 +123,54 @@ function choice(choices, options = {}) {
 	};
 }
 /**
+* Expands a numeric string in scientific notation (e.g., `"1e+21"`,
+* `"1.5e-3"`, `".1e-6"`) into plain decimal form for normalization.
+* Used for both canonical `String(number)` output and user input.
+* Returns the input unchanged if it does not contain scientific notation.
+*/
+function expandScientific(s) {
+	const match = /^([+-]?)(\d+\.?\d*|\.\d+)[eE]([+-]?\d+)$/.exec(s);
+	if (!match) return s;
+	const [, rawSign, mantissa, expStr] = match;
+	const sign = rawSign === "-" ? "-" : "";
+	const exp = parseInt(expStr, 10);
+	const dotPos = mantissa.indexOf(".");
+	const digits = mantissa.replace(".", "");
+	const intLen = dotPos >= 0 ? dotPos : digits.length;
+	const newIntLen = intLen + exp;
+	let result;
+	if (newIntLen >= digits.length) result = digits + "0".repeat(newIntLen - digits.length);
+	else if (newIntLen <= 0) result = "0." + "0".repeat(-newIntLen) + digits;
+	else result = digits.slice(0, newIntLen) + "." + digits.slice(newIntLen);
+	return sign + result;
+}
+/**
+* Normalizes a plain decimal string by stripping leading zeros from the
+* integer part and trailing zeros from the fractional part, so that two
+* strings representing the same mathematical value compare as equal.
+*/
+function normalizeDecimal(s) {
+	let sign = "";
+	let str = s;
+	if (str.startsWith("-") || str.startsWith("+")) {
+		if (str[0] === "-") sign = "-";
+		str = str.slice(1);
+	}
+	const dot = str.indexOf(".");
+	let int;
+	let frac;
+	if (dot >= 0) {
+		int = str.slice(0, dot);
+		frac = str.slice(dot + 1);
+	} else {
+		int = str;
+		frac = "";
+	}
+	int = int.replace(/^0+/, "") || "0";
+	frac = frac.replace(/0+$/, "");
+	return sign + (frac ? int + "." + frac : int);
+}
+/**
 * Formats error message for string choice parser.
 */
 function formatStringChoiceError(input, choices, options) {
@@ -95,15 +180,16 @@ function formatStringChoiceError(input, choices, options) {
 /**
 * 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);
+function formatNumberChoiceError(input, validChoices, allChoices, options) {
+	if (options.errors?.invalidChoice) return typeof options.errors.invalidChoice === "function" ? options.errors.invalidChoice(input, validChoices) : options.errors.invalidChoice;
+	return formatDefaultChoiceError(input, allChoices);
 }
 /**
 * Formats default error message for choice parser.
 */
 function formatDefaultChoiceError(input, choices) {
-	const choiceStrings = choices.map((c) => String(c));
+	const choiceStrings = choices.filter((c) => typeof c === "string" || !Number.isNaN(c)).map((c) => Object.is(c, -0) ? "-0" : String(c));
+	if (choiceStrings.length === 0 && choices.length > 0) return message`No valid choices are configured, but got ${input}.`;
 	return message`Expected one of ${valueSet(choiceStrings, { locale: "en-US" })}, but got ${input}.`;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.692+2b267f09",
+  "version": "1.0.0-dev.701+138e5e73",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",