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

package/dist/constructs.cjs

@@ -9,6 +9,13 @@ const require_usage_internals = require('./usage-internals.cjs');
 //#region src/constructs.ts
 const inheritParentAnnotationsKey = Symbol.for("@optique/core/inheritParentAnnotations");
 /**
+* Internal symbol for exposing field-level parser pairs from `object()`
+* and `merge()` parsers.  This allows `merge()` to pre-complete dependency
+* source fields from child parsers before resolving deferred states.
+* @internal
+*/
+const fieldParsersKey = Symbol("fieldParsers");
+/**
 * 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
@@ -777,6 +784,64 @@ async function completeDependencySourceDefaultsAsync(context, parserPairs, regis
 	}
 }
 /**
+* Collects field-level parser pairs from child parsers that expose them
+* via {@link fieldParsersKey}.  Used by `merge()` to gather field→parser
+* mappings from its child `object()` (or nested `merge()`) parsers.
+* @internal
+*/
+function collectChildFieldParsers(parsers) {
+	const pairs = [];
+	for (const parser of parsers) if (fieldParsersKey in parser) pairs.push(...parser[fieldParsersKey]);
+	return pairs;
+}
+/**
+* Pre-completes dependency source fields and registers their values in
+* the given registry.  Unlike `completeDependencySourceDefaults()` (used
+* by suggest), this function handles all four Phase 1 cases — including
+* PendingDependencySourceState in arrays and wrappedDependencySourceMarker.
+*
+* The original state is NOT modified; only the registry is populated.
+* @internal
+*/
+function preCompleteAndRegisterDependencies(state, fieldParserPairs, registry) {
+	for (const [field, fieldParser] of fieldParserPairs) {
+		const fieldState = state[field];
+		let completed;
+		if (Array.isArray(fieldState) && fieldState.length === 1 && require_dependency.isPendingDependencySourceState(fieldState[0])) completed = fieldParser.complete(fieldState);
+		else if (fieldState === void 0 && require_dependency.isPendingDependencySourceState(fieldParser.initialState)) completed = fieldParser.complete([fieldParser.initialState]);
+		else if (fieldState === void 0 && require_dependency.isWrappedDependencySource(fieldParser)) {
+			const pendingState = fieldParser[require_dependency.wrappedDependencySourceMarker];
+			completed = fieldParser.complete([pendingState]);
+		} else if (fieldState != null && !Array.isArray(fieldState) && !require_dependency.isDependencySourceState(fieldState) && (require_dependency.isWrappedDependencySource(fieldParser) || require_dependency.isPendingDependencySourceState(fieldParser.initialState))) {
+			const annotatedFieldState = getAnnotatedFieldState(state, field, fieldParser);
+			completed = fieldParser.complete(annotatedFieldState);
+		} else continue;
+		const depState = wrapAsDependencySourceState(completed, fieldParser);
+		if (depState) registerCompletedDependency(depState, registry);
+	}
+}
+/**
+* Async version of {@link preCompleteAndRegisterDependencies}.
+* @internal
+*/
+async function preCompleteAndRegisterDependenciesAsync(state, fieldParserPairs, registry) {
+	for (const [field, fieldParser] of fieldParserPairs) {
+		const fieldState = state[field];
+		let completed;
+		if (Array.isArray(fieldState) && fieldState.length === 1 && require_dependency.isPendingDependencySourceState(fieldState[0])) completed = await fieldParser.complete(fieldState);
+		else if (fieldState === void 0 && require_dependency.isPendingDependencySourceState(fieldParser.initialState)) completed = await fieldParser.complete([fieldParser.initialState]);
+		else if (fieldState === void 0 && require_dependency.isWrappedDependencySource(fieldParser)) {
+			const pendingState = fieldParser[require_dependency.wrappedDependencySourceMarker];
+			completed = await fieldParser.complete([pendingState]);
+		} else if (fieldState != null && !Array.isArray(fieldState) && !require_dependency.isDependencySourceState(fieldState) && (require_dependency.isWrappedDependencySource(fieldParser) || require_dependency.isPendingDependencySourceState(fieldParser.initialState))) {
+			const annotatedFieldState = getAnnotatedFieldState(state, field, fieldParser);
+			completed = await fieldParser.complete(annotatedFieldState);
+		} else continue;
+		const depState = wrapAsDependencySourceState(completed, fieldParser);
+		if (depState) registerCompletedDependency(depState, registry);
+	}
+}
+/**
 * Recursively collects dependency values from DependencySourceState objects
 * found anywhere in the state tree.
 * @internal
@@ -869,8 +934,8 @@ function resolveDeferred(state, registry, visited = /* @__PURE__ */ new WeakSet(
 	}
 	return state;
 }
-function resolveDeferredParseStates(fieldStates) {
-	const registry = new require_dependency.DependencyRegistry();
+function resolveDeferredParseStates(fieldStates, initialRegistry) {
+	const registry = initialRegistry ?? new require_dependency.DependencyRegistry();
 	collectDependencies(fieldStates, registry);
 	return resolveDeferred(fieldStates, registry);
 }
@@ -916,8 +981,8 @@ async function resolveDeferredAsync(state, registry, visited = /* @__PURE__ */ n
 * Async version of resolveDeferredParseStates for async parsers.
 * @internal
 */
-async function resolveDeferredParseStatesAsync(fieldStates) {
-	const registry = new require_dependency.DependencyRegistry();
+async function resolveDeferredParseStatesAsync(fieldStates, initialRegistry) {
+	const registry = initialRegistry ?? new require_dependency.DependencyRegistry();
 	collectDependencies(fieldStates, registry);
 	return await resolveDeferredAsync(fieldStates, registry);
 }
@@ -1102,6 +1167,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		$mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
+		[fieldParsersKey]: parserPairs,
 		priority: Math.max(...parserKeys.map((k) => parsers[k].priority)),
 		usage: applyHiddenToUsage(parserPairs.flatMap(([_, p]) => p.usage), options.hidden),
 		get initialState() {
@@ -1724,10 +1790,12 @@ function merge(...args) {
 			error: require_message.message`No matching option or argument found.`
 		};
 	};
+	const mergedFieldParsers = collectChildFieldParsers(parsers);
 	return {
 		$mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
+		[fieldParsersKey]: mergedFieldParsers,
 		priority: Math.max(...parsers.map((p) => p.priority)),
 		usage: applyHiddenToUsage(parsers.flatMap((p) => p.usage), options.hidden),
 		initialState,
@@ -1745,6 +1813,8 @@ function merge(...args) {
 					if (resolvedState && typeof resolvedState === "object") {
 						const extractedState = {};
 						for (const field in parser.initialState) extractedState[field] = field in resolvedState ? resolvedState[field] : parser.initialState[field];
+						const annotations = require_annotations.getAnnotations(resolvedState);
+						if (annotations !== void 0) return require_annotations.inheritAnnotations(resolvedState, extractedState);
 						return extractedState;
 					}
 					return parser.initialState;
@@ -1752,7 +1822,10 @@ function merge(...args) {
 				return parser.initialState;
 			};
 			if (!isAsync) {
-				const resolvedState = resolveDeferredParseStates(state);
+				const childFieldPairs = collectChildFieldParsers(syncParsers);
+				const registry = new require_dependency.DependencyRegistry();
+				preCompleteAndRegisterDependencies(state, childFieldPairs, registry);
+				const resolvedState = resolveDeferredParseStates(state, registry);
 				const object$1 = {};
 				for (let i = 0; i < syncParsers.length; i++) {
 					const parser = syncParsers[i];
@@ -1767,7 +1840,10 @@ function merge(...args) {
 				};
 			}
 			return (async () => {
-				const resolvedState = await resolveDeferredParseStatesAsync(state);
+				const childFieldPairs = collectChildFieldParsers(parsers);
+				const registry = new require_dependency.DependencyRegistry();
+				await preCompleteAndRegisterDependenciesAsync(state, childFieldPairs, registry);
+				const resolvedState = await resolveDeferredParseStatesAsync(state, registry);
 				const object$1 = {};
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
@@ -1799,19 +1875,23 @@ function merge(...args) {
 				}
 				return p.initialState;
 			};
-			const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new require_dependency.DependencyRegistry();
-			if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
-			const contextWithRegistry = {
-				...context,
-				dependencyRegistry: registry
-			};
 			if (isAsync) return async function* () {
+				const registry$1 = context.dependencyRegistry ? context.dependencyRegistry.clone() : new require_dependency.DependencyRegistry();
+				const childFieldPairs$1 = collectChildFieldParsers(parsers);
+				if (context.state && typeof context.state === "object") {
+					await preCompleteAndRegisterDependenciesAsync(context.state, childFieldPairs$1, registry$1);
+					collectDependencies(context.state, registry$1);
+				} else await completeDependencySourceDefaultsAsync(context, childFieldPairs$1, registry$1);
+				const contextWithRegistry$1 = {
+					...context,
+					dependencyRegistry: registry$1
+				};
 				const suggestions = [];
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
 					const parserState = extractState(parser, i);
 					const parserSuggestions = parser.suggest({
-						...contextWithRegistry,
+						...contextWithRegistry$1,
 						state: parserState
 					}, prefix);
 					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
@@ -1819,6 +1899,16 @@ function merge(...args) {
 				}
 				yield* require_suggestion.deduplicateSuggestions(suggestions);
 			}();
+			const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new require_dependency.DependencyRegistry();
+			const childFieldPairs = collectChildFieldParsers(syncParsers);
+			if (context.state && typeof context.state === "object") {
+				preCompleteAndRegisterDependencies(context.state, childFieldPairs, registry);
+				collectDependencies(context.state, registry);
+			} else completeDependencySourceDefaults(context, childFieldPairs, registry);
+			const contextWithRegistry = {
+				...context,
+				dependencyRegistry: registry
+			};
 			return function* () {
 				const suggestions = [];
 				for (let i = 0; i < syncParsers.length; i++) {
@@ -2257,6 +2347,7 @@ function group(label, parser, options = {}) {
 		priority: parser.priority,
 		usage: applyHiddenToUsage(parser.usage, options.hidden),
 		initialState: parser.initialState,
+		...fieldParsersKey in parser ? { [fieldParsersKey]: parser[fieldParsersKey] } : {},
 		...typeof parser.shouldDeferCompletion === "function" ? { shouldDeferCompletion: parser.shouldDeferCompletion.bind(parser) } : {},
 		parse: (context) => parser.parse(context),
 		complete: (state) => parser.complete(state),

package/dist/constructs.js

@@ -9,6 +9,13 @@ import { collectLeadingCandidates } from "./usage-internals.js";
 //#region src/constructs.ts
 const inheritParentAnnotationsKey = Symbol.for("@optique/core/inheritParentAnnotations");
 /**
+* Internal symbol for exposing field-level parser pairs from `object()`
+* and `merge()` parsers.  This allows `merge()` to pre-complete dependency
+* source fields from child parsers before resolving deferred states.
+* @internal
+*/
+const fieldParsersKey = Symbol("fieldParsers");
+/**
 * 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
@@ -777,6 +784,64 @@ async function completeDependencySourceDefaultsAsync(context, parserPairs, regis
 	}
 }
 /**
+* Collects field-level parser pairs from child parsers that expose them
+* via {@link fieldParsersKey}.  Used by `merge()` to gather field→parser
+* mappings from its child `object()` (or nested `merge()`) parsers.
+* @internal
+*/
+function collectChildFieldParsers(parsers) {
+	const pairs = [];
+	for (const parser of parsers) if (fieldParsersKey in parser) pairs.push(...parser[fieldParsersKey]);
+	return pairs;
+}
+/**
+* Pre-completes dependency source fields and registers their values in
+* the given registry.  Unlike `completeDependencySourceDefaults()` (used
+* by suggest), this function handles all four Phase 1 cases — including
+* PendingDependencySourceState in arrays and wrappedDependencySourceMarker.
+*
+* The original state is NOT modified; only the registry is populated.
+* @internal
+*/
+function preCompleteAndRegisterDependencies(state, fieldParserPairs, registry) {
+	for (const [field, fieldParser] of fieldParserPairs) {
+		const fieldState = state[field];
+		let completed;
+		if (Array.isArray(fieldState) && fieldState.length === 1 && isPendingDependencySourceState(fieldState[0])) completed = fieldParser.complete(fieldState);
+		else if (fieldState === void 0 && isPendingDependencySourceState(fieldParser.initialState)) completed = fieldParser.complete([fieldParser.initialState]);
+		else if (fieldState === void 0 && isWrappedDependencySource(fieldParser)) {
+			const pendingState = fieldParser[wrappedDependencySourceMarker];
+			completed = fieldParser.complete([pendingState]);
+		} else if (fieldState != null && !Array.isArray(fieldState) && !isDependencySourceState(fieldState) && (isWrappedDependencySource(fieldParser) || isPendingDependencySourceState(fieldParser.initialState))) {
+			const annotatedFieldState = getAnnotatedFieldState(state, field, fieldParser);
+			completed = fieldParser.complete(annotatedFieldState);
+		} else continue;
+		const depState = wrapAsDependencySourceState(completed, fieldParser);
+		if (depState) registerCompletedDependency(depState, registry);
+	}
+}
+/**
+* Async version of {@link preCompleteAndRegisterDependencies}.
+* @internal
+*/
+async function preCompleteAndRegisterDependenciesAsync(state, fieldParserPairs, registry) {
+	for (const [field, fieldParser] of fieldParserPairs) {
+		const fieldState = state[field];
+		let completed;
+		if (Array.isArray(fieldState) && fieldState.length === 1 && isPendingDependencySourceState(fieldState[0])) completed = await fieldParser.complete(fieldState);
+		else if (fieldState === void 0 && isPendingDependencySourceState(fieldParser.initialState)) completed = await fieldParser.complete([fieldParser.initialState]);
+		else if (fieldState === void 0 && isWrappedDependencySource(fieldParser)) {
+			const pendingState = fieldParser[wrappedDependencySourceMarker];
+			completed = await fieldParser.complete([pendingState]);
+		} else if (fieldState != null && !Array.isArray(fieldState) && !isDependencySourceState(fieldState) && (isWrappedDependencySource(fieldParser) || isPendingDependencySourceState(fieldParser.initialState))) {
+			const annotatedFieldState = getAnnotatedFieldState(state, field, fieldParser);
+			completed = await fieldParser.complete(annotatedFieldState);
+		} else continue;
+		const depState = wrapAsDependencySourceState(completed, fieldParser);
+		if (depState) registerCompletedDependency(depState, registry);
+	}
+}
+/**
 * Recursively collects dependency values from DependencySourceState objects
 * found anywhere in the state tree.
 * @internal
@@ -869,8 +934,8 @@ function resolveDeferred(state, registry, visited = /* @__PURE__ */ new WeakSet(
 	}
 	return state;
 }
-function resolveDeferredParseStates(fieldStates) {
-	const registry = new DependencyRegistry();
+function resolveDeferredParseStates(fieldStates, initialRegistry) {
+	const registry = initialRegistry ?? new DependencyRegistry();
 	collectDependencies(fieldStates, registry);
 	return resolveDeferred(fieldStates, registry);
 }
@@ -916,8 +981,8 @@ async function resolveDeferredAsync(state, registry, visited = /* @__PURE__ */ n
 * Async version of resolveDeferredParseStates for async parsers.
 * @internal
 */
-async function resolveDeferredParseStatesAsync(fieldStates) {
-	const registry = new DependencyRegistry();
+async function resolveDeferredParseStatesAsync(fieldStates, initialRegistry) {
+	const registry = initialRegistry ?? new DependencyRegistry();
 	collectDependencies(fieldStates, registry);
 	return await resolveDeferredAsync(fieldStates, registry);
 }
@@ -1102,6 +1167,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		$mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
+		[fieldParsersKey]: parserPairs,
 		priority: Math.max(...parserKeys.map((k) => parsers[k].priority)),
 		usage: applyHiddenToUsage(parserPairs.flatMap(([_, p]) => p.usage), options.hidden),
 		get initialState() {
@@ -1724,10 +1790,12 @@ function merge(...args) {
 			error: message`No matching option or argument found.`
 		};
 	};
+	const mergedFieldParsers = collectChildFieldParsers(parsers);
 	return {
 		$mode: combinedMode,
 		$valueType: [],
 		$stateType: [],
+		[fieldParsersKey]: mergedFieldParsers,
 		priority: Math.max(...parsers.map((p) => p.priority)),
 		usage: applyHiddenToUsage(parsers.flatMap((p) => p.usage), options.hidden),
 		initialState,
@@ -1745,6 +1813,8 @@ function merge(...args) {
 					if (resolvedState && typeof resolvedState === "object") {
 						const extractedState = {};
 						for (const field in parser.initialState) extractedState[field] = field in resolvedState ? resolvedState[field] : parser.initialState[field];
+						const annotations = getAnnotations(resolvedState);
+						if (annotations !== void 0) return inheritAnnotations(resolvedState, extractedState);
 						return extractedState;
 					}
 					return parser.initialState;
@@ -1752,7 +1822,10 @@ function merge(...args) {
 				return parser.initialState;
 			};
 			if (!isAsync) {
-				const resolvedState = resolveDeferredParseStates(state);
+				const childFieldPairs = collectChildFieldParsers(syncParsers);
+				const registry = new DependencyRegistry();
+				preCompleteAndRegisterDependencies(state, childFieldPairs, registry);
+				const resolvedState = resolveDeferredParseStates(state, registry);
 				const object$1 = {};
 				for (let i = 0; i < syncParsers.length; i++) {
 					const parser = syncParsers[i];
@@ -1767,7 +1840,10 @@ function merge(...args) {
 				};
 			}
 			return (async () => {
-				const resolvedState = await resolveDeferredParseStatesAsync(state);
+				const childFieldPairs = collectChildFieldParsers(parsers);
+				const registry = new DependencyRegistry();
+				await preCompleteAndRegisterDependenciesAsync(state, childFieldPairs, registry);
+				const resolvedState = await resolveDeferredParseStatesAsync(state, registry);
 				const object$1 = {};
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
@@ -1799,19 +1875,23 @@ function merge(...args) {
 				}
 				return p.initialState;
 			};
-			const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new DependencyRegistry();
-			if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
-			const contextWithRegistry = {
-				...context,
-				dependencyRegistry: registry
-			};
 			if (isAsync) return async function* () {
+				const registry$1 = context.dependencyRegistry ? context.dependencyRegistry.clone() : new DependencyRegistry();
+				const childFieldPairs$1 = collectChildFieldParsers(parsers);
+				if (context.state && typeof context.state === "object") {
+					await preCompleteAndRegisterDependenciesAsync(context.state, childFieldPairs$1, registry$1);
+					collectDependencies(context.state, registry$1);
+				} else await completeDependencySourceDefaultsAsync(context, childFieldPairs$1, registry$1);
+				const contextWithRegistry$1 = {
+					...context,
+					dependencyRegistry: registry$1
+				};
 				const suggestions = [];
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
 					const parserState = extractState(parser, i);
 					const parserSuggestions = parser.suggest({
-						...contextWithRegistry,
+						...contextWithRegistry$1,
 						state: parserState
 					}, prefix);
 					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
@@ -1819,6 +1899,16 @@ function merge(...args) {
 				}
 				yield* deduplicateSuggestions(suggestions);
 			}();
+			const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new DependencyRegistry();
+			const childFieldPairs = collectChildFieldParsers(syncParsers);
+			if (context.state && typeof context.state === "object") {
+				preCompleteAndRegisterDependencies(context.state, childFieldPairs, registry);
+				collectDependencies(context.state, registry);
+			} else completeDependencySourceDefaults(context, childFieldPairs, registry);
+			const contextWithRegistry = {
+				...context,
+				dependencyRegistry: registry
+			};
 			return function* () {
 				const suggestions = [];
 				for (let i = 0; i < syncParsers.length; i++) {
@@ -2257,6 +2347,7 @@ function group(label, parser, options = {}) {
 		priority: parser.priority,
 		usage: applyHiddenToUsage(parser.usage, options.hidden),
 		initialState: parser.initialState,
+		...fieldParsersKey in parser ? { [fieldParsersKey]: parser[fieldParsersKey] } : {},
 		...typeof parser.shouldDeferCompletion === "function" ? { shouldDeferCompletion: parser.shouldDeferCompletion.bind(parser) } : {},
 		parse: (context) => parser.parse(context),
 		complete: (state) => parser.complete(state),

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.1265+4c1a69a0",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",