@optique/core 1.0.0-dev.1701 → 1.0.0-dev.1705

package/dist/constructs.cjs

@@ -513,81 +513,77 @@ function createExclusiveComplete(parsers, options, noMatchContext, mode) {
 	const syncParsers = parsers;
 	return (state, exec) => {
 		const activeState = normalizeExclusiveState(state);
-		if (activeState == null) {
-			const annotations = require_annotations.getAnnotations(state);
-			const annotateInitial = (initial) => annotations != null && initial != null && typeof initial === "object" ? require_annotations.injectAnnotations(initial, annotations) : initial;
-			return require_mode_dispatch.dispatchByMode(mode, () => {
-				const emptyCtx = {
-					buffer: [],
-					optionsTerminated: false,
-					usage: []
-				};
-				let candidateIndex = -1;
-				let candidateCount = 0;
-				for (let i$1 = 0; i$1 < syncParsers.length; i$1++) {
-					const p = syncParsers[i$1];
-					if (p.leadingNames.size > 0 || p.acceptingAnyToken) continue;
-					const parseResult = p.parse({
-						...emptyCtx,
-						state: annotateInitial(p.initialState)
-					});
-					if (!parseResult.success || parseResult.provisional) continue;
-					candidateCount++;
-					if (candidateIndex < 0) candidateIndex = i$1;
-					if (candidateCount > 1) break;
-				}
-				if (candidateCount === 1 && candidateIndex >= 0) {
-					const p = syncParsers[candidateIndex];
-					const parseResult = p.parse({
-						...emptyCtx,
-						state: annotateInitial(p.initialState)
-					});
-					if (parseResult.success) {
-						const annotatedState = getAnnotatedChildState(state, parseResult.next.state, p);
-						return p.complete(annotatedState, withChildExecPath(exec, candidateIndex));
-					}
-				}
-				return {
-					success: false,
-					error: getNoMatchError(options, noMatchContext)
-				};
-			}, async () => {
-				const emptyCtx = {
-					buffer: [],
-					optionsTerminated: false,
-					usage: []
-				};
-				let candidateIndex = -1;
-				let candidateCount = 0;
-				for (let i$1 = 0; i$1 < parsers.length; i$1++) {
-					const p = parsers[i$1];
-					if (p.leadingNames.size > 0 || p.acceptingAnyToken) continue;
-					const parseResult = await p.parse({
-						...emptyCtx,
-						state: annotateInitial(p.initialState)
-					});
-					if (!parseResult.success || parseResult.provisional) continue;
-					candidateCount++;
-					if (candidateIndex < 0) candidateIndex = i$1;
-					if (candidateCount > 1) break;
+		if (activeState == null) return require_mode_dispatch.dispatchByMode(mode, () => {
+			const emptyCtx = {
+				buffer: [],
+				optionsTerminated: false,
+				usage: []
+			};
+			let candidateIndex = -1;
+			let candidateCount = 0;
+			for (let i$1 = 0; i$1 < syncParsers.length; i$1++) {
+				const p = syncParsers[i$1];
+				if (p.leadingNames.size > 0 || p.acceptingAnyToken) continue;
+				const parseResult = p.parse({
+					...emptyCtx,
+					state: getAnnotatedChildState(state, p.initialState, p)
+				});
+				if (!parseResult.success || parseResult.provisional) continue;
+				candidateCount++;
+				if (candidateIndex < 0) candidateIndex = i$1;
+				if (candidateCount > 1) break;
+			}
+			if (candidateCount === 1 && candidateIndex >= 0) {
+				const p = syncParsers[candidateIndex];
+				const parseResult = p.parse({
+					...emptyCtx,
+					state: getAnnotatedChildState(state, p.initialState, p)
+				});
+				if (parseResult.success) {
+					const annotatedState = getAnnotatedChildState(state, parseResult.next.state, p);
+					return p.complete(annotatedState, withChildExecPath(exec, candidateIndex));
 				}
-				if (candidateCount === 1 && candidateIndex >= 0 && (parsers[candidateIndex].$mode === "sync" || exec?.phase !== "parse" && exec?.phase !== "suggest")) {
-					const p = parsers[candidateIndex];
-					const parseResult = await p.parse({
-						...emptyCtx,
-						state: annotateInitial(p.initialState)
-					});
-					if (parseResult.success) {
-						const annotatedState = getAnnotatedChildState(state, parseResult.next.state, p);
-						return await p.complete(annotatedState, withChildExecPath(exec, candidateIndex));
-					}
+			}
+			return {
+				success: false,
+				error: getNoMatchError(options, noMatchContext)
+			};
+		}, async () => {
+			const emptyCtx = {
+				buffer: [],
+				optionsTerminated: false,
+				usage: []
+			};
+			let candidateIndex = -1;
+			let candidateCount = 0;
+			for (let i$1 = 0; i$1 < parsers.length; i$1++) {
+				const p = parsers[i$1];
+				if (p.leadingNames.size > 0 || p.acceptingAnyToken) continue;
+				const parseResult = await p.parse({
+					...emptyCtx,
+					state: getAnnotatedChildState(state, p.initialState, p)
+				});
+				if (!parseResult.success || parseResult.provisional) continue;
+				candidateCount++;
+				if (candidateIndex < 0) candidateIndex = i$1;
+				if (candidateCount > 1) break;
+			}
+			if (candidateCount === 1 && candidateIndex >= 0 && (parsers[candidateIndex].$mode === "sync" || exec?.phase !== "parse" && exec?.phase !== "suggest")) {
+				const p = parsers[candidateIndex];
+				const parseResult = await p.parse({
+					...emptyCtx,
+					state: getAnnotatedChildState(state, p.initialState, p)
+				});
+				if (parseResult.success) {
+					const annotatedState = getAnnotatedChildState(state, parseResult.next.state, p);
+					return await p.complete(annotatedState, withChildExecPath(exec, candidateIndex));
 				}
-				return {
-					success: false,
-					error: getNoMatchError(options, noMatchContext)
-				};
-			});
-		}
+			}
+			return {
+				success: false,
+				error: getNoMatchError(options, noMatchContext)
+			};
+		});
 		const [i, result] = activeState;
 		if (!result.success) return {
 			success: false,
@@ -4034,10 +4030,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					const deferredValue = deferredDiscriminatorResult.value;
 					const deferredBranch = syncBranches[deferredValue];
 					if (deferredBranch) {
+						const branchExec = withChildExecPath(exec, "_branch");
 						const emptyCtx = {
 							buffer: [],
 							optionsTerminated: false,
-							usage: []
+							usage: [],
+							exec: branchExec,
+							dependencyRegistry: exec?.dependencyRegistry
 						};
 						const annotatedInitial = getAnnotatedChildState(state, deferredBranch.initialState, deferredBranch);
 						const replayResult = deferredBranch.parse({
@@ -4046,7 +4045,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						});
 						const branchState = replayResult.success ? replayResult.next.state : annotatedInitial;
 						const annotatedBranchState = getAnnotatedChildState(state, branchState, deferredBranch);
-						const branchResult$1 = unwrapCompleteResult(deferredBranch.complete(annotatedBranchState, withChildExecPath(exec, "_branch")));
+						const branchResult$1 = unwrapCompleteResult(deferredBranch.complete(annotatedBranchState, branchExec));
 						if (branchResult$1.success) return {
 							success: true,
 							value: [deferredValue, branchResult$1.value],
@@ -4140,10 +4139,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					const deferredValue = deferredDiscriminatorResult.value;
 					const deferredBranch = branches[deferredValue];
 					if (deferredBranch) {
+						const branchExec = withChildExecPath(exec, "_branch");
 						const emptyCtx = {
 							buffer: [],
 							optionsTerminated: false,
-							usage: []
+							usage: [],
+							exec: branchExec,
+							dependencyRegistry: exec?.dependencyRegistry
 						};
 						const annotatedInitial = getAnnotatedChildState(state, deferredBranch.initialState, deferredBranch);
 						const replayResult = await deferredBranch.parse({
@@ -4152,7 +4154,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						});
 						const branchState = replayResult.success ? replayResult.next.state : annotatedInitial;
 						const annotatedBranchState = getAnnotatedChildState(state, branchState, deferredBranch);
-						const branchResult$1 = unwrapCompleteResult(await deferredBranch.complete(annotatedBranchState, withChildExecPath(exec, "_branch")));
+						const branchResult$1 = unwrapCompleteResult(await deferredBranch.complete(annotatedBranchState, branchExec));
 						if (branchResult$1.success) return {
 							success: true,
 							value: [deferredValue, branchResult$1.value],

package/dist/constructs.js

@@ -513,81 +513,77 @@ function createExclusiveComplete(parsers, options, noMatchContext, mode) {
 	const syncParsers = parsers;
 	return (state, exec) => {
 		const activeState = normalizeExclusiveState(state);
-		if (activeState == null) {
-			const annotations = getAnnotations(state);
-			const annotateInitial = (initial) => annotations != null && initial != null && typeof initial === "object" ? injectAnnotations(initial, annotations) : initial;
-			return dispatchByMode(mode, () => {
-				const emptyCtx = {
-					buffer: [],
-					optionsTerminated: false,
-					usage: []
-				};
-				let candidateIndex = -1;
-				let candidateCount = 0;
-				for (let i$1 = 0; i$1 < syncParsers.length; i$1++) {
-					const p = syncParsers[i$1];
-					if (p.leadingNames.size > 0 || p.acceptingAnyToken) continue;
-					const parseResult = p.parse({
-						...emptyCtx,
-						state: annotateInitial(p.initialState)
-					});
-					if (!parseResult.success || parseResult.provisional) continue;
-					candidateCount++;
-					if (candidateIndex < 0) candidateIndex = i$1;
-					if (candidateCount > 1) break;
-				}
-				if (candidateCount === 1 && candidateIndex >= 0) {
-					const p = syncParsers[candidateIndex];
-					const parseResult = p.parse({
-						...emptyCtx,
-						state: annotateInitial(p.initialState)
-					});
-					if (parseResult.success) {
-						const annotatedState = getAnnotatedChildState(state, parseResult.next.state, p);
-						return p.complete(annotatedState, withChildExecPath(exec, candidateIndex));
-					}
-				}
-				return {
-					success: false,
-					error: getNoMatchError(options, noMatchContext)
-				};
-			}, async () => {
-				const emptyCtx = {
-					buffer: [],
-					optionsTerminated: false,
-					usage: []
-				};
-				let candidateIndex = -1;
-				let candidateCount = 0;
-				for (let i$1 = 0; i$1 < parsers.length; i$1++) {
-					const p = parsers[i$1];
-					if (p.leadingNames.size > 0 || p.acceptingAnyToken) continue;
-					const parseResult = await p.parse({
-						...emptyCtx,
-						state: annotateInitial(p.initialState)
-					});
-					if (!parseResult.success || parseResult.provisional) continue;
-					candidateCount++;
-					if (candidateIndex < 0) candidateIndex = i$1;
-					if (candidateCount > 1) break;
+		if (activeState == null) return dispatchByMode(mode, () => {
+			const emptyCtx = {
+				buffer: [],
+				optionsTerminated: false,
+				usage: []
+			};
+			let candidateIndex = -1;
+			let candidateCount = 0;
+			for (let i$1 = 0; i$1 < syncParsers.length; i$1++) {
+				const p = syncParsers[i$1];
+				if (p.leadingNames.size > 0 || p.acceptingAnyToken) continue;
+				const parseResult = p.parse({
+					...emptyCtx,
+					state: getAnnotatedChildState(state, p.initialState, p)
+				});
+				if (!parseResult.success || parseResult.provisional) continue;
+				candidateCount++;
+				if (candidateIndex < 0) candidateIndex = i$1;
+				if (candidateCount > 1) break;
+			}
+			if (candidateCount === 1 && candidateIndex >= 0) {
+				const p = syncParsers[candidateIndex];
+				const parseResult = p.parse({
+					...emptyCtx,
+					state: getAnnotatedChildState(state, p.initialState, p)
+				});
+				if (parseResult.success) {
+					const annotatedState = getAnnotatedChildState(state, parseResult.next.state, p);
+					return p.complete(annotatedState, withChildExecPath(exec, candidateIndex));
 				}
-				if (candidateCount === 1 && candidateIndex >= 0 && (parsers[candidateIndex].$mode === "sync" || exec?.phase !== "parse" && exec?.phase !== "suggest")) {
-					const p = parsers[candidateIndex];
-					const parseResult = await p.parse({
-						...emptyCtx,
-						state: annotateInitial(p.initialState)
-					});
-					if (parseResult.success) {
-						const annotatedState = getAnnotatedChildState(state, parseResult.next.state, p);
-						return await p.complete(annotatedState, withChildExecPath(exec, candidateIndex));
-					}
+			}
+			return {
+				success: false,
+				error: getNoMatchError(options, noMatchContext)
+			};
+		}, async () => {
+			const emptyCtx = {
+				buffer: [],
+				optionsTerminated: false,
+				usage: []
+			};
+			let candidateIndex = -1;
+			let candidateCount = 0;
+			for (let i$1 = 0; i$1 < parsers.length; i$1++) {
+				const p = parsers[i$1];
+				if (p.leadingNames.size > 0 || p.acceptingAnyToken) continue;
+				const parseResult = await p.parse({
+					...emptyCtx,
+					state: getAnnotatedChildState(state, p.initialState, p)
+				});
+				if (!parseResult.success || parseResult.provisional) continue;
+				candidateCount++;
+				if (candidateIndex < 0) candidateIndex = i$1;
+				if (candidateCount > 1) break;
+			}
+			if (candidateCount === 1 && candidateIndex >= 0 && (parsers[candidateIndex].$mode === "sync" || exec?.phase !== "parse" && exec?.phase !== "suggest")) {
+				const p = parsers[candidateIndex];
+				const parseResult = await p.parse({
+					...emptyCtx,
+					state: getAnnotatedChildState(state, p.initialState, p)
+				});
+				if (parseResult.success) {
+					const annotatedState = getAnnotatedChildState(state, parseResult.next.state, p);
+					return await p.complete(annotatedState, withChildExecPath(exec, candidateIndex));
 				}
-				return {
-					success: false,
-					error: getNoMatchError(options, noMatchContext)
-				};
-			});
-		}
+			}
+			return {
+				success: false,
+				error: getNoMatchError(options, noMatchContext)
+			};
+		});
 		const [i, result] = activeState;
 		if (!result.success) return {
 			success: false,
@@ -4034,10 +4030,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					const deferredValue = deferredDiscriminatorResult.value;
 					const deferredBranch = syncBranches[deferredValue];
 					if (deferredBranch) {
+						const branchExec = withChildExecPath(exec, "_branch");
 						const emptyCtx = {
 							buffer: [],
 							optionsTerminated: false,
-							usage: []
+							usage: [],
+							exec: branchExec,
+							dependencyRegistry: exec?.dependencyRegistry
 						};
 						const annotatedInitial = getAnnotatedChildState(state, deferredBranch.initialState, deferredBranch);
 						const replayResult = deferredBranch.parse({
@@ -4046,7 +4045,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						});
 						const branchState = replayResult.success ? replayResult.next.state : annotatedInitial;
 						const annotatedBranchState = getAnnotatedChildState(state, branchState, deferredBranch);
-						const branchResult$1 = unwrapCompleteResult(deferredBranch.complete(annotatedBranchState, withChildExecPath(exec, "_branch")));
+						const branchResult$1 = unwrapCompleteResult(deferredBranch.complete(annotatedBranchState, branchExec));
 						if (branchResult$1.success) return {
 							success: true,
 							value: [deferredValue, branchResult$1.value],
@@ -4140,10 +4139,13 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					const deferredValue = deferredDiscriminatorResult.value;
 					const deferredBranch = branches[deferredValue];
 					if (deferredBranch) {
+						const branchExec = withChildExecPath(exec, "_branch");
 						const emptyCtx = {
 							buffer: [],
 							optionsTerminated: false,
-							usage: []
+							usage: [],
+							exec: branchExec,
+							dependencyRegistry: exec?.dependencyRegistry
 						};
 						const annotatedInitial = getAnnotatedChildState(state, deferredBranch.initialState, deferredBranch);
 						const replayResult = await deferredBranch.parse({
@@ -4152,7 +4154,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 						});
 						const branchState = replayResult.success ? replayResult.next.state : annotatedInitial;
 						const annotatedBranchState = getAnnotatedChildState(state, branchState, deferredBranch);
-						const branchResult$1 = unwrapCompleteResult(await deferredBranch.complete(annotatedBranchState, withChildExecPath(exec, "_branch")));
+						const branchResult$1 = unwrapCompleteResult(await deferredBranch.complete(annotatedBranchState, branchExec));
 						if (branchResult$1.success) return {
 							success: true,
 							value: [deferredValue, branchResult$1.value],

package/dist/modifiers.cjs

@@ -6,10 +6,10 @@ const require_parser = require('./parser.cjs');
 
 //#region src/modifiers.ts
 /**
-* Internal marker for optional-style wrappers (`optional()`, `withDefault()`).
-* Used by `object()`'s zero-consumption pass to skip these parsers, since they
-* should return `undefined`/default when the user provides no input rather than
-* running the inner parser.
+* Internal marker for wrappers that should be skipped by `object()`'s
+* zero-consumption pass.  Set on `optional()`, `withDefault()`, and
+* `prompt()`, since these wrappers have their own completion semantics
+* that should not be short-circuited during parse.
 *
 * @internal
 */

package/dist/modifiers.d.cts

@@ -4,10 +4,10 @@ import { Mode, Parser } from "./parser.cjs";
 //#region src/modifiers.d.ts
 
 /**
- * Internal marker for optional-style wrappers (`optional()`, `withDefault()`).
- * Used by `object()`'s zero-consumption pass to skip these parsers, since they
- * should return `undefined`/default when the user provides no input rather than
- * running the inner parser.
+ * Internal marker for wrappers that should be skipped by `object()`'s
+ * zero-consumption pass.  Set on `optional()`, `withDefault()`, and
+ * `prompt()`, since these wrappers have their own completion semantics
+ * that should not be short-circuited during parse.
  *
  * @internal
  */

package/dist/modifiers.d.ts

@@ -4,10 +4,10 @@ import { Mode, Parser } from "./parser.js";
 //#region src/modifiers.d.ts
 
 /**
- * Internal marker for optional-style wrappers (`optional()`, `withDefault()`).
- * Used by `object()`'s zero-consumption pass to skip these parsers, since they
- * should return `undefined`/default when the user provides no input rather than
- * running the inner parser.
+ * Internal marker for wrappers that should be skipped by `object()`'s
+ * zero-consumption pass.  Set on `optional()`, `withDefault()`, and
+ * `prompt()`, since these wrappers have their own completion semantics
+ * that should not be short-circuited during parse.
  *
  * @internal
  */

package/dist/modifiers.js

@@ -6,10 +6,10 @@ import { defineInheritedAnnotationParser, defineSourceBindingOnlyAnnotationCompl
 
 //#region src/modifiers.ts
 /**
-* Internal marker for optional-style wrappers (`optional()`, `withDefault()`).
-* Used by `object()`'s zero-consumption pass to skip these parsers, since they
-* should return `undefined`/default when the user provides no input rather than
-* running the inner parser.
+* Internal marker for wrappers that should be skipped by `object()`'s
+* zero-consumption pass.  Set on `optional()`, `withDefault()`, and
+* `prompt()`, since these wrappers have their own completion semantics
+* that should not be short-circuited during parse.
 *
 * @internal
 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.1701+1135d650",
+  "version": "1.0.0-dev.1705+262899fd",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",