@north-light/crouter 0.3.202 → 0.3.204

package/dist/clients/attach/ansi-cells.d.ts

@@ -24,10 +24,14 @@ export declare function rowCells(line: string): number;
 /** Plain text of cells `[from, to)` — every escape, link boundary, and cursor
  *  marker dropped, exactly what a terminal copies out of that span. */
 export declare function sliceCells(line: string, from: number, to: number): string;
-/** The SGR pair `styleCells` asserts over a span. */
+/** The SGR pair `styleCells` asserts over a span. A style that paints color
+ *  sets `restore`, because its `off` cannot un-set one color without also
+ *  discarding whatever color the row had underneath it — with `restore`, the
+ *  span closes by resetting and replaying the SGRs the row had already asserted. */
 export type CellStyle = {
     on: string;
     off: string;
+    restore?: boolean;
 };
 export declare const INVERSE_STYLE: CellStyle;
 /** Style cells `[from, to)`, re-asserting `style.on` after any SGR inside the

package/dist/clients/attach/ansi-cells.js

@@ -89,19 +89,30 @@ export function styleCells(line, from, to, maxCells, style = INVERSE_STYLE) {
         return line;
     let out = '';
     let inside = false;
+    // The SGRs in force at the current point, so a color span can hand the row
+    // back exactly as it found it. A full reset clears the list.
+    const active = [];
     const open = () => { if (!inside) {
         out += style.on;
         inside = true;
     } };
-    const close = () => { if (inside) {
-        out += style.off;
+    const close = () => {
+        if (!inside)
+            return;
+        out += style.restore === true ? `\x1b[0m${active.join('')}` : style.off;
         inside = false;
-    } };
+    };
     const cells = walkRow(line, {
         onEscape: (escape) => {
             out += escape;
+            if (!escape.endsWith('m'))
+                return;
+            if (escape === '\x1b[0m' || escape === '\x1b[m')
+                active.length = 0;
+            else
+                active.push(escape);
             // An SGR inside the span may have reset every attribute, including ours.
-            if (inside && escape.endsWith('m'))
+            if (inside)
                 out += style.on;
         },
         onGlyph: (glyph) => {
@@ -116,7 +127,7 @@ export function styleCells(line, from, to, maxCells, style = INVERSE_STYLE) {
     if (cells < end) {
         const gap = Math.max(0, from - cells);
         const styled = end - Math.max(from, cells);
-        out += ' '.repeat(gap) + style.on + ' '.repeat(styled) + style.off;
+        out += ' '.repeat(gap) + style.on + ' '.repeat(styled) + (style.restore === true ? '\x1b[0m' : style.off);
     }
     return out;
 }

package/dist/clients/attach/render/transcript-search.js

@@ -10,12 +10,11 @@
 // what the viewport needs to scroll to one and what `highlightCells` needs to
 // paint one.
 import { styleCells, walkRow } from '../ansi-cells.js';
-/** Every hit is reverse-video; the one you are standing on is also underlined,
- *  so a screen with several hits still says which of them `n` will leave.
- *  Closing a span restores nothing, so the extra attribute is underline rather
- *  than bold: transcript text runs bold often and underlined almost never. */
-const HIT_STYLE = { on: '\x1b[7m', off: '\x1b[27m' };
-const SELECTED_HIT_STYLE = { on: '\x1b[7m\x1b[4m', off: '\x1b[24m\x1b[27m' };
+/** Hits are painted as backgrounds with black text, the way an editor marks
+ *  find results: white for every hit, amber for the one you are standing on, so
+ *  a screen full of hits still says which of them `n` will leave. */
+const HIT_STYLE = { on: '\x1b[107m\x1b[30m', off: '', restore: true };
+const SELECTED_HIT_STYLE = { on: '\x1b[48;5;214m\x1b[30m', off: '', restore: true };
 function plainRow(line) {
     let text = '';
     const cells = [];