@optique/core 1.3.0-dev.2379 → 1.3.0-dev.2381

package/dist/modifiers.cjs

@@ -1,6 +1,7 @@
 const require_internal_annotations = require('./internal/annotations.cjs');
 const require_message = require('./message.cjs');
 const require_mode_dispatch = require('./internal/mode-dispatch.cjs');
+const require_dependency_runtime = require('./dependency-runtime.cjs');
 const require_internal_parser = require('./internal/parser.cjs');
 const require_annotation_state = require('./annotation-state.cjs');
 const require_execution_context = require('./execution-context.cjs');
@@ -456,8 +457,24 @@ function optional(parser) {
 	}
 	if (parser.dependencyMetadata != null) {
 		const composed = require_dependency_metadata.composeDependencyMetadata(parser.dependencyMetadata, "optional");
-		if (composed != null) optionalParser.dependencyMetadata = composed;
+		if (composed != null) {
+			const rebound = composed.source?.completeSource == null ? composed : composed.source.preservesSourceValue === false ? {
+				...composed,
+				source: {
+					...composed.source,
+					completeSource: void 0
+				}
+			} : {
+				...composed,
+				source: {
+					...composed.source,
+					completeSource: (state, exec) => Promise.resolve(optionalParser.complete(state, exec))
+				}
+			};
+			optionalParser.dependencyMetadata = rebound;
+		}
 	}
+	require_dependency_runtime.defineForwardedEffectfulSchedulingNodes(optionalParser, parser, (state) => Array.isArray(state) && state.length === 1 ? state[0] : state);
 	require_internal_parser.defineParseLanes(optionalParser, adaptOptionalStyleParseLanes(parser));
 	require_internal_parser.defineInheritedAnnotationParser(optionalParser);
 	require_internal_parser.defineSourceBindingOnlyAnnotationCompletionParser(optionalParser);
@@ -691,8 +708,24 @@ function withDefault(parser, defaultValue, options) {
 				value: v
 			};
 		} });
-		if (composed != null) withDefaultParser.dependencyMetadata = composed;
+		if (composed != null) {
+			const rebound = composed.source?.completeSource == null ? composed : composed.source.preservesSourceValue === false ? {
+				...composed,
+				source: {
+					...composed.source,
+					completeSource: void 0
+				}
+			} : {
+				...composed,
+				source: {
+					...composed.source,
+					completeSource: (state, exec) => Promise.resolve(withDefaultParser.complete(state, exec))
+				}
+			};
+			withDefaultParser.dependencyMetadata = rebound;
+		}
 	}
+	require_dependency_runtime.defineForwardedEffectfulSchedulingNodes(withDefaultParser, parser, (state) => Array.isArray(state) && state.length === 1 ? state[0] : state);
 	require_internal_parser.defineParseLanes(withDefaultParser, adaptOptionalStyleParseLanes(parser));
 	require_internal_parser.defineInheritedAnnotationParser(withDefaultParser);
 	require_internal_parser.defineSourceBindingOnlyAnnotationCompletionParser(withDefaultParser);
@@ -884,6 +917,7 @@ function map(parser, transform) {
 		}
 		if (composed != null) mappedParser.dependencyMetadata = composed;
 	}
+	require_dependency_runtime.defineForwardedEffectfulSchedulingNodes(mappedParser, parser);
 	return fluent(mappedParser);
 }
 const deferredValueBrand = Symbol.for("@optique/core/deferredValue");
@@ -1660,6 +1694,7 @@ function multiple(parser, options = {}) {
 				source: {
 					...innerSource,
 					preservesSourceValue: false,
+					completeSource: void 0,
 					extractSourceValue: (state) => {
 						if (!Array.isArray(state)) return innerSource.extractSourceValue(state);
 						const scan = (index) => {
@@ -1785,6 +1820,11 @@ function nonEmpty(parser) {
 			return lane.parse(context);
 		}
 	})));
+	if (parser.dependencyMetadata != null) Object.defineProperty(nonEmptyParser, "dependencyMetadata", {
+		value: parser.dependencyMetadata,
+		configurable: true,
+		enumerable: false
+	});
 	if ("placeholder" in parser) Object.defineProperty(nonEmptyParser, "placeholder", {
 		get() {
 			return parser.placeholder;
@@ -1809,6 +1849,7 @@ function nonEmpty(parser) {
 		configurable: true,
 		enumerable: false
 	});
+	require_dependency_runtime.defineForwardedEffectfulSchedulingNodes(nonEmptyParser, parser);
 	return fluent(nonEmptyParser);
 }
 const fluentParserMarker = Symbol.for("@optique/core/fluent");

package/dist/modifiers.js

@@ -1,6 +1,7 @@
 import { annotateFreshArray, annotationKey, getAnnotations, inheritAnnotations, isInjectedAnnotationWrapper, unwrapInjectedAnnotationWrapper } from "./internal/annotations.js";
 import { formatMessage, message, text } from "./message.js";
 import { dispatchByMode, dispatchIterableByMode, mapModeValue, wrapForMode } from "./internal/mode-dispatch.js";
+import { defineForwardedEffectfulSchedulingNodes } from "./dependency-runtime.js";
 import { defineInheritedAnnotationParser, defineParseLanes, defineSourceBindingOnlyAnnotationCompletionParser, getOwnParseLanes, unmatchedNonCliDependencySourceStateMarker } from "./internal/parser.js";
 import { getDelegatedAnnotationState, hasDelegatedAnnotationCarrier, isAnnotationWrappedInitialState, normalizeDelegatedAnnotationState, normalizeNestedDelegatedAnnotationState } from "./annotation-state.js";
 import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
@@ -456,8 +457,24 @@ function optional(parser) {
 	}
 	if (parser.dependencyMetadata != null) {
 		const composed = composeDependencyMetadata(parser.dependencyMetadata, "optional");
-		if (composed != null) optionalParser.dependencyMetadata = composed;
+		if (composed != null) {
+			const rebound = composed.source?.completeSource == null ? composed : composed.source.preservesSourceValue === false ? {
+				...composed,
+				source: {
+					...composed.source,
+					completeSource: void 0
+				}
+			} : {
+				...composed,
+				source: {
+					...composed.source,
+					completeSource: (state, exec) => Promise.resolve(optionalParser.complete(state, exec))
+				}
+			};
+			optionalParser.dependencyMetadata = rebound;
+		}
 	}
+	defineForwardedEffectfulSchedulingNodes(optionalParser, parser, (state) => Array.isArray(state) && state.length === 1 ? state[0] : state);
 	defineParseLanes(optionalParser, adaptOptionalStyleParseLanes(parser));
 	defineInheritedAnnotationParser(optionalParser);
 	defineSourceBindingOnlyAnnotationCompletionParser(optionalParser);
@@ -691,8 +708,24 @@ function withDefault(parser, defaultValue, options) {
 				value: v
 			};
 		} });
-		if (composed != null) withDefaultParser.dependencyMetadata = composed;
+		if (composed != null) {
+			const rebound = composed.source?.completeSource == null ? composed : composed.source.preservesSourceValue === false ? {
+				...composed,
+				source: {
+					...composed.source,
+					completeSource: void 0
+				}
+			} : {
+				...composed,
+				source: {
+					...composed.source,
+					completeSource: (state, exec) => Promise.resolve(withDefaultParser.complete(state, exec))
+				}
+			};
+			withDefaultParser.dependencyMetadata = rebound;
+		}
 	}
+	defineForwardedEffectfulSchedulingNodes(withDefaultParser, parser, (state) => Array.isArray(state) && state.length === 1 ? state[0] : state);
 	defineParseLanes(withDefaultParser, adaptOptionalStyleParseLanes(parser));
 	defineInheritedAnnotationParser(withDefaultParser);
 	defineSourceBindingOnlyAnnotationCompletionParser(withDefaultParser);
@@ -884,6 +917,7 @@ function map(parser, transform) {
 		}
 		if (composed != null) mappedParser.dependencyMetadata = composed;
 	}
+	defineForwardedEffectfulSchedulingNodes(mappedParser, parser);
 	return fluent(mappedParser);
 }
 const deferredValueBrand = Symbol.for("@optique/core/deferredValue");
@@ -1660,6 +1694,7 @@ function multiple(parser, options = {}) {
 				source: {
 					...innerSource,
 					preservesSourceValue: false,
+					completeSource: void 0,
 					extractSourceValue: (state) => {
 						if (!Array.isArray(state)) return innerSource.extractSourceValue(state);
 						const scan = (index) => {
@@ -1785,6 +1820,11 @@ function nonEmpty(parser) {
 			return lane.parse(context);
 		}
 	})));
+	if (parser.dependencyMetadata != null) Object.defineProperty(nonEmptyParser, "dependencyMetadata", {
+		value: parser.dependencyMetadata,
+		configurable: true,
+		enumerable: false
+	});
 	if ("placeholder" in parser) Object.defineProperty(nonEmptyParser, "placeholder", {
 		get() {
 			return parser.placeholder;
@@ -1809,6 +1849,7 @@ function nonEmpty(parser) {
 		configurable: true,
 		enumerable: false
 	});
+	defineForwardedEffectfulSchedulingNodes(nonEmptyParser, parser);
 	return fluent(nonEmptyParser);
 }
 const fluentParserMarker = Symbol.for("@optique/core/fluent");

package/dist/parser.d.cts

@@ -1,3 +1,3 @@
 import { ParseOptions } from "./internal/annotations.cjs";
-import { CombineModes, DocState, ExecutionContext, ExecutionPhase, InferMode, InferValue, Mode, ModeIterable, ModeValue, ParseFrame, Parser, ParserContext, ParserResult, Result, Suggestion, createParserContext, getDocPage, getDocPageAsync, getDocPageSync, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync } from "./internal/parser.cjs";
-export { type CombineModes, type DocState, type ExecutionContext, type ExecutionPhase, type InferMode, type InferValue, type Mode, type ModeIterable, type ModeValue, type ParseFrame, type ParseOptions, type Parser, type ParserContext, type ParserResult, type Result, type Suggestion, createParserContext, getDocPage, getDocPageAsync, getDocPageSync, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync };
+import { CombineModes, DocState, EffectfulCompletionSession, ExecutionContext, ExecutionPhase, InferMode, InferValue, Mode, ModeIterable, ModeValue, ParseFrame, Parser, ParserContext, ParserResult, Result, Suggestion, createParserContext, getDocPage, getDocPageAsync, getDocPageSync, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync } from "./internal/parser.cjs";
+export { type CombineModes, type DocState, type EffectfulCompletionSession, type ExecutionContext, type ExecutionPhase, type InferMode, type InferValue, type Mode, type ModeIterable, type ModeValue, type ParseFrame, type ParseOptions, type Parser, type ParserContext, type ParserResult, type Result, type Suggestion, createParserContext, getDocPage, getDocPageAsync, getDocPageSync, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync };

package/dist/parser.d.ts

@@ -1,3 +1,3 @@
 import { ParseOptions } from "./internal/annotations.js";
-import { CombineModes, DocState, ExecutionContext, ExecutionPhase, InferMode, InferValue, Mode, ModeIterable, ModeValue, ParseFrame, Parser, ParserContext, ParserResult, Result, Suggestion, createParserContext, getDocPage, getDocPageAsync, getDocPageSync, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync } from "./internal/parser.js";
-export { type CombineModes, type DocState, type ExecutionContext, type ExecutionPhase, type InferMode, type InferValue, type Mode, type ModeIterable, type ModeValue, type ParseFrame, type ParseOptions, type Parser, type ParserContext, type ParserResult, type Result, type Suggestion, createParserContext, getDocPage, getDocPageAsync, getDocPageSync, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync };
+import { CombineModes, DocState, EffectfulCompletionSession, ExecutionContext, ExecutionPhase, InferMode, InferValue, Mode, ModeIterable, ModeValue, ParseFrame, Parser, ParserContext, ParserResult, Result, Suggestion, createParserContext, getDocPage, getDocPageAsync, getDocPageSync, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync } from "./internal/parser.js";
+export { type CombineModes, type DocState, type EffectfulCompletionSession, type ExecutionContext, type ExecutionPhase, type InferMode, type InferValue, type Mode, type ModeIterable, type ModeValue, type ParseFrame, type ParseOptions, type Parser, type ParserContext, type ParserResult, type Result, type Suggestion, createParserContext, getDocPage, getDocPageAsync, getDocPageSync, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync };

package/dist/primitives.cjs

@@ -1706,6 +1706,20 @@ function command(name, parser, options = {}) {
 		configurable: true,
 		enumerable: false
 	});
+	Object.defineProperty(result, require_dependency_runtime.effectfulSchedulingNodesKey, {
+		value: ((state, parentPath) => {
+			const normalizedState = normalizeCommandState(state);
+			if (normalizedState == null) return [];
+			const innerState = normalizedState[0] === "parsing" ? normalizedState[1] : parser.initialState;
+			return [{
+				path: [...parentPath ?? [], name],
+				parser,
+				state: getCommandChildState(state, innerState, parser)
+			}];
+		}),
+		configurable: true,
+		enumerable: false
+	});
 	return require_modifiers.fluent(result);
 }
 /**

package/dist/primitives.js

@@ -4,7 +4,7 @@ import { validateCommandNames, validateOptionNames } from "./validate.js";
 import { extractOptionNames, isDocHidden, isSuggestionHidden } from "./usage.js";
 import { dispatchByMode, dispatchIterableByMode, wrapForMode } from "./internal/mode-dispatch.js";
 import { getDefaultValuesFunction, getDependencyIds, getSnapshottedDefaultDependencyValues, isDerivedValueParser, suggestWithDependency } from "./internal/dependency.js";
-import { replayDerivedParser, replayDerivedParserAsync } from "./dependency-runtime.js";
+import { effectfulSchedulingNodesKey, replayDerivedParser, replayDerivedParserAsync } from "./dependency-runtime.js";
 import { getWrappedChildParseState, getWrappedChildState, isAnnotationWrappedInitialState, normalizeInjectedAnnotationState } from "./annotation-state.js";
 import { hiddenCommandAliasesKey } from "./internal/command-alias.js";
 import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
@@ -1706,6 +1706,20 @@ function command(name, parser, options = {}) {
 		configurable: true,
 		enumerable: false
 	});
+	Object.defineProperty(result, effectfulSchedulingNodesKey, {
+		value: ((state, parentPath) => {
+			const normalizedState = normalizeCommandState(state);
+			if (normalizedState == null) return [];
+			const innerState = normalizedState[0] === "parsing" ? normalizedState[1] : parser.initialState;
+			return [{
+				path: [...parentPath ?? [], name],
+				parser,
+				state: getCommandChildState(state, innerState, parser)
+			}];
+		}),
+		configurable: true,
+		enumerable: false
+	});
 	return fluent(result);
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.3.0-dev.2379",
+  "version": "1.3.0-dev.2381",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -221,7 +221,7 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@optique/env": "1.3.0-dev.2379+3e20cbf3",
+    "@optique/env": "1.3.0-dev.2381+b37c0393",
     "@types/node": "^24.0.0",
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",