@hraness/dawg 0.6.1 → 0.8.0

package/tui/text.ts

@@ -30,9 +30,37 @@ export function graphemeWidth(cluster: string): number {
   return Math.max(0, Math.min(2, width));
 }
 
-/** Segment text into grapheme clusters with code-point offsets and widths. */
-export function graphemes(text: string): Grapheme[] {
+/** Printable ASCII only: one cell per character, no segmentation needed. */
+const PRINTABLE_ASCII = /^[\x20-\x7e]*$/;
+
+/**
+ * Recent segmentations. A frame paints the same strings every tick (help
+ * rows, labels, hints), and segmenting them is most of a large frame's
+ * cost; the cache holds a frame's worth and is dropped whole when full.
+ */
+const segmented = new Map<string, readonly Grapheme[]>();
+const SEGMENTED_MAX = 4096;
+
+/**
+ * Segment text into grapheme clusters with code-point offsets and widths.
+ * The result is shared between calls: read it, never mutate it.
+ */
+export function graphemes(text: string): readonly Grapheme[] {
+  const cached = segmented.get(text);
+  if (cached) return cached;
+  const result = segment(text);
+  if (segmented.size >= SEGMENTED_MAX) segmented.clear();
+  segmented.set(text, result);
+  return result;
+}
+
+function segment(text: string): Grapheme[] {
   const result: Grapheme[] = [];
+  if (PRINTABLE_ASCII.test(text)) {
+    for (let index = 0; index < text.length; index += 1)
+      result.push({ text: text[index]!, start: index, length: 1, width: 1 });
+    return result;
+  }
   let start = 0;
   const clusters = segmenter
     ? Array.from(segmenter.segment(text), (part) => part.segment)
@@ -51,6 +79,7 @@ export function graphemes(text: string): Grapheme[] {
 }
 
 export function displayWidth(text: string): number {
+  if (PRINTABLE_ASCII.test(text)) return text.length;
   let width = 0;
   for (const cluster of graphemes(text)) width += cluster.width;
   return width;
@@ -61,6 +90,10 @@ export function truncate(text: string, width: number, ellipsis = "…"): string
   if (width <= 0) return "";
   if (displayWidth(text) <= width) return text;
   const room = Math.max(0, width - displayWidth(ellipsis));
+  if (PRINTABLE_ASCII.test(text))
+    return room === 0
+      ? ellipsis.slice(0, width)
+      : `${text.slice(0, room)}${ellipsis}`;
   let used = 0;
   let out = "";
   for (const cluster of graphemes(text)) {

package/tui/theme.ts

@@ -56,7 +56,12 @@ export type SemanticRole =
   | "promptBg"
   | "promptText"
   | "pillSteer"
-  | "pillQueue";
+  | "pillQueue"
+  /** The four knobs (design §7.1): reserved, never reused for other things. */
+  | "knob1"
+  | "knob2"
+  | "knob3"
+  | "knob4";
 
 export interface Rgb {
   readonly r: number;
@@ -115,6 +120,10 @@ const defaultTheme: Theme = {
     promptText: { fg: rgb(232, 237, 246) },
     pillSteer: { fg: rgb(17, 20, 26), bg: rgb(91, 211, 145), bold: true },
     pillQueue: { fg: rgb(17, 20, 26), bg: rgb(255, 193, 87), bold: true },
+    knob1: { fg: rgb(80, 160, 255), bold: true },
+    knob2: { fg: rgb(90, 210, 140), bold: true },
+    knob3: { fg: rgb(225, 228, 236), bold: true },
+    knob4: { fg: rgb(255, 140, 60), bold: true },
   },
   accents: [
     rgb(95, 181, 255),
@@ -160,6 +169,10 @@ const highContrastTheme: Theme = {
     promptText: { fg: rgb(255, 255, 255), bold: true },
     pillSteer: { fg: rgb(0, 0, 0), bg: rgb(0, 255, 0), bold: true },
     pillQueue: { fg: rgb(0, 0, 0), bg: rgb(255, 255, 0), bold: true },
+    knob1: { fg: rgb(60, 150, 255), bold: true },
+    knob2: { fg: rgb(60, 255, 140), bold: true },
+    knob3: { fg: rgb(236, 240, 255), bold: true },
+    knob4: { fg: rgb(255, 130, 30), bold: true },
   },
   accents: [
     rgb(0, 200, 255),
@@ -206,6 +219,11 @@ const monoTheme: Theme = {
     promptText: {},
     pillSteer: { reverse: true, bold: true },
     pillQueue: { reverse: true, bold: true, underline: true },
+    // No hue: the knob glyphs (● ▲ ■ ◆) carry which knob is which.
+    knob1: { bold: true },
+    knob2: { bold: true },
+    knob3: { bold: true },
+    knob4: { bold: true },
   },
   accents: [],
 };
@@ -425,6 +443,33 @@ export function styleSgr(
   return sequence;
 }
 
+/**
+ * The shortest SGR that moves the terminal from `from` to `to` when they
+ * differ only in foreground colour: `38;…` or `39`, never a full reset.
+ * Undefined when anything else differs (the caller emits `styleSgr`).
+ */
+export function foregroundSgr(
+  from: Style,
+  to: Style,
+  capabilities: TerminalCapabilities,
+): string | undefined {
+  if (capabilities.attributes === false) return "";
+  if (
+    !!from.bold !== !!to.bold ||
+    !!from.dim !== !!to.dim ||
+    !!from.italic !== !!to.italic ||
+    !!from.underline !== !!to.underline ||
+    !!from.reverse !== !!to.reverse
+  )
+    return undefined;
+  const fromBg = from.bg && colorCode(from.bg, capabilities.colorDepth, true);
+  const toBg = to.bg && colorCode(to.bg, capabilities.colorDepth, true);
+  if (fromBg !== toBg) return undefined;
+  if (!to.fg) return "\u001b[39m";
+  const code = colorCode(to.fg, capabilities.colorDepth, false);
+  return code ? `\u001b[${code}m` : "\u001b[39m";
+}
+
 /** Resolve the effective theme: no-color terminals always use attributes only. */
 export function effectiveTheme(
   name: ThemeName,