@optique/core 1.0.0-dev.1611 → 1.0.0-dev.1616

package/dist/dependency-runtime.cjs

@@ -168,6 +168,7 @@ function resolveSingleDeferred(deferred, runtime) {
 		defaultValues: deferred.defaultValues
 	});
 	if (resolution.kind !== "resolved") return deferred.preliminaryResult;
+	if (resolution.usedDefaults.every((d) => d)) return deferred.preliminaryResult;
 	const depValue = isMultiDep ? resolution.values : resolution.values[0];
 	const result = deferred.parser[require_dependency.parseWithDependency](deferred.rawInput, depValue);
 	if (result instanceof Promise) return deferred.preliminaryResult;
@@ -266,6 +267,7 @@ async function resolveDeferredInStateAsync(state, runtime, visited = /* @__PURE_
 			defaultValues: deferred.defaultValues
 		});
 		if (resolution.kind !== "resolved") return deferred.preliminaryResult;
+		if (resolution.usedDefaults.every((d) => d)) return deferred.preliminaryResult;
 		const depValue = isMultiDep ? resolution.values : resolution.values[0];
 		return Promise.resolve(deferred.parser[require_dependency.parseWithDependency](deferred.rawInput, depValue));
 	}

package/dist/dependency-runtime.js

@@ -168,6 +168,7 @@ function resolveSingleDeferred(deferred, runtime) {
 		defaultValues: deferred.defaultValues
 	});
 	if (resolution.kind !== "resolved") return deferred.preliminaryResult;
+	if (resolution.usedDefaults.every((d) => d)) return deferred.preliminaryResult;
 	const depValue = isMultiDep ? resolution.values : resolution.values[0];
 	const result = deferred.parser[parseWithDependency](deferred.rawInput, depValue);
 	if (result instanceof Promise) return deferred.preliminaryResult;
@@ -266,6 +267,7 @@ async function resolveDeferredInStateAsync(state, runtime, visited = /* @__PURE_
 			defaultValues: deferred.defaultValues
 		});
 		if (resolution.kind !== "resolved") return deferred.preliminaryResult;
+		if (resolution.usedDefaults.every((d) => d)) return deferred.preliminaryResult;
 		const depValue = isMultiDep ? resolution.values : resolution.values[0];
 		return Promise.resolve(deferred.parser[parseWithDependency](deferred.rawInput, depValue));
 	}

package/dist/parser.cjs

@@ -1,5 +1,7 @@
 const require_annotations = require('./annotations.cjs');
 const require_message = require('./message.cjs');
+const require_dependency = require('./dependency.cjs');
+const require_dependency_runtime = require('./dependency-runtime.cjs');
 const require_mode_dispatch = require('./mode-dispatch.cjs');
 const require_usage = require('./usage.cjs');
 const require_doc = require('./doc.cjs');
@@ -83,11 +85,15 @@ function parseSync(parser, args, options) {
 			error: require_message.message`Unexpected option or argument: ${context.buffer[0]}.`
 		};
 	} while (context.buffer.length > 0);
+	const runtime = require_dependency_runtime.createDependencyRuntimeContext();
+	const resolvedState = require_dependency.isDeferredParseState(context.state) ? require_dependency_runtime.resolveStateWithRuntime(context.state, runtime) : context.state;
 	const completeExec = {
 		...exec,
-		phase: "complete"
+		phase: "complete",
+		dependencyRuntime: runtime,
+		dependencyRegistry: runtime.registry
 	};
-	const endResult = parser.complete(context.state, completeExec);
+	const endResult = parser.complete(resolvedState, completeExec);
 	return endResult.success ? {
 		success: true,
 		value: shouldUnwrapAnnotatedValue ? require_annotations.unwrapInjectedAnnotationWrapper(endResult.value) : endResult.value,
@@ -150,11 +156,15 @@ async function parseAsync(parser, args, options) {
 			error: require_message.message`Unexpected option or argument: ${context.buffer[0]}.`
 		};
 	} while (context.buffer.length > 0);
+	const runtime = require_dependency_runtime.createDependencyRuntimeContext();
+	const resolvedState = require_dependency.isDeferredParseState(context.state) ? await require_dependency_runtime.resolveStateWithRuntimeAsync(context.state, runtime) : context.state;
 	const completeExec = {
 		...exec,
-		phase: "complete"
+		phase: "complete",
+		dependencyRuntime: runtime,
+		dependencyRegistry: runtime.registry
 	};
-	const endResult = await parser.complete(context.state, completeExec);
+	const endResult = await parser.complete(resolvedState, completeExec);
 	return endResult.success ? {
 		success: true,
 		value: shouldUnwrapAnnotatedValue ? require_annotations.unwrapInjectedAnnotationWrapper(endResult.value) : endResult.value,
@@ -241,12 +251,31 @@ function suggestSync(parser, args, options) {
 	});
 	while (context.buffer.length > 0) {
 		const result = parser.parse(context);
-		if (!result.success) return Array.from(parser.suggest(context, prefix));
+		if (!result.success) return Array.from(parser.suggest(withSuggestRuntime(context), prefix));
 		const previousBuffer = context.buffer;
 		context = result.next;
 		if (isBufferUnchanged(previousBuffer, context.buffer)) return [];
 	}
-	return Array.from(parser.suggest(context, prefix));
+	return Array.from(parser.suggest(withSuggestRuntime(context), prefix));
+}
+/**
+* Creates a dependency runtime from the current parser state and returns
+* a context with the populated registry.  Used by top-level suggest
+* functions to mirror the construct-owned model where suggest() receives
+* a context with a dependency registry.
+* @internal
+*/
+function withSuggestRuntime(context) {
+	const runtime = require_dependency_runtime.createDependencyRuntimeContext();
+	require_dependency_runtime.collectSourcesFromState(context.state, runtime);
+	return {
+		...context,
+		dependencyRegistry: runtime.registry,
+		exec: context.exec ? {
+			...context.exec,
+			dependencyRegistry: runtime.registry
+		} : void 0
+	};
 }
 /**
 * Generates command-line suggestions based on current parsing state.
@@ -284,16 +313,18 @@ async function suggestAsync(parser, args, options) {
 	while (context.buffer.length > 0) {
 		const result = await parser.parse(context);
 		if (!result.success) {
+			const ctx$1 = withSuggestRuntime(context);
 			const suggestions$1 = [];
-			for await (const suggestion of parser.suggest(context, prefix)) suggestions$1.push(suggestion);
+			for await (const suggestion of parser.suggest(ctx$1, prefix)) suggestions$1.push(suggestion);
 			return suggestions$1;
 		}
 		const previousBuffer = context.buffer;
 		context = result.next;
 		if (isBufferUnchanged(previousBuffer, context.buffer)) return [];
 	}
+	const ctx = withSuggestRuntime(context);
 	const suggestions = [];
-	for await (const suggestion of parser.suggest(context, prefix)) suggestions.push(suggestion);
+	for await (const suggestion of parser.suggest(ctx, prefix)) suggestions.push(suggestion);
 	return suggestions;
 }
 /**

package/dist/parser.js

@@ -1,5 +1,7 @@
 import { injectAnnotations, isInjectedAnnotationWrapper, unwrapInjectedAnnotationWrapper } from "./annotations.js";
 import { cloneMessage, message } from "./message.js";
+import { isDeferredParseState } from "./dependency.js";
+import { collectSourcesFromState, createDependencyRuntimeContext, resolveStateWithRuntime, resolveStateWithRuntimeAsync } from "./dependency-runtime.js";
 import { dispatchByMode } from "./mode-dispatch.js";
 import { cloneUsage, normalizeUsage } from "./usage.js";
 import { cloneDocEntry, isDocEntryHidden } from "./doc.js";
@@ -83,11 +85,15 @@ function parseSync(parser, args, options) {
 			error: message`Unexpected option or argument: ${context.buffer[0]}.`
 		};
 	} while (context.buffer.length > 0);
+	const runtime = createDependencyRuntimeContext();
+	const resolvedState = isDeferredParseState(context.state) ? resolveStateWithRuntime(context.state, runtime) : context.state;
 	const completeExec = {
 		...exec,
-		phase: "complete"
+		phase: "complete",
+		dependencyRuntime: runtime,
+		dependencyRegistry: runtime.registry
 	};
-	const endResult = parser.complete(context.state, completeExec);
+	const endResult = parser.complete(resolvedState, completeExec);
 	return endResult.success ? {
 		success: true,
 		value: shouldUnwrapAnnotatedValue ? unwrapInjectedAnnotationWrapper(endResult.value) : endResult.value,
@@ -150,11 +156,15 @@ async function parseAsync(parser, args, options) {
 			error: message`Unexpected option or argument: ${context.buffer[0]}.`
 		};
 	} while (context.buffer.length > 0);
+	const runtime = createDependencyRuntimeContext();
+	const resolvedState = isDeferredParseState(context.state) ? await resolveStateWithRuntimeAsync(context.state, runtime) : context.state;
 	const completeExec = {
 		...exec,
-		phase: "complete"
+		phase: "complete",
+		dependencyRuntime: runtime,
+		dependencyRegistry: runtime.registry
 	};
-	const endResult = await parser.complete(context.state, completeExec);
+	const endResult = await parser.complete(resolvedState, completeExec);
 	return endResult.success ? {
 		success: true,
 		value: shouldUnwrapAnnotatedValue ? unwrapInjectedAnnotationWrapper(endResult.value) : endResult.value,
@@ -241,12 +251,31 @@ function suggestSync(parser, args, options) {
 	});
 	while (context.buffer.length > 0) {
 		const result = parser.parse(context);
-		if (!result.success) return Array.from(parser.suggest(context, prefix));
+		if (!result.success) return Array.from(parser.suggest(withSuggestRuntime(context), prefix));
 		const previousBuffer = context.buffer;
 		context = result.next;
 		if (isBufferUnchanged(previousBuffer, context.buffer)) return [];
 	}
-	return Array.from(parser.suggest(context, prefix));
+	return Array.from(parser.suggest(withSuggestRuntime(context), prefix));
+}
+/**
+* Creates a dependency runtime from the current parser state and returns
+* a context with the populated registry.  Used by top-level suggest
+* functions to mirror the construct-owned model where suggest() receives
+* a context with a dependency registry.
+* @internal
+*/
+function withSuggestRuntime(context) {
+	const runtime = createDependencyRuntimeContext();
+	collectSourcesFromState(context.state, runtime);
+	return {
+		...context,
+		dependencyRegistry: runtime.registry,
+		exec: context.exec ? {
+			...context.exec,
+			dependencyRegistry: runtime.registry
+		} : void 0
+	};
 }
 /**
 * Generates command-line suggestions based on current parsing state.
@@ -284,16 +313,18 @@ async function suggestAsync(parser, args, options) {
 	while (context.buffer.length > 0) {
 		const result = await parser.parse(context);
 		if (!result.success) {
+			const ctx$1 = withSuggestRuntime(context);
 			const suggestions$1 = [];
-			for await (const suggestion of parser.suggest(context, prefix)) suggestions$1.push(suggestion);
+			for await (const suggestion of parser.suggest(ctx$1, prefix)) suggestions$1.push(suggestion);
 			return suggestions$1;
 		}
 		const previousBuffer = context.buffer;
 		context = result.next;
 		if (isBufferUnchanged(previousBuffer, context.buffer)) return [];
 	}
+	const ctx = withSuggestRuntime(context);
 	const suggestions = [];
-	for await (const suggestion of parser.suggest(context, prefix)) suggestions.push(suggestion);
+	for await (const suggestion of parser.suggest(ctx, prefix)) suggestions.push(suggestion);
 	return suggestions;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.1611+0344ff75",
+  "version": "1.0.0-dev.1616+17abc525",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",