@optique/core 0.10.4 → 0.10.5

package/dist/doc.cjs

@@ -78,18 +78,31 @@ function formatDocPage(programName, page, options = {}) {
 				optionsSeparator: ", ",
 				maxWidth: options.maxWidth == null ? void 0 : options.maxWidth - termIndent
 			});
+			const descColumnWidth = options.maxWidth == null ? void 0 : options.maxWidth - termIndent - termWidth - 2;
 			let description = entry.description == null ? "" : require_message.formatMessage(entry.description, {
 				colors: options.colors,
 				quotes: !options.colors,
-				maxWidth: options.maxWidth == null ? void 0 : options.maxWidth - termIndent - termWidth - 2
+				maxWidth: descColumnWidth
 			});
 			if (options.showDefault && entry.default != null) {
 				const prefix = typeof options.showDefault === "object" ? options.showDefault.prefix ?? " [" : " [";
 				const suffix = typeof options.showDefault === "object" ? options.showDefault.suffix ?? "]" : "]";
-				const defaultText = `${prefix}${require_message.formatMessage(entry.default, {
+				let defaultStartWidth;
+				if (descColumnWidth != null) {
+					const lastW = lastLineVisibleLength(description);
+					if (lastW + prefix.length >= descColumnWidth) {
+						description += "\n";
+						defaultStartWidth = prefix.length;
+					} else defaultStartWidth = lastW + prefix.length;
+				}
+				const defaultFormatOptions = {
 					colors: options.colors ? { resetSuffix: "\x1B[2m" } : false,
-					quotes: !options.colors
-				})}${suffix}`;
+					quotes: !options.colors,
+					maxWidth: descColumnWidth,
+					startWidth: defaultStartWidth
+				};
+				const defaultContent = require_message.formatMessage(entry.default, defaultFormatOptions);
+				const defaultText = `${prefix}${defaultContent}${suffix}`;
 				const formattedDefault = options.colors ? `\x1b[2m${defaultText}\x1b[0m` : defaultText;
 				description += formattedDefault;
 			}
@@ -114,10 +127,22 @@ function formatDocPage(programName, page, options = {}) {
 					}
 					if (truncated) truncatedTerms = [...terms.slice(0, cutIndex), require_message.text(", ...")];
 				}
-				const choicesDisplay = require_message.formatMessage(truncatedTerms, {
+				let choicesStartWidth;
+				if (descColumnWidth != null) {
+					const lastW = lastLineVisibleLength(description);
+					const prefixLabelLen = prefix.length + label.length;
+					if (lastW + prefixLabelLen >= descColumnWidth) {
+						description += "\n";
+						choicesStartWidth = prefixLabelLen;
+					} else choicesStartWidth = lastW + prefixLabelLen;
+				}
+				const choicesFormatOptions = {
 					colors: options.colors ? { resetSuffix: "\x1B[2m" } : false,
-					quotes: false
-				});
+					quotes: false,
+					maxWidth: descColumnWidth,
+					startWidth: choicesStartWidth
+				};
+				const choicesDisplay = require_message.formatMessage(truncatedTerms, choicesFormatOptions);
 				const choicesText = `${prefix}${label}${choicesDisplay}${suffix}`;
 				const formattedChoices = options.colors ? `\x1b[2m${choicesText}\x1b[0m` : choicesText;
 				description += formattedChoices;
@@ -174,12 +199,17 @@ function formatDocPage(programName, page, options = {}) {
 function indentLines(text$1, indent) {
 	return text$1.split("\n").join("\n" + " ".repeat(indent));
 }
+const ansiEscapeCodeRegex = /\x1B\[[0-9;]*[a-zA-Z]/g;
 function ansiAwareRightPad(text$1, length, char = " ") {
-	const ansiEscapeCodeRegex = /\x1B\[[0-9;]*[a-zA-Z]/g;
 	const strippedText = text$1.replace(ansiEscapeCodeRegex, "");
 	if (strippedText.length >= length) return text$1;
 	return text$1 + char.repeat(length - strippedText.length);
 }
+function lastLineVisibleLength(text$1) {
+	const lastNewline = text$1.lastIndexOf("\n");
+	const lastLine = lastNewline === -1 ? text$1 : text$1.slice(lastNewline + 1);
+	return lastLine.replace(ansiEscapeCodeRegex, "").length;
+}
 
 //#endregion
 exports.formatDocPage = formatDocPage;

package/dist/doc.js

@@ -78,18 +78,31 @@ function formatDocPage(programName, page, options = {}) {
 				optionsSeparator: ", ",
 				maxWidth: options.maxWidth == null ? void 0 : options.maxWidth - termIndent
 			});
+			const descColumnWidth = options.maxWidth == null ? void 0 : options.maxWidth - termIndent - termWidth - 2;
 			let description = entry.description == null ? "" : formatMessage(entry.description, {
 				colors: options.colors,
 				quotes: !options.colors,
-				maxWidth: options.maxWidth == null ? void 0 : options.maxWidth - termIndent - termWidth - 2
+				maxWidth: descColumnWidth
 			});
 			if (options.showDefault && entry.default != null) {
 				const prefix = typeof options.showDefault === "object" ? options.showDefault.prefix ?? " [" : " [";
 				const suffix = typeof options.showDefault === "object" ? options.showDefault.suffix ?? "]" : "]";
-				const defaultText = `${prefix}${formatMessage(entry.default, {
+				let defaultStartWidth;
+				if (descColumnWidth != null) {
+					const lastW = lastLineVisibleLength(description);
+					if (lastW + prefix.length >= descColumnWidth) {
+						description += "\n";
+						defaultStartWidth = prefix.length;
+					} else defaultStartWidth = lastW + prefix.length;
+				}
+				const defaultFormatOptions = {
 					colors: options.colors ? { resetSuffix: "\x1B[2m" } : false,
-					quotes: !options.colors
-				})}${suffix}`;
+					quotes: !options.colors,
+					maxWidth: descColumnWidth,
+					startWidth: defaultStartWidth
+				};
+				const defaultContent = formatMessage(entry.default, defaultFormatOptions);
+				const defaultText = `${prefix}${defaultContent}${suffix}`;
 				const formattedDefault = options.colors ? `\x1b[2m${defaultText}\x1b[0m` : defaultText;
 				description += formattedDefault;
 			}
@@ -114,10 +127,22 @@ function formatDocPage(programName, page, options = {}) {
 					}
 					if (truncated) truncatedTerms = [...terms.slice(0, cutIndex), text(", ...")];
 				}
-				const choicesDisplay = formatMessage(truncatedTerms, {
+				let choicesStartWidth;
+				if (descColumnWidth != null) {
+					const lastW = lastLineVisibleLength(description);
+					const prefixLabelLen = prefix.length + label.length;
+					if (lastW + prefixLabelLen >= descColumnWidth) {
+						description += "\n";
+						choicesStartWidth = prefixLabelLen;
+					} else choicesStartWidth = lastW + prefixLabelLen;
+				}
+				const choicesFormatOptions = {
 					colors: options.colors ? { resetSuffix: "\x1B[2m" } : false,
-					quotes: false
-				});
+					quotes: false,
+					maxWidth: descColumnWidth,
+					startWidth: choicesStartWidth
+				};
+				const choicesDisplay = formatMessage(truncatedTerms, choicesFormatOptions);
 				const choicesText = `${prefix}${label}${choicesDisplay}${suffix}`;
 				const formattedChoices = options.colors ? `\x1b[2m${choicesText}\x1b[0m` : choicesText;
 				description += formattedChoices;
@@ -174,12 +199,17 @@ function formatDocPage(programName, page, options = {}) {
 function indentLines(text$1, indent) {
 	return text$1.split("\n").join("\n" + " ".repeat(indent));
 }
+const ansiEscapeCodeRegex = /\x1B\[[0-9;]*[a-zA-Z]/g;
 function ansiAwareRightPad(text$1, length, char = " ") {
-	const ansiEscapeCodeRegex = /\x1B\[[0-9;]*[a-zA-Z]/g;
 	const strippedText = text$1.replace(ansiEscapeCodeRegex, "");
 	if (strippedText.length >= length) return text$1;
 	return text$1 + char.repeat(length - strippedText.length);
 }
+function lastLineVisibleLength(text$1) {
+	const lastNewline = text$1.lastIndexOf("\n");
+	const lastLine = lastNewline === -1 ? text$1 : text$1.slice(lastNewline + 1);
+	return lastLine.replace(ansiEscapeCodeRegex, "").length;
+}
 
 //#endregion
 export { formatDocPage };

package/dist/facade.cjs

@@ -542,6 +542,9 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 				const helpAsCommand = help === "command" || help === "both";
 				const versionAsCommand = version === "command" || version === "both";
 				const completionAsCommand = completion === "command" || completion === "both";
+				const helpAsOption = help === "option" || help === "both";
+				const versionAsOption = version === "option" || version === "both";
+				const completionAsOption = completion === "option" || completion === "both";
 				const requestedCommand = classified.commands[0];
 				if ((requestedCommand === "completion" || requestedCommand === "completions") && completionAsCommand && completionParsers.completionCommand) helpGeneratorParser = completionParsers.completionCommand;
 				else if (requestedCommand === "help" && helpAsCommand && helpParsers.helpCommand) helpGeneratorParser = helpParsers.helpCommand;
@@ -560,6 +563,9 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 					commandParsers.push(...ungroupedMeta);
 					for (const [label, parsers] of Object.entries(groupedMeta)) if (parsers.length === 1) commandParsers.push(require_constructs.group(label, parsers[0]));
 					else commandParsers.push(require_constructs.group(label, require_constructs.longestMatch(...parsers)));
+					if (helpAsOption && helpParsers.helpOption) commandParsers.push(helpParsers.helpOption);
+					if (versionAsOption && versionParsers.versionOption) commandParsers.push(versionParsers.versionOption);
+					if (completionAsOption && completionParsers.completionOption) commandParsers.push(completionParsers.completionOption);
 					if (commandParsers.length === 1) helpGeneratorParser = commandParsers[0];
 					else if (commandParsers.length === 2) helpGeneratorParser = require_constructs.longestMatch(commandParsers[0], commandParsers[1]);
 					else helpGeneratorParser = require_constructs.longestMatch(...commandParsers);

package/dist/facade.js

@@ -542,6 +542,9 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 				const helpAsCommand = help === "command" || help === "both";
 				const versionAsCommand = version === "command" || version === "both";
 				const completionAsCommand = completion === "command" || completion === "both";
+				const helpAsOption = help === "option" || help === "both";
+				const versionAsOption = version === "option" || version === "both";
+				const completionAsOption = completion === "option" || completion === "both";
 				const requestedCommand = classified.commands[0];
 				if ((requestedCommand === "completion" || requestedCommand === "completions") && completionAsCommand && completionParsers.completionCommand) helpGeneratorParser = completionParsers.completionCommand;
 				else if (requestedCommand === "help" && helpAsCommand && helpParsers.helpCommand) helpGeneratorParser = helpParsers.helpCommand;
@@ -560,6 +563,9 @@ function runParser(parserOrProgram, programNameOrArgs, argsOrOptions, optionsPar
 					commandParsers.push(...ungroupedMeta);
 					for (const [label, parsers] of Object.entries(groupedMeta)) if (parsers.length === 1) commandParsers.push(group(label, parsers[0]));
 					else commandParsers.push(group(label, longestMatch(...parsers)));
+					if (helpAsOption && helpParsers.helpOption) commandParsers.push(helpParsers.helpOption);
+					if (versionAsOption && versionParsers.versionOption) commandParsers.push(versionParsers.versionOption);
+					if (completionAsOption && completionParsers.completionOption) commandParsers.push(completionParsers.completionOption);
 					if (commandParsers.length === 1) helpGeneratorParser = commandParsers[0];
 					else if (commandParsers.length === 2) helpGeneratorParser = longestMatch(commandParsers[0], commandParsers[1]);
 					else helpGeneratorParser = longestMatch(...commandParsers);

package/dist/message.cjs

@@ -237,14 +237,6 @@ function valueSet(values$1, options) {
 	});
 	return result;
 }
-/**
-* Formats a {@link Message} into a human-readable string for
-* the terminal.
-* @param msg The message to format, which is an array of
-*              {@link MessageTerm} objects.
-* @param options Optional formatting options to customize the output.
-* @returns A formatted string representation of the message.
-*/
 function formatMessage(msg, options = {}) {
 	const colorConfig = options.colors ?? false;
 	const useColors = typeof colorConfig === "boolean" ? colorConfig : true;
@@ -373,7 +365,7 @@ function formatMessage(msg, options = {}) {
 		}
 	}
 	let output = "";
-	let totalWidth = 0;
+	let totalWidth = options.startWidth ?? 0;
 	for (const { text: text$1, width } of stream()) {
 		if (width === -1) {
 			output += text$1;

package/dist/message.js

@@ -236,14 +236,6 @@ function valueSet(values$1, options) {
 	});
 	return result;
 }
-/**
-* Formats a {@link Message} into a human-readable string for
-* the terminal.
-* @param msg The message to format, which is an array of
-*              {@link MessageTerm} objects.
-* @param options Optional formatting options to customize the output.
-* @returns A formatted string representation of the message.
-*/
 function formatMessage(msg, options = {}) {
 	const colorConfig = options.colors ?? false;
 	const useColors = typeof colorConfig === "boolean" ? colorConfig : true;
@@ -372,7 +364,7 @@ function formatMessage(msg, options = {}) {
 		}
 	}
 	let output = "";
-	let totalWidth = 0;
+	let totalWidth = options.startWidth ?? 0;
 	for (const { text: text$1, width } of stream()) {
 		if (width === -1) {
 			output += text$1;

package/package.json

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