@optique/core 1.3.1 → 1.3.3

package/dist/terminal.cjs

@@ -1,3 +1,4 @@
+const require_terminal_separators = require('./terminal-separators.cjs');
 
 //#region src/terminal.ts
 const plain = (text) => ({
@@ -9,6 +10,8 @@ const styled = (text, style) => ({
 	style,
 	children: [plain(text)]
 });
+const valuesSeparator = plain(" ");
+require_terminal_separators.wrapTrimmableFragments.add(valuesSeparator);
 /**
 * Optique's built-in terminal theme, with every formatter available for delegation.
 * @since 1.3.0
@@ -34,7 +37,7 @@ const defaultTerminalTheme = {
 	value: (_term, ctx) => ctx.usage === "literal" ? plain(ctx.text) : styled(ctx.text, { foreground: "green" }),
 	values: (term, ctx) => ({
 		type: "concat",
-		children: term.values.flatMap((value, i) => [...i === 0 ? [] : [plain(" ")], ctx.format({
+		children: term.values.flatMap((value, i) => [...i === 0 ? [] : [valuesSeparator], ctx.format({
 			type: "value",
 			value
 		})])

package/dist/terminal.js

@@ -1,3 +1,5 @@
+import { wrapTrimmableFragments } from "./terminal-separators.js";
+
 //#region src/terminal.ts
 const plain = (text) => ({
 	type: "text",
@@ -8,6 +10,8 @@ const styled = (text, style) => ({
 	style,
 	children: [plain(text)]
 });
+const valuesSeparator = plain(" ");
+wrapTrimmableFragments.add(valuesSeparator);
 /**
 * Optique's built-in terminal theme, with every formatter available for delegation.
 * @since 1.3.0
@@ -33,7 +37,7 @@ const defaultTerminalTheme = {
 	value: (_term, ctx) => ctx.usage === "literal" ? plain(ctx.text) : styled(ctx.text, { foreground: "green" }),
 	values: (term, ctx) => ({
 		type: "concat",
-		children: term.values.flatMap((value, i) => [...i === 0 ? [] : [plain(" ")], ctx.format({
+		children: term.values.flatMap((value, i) => [...i === 0 ? [] : [valuesSeparator], ctx.format({
 			type: "value",
 			value
 		})])

package/dist/text-layout.cjs

@@ -51,6 +51,18 @@ function placeText(text, cursor, maxWidth, trailingRoom = 0) {
 		}
 	};
 }
+const leadingSpacePattern = /^((?:\x1B(?:\[[0-9;:]*[@-~]|\][^\x1B\x07]*(?:\x1B\\|\x07)))*)[^\S\n]+/;
+/**
+* Removes the whitespace that begins a text's first line, keeping any
+* escape sequences before it.  Used when layout moves text that starts with
+* a separating space to a fresh line.
+* @param text Rendered text, possibly containing ANSI styles or OSC links.
+* @returns The text without its leading whitespace.
+* @internal
+*/
+function trimLeadingSpace(text) {
+	return text.replace(leadingSpacePattern, "$1");
+}
 /**
 * Measures an annotation's fixed text without invoking theme callbacks.
 * @param prefix The already joined prefix and optional label.
@@ -84,4 +96,5 @@ function spaceAfterLabel(label) {
 exports.measureAnnotation = measureAnnotation;
 exports.measureText = measureText;
 exports.placeText = placeText;
-exports.spaceAfterLabel = spaceAfterLabel;
+exports.spaceAfterLabel = spaceAfterLabel;
+exports.trimLeadingSpace = trimLeadingSpace;

package/dist/text-layout.d.cts

@@ -41,7 +41,14 @@ declare function placeText(text: string, cursor: TextCursor, maxWidth?: number,
   readonly text: string;
   readonly cursor: TextCursor;
 };
-/** Fixed annotation geometry shared by preflight and placement. @internal */
+/**
+ * Removes the whitespace that begins a text's first line, keeping any
+ * escape sequences before it.  Used when layout moves text that starts with
+ * a separating space to a fresh line.
+ * @param text Rendered text, possibly containing ANSI styles or OSC links.
+ * @returns The text without its leading whitespace.
+ * @internal
+ */
 
 /**
  * Adds a separating space only when a label occupies its final physical line.

package/dist/text-layout.d.ts

@@ -41,7 +41,14 @@ declare function placeText(text: string, cursor: TextCursor, maxWidth?: number,
   readonly text: string;
   readonly cursor: TextCursor;
 };
-/** Fixed annotation geometry shared by preflight and placement. @internal */
+/**
+ * Removes the whitespace that begins a text's first line, keeping any
+ * escape sequences before it.  Used when layout moves text that starts with
+ * a separating space to a fresh line.
+ * @param text Rendered text, possibly containing ANSI styles or OSC links.
+ * @returns The text without its leading whitespace.
+ * @internal
+ */
 
 /**
  * Adds a separating space only when a label occupies its final physical line.

package/dist/text-layout.js

@@ -51,6 +51,18 @@ function placeText(text, cursor, maxWidth, trailingRoom = 0) {
 		}
 	};
 }
+const leadingSpacePattern = /^((?:\x1B(?:\[[0-9;:]*[@-~]|\][^\x1B\x07]*(?:\x1B\\|\x07)))*)[^\S\n]+/;
+/**
+* Removes the whitespace that begins a text's first line, keeping any
+* escape sequences before it.  Used when layout moves text that starts with
+* a separating space to a fresh line.
+* @param text Rendered text, possibly containing ANSI styles or OSC links.
+* @returns The text without its leading whitespace.
+* @internal
+*/
+function trimLeadingSpace(text) {
+	return text.replace(leadingSpacePattern, "$1");
+}
 /**
 * Measures an annotation's fixed text without invoking theme callbacks.
 * @param prefix The already joined prefix and optional label.
@@ -81,4 +93,4 @@ function spaceAfterLabel(label) {
 }
 
 //#endregion
-export { measureAnnotation, measureText, placeText, spaceAfterLabel };
+export { measureAnnotation, measureText, placeText, spaceAfterLabel, trimLeadingSpace };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -237,7 +237,7 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@optique/env": "1.3.1",
+    "@optique/env": "1.3.3",
     "@types/node": "^24.0.0",
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",