@optique/core 1.0.0-dev.670 → 1.0.0-dev.677

package/dist/constructs.cjs

@@ -610,7 +610,7 @@ function longestMatch(...args) {
 * @internal
 */
 function* suggestObjectSync(context, prefix, parserPairs) {
-	const registry = context.dependencyRegistry instanceof require_dependency.DependencyRegistry ? context.dependencyRegistry : new require_dependency.DependencyRegistry();
+	const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new require_dependency.DependencyRegistry();
 	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
 	const contextWithRegistry = {
 		...context,
@@ -643,7 +643,7 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 * @internal
 */
 async function* suggestObjectAsync(context, prefix, parserPairs) {
-	const registry = context.dependencyRegistry instanceof require_dependency.DependencyRegistry ? context.dependencyRegistry : new require_dependency.DependencyRegistry();
+	const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new require_dependency.DependencyRegistry();
 	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
 	const contextWithRegistry = {
 		...context,
@@ -673,17 +673,9 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	yield* require_suggestion.deduplicateSuggestions(suggestions);
 }
 /**
-* Resolves deferred parse states in an object's field states.
-* This function builds a dependency registry from DependencySourceState fields
-* and re-parses DeferredParseState fields using the actual dependency values.
-*
-* @param fieldStates A record of field names to their state values
-* @returns The field states with deferred states resolved to their actual values
-* @internal
-*/
-/**
 * Recursively collects dependency values from DependencySourceState objects
 * found anywhere in the state tree.
+* @internal
 */
 function collectDependencies(state, registry, visited = /* @__PURE__ */ new WeakSet()) {
 	if (state === null || state === void 0) return;
@@ -1687,13 +1679,19 @@ function merge(...args) {
 				}
 				return p.initialState;
 			};
+			const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new require_dependency.DependencyRegistry();
+			if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
+			const contextWithRegistry = {
+				...context,
+				dependencyRegistry: registry
+			};
 			if (isAsync) return async function* () {
 				const suggestions = [];
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
 					const parserState = extractState(parser, i);
 					const parserSuggestions = parser.suggest({
-						...context,
+						...contextWithRegistry,
 						state: parserState
 					}, prefix);
 					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
@@ -1707,7 +1705,7 @@ function merge(...args) {
 					const parser = syncParsers[i];
 					const parserState = extractState(parser, i);
 					const parserSuggestions = parser.suggest({
-						...context,
+						...contextWithRegistry,
 						state: parserState
 					}, prefix);
 					suggestions.push(...parserSuggestions);
@@ -1777,6 +1775,118 @@ function merge(...args) {
 		}
 	};
 }
+/**
+* Builds a dependency registry from the pre-parsed context state and returns
+* the enriched context alongside the state array.  Used by both the sync and
+* async branches of `concat().suggest()`.
+* @internal
+*/
+function buildSuggestRegistry(preParsedContext) {
+	const stateArray = preParsedContext.state;
+	const registry = preParsedContext.dependencyRegistry ? preParsedContext.dependencyRegistry.clone() : new require_dependency.DependencyRegistry();
+	if (stateArray && Array.isArray(stateArray)) collectDependencies(stateArray, registry);
+	return {
+		context: {
+			...preParsedContext,
+			dependencyRegistry: registry
+		},
+		stateArray
+	};
+}
+/**
+* This helper replays child parsers in priority order (mirroring
+* `concat.parse()`) to accumulate dependency source values for suggestions.
+* @internal
+*/
+function preParseSuggestContext(context, parsers) {
+	if (context.buffer.length < 1 || !Array.isArray(context.state)) return context;
+	return preParseSuggestLoop(context, context.state.slice(), parsers);
+}
+/**
+* Async variant of {@link preParseSuggestContext} that awaits async child
+* parsers so that dependency sources from async sub-parsers are resolved.
+* @internal
+*/
+async function preParseSuggestContextAsync(context, parsers) {
+	if (context.buffer.length < 1 || !Array.isArray(context.state)) return context;
+	return await preParseSuggestLoop(context, context.state.slice(), parsers);
+}
+/**
+* Shared loop for sync and async concat suggest pre-parse.  When a child
+* parser returns a Promise its result is awaited; sync results are used
+* directly.  Parsers are tried in priority order, matching `concat.parse()`.
+* @internal
+*/
+function preParseSuggestLoop(context, stateArray, parsers, matchedParsers = /* @__PURE__ */ new Set()) {
+	const indexedParsers = parsers.map((parser, index) => [parser, index]);
+	let currentContext = context;
+	let changed = true;
+	while (changed && currentContext.buffer.length > 0) {
+		changed = false;
+		const remaining = indexedParsers.filter(([_, index]) => !matchedParsers.has(index)).sort(([a], [b]) => b.priority - a.priority);
+		const tried = tryParseSuggestList(currentContext, stateArray, parsers, matchedParsers, remaining);
+		if (tried === null) continue;
+		if (typeof tried === "object" && "then" in tried && typeof tried.then === "function") return tried;
+		currentContext = tried;
+		changed = true;
+	}
+	return {
+		...currentContext,
+		state: stateArray
+	};
+}
+/**
+* Tries each parser in `remaining` once.  Returns the updated context if a
+* parser consumed input (sync), a Promise that resolves to a context if an
+* async parser was encountered, or `null` if no parser consumed.
+* @internal
+*/
+function tryParseSuggestList(context, stateArray, parsers, matchedParsers, remaining) {
+	for (let ri = 0; ri < remaining.length; ri++) {
+		const [parser, index] = remaining[ri];
+		const parserState = index < stateArray.length ? stateArray[index] : parser.initialState;
+		const resultOrPromise = parser.parse({
+			...context,
+			state: parserState
+		});
+		if (resultOrPromise != null && typeof resultOrPromise === "object" && "then" in resultOrPromise && typeof resultOrPromise.then === "function") {
+			const tail = remaining.slice(ri + 1);
+			return resultOrPromise.then((result$1) => {
+				if (result$1.success && result$1.consumed.length > 0) {
+					stateArray[index] = result$1.next.state;
+					matchedParsers.add(index);
+					return preParseSuggestLoop({
+						...context,
+						buffer: result$1.next.buffer,
+						optionsTerminated: result$1.next.optionsTerminated,
+						state: stateArray
+					}, stateArray, parsers, matchedParsers);
+				}
+				const next = tryParseSuggestList(context, stateArray, parsers, matchedParsers, tail);
+				if (next === null) return {
+					...context,
+					state: stateArray
+				};
+				if (typeof next === "object" && "then" in next && typeof next.then === "function") return next.then((ctx) => ctx.buffer.length < context.buffer.length ? preParseSuggestLoop(ctx, stateArray, parsers, matchedParsers) : ctx);
+				const nextCtx = next;
+				if (nextCtx.buffer.length < context.buffer.length) return preParseSuggestLoop(nextCtx, stateArray, parsers, matchedParsers);
+				return nextCtx;
+			});
+		}
+		const result = resultOrPromise;
+		if (result.success && result.consumed.length > 0) {
+			stateArray[index] = result.next.state;
+			matchedParsers.add(index);
+			return {
+				...context,
+				buffer: result.next.buffer,
+				optionsTerminated: result.next.optionsTerminated,
+				state: stateArray
+			};
+		}
+	}
+	return null;
+}
 function concat(...parsers) {
 	const combinedMode = parsers.some((p) => p.$mode === "async") ? "async" : "sync";
 	const isAsync = combinedMode === "async";
@@ -1960,14 +2070,15 @@ function concat(...parsers) {
 			return completeSync(state);
 		},
 		suggest(context, prefix) {
-			const stateArray = context.state;
 			if (isAsync) return async function* () {
+				const preParsedContext$1 = await preParseSuggestContextAsync(context, parsers);
+				const { context: contextWithRegistry$1, stateArray: stateArray$1 } = buildSuggestRegistry(preParsedContext$1);
 				const suggestions = [];
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
-					const parserState = stateArray && Array.isArray(stateArray) ? stateArray[i] : parser.initialState;
+					const parserState = stateArray$1 && Array.isArray(stateArray$1) ? stateArray$1[i] : parser.initialState;
 					const parserSuggestions = parser.suggest({
-						...context,
+						...contextWithRegistry$1,
 						state: parserState
 					}, prefix);
 					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
@@ -1975,13 +2086,15 @@ function concat(...parsers) {
 				}
 				yield* require_suggestion.deduplicateSuggestions(suggestions);
 			}();
+			const preParsedContext = preParseSuggestContext(context, syncParsers);
+			const { context: contextWithRegistry, stateArray } = buildSuggestRegistry(preParsedContext);
 			return function* () {
 				const suggestions = [];
 				for (let i = 0; i < syncParsers.length; i++) {
 					const parser = syncParsers[i];
 					const parserState = stateArray && Array.isArray(stateArray) ? stateArray[i] : parser.initialState;
 					const parserSuggestions = parser.suggest({
-						...context,
+						...contextWithRegistry,
 						state: parserState
 					}, prefix);
 					suggestions.push(...parserSuggestions);

package/dist/constructs.js

@@ -610,7 +610,7 @@ function longestMatch(...args) {
 * @internal
 */
 function* suggestObjectSync(context, prefix, parserPairs) {
-	const registry = context.dependencyRegistry instanceof DependencyRegistry ? context.dependencyRegistry : new DependencyRegistry();
+	const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new DependencyRegistry();
 	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
 	const contextWithRegistry = {
 		...context,
@@ -643,7 +643,7 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 * @internal
 */
 async function* suggestObjectAsync(context, prefix, parserPairs) {
-	const registry = context.dependencyRegistry instanceof DependencyRegistry ? context.dependencyRegistry : new DependencyRegistry();
+	const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new DependencyRegistry();
 	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
 	const contextWithRegistry = {
 		...context,
@@ -673,17 +673,9 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	yield* deduplicateSuggestions(suggestions);
 }
 /**
-* Resolves deferred parse states in an object's field states.
-* This function builds a dependency registry from DependencySourceState fields
-* and re-parses DeferredParseState fields using the actual dependency values.
-*
-* @param fieldStates A record of field names to their state values
-* @returns The field states with deferred states resolved to their actual values
-* @internal
-*/
-/**
 * Recursively collects dependency values from DependencySourceState objects
 * found anywhere in the state tree.
+* @internal
 */
 function collectDependencies(state, registry, visited = /* @__PURE__ */ new WeakSet()) {
 	if (state === null || state === void 0) return;
@@ -1687,13 +1679,19 @@ function merge(...args) {
 				}
 				return p.initialState;
 			};
+			const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new DependencyRegistry();
+			if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
+			const contextWithRegistry = {
+				...context,
+				dependencyRegistry: registry
+			};
 			if (isAsync) return async function* () {
 				const suggestions = [];
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
 					const parserState = extractState(parser, i);
 					const parserSuggestions = parser.suggest({
-						...context,
+						...contextWithRegistry,
 						state: parserState
 					}, prefix);
 					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
@@ -1707,7 +1705,7 @@ function merge(...args) {
 					const parser = syncParsers[i];
 					const parserState = extractState(parser, i);
 					const parserSuggestions = parser.suggest({
-						...context,
+						...contextWithRegistry,
 						state: parserState
 					}, prefix);
 					suggestions.push(...parserSuggestions);
@@ -1777,6 +1775,118 @@ function merge(...args) {
 		}
 	};
 }
+/**
+* Builds a dependency registry from the pre-parsed context state and returns
+* the enriched context alongside the state array.  Used by both the sync and
+* async branches of `concat().suggest()`.
+* @internal
+*/
+function buildSuggestRegistry(preParsedContext) {
+	const stateArray = preParsedContext.state;
+	const registry = preParsedContext.dependencyRegistry ? preParsedContext.dependencyRegistry.clone() : new DependencyRegistry();
+	if (stateArray && Array.isArray(stateArray)) collectDependencies(stateArray, registry);
+	return {
+		context: {
+			...preParsedContext,
+			dependencyRegistry: registry
+		},
+		stateArray
+	};
+}
+/**
+* This helper replays child parsers in priority order (mirroring
+* `concat.parse()`) to accumulate dependency source values for suggestions.
+* @internal
+*/
+function preParseSuggestContext(context, parsers) {
+	if (context.buffer.length < 1 || !Array.isArray(context.state)) return context;
+	return preParseSuggestLoop(context, context.state.slice(), parsers);
+}
+/**
+* Async variant of {@link preParseSuggestContext} that awaits async child
+* parsers so that dependency sources from async sub-parsers are resolved.
+* @internal
+*/
+async function preParseSuggestContextAsync(context, parsers) {
+	if (context.buffer.length < 1 || !Array.isArray(context.state)) return context;
+	return await preParseSuggestLoop(context, context.state.slice(), parsers);
+}
+/**
+* Shared loop for sync and async concat suggest pre-parse.  When a child
+* parser returns a Promise its result is awaited; sync results are used
+* directly.  Parsers are tried in priority order, matching `concat.parse()`.
+* @internal
+*/
+function preParseSuggestLoop(context, stateArray, parsers, matchedParsers = /* @__PURE__ */ new Set()) {
+	const indexedParsers = parsers.map((parser, index) => [parser, index]);
+	let currentContext = context;
+	let changed = true;
+	while (changed && currentContext.buffer.length > 0) {
+		changed = false;
+		const remaining = indexedParsers.filter(([_, index]) => !matchedParsers.has(index)).sort(([a], [b]) => b.priority - a.priority);
+		const tried = tryParseSuggestList(currentContext, stateArray, parsers, matchedParsers, remaining);
+		if (tried === null) continue;
+		if (typeof tried === "object" && "then" in tried && typeof tried.then === "function") return tried;
+		currentContext = tried;
+		changed = true;
+	}
+	return {
+		...currentContext,
+		state: stateArray
+	};
+}
+/**
+* Tries each parser in `remaining` once.  Returns the updated context if a
+* parser consumed input (sync), a Promise that resolves to a context if an
+* async parser was encountered, or `null` if no parser consumed.
+* @internal
+*/
+function tryParseSuggestList(context, stateArray, parsers, matchedParsers, remaining) {
+	for (let ri = 0; ri < remaining.length; ri++) {
+		const [parser, index] = remaining[ri];
+		const parserState = index < stateArray.length ? stateArray[index] : parser.initialState;
+		const resultOrPromise = parser.parse({
+			...context,
+			state: parserState
+		});
+		if (resultOrPromise != null && typeof resultOrPromise === "object" && "then" in resultOrPromise && typeof resultOrPromise.then === "function") {
+			const tail = remaining.slice(ri + 1);
+			return resultOrPromise.then((result$1) => {
+				if (result$1.success && result$1.consumed.length > 0) {
+					stateArray[index] = result$1.next.state;
+					matchedParsers.add(index);
+					return preParseSuggestLoop({
+						...context,
+						buffer: result$1.next.buffer,
+						optionsTerminated: result$1.next.optionsTerminated,
+						state: stateArray
+					}, stateArray, parsers, matchedParsers);
+				}
+				const next = tryParseSuggestList(context, stateArray, parsers, matchedParsers, tail);
+				if (next === null) return {
+					...context,
+					state: stateArray
+				};
+				if (typeof next === "object" && "then" in next && typeof next.then === "function") return next.then((ctx) => ctx.buffer.length < context.buffer.length ? preParseSuggestLoop(ctx, stateArray, parsers, matchedParsers) : ctx);
+				const nextCtx = next;
+				if (nextCtx.buffer.length < context.buffer.length) return preParseSuggestLoop(nextCtx, stateArray, parsers, matchedParsers);
+				return nextCtx;
+			});
+		}
+		const result = resultOrPromise;
+		if (result.success && result.consumed.length > 0) {
+			stateArray[index] = result.next.state;
+			matchedParsers.add(index);
+			return {
+				...context,
+				buffer: result.next.buffer,
+				optionsTerminated: result.next.optionsTerminated,
+				state: stateArray
+			};
+		}
+	}
+	return null;
+}
 function concat(...parsers) {
 	const combinedMode = parsers.some((p) => p.$mode === "async") ? "async" : "sync";
 	const isAsync = combinedMode === "async";
@@ -1960,14 +2070,15 @@ function concat(...parsers) {
 			return completeSync(state);
 		},
 		suggest(context, prefix) {
-			const stateArray = context.state;
 			if (isAsync) return async function* () {
+				const preParsedContext$1 = await preParseSuggestContextAsync(context, parsers);
+				const { context: contextWithRegistry$1, stateArray: stateArray$1 } = buildSuggestRegistry(preParsedContext$1);
 				const suggestions = [];
 				for (let i = 0; i < parsers.length; i++) {
 					const parser = parsers[i];
-					const parserState = stateArray && Array.isArray(stateArray) ? stateArray[i] : parser.initialState;
+					const parserState = stateArray$1 && Array.isArray(stateArray$1) ? stateArray$1[i] : parser.initialState;
 					const parserSuggestions = parser.suggest({
-						...context,
+						...contextWithRegistry$1,
 						state: parserState
 					}, prefix);
 					if (parser.$mode === "async") for await (const s of parserSuggestions) suggestions.push(s);
@@ -1975,13 +2086,15 @@ function concat(...parsers) {
 				}
 				yield* deduplicateSuggestions(suggestions);
 			}();
+			const preParsedContext = preParseSuggestContext(context, syncParsers);
+			const { context: contextWithRegistry, stateArray } = buildSuggestRegistry(preParsedContext);
 			return function* () {
 				const suggestions = [];
 				for (let i = 0; i < syncParsers.length; i++) {
 					const parser = syncParsers[i];
 					const parserState = stateArray && Array.isArray(stateArray) ? stateArray[i] : parser.initialState;
 					const parserSuggestions = parser.suggest({
-						...context,
+						...contextWithRegistry,
 						state: parserState
 					}, prefix);
 					suggestions.push(...parserSuggestions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.670+a142c6c9",
+  "version": "1.0.0-dev.677+43d39974",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",