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

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/index.cjs

@@ -20,6 +20,7 @@ exports.annotationKey = require_annotations.annotationKey;
 exports.argument = require_primitives.argument;
 exports.bash = require_completion.bash;
 exports.checkBooleanOption = require_valueparser.checkBooleanOption;
+exports.checkEnumOption = require_valueparser.checkEnumOption;
 exports.choice = require_valueparser.choice;
 exports.cidr = require_valueparser.cidr;
 exports.command = require_primitives.command;

package/dist/index.d.cts

@@ -3,7 +3,7 @@ import { NonEmptyString, ensureNonEmptyString, isNonEmptyString } from "./nonemp
 import { Message, MessageFormatOptions, MessageTerm, ValueSetOptions, commandLine, envVar, formatMessage, lineBreak, link, message, metavar, optionName, optionNames, text, value, valueSet, values } from "./message.cjs";
 import { HiddenVisibility, OptionName, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, extractArgumentMetavars, extractCommandNames, extractOptionNames, formatUsage, formatUsageTerm, isDocHidden, isSuggestionHidden, isUsageHidden, mergeHidden, normalizeUsage } from "./usage.cjs";
 import { DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, ShowChoicesOptions, ShowDefaultOptions, formatDocPage } from "./doc.cjs";
-import { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, DomainOptions, EmailOptions, FloatOptions, HostnameOptions, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, LocaleOptions, MacAddressOptions, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, SocketAddressOptions, SocketAddressValue, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, checkBooleanOption, choice, cidr, domain, email, float, hostname, integer, ip, ipv4, ipv6, isValueParser, locale, macAddress, port, portRange, socketAddress, string, url, uuid } from "./valueparser.cjs";
+import { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, DomainOptions, EmailOptions, FloatOptions, HostnameOptions, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, LocaleOptions, MacAddressOptions, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, SocketAddressOptions, SocketAddressValue, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, checkBooleanOption, checkEnumOption, choice, cidr, domain, email, float, hostname, integer, ip, ipv4, ipv6, isValueParser, locale, macAddress, port, portRange, socketAddress, string, url, uuid } from "./valueparser.cjs";
 import { ConditionalErrorOptions, ConditionalOptions, DuplicateOptionError, GroupOptions, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, NoMatchContext, ObjectErrorOptions, ObjectOptions, OrErrorOptions, OrOptions, TupleOptions, concat, conditional, group, longestMatch, merge, object, or, tuple } from "./constructs.cjs";
 import { MultipleErrorOptions, MultipleOptions, WithDefaultError, WithDefaultOptions, map, multiple, nonEmpty, optional, withDefault } from "./modifiers.cjs";
 import { AnyDependencySource, CombineMode, CombinedDependencyMode, DeferredParseState, DependencyError, DependencyMode, DependencyRegistry, DependencySource, DependencySourceState, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, PendingDependencySourceState, ResolvedDependency, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, defaultValues, deferredParseMarker, dependency, dependencyId, dependencyIds, dependencySourceMarker, dependencySourceStateMarker, deriveFrom, deriveFromAsync, deriveFromSync, derivedValueParserMarker, formatDependencyError, getDefaultValuesFunction, getDependencyIds, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, parseWithDependency, pendingDependencySourceStateMarker, suggestWithDependency, transformsDependencyValue, transformsDependencyValueMarker, wrappedDependencySourceMarker } from "./dependency.cjs";
@@ -12,4 +12,4 @@ import { CombineModes, DocState, InferMode, InferValue, Mode, ModeIterable, Mode
 import { ShellCompletion, bash, fish, nu, pwsh, zsh } from "./completion.cjs";
 import { ParserValuePlaceholder, SourceContext } from "./context.cjs";
 import { CommandSubConfig, ContextOptionsParam, ExtractRequiredOptions, OptionSubConfig, RunOptions, RunParserError, RunWithOptions, SubstituteParserValue, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync } from "./facade.cjs";
-export { type Annotations, AnyDependencySource, ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, CombineMode, CombineModes, CombinedDependencyMode, CommandErrorOptions, CommandOptions, CommandSubConfig, ConditionalErrorOptions, ConditionalOptions, ContextOptionsParam, DeferredParseState, DependencyError, DependencyMode, DependencyRegistry, DependencySource, DependencySourceState, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DomainOptions, DuplicateOptionError, EmailOptions, ExtractRequiredOptions, FlagErrorOptions, FlagOptions, FloatOptions, GroupOptions, HiddenVisibility, HostnameOptions, InferMode, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MacAddressOptions, MergeOptions, type Message, type MessageFormatOptions, type MessageTerm, Mode, ModeIterable, ModeValue, MultipleErrorOptions, MultipleOptions, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OptionState, OptionSubConfig, OrErrorOptions, OrOptions, type ParseOptions, Parser, ParserContext, ParserResult, ParserValuePlaceholder, PassThroughFormat, PassThroughOptions, PendingDependencySourceState, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, ResolvedDependency, Result, RunOptions, RunParserError, RunWithOptions, ShellCompletion, ShowChoicesOptions, ShowDefaultOptions, SocketAddressOptions, SocketAddressValue, SourceContext, StringOptions, SubstituteParserValue, Suggestion, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, type ValueSetOptions, WithDefaultError, WithDefaultOptions, annotationKey, argument, bash, checkBooleanOption, choice, cidr, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, defaultValues, deferredParseMarker, dependency, dependencyId, dependencyIds, dependencySourceMarker, dependencySourceStateMarker, deriveFrom, deriveFromAsync, deriveFromSync, derivedValueParserMarker, domain, email, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fail, fish, flag, float, formatDependencyError, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getAnnotations, getDefaultValuesFunction, getDependencyIds, getDocPage, getDocPageAsync, getDocPageSync, group, hostname, integer, ip, ipv4, ipv6, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isDocHidden, isNonEmptyString, isPendingDependencySourceState, isSuggestionHidden, isUsageHidden, isValueParser, isWrappedDependencySource, lineBreak, link, locale, longestMatch, macAddress, map, merge, mergeHidden, message, metavar, multiple, nonEmpty, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, parseAsync, parseSync, parseWithDependency, passThrough, pendingDependencySourceStateMarker, port, portRange, pwsh, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync, socketAddress, string, suggest, suggestAsync, suggestSync, suggestWithDependency, text, transformsDependencyValue, transformsDependencyValueMarker, tuple, url, uuid, value, valueSet, values, withDefault, wrappedDependencySourceMarker, zsh };
+export { type Annotations, AnyDependencySource, ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, CombineMode, CombineModes, CombinedDependencyMode, CommandErrorOptions, CommandOptions, CommandSubConfig, ConditionalErrorOptions, ConditionalOptions, ContextOptionsParam, DeferredParseState, DependencyError, DependencyMode, DependencyRegistry, DependencySource, DependencySourceState, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DomainOptions, DuplicateOptionError, EmailOptions, ExtractRequiredOptions, FlagErrorOptions, FlagOptions, FloatOptions, GroupOptions, HiddenVisibility, HostnameOptions, InferMode, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MacAddressOptions, MergeOptions, type Message, type MessageFormatOptions, type MessageTerm, Mode, ModeIterable, ModeValue, MultipleErrorOptions, MultipleOptions, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OptionState, OptionSubConfig, OrErrorOptions, OrOptions, type ParseOptions, Parser, ParserContext, ParserResult, ParserValuePlaceholder, PassThroughFormat, PassThroughOptions, PendingDependencySourceState, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, ResolvedDependency, Result, RunOptions, RunParserError, RunWithOptions, ShellCompletion, ShowChoicesOptions, ShowDefaultOptions, SocketAddressOptions, SocketAddressValue, SourceContext, StringOptions, SubstituteParserValue, Suggestion, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, type ValueSetOptions, WithDefaultError, WithDefaultOptions, annotationKey, argument, bash, checkBooleanOption, checkEnumOption, choice, cidr, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, defaultValues, deferredParseMarker, dependency, dependencyId, dependencyIds, dependencySourceMarker, dependencySourceStateMarker, deriveFrom, deriveFromAsync, deriveFromSync, derivedValueParserMarker, domain, email, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fail, fish, flag, float, formatDependencyError, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getAnnotations, getDefaultValuesFunction, getDependencyIds, getDocPage, getDocPageAsync, getDocPageSync, group, hostname, integer, ip, ipv4, ipv6, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isDocHidden, isNonEmptyString, isPendingDependencySourceState, isSuggestionHidden, isUsageHidden, isValueParser, isWrappedDependencySource, lineBreak, link, locale, longestMatch, macAddress, map, merge, mergeHidden, message, metavar, multiple, nonEmpty, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, parseAsync, parseSync, parseWithDependency, passThrough, pendingDependencySourceStateMarker, port, portRange, pwsh, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync, socketAddress, string, suggest, suggestAsync, suggestSync, suggestWithDependency, text, transformsDependencyValue, transformsDependencyValueMarker, tuple, url, uuid, value, valueSet, values, withDefault, wrappedDependencySourceMarker, zsh };

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { NonEmptyString, ensureNonEmptyString, isNonEmptyString } from "./nonemp
 import { Message, MessageFormatOptions, MessageTerm, ValueSetOptions, commandLine, envVar, formatMessage, lineBreak, link, message, metavar, optionName, optionNames, text, value, valueSet, values } from "./message.js";
 import { HiddenVisibility, OptionName, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, extractArgumentMetavars, extractCommandNames, extractOptionNames, formatUsage, formatUsageTerm, isDocHidden, isSuggestionHidden, isUsageHidden, mergeHidden, normalizeUsage } from "./usage.js";
 import { DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, ShowChoicesOptions, ShowDefaultOptions, formatDocPage } from "./doc.js";
-import { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, DomainOptions, EmailOptions, FloatOptions, HostnameOptions, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, LocaleOptions, MacAddressOptions, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, SocketAddressOptions, SocketAddressValue, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, checkBooleanOption, choice, cidr, domain, email, float, hostname, integer, ip, ipv4, ipv6, isValueParser, locale, macAddress, port, portRange, socketAddress, string, url, uuid } from "./valueparser.js";
+import { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, DomainOptions, EmailOptions, FloatOptions, HostnameOptions, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, LocaleOptions, MacAddressOptions, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, SocketAddressOptions, SocketAddressValue, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, checkBooleanOption, checkEnumOption, choice, cidr, domain, email, float, hostname, integer, ip, ipv4, ipv6, isValueParser, locale, macAddress, port, portRange, socketAddress, string, url, uuid } from "./valueparser.js";
 import { ConditionalErrorOptions, ConditionalOptions, DuplicateOptionError, GroupOptions, LongestMatchErrorOptions, LongestMatchOptions, MergeOptions, NoMatchContext, ObjectErrorOptions, ObjectOptions, OrErrorOptions, OrOptions, TupleOptions, concat, conditional, group, longestMatch, merge, object, or, tuple } from "./constructs.js";
 import { MultipleErrorOptions, MultipleOptions, WithDefaultError, WithDefaultOptions, map, multiple, nonEmpty, optional, withDefault } from "./modifiers.js";
 import { AnyDependencySource, CombineMode, CombinedDependencyMode, DeferredParseState, DependencyError, DependencyMode, DependencyRegistry, DependencySource, DependencySourceState, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, PendingDependencySourceState, ResolvedDependency, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, defaultValues, deferredParseMarker, dependency, dependencyId, dependencyIds, dependencySourceMarker, dependencySourceStateMarker, deriveFrom, deriveFromAsync, deriveFromSync, derivedValueParserMarker, formatDependencyError, getDefaultValuesFunction, getDependencyIds, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, isWrappedDependencySource, parseWithDependency, pendingDependencySourceStateMarker, suggestWithDependency, transformsDependencyValue, transformsDependencyValueMarker, wrappedDependencySourceMarker } from "./dependency.js";
@@ -12,4 +12,4 @@ import { CombineModes, DocState, InferMode, InferValue, Mode, ModeIterable, Mode
 import { ShellCompletion, bash, fish, nu, pwsh, zsh } from "./completion.js";
 import { ParserValuePlaceholder, SourceContext } from "./context.js";
 import { CommandSubConfig, ContextOptionsParam, ExtractRequiredOptions, OptionSubConfig, RunOptions, RunParserError, RunWithOptions, SubstituteParserValue, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync } from "./facade.js";
-export { type Annotations, AnyDependencySource, ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, CombineMode, CombineModes, CombinedDependencyMode, CommandErrorOptions, CommandOptions, CommandSubConfig, ConditionalErrorOptions, ConditionalOptions, ContextOptionsParam, DeferredParseState, DependencyError, DependencyMode, DependencyRegistry, DependencySource, DependencySourceState, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DomainOptions, DuplicateOptionError, EmailOptions, ExtractRequiredOptions, FlagErrorOptions, FlagOptions, FloatOptions, GroupOptions, HiddenVisibility, HostnameOptions, InferMode, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MacAddressOptions, MergeOptions, type Message, type MessageFormatOptions, type MessageTerm, Mode, ModeIterable, ModeValue, MultipleErrorOptions, MultipleOptions, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OptionState, OptionSubConfig, OrErrorOptions, OrOptions, type ParseOptions, Parser, ParserContext, ParserResult, ParserValuePlaceholder, PassThroughFormat, PassThroughOptions, PendingDependencySourceState, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, ResolvedDependency, Result, RunOptions, RunParserError, RunWithOptions, ShellCompletion, ShowChoicesOptions, ShowDefaultOptions, SocketAddressOptions, SocketAddressValue, SourceContext, StringOptions, SubstituteParserValue, Suggestion, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, type ValueSetOptions, WithDefaultError, WithDefaultOptions, annotationKey, argument, bash, checkBooleanOption, choice, cidr, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, defaultValues, deferredParseMarker, dependency, dependencyId, dependencyIds, dependencySourceMarker, dependencySourceStateMarker, deriveFrom, deriveFromAsync, deriveFromSync, derivedValueParserMarker, domain, email, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fail, fish, flag, float, formatDependencyError, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getAnnotations, getDefaultValuesFunction, getDependencyIds, getDocPage, getDocPageAsync, getDocPageSync, group, hostname, integer, ip, ipv4, ipv6, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isDocHidden, isNonEmptyString, isPendingDependencySourceState, isSuggestionHidden, isUsageHidden, isValueParser, isWrappedDependencySource, lineBreak, link, locale, longestMatch, macAddress, map, merge, mergeHidden, message, metavar, multiple, nonEmpty, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, parseAsync, parseSync, parseWithDependency, passThrough, pendingDependencySourceStateMarker, port, portRange, pwsh, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync, socketAddress, string, suggest, suggestAsync, suggestSync, suggestWithDependency, text, transformsDependencyValue, transformsDependencyValueMarker, tuple, url, uuid, value, valueSet, values, withDefault, wrappedDependencySourceMarker, zsh };
+export { type Annotations, AnyDependencySource, ArgumentErrorOptions, ArgumentOptions, ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, CombineMode, CombineModes, CombinedDependencyMode, CommandErrorOptions, CommandOptions, CommandSubConfig, ConditionalErrorOptions, ConditionalOptions, ContextOptionsParam, DeferredParseState, DependencyError, DependencyMode, DependencyRegistry, DependencySource, DependencySourceState, DependencyValue, DependencyValues, DeriveAsyncOptions, DeriveFromAsyncOptions, DeriveFromOptions, DeriveFromSyncOptions, DeriveOptions, DeriveSyncOptions, DerivedValueParser, DocEntry, DocFragment, DocFragments, DocPage, DocPageFormatOptions, DocSection, DocState, DomainOptions, DuplicateOptionError, EmailOptions, ExtractRequiredOptions, FlagErrorOptions, FlagOptions, FloatOptions, GroupOptions, HiddenVisibility, HostnameOptions, InferMode, InferValue, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, LocaleOptions, LongestMatchErrorOptions, LongestMatchOptions, MacAddressOptions, MergeOptions, type Message, type MessageFormatOptions, type MessageTerm, Mode, ModeIterable, ModeValue, MultipleErrorOptions, MultipleOptions, NoMatchContext, NonEmptyString, ObjectErrorOptions, ObjectOptions, OptionErrorOptions, OptionName, OptionOptions, OptionState, OptionSubConfig, OrErrorOptions, OrOptions, type ParseOptions, Parser, ParserContext, ParserResult, ParserValuePlaceholder, PassThroughFormat, PassThroughOptions, PendingDependencySourceState, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, ResolvedDependency, Result, RunOptions, RunParserError, RunWithOptions, ShellCompletion, ShowChoicesOptions, ShowDefaultOptions, SocketAddressOptions, SocketAddressValue, SourceContext, StringOptions, SubstituteParserValue, Suggestion, TupleOptions, UrlOptions, Usage, UsageFormatOptions, UsageTerm, UsageTermFormatOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, type ValueSetOptions, WithDefaultError, WithDefaultOptions, annotationKey, argument, bash, checkBooleanOption, checkEnumOption, choice, cidr, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, defaultValues, deferredParseMarker, dependency, dependencyId, dependencyIds, dependencySourceMarker, dependencySourceStateMarker, deriveFrom, deriveFromAsync, deriveFromSync, derivedValueParserMarker, domain, email, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fail, fish, flag, float, formatDependencyError, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getAnnotations, getDefaultValuesFunction, getDependencyIds, getDocPage, getDocPageAsync, getDocPageSync, group, hostname, integer, ip, ipv4, ipv6, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isDocHidden, isNonEmptyString, isPendingDependencySourceState, isSuggestionHidden, isUsageHidden, isValueParser, isWrappedDependencySource, lineBreak, link, locale, longestMatch, macAddress, map, merge, mergeHidden, message, metavar, multiple, nonEmpty, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, parseAsync, parseSync, parseWithDependency, passThrough, pendingDependencySourceStateMarker, port, portRange, pwsh, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync, socketAddress, string, suggest, suggestAsync, suggestSync, suggestWithDependency, text, transformsDependencyValue, transformsDependencyValueMarker, tuple, url, uuid, value, valueSet, values, withDefault, wrappedDependencySourceMarker, zsh };

package/dist/index.js

@@ -7,9 +7,9 @@ import { DuplicateOptionError, concat, conditional, group, longestMatch, merge,
 import { formatDocPage } from "./doc.js";
 import { WithDefaultError, map, multiple, nonEmpty, optional, withDefault } from "./modifiers.js";
 import { ensureNonEmptyString, isNonEmptyString } from "./nonempty.js";
-import { checkBooleanOption, choice, cidr, domain, email, float, hostname, integer, ip, ipv4, ipv6, isValueParser, locale, macAddress, port, portRange, socketAddress, string, url, uuid } from "./valueparser.js";
+import { checkBooleanOption, checkEnumOption, choice, cidr, domain, email, float, hostname, integer, ip, ipv4, ipv6, isValueParser, locale, macAddress, port, portRange, socketAddress, string, url, uuid } from "./valueparser.js";
 import { argument, command, constant, fail, flag, option, passThrough } from "./primitives.js";
 import { getDocPage, getDocPageAsync, getDocPageSync, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync } from "./parser.js";
 import { RunParserError, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync } from "./facade.js";
 
-export { DependencyRegistry, DuplicateOptionError, RunParserError, WithDefaultError, annotationKey, argument, bash, checkBooleanOption, choice, cidr, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, defaultValues, deferredParseMarker, dependency, dependencyId, dependencyIds, dependencySourceMarker, dependencySourceStateMarker, deriveFrom, deriveFromAsync, deriveFromSync, derivedValueParserMarker, domain, email, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fail, fish, flag, float, formatDependencyError, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getAnnotations, getDefaultValuesFunction, getDependencyIds, getDocPage, getDocPageAsync, getDocPageSync, group, hostname, integer, ip, ipv4, ipv6, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isDocHidden, isNonEmptyString, isPendingDependencySourceState, isSuggestionHidden, isUsageHidden, isValueParser, isWrappedDependencySource, lineBreak, link, locale, longestMatch, macAddress, map, merge, mergeHidden, message, metavar, multiple, nonEmpty, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, parseAsync, parseSync, parseWithDependency, passThrough, pendingDependencySourceStateMarker, port, portRange, pwsh, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync, socketAddress, string, suggest, suggestAsync, suggestSync, suggestWithDependency, text, transformsDependencyValue, transformsDependencyValueMarker, tuple, url, uuid, value, valueSet, values, withDefault, wrappedDependencySourceMarker, zsh };
+export { DependencyRegistry, DuplicateOptionError, RunParserError, WithDefaultError, annotationKey, argument, bash, checkBooleanOption, checkEnumOption, choice, cidr, command, commandLine, concat, conditional, constant, createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, defaultValues, deferredParseMarker, dependency, dependencyId, dependencyIds, dependencySourceMarker, dependencySourceStateMarker, deriveFrom, deriveFromAsync, deriveFromSync, derivedValueParserMarker, domain, email, ensureNonEmptyString, envVar, extractArgumentMetavars, extractCommandNames, extractOptionNames, fail, fish, flag, float, formatDependencyError, formatDocPage, formatMessage, formatUsage, formatUsageTerm, getAnnotations, getDefaultValuesFunction, getDependencyIds, getDocPage, getDocPageAsync, getDocPageSync, group, hostname, integer, ip, ipv4, ipv6, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isDocHidden, isNonEmptyString, isPendingDependencySourceState, isSuggestionHidden, isUsageHidden, isValueParser, isWrappedDependencySource, lineBreak, link, locale, longestMatch, macAddress, map, merge, mergeHidden, message, metavar, multiple, nonEmpty, normalizeUsage, nu, object, option, optionName, optionNames, optional, or, parse, parseAsync, parseSync, parseWithDependency, passThrough, pendingDependencySourceStateMarker, port, portRange, pwsh, runParser, runParserAsync, runParserSync, runWith, runWithAsync, runWithSync, socketAddress, string, suggest, suggestAsync, suggestSync, suggestWithDependency, text, transformsDependencyValue, transformsDependencyValueMarker, tuple, url, uuid, value, valueSet, values, withDefault, wrappedDependencySourceMarker, zsh };

package/dist/valueparser.cjs

@@ -173,6 +173,26 @@ function checkBooleanOption(options, key) {
 	if (value !== void 0 && typeof value !== "boolean") throw new TypeError(`Expected ${String(key)} to be a boolean, but got ${typeof value}: ${String(value)}.`);
 }
 /**
+* Validates that an option value, if present, is one of the allowed values.
+* Throws a {@link TypeError} if the value is defined but not in the allowed
+* list.
+*
+* @template T The type of the options object.
+* @param options The options object to check.
+* @param key The key of the option to validate.
+* @param allowed The list of allowed values.
+* @throws {TypeError} If the option value is defined but not in the allowed
+*   list.
+* @since 1.0.0
+*/
+function checkEnumOption(options, key, allowed) {
+	const value = options?.[key];
+	if (value !== void 0 && (typeof value !== "string" || !allowed.includes(value))) {
+		const rendered = typeof value === "string" ? JSON.stringify(value) : typeof value === "symbol" ? value.toString() : String(value);
+		throw new TypeError(`Expected ${String(key)} to be one of ${allowed.map((v) => JSON.stringify(v)).join(", ")}, but got ${typeof value}: ${rendered}.`);
+	}
+}
+/**
 * Expands a numeric string in scientific notation (e.g., `"1e+21"`,
 * `"1.5e-3"`, `".1e-6"`) into plain decimal form for normalization.
 * Used for both canonical `String(number)` output and user input.
@@ -1877,6 +1897,24 @@ function portRange(options) {
 * ```
 */
 function macAddress(options) {
+	checkEnumOption(options, "separator", [
+		":",
+		"-",
+		".",
+		"none",
+		"any"
+	]);
+	checkEnumOption(options, "outputSeparator", [
+		":",
+		"-",
+		".",
+		"none"
+	]);
+	checkEnumOption(options, "case", [
+		"preserve",
+		"upper",
+		"lower"
+	]);
 	const separator = options?.separator ?? "any";
 	const caseOption = options?.case ?? "preserve";
 	const outputSeparator = options?.outputSeparator;
@@ -3072,6 +3110,7 @@ function cidr(options) {
 
 //#endregion
 exports.checkBooleanOption = checkBooleanOption;
+exports.checkEnumOption = checkEnumOption;
 exports.choice = choice;
 exports.cidr = cidr;
 exports.domain = domain;

package/dist/valueparser.d.cts

@@ -244,6 +244,20 @@ declare function choice<const T extends number>(choices: readonly T[], options?:
  * @since 1.0.0
  */
 declare function checkBooleanOption<T extends object>(options: T | undefined, key: keyof T): void;
+/**
+ * Validates that an option value, if present, is one of the allowed values.
+ * Throws a {@link TypeError} if the value is defined but not in the allowed
+ * list.
+ *
+ * @template T The type of the options object.
+ * @param options The options object to check.
+ * @param key The key of the option to validate.
+ * @param allowed The list of allowed values.
+ * @throws {TypeError} If the option value is defined but not in the allowed
+ *   list.
+ * @since 1.0.0
+ */
+declare function checkEnumOption<T extends object>(options: T | undefined, key: keyof T, allowed: readonly string[]): void;
 /**
  * Creates a {@link ValueParser} for strings.
  *
@@ -1995,4 +2009,4 @@ interface CidrOptions {
  */
 declare function cidr(options?: CidrOptions): ValueParser<"sync", CidrValue>;
 //#endregion
-export { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, DomainOptions, EmailOptions, FloatOptions, HostnameOptions, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, LocaleOptions, MacAddressOptions, type Mode, type ModeIterable, type ModeValue, type NonEmptyString, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, SocketAddressOptions, SocketAddressValue, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, checkBooleanOption, choice, cidr, domain, email, ensureNonEmptyString, float, hostname, integer, ip, ipv4, ipv6, isNonEmptyString, isValueParser, locale, macAddress, port, portRange, socketAddress, string, url, uuid };
+export { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, DomainOptions, EmailOptions, FloatOptions, HostnameOptions, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, LocaleOptions, MacAddressOptions, type Mode, type ModeIterable, type ModeValue, type NonEmptyString, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, SocketAddressOptions, SocketAddressValue, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, checkBooleanOption, checkEnumOption, choice, cidr, domain, email, ensureNonEmptyString, float, hostname, integer, ip, ipv4, ipv6, isNonEmptyString, isValueParser, locale, macAddress, port, portRange, socketAddress, string, url, uuid };

package/dist/valueparser.d.ts

@@ -244,6 +244,20 @@ declare function choice<const T extends number>(choices: readonly T[], options?:
  * @since 1.0.0
  */
 declare function checkBooleanOption<T extends object>(options: T | undefined, key: keyof T): void;
+/**
+ * Validates that an option value, if present, is one of the allowed values.
+ * Throws a {@link TypeError} if the value is defined but not in the allowed
+ * list.
+ *
+ * @template T The type of the options object.
+ * @param options The options object to check.
+ * @param key The key of the option to validate.
+ * @param allowed The list of allowed values.
+ * @throws {TypeError} If the option value is defined but not in the allowed
+ *   list.
+ * @since 1.0.0
+ */
+declare function checkEnumOption<T extends object>(options: T | undefined, key: keyof T, allowed: readonly string[]): void;
 /**
  * Creates a {@link ValueParser} for strings.
  *
@@ -1995,4 +2009,4 @@ interface CidrOptions {
  */
 declare function cidr(options?: CidrOptions): ValueParser<"sync", CidrValue>;
 //#endregion
-export { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, DomainOptions, EmailOptions, FloatOptions, HostnameOptions, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, LocaleOptions, MacAddressOptions, type Mode, type ModeIterable, type ModeValue, type NonEmptyString, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, SocketAddressOptions, SocketAddressValue, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, checkBooleanOption, choice, cidr, domain, email, ensureNonEmptyString, float, hostname, integer, ip, ipv4, ipv6, isNonEmptyString, isValueParser, locale, macAddress, port, portRange, socketAddress, string, url, uuid };
+export { ChoiceOptions, ChoiceOptionsBase, ChoiceOptionsNumber, ChoiceOptionsString, CidrOptions, CidrValue, DomainOptions, EmailOptions, FloatOptions, HostnameOptions, IntegerOptionsBigInt, IntegerOptionsNumber, IpOptions, Ipv4Options, Ipv6Options, LocaleOptions, MacAddressOptions, type Mode, type ModeIterable, type ModeValue, type NonEmptyString, PortOptionsBigInt, PortOptionsNumber, PortRangeOptionsBigInt, PortRangeOptionsNumber, PortRangeValueBigInt, PortRangeValueNumber, SocketAddressOptions, SocketAddressValue, StringOptions, UrlOptions, Uuid, UuidOptions, ValueParser, ValueParserResult, checkBooleanOption, checkEnumOption, choice, cidr, domain, email, ensureNonEmptyString, float, hostname, integer, ip, ipv4, ipv6, isNonEmptyString, isValueParser, locale, macAddress, port, portRange, socketAddress, string, url, uuid };

package/dist/valueparser.js

@@ -173,6 +173,26 @@ function checkBooleanOption(options, key) {
 	if (value !== void 0 && typeof value !== "boolean") throw new TypeError(`Expected ${String(key)} to be a boolean, but got ${typeof value}: ${String(value)}.`);
 }
 /**
+* Validates that an option value, if present, is one of the allowed values.
+* Throws a {@link TypeError} if the value is defined but not in the allowed
+* list.
+*
+* @template T The type of the options object.
+* @param options The options object to check.
+* @param key The key of the option to validate.
+* @param allowed The list of allowed values.
+* @throws {TypeError} If the option value is defined but not in the allowed
+*   list.
+* @since 1.0.0
+*/
+function checkEnumOption(options, key, allowed) {
+	const value = options?.[key];
+	if (value !== void 0 && (typeof value !== "string" || !allowed.includes(value))) {
+		const rendered = typeof value === "string" ? JSON.stringify(value) : typeof value === "symbol" ? value.toString() : String(value);
+		throw new TypeError(`Expected ${String(key)} to be one of ${allowed.map((v) => JSON.stringify(v)).join(", ")}, but got ${typeof value}: ${rendered}.`);
+	}
+}
+/**
 * Expands a numeric string in scientific notation (e.g., `"1e+21"`,
 * `"1.5e-3"`, `".1e-6"`) into plain decimal form for normalization.
 * Used for both canonical `String(number)` output and user input.
@@ -1877,6 +1897,24 @@ function portRange(options) {
 * ```
 */
 function macAddress(options) {
+	checkEnumOption(options, "separator", [
+		":",
+		"-",
+		".",
+		"none",
+		"any"
+	]);
+	checkEnumOption(options, "outputSeparator", [
+		":",
+		"-",
+		".",
+		"none"
+	]);
+	checkEnumOption(options, "case", [
+		"preserve",
+		"upper",
+		"lower"
+	]);
 	const separator = options?.separator ?? "any";
 	const caseOption = options?.case ?? "preserve";
 	const outputSeparator = options?.outputSeparator;
@@ -3071,4 +3109,4 @@ function cidr(options) {
 }
 
 //#endregion
-export { checkBooleanOption, choice, cidr, domain, email, ensureNonEmptyString, float, hostname, integer, ip, ipv4, ipv6, isNonEmptyString, isValueParser, locale, macAddress, port, portRange, socketAddress, string, url, uuid };
+export { checkBooleanOption, checkEnumOption, choice, cidr, domain, email, ensureNonEmptyString, float, hostname, integer, ip, ipv4, ipv6, isNonEmptyString, isValueParser, locale, macAddress, port, portRange, socketAddress, string, url, uuid };

package/package.json

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