@optique/core 0.9.2 → 0.9.3

package/dist/facade.cjs

@@ -500,6 +500,59 @@ function runParser(parser, programName, args, options = {}) {
 					else if (commandParsers.length === 2) helpGeneratorParser = require_constructs.longestMatch(commandParsers[0], commandParsers[1]);
 					else helpGeneratorParser = require_constructs.longestMatch(...commandParsers);
 				}
+				const reportInvalidHelpCommand = (validationError) => {
+					stderr(`Usage: ${indentLines(require_usage.formatUsage(programName, augmentedParser.usage, {
+						colors,
+						maxWidth: maxWidth == null ? void 0 : maxWidth - 7,
+						expandCommands: true
+					}), 7)}`);
+					const errorMessage = require_message.formatMessage(validationError, {
+						colors,
+						quotes: !colors
+					});
+					stderr(`Error: ${errorMessage}`);
+					return onError(1);
+				};
+				if (classified.commands.length > 0) {
+					let validationContext = {
+						buffer: [...classified.commands],
+						optionsTerminated: false,
+						state: helpGeneratorParser.initialState,
+						usage: helpGeneratorParser.usage
+					};
+					const processStep = (stepResult) => {
+						if (!stepResult.success) return stepResult.error;
+						if (stepResult.consumed.length < 1) return require_message.message`Unexpected option or subcommand: ${require_message.optionName(validationContext.buffer[0])}.`;
+						validationContext = {
+							...validationContext,
+							buffer: stepResult.next.buffer,
+							optionsTerminated: stepResult.next.optionsTerminated,
+							state: stepResult.next.state,
+							usage: stepResult.next.usage ?? validationContext.usage
+						};
+						return validationContext.buffer.length > 0 ? "continue" : null;
+					};
+					let validationResult = "continue";
+					while (validationResult === "continue") {
+						const stepResult = helpGeneratorParser.parse(validationContext);
+						if (stepResult instanceof Promise) {
+							const asyncValidate = async (result$1) => {
+								let res = processStep(result$1);
+								while (res === "continue") {
+									const next = helpGeneratorParser.parse(validationContext);
+									const resolved = next instanceof Promise ? await next : next;
+									res = processStep(resolved);
+								}
+								if (res != null) return reportInvalidHelpCommand(res);
+								const docOrPromise$1 = require_parser.getDocPage(helpGeneratorParser, classified.commands);
+								return docOrPromise$1 instanceof Promise ? docOrPromise$1.then(displayHelp) : displayHelp(docOrPromise$1);
+							};
+							return stepResult.then(asyncValidate);
+						}
+						validationResult = processStep(stepResult);
+					}
+					if (validationResult != null) return reportInvalidHelpCommand(validationResult);
+				}
 				const displayHelp = (doc) => {
 					if (doc != null) {
 						const isMetaCommandHelp = (completionName === "singular" || completionName === "both" ? requestedCommand === "completion" : false) || (completionName === "plural" || completionName === "both" ? requestedCommand === "completions" : false) || requestedCommand === "help" || requestedCommand === "version";

package/dist/facade.js

@@ -500,6 +500,59 @@ function runParser(parser, programName, args, options = {}) {
 					else if (commandParsers.length === 2) helpGeneratorParser = longestMatch(commandParsers[0], commandParsers[1]);
 					else helpGeneratorParser = longestMatch(...commandParsers);
 				}
+				const reportInvalidHelpCommand = (validationError) => {
+					stderr(`Usage: ${indentLines(formatUsage(programName, augmentedParser.usage, {
+						colors,
+						maxWidth: maxWidth == null ? void 0 : maxWidth - 7,
+						expandCommands: true
+					}), 7)}`);
+					const errorMessage = formatMessage(validationError, {
+						colors,
+						quotes: !colors
+					});
+					stderr(`Error: ${errorMessage}`);
+					return onError(1);
+				};
+				if (classified.commands.length > 0) {
+					let validationContext = {
+						buffer: [...classified.commands],
+						optionsTerminated: false,
+						state: helpGeneratorParser.initialState,
+						usage: helpGeneratorParser.usage
+					};
+					const processStep = (stepResult) => {
+						if (!stepResult.success) return stepResult.error;
+						if (stepResult.consumed.length < 1) return message`Unexpected option or subcommand: ${optionName(validationContext.buffer[0])}.`;
+						validationContext = {
+							...validationContext,
+							buffer: stepResult.next.buffer,
+							optionsTerminated: stepResult.next.optionsTerminated,
+							state: stepResult.next.state,
+							usage: stepResult.next.usage ?? validationContext.usage
+						};
+						return validationContext.buffer.length > 0 ? "continue" : null;
+					};
+					let validationResult = "continue";
+					while (validationResult === "continue") {
+						const stepResult = helpGeneratorParser.parse(validationContext);
+						if (stepResult instanceof Promise) {
+							const asyncValidate = async (result$1) => {
+								let res = processStep(result$1);
+								while (res === "continue") {
+									const next = helpGeneratorParser.parse(validationContext);
+									const resolved = next instanceof Promise ? await next : next;
+									res = processStep(resolved);
+								}
+								if (res != null) return reportInvalidHelpCommand(res);
+								const docOrPromise$1 = getDocPage(helpGeneratorParser, classified.commands);
+								return docOrPromise$1 instanceof Promise ? docOrPromise$1.then(displayHelp) : displayHelp(docOrPromise$1);
+							};
+							return stepResult.then(asyncValidate);
+						}
+						validationResult = processStep(stepResult);
+					}
+					if (validationResult != null) return reportInvalidHelpCommand(validationResult);
+				}
 				const displayHelp = (doc) => {
 					if (doc != null) {
 						const isMetaCommandHelp = (completionName === "singular" || completionName === "both" ? requestedCommand === "completion" : false) || (completionName === "plural" || completionName === "both" ? requestedCommand === "completions" : false) || requestedCommand === "help" || requestedCommand === "version";

package/dist/parser.cjs

@@ -356,11 +356,9 @@ function buildDocPage(parser, context, args) {
 		const term = usage[i];
 		if (term.type === "exclusive") {
 			const found = findCommandInExclusive(term, arg);
-			if (found) {
-				usage.splice(i, 1, ...found);
-				i += found.length;
-			} else i++;
-		} else i++;
+			if (found) usage.splice(i, 1, ...found);
+		}
+		i++;
 	}
 	return {
 		usage,

package/dist/parser.js

@@ -356,11 +356,9 @@ function buildDocPage(parser, context, args) {
 		const term = usage[i];
 		if (term.type === "exclusive") {
 			const found = findCommandInExclusive(term, arg);
-			if (found) {
-				usage.splice(i, 1, ...found);
-				i += found.length;
-			} else i++;
-		} else i++;
+			if (found) usage.splice(i, 1, ...found);
+		}
+		i++;
 	}
 	return {
 		usage,

package/package.json

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