typescript-virtual-container 1.5.8 → 1.5.9

package/dist/modules/webTermRenderer.js

@@ -15,9 +15,11 @@ export class WebTermRenderer {
     rows;
     cols;
     screen;
+    scrollback = [];
     curRow = 0;
     curCol = 0;
     cursorVisible = true;
+    _cleared = false;
     // Current SGR state
     bold = false;
     reverse = false;
@@ -66,8 +68,34 @@ export class WebTermRenderer {
                     this.handleCsi(seq, cmd);
                     i = j + 1;
                 }
+                else if (next === "]") {
+                    // OSC (Operating System Command) — terminator is BEL (\x07) or ST (ESC \)
+                    // Must consume fully or the payload prints as raw text and corrupts SGR state.
+                    let j = i + 2;
+                    while (j < this.buf.length) {
+                        if (this.buf[j] === "\x07") {
+                            j++;
+                            break;
+                        }
+                        if (this.buf[j] === "\x1b" && this.buf[j + 1] === "\\") {
+                            j += 2;
+                            break;
+                        }
+                        j++;
+                    }
+                    // If terminator not yet received, wait for more data
+                    if (j >= this.buf.length && this.buf[j - 1] !== "\x07")
+                        break;
+                    i = j;
+                }
+                else if (next === "O") {
+                    // SS3 — single extra byte (F1-F4, cursor keys in application mode)
+                    if (i + 2 >= this.buf.length)
+                        break; // wait for more data
+                    i += 3; // ESC O <cmd>
+                }
                 else {
-                    i += 2; // skip unknown ESC sequence
+                    i += 2; // skip unknown 2-char ESC sequence
                 }
             }
             else if (ch === "\r") {
@@ -75,7 +103,12 @@ export class WebTermRenderer {
                 i++;
             }
             else if (ch === "\n") {
-                this.curRow = Math.min(this.curRow + 1, this.rows - 1);
+                if (this.curRow < this.rows - 1) {
+                    this.curRow++;
+                }
+                else {
+                    this.scrollUp();
+                }
                 i++;
             }
             else if (ch.charCodeAt(0) >= 32) {
@@ -116,15 +149,6 @@ export class WebTermRenderer {
             }
             return;
         }
-        if (cmd === "J") {
-            const mode = seq === "" ? 0 : Number.parseInt(seq, 10);
-            if (mode === 2) {
-                this.screen = this.makeScreen();
-                this.curRow = 0;
-                this.curCol = 0;
-            }
-            return;
-        }
         if (cmd === "m") {
             this.handleSgr(seq);
             return;
@@ -137,6 +161,57 @@ export class WebTermRenderer {
             this.cursorVisible = true;
             return;
         }
+        // Cursor movement (relative)
+        if (cmd === "A") {
+            const n = Number.parseInt(seq || "1", 10) || 1;
+            this.curRow = Math.max(0, this.curRow - n);
+            return;
+        }
+        if (cmd === "B") {
+            const n = Number.parseInt(seq || "1", 10) || 1;
+            this.curRow = Math.min(this.rows - 1, this.curRow + n);
+            return;
+        }
+        if (cmd === "C") {
+            const n = Number.parseInt(seq || "1", 10) || 1;
+            this.curCol = Math.min(this.cols - 1, this.curCol + n);
+            return;
+        }
+        if (cmd === "D") {
+            const n = Number.parseInt(seq || "1", 10) || 1;
+            this.curCol = Math.max(0, this.curCol - n);
+            return;
+        }
+        // Cursor column absolute
+        if (cmd === "G") {
+            const n = Number.parseInt(seq || "1", 10) || 1;
+            this.curCol = Math.max(0, Math.min(n - 1, this.cols - 1));
+            return;
+        }
+        // Erase display modes 0/1
+        if (cmd === "J") {
+            const mode = seq === "" ? 0 : Number.parseInt(seq, 10);
+            if (mode === 0) {
+                for (let c = this.curCol; c < this.cols; c++)
+                    this.screen[this.curRow][c] = makeCell();
+                for (let r = this.curRow + 1; r < this.rows; r++)
+                    this.screen[r] = Array.from({ length: this.cols }, () => makeCell());
+            }
+            else if (mode === 1) {
+                for (let r = 0; r < this.curRow; r++)
+                    this.screen[r] = Array.from({ length: this.cols }, () => makeCell());
+                for (let c = 0; c <= this.curCol; c++)
+                    this.screen[this.curRow][c] = makeCell();
+            }
+            else if (mode === 2) {
+                this.screen = this.makeScreen();
+                this.scrollback = [];
+                this.curRow = 0;
+                this.curCol = 0;
+                this._cleared = true;
+            }
+            return;
+        }
     }
     handleSgr(seq) {
         const codes = seq === "" ? [0] : seq.split(";").map((n) => Number.parseInt(n || "0", 10));
@@ -202,9 +277,24 @@ export class WebTermRenderer {
             i++;
         }
     }
+    scrollUp() {
+        const line = this.screen.shift();
+        this.scrollback.push(line);
+        if (this.scrollback.length > 1000)
+            this.scrollback.shift();
+        this.screen.push(Array.from({ length: this.cols }, () => makeCell()));
+        // curRow stays at rows-1 (bottom)
+    }
     putChar(ch) {
-        if (this.curRow >= this.rows || this.curCol >= this.cols)
-            return;
+        if (this.curCol >= this.cols) {
+            this.curCol = 0;
+            if (this.curRow < this.rows - 1) {
+                this.curRow++;
+            }
+            else {
+                this.scrollUp();
+            }
+        }
         this.screen[this.curRow][this.curCol] = makeCell({
             ch,
             bold: this.bold,
@@ -213,11 +303,6 @@ export class WebTermRenderer {
             bg: this.bg,
         });
         this.curCol++;
-        if (this.curCol >= this.cols) {
-            this.curCol = 0;
-            if (this.curRow < this.rows - 1)
-                this.curRow++;
-        }
     }
     makeScreen(rows = this.rows, cols = this.cols) {
         return Array.from({ length: rows }, () => Array.from({ length: cols }, () => makeCell()));
@@ -235,14 +320,60 @@ export class WebTermRenderer {
                 let fg = cell.fg ?? "#ccc";
                 let bg = cell.bg ?? "transparent";
                 if (cell.reverse) {
-                    [fg, bg] = [bg === "transparent" ? "#000" : bg, fg];
+                    [fg, bg] = [bg === "transparent" ? "#000" : bg, fg === "transparent" ? "#000" : fg];
                 }
-                if (cell.bold && !cell.fg)
-                    fg = "#fff";
                 if (isCursor) {
-                    [fg, bg] = [bg === "transparent" ? "#000" : bg, fg === "#ccc" ? "#ccc" : fg];
-                    bg = "#ccc";
-                    fg = "#000";
+                    // Isoler le curseur dans son propre span pour éviter que sa couleur
+                    // inversée ne déborde sur les cellules vides adjacentes.
+                    if (spanOpen) {
+                        html += "</span>";
+                        spanOpen = false;
+                        lastStyle = "";
+                    }
+                    const curFg = bg === "transparent" ? "#000" : bg;
+                    const boldPart = cell.bold ? "font-weight:bold;" : "";
+                    html += `<span style="color:${curFg};background:#ccc;${boldPart}">${escHtml(cell.ch)}</span>`;
+                }
+                else {
+                    const style = `color:${fg};background:${bg};${cell.bold ? "font-weight:bold;" : ""}`;
+                    if (style !== lastStyle) {
+                        if (spanOpen)
+                            html += "</span>";
+                        html += `<span style="${style}">`;
+                        spanOpen = true;
+                        lastStyle = style;
+                    }
+                    html += escHtml(cell.ch);
+                }
+            }
+            if (spanOpen)
+                html += "</span>";
+            if (r < this.rows - 1)
+                html += "\n";
+        }
+        return html;
+    }
+    get cursorRow() { return this.curRow; }
+    get cursorCol() { return this.curCol; }
+    get isCursorVisible() { return this.cursorVisible; }
+    /** Returns true (once) if CSI 2J was received since last call. */
+    consumeCleared() {
+        const v = this._cleared;
+        this._cleared = false;
+        return v;
+    }
+    get scrollbackLength() { return this.scrollback.length; }
+    clearScrollback() { this.scrollback = []; }
+    renderScrollbackHtml() {
+        let html = "";
+        for (const row of this.scrollback) {
+            let spanOpen = false;
+            let lastStyle = "";
+            for (const cell of row) {
+                let fg = cell.fg ?? "#ccc";
+                let bg = cell.bg ?? "transparent";
+                if (cell.reverse) {
+                    [fg, bg] = [bg === "transparent" ? "#000" : bg, fg === "transparent" ? "#000" : fg];
                 }
                 const style = `color:${fg};background:${bg};${cell.bold ? "font-weight:bold;" : ""}`;
                 if (style !== lastStyle) {
@@ -256,15 +387,18 @@ export class WebTermRenderer {
             }
             if (spanOpen)
                 html += "</span>";
-            if (r < this.rows - 1)
-                html += "\n";
+            html += "\n";
         }
         return html;
     }
-    get cursorRow() { return this.curRow; }
-    get cursorCol() { return this.curCol; }
-    get isCursorVisible() { return this.cursorVisible; }
 }
+// const ANSI_NORMAL_TO_BRIGHT: Record<string, string> = {
+// 	"#000": "#555", "#c00": "#f55", "#0c0": "#5f5", "#cc0": "#ff5",
+// 	"#00c": "#55f", "#c0c": "#f5f", "#0cc": "#5ff", "#ccc": "#fff",
+// };
+// function boldBright(fg: string): string {
+// 	return ANSI_NORMAL_TO_BRIGHT[fg] ?? fg;
+// }
 function escHtml(ch) {
     if (ch === "&")
         return "&amp;";

package/dist/types/commands.d.ts

@@ -27,6 +27,8 @@ export interface CommandResult {
     openEditor?: NanoEditorSession;
     /** Request opening built-in htop-like screen. */
     openHtop?: boolean;
+    /** Request opening built-in Pac-Man game. */
+    openPacman?: boolean;
     /** Request sudo password challenge flow. */
     sudoChallenge?: SudoChallenge;
     /** Request a generic password challenge (adduser, passwd). */

package/dist/types/pipeline.d.ts

@@ -36,6 +36,8 @@ export interface Statement {
     op?: LogicalOp;
     /** Optional next statement in sequence. */
     next?: Statement;
+    /** Run in background (trailing &). */
+    background?: boolean;
 }
 /** Top-level parse result for a script. */
 export interface Script {

package/package.json

@@ -4,7 +4,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "files": [
     "dist/",
     "README.md",
@@ -37,7 +37,7 @@
     "deploy:npm": "bun publish --access public",
     "bench": "rm -rf .benchmark-shells/ && bun benchmark-virtualshell.ts",
     "benchmark": "bun benchmark-virtualshell.ts > benchmark-results.txt",
-"web-build": "bunx esbuild src/web.ts --bundle --platform=browser --format=esm --target=es2020 --outfile=builds/web.min.js --tree-shaking=true --minify",
+    "web-build": "bunx esbuild src/web.ts --bundle --platform=browser --format=esm --target=es2020 --outfile=builds/web.min.js --tree-shaking=true --minify",
     "web-build-iife": "bunx esbuild src/web.ts --bundle --platform=browser --format=iife --target=es2020 --outfile=builds/web-iife.min.js --tree-shaking=true --minify --global-name=WebShellLib",
     "example-build": "bun run web-build && cp builds/web.min.js examples/web.min.js",
     "example-serve": "cd examples && bun server.js",