@optique/core 1.0.0-dev.1895 → 1.0.0-dev.1899

package/dist/annotation-state.cjs

@@ -92,6 +92,46 @@ function isPendingNestedNormalizationAlias(originalValue, normalizedValue, seen)
 	const entry = seen.get(originalValue);
 	return entry != null && !entry.finalized && entry.clone === normalizedValue;
 }
+function createPendingNestedNormalizationClone(source) {
+	return Array.isArray(source) ? [] : Object.create(Object.getPrototypeOf(source));
+}
+function normalizeNestedDelegatedStructuredState(source, seen) {
+	const clone = createPendingNestedNormalizationClone(source);
+	const entry = {
+		clone,
+		finalized: false,
+		result: clone
+	};
+	seen.set(source, entry);
+	const overrides = /* @__PURE__ */ new Map();
+	let changed = false;
+	for (const key of Reflect.ownKeys(source)) {
+		const descriptor = Object.getOwnPropertyDescriptor(source, key);
+		if (descriptor == null || !("value" in descriptor)) continue;
+		const nextValue = normalizeNestedDelegatedAnnotationState(descriptor.value, seen);
+		if (nextValue === descriptor.value) continue;
+		overrides.set(key, nextValue);
+		if (!isPendingNestedNormalizationAlias(descriptor.value, nextValue, seen)) changed = true;
+	}
+	if (!changed) {
+		entry.finalized = true;
+		entry.result = source;
+		return source;
+	}
+	const descriptors = Object.getOwnPropertyDescriptors(source);
+	for (const [key, nextValue] of overrides) {
+		const descriptor = descriptors[key];
+		if (descriptor == null || !("value" in descriptor)) continue;
+		descriptors[key] = {
+			...descriptor,
+			value: nextValue
+		};
+	}
+	Object.defineProperties(clone, descriptors);
+	entry.finalized = true;
+	entry.result = clone;
+	return clone;
+}
 /**
 * Recursively removes delegated annotation carriers from plain-object and array
 * structures.
@@ -114,55 +154,10 @@ function normalizeNestedDelegatedAnnotationState(value, seen = /* @__PURE__ */ n
 	const source = normalized;
 	const existing = seen.get(source);
 	if (existing != null) return existing.finalized ? existing.result : existing.clone;
-	if (Array.isArray(source)) {
-		let changed$1 = false;
-		const clone$1 = require_annotations.annotateFreshArray(source, source.slice());
-		const entry$1 = {
-			clone: clone$1,
-			finalized: false,
-			result: clone$1
-		};
-		seen.set(source, entry$1);
-		for (let i = 0; i < source.length; i++) {
-			const nextValue = normalizeNestedDelegatedAnnotationState(source[i], seen);
-			if (nextValue !== source[i]) {
-				clone$1[i] = nextValue;
-				if (!isPendingNestedNormalizationAlias(source[i], nextValue, seen)) changed$1 = true;
-			}
-		}
-		entry$1.finalized = true;
-		entry$1.result = changed$1 ? clone$1 : source;
-		return changed$1 ? clone$1 : source;
-	}
+	if (Array.isArray(source)) return normalizeNestedDelegatedStructuredState(source, seen);
 	const proto = Object.getPrototypeOf(source);
 	if (proto !== Object.prototype && proto !== null) return normalized;
-	const descriptors = Object.getOwnPropertyDescriptors(source);
-	let changed = false;
-	const clone = Object.create(proto);
-	const entry = {
-		clone,
-		finalized: false,
-		result: clone
-	};
-	seen.set(source, entry);
-	for (const key of Reflect.ownKeys(descriptors)) {
-		const descriptor = descriptors[key];
-		if (descriptor != null && "value" in descriptor) {
-			const nextValue = normalizeNestedDelegatedAnnotationState(descriptor.value, seen);
-			if (nextValue !== descriptor.value) {
-				descriptors[key] = {
-					...descriptor,
-					value: nextValue
-				};
-				if (!isPendingNestedNormalizationAlias(descriptor.value, nextValue, seen)) changed = true;
-			}
-		}
-	}
-	entry.finalized = true;
-	entry.result = changed ? clone : source;
-	if (!changed) return source;
-	Object.defineProperties(clone, descriptors);
-	return clone;
+	return normalizeNestedDelegatedStructuredState(source, seen);
 }
 /**
 * Creates a short-lived delegated state that exposes the parent's annotations

package/dist/annotation-state.js

@@ -1,4 +1,4 @@
-import { annotateFreshArray, annotationKey, getAnnotations, inheritAnnotations, injectAnnotations, isInjectedAnnotationWrapper, unwrapInjectedAnnotationWrapper } from "./annotations.js";
+import { annotationKey, getAnnotations, inheritAnnotations, injectAnnotations, isInjectedAnnotationWrapper, unwrapInjectedAnnotationWrapper } from "./annotations.js";
 import { inheritParentAnnotationsKey } from "./parser.js";
 
 //#region src/annotation-state.ts
@@ -92,6 +92,46 @@ function isPendingNestedNormalizationAlias(originalValue, normalizedValue, seen)
 	const entry = seen.get(originalValue);
 	return entry != null && !entry.finalized && entry.clone === normalizedValue;
 }
+function createPendingNestedNormalizationClone(source) {
+	return Array.isArray(source) ? [] : Object.create(Object.getPrototypeOf(source));
+}
+function normalizeNestedDelegatedStructuredState(source, seen) {
+	const clone = createPendingNestedNormalizationClone(source);
+	const entry = {
+		clone,
+		finalized: false,
+		result: clone
+	};
+	seen.set(source, entry);
+	const overrides = /* @__PURE__ */ new Map();
+	let changed = false;
+	for (const key of Reflect.ownKeys(source)) {
+		const descriptor = Object.getOwnPropertyDescriptor(source, key);
+		if (descriptor == null || !("value" in descriptor)) continue;
+		const nextValue = normalizeNestedDelegatedAnnotationState(descriptor.value, seen);
+		if (nextValue === descriptor.value) continue;
+		overrides.set(key, nextValue);
+		if (!isPendingNestedNormalizationAlias(descriptor.value, nextValue, seen)) changed = true;
+	}
+	if (!changed) {
+		entry.finalized = true;
+		entry.result = source;
+		return source;
+	}
+	const descriptors = Object.getOwnPropertyDescriptors(source);
+	for (const [key, nextValue] of overrides) {
+		const descriptor = descriptors[key];
+		if (descriptor == null || !("value" in descriptor)) continue;
+		descriptors[key] = {
+			...descriptor,
+			value: nextValue
+		};
+	}
+	Object.defineProperties(clone, descriptors);
+	entry.finalized = true;
+	entry.result = clone;
+	return clone;
+}
 /**
 * Recursively removes delegated annotation carriers from plain-object and array
 * structures.
@@ -114,55 +154,10 @@ function normalizeNestedDelegatedAnnotationState(value, seen = /* @__PURE__ */ n
 	const source = normalized;
 	const existing = seen.get(source);
 	if (existing != null) return existing.finalized ? existing.result : existing.clone;
-	if (Array.isArray(source)) {
-		let changed$1 = false;
-		const clone$1 = annotateFreshArray(source, source.slice());
-		const entry$1 = {
-			clone: clone$1,
-			finalized: false,
-			result: clone$1
-		};
-		seen.set(source, entry$1);
-		for (let i = 0; i < source.length; i++) {
-			const nextValue = normalizeNestedDelegatedAnnotationState(source[i], seen);
-			if (nextValue !== source[i]) {
-				clone$1[i] = nextValue;
-				if (!isPendingNestedNormalizationAlias(source[i], nextValue, seen)) changed$1 = true;
-			}
-		}
-		entry$1.finalized = true;
-		entry$1.result = changed$1 ? clone$1 : source;
-		return changed$1 ? clone$1 : source;
-	}
+	if (Array.isArray(source)) return normalizeNestedDelegatedStructuredState(source, seen);
 	const proto = Object.getPrototypeOf(source);
 	if (proto !== Object.prototype && proto !== null) return normalized;
-	const descriptors = Object.getOwnPropertyDescriptors(source);
-	let changed = false;
-	const clone = Object.create(proto);
-	const entry = {
-		clone,
-		finalized: false,
-		result: clone
-	};
-	seen.set(source, entry);
-	for (const key of Reflect.ownKeys(descriptors)) {
-		const descriptor = descriptors[key];
-		if (descriptor != null && "value" in descriptor) {
-			const nextValue = normalizeNestedDelegatedAnnotationState(descriptor.value, seen);
-			if (nextValue !== descriptor.value) {
-				descriptors[key] = {
-					...descriptor,
-					value: nextValue
-				};
-				if (!isPendingNestedNormalizationAlias(descriptor.value, nextValue, seen)) changed = true;
-			}
-		}
-	}
-	entry.finalized = true;
-	entry.result = changed ? clone : source;
-	if (!changed) return source;
-	Object.defineProperties(clone, descriptors);
-	return clone;
+	return normalizeNestedDelegatedStructuredState(source, seen);
 }
 /**
 * Creates a short-lived delegated state that exposes the parent's annotations

package/dist/modifiers.cjs

@@ -277,6 +277,13 @@ function normalizeOptionalLikeInnerState(state, initialState, parser) {
 	if (state != null && typeof state === "object") return state;
 	return initialState;
 }
+function normalizeOptionalLikeSuggestState(state, initialState, parser) {
+	if (Array.isArray(state)) {
+		const innerState = state[0];
+		return innerState != null && typeof innerState === "object" ? require_annotation_state.getDelegatedAnnotationState(state, innerState) : innerState;
+	}
+	return normalizeOptionalLikeInnerState(state, initialState, parser);
+}
 /**
 * Creates a parser that makes another parser optional, allowing it to succeed
 * without consuming input if the wrapped parser fails to match.
@@ -292,14 +299,14 @@ function normalizeOptionalLikeInnerState(state, initialState, parser) {
 function optional(parser) {
 	const syncParser = parser;
 	function* suggestSync(context, prefix) {
-		const innerState = normalizeOptionalLikeInnerState(context.state, syncParser.initialState, parser);
+		const innerState = normalizeOptionalLikeSuggestState(context.state, syncParser.initialState, parser);
 		yield* syncParser.suggest({
 			...context,
 			state: innerState
 		}, prefix);
 	}
 	async function* suggestAsync(context, prefix) {
-		const innerState = normalizeOptionalLikeInnerState(context.state, syncParser.initialState, parser);
+		const innerState = normalizeOptionalLikeSuggestState(context.state, syncParser.initialState, parser);
 		const suggestions = parser.suggest({
 			...context,
 			state: innerState
@@ -327,7 +334,7 @@ function optional(parser) {
 				parser: optionalParser,
 				state
 			}];
-			const innerState = normalizeOptionalLikeInnerState(state, parser.initialState, parser);
+			const innerState = normalizeOptionalLikeSuggestState(state, parser.initialState, parser);
 			return parser.getSuggestRuntimeNodes?.(innerState, path) ?? (parser.dependencyMetadata?.source != null ? [{
 				path,
 				parser,
@@ -461,14 +468,14 @@ function withDefault(parser, defaultValue, options) {
 		}
 	};
 	function* suggestSync(context, prefix) {
-		const innerState = normalizeOptionalLikeInnerState(context.state, syncParser.initialState, parser);
+		const innerState = normalizeOptionalLikeSuggestState(context.state, syncParser.initialState, parser);
 		yield* syncParser.suggest({
 			...context,
 			state: innerState
 		}, prefix);
 	}
 	async function* suggestAsync(context, prefix) {
-		const innerState = normalizeOptionalLikeInnerState(context.state, syncParser.initialState, parser);
+		const innerState = normalizeOptionalLikeSuggestState(context.state, syncParser.initialState, parser);
 		const suggestions = parser.suggest({
 			...context,
 			state: innerState
@@ -495,7 +502,7 @@ function withDefault(parser, defaultValue, options) {
 				parser: withDefaultParser,
 				state
 			}];
-			const innerState = normalizeOptionalLikeInnerState(state, parser.initialState, parser);
+			const innerState = normalizeOptionalLikeSuggestState(state, parser.initialState, parser);
 			return parser.getSuggestRuntimeNodes?.(innerState, path) ?? (parser.dependencyMetadata?.source != null ? [{
 				path,
 				parser,

package/dist/modifiers.js

@@ -277,6 +277,13 @@ function normalizeOptionalLikeInnerState(state, initialState, parser) {
 	if (state != null && typeof state === "object") return state;
 	return initialState;
 }
+function normalizeOptionalLikeSuggestState(state, initialState, parser) {
+	if (Array.isArray(state)) {
+		const innerState = state[0];
+		return innerState != null && typeof innerState === "object" ? getDelegatedAnnotationState(state, innerState) : innerState;
+	}
+	return normalizeOptionalLikeInnerState(state, initialState, parser);
+}
 /**
 * Creates a parser that makes another parser optional, allowing it to succeed
 * without consuming input if the wrapped parser fails to match.
@@ -292,14 +299,14 @@ function normalizeOptionalLikeInnerState(state, initialState, parser) {
 function optional(parser) {
 	const syncParser = parser;
 	function* suggestSync(context, prefix) {
-		const innerState = normalizeOptionalLikeInnerState(context.state, syncParser.initialState, parser);
+		const innerState = normalizeOptionalLikeSuggestState(context.state, syncParser.initialState, parser);
 		yield* syncParser.suggest({
 			...context,
 			state: innerState
 		}, prefix);
 	}
 	async function* suggestAsync(context, prefix) {
-		const innerState = normalizeOptionalLikeInnerState(context.state, syncParser.initialState, parser);
+		const innerState = normalizeOptionalLikeSuggestState(context.state, syncParser.initialState, parser);
 		const suggestions = parser.suggest({
 			...context,
 			state: innerState
@@ -327,7 +334,7 @@ function optional(parser) {
 				parser: optionalParser,
 				state
 			}];
-			const innerState = normalizeOptionalLikeInnerState(state, parser.initialState, parser);
+			const innerState = normalizeOptionalLikeSuggestState(state, parser.initialState, parser);
 			return parser.getSuggestRuntimeNodes?.(innerState, path) ?? (parser.dependencyMetadata?.source != null ? [{
 				path,
 				parser,
@@ -461,14 +468,14 @@ function withDefault(parser, defaultValue, options) {
 		}
 	};
 	function* suggestSync(context, prefix) {
-		const innerState = normalizeOptionalLikeInnerState(context.state, syncParser.initialState, parser);
+		const innerState = normalizeOptionalLikeSuggestState(context.state, syncParser.initialState, parser);
 		yield* syncParser.suggest({
 			...context,
 			state: innerState
 		}, prefix);
 	}
 	async function* suggestAsync(context, prefix) {
-		const innerState = normalizeOptionalLikeInnerState(context.state, syncParser.initialState, parser);
+		const innerState = normalizeOptionalLikeSuggestState(context.state, syncParser.initialState, parser);
 		const suggestions = parser.suggest({
 			...context,
 			state: innerState
@@ -495,7 +502,7 @@ function withDefault(parser, defaultValue, options) {
 				parser: withDefaultParser,
 				state
 			}];
-			const innerState = normalizeOptionalLikeInnerState(state, parser.initialState, parser);
+			const innerState = normalizeOptionalLikeSuggestState(state, parser.initialState, parser);
 			return parser.getSuggestRuntimeNodes?.(innerState, path) ?? (parser.dependencyMetadata?.source != null ? [{
 				path,
 				parser,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.1895+42aa2942",
+  "version": "1.0.0-dev.1899+f70a2468",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",