@optique/core 0.10.0-dev.290 → 0.10.0-dev.292

package/dist/primitives.cjs

@@ -1,10 +1,24 @@
 const require_message = require('./message.cjs');
+const require_dependency = require('./dependency.cjs');
 const require_usage = require('./usage.cjs');
 const require_suggestion = require('./suggestion.cjs');
 const require_valueparser = require('./valueparser.cjs');
 
 //#region src/primitives.ts
 /**
+* Helper function to create the appropriate state for an option value.
+* - If the value parser is a DerivedValueParser, wraps the result in a DeferredParseState
+*   to allow later resolution with actual dependency values.
+* - If the value parser is a DependencySource, wraps the result in a DependencySourceState
+*   so that it can be matched with DeferredParseState during resolution.
+* @internal
+*/
+function createOptionParseState(rawInput, valueParser, parseResult) {
+	if (require_dependency.isDerivedValueParser(valueParser)) return require_dependency.createDeferredParseState(rawInput, valueParser, parseResult);
+	if (require_dependency.isDependencySource(valueParser)) return require_dependency.createDependencySourceState(parseResult, valueParser[require_dependency.DependencyId]);
+	return parseResult;
+}
+/**
 * Creates a parser that always succeeds without consuming any input and
 * produces a constant value of the type {@link T}.
 * @template T The type of the constant value produced by the parser.
@@ -237,12 +251,13 @@ function option(...args) {
 					consumed: 1,
 					error: require_message.message`Option ${require_message.optionName(context.buffer[0])} requires a value, but got no value.`
 				};
-				const parseResultOrPromise = valueParser.parse(context.buffer[1]);
+				const rawInput = context.buffer[1];
+				const parseResultOrPromise = valueParser.parse(rawInput);
 				if (isAsync) return parseResultOrPromise.then((parseResult) => ({
 					success: true,
 					next: {
 						...context,
-						state: parseResult,
+						state: createOptionParseState(rawInput, valueParser, parseResult),
 						buffer: context.buffer.slice(2)
 					},
 					consumed: context.buffer.slice(0, 2)
@@ -251,7 +266,7 @@ function option(...args) {
 					success: true,
 					next: {
 						...context,
-						state: parseResultOrPromise,
+						state: createOptionParseState(rawInput, valueParser, parseResultOrPromise),
 						buffer: context.buffer.slice(2)
 					},
 					consumed: context.buffer.slice(0, 2)
@@ -265,18 +280,18 @@ function option(...args) {
 					consumed: 1,
 					error: options.errors?.duplicate ? typeof options.errors.duplicate === "function" ? options.errors.duplicate(prefix) : options.errors.duplicate : require_message.message`${require_message.optionName(prefix)} cannot be used multiple times.`
 				};
-				const value = context.buffer[0].slice(prefix.length);
+				const rawInput = context.buffer[0].slice(prefix.length);
 				if (valueParser == null) return {
 					success: false,
 					consumed: 1,
-					error: options.errors?.unexpectedValue ? typeof options.errors.unexpectedValue === "function" ? options.errors.unexpectedValue(value) : options.errors.unexpectedValue : require_message.message`Option ${require_message.optionName(prefix)} is a Boolean flag, but got a value: ${value}.`
+					error: options.errors?.unexpectedValue ? typeof options.errors.unexpectedValue === "function" ? options.errors.unexpectedValue(rawInput) : options.errors.unexpectedValue : require_message.message`Option ${require_message.optionName(prefix)} is a Boolean flag, but got a value: ${rawInput}.`
 				};
-				const parseResultOrPromise = valueParser.parse(value);
+				const parseResultOrPromise = valueParser.parse(rawInput);
 				if (isAsync) return parseResultOrPromise.then((parseResult) => ({
 					success: true,
 					next: {
 						...context,
-						state: parseResult,
+						state: createOptionParseState(rawInput, valueParser, parseResult),
 						buffer: context.buffer.slice(1)
 					},
 					consumed: context.buffer.slice(0, 1)
@@ -285,7 +300,7 @@ function option(...args) {
 					success: true,
 					next: {
 						...context,
-						state: parseResultOrPromise,
+						state: createOptionParseState(rawInput, valueParser, parseResultOrPromise),
 						buffer: context.buffer.slice(1)
 					},
 					consumed: context.buffer.slice(0, 1)
@@ -341,6 +356,22 @@ function option(...args) {
 				success: false,
 				error: options.errors?.missing ? typeof options.errors.missing === "function" ? options.errors.missing(optionNames$1) : options.errors.missing : require_message.message`Missing option ${require_message.optionNames(optionNames$1)}.`
 			};
+			if (require_dependency.isDeferredParseState(state)) {
+				const preliminaryResult = state.preliminaryResult;
+				if (preliminaryResult.success) return preliminaryResult;
+				return {
+					success: false,
+					error: options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(preliminaryResult.error) : options.errors.invalidValue : require_message.message`${require_message.optionNames(optionNames$1)}: ${preliminaryResult.error}`
+				};
+			}
+			if (require_dependency.isDependencySourceState(state)) {
+				const result$1 = state.result;
+				if (result$1.success) return result$1;
+				return {
+					success: false,
+					error: options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(result$1.error) : options.errors.invalidValue : require_message.message`${require_message.optionNames(optionNames$1)}: ${result$1.error}`
+				};
+			}
 			if (state.success) return state;
 			return {
 				success: false,
@@ -623,13 +654,14 @@ function argument(valueParser, options = {}) {
 				consumed: i,
 				error: options.errors?.multiple ? typeof options.errors.multiple === "function" ? options.errors.multiple(valueParser.metavar) : options.errors.multiple : require_message.message`The argument ${require_message.metavar(valueParser.metavar)} cannot be used multiple times.`
 			};
-			const parseResultOrPromise = valueParser.parse(context.buffer[i]);
+			const rawInput = context.buffer[i];
+			const parseResultOrPromise = valueParser.parse(rawInput);
 			if (isAsync) return parseResultOrPromise.then((parseResult) => ({
 				success: true,
 				next: {
 					...context,
 					buffer: context.buffer.slice(i + 1),
-					state: parseResult,
+					state: createOptionParseState(rawInput, valueParser, parseResult),
 					optionsTerminated
 				},
 				consumed: context.buffer.slice(0, i + 1)
@@ -639,7 +671,7 @@ function argument(valueParser, options = {}) {
 				next: {
 					...context,
 					buffer: context.buffer.slice(i + 1),
-					state: parseResultOrPromise,
+					state: createOptionParseState(rawInput, valueParser, parseResultOrPromise),
 					optionsTerminated
 				},
 				consumed: context.buffer.slice(0, i + 1)
@@ -650,7 +682,23 @@ function argument(valueParser, options = {}) {
 				success: false,
 				error: options.errors?.endOfInput ?? require_message.message`Expected a ${require_message.metavar(valueParser.metavar)}, but too few arguments.`
 			};
-			else if (state.success) return state;
+			if (require_dependency.isDeferredParseState(state)) {
+				const preliminaryResult = state.preliminaryResult;
+				if (preliminaryResult.success) return preliminaryResult;
+				return {
+					success: false,
+					error: options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(preliminaryResult.error) : options.errors.invalidValue : require_message.message`${require_message.metavar(valueParser.metavar)}: ${preliminaryResult.error}`
+				};
+			}
+			if (require_dependency.isDependencySourceState(state)) {
+				const result$1 = state.result;
+				if (result$1.success) return result$1;
+				return {
+					success: false,
+					error: options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(result$1.error) : options.errors.invalidValue : require_message.message`${require_message.metavar(valueParser.metavar)}: ${result$1.error}`
+				};
+			}
+			if (state.success) return state;
 			return {
 				success: false,
 				error: options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(state.error) : options.errors.invalidValue : require_message.message`${require_message.metavar(valueParser.metavar)}: ${state.error}`

package/dist/primitives.d.cts

@@ -1,10 +1,16 @@
 import { Message } from "./message.cjs";
 import { OptionName } from "./usage.cjs";
 import { ValueParser, ValueParserResult } from "./valueparser.cjs";
+import { DeferredParseState } from "./dependency.cjs";
 import { Mode, Parser } from "./parser.cjs";
 
 //#region src/primitives.d.ts
-
+/**
+ * State type for options that may use deferred parsing (DerivedValueParser).
+ * This extends the normal ValueParserResult to also support DeferredParseState.
+ * @internal
+ */
+type OptionState<T> = ValueParserResult<T> | DeferredParseState<T> | undefined;
 /**
  * Creates a parser that always succeeds without consuming any input and
  * produces a constant value of the type {@link T}.
@@ -423,4 +429,4 @@ interface PassThroughOptions {
  */
 declare function passThrough(options?: PassThroughOptions): Parser<"sync", readonly string[], readonly string[]>;
 //#endregion
-export { ArgumentErrorOptions, ArgumentOptions, CommandErrorOptions, CommandOptions, FlagErrorOptions, FlagOptions, OptionErrorOptions, OptionOptions, PassThroughFormat, PassThroughOptions, argument, command, constant, flag, option, passThrough };
+export { ArgumentErrorOptions, ArgumentOptions, CommandErrorOptions, CommandOptions, FlagErrorOptions, FlagOptions, OptionErrorOptions, OptionOptions, OptionState, PassThroughFormat, PassThroughOptions, argument, command, constant, flag, option, passThrough };

package/dist/primitives.d.ts

@@ -1,10 +1,16 @@
 import { Message } from "./message.js";
 import { OptionName } from "./usage.js";
 import { ValueParser, ValueParserResult } from "./valueparser.js";
+import { DeferredParseState } from "./dependency.js";
 import { Mode, Parser } from "./parser.js";
 
 //#region src/primitives.d.ts
-
+/**
+ * State type for options that may use deferred parsing (DerivedValueParser).
+ * This extends the normal ValueParserResult to also support DeferredParseState.
+ * @internal
+ */
+type OptionState<T> = ValueParserResult<T> | DeferredParseState<T> | undefined;
 /**
  * Creates a parser that always succeeds without consuming any input and
  * produces a constant value of the type {@link T}.
@@ -423,4 +429,4 @@ interface PassThroughOptions {
  */
 declare function passThrough(options?: PassThroughOptions): Parser<"sync", readonly string[], readonly string[]>;
 //#endregion
-export { ArgumentErrorOptions, ArgumentOptions, CommandErrorOptions, CommandOptions, FlagErrorOptions, FlagOptions, OptionErrorOptions, OptionOptions, PassThroughFormat, PassThroughOptions, argument, command, constant, flag, option, passThrough };
+export { ArgumentErrorOptions, ArgumentOptions, CommandErrorOptions, CommandOptions, FlagErrorOptions, FlagOptions, OptionErrorOptions, OptionOptions, OptionState, PassThroughFormat, PassThroughOptions, argument, command, constant, flag, option, passThrough };

package/dist/primitives.js

@@ -1,10 +1,24 @@
 import { message, metavar, optionName, optionNames } from "./message.js";
+import { DependencyId, createDeferredParseState, createDependencySourceState, isDeferredParseState, isDependencySource, isDependencySourceState, isDerivedValueParser } from "./dependency.js";
 import { extractCommandNames, extractOptionNames } from "./usage.js";
 import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, findSimilar } from "./suggestion.js";
 import { isValueParser } from "./valueparser.js";
 
 //#region src/primitives.ts
 /**
+* Helper function to create the appropriate state for an option value.
+* - If the value parser is a DerivedValueParser, wraps the result in a DeferredParseState
+*   to allow later resolution with actual dependency values.
+* - If the value parser is a DependencySource, wraps the result in a DependencySourceState
+*   so that it can be matched with DeferredParseState during resolution.
+* @internal
+*/
+function createOptionParseState(rawInput, valueParser, parseResult) {
+	if (isDerivedValueParser(valueParser)) return createDeferredParseState(rawInput, valueParser, parseResult);
+	if (isDependencySource(valueParser)) return createDependencySourceState(parseResult, valueParser[DependencyId]);
+	return parseResult;
+}
+/**
 * Creates a parser that always succeeds without consuming any input and
 * produces a constant value of the type {@link T}.
 * @template T The type of the constant value produced by the parser.
@@ -237,12 +251,13 @@ function option(...args) {
 					consumed: 1,
 					error: message`Option ${optionName(context.buffer[0])} requires a value, but got no value.`
 				};
-				const parseResultOrPromise = valueParser.parse(context.buffer[1]);
+				const rawInput = context.buffer[1];
+				const parseResultOrPromise = valueParser.parse(rawInput);
 				if (isAsync) return parseResultOrPromise.then((parseResult) => ({
 					success: true,
 					next: {
 						...context,
-						state: parseResult,
+						state: createOptionParseState(rawInput, valueParser, parseResult),
 						buffer: context.buffer.slice(2)
 					},
 					consumed: context.buffer.slice(0, 2)
@@ -251,7 +266,7 @@ function option(...args) {
 					success: true,
 					next: {
 						...context,
-						state: parseResultOrPromise,
+						state: createOptionParseState(rawInput, valueParser, parseResultOrPromise),
 						buffer: context.buffer.slice(2)
 					},
 					consumed: context.buffer.slice(0, 2)
@@ -265,18 +280,18 @@ function option(...args) {
 					consumed: 1,
 					error: options.errors?.duplicate ? typeof options.errors.duplicate === "function" ? options.errors.duplicate(prefix) : options.errors.duplicate : message`${optionName(prefix)} cannot be used multiple times.`
 				};
-				const value = context.buffer[0].slice(prefix.length);
+				const rawInput = context.buffer[0].slice(prefix.length);
 				if (valueParser == null) return {
 					success: false,
 					consumed: 1,
-					error: options.errors?.unexpectedValue ? typeof options.errors.unexpectedValue === "function" ? options.errors.unexpectedValue(value) : options.errors.unexpectedValue : message`Option ${optionName(prefix)} is a Boolean flag, but got a value: ${value}.`
+					error: options.errors?.unexpectedValue ? typeof options.errors.unexpectedValue === "function" ? options.errors.unexpectedValue(rawInput) : options.errors.unexpectedValue : message`Option ${optionName(prefix)} is a Boolean flag, but got a value: ${rawInput}.`
 				};
-				const parseResultOrPromise = valueParser.parse(value);
+				const parseResultOrPromise = valueParser.parse(rawInput);
 				if (isAsync) return parseResultOrPromise.then((parseResult) => ({
 					success: true,
 					next: {
 						...context,
-						state: parseResult,
+						state: createOptionParseState(rawInput, valueParser, parseResult),
 						buffer: context.buffer.slice(1)
 					},
 					consumed: context.buffer.slice(0, 1)
@@ -285,7 +300,7 @@ function option(...args) {
 					success: true,
 					next: {
 						...context,
-						state: parseResultOrPromise,
+						state: createOptionParseState(rawInput, valueParser, parseResultOrPromise),
 						buffer: context.buffer.slice(1)
 					},
 					consumed: context.buffer.slice(0, 1)
@@ -341,6 +356,22 @@ function option(...args) {
 				success: false,
 				error: options.errors?.missing ? typeof options.errors.missing === "function" ? options.errors.missing(optionNames$1) : options.errors.missing : message`Missing option ${optionNames(optionNames$1)}.`
 			};
+			if (isDeferredParseState(state)) {
+				const preliminaryResult = state.preliminaryResult;
+				if (preliminaryResult.success) return preliminaryResult;
+				return {
+					success: false,
+					error: options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(preliminaryResult.error) : options.errors.invalidValue : message`${optionNames(optionNames$1)}: ${preliminaryResult.error}`
+				};
+			}
+			if (isDependencySourceState(state)) {
+				const result$1 = state.result;
+				if (result$1.success) return result$1;
+				return {
+					success: false,
+					error: options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(result$1.error) : options.errors.invalidValue : message`${optionNames(optionNames$1)}: ${result$1.error}`
+				};
+			}
 			if (state.success) return state;
 			return {
 				success: false,
@@ -623,13 +654,14 @@ function argument(valueParser, options = {}) {
 				consumed: i,
 				error: options.errors?.multiple ? typeof options.errors.multiple === "function" ? options.errors.multiple(valueParser.metavar) : options.errors.multiple : message`The argument ${metavar(valueParser.metavar)} cannot be used multiple times.`
 			};
-			const parseResultOrPromise = valueParser.parse(context.buffer[i]);
+			const rawInput = context.buffer[i];
+			const parseResultOrPromise = valueParser.parse(rawInput);
 			if (isAsync) return parseResultOrPromise.then((parseResult) => ({
 				success: true,
 				next: {
 					...context,
 					buffer: context.buffer.slice(i + 1),
-					state: parseResult,
+					state: createOptionParseState(rawInput, valueParser, parseResult),
 					optionsTerminated
 				},
 				consumed: context.buffer.slice(0, i + 1)
@@ -639,7 +671,7 @@ function argument(valueParser, options = {}) {
 				next: {
 					...context,
 					buffer: context.buffer.slice(i + 1),
-					state: parseResultOrPromise,
+					state: createOptionParseState(rawInput, valueParser, parseResultOrPromise),
 					optionsTerminated
 				},
 				consumed: context.buffer.slice(0, i + 1)
@@ -650,7 +682,23 @@ function argument(valueParser, options = {}) {
 				success: false,
 				error: options.errors?.endOfInput ?? message`Expected a ${metavar(valueParser.metavar)}, but too few arguments.`
 			};
-			else if (state.success) return state;
+			if (isDeferredParseState(state)) {
+				const preliminaryResult = state.preliminaryResult;
+				if (preliminaryResult.success) return preliminaryResult;
+				return {
+					success: false,
+					error: options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(preliminaryResult.error) : options.errors.invalidValue : message`${metavar(valueParser.metavar)}: ${preliminaryResult.error}`
+				};
+			}
+			if (isDependencySourceState(state)) {
+				const result$1 = state.result;
+				if (result$1.success) return result$1;
+				return {
+					success: false,
+					error: options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(result$1.error) : options.errors.invalidValue : message`${metavar(valueParser.metavar)}: ${result$1.error}`
+				};
+			}
+			if (state.success) return state;
 			return {
 				success: false,
 				error: options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(state.error) : options.errors.invalidValue : message`${metavar(valueParser.metavar)}: ${state.error}`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "0.10.0-dev.290+351f37d4",
+  "version": "0.10.0-dev.292+0ee567be",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -67,6 +67,14 @@
       "import": "./dist/constructs.js",
       "require": "./dist/constructs.cjs"
     },
+    "./dependency": {
+      "types": {
+        "import": "./dist/dependency.d.ts",
+        "require": "./dist/dependency.d.cts"
+      },
+      "import": "./dist/dependency.js",
+      "require": "./dist/dependency.cjs"
+    },
     "./doc": {
       "types": {
         "import": "./dist/doc.d.ts",