@optique/core 1.0.0-dev.1716 → 1.0.0-dev.1720

package/dist/constructs.cjs

@@ -4497,7 +4497,19 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			dependencyRegistry: runtime.registry
 		};
 		const needsDiscriminatorCompletion = state.selectedBranch.kind !== "default" && !(state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key);
-		const discriminatorCompleteResult = needsDiscriminatorCompletion ? await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(completionExec, "_discriminator")) : void 0;
+		let discriminatorCompletionExec = completionExec;
+		if (wasSpeculative && needsDiscriminatorCompletion) {
+			const discOnlyState = { _discriminator: annotatedDiscriminatorState };
+			const discOnlyRuntime = require_dependency_runtime.createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
+			await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromPairs([["_discriminator", discriminator]], discOnlyState, exec?.path), discOnlyRuntime);
+			require_dependency_runtime.collectSourcesFromState(discOnlyState, discOnlyRuntime);
+			discriminatorCompletionExec = {
+				...completionExec,
+				dependencyRuntime: discOnlyRuntime,
+				dependencyRegistry: discOnlyRuntime.registry
+			};
+		}
+		const discriminatorCompleteResult = needsDiscriminatorCompletion ? await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(discriminatorCompletionExec, "_discriminator")) : void 0;
 		let discriminatorValue;
 		if (state.selectedBranch.kind === "default") discriminatorValue = void 0;
 		else if (state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key) discriminatorValue = state.discriminatorValue;
@@ -4509,7 +4521,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		if (wasSpeculative && state.selectedBranch.kind === "branch" && discriminatorValue !== state.selectedBranch.key) {
 			const speculativeKey = state.selectedBranch.key;
-			const resolvedKey = discriminatorValue ?? "";
+			const resolvedKey = typeof discriminatorValue === "string" ? discriminatorValue : "<unknown>";
 			return {
 				success: false,
 				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}.`

package/dist/constructs.d.cts

@@ -1327,11 +1327,11 @@ interface ConditionalErrorOptions {
    * Custom error message when branch parser fails.
    * Receives the discriminator value for context.
    */
-  branchError?: (discriminatorValue: string | undefined, error: Message) => Message;
+  readonly branchError?: (discriminatorValue: string | undefined, error: Message) => Message;
   /**
    * Custom error message for no matching input.
    */
-  noMatch?: Message | ((context: NoMatchContext) => Message);
+  readonly noMatch?: Message | ((context: NoMatchContext) => Message);
   /**
    * Custom error message when speculative branch parsing committed
    * to one branch but the resolved discriminator value names a
@@ -1345,7 +1345,7 @@ interface ConditionalErrorOptions {
    * branch tokens were committed to (`speculativeKey`).
    * @since 0.10.1
    */
-  branchMismatch?: (discriminatorValue: string, speculativeKey: string) => Message;
+  readonly branchMismatch?: (discriminatorValue: string, speculativeKey: string) => Message;
 }
 /**
  * Options for customizing the {@link conditional} combinator behavior.
@@ -1355,7 +1355,7 @@ interface ConditionalOptions {
   /**
    * Custom error messages.
    */
-  errors?: ConditionalErrorOptions;
+  readonly errors?: ConditionalErrorOptions;
 }
 /**
  * Helper type to infer result type without default branch.

package/dist/constructs.d.ts

@@ -1327,11 +1327,11 @@ interface ConditionalErrorOptions {
    * Custom error message when branch parser fails.
    * Receives the discriminator value for context.
    */
-  branchError?: (discriminatorValue: string | undefined, error: Message) => Message;
+  readonly branchError?: (discriminatorValue: string | undefined, error: Message) => Message;
   /**
    * Custom error message for no matching input.
    */
-  noMatch?: Message | ((context: NoMatchContext) => Message);
+  readonly noMatch?: Message | ((context: NoMatchContext) => Message);
   /**
    * Custom error message when speculative branch parsing committed
    * to one branch but the resolved discriminator value names a
@@ -1345,7 +1345,7 @@ interface ConditionalErrorOptions {
    * branch tokens were committed to (`speculativeKey`).
    * @since 0.10.1
    */
-  branchMismatch?: (discriminatorValue: string, speculativeKey: string) => Message;
+  readonly branchMismatch?: (discriminatorValue: string, speculativeKey: string) => Message;
 }
 /**
  * Options for customizing the {@link conditional} combinator behavior.
@@ -1355,7 +1355,7 @@ interface ConditionalOptions {
   /**
    * Custom error messages.
    */
-  errors?: ConditionalErrorOptions;
+  readonly errors?: ConditionalErrorOptions;
 }
 /**
  * Helper type to infer result type without default branch.

package/dist/constructs.js

@@ -4497,7 +4497,19 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			dependencyRegistry: runtime.registry
 		};
 		const needsDiscriminatorCompletion = state.selectedBranch.kind !== "default" && !(state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key);
-		const discriminatorCompleteResult = needsDiscriminatorCompletion ? await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(completionExec, "_discriminator")) : void 0;
+		let discriminatorCompletionExec = completionExec;
+		if (wasSpeculative && needsDiscriminatorCompletion) {
+			const discOnlyState = { _discriminator: annotatedDiscriminatorState };
+			const discOnlyRuntime = createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
+			await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs([["_discriminator", discriminator]], discOnlyState, exec?.path), discOnlyRuntime);
+			collectSourcesFromState(discOnlyState, discOnlyRuntime);
+			discriminatorCompletionExec = {
+				...completionExec,
+				dependencyRuntime: discOnlyRuntime,
+				dependencyRegistry: discOnlyRuntime.registry
+			};
+		}
+		const discriminatorCompleteResult = needsDiscriminatorCompletion ? await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(discriminatorCompletionExec, "_discriminator")) : void 0;
 		let discriminatorValue;
 		if (state.selectedBranch.kind === "default") discriminatorValue = void 0;
 		else if (state.discriminatorValue != null && state.discriminatorValue === state.selectedBranch.key) discriminatorValue = state.discriminatorValue;
@@ -4509,7 +4521,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		}
 		if (wasSpeculative && state.selectedBranch.kind === "branch" && discriminatorValue !== state.selectedBranch.key) {
 			const speculativeKey = state.selectedBranch.key;
-			const resolvedKey = discriminatorValue ?? "";
+			const resolvedKey = typeof discriminatorValue === "string" ? discriminatorValue : "<unknown>";
 			return {
 				success: false,
 				error: options?.errors?.branchMismatch ? options.errors.branchMismatch(resolvedKey, speculativeKey) : message`Branch mismatch: tokens for ${speculativeKey} were consumed, but the discriminator resolved to ${resolvedKey}.`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.1716+22013925",
+  "version": "1.0.0-dev.1720+dd376912",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",