@optique/core 1.2.2 → 1.2.4

package/dist/internal/parser.js

@@ -8,6 +8,12 @@ import { createInputTrace } from "../input-trace.js";
 
 //#region src/internal/parser.ts
 /**
+* Internal symbol used by transparent combinators to expose independently
+* competing parse operations to shared-buffer parents.
+* @internal
+*/
+const parseLanesKey = Symbol("parseLanes");
+/**
 * Internal marker for wrappers whose `{ hasCliValue: false }` states should
 * be treated as unmatched dependency-source states during completion-time
 * Phase 1.
@@ -387,6 +393,32 @@ function composeWrappedSourceMetadata(dependencyMetadata, wrapSource) {
 	};
 }
 /**
+* Defines internal parse-lane metadata without exposing it through object
+* spreads used by custom parser wrappers.
+*
+* @internal
+*/
+function defineParseLanes(parser, lanes) {
+	if (lanes == null) return;
+	Object.defineProperty(parser, parseLanesKey, {
+		value: lanes,
+		configurable: true,
+		enumerable: false
+	});
+}
+/**
+* Gets parse-lane metadata defined directly on a parser.
+*
+* Inherited metadata belongs to the parser's prototype and must not bypass an
+* overriding `parse()` implementation on a custom wrapper.
+*
+* @internal
+*/
+function getOwnParseLanes(parser) {
+	if (!Object.hasOwn(parser, parseLanesKey)) return void 0;
+	return parser[parseLanesKey];
+}
+/**
 * Marks a parser as inheriting parent-state annotations through wrapper-state
 * reconstruction.
 *
@@ -850,4 +882,4 @@ function findNextMatchedCommandArgIndex(args, matchedCommandArgIndices, start) {
 }
 
 //#endregion
-export { annotationWrapperRequiresSourceBindingKey, composeWrappedSourceMetadata, createParserContext, defineInheritedAnnotationParser, defineSourceBindingOnlyAnnotationCompletionParser, getDelegatingSuggestRuntimeNodes, getDocPage, getDocPageAsync, getDocPageSync, getParserSuggestRuntimeNodes, inheritParentAnnotationsKey, parse, parseAsync, parseSync, suggest, suggestAsync, suggestSync, unmatchedNonCliDependencySourceStateMarker };
+export { annotationWrapperRequiresSourceBindingKey, composeWrappedSourceMetadata, createParserContext, defineInheritedAnnotationParser, defineParseLanes, defineSourceBindingOnlyAnnotationCompletionParser, getDelegatingSuggestRuntimeNodes, getDocPage, getDocPageAsync, getDocPageSync, getOwnParseLanes, getParserSuggestRuntimeNodes, inheritParentAnnotationsKey, parse, parseAsync, parseLanesKey, parseSync, suggest, suggestAsync, suggestSync, unmatchedNonCliDependencySourceStateMarker };

package/dist/modifiers.cjs

@@ -231,6 +231,44 @@ function processOptionalStyleResult(result, innerState, context) {
 	};
 	return result;
 }
+function adaptOptionalStyleParseLanes(parser) {
+	const lanes = require_internal_parser.getOwnParseLanes(parser);
+	if (lanes == null) return void 0;
+	const consumptionGroup = {};
+	return lanes.map((lane) => ({
+		priority: lane.priority,
+		zeroConsumptionGroup: lane.zeroConsumptionGroup,
+		settlesZeroConsumption: lane.settlesZeroConsumption,
+		leadingNames: lane.leadingNames,
+		acceptingAnyToken: false,
+		requiredConsumptionGroups: [...lane.requiredConsumptionGroups?.map((group) => ({
+			id: group.id,
+			...group.isActive == null ? {} : { isActive(state) {
+				const innerState = Array.isArray(state) ? state[0] : parser.initialState;
+				return group.isActive?.(innerState) ?? true;
+			} }
+		})) ?? [], {
+			id: consumptionGroup,
+			isActive(state) {
+				return Array.isArray(state);
+			}
+		}],
+		parse(context) {
+			const innerState = deriveOptionalInnerParseState(context.state, parser);
+			const innerContext = {
+				...context,
+				state: innerState
+			};
+			return require_mode_dispatch.dispatchByMode(parser.mode, () => {
+				const result = lane.parse(innerContext);
+				return processOptionalStyleResult(result, innerState, context);
+			}, async () => {
+				const result = await lane.parse(innerContext);
+				return processOptionalStyleResult(result, innerState, context);
+			});
+		}
+	}));
+}
 /**
 * Creates a `shouldDeferCompletion` adapter that unwraps the outer state
 * shape (`[TState] | undefined`) used by {@link optional} and
@@ -420,6 +458,7 @@ function optional(parser) {
 		const composed = require_dependency_metadata.composeDependencyMetadata(parser.dependencyMetadata, "optional");
 		if (composed != null) optionalParser.dependencyMetadata = composed;
 	}
+	require_internal_parser.defineParseLanes(optionalParser, adaptOptionalStyleParseLanes(parser));
 	require_internal_parser.defineInheritedAnnotationParser(optionalParser);
 	require_internal_parser.defineSourceBindingOnlyAnnotationCompletionParser(optionalParser);
 	return fluent(optionalParser);
@@ -654,6 +693,7 @@ function withDefault(parser, defaultValue, options) {
 		} });
 		if (composed != null) withDefaultParser.dependencyMetadata = composed;
 	}
+	require_internal_parser.defineParseLanes(withDefaultParser, adaptOptionalStyleParseLanes(parser));
 	require_internal_parser.defineInheritedAnnotationParser(withDefaultParser);
 	require_internal_parser.defineSourceBindingOnlyAnnotationCompletionParser(withDefaultParser);
 	return fluent(withDefaultParser);
@@ -793,6 +833,7 @@ function map(parser, transform) {
 			return parser.getDocFragments(state, void 0);
 		}
 	};
+	require_internal_parser.defineParseLanes(mappedParser, require_internal_parser.getOwnParseLanes(parser));
 	delete mappedParser.normalizeValue;
 	delete mappedParser.validateValue;
 	if ("placeholder" in parser) Object.defineProperty(mappedParser, "placeholder", {
@@ -1680,6 +1721,7 @@ function multiple(parser, options = {}) {
 function nonEmpty(parser) {
 	const syncParser = parser;
 	const initialState = parser.initialState;
+	const consumptionGroup = {};
 	const processNonEmptyResult = (result) => {
 		if (!result.success) return result;
 		if (result.consumed.length === 0) return {
@@ -1732,6 +1774,17 @@ function nonEmpty(parser) {
 			return syncParser.getDocFragments(state, defaultValue);
 		}
 	};
+	require_internal_parser.defineParseLanes(nonEmptyParser, require_internal_parser.getOwnParseLanes(parser)?.map((lane) => ({
+		priority: lane.priority,
+		zeroConsumptionGroup: lane.zeroConsumptionGroup,
+		settlesZeroConsumption: lane.settlesZeroConsumption,
+		leadingNames: lane.leadingNames,
+		acceptingAnyToken: lane.acceptingAnyToken,
+		requiredConsumptionGroups: [...lane.requiredConsumptionGroups ?? [], { id: consumptionGroup }],
+		parse(context) {
+			return lane.parse(context);
+		}
+	})));
 	if ("placeholder" in parser) Object.defineProperty(nonEmptyParser, "placeholder", {
 		get() {
 			return parser.placeholder;

package/dist/modifiers.js

@@ -1,7 +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 { defineInheritedAnnotationParser, defineSourceBindingOnlyAnnotationCompletionParser, unmatchedNonCliDependencySourceStateMarker } from "./internal/parser.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";
 import { completeOrExtractPhase2Seed, extractPhase2Seed, extractPhase2SeedKey, phase2SeedFromValueResult } from "./phase2-seed.js";
@@ -231,6 +231,44 @@ function processOptionalStyleResult(result, innerState, context) {
 	};
 	return result;
 }
+function adaptOptionalStyleParseLanes(parser) {
+	const lanes = getOwnParseLanes(parser);
+	if (lanes == null) return void 0;
+	const consumptionGroup = {};
+	return lanes.map((lane) => ({
+		priority: lane.priority,
+		zeroConsumptionGroup: lane.zeroConsumptionGroup,
+		settlesZeroConsumption: lane.settlesZeroConsumption,
+		leadingNames: lane.leadingNames,
+		acceptingAnyToken: false,
+		requiredConsumptionGroups: [...lane.requiredConsumptionGroups?.map((group) => ({
+			id: group.id,
+			...group.isActive == null ? {} : { isActive(state) {
+				const innerState = Array.isArray(state) ? state[0] : parser.initialState;
+				return group.isActive?.(innerState) ?? true;
+			} }
+		})) ?? [], {
+			id: consumptionGroup,
+			isActive(state) {
+				return Array.isArray(state);
+			}
+		}],
+		parse(context) {
+			const innerState = deriveOptionalInnerParseState(context.state, parser);
+			const innerContext = {
+				...context,
+				state: innerState
+			};
+			return dispatchByMode(parser.mode, () => {
+				const result = lane.parse(innerContext);
+				return processOptionalStyleResult(result, innerState, context);
+			}, async () => {
+				const result = await lane.parse(innerContext);
+				return processOptionalStyleResult(result, innerState, context);
+			});
+		}
+	}));
+}
 /**
 * Creates a `shouldDeferCompletion` adapter that unwraps the outer state
 * shape (`[TState] | undefined`) used by {@link optional} and
@@ -420,6 +458,7 @@ function optional(parser) {
 		const composed = composeDependencyMetadata(parser.dependencyMetadata, "optional");
 		if (composed != null) optionalParser.dependencyMetadata = composed;
 	}
+	defineParseLanes(optionalParser, adaptOptionalStyleParseLanes(parser));
 	defineInheritedAnnotationParser(optionalParser);
 	defineSourceBindingOnlyAnnotationCompletionParser(optionalParser);
 	return fluent(optionalParser);
@@ -654,6 +693,7 @@ function withDefault(parser, defaultValue, options) {
 		} });
 		if (composed != null) withDefaultParser.dependencyMetadata = composed;
 	}
+	defineParseLanes(withDefaultParser, adaptOptionalStyleParseLanes(parser));
 	defineInheritedAnnotationParser(withDefaultParser);
 	defineSourceBindingOnlyAnnotationCompletionParser(withDefaultParser);
 	return fluent(withDefaultParser);
@@ -793,6 +833,7 @@ function map(parser, transform) {
 			return parser.getDocFragments(state, void 0);
 		}
 	};
+	defineParseLanes(mappedParser, getOwnParseLanes(parser));
 	delete mappedParser.normalizeValue;
 	delete mappedParser.validateValue;
 	if ("placeholder" in parser) Object.defineProperty(mappedParser, "placeholder", {
@@ -1680,6 +1721,7 @@ function multiple(parser, options = {}) {
 function nonEmpty(parser) {
 	const syncParser = parser;
 	const initialState = parser.initialState;
+	const consumptionGroup = {};
 	const processNonEmptyResult = (result) => {
 		if (!result.success) return result;
 		if (result.consumed.length === 0) return {
@@ -1732,6 +1774,17 @@ function nonEmpty(parser) {
 			return syncParser.getDocFragments(state, defaultValue);
 		}
 	};
+	defineParseLanes(nonEmptyParser, getOwnParseLanes(parser)?.map((lane) => ({
+		priority: lane.priority,
+		zeroConsumptionGroup: lane.zeroConsumptionGroup,
+		settlesZeroConsumption: lane.settlesZeroConsumption,
+		leadingNames: lane.leadingNames,
+		acceptingAnyToken: lane.acceptingAnyToken,
+		requiredConsumptionGroups: [...lane.requiredConsumptionGroups ?? [], { id: consumptionGroup }],
+		parse(context) {
+			return lane.parse(context);
+		}
+	})));
 	if ("placeholder" in parser) Object.defineProperty(nonEmptyParser, "placeholder", {
 		get() {
 			return parser.placeholder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -225,7 +225,7 @@
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",
     "typescript": "^5.8.3",
-    "@optique/env": "1.2.2"
+    "@optique/env": "1.2.4"
   },
   "scripts": {
     "build": "tsdown",