@optique/core 0.8.9 → 0.8.11

package/dist/constructs.cjs

@@ -4,6 +4,57 @@ const require_suggestion = require('./suggestion.cjs');
 
 //#region src/constructs.ts
 /**
+* Collects option names and command names that are valid at the current
+* parse position by walking the usage tree.  Only "leading" candidates
+* (those reachable before a required positional argument) are collected.
+*/
+function collectLeadingCandidates(terms, optionNames, commandNames) {
+	if (!terms || !Array.isArray(terms)) return true;
+	for (const term of terms) {
+		if (term.type === "option") {
+			for (const name of term.names) optionNames.add(name);
+			return false;
+		}
+		if (term.type === "command") {
+			commandNames.add(term.name);
+			return false;
+		}
+		if (term.type === "argument") return false;
+		if (term.type === "optional") {
+			collectLeadingCandidates(term.terms, optionNames, commandNames);
+			continue;
+		}
+		if (term.type === "multiple") {
+			collectLeadingCandidates(term.terms, optionNames, commandNames);
+			if (term.min === 0) continue;
+			return false;
+		}
+		if (term.type === "exclusive") {
+			let allAlternativesSkippable = true;
+			for (const exclusiveUsage of term.terms) {
+				const alternativeSkippable = collectLeadingCandidates(exclusiveUsage, optionNames, commandNames);
+				allAlternativesSkippable = allAlternativesSkippable && alternativeSkippable;
+			}
+			if (allAlternativesSkippable) continue;
+			return false;
+		}
+	}
+	return true;
+}
+function createUnexpectedInputErrorWithScopedSuggestions(baseError, invalidInput, parsers, customFormatter) {
+	const options = /* @__PURE__ */ new Set();
+	const commands = /* @__PURE__ */ new Set();
+	for (const parser of parsers) collectLeadingCandidates(parser.usage, options, commands);
+	const candidates = new Set([...options, ...commands]);
+	const suggestions = require_suggestion.findSimilar(invalidInput, candidates, require_suggestion.DEFAULT_FIND_SIMILAR_OPTIONS);
+	const suggestionMsg = customFormatter ? customFormatter(suggestions) : require_suggestion.createSuggestionMessage(suggestions);
+	return suggestionMsg.length > 0 ? [
+		...baseError,
+		require_message.text("\n\n"),
+		...suggestionMsg
+	] : baseError;
+}
+/**
 * 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.
@@ -168,16 +219,6 @@ function getNoMatchError(options, noMatchContext) {
 	return customNoMatch ? typeof customNoMatch === "function" ? customNoMatch(noMatchContext) : customNoMatch : generateNoMatchError(noMatchContext);
 }
 /**
-* Creates default error for parse() method when buffer is not empty.
-* Shared by or() and longestMatch().
-* @internal
-*/
-function createUnexpectedInputError(token, usage, options) {
-	const defaultMsg = require_message.message`Unexpected option or subcommand: ${require_message.optionName(token)}.`;
-	if (options?.errors?.unexpectedInput != null) return typeof options.errors.unexpectedInput === "function" ? options.errors.unexpectedInput(token) : options.errors.unexpectedInput;
-	return require_suggestion.createErrorWithSuggestions(defaultMsg, token, usage, "both", options?.errors?.suggestions);
-}
-/**
 * @since 0.5.0
 */
 function or(...args) {
@@ -204,7 +245,12 @@ function or(...args) {
 		parse(context) {
 			let error = {
 				consumed: 0,
-				error: context.buffer.length < 1 ? getNoMatchError(options, noMatchContext) : createUnexpectedInputError(context.buffer[0], context.usage, options)
+				error: context.buffer.length < 1 ? getNoMatchError(options, noMatchContext) : (() => {
+					const token = context.buffer[0];
+					const defaultMsg = require_message.message`Unexpected option or subcommand: ${require_message.optionName(token)}.`;
+					if (options?.errors?.unexpectedInput != null) return typeof options.errors.unexpectedInput === "function" ? options.errors.unexpectedInput(token) : options.errors.unexpectedInput;
+					return createUnexpectedInputErrorWithScopedSuggestions(defaultMsg, token, parsers, options?.errors?.suggestions);
+				})()
 			};
 			const orderedParsers = parsers.map((p, i) => [p, i]);
 			orderedParsers.sort(([_, a], [__, b]) => context.state?.[0] === a ? -1 : context.state?.[0] === b ? 1 : a - b);
@@ -238,7 +284,9 @@ function or(...args) {
 		},
 		suggest: createExclusiveSuggest(parsers),
 		getDocFragments(state, _defaultValue) {
+			let brief;
 			let description;
+			let footer;
 			let fragments;
 			if (state.kind === "unavailable" || state.state == null) fragments = parsers.flatMap((p) => p.getDocFragments({ kind: "unavailable" }, void 0).fragments);
 			else {
@@ -248,7 +296,9 @@ function or(...args) {
 					state: parserResult.next.state
 				} : { kind: "unavailable" };
 				const docFragments = parsers[index].getDocFragments(innerState, void 0);
+				brief = docFragments.brief;
 				description = docFragments.description;
+				footer = docFragments.footer;
 				fragments = docFragments.fragments;
 			}
 			const entries = fragments.filter((f) => f.type === "entry");
@@ -259,7 +309,9 @@ function or(...args) {
 				else sections.push(fragment);
 			}
 			return {
+				brief,
 				description,
+				footer,
 				fragments: [...sections.map((s) => ({
 					...s,
 					type: "section"
@@ -299,7 +351,12 @@ function longestMatch(...args) {
 			let bestMatch = null;
 			let error = {
 				consumed: 0,
-				error: context.buffer.length < 1 ? getNoMatchError(options, noMatchContext) : createUnexpectedInputError(context.buffer[0], context.usage, options)
+				error: context.buffer.length < 1 ? getNoMatchError(options, noMatchContext) : (() => {
+					const token = context.buffer[0];
+					const defaultMsg = require_message.message`Unexpected option or subcommand: ${require_message.optionName(token)}.`;
+					if (options?.errors?.unexpectedInput != null) return typeof options.errors.unexpectedInput === "function" ? options.errors.unexpectedInput(token) : options.errors.unexpectedInput;
+					return createUnexpectedInputErrorWithScopedSuggestions(defaultMsg, token, parsers, options?.errors?.suggestions);
+				})()
 			};
 			for (let i = 0; i < parsers.length; i++) {
 				const parser = parsers[i];
@@ -333,6 +390,7 @@ function longestMatch(...args) {
 		},
 		suggest: createExclusiveSuggest(parsers),
 		getDocFragments(state, _defaultValue) {
+			let brief;
 			let description;
 			let footer;
 			let fragments;
@@ -344,12 +402,14 @@ function longestMatch(...args) {
 						kind: "available",
 						state: result.next.state
 					});
+					brief = docResult.brief;
 					description = docResult.description;
 					footer = docResult.footer;
 					fragments = docResult.fragments;
 				} else fragments = parsers.flatMap((p) => p.getDocFragments({ kind: "unavailable" }).fragments);
 			}
 			return {
+				brief,
 				description,
 				fragments,
 				footer

package/dist/constructs.js

@@ -1,9 +1,60 @@
-import { message, optionName, values } from "./message.js";
+import { message, optionName, text, values } from "./message.js";
 import { extractArgumentMetavars, extractCommandNames, extractOptionNames } from "./usage.js";
-import { createErrorWithSuggestions, deduplicateSuggestions } from "./suggestion.js";
+import { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, createSuggestionMessage, deduplicateSuggestions, findSimilar } from "./suggestion.js";
 
 //#region src/constructs.ts
 /**
+* Collects option names and command names that are valid at the current
+* parse position by walking the usage tree.  Only "leading" candidates
+* (those reachable before a required positional argument) are collected.
+*/
+function collectLeadingCandidates(terms, optionNames, commandNames) {
+	if (!terms || !Array.isArray(terms)) return true;
+	for (const term of terms) {
+		if (term.type === "option") {
+			for (const name of term.names) optionNames.add(name);
+			return false;
+		}
+		if (term.type === "command") {
+			commandNames.add(term.name);
+			return false;
+		}
+		if (term.type === "argument") return false;
+		if (term.type === "optional") {
+			collectLeadingCandidates(term.terms, optionNames, commandNames);
+			continue;
+		}
+		if (term.type === "multiple") {
+			collectLeadingCandidates(term.terms, optionNames, commandNames);
+			if (term.min === 0) continue;
+			return false;
+		}
+		if (term.type === "exclusive") {
+			let allAlternativesSkippable = true;
+			for (const exclusiveUsage of term.terms) {
+				const alternativeSkippable = collectLeadingCandidates(exclusiveUsage, optionNames, commandNames);
+				allAlternativesSkippable = allAlternativesSkippable && alternativeSkippable;
+			}
+			if (allAlternativesSkippable) continue;
+			return false;
+		}
+	}
+	return true;
+}
+function createUnexpectedInputErrorWithScopedSuggestions(baseError, invalidInput, parsers, customFormatter) {
+	const options = /* @__PURE__ */ new Set();
+	const commands = /* @__PURE__ */ new Set();
+	for (const parser of parsers) collectLeadingCandidates(parser.usage, options, commands);
+	const candidates = new Set([...options, ...commands]);
+	const suggestions = findSimilar(invalidInput, candidates, DEFAULT_FIND_SIMILAR_OPTIONS);
+	const suggestionMsg = customFormatter ? customFormatter(suggestions) : createSuggestionMessage(suggestions);
+	return suggestionMsg.length > 0 ? [
+		...baseError,
+		text("\n\n"),
+		...suggestionMsg
+	] : baseError;
+}
+/**
 * 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.
@@ -168,16 +219,6 @@ function getNoMatchError(options, noMatchContext) {
 	return customNoMatch ? typeof customNoMatch === "function" ? customNoMatch(noMatchContext) : customNoMatch : generateNoMatchError(noMatchContext);
 }
 /**
-* Creates default error for parse() method when buffer is not empty.
-* Shared by or() and longestMatch().
-* @internal
-*/
-function createUnexpectedInputError(token, usage, options) {
-	const defaultMsg = message`Unexpected option or subcommand: ${optionName(token)}.`;
-	if (options?.errors?.unexpectedInput != null) return typeof options.errors.unexpectedInput === "function" ? options.errors.unexpectedInput(token) : options.errors.unexpectedInput;
-	return createErrorWithSuggestions(defaultMsg, token, usage, "both", options?.errors?.suggestions);
-}
-/**
 * @since 0.5.0
 */
 function or(...args) {
@@ -204,7 +245,12 @@ function or(...args) {
 		parse(context) {
 			let error = {
 				consumed: 0,
-				error: context.buffer.length < 1 ? getNoMatchError(options, noMatchContext) : createUnexpectedInputError(context.buffer[0], context.usage, options)
+				error: context.buffer.length < 1 ? getNoMatchError(options, noMatchContext) : (() => {
+					const token = context.buffer[0];
+					const defaultMsg = message`Unexpected option or subcommand: ${optionName(token)}.`;
+					if (options?.errors?.unexpectedInput != null) return typeof options.errors.unexpectedInput === "function" ? options.errors.unexpectedInput(token) : options.errors.unexpectedInput;
+					return createUnexpectedInputErrorWithScopedSuggestions(defaultMsg, token, parsers, options?.errors?.suggestions);
+				})()
 			};
 			const orderedParsers = parsers.map((p, i) => [p, i]);
 			orderedParsers.sort(([_, a], [__, b]) => context.state?.[0] === a ? -1 : context.state?.[0] === b ? 1 : a - b);
@@ -238,7 +284,9 @@ function or(...args) {
 		},
 		suggest: createExclusiveSuggest(parsers),
 		getDocFragments(state, _defaultValue) {
+			let brief;
 			let description;
+			let footer;
 			let fragments;
 			if (state.kind === "unavailable" || state.state == null) fragments = parsers.flatMap((p) => p.getDocFragments({ kind: "unavailable" }, void 0).fragments);
 			else {
@@ -248,7 +296,9 @@ function or(...args) {
 					state: parserResult.next.state
 				} : { kind: "unavailable" };
 				const docFragments = parsers[index].getDocFragments(innerState, void 0);
+				brief = docFragments.brief;
 				description = docFragments.description;
+				footer = docFragments.footer;
 				fragments = docFragments.fragments;
 			}
 			const entries = fragments.filter((f) => f.type === "entry");
@@ -259,7 +309,9 @@ function or(...args) {
 				else sections.push(fragment);
 			}
 			return {
+				brief,
 				description,
+				footer,
 				fragments: [...sections.map((s) => ({
 					...s,
 					type: "section"
@@ -299,7 +351,12 @@ function longestMatch(...args) {
 			let bestMatch = null;
 			let error = {
 				consumed: 0,
-				error: context.buffer.length < 1 ? getNoMatchError(options, noMatchContext) : createUnexpectedInputError(context.buffer[0], context.usage, options)
+				error: context.buffer.length < 1 ? getNoMatchError(options, noMatchContext) : (() => {
+					const token = context.buffer[0];
+					const defaultMsg = message`Unexpected option or subcommand: ${optionName(token)}.`;
+					if (options?.errors?.unexpectedInput != null) return typeof options.errors.unexpectedInput === "function" ? options.errors.unexpectedInput(token) : options.errors.unexpectedInput;
+					return createUnexpectedInputErrorWithScopedSuggestions(defaultMsg, token, parsers, options?.errors?.suggestions);
+				})()
 			};
 			for (let i = 0; i < parsers.length; i++) {
 				const parser = parsers[i];
@@ -333,6 +390,7 @@ function longestMatch(...args) {
 		},
 		suggest: createExclusiveSuggest(parsers),
 		getDocFragments(state, _defaultValue) {
+			let brief;
 			let description;
 			let footer;
 			let fragments;
@@ -344,12 +402,14 @@ function longestMatch(...args) {
 						kind: "available",
 						state: result.next.state
 					});
+					brief = docResult.brief;
 					description = docResult.description;
 					footer = docResult.footer;
 					fragments = docResult.fragments;
 				} else fragments = parsers.flatMap((p) => p.getDocFragments({ kind: "unavailable" }).fragments);
 			}
 			return {
+				brief,
 				description,
 				fragments,
 				footer

package/dist/doc.d.cts

@@ -60,6 +60,12 @@ type DocFragment = {
  * a final document page.
  */
 interface DocFragments {
+  /**
+   * An optional brief that provides a short summary for the collection
+   * of fragments.
+   * @since 0.7.12
+   */
+  readonly brief?: Message;
   /**
    * An optional description that applies to the entire collection of fragments.
    */

package/dist/doc.d.ts

@@ -60,6 +60,12 @@ type DocFragment = {
  * a final document page.
  */
 interface DocFragments {
+  /**
+   * An optional brief that provides a short summary for the collection
+   * of fragments.
+   * @since 0.7.12
+   */
+  readonly brief?: Message;
   /**
    * An optional description that applies to the entire collection of fragments.
    */

package/dist/facade.cjs

@@ -470,9 +470,9 @@ function run(parser, programName, args, options = {}) {
 			} 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);
+				if (singularMatchExact || pluralMatchExact) {
+					const shell = i + 1 < args.length ? args[i + 1] : "";
+					const completionArgs = i + 1 < args.length ? args.slice(i + 2) : [];
 					return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode, completionName);
 				}
 			}
@@ -561,11 +561,13 @@ function run(parser, programName, args, options = {}) {
 			const doc = require_parser.getDocPage(helpGeneratorParser, classified.commands);
 			if (doc != null) {
 				const isMetaCommandHelp = (completionName === "singular" || completionName === "both" ? requestedCommand === "completion" : false) || (completionName === "plural" || completionName === "both" ? requestedCommand === "completions" : false) || requestedCommand === "help" || requestedCommand === "version";
+				const isSubcommandHelp = classified.commands.length > 0;
+				const shouldOverride = !isMetaCommandHelp && !isSubcommandHelp;
 				const augmentedDoc = {
 					...doc,
-					brief: !isMetaCommandHelp ? brief ?? doc.brief : doc.brief,
-					description: !isMetaCommandHelp ? description ?? doc.description : doc.description,
-					footer: !isMetaCommandHelp ? footer ?? doc.footer : doc.footer
+					brief: shouldOverride ? brief ?? doc.brief : doc.brief ?? brief,
+					description: shouldOverride ? description ?? doc.description : doc.description ?? description,
+					footer: shouldOverride ? footer ?? doc.footer : doc.footer ?? footer
 				};
 				stdout(require_doc.formatDocPage(programName, augmentedDoc, {
 					colors,

package/dist/facade.js

@@ -470,9 +470,9 @@ function run(parser, programName, args, options = {}) {
 			} 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);
+				if (singularMatchExact || pluralMatchExact) {
+					const shell = i + 1 < args.length ? args[i + 1] : "";
+					const completionArgs = i + 1 < args.length ? args.slice(i + 2) : [];
 					return handleCompletion([shell, ...completionArgs], programName, parser, completionParsers.completionCommand, stdout, stderr, onCompletion, onError, availableShells, colors, maxWidth, completionMode, completionName);
 				}
 			}
@@ -561,11 +561,13 @@ function run(parser, programName, args, options = {}) {
 			const doc = getDocPage(helpGeneratorParser, classified.commands);
 			if (doc != null) {
 				const isMetaCommandHelp = (completionName === "singular" || completionName === "both" ? requestedCommand === "completion" : false) || (completionName === "plural" || completionName === "both" ? requestedCommand === "completions" : false) || requestedCommand === "help" || requestedCommand === "version";
+				const isSubcommandHelp = classified.commands.length > 0;
+				const shouldOverride = !isMetaCommandHelp && !isSubcommandHelp;
 				const augmentedDoc = {
 					...doc,
-					brief: !isMetaCommandHelp ? brief ?? doc.brief : doc.brief,
-					description: !isMetaCommandHelp ? description ?? doc.description : doc.description,
-					footer: !isMetaCommandHelp ? footer ?? doc.footer : doc.footer
+					brief: shouldOverride ? brief ?? doc.brief : doc.brief ?? brief,
+					description: shouldOverride ? description ?? doc.description : doc.description ?? description,
+					footer: shouldOverride ? footer ?? doc.footer : doc.footer ?? footer
 				};
 				stdout(formatDocPage(programName, augmentedDoc, {
 					colors,

package/dist/parser.cjs

@@ -159,7 +159,7 @@ function getDocPage(parser, args = []) {
 		if (!result.success) break;
 		context = result.next;
 	} while (context.buffer.length > 0);
-	const { description, fragments, footer } = parser.getDocFragments({
+	const { brief, description, fragments, footer } = parser.getDocFragments({
 		kind: "available",
 		state: context.state
 	}, void 0);
@@ -185,6 +185,7 @@ function getDocPage(parser, args = []) {
 	return {
 		usage,
 		sections,
+		...brief != null && { brief },
 		...description != null && { description },
 		...footer != null && { footer }
 	};

package/dist/parser.js

@@ -159,7 +159,7 @@ function getDocPage(parser, args = []) {
 		if (!result.success) break;
 		context = result.next;
 	} while (context.buffer.length > 0);
-	const { description, fragments, footer } = parser.getDocFragments({
+	const { brief, description, fragments, footer } = parser.getDocFragments({
 		kind: "available",
 		state: context.state
 	}, void 0);
@@ -185,6 +185,7 @@ function getDocPage(parser, args = []) {
 	return {
 		usage,
 		sections,
+		...brief != null && { brief },
 		...description != null && { description },
 		...footer != null && { footer }
 	};

package/dist/primitives.cjs

@@ -725,6 +725,7 @@ function command(name, parser, options = {}) {
 			const innerFragments = parser.getDocFragments(innerState, defaultValue);
 			return {
 				...innerFragments,
+				brief: innerFragments.brief ?? options.brief,
 				description: innerFragments.description ?? options.description,
 				footer: innerFragments.footer ?? options.footer
 			};

package/dist/primitives.js

@@ -725,6 +725,7 @@ function command(name, parser, options = {}) {
 			const innerFragments = parser.getDocFragments(innerState, defaultValue);
 			return {
 				...innerFragments,
+				brief: innerFragments.brief ?? options.brief,
 				description: innerFragments.description ?? options.description,
 				footer: innerFragments.footer ?? options.footer
 			};

package/dist/suggestion.cjs

@@ -232,5 +232,6 @@ function deduplicateSuggestions(suggestions) {
 //#endregion
 exports.DEFAULT_FIND_SIMILAR_OPTIONS = DEFAULT_FIND_SIMILAR_OPTIONS;
 exports.createErrorWithSuggestions = createErrorWithSuggestions;
+exports.createSuggestionMessage = createSuggestionMessage;
 exports.deduplicateSuggestions = deduplicateSuggestions;
 exports.findSimilar = findSimilar;

package/dist/suggestion.js

@@ -230,4 +230,4 @@ function deduplicateSuggestions(suggestions) {
 }
 
 //#endregion
-export { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, deduplicateSuggestions, findSimilar };
+export { DEFAULT_FIND_SIMILAR_OPTIONS, createErrorWithSuggestions, createSuggestionMessage, deduplicateSuggestions, findSimilar };

package/package.json

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