@optique/core 1.0.10 → 1.0.11-dev.2654

package/dist/primitives.cjs

@@ -1,5 +1,6 @@
 const require_annotations = require('./internal/annotations.cjs');
 const require_message = require('./message.cjs');
+const require_passthrough = require('./internal/passthrough.cjs');
 const require_validate = require('./validate.cjs');
 const require_usage = require('./usage.cjs');
 const require_mode_dispatch = require('./internal/mode-dispatch.cjs');
@@ -137,6 +138,7 @@ function constant(value) {
 			return { fragments: [] };
 		}
 	};
+	require_passthrough.defineKnownCompletion(result, (state) => require_annotation_state.normalizeInjectedAnnotationState(state));
 	Object.defineProperty(result, "placeholder", {
 		value,
 		configurable: true,
@@ -570,10 +572,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,
@@ -854,10 +861,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,
@@ -1424,6 +1436,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;
 }
 /**
@@ -1476,7 +1504,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",
@@ -1494,6 +1522,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];
@@ -1605,6 +1635,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

@@ -1,5 +1,6 @@
 import { annotateFreshArray, getAnnotations } from "./internal/annotations.js";
 import { message, metavar, optionName, optionNames, text, valueSet } from "./message.js";
+import { defineKnownCompletion, defineOptionMatch, definePassThroughPriority, getOptionMatch, getPassThroughFailure, getPassThroughPriority } from "./internal/passthrough.js";
 import { validateCommandNames, validateOptionNames } from "./validate.js";
 import { extractOptionNames, isDocHidden, isSuggestionHidden } from "./usage.js";
 import { dispatchByMode, dispatchIterableByMode, wrapForMode } from "./internal/mode-dispatch.js";
@@ -137,6 +138,7 @@ function constant(value) {
 			return { fragments: [] };
 		}
 	};
+	defineKnownCompletion(result, (state) => normalizeInjectedAnnotationState(state));
 	Object.defineProperty(result, "placeholder", {
 		value,
 		configurable: true,
@@ -570,10 +572,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,
@@ -854,10 +861,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,
@@ -1424,6 +1436,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;
 }
 /**
@@ -1476,7 +1504,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",
@@ -1494,6 +1522,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];
@@ -1605,6 +1635,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.0.10",
+  "version": "1.0.11-dev.2654",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",