@optique/core 0.6.7 → 0.6.9-dev.197

package/dist/constructs.cjs

@@ -647,8 +647,16 @@ function merge(...args) {
 			});
 		},
 		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

@@ -647,8 +647,16 @@ function merge(...args) {
 			});
 		},
 		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 {
@@ -84,14 +84,14 @@ function createCompletionParser(mode, programName, availableShells) {
 			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 {
@@ -84,14 +84,14 @@ function createCompletionParser(mode, programName, availableShells) {
 			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

@@ -149,16 +149,15 @@ function getDocPage(parser, args = []) {
 	}
 	if (entries.length > 0) sections.push({ entries });
 	const usage = [...require_usage.normalizeUsage(parser.usage)];
-	let i = 0;
-	for (const arg of args) {
+	for (const arg of args) for (let i = 0; i < usage.length; i++) {
 		const term = usage[i];
-		if (usage.length > i && term.type === "exclusive") for (const termGroup of term.terms) {
+		if (term.type !== "exclusive") continue;
+		for (const termGroup of term.terms) {
 			const firstTerm = termGroup[0];
 			if (firstTerm?.type !== "command" || firstTerm.name !== arg) continue;
 			usage.splice(i, 1, ...termGroup);
 			break;
 		}
-		i++;
 	}
 	return {
 		usage,

package/dist/parser.js

@@ -149,16 +149,15 @@ function getDocPage(parser, args = []) {
 	}
 	if (entries.length > 0) sections.push({ entries });
 	const usage = [...normalizeUsage(parser.usage)];
-	let i = 0;
-	for (const arg of args) {
+	for (const arg of args) for (let i = 0; i < usage.length; i++) {
 		const term = usage[i];
-		if (usage.length > i && term.type === "exclusive") for (const termGroup of term.terms) {
+		if (term.type !== "exclusive") continue;
+		for (const termGroup of term.terms) {
 			const firstTerm = termGroup[0];
 			if (firstTerm?.type !== "command" || firstTerm.name !== arg) continue;
 			usage.splice(i, 1, ...termGroup);
 			break;
 		}
-		i++;
 	}
 	return {
 		usage,

package/dist/primitives.cjs

@@ -666,7 +666,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

@@ -666,7 +666,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.6.7",
+  "version": "0.6.9-dev.197+945d8f0c",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",