@optique/core 0.7.2 → 0.7.3

package/dist/constructs.cjs

@@ -4,6 +4,27 @@ const require_suggestion = require('./suggestion.cjs');
 
 //#region src/constructs.ts
 /**
+* Checks if the given token is an option name that requires a value
+* (i.e., has a metavar) within the given usage terms.
+* @param usage The usage terms to search through.
+* @param token The token to check.
+* @returns `true` if the token is an option that requires a value, `false` otherwise.
+*/
+function isOptionRequiringValue(usage, token) {
+	function traverse(terms) {
+		if (!terms || !Array.isArray(terms)) return false;
+		for (const term of terms) if (term.type === "option") {
+			if (term.metavar && term.names.includes(token)) return true;
+		} else if (term.type === "optional" || term.type === "multiple") {
+			if (traverse(term.terms)) return true;
+		} else if (term.type === "exclusive") {
+			for (const exclusiveUsage of term.terms) if (traverse(exclusiveUsage)) return true;
+		}
+		return false;
+	}
+	return traverse(usage);
+}
+/**
 * Extracts required (non-optional) usage terms from a usage array.
 * @param usage The usage to extract required terms from
 * @returns Usage containing only required (non-optional) terms
@@ -461,6 +482,16 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		},
 		suggest(context, prefix) {
 			const suggestions = [];
+			if (context.buffer.length > 0) {
+				const lastToken = context.buffer[context.buffer.length - 1];
+				for (const [field, parser] of parserPairs) if (isOptionRequiringValue(parser.usage, lastToken)) {
+					const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
+					return Array.from(parser.suggest({
+						...context,
+						state: fieldState
+					}, prefix));
+				}
+			}
 			for (const [field, parser] of parserPairs) {
 				const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
 				const fieldSuggestions = parser.suggest({

package/dist/constructs.js

@@ -4,6 +4,27 @@ import { createErrorWithSuggestions } from "./suggestion.js";
 
 //#region src/constructs.ts
 /**
+* Checks if the given token is an option name that requires a value
+* (i.e., has a metavar) within the given usage terms.
+* @param usage The usage terms to search through.
+* @param token The token to check.
+* @returns `true` if the token is an option that requires a value, `false` otherwise.
+*/
+function isOptionRequiringValue(usage, token) {
+	function traverse(terms) {
+		if (!terms || !Array.isArray(terms)) return false;
+		for (const term of terms) if (term.type === "option") {
+			if (term.metavar && term.names.includes(token)) return true;
+		} else if (term.type === "optional" || term.type === "multiple") {
+			if (traverse(term.terms)) return true;
+		} else if (term.type === "exclusive") {
+			for (const exclusiveUsage of term.terms) if (traverse(exclusiveUsage)) return true;
+		}
+		return false;
+	}
+	return traverse(usage);
+}
+/**
 * Extracts required (non-optional) usage terms from a usage array.
 * @param usage The usage to extract required terms from
 * @returns Usage containing only required (non-optional) terms
@@ -461,6 +482,16 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 		},
 		suggest(context, prefix) {
 			const suggestions = [];
+			if (context.buffer.length > 0) {
+				const lastToken = context.buffer[context.buffer.length - 1];
+				for (const [field, parser] of parserPairs) if (isOptionRequiringValue(parser.usage, lastToken)) {
+					const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
+					return Array.from(parser.suggest({
+						...context,
+						state: fieldState
+					}, prefix));
+				}
+			}
 			for (const [field, parser] of parserPairs) {
 				const fieldState = context.state && typeof context.state === "object" && field in context.state ? context.state[field] : parser.initialState;
 				const fieldSuggestions = parser.suggest({

package/dist/facade.cjs

@@ -343,7 +343,7 @@ function classifyResult(result, args) {
 * Handles shell completion requests.
 * @since 0.6.0
 */
-function handleCompletion(completionArgs, programName, parser, completionParser, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode) {
+function handleCompletion(completionArgs, programName, parser, completionParser, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode, completionName) {
 	const shellName = completionArgs[0] || "";
 	const args = completionArgs.slice(1);
 	if (!shellName) {
@@ -375,7 +375,8 @@ function handleCompletion(completionArgs, programName, parser, completionParser,
 		return onError(1);
 	}
 	if (args.length === 0) {
-		const completionArg = completionMode === "option" ? "--completion" : "completion";
+		const usePlural = completionName === "plural";
+		const completionArg = completionMode === "option" ? usePlural ? "--completions" : "--completion" : usePlural ? "completions" : "completion";
 		const script = shell.generateScript(programName, [completionArg, shellName]);
 		stdout(script);
 	} else {
@@ -457,7 +458,7 @@ function run(parser, programName, args, options = {}) {
 	} : createCompletionParser(completion, programName, availableShells, completionName);
 	if (options.completion) {
 		const hasHelpOption = args.includes("--help");
-		if ((completionMode === "command" || completionMode === "both") && args.length >= 1 && ((completionName === "singular" || completionName === "both" ? args[0] === "completion" : false) || (completionName === "plural" || completionName === "both" ? args[0] === "completions" : false)) && !hasHelpOption) return handleCompletion(args.slice(1), programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode);
+		if ((completionMode === "command" || completionMode === "both") && args.length >= 1 && ((completionName === "singular" || completionName === "both" ? args[0] === "completion" : false) || (completionName === "plural" || completionName === "both" ? args[0] === "completions" : false)) && !hasHelpOption) return handleCompletion(args.slice(1), programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode, completionName);
 		if (completionMode === "option" || completionMode === "both") for (let i = 0; i < args.length; i++) {
 			const arg = args[i];
 			const singularMatch = completionName === "singular" || completionName === "both" ? arg.startsWith("--completion=") : false;
@@ -465,14 +466,14 @@ function run(parser, programName, args, options = {}) {
 			if (singularMatch || pluralMatch) {
 				const shell = arg.slice(arg.indexOf("=") + 1);
 				const completionArgs = args.slice(i + 1);
-				return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode);
+				return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode, completionName);
 			} else {
 				const singularMatchExact = completionName === "singular" || completionName === "both" ? arg === "--completion" : false;
 				const pluralMatchExact = completionName === "plural" || completionName === "both" ? arg === "--completions" : false;
 				if ((singularMatchExact || pluralMatchExact) && i + 1 < args.length) {
 					const shell = args[i + 1];
 					const completionArgs = args.slice(i + 2);
-					return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode);
+					return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode, completionName);
 				}
 			}
 		}

package/dist/facade.js

@@ -343,7 +343,7 @@ function classifyResult(result, args) {
 * Handles shell completion requests.
 * @since 0.6.0
 */
-function handleCompletion(completionArgs, programName, parser, completionParser, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode) {
+function handleCompletion(completionArgs, programName, parser, completionParser, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode, completionName) {
 	const shellName = completionArgs[0] || "";
 	const args = completionArgs.slice(1);
 	if (!shellName) {
@@ -375,7 +375,8 @@ function handleCompletion(completionArgs, programName, parser, completionParser,
 		return onError(1);
 	}
 	if (args.length === 0) {
-		const completionArg = completionMode === "option" ? "--completion" : "completion";
+		const usePlural = completionName === "plural";
+		const completionArg = completionMode === "option" ? usePlural ? "--completions" : "--completion" : usePlural ? "completions" : "completion";
 		const script = shell.generateScript(programName, [completionArg, shellName]);
 		stdout(script);
 	} else {
@@ -457,7 +458,7 @@ function run(parser, programName, args, options = {}) {
 	} : createCompletionParser(completion, programName, availableShells, completionName);
 	if (options.completion) {
 		const hasHelpOption = args.includes("--help");
-		if ((completionMode === "command" || completionMode === "both") && args.length >= 1 && ((completionName === "singular" || completionName === "both" ? args[0] === "completion" : false) || (completionName === "plural" || completionName === "both" ? args[0] === "completions" : false)) && !hasHelpOption) return handleCompletion(args.slice(1), programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode);
+		if ((completionMode === "command" || completionMode === "both") && args.length >= 1 && ((completionName === "singular" || completionName === "both" ? args[0] === "completion" : false) || (completionName === "plural" || completionName === "both" ? args[0] === "completions" : false)) && !hasHelpOption) return handleCompletion(args.slice(1), programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode, completionName);
 		if (completionMode === "option" || completionMode === "both") for (let i = 0; i < args.length; i++) {
 			const arg = args[i];
 			const singularMatch = completionName === "singular" || completionName === "both" ? arg.startsWith("--completion=") : false;
@@ -465,14 +466,14 @@ function run(parser, programName, args, options = {}) {
 			if (singularMatch || pluralMatch) {
 				const shell = arg.slice(arg.indexOf("=") + 1);
 				const completionArgs = args.slice(i + 1);
-				return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode);
+				return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode, completionName);
 			} else {
 				const singularMatchExact = completionName === "singular" || completionName === "both" ? arg === "--completion" : false;
 				const pluralMatchExact = completionName === "plural" || completionName === "both" ? arg === "--completions" : false;
 				if ((singularMatchExact || pluralMatchExact) && i + 1 < args.length) {
 					const shell = args[i + 1];
 					const completionArgs = args.slice(i + 2);
-					return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode);
+					return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode, completionName);
 				}
 			}
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",