@opentui/core 0.4.5 → 0.5.1

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

@@ -40,7 +40,7 @@ import {
   toArrayBuffer,
   treeSitterToTextChunks,
   yoga_default
-} from "./chunk-node-q0cwyvm9.js";
+} from "./chunk-node-m23dbcww.js";
 
 // src/Renderable.ts
 import { EventEmitter } from "events";
@@ -1256,6 +1256,7 @@ class Renderable extends BaseRenderable {
   }
   destroySelf() {}
   processMouseEvent(event) {
+    event.currentTarget = this;
     this._mouseListener?.call(this, event);
     this._mouseListeners[event.type]?.call(this, event);
     this.onMouseEvent(event);
@@ -1364,6 +1365,7 @@ class Renderable extends BaseRenderable {
 
 class RootRenderable extends Renderable {
   renderList = [];
+  _currentRenderable;
   appliedLayoutGeneration = -1;
   appliedRenderListRevision = -1;
   renderListReusable = false;
@@ -1385,7 +1387,16 @@ class RootRenderable extends Renderable {
     this.yogaNode.setFlexDirection(0 /* Column */);
     this.calculateLayout();
   }
+  get currentRenderable() {
+    return this._currentRenderable;
+  }
+  takeCurrentRenderable() {
+    const renderable = this._currentRenderable;
+    this._currentRenderable = undefined;
+    return renderable;
+  }
   render(buffer, deltaTime) {
+    this._currentRenderable = undefined;
     if (!this.visible)
       return;
     for (const renderable of this._ctx.getLifecyclePasses()) {
@@ -1414,7 +1425,9 @@ class RootRenderable extends Renderable {
       switch (command.action) {
         case "render":
           if (!command.renderable.isDestroyed) {
+            this._currentRenderable = command.renderable;
             command.renderable.render(buffer, deltaTime);
+            this._currentRenderable = undefined;
           }
           break;
         case "pushScissorRect":
@@ -6267,6 +6280,9 @@ class EditBufferRenderable extends Renderable {
   }
 }
 
+// src/renderer.ts
+import { appendFileSync, writeFileSync } from "node:fs";
+
 // src/ansi.ts
 var ANSI = {
   switchToAlternateScreen: "\x1B[?1049h",
@@ -6444,10 +6460,11 @@ function isPixelResolutionResponse(sequence) {
 function parsePixelResolution(sequence) {
   const match = sequence.match(/\x1b\[4;(\d+);(\d+)t/);
   if (match) {
-    return {
-      width: parseInt(match[2]),
-      height: parseInt(match[1])
-    };
+    const width = Number(match[2]);
+    const height = Number(match[1]);
+    if (!Number.isSafeInteger(width) || !Number.isSafeInteger(height) || width > 2147483647 || height > 2147483647)
+      return null;
+    return { width, height };
   }
   return null;
 }
@@ -6631,6 +6648,12 @@ registerEnvVar({
   type: "boolean",
   default: false
 });
+registerEnvVar({
+  name: "OTUI_STDIN_LOG",
+  description: "Write the raw stdin byte stream to this file for debugging.",
+  type: "string",
+  default: ""
+});
 registerEnvVar({
   name: "OTUI_SHOW_STATS",
   description: "Show the debug overlay at startup.",
@@ -6715,18 +6738,25 @@ var CHAR_FLAG_MASK = 3221225472 >>> 0;
 class ScrollbackSnapshotRenderContext extends EventEmitter5 {
   width;
   height;
+  terminalWidth;
+  terminalHeight;
+  resolution;
   frameId = 0;
   widthMethod;
-  capabilities = null;
+  capabilities;
   hasSelection = false;
   currentFocusedRenderable = null;
   keyInput;
   _internalKeyInput;
   lifecyclePasses = new Set;
-  constructor(width, height, widthMethod) {
+  constructor(width, height, widthMethod, terminalWidth = width, terminalHeight = height, resolution = null, capabilities = null) {
     super();
     this.width = width;
     this.height = height;
+    this.terminalWidth = terminalWidth;
+    this.terminalHeight = terminalHeight;
+    this.resolution = resolution;
+    this.capabilities = capabilities;
     this.widthMethod = widthMethod;
     this.keyInput = new KeyHandler;
     this._internalKeyInput = new InternalKeyHandler;
@@ -6781,6 +6811,7 @@ var DEFAULT_FORWARDED_ENV_KEYS = [
   "ZELLIJ_PANE_ID",
   "TERM",
   "OPENTUI_GRAPHICS",
+  "OPENTUI_IMAGE_PROTOCOL",
   "TERM_PROGRAM",
   "TERM_PROGRAM_VERSION",
   "TERM_FEATURES",
@@ -6841,6 +6872,7 @@ class MouseEvent {
   modifiers;
   scroll;
   target;
+  currentTarget = null;
   isDragging;
   _propagationStopped = false;
   _defaultPrevented = false;
@@ -6905,6 +6937,8 @@ var CliRenderEvents;
 ((CliRenderEvents2) => {
   CliRenderEvents2["RESIZE"] = "resize";
   CliRenderEvents2["FRAME"] = "frame";
+  CliRenderEvents2["RENDER_ERROR"] = "render:error";
+  CliRenderEvents2["HANDLER_ERROR"] = "handler:error";
   CliRenderEvents2["EXTERNAL_OUTPUT"] = "external_output";
   CliRenderEvents2["FOCUS"] = "focus";
   CliRenderEvents2["BLUR"] = "blur";
@@ -6965,6 +6999,7 @@ class CliRenderer extends EventEmitter5 {
   postProcessFns = [];
   backgroundColor = RGBA.fromInts(0, 0, 0, 0);
   waitingForPixelResolution = false;
+  pixelResolutionRequeryPending = false;
   clock;
   rendering = false;
   renderingNative = false;
@@ -7069,6 +7104,7 @@ class CliRenderer extends EventEmitter5 {
   idleResolvers = [];
   _debugInputs = [];
   _debugModeEnabled = env.OTUI_DEBUG;
+  stdinLogPath = env.OTUI_STDIN_LOG;
   handleError = ((error) => {
     console.error(error);
     if (this._openConsoleOnError) {
@@ -7802,7 +7838,7 @@ Captured external output:
     const startOnNewLine = options.startOnNewLine ?? true;
     const tailColumn = renderer.getPendingSplitTailColumn();
     const firstLineOffset = !startOnNewLine && tailColumn > 0 && tailColumn < renderer.width ? tailColumn : 0;
-    const snapshotContext = new ScrollbackSnapshotRenderContext(renderer.width, 1, renderer.widthMethod);
+    const snapshotContext = new ScrollbackSnapshotRenderContext(renderer.width, 1, renderer.widthMethod, renderer._terminalWidth, renderer._terminalHeight, renderer.resolution, renderer.capabilities);
     let firstLineOffsetOwner = null;
     const renderContext = Object.create(snapshotContext);
     Object.defineProperty(renderContext, "claimFirstLineOffset", {
@@ -7836,6 +7872,10 @@ Captured external output:
     let surfaceWidth = renderer.width;
     let surfaceHeight = 1;
     let surfaceWidthMethod = renderer.widthMethod;
+    let surfaceTerminalWidth = renderer._terminalWidth;
+    let surfaceTerminalHeight = renderer._terminalHeight;
+    let surfaceResolutionWidth = renderer.resolution?.width ?? null;
+    let surfaceResolutionHeight = renderer.resolution?.height ?? null;
     let surfaceDestroyed = false;
     let hasRendered = false;
     let nextCommitStartOnNewLine = startOnNewLine;
@@ -7856,7 +7896,7 @@ Captured external output:
       }
     };
     const assertGeometryStillCurrent = () => {
-      if (renderer.width !== surfaceWidth || renderer.widthMethod !== surfaceWidthMethod) {
+      if (renderer.width !== surfaceWidth || renderer.widthMethod !== surfaceWidthMethod || renderer._terminalWidth !== surfaceTerminalWidth || renderer._terminalHeight !== surfaceTerminalHeight || (renderer.resolution?.width ?? null) !== surfaceResolutionWidth || (renderer.resolution?.height ?? null) !== surfaceResolutionHeight) {
         throw new Error("ScrollbackSurface.commitRows requires render() after renderer geometry changes");
       }
     };
@@ -7917,6 +7957,10 @@ Captured external output:
       const widthMethod = renderer.widthMethod;
       snapshotContext.width = width;
       snapshotContext.widthMethod = widthMethod;
+      snapshotContext.terminalWidth = renderer._terminalWidth;
+      snapshotContext.terminalHeight = renderer._terminalHeight;
+      snapshotContext.resolution = renderer.resolution;
+      snapshotContext.capabilities = renderer.capabilities;
       publicRoot.width = width;
       const renderPass = (height) => {
         snapshotContext.height = height;
@@ -7942,6 +7986,10 @@ Captured external output:
           surfaceWidth = width;
           surfaceHeight = measuredHeight;
           surfaceWidthMethod = widthMethod;
+          surfaceTerminalWidth = renderer._terminalWidth;
+          surfaceTerminalHeight = renderer._terminalHeight;
+          surfaceResolutionWidth = renderer.resolution?.width ?? null;
+          surfaceResolutionHeight = renderer.resolution?.height ?? null;
           hasRendered = true;
           return;
         }
@@ -7951,6 +7999,10 @@ Captured external output:
       surfaceWidth = width;
       surfaceHeight = targetHeight;
       surfaceWidthMethod = widthMethod;
+      surfaceTerminalWidth = renderer._terminalWidth;
+      surfaceTerminalHeight = renderer._terminalHeight;
+      surfaceResolutionWidth = renderer.resolution?.width ?? null;
+      surfaceResolutionHeight = renderer.resolution?.height ?? null;
       hasRendered = true;
     };
     const settleSurface = async (timeoutMs = 2000) => {
@@ -8050,7 +8102,7 @@ Captured external output:
     if (this._screenMode !== "split-footer" || this._externalOutputMode !== "capture-stdout") {
       throw new Error('writeToScrollback requires screenMode "split-footer" and externalOutputMode "capture-stdout"');
     }
-    const snapshotContext = new ScrollbackSnapshotRenderContext(this.width, this.height, this.widthMethod);
+    const snapshotContext = new ScrollbackSnapshotRenderContext(this.width, this.height, this.widthMethod, this._terminalWidth, this._terminalHeight, this.resolution, this.capabilities);
     const snapshot = write({
       width: this.width,
       widthMethod: this.widthMethod,
@@ -8225,7 +8277,7 @@ Captured external output:
     }
   }
   createStdoutSnapshotCommit(line, trailingNewline) {
-    const snapshotContext = new ScrollbackSnapshotRenderContext(this.width, 1, this.widthMethod);
+    const snapshotContext = new ScrollbackSnapshotRenderContext(this.width, 1, this.widthMethod, this._terminalWidth, this._terminalHeight, this.resolution, this.capabilities);
     const maxWidth = Math.max(1, this.width);
     const lineCells = [...line];
     const rowColumns = Math.min(lineCells.length, maxWidth);
@@ -8309,6 +8361,7 @@ Captured external output:
     let acceptedCommits = 0;
     let nativeBackpressured = false;
     let nativeFailed = false;
+    let nextRenderOffset = this.renderOffset;
     for (const [index, commit] of commits.entries()) {
       const forceCommit = forceFooterRepaint && index === lastCommitIndex;
       const beginFrame = index === 0;
@@ -8322,14 +8375,10 @@ Captured external output:
         nativeFailed = true;
         break;
       }
-      this.renderOffset = nativeResult.renderOffset;
-      this.recordSplitCommit(commit);
+      nextRenderOffset = nativeResult.renderOffset;
       hasCommittedOutput = true;
       acceptedCommits++;
     }
-    if (acceptedCommits > 0) {
-      this.externalOutputQueue.drop(acceptedCommits);
-    }
     if (nativeFailed) {
       return this.reportNativeRenderFailure();
     }
@@ -8337,6 +8386,12 @@ Captured external output:
       this.scheduleRenderAfterFeedIdle();
       return "backpressured";
     }
+    if (acceptedCommits > 0) {
+      this.renderOffset = nextRenderOffset;
+      for (const commit of commits.slice(0, acceptedCommits))
+        this.recordSplitCommit(commit);
+      this.externalOutputQueue.drop(acceptedCommits);
+    }
     if (!hasCommittedOutput) {
       const nativeResult = this.lib.repaintSplitFooter(this.rendererPtr, this.getSplitPinnedRenderOffset(), forceFooterRepaint);
       if (nativeResult.status === NATIVE_RENDER_STATUS_SKIPPED) {
@@ -8708,6 +8763,9 @@ Captured external output:
     const data = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
     if (!this.stdinParser)
       return;
+    if (this.stdinLogPath) {
+      appendFileSync(this.stdinLogPath, data);
+    }
     try {
       this.stdinParser.push(data);
       this.drainStdinParser();
@@ -8814,6 +8872,12 @@ Captured external output:
     });
   }
   handleStdinEvent(event) {
+    if (this._controlState === "explicit_suspended" /* EXPLICIT_SUSPENDED */) {
+      if (event.type === "response" && isPixelResolutionResponse(event.sequence)) {
+        this.dispatchSequenceHandlers(event.sequence);
+      }
+      return;
+    }
     switch (event.type) {
       case "key":
         if (this.dispatchSequenceHandlers(event.raw)) {
@@ -8857,16 +8921,25 @@ Captured external output:
     }
   }
   setupInput() {
+    if (this.stdinLogPath) {
+      writeFileSync(this.stdinLogPath, Buffer.alloc(0), { mode: 384 });
+    }
     for (const handler of this.prependedInputHandlers) {
       this.addInputHandler(handler);
     }
     this.addInputHandler((sequence) => {
       if (isPixelResolutionResponse(sequence) && this.waitingForPixelResolution) {
+        this.waitingForPixelResolution = false;
+        if (this.pixelResolutionRequeryPending) {
+          this.updateStdinParserProtocolContext({ pixelResolutionQueryActive: false });
+          this.queryPixelResolution();
+          return true;
+        }
         const resolution = parsePixelResolution(sequence);
         if (resolution) {
           this._resolution = resolution;
+          this.requestRender();
         }
-        this.waitingForPixelResolution = false;
         this.updateStdinParserProtocolContext({ pixelResolutionQueryActive: false }, true);
         return true;
       }
@@ -8883,7 +8956,7 @@ Captured external output:
   }
   dispatchMouseEvent(target, attributes) {
     const event = new MouseEvent(target, attributes);
-    target.processMouseEvent(event);
+    this.sendMouseEvent(target, event);
     if (this.autoFocus && event.type === "down" && event.button === 0 /* LEFT */ && !event.defaultPrevented) {
       let current = target;
       while (current) {
@@ -8896,6 +8969,15 @@ Captured external output:
     }
     return event;
   }
+  sendMouseEvent(target, event) {
+    try {
+      target.processMouseEvent(event);
+    } catch (error) {
+      const handled = this.emit("handler:error" /* HANDLER_ERROR */, { error, event });
+      if (!handled)
+        console.error("Error in mouse handler:", error);
+    }
+  }
   processSingleMouseEvent(mouseEvent) {
     if (this._splitHeight > 0) {
       if (mouseEvent.y < this.renderOffset) {
@@ -8923,7 +9005,7 @@ Captured external output:
       const scrollTarget = maybeRenderable2 ?? fallbackTarget;
       if (scrollTarget) {
         const event2 = new MouseEvent(scrollTarget, mouseEvent);
-        scrollTarget.processMouseEvent(event2);
+        this.sendMouseEvent(scrollTarget, event2);
       }
       return true;
     }
@@ -8946,7 +9028,7 @@ Captured external output:
           ...mouseEvent,
           isDragging: true
         });
-        maybeRenderable.processMouseEvent(event2);
+        this.sendMouseEvent(maybeRenderable, event2);
       }
       return true;
     }
@@ -8956,7 +9038,7 @@ Captured external output:
           ...mouseEvent,
           isDragging: true
         });
-        maybeRenderable.processMouseEvent(event2);
+        this.sendMouseEvent(maybeRenderable, event2);
       }
       this.finishSelection();
       return true;
@@ -8974,7 +9056,7 @@ Captured external output:
           ...mouseEvent,
           type: "out"
         });
-        this.lastOverRenderable.processMouseEvent(event2);
+        this.sendMouseEvent(this.lastOverRenderable, event2);
       }
       this.lastOverRenderable = maybeRenderable;
       if (maybeRenderable) {
@@ -8983,12 +9065,12 @@ Captured external output:
           type: "over",
           source: this.capturedRenderable
         });
-        maybeRenderable.processMouseEvent(event2);
+        this.sendMouseEvent(maybeRenderable, event2);
       }
     }
     if (this.capturedRenderable && mouseEvent.type !== "up") {
       const event2 = new MouseEvent(this.capturedRenderable, mouseEvent);
-      this.capturedRenderable.processMouseEvent(event2);
+      this.sendMouseEvent(this.capturedRenderable, event2);
       return true;
     }
     if (this.capturedRenderable && mouseEvent.type === "up") {
@@ -8996,15 +9078,15 @@ Captured external output:
         ...mouseEvent,
         type: "drag-end"
       });
-      this.capturedRenderable.processMouseEvent(event2);
-      this.capturedRenderable.processMouseEvent(new MouseEvent(this.capturedRenderable, mouseEvent));
+      this.sendMouseEvent(this.capturedRenderable, event2);
+      this.sendMouseEvent(this.capturedRenderable, new MouseEvent(this.capturedRenderable, mouseEvent));
       if (maybeRenderable) {
         const event3 = new MouseEvent(maybeRenderable, {
           ...mouseEvent,
           type: "drop",
           source: this.capturedRenderable
         });
-        maybeRenderable.processMouseEvent(event3);
+        this.sendMouseEvent(maybeRenderable, event3);
       }
       this.lastOverRenderable = this.capturedRenderable;
       this.lastOverRenderableNum = this.capturedRenderable.num;
@@ -9049,7 +9131,7 @@ Captured external output:
     };
     if (lastOver && !lastOver.isDestroyed) {
       const event = new MouseEvent(lastOver, { ...baseEvent, type: "out" });
-      lastOver.processMouseEvent(event);
+      this.sendMouseEvent(lastOver, event);
     }
     this.lastOverRenderable = hitRenderable;
     this.lastOverRenderableNum = hitId;
@@ -9058,7 +9140,7 @@ Captured external output:
         ...baseEvent,
         type: "over"
       });
-      hitRenderable.processMouseEvent(event);
+      this.sendMouseEvent(hitRenderable, event);
     }
   }
   setMousePointer(style) {
@@ -9118,6 +9200,10 @@ Captured external output:
     }, this.resizeDebounceDelay);
   }
   queryPixelResolution() {
+    this.pixelResolutionRequeryPending = true;
+    if (this._controlState === "explicit_suspended" /* EXPLICIT_SUSPENDED */ || this.waitingForPixelResolution)
+      return;
+    this.pixelResolutionRequeryPending = false;
     this.waitingForPixelResolution = true;
     this.updateStdinParserProtocolContext({ pixelResolutionQueryActive: true });
     this.lib.queryPixelResolution(this.rendererPtr);
@@ -9135,6 +9221,7 @@ Captured external output:
     const visiblePreviousSplitHeight = pendingSplitFooterTransition?.sourceHeight ?? previousGeometry.effectiveFooterHeight;
     this._terminalWidth = width;
     this._terminalHeight = height;
+    this._resolution = null;
     this.queryPixelResolution();
     this.setCapturedRenderable(undefined);
     this.stdinParser?.resetMouseState();
@@ -9327,14 +9414,16 @@ Captured external output:
     this._suspendedMouseEnabled = this._useMouse;
     this.disableMouse();
     this.removeExitListeners();
-    this.waitingForPixelResolution = false;
     this.updateStdinParserProtocolContext({
       privateCapabilityRepliesActive: false,
-      pixelResolutionQueryActive: false,
+      pixelResolutionQueryActive: this.waitingForPixelResolution,
       explicitWidthCprActive: false,
       startupCursorCprActive: false
     });
-    this.stdinParser?.reset();
+    if (this.stdinParser?.hasPendingPixelResolutionResponse())
+      this.stdinParser.pausePendingTimeout();
+    else
+      this.stdinParser?.reset();
     this.stdin.removeListener("data", this.stdinListener);
     this.themeModeState.cancelRefresh();
     this.lib.suspendRenderer(this.rendererPtr);
@@ -9347,7 +9436,13 @@ Captured external output:
     if (this.stdin.setRawMode) {
       this.stdin.setRawMode(true);
     }
-    while (this.stdin.read() !== null) {}
+    let drained;
+    while ((drained = this.stdin.read()) !== null)
+      this.stdinListener(drained);
+    if (this.stdinParser?.hasPendingPixelResolutionResponse())
+      this.stdinParser.pausePendingTimeout();
+    else
+      this.stdinParser?.reset();
     this.stdin.on("data", this.stdinListener);
     this.stdin.resume();
     this.addExitListeners();
@@ -9372,6 +9467,9 @@ Captured external output:
     }
     this.forceFullRepaintRequested = true;
     this._controlState = this._previousControlState;
+    if (this.pixelResolutionRequeryPending)
+      this.queryPixelResolution();
+    this.stdinParser?.resumePendingTimeout();
     if (this._previousControlState === "auto_started" /* AUTO_STARTED */ || this._previousControlState === "explicit_started" /* EXPLICIT_STARTED */) {
       this.internalStart();
     } else {
@@ -9452,6 +9550,7 @@ Captured external output:
     this.themeModeState.cancelRefresh();
     this._isRunning = false;
     this.waitingForPixelResolution = false;
+    this.pixelResolutionRequeryPending = false;
     this.updateStdinParserProtocolContext({
       privateCapabilityRepliesActive: false,
       pixelResolutionQueryActive: false,
@@ -9586,12 +9685,12 @@ Captured external output:
   async loop() {
     if (this.rendering || this._isDestroyed)
       return;
-    this.renderTimeout = null;
-    this.rendering = true;
     if (this.renderTimeout) {
       this.clock.clearTimeout(this.renderTimeout);
       this.renderTimeout = null;
     }
+    this.rendering = true;
+    let renderFailed = false;
     try {
       this._frameId++;
       const now = this.normalizeClockTime(this.clock.now(), this.lastTime);
@@ -9684,11 +9783,22 @@ Captured external output:
           this.renderTimeout = null;
         }
       }
+    } catch (error) {
+      renderFailed = true;
+      const renderError = error instanceof Error ? error : new Error(String(error));
+      const event = { error: renderError, renderable: this.root.takeCurrentRenderable() };
+      const handled = this.emit("render:error" /* RENDER_ERROR */, event);
+      if (!handled)
+        this.handleError(renderError);
     } finally {
       this.rendering = false;
       if (this._destroyPending) {
         this.finalizeDestroy();
       }
+      if (renderFailed && (this._isRunning || this.immediateRerenderRequested) && !this._isDestroyed) {
+        this.immediateRerenderRequested = false;
+        this.scheduleRenderTimer();
+      }
       this.resolveIdleIfNeeded();
     }
   }
@@ -10042,5 +10152,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=505B20901D301C3264756E2164756E21
-//# sourceMappingURL=chunk-node-51kpf0mz.js.map
+//# debugId=19BC632C369BDFA064756E2164756E21
+//# sourceMappingURL=chunk-node-0yw3x5m7.js.map