@optique/core 0.10.0-dev.301 → 0.10.0-dev.305
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 +16 -14
- package/dist/constructs.js +16 -14
- package/package.json +1 -1
package/dist/constructs.cjs
CHANGED
|
@@ -914,6 +914,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
|
|
|
914
914
|
complete(state) {
|
|
915
915
|
if (!isAsync) {
|
|
916
916
|
const preCompletedState = {};
|
|
917
|
+
const preCompletedKeys = /* @__PURE__ */ new Set();
|
|
917
918
|
for (const field of parserKeys) {
|
|
918
919
|
const fieldKey = field;
|
|
919
920
|
const fieldState = state[fieldKey];
|
|
@@ -921,14 +922,18 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
|
|
|
921
922
|
if (Array.isArray(fieldState) && fieldState.length === 1 && require_dependency.isPendingDependencySourceState(fieldState[0])) {
|
|
922
923
|
const completed = fieldParser.complete(fieldState);
|
|
923
924
|
preCompletedState[fieldKey] = completed;
|
|
925
|
+
preCompletedKeys.add(fieldKey);
|
|
924
926
|
} else if (fieldState === void 0 && require_dependency.isPendingDependencySourceState(fieldParser.initialState)) {
|
|
925
927
|
const completed = fieldParser.complete([fieldParser.initialState]);
|
|
926
928
|
preCompletedState[fieldKey] = completed;
|
|
929
|
+
preCompletedKeys.add(fieldKey);
|
|
927
930
|
} else if (fieldState === void 0 && require_dependency.isWrappedDependencySource(fieldParser)) {
|
|
928
931
|
const pendingState = fieldParser[require_dependency.WrappedDependencySourceMarker];
|
|
929
932
|
const completed = fieldParser.complete([pendingState]);
|
|
930
|
-
if (require_dependency.isDependencySourceState(completed))
|
|
931
|
-
|
|
933
|
+
if (require_dependency.isDependencySourceState(completed)) {
|
|
934
|
+
preCompletedState[fieldKey] = completed;
|
|
935
|
+
preCompletedKeys.add(fieldKey);
|
|
936
|
+
} else preCompletedState[fieldKey] = fieldState;
|
|
932
937
|
} else preCompletedState[fieldKey] = fieldState;
|
|
933
938
|
}
|
|
934
939
|
const resolvedState = resolveDeferredParseStates(preCompletedState);
|
|
@@ -937,11 +942,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
|
|
|
937
942
|
const fieldKey = field;
|
|
938
943
|
const fieldResolvedState = resolvedState[fieldKey];
|
|
939
944
|
const fieldParser = parsers[field];
|
|
940
|
-
|
|
941
|
-
const wasPreCompletedCase1 = Array.isArray(originalFieldState) && originalFieldState.length === 1 && require_dependency.isPendingDependencySourceState(originalFieldState[0]);
|
|
942
|
-
const wasPreCompletedCase2 = originalFieldState === void 0 && require_dependency.isPendingDependencySourceState(fieldParser.initialState);
|
|
943
|
-
const wasPreCompletedCase3 = originalFieldState === void 0 && require_dependency.isWrappedDependencySource(fieldParser);
|
|
944
|
-
if (require_dependency.isDependencySourceState(fieldResolvedState) && (wasPreCompletedCase1 || wasPreCompletedCase2 || wasPreCompletedCase3)) {
|
|
945
|
+
if (require_dependency.isDependencySourceState(fieldResolvedState) && preCompletedKeys.has(fieldKey)) {
|
|
945
946
|
const depResult = fieldResolvedState.result;
|
|
946
947
|
if (depResult.success) result[fieldKey] = depResult.value;
|
|
947
948
|
else return {
|
|
@@ -964,6 +965,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
|
|
|
964
965
|
}
|
|
965
966
|
return (async () => {
|
|
966
967
|
const preCompletedState = {};
|
|
968
|
+
const preCompletedKeys = /* @__PURE__ */ new Set();
|
|
967
969
|
for (const field of parserKeys) {
|
|
968
970
|
const fieldKey = field;
|
|
969
971
|
const fieldState = state[fieldKey];
|
|
@@ -971,14 +973,18 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
|
|
|
971
973
|
if (Array.isArray(fieldState) && fieldState.length === 1 && require_dependency.isPendingDependencySourceState(fieldState[0])) {
|
|
972
974
|
const completed = await fieldParser.complete(fieldState);
|
|
973
975
|
preCompletedState[fieldKey] = completed;
|
|
976
|
+
preCompletedKeys.add(fieldKey);
|
|
974
977
|
} else if (fieldState === void 0 && require_dependency.isPendingDependencySourceState(fieldParser.initialState)) {
|
|
975
978
|
const completed = await fieldParser.complete([fieldParser.initialState]);
|
|
976
979
|
preCompletedState[fieldKey] = completed;
|
|
980
|
+
preCompletedKeys.add(fieldKey);
|
|
977
981
|
} else if (fieldState === void 0 && require_dependency.isWrappedDependencySource(fieldParser)) {
|
|
978
982
|
const pendingState = fieldParser[require_dependency.WrappedDependencySourceMarker];
|
|
979
983
|
const completed = await fieldParser.complete([pendingState]);
|
|
980
|
-
if (require_dependency.isDependencySourceState(completed))
|
|
981
|
-
|
|
984
|
+
if (require_dependency.isDependencySourceState(completed)) {
|
|
985
|
+
preCompletedState[fieldKey] = completed;
|
|
986
|
+
preCompletedKeys.add(fieldKey);
|
|
987
|
+
} else preCompletedState[fieldKey] = fieldState;
|
|
982
988
|
} else preCompletedState[fieldKey] = fieldState;
|
|
983
989
|
}
|
|
984
990
|
const resolvedState = await resolveDeferredParseStatesAsync(preCompletedState);
|
|
@@ -987,11 +993,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
|
|
|
987
993
|
const fieldKey = field;
|
|
988
994
|
const fieldResolvedState = resolvedState[fieldKey];
|
|
989
995
|
const fieldParser = parsers[field];
|
|
990
|
-
|
|
991
|
-
const wasPreCompletedCase1 = Array.isArray(originalFieldState) && originalFieldState.length === 1 && require_dependency.isPendingDependencySourceState(originalFieldState[0]);
|
|
992
|
-
const wasPreCompletedCase2 = originalFieldState === void 0 && require_dependency.isPendingDependencySourceState(fieldParser.initialState);
|
|
993
|
-
const wasPreCompletedCase3 = originalFieldState === void 0 && require_dependency.isWrappedDependencySource(fieldParser);
|
|
994
|
-
if (require_dependency.isDependencySourceState(fieldResolvedState) && (wasPreCompletedCase1 || wasPreCompletedCase2 || wasPreCompletedCase3)) {
|
|
996
|
+
if (require_dependency.isDependencySourceState(fieldResolvedState) && preCompletedKeys.has(fieldKey)) {
|
|
995
997
|
const depResult = fieldResolvedState.result;
|
|
996
998
|
if (depResult.success) result[fieldKey] = depResult.value;
|
|
997
999
|
else return {
|
package/dist/constructs.js
CHANGED
|
@@ -914,6 +914,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
|
|
|
914
914
|
complete(state) {
|
|
915
915
|
if (!isAsync) {
|
|
916
916
|
const preCompletedState = {};
|
|
917
|
+
const preCompletedKeys = /* @__PURE__ */ new Set();
|
|
917
918
|
for (const field of parserKeys) {
|
|
918
919
|
const fieldKey = field;
|
|
919
920
|
const fieldState = state[fieldKey];
|
|
@@ -921,14 +922,18 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
|
|
|
921
922
|
if (Array.isArray(fieldState) && fieldState.length === 1 && isPendingDependencySourceState(fieldState[0])) {
|
|
922
923
|
const completed = fieldParser.complete(fieldState);
|
|
923
924
|
preCompletedState[fieldKey] = completed;
|
|
925
|
+
preCompletedKeys.add(fieldKey);
|
|
924
926
|
} else if (fieldState === void 0 && isPendingDependencySourceState(fieldParser.initialState)) {
|
|
925
927
|
const completed = fieldParser.complete([fieldParser.initialState]);
|
|
926
928
|
preCompletedState[fieldKey] = completed;
|
|
929
|
+
preCompletedKeys.add(fieldKey);
|
|
927
930
|
} else if (fieldState === void 0 && isWrappedDependencySource(fieldParser)) {
|
|
928
931
|
const pendingState = fieldParser[WrappedDependencySourceMarker];
|
|
929
932
|
const completed = fieldParser.complete([pendingState]);
|
|
930
|
-
if (isDependencySourceState(completed))
|
|
931
|
-
|
|
933
|
+
if (isDependencySourceState(completed)) {
|
|
934
|
+
preCompletedState[fieldKey] = completed;
|
|
935
|
+
preCompletedKeys.add(fieldKey);
|
|
936
|
+
} else preCompletedState[fieldKey] = fieldState;
|
|
932
937
|
} else preCompletedState[fieldKey] = fieldState;
|
|
933
938
|
}
|
|
934
939
|
const resolvedState = resolveDeferredParseStates(preCompletedState);
|
|
@@ -937,11 +942,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
|
|
|
937
942
|
const fieldKey = field;
|
|
938
943
|
const fieldResolvedState = resolvedState[fieldKey];
|
|
939
944
|
const fieldParser = parsers[field];
|
|
940
|
-
|
|
941
|
-
const wasPreCompletedCase1 = Array.isArray(originalFieldState) && originalFieldState.length === 1 && isPendingDependencySourceState(originalFieldState[0]);
|
|
942
|
-
const wasPreCompletedCase2 = originalFieldState === void 0 && isPendingDependencySourceState(fieldParser.initialState);
|
|
943
|
-
const wasPreCompletedCase3 = originalFieldState === void 0 && isWrappedDependencySource(fieldParser);
|
|
944
|
-
if (isDependencySourceState(fieldResolvedState) && (wasPreCompletedCase1 || wasPreCompletedCase2 || wasPreCompletedCase3)) {
|
|
945
|
+
if (isDependencySourceState(fieldResolvedState) && preCompletedKeys.has(fieldKey)) {
|
|
945
946
|
const depResult = fieldResolvedState.result;
|
|
946
947
|
if (depResult.success) result[fieldKey] = depResult.value;
|
|
947
948
|
else return {
|
|
@@ -964,6 +965,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
|
|
|
964
965
|
}
|
|
965
966
|
return (async () => {
|
|
966
967
|
const preCompletedState = {};
|
|
968
|
+
const preCompletedKeys = /* @__PURE__ */ new Set();
|
|
967
969
|
for (const field of parserKeys) {
|
|
968
970
|
const fieldKey = field;
|
|
969
971
|
const fieldState = state[fieldKey];
|
|
@@ -971,14 +973,18 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
|
|
|
971
973
|
if (Array.isArray(fieldState) && fieldState.length === 1 && isPendingDependencySourceState(fieldState[0])) {
|
|
972
974
|
const completed = await fieldParser.complete(fieldState);
|
|
973
975
|
preCompletedState[fieldKey] = completed;
|
|
976
|
+
preCompletedKeys.add(fieldKey);
|
|
974
977
|
} else if (fieldState === void 0 && isPendingDependencySourceState(fieldParser.initialState)) {
|
|
975
978
|
const completed = await fieldParser.complete([fieldParser.initialState]);
|
|
976
979
|
preCompletedState[fieldKey] = completed;
|
|
980
|
+
preCompletedKeys.add(fieldKey);
|
|
977
981
|
} else if (fieldState === void 0 && isWrappedDependencySource(fieldParser)) {
|
|
978
982
|
const pendingState = fieldParser[WrappedDependencySourceMarker];
|
|
979
983
|
const completed = await fieldParser.complete([pendingState]);
|
|
980
|
-
if (isDependencySourceState(completed))
|
|
981
|
-
|
|
984
|
+
if (isDependencySourceState(completed)) {
|
|
985
|
+
preCompletedState[fieldKey] = completed;
|
|
986
|
+
preCompletedKeys.add(fieldKey);
|
|
987
|
+
} else preCompletedState[fieldKey] = fieldState;
|
|
982
988
|
} else preCompletedState[fieldKey] = fieldState;
|
|
983
989
|
}
|
|
984
990
|
const resolvedState = await resolveDeferredParseStatesAsync(preCompletedState);
|
|
@@ -987,11 +993,7 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
|
|
|
987
993
|
const fieldKey = field;
|
|
988
994
|
const fieldResolvedState = resolvedState[fieldKey];
|
|
989
995
|
const fieldParser = parsers[field];
|
|
990
|
-
|
|
991
|
-
const wasPreCompletedCase1 = Array.isArray(originalFieldState) && originalFieldState.length === 1 && isPendingDependencySourceState(originalFieldState[0]);
|
|
992
|
-
const wasPreCompletedCase2 = originalFieldState === void 0 && isPendingDependencySourceState(fieldParser.initialState);
|
|
993
|
-
const wasPreCompletedCase3 = originalFieldState === void 0 && isWrappedDependencySource(fieldParser);
|
|
994
|
-
if (isDependencySourceState(fieldResolvedState) && (wasPreCompletedCase1 || wasPreCompletedCase2 || wasPreCompletedCase3)) {
|
|
996
|
+
if (isDependencySourceState(fieldResolvedState) && preCompletedKeys.has(fieldKey)) {
|
|
995
997
|
const depResult = fieldResolvedState.result;
|
|
996
998
|
if (depResult.success) result[fieldKey] = depResult.value;
|
|
997
999
|
else return {
|