@opentui/core 0.0.0-20250930-a8fe63ce → 0.0.0-20251001-886e38c1

package/3d.js

@@ -5,7 +5,7 @@ import {
   __export,
   __require,
   __toESM
-} from "./index-h87jjatk.js";
+} from "./index-r19wz8xa.js";
 
 // ../../node_modules/omggif/omggif.js
 var require_omggif = __commonJS((exports) => {

package/{index-h87jjatk.js → index-r19wz8xa.js}

@@ -5282,6 +5282,10 @@ class ProcessQueue {
   }
 }
 
+// src/lib/tree-sitter/default-parsers.ts
+import { resolve, dirname } from "path";
+import { fileURLToPath } from "url";
+
 // src/lib/tree-sitter/assets/javascript/highlights.scm
 var highlights_default = "./highlights-ghv9g403.scm";
 
@@ -5295,32 +5299,43 @@ var highlights_default2 = "./highlights-eq9cgrbb.scm";
 var tree_sitter_typescript_default = "./tree-sitter-typescript-zxjzwt75.wasm";
 
 // src/lib/tree-sitter/default-parsers.ts
-var DEFAULT_PARSERS = [
-  {
-    filetype: "javascript",
-    queries: {
-      highlights: [highlights_default]
-    },
-    wasm: tree_sitter_javascript_default
-  },
-  {
-    filetype: "typescript",
-    queries: {
-      highlights: [highlights_default2]
-    },
-    wasm: tree_sitter_typescript_default
+var _cachedParsers;
+function getParsers() {
+  if (!_cachedParsers) {
+    _cachedParsers = [
+      {
+        filetype: "javascript",
+        queries: {
+          highlights: [resolve(dirname(fileURLToPath(import.meta.url)), highlights_default)]
+        },
+        wasm: resolve(dirname(fileURLToPath(import.meta.url)), tree_sitter_javascript_default)
+      },
+      {
+        filetype: "typescript",
+        queries: {
+          highlights: [resolve(dirname(fileURLToPath(import.meta.url)), highlights_default2)]
+        },
+        wasm: resolve(dirname(fileURLToPath(import.meta.url)), tree_sitter_typescript_default)
+      }
+    ];
   }
-];
+  return _cachedParsers;
+}
+
+// src/lib/tree-sitter/parser.worker.path.ts
+var workerPath = new URL("./parser.worker.js", import.meta.url).href;
+var parser_worker_path_default = workerPath;
 
 // src/lib/tree-sitter/client.ts
-var DEFAULT_PARSERS2 = DEFAULT_PARSERS;
+import { resolve as resolve2, isAbsolute } from "path";
+var DEFAULT_PARSERS = getParsers();
 function addDefaultParsers(parsers) {
   for (const parser of parsers) {
-    const existingIndex = DEFAULT_PARSERS2.findIndex((p) => p.filetype === parser.filetype);
+    const existingIndex = DEFAULT_PARSERS.findIndex((p) => p.filetype === parser.filetype);
     if (existingIndex >= 0) {
-      DEFAULT_PARSERS2[existingIndex] = parser;
+      DEFAULT_PARSERS[existingIndex] = parser;
     } else {
-      DEFAULT_PARSERS2.push(parser);
+      DEFAULT_PARSERS.push(parser);
     }
   }
 }
@@ -5342,13 +5357,32 @@ class TreeSitterClient extends EventEmitter2 {
     this.debouncer = createDebounce("tree-sitter-client");
     this.startWorker();
   }
+  emitError(error, bufferId) {
+    if (this.listenerCount("error") > 0) {
+      this.emit("error", error, bufferId);
+    }
+  }
+  emitWarning(warning, bufferId) {
+    if (this.listenerCount("warning") > 0) {
+      this.emit("warning", warning, bufferId);
+    }
+  }
   startWorker() {
     if (this.worker) {
       return;
     }
-    const workerPath = this.options.workerPath || new URL("./parser.worker.ts", import.meta.url);
-    this.worker = new Worker(workerPath);
+    const workerPath2 = this.options.workerPath || parser_worker_path_default;
+    this.worker = new Worker(workerPath2);
     this.worker.onmessage = this.handleWorkerMessage.bind(this);
+    this.worker.onerror = (error) => {
+      console.error("TreeSitter worker error:", error.message);
+      if (this.initializeResolvers) {
+        clearTimeout(this.initializeResolvers.timeoutId);
+        this.initializeResolvers.reject(new Error(`Worker error: ${error.message}`));
+        this.initializeResolvers = undefined;
+      }
+      this.emitError(`Worker error: ${error.message}`);
+    };
   }
   stopWorker() {
     if (!this.worker) {
@@ -5369,13 +5403,15 @@ class TreeSitterClient extends EventEmitter2 {
     if (this.initializePromise) {
       return this.initializePromise;
     }
-    this.initializePromise = new Promise((resolve, reject) => {
+    this.initializePromise = new Promise((resolve3, reject) => {
       const timeoutMs = this.options.initTimeout ?? 1e4;
       const timeoutId = setTimeout(() => {
+        const error = new Error("Worker initialization timed out");
+        console.error("TreeSitter client:", error.message);
         this.initializeResolvers = undefined;
-        reject(new Error("Worker initialization timed out"));
+        reject(error);
       }, timeoutMs);
-      this.initializeResolvers = { resolve, reject, timeoutId };
+      this.initializeResolvers = { resolve: resolve3, reject, timeoutId };
       this.worker?.postMessage({
         type: "INIT",
         dataPath: this.options.dataPath
@@ -5386,17 +5422,25 @@ class TreeSitterClient extends EventEmitter2 {
     return this.initializePromise;
   }
   async registerDefaultParsers() {
-    for (const parser of DEFAULT_PARSERS2) {
+    for (const parser of DEFAULT_PARSERS) {
       this.addFiletypeParser(parser);
     }
   }
   addFiletypeParser(filetypeParser) {
-    this.worker?.postMessage({ type: "ADD_FILETYPE_PARSER", filetypeParser });
+    const isUrl = (path) => path.startsWith("http://") || path.startsWith("https://");
+    const resolvedParser = {
+      ...filetypeParser,
+      wasm: isUrl(filetypeParser.wasm) || isAbsolute(filetypeParser.wasm) ? filetypeParser.wasm : resolve2(filetypeParser.wasm),
+      queries: {
+        highlights: filetypeParser.queries.highlights.map((path) => isUrl(path) || isAbsolute(path) ? path : resolve2(path))
+      }
+    };
+    this.worker?.postMessage({ type: "ADD_FILETYPE_PARSER", filetypeParser: resolvedParser });
   }
   async getPerformance() {
     const messageId = `performance_${this.messageIdCounter++}`;
-    return new Promise((resolve) => {
-      this.messageCallbacks.set(messageId, resolve);
+    return new Promise((resolve3) => {
+      this.messageCallbacks.set(messageId, resolve3);
       this.worker?.postMessage({ type: "GET_PERFORMANCE", messageId });
     });
   }
@@ -5409,8 +5453,8 @@ class TreeSitterClient extends EventEmitter2 {
       }
     }
     const messageId = `oneshot_${this.messageIdCounter++}`;
-    return new Promise((resolve) => {
-      this.messageCallbacks.set(messageId, resolve);
+    return new Promise((resolve3) => {
+      this.messageCallbacks.set(messageId, resolve3);
       this.worker?.postMessage({
         type: "ONESHOT_HIGHLIGHT",
         content,
@@ -5435,6 +5479,7 @@ class TreeSitterClient extends EventEmitter2 {
       if (this.initializeResolvers) {
         clearTimeout(this.initializeResolvers.timeoutId);
         if (error) {
+          console.error("TreeSitter client initialization failed:", error);
           this.initializeResolvers.reject(new Error(error));
         } else {
           this.initialized = true;
@@ -5494,11 +5539,11 @@ class TreeSitterClient extends EventEmitter2 {
       return;
     }
     if (warning) {
-      this.emit("warning", warning, bufferId);
+      this.emitWarning(warning, bufferId);
       return;
     }
     if (error) {
-      this.emit("error", error, bufferId);
+      this.emitError(error, bufferId);
       return;
     }
     if (type === "WORKER_LOG") {
@@ -5515,8 +5560,8 @@ class TreeSitterClient extends EventEmitter2 {
   }
   async preloadParser(filetype) {
     const messageId = `has_parser_${this.messageIdCounter++}`;
-    const response = await new Promise((resolve) => {
-      this.messageCallbacks.set(messageId, resolve);
+    const response = await new Promise((resolve3) => {
+      this.messageCallbacks.set(messageId, resolve3);
       this.worker?.postMessage({
         type: "PRELOAD_PARSER",
         filetype,
@@ -5528,13 +5573,13 @@ class TreeSitterClient extends EventEmitter2 {
   async createBuffer(id, content, filetype, version = 1, autoInitialize = true) {
     if (!this.initialized) {
       if (!autoInitialize) {
-        this.emit("error", "Could not create buffer because client is not initialized");
+        this.emitError("Could not create buffer because client is not initialized");
         return false;
       }
       try {
         await this.initialize();
       } catch (error) {
-        this.emit("error", "Could not create buffer because of initialization error");
+        this.emitError("Could not create buffer because of initialization error");
         return false;
       }
     }
@@ -5543,8 +5588,8 @@ class TreeSitterClient extends EventEmitter2 {
     }
     this.buffers.set(id, { id, content, filetype, version, hasParser: false });
     const messageId = `init_${this.messageIdCounter++}`;
-    const response = await new Promise((resolve) => {
-      this.messageCallbacks.set(messageId, resolve);
+    const response = await new Promise((resolve3) => {
+      this.messageCallbacks.set(messageId, resolve3);
       this.worker?.postMessage({
         type: "INITIALIZE_PARSER",
         bufferId: id,
@@ -5557,7 +5602,7 @@ class TreeSitterClient extends EventEmitter2 {
     if (!response.hasParser) {
       this.emit("buffer:initialized", id, false);
       if (filetype !== "plaintext") {
-        this.emit("warning", response.warning || response.error || "Buffer has no parser", id);
+        this.emitWarning(response.warning || response.error || "Buffer has no parser", id);
       }
       return false;
     }
@@ -5600,9 +5645,9 @@ class TreeSitterClient extends EventEmitter2 {
       this.editQueues.delete(bufferId);
     }
     if (this.worker) {
-      await new Promise((resolve) => {
+      await new Promise((resolve3) => {
         const messageId = `dispose_${bufferId}`;
-        this.messageCallbacks.set(messageId, resolve);
+        this.messageCallbacks.set(messageId, resolve3);
         try {
           this.worker.postMessage({
             type: "DISPOSE_BUFFER",
@@ -5610,13 +5655,13 @@ class TreeSitterClient extends EventEmitter2 {
           });
         } catch (error) {
           console.error("Error disposing buffer", error);
-          resolve(false);
+          resolve3(false);
         }
         setTimeout(() => {
           if (this.messageCallbacks.has(messageId)) {
             this.messageCallbacks.delete(messageId);
             console.warn({ bufferId }, "Timed out waiting for buffer to be disposed");
-            resolve(false);
+            resolve3(false);
           }
         }, 3000);
       });
@@ -5628,10 +5673,19 @@ class TreeSitterClient extends EventEmitter2 {
       clearTimeout(this.initializeResolvers.timeoutId);
       this.initializeResolvers = undefined;
     }
+    for (const [messageId, callback] of this.messageCallbacks.entries()) {
+      if (typeof callback === "function") {
+        try {
+          callback({ error: "Client destroyed" });
+        } catch (e) {}
+      }
+    }
+    this.messageCallbacks.clear();
     clearDebounceScope("tree-sitter-client");
-    this.stopWorker();
-    this.buffers.clear();
+    this.debouncer.clear();
     this.editQueues.clear();
+    this.buffers.clear();
+    this.stopWorker();
     this.initialized = false;
     this.initializePromise = undefined;
   }
@@ -5641,7 +5695,7 @@ class TreeSitterClient extends EventEmitter2 {
     }
     const buffer = this.buffers.get(bufferId);
     if (!buffer || !buffer.hasParser) {
-      this.emit("error", "Cannot reset buffer with no parser", bufferId);
+      this.emitError("Cannot reset buffer with no parser", bufferId);
       return;
     }
     this.buffers.set(bufferId, { ...buffer, content, version });
@@ -5663,12 +5717,12 @@ class TreeSitterClient extends EventEmitter2 {
     this.options.dataPath = dataPath;
     if (this.initialized && this.worker) {
       const messageId = `update_datapath_${this.messageIdCounter++}`;
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve3, reject) => {
         this.messageCallbacks.set(messageId, (response) => {
           if (response.error) {
             reject(new Error(response.error));
           } else {
-            resolve();
+            resolve3();
           }
         });
         this.worker.postMessage({
@@ -6037,13 +6091,13 @@ import ${safeFiletype}_language from "${parser.languagePath}" with { type: "file
 `);
   const parserDefinitions = parsers.map((parser) => {
     const safeFiletype = parser.filetype.replace(/[^a-zA-Z0-9]/g, "_");
-    return `  {
-    filetype: "${parser.filetype}",
-    queries: {
-      highlights: [${safeFiletype}_highlights],
-    },
-    wasm: ${safeFiletype}_language,
-  }`;
+    return `      {
+        filetype: "${parser.filetype}",
+        queries: {
+          highlights: [resolve(dirname(fileURLToPath(import.meta.url)), ${safeFiletype}_highlights)],
+        },
+        wasm: resolve(dirname(fileURLToPath(import.meta.url)), ${safeFiletype}_language),
+      }`;
   }).join(`,
 `);
   const fileContent = `// This file is generated by assets/update.ts - DO NOT EDIT MANUALLY
@@ -6051,12 +6105,22 @@ import ${safeFiletype}_language from "${parser.languagePath}" with { type: "file
 // Last generated: ${new Date().toISOString()}
 
 import type { FiletypeParserOptions } from "./types"
+import { resolve, dirname } from "path"
+import { fileURLToPath } from "url"
 
 ${imports}
 
-export const DEFAULT_PARSERS: FiletypeParserOptions[] = [
+// Cached parsers to avoid re-resolving paths on every call
+let _cachedParsers: FiletypeParserOptions[] | undefined
+
+export function getParsers(): FiletypeParserOptions[] {
+  if (!_cachedParsers) {
+    _cachedParsers = [
 ${parserDefinitions},
-]
+    ]
+  }
+  return _cachedParsers
+}
 `;
   await mkdir2(path3.dirname(outputPath), { recursive: true });
   await writeFile2(outputPath, fileContent, "utf-8");
@@ -9569,6 +9633,18 @@ registerEnvVar({
   type: "boolean",
   default: false
 });
+registerEnvVar({
+  name: "OTUI_USE_ALTERNATE_SCREEN",
+  description: "Whether to use the console. Will not capture console output if set to false.",
+  type: "boolean",
+  default: true
+});
+registerEnvVar({
+  name: "OTUI_OVERRIDE_STDOUT",
+  description: "Override the stdout stream. This is useful for debugging.",
+  type: "boolean",
+  default: true
+});
 
 class MouseEvent {
   type;
@@ -9641,7 +9717,7 @@ var rendererTracker = singleton("RendererTracker", () => {
 });
 async function createCliRenderer(config = {}) {
   if (process.argv.includes("--delay-start")) {
-    await new Promise((resolve2) => setTimeout(resolve2, 5000));
+    await new Promise((resolve4) => setTimeout(resolve4, 5000));
   }
   const stdin = config.stdin || process.stdin;
   const stdout = config.stdout || process.stdout;
@@ -9729,7 +9805,7 @@ class CliRenderer extends EventEmitter7 {
   resizeDebounceDelay = 100;
   enableMouseMovement = false;
   _useMouse = true;
-  _useAlternateScreen = true;
+  _useAlternateScreen = env.OTUI_USE_ALTERNATE_SCREEN;
   capturedRenderable;
   lastOverRenderableNum = 0;
   lastOverRenderable;
@@ -9760,9 +9836,9 @@ class CliRenderer extends EventEmitter7 {
   handleError = ((error) => {
     this.stop();
     this.destroy();
-    new Promise((resolve2) => {
+    new Promise((resolve4) => {
       setTimeout(() => {
-        resolve2(true);
+        resolve4(true);
       }, 100);
     }).then(() => {
       this.realStdoutWrite.call(this.stdout, `
@@ -9841,7 +9917,7 @@ Captured output:
     this.maxStatSamples = config.maxStatSamples || 300;
     this.enableMouseMovement = config.enableMouseMovement || true;
     this._useMouse = config.useMouse ?? true;
-    this._useAlternateScreen = config.useAlternateScreen ?? true;
+    this._useAlternateScreen = config.useAlternateScreen ?? env.OTUI_USE_ALTERNATE_SCREEN;
     this.nextRenderBuffer = this.lib.getNextBuffer(this.rendererPtr);
     this.currentRenderBuffer = this.lib.getCurrentBuffer(this.rendererPtr);
     this.postProcessFns = config.postProcessFns || [];
@@ -9849,7 +9925,9 @@ Captured output:
     if (this.memorySnapshotInterval > 0) {
       this.startMemorySnapshotTimer();
     }
-    this.stdout.write = this.interceptStdoutWrite.bind(this);
+    if (env.OTUI_OVERRIDE_STDOUT) {
+      this.stdout.write = this.interceptStdoutWrite.bind(this);
+    }
     process.on("SIGWINCH", this.sigwinchHandler);
     process.on("warning", this.warningHandler);
     process.on("uncaughtException", this.handleError);
@@ -10081,16 +10159,16 @@ Captured output:
     if (this._terminalIsSetup)
       return;
     this._terminalIsSetup = true;
-    await new Promise((resolve2) => {
+    await new Promise((resolve4) => {
       const timeout = setTimeout(() => {
         this.stdin.off("data", capListener);
-        resolve2(true);
+        resolve4(true);
       }, 100);
       const capListener = (str) => {
         clearTimeout(timeout);
         this.lib.processCapabilityResponse(this.rendererPtr, str);
         this.stdin.off("data", capListener);
-        resolve2(true);
+        resolve4(true);
       };
       this.stdin.on("data", capListener);
       this.lib.setupTerminal(this.rendererPtr, this._useAlternateScreen);
@@ -10734,5 +10812,5 @@ Captured output:
 
 export { __toESM, __commonJS, __export, __require, Edge, Gutter, exports_src, BorderChars, getBorderFromSides, getBorderSides, borderCharsToArray, BorderCharArrays, nonAlphanumericKeys, parseKeypress, ANSI, KeyEvent, PasteEvent, KeyHandler, InternalKeyHandler, RGBA, hexToRgb, rgbToHex, hsvToRgb, parseColor, fonts, measureText, getCharacterPositions, coordinateToCharacterIndex, renderFontToFrameBuffer, TextAttributes, DebugOverlayCorner, createTextAttributes, visualizeRenderableTree, isStyledText, StyledText, stringToStyledText, black, red, green, yellow, blue, magenta, cyan, white, brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite, bgBlack, bgRed, bgGreen, bgYellow, bgBlue, bgMagenta, bgCyan, bgWhite, bold, italic, underline, strikethrough, dim, reverse, blink, fg, bg, t, convertThemeToStyles, SyntaxStyle, hastToStyledText, parseAlign, parseBoxSizing, parseDimension, parseDirection, parseDisplay, parseEdge, parseFlexDirection, parseGutter, parseJustify, parseLogLevel, parseMeasureMode, parseOverflow, parsePositionType, parseUnit, parseWrap, MouseParser, Selection, convertGlobalToLocalSelection, ASCIIFontSelectionHelper, envRegistry, registerEnvVar, clearEnvCache, generateEnvMarkdown, generateEnvColored, env, treeSitterToTextChunks, treeSitterToStyledText, addDefaultParsers, TreeSitterClient, DataPathsManager, getDataPaths, extToFiletype, pathToFiletype, main, getTreeSitterClient, TextBuffer, LogLevel2 as LogLevel, setRenderLibPath, resolveRenderLib, OptimizedBuffer, h, isVNode, maybeMakeRenderable, wrapWithDelegates, instantiate, delegate, isValidPercentage, LayoutEvents, RenderableEvents, isRenderable, BaseRenderable, Renderable, RootRenderable, capture, ConsolePosition, TerminalConsole, getObjectsInViewport, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, CliRenderer };
 
-//# debugId=259CDC2839F0878D64756E2164756E21
-//# sourceMappingURL=index-h87jjatk.js.map
+//# debugId=3A66ED403B9C39DF64756E2164756E21
+//# sourceMappingURL=index-r19wz8xa.js.map