@opentui/core 0.5.1 → 0.5.2

package/{chunk-node-0yw3x5m7.js → chunk-node-kq7as74d.js}

@@ -40,7 +40,7 @@ import {
   toArrayBuffer,
   treeSitterToTextChunks,
   yoga_default
-} from "./chunk-node-m23dbcww.js";
+} from "./chunk-node-aj3n20gq.js";
 
 // src/Renderable.ts
 import { EventEmitter } from "events";
@@ -3115,6 +3115,9 @@ class CodeRenderable extends TextBufferRenderable {
   _treeSitterClient;
   _highlightsDirty = false;
   _highlightSnapshotId = 0;
+  _highlightLoopActive = false;
+  _highlightPromise;
+  _highlightRerun = false;
   _conceal;
   _drawUnstyledText;
   _shouldRenderTextBuffer = true;
@@ -3161,11 +3164,14 @@ class CodeRenderable extends TextBufferRenderable {
   get content() {
     return this._content;
   }
+  invalidateHighlights() {
+    this._highlightsDirty = true;
+    this._highlightSnapshotId++;
+  }
   set content(value) {
     if (this._content !== value) {
       this._content = value;
-      this._highlightsDirty = true;
-      this._highlightSnapshotId++;
+      this.invalidateHighlights();
       if (this._streaming && this._filetype && !this._drawUnstyledText) {
         this.requestRender();
         return;
@@ -3215,7 +3221,7 @@ class CodeRenderable extends TextBufferRenderable {
   set filetype(value) {
     if (this._filetype !== value) {
       this._filetype = value;
-      this._highlightsDirty = true;
+      this.invalidateHighlights();
     }
   }
   get syntaxStyle() {
@@ -3224,7 +3230,7 @@ class CodeRenderable extends TextBufferRenderable {
   set syntaxStyle(value) {
     if (this._syntaxStyle !== value) {
       this._syntaxStyle = value;
-      this._highlightsDirty = true;
+      this.invalidateHighlights();
     }
   }
   get conceal() {
@@ -3233,7 +3239,7 @@ class CodeRenderable extends TextBufferRenderable {
   set conceal(value) {
     if (this._conceal !== value) {
       this._conceal = value;
-      this._highlightsDirty = true;
+      this.invalidateHighlights();
     }
   }
   get drawUnstyledText() {
@@ -3242,7 +3248,7 @@ class CodeRenderable extends TextBufferRenderable {
   set drawUnstyledText(value) {
     if (this._drawUnstyledText !== value) {
       this._drawUnstyledText = value;
-      this._highlightsDirty = true;
+      this.invalidateHighlights();
     }
   }
   get streaming() {
@@ -3251,7 +3257,7 @@ class CodeRenderable extends TextBufferRenderable {
   set initialStyledText(value) {
     if (this._initialStyledText !== value) {
       this._initialStyledText = value;
-      this._highlightsDirty = true;
+      this.invalidateHighlights();
     }
   }
   set streaming(value) {
@@ -3259,7 +3265,7 @@ class CodeRenderable extends TextBufferRenderable {
       this._streaming = value;
       this._hadInitialContent = false;
       this._lastHighlights = [];
-      this._highlightsDirty = true;
+      this.invalidateHighlights();
     }
   }
   get treeSitterClient() {
@@ -3268,7 +3274,7 @@ class CodeRenderable extends TextBufferRenderable {
   set treeSitterClient(value) {
     if (this._treeSitterClient !== value) {
       this._treeSitterClient = value;
-      this._highlightsDirty = true;
+      this.invalidateHighlights();
     }
   }
   get onHighlight() {
@@ -3280,13 +3286,13 @@ class CodeRenderable extends TextBufferRenderable {
   set baseHighlight(value) {
     if (this._baseHighlight !== value) {
       this._baseHighlight = value;
-      this._highlightsDirty = true;
+      this.invalidateHighlights();
     }
   }
   set onHighlight(value) {
     if (this._onHighlight !== value) {
       this._onHighlight = value;
-      this._highlightsDirty = true;
+      this.invalidateHighlights();
     }
   }
   get onChunks() {
@@ -3295,11 +3301,11 @@ class CodeRenderable extends TextBufferRenderable {
   set onChunks(value) {
     if (this._onChunks !== value) {
       this._onChunks = value;
-      this._highlightsDirty = true;
+      this.invalidateHighlights();
     }
   }
   get isHighlighting() {
-    return this._isHighlighting;
+    return this._isHighlighting || this._highlightRerun;
   }
   get highlightingDone() {
     return this._highlightingPromise;
@@ -3424,6 +3430,23 @@ class CodeRenderable extends TextBufferRenderable {
       this.requestRender();
     }
   }
+  async runHighlights() {
+    try {
+      do {
+        this._highlightRerun = false;
+        await this.startHighlight();
+      } while (this._highlightRerun && !this.isDestroyed && this._content.length > 0 && this._filetype);
+    } finally {
+      this._highlightLoopActive = false;
+      this._highlightRerun = false;
+    }
+  }
+  clearPendingHighlight() {
+    this._highlightSnapshotId++;
+    this._isHighlighting = false;
+    this._highlightRerun = false;
+    this._highlightingPromise = Promise.resolve();
+  }
   setRenderedLineSources(lineSources) {
     this._renderedLineSources = lineSources;
     this._mappedLineInfo = undefined;
@@ -3520,22 +3543,53 @@ class CodeRenderable extends TextBufferRenderable {
     if (this._highlightsDirty) {
       if (this.isDestroyed)
         return;
-      if (this._content.length === 0) {
-        this._shouldRenderTextBuffer = false;
-        this._highlightsDirty = false;
-      } else if (!this._filetype) {
-        this._shouldRenderTextBuffer = true;
+      const hasContent = this._content.length > 0;
+      if (!hasContent || !this._filetype) {
+        this._shouldRenderTextBuffer = hasContent;
         this._highlightsDirty = false;
+        this.clearPendingHighlight();
+        if (hasContent) {
+          this.textBuffer.setText(this._content);
+          this.setRenderedLineSources(undefined);
+          this.updateTextInfo();
+        }
       } else {
         this.ensureVisibleTextBeforeHighlight();
         this._highlightsDirty = false;
-        this._highlightingPromise = this.startHighlight();
+        if (this._highlightLoopActive) {
+          this._isHighlighting = true;
+          this._highlightRerun = true;
+          this._highlightingPromise = this._highlightPromise;
+        } else {
+          const { promise: highlightingPromise, resolve, reject } = Promise.withResolvers();
+          this._highlightLoopActive = true;
+          this._highlightPromise = highlightingPromise;
+          this._highlightingPromise = highlightingPromise;
+          const clearHighlight = () => {
+            if (this._highlightPromise === highlightingPromise) {
+              this._highlightPromise = undefined;
+            }
+          };
+          this.runHighlights().then(() => {
+            clearHighlight();
+            resolve();
+          }, (error) => {
+            clearHighlight();
+            reject(error);
+          });
+        }
       }
     }
     if (!this._shouldRenderTextBuffer)
       return;
     super.renderSelf(buffer);
   }
+  destroy() {
+    if (this.isDestroyed)
+      return;
+    this.clearPendingHighlight();
+    super.destroy();
+  }
 }
 
 // src/renderables/TextNode.ts
@@ -6805,6 +6859,10 @@ class ScrollbackSnapshotRenderContext extends EventEmitter5 {
   updateSelection(_currentRenderable, _x, _y, _options) {}
 }
 var DEFAULT_FORWARDED_ENV_KEYS = [
+  "SSH_CONNECTION",
+  "SSH_CLIENT",
+  "SSH_TTY",
+  "MOSH_CONNECTION",
   "TMUX",
   "ZELLIJ",
   "ZELLIJ_SESSION_NAME",
@@ -7035,6 +7093,7 @@ class CliRenderer extends EventEmitter5 {
   animationRequest = new Map;
   resizeTimeoutId = null;
   capabilityTimeoutId = null;
+  terminalKeepAliveTimer = null;
   xtVersionWaiters = new Set;
   splitStartupSeedTimeoutId = null;
   pendingSplitStartupCursorSeed = false;
@@ -7240,7 +7299,7 @@ Captured external output:
     this.rendererPtr = rendererPtr;
     this.clearOnShutdown = config.clearOnShutdown ?? true;
     this.lib.setClearOnShutdown(this.rendererPtr, this.clearOnShutdown);
-    const forwardEnvKeys = config.forwardEnvKeys ?? (config.remote === false ? [...DEFAULT_FORWARDED_ENV_KEYS] : []);
+    const forwardEnvKeys = config.forwardEnvKeys ?? (remoteMode === true ? [] : [...DEFAULT_FORWARDED_ENV_KEYS]);
     for (const key of forwardEnvKeys) {
       const value = process.env[key];
       if (value === undefined)
@@ -7254,8 +7313,8 @@ Captured external output:
       "SIGQUIT",
       "SIGABRT",
       "SIGHUP",
-      "SIGBREAK",
       "SIGPIPE",
+      "SIGBREAK",
       "SIGBUS"
     ];
     this.clipboard = new Clipboard(this.lib, this.rendererPtr);
@@ -7299,7 +7358,6 @@ Captured external output:
     process.on("warning", this.warningHandler);
     process.on("uncaughtException", this.handleError);
     process.on("unhandledRejection", this.handleError);
-    process.on("beforeExit", this.exitHandler);
     const useKittyForParsing = kittyConfig !== null;
     this._keyHandler = new InternalKeyHandler;
     this._keyHandler.on("keypress", (event) => {
@@ -7383,6 +7441,17 @@ Captured external output:
     });
     this._exitListenersAdded = true;
   }
+  startTerminalKeepAlive() {
+    if (this.stdin !== process.stdin || this.terminalKeepAliveTimer !== null)
+      return;
+    this.terminalKeepAliveTimer = setInterval(() => {}, 60000);
+  }
+  stopTerminalKeepAlive() {
+    if (this.terminalKeepAliveTimer === null)
+      return;
+    clearInterval(this.terminalKeepAliveTimer);
+    this.terminalKeepAliveTimer = null;
+  }
   removeExitListeners() {
     if (!this._exitListenersAdded || this.exitSignals.length === 0)
       return;
@@ -8953,6 +9022,7 @@ Captured external output:
     }
     this.stdin.on("data", this.stdinListener);
     this.stdin.resume();
+    this.startTerminalKeepAlive();
   }
   dispatchMouseEvent(target, attributes) {
     const event = new MouseEvent(target, attributes);
@@ -9425,6 +9495,7 @@ Captured external output:
     else
       this.stdinParser?.reset();
     this.stdin.removeListener("data", this.stdinListener);
+    this.stopTerminalKeepAlive();
     this.themeModeState.cancelRefresh();
     this.lib.suspendRenderer(this.rendererPtr);
     if (this.stdin.setRawMode) {
@@ -9445,6 +9516,7 @@ Captured external output:
       this.stdinParser?.reset();
     this.stdin.on("data", this.stdinListener);
     this.stdin.resume();
+    this.startTerminalKeepAlive();
     this.addExitListeners();
     const resumePreservedNonAltSurface = this.pendingSuspendedTerminalSetup && this._screenMode !== "alternate-screen" && this.suspendedNonAltSurfacePreserved && this.renderOffset > 0;
     if (this.pendingSuspendedTerminalSetup) {
@@ -9528,7 +9600,6 @@ Captured external output:
     process.removeListener("uncaughtException", this.handleError);
     process.removeListener("unhandledRejection", this.handleError);
     process.removeListener("warning", this.warningHandler);
-    process.removeListener("beforeExit", this.exitHandler);
     this.removeExitListeners();
     if (this.resizeTimeoutId !== null) {
       this.clock.clearTimeout(this.resizeTimeoutId);
@@ -9560,6 +9631,7 @@ Captured external output:
     this._useMouse = false;
     this.setCapturedRenderable(undefined);
     this.stdin.removeListener("data", this.stdinListener);
+    this.stopTerminalKeepAlive();
     if (this.stdin.setRawMode) {
       try {
         this.stdin.setRawMode(false);
@@ -10152,5 +10224,5 @@ Captured external output:
 
 export { h, isVNode, maybeMakeRenderable, wrapWithDelegates, instantiate, delegate, LayoutEvents, RenderableEvents, isRenderable, BaseRenderable, Renderable, RootRenderable, TextBufferView, EditBuffer, EditorView, convertThemeToStyles, SyntaxStyle, ANSI, BoxRenderable, TextBufferRenderable, CodeRenderable, isTextNodeRenderable, TextNodeRenderable, RootTextNodeRenderable, TextRenderable, NativeSpanFeed, defaultKeyAliases, mergeKeyAliases, mergeKeyBindings, getKeyBindingAction, buildKeyBindingsMap, capture, ConsolePosition, TerminalConsole, getObjectsInViewport, EditBufferRenderableEvents, isEditBufferRenderable, EditBufferRenderable, buildKittyKeyboardFlags, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, RendererControlState, CliRenderer };
 
-//# debugId=19BC632C369BDFA064756E2164756E21
-//# sourceMappingURL=chunk-node-0yw3x5m7.js.map
+//# debugId=58E1FA06080F555B64756E2164756E21
+//# sourceMappingURL=chunk-node-kq7as74d.js.map