@optique/core 1.0.0-dev.1252 → 1.0.0-dev.1258

package/dist/valueparser.cjs

@@ -499,6 +499,7 @@ function url(options = {}) {
 			originalProtocolsList.push(protocol);
 			normalizedProtocolsList.push(normalized);
 		}
+		if (originalProtocolsList.length === 0) throw new TypeError("allowedProtocols must not be empty.");
 	}
 	const originalProtocols = options.allowedProtocols != null ? Object.freeze(originalProtocolsList) : void 0;
 	const allowedProtocols = options.allowedProtocols != null ? Object.freeze(normalizedProtocolsList) : void 0;
@@ -517,7 +518,25 @@ function url(options = {}) {
 			const url$1 = new URL(input);
 			if (allowedProtocols != null && !allowedProtocols.includes(url$1.protocol)) return {
 				success: false,
-				error: disallowedProtocol ? typeof disallowedProtocol === "function" ? disallowedProtocol(url$1.protocol, originalProtocols) : disallowedProtocol : require_message.message`URL protocol ${url$1.protocol} is not allowed. Allowed protocols: ${allowedProtocols.join(", ")}.`
+				error: disallowedProtocol ? typeof disallowedProtocol === "function" ? disallowedProtocol(url$1.protocol, originalProtocols) : disallowedProtocol : [
+					{
+						type: "text",
+						text: "URL protocol "
+					},
+					{
+						type: "value",
+						value: url$1.protocol
+					},
+					{
+						type: "text",
+						text: " is not allowed. Allowed protocols: "
+					},
+					...require_message.valueSet(originalProtocols, { locale: "en-US" }),
+					{
+						type: "text",
+						text: "."
+					}
+				]
 			};
 			return {
 				success: true,
@@ -1364,16 +1383,19 @@ function email(options) {
 	const allowDisplayName = options?.allowDisplayName ?? false;
 	const lowercase = options?.lowercase ?? false;
 	const allowedDomains = options?.allowedDomains != null ? Object.freeze([...options.allowedDomains]) : void 0;
-	if (allowedDomains != null) for (let i = 0; i < allowedDomains.length; i++) {
-		const entry = allowedDomains[i];
-		if (typeof entry !== "string") throw new TypeError(`allowedDomains[${i}] must be a string, got ${typeof entry}.`);
-		if (entry !== entry.trim()) throw new TypeError(`allowedDomains[${i}] must not have leading or trailing whitespace: ${JSON.stringify(entry)}`);
-		if (entry.startsWith("@")) throw new TypeError(`allowedDomains[${i}] must not start with "@": ${JSON.stringify(entry)}`);
-		if (entry === "" || !entry.includes(".")) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
-		if (entry.startsWith(".") || entry.endsWith(".") || entry.startsWith("-") || entry.endsWith("-")) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
-		const labels = entry.split(".");
-		for (const label of labels) if (label.length === 0 || label.length > 63 || label.startsWith("-") || label.endsWith("-") || !/^[a-zA-Z0-9-]+$/.test(label)) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
-		if (labels.length === 4 && labels.every((label) => /^[0-9]+$/.test(label))) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
+	if (allowedDomains != null) {
+		if (allowedDomains.length === 0) throw new TypeError("allowedDomains must not be empty.");
+		for (let i = 0; i < allowedDomains.length; i++) {
+			const entry = allowedDomains[i];
+			if (typeof entry !== "string") throw new TypeError(`allowedDomains[${i}] must be a string, got ${typeof entry}.`);
+			if (entry !== entry.trim()) throw new TypeError(`allowedDomains[${i}] must not have leading or trailing whitespace: ${JSON.stringify(entry)}`);
+			if (entry.startsWith("@")) throw new TypeError(`allowedDomains[${i}] must not start with "@": ${JSON.stringify(entry)}`);
+			if (entry === "" || !entry.includes(".")) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
+			if (entry.startsWith(".") || entry.endsWith(".") || entry.startsWith("-") || entry.endsWith("-")) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
+			const labels = entry.split(".");
+			for (const label of labels) if (label.length === 0 || label.length > 63 || label.startsWith("-") || label.endsWith("-") || !/^[a-zA-Z0-9-]+$/.test(label)) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
+			if (labels.length === 4 && labels.every((label) => /^[0-9]+$/.test(label))) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
+		}
 	}
 	const invalidEmail = options?.errors?.invalidEmail;
 	const domainNotAllowed = options?.errors?.domainNotAllowed;
@@ -1489,7 +1511,12 @@ function email(options) {
 								},
 								{
 									type: "text",
-									text: ` is not allowed. Allowed domains: ${allowedDomains.join(", ")}.`
+									text: " is not allowed. Allowed domains: "
+								},
+								...require_message.valueSet(allowedDomains, { locale: "en-US" }),
+								{
+									type: "text",
+									text: "."
 								}
 							];
 							return {
@@ -1535,7 +1562,12 @@ function email(options) {
 							},
 							{
 								type: "text",
-								text: ` is not allowed. Allowed domains: ${allowedDomains.join(", ")}.`
+								text: " is not allowed. Allowed domains: "
+							},
+							...require_message.valueSet(allowedDomains, { locale: "en-US" }),
+							{
+								type: "text",
+								text: "."
 							}
 						];
 						return {
@@ -1849,8 +1881,8 @@ function macAddress(options) {
 	const caseOption = options?.case ?? "preserve";
 	const outputSeparator = options?.outputSeparator;
 	const metavar = options?.metavar ?? "MAC";
-	const colonRegex = /^([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2})$/;
-	const hyphenRegex = /^([0-9a-fA-F]{1,2})-([0-9a-fA-F]{1,2})-([0-9a-fA-F]{1,2})-([0-9a-fA-F]{1,2})-([0-9a-fA-F]{1,2})-([0-9a-fA-F]{1,2})$/;
+	const colonRegex = /^([0-9a-fA-F]{2}):([0-9a-fA-F]{2}):([0-9a-fA-F]{2}):([0-9a-fA-F]{2}):([0-9a-fA-F]{2}):([0-9a-fA-F]{2})$/;
+	const hyphenRegex = /^([0-9a-fA-F]{2})-([0-9a-fA-F]{2})-([0-9a-fA-F]{2})-([0-9a-fA-F]{2})-([0-9a-fA-F]{2})-([0-9a-fA-F]{2})$/;
 	const dotRegex = /^([0-9a-fA-F]{4})\.([0-9a-fA-F]{4})\.([0-9a-fA-F]{4})$/;
 	const noneRegex = /^([0-9a-fA-F]{12})$/;
 	return {
@@ -1983,15 +2015,18 @@ function domain(options) {
 	const allowSubdomains = options?.allowSubdomains ?? true;
 	const allowedTlds = options?.allowedTlds != null ? Object.freeze([...options.allowedTlds]) : void 0;
 	const labelRegex = /^[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/;
-	if (allowedTlds !== void 0) for (const [i, tld] of allowedTlds.entries()) {
-		if (typeof tld !== "string") {
-			const actualType = Array.isArray(tld) ? "array" : typeof tld;
-			throw new TypeError(`allowedTlds[${i}] must be a string, but got ${actualType}.`);
+	if (allowedTlds !== void 0) {
+		if (allowedTlds.length === 0) throw new TypeError("allowedTlds must not be empty.");
+		for (const [i, tld] of allowedTlds.entries()) {
+			if (typeof tld !== "string") {
+				const actualType = Array.isArray(tld) ? "array" : typeof tld;
+				throw new TypeError(`allowedTlds[${i}] must be a string, but got ${actualType}.`);
+			}
+			if (tld.length === 0) throw new TypeError(`allowedTlds[${i}] must not be an empty string.`);
+			if (tld.includes(".")) throw new TypeError(`allowedTlds[${i}] must not contain dots: ${JSON.stringify(tld)}.`);
+			if (tld !== tld.trim()) throw new TypeError(`allowedTlds[${i}] must not have leading or trailing whitespace: ${JSON.stringify(tld)}.`);
+			if (!labelRegex.test(tld)) throw new TypeError(`allowedTlds[${i}] is not a valid DNS label: ${JSON.stringify(tld)}.`);
 		}
-		if (tld.length === 0) throw new TypeError(`allowedTlds[${i}] must not be an empty string.`);
-		if (tld.includes(".")) throw new TypeError(`allowedTlds[${i}] must not contain dots: ${JSON.stringify(tld)}.`);
-		if (tld !== tld.trim()) throw new TypeError(`allowedTlds[${i}] must not have leading or trailing whitespace: ${JSON.stringify(tld)}.`);
-		if (!labelRegex.test(tld)) throw new TypeError(`allowedTlds[${i}] is not a valid DNS label: ${JSON.stringify(tld)}.`);
 	}
 	const allowedTldsLower = allowedTlds != null ? Object.freeze(allowedTlds.map((t) => t.toLowerCase())) : void 0;
 	const minLabels = options?.minLabels ?? 2;
@@ -2188,7 +2223,12 @@ function domain(options) {
 						},
 						{
 							type: "text",
-							text: ` is not allowed. Allowed TLDs: ${allowedTlds.join(", ")}.`
+							text: " is not allowed. Allowed TLDs: "
+						},
+						...require_message.valueSet(allowedTlds, { locale: "en-US" }),
+						{
+							type: "text",
+							text: "."
 						}
 					];
 					return {

package/dist/valueparser.js

@@ -499,6 +499,7 @@ function url(options = {}) {
 			originalProtocolsList.push(protocol);
 			normalizedProtocolsList.push(normalized);
 		}
+		if (originalProtocolsList.length === 0) throw new TypeError("allowedProtocols must not be empty.");
 	}
 	const originalProtocols = options.allowedProtocols != null ? Object.freeze(originalProtocolsList) : void 0;
 	const allowedProtocols = options.allowedProtocols != null ? Object.freeze(normalizedProtocolsList) : void 0;
@@ -517,7 +518,25 @@ function url(options = {}) {
 			const url$1 = new URL(input);
 			if (allowedProtocols != null && !allowedProtocols.includes(url$1.protocol)) return {
 				success: false,
-				error: disallowedProtocol ? typeof disallowedProtocol === "function" ? disallowedProtocol(url$1.protocol, originalProtocols) : disallowedProtocol : message`URL protocol ${url$1.protocol} is not allowed. Allowed protocols: ${allowedProtocols.join(", ")}.`
+				error: disallowedProtocol ? typeof disallowedProtocol === "function" ? disallowedProtocol(url$1.protocol, originalProtocols) : disallowedProtocol : [
+					{
+						type: "text",
+						text: "URL protocol "
+					},
+					{
+						type: "value",
+						value: url$1.protocol
+					},
+					{
+						type: "text",
+						text: " is not allowed. Allowed protocols: "
+					},
+					...valueSet(originalProtocols, { locale: "en-US" }),
+					{
+						type: "text",
+						text: "."
+					}
+				]
 			};
 			return {
 				success: true,
@@ -1364,16 +1383,19 @@ function email(options) {
 	const allowDisplayName = options?.allowDisplayName ?? false;
 	const lowercase = options?.lowercase ?? false;
 	const allowedDomains = options?.allowedDomains != null ? Object.freeze([...options.allowedDomains]) : void 0;
-	if (allowedDomains != null) for (let i = 0; i < allowedDomains.length; i++) {
-		const entry = allowedDomains[i];
-		if (typeof entry !== "string") throw new TypeError(`allowedDomains[${i}] must be a string, got ${typeof entry}.`);
-		if (entry !== entry.trim()) throw new TypeError(`allowedDomains[${i}] must not have leading or trailing whitespace: ${JSON.stringify(entry)}`);
-		if (entry.startsWith("@")) throw new TypeError(`allowedDomains[${i}] must not start with "@": ${JSON.stringify(entry)}`);
-		if (entry === "" || !entry.includes(".")) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
-		if (entry.startsWith(".") || entry.endsWith(".") || entry.startsWith("-") || entry.endsWith("-")) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
-		const labels = entry.split(".");
-		for (const label of labels) if (label.length === 0 || label.length > 63 || label.startsWith("-") || label.endsWith("-") || !/^[a-zA-Z0-9-]+$/.test(label)) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
-		if (labels.length === 4 && labels.every((label) => /^[0-9]+$/.test(label))) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
+	if (allowedDomains != null) {
+		if (allowedDomains.length === 0) throw new TypeError("allowedDomains must not be empty.");
+		for (let i = 0; i < allowedDomains.length; i++) {
+			const entry = allowedDomains[i];
+			if (typeof entry !== "string") throw new TypeError(`allowedDomains[${i}] must be a string, got ${typeof entry}.`);
+			if (entry !== entry.trim()) throw new TypeError(`allowedDomains[${i}] must not have leading or trailing whitespace: ${JSON.stringify(entry)}`);
+			if (entry.startsWith("@")) throw new TypeError(`allowedDomains[${i}] must not start with "@": ${JSON.stringify(entry)}`);
+			if (entry === "" || !entry.includes(".")) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
+			if (entry.startsWith(".") || entry.endsWith(".") || entry.startsWith("-") || entry.endsWith("-")) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
+			const labels = entry.split(".");
+			for (const label of labels) if (label.length === 0 || label.length > 63 || label.startsWith("-") || label.endsWith("-") || !/^[a-zA-Z0-9-]+$/.test(label)) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
+			if (labels.length === 4 && labels.every((label) => /^[0-9]+$/.test(label))) throw new TypeError(`allowedDomains[${i}] is not a valid domain: ${JSON.stringify(entry)}`);
+		}
 	}
 	const invalidEmail = options?.errors?.invalidEmail;
 	const domainNotAllowed = options?.errors?.domainNotAllowed;
@@ -1489,7 +1511,12 @@ function email(options) {
 								},
 								{
 									type: "text",
-									text: ` is not allowed. Allowed domains: ${allowedDomains.join(", ")}.`
+									text: " is not allowed. Allowed domains: "
+								},
+								...valueSet(allowedDomains, { locale: "en-US" }),
+								{
+									type: "text",
+									text: "."
 								}
 							];
 							return {
@@ -1535,7 +1562,12 @@ function email(options) {
 							},
 							{
 								type: "text",
-								text: ` is not allowed. Allowed domains: ${allowedDomains.join(", ")}.`
+								text: " is not allowed. Allowed domains: "
+							},
+							...valueSet(allowedDomains, { locale: "en-US" }),
+							{
+								type: "text",
+								text: "."
 							}
 						];
 						return {
@@ -1849,8 +1881,8 @@ function macAddress(options) {
 	const caseOption = options?.case ?? "preserve";
 	const outputSeparator = options?.outputSeparator;
 	const metavar = options?.metavar ?? "MAC";
-	const colonRegex = /^([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2}):([0-9a-fA-F]{1,2})$/;
-	const hyphenRegex = /^([0-9a-fA-F]{1,2})-([0-9a-fA-F]{1,2})-([0-9a-fA-F]{1,2})-([0-9a-fA-F]{1,2})-([0-9a-fA-F]{1,2})-([0-9a-fA-F]{1,2})$/;
+	const colonRegex = /^([0-9a-fA-F]{2}):([0-9a-fA-F]{2}):([0-9a-fA-F]{2}):([0-9a-fA-F]{2}):([0-9a-fA-F]{2}):([0-9a-fA-F]{2})$/;
+	const hyphenRegex = /^([0-9a-fA-F]{2})-([0-9a-fA-F]{2})-([0-9a-fA-F]{2})-([0-9a-fA-F]{2})-([0-9a-fA-F]{2})-([0-9a-fA-F]{2})$/;
 	const dotRegex = /^([0-9a-fA-F]{4})\.([0-9a-fA-F]{4})\.([0-9a-fA-F]{4})$/;
 	const noneRegex = /^([0-9a-fA-F]{12})$/;
 	return {
@@ -1983,15 +2015,18 @@ function domain(options) {
 	const allowSubdomains = options?.allowSubdomains ?? true;
 	const allowedTlds = options?.allowedTlds != null ? Object.freeze([...options.allowedTlds]) : void 0;
 	const labelRegex = /^[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/;
-	if (allowedTlds !== void 0) for (const [i, tld] of allowedTlds.entries()) {
-		if (typeof tld !== "string") {
-			const actualType = Array.isArray(tld) ? "array" : typeof tld;
-			throw new TypeError(`allowedTlds[${i}] must be a string, but got ${actualType}.`);
+	if (allowedTlds !== void 0) {
+		if (allowedTlds.length === 0) throw new TypeError("allowedTlds must not be empty.");
+		for (const [i, tld] of allowedTlds.entries()) {
+			if (typeof tld !== "string") {
+				const actualType = Array.isArray(tld) ? "array" : typeof tld;
+				throw new TypeError(`allowedTlds[${i}] must be a string, but got ${actualType}.`);
+			}
+			if (tld.length === 0) throw new TypeError(`allowedTlds[${i}] must not be an empty string.`);
+			if (tld.includes(".")) throw new TypeError(`allowedTlds[${i}] must not contain dots: ${JSON.stringify(tld)}.`);
+			if (tld !== tld.trim()) throw new TypeError(`allowedTlds[${i}] must not have leading or trailing whitespace: ${JSON.stringify(tld)}.`);
+			if (!labelRegex.test(tld)) throw new TypeError(`allowedTlds[${i}] is not a valid DNS label: ${JSON.stringify(tld)}.`);
 		}
-		if (tld.length === 0) throw new TypeError(`allowedTlds[${i}] must not be an empty string.`);
-		if (tld.includes(".")) throw new TypeError(`allowedTlds[${i}] must not contain dots: ${JSON.stringify(tld)}.`);
-		if (tld !== tld.trim()) throw new TypeError(`allowedTlds[${i}] must not have leading or trailing whitespace: ${JSON.stringify(tld)}.`);
-		if (!labelRegex.test(tld)) throw new TypeError(`allowedTlds[${i}] is not a valid DNS label: ${JSON.stringify(tld)}.`);
 	}
 	const allowedTldsLower = allowedTlds != null ? Object.freeze(allowedTlds.map((t) => t.toLowerCase())) : void 0;
 	const minLabels = options?.minLabels ?? 2;
@@ -2188,7 +2223,12 @@ function domain(options) {
 						},
 						{
 							type: "text",
-							text: ` is not allowed. Allowed TLDs: ${allowedTlds.join(", ")}.`
+							text: " is not allowed. Allowed TLDs: "
+						},
+						...valueSet(allowedTlds, { locale: "en-US" }),
+						{
+							type: "text",
+							text: "."
 						}
 					];
 					return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.1252+eebac476",
+  "version": "1.0.0-dev.1258+ce84a88d",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",