@optique/core 0.10.0-dev.295 → 0.10.0-dev.297

package/dist/constructs.js

@@ -243,11 +243,38 @@ function or(...args) {
 				state: context.state == null || context.state[0] !== i || !context.state[1].success ? parser.initialState : context.state[1].next.state
 			});
 			if (result.success && result.consumed.length > 0) {
-				if (context.state?.[0] !== i && context.state?.[1].success) return {
-					success: false,
-					consumed: context.buffer.length - result.next.buffer.length,
-					error: message`${values(context.state[1].consumed)} and ${values(result.consumed)} cannot be used together.`
-				};
+				if (context.state?.[0] !== i && context.state?.[1].success) {
+					const previouslyConsumed = context.state[1].consumed;
+					const checkResult = parser.parse({
+						...context,
+						buffer: previouslyConsumed,
+						state: parser.initialState
+					});
+					const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
+					if (!canConsumeShared) return {
+						success: false,
+						consumed: context.buffer.length - result.next.buffer.length,
+						error: message`${values(context.state[1].consumed)} and ${values(result.consumed)} cannot be used together.`
+					};
+					const replayedResult = parser.parse({
+						...context,
+						state: checkResult.next.state
+					});
+					if (!replayedResult.success) return replayedResult;
+					return {
+						success: true,
+						next: {
+							...context,
+							buffer: replayedResult.next.buffer,
+							optionsTerminated: replayedResult.next.optionsTerminated,
+							state: [i, {
+								...replayedResult,
+								consumed: [...previouslyConsumed, ...replayedResult.consumed]
+							}]
+						},
+						consumed: replayedResult.consumed
+					};
+				}
 				return {
 					success: true,
 					next: {
@@ -276,11 +303,40 @@ function or(...args) {
 			});
 			const result = await resultOrPromise;
 			if (result.success && result.consumed.length > 0) {
-				if (context.state?.[0] !== i && context.state?.[1].success) return {
-					success: false,
-					consumed: context.buffer.length - result.next.buffer.length,
-					error: message`${values(context.state[1].consumed)} and ${values(result.consumed)} cannot be used together.`
-				};
+				if (context.state?.[0] !== i && context.state?.[1].success) {
+					const previouslyConsumed = context.state[1].consumed;
+					const checkResultOrPromise = parser.parse({
+						...context,
+						buffer: previouslyConsumed,
+						state: parser.initialState
+					});
+					const checkResult = await checkResultOrPromise;
+					const canConsumeShared = checkResult.success && checkResult.consumed.length === previouslyConsumed.length && checkResult.consumed.every((c, idx) => c === previouslyConsumed[idx]);
+					if (!canConsumeShared) return {
+						success: false,
+						consumed: context.buffer.length - result.next.buffer.length,
+						error: message`${values(context.state[1].consumed)} and ${values(result.consumed)} cannot be used together.`
+					};
+					const replayedResultOrPromise = parser.parse({
+						...context,
+						state: checkResult.next.state
+					});
+					const replayedResult = await replayedResultOrPromise;
+					if (!replayedResult.success) return replayedResult;
+					return {
+						success: true,
+						next: {
+							...context,
+							buffer: replayedResult.next.buffer,
+							optionsTerminated: replayedResult.next.optionsTerminated,
+							state: [i, {
+								...replayedResult,
+								consumed: [...previouslyConsumed, ...replayedResult.consumed]
+							}]
+						},
+						consumed: replayedResult.consumed
+					};
+				}
 				return {
 					success: true,
 					next: {
@@ -482,12 +538,18 @@ function longestMatch(...args) {
 * @internal
 */
 function* suggestObjectSync(context, prefix, parserPairs) {
+	const registry = context.dependencyRegistry instanceof DependencyRegistry ? context.dependencyRegistry : new DependencyRegistry();
+	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
+	const contextWithRegistry = {
+		...context,
+		dependencyRegistry: registry
+	};
 	if (context.buffer.length > 0) {
 		const lastToken = context.buffer[context.buffer.length - 1];
 		for (const [field, parser] of parserPairs) if (isOptionRequiringValue(parser.usage, lastToken)) {
 			const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
 			yield* parser.suggest({
-				...context,
+				...contextWithRegistry,
 				state: fieldState
 			}, prefix);
 			return;
@@ -497,7 +559,7 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 	for (const [field, parser] of parserPairs) {
 		const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
 		const fieldSuggestions = parser.suggest({
-			...context,
+			...contextWithRegistry,
 			state: fieldState
 		}, prefix);
 		suggestions.push(...fieldSuggestions);
@@ -509,12 +571,18 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 * @internal
 */
 async function* suggestObjectAsync(context, prefix, parserPairs) {
+	const registry = context.dependencyRegistry instanceof DependencyRegistry ? context.dependencyRegistry : new DependencyRegistry();
+	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
+	const contextWithRegistry = {
+		...context,
+		dependencyRegistry: registry
+	};
 	if (context.buffer.length > 0) {
 		const lastToken = context.buffer[context.buffer.length - 1];
 		for (const [field, parser] of parserPairs) if (isOptionRequiringValue(parser.usage, lastToken)) {
 			const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
 			const suggestions$1 = parser.suggest({
-				...context,
+				...contextWithRegistry,
 				state: fieldState
 			}, prefix);
 			for await (const s of suggestions$1) yield s;
@@ -525,7 +593,7 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	for (const [field, parser] of parserPairs) {
 		const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
 		const fieldSuggestions = parser.suggest({
-			...context,
+			...contextWithRegistry,
 			state: fieldState
 		}, prefix);
 		for await (const s of fieldSuggestions) suggestions.push(s);
@@ -591,19 +659,17 @@ function resolveDeferred(state, registry) {
 		const parser = deferredState.parser;
 		const depIds = deferredState.dependencyIds;
 		if (depIds && depIds.length > 0) {
+			const defaults = deferredState.defaultValues;
 			const dependencyValues = [];
-			let allDepsAvailable = true;
-			for (const depId$1 of depIds) if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
-			else {
-				allDepsAvailable = false;
-				break;
-			}
-			if (allDepsAvailable) {
-				const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValues);
-				if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
-				return reParseResult;
+			for (let i = 0; i < depIds.length; i++) {
+				const depId$1 = depIds[i];
+				if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
+				else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
+				else return deferredState.preliminaryResult;
 			}
-			return deferredState.preliminaryResult;
+			const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValues);
+			if (reParseResult instanceof Promise) return deferredState.preliminaryResult;
+			return reParseResult;
 		}
 		const depId = deferredState.dependencyId;
 		if (registry.has(depId)) {
@@ -648,18 +714,16 @@ async function resolveDeferredAsync(state, registry) {
 		const parser = deferredState.parser;
 		const depIds = deferredState.dependencyIds;
 		if (depIds && depIds.length > 0) {
+			const defaults = deferredState.defaultValues;
 			const dependencyValues = [];
-			let allDepsAvailable = true;
-			for (const depId$1 of depIds) if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
-			else {
-				allDepsAvailable = false;
-				break;
+			for (let i = 0; i < depIds.length; i++) {
+				const depId$1 = depIds[i];
+				if (registry.has(depId$1)) dependencyValues.push(registry.get(depId$1));
+				else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
+				else return deferredState.preliminaryResult;
 			}
-			if (allDepsAvailable) {
-				const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValues);
-				return Promise.resolve(reParseResult);
-			}
-			return deferredState.preliminaryResult;
+			const reParseResult = parser[ParseWithDependency](deferredState.rawInput, dependencyValues);
+			return Promise.resolve(reParseResult);
 		}
 		const depId = deferredState.dependencyId;
 		if (registry.has(depId)) {
@@ -863,7 +927,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					} else if (fieldState === void 0 && isWrappedDependencySource(fieldParser)) {
 						const pendingState = fieldParser[WrappedDependencySourceMarker];
 						const completed = fieldParser.complete([pendingState]);
-						preCompletedState[fieldKey] = completed;
+						if (isDependencySourceState(completed)) preCompletedState[fieldKey] = completed;
+						else preCompletedState[fieldKey] = fieldState;
 					} else preCompletedState[fieldKey] = fieldState;
 				}
 				const resolvedState = resolveDeferredParseStates(preCompletedState);
@@ -912,7 +977,8 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 					} else if (fieldState === void 0 && isWrappedDependencySource(fieldParser)) {
 						const pendingState = fieldParser[WrappedDependencySourceMarker];
 						const completed = await fieldParser.complete([pendingState]);
-						preCompletedState[fieldKey] = completed;
+						if (isDependencySourceState(completed)) preCompletedState[fieldKey] = completed;
+						else preCompletedState[fieldKey] = fieldState;
 					} else preCompletedState[fieldKey] = fieldState;
 				}
 				const resolvedState = await resolveDeferredParseStatesAsync(preCompletedState);
@@ -1162,10 +1228,43 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		},
 		complete(state) {
 			if (!isAsync) {
-				const result = [];
 				const stateArray = state;
+				const preCompletedState = [];
 				for (let i = 0; i < syncParsers.length; i++) {
-					const valueResult = syncParsers[i].complete(stateArray[i]);
+					const elementState = stateArray[i];
+					const elementParser = syncParsers[i];
+					if (Array.isArray(elementState) && elementState.length === 1 && isPendingDependencySourceState(elementState[0])) {
+						const completed = elementParser.complete(elementState);
+						preCompletedState[i] = completed;
+					} else if (elementState === void 0 && isPendingDependencySourceState(elementParser.initialState)) {
+						const completed = elementParser.complete([elementParser.initialState]);
+						preCompletedState[i] = completed;
+					} else if (elementState === void 0 && isWrappedDependencySource(elementParser)) {
+						const pendingState = elementParser[WrappedDependencySourceMarker];
+						const completed = elementParser.complete([pendingState]);
+						preCompletedState[i] = completed;
+					} else preCompletedState[i] = elementState;
+				}
+				const resolvedState = resolveDeferredParseStates(preCompletedState);
+				const resolvedArray = resolvedState;
+				const result = [];
+				for (let i = 0; i < syncParsers.length; i++) {
+					const elementResolvedState = resolvedArray[i];
+					const elementParser = syncParsers[i];
+					const originalElementState = stateArray[i];
+					const wasPreCompletedCase1 = Array.isArray(originalElementState) && originalElementState.length === 1 && isPendingDependencySourceState(originalElementState[0]);
+					const wasPreCompletedCase2 = originalElementState === void 0 && isPendingDependencySourceState(elementParser.initialState);
+					const wasPreCompletedCase3 = originalElementState === void 0 && isWrappedDependencySource(elementParser);
+					if (isDependencySourceState(elementResolvedState) && (wasPreCompletedCase1 || wasPreCompletedCase2 || wasPreCompletedCase3)) {
+						const depResult = elementResolvedState.result;
+						if (depResult.success) result[i] = depResult.value;
+						else return {
+							success: false,
+							error: depResult.error
+						};
+						continue;
+					}
+					const valueResult = elementParser.complete(elementResolvedState);
 					if (valueResult.success) result[i] = valueResult.value;
 					else return {
 						success: false,
@@ -1178,10 +1277,43 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				};
 			}
 			return (async () => {
-				const result = [];
 				const stateArray = state;
+				const preCompletedState = [];
 				for (let i = 0; i < parsers.length; i++) {
-					const valueResult = await parsers[i].complete(stateArray[i]);
+					const elementState = stateArray[i];
+					const elementParser = parsers[i];
+					if (Array.isArray(elementState) && elementState.length === 1 && isPendingDependencySourceState(elementState[0])) {
+						const completed = await elementParser.complete(elementState);
+						preCompletedState[i] = completed;
+					} else if (elementState === void 0 && isPendingDependencySourceState(elementParser.initialState)) {
+						const completed = await elementParser.complete([elementParser.initialState]);
+						preCompletedState[i] = completed;
+					} else if (elementState === void 0 && isWrappedDependencySource(elementParser)) {
+						const pendingState = elementParser[WrappedDependencySourceMarker];
+						const completed = await elementParser.complete([pendingState]);
+						preCompletedState[i] = completed;
+					} else preCompletedState[i] = elementState;
+				}
+				const resolvedState = await resolveDeferredParseStatesAsync(preCompletedState);
+				const resolvedArray = resolvedState;
+				const result = [];
+				for (let i = 0; i < parsers.length; i++) {
+					const elementResolvedState = resolvedArray[i];
+					const elementParser = parsers[i];
+					const originalElementState = stateArray[i];
+					const wasPreCompletedCase1 = Array.isArray(originalElementState) && originalElementState.length === 1 && isPendingDependencySourceState(originalElementState[0]);
+					const wasPreCompletedCase2 = originalElementState === void 0 && isPendingDependencySourceState(elementParser.initialState);
+					const wasPreCompletedCase3 = originalElementState === void 0 && isWrappedDependencySource(elementParser);
+					if (isDependencySourceState(elementResolvedState) && (wasPreCompletedCase1 || wasPreCompletedCase2 || wasPreCompletedCase3)) {
+						const depResult = elementResolvedState.result;
+						if (depResult.success) result[i] = depResult.value;
+						else return {
+							success: false,
+							error: depResult.error
+						};
+						continue;
+					}
+					const valueResult = await elementParser.complete(elementResolvedState);
 					if (valueResult.success) result[i] = valueResult.value;
 					else return {
 						success: false,
@@ -2106,6 +2238,7 @@ function conditional(discriminator, branches, defaultBranch, options) {
 		};
 	};
 	const completeSync = (state) => {
+		const syncDiscriminator = discriminator;
 		const syncDefaultBranch = defaultBranch;
 		const syncBranches = branches;
 		if (state.selectedBranch === void 0) {
@@ -2124,7 +2257,14 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 		}
 		const branchParser = state.selectedBranch.kind === "default" ? syncDefaultBranch : syncBranches[state.selectedBranch.key];
-		const branchResult = branchParser.complete(state.branchState);
+		const discriminatorCompleteResult = syncDiscriminator.complete(state.discriminatorState);
+		const combinedState = {
+			_discriminator: state.discriminatorState,
+			_branch: state.branchState
+		};
+		const resolvedCombinedState = resolveDeferredParseStates(combinedState);
+		const resolvedBranchState = resolvedCombinedState._branch;
+		const branchResult = branchParser.complete(resolvedBranchState);
 		if (!branchResult.success) {
 			if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
 				success: false,
@@ -2132,7 +2272,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 			return branchResult;
 		}
-		const discriminatorValue = state.selectedBranch.kind === "default" ? void 0 : state.selectedBranch.key;
+		let discriminatorValue;
+		if (state.selectedBranch.kind === "default") discriminatorValue = void 0;
+		else if (isDependencySourceState(discriminatorCompleteResult)) discriminatorValue = discriminatorCompleteResult.result.success ? discriminatorCompleteResult.result.value : state.selectedBranch.key;
+		else if (discriminatorCompleteResult.success) discriminatorValue = discriminatorCompleteResult.value;
+		else discriminatorValue = state.selectedBranch.key;
 		return {
 			success: true,
 			value: [discriminatorValue, branchResult.value]
@@ -2155,7 +2299,14 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 		}
 		const branchParser = state.selectedBranch.kind === "default" ? defaultBranch : branches[state.selectedBranch.key];
-		const branchResult = await branchParser.complete(state.branchState);
+		const discriminatorCompleteResult = await discriminator.complete(state.discriminatorState);
+		const combinedState = {
+			_discriminator: state.discriminatorState,
+			_branch: state.branchState
+		};
+		const resolvedCombinedState = await resolveDeferredParseStatesAsync(combinedState);
+		const resolvedBranchState = resolvedCombinedState._branch;
+		const branchResult = await branchParser.complete(resolvedBranchState);
 		if (!branchResult.success) {
 			if (state.discriminatorValue !== void 0 && options?.errors?.branchError) return {
 				success: false,
@@ -2163,7 +2314,11 @@ function conditional(discriminator, branches, defaultBranch, options) {
 			};
 			return branchResult;
 		}
-		const discriminatorValue = state.selectedBranch.kind === "default" ? void 0 : state.selectedBranch.key;
+		let discriminatorValue;
+		if (state.selectedBranch.kind === "default") discriminatorValue = void 0;
+		else if (isDependencySourceState(discriminatorCompleteResult)) discriminatorValue = discriminatorCompleteResult.result.success ? discriminatorCompleteResult.result.value : state.selectedBranch.key;
+		else if (discriminatorCompleteResult.success) discriminatorValue = discriminatorCompleteResult.value;
+		else discriminatorValue = state.selectedBranch.key;
 		return {
 			success: true,
 			value: [discriminatorValue, branchResult.value]