@optique/core 0.5.0-dev.79 → 0.5.0-dev.82

package/dist/valueparser.js

@@ -30,7 +30,7 @@ function choice(values, options = {}) {
 			const index = normalizedValues.indexOf(normalizedInput);
 			if (index < 0) return {
 				success: false,
-				error: message`Expected one of ${values.join(", ")}, but got ${input}.`
+				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}.`
 			};
 			return {
 				success: true,
@@ -57,7 +57,7 @@ function string(options = {}) {
 		parse(input) {
 			if (options.pattern != null && !options.pattern.test(input)) return {
 				success: false,
-				error: message`Expected a string matching pattern ${text(options.pattern.source)}, but got ${input}.`
+				error: options.errors?.patternMismatch ? typeof options.errors.patternMismatch === "function" ? options.errors.patternMismatch(input, options.pattern) : options.errors.patternMismatch : message`Expected a string matching pattern ${text(options.pattern.source)}, but got ${input}.`
 			};
 			return {
 				success: true,
@@ -112,17 +112,17 @@ function integer(options) {
 			} catch (e) {
 				if (e instanceof SyntaxError) return {
 					success: false,
-					error: message`Expected a valid integer, but got ${input}.`
+					error: options.errors?.invalidInteger ? typeof options.errors.invalidInteger === "function" ? options.errors.invalidInteger(input) : options.errors.invalidInteger : message`Expected a valid integer, but got ${input}.`
 				};
 				throw e;
 			}
 			if (options.min != null && value < options.min) return {
 				success: false,
-				error: message`Expected a value greater than or equal to ${text(options.min.toLocaleString("en"))}, but got ${input}.`
+				error: options.errors?.belowMinimum ? typeof options.errors.belowMinimum === "function" ? options.errors.belowMinimum(value, options.min) : options.errors.belowMinimum : message`Expected a value greater than or equal to ${text(options.min.toLocaleString("en"))}, but got ${input}.`
 			};
 			else if (options.max != null && value > options.max) return {
 				success: false,
-				error: message`Expected a value less than or equal to ${text(options.max.toLocaleString("en"))}, but got ${input}.`
+				error: options.errors?.aboveMaximum ? typeof options.errors.aboveMaximum === "function" ? options.errors.aboveMaximum(value, options.max) : options.errors.aboveMaximum : message`Expected a value less than or equal to ${text(options.max.toLocaleString("en"))}, but got ${input}.`
 			};
 			return {
 				success: true,
@@ -138,16 +138,16 @@ function integer(options) {
 		parse(input) {
 			if (!input.match(/^\d+$/)) return {
 				success: false,
-				error: message`Expected a valid integer, but got ${input}.`
+				error: options?.errors?.invalidInteger ? typeof options.errors.invalidInteger === "function" ? options.errors.invalidInteger(input) : options.errors.invalidInteger : message`Expected a valid integer, but got ${input}.`
 			};
 			const value = Number.parseInt(input);
 			if (options?.min != null && value < options.min) return {
 				success: false,
-				error: message`Expected a value greater than or equal to ${text(options.min.toLocaleString("en"))}, but got ${input}.`
+				error: options.errors?.belowMinimum ? typeof options.errors.belowMinimum === "function" ? options.errors.belowMinimum(value, options.min) : options.errors.belowMinimum : message`Expected a value greater than or equal to ${text(options.min.toLocaleString("en"))}, but got ${input}.`
 			};
 			else if (options?.max != null && value > options.max) return {
 				success: false,
-				error: message`Expected a value less than or equal to ${text(options.max.toLocaleString("en"))}, but got ${input}.`
+				error: options.errors?.aboveMaximum ? typeof options.errors.aboveMaximum === "function" ? options.errors.aboveMaximum(value, options.max) : options.errors.aboveMaximum : message`Expected a value less than or equal to ${text(options.max.toLocaleString("en"))}, but got ${input}.`
 			};
 			return {
 				success: true,
@@ -182,19 +182,19 @@ function float(options = {}) {
 				value = Number(input);
 				if (Number.isNaN(value)) return {
 					success: false,
-					error: message`Expected a valid number, but got ${input}.`
+					error: options.errors?.invalidNumber ? typeof options.errors.invalidNumber === "function" ? options.errors.invalidNumber(input) : options.errors.invalidNumber : message`Expected a valid number, but got ${input}.`
 				};
 			} else return {
 				success: false,
-				error: message`Expected a valid number, but got ${input}.`
+				error: options.errors?.invalidNumber ? typeof options.errors.invalidNumber === "function" ? options.errors.invalidNumber(input) : options.errors.invalidNumber : message`Expected a valid number, but got ${input}.`
 			};
 			if (options.min != null && value < options.min) return {
 				success: false,
-				error: message`Expected a value greater than or equal to ${text(options.min.toLocaleString("en"))}, but got ${input}.`
+				error: options.errors?.belowMinimum ? typeof options.errors.belowMinimum === "function" ? options.errors.belowMinimum(value, options.min) : options.errors.belowMinimum : message`Expected a value greater than or equal to ${text(options.min.toLocaleString("en"))}, but got ${input}.`
 			};
 			else if (options.max != null && value > options.max) return {
 				success: false,
-				error: message`Expected a value less than or equal to ${text(options.max.toLocaleString("en"))}, but got ${input}.`
+				error: options.errors?.aboveMaximum ? typeof options.errors.aboveMaximum === "function" ? options.errors.aboveMaximum(value, options.max) : options.errors.aboveMaximum : message`Expected a value less than or equal to ${text(options.max.toLocaleString("en"))}, but got ${input}.`
 			};
 			return {
 				success: true,
@@ -222,12 +222,12 @@ function url(options = {}) {
 		parse(input) {
 			if (!URL.canParse(input)) return {
 				success: false,
-				error: message`Invalid URL: ${input}.`
+				error: options.errors?.invalidUrl ? typeof options.errors.invalidUrl === "function" ? options.errors.invalidUrl(input) : options.errors.invalidUrl : message`Invalid URL: ${input}.`
 			};
 			const url$1 = new URL(input);
 			if (allowedProtocols != null && !allowedProtocols.includes(url$1.protocol)) return {
 				success: false,
-				error: message`URL protocol ${url$1.protocol} is not allowed. Allowed protocols: ${allowedProtocols.join(", ")}.`
+				error: options.errors?.disallowedProtocol ? typeof options.errors.disallowedProtocol === "function" ? options.errors.disallowedProtocol(url$1.protocol, options.allowedProtocols) : options.errors.disallowedProtocol : message`URL protocol ${url$1.protocol} is not allowed. Allowed protocols: ${allowedProtocols.join(", ")}.`
 			};
 			return {
 				success: true,
@@ -259,7 +259,7 @@ function locale(options = {}) {
 			} catch (e) {
 				if (e instanceof RangeError) return {
 					success: false,
-					error: message`Invalid locale: ${input}.`
+					error: options.errors?.invalidLocale ? typeof options.errors.invalidLocale === "function" ? options.errors.invalidLocale(input) : options.errors.invalidLocale : message`Invalid locale: ${input}.`
 				};
 				throw e;
 			}
@@ -292,23 +292,23 @@ function uuid(options = {}) {
 		parse(input) {
 			if (!uuidRegex.test(input)) return {
 				success: false,
-				error: message`Expected a valid UUID in format ${"xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"}, but got ${input}.`
+				error: options.errors?.invalidUuid ? typeof options.errors.invalidUuid === "function" ? options.errors.invalidUuid(input) : options.errors.invalidUuid : message`Expected a valid UUID in format ${"xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"}, but got ${input}.`
 			};
 			if (options.allowedVersions != null && options.allowedVersions.length > 0) {
 				const versionChar = input.charAt(14);
 				const version = parseInt(versionChar, 16);
-				if (!options.allowedVersions.includes(version)) {
-					let expectedVersions = message``;
-					let i = 0;
-					for (const v of options.allowedVersions) {
-						expectedVersions = i < 1 ? message`${expectedVersions}${v.toLocaleString("en")}` : i + 1 >= options.allowedVersions.length ? message`${expectedVersions}, or ${v.toLocaleString("en")}` : message`${expectedVersions}, ${v.toLocaleString("en")}`;
-						i++;
-					}
-					return {
-						success: false,
-						error: message`Expected UUID version ${expectedVersions}, but got version ${version.toLocaleString("en")}.`
-					};
-				}
+				if (!options.allowedVersions.includes(version)) return {
+					success: false,
+					error: options.errors?.disallowedVersion ? typeof options.errors.disallowedVersion === "function" ? options.errors.disallowedVersion(version, options.allowedVersions) : options.errors.disallowedVersion : (() => {
+						let expectedVersions = message``;
+						let i = 0;
+						for (const v of options.allowedVersions) {
+							expectedVersions = i < 1 ? message`${expectedVersions}${v.toLocaleString("en")}` : i + 1 >= options.allowedVersions.length ? message`${expectedVersions}, or ${v.toLocaleString("en")}` : message`${expectedVersions}, ${v.toLocaleString("en")}`;
+							i++;
+						}
+						return message`Expected UUID version ${expectedVersions}, but got version ${version.toLocaleString("en")}.`;
+					})()
+				};
 			}
 			return {
 				success: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "0.5.0-dev.79+66aa8134",
+  "version": "0.5.0-dev.82+3a10f0da",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -51,6 +51,14 @@
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     },
+    "./constructs": {
+      "types": {
+        "import": "./dist/constructs.d.ts",
+        "require": "./dist/constructs.cts"
+      },
+      "import": "./dist/constructs.js",
+      "require": "./dist/constructs.cjs"
+    },
     "./doc": {
       "types": {
         "import": "./dist/doc.d.ts",
@@ -75,6 +83,14 @@
       "import": "./dist/message.js",
       "require": "./dist/message.cjs"
     },
+    "./modifiers": {
+      "types": {
+        "import": "./dist/modifiers.d.ts",
+        "require": "./dist/modifiers.cts"
+      },
+      "import": "./dist/modifiers.js",
+      "require": "./dist/modifiers.cjs"
+    },
     "./parser": {
       "types": {
         "import": "./dist/parser.d.ts",
@@ -83,6 +99,14 @@
       "import": "./dist/parser.js",
       "require": "./dist/parser.cjs"
     },
+    "./primitives": {
+      "types": {
+        "import": "./dist/primitives.d.ts",
+        "require": "./dist/primitives.cts"
+      },
+      "import": "./dist/primitives.js",
+      "require": "./dist/primitives.cjs"
+    },
     "./usage": {
       "types": {
         "import": "./dist/usage.d.ts",