@optique/core 1.1.9 → 1.1.11

package/dist/constructs.cjs

@@ -8,6 +8,7 @@ const require_internal_dependency = require('./internal/dependency.cjs');
 const require_dependency_runtime = require('./dependency-runtime.cjs');
 const require_internal_parser = require('./internal/parser.cjs');
 const require_annotation_state = require('./annotation-state.cjs');
+const require_command_doc_metadata = require('./internal/command-doc-metadata.cjs');
 const require_passthrough = require('./internal/passthrough.cjs');
 const require_command_alias = require('./internal/command-alias.cjs');
 const require_execution_context = require('./execution-context.cjs');
@@ -1350,6 +1351,7 @@ function or(...args) {
 		},
 		suggest: createExclusiveSuggest(parsers, combinedMode),
 		getDocFragments(state, _defaultValue) {
+			let commandMetadata;
 			let brief;
 			let description;
 			let footer;
@@ -1362,18 +1364,19 @@ function or(...args) {
 					state: parserResult.next.state
 				} : { kind: "unavailable" };
 				const docFragments = parsers[index].getDocFragments(innerState, void 0);
+				commandMetadata = require_command_doc_metadata.getCommandDocMetadata(docFragments);
 				brief = docFragments.brief;
 				description = docFragments.description;
 				footer = docFragments.footer;
 				fragments = docFragments.fragments;
 			}
 			if (state.kind === "unavailable" || state.state == null) fragments = require_doc.deduplicateDocFragments(fragments);
-			return {
+			return require_command_doc_metadata.withCommandDocMetadata({
 				brief,
 				description,
 				footer,
 				fragments
-			};
+			}, commandMetadata);
 		}
 	};
 	const singleDependencyMetadata = composeExclusiveDependencyMetadata(parsers);
@@ -1581,6 +1584,7 @@ function createLongestMatch(...args) {
 		},
 		suggest: createExclusiveSuggest(parsers, combinedMode),
 		getDocFragments(state, _defaultValue) {
+			let commandMetadata;
 			let brief;
 			let description;
 			let footer;
@@ -1596,6 +1600,7 @@ function createLongestMatch(...args) {
 						kind: "available",
 						state: result.next.state
 					});
+					commandMetadata = require_command_doc_metadata.getCommandDocMetadata(docResult);
 					brief = docResult.brief;
 					description = docResult.description;
 					footer = docResult.footer;
@@ -1606,12 +1611,12 @@ function createLongestMatch(...args) {
 					shouldDeduplicate = true;
 				}
 			}
-			return {
+			return require_command_doc_metadata.withCommandDocMetadata({
 				brief,
 				description,
 				fragments: shouldDeduplicate ? require_doc.deduplicateDocFragments(fragments) : fragments,
 				footer
-			};
+			}, commandMetadata);
 		}
 	};
 	const multiDependencyMetadata = composeExclusiveDependencyMetadata(parsers);
@@ -2583,12 +2588,15 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			}, () => suggestObjectAsync(context, prefix, parserPairs));
 		},
 		getDocFragments(state, defaultValue) {
+			let commandMetadata;
 			const fragments = parserPairs.flatMap(([field, p]) => {
 				const fieldState = state.kind === "unavailable" ? { kind: "unavailable" } : {
 					kind: "available",
 					state: state.state[field]
 				};
-				return p.getDocFragments(fieldState, defaultValue?.[field]).fragments;
+				const docs = p.getDocFragments(fieldState, defaultValue?.[field]);
+				commandMetadata = require_command_doc_metadata.collectCommandDocMetadata(commandMetadata, docs);
+				return docs.fragments;
 			});
 			const hiddenAwareFragments = applyHiddenToDocFragments(fragments, options.hidden);
 			const entries = hiddenAwareFragments.filter((d) => d.type === "entry");
@@ -2603,10 +2611,13 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				entries
 			};
 			sections.push(section);
-			return { fragments: sections.map((s) => ({
-				...s,
-				type: "section"
-			})) };
+			return require_command_doc_metadata.withCommandDocMetadata({
+				...commandMetadata,
+				fragments: sections.map((s) => ({
+					...s,
+					type: "section"
+				}))
+			}, commandMetadata);
 		}
 	};
 	const fieldNormalizers = [];
@@ -3599,12 +3610,15 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			return require_mode_dispatch.dispatchIterableByMode(combinedMode, () => suggestTupleSync(context, prefix, syncParsers), () => suggestTupleAsync(context, prefix, parsers));
 		},
 		getDocFragments(state, defaultValue) {
+			let commandMetadata;
 			const fragments = syncParsers.flatMap((p, i) => {
 				const indexState = state.kind === "unavailable" ? { kind: "unavailable" } : {
 					kind: "available",
 					state: state.state[i]
 				};
-				return p.getDocFragments(indexState, defaultValue?.[i]).fragments;
+				const docs = p.getDocFragments(indexState, defaultValue?.[i]);
+				commandMetadata = require_command_doc_metadata.collectCommandDocMetadata(commandMetadata, docs);
+				return docs.fragments;
 			});
 			const entries = fragments.filter((d) => d.type === "entry");
 			const sections = [];
@@ -3618,10 +3632,13 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				entries
 			};
 			sections.push(section);
-			return { fragments: sections.map((s) => ({
-				...s,
-				type: "section"
-			})) };
+			return require_command_doc_metadata.withCommandDocMetadata({
+				...commandMetadata,
+				fragments: sections.map((s) => ({
+					...s,
+					type: "section"
+				}))
+			}, commandMetadata);
 		},
 		[Symbol.for("Deno.customInspect")]() {
 			const parsersStr = parsers.length === 1 ? `[1 parser]` : `[${parsers.length} parsers]`;
@@ -4847,6 +4864,7 @@ function merge(...args) {
 			}();
 		},
 		getDocFragments(state, _defaultValue) {
+			let commandMetadata;
 			let brief;
 			let description;
 			let footer;
@@ -4864,6 +4882,7 @@ function merge(...args) {
 					state: state.state
 				};
 				const docFragments = p.getDocFragments(parserState, void 0);
+				commandMetadata = require_command_doc_metadata.collectCommandDocMetadata(commandMetadata, docFragments, true);
 				brief ??= docFragments.brief;
 				description ??= docFragments.description;
 				footer ??= docFragments.footer;
@@ -4883,7 +4902,7 @@ function merge(...args) {
 					entries
 				};
 				sections.push(labeledSection);
-				return {
+				return require_command_doc_metadata.withCommandDocMetadata({
 					brief,
 					description,
 					footer,
@@ -4891,9 +4910,9 @@ function merge(...args) {
 						...s,
 						type: "section"
 					}))
-				};
+				}, commandMetadata);
 			}
-			return {
+			return require_command_doc_metadata.withCommandDocMetadata({
 				brief,
 				description,
 				footer,
@@ -4904,7 +4923,7 @@ function merge(...args) {
 					type: "section",
 					entries
 				}]
-			};
+			}, commandMetadata);
 		}
 	};
 	require_internal_parser.defineParseLanes(mergeParser, mergeParseLanes);
@@ -5520,12 +5539,15 @@ function concat(...parsers) {
 			}();
 		},
 		getDocFragments(state, _defaultValue) {
+			let commandMetadata;
 			const fragments = syncParsers.flatMap((p, index) => {
 				const indexState = state.kind === "unavailable" ? { kind: "unavailable" } : {
 					kind: "available",
 					state: state.state[index]
 				};
-				return p.getDocFragments(indexState, void 0).fragments;
+				const docs = p.getDocFragments(indexState, void 0);
+				commandMetadata = require_command_doc_metadata.collectCommandDocMetadata(commandMetadata, docs);
+				return docs.fragments;
 			});
 			const entries = fragments.filter((f) => f.type === "entry");
 			const sections = [];
@@ -5542,7 +5564,10 @@ function concat(...parsers) {
 				type: "section",
 				entries
 			});
-			return { fragments: result };
+			return require_command_doc_metadata.withCommandDocMetadata({
+				...commandMetadata,
+				fragments: result
+			}, commandMetadata);
 		}
 	};
 	require_internal_parser.defineInheritedAnnotationParser(concatParser);
@@ -5578,7 +5603,8 @@ function group(label, parser, options = {}) {
 			return parser.suggest(context, prefix);
 		},
 		getDocFragments: (state, defaultValue) => {
-			const { brief, description, footer, fragments } = parser.getDocFragments(state, defaultValue);
+			const docs = parser.getDocFragments(state, defaultValue);
+			const { brief, description, footer, fragments } = docs;
 			const hiddenAwareFragments = applyHiddenToDocFragments(fragments, options.hidden);
 			const allEntries = [];
 			const titledSections = [];
@@ -5601,7 +5627,7 @@ function group(label, parser, options = {}) {
 				title: label,
 				entries: allEntries
 			} : { entries: allEntries };
-			return {
+			return require_command_doc_metadata.withCommandDocMetadata({
 				brief,
 				description,
 				footer,
@@ -5612,7 +5638,7 @@ function group(label, parser, options = {}) {
 					type: "section",
 					...labeledSection
 				}]
-			};
+			}, require_command_doc_metadata.getCommandDocMetadata(docs));
 		}
 	};
 	require_internal_parser.defineParseLanes(groupParser, require_internal_parser.getOwnParseLanes(parser));

package/dist/constructs.js

@@ -8,6 +8,7 @@ import { createDependencySourceState, dependencyId, isDependencySourceState, isP
 import { buildRuntimeNodesFromArray, buildRuntimeNodesFromPairs, collectExplicitSourceValues, collectExplicitSourceValuesAsync, collectSourcesFromState, createDependencyRuntimeContext, fillMissingSourceDefaults, fillMissingSourceDefaultsAsync, resolveStateWithRuntime, resolveStateWithRuntimeAsync } from "./dependency-runtime.js";
 import { defineInheritedAnnotationParser, defineParseLanes, getOwnParseLanes, getParserSuggestRuntimeNodes, unmatchedNonCliDependencySourceStateMarker } from "./internal/parser.js";
 import { annotationViewTargets, getWrappedChildParseState, getWrappedChildState, reconcileObjectChildState, unwrapAnnotationView } from "./annotation-state.js";
+import { collectCommandDocMetadata, getCommandDocMetadata, withCommandDocMetadata } from "./internal/command-doc-metadata.js";
 import { combineOptionMatches, combinePassThroughPriorities, defineOptionMatch, definePassThroughPriority, delegateKnownCompletion, getKnownCompletion, getOptionMatch, getPassThroughFailureHint, getPassThroughPriority, hasPassThroughUsage, matchesOptionToken, retainConsumingFailure, retainConsumingFailureHint, withPassThroughFailure } from "./internal/passthrough.js";
 import { allowDuplicateLeadingCommandNamesKey } from "./internal/command-alias.js";
 import { mergeChildExec, withChildContext, withChildExecPath } from "./execution-context.js";
@@ -1350,6 +1351,7 @@ function or(...args) {
 		},
 		suggest: createExclusiveSuggest(parsers, combinedMode),
 		getDocFragments(state, _defaultValue) {
+			let commandMetadata;
 			let brief;
 			let description;
 			let footer;
@@ -1362,18 +1364,19 @@ function or(...args) {
 					state: parserResult.next.state
 				} : { kind: "unavailable" };
 				const docFragments = parsers[index].getDocFragments(innerState, void 0);
+				commandMetadata = getCommandDocMetadata(docFragments);
 				brief = docFragments.brief;
 				description = docFragments.description;
 				footer = docFragments.footer;
 				fragments = docFragments.fragments;
 			}
 			if (state.kind === "unavailable" || state.state == null) fragments = deduplicateDocFragments(fragments);
-			return {
+			return withCommandDocMetadata({
 				brief,
 				description,
 				footer,
 				fragments
-			};
+			}, commandMetadata);
 		}
 	};
 	const singleDependencyMetadata = composeExclusiveDependencyMetadata(parsers);
@@ -1581,6 +1584,7 @@ function createLongestMatch(...args) {
 		},
 		suggest: createExclusiveSuggest(parsers, combinedMode),
 		getDocFragments(state, _defaultValue) {
+			let commandMetadata;
 			let brief;
 			let description;
 			let footer;
@@ -1596,6 +1600,7 @@ function createLongestMatch(...args) {
 						kind: "available",
 						state: result.next.state
 					});
+					commandMetadata = getCommandDocMetadata(docResult);
 					brief = docResult.brief;
 					description = docResult.description;
 					footer = docResult.footer;
@@ -1606,12 +1611,12 @@ function createLongestMatch(...args) {
 					shouldDeduplicate = true;
 				}
 			}
-			return {
+			return withCommandDocMetadata({
 				brief,
 				description,
 				fragments: shouldDeduplicate ? deduplicateDocFragments(fragments) : fragments,
 				footer
-			};
+			}, commandMetadata);
 		}
 	};
 	const multiDependencyMetadata = composeExclusiveDependencyMetadata(parsers);
@@ -2583,12 +2588,15 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			}, () => suggestObjectAsync(context, prefix, parserPairs));
 		},
 		getDocFragments(state, defaultValue) {
+			let commandMetadata;
 			const fragments = parserPairs.flatMap(([field, p]) => {
 				const fieldState = state.kind === "unavailable" ? { kind: "unavailable" } : {
 					kind: "available",
 					state: state.state[field]
 				};
-				return p.getDocFragments(fieldState, defaultValue?.[field]).fragments;
+				const docs = p.getDocFragments(fieldState, defaultValue?.[field]);
+				commandMetadata = collectCommandDocMetadata(commandMetadata, docs);
+				return docs.fragments;
 			});
 			const hiddenAwareFragments = applyHiddenToDocFragments(fragments, options.hidden);
 			const entries = hiddenAwareFragments.filter((d) => d.type === "entry");
@@ -2603,10 +2611,13 @@ function object(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				entries
 			};
 			sections.push(section);
-			return { fragments: sections.map((s) => ({
-				...s,
-				type: "section"
-			})) };
+			return withCommandDocMetadata({
+				...commandMetadata,
+				fragments: sections.map((s) => ({
+					...s,
+					type: "section"
+				}))
+			}, commandMetadata);
 		}
 	};
 	const fieldNormalizers = [];
@@ -3599,12 +3610,15 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 			return dispatchIterableByMode(combinedMode, () => suggestTupleSync(context, prefix, syncParsers), () => suggestTupleAsync(context, prefix, parsers));
 		},
 		getDocFragments(state, defaultValue) {
+			let commandMetadata;
 			const fragments = syncParsers.flatMap((p, i) => {
 				const indexState = state.kind === "unavailable" ? { kind: "unavailable" } : {
 					kind: "available",
 					state: state.state[i]
 				};
-				return p.getDocFragments(indexState, defaultValue?.[i]).fragments;
+				const docs = p.getDocFragments(indexState, defaultValue?.[i]);
+				commandMetadata = collectCommandDocMetadata(commandMetadata, docs);
+				return docs.fragments;
 			});
 			const entries = fragments.filter((d) => d.type === "entry");
 			const sections = [];
@@ -3618,10 +3632,13 @@ function tuple(labelOrParsers, maybeParsersOrOptions, maybeOptions) {
 				entries
 			};
 			sections.push(section);
-			return { fragments: sections.map((s) => ({
-				...s,
-				type: "section"
-			})) };
+			return withCommandDocMetadata({
+				...commandMetadata,
+				fragments: sections.map((s) => ({
+					...s,
+					type: "section"
+				}))
+			}, commandMetadata);
 		},
 		[Symbol.for("Deno.customInspect")]() {
 			const parsersStr = parsers.length === 1 ? `[1 parser]` : `[${parsers.length} parsers]`;
@@ -4847,6 +4864,7 @@ function merge(...args) {
 			}();
 		},
 		getDocFragments(state, _defaultValue) {
+			let commandMetadata;
 			let brief;
 			let description;
 			let footer;
@@ -4864,6 +4882,7 @@ function merge(...args) {
 					state: state.state
 				};
 				const docFragments = p.getDocFragments(parserState, void 0);
+				commandMetadata = collectCommandDocMetadata(commandMetadata, docFragments, true);
 				brief ??= docFragments.brief;
 				description ??= docFragments.description;
 				footer ??= docFragments.footer;
@@ -4883,7 +4902,7 @@ function merge(...args) {
 					entries
 				};
 				sections.push(labeledSection);
-				return {
+				return withCommandDocMetadata({
 					brief,
 					description,
 					footer,
@@ -4891,9 +4910,9 @@ function merge(...args) {
 						...s,
 						type: "section"
 					}))
-				};
+				}, commandMetadata);
 			}
-			return {
+			return withCommandDocMetadata({
 				brief,
 				description,
 				footer,
@@ -4904,7 +4923,7 @@ function merge(...args) {
 					type: "section",
 					entries
 				}]
-			};
+			}, commandMetadata);
 		}
 	};
 	defineParseLanes(mergeParser, mergeParseLanes);
@@ -5520,12 +5539,15 @@ function concat(...parsers) {
 			}();
 		},
 		getDocFragments(state, _defaultValue) {
+			let commandMetadata;
 			const fragments = syncParsers.flatMap((p, index) => {
 				const indexState = state.kind === "unavailable" ? { kind: "unavailable" } : {
 					kind: "available",
 					state: state.state[index]
 				};
-				return p.getDocFragments(indexState, void 0).fragments;
+				const docs = p.getDocFragments(indexState, void 0);
+				commandMetadata = collectCommandDocMetadata(commandMetadata, docs);
+				return docs.fragments;
 			});
 			const entries = fragments.filter((f) => f.type === "entry");
 			const sections = [];
@@ -5542,7 +5564,10 @@ function concat(...parsers) {
 				type: "section",
 				entries
 			});
-			return { fragments: result };
+			return withCommandDocMetadata({
+				...commandMetadata,
+				fragments: result
+			}, commandMetadata);
 		}
 	};
 	defineInheritedAnnotationParser(concatParser);
@@ -5578,7 +5603,8 @@ function group(label, parser, options = {}) {
 			return parser.suggest(context, prefix);
 		},
 		getDocFragments: (state, defaultValue) => {
-			const { brief, description, footer, fragments } = parser.getDocFragments(state, defaultValue);
+			const docs = parser.getDocFragments(state, defaultValue);
+			const { brief, description, footer, fragments } = docs;
 			const hiddenAwareFragments = applyHiddenToDocFragments(fragments, options.hidden);
 			const allEntries = [];
 			const titledSections = [];
@@ -5601,7 +5627,7 @@ function group(label, parser, options = {}) {
 				title: label,
 				entries: allEntries
 			} : { entries: allEntries };
-			return {
+			return withCommandDocMetadata({
 				brief,
 				description,
 				footer,
@@ -5612,7 +5638,7 @@ function group(label, parser, options = {}) {
 					type: "section",
 					...labeledSection
 				}]
-			};
+			}, getCommandDocMetadata(docs));
 		}
 	};
 	defineParseLanes(groupParser, getOwnParseLanes(parser));

package/dist/displaywidth.cjs

@@ -16,6 +16,17 @@ function getDisplayWidth(text) {
 	for (const { segment } of segmenter.segment(stripped)) width += graphemeWidth(segment);
 	return width;
 }
+/**
+* Removes ANSI escape sequences (CSI and OSC) from a string, leaving only
+* the text a terminal would print.
+*
+* @param text The string to strip.
+* @returns The string without ANSI escape sequences.
+* @internal
+*/
+function stripAnsi(text) {
+	return text.replace(ansiRegex, "");
+}
 const zeroWidthRegex = /^[\p{Cf}\p{Mn}\p{Me}]+$/u;
 const emojiPresentationRegex = /\p{Emoji_Presentation}/u;
 const emojiWithVS16Regex = /\p{Emoji}\uFE0F/u;
@@ -41,4 +52,5 @@ function isEastAsianWide(cp) {
 }
 
 //#endregion
-exports.getDisplayWidth = getDisplayWidth;
+exports.getDisplayWidth = getDisplayWidth;
+exports.stripAnsi = stripAnsi;

package/dist/displaywidth.d.cts

@@ -8,5 +8,14 @@
  * @internal
  */
 declare function getDisplayWidth(text: string): number;
+/**
+ * Removes ANSI escape sequences (CSI and OSC) from a string, leaving only
+ * the text a terminal would print.
+ *
+ * @param text The string to strip.
+ * @returns The string without ANSI escape sequences.
+ * @internal
+ */
+declare function stripAnsi(text: string): string;
 //#endregion
-export { getDisplayWidth };
+export { getDisplayWidth, stripAnsi };

package/dist/displaywidth.d.ts

@@ -8,5 +8,14 @@
  * @internal
  */
 declare function getDisplayWidth(text: string): number;
+/**
+ * Removes ANSI escape sequences (CSI and OSC) from a string, leaving only
+ * the text a terminal would print.
+ *
+ * @param text The string to strip.
+ * @returns The string without ANSI escape sequences.
+ * @internal
+ */
+declare function stripAnsi(text: string): string;
 //#endregion
-export { getDisplayWidth };
+export { getDisplayWidth, stripAnsi };

package/dist/displaywidth.js

@@ -15,6 +15,17 @@ function getDisplayWidth(text) {
 	for (const { segment } of segmenter.segment(stripped)) width += graphemeWidth(segment);
 	return width;
 }
+/**
+* Removes ANSI escape sequences (CSI and OSC) from a string, leaving only
+* the text a terminal would print.
+*
+* @param text The string to strip.
+* @returns The string without ANSI escape sequences.
+* @internal
+*/
+function stripAnsi(text) {
+	return text.replace(ansiRegex, "");
+}
 const zeroWidthRegex = /^[\p{Cf}\p{Mn}\p{Me}]+$/u;
 const emojiPresentationRegex = /\p{Emoji_Presentation}/u;
 const emojiWithVS16Regex = /\p{Emoji}\uFE0F/u;
@@ -40,4 +51,4 @@ function isEastAsianWide(cp) {
 }
 
 //#endregion
-export { getDisplayWidth };
+export { getDisplayWidth, stripAnsi };

package/dist/doc.cjs

@@ -341,13 +341,15 @@ function formatDocPage(programName, page, options = {}) {
 				const suffix = typeof options.showDefault === "object" ? options.showDefault.suffix ?? "]" : "]";
 				const prefixWidth = require_displaywidth.getDisplayWidth(prefix);
 				const suffixWidth = require_displaywidth.getDisplayWidth(suffix);
+				let defaultPrefix = prefix;
 				let defaultStartWidth;
 				if (descColumnWidth != null) {
 					const lastW = lastLineVisibleLength(description);
 					const effectiveLastW = lastW + currentExtraOffset();
 					if (effectiveLastW + prefixWidth >= descColumnWidth) {
 						description += "\n";
-						defaultStartWidth = prefixWidth;
+						defaultPrefix = prefix.trimStart();
+						defaultStartWidth = require_displaywidth.getDisplayWidth(defaultPrefix);
 					} else defaultStartWidth = effectiveLastW + prefixWidth;
 				}
 				const defaultFormatOptions = {
@@ -357,7 +359,7 @@ function formatDocPage(programName, page, options = {}) {
 					startWidth: defaultStartWidth
 				};
 				const defaultContent = require_message.formatMessage(entry.default, defaultFormatOptions);
-				const defaultText = `${prefix}${defaultContent}${suffix}`;
+				const defaultText = `${defaultPrefix}${defaultContent}${suffix}`;
 				const formattedDefault = options.colors ? `\x1b[2m${defaultText}\x1b[0m` : defaultText;
 				description += formattedDefault;
 			}
@@ -385,6 +387,7 @@ function formatDocPage(programName, page, options = {}) {
 				const choicesPrefixWidth = require_displaywidth.getDisplayWidth(prefix);
 				const choicesSuffixWidth = require_displaywidth.getDisplayWidth(suffix);
 				const choicesLabelWidth = require_displaywidth.getDisplayWidth(label);
+				let choicesHeading = `${prefix}${label}`;
 				let choicesStartWidth;
 				if (descColumnWidth != null) {
 					const lastW = lastLineVisibleLength(description);
@@ -392,7 +395,8 @@ function formatDocPage(programName, page, options = {}) {
 					const prefixLabelLen = choicesPrefixWidth + choicesLabelWidth;
 					if (effectiveLastW + prefixLabelLen >= descColumnWidth) {
 						description += "\n";
-						choicesStartWidth = prefixLabelLen;
+						choicesHeading = choicesHeading.trimStart();
+						choicesStartWidth = require_displaywidth.getDisplayWidth(choicesHeading);
 					} else choicesStartWidth = effectiveLastW + prefixLabelLen;
 				}
 				const choicesFormatOptions = {
@@ -402,7 +406,7 @@ function formatDocPage(programName, page, options = {}) {
 					startWidth: choicesStartWidth
 				};
 				const choicesDisplay = require_message.formatMessage(truncatedTerms, choicesFormatOptions);
-				const choicesText = `${prefix}${label}${choicesDisplay}${suffix}`;
+				const choicesText = `${choicesHeading}${choicesDisplay}${suffix}`;
 				const formattedChoices = options.colors ? `\x1b[2m${choicesText}\x1b[0m` : choicesText;
 				description += formattedChoices;
 			}

package/dist/doc.js

@@ -341,13 +341,15 @@ function formatDocPage(programName, page, options = {}) {
 				const suffix = typeof options.showDefault === "object" ? options.showDefault.suffix ?? "]" : "]";
 				const prefixWidth = getDisplayWidth(prefix);
 				const suffixWidth = getDisplayWidth(suffix);
+				let defaultPrefix = prefix;
 				let defaultStartWidth;
 				if (descColumnWidth != null) {
 					const lastW = lastLineVisibleLength(description);
 					const effectiveLastW = lastW + currentExtraOffset();
 					if (effectiveLastW + prefixWidth >= descColumnWidth) {
 						description += "\n";
-						defaultStartWidth = prefixWidth;
+						defaultPrefix = prefix.trimStart();
+						defaultStartWidth = getDisplayWidth(defaultPrefix);
 					} else defaultStartWidth = effectiveLastW + prefixWidth;
 				}
 				const defaultFormatOptions = {
@@ -357,7 +359,7 @@ function formatDocPage(programName, page, options = {}) {
 					startWidth: defaultStartWidth
 				};
 				const defaultContent = formatMessage(entry.default, defaultFormatOptions);
-				const defaultText = `${prefix}${defaultContent}${suffix}`;
+				const defaultText = `${defaultPrefix}${defaultContent}${suffix}`;
 				const formattedDefault = options.colors ? `\x1b[2m${defaultText}\x1b[0m` : defaultText;
 				description += formattedDefault;
 			}
@@ -385,6 +387,7 @@ function formatDocPage(programName, page, options = {}) {
 				const choicesPrefixWidth = getDisplayWidth(prefix);
 				const choicesSuffixWidth = getDisplayWidth(suffix);
 				const choicesLabelWidth = getDisplayWidth(label);
+				let choicesHeading = `${prefix}${label}`;
 				let choicesStartWidth;
 				if (descColumnWidth != null) {
 					const lastW = lastLineVisibleLength(description);
@@ -392,7 +395,8 @@ function formatDocPage(programName, page, options = {}) {
 					const prefixLabelLen = choicesPrefixWidth + choicesLabelWidth;
 					if (effectiveLastW + prefixLabelLen >= descColumnWidth) {
 						description += "\n";
-						choicesStartWidth = prefixLabelLen;
+						choicesHeading = choicesHeading.trimStart();
+						choicesStartWidth = getDisplayWidth(choicesHeading);
 					} else choicesStartWidth = effectiveLastW + prefixLabelLen;
 				}
 				const choicesFormatOptions = {
@@ -402,7 +406,7 @@ function formatDocPage(programName, page, options = {}) {
 					startWidth: choicesStartWidth
 				};
 				const choicesDisplay = formatMessage(truncatedTerms, choicesFormatOptions);
-				const choicesText = `${prefix}${label}${choicesDisplay}${suffix}`;
+				const choicesText = `${choicesHeading}${choicesDisplay}${suffix}`;
 				const formattedChoices = options.colors ? `\x1b[2m${choicesText}\x1b[0m` : choicesText;
 				description += formattedChoices;
 			}