@opentui/core 0.2.0 → 0.2.2

package/NativeSpanFeed.d.ts

@@ -1,4 +1,4 @@
-import { type Pointer } from "bun:ffi";
+import { type Pointer } from "./platform/ffi.js";
 import type { NativeSpanFeedOptions } from "./zig-structs.js";
 export type { GrowthPolicy, NativeSpanFeedOptions, NativeSpanFeedStats } from "./zig-structs.js";
 export type DataHandler = (data: Uint8Array) => void | Promise<void>;
@@ -7,7 +7,7 @@ export type DataHandler = (data: Uint8Array) => void | Promise<void>;
  */
 export declare class NativeSpanFeed {
     static create(options?: NativeSpanFeedOptions): NativeSpanFeed;
-    static attach(streamPtr: bigint | number, _options?: NativeSpanFeedOptions): NativeSpanFeed;
+    static attach(streamPtr: Pointer, _options?: NativeSpanFeedOptions): NativeSpanFeed;
     readonly streamPtr: Pointer;
     private readonly lib;
     private readonly eventHandler;

package/README.md

@@ -28,7 +28,8 @@ This creates platform-specific libraries that are automatically loaded by the Ty
 
 ```bash
 bun install
-bun run src/examples/index.ts
+cd ../examples
+bun run dev
 ```
 
 ## Benchmarks

package/buffer.d.ts

@@ -1,6 +1,6 @@
 import { RGBA } from "./lib/index.js";
 import { type RenderLib } from "./zig.js";
-import { type Pointer } from "bun:ffi";
+import { type Pointer, type PointerInput } from "./platform/ffi.js";
 import { type BorderStyle, type BorderSides } from "./lib/index.js";
 import { TargetChannel, type WidthMethod, type CapturedLine } from "./types.js";
 import type { TextBufferView } from "./text-buffer-view.js";
@@ -57,8 +57,8 @@ export declare class OptimizedBuffer {
     destroy(): void;
     drawTextBuffer(textBufferView: TextBufferView, x: number, y: number): void;
     drawEditorView(editorView: EditorView, x: number, y: number): void;
-    drawSuperSampleBuffer(x: number, y: number, pixelDataPtr: Pointer, pixelDataLength: number, format: "bgra8unorm" | "rgba8unorm", alignedBytesPerRow: number): void;
-    drawPackedBuffer(dataPtr: Pointer, dataLen: number, posX: number, posY: number, terminalWidthCells: number, terminalHeightCells: number): void;
+    drawSuperSampleBuffer(x: number, y: number, pixelDataPtr: PointerInput, pixelDataLength: number, format: "bgra8unorm" | "rgba8unorm", alignedBytesPerRow: number): void;
+    drawPackedBuffer(dataPtr: PointerInput, dataLen: number, posX: number, posY: number, terminalWidthCells: number, terminalHeightCells: number): void;
     drawGrayscaleBuffer(posX: number, posY: number, intensities: Float32Array, srcWidth: number, srcHeight: number, fg?: RGBA | null, bg?: RGBA | null): void;
     drawGrayscaleBufferSupersampled(posX: number, posY: number, intensities: Float32Array, srcWidth: number, srcHeight: number, fg?: RGBA | null, bg?: RGBA | null): void;
     resize(width: number, height: number): void;

package/edit-buffer.d.ts

@@ -1,5 +1,5 @@
 import { type LogicalCursor, type RenderLib } from "./zig.js";
-import { type Pointer } from "bun:ffi";
+import { type Pointer } from "./platform/ffi.js";
 import { type WidthMethod, type Highlight } from "./types.js";
 import { RGBA } from "./lib/RGBA.js";
 import { EventEmitter } from "events";

package/editor-view.d.ts

@@ -1,6 +1,6 @@
 import { RGBA } from "./lib/RGBA.js";
 import { type RenderLib, type VisualCursor, type LineInfo } from "./zig.js";
-import { type Pointer } from "bun:ffi";
+import { type Pointer } from "./platform/ffi.js";
 import type { EditBuffer } from "./edit-buffer.js";
 export interface Viewport {
     offsetY: number;

package/{index-mch6dv67.js → index-d07rkqtc.js}

@@ -175,6 +175,7 @@ import {
   stripAnsiSequences,
   t,
   terminalNamedSingleStrokeKeys,
+  toArrayBuffer,
   treeSitterToStyledText,
   treeSitterToTextChunks,
   underline,
@@ -182,7 +183,7 @@ import {
   white,
   wrapWithDelegates,
   yellow
-} from "./index-mw2x3082.js";
+} from "./index-jv9g79dk.js";
 
 // src/index.ts
 var exports_src2 = {};
@@ -2770,16 +2771,6 @@ class SlotRenderable extends Renderable {
   }
 }
 // src/NativeSpanFeed.ts
-import { toArrayBuffer } from "bun:ffi";
-function toPointer(value) {
-  if (typeof value === "bigint") {
-    if (value > BigInt(Number.MAX_SAFE_INTEGER)) {
-      throw new Error("Pointer exceeds safe integer range");
-    }
-    return Number(value);
-  }
-  return value;
-}
 function toNumber(value) {
   return typeof value === "bigint" ? Number(value) : value;
 }
@@ -2800,12 +2791,11 @@ class NativeSpanFeed {
   }
   static attach(streamPtr, _options) {
     const lib = resolveRenderLib();
-    const ptr = toPointer(streamPtr);
-    const stream = new NativeSpanFeed(ptr);
-    lib.registerNativeSpanFeedStream(ptr, stream.eventHandler);
-    const status = lib.attachNativeSpanFeed(ptr);
+    const stream = new NativeSpanFeed(streamPtr);
+    lib.registerNativeSpanFeedStream(streamPtr, stream.eventHandler);
+    const status = lib.attachNativeSpanFeed(streamPtr);
     if (status !== 0) {
-      lib.unregisterNativeSpanFeedStream(ptr);
+      lib.unregisterNativeSpanFeedStream(streamPtr);
       throw new Error(`Failed to attach stream: ${status}`);
     }
     return stream;
@@ -2939,7 +2929,7 @@ class NativeSpanFeed {
           break;
         }
         case 6 /* Error */: {
-          const code = arg0;
+          const code = toNumber(arg0);
           for (const handler of this.errorHandlers)
             handler(code);
           break;
@@ -3815,49 +3805,271 @@ class LineNumberRenderable extends Renderable {
     }
   }
 }
-// ../../node_modules/.bun/diff@8.0.2/node_modules/diff/libesm/patch/parse.js
+// ../../node_modules/.bun/diff@9.0.0/node_modules/diff/libesm/patch/parse.js
 function parsePatch(uniDiff) {
   const diffstr = uniDiff.split(/\n/), list = [];
   let i = 0;
+  function isGitDiffHeader(line) {
+    return /^diff --git /.test(line);
+  }
+  function isDiffHeader(line) {
+    return isGitDiffHeader(line) || /^Index:\s/.test(line) || /^diff(?: -r \w+)+\s/.test(line);
+  }
+  function isFileHeader(line) {
+    return /^(---|\+\+\+)\s/.test(line);
+  }
+  function isHunkHeader(line) {
+    return /^@@\s/.test(line);
+  }
   function parseIndex() {
+    var _a;
     const index = {};
+    index.hunks = [];
     list.push(index);
+    let seenDiffHeader = false;
     while (i < diffstr.length) {
       const line = diffstr[i];
-      if (/^(---|\+\+\+|@@)\s/.test(line)) {
+      if (isFileHeader(line) || isHunkHeader(line)) {
         break;
       }
-      const header = /^(?:Index:|diff(?: -r \w+)+)\s+(.+?)\s*$/.exec(line);
-      if (header) {
-        index.index = header[1];
+      if (isGitDiffHeader(line)) {
+        if (seenDiffHeader) {
+          return;
+        }
+        seenDiffHeader = true;
+        index.isGit = true;
+        const paths = parseGitDiffHeader(line);
+        if (paths) {
+          index.oldFileName = paths.oldFileName;
+          index.newFileName = paths.newFileName;
+        }
+        i++;
+        while (i < diffstr.length) {
+          const extLine = diffstr[i];
+          if (isFileHeader(extLine) || isHunkHeader(extLine) || isDiffHeader(extLine)) {
+            break;
+          }
+          const renameFromMatch = /^rename from (.*)/.exec(extLine);
+          if (renameFromMatch) {
+            index.oldFileName = "a/" + unquoteIfQuoted(renameFromMatch[1]);
+            index.isRename = true;
+          }
+          const renameToMatch = /^rename to (.*)/.exec(extLine);
+          if (renameToMatch) {
+            index.newFileName = "b/" + unquoteIfQuoted(renameToMatch[1]);
+            index.isRename = true;
+          }
+          const copyFromMatch = /^copy from (.*)/.exec(extLine);
+          if (copyFromMatch) {
+            index.oldFileName = "a/" + unquoteIfQuoted(copyFromMatch[1]);
+            index.isCopy = true;
+          }
+          const copyToMatch = /^copy to (.*)/.exec(extLine);
+          if (copyToMatch) {
+            index.newFileName = "b/" + unquoteIfQuoted(copyToMatch[1]);
+            index.isCopy = true;
+          }
+          const newFileModeMatch = /^new file mode (\d+)/.exec(extLine);
+          if (newFileModeMatch) {
+            index.isCreate = true;
+            index.newMode = newFileModeMatch[1];
+          }
+          const deletedFileModeMatch = /^deleted file mode (\d+)/.exec(extLine);
+          if (deletedFileModeMatch) {
+            index.isDelete = true;
+            index.oldMode = deletedFileModeMatch[1];
+          }
+          const oldModeMatch = /^old mode (\d+)/.exec(extLine);
+          if (oldModeMatch) {
+            index.oldMode = oldModeMatch[1];
+          }
+          const newModeMatch = /^new mode (\d+)/.exec(extLine);
+          if (newModeMatch) {
+            index.newMode = newModeMatch[1];
+          }
+          if (/^Binary files /.test(extLine)) {
+            index.isBinary = true;
+          }
+          i++;
+        }
+        continue;
+      } else if (isDiffHeader(line)) {
+        if (seenDiffHeader) {
+          return;
+        }
+        seenDiffHeader = true;
+        const headerMatch = /^(?:Index:|diff(?: -r \w+)+)\s+/.exec(line);
+        if (headerMatch) {
+          index.index = line.substring(headerMatch[0].length).trim();
+        }
       }
       i++;
     }
     parseFileHeader(index);
     parseFileHeader(index);
-    index.hunks = [];
+    if (index.oldFileName === undefined !== (index.newFileName === undefined)) {
+      throw new Error("Missing " + (index.oldFileName !== undefined ? '"+++ ..."' : '"--- ..."') + " file header for " + ((_a = index.oldFileName) !== null && _a !== undefined ? _a : index.newFileName));
+    }
     while (i < diffstr.length) {
       const line = diffstr[i];
-      if (/^(Index:\s|diff\s|---\s|\+\+\+\s|===================================================================)/.test(line)) {
+      if (isDiffHeader(line) || isFileHeader(line) || /^===================================================================/.test(line)) {
         break;
-      } else if (/^@@/.test(line)) {
+      } else if (isHunkHeader(line)) {
         index.hunks.push(parseHunk());
-      } else if (line) {
-        throw new Error("Unknown line " + (i + 1) + " " + JSON.stringify(line));
       } else {
         i++;
       }
     }
   }
+  function parseGitDiffHeader(line) {
+    const rest = line.substring("diff --git ".length);
+    if (rest.startsWith('"')) {
+      const oldPath = parseQuotedFileName(rest);
+      if (oldPath === null) {
+        return null;
+      }
+      const afterOld = rest.substring(oldPath.rawLength + 1);
+      let newFileName;
+      if (afterOld.startsWith('"')) {
+        const newPath = parseQuotedFileName(afterOld);
+        if (newPath === null) {
+          return null;
+        }
+        newFileName = newPath.fileName;
+      } else {
+        newFileName = afterOld;
+      }
+      return {
+        oldFileName: oldPath.fileName,
+        newFileName
+      };
+    }
+    const quoteIdx = rest.indexOf('"');
+    if (quoteIdx > 0) {
+      const oldFileName = rest.substring(0, quoteIdx - 1);
+      const newPath = parseQuotedFileName(rest.substring(quoteIdx));
+      if (newPath === null) {
+        return null;
+      }
+      return {
+        oldFileName,
+        newFileName: newPath.fileName
+      };
+    }
+    if (rest.startsWith("a/")) {
+      const splits = [];
+      let idx = 0;
+      while (true) {
+        idx = rest.indexOf(" b/", idx + 1);
+        if (idx === -1) {
+          break;
+        }
+        splits.push(idx);
+      }
+      if (splits.length > 0) {
+        const mid = splits[Math.floor(splits.length / 2)];
+        return {
+          oldFileName: rest.substring(0, mid),
+          newFileName: rest.substring(mid + 1)
+        };
+      }
+    }
+    return null;
+  }
+  function unquoteIfQuoted(s) {
+    if (s.startsWith('"')) {
+      const parsed = parseQuotedFileName(s);
+      if (parsed) {
+        return parsed.fileName;
+      }
+    }
+    return s;
+  }
+  function parseQuotedFileName(s) {
+    if (!s.startsWith('"')) {
+      return null;
+    }
+    let result = "";
+    let j = 1;
+    while (j < s.length) {
+      if (s[j] === '"') {
+        return { fileName: result, rawLength: j + 1 };
+      }
+      if (s[j] === "\\" && j + 1 < s.length) {
+        j++;
+        switch (s[j]) {
+          case "a":
+            result += "\x07";
+            break;
+          case "b":
+            result += "\b";
+            break;
+          case "f":
+            result += "\f";
+            break;
+          case "n":
+            result += `
+`;
+            break;
+          case "r":
+            result += "\r";
+            break;
+          case "t":
+            result += "\t";
+            break;
+          case "v":
+            result += "\v";
+            break;
+          case "\\":
+            result += "\\";
+            break;
+          case '"':
+            result += '"';
+            break;
+          case "0":
+          case "1":
+          case "2":
+          case "3":
+          case "4":
+          case "5":
+          case "6":
+          case "7": {
+            if (j + 2 >= s.length || s[j + 1] < "0" || s[j + 1] > "7" || s[j + 2] < "0" || s[j + 2] > "7") {
+              return null;
+            }
+            const bytes = [parseInt(s.substring(j, j + 3), 8)];
+            j += 3;
+            while (s[j] === "\\" && s[j + 1] >= "0" && s[j + 1] <= "7") {
+              if (j + 3 >= s.length || s[j + 2] < "0" || s[j + 2] > "7" || s[j + 3] < "0" || s[j + 3] > "7") {
+                return null;
+              }
+              bytes.push(parseInt(s.substring(j + 1, j + 4), 8));
+              j += 4;
+            }
+            result += new TextDecoder("utf-8").decode(new Uint8Array(bytes));
+            continue;
+          }
+          default:
+            return null;
+        }
+      } else {
+        result += s[j];
+      }
+      j++;
+    }
+    return null;
+  }
   function parseFileHeader(index) {
-    const fileHeader = /^(---|\+\+\+)\s+(.*)\r?$/.exec(diffstr[i]);
-    if (fileHeader) {
-      const data = fileHeader[2].split("\t", 2), header = (data[1] || "").trim();
-      let fileName = data[0].replace(/\\\\/g, "\\");
-      if (/^".*"$/.test(fileName)) {
-        fileName = fileName.substr(1, fileName.length - 2);
-      }
-      if (fileHeader[1] === "---") {
+    const fileHeaderMatch = /^(---|\+\+\+)\s+/.exec(diffstr[i]);
+    if (fileHeaderMatch) {
+      const prefix = fileHeaderMatch[1], data = diffstr[i].substring(3).trim().split("\t", 2), header = (data[1] || "").trim();
+      let fileName = data[0];
+      if (fileName.startsWith('"')) {
+        fileName = unquoteIfQuoted(fileName);
+      } else {
+        fileName = fileName.replace(/\\\\/g, "\\");
+      }
+      if (prefix === "---") {
         index.oldFileName = fileName;
         index.oldHeader = header;
       } else {
@@ -3912,6 +4124,9 @@ function parsePatch(uniDiff) {
     if (removeCount !== hunk.oldLines) {
       throw new Error("Removed line count did not match for hunk at line " + (chunkHeaderIndex + 1));
     }
+    if (i < diffstr.length && diffstr[i] && /^[+ -]/.test(diffstr[i]) && !isFileHeader(diffstr[i])) {
+      throw new Error("Hunk at line " + (chunkHeaderIndex + 1) + " has more lines than expected (expected " + hunk.oldLines + " old lines and " + hunk.newLines + " new lines)");
+    }
     return hunk;
   }
   while (i < diffstr.length) {
@@ -10774,5 +10989,5 @@ class TimeToFirstDrawRenderable extends Renderable {
 }
 export { DistortionEffect, VignetteEffect, CloudsEffect, FlamesEffect, CRTRollingBarEffect, RainbowTextEffect, applyScanlines, applyInvert, applyNoise, applyChromaticAberration, applyAsciiArt, applyBrightness, applyGain, applySaturation, BloomEffect, SEPIA_MATRIX, PROTANOPIA_SIM_MATRIX, DEUTERANOPIA_SIM_MATRIX, TRITANOPIA_SIM_MATRIX, ACHROMATOPSIA_MATRIX, PROTANOPIA_COMP_MATRIX, DEUTERANOPIA_COMP_MATRIX, TRITANOPIA_COMP_MATRIX, TECHNICOLOR_MATRIX, SOLARIZATION_MATRIX, SYNTHWAVE_MATRIX, GREENSCALE_MATRIX, GRAYSCALE_MATRIX, INVERT_MATRIX, Timeline, engine, createTimeline, SlotRegistry, createSlotRegistry, createCoreSlotRegistry, registerCorePlugin, resolveCoreSlot, SlotRenderable, NativeSpanFeed, FrameBufferRenderable, ASCIIFontRenderable, Generic, Box, Text, ASCIIFont, Input, Select, TabSelect, FrameBuffer, Code, ScrollBox, vstyles, VRenderable, LineNumberRenderable, DiffRenderable, defaultTextareaKeyBindings, TextareaRenderable, InputRenderableEvents, InputRenderable, TextTableRenderable, MarkdownRenderable, SliderRenderable, ScrollBarRenderable, ArrowRenderable, ScrollBoxRenderable, SelectRenderableEvents, SelectRenderable, TabSelectRenderableEvents, TabSelectRenderable, TimeToFirstDrawRenderable, exports_src2 as exports_src };
 
-//# debugId=1EC456BC9A30AA3564756E2164756E21
-//# sourceMappingURL=index-mch6dv67.js.map
+//# debugId=C6958AB1304EEF3C64756E2164756E21
+//# sourceMappingURL=index-d07rkqtc.js.map