@optique/core 1.0.0-dev.1722 → 1.0.0-dev.1726

package/dist/constructs.cjs

@@ -872,27 +872,27 @@ function or(...args) {
 							dependencyRegistry: replayExec.dependencyRegistry
 						} : {}
 					}, provisionalConsuming.index, checkResult.next.state, provisionalConsuming.parser));
-					if (replayedResult.success) {
-						const mergedExec = mergeChildExec(replayExec, replayedResult.next.exec);
-						return {
-							success: true,
-							provisional: true,
-							next: {
-								...context,
-								buffer: replayedResult.next.buffer,
-								optionsTerminated: replayedResult.next.optionsTerminated,
-								state: createExclusiveState(context.state, provisionalConsuming.index, provisionalConsuming.parser, {
-									...replayedResult,
-									consumed: [...previouslyConsumed, ...replayedResult.consumed]
-								}),
-								...mergedExec != null ? {
-									exec: mergedExec,
-									dependencyRegistry: mergedExec.dependencyRegistry
-								} : {}
-							},
-							consumed: replayedResult.consumed
-						};
-					}
+					if (!replayedResult.success) return replayedResult;
+					const mergedExec = mergeChildExec(replayExec, replayedResult.next.exec);
+					return {
+						success: true,
+						provisional: true,
+						next: {
+							...context,
+							buffer: replayedResult.next.buffer,
+							optionsTerminated: replayedResult.next.optionsTerminated,
+							state: createExclusiveState(context.state, provisionalConsuming.index, provisionalConsuming.parser, {
+								...replayedResult,
+								provisional: true,
+								consumed: [...previouslyConsumed, ...replayedResult.consumed]
+							}),
+							...mergedExec != null ? {
+								exec: mergedExec,
+								dependencyRegistry: mergedExec.dependencyRegistry
+							} : {}
+						},
+						consumed: replayedResult.consumed
+					};
 				}
 			}
 		}
@@ -1071,27 +1071,27 @@ function or(...args) {
 							dependencyRegistry: replayExec.dependencyRegistry
 						} : {}
 					}, provisionalConsuming.index, checkResult.next.state, provisionalConsuming.parser));
-					if (replayedResult.success) {
-						const mergedExec = mergeChildExec(replayExec, replayedResult.next.exec);
-						return {
-							success: true,
-							provisional: true,
-							next: {
-								...context,
-								buffer: replayedResult.next.buffer,
-								optionsTerminated: replayedResult.next.optionsTerminated,
-								state: createExclusiveState(context.state, provisionalConsuming.index, provisionalConsuming.parser, {
-									...replayedResult,
-									consumed: [...previouslyConsumed, ...replayedResult.consumed]
-								}),
-								...mergedExec != null ? {
-									exec: mergedExec,
-									dependencyRegistry: mergedExec.dependencyRegistry
-								} : {}
-							},
-							consumed: replayedResult.consumed
-						};
-					}
+					if (!replayedResult.success) return replayedResult;
+					const mergedExec = mergeChildExec(replayExec, replayedResult.next.exec);
+					return {
+						success: true,
+						provisional: true,
+						next: {
+							...context,
+							buffer: replayedResult.next.buffer,
+							optionsTerminated: replayedResult.next.optionsTerminated,
+							state: createExclusiveState(context.state, provisionalConsuming.index, provisionalConsuming.parser, {
+								...replayedResult,
+								provisional: true,
+								consumed: [...previouslyConsumed, ...replayedResult.consumed]
+							}),
+							...mergedExec != null ? {
+								exec: mergedExec,
+								dependencyRegistry: mergedExec.dependencyRegistry
+							} : {}
+						},
+						consumed: replayedResult.consumed
+					};
 				}
 			}
 		}
@@ -3851,10 +3851,6 @@ function group(label, parser, options = {}) {
 * - Within `longestMatch()`, a longer speculative match can beat a
 *   shorter definitive one.  If the speculative match fails during
 *   completion, the tokens consumed by it are not recoverable.
-* - The dependency runtime seeds both discriminator and branch sources
-*   before verifying the speculative selection.  A discriminator that
-*   depends on branch-local dependency sources could be circularly
-*   confirmed by the speculative branch.
 *
 * @since 0.8.0
 */
@@ -4048,6 +4044,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				const mergedExec = mergeChildExec(context.exec, branchResult.next.exec);
 				return {
 					success: true,
+					...state.speculative || branchResult.provisional ? { provisional: true } : {},
 					next: {
 						...branchResult.next,
 						state: {
@@ -4172,16 +4169,12 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					success: true,
 					provisional: true,
 					next: {
-						...context,
+						...speculationContext,
 						state: {
 							...state,
 							discriminatorState: annotatedDiscriminatorState$1,
 							branchState: deferredBranchState
-						},
-						...discriminatorExec != null ? {
-							exec: discriminatorExec,
-							dependencyRegistry: discriminatorExec.dependencyRegistry
-						} : {}
+						}
 					},
 					consumed: []
 				};
@@ -4409,10 +4402,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				...state,
 				speculative: void 0
 			};
-		} else state = {
-			...state,
-			discriminatorValue: state.selectedBranch.key,
-			speculative: void 0
+		} else return {
+			success: true,
+			value: [state.selectedBranch.key, void 0]
 		};
 		if (state.selectedBranch === void 0) {
 			if (exec?.phase !== "parse" && exec?.phase !== "suggest") {

package/dist/constructs.js

@@ -872,27 +872,27 @@ function or(...args) {
 							dependencyRegistry: replayExec.dependencyRegistry
 						} : {}
 					}, provisionalConsuming.index, checkResult.next.state, provisionalConsuming.parser));
-					if (replayedResult.success) {
-						const mergedExec = mergeChildExec(replayExec, replayedResult.next.exec);
-						return {
-							success: true,
-							provisional: true,
-							next: {
-								...context,
-								buffer: replayedResult.next.buffer,
-								optionsTerminated: replayedResult.next.optionsTerminated,
-								state: createExclusiveState(context.state, provisionalConsuming.index, provisionalConsuming.parser, {
-									...replayedResult,
-									consumed: [...previouslyConsumed, ...replayedResult.consumed]
-								}),
-								...mergedExec != null ? {
-									exec: mergedExec,
-									dependencyRegistry: mergedExec.dependencyRegistry
-								} : {}
-							},
-							consumed: replayedResult.consumed
-						};
-					}
+					if (!replayedResult.success) return replayedResult;
+					const mergedExec = mergeChildExec(replayExec, replayedResult.next.exec);
+					return {
+						success: true,
+						provisional: true,
+						next: {
+							...context,
+							buffer: replayedResult.next.buffer,
+							optionsTerminated: replayedResult.next.optionsTerminated,
+							state: createExclusiveState(context.state, provisionalConsuming.index, provisionalConsuming.parser, {
+								...replayedResult,
+								provisional: true,
+								consumed: [...previouslyConsumed, ...replayedResult.consumed]
+							}),
+							...mergedExec != null ? {
+								exec: mergedExec,
+								dependencyRegistry: mergedExec.dependencyRegistry
+							} : {}
+						},
+						consumed: replayedResult.consumed
+					};
 				}
 			}
 		}
@@ -1071,27 +1071,27 @@ function or(...args) {
 							dependencyRegistry: replayExec.dependencyRegistry
 						} : {}
 					}, provisionalConsuming.index, checkResult.next.state, provisionalConsuming.parser));
-					if (replayedResult.success) {
-						const mergedExec = mergeChildExec(replayExec, replayedResult.next.exec);
-						return {
-							success: true,
-							provisional: true,
-							next: {
-								...context,
-								buffer: replayedResult.next.buffer,
-								optionsTerminated: replayedResult.next.optionsTerminated,
-								state: createExclusiveState(context.state, provisionalConsuming.index, provisionalConsuming.parser, {
-									...replayedResult,
-									consumed: [...previouslyConsumed, ...replayedResult.consumed]
-								}),
-								...mergedExec != null ? {
-									exec: mergedExec,
-									dependencyRegistry: mergedExec.dependencyRegistry
-								} : {}
-							},
-							consumed: replayedResult.consumed
-						};
-					}
+					if (!replayedResult.success) return replayedResult;
+					const mergedExec = mergeChildExec(replayExec, replayedResult.next.exec);
+					return {
+						success: true,
+						provisional: true,
+						next: {
+							...context,
+							buffer: replayedResult.next.buffer,
+							optionsTerminated: replayedResult.next.optionsTerminated,
+							state: createExclusiveState(context.state, provisionalConsuming.index, provisionalConsuming.parser, {
+								...replayedResult,
+								provisional: true,
+								consumed: [...previouslyConsumed, ...replayedResult.consumed]
+							}),
+							...mergedExec != null ? {
+								exec: mergedExec,
+								dependencyRegistry: mergedExec.dependencyRegistry
+							} : {}
+						},
+						consumed: replayedResult.consumed
+					};
 				}
 			}
 		}
@@ -3851,10 +3851,6 @@ function group(label, parser, options = {}) {
 * - Within `longestMatch()`, a longer speculative match can beat a
 *   shorter definitive one.  If the speculative match fails during
 *   completion, the tokens consumed by it are not recoverable.
-* - The dependency runtime seeds both discriminator and branch sources
-*   before verifying the speculative selection.  A discriminator that
-*   depends on branch-local dependency sources could be circularly
-*   confirmed by the speculative branch.
 *
 * @since 0.8.0
 */
@@ -4048,6 +4044,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				const mergedExec = mergeChildExec(context.exec, branchResult.next.exec);
 				return {
 					success: true,
+					...state.speculative || branchResult.provisional ? { provisional: true } : {},
 					next: {
 						...branchResult.next,
 						state: {
@@ -4172,16 +4169,12 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					success: true,
 					provisional: true,
 					next: {
-						...context,
+						...speculationContext,
 						state: {
 							...state,
 							discriminatorState: annotatedDiscriminatorState$1,
 							branchState: deferredBranchState
-						},
-						...discriminatorExec != null ? {
-							exec: discriminatorExec,
-							dependencyRegistry: discriminatorExec.dependencyRegistry
-						} : {}
+						}
 					},
 					consumed: []
 				};
@@ -4409,10 +4402,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				...state,
 				speculative: void 0
 			};
-		} else state = {
-			...state,
-			discriminatorValue: state.selectedBranch.key,
-			speculative: void 0
+		} else return {
+			success: true,
+			value: [state.selectedBranch.key, void 0]
 		};
 		if (state.selectedBranch === void 0) {
 			if (exec?.phase !== "parse" && exec?.phase !== "suggest") {

package/dist/parser.d.cts

@@ -559,11 +559,23 @@ type ParserResult<TState> = {
    */
   readonly consumed: readonly string[];
   /**
-   * When `true`, indicates that this success is tentative: the parser
-   * matched something (e.g., a zero-consuming discriminator resolved to
-   * a branch key) but the selected sub-parser has not consumed any input
-   * yet.  Outer combinators like {@link or} should not treat provisional
-   * successes as definitive zero-consumed fallback candidates.
+   * When `true`, indicates that this success is tentative or
+   * speculative: the parser matched something but the match has not
+   * been confirmed yet.  This covers two cases:
+   *
+   * - A zero-consuming discriminator resolved to a branch key, but
+   *   the selected sub-parser has not consumed any input yet.
+   * - A {@link conditional} parser speculatively committed to a
+   *   named branch that consumed tokens, before the discriminator
+   *   has had a chance to confirm the choice.  In this case the
+   *   marker stays set across subsequent parse calls until
+   *   `complete()` verifies the speculative selection.
+   *
+   * Outer combinators like {@link or} and {@link longestMatch} should
+   * not treat provisional successes as definitive — a definitive
+   * branch must be allowed to take priority, and a definitive
+   * zero-consuming fallback must not be displaced by a provisional
+   * consuming hit.
    *
    * @since 1.0.0
    */

package/dist/parser.d.ts

@@ -559,11 +559,23 @@ type ParserResult<TState> = {
    */
   readonly consumed: readonly string[];
   /**
-   * When `true`, indicates that this success is tentative: the parser
-   * matched something (e.g., a zero-consuming discriminator resolved to
-   * a branch key) but the selected sub-parser has not consumed any input
-   * yet.  Outer combinators like {@link or} should not treat provisional
-   * successes as definitive zero-consumed fallback candidates.
+   * When `true`, indicates that this success is tentative or
+   * speculative: the parser matched something but the match has not
+   * been confirmed yet.  This covers two cases:
+   *
+   * - A zero-consuming discriminator resolved to a branch key, but
+   *   the selected sub-parser has not consumed any input yet.
+   * - A {@link conditional} parser speculatively committed to a
+   *   named branch that consumed tokens, before the discriminator
+   *   has had a chance to confirm the choice.  In this case the
+   *   marker stays set across subsequent parse calls until
+   *   `complete()` verifies the speculative selection.
+   *
+   * Outer combinators like {@link or} and {@link longestMatch} should
+   * not treat provisional successes as definitive — a definitive
+   * branch must be allowed to take priority, and a definitive
+   * zero-consuming fallback must not be displaced by a provisional
+   * consuming hit.
    *
    * @since 1.0.0
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.1722+72215deb",
+  "version": "1.0.0-dev.1726+29d6f85c",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",