@optique/core 0.8.9-dev.349 → 0.8.10

package/dist/constructs.cjs

@@ -238,7 +238,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 +250,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 +263,9 @@ function or(...args) {
 				else sections.push(fragment);
 			}
 			return {
+				brief,
 				description,
+				footer,
 				fragments: [...sections.map((s) => ({
 					...s,
 					type: "section"
@@ -333,6 +339,7 @@ function longestMatch(...args) {
 		},
 		suggest: createExclusiveSuggest(parsers),
 		getDocFragments(state, _defaultValue) {
+			let brief;
 			let description;
 			let footer;
 			let fragments;
@@ -344,12 +351,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

@@ -238,7 +238,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 +250,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 +263,9 @@ function or(...args) {
 				else sections.push(fragment);
 			}
 			return {
+				brief,
 				description,
+				footer,
 				fragments: [...sections.map((s) => ({
 					...s,
 					type: "section"
@@ -333,6 +339,7 @@ function longestMatch(...args) {
 		},
 		suggest: createExclusiveSuggest(parsers),
 		getDocFragments(state, _defaultValue) {
+			let brief;
 			let description;
 			let footer;
 			let fragments;
@@ -344,12 +351,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

@@ -515,14 +515,59 @@ 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";
+				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

@@ -515,14 +515,59 @@ 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";
+				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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "0.8.9-dev.349+356beecf",
+  "version": "0.8.10",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",