@optique/core 1.0.0-dev.1667 → 1.0.0-dev.1671
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/constructs.cjs +26 -18
- package/dist/constructs.js +26 -18
- package/package.json +1 -1
package/dist/constructs.cjs
CHANGED
|
@@ -3509,9 +3509,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3509
3509
|
}
|
|
3510
3510
|
return branchResult;
|
|
3511
3511
|
}
|
|
3512
|
-
const discriminatorResult = syncDiscriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState) });
|
|
3512
|
+
const discriminatorResult = syncDiscriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState, syncDiscriminator) });
|
|
3513
3513
|
if (discriminatorResult.success && discriminatorResult.consumed.length > 0) {
|
|
3514
|
-
const
|
|
3514
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, discriminatorResult.next.state, syncDiscriminator);
|
|
3515
|
+
const completionResult = syncDiscriminator.complete(annotatedDiscriminatorState, withChildExecPath(context.exec, "_discriminator"));
|
|
3515
3516
|
if (completionResult.success) {
|
|
3516
3517
|
const value = completionResult.value;
|
|
3517
3518
|
const branchParser = syncBranches[value];
|
|
@@ -3535,7 +3536,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3535
3536
|
next: {
|
|
3536
3537
|
...branchParseResult.next,
|
|
3537
3538
|
state: {
|
|
3538
|
-
discriminatorState:
|
|
3539
|
+
discriminatorState: annotatedDiscriminatorState,
|
|
3539
3540
|
discriminatorValue: value,
|
|
3540
3541
|
selectedBranch: {
|
|
3541
3542
|
kind: "branch",
|
|
@@ -3556,7 +3557,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3556
3557
|
next: {
|
|
3557
3558
|
...discriminatorResult.next,
|
|
3558
3559
|
state: {
|
|
3559
|
-
discriminatorState:
|
|
3560
|
+
discriminatorState: annotatedDiscriminatorState,
|
|
3560
3561
|
discriminatorValue: value,
|
|
3561
3562
|
selectedBranch: {
|
|
3562
3563
|
kind: "branch",
|
|
@@ -3627,9 +3628,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3627
3628
|
}
|
|
3628
3629
|
return branchResult;
|
|
3629
3630
|
}
|
|
3630
|
-
const discriminatorResult = await discriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState) });
|
|
3631
|
+
const discriminatorResult = await discriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState, discriminator) });
|
|
3631
3632
|
if (discriminatorResult.success && discriminatorResult.consumed.length > 0) {
|
|
3632
|
-
const
|
|
3633
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, discriminatorResult.next.state, discriminator);
|
|
3634
|
+
const completionResult = await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(context.exec, "_discriminator"));
|
|
3633
3635
|
if (completionResult.success) {
|
|
3634
3636
|
const value = completionResult.value;
|
|
3635
3637
|
const branchParser = branches[value];
|
|
@@ -3653,7 +3655,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3653
3655
|
next: {
|
|
3654
3656
|
...branchParseResult.next,
|
|
3655
3657
|
state: {
|
|
3656
|
-
discriminatorState:
|
|
3658
|
+
discriminatorState: annotatedDiscriminatorState,
|
|
3657
3659
|
discriminatorValue: value,
|
|
3658
3660
|
selectedBranch: {
|
|
3659
3661
|
kind: "branch",
|
|
@@ -3674,7 +3676,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3674
3676
|
next: {
|
|
3675
3677
|
...discriminatorResult.next,
|
|
3676
3678
|
state: {
|
|
3677
|
-
discriminatorState:
|
|
3679
|
+
discriminatorState: annotatedDiscriminatorState,
|
|
3678
3680
|
discriminatorValue: value,
|
|
3679
3681
|
selectedBranch: {
|
|
3680
3682
|
kind: "branch",
|
|
@@ -3744,8 +3746,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3744
3746
|
};
|
|
3745
3747
|
}
|
|
3746
3748
|
const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
|
|
3749
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator);
|
|
3747
3750
|
const combinedState = {
|
|
3748
|
-
_discriminator:
|
|
3751
|
+
_discriminator: annotatedDiscriminatorState,
|
|
3749
3752
|
_branch: getAnnotatedChildState(state, state.branchState, branchParser)
|
|
3750
3753
|
};
|
|
3751
3754
|
const runtime = require_dependency_runtime.createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
|
|
@@ -3762,7 +3765,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3762
3765
|
dependencyRuntime: runtime,
|
|
3763
3766
|
dependencyRegistry: runtime.registry
|
|
3764
3767
|
};
|
|
3765
|
-
const discriminatorCompleteResult = state.selectedBranch.kind === "default" ? void 0 : syncDiscriminator.complete(
|
|
3768
|
+
const discriminatorCompleteResult = state.selectedBranch.kind === "default" ? void 0 : syncDiscriminator.complete(annotatedDiscriminatorState, withChildExecPath(completionExec, "_discriminator"));
|
|
3766
3769
|
const branchResult = unwrapCompleteResult(branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch")));
|
|
3767
3770
|
if (!branchResult.success) {
|
|
3768
3771
|
if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
|
|
@@ -3807,8 +3810,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3807
3810
|
};
|
|
3808
3811
|
}
|
|
3809
3812
|
const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
|
|
3813
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, discriminator);
|
|
3810
3814
|
const combinedState = {
|
|
3811
|
-
_discriminator:
|
|
3815
|
+
_discriminator: annotatedDiscriminatorState,
|
|
3812
3816
|
_branch: getAnnotatedChildState(state, state.branchState, branchParser)
|
|
3813
3817
|
};
|
|
3814
3818
|
const runtime = require_dependency_runtime.createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
|
|
@@ -3825,7 +3829,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3825
3829
|
dependencyRuntime: runtime,
|
|
3826
3830
|
dependencyRegistry: runtime.registry
|
|
3827
3831
|
};
|
|
3828
|
-
const discriminatorCompleteResult = state.selectedBranch.kind === "default" ? void 0 : await discriminator.complete(
|
|
3832
|
+
const discriminatorCompleteResult = state.selectedBranch.kind === "default" ? void 0 : await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(completionExec, "_discriminator"));
|
|
3829
3833
|
const branchResult = unwrapCompleteResult(await branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch")));
|
|
3830
3834
|
if (!branchResult.success) {
|
|
3831
3835
|
if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
|
|
@@ -3856,8 +3860,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3856
3860
|
const syncDefaultBranch = defaultBranch;
|
|
3857
3861
|
if (state.selectedBranch === void 0) {
|
|
3858
3862
|
const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
|
|
3863
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator);
|
|
3859
3864
|
const defaultCombinedState = {
|
|
3860
|
-
_discriminator:
|
|
3865
|
+
_discriminator: annotatedDiscriminatorState,
|
|
3861
3866
|
_branch: syncDefaultBranch == null ? state.branchState : getAnnotatedChildState(state, state.branchState, syncDefaultBranch)
|
|
3862
3867
|
};
|
|
3863
3868
|
require_dependency_runtime.collectExplicitSourceValues(require_dependency_runtime.buildRuntimeNodesFromPairs(syncDefaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", syncDefaultBranch]], defaultCombinedState, context.exec?.path), runtime);
|
|
@@ -3871,13 +3876,14 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3871
3876
|
dependencyRegistry: runtime.registry
|
|
3872
3877
|
} } : {}
|
|
3873
3878
|
};
|
|
3874
|
-
yield* syncDiscriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState), prefix);
|
|
3879
|
+
yield* syncDiscriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState, syncDiscriminator), prefix);
|
|
3875
3880
|
if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch), prefix);
|
|
3876
3881
|
} else {
|
|
3877
3882
|
const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
|
|
3878
3883
|
const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
|
|
3884
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator);
|
|
3879
3885
|
const combinedState = {
|
|
3880
|
-
_discriminator:
|
|
3886
|
+
_discriminator: annotatedDiscriminatorState,
|
|
3881
3887
|
_branch: getAnnotatedChildState(state, state.branchState, branchParser)
|
|
3882
3888
|
};
|
|
3883
3889
|
require_dependency_runtime.collectExplicitSourceValues(require_dependency_runtime.buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
|
|
@@ -3898,8 +3904,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3898
3904
|
const state = context.state ?? initialState;
|
|
3899
3905
|
if (state.selectedBranch === void 0) {
|
|
3900
3906
|
const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
|
|
3907
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, discriminator);
|
|
3901
3908
|
const defaultCombinedState = {
|
|
3902
|
-
_discriminator:
|
|
3909
|
+
_discriminator: annotatedDiscriminatorState,
|
|
3903
3910
|
_branch: defaultBranch == null ? state.branchState : getAnnotatedChildState(state, state.branchState, defaultBranch)
|
|
3904
3911
|
};
|
|
3905
3912
|
await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromPairs(defaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", defaultBranch]], defaultCombinedState, context.exec?.path), runtime);
|
|
@@ -3913,13 +3920,14 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3913
3920
|
dependencyRegistry: runtime.registry
|
|
3914
3921
|
} } : {}
|
|
3915
3922
|
};
|
|
3916
|
-
yield* discriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState), prefix);
|
|
3923
|
+
yield* discriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState, discriminator), prefix);
|
|
3917
3924
|
if (defaultBranch !== void 0) yield* defaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch), prefix);
|
|
3918
3925
|
} else {
|
|
3919
3926
|
const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
|
|
3920
3927
|
const runtime = require_dependency_runtime.createDependencyRuntimeContext(context.dependencyRegistry?.clone());
|
|
3928
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, discriminator);
|
|
3921
3929
|
const combinedState = {
|
|
3922
|
-
_discriminator:
|
|
3930
|
+
_discriminator: annotatedDiscriminatorState,
|
|
3923
3931
|
_branch: getAnnotatedChildState(state, state.branchState, branchParser)
|
|
3924
3932
|
};
|
|
3925
3933
|
await require_dependency_runtime.collectExplicitSourceValuesAsync(require_dependency_runtime.buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
|
package/dist/constructs.js
CHANGED
|
@@ -3509,9 +3509,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3509
3509
|
}
|
|
3510
3510
|
return branchResult;
|
|
3511
3511
|
}
|
|
3512
|
-
const discriminatorResult = syncDiscriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState) });
|
|
3512
|
+
const discriminatorResult = syncDiscriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState, syncDiscriminator) });
|
|
3513
3513
|
if (discriminatorResult.success && discriminatorResult.consumed.length > 0) {
|
|
3514
|
-
const
|
|
3514
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, discriminatorResult.next.state, syncDiscriminator);
|
|
3515
|
+
const completionResult = syncDiscriminator.complete(annotatedDiscriminatorState, withChildExecPath(context.exec, "_discriminator"));
|
|
3515
3516
|
if (completionResult.success) {
|
|
3516
3517
|
const value = completionResult.value;
|
|
3517
3518
|
const branchParser = syncBranches[value];
|
|
@@ -3535,7 +3536,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3535
3536
|
next: {
|
|
3536
3537
|
...branchParseResult.next,
|
|
3537
3538
|
state: {
|
|
3538
|
-
discriminatorState:
|
|
3539
|
+
discriminatorState: annotatedDiscriminatorState,
|
|
3539
3540
|
discriminatorValue: value,
|
|
3540
3541
|
selectedBranch: {
|
|
3541
3542
|
kind: "branch",
|
|
@@ -3556,7 +3557,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3556
3557
|
next: {
|
|
3557
3558
|
...discriminatorResult.next,
|
|
3558
3559
|
state: {
|
|
3559
|
-
discriminatorState:
|
|
3560
|
+
discriminatorState: annotatedDiscriminatorState,
|
|
3560
3561
|
discriminatorValue: value,
|
|
3561
3562
|
selectedBranch: {
|
|
3562
3563
|
kind: "branch",
|
|
@@ -3627,9 +3628,10 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3627
3628
|
}
|
|
3628
3629
|
return branchResult;
|
|
3629
3630
|
}
|
|
3630
|
-
const discriminatorResult = await discriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState) });
|
|
3631
|
+
const discriminatorResult = await discriminator.parse({ ...withChildContext(context, "_discriminator", state.discriminatorState, discriminator) });
|
|
3631
3632
|
if (discriminatorResult.success && discriminatorResult.consumed.length > 0) {
|
|
3632
|
-
const
|
|
3633
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, discriminatorResult.next.state, discriminator);
|
|
3634
|
+
const completionResult = await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(context.exec, "_discriminator"));
|
|
3633
3635
|
if (completionResult.success) {
|
|
3634
3636
|
const value = completionResult.value;
|
|
3635
3637
|
const branchParser = branches[value];
|
|
@@ -3653,7 +3655,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3653
3655
|
next: {
|
|
3654
3656
|
...branchParseResult.next,
|
|
3655
3657
|
state: {
|
|
3656
|
-
discriminatorState:
|
|
3658
|
+
discriminatorState: annotatedDiscriminatorState,
|
|
3657
3659
|
discriminatorValue: value,
|
|
3658
3660
|
selectedBranch: {
|
|
3659
3661
|
kind: "branch",
|
|
@@ -3674,7 +3676,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3674
3676
|
next: {
|
|
3675
3677
|
...discriminatorResult.next,
|
|
3676
3678
|
state: {
|
|
3677
|
-
discriminatorState:
|
|
3679
|
+
discriminatorState: annotatedDiscriminatorState,
|
|
3678
3680
|
discriminatorValue: value,
|
|
3679
3681
|
selectedBranch: {
|
|
3680
3682
|
kind: "branch",
|
|
@@ -3744,8 +3746,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3744
3746
|
};
|
|
3745
3747
|
}
|
|
3746
3748
|
const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
|
|
3749
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator);
|
|
3747
3750
|
const combinedState = {
|
|
3748
|
-
_discriminator:
|
|
3751
|
+
_discriminator: annotatedDiscriminatorState,
|
|
3749
3752
|
_branch: getAnnotatedChildState(state, state.branchState, branchParser)
|
|
3750
3753
|
};
|
|
3751
3754
|
const runtime = createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
|
|
@@ -3762,7 +3765,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3762
3765
|
dependencyRuntime: runtime,
|
|
3763
3766
|
dependencyRegistry: runtime.registry
|
|
3764
3767
|
};
|
|
3765
|
-
const discriminatorCompleteResult = state.selectedBranch.kind === "default" ? void 0 : syncDiscriminator.complete(
|
|
3768
|
+
const discriminatorCompleteResult = state.selectedBranch.kind === "default" ? void 0 : syncDiscriminator.complete(annotatedDiscriminatorState, withChildExecPath(completionExec, "_discriminator"));
|
|
3766
3769
|
const branchResult = unwrapCompleteResult(branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch")));
|
|
3767
3770
|
if (!branchResult.success) {
|
|
3768
3771
|
if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
|
|
@@ -3807,8 +3810,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3807
3810
|
};
|
|
3808
3811
|
}
|
|
3809
3812
|
const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
|
|
3813
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, discriminator);
|
|
3810
3814
|
const combinedState = {
|
|
3811
|
-
_discriminator:
|
|
3815
|
+
_discriminator: annotatedDiscriminatorState,
|
|
3812
3816
|
_branch: getAnnotatedChildState(state, state.branchState, branchParser)
|
|
3813
3817
|
};
|
|
3814
3818
|
const runtime = createDependencyRuntimeContext(exec?.dependencyRegistry?.clone());
|
|
@@ -3825,7 +3829,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3825
3829
|
dependencyRuntime: runtime,
|
|
3826
3830
|
dependencyRegistry: runtime.registry
|
|
3827
3831
|
};
|
|
3828
|
-
const discriminatorCompleteResult = state.selectedBranch.kind === "default" ? void 0 : await discriminator.complete(
|
|
3832
|
+
const discriminatorCompleteResult = state.selectedBranch.kind === "default" ? void 0 : await discriminator.complete(annotatedDiscriminatorState, withChildExecPath(completionExec, "_discriminator"));
|
|
3829
3833
|
const branchResult = unwrapCompleteResult(await branchParser.complete(resolvedBranchState, withChildExecPath(completionExec, "_branch")));
|
|
3830
3834
|
if (!branchResult.success) {
|
|
3831
3835
|
if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
|
|
@@ -3856,8 +3860,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3856
3860
|
const syncDefaultBranch = defaultBranch;
|
|
3857
3861
|
if (state.selectedBranch === void 0) {
|
|
3858
3862
|
const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
|
|
3863
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator);
|
|
3859
3864
|
const defaultCombinedState = {
|
|
3860
|
-
_discriminator:
|
|
3865
|
+
_discriminator: annotatedDiscriminatorState,
|
|
3861
3866
|
_branch: syncDefaultBranch == null ? state.branchState : getAnnotatedChildState(state, state.branchState, syncDefaultBranch)
|
|
3862
3867
|
};
|
|
3863
3868
|
collectExplicitSourceValues(buildRuntimeNodesFromPairs(syncDefaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", syncDefaultBranch]], defaultCombinedState, context.exec?.path), runtime);
|
|
@@ -3871,13 +3876,14 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3871
3876
|
dependencyRegistry: runtime.registry
|
|
3872
3877
|
} } : {}
|
|
3873
3878
|
};
|
|
3874
|
-
yield* syncDiscriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState), prefix);
|
|
3879
|
+
yield* syncDiscriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState, syncDiscriminator), prefix);
|
|
3875
3880
|
if (syncDefaultBranch !== void 0) yield* syncDefaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? syncDefaultBranch.initialState, syncDefaultBranch), prefix);
|
|
3876
3881
|
} else {
|
|
3877
3882
|
const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
|
|
3878
3883
|
const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
|
|
3884
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, syncDiscriminator);
|
|
3879
3885
|
const combinedState = {
|
|
3880
|
-
_discriminator:
|
|
3886
|
+
_discriminator: annotatedDiscriminatorState,
|
|
3881
3887
|
_branch: getAnnotatedChildState(state, state.branchState, branchParser)
|
|
3882
3888
|
};
|
|
3883
3889
|
collectExplicitSourceValues(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
|
|
@@ -3898,8 +3904,9 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3898
3904
|
const state = context.state ?? initialState;
|
|
3899
3905
|
if (state.selectedBranch === void 0) {
|
|
3900
3906
|
const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
|
|
3907
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, discriminator);
|
|
3901
3908
|
const defaultCombinedState = {
|
|
3902
|
-
_discriminator:
|
|
3909
|
+
_discriminator: annotatedDiscriminatorState,
|
|
3903
3910
|
_branch: defaultBranch == null ? state.branchState : getAnnotatedChildState(state, state.branchState, defaultBranch)
|
|
3904
3911
|
};
|
|
3905
3912
|
await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs(defaultBranch == null ? [["_discriminator", discriminator]] : [["_discriminator", discriminator], ["_branch", defaultBranch]], defaultCombinedState, context.exec?.path), runtime);
|
|
@@ -3913,13 +3920,14 @@ function conditional(discriminator, branches, defaultBranch, options) {
|
|
|
3913
3920
|
dependencyRegistry: runtime.registry
|
|
3914
3921
|
} } : {}
|
|
3915
3922
|
};
|
|
3916
|
-
yield* discriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState), prefix);
|
|
3923
|
+
yield* discriminator.suggest(withChildContext(suggestContext, "_discriminator", state.discriminatorState, discriminator), prefix);
|
|
3917
3924
|
if (defaultBranch !== void 0) yield* defaultBranch.suggest(withChildContext(suggestContext, "_branch", state.branchState ?? defaultBranch.initialState, defaultBranch), prefix);
|
|
3918
3925
|
} else {
|
|
3919
3926
|
const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
|
|
3920
3927
|
const runtime = createDependencyRuntimeContext(context.dependencyRegistry?.clone());
|
|
3928
|
+
const annotatedDiscriminatorState = getAnnotatedChildState(state, state.discriminatorState, discriminator);
|
|
3921
3929
|
const combinedState = {
|
|
3922
|
-
_discriminator:
|
|
3930
|
+
_discriminator: annotatedDiscriminatorState,
|
|
3923
3931
|
_branch: getAnnotatedChildState(state, state.branchState, branchParser)
|
|
3924
3932
|
};
|
|
3925
3933
|
await collectExplicitSourceValuesAsync(buildRuntimeNodesFromPairs([["_discriminator", discriminator], ["_branch", branchParser]], combinedState, context.exec?.path), runtime);
|