@optique/core 1.4.0-dev.2623 → 1.4.0-dev.2627

package/dist/constructs.cjs

@@ -4147,12 +4147,19 @@ function seq(...rawArgs) {
 		}
 		return require_short_option.combinedOptionScope(parsers.slice(0, end), parsers.slice(0, end).map((_, index) => index));
 	};
-	const seqScope = require_short_option.selectableOptionScope(reachableSeqScope({
-		state: initialState,
-		buffer: [],
-		usage: [],
-		optionsTerminated: false
-	}));
+	const seqScope = require_short_option.selectableOptionScope((selections, arities, context, path = []) => {
+		const initialContext = {
+			state: context == null ? initialState : require_internal_annotations.inheritAnnotations(context.state, initialState),
+			buffer: context?.buffer ?? [],
+			usage: context?.usage ?? [],
+			optionsTerminated: context?.optionsTerminated ?? false,
+			exec: context?.exec == null ? void 0 : {
+				...context.exec,
+				path
+			}
+		};
+		return reachableSeqScope(initialContext)(selections, arities, context, path);
+	});
 	const parseSync = (context) => {
 		let currentContext = context;
 		const allConsumed = [];
@@ -6426,11 +6433,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		const discriminatorConsumed = discriminatorResult.success ? discriminatorResult.consumed.length : discriminatorResult.consumed;
 		if (syncDefaultBranch !== void 0) {
-			const defaultResult = syncDefaultBranch.parse(withChildContext$1(context, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch, syncDefaultBranch.usage));
+			const defaultContext = require_short_option.forkOptionScope(context);
+			optionScope.select(defaultContext, syncDefaultBranch);
+			const defaultResult = syncDefaultBranch.parse(withChildContext$1(defaultContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch, syncDefaultBranch.usage));
 			if (defaultResult.success && (defaultResult.consumed.length > 0 || discriminatorConsumed === 0 && context.buffer.length === 0)) {
 				const mergedExec = require_execution_context.mergeChildExec(context.exec, defaultResult.next.exec);
 				const commitDefault = defaultResult.consumed.length > 0 || context.buffer.length === 0;
-				if (commitDefault) optionScope.select(context, syncDefaultBranch);
+				if (commitDefault) require_short_option.adoptOptionScope(context, defaultResult.next);
 				return {
 					success: true,
 					...defaultResult.provisional ? { provisional: true } : {},
@@ -6682,11 +6691,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		const discriminatorConsumed = discriminatorResult.success ? discriminatorResult.consumed.length : discriminatorResult.consumed;
 		if (defaultBranch !== void 0) {
-			const defaultResult = await defaultBranch.parse(withChildContext$1(context, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
+			const defaultContext = require_short_option.forkOptionScope(context);
+			optionScope.select(defaultContext, defaultBranch);
+			const defaultResult = await defaultBranch.parse(withChildContext$1(defaultContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
 			if (defaultResult.success && (defaultResult.consumed.length > 0 || discriminatorConsumed === 0 && context.buffer.length === 0)) {
 				const mergedExec = require_execution_context.mergeChildExec(context.exec, defaultResult.next.exec);
 				const commitDefault = defaultResult.consumed.length > 0 || context.buffer.length === 0;
-				if (commitDefault) optionScope.select(context, defaultBranch);
+				if (commitDefault) require_short_option.adoptOptionScope(context, defaultResult.next);
 				return {
 					success: true,
 					...defaultResult.provisional ? { provisional: true } : {},
@@ -7348,7 +7359,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				const branchContext = require_short_option.forkOptionScope(suggestContext);
 				optionScope.select(branchContext, resolvedBranch);
 				yield* resolvedBranch.suggest(withChildContext$1(branchContext, "_branch", state.branchState ?? resolvedBranch.initialState, resolvedBranch), prefix);
-			} else if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest(withChildContext$1(suggestContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch), prefix);
+			} else if (syncDefaultBranch !== void 0) {
+				const defaultContext = require_short_option.forkOptionScope(suggestContext);
+				optionScope.select(defaultContext, syncDefaultBranch);
+				yield* syncDefaultBranch.suggest(withChildContext$1(defaultContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch), prefix);
+			}
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
 			const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
@@ -7408,7 +7423,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				}
 			}
 			if (!discResolved) {
-				if (defaultBranch !== void 0) yield* defaultBranch.suggest(withChildContext$1(suggestContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch), prefix);
+				if (defaultBranch !== void 0) {
+					const defaultContext = require_short_option.forkOptionScope(suggestContext);
+					optionScope.select(defaultContext, defaultBranch);
+					yield* defaultBranch.suggest(withChildContext$1(defaultContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch), prefix);
+				}
 			}
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];

package/dist/constructs.js

@@ -4147,12 +4147,19 @@ function seq(...rawArgs) {
 		}
 		return combinedOptionScope(parsers.slice(0, end), parsers.slice(0, end).map((_, index) => index));
 	};
-	const seqScope = selectableOptionScope(reachableSeqScope({
-		state: initialState,
-		buffer: [],
-		usage: [],
-		optionsTerminated: false
-	}));
+	const seqScope = selectableOptionScope((selections, arities, context, path = []) => {
+		const initialContext = {
+			state: context == null ? initialState : inheritAnnotations(context.state, initialState),
+			buffer: context?.buffer ?? [],
+			usage: context?.usage ?? [],
+			optionsTerminated: context?.optionsTerminated ?? false,
+			exec: context?.exec == null ? void 0 : {
+				...context.exec,
+				path
+			}
+		};
+		return reachableSeqScope(initialContext)(selections, arities, context, path);
+	});
 	const parseSync = (context) => {
 		let currentContext = context;
 		const allConsumed = [];
@@ -6426,11 +6433,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		const discriminatorConsumed = discriminatorResult.success ? discriminatorResult.consumed.length : discriminatorResult.consumed;
 		if (syncDefaultBranch !== void 0) {
-			const defaultResult = syncDefaultBranch.parse(withChildContext$1(context, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch, syncDefaultBranch.usage));
+			const defaultContext = forkOptionScope(context);
+			optionScope.select(defaultContext, syncDefaultBranch);
+			const defaultResult = syncDefaultBranch.parse(withChildContext$1(defaultContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch, syncDefaultBranch.usage));
 			if (defaultResult.success && (defaultResult.consumed.length > 0 || discriminatorConsumed === 0 && context.buffer.length === 0)) {
 				const mergedExec = mergeChildExec(context.exec, defaultResult.next.exec);
 				const commitDefault = defaultResult.consumed.length > 0 || context.buffer.length === 0;
-				if (commitDefault) optionScope.select(context, syncDefaultBranch);
+				if (commitDefault) adoptOptionScope(context, defaultResult.next);
 				return {
 					success: true,
 					...defaultResult.provisional ? { provisional: true } : {},
@@ -6682,11 +6691,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		const discriminatorConsumed = discriminatorResult.success ? discriminatorResult.consumed.length : discriminatorResult.consumed;
 		if (defaultBranch !== void 0) {
-			const defaultResult = await defaultBranch.parse(withChildContext$1(context, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
+			const defaultContext = forkOptionScope(context);
+			optionScope.select(defaultContext, defaultBranch);
+			const defaultResult = await defaultBranch.parse(withChildContext$1(defaultContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch, defaultBranch.usage));
 			if (defaultResult.success && (defaultResult.consumed.length > 0 || discriminatorConsumed === 0 && context.buffer.length === 0)) {
 				const mergedExec = mergeChildExec(context.exec, defaultResult.next.exec);
 				const commitDefault = defaultResult.consumed.length > 0 || context.buffer.length === 0;
-				if (commitDefault) optionScope.select(context, defaultBranch);
+				if (commitDefault) adoptOptionScope(context, defaultResult.next);
 				return {
 					success: true,
 					...defaultResult.provisional ? { provisional: true } : {},
@@ -7348,7 +7359,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				const branchContext = forkOptionScope(suggestContext);
 				optionScope.select(branchContext, resolvedBranch);
 				yield* resolvedBranch.suggest(withChildContext$1(branchContext, "_branch", state.branchState ?? resolvedBranch.initialState, resolvedBranch), prefix);
-			} else if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest(withChildContext$1(suggestContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch), prefix);
+			} else if (syncDefaultBranch !== void 0) {
+				const defaultContext = forkOptionScope(suggestContext);
+				optionScope.select(defaultContext, syncDefaultBranch);
+				yield* syncDefaultBranch.suggest(withChildContext$1(defaultContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch), prefix);
+			}
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
 			const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
@@ -7408,7 +7423,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				}
 			}
 			if (!discResolved) {
-				if (defaultBranch !== void 0) yield* defaultBranch.suggest(withChildContext$1(suggestContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch), prefix);
+				if (defaultBranch !== void 0) {
+					const defaultContext = forkOptionScope(suggestContext);
+					optionScope.select(defaultContext, defaultBranch);
+					yield* defaultBranch.suggest(withChildContext$1(defaultContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch), prefix);
+				}
 			}
 		} else {
 			const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];

package/dist/primitives.cjs

@@ -1524,7 +1524,7 @@ function command(name, parser, options = {}) {
 	const isAsync = parser.mode === "async";
 	const syncInnerParser = parser;
 	const asyncInnerParser = parser;
-	const commandScope = require_short_option.selectableOptionScope(() => new Set(commandNames));
+	const commandScope = require_short_option.selectableOptionScope(() => /* @__PURE__ */ new Set());
 	const enteredScope = require_short_option.combinedOptionScope([parser], [name]);
 	const result = {
 		[Symbol.for("@optique/core/commandParser")]: true,

package/dist/primitives.js

@@ -1524,7 +1524,7 @@ function command(name, parser, options = {}) {
 	const isAsync = parser.mode === "async";
 	const syncInnerParser = parser;
 	const asyncInnerParser = parser;
-	const commandScope = selectableOptionScope(() => new Set(commandNames));
+	const commandScope = selectableOptionScope(() => /* @__PURE__ */ new Set());
 	const enteredScope = combinedOptionScope([parser], [name]);
 	const result = {
 		[Symbol.for("@optique/core/commandParser")]: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.4.0-dev.2623",
+  "version": "1.4.0-dev.2627",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -237,7 +237,7 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@optique/env": "1.4.0-dev.2623+c24ee8fb",
+    "@optique/env": "1.4.0-dev.2627+4dd892c0",
     "@types/node": "^24.0.0",
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",