@optique/core 1.3.0-dev.2538 → 1.3.0-dev.2542

package/dist/doc.cjs

@@ -323,9 +323,9 @@ function formatDocPage(programName, page, options = {}) {
 		}, options.theme))].map((token) => token.width)) : 0;
 		const usageMin = page.usage != null && showUsage ? usageLabelWidth + Math.max(programNameWidth, Math.min(maxVisibleAtomicWidth(page.usage, options.theme), programNameWidth + usageLabelWidth)) : 1;
 		let sectionMin = 1;
-		if (hasContent(page.examples)) sectionMin = Math.max(sectionMin, require_displaywidth.getDisplayWidth(label("Examples:", "examples")));
-		if (hasContent(page.author)) sectionMin = Math.max(sectionMin, require_displaywidth.getDisplayWidth(label("Author:", "author")));
-		if (hasContent(page.bugs)) sectionMin = Math.max(sectionMin, require_displaywidth.getDisplayWidth(label("Bugs:", "bugs")));
+		if (hasContent(page.examples)) sectionMin = Math.max(sectionMin, ...label("Examples:", "examples").split("\n").map((line) => require_displaywidth.getDisplayWidth(line)));
+		if (hasContent(page.author)) sectionMin = Math.max(sectionMin, ...label("Author:", "author").split("\n").map((line) => require_displaywidth.getDisplayWidth(line)));
+		if (hasContent(page.bugs)) sectionMin = Math.max(sectionMin, ...label("Bugs:", "bugs").split("\n").map((line) => require_displaywidth.getDisplayWidth(line)));
 		const minWidth = Math.max(entryMin, usageMin, sectionMin);
 		if (options.maxWidth < minWidth) throw new RangeError(`maxWidth must be at least ${minWidth}, got ${options.maxWidth}.`);
 		if (needsDescColumn && minDescWidth > 1) {

package/dist/doc.js

@@ -323,9 +323,9 @@ function formatDocPage(programName, page, options = {}) {
 		}, options.theme))].map((token) => token.width)) : 0;
 		const usageMin = page.usage != null && showUsage ? usageLabelWidth + Math.max(programNameWidth, Math.min(maxVisibleAtomicWidth(page.usage, options.theme), programNameWidth + usageLabelWidth)) : 1;
 		let sectionMin = 1;
-		if (hasContent(page.examples)) sectionMin = Math.max(sectionMin, getDisplayWidth(label("Examples:", "examples")));
-		if (hasContent(page.author)) sectionMin = Math.max(sectionMin, getDisplayWidth(label("Author:", "author")));
-		if (hasContent(page.bugs)) sectionMin = Math.max(sectionMin, getDisplayWidth(label("Bugs:", "bugs")));
+		if (hasContent(page.examples)) sectionMin = Math.max(sectionMin, ...label("Examples:", "examples").split("\n").map((line) => getDisplayWidth(line)));
+		if (hasContent(page.author)) sectionMin = Math.max(sectionMin, ...label("Author:", "author").split("\n").map((line) => getDisplayWidth(line)));
+		if (hasContent(page.bugs)) sectionMin = Math.max(sectionMin, ...label("Bugs:", "bugs").split("\n").map((line) => getDisplayWidth(line)));
 		const minWidth = Math.max(entryMin, usageMin, sectionMin);
 		if (options.maxWidth < minWidth) throw new RangeError(`maxWidth must be at least ${minWidth}, got ${options.maxWidth}.`);
 		if (needsDescColumn && minDescWidth > 1) {

package/dist/terminal-internal.cjs

@@ -127,11 +127,19 @@ function sameStyle(a, b) {
 }
 function* fragmentTokens(fragment, scopes = [], inherited = {}) {
 	if (fragment.type === "text") {
-		yield {
-			text: fragment.text,
-			width: require_displaywidth.getDisplayWidth(fragment.text),
-			scopes
-		};
+		const lines = fragment.text.split("\n");
+		for (let i = 0; i < lines.length; i++) {
+			if (i > 0) yield {
+				text: "\n",
+				width: -1,
+				scopes
+			};
+			if (lines[i].length > 0 || lines.length === 1) yield {
+				text: lines[i],
+				width: require_displaywidth.getDisplayWidth(lines[i]),
+				scopes
+			};
+		}
 		return;
 	}
 	let next = scopes;
@@ -193,7 +201,7 @@ function serializeTokens(tokens, colors = false, resetSuffix = "", ambient = {})
 	const items = [...tokens];
 	for (let i = 0; i < items.length; i++) {
 		const token = items[i];
-		if (colors && token.width === -1) {
+		if (colors && token.width === -1 && token.scopes.length === 0) {
 			const next = items.slice(i + 1).find((t) => t.width !== -1)?.scopes ?? [];
 			let common = 0;
 			while (common < active.length && common < next.length && active[common] === next[common]) common++;

package/dist/terminal-internal.js

@@ -127,11 +127,19 @@ function sameStyle(a, b) {
 }
 function* fragmentTokens(fragment, scopes = [], inherited = {}) {
 	if (fragment.type === "text") {
-		yield {
-			text: fragment.text,
-			width: getDisplayWidth(fragment.text),
-			scopes
-		};
+		const lines = fragment.text.split("\n");
+		for (let i = 0; i < lines.length; i++) {
+			if (i > 0) yield {
+				text: "\n",
+				width: -1,
+				scopes
+			};
+			if (lines[i].length > 0 || lines.length === 1) yield {
+				text: lines[i],
+				width: getDisplayWidth(lines[i]),
+				scopes
+			};
+		}
 		return;
 	}
 	let next = scopes;
@@ -193,7 +201,7 @@ function serializeTokens(tokens, colors = false, resetSuffix = "", ambient = {})
 	const items = [...tokens];
 	for (let i = 0; i < items.length; i++) {
 		const token = items[i];
-		if (colors && token.width === -1) {
+		if (colors && token.width === -1 && token.scopes.length === 0) {
 			const next = items.slice(i + 1).find((t) => t.width !== -1)?.scopes ?? [];
 			let common = 0;
 			while (common < active.length && common < next.length && active[common] === next[common]) common++;

package/dist/terminal.d.cts

@@ -61,7 +61,8 @@ interface TerminalStyle {
   readonly underline?: boolean;
 }
 /**
- * Structured output. Each text leaf is an indivisible wrapping unit.
+ * Structured output. Newlines in text leaves force line breaks; each line
+ * within a leaf is an indivisible wrapping unit.
  * @since 1.3.0
  */
 type TerminalFragment = {

package/dist/terminal.d.ts

@@ -61,7 +61,8 @@ interface TerminalStyle {
   readonly underline?: boolean;
 }
 /**
- * Structured output. Each text leaf is an indivisible wrapping unit.
+ * Structured output. Newlines in text leaves force line breaks; each line
+ * within a leaf is an indivisible wrapping unit.
  * @since 1.3.0
  */
 type TerminalFragment = {

package/dist/usage.cjs

@@ -490,6 +490,11 @@ function layoutUsageTokens(input, options, initialWidth = 0) {
 	let lineWidth = initialWidth;
 	const output = [];
 	for (const token of input) {
+		if (token.width === -1) {
+			output.push(token);
+			lineWidth = 0;
+			continue;
+		}
 		if (options.maxWidth != null && lineWidth > 0 && lineWidth + token.width > options.maxWidth) {
 			const last = output.at(-1);
 			if (last?.text.endsWith(" ") && (!options.colors || last.scopes.length === 0)) output[output.length - 1] = {

package/dist/usage.js

@@ -490,6 +490,11 @@ function layoutUsageTokens(input, options, initialWidth = 0) {
 	let lineWidth = initialWidth;
 	const output = [];
 	for (const token of input) {
+		if (token.width === -1) {
+			output.push(token);
+			lineWidth = 0;
+			continue;
+		}
 		if (options.maxWidth != null && lineWidth > 0 && lineWidth + token.width > options.maxWidth) {
 			const last = output.at(-1);
 			if (last?.text.endsWith(" ") && (!options.colors || last.scopes.length === 0)) output[output.length - 1] = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.3.0-dev.2538",
+  "version": "1.3.0-dev.2542",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -237,7 +237,7 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@optique/env": "1.3.0-dev.2538+8e1487d7",
+    "@optique/env": "1.3.0-dev.2542+1201b1a0",
     "@types/node": "^24.0.0",
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",