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

package/dist/annotation-state.cjs

@@ -87,6 +87,11 @@ function normalizeDelegatedAnnotationState(state) {
 function hasDelegatedAnnotationCarrier(state) {
 	return state != null && typeof state === "object" && (require_annotations.isInjectedAnnotationWrapper(state) || annotationViewTargets.has(state));
 }
+function isPendingNestedNormalizationAlias(originalValue, normalizedValue, seen) {
+	if (originalValue == null || typeof originalValue !== "object") return false;
+	const entry = seen.get(originalValue);
+	return entry != null && !entry.finalized && entry.clone === normalizedValue;
+}
 /**
 * Recursively removes delegated annotation carriers from plain-object and array
 * structures.
@@ -107,30 +112,39 @@ function normalizeNestedDelegatedAnnotationState(value, seen = /* @__PURE__ */ n
 	const normalized = normalizeDelegatedAnnotationState(value);
 	if (normalized == null || typeof normalized !== "object") return normalized;
 	const source = normalized;
-	if (seen.has(source)) return seen.get(source);
+	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 = [...source];
-		seen.set(source, clone$1);
+		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;
-				changed$1 = true;
+				if (!isPendingNestedNormalizationAlias(source[i], nextValue, seen)) changed$1 = true;
 			}
 		}
-		if (!changed$1) {
-			seen.set(source, source);
-			return source;
-		}
-		return clone$1;
+		entry$1.finalized = true;
+		entry$1.result = changed$1 ? clone$1 : source;
+		return changed$1 ? clone$1 : source;
 	}
 	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);
-	seen.set(source, clone);
+	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) {
@@ -140,14 +154,13 @@ function normalizeNestedDelegatedAnnotationState(value, seen = /* @__PURE__ */ n
 					...descriptor,
 					value: nextValue
 				};
-				changed = true;
+				if (!isPendingNestedNormalizationAlias(descriptor.value, nextValue, seen)) changed = true;
 			}
 		}
 	}
-	if (!changed) {
-		seen.set(source, source);
-		return source;
-	}
+	entry.finalized = true;
+	entry.result = changed ? clone : source;
+	if (!changed) return source;
 	Object.defineProperties(clone, descriptors);
 	return clone;
 }
@@ -167,9 +180,10 @@ function normalizeNestedDelegatedAnnotationState(value, seen = /* @__PURE__ */ n
 */
 function getDelegatedAnnotationState(parentState, childState) {
 	const annotations = require_annotations.getAnnotations(parentState);
-	if (annotations === void 0 || require_annotations.getAnnotations(childState) === annotations) return childState;
-	if (childState == null || typeof childState !== "object") return require_annotations.injectAnnotations(childState, annotations);
+	if (annotations === void 0) return childState;
 	if (require_annotations.isInjectedAnnotationWrapper(childState)) return require_annotations.injectAnnotations(normalizeInjectedAnnotationState(childState), annotations);
+	if (require_annotations.getAnnotations(childState) === annotations) return childState;
+	if (childState == null || typeof childState !== "object") return require_annotations.injectAnnotations(childState, annotations);
 	if (isNonPlainDelegatedObject(childState)) return withAnnotationView(childState, annotations);
 	return require_annotations.inheritAnnotations(parentState, childState);
 }

package/dist/annotation-state.js

@@ -1,4 +1,4 @@
-import { annotationKey, getAnnotations, inheritAnnotations, injectAnnotations, isInjectedAnnotationWrapper, unwrapInjectedAnnotationWrapper } from "./annotations.js";
+import { annotateFreshArray, annotationKey, getAnnotations, inheritAnnotations, injectAnnotations, isInjectedAnnotationWrapper, unwrapInjectedAnnotationWrapper } from "./annotations.js";
 import { inheritParentAnnotationsKey } from "./parser.js";
 
 //#region src/annotation-state.ts
@@ -87,6 +87,11 @@ function normalizeDelegatedAnnotationState(state) {
 function hasDelegatedAnnotationCarrier(state) {
 	return state != null && typeof state === "object" && (isInjectedAnnotationWrapper(state) || annotationViewTargets.has(state));
 }
+function isPendingNestedNormalizationAlias(originalValue, normalizedValue, seen) {
+	if (originalValue == null || typeof originalValue !== "object") return false;
+	const entry = seen.get(originalValue);
+	return entry != null && !entry.finalized && entry.clone === normalizedValue;
+}
 /**
 * Recursively removes delegated annotation carriers from plain-object and array
 * structures.
@@ -107,30 +112,39 @@ function normalizeNestedDelegatedAnnotationState(value, seen = /* @__PURE__ */ n
 	const normalized = normalizeDelegatedAnnotationState(value);
 	if (normalized == null || typeof normalized !== "object") return normalized;
 	const source = normalized;
-	if (seen.has(source)) return seen.get(source);
+	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 = [...source];
-		seen.set(source, clone$1);
+		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;
-				changed$1 = true;
+				if (!isPendingNestedNormalizationAlias(source[i], nextValue, seen)) changed$1 = true;
 			}
 		}
-		if (!changed$1) {
-			seen.set(source, source);
-			return source;
-		}
-		return clone$1;
+		entry$1.finalized = true;
+		entry$1.result = changed$1 ? clone$1 : source;
+		return changed$1 ? clone$1 : source;
 	}
 	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);
-	seen.set(source, clone);
+	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) {
@@ -140,14 +154,13 @@ function normalizeNestedDelegatedAnnotationState(value, seen = /* @__PURE__ */ n
 					...descriptor,
 					value: nextValue
 				};
-				changed = true;
+				if (!isPendingNestedNormalizationAlias(descriptor.value, nextValue, seen)) changed = true;
 			}
 		}
 	}
-	if (!changed) {
-		seen.set(source, source);
-		return source;
-	}
+	entry.finalized = true;
+	entry.result = changed ? clone : source;
+	if (!changed) return source;
 	Object.defineProperties(clone, descriptors);
 	return clone;
 }
@@ -167,9 +180,10 @@ function normalizeNestedDelegatedAnnotationState(value, seen = /* @__PURE__ */ n
 */
 function getDelegatedAnnotationState(parentState, childState) {
 	const annotations = getAnnotations(parentState);
-	if (annotations === void 0 || getAnnotations(childState) === annotations) return childState;
-	if (childState == null || typeof childState !== "object") return injectAnnotations(childState, annotations);
+	if (annotations === void 0) return childState;
 	if (isInjectedAnnotationWrapper(childState)) return injectAnnotations(normalizeInjectedAnnotationState(childState), annotations);
+	if (getAnnotations(childState) === annotations) return childState;
+	if (childState == null || typeof childState !== "object") return injectAnnotations(childState, annotations);
 	if (isNonPlainDelegatedObject(childState)) return withAnnotationView(childState, annotations);
 	return inheritAnnotations(parentState, childState);
 }

package/package.json

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