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

package/dist/constructs.cjs

@@ -4450,6 +4450,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					};
 				} else if (defaultBranch === void 0) return deferredDiscriminatorResult;
 			}
+			if (defaultBranch !== void 0 && (exec?.phase === "parse" || exec?.phase === "suggest")) return {
+				success: true,
+				value: [void 0, void 0]
+			};
 			if (defaultBranch !== void 0) {
 				const branchState = getAnnotatedChildState(state, state.branchState ?? defaultBranch.initialState, defaultBranch);
 				const defaultResult = unwrapCompleteResult(await defaultBranch.complete(branchState, withChildExecPath(exec, "_branch")));
@@ -4477,7 +4481,6 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const runtime = require_dependency_runtime.createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
 		await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path), runtime);
 		require_dependency_runtime.collectSourcesFromState(combinedState, runtime);
-		const resolvedBranchState = getAnnotatedChildState(state, await require_dependency_runtime.resolveStateWithRuntimeAsync(state.branchState, runtime), branchParser);
 		const completionExec = {
 			...exec ?? {
 				usage: branchParser.usage,
@@ -4519,6 +4522,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				error: options?.errors?.branchMismatch ? options.errors.branchMismatch(resolvedKey, speculativeKey) : require_message.message`Branch mismatch: tokens for ${speculativeKey} were consumed, but the discriminator resolved to ${resolvedKey}.`
 			};
 		}
+		const resolvedBranchState = getAnnotatedChildState(state, await require_dependency_runtime.resolveStateWithRuntimeAsync(state.branchState, runtime), branchParser);
 		const branchResult = unwrapCompleteResult(await branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch")));
 		if (!branchResult.success) {
 			if (discriminatorValue !== void 0 && options?.errors?.branchError) return {

package/dist/constructs.d.cts

@@ -1343,7 +1343,7 @@ interface ConditionalErrorOptions {
    * Receives both the discriminator value the parser actually
    * resolved to (`discriminatorValue`) and the speculative key the
    * branch tokens were committed to (`speculativeKey`).
-   * @since 0.10.1
+   * @since 1.0.1
    */
   readonly branchMismatch?: (discriminatorValue: string, speculativeKey: string) => Message;
 }

package/dist/constructs.d.ts

@@ -1343,7 +1343,7 @@ interface ConditionalErrorOptions {
    * Receives both the discriminator value the parser actually
    * resolved to (`discriminatorValue`) and the speculative key the
    * branch tokens were committed to (`speculativeKey`).
-   * @since 0.10.1
+   * @since 1.0.1
    */
   readonly branchMismatch?: (discriminatorValue: string, speculativeKey: string) => Message;
 }

package/dist/constructs.js

@@ -4450,6 +4450,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
 					};
 				} else if (defaultBranch === void 0) return deferredDiscriminatorResult;
 			}
+			if (defaultBranch !== void 0 && (exec?.phase === "parse" || exec?.phase === "suggest")) return {
+				success: true,
+				value: [void 0, void 0]
+			};
 			if (defaultBranch !== void 0) {
 				const branchState = getAnnotatedChildState(state, state.branchState ?? defaultBranch.initialState, defaultBranch);
 				const defaultResult = unwrapCompleteResult(await defaultBranch.complete(branchState, withChildExecPath(exec, "_branch")));
@@ -4477,7 +4481,6 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		const runtime = createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
 		await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, exec?.path), runtime);
 		collectSourcesFromState(combinedState, runtime);
-		const resolvedBranchState = getAnnotatedChildState(state, await resolveStateWithRuntimeAsync(state.branchState, runtime), branchParser);
 		const completionExec = {
 			...exec ?? {
 				usage: branchParser.usage,
@@ -4519,6 +4522,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 				error: options?.errors?.branchMismatch ? options.errors.branchMismatch(resolvedKey, speculativeKey) : message`Branch mismatch: tokens for ${speculativeKey} were consumed, but the discriminator resolved to ${resolvedKey}.`
 			};
 		}
+		const resolvedBranchState = getAnnotatedChildState(state, await resolveStateWithRuntimeAsync(state.branchState, runtime), branchParser);
 		const branchResult = unwrapCompleteResult(await branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch")));
 		if (!branchResult.success) {
 			if (discriminatorValue !== void 0 && options?.errors?.branchError) return {

package/package.json

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