@tuidom/core 0.15.0 → 0.16.0

package/dist/common/measureTextWidth.d.ts

@@ -17,5 +17,13 @@
  * constructor: tab expands to the next tab stop, `\r` is zero-width, single
  * code units go through {@link getCharDisplayWidth}, multi-code-unit clusters
  * through {@link getGraphemeDisplayWidth}.
+ *
+ * A prefix of printable ASCII and tabs is counted without segmentation: each
+ * such code unit is a grapheme of its own (see `isStandalone` in
+ * `segmentGraphemes`) one column wide, or a tab stop. Program text is mostly
+ * that, and the per-grapheme generator was the whole cost of measuring a
+ * 200k-line file. The last code unit of the prefix is handed back to the
+ * generic path, since what follows may join it into one cluster (a combining
+ * mark, a ZWJ, a variation selector).
  */
 export declare function measureTextWidth(raw: string, tabSize?: number, stopAfter?: number): number;

package/dist/common/measureTextWidth.js

@@ -20,11 +20,44 @@ const DEFAULT_TAB_SIZE = 4;
  * constructor: tab expands to the next tab stop, `\r` is zero-width, single
  * code units go through {@link getCharDisplayWidth}, multi-code-unit clusters
  * through {@link getGraphemeDisplayWidth}.
+ *
+ * A prefix of printable ASCII and tabs is counted without segmentation: each
+ * such code unit is a grapheme of its own (see `isStandalone` in
+ * `segmentGraphemes`) one column wide, or a tab stop. Program text is mostly
+ * that, and the per-grapheme generator was the whole cost of measuring a
+ * 200k-line file. The last code unit of the prefix is handed back to the
+ * generic path, since what follows may join it into one cluster (a combining
+ * mark, a ZWJ, a variation selector).
  */
 export function measureTextWidth(raw, tabSize = DEFAULT_TAB_SIZE, stopAfter = Infinity) {
+    const end = Math.min(raw.length, stopAfter);
     let column = 0;
-    for (const { segment, index } of segmentGraphemes(raw)) {
-        if (index >= stopAfter)
+    let columnBefore = 0;
+    let i = 0;
+    for (; i < end; i++) {
+        const c = raw.charCodeAt(i);
+        if (c === 0x09) {
+            columnBefore = column;
+            column += tabSize - (column % tabSize);
+        }
+        else if (c >= 0x20 && c <= 0x7e) {
+            columnBefore = column;
+            column++;
+        }
+        else {
+            break;
+        }
+    }
+    // The whole string is such a prefix: nothing after it can join its last code unit.
+    if (i >= raw.length)
+        return column;
+    // Resume one code unit back, where the break is certain, from the column before it.
+    const start = Math.max(0, i - 1);
+    if (start < i)
+        column = columnBefore;
+    const tail = start === 0 ? raw : raw.slice(start);
+    for (const { segment, index } of segmentGraphemes(tail)) {
+        if (start + index >= stopAfter)
             break;
         if (segment === "\t") {
             column += tabSize - (column % tabSize);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tuidom/core",
-    "version": "0.15.0",
+    "version": "0.16.0",
     "type": "module",
     "description": "Experimental terminal UI DOM — core: element tree, flex layout, grid rendering, input parsing. API is unstable.",
     "license": "MIT",