@optique/core 1.0.0-dev.679 → 1.0.0-dev.688

package/dist/constructs.cjs

@@ -612,6 +612,7 @@ function longestMatch(...args) {
 function* suggestObjectSync(context, prefix, parserPairs) {
 	const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new require_dependency.DependencyRegistry();
 	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
+	completeDependencySourceDefaults(context, parserPairs, registry);
 	const contextWithRegistry = {
 		...context,
 		dependencyRegistry: registry
@@ -645,6 +646,7 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 async function* suggestObjectAsync(context, prefix, parserPairs) {
 	const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new require_dependency.DependencyRegistry();
 	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
+	await completeDependencySourceDefaultsAsync(context, parserPairs, registry);
 	const contextWithRegistry = {
 		...context,
 		dependencyRegistry: registry
@@ -673,6 +675,59 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	yield* require_suggestion.deduplicateSuggestions(suggestions);
 }
 /**
+* Registers an already-resolved dependency source value in the registry
+* if it is a successful {@link DependencySourceState}.
+*
+* @internal
+*/
+function registerCompletedDependency(completed, registry) {
+	if (require_dependency.isDependencySourceState(completed) && completed.result.success && !registry.has(completed[require_dependency.dependencyId])) registry.set(completed[require_dependency.dependencyId], completed.result.value);
+}
+/**
+* Yields `(parser, state)` pairs for dependency source parsers whose field
+* state is unpopulated, so callers can invoke `complete()` on them.
+*
+* @see https://github.com/dahlia/optique/issues/186
+* @internal
+*/
+function* pendingDependencyDefaults(context, parserPairs) {
+	for (const [field, fieldParser] of parserPairs) {
+		const fieldState = context.state != null && typeof context.state === "object" && field in context.state ? context.state[field] : void 0;
+		if (fieldState != null) continue;
+		if (require_dependency.isPendingDependencySourceState(fieldParser.initialState)) yield {
+			parser: fieldParser,
+			state: fieldParser.initialState
+		};
+		else if (require_dependency.isWrappedDependencySource(fieldParser)) yield {
+			parser: fieldParser,
+			state: [fieldParser[require_dependency.wrappedDependencySourceMarker]]
+		};
+	}
+}
+/**
+* Pre-completes dependency source parsers wrapped in `withDefault()` whose
+* field state is unpopulated, so that their default values are registered
+* in the dependency registry.  This mirrors Phase 1 of parse-time dependency
+* resolution and ensures `suggest()` sees the same defaults as `parse()`.
+*
+* @see https://github.com/dahlia/optique/issues/186
+* @internal
+*/
+function completeDependencySourceDefaults(context, parserPairs, registry) {
+	for (const { parser, state } of pendingDependencyDefaults(context, parserPairs)) registerCompletedDependency(parser.complete(state), registry);
+}
+/**
+* Async version of {@link completeDependencySourceDefaults} that awaits
+* `complete()` results.  Async parsers with `transformsDependencyValue`
+* return a `Promise` from `complete()`, which the sync version cannot handle.
+*
+* @see https://github.com/dahlia/optique/issues/186
+* @internal
+*/
+async function completeDependencySourceDefaultsAsync(context, parserPairs, registry) {
+	for (const { parser, state } of pendingDependencyDefaults(context, parserPairs)) registerCompletedDependency(await parser.complete(state), registry);
+}
+/**
 * Recursively collects dependency values from DependencySourceState objects
 * found anywhere in the state tree.
 * @internal

package/dist/constructs.js

@@ -612,6 +612,7 @@ function longestMatch(...args) {
 function* suggestObjectSync(context, prefix, parserPairs) {
 	const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new DependencyRegistry();
 	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
+	completeDependencySourceDefaults(context, parserPairs, registry);
 	const contextWithRegistry = {
 		...context,
 		dependencyRegistry: registry
@@ -645,6 +646,7 @@ function* suggestObjectSync(context, prefix, parserPairs) {
 async function* suggestObjectAsync(context, prefix, parserPairs) {
 	const registry = context.dependencyRegistry ? context.dependencyRegistry.clone() : new DependencyRegistry();
 	if (context.state && typeof context.state === "object") collectDependencies(context.state, registry);
+	await completeDependencySourceDefaultsAsync(context, parserPairs, registry);
 	const contextWithRegistry = {
 		...context,
 		dependencyRegistry: registry
@@ -673,6 +675,59 @@ async function* suggestObjectAsync(context, prefix, parserPairs) {
 	yield* deduplicateSuggestions(suggestions);
 }
 /**
+* Registers an already-resolved dependency source value in the registry
+* if it is a successful {@link DependencySourceState}.
+*
+* @internal
+*/
+function registerCompletedDependency(completed, registry) {
+	if (isDependencySourceState(completed) && completed.result.success && !registry.has(completed[dependencyId])) registry.set(completed[dependencyId], completed.result.value);
+}
+/**
+* Yields `(parser, state)` pairs for dependency source parsers whose field
+* state is unpopulated, so callers can invoke `complete()` on them.
+*
+* @see https://github.com/dahlia/optique/issues/186
+* @internal
+*/
+function* pendingDependencyDefaults(context, parserPairs) {
+	for (const [field, fieldParser] of parserPairs) {
+		const fieldState = context.state != null && typeof context.state === "object" && field in context.state ? context.state[field] : void 0;
+		if (fieldState != null) continue;
+		if (isPendingDependencySourceState(fieldParser.initialState)) yield {
+			parser: fieldParser,
+			state: fieldParser.initialState
+		};
+		else if (isWrappedDependencySource(fieldParser)) yield {
+			parser: fieldParser,
+			state: [fieldParser[wrappedDependencySourceMarker]]
+		};
+	}
+}
+/**
+* Pre-completes dependency source parsers wrapped in `withDefault()` whose
+* field state is unpopulated, so that their default values are registered
+* in the dependency registry.  This mirrors Phase 1 of parse-time dependency
+* resolution and ensures `suggest()` sees the same defaults as `parse()`.
+*
+* @see https://github.com/dahlia/optique/issues/186
+* @internal
+*/
+function completeDependencySourceDefaults(context, parserPairs, registry) {
+	for (const { parser, state } of pendingDependencyDefaults(context, parserPairs)) registerCompletedDependency(parser.complete(state), registry);
+}
+/**
+* Async version of {@link completeDependencySourceDefaults} that awaits
+* `complete()` results.  Async parsers with `transformsDependencyValue`
+* return a `Promise` from `complete()`, which the sync version cannot handle.
+*
+* @see https://github.com/dahlia/optique/issues/186
+* @internal
+*/
+async function completeDependencySourceDefaultsAsync(context, parserPairs, registry) {
+	for (const { parser, state } of pendingDependencyDefaults(context, parserPairs)) registerCompletedDependency(await parser.complete(state), registry);
+}
+/**
 * Recursively collects dependency values from DependencySourceState objects
 * found anywhere in the state tree.
 * @internal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.679+b8bf2b3d",
+  "version": "1.0.0-dev.688+29c3a506",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",