@optique/core 1.0.0-dev.1868 → 1.0.0-dev.1872

package/dist/annotations.cjs

@@ -157,6 +157,16 @@ function tryCloneRegExpSubclass(source) {
 		return void 0;
 	}
 }
+function tryCloneArraySubclass(source) {
+	const cloneConstructor = resolveCloneConstructor(source);
+	if (cloneConstructor == null) return void 0;
+	try {
+		const cloned = Reflect.apply(Array.from, cloneConstructor, [source]);
+		return Array.isArray(cloned) ? cloned : void 0;
+	} catch {
+		return void 0;
+	}
+}
 function tryCloneURLSearchParamsSubclass(source) {
 	const cloneConstructor = resolveCloneConstructor(source);
 	if (cloneConstructor == null) return void 0;
@@ -251,7 +261,8 @@ function cloneRegExpShape(source) {
 }
 function createProtectedObjectView(target, context) {
 	if (Array.isArray(target)) {
-		const view$1 = Object.setPrototypeOf([], Object.getPrototypeOf(target));
+		const targetPrototype = Object.getPrototypeOf(target);
+		const view$1 = targetPrototype === Array.prototype || targetPrototype === null ? Object.setPrototypeOf([], targetPrototype) : tryCloneArraySubclass(target) ?? [];
 		view$1.length = target.length;
 		registerProtectedAnnotationView(context, target, view$1);
 		for (const key of Reflect.ownKeys(target)) {
@@ -596,21 +607,23 @@ function injectAnnotationsWithContext(state, annotations, context) {
 		return cloned$1;
 	}
 	if (isInjectedAnnotationWrapper(state)) {
-		state[annotationKey] = protectedAnnotations;
-		return state;
+		const cloned$1 = Object.create(Object.getPrototypeOf(state), Object.getOwnPropertyDescriptors(state));
+		cloned$1[annotationKey] = protectedAnnotations;
+		injectedAnnotationWrappers.add(cloned$1);
+		return cloned$1;
 	}
 	if (state instanceof Date) {
-		const cloned$1 = new Date(state.getTime());
+		const cloned$1 = tryCloneDateSubclass(state) ?? new Date(state.getTime());
 		cloned$1[annotationKey] = protectedAnnotations;
 		return cloned$1;
 	}
 	if (state instanceof Map) {
-		const cloned$1 = new Map(state);
+		const cloned$1 = tryCloneMapSubclass(state, state) ?? new Map(state);
 		cloned$1[annotationKey] = protectedAnnotations;
 		return cloned$1;
 	}
 	if (state instanceof Set) {
-		const cloned$1 = new Set(state);
+		const cloned$1 = tryCloneSetSubclass(state, state) ?? new Set(state);
 		cloned$1[annotationKey] = protectedAnnotations;
 		return cloned$1;
 	}
@@ -702,17 +715,17 @@ function inheritAnnotations(source, target) {
 		return cloned$1;
 	}
 	if (target instanceof Date) {
-		const cloned$1 = new Date(target.getTime());
+		const cloned$1 = tryCloneDateSubclass(target) ?? new Date(target.getTime());
 		cloned$1[annotationKey] = annotations;
 		return cloned$1;
 	}
 	if (target instanceof Map) {
-		const cloned$1 = new Map(target);
+		const cloned$1 = tryCloneMapSubclass(target, target) ?? new Map(target);
 		cloned$1[annotationKey] = annotations;
 		return cloned$1;
 	}
 	if (target instanceof Set) {
-		const cloned$1 = new Set(target);
+		const cloned$1 = tryCloneSetSubclass(target, target) ?? new Set(target);
 		cloned$1[annotationKey] = annotations;
 		return cloned$1;
 	}

package/dist/annotations.js

@@ -156,6 +156,16 @@ function tryCloneRegExpSubclass(source) {
 		return void 0;
 	}
 }
+function tryCloneArraySubclass(source) {
+	const cloneConstructor = resolveCloneConstructor(source);
+	if (cloneConstructor == null) return void 0;
+	try {
+		const cloned = Reflect.apply(Array.from, cloneConstructor, [source]);
+		return Array.isArray(cloned) ? cloned : void 0;
+	} catch {
+		return void 0;
+	}
+}
 function tryCloneURLSearchParamsSubclass(source) {
 	const cloneConstructor = resolveCloneConstructor(source);
 	if (cloneConstructor == null) return void 0;
@@ -250,7 +260,8 @@ function cloneRegExpShape(source) {
 }
 function createProtectedObjectView(target, context) {
 	if (Array.isArray(target)) {
-		const view$1 = Object.setPrototypeOf([], Object.getPrototypeOf(target));
+		const targetPrototype = Object.getPrototypeOf(target);
+		const view$1 = targetPrototype === Array.prototype || targetPrototype === null ? Object.setPrototypeOf([], targetPrototype) : tryCloneArraySubclass(target) ?? [];
 		view$1.length = target.length;
 		registerProtectedAnnotationView(context, target, view$1);
 		for (const key of Reflect.ownKeys(target)) {
@@ -595,21 +606,23 @@ function injectAnnotationsWithContext(state, annotations, context) {
 		return cloned$1;
 	}
 	if (isInjectedAnnotationWrapper(state)) {
-		state[annotationKey] = protectedAnnotations;
-		return state;
+		const cloned$1 = Object.create(Object.getPrototypeOf(state), Object.getOwnPropertyDescriptors(state));
+		cloned$1[annotationKey] = protectedAnnotations;
+		injectedAnnotationWrappers.add(cloned$1);
+		return cloned$1;
 	}
 	if (state instanceof Date) {
-		const cloned$1 = new Date(state.getTime());
+		const cloned$1 = tryCloneDateSubclass(state) ?? new Date(state.getTime());
 		cloned$1[annotationKey] = protectedAnnotations;
 		return cloned$1;
 	}
 	if (state instanceof Map) {
-		const cloned$1 = new Map(state);
+		const cloned$1 = tryCloneMapSubclass(state, state) ?? new Map(state);
 		cloned$1[annotationKey] = protectedAnnotations;
 		return cloned$1;
 	}
 	if (state instanceof Set) {
-		const cloned$1 = new Set(state);
+		const cloned$1 = tryCloneSetSubclass(state, state) ?? new Set(state);
 		cloned$1[annotationKey] = protectedAnnotations;
 		return cloned$1;
 	}
@@ -701,17 +714,17 @@ function inheritAnnotations(source, target) {
 		return cloned$1;
 	}
 	if (target instanceof Date) {
-		const cloned$1 = new Date(target.getTime());
+		const cloned$1 = tryCloneDateSubclass(target) ?? new Date(target.getTime());
 		cloned$1[annotationKey] = annotations;
 		return cloned$1;
 	}
 	if (target instanceof Map) {
-		const cloned$1 = new Map(target);
+		const cloned$1 = tryCloneMapSubclass(target, target) ?? new Map(target);
 		cloned$1[annotationKey] = annotations;
 		return cloned$1;
 	}
 	if (target instanceof Set) {
-		const cloned$1 = new Set(target);
+		const cloned$1 = tryCloneSetSubclass(target, target) ?? new Set(target);
 		cloned$1[annotationKey] = annotations;
 		return cloned$1;
 	}

package/dist/facade.cjs

@@ -1620,7 +1620,7 @@ function runWithAsync(parser, programName, contexts, options) {
 * @returns A new parser with annotations in its initial state.
 */
 function injectAnnotationsIntoParser(parser, annotations) {
-	const newInitialState = require_annotations.injectAnnotations(parser.initialState, annotations);
+	const newInitialState = require_annotations.injectFreshRunAnnotations(parser.initialState, annotations);
 	const descriptors = { ...Object.getOwnPropertyDescriptors(parser) };
 	const initialState = descriptors.initialState;
 	descriptors.initialState = initialState == null ? {

package/dist/facade.js

@@ -1,4 +1,4 @@
-import { injectAnnotations, isInjectedAnnotationWrapper, unwrapInjectedAnnotationWrapper } from "./annotations.js";
+import { injectFreshRunAnnotations, isInjectedAnnotationWrapper, unwrapInjectedAnnotationWrapper } from "./annotations.js";
 import { commandLine, formatMessage, lineBreak, message, optionName, text, value } from "./message.js";
 import { bash, fish, nu, pwsh, zsh } from "./completion.js";
 import { validateCommandNames, validateContextIds, validateMetaNameCollisions, validateOptionNames, validateProgramName } from "./validate.js";
@@ -1620,7 +1620,7 @@ function runWithAsync(parser, programName, contexts, options) {
 * @returns A new parser with annotations in its initial state.
 */
 function injectAnnotationsIntoParser(parser, annotations) {
-	const newInitialState = injectAnnotations(parser.initialState, annotations);
+	const newInitialState = injectFreshRunAnnotations(parser.initialState, annotations);
 	const descriptors = { ...Object.getOwnPropertyDescriptors(parser) };
 	const initialState = descriptors.initialState;
 	descriptors.initialState = initialState == null ? {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.1868+54bdb27a",
+  "version": "1.0.0-dev.1872+bf32b1c5",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",