@optique/core 0.8.3 → 0.8.5

package/dist/constructs.cjs

@@ -760,8 +760,16 @@ function merge(...args) {
 			return require_suggestion.deduplicateSuggestions(suggestions);
 		},
 		getDocFragments(state, _defaultValue) {
-			const fragments = parsers.flatMap((p) => {
-				const parserState = p.initialState === void 0 ? { kind: "unavailable" } : state.kind === "unavailable" ? { kind: "unavailable" } : {
+			const fragments = parsers.flatMap((p, i) => {
+				let parserState;
+				if (p.initialState === void 0) {
+					const key = `__parser_${i}`;
+					if (state.kind === "available" && state.state && typeof state.state === "object" && key in state.state) parserState = {
+						kind: "available",
+						state: state.state[key]
+					};
+					else parserState = { kind: "unavailable" };
+				} else parserState = state.kind === "unavailable" ? { kind: "unavailable" } : {
 					kind: "available",
 					state: state.state
 				};

package/dist/constructs.js

@@ -760,8 +760,16 @@ function merge(...args) {
 			return deduplicateSuggestions(suggestions);
 		},
 		getDocFragments(state, _defaultValue) {
-			const fragments = parsers.flatMap((p) => {
-				const parserState = p.initialState === void 0 ? { kind: "unavailable" } : state.kind === "unavailable" ? { kind: "unavailable" } : {
+			const fragments = parsers.flatMap((p, i) => {
+				let parserState;
+				if (p.initialState === void 0) {
+					const key = `__parser_${i}`;
+					if (state.kind === "available" && state.state && typeof state.state === "object" && key in state.state) parserState = {
+						kind: "available",
+						state: state.state[key]
+					};
+					else parserState = { kind: "unavailable" };
+				} else parserState = state.kind === "unavailable" ? { kind: "unavailable" } : {
 					kind: "available",
 					state: state.state
 				};

package/dist/facade.cjs

@@ -13,7 +13,7 @@ const require_parser = require('./parser.cjs');
 * Creates help parsers based on the specified mode.
 */
 function createHelpParser(mode) {
-	const helpCommand = require_primitives.command("help", require_modifiers.multiple(require_primitives.argument(require_valueparser.string({ metavar: "COMMAND" }))), { description: require_message.message`Show help information.` });
+	const helpCommand = require_primitives.command("help", require_modifiers.multiple(require_primitives.argument(require_valueparser.string({ metavar: "COMMAND" }), { description: require_message.message`Command name to show help for.` })), { description: require_message.message`Show help information.` });
 	const helpOption = require_primitives.flag("--help", { description: require_message.message`Show help information.` });
 	switch (mode) {
 		case "command": return {
@@ -98,14 +98,14 @@ function createCompletionParser(mode, programName, availableShells, name = "both
 			completionCommand: null,
 			completionOption: require_constructs.object({
 				shell: completionOption,
-				args: require_modifiers.withDefault(require_modifiers.multiple(require_primitives.argument(require_valueparser.string({ metavar: "ARG" }))), [])
+				args: require_modifiers.withDefault(require_modifiers.multiple(require_primitives.argument(require_valueparser.string({ metavar: "ARG" }), { description: require_message.message`Command line arguments for completion suggestions (used by shell integration; you usually don't need to provide this).` })), [])
 			})
 		};
 		case "both": return {
 			completionCommand,
 			completionOption: require_constructs.object({
 				shell: completionOption,
-				args: require_modifiers.withDefault(require_modifiers.multiple(require_primitives.argument(require_valueparser.string({ metavar: "ARG" }))), [])
+				args: require_modifiers.withDefault(require_modifiers.multiple(require_primitives.argument(require_valueparser.string({ metavar: "ARG" }), { description: require_message.message`Command line arguments for completion suggestions (used by shell integration; you usually don't need to provide this).` })), [])
 			})
 		};
 	}

package/dist/facade.js

@@ -13,7 +13,7 @@ import { getDocPage, parse, suggest } from "./parser.js";
 * Creates help parsers based on the specified mode.
 */
 function createHelpParser(mode) {
-	const helpCommand = command("help", multiple(argument(string({ metavar: "COMMAND" }))), { description: message`Show help information.` });
+	const helpCommand = command("help", multiple(argument(string({ metavar: "COMMAND" }), { description: message`Command name to show help for.` })), { description: message`Show help information.` });
 	const helpOption = flag("--help", { description: message`Show help information.` });
 	switch (mode) {
 		case "command": return {
@@ -98,14 +98,14 @@ function createCompletionParser(mode, programName, availableShells, name = "both
 			completionCommand: null,
 			completionOption: object({
 				shell: completionOption,
-				args: withDefault(multiple(argument(string({ metavar: "ARG" }))), [])
+				args: withDefault(multiple(argument(string({ metavar: "ARG" }), { description: message`Command line arguments for completion suggestions (used by shell integration; you usually don't need to provide this).` })), [])
 			})
 		};
 		case "both": return {
 			completionCommand,
 			completionOption: object({
 				shell: completionOption,
-				args: withDefault(multiple(argument(string({ metavar: "ARG" }))), [])
+				args: withDefault(multiple(argument(string({ metavar: "ARG" }), { description: message`Command line arguments for completion suggestions (used by shell integration; you usually don't need to provide this).` })), [])
 			})
 		};
 	}

package/dist/parser.cjs

@@ -95,6 +95,26 @@ function suggest(parser, args) {
 	return Array.from(parser.suggest(context, prefix));
 }
 /**
+* Recursively searches for a command within nested exclusive usage terms.
+* When the command is found, returns the expanded usage terms for that command.
+*
+* @param term The usage term to search in
+* @param commandName The command name to find
+* @returns The expanded usage terms if found, null otherwise
+*/
+function findCommandInExclusive(term, commandName) {
+	if (term.type !== "exclusive") return null;
+	for (const termGroup of term.terms) {
+		const firstTerm = termGroup[0];
+		if (firstTerm?.type === "command" && firstTerm.name === commandName) return termGroup;
+		if (firstTerm?.type === "exclusive") {
+			const found = findCommandInExclusive(firstTerm, commandName);
+			if (found) return [...found, ...termGroup.slice(1)];
+		}
+	}
+	return null;
+}
+/**
 * Generates a documentation page for a parser based on its current state after
 * attempting to parse the provided arguments. This function is useful for
 * creating help documentation that reflects the current parsing context.
@@ -157,14 +177,11 @@ function getDocPage(parser, args = []) {
 		if (i >= usage.length) break;
 		const term = usage[i];
 		if (term.type === "exclusive") {
-			for (const termGroup of term.terms) {
-				const firstTerm = termGroup[0];
-				if (firstTerm?.type !== "command" || firstTerm.name !== arg) continue;
-				usage.splice(i, 1, ...termGroup);
-				i += termGroup.length;
-				break;
-			}
-			if (usage[i] === term) i++;
+			const found = findCommandInExclusive(term, arg);
+			if (found) {
+				usage.splice(i, 1, ...found);
+				i += found.length;
+			} else i++;
 		} else i++;
 	}
 	return {

package/dist/parser.js

@@ -95,6 +95,26 @@ function suggest(parser, args) {
 	return Array.from(parser.suggest(context, prefix));
 }
 /**
+* Recursively searches for a command within nested exclusive usage terms.
+* When the command is found, returns the expanded usage terms for that command.
+*
+* @param term The usage term to search in
+* @param commandName The command name to find
+* @returns The expanded usage terms if found, null otherwise
+*/
+function findCommandInExclusive(term, commandName) {
+	if (term.type !== "exclusive") return null;
+	for (const termGroup of term.terms) {
+		const firstTerm = termGroup[0];
+		if (firstTerm?.type === "command" && firstTerm.name === commandName) return termGroup;
+		if (firstTerm?.type === "exclusive") {
+			const found = findCommandInExclusive(firstTerm, commandName);
+			if (found) return [...found, ...termGroup.slice(1)];
+		}
+	}
+	return null;
+}
+/**
 * Generates a documentation page for a parser based on its current state after
 * attempting to parse the provided arguments. This function is useful for
 * creating help documentation that reflects the current parsing context.
@@ -157,14 +177,11 @@ function getDocPage(parser, args = []) {
 		if (i >= usage.length) break;
 		const term = usage[i];
 		if (term.type === "exclusive") {
-			for (const termGroup of term.terms) {
-				const firstTerm = termGroup[0];
-				if (firstTerm?.type !== "command" || firstTerm.name !== arg) continue;
-				usage.splice(i, 1, ...termGroup);
-				i += termGroup.length;
-				break;
-			}
-			if (usage[i] === term) i++;
+			const found = findCommandInExclusive(term, arg);
+			if (found) {
+				usage.splice(i, 1, ...found);
+				i += found.length;
+			} else i++;
 		} else i++;
 	}
 	return {

package/dist/primitives.cjs

@@ -710,7 +710,10 @@ function command(name, parser, options = {}) {
 			const innerState = state.state[0] === "parsing" ? {
 				kind: "available",
 				state: state.state[1]
-			} : { kind: "unavailable" };
+			} : {
+				kind: "available",
+				state: parser.initialState
+			};
 			const innerFragments = parser.getDocFragments(innerState, defaultValue);
 			return {
 				...innerFragments,

package/dist/primitives.js

@@ -710,7 +710,10 @@ function command(name, parser, options = {}) {
 			const innerState = state.state[0] === "parsing" ? {
 				kind: "available",
 				state: state.state[1]
-			} : { kind: "unavailable" };
+			} : {
+				kind: "available",
+				state: parser.initialState
+			};
 			const innerFragments = parser.getDocFragments(innerState, defaultValue);
 			return {
 				...innerFragments,

package/package.json

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