@opentuah/core 0.1.80 → 0.1.84

package/index.js

@@ -37,6 +37,7 @@ import {
   TextAttributes,
   TextBuffer,
   TreeSitterClient,
+  VTermStyleFlags,
   addDefaultParsers,
   attributesWithLink,
   bg,
@@ -145,10 +146,11 @@ import {
   treeSitterToTextChunks,
   underline,
   visualizeRenderableTree,
+  vtermDataToStyledText,
   white,
   wrapWithDelegates,
   yellow
-} from "./index-0envey0s.js";
+} from "./index-0t4rap2j.js";
 // src/text-buffer-view.ts
 class TextBufferView {
   lib;
@@ -3893,21 +3895,10 @@ class LineNumberRenderable extends Renderable {
     this._inlineHighlights = inlineHighlights;
     this.requestRender();
   }
-  getInlineHighlights() {
-    return this._inlineHighlights;
-  }
   clearInlineHighlights() {
     this._inlineHighlights.clear();
     this.requestRender();
   }
-  setLineInlineHighlights(line, highlights) {
-    this._inlineHighlights.set(line, highlights);
-    this.requestRender();
-  }
-  clearLineInlineHighlights(line) {
-    this._inlineHighlights.delete(line);
-    this.requestRender();
-  }
 }
 
 // src/renderables/Diff.ts
@@ -4045,8 +4036,8 @@ function computeInlineHighlights(oldContent, newContent) {
     return { oldHighlight: null, newHighlight: null };
   }
   const { stringARange, stringBRange } = relativeChanges(oldContent, newContent);
-  const oldHighlight = stringARange.length > 0 ? { ...toDisplayColumns(oldContent, stringARange.location, stringARange.length), type: "removed-word" } : null;
-  const newHighlight = stringBRange.length > 0 ? { ...toDisplayColumns(newContent, stringBRange.location, stringBRange.length), type: "added-word" } : null;
+  const oldHighlight = stringARange.length > 0 ? toDisplayColumns(oldContent, stringARange.location, stringARange.length) : null;
+  const newHighlight = stringBRange.length > 0 ? toDisplayColumns(newContent, stringBRange.location, stringBRange.length) : null;
   return { oldHighlight, newHighlight };
 }
 
@@ -4122,8 +4113,8 @@ class DiffRenderable extends Renderable {
     this._addedLineNumberBg = parseColor(options.addedLineNumberBg ?? "transparent");
     this._removedLineNumberBg = parseColor(options.removedLineNumberBg ?? "transparent");
     this._disableWordHighlights = options.disableWordHighlights ?? false;
-    this._addedWordBg = options.addedWordBg ? parseColor(options.addedWordBg) : this._addedBg.brighten(1.15);
-    this._removedWordBg = options.removedWordBg ? parseColor(options.removedWordBg) : this._removedBg.brighten(1.15);
+    this._addedWordBg = options.addedWordBg ? parseColor(options.addedWordBg) : this._addedBg.brighten(1.1);
+    this._removedWordBg = options.removedWordBg ? parseColor(options.removedWordBg) : this._removedBg.brighten(1.1);
     this._hunkHeaderBg = parseColor(options.hunkHeaderBg ?? "#1a1a2e");
     this._hunkHeaderFg = parseColor(options.hunkHeaderFg ?? "#6688aa");
     if (this._diff) {
@@ -4131,35 +4122,32 @@ class DiffRenderable extends Renderable {
       this.buildView();
     }
   }
-  toLineHighlights(highlights, bg2) {
-    return highlights.map((h2) => ({ startCol: h2.startCol, endCol: h2.endCol, bg: bg2 }));
-  }
   processChangeBlockWithHighlights(removes, adds) {
     const leftLines = [];
     const rightLines = [];
     const maxLength = Math.max(removes.length, adds.length);
     const shouldDisplayDiffInChunk = !this._disableWordHighlights && adds.length === removes.length;
-    const diffTokensBefore = [];
-    const diffTokensAfter = [];
+    const removedHighlights = [];
+    const addedHighlights = [];
     if (shouldDisplayDiffInChunk) {
       for (let i = 0;i < removes.length; i++) {
         const remove = removes[i];
         const add = adds[i];
         if (remove.content.length < MaxIntraLineDiffStringLength && add.content.length < MaxIntraLineDiffStringLength) {
           const { oldHighlight, newHighlight } = computeInlineHighlights(remove.content, add.content);
-          diffTokensBefore[i] = oldHighlight;
-          diffTokensAfter[i] = newHighlight;
+          removedHighlights[i] = oldHighlight;
+          addedHighlights[i] = newHighlight;
         } else {
-          diffTokensBefore[i] = null;
-          diffTokensAfter[i] = null;
+          removedHighlights[i] = null;
+          addedHighlights[i] = null;
         }
       }
     }
     for (let j = 0;j < maxLength; j++) {
       const remove = j < removes.length ? removes[j] : null;
       const add = j < adds.length ? adds[j] : null;
-      const leftHighlight = shouldDisplayDiffInChunk && j < diffTokensBefore.length ? diffTokensBefore[j] : null;
-      const rightHighlight = shouldDisplayDiffInChunk && j < diffTokensAfter.length ? diffTokensAfter[j] : null;
+      const leftRange = shouldDisplayDiffInChunk && j < removedHighlights.length ? removedHighlights[j] : null;
+      const rightRange = shouldDisplayDiffInChunk && j < addedHighlights.length ? addedHighlights[j] : null;
       if (remove) {
         leftLines.push({
           content: remove.content,
@@ -4170,7 +4158,7 @@ class DiffRenderable extends Renderable {
             afterColor: this._removedSignColor
           },
           type: "remove",
-          inlineHighlights: leftHighlight ? [leftHighlight] : []
+          inlineHighlights: leftRange ? [{ ...leftRange, bg: this._removedWordBg }] : []
         });
       } else {
         leftLines.push({
@@ -4189,7 +4177,7 @@ class DiffRenderable extends Renderable {
             afterColor: this._addedSignColor
           },
           type: "add",
-          inlineHighlights: rightHighlight ? [rightHighlight] : []
+          inlineHighlights: rightRange ? [{ ...rightRange, bg: this._addedWordBg }] : []
         });
       } else {
         rightLines.push({
@@ -4565,7 +4553,7 @@ class DiffRenderable extends Renderable {
             if (line2.lineNum !== undefined)
               lineNumbers.set(lineIndex, line2.lineNum);
             if (line2.inlineHighlights?.length) {
-              inlineHighlights.set(lineIndex, this.toLineHighlights(line2.inlineHighlights, this._removedWordBg));
+              inlineHighlights.set(lineIndex, line2.inlineHighlights);
             }
             lineIndex++;
           }
@@ -4581,7 +4569,7 @@ class DiffRenderable extends Renderable {
             if (line2.lineNum !== undefined)
               lineNumbers.set(lineIndex, line2.lineNum);
             if (line2.inlineHighlights?.length) {
-              inlineHighlights.set(lineIndex, this.toLineHighlights(line2.inlineHighlights, this._addedWordBg));
+              inlineHighlights.set(lineIndex, line2.inlineHighlights);
             }
             lineIndex++;
           }
@@ -4810,7 +4798,7 @@ class DiffRenderable extends Renderable {
         leftLineSigns.set(index, line.sign);
       }
       if (line.inlineHighlights?.length) {
-        leftInlineHighlights.set(index, this.toLineHighlights(line.inlineHighlights, this._removedWordBg));
+        leftInlineHighlights.set(index, line.inlineHighlights);
       }
     });
     finalRightLines.forEach((line, index) => {
@@ -4855,7 +4843,7 @@ class DiffRenderable extends Renderable {
         rightLineSigns.set(index, line.sign);
       }
       if (line.inlineHighlights?.length) {
-        rightInlineHighlights.set(index, this.toLineHighlights(line.inlineHighlights, this._addedWordBg));
+        rightInlineHighlights.set(index, line.inlineHighlights);
       }
     });
     const leftContentFinal = finalLeftLines.map((l) => l.content).join(`
@@ -9122,12 +9110,119 @@ class TabSelectRenderable extends Renderable {
     this._keyBindingsMap = buildKeyBindingsMap(mergedBindings, this._keyAliasMap);
   }
 }
+// src/renderables/Terminal.ts
+var DEFAULT_FG = RGBA.fromHex("#d4d4d4");
+function trimEmptyLines(data) {
+  while (data.lines.length > 0) {
+    const lastLine = data.lines[data.lines.length - 1];
+    const hasText = lastLine.spans.some((span) => span.text.trim().length > 0);
+    if (hasText)
+      break;
+    data.lines.pop();
+  }
+}
+
+class StatelessTerminalRenderable extends TextBufferRenderable {
+  _ansi;
+  _cols;
+  _rows;
+  _limit;
+  _trimEnd;
+  _needsUpdate = true;
+  _lineCount = 0;
+  _lib;
+  constructor(ctx, options) {
+    super(ctx, { ...options, fg: DEFAULT_FG, wrapMode: "none" });
+    this._ansi = options.ansi ?? "";
+    this._cols = options.cols ?? 120;
+    this._rows = options.rows ?? 40;
+    this._limit = options.limit;
+    this._trimEnd = options.trimEnd;
+    this._lib = resolveRenderLib();
+  }
+  get lineCount() {
+    return this._lineCount;
+  }
+  get ansi() {
+    return this._ansi;
+  }
+  set ansi(value) {
+    if (this._ansi !== value) {
+      this._ansi = value;
+      this._needsUpdate = true;
+      this.requestRender();
+    }
+  }
+  get cols() {
+    return this._cols;
+  }
+  set cols(value) {
+    if (this._cols !== value) {
+      this._cols = value;
+      this._needsUpdate = true;
+      this.requestRender();
+    }
+  }
+  get rows() {
+    return this._rows;
+  }
+  set rows(value) {
+    if (this._rows !== value) {
+      this._rows = value;
+      this._needsUpdate = true;
+      this.requestRender();
+    }
+  }
+  get limit() {
+    return this._limit;
+  }
+  set limit(value) {
+    if (this._limit !== value) {
+      this._limit = value;
+      this._needsUpdate = true;
+      this.requestRender();
+    }
+  }
+  get trimEnd() {
+    return this._trimEnd;
+  }
+  set trimEnd(value) {
+    if (this._trimEnd !== value) {
+      this._trimEnd = value;
+      this._needsUpdate = true;
+      this.requestRender();
+    }
+  }
+  renderSelf(buffer) {
+    if (this._needsUpdate) {
+      const data = this._lib.vtermPtyToJson(this._ansi, {
+        cols: this._cols,
+        rows: this._rows,
+        limit: this._limit
+      });
+      if (this._trimEnd)
+        trimEmptyLines(data);
+      this.textBuffer.setStyledText(vtermDataToStyledText(data));
+      this.updateTextInfo();
+      this._lineCount = this.textBufferView.logicalLineInfo.lineStarts.length;
+      this._needsUpdate = false;
+    }
+    super.renderSelf(buffer);
+  }
+  getScrollPositionForLine(lineNumber) {
+    const clampedLine = Math.max(0, Math.min(lineNumber, this._lineCount - 1));
+    const lineStarts = this.textBufferView.logicalLineInfo.lineStarts;
+    const lineYOffset = lineStarts?.[clampedLine] ?? clampedLine;
+    return this.y + lineYOffset;
+  }
+}
 // src/index.ts
 import * as Yoga from "yoga-layout";
 export {
   yellow,
   wrapWithDelegates,
   white,
+  vtermDataToStyledText,
   vstyles,
   visualizeRenderableTree,
   main as updateAssets,
@@ -9245,6 +9340,7 @@ export {
   addDefaultParsers,
   Yoga,
   VignetteEffect,
+  VTermStyleFlags,
   VRenderable,
   TreeSitterClient,
   Timeline,
@@ -9264,6 +9360,7 @@ export {
   SyntaxStyle,
   StyledText,
   StdinBuffer,
+  StatelessTerminalRenderable,
   SliderRenderable,
   Selection,
   SelectRenderableEvents,
@@ -9327,5 +9424,5 @@ export {
   ASCIIFont
 };
 
-//# debugId=920E724ED4DA89FA64756E2164756E21
+//# debugId=F3E0750B0CE8050E64756E2164756E21
 //# sourceMappingURL=index.js.map