@optique/core 0.7.10-dev.283 → 0.7.11

package/dist/facade.cjs

@@ -515,6 +515,49 @@ function run(parser, programName, args, options = {}) {
 				else if (commandParsers.length === 2) helpGeneratorParser = require_constructs.longestMatch(commandParsers[0], commandParsers[1]);
 				else helpGeneratorParser = require_constructs.longestMatch(...commandParsers);
 			}
+			if (classified.commands.length > 0) {
+				let validationContext = {
+					buffer: [...classified.commands],
+					optionsTerminated: false,
+					state: helpGeneratorParser.initialState,
+					usage: helpGeneratorParser.usage
+				};
+				let commandsValid = true;
+				let validationError;
+				while (validationContext.buffer.length > 0) {
+					const stepResult = helpGeneratorParser.parse(validationContext);
+					if (!stepResult.success) {
+						commandsValid = false;
+						validationError = stepResult.error;
+						break;
+					}
+					if (stepResult.consumed.length < 1) {
+						commandsValid = false;
+						validationError = require_message.message`Unexpected option or subcommand: ${require_message.optionName(validationContext.buffer[0])}.`;
+						break;
+					}
+					validationContext = {
+						...validationContext,
+						buffer: stepResult.next.buffer,
+						optionsTerminated: stepResult.next.optionsTerminated,
+						state: stepResult.next.state,
+						usage: stepResult.next.usage ?? validationContext.usage
+					};
+				}
+				if (!commandsValid && validationError != null) {
+					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);
+				}
+			}
 			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";

package/dist/facade.js

@@ -515,6 +515,49 @@ function run(parser, programName, args, options = {}) {
 				else if (commandParsers.length === 2) helpGeneratorParser = longestMatch(commandParsers[0], commandParsers[1]);
 				else helpGeneratorParser = longestMatch(...commandParsers);
 			}
+			if (classified.commands.length > 0) {
+				let validationContext = {
+					buffer: [...classified.commands],
+					optionsTerminated: false,
+					state: helpGeneratorParser.initialState,
+					usage: helpGeneratorParser.usage
+				};
+				let commandsValid = true;
+				let validationError;
+				while (validationContext.buffer.length > 0) {
+					const stepResult = helpGeneratorParser.parse(validationContext);
+					if (!stepResult.success) {
+						commandsValid = false;
+						validationError = stepResult.error;
+						break;
+					}
+					if (stepResult.consumed.length < 1) {
+						commandsValid = false;
+						validationError = message`Unexpected option or subcommand: ${optionName(validationContext.buffer[0])}.`;
+						break;
+					}
+					validationContext = {
+						...validationContext,
+						buffer: stepResult.next.buffer,
+						optionsTerminated: stepResult.next.optionsTerminated,
+						state: stepResult.next.state,
+						usage: stepResult.next.usage ?? validationContext.usage
+					};
+				}
+				if (!commandsValid && validationError != null) {
+					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);
+				}
+			}
 			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";

package/dist/primitives.cjs

@@ -665,8 +665,16 @@ function command(name, parser, options = {}) {
 				success: false,
 				error: options.errors?.notFound ?? require_message.message`Command ${require_message.optionName(name)} was not matched.`
 			};
-			else if (state[0] === "matched") return parser.complete(parser.initialState);
-			else if (state[0] === "parsing") return parser.complete(state[1]);
+			else if (state[0] === "matched") {
+				const parseResult = parser.parse({
+					buffer: [],
+					optionsTerminated: false,
+					usage: [],
+					state: parser.initialState
+				});
+				if (parseResult.success) return parser.complete(parseResult.next.state);
+				return parser.complete(parser.initialState);
+			} else if (state[0] === "parsing") return parser.complete(state[1]);
 			return {
 				success: false,
 				error: options.errors?.invalidState ?? require_message.message`Invalid command state during completion.`

package/dist/primitives.js

@@ -665,8 +665,16 @@ function command(name, parser, options = {}) {
 				success: false,
 				error: options.errors?.notFound ?? message`Command ${optionName(name)} was not matched.`
 			};
-			else if (state[0] === "matched") return parser.complete(parser.initialState);
-			else if (state[0] === "parsing") return parser.complete(state[1]);
+			else if (state[0] === "matched") {
+				const parseResult = parser.parse({
+					buffer: [],
+					optionsTerminated: false,
+					usage: [],
+					state: parser.initialState
+				});
+				if (parseResult.success) return parser.complete(parseResult.next.state);
+				return parser.complete(parser.initialState);
+			} else if (state[0] === "parsing") return parser.complete(state[1]);
 			return {
 				success: false,
 				error: options.errors?.invalidState ?? message`Invalid command state during completion.`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "0.7.10-dev.283+51faca1f",
+  "version": "0.7.11",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",