@optique/core 1.0.0-dev.1590 → 1.0.0-dev.1598

package/dist/displaywidth.cjs

@@ -0,0 +1,44 @@
+
+//#region src/displaywidth.ts
+const ansiRegex = /\x1B(?:\[[0-9;:]*[@-~]|\][^\x1B\x07]*(?:\x1B\\|\x07))/g;
+const segmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+/**
+* Computes the terminal display width of a string, accounting for
+* East Asian wide characters, combining marks, emoji, and ANSI escapes.
+*
+* @param text The string to measure.
+* @returns The number of terminal columns the string occupies.
+* @internal
+*/
+function getDisplayWidth(text) {
+	const stripped = text.replace(ansiRegex, "");
+	let width = 0;
+	for (const { segment } of segmenter.segment(stripped)) width += graphemeWidth(segment);
+	return width;
+}
+const zeroWidthRegex = /^[\p{Cf}\p{Mn}\p{Me}]+$/u;
+const emojiPresentationRegex = /\p{Emoji_Presentation}/u;
+const emojiWithVS16Regex = /\p{Emoji}\uFE0F/u;
+const keycapEmojiRegex = /^[#*0-9]\uFE0F?\u20E3$/u;
+const textPresentationRegex = /\uFE0E/u;
+const regionalIndicatorRegex = /[\u{1F1E6}-\u{1F1FF}]/u;
+function graphemeWidth(grapheme) {
+	const cp = grapheme.codePointAt(0);
+	if (cp == null) return 0;
+	if (cp === 9) return 1;
+	if (cp < 32 || cp >= 127 && cp < 160) return 0;
+	if (zeroWidthRegex.test(grapheme)) return 0;
+	if (keycapEmojiRegex.test(grapheme) || !textPresentationRegex.test(grapheme) && (emojiPresentationRegex.test(grapheme) || emojiWithVS16Regex.test(grapheme) || regionalIndicatorRegex.test(grapheme))) return 2;
+	let width = isEastAsianWide(cp) ? 2 : 1;
+	for (let i = cp > 65535 ? 2 : 1; i < grapheme.length; i++) {
+		const c = grapheme.charCodeAt(i);
+		if (c === 65438 || c === 65439) width += 1;
+	}
+	return width;
+}
+function isEastAsianWide(cp) {
+	return cp >= 4352 && cp <= 4447 || cp >= 9001 && cp <= 9002 || cp >= 9776 && cp <= 9783 || cp >= 9866 && cp <= 9871 || cp >= 11904 && cp <= 12255 || cp >= 12272 && cp <= 12350 || cp >= 12353 && cp <= 40959 || cp >= 40960 && cp <= 42191 || cp >= 43360 && cp <= 43391 || cp >= 44032 && cp <= 55215 || cp >= 63744 && cp <= 64255 || cp >= 65040 && cp <= 65049 || cp >= 65072 && cp <= 65135 || cp >= 65281 && cp <= 65376 || cp >= 65504 && cp <= 65510 || cp >= 94176 && cp <= 101759 || cp >= 110576 && cp <= 111359 || cp >= 127488 && cp <= 127490 || cp >= 127504 && cp <= 127547 || cp >= 127552 && cp <= 127560 || cp >= 127568 && cp <= 127569 || cp >= 127584 && cp <= 127589 || cp >= 131072 && cp <= 196605 || cp >= 196608 && cp <= 262141;
+}
+
+//#endregion
+exports.getDisplayWidth = getDisplayWidth;

package/dist/displaywidth.js

@@ -0,0 +1,43 @@
+//#region src/displaywidth.ts
+const ansiRegex = /\x1B(?:\[[0-9;:]*[@-~]|\][^\x1B\x07]*(?:\x1B\\|\x07))/g;
+const segmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+/**
+* Computes the terminal display width of a string, accounting for
+* East Asian wide characters, combining marks, emoji, and ANSI escapes.
+*
+* @param text The string to measure.
+* @returns The number of terminal columns the string occupies.
+* @internal
+*/
+function getDisplayWidth(text) {
+	const stripped = text.replace(ansiRegex, "");
+	let width = 0;
+	for (const { segment } of segmenter.segment(stripped)) width += graphemeWidth(segment);
+	return width;
+}
+const zeroWidthRegex = /^[\p{Cf}\p{Mn}\p{Me}]+$/u;
+const emojiPresentationRegex = /\p{Emoji_Presentation}/u;
+const emojiWithVS16Regex = /\p{Emoji}\uFE0F/u;
+const keycapEmojiRegex = /^[#*0-9]\uFE0F?\u20E3$/u;
+const textPresentationRegex = /\uFE0E/u;
+const regionalIndicatorRegex = /[\u{1F1E6}-\u{1F1FF}]/u;
+function graphemeWidth(grapheme) {
+	const cp = grapheme.codePointAt(0);
+	if (cp == null) return 0;
+	if (cp === 9) return 1;
+	if (cp < 32 || cp >= 127 && cp < 160) return 0;
+	if (zeroWidthRegex.test(grapheme)) return 0;
+	if (keycapEmojiRegex.test(grapheme) || !textPresentationRegex.test(grapheme) && (emojiPresentationRegex.test(grapheme) || emojiWithVS16Regex.test(grapheme) || regionalIndicatorRegex.test(grapheme))) return 2;
+	let width = isEastAsianWide(cp) ? 2 : 1;
+	for (let i = cp > 65535 ? 2 : 1; i < grapheme.length; i++) {
+		const c = grapheme.charCodeAt(i);
+		if (c === 65438 || c === 65439) width += 1;
+	}
+	return width;
+}
+function isEastAsianWide(cp) {
+	return cp >= 4352 && cp <= 4447 || cp >= 9001 && cp <= 9002 || cp >= 9776 && cp <= 9783 || cp >= 9866 && cp <= 9871 || cp >= 11904 && cp <= 12255 || cp >= 12272 && cp <= 12350 || cp >= 12353 && cp <= 40959 || cp >= 40960 && cp <= 42191 || cp >= 43360 && cp <= 43391 || cp >= 44032 && cp <= 55215 || cp >= 63744 && cp <= 64255 || cp >= 65040 && cp <= 65049 || cp >= 65072 && cp <= 65135 || cp >= 65281 && cp <= 65376 || cp >= 65504 && cp <= 65510 || cp >= 94176 && cp <= 101759 || cp >= 110576 && cp <= 111359 || cp >= 127488 && cp <= 127490 || cp >= 127504 && cp <= 127547 || cp >= 127552 && cp <= 127560 || cp >= 127568 && cp <= 127569 || cp >= 127584 && cp <= 127589 || cp >= 131072 && cp <= 196605 || cp >= 196608 && cp <= 262141;
+}
+
+//#endregion
+export { getDisplayWidth };

package/dist/doc.cjs

@@ -1,3 +1,4 @@
+const require_displaywidth = require('./displaywidth.cjs');
 const require_message = require('./message.cjs');
 const require_validate = require('./validate.cjs');
 const require_usage = require('./usage.cjs');
@@ -237,18 +238,19 @@ function formatDocPage(programName, page, options = {}) {
 		if (needsDescColumn) {
 			if (options.showDefault && page.sections.some((s) => s.entries.some((e) => hasContent(e.default)))) {
 				const prefix = typeof options.showDefault === "object" ? options.showDefault.prefix ?? " [" : " [";
-				minDescWidth = Math.max(minDescWidth, prefix.length);
+				minDescWidth = Math.max(minDescWidth, require_displaywidth.getDisplayWidth(prefix));
 			}
 			if (options.showChoices && page.sections.some((s) => s.entries.some((e) => hasContent(e.choices)))) {
 				const prefix = typeof options.showChoices === "object" ? options.showChoices.prefix ?? " (" : " (";
 				const label = typeof options.showChoices === "object" ? options.showChoices.label ?? "choices: " : "choices: ";
-				minDescWidth = Math.max(minDescWidth, prefix.length + label.length);
+				minDescWidth = Math.max(minDescWidth, require_displaywidth.getDisplayWidth(prefix) + require_displaywidth.getDisplayWidth(label));
 			}
 		}
 		const splitEntryMin = termIndent + 2 + Math.max(2, 2 * minDescWidth - 1);
 		const fixedEntryMin = termIndent + 2 + termWidth + minDescWidth;
 		const entryMin = needsDescColumn ? Math.min(splitEntryMin, fixedEntryMin) : hasEntries ? termIndent + 1 : 1;
-		const usageMin = page.usage != null ? 7 + Math.max(programName.length, Math.min(maxVisibleAtomicWidth(page.usage), programName.length + 7)) : 1;
+		const programNameWidth = require_displaywidth.getDisplayWidth(programName);
+		const usageMin = page.usage != null ? 7 + Math.max(programNameWidth, Math.min(maxVisibleAtomicWidth(page.usage), programNameWidth + 7)) : 1;
 		let sectionMin = 1;
 		if (hasContent(page.examples)) sectionMin = Math.max(sectionMin, 9);
 		if (hasContent(page.author)) sectionMin = Math.max(sectionMin, 7);
@@ -337,19 +339,21 @@ function formatDocPage(programName, page, options = {}) {
 			if (options.showDefault && hasContent(entry.default)) {
 				const prefix = typeof options.showDefault === "object" ? options.showDefault.prefix ?? " [" : " [";
 				const suffix = typeof options.showDefault === "object" ? options.showDefault.suffix ?? "]" : "]";
+				const prefixWidth = require_displaywidth.getDisplayWidth(prefix);
+				const suffixWidth = require_displaywidth.getDisplayWidth(suffix);
 				let defaultStartWidth;
 				if (descColumnWidth != null) {
 					const lastW = lastLineVisibleLength(description);
 					const effectiveLastW = lastW + currentExtraOffset();
-					if (effectiveLastW + prefix.length >= descColumnWidth) {
+					if (effectiveLastW + prefixWidth >= descColumnWidth) {
 						description += "\n";
-						defaultStartWidth = prefix.length;
-					} else defaultStartWidth = effectiveLastW + prefix.length;
+						defaultStartWidth = prefixWidth;
+					} else defaultStartWidth = effectiveLastW + prefixWidth;
 				}
 				const defaultFormatOptions = {
 					colors: options.colors ? { resetSuffix: "\x1B[2m" } : false,
 					quotes: !options.colors,
-					maxWidth: descColumnWidth == null ? void 0 : descColumnWidth - suffix.length,
+					maxWidth: descColumnWidth == null ? void 0 : descColumnWidth - suffixWidth,
 					startWidth: defaultStartWidth
 				};
 				const defaultContent = require_message.formatMessage(entry.default, defaultFormatOptions);
@@ -378,11 +382,14 @@ function formatDocPage(programName, page, options = {}) {
 					}
 					if (truncated) truncatedTerms = [...terms.slice(0, cutIndex), require_message.text(", ...")];
 				}
+				const choicesPrefixWidth = require_displaywidth.getDisplayWidth(prefix);
+				const choicesSuffixWidth = require_displaywidth.getDisplayWidth(suffix);
+				const choicesLabelWidth = require_displaywidth.getDisplayWidth(label);
 				let choicesStartWidth;
 				if (descColumnWidth != null) {
 					const lastW = lastLineVisibleLength(description);
 					const effectiveLastW = lastW + currentExtraOffset();
-					const prefixLabelLen = prefix.length + label.length;
+					const prefixLabelLen = choicesPrefixWidth + choicesLabelWidth;
 					if (effectiveLastW + prefixLabelLen >= descColumnWidth) {
 						description += "\n";
 						choicesStartWidth = prefixLabelLen;
@@ -391,7 +398,7 @@ function formatDocPage(programName, page, options = {}) {
 				const choicesFormatOptions = {
 					colors: options.colors ? { resetSuffix: "\x1B[2m" } : false,
 					quotes: false,
-					maxWidth: descColumnWidth == null ? void 0 : descColumnWidth - suffix.length,
+					maxWidth: descColumnWidth == null ? void 0 : descColumnWidth - choicesSuffixWidth,
 					startWidth: choicesStartWidth
 				};
 				const choicesDisplay = require_message.formatMessage(truncatedTerms, choicesFormatOptions);
@@ -461,16 +468,16 @@ function maxVisibleAtomicWidth(usage) {
 	let max = 0;
 	for (const term of usage) switch (term.type) {
 		case "argument":
-			if (!require_usage.isUsageHidden(term.hidden)) max = Math.max(max, term.metavar.length);
+			if (!require_usage.isUsageHidden(term.hidden)) max = Math.max(max, require_displaywidth.getDisplayWidth(term.metavar));
 			break;
 		case "option":
 			if (!require_usage.isUsageHidden(term.hidden) && term.names.length > 0) {
-				for (const name of term.names) max = Math.max(max, name.length);
-				if (term.metavar != null) max = Math.max(max, term.metavar.length);
+				for (const name of term.names) max = Math.max(max, require_displaywidth.getDisplayWidth(name));
+				if (term.metavar != null) max = Math.max(max, require_displaywidth.getDisplayWidth(term.metavar));
 			}
 			break;
 		case "command":
-			if (!require_usage.isUsageHidden(term.hidden)) max = Math.max(max, term.name.length);
+			if (!require_usage.isUsageHidden(term.hidden)) max = Math.max(max, require_displaywidth.getDisplayWidth(term.name));
 			break;
 		case "passthrough":
 			if (!require_usage.isUsageHidden(term.hidden)) max = Math.max(max, 5);
@@ -491,7 +498,7 @@ function maxVisibleAtomicWidth(usage) {
 			}
 			break;
 		case "literal":
-			if (term.value !== "") max = Math.max(max, term.value.length);
+			if (term.value !== "") max = Math.max(max, require_displaywidth.getDisplayWidth(term.value));
 			break;
 		case "ellipsis":
 			max = Math.max(max, 3);
@@ -499,16 +506,15 @@ function maxVisibleAtomicWidth(usage) {
 	}
 	return max;
 }
-const ansiEscapeCodeRegex = /\x1B\[[0-9;]*[a-zA-Z]/g;
 function ansiAwareRightPad(text$1, length, char = " ") {
-	const strippedText = text$1.replace(ansiEscapeCodeRegex, "");
-	if (strippedText.length >= length) return text$1;
-	return text$1 + char.repeat(length - strippedText.length);
+	const visibleWidth = lastLineVisibleLength(text$1);
+	if (visibleWidth >= length) return text$1;
+	return text$1 + char.repeat(length - visibleWidth);
 }
 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;
+	return require_displaywidth.getDisplayWidth(lastLine);
 }
 
 //#endregion

package/dist/doc.js

@@ -1,3 +1,4 @@
+import { getDisplayWidth } from "./displaywidth.js";
 import { cloneMessage, formatMessage, text } from "./message.js";
 import { validateLabel, validateProgramName } from "./validate.js";
 import { cloneUsageTerm, formatUsage, formatUsageTerm, isDocHidden, isUsageHidden } from "./usage.js";
@@ -237,18 +238,19 @@ function formatDocPage(programName, page, options = {}) {
 		if (needsDescColumn) {
 			if (options.showDefault && page.sections.some((s) => s.entries.some((e) => hasContent(e.default)))) {
 				const prefix = typeof options.showDefault === "object" ? options.showDefault.prefix ?? " [" : " [";
-				minDescWidth = Math.max(minDescWidth, prefix.length);
+				minDescWidth = Math.max(minDescWidth, getDisplayWidth(prefix));
 			}
 			if (options.showChoices && page.sections.some((s) => s.entries.some((e) => hasContent(e.choices)))) {
 				const prefix = typeof options.showChoices === "object" ? options.showChoices.prefix ?? " (" : " (";
 				const label = typeof options.showChoices === "object" ? options.showChoices.label ?? "choices: " : "choices: ";
-				minDescWidth = Math.max(minDescWidth, prefix.length + label.length);
+				minDescWidth = Math.max(minDescWidth, getDisplayWidth(prefix) + getDisplayWidth(label));
 			}
 		}
 		const splitEntryMin = termIndent + 2 + Math.max(2, 2 * minDescWidth - 1);
 		const fixedEntryMin = termIndent + 2 + termWidth + minDescWidth;
 		const entryMin = needsDescColumn ? Math.min(splitEntryMin, fixedEntryMin) : hasEntries ? termIndent + 1 : 1;
-		const usageMin = page.usage != null ? 7 + Math.max(programName.length, Math.min(maxVisibleAtomicWidth(page.usage), programName.length + 7)) : 1;
+		const programNameWidth = getDisplayWidth(programName);
+		const usageMin = page.usage != null ? 7 + Math.max(programNameWidth, Math.min(maxVisibleAtomicWidth(page.usage), programNameWidth + 7)) : 1;
 		let sectionMin = 1;
 		if (hasContent(page.examples)) sectionMin = Math.max(sectionMin, 9);
 		if (hasContent(page.author)) sectionMin = Math.max(sectionMin, 7);
@@ -337,19 +339,21 @@ function formatDocPage(programName, page, options = {}) {
 			if (options.showDefault && hasContent(entry.default)) {
 				const prefix = typeof options.showDefault === "object" ? options.showDefault.prefix ?? " [" : " [";
 				const suffix = typeof options.showDefault === "object" ? options.showDefault.suffix ?? "]" : "]";
+				const prefixWidth = getDisplayWidth(prefix);
+				const suffixWidth = getDisplayWidth(suffix);
 				let defaultStartWidth;
 				if (descColumnWidth != null) {
 					const lastW = lastLineVisibleLength(description);
 					const effectiveLastW = lastW + currentExtraOffset();
-					if (effectiveLastW + prefix.length >= descColumnWidth) {
+					if (effectiveLastW + prefixWidth >= descColumnWidth) {
 						description += "\n";
-						defaultStartWidth = prefix.length;
-					} else defaultStartWidth = effectiveLastW + prefix.length;
+						defaultStartWidth = prefixWidth;
+					} else defaultStartWidth = effectiveLastW + prefixWidth;
 				}
 				const defaultFormatOptions = {
 					colors: options.colors ? { resetSuffix: "\x1B[2m" } : false,
 					quotes: !options.colors,
-					maxWidth: descColumnWidth == null ? void 0 : descColumnWidth - suffix.length,
+					maxWidth: descColumnWidth == null ? void 0 : descColumnWidth - suffixWidth,
 					startWidth: defaultStartWidth
 				};
 				const defaultContent = formatMessage(entry.default, defaultFormatOptions);
@@ -378,11 +382,14 @@ function formatDocPage(programName, page, options = {}) {
 					}
 					if (truncated) truncatedTerms = [...terms.slice(0, cutIndex), text(", ...")];
 				}
+				const choicesPrefixWidth = getDisplayWidth(prefix);
+				const choicesSuffixWidth = getDisplayWidth(suffix);
+				const choicesLabelWidth = getDisplayWidth(label);
 				let choicesStartWidth;
 				if (descColumnWidth != null) {
 					const lastW = lastLineVisibleLength(description);
 					const effectiveLastW = lastW + currentExtraOffset();
-					const prefixLabelLen = prefix.length + label.length;
+					const prefixLabelLen = choicesPrefixWidth + choicesLabelWidth;
 					if (effectiveLastW + prefixLabelLen >= descColumnWidth) {
 						description += "\n";
 						choicesStartWidth = prefixLabelLen;
@@ -391,7 +398,7 @@ function formatDocPage(programName, page, options = {}) {
 				const choicesFormatOptions = {
 					colors: options.colors ? { resetSuffix: "\x1B[2m" } : false,
 					quotes: false,
-					maxWidth: descColumnWidth == null ? void 0 : descColumnWidth - suffix.length,
+					maxWidth: descColumnWidth == null ? void 0 : descColumnWidth - choicesSuffixWidth,
 					startWidth: choicesStartWidth
 				};
 				const choicesDisplay = formatMessage(truncatedTerms, choicesFormatOptions);
@@ -461,16 +468,16 @@ function maxVisibleAtomicWidth(usage) {
 	let max = 0;
 	for (const term of usage) switch (term.type) {
 		case "argument":
-			if (!isUsageHidden(term.hidden)) max = Math.max(max, term.metavar.length);
+			if (!isUsageHidden(term.hidden)) max = Math.max(max, getDisplayWidth(term.metavar));
 			break;
 		case "option":
 			if (!isUsageHidden(term.hidden) && term.names.length > 0) {
-				for (const name of term.names) max = Math.max(max, name.length);
-				if (term.metavar != null) max = Math.max(max, term.metavar.length);
+				for (const name of term.names) max = Math.max(max, getDisplayWidth(name));
+				if (term.metavar != null) max = Math.max(max, getDisplayWidth(term.metavar));
 			}
 			break;
 		case "command":
-			if (!isUsageHidden(term.hidden)) max = Math.max(max, term.name.length);
+			if (!isUsageHidden(term.hidden)) max = Math.max(max, getDisplayWidth(term.name));
 			break;
 		case "passthrough":
 			if (!isUsageHidden(term.hidden)) max = Math.max(max, 5);
@@ -491,7 +498,7 @@ function maxVisibleAtomicWidth(usage) {
 			}
 			break;
 		case "literal":
-			if (term.value !== "") max = Math.max(max, term.value.length);
+			if (term.value !== "") max = Math.max(max, getDisplayWidth(term.value));
 			break;
 		case "ellipsis":
 			max = Math.max(max, 3);
@@ -499,16 +506,15 @@ function maxVisibleAtomicWidth(usage) {
 	}
 	return max;
 }
-const ansiEscapeCodeRegex = /\x1B\[[0-9;]*[a-zA-Z]/g;
 function ansiAwareRightPad(text$1, length, char = " ") {
-	const strippedText = text$1.replace(ansiEscapeCodeRegex, "");
-	if (strippedText.length >= length) return text$1;
-	return text$1 + char.repeat(length - strippedText.length);
+	const visibleWidth = lastLineVisibleLength(text$1);
+	if (visibleWidth >= length) return text$1;
+	return text$1 + char.repeat(length - visibleWidth);
 }
 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;
+	return getDisplayWidth(lastLine);
 }
 
 //#endregion

package/dist/message.cjs

@@ -1,3 +1,4 @@
+const require_displaywidth = require('./displaywidth.cjs');
 
 //#region src/message.ts
 /**
@@ -323,7 +324,7 @@ function formatMessage(msg, options = {}) {
 							if (match == null) break;
 							yield {
 								text: match[0],
-								width: match[0].length
+								width: require_displaywidth.getDisplayWidth(match[0])
 							};
 						}
 					}
@@ -340,7 +341,7 @@ function formatMessage(msg, options = {}) {
 							if (match == null) break;
 							yield {
 								text: match[0],
-								width: match[0].length
+								width: require_displaywidth.getDisplayWidth(match[0])
 							};
 						}
 					}
@@ -349,7 +350,7 @@ function formatMessage(msg, options = {}) {
 				const name = useQuotes ? `\`${term.optionName}\`` : term.optionName;
 				yield {
 					text: useColors ? `\x1b[3m${name}${resetSequence}` : name,
-					width: name.length
+					width: require_displaywidth.getDisplayWidth(name)
 				};
 			} else if (term.type === "optionNames") {
 				const names = term.optionNames.map((name) => useQuotes ? `\`${name}\`` : name);
@@ -361,7 +362,7 @@ function formatMessage(msg, options = {}) {
 					};
 					yield {
 						text: useColors ? `\x1b[3m${name}${resetSequence}` : name,
-						width: name.length
+						width: require_displaywidth.getDisplayWidth(name)
 					};
 					i++;
 				}
@@ -369,13 +370,13 @@ function formatMessage(msg, options = {}) {
 				const metavar$1 = useQuotes ? `\`${term.metavar}\`` : term.metavar;
 				yield {
 					text: useColors ? `\x1b[1m${metavar$1}${resetSequence}` : metavar$1,
-					width: metavar$1.length
+					width: require_displaywidth.getDisplayWidth(metavar$1)
 				};
 			} else if (term.type === "value") {
 				const value$1 = useQuotes ? `${JSON.stringify(term.value)}` : term.value;
 				yield {
 					text: useColors ? `\x1b[32m${value$1}${resetSequence}` : value$1,
-					width: value$1.length
+					width: require_displaywidth.getDisplayWidth(value$1)
 				};
 			} else if (term.type === "values") for (let i = 0; i < term.values.length; i++) {
 				if (i > 0) yield {
@@ -385,20 +386,20 @@ function formatMessage(msg, options = {}) {
 				const value$1 = useQuotes ? JSON.stringify(term.values[i]) : term.values[i];
 				yield {
 					text: useColors ? i <= 0 ? `\x1b[32m${value$1}` : i + 1 >= term.values.length ? `${value$1}${resetSequence}` : value$1 : value$1,
-					width: value$1.length
+					width: require_displaywidth.getDisplayWidth(value$1)
 				};
 			}
 			else if (term.type === "envVar") {
 				const envVar$1 = useQuotes ? `\`${term.envVar}\`` : term.envVar;
 				yield {
 					text: useColors ? `\x1b[1;4m${envVar$1}${resetSequence}` : envVar$1,
-					width: envVar$1.length
+					width: require_displaywidth.getDisplayWidth(envVar$1)
 				};
 			} else if (term.type === "commandLine") {
 				const cmd = useQuotes ? `\`${term.commandLine}\`` : term.commandLine;
 				yield {
 					text: useColors ? `\x1b[36m${cmd}${resetSequence}` : cmd,
-					width: cmd.length
+					width: require_displaywidth.getDisplayWidth(cmd)
 				};
 			} else if (term.type === "lineBreak") {
 				yield {
@@ -413,11 +414,11 @@ function formatMessage(msg, options = {}) {
 					const hyperlink = `\x1b]8;;${urlString}\x1b\\${displayText}\x1b]8;;\x1b\\${resetSuffix}`;
 					yield {
 						text: hyperlink,
-						width: displayText.length
+						width: require_displaywidth.getDisplayWidth(displayText)
 					};
 				} else yield {
 					text: displayText,
-					width: displayText.length
+					width: require_displaywidth.getDisplayWidth(displayText)
 				};
 			} else throw new TypeError(`Invalid MessageTerm type: ${term["type"]}.`);
 		}

package/dist/message.js

@@ -1,3 +1,5 @@
+import { getDisplayWidth } from "./displaywidth.js";
+
 //#region src/message.ts
 /**
 * Creates a deep clone of a {@link MessageTerm}.  Most variants contain only
@@ -322,7 +324,7 @@ function formatMessage(msg, options = {}) {
 							if (match == null) break;
 							yield {
 								text: match[0],
-								width: match[0].length
+								width: getDisplayWidth(match[0])
 							};
 						}
 					}
@@ -339,7 +341,7 @@ function formatMessage(msg, options = {}) {
 							if (match == null) break;
 							yield {
 								text: match[0],
-								width: match[0].length
+								width: getDisplayWidth(match[0])
 							};
 						}
 					}
@@ -348,7 +350,7 @@ function formatMessage(msg, options = {}) {
 				const name = useQuotes ? `\`${term.optionName}\`` : term.optionName;
 				yield {
 					text: useColors ? `\x1b[3m${name}${resetSequence}` : name,
-					width: name.length
+					width: getDisplayWidth(name)
 				};
 			} else if (term.type === "optionNames") {
 				const names = term.optionNames.map((name) => useQuotes ? `\`${name}\`` : name);
@@ -360,7 +362,7 @@ function formatMessage(msg, options = {}) {
 					};
 					yield {
 						text: useColors ? `\x1b[3m${name}${resetSequence}` : name,
-						width: name.length
+						width: getDisplayWidth(name)
 					};
 					i++;
 				}
@@ -368,13 +370,13 @@ function formatMessage(msg, options = {}) {
 				const metavar$1 = useQuotes ? `\`${term.metavar}\`` : term.metavar;
 				yield {
 					text: useColors ? `\x1b[1m${metavar$1}${resetSequence}` : metavar$1,
-					width: metavar$1.length
+					width: getDisplayWidth(metavar$1)
 				};
 			} else if (term.type === "value") {
 				const value$1 = useQuotes ? `${JSON.stringify(term.value)}` : term.value;
 				yield {
 					text: useColors ? `\x1b[32m${value$1}${resetSequence}` : value$1,
-					width: value$1.length
+					width: getDisplayWidth(value$1)
 				};
 			} else if (term.type === "values") for (let i = 0; i < term.values.length; i++) {
 				if (i > 0) yield {
@@ -384,20 +386,20 @@ function formatMessage(msg, options = {}) {
 				const value$1 = useQuotes ? JSON.stringify(term.values[i]) : term.values[i];
 				yield {
 					text: useColors ? i <= 0 ? `\x1b[32m${value$1}` : i + 1 >= term.values.length ? `${value$1}${resetSequence}` : value$1 : value$1,
-					width: value$1.length
+					width: getDisplayWidth(value$1)
 				};
 			}
 			else if (term.type === "envVar") {
 				const envVar$1 = useQuotes ? `\`${term.envVar}\`` : term.envVar;
 				yield {
 					text: useColors ? `\x1b[1;4m${envVar$1}${resetSequence}` : envVar$1,
-					width: envVar$1.length
+					width: getDisplayWidth(envVar$1)
 				};
 			} else if (term.type === "commandLine") {
 				const cmd = useQuotes ? `\`${term.commandLine}\`` : term.commandLine;
 				yield {
 					text: useColors ? `\x1b[36m${cmd}${resetSequence}` : cmd,
-					width: cmd.length
+					width: getDisplayWidth(cmd)
 				};
 			} else if (term.type === "lineBreak") {
 				yield {
@@ -412,11 +414,11 @@ function formatMessage(msg, options = {}) {
 					const hyperlink = `\x1b]8;;${urlString}\x1b\\${displayText}\x1b]8;;\x1b\\${resetSuffix}`;
 					yield {
 						text: hyperlink,
-						width: displayText.length
+						width: getDisplayWidth(displayText)
 					};
 				} else yield {
 					text: displayText,
-					width: displayText.length
+					width: getDisplayWidth(displayText)
 				};
 			} else throw new TypeError(`Invalid MessageTerm type: ${term["type"]}.`);
 		}

package/dist/usage.cjs

@@ -1,3 +1,4 @@
+const require_displaywidth = require('./displaywidth.cjs');
 const require_validate = require('./validate.cjs');
 
 //#region src/usage.ts
@@ -195,7 +196,7 @@ function formatUsage(programName, usage, options = {}) {
 		}
 	}
 	let output = options.colors ? `\x1b[1m${programName}\x1b[0m` : programName;
-	let lineWidth = programName.length;
+	let lineWidth = require_displaywidth.getDisplayWidth(programName);
 	let first = true;
 	for (const { text, width } of formatUsageTerms(usage, options)) {
 		if (first) {
@@ -466,24 +467,24 @@ function* formatUsageTermInternal(term, options) {
 	const optionsSeparator = options.optionsSeparator ?? "/";
 	if (term.type === "argument") yield {
 		text: options?.colors ? `\x1b[4m${term.metavar}\x1b[0m` : term.metavar,
-		width: term.metavar.length
+		width: require_displaywidth.getDisplayWidth(term.metavar)
 	};
 	else if (term.type === "option") if (options?.onlyShortestOptions) {
-		const shortestName = term.names.reduce((a, b) => a.length <= b.length ? a : b);
+		const shortestName = term.names.reduce((a, b) => require_displaywidth.getDisplayWidth(a) <= require_displaywidth.getDisplayWidth(b) ? a : b);
 		yield {
 			text: options?.colors ? `\x1b[3m${shortestName}\x1b[0m` : shortestName,
-			width: shortestName.length
+			width: require_displaywidth.getDisplayWidth(shortestName)
 		};
 	} else {
 		let i = 0;
 		for (const optionName of term.names) {
 			if (i > 0) yield {
 				text: options?.colors ? `\x1b[2m${optionsSeparator}\x1b[0m` : optionsSeparator,
-				width: optionsSeparator.length
+				width: require_displaywidth.getDisplayWidth(optionsSeparator)
 			};
 			yield {
 				text: options?.colors ? `\x1b[3m${optionName}\x1b[0m` : optionName,
-				width: optionName.length
+				width: require_displaywidth.getDisplayWidth(optionName)
 			};
 			i++;
 		}
@@ -494,13 +495,13 @@ function* formatUsageTermInternal(term, options) {
 			};
 			yield {
 				text: options?.colors ? `\x1b[4m\x1b[2m${term.metavar}\x1b[0m` : term.metavar,
-				width: term.metavar.length
+				width: require_displaywidth.getDisplayWidth(term.metavar)
 			};
 		}
 	}
 	else if (term.type === "command") yield {
 		text: options?.colors ? `\x1b[1m${term.name}\x1b[0m` : term.name,
-		width: term.name.length
+		width: require_displaywidth.getDisplayWidth(term.name)
 	};
 	else if (term.type === "optional") {
 		yield {
@@ -562,7 +563,7 @@ function* formatUsageTermInternal(term, options) {
 		};
 	} else if (term.type === "literal") yield {
 		text: term.value,
-		width: term.value.length
+		width: require_displaywidth.getDisplayWidth(term.value)
 	};
 	else if (term.type === "passthrough") {
 		const text = "[...]";

package/dist/usage.js

@@ -1,3 +1,4 @@
+import { getDisplayWidth } from "./displaywidth.js";
 import { validateProgramName } from "./validate.js";
 
 //#region src/usage.ts
@@ -195,7 +196,7 @@ function formatUsage(programName, usage, options = {}) {
 		}
 	}
 	let output = options.colors ? `\x1b[1m${programName}\x1b[0m` : programName;
-	let lineWidth = programName.length;
+	let lineWidth = getDisplayWidth(programName);
 	let first = true;
 	for (const { text, width } of formatUsageTerms(usage, options)) {
 		if (first) {
@@ -466,24 +467,24 @@ function* formatUsageTermInternal(term, options) {
 	const optionsSeparator = options.optionsSeparator ?? "/";
 	if (term.type === "argument") yield {
 		text: options?.colors ? `\x1b[4m${term.metavar}\x1b[0m` : term.metavar,
-		width: term.metavar.length
+		width: getDisplayWidth(term.metavar)
 	};
 	else if (term.type === "option") if (options?.onlyShortestOptions) {
-		const shortestName = term.names.reduce((a, b) => a.length <= b.length ? a : b);
+		const shortestName = term.names.reduce((a, b) => getDisplayWidth(a) <= getDisplayWidth(b) ? a : b);
 		yield {
 			text: options?.colors ? `\x1b[3m${shortestName}\x1b[0m` : shortestName,
-			width: shortestName.length
+			width: getDisplayWidth(shortestName)
 		};
 	} else {
 		let i = 0;
 		for (const optionName of term.names) {
 			if (i > 0) yield {
 				text: options?.colors ? `\x1b[2m${optionsSeparator}\x1b[0m` : optionsSeparator,
-				width: optionsSeparator.length
+				width: getDisplayWidth(optionsSeparator)
 			};
 			yield {
 				text: options?.colors ? `\x1b[3m${optionName}\x1b[0m` : optionName,
-				width: optionName.length
+				width: getDisplayWidth(optionName)
 			};
 			i++;
 		}
@@ -494,13 +495,13 @@ function* formatUsageTermInternal(term, options) {
 			};
 			yield {
 				text: options?.colors ? `\x1b[4m\x1b[2m${term.metavar}\x1b[0m` : term.metavar,
-				width: term.metavar.length
+				width: getDisplayWidth(term.metavar)
 			};
 		}
 	}
 	else if (term.type === "command") yield {
 		text: options?.colors ? `\x1b[1m${term.name}\x1b[0m` : term.name,
-		width: term.name.length
+		width: getDisplayWidth(term.name)
 	};
 	else if (term.type === "optional") {
 		yield {
@@ -562,7 +563,7 @@ function* formatUsageTermInternal(term, options) {
 		};
 	} else if (term.type === "literal") yield {
 		text: term.value,
-		width: term.value.length
+		width: getDisplayWidth(term.value)
 	};
 	else if (term.type === "passthrough") {
 		const text = "[...]";

package/dist/valueparser.cjs

@@ -1745,21 +1745,24 @@ function socketAddress(options) {
 		},
 		parse(input) {
 			const trimmed = input.trim();
+			const searchInput = input.trimStart();
 			const canOmitPort = defaultPort !== void 0 && !requirePort;
 			let firstHostError;
 			let validHostInvalidPortError;
 			let trailingSepHost;
 			let trailingSepHostError;
 			let anySeparatorFound = false;
-			let searchFrom = trimmed.length;
+			let trailingSepInTrimmedRegion = false;
+			let searchFrom = searchInput.length;
 			while (searchFrom > 0) {
-				const separatorIndex = trimmed.lastIndexOf(separator, searchFrom - 1);
+				const separatorIndex = searchInput.lastIndexOf(separator, searchFrom - 1);
 				if (separatorIndex === -1) break;
 				anySeparatorFound = true;
-				const hostPart = trimmed.substring(0, separatorIndex);
-				const portPart = trimmed.substring(separatorIndex + separator.length);
+				const hostPart = searchInput.substring(0, separatorIndex).trim();
+				const portPart = searchInput.substring(separatorIndex + separator.length).trim();
 				if (portPart === "") {
 					if (trailingSepHost === void 0 && trailingSepHostError === void 0) {
+						if (separatorIndex + separator.length > trimmed.length) trailingSepInTrimmedRegion = true;
 						const hostResult = parseHost(hostPart);
 						if (hostResult.success) trailingSepHost = hostResult.value;
 						else trailingSepHostError = {
@@ -1856,7 +1859,7 @@ function socketAddress(options) {
 			let hostOnlyResult;
 			if (!requirePort || trailingSepHost !== void 0 || trailingSepHostError !== void 0) {
 				hostOnlyResult = parseHost(trimmed);
-				if (canOmitPort && hostOnlyResult.success) return {
+				if (canOmitPort && hostOnlyResult.success && !trailingSepInTrimmedRegion) return {
 					success: true,
 					value: {
 						host: hostOnlyResult.value,
@@ -1864,14 +1867,7 @@ function socketAddress(options) {
 					}
 				};
 			}
-			if (trailingSepHost !== void 0 && hostOnlyResult !== void 0 && !hostOnlyResult.success) {
-				if (canOmitPort) return {
-					success: true,
-					value: {
-						host: trailingSepHost,
-						port: defaultPort
-					}
-				};
+			if (trailingSepHost !== void 0 && hostOnlyResult !== void 0 && (!hostOnlyResult.success || trailingSepInTrimmedRegion)) {
 				const errorMsg$1 = options?.errors?.missingPort;
 				const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1 ?? require_message.message`Port number is required but was not specified.`;
 				return {
@@ -1879,7 +1875,7 @@ function socketAddress(options) {
 					error: msg
 				};
 			}
-			if (trailingSepHostError !== void 0 && hostOnlyResult !== void 0 && !hostOnlyResult.success) {
+			if (trailingSepHostError !== void 0 && hostOnlyResult !== void 0 && (!hostOnlyResult.success || trailingSepInTrimmedRegion)) {
 				const errorMsg$1 = options?.errors?.invalidFormat;
 				if (errorMsg$1) {
 					const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1;

package/dist/valueparser.js

@@ -1745,21 +1745,24 @@ function socketAddress(options) {
 		},
 		parse(input) {
 			const trimmed = input.trim();
+			const searchInput = input.trimStart();
 			const canOmitPort = defaultPort !== void 0 && !requirePort;
 			let firstHostError;
 			let validHostInvalidPortError;
 			let trailingSepHost;
 			let trailingSepHostError;
 			let anySeparatorFound = false;
-			let searchFrom = trimmed.length;
+			let trailingSepInTrimmedRegion = false;
+			let searchFrom = searchInput.length;
 			while (searchFrom > 0) {
-				const separatorIndex = trimmed.lastIndexOf(separator, searchFrom - 1);
+				const separatorIndex = searchInput.lastIndexOf(separator, searchFrom - 1);
 				if (separatorIndex === -1) break;
 				anySeparatorFound = true;
-				const hostPart = trimmed.substring(0, separatorIndex);
-				const portPart = trimmed.substring(separatorIndex + separator.length);
+				const hostPart = searchInput.substring(0, separatorIndex).trim();
+				const portPart = searchInput.substring(separatorIndex + separator.length).trim();
 				if (portPart === "") {
 					if (trailingSepHost === void 0 && trailingSepHostError === void 0) {
+						if (separatorIndex + separator.length > trimmed.length) trailingSepInTrimmedRegion = true;
 						const hostResult = parseHost(hostPart);
 						if (hostResult.success) trailingSepHost = hostResult.value;
 						else trailingSepHostError = {
@@ -1856,7 +1859,7 @@ function socketAddress(options) {
 			let hostOnlyResult;
 			if (!requirePort || trailingSepHost !== void 0 || trailingSepHostError !== void 0) {
 				hostOnlyResult = parseHost(trimmed);
-				if (canOmitPort && hostOnlyResult.success) return {
+				if (canOmitPort && hostOnlyResult.success && !trailingSepInTrimmedRegion) return {
 					success: true,
 					value: {
 						host: hostOnlyResult.value,
@@ -1864,14 +1867,7 @@ function socketAddress(options) {
 					}
 				};
 			}
-			if (trailingSepHost !== void 0 && hostOnlyResult !== void 0 && !hostOnlyResult.success) {
-				if (canOmitPort) return {
-					success: true,
-					value: {
-						host: trailingSepHost,
-						port: defaultPort
-					}
-				};
+			if (trailingSepHost !== void 0 && hostOnlyResult !== void 0 && (!hostOnlyResult.success || trailingSepInTrimmedRegion)) {
 				const errorMsg$1 = options?.errors?.missingPort;
 				const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1 ?? message`Port number is required but was not specified.`;
 				return {
@@ -1879,7 +1875,7 @@ function socketAddress(options) {
 					error: msg
 				};
 			}
-			if (trailingSepHostError !== void 0 && hostOnlyResult !== void 0 && !hostOnlyResult.success) {
+			if (trailingSepHostError !== void 0 && hostOnlyResult !== void 0 && (!hostOnlyResult.success || trailingSepInTrimmedRegion)) {
 				const errorMsg$1 = options?.errors?.invalidFormat;
 				if (errorMsg$1) {
 					const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.1590+eb65aeba",
+  "version": "1.0.0-dev.1598+6650da3a",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",