@optique/core 1.0.0-dev.1659 → 1.0.0-dev.1663

package/dist/constructs.cjs

@@ -137,7 +137,11 @@ function containsAnnotationView(value, seen = /* @__PURE__ */ new WeakSet()) {
 	if (Array.isArray(source)) return source.some((item) => containsAnnotationView(item, seen));
 	const proto = Object.getPrototypeOf(source);
 	if (proto !== Object.prototype && proto !== null) return false;
-	return Reflect.ownKeys(source).some((key) => containsAnnotationView(source[key], seen));
+	const descriptors = Object.getOwnPropertyDescriptors(source);
+	return Reflect.ownKeys(descriptors).some((key) => {
+		const descriptor = descriptors[key];
+		return descriptor != null && "value" in descriptor ? containsAnnotationView(descriptor.value, seen) : false;
+	});
 }
 function unwrapNestedAnnotationViews(value, seen = /* @__PURE__ */ new WeakMap()) {
 	if (value == null || typeof value !== "object") return value;
@@ -222,17 +226,18 @@ function getAnnotatedFieldState(parentState, field, parser) {
 }
 const annotationViewTargets = /* @__PURE__ */ new WeakMap();
 function withAnnotationView(state, annotations) {
-	const view = new Proxy(state, {
-		get(target, key) {
+	const target = unwrapAnnotationView(state);
+	const view = new Proxy(target, {
+		get(target$1, key) {
 			if (key === require_annotations.annotationKey) return annotations;
-			const value = Reflect.get(target, key, target);
-			return typeof value === "function" ? value.bind(target) : value;
+			const value = Reflect.get(target$1, key, target$1);
+			return typeof value === "function" ? value.bind(target$1) : value;
 		},
-		has(target, key) {
-			return key === require_annotations.annotationKey || Reflect.has(target, key);
+		has(target$1, key) {
+			return key === require_annotations.annotationKey || Reflect.has(target$1, key);
 		}
 	});
-	annotationViewTargets.set(view, state);
+	annotationViewTargets.set(view, target);
 	return view;
 }
 function getParseChildState(parentState, childState, parser) {
@@ -249,7 +254,7 @@ function getParseChildState(parentState, childState, parser) {
 function getObjectParseChildState(parentState, childState, _parser) {
 	const annotations = require_annotations.getAnnotations(parentState);
 	if (annotations === void 0 || childState == null || typeof childState !== "object" || require_annotations.getAnnotations(childState) === annotations) return childState;
-	return require_annotations.injectAnnotations(childState, annotations);
+	return require_annotations.inheritAnnotations(parentState, childState);
 }
 function getAnnotatedChildState(parentState, childState, parser) {
 	const annotations = require_annotations.getAnnotations(parentState);
@@ -1328,10 +1333,17 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	const createFieldStateGetter = (parentState, annotateChildState = getAnnotatedChildState) => {
 		return (field, parser) => {
 			const fieldKey = field;
-			const cache = parentState != null && typeof parentState === "object" ? inheritedFieldStateCache.get(parentState) ?? (() => {
-				const stateCache = /* @__PURE__ */ new Map();
-				inheritedFieldStateCache.set(parentState, stateCache);
-				return stateCache;
+			const cache = parentState != null && typeof parentState === "object" ? (() => {
+				const annotatorCaches = inheritedFieldStateCache.get(parentState) ?? (() => {
+					const nextCaches = /* @__PURE__ */ new WeakMap();
+					inheritedFieldStateCache.set(parentState, nextCaches);
+					return nextCaches;
+				})();
+				return annotatorCaches.get(annotateChildState) ?? (() => {
+					const stateCache = /* @__PURE__ */ new Map();
+					annotatorCaches.set(annotateChildState, stateCache);
+					return stateCache;
+				})();
 			})() : void 0;
 			if (cache?.has(fieldKey)) return cache.get(fieldKey);
 			const sourceState = parentState != null && typeof parentState === "object" && fieldKey in parentState ? parentState[fieldKey] : parser.initialState;

package/dist/constructs.js

@@ -137,7 +137,11 @@ function containsAnnotationView(value, seen = /* @__PURE__ */ new WeakSet()) {
 	if (Array.isArray(source)) return source.some((item) => containsAnnotationView(item, seen));
 	const proto = Object.getPrototypeOf(source);
 	if (proto !== Object.prototype && proto !== null) return false;
-	return Reflect.ownKeys(source).some((key) => containsAnnotationView(source[key], seen));
+	const descriptors = Object.getOwnPropertyDescriptors(source);
+	return Reflect.ownKeys(descriptors).some((key) => {
+		const descriptor = descriptors[key];
+		return descriptor != null && "value" in descriptor ? containsAnnotationView(descriptor.value, seen) : false;
+	});
 }
 function unwrapNestedAnnotationViews(value, seen = /* @__PURE__ */ new WeakMap()) {
 	if (value == null || typeof value !== "object") return value;
@@ -222,17 +226,18 @@ function getAnnotatedFieldState(parentState, field, parser) {
 }
 const annotationViewTargets = /* @__PURE__ */ new WeakMap();
 function withAnnotationView(state, annotations) {
-	const view = new Proxy(state, {
-		get(target, key) {
+	const target = unwrapAnnotationView(state);
+	const view = new Proxy(target, {
+		get(target$1, key) {
 			if (key === annotationKey) return annotations;
-			const value = Reflect.get(target, key, target);
-			return typeof value === "function" ? value.bind(target) : value;
+			const value = Reflect.get(target$1, key, target$1);
+			return typeof value === "function" ? value.bind(target$1) : value;
 		},
-		has(target, key) {
-			return key === annotationKey || Reflect.has(target, key);
+		has(target$1, key) {
+			return key === annotationKey || Reflect.has(target$1, key);
 		}
 	});
-	annotationViewTargets.set(view, state);
+	annotationViewTargets.set(view, target);
 	return view;
 }
 function getParseChildState(parentState, childState, parser) {
@@ -249,7 +254,7 @@ function getParseChildState(parentState, childState, parser) {
 function getObjectParseChildState(parentState, childState, _parser) {
 	const annotations = getAnnotations(parentState);
 	if (annotations === void 0 || childState == null || typeof childState !== "object" || getAnnotations(childState) === annotations) return childState;
-	return injectAnnotations(childState, annotations);
+	return inheritAnnotations(parentState, childState);
 }
 function getAnnotatedChildState(parentState, childState, parser) {
 	const annotations = getAnnotations(parentState);
@@ -1328,10 +1333,17 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 	const createFieldStateGetter = (parentState, annotateChildState = getAnnotatedChildState) => {
 		return (field, parser) => {
 			const fieldKey = field;
-			const cache = parentState != null && typeof parentState === "object" ? inheritedFieldStateCache.get(parentState) ?? (() => {
-				const stateCache = /* @__PURE__ */ new Map();
-				inheritedFieldStateCache.set(parentState, stateCache);
-				return stateCache;
+			const cache = parentState != null && typeof parentState === "object" ? (() => {
+				const annotatorCaches = inheritedFieldStateCache.get(parentState) ?? (() => {
+					const nextCaches = /* @__PURE__ */ new WeakMap();
+					inheritedFieldStateCache.set(parentState, nextCaches);
+					return nextCaches;
+				})();
+				return annotatorCaches.get(annotateChildState) ?? (() => {
+					const stateCache = /* @__PURE__ */ new Map();
+					annotatorCaches.set(annotateChildState, stateCache);
+					return stateCache;
+				})();
 			})() : void 0;
 			if (cache?.has(fieldKey)) return cache.get(fieldKey);
 			const sourceState = parentState != null && typeof parentState === "object" && fieldKey in parentState ? parentState[fieldKey] : parser.initialState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.1659+94dcbc28",
+  "version": "1.0.0-dev.1663+381b3156",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",