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

package/dist/constructs.cjs

@@ -8,6 +8,21 @@ const require_usage_internals = require('./usage-internals.cjs');
 
 //#region src/constructs.ts
 const inheritParentAnnotationsKey = Symbol.for("@optique/core/inheritParentAnnotations");
+/**
+* Returns the field state with parent annotations inherited, respecting
+* the parser's {@link inheritParentAnnotationsKey} flag.  This is the
+* same logic as {@link createFieldStateGetter} inside `object()` but
+* without the per-state cache, for use in module-level helpers like
+* {@link pendingDependencyDefaults}.
+* @internal
+*/
+function getAnnotatedFieldState(parentState, field, parser) {
+	const sourceState = parentState != null && typeof parentState === "object" && field in parentState ? parentState[field] : parser.initialState;
+	if (sourceState == null || typeof sourceState !== "object") return sourceState;
+	const annotations = require_annotations.getAnnotations(parentState);
+	if (annotations === void 0 || require_annotations.getAnnotations(sourceState) === annotations) return sourceState;
+	return Reflect.get(parser, inheritParentAnnotationsKey) === true ? require_annotations.injectAnnotations(sourceState, annotations) : require_annotations.inheritAnnotations(parentState, sourceState);
+}
 function createUnexpectedInputErrorWithScopedSuggestions(baseError, invalidInput, parsers, customFormatter) {
 	const options = /* @__PURE__ */ new Set();
 	const commands = /* @__PURE__ */ new Set();
@@ -693,7 +708,13 @@ function registerCompletedDependency(completed, registry) {
 function* pendingDependencyDefaults(context, parserPairs) {
 	for (const [field, fieldParser] of parserPairs) {
 		const fieldState = context.state != null && typeof context.state === "object" && field in context.state ? context.state[field] : void 0;
-		if (fieldState != null) continue;
+		if (fieldState != null) {
+			if (!Array.isArray(fieldState) && !require_dependency.isDependencySourceState(fieldState) && (require_dependency.isWrappedDependencySource(fieldParser) || require_dependency.isPendingDependencySourceState(fieldParser.initialState))) yield {
+				parser: fieldParser,
+				state: getAnnotatedFieldState(context.state, field, fieldParser)
+			};
+			continue;
+		}
 		if (require_dependency.isPendingDependencySourceState(fieldParser.initialState)) yield {
 			parser: fieldParser,
 			state: fieldParser.initialState
@@ -714,7 +735,31 @@ function* pendingDependencyDefaults(context, parserPairs) {
 * @internal
 */
 function completeDependencySourceDefaults(context, parserPairs, registry) {
-	for (const { parser, state } of pendingDependencyDefaults(context, parserPairs)) registerCompletedDependency(parser.complete(state), registry);
+	for (const { parser, state } of pendingDependencyDefaults(context, parserPairs)) {
+		const completed = parser.complete(state);
+		const depState = wrapAsDependencySourceState(completed, parser);
+		if (depState) registerCompletedDependency(depState, registry);
+	}
+}
+/**
+* Wraps a completed result as a {@link DependencySourceState} if the parser
+* contains a dependency source and the result is a successful plain Result
+* with a defined value.  Returns the existing state if the result is already
+* a DependencySourceState, or `undefined` if no wrapping applies.
+*
+* This helper is shared by both `object()` Phase 1 and the suggest-time
+* pre-completion paths to keep the dep-ID selection and `value !== undefined`
+* rule in one place.
+* @internal
+*/
+function wrapAsDependencySourceState(completed, parser) {
+	if (require_dependency.isDependencySourceState(completed)) return completed;
+	const hasDep = require_dependency.isWrappedDependencySource(parser) || require_dependency.isPendingDependencySourceState(parser.initialState);
+	if (hasDep && typeof completed === "object" && completed !== null && "success" in completed && completed.success && "value" in completed && completed.value !== void 0) {
+		const depId = require_dependency.isWrappedDependencySource(parser) ? parser[require_dependency.wrappedDependencySourceMarker][require_dependency.dependencyId] : parser.initialState[require_dependency.dependencyId];
+		return require_dependency.createDependencySourceState(completed, depId);
+	}
+	return void 0;
 }
 /**
 * Async version of {@link completeDependencySourceDefaults} that awaits
@@ -725,7 +770,11 @@ function completeDependencySourceDefaults(context, parserPairs, registry) {
 * @internal
 */
 async function completeDependencySourceDefaultsAsync(context, parserPairs, registry) {
-	for (const { parser, state } of pendingDependencyDefaults(context, parserPairs)) registerCompletedDependency(await parser.complete(state), registry);
+	for (const { parser, state } of pendingDependencyDefaults(context, parserPairs)) {
+		const completed = await parser.complete(state);
+		const depState = wrapAsDependencySourceState(completed, parser);
+		if (depState) registerCompletedDependency(depState, registry);
+	}
 }
 /**
 * Recursively collects dependency values from DependencySourceState objects
@@ -1085,6 +1134,14 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 							preCompletedState[fieldKey] = completed;
 							preCompletedKeys.add(fieldKey);
 						} else preCompletedState[fieldKey] = fieldState;
+					} else if (fieldState != null && !Array.isArray(fieldState) && !require_dependency.isDependencySourceState(fieldState) && (require_dependency.isWrappedDependencySource(fieldParser) || require_dependency.isPendingDependencySourceState(fieldParser.initialState))) {
+						const annotatedFieldState = getFieldState(field, fieldParser);
+						const completed = fieldParser.complete(annotatedFieldState);
+						const depState = wrapAsDependencySourceState(completed, fieldParser);
+						if (depState) {
+							preCompletedState[fieldKey] = depState;
+							preCompletedKeys.add(fieldKey);
+						} else preCompletedState[fieldKey] = annotatedFieldState;
 					} else preCompletedState[fieldKey] = getFieldState(field, fieldParser);
 				}
 				const resolvedState = resolveDeferredParseStates(preCompletedState);
@@ -1138,6 +1195,14 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 							preCompletedState[fieldKey] = completed;
 							preCompletedKeys.add(fieldKey);
 						} else preCompletedState[fieldKey] = fieldState;
+					} else if (fieldState != null && !Array.isArray(fieldState) && !require_dependency.isDependencySourceState(fieldState) && (require_dependency.isWrappedDependencySource(fieldParser) || require_dependency.isPendingDependencySourceState(fieldParser.initialState))) {
+						const annotatedFieldState = getFieldState(field, fieldParser);
+						const completed = await fieldParser.complete(annotatedFieldState);
+						const depState = wrapAsDependencySourceState(completed, fieldParser);
+						if (depState) {
+							preCompletedState[fieldKey] = depState;
+							preCompletedKeys.add(fieldKey);
+						} else preCompletedState[fieldKey] = annotatedFieldState;
 					} else preCompletedState[fieldKey] = getFieldState(field, fieldParser);
 				}
 				const resolvedState = await resolveDeferredParseStatesAsync(preCompletedState);

package/dist/constructs.js

@@ -1,6 +1,6 @@
 import { getAnnotations, inheritAnnotations, injectAnnotations } from "./annotations.js";
 import { message, optionName, text, values } from "./message.js";
-import { DependencyRegistry, dependencyId, isDeferredParseState, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource, parseWithDependency, wrappedDependencySourceMarker } from "./dependency.js";
+import { DependencyRegistry, createDependencySourceState, dependencyId, isDeferredParseState, isDependencySourceState, isPendingDependencySourceState, isWrappedDependencySource, parseWithDependency, wrappedDependencySourceMarker } from "./dependency.js";
 import { dispatchByMode, dispatchIterableByMode } from "./mode-dispatch.js";
 import { extractArgumentMetavars, extractCommandNames, extractOptionNames, isDocHidden, mergeHidden } from "./usage.js";
 import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, createSuggestionMessage, deduplicateSuggestions, findSimilar } from "./suggestion.js";
@@ -8,6 +8,21 @@ import { collectLeadingCandidates } from "./usage-internals.js";
 
 //#region src/constructs.ts
 const inheritParentAnnotationsKey = Symbol.for("@optique/core/inheritParentAnnotations");
+/**
+* Returns the field state with parent annotations inherited, respecting
+* the parser's {@link inheritParentAnnotationsKey} flag.  This is the
+* same logic as {@link createFieldStateGetter} inside `object()` but
+* without the per-state cache, for use in module-level helpers like
+* {@link pendingDependencyDefaults}.
+* @internal
+*/
+function getAnnotatedFieldState(parentState, field, parser) {
+	const sourceState = parentState != null && typeof parentState === "object" && field in parentState ? parentState[field] : parser.initialState;
+	if (sourceState == null || typeof sourceState !== "object") return sourceState;
+	const annotations = getAnnotations(parentState);
+	if (annotations === void 0 || getAnnotations(sourceState) === annotations) return sourceState;
+	return Reflect.get(parser, inheritParentAnnotationsKey) === true ? injectAnnotations(sourceState, annotations) : inheritAnnotations(parentState, sourceState);
+}
 function createUnexpectedInputErrorWithScopedSuggestions(baseError, invalidInput, parsers, customFormatter) {
 	const options = /* @__PURE__ */ new Set();
 	const commands = /* @__PURE__ */ new Set();
@@ -693,7 +708,13 @@ function registerCompletedDependency(completed, registry) {
 function* pendingDependencyDefaults(context, parserPairs) {
 	for (const [field, fieldParser] of parserPairs) {
 		const fieldState = context.state != null && typeof context.state === "object" && field in context.state ? context.state[field] : void 0;
-		if (fieldState != null) continue;
+		if (fieldState != null) {
+			if (!Array.isArray(fieldState) && !isDependencySourceState(fieldState) && (isWrappedDependencySource(fieldParser) || isPendingDependencySourceState(fieldParser.initialState))) yield {
+				parser: fieldParser,
+				state: getAnnotatedFieldState(context.state, field, fieldParser)
+			};
+			continue;
+		}
 		if (isPendingDependencySourceState(fieldParser.initialState)) yield {
 			parser: fieldParser,
 			state: fieldParser.initialState
@@ -714,7 +735,31 @@ function* pendingDependencyDefaults(context, parserPairs) {
 * @internal
 */
 function completeDependencySourceDefaults(context, parserPairs, registry) {
-	for (const { parser, state } of pendingDependencyDefaults(context, parserPairs)) registerCompletedDependency(parser.complete(state), registry);
+	for (const { parser, state } of pendingDependencyDefaults(context, parserPairs)) {
+		const completed = parser.complete(state);
+		const depState = wrapAsDependencySourceState(completed, parser);
+		if (depState) registerCompletedDependency(depState, registry);
+	}
+}
+/**
+* Wraps a completed result as a {@link DependencySourceState} if the parser
+* contains a dependency source and the result is a successful plain Result
+* with a defined value.  Returns the existing state if the result is already
+* a DependencySourceState, or `undefined` if no wrapping applies.
+*
+* This helper is shared by both `object()` Phase 1 and the suggest-time
+* pre-completion paths to keep the dep-ID selection and `value !== undefined`
+* rule in one place.
+* @internal
+*/
+function wrapAsDependencySourceState(completed, parser) {
+	if (isDependencySourceState(completed)) return completed;
+	const hasDep = isWrappedDependencySource(parser) || isPendingDependencySourceState(parser.initialState);
+	if (hasDep && typeof completed === "object" && completed !== null && "success" in completed && completed.success && "value" in completed && completed.value !== void 0) {
+		const depId = isWrappedDependencySource(parser) ? parser[wrappedDependencySourceMarker][dependencyId] : parser.initialState[dependencyId];
+		return createDependencySourceState(completed, depId);
+	}
+	return void 0;
 }
 /**
 * Async version of {@link completeDependencySourceDefaults} that awaits
@@ -725,7 +770,11 @@ function completeDependencySourceDefaults(context, parserPairs, registry) {
 * @internal
 */
 async function completeDependencySourceDefaultsAsync(context, parserPairs, registry) {
-	for (const { parser, state } of pendingDependencyDefaults(context, parserPairs)) registerCompletedDependency(await parser.complete(state), registry);
+	for (const { parser, state } of pendingDependencyDefaults(context, parserPairs)) {
+		const completed = await parser.complete(state);
+		const depState = wrapAsDependencySourceState(completed, parser);
+		if (depState) registerCompletedDependency(depState, registry);
+	}
 }
 /**
 * Recursively collects dependency values from DependencySourceState objects
@@ -1085,6 +1134,14 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 							preCompletedState[fieldKey] = completed;
 							preCompletedKeys.add(fieldKey);
 						} else preCompletedState[fieldKey] = fieldState;
+					} else if (fieldState != null && !Array.isArray(fieldState) && !isDependencySourceState(fieldState) && (isWrappedDependencySource(fieldParser) || isPendingDependencySourceState(fieldParser.initialState))) {
+						const annotatedFieldState = getFieldState(field, fieldParser);
+						const completed = fieldParser.complete(annotatedFieldState);
+						const depState = wrapAsDependencySourceState(completed, fieldParser);
+						if (depState) {
+							preCompletedState[fieldKey] = depState;
+							preCompletedKeys.add(fieldKey);
+						} else preCompletedState[fieldKey] = annotatedFieldState;
 					} else preCompletedState[fieldKey] = getFieldState(field, fieldParser);
 				}
 				const resolvedState = resolveDeferredParseStates(preCompletedState);
@@ -1138,6 +1195,14 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 							preCompletedState[fieldKey] = completed;
 							preCompletedKeys.add(fieldKey);
 						} else preCompletedState[fieldKey] = fieldState;
+					} else if (fieldState != null && !Array.isArray(fieldState) && !isDependencySourceState(fieldState) && (isWrappedDependencySource(fieldParser) || isPendingDependencySourceState(fieldParser.initialState))) {
+						const annotatedFieldState = getFieldState(field, fieldParser);
+						const completed = await fieldParser.complete(annotatedFieldState);
+						const depState = wrapAsDependencySourceState(completed, fieldParser);
+						if (depState) {
+							preCompletedState[fieldKey] = depState;
+							preCompletedKeys.add(fieldKey);
+						} else preCompletedState[fieldKey] = annotatedFieldState;
 					} else preCompletedState[fieldKey] = getFieldState(field, fieldParser);
 				}
 				const resolvedState = await resolveDeferredParseStatesAsync(preCompletedState);

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.1251+2501c981",
+  "version": "1.0.0-dev.1258+ce84a88d",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",