@optique/core 1.4.0-dev.2978 → 1.4.0-dev.2981

package/dist/execution-context.cjs

@@ -39,7 +39,8 @@ function withChildContext(context, segment, state, usage) {
 	const exec = withChildExecPath(context.exec, segment);
 	const dependencyRegistry = context.dependencyRegistry ?? exec?.dependencyRegistry;
 	return {
-		...require_short_option.withOptionScopeChild(context, segment),
+		...context,
+		...require_short_option.getChildOptionScope(context, segment, exec?.path),
 		state,
 		...usage != null ? { usage } : {},
 		...exec != null ? {

package/dist/execution-context.js

@@ -1,5 +1,5 @@
 import { mergeCommandDocPolicy } from "./internal/command-doc-policy.js";
-import { withOptionScopeChild } from "./short-option.js";
+import { getChildOptionScope } from "./short-option.js";
 
 //#region src/execution-context.ts
 /**
@@ -39,7 +39,8 @@ function withChildContext(context, segment, state, usage) {
 	const exec = withChildExecPath(context.exec, segment);
 	const dependencyRegistry = context.dependencyRegistry ?? exec?.dependencyRegistry;
 	return {
-		...withOptionScopeChild(context, segment),
+		...context,
+		...getChildOptionScope(context, segment, exec?.path),
 		state,
 		...usage != null ? { usage } : {},
 		...exec != null ? {

package/dist/short-option.cjs

@@ -18,6 +18,16 @@ function getScopeBindings(selections) {
 	}
 	return bindings;
 }
+function setSelection(selections, source, selected) {
+	if (selections.map.get(source) === selected) return;
+	if (!selections.owned) {
+		const previous = selections.map;
+		selections.map = new Map(previous);
+		scopeBindings.set(selections.map, getScopeBindings(previous));
+		selections.owned = true;
+	}
+	selections.map.set(source, selected);
+}
 function bindScope(source, path, selections) {
 	const boundScopes = getScopeBindings(selections);
 	let node = boundScopes.get(source);
@@ -47,12 +57,9 @@ function bindScope(source, path, selections) {
 function scopePath(context) {
 	return context.exec?.path ?? context[optionPathKey] ?? [];
 }
-/** Tracks child occurrences even for contexts without execution metadata. @internal */
-function withOptionScopeChild(context, segment) {
-	return {
-		...context,
-		[optionPathKey]: [...scopePath(context), segment]
-	};
+/** Supplies child occurrence metadata without copying the parent. @internal */
+function getChildOptionScope(context, segment, path) {
+	return { [optionPathKey]: path ?? [...scopePath(context), segment] };
 }
 const primitiveScopes = /* @__PURE__ */ new WeakMap();
 function parserScope(parser) {
@@ -104,7 +111,7 @@ function selectableOptionScope(initial) {
 		select(context, selected) {
 			const selections = context[optionScopeKey]?.selections;
 			if (selections == null) return;
-			selections.set(bindScope(source, scopePath(context), selections), selected);
+			setSelection(selections, bindScope(source, scopePath(context), selections.map), selected);
 		}
 	};
 }
@@ -135,7 +142,7 @@ function conditionalOptionScope(discriminator, fallback, candidates = []) {
 /** Returns the names reachable in this parse scope. @internal */
 function getOptionScope(context) {
 	const scoped = context[optionScopeKey];
-	const names = scoped == null ? require_usage.extractOptionNames(context.usage, true) : new Set([...scoped.names, ...[...scoped.sources].flatMap((source) => [...source(scoped.selections, void 0, context)])]);
+	const names = scoped == null ? require_usage.extractOptionNames(context.usage, true) : new Set([...scoped.names, ...[...scoped.sources].flatMap((source) => [...source(scoped.selections.map, void 0, context)])]);
 	return names;
 }
 /** Adds reachable names without consulting the flattened help tree. @internal */
@@ -146,19 +153,42 @@ function withOptionScope(context, names) {
 		[optionScopeKey]: {
 			names: new Set([...inherited?.names ?? [], ...names]),
 			sources: inherited?.sources ?? /* @__PURE__ */ new Set(),
-			selections: inherited?.selections ?? /* @__PURE__ */ new Map()
+			selections: inherited?.selections ?? {
+				map: /* @__PURE__ */ new Map(),
+				owned: true
+			}
 		}
 	};
 }
+const scopeUnions = /* @__PURE__ */ new WeakMap();
+function withScopeSource(sources, source) {
+	let unions = scopeUnions.get(sources);
+	if (unions == null) {
+		unions = /* @__PURE__ */ new WeakMap();
+		scopeUnions.set(sources, unions);
+	}
+	let combined = unions.get(source);
+	if (combined == null) {
+		combined = new Set([...sources, source]);
+		unions.set(source, combined);
+	}
+	return combined;
+}
 /** Adds a parser's owned declarations, retaining modifier metadata. @internal */
 function withParserOptionScope(context, parser, segment) {
 	const inherited = context[optionScopeKey];
-	const selections = inherited?.selections ?? /* @__PURE__ */ new Map();
+	const selections = inherited?.selections ?? {
+		map: /* @__PURE__ */ new Map(),
+		owned: true
+	};
+	const source = bindScope(parserScope(parser), segment == null ? scopePath(context) : [...scopePath(context), segment], selections.map);
+	if (inherited?.sources.has(source)) return context;
+	const sources = inherited == null ? new Set([source]) : withScopeSource(inherited.sources, source);
 	return {
 		...context,
 		[optionScopeKey]: {
 			names: inherited?.names ?? /* @__PURE__ */ new Set(),
-			sources: new Set([...inherited?.sources ?? [], bindScope(parserScope(parser), segment == null ? scopePath(context) : [...scopePath(context), segment], selections)]),
+			sources,
 			selections
 		}
 	};
@@ -167,8 +197,11 @@ function withParserOptionScope(context, parser, segment) {
 function forkOptionScope(context) {
 	const scoped = context[optionScopeKey];
 	if (scoped == null) return context;
-	const selections = new Map(scoped.selections);
-	scopeBindings.set(selections, getScopeBindings(scoped.selections));
+	scoped.selections.owned = false;
+	const selections = {
+		map: scoped.selections.map,
+		owned: false
+	};
 	return {
 		...context,
 		[optionScopeKey]: {
@@ -181,7 +214,7 @@ function forkOptionScope(context) {
 function adoptOptionScope(context, next) {
 	const own = context[optionScopeKey];
 	const child = next[optionScopeKey];
-	if (own != null && child != null) for (const [source, selected] of child.selections) own.selections.set(source, selected);
+	if (own != null && child != null && own.selections.map !== child.selections.map) for (const [source, selected] of child.selections.map) setSelection(own.selections, source, selected);
 	return context;
 }
 /** Removes names reserved only for a speculative probe. @internal */
@@ -268,7 +301,7 @@ function attachedValuePrefix(context, prefix, optionNames) {
 	};
 	const scoped = context[optionScopeKey];
 	if (scoped == null) require_usage_internals.collectOptionNamesAtCurrentCommandDepth(context.usage, names, false);
-	else for (const source of scoped.sources) source(scoped.selections, names, context);
+	else for (const source of scoped.sources) source(scoped.selections.map, names, context);
 	for (let index = 1; index < prefix.length;) {
 		const character = String.fromCodePoint(prefix.codePointAt(index));
 		const nextIndex = index + character.length;
@@ -305,6 +338,7 @@ exports.combinedOptionScope = combinedOptionScope;
 exports.conditionalOptionScope = conditionalOptionScope;
 exports.forkOptionScope = forkOptionScope;
 exports.fullNameOwnsToken = fullNameOwnsToken;
+exports.getChildOptionScope = getChildOptionScope;
 exports.inheritOptionScope = inheritOptionScope;
 exports.prefixSuggestion = prefixSuggestion;
 exports.repeatedOptionScope = repeatedOptionScope;
@@ -312,5 +346,4 @@ exports.restoreOptionScope = restoreOptionScope;
 exports.scopeParser = scopeParser;
 exports.selectableOptionScope = selectableOptionScope;
 exports.withOptionScope = withOptionScope;
-exports.withOptionScopeChild = withOptionScopeChild;
 exports.withParserOptionScope = withParserOptionScope;

package/dist/short-option.js

@@ -18,6 +18,16 @@ function getScopeBindings(selections) {
 	}
 	return bindings;
 }
+function setSelection(selections, source, selected) {
+	if (selections.map.get(source) === selected) return;
+	if (!selections.owned) {
+		const previous = selections.map;
+		selections.map = new Map(previous);
+		scopeBindings.set(selections.map, getScopeBindings(previous));
+		selections.owned = true;
+	}
+	selections.map.set(source, selected);
+}
 function bindScope(source, path, selections) {
 	const boundScopes = getScopeBindings(selections);
 	let node = boundScopes.get(source);
@@ -47,12 +57,9 @@ function bindScope(source, path, selections) {
 function scopePath(context) {
 	return context.exec?.path ?? context[optionPathKey] ?? [];
 }
-/** Tracks child occurrences even for contexts without execution metadata. @internal */
-function withOptionScopeChild(context, segment) {
-	return {
-		...context,
-		[optionPathKey]: [...scopePath(context), segment]
-	};
+/** Supplies child occurrence metadata without copying the parent. @internal */
+function getChildOptionScope(context, segment, path) {
+	return { [optionPathKey]: path ?? [...scopePath(context), segment] };
 }
 const primitiveScopes = /* @__PURE__ */ new WeakMap();
 function parserScope(parser) {
@@ -104,7 +111,7 @@ function selectableOptionScope(initial) {
 		select(context, selected) {
 			const selections = context[optionScopeKey]?.selections;
 			if (selections == null) return;
-			selections.set(bindScope(source, scopePath(context), selections), selected);
+			setSelection(selections, bindScope(source, scopePath(context), selections.map), selected);
 		}
 	};
 }
@@ -135,7 +142,7 @@ function conditionalOptionScope(discriminator, fallback, candidates = []) {
 /** Returns the names reachable in this parse scope. @internal */
 function getOptionScope(context) {
 	const scoped = context[optionScopeKey];
-	const names = scoped == null ? extractOptionNames(context.usage, true) : new Set([...scoped.names, ...[...scoped.sources].flatMap((source) => [...source(scoped.selections, void 0, context)])]);
+	const names = scoped == null ? extractOptionNames(context.usage, true) : new Set([...scoped.names, ...[...scoped.sources].flatMap((source) => [...source(scoped.selections.map, void 0, context)])]);
 	return names;
 }
 /** Adds reachable names without consulting the flattened help tree. @internal */
@@ -146,19 +153,42 @@ function withOptionScope(context, names) {
 		[optionScopeKey]: {
 			names: new Set([...inherited?.names ?? [], ...names]),
 			sources: inherited?.sources ?? /* @__PURE__ */ new Set(),
-			selections: inherited?.selections ?? /* @__PURE__ */ new Map()
+			selections: inherited?.selections ?? {
+				map: /* @__PURE__ */ new Map(),
+				owned: true
+			}
 		}
 	};
 }
+const scopeUnions = /* @__PURE__ */ new WeakMap();
+function withScopeSource(sources, source) {
+	let unions = scopeUnions.get(sources);
+	if (unions == null) {
+		unions = /* @__PURE__ */ new WeakMap();
+		scopeUnions.set(sources, unions);
+	}
+	let combined = unions.get(source);
+	if (combined == null) {
+		combined = new Set([...sources, source]);
+		unions.set(source, combined);
+	}
+	return combined;
+}
 /** Adds a parser's owned declarations, retaining modifier metadata. @internal */
 function withParserOptionScope(context, parser, segment) {
 	const inherited = context[optionScopeKey];
-	const selections = inherited?.selections ?? /* @__PURE__ */ new Map();
+	const selections = inherited?.selections ?? {
+		map: /* @__PURE__ */ new Map(),
+		owned: true
+	};
+	const source = bindScope(parserScope(parser), segment == null ? scopePath(context) : [...scopePath(context), segment], selections.map);
+	if (inherited?.sources.has(source)) return context;
+	const sources = inherited == null ? new Set([source]) : withScopeSource(inherited.sources, source);
 	return {
 		...context,
 		[optionScopeKey]: {
 			names: inherited?.names ?? /* @__PURE__ */ new Set(),
-			sources: new Set([...inherited?.sources ?? [], bindScope(parserScope(parser), segment == null ? scopePath(context) : [...scopePath(context), segment], selections)]),
+			sources,
 			selections
 		}
 	};
@@ -167,8 +197,11 @@ function withParserOptionScope(context, parser, segment) {
 function forkOptionScope(context) {
 	const scoped = context[optionScopeKey];
 	if (scoped == null) return context;
-	const selections = new Map(scoped.selections);
-	scopeBindings.set(selections, getScopeBindings(scoped.selections));
+	scoped.selections.owned = false;
+	const selections = {
+		map: scoped.selections.map,
+		owned: false
+	};
 	return {
 		...context,
 		[optionScopeKey]: {
@@ -181,7 +214,7 @@ function forkOptionScope(context) {
 function adoptOptionScope(context, next) {
 	const own = context[optionScopeKey];
 	const child = next[optionScopeKey];
-	if (own != null && child != null) for (const [source, selected] of child.selections) own.selections.set(source, selected);
+	if (own != null && child != null && own.selections.map !== child.selections.map) for (const [source, selected] of child.selections.map) setSelection(own.selections, source, selected);
 	return context;
 }
 /** Removes names reserved only for a speculative probe. @internal */
@@ -268,7 +301,7 @@ function attachedValuePrefix(context, prefix, optionNames) {
 	};
 	const scoped = context[optionScopeKey];
 	if (scoped == null) collectOptionNamesAtCurrentCommandDepth(context.usage, names, false);
-	else for (const source of scoped.sources) source(scoped.selections, names, context);
+	else for (const source of scoped.sources) source(scoped.selections.map, names, context);
 	for (let index = 1; index < prefix.length;) {
 		const character = String.fromCodePoint(prefix.codePointAt(index));
 		const nextIndex = index + character.length;
@@ -299,4 +332,4 @@ function prefixSuggestion(head, suggestion) {
 }
 
 //#endregion
-export { adoptOptionScope, attachedValuePrefix, combinedOptionScope, conditionalOptionScope, forkOptionScope, fullNameOwnsToken, inheritOptionScope, prefixSuggestion, repeatedOptionScope, restoreOptionScope, scopeParser, selectableOptionScope, withOptionScope, withOptionScopeChild, withParserOptionScope };
+export { adoptOptionScope, attachedValuePrefix, combinedOptionScope, conditionalOptionScope, forkOptionScope, fullNameOwnsToken, getChildOptionScope, inheritOptionScope, prefixSuggestion, repeatedOptionScope, restoreOptionScope, scopeParser, selectableOptionScope, withOptionScope, withParserOptionScope };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.4.0-dev.2978",
+  "version": "1.4.0-dev.2981",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -269,7 +269,7 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@optique/env": "1.4.0-dev.2978+84f95710",
+    "@optique/env": "1.4.0-dev.2981+d26f1a24",
     "@types/node": "^24.0.0",
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",