@optique/core 1.1.8 → 1.1.9

package/dist/primitives.cjs

@@ -6,6 +6,7 @@ const require_mode_dispatch = require('./internal/mode-dispatch.cjs');
 const require_internal_dependency = require('./internal/dependency.cjs');
 const require_dependency_runtime = require('./dependency-runtime.cjs');
 const require_annotation_state = require('./annotation-state.cjs');
+const require_passthrough = require('./internal/passthrough.cjs');
 const require_command_alias = require('./internal/command-alias.cjs');
 const require_execution_context = require('./execution-context.cjs');
 const require_phase2_seed = require('./phase2-seed.cjs');
@@ -144,6 +145,7 @@ function constant(value) {
 			return { fragments: [] };
 		}
 	};
+	require_passthrough.defineKnownCompletion(result, (state) => require_annotation_state.normalizeInjectedAnnotationState(state));
 	Object.defineProperty(result, "placeholder", {
 		value,
 		configurable: true,
@@ -583,10 +585,15 @@ function option(...args) {
 			}
 			const invalidOption = context.buffer[0];
 			if (options.errors?.noMatch) {
+				if (typeof options.errors.noMatch !== "function") return {
+					success: false,
+					consumed: 0,
+					error: options.errors.noMatch
+				};
 				const candidates = /* @__PURE__ */ new Set();
 				for (const name of require_usage.extractOptionNames(context.usage)) candidates.add(name);
 				const suggestions = require_suggestion.findSimilar(invalidOption, candidates, require_suggestion.DEFAULT_FIND_SIMILAR_OPTIONS);
-				const errorMessage = typeof options.errors.noMatch === "function" ? options.errors.noMatch(invalidOption, suggestions) : options.errors.noMatch;
+				const errorMessage = options.errors.noMatch(invalidOption, suggestions);
 				return {
 					success: false,
 					consumed: 0,
@@ -871,10 +878,15 @@ function flag(...args) {
 			}
 			const invalidOption = context.buffer[0];
 			if (options.errors?.noMatch) {
+				if (typeof options.errors.noMatch !== "function") return {
+					success: false,
+					consumed: 0,
+					error: options.errors.noMatch
+				};
 				const candidates = /* @__PURE__ */ new Set();
 				for (const name of require_usage.extractOptionNames(context.usage)) candidates.add(name);
 				const suggestions = require_suggestion.findSimilar(invalidOption, candidates, require_suggestion.DEFAULT_FIND_SIMILAR_OPTIONS);
-				const errorMessage = typeof options.errors.noMatch === "function" ? options.errors.noMatch(invalidOption, suggestions) : options.errors.noMatch;
+				const errorMessage = options.errors.noMatch(invalidOption, suggestions);
 				return {
 					success: false,
 					consumed: 0,
@@ -1183,7 +1195,7 @@ function argument(valueParser, options = {}) {
 	const syncValueParser = valueParser;
 	const dependencyMetadata = require_dependency_metadata.extractDependencyMetadata(valueParser);
 	const formatInvalidValueError = (error) => options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(error) : options.errors.invalidValue : require_message.message`${require_message.metavar(valueParser.metavar)}: ${error}`;
-	const optionPattern = /^--?[a-z0-9-]+$/i;
+	const optionPattern = /^(?!--=)(--?[a-z0-9-]+)(?:=|$)/i;
 	const term = {
 		type: "argument",
 		metavar: valueParser.metavar,
@@ -1210,14 +1222,15 @@ function argument(valueParser, options = {}) {
 			};
 			let i = 0;
 			let optionsTerminated = context.optionsTerminated;
-			if (!optionsTerminated) {
-				if (context.buffer[i] === "--") {
-					optionsTerminated = true;
-					i++;
-				} else if (context.buffer[i].match(optionPattern)) return {
+			if (!optionsTerminated) if (context.buffer[i] === "--") {
+				optionsTerminated = true;
+				i++;
+			} else {
+				const optionMatch = context.buffer[i].match(optionPattern);
+				if (optionMatch != null) return {
 					success: false,
 					consumed: i,
-					error: require_message.message`Expected an argument, but got an option: ${require_message.optionName(context.buffer[i])}.`
+					error: require_message.message`Expected an argument, but got an option: ${require_message.optionName(optionMatch[1])}.`
 				};
 			}
 			if (context.buffer.length < i + 1) return {
@@ -1703,6 +1716,22 @@ function command(name, parser, options = {}) {
 		configurable: true,
 		enumerable: false
 	});
+	require_passthrough.definePassThroughPriority(result, [parser], (state, token) => {
+		const active = normalizeCommandState(state);
+		if (active == null) return void 0;
+		const childState = active[0] === "matched" ? parser.initialState : active[1];
+		return require_passthrough.getPassThroughPriority(parser, getCommandParseChildState(state, childState, parser), token);
+	});
+	require_passthrough.defineOptionMatch(result, (state, token) => {
+		const active = normalizeCommandState(state);
+		if (active == null) return void 0;
+		const childState = active[0] === "matched" ? parser.initialState : active[1];
+		const match = require_passthrough.getOptionMatch(parser, getCommandParseChildState(state, childState, parser), token);
+		return match == null ? void 0 : {
+			...match,
+			continuesCommand: true
+		};
+	});
 	return result;
 }
 /**
@@ -1755,7 +1784,7 @@ function passThrough(options = {}) {
 	const format = options.format ?? "equalsOnly";
 	const optionPattern = /^-[a-z0-9-]|^--[a-z0-9-]+/i;
 	const equalsOptionPattern = /^--[a-z0-9-]+=/i;
-	return {
+	const result = {
 		$valueType: [],
 		$stateType: [],
 		mode: "sync",
@@ -1776,6 +1805,8 @@ function passThrough(options = {}) {
 				consumed: 0,
 				error: require_message.message`No input to pass through.`
 			};
+			const failure = require_passthrough.getPassThroughFailure(context, this?.priority ?? -10);
+			if (failure != null) return failure.failure;
 			const token = context.buffer[0];
 			if (format === "greedy") {
 				const captured = [...context.buffer];
@@ -1887,6 +1918,12 @@ function passThrough(options = {}) {
 			return `passThrough(${format})`;
 		}
 	};
+	require_passthrough.definePassThroughPriority(result, [result], (_state, token) => {
+		if (token == null || format === "greedy") return result.priority;
+		const accepts = format === "equalsOnly" ? equalsOptionPattern.test(token) : format === "nextToken" && optionPattern.test(token);
+		return accepts ? result.priority : void 0;
+	});
+	return result;
 }
 
 //#endregion

package/dist/primitives.js

@@ -6,6 +6,7 @@ import { dispatchByMode, dispatchIterableByMode, wrapForMode } from "./internal/
 import { getDefaultValuesFunction, getDependencyIds, getSnapshottedDefaultDependencyValues, isDerivedValueParser, suggestWithDependency } from "./internal/dependency.js";
 import { replayDerivedParser, replayDerivedParserAsync } from "./dependency-runtime.js";
 import { getWrappedChildParseState, getWrappedChildState, isAnnotationWrappedInitialState, normalizeInjectedAnnotationState } from "./annotation-state.js";
+import { defineKnownCompletion, defineOptionMatch, definePassThroughPriority, getOptionMatch, getPassThroughFailure, getPassThroughPriority } from "./internal/passthrough.js";
 import { hiddenCommandAliasesKey } from "./internal/command-alias.js";
 import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
 import { completeOrExtractPhase2Seed, extractPhase2SeedKey } from "./phase2-seed.js";
@@ -144,6 +145,7 @@ function constant(value) {
 			return { fragments: [] };
 		}
 	};
+	defineKnownCompletion(result, (state) => normalizeInjectedAnnotationState(state));
 	Object.defineProperty(result, "placeholder", {
 		value,
 		configurable: true,
@@ -583,10 +585,15 @@ function option(...args) {
 			}
 			const invalidOption = context.buffer[0];
 			if (options.errors?.noMatch) {
+				if (typeof options.errors.noMatch !== "function") return {
+					success: false,
+					consumed: 0,
+					error: options.errors.noMatch
+				};
 				const candidates = /* @__PURE__ */ new Set();
 				for (const name of extractOptionNames(context.usage)) candidates.add(name);
 				const suggestions = findSimilar(invalidOption, candidates, DEFAULT_FIND_SIMILAR_OPTIONS);
-				const errorMessage = typeof options.errors.noMatch === "function" ? options.errors.noMatch(invalidOption, suggestions) : options.errors.noMatch;
+				const errorMessage = options.errors.noMatch(invalidOption, suggestions);
 				return {
 					success: false,
 					consumed: 0,
@@ -871,10 +878,15 @@ function flag(...args) {
 			}
 			const invalidOption = context.buffer[0];
 			if (options.errors?.noMatch) {
+				if (typeof options.errors.noMatch !== "function") return {
+					success: false,
+					consumed: 0,
+					error: options.errors.noMatch
+				};
 				const candidates = /* @__PURE__ */ new Set();
 				for (const name of extractOptionNames(context.usage)) candidates.add(name);
 				const suggestions = findSimilar(invalidOption, candidates, DEFAULT_FIND_SIMILAR_OPTIONS);
-				const errorMessage = typeof options.errors.noMatch === "function" ? options.errors.noMatch(invalidOption, suggestions) : options.errors.noMatch;
+				const errorMessage = options.errors.noMatch(invalidOption, suggestions);
 				return {
 					success: false,
 					consumed: 0,
@@ -1183,7 +1195,7 @@ function argument(valueParser, options = {}) {
 	const syncValueParser = valueParser;
 	const dependencyMetadata = extractDependencyMetadata(valueParser);
 	const formatInvalidValueError = (error) => options.errors?.invalidValue ? typeof options.errors.invalidValue === "function" ? options.errors.invalidValue(error) : options.errors.invalidValue : message`${metavar(valueParser.metavar)}: ${error}`;
-	const optionPattern = /^--?[a-z0-9-]+$/i;
+	const optionPattern = /^(?!--=)(--?[a-z0-9-]+)(?:=|$)/i;
 	const term = {
 		type: "argument",
 		metavar: valueParser.metavar,
@@ -1210,14 +1222,15 @@ function argument(valueParser, options = {}) {
 			};
 			let i = 0;
 			let optionsTerminated = context.optionsTerminated;
-			if (!optionsTerminated) {
-				if (context.buffer[i] === "--") {
-					optionsTerminated = true;
-					i++;
-				} else if (context.buffer[i].match(optionPattern)) return {
+			if (!optionsTerminated) if (context.buffer[i] === "--") {
+				optionsTerminated = true;
+				i++;
+			} else {
+				const optionMatch = context.buffer[i].match(optionPattern);
+				if (optionMatch != null) return {
 					success: false,
 					consumed: i,
-					error: message`Expected an argument, but got an option: ${optionName(context.buffer[i])}.`
+					error: message`Expected an argument, but got an option: ${optionName(optionMatch[1])}.`
 				};
 			}
 			if (context.buffer.length < i + 1) return {
@@ -1703,6 +1716,22 @@ function command(name, parser, options = {}) {
 		configurable: true,
 		enumerable: false
 	});
+	definePassThroughPriority(result, [parser], (state, token) => {
+		const active = normalizeCommandState(state);
+		if (active == null) return void 0;
+		const childState = active[0] === "matched" ? parser.initialState : active[1];
+		return getPassThroughPriority(parser, getCommandParseChildState(state, childState, parser), token);
+	});
+	defineOptionMatch(result, (state, token) => {
+		const active = normalizeCommandState(state);
+		if (active == null) return void 0;
+		const childState = active[0] === "matched" ? parser.initialState : active[1];
+		const match = getOptionMatch(parser, getCommandParseChildState(state, childState, parser), token);
+		return match == null ? void 0 : {
+			...match,
+			continuesCommand: true
+		};
+	});
 	return result;
 }
 /**
@@ -1755,7 +1784,7 @@ function passThrough(options = {}) {
 	const format = options.format ?? "equalsOnly";
 	const optionPattern = /^-[a-z0-9-]|^--[a-z0-9-]+/i;
 	const equalsOptionPattern = /^--[a-z0-9-]+=/i;
-	return {
+	const result = {
 		$valueType: [],
 		$stateType: [],
 		mode: "sync",
@@ -1776,6 +1805,8 @@ function passThrough(options = {}) {
 				consumed: 0,
 				error: message`No input to pass through.`
 			};
+			const failure = getPassThroughFailure(context, this?.priority ?? -10);
+			if (failure != null) return failure.failure;
 			const token = context.buffer[0];
 			if (format === "greedy") {
 				const captured = [...context.buffer];
@@ -1887,6 +1918,12 @@ function passThrough(options = {}) {
 			return `passThrough(${format})`;
 		}
 	};
+	definePassThroughPriority(result, [result], (_state, token) => {
+		if (token == null || format === "greedy") return result.priority;
+		const accepts = format === "equalsOnly" ? equalsOptionPattern.test(token) : format === "nextToken" && optionPattern.test(token);
+		return accepts ? result.priority : void 0;
+	});
+	return result;
 }
 
 //#endregion

package/dist/suggestion.cjs

@@ -86,8 +86,10 @@ function findSimilar(input, candidates, options = {}) {
 		const normalizedCandidate = caseSensitive ? candidate : candidate.toLowerCase();
 		if (seen.has(candidate)) continue;
 		seen.add(candidate);
+		if (normalizedInput === normalizedCandidate) return [candidate];
+		const minimumDistance = Math.abs(normalizedInput.length - normalizedCandidate.length);
+		if (minimumDistance > maxDistance || minimumDistance / input.length > maxDistanceRatio) continue;
 		const distance = levenshteinDistance(normalizedInput, normalizedCandidate);
-		if (distance === 0) return [candidate];
 		const distanceRatio = distance / input.length;
 		if (distance <= maxDistance && distanceRatio <= maxDistanceRatio) matches.push({
 			candidate,

package/dist/suggestion.js

@@ -86,8 +86,10 @@ function findSimilar(input, candidates, options = {}) {
 		const normalizedCandidate = caseSensitive ? candidate : candidate.toLowerCase();
 		if (seen.has(candidate)) continue;
 		seen.add(candidate);
+		if (normalizedInput === normalizedCandidate) return [candidate];
+		const minimumDistance = Math.abs(normalizedInput.length - normalizedCandidate.length);
+		if (minimumDistance > maxDistance || minimumDistance / input.length > maxDistanceRatio) continue;
 		const distance = levenshteinDistance(normalizedInput, normalizedCandidate);
-		if (distance === 0) return [candidate];
 		const distanceRatio = distance / input.length;
 		if (distance <= maxDistance && distanceRatio <= maxDistanceRatio) matches.push({
 			candidate,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -196,7 +196,7 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@optique/env": "1.1.8",
+    "@optique/env": "1.1.9",
     "@types/node": "^24.0.0",
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",