@optique/core 1.0.11-dev.2640 → 1.0.11-dev.2656

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,
@@ -958,7 +960,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,
@@ -982,14 +984,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 {
@@ -1434,6 +1437,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;
 }
 /**
@@ -1486,7 +1505,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",
@@ -1504,6 +1523,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];
@@ -1615,6 +1636,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,
@@ -958,7 +960,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,
@@ -982,14 +984,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 {
@@ -1434,6 +1437,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;
 }
 /**
@@ -1486,7 +1505,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",
@@ -1504,6 +1523,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];
@@ -1615,6 +1636,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.11-dev.2640",
+  "version": "1.0.11-dev.2656",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",