@optique/core 0.10.0-dev.319 → 0.10.0-dev.324

package/dist/primitives.cjs

@@ -63,15 +63,15 @@ function* getSuggestionsWithDependency(valueParser, prefix, dependencyRegistry)
 		const derived = valueParser;
 		const suggestWithDep = derived[require_dependency.suggestWithDependency];
 		if (suggestWithDep && dependencyRegistry) {
-			const depIds = require_dependency.dependencyIds in derived ? derived[require_dependency.dependencyIds] : [derived[require_dependency.dependencyId]];
-			const defaults = require_dependency.defaultValues in derived ? derived[require_dependency.defaultValues]?.() : void 0;
-			const registry = dependencyRegistry;
+			const depIds = require_dependency.getDependencyIds(derived);
+			const defaultsFn = require_dependency.getDefaultValuesFunction(derived);
+			const defaults = defaultsFn?.();
 			const dependencyValues = [];
 			let hasAnyValue = false;
 			for (let i = 0; i < depIds.length; i++) {
 				const depId = depIds[i];
-				if (registry.has(depId)) {
-					dependencyValues.push(registry.get(depId));
+				if (dependencyRegistry.has(depId)) {
+					dependencyValues.push(dependencyRegistry.get(depId));
 					hasAnyValue = true;
 				} else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
 				else {
@@ -144,15 +144,15 @@ async function* getSuggestionsWithDependencyAsync(valueParser, prefix, dependenc
 		const derived = valueParser;
 		const suggestWithDep = derived[require_dependency.suggestWithDependency];
 		if (suggestWithDep && dependencyRegistry) {
-			const depIds = require_dependency.dependencyIds in derived ? derived[require_dependency.dependencyIds] : [derived[require_dependency.dependencyId]];
-			const defaults = require_dependency.defaultValues in derived ? derived[require_dependency.defaultValues]?.() : void 0;
-			const registry = dependencyRegistry;
+			const depIds = require_dependency.getDependencyIds(derived);
+			const defaultsFn = require_dependency.getDefaultValuesFunction(derived);
+			const defaults = defaultsFn?.();
 			const dependencyValues = [];
 			let hasAnyValue = false;
 			for (let i = 0; i < depIds.length; i++) {
 				const depId = depIds[i];
-				if (registry.has(depId)) {
-					dependencyValues.push(registry.get(depId));
+				if (dependencyRegistry.has(depId)) {
+					dependencyValues.push(dependencyRegistry.get(depId));
 					hasAnyValue = true;
 				} else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
 				else {
@@ -940,8 +940,21 @@ function command(name, parser, options = {}) {
 				success: false,
 				error: options.errors?.notFound ?? require_message.message`Command ${require_message.optionName(name)} was not matched.`
 			};
-			else if (state[0] === "matched") return parser.complete(parser.initialState);
-			else if (state[0] === "parsing") return parser.complete(state[1]);
+			else if (state[0] === "matched") {
+				const parseResultOrPromise = parser.parse({
+					buffer: [],
+					optionsTerminated: false,
+					usage: [],
+					state: parser.initialState
+				});
+				if (isAsync) return parseResultOrPromise.then((parseResult$1) => {
+					if (parseResult$1.success) return parser.complete(parseResult$1.next.state);
+					return parser.complete(parser.initialState);
+				});
+				const parseResult = parseResultOrPromise;
+				if (parseResult.success) return parser.complete(parseResult.next.state);
+				return parser.complete(parser.initialState);
+			} else if (state[0] === "parsing") return parser.complete(state[1]);
 			return {
 				success: false,
 				error: options.errors?.invalidState ?? require_message.message`Invalid command state during completion.`

package/dist/primitives.js

@@ -1,5 +1,5 @@
 import { message, metavar, optionName, optionNames } from "./message.js";
-import { createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, defaultValues, dependencyId, dependencyIds, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, suggestWithDependency } from "./dependency.js";
+import { createDeferredParseState, createDependencySourceState, createPendingDependencySourceState, dependencyId, getDefaultValuesFunction, getDependencyIds, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser, isPendingDependencySourceState, suggestWithDependency } from "./dependency.js";
 import { extractCommandNames, extractOptionNames } from "./usage.js";
 import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, findSimilar } from "./suggestion.js";
 import { isValueParser } from "./valueparser.js";
@@ -63,15 +63,15 @@ function* getSuggestionsWithDependency(valueParser, prefix, dependencyRegistry)
 		const derived = valueParser;
 		const suggestWithDep = derived[suggestWithDependency];
 		if (suggestWithDep && dependencyRegistry) {
-			const depIds = dependencyIds in derived ? derived[dependencyIds] : [derived[dependencyId]];
-			const defaults = defaultValues in derived ? derived[defaultValues]?.() : void 0;
-			const registry = dependencyRegistry;
+			const depIds = getDependencyIds(derived);
+			const defaultsFn = getDefaultValuesFunction(derived);
+			const defaults = defaultsFn?.();
 			const dependencyValues = [];
 			let hasAnyValue = false;
 			for (let i = 0; i < depIds.length; i++) {
 				const depId = depIds[i];
-				if (registry.has(depId)) {
-					dependencyValues.push(registry.get(depId));
+				if (dependencyRegistry.has(depId)) {
+					dependencyValues.push(dependencyRegistry.get(depId));
 					hasAnyValue = true;
 				} else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
 				else {
@@ -144,15 +144,15 @@ async function* getSuggestionsWithDependencyAsync(valueParser, prefix, dependenc
 		const derived = valueParser;
 		const suggestWithDep = derived[suggestWithDependency];
 		if (suggestWithDep && dependencyRegistry) {
-			const depIds = dependencyIds in derived ? derived[dependencyIds] : [derived[dependencyId]];
-			const defaults = defaultValues in derived ? derived[defaultValues]?.() : void 0;
-			const registry = dependencyRegistry;
+			const depIds = getDependencyIds(derived);
+			const defaultsFn = getDefaultValuesFunction(derived);
+			const defaults = defaultsFn?.();
 			const dependencyValues = [];
 			let hasAnyValue = false;
 			for (let i = 0; i < depIds.length; i++) {
 				const depId = depIds[i];
-				if (registry.has(depId)) {
-					dependencyValues.push(registry.get(depId));
+				if (dependencyRegistry.has(depId)) {
+					dependencyValues.push(dependencyRegistry.get(depId));
 					hasAnyValue = true;
 				} else if (defaults && i < defaults.length) dependencyValues.push(defaults[i]);
 				else {
@@ -940,8 +940,21 @@ function command(name, parser, options = {}) {
 				success: false,
 				error: options.errors?.notFound ?? message`Command ${optionName(name)} was not matched.`
 			};
-			else if (state[0] === "matched") return parser.complete(parser.initialState);
-			else if (state[0] === "parsing") return parser.complete(state[1]);
+			else if (state[0] === "matched") {
+				const parseResultOrPromise = parser.parse({
+					buffer: [],
+					optionsTerminated: false,
+					usage: [],
+					state: parser.initialState
+				});
+				if (isAsync) return parseResultOrPromise.then((parseResult$1) => {
+					if (parseResult$1.success) return parser.complete(parseResult$1.next.state);
+					return parser.complete(parser.initialState);
+				});
+				const parseResult = parseResultOrPromise;
+				if (parseResult.success) return parser.complete(parseResult.next.state);
+				return parser.complete(parser.initialState);
+			} else if (state[0] === "parsing") return parser.complete(state[1]);
 			return {
 				success: false,
 				error: options.errors?.invalidState ?? message`Invalid command state during completion.`

package/dist/registry-types.d.cts

@@ -0,0 +1,38 @@
+//#region src/registry-types.d.ts
+/**
+ * Interface for dependency registry to break circular dependency between
+ * parser.ts and dependency.ts.
+ *
+ * This interface defines the contract for storing and retrieving resolved
+ * dependency values during parsing. The actual implementation is provided
+ * by {@link DependencyRegistry} in dependency.ts.
+ *
+ * @since 0.10.0
+ */
+interface DependencyRegistryLike {
+  /**
+   * Registers a resolved dependency value.
+   * @param id The dependency ID (a unique symbol).
+   * @param value The resolved value.
+   */
+  set<T>(id: symbol, value: T): void;
+  /**
+   * Gets a resolved dependency value.
+   * @param id The dependency ID.
+   * @returns The resolved value, or undefined if not found.
+   */
+  get<T>(id: symbol): T | undefined;
+  /**
+   * Checks if a dependency has been resolved.
+   * @param id The dependency ID.
+   * @returns `true` if the dependency has been resolved.
+   */
+  has(id: symbol): boolean;
+  /**
+   * Creates a copy of the registry.
+   * @returns A new registry with the same values.
+   */
+  clone(): DependencyRegistryLike;
+}
+//#endregion
+export { DependencyRegistryLike };

package/dist/registry-types.d.ts

@@ -0,0 +1,38 @@
+//#region src/registry-types.d.ts
+/**
+ * Interface for dependency registry to break circular dependency between
+ * parser.ts and dependency.ts.
+ *
+ * This interface defines the contract for storing and retrieving resolved
+ * dependency values during parsing. The actual implementation is provided
+ * by {@link DependencyRegistry} in dependency.ts.
+ *
+ * @since 0.10.0
+ */
+interface DependencyRegistryLike {
+  /**
+   * Registers a resolved dependency value.
+   * @param id The dependency ID (a unique symbol).
+   * @param value The resolved value.
+   */
+  set<T>(id: symbol, value: T): void;
+  /**
+   * Gets a resolved dependency value.
+   * @param id The dependency ID.
+   * @returns The resolved value, or undefined if not found.
+   */
+  get<T>(id: symbol): T | undefined;
+  /**
+   * Checks if a dependency has been resolved.
+   * @param id The dependency ID.
+   * @returns `true` if the dependency has been resolved.
+   */
+  has(id: symbol): boolean;
+  /**
+   * Creates a copy of the registry.
+   * @returns A new registry with the same values.
+   */
+  clone(): DependencyRegistryLike;
+}
+//#endregion
+export { DependencyRegistryLike };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "0.10.0-dev.319+9aeefc28",
+  "version": "0.10.0-dev.324+5bba27e5",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",