@opentui/core 0.4.2 → 0.4.4

package/{index-x7n320jr.js → index-za1krqsf.js}

@@ -202,6 +202,17 @@ var POINTER_NEGATIVE = "Pointer must be non-negative";
 var POINTER_OFFSET_NEGATIVE = "Pointer offset must be non-negative";
 var POINTER_OFFSET_UNSAFE = "Pointer offset must be a safe integer";
 var POINTER_UNSAFE = "Pointer exceeds safe integer range";
+var arrayBufferByteLength = Object.getOwnPropertyDescriptor(ArrayBuffer.prototype, "byteLength")?.get;
+function isArrayBuffer(value) {
+  if (value === null || typeof value !== "object" || arrayBufferByteLength == null)
+    return false;
+  try {
+    arrayBufferByteLength.call(value);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function unavailable(cause) {
   throw new Error(FFI_UNAVAILABLE, { cause });
 }
@@ -351,7 +362,7 @@ function createNodeBackend(nodeFfi) {
       let closed = false;
       let libraryClosed = false;
       return {
-        symbols: wrapNodeSymbols(functions, symbols, nodeFfi),
+        symbols: wrapNodeSymbols(functions, symbols),
         createCallback(callback, definition) {
           if (closed) {
             throw new Error(LIBRARY_CLOSED);
@@ -402,10 +413,10 @@ function toNodeLibraryPath(path) {
 function normalizeNodeDefinitions(definitions) {
   return Object.fromEntries(Object.entries(definitions).map(([name, definition]) => [name, normalizeNodeDefinition(definition)]));
 }
-function wrapNodeSymbols(functions, definitions, nodeFfi) {
-  return Object.fromEntries(Object.entries(functions).map(([name, fn]) => [name, wrapNodeSymbol(fn, definitions[name], nodeFfi)]));
+function wrapNodeSymbols(functions, definitions) {
+  return Object.fromEntries(Object.entries(functions).map(([name, fn]) => [name, wrapNodeSymbol(fn, definitions[name])]));
 }
-function wrapNodeSymbol(fn, definition, nodeFfi) {
+function wrapNodeSymbol(fn, definition) {
   const pointerArgIndexes = (definition.args ?? []).flatMap((type, index) => isNodePointerArgumentType(type) ? [index] : []);
   if (pointerArgIndexes.length === 0) {
     return fn;
@@ -413,7 +424,7 @@ function wrapNodeSymbol(fn, definition, nodeFfi) {
   return (...args) => {
     const normalizedArgs = args.slice();
     for (const index of pointerArgIndexes) {
-      normalizedArgs[index] = toNodePointerArgument(nodeFfi, normalizedArgs[index]);
+      normalizedArgs[index] = toNodePointerArgument(normalizedArgs[index]);
     }
     return fn(...normalizedArgs);
   };
@@ -421,7 +432,7 @@ function wrapNodeSymbol(fn, definition, nodeFfi) {
 function isNodePointerArgumentType(type) {
   return type === FFIType.ptr || type === FFIType.pointer || type === FFIType.function || type === FFIType.callback;
 }
-function toNodePointerArgument(nodeFfi, value) {
+function toNodePointerArgument(value) {
   if (value == null) {
     return 0n;
   }
@@ -429,27 +440,30 @@ function toNodePointerArgument(nodeFfi, value) {
     return toBigIntPointer(value);
   }
   if (ArrayBuffer.isView(value)) {
+    if (!isArrayBuffer(value.buffer)) {
+      throw new TypeError(NODE_PTR_VALUE);
+    }
     if (value.byteLength === 0) {
       return 0n;
     }
-    return toNodeSourcePointer(nodeFfi, value);
+    return value;
   }
-  if (value instanceof ArrayBuffer) {
+  if (isArrayBuffer(value)) {
     if (value.byteLength === 0) {
       return 0n;
     }
-    return toNodeSourcePointer(nodeFfi, value);
+    return value;
   }
   throw new TypeError(NODE_POINTER_ARGUMENT);
 }
 function toNodeSourcePointer(nodeFfi, value) {
   if (ArrayBuffer.isView(value)) {
-    if (!(value.buffer instanceof ArrayBuffer)) {
+    if (!isArrayBuffer(value.buffer)) {
       throw new TypeError(NODE_PTR_VALUE);
     }
     return nodeFfi.getRawPointer(value.buffer) + BigInt(value.byteOffset);
   }
-  if (value instanceof ArrayBuffer) {
+  if (isArrayBuffer(value)) {
     return nodeFfi.getRawPointer(value);
   }
   throw new TypeError(NODE_PTR_VALUE);
@@ -10818,7 +10832,7 @@ class TextBuffer {
   }
 }
 
-// ../../node_modules/.bun/bun-ffi-structs@0.2.3+1fb4c65d43e298b9/node_modules/bun-ffi-structs/dist/index.js
+// ../../node_modules/.bun/bun-ffi-structs@0.2.4+1fb4c65d43e298b9/node_modules/bun-ffi-structs/dist/index.js
 var FFI_LOAD_ERROR = "bun-ffi-structs requires Bun or Node.js with node:ffi enabled (--experimental-ffi --allow-ffi).";
 var backend2 = await loadBackend2();
 function unavailable2(cause) {
@@ -11068,6 +11082,20 @@ function defineStruct(fields, structDefOptions) {
       size = typeSizes[typeOrStruct];
       align = typeAlignments[typeOrStruct];
       ({ pack, unpack } = primitivePackers(typeOrStruct));
+      if (typeOrStruct === "pointer") {
+        pack = (view, off, val) => {
+          if (val instanceof ArrayBuffer || ArrayBuffer.isView(val)) {
+            if (val.byteLength === 0) {
+              pointerPacker(view, off, null);
+              return;
+            }
+            pointerPacker(view, off, ptr2(val));
+            retainPointerTarget(view.buffer, val);
+            return;
+          }
+          pointerPacker(view, off, val);
+        };
+      }
     } else if (typeof typeOrStruct === "string" && typeOrStruct === "cstring") {
       size = pointerSize;
       align = pointerSize;
@@ -11541,7 +11569,7 @@ function defineStruct(fields, structDefOptions) {
 }
 
 // src/zig-structs.ts
-var rgbaPackTransform = (rgba) => rgba ? ptr(rgba.buffer) : null;
+var rgbaPackTransform = (rgba) => rgba?.buffer ?? null;
 var rgbaUnpackTransform = (ptr3) => ptr3 ? RGBA.fromArray(new Uint16Array(toArrayBuffer(ptr3, 0, 8))) : undefined;
 var StyledChunkStruct = defineStruct([
   ["text", "char*"],
@@ -11744,6 +11772,33 @@ var ReserveInfoStruct = defineStruct([
     len: value.len
   })
 });
+var NativeAudioStreamFormat = {
+  Mp3: 1,
+  Flac: 2
+};
+var NativeAudioStreamState = {
+  Initializing: 0,
+  Buffering: 1,
+  Playing: 2,
+  Ended: 3,
+  Failed: 4,
+  Cancelled: 5,
+  Reconnecting: 6
+};
+var NativeAudioStreamStateNames = [
+  "initializing",
+  "buffering",
+  "playing",
+  "ended",
+  "errored",
+  "disposed",
+  "reconnecting"
+];
+var NativeAudioStreamCloseReason = {
+  PreserveNativeTerminal: 0,
+  TransportError: 1,
+  Disposed: 2
+};
 var AudioCreateOptionsStruct = defineStruct([
   ["sampleRate", "u32", { default: 48000 }],
   ["playbackChannels", "u32", { default: 2 }]
@@ -11771,6 +11826,29 @@ var AudioVoiceOptionsStruct = defineStruct([
   ["loop", "bool_u8", { default: false }],
   ["groupId", "u32", { default: 0 }]
 ]);
+var AudioStreamCreateOptionsStruct = defineStruct([
+  ["capacityMs", "u32"],
+  ["startupMs", "u32"],
+  ["resumeMs", "u32"],
+  ["volume", "f32"],
+  ["pan", "f32"],
+  ["groupId", "u32"],
+  ["maxProbeBytes", "u32"],
+  ["format", "u32"]
+]);
+var AudioStreamStatsStruct = defineStruct([
+  ["bytesReceived", "u64"],
+  ["framesDecoded", "u64"],
+  ["framesPlayed", "u64"],
+  ["state", "u32"],
+  ["sampleRate", "u32"],
+  ["channels", "u32"],
+  ["bufferedFrames", "u32"],
+  ["capacityFrames", "u32"],
+  ["underruns", "u32"],
+  ["errorCode", "i32"],
+  ["readyGeneration", "u32"]
+]);
 var AudioStatsStruct = defineStruct([
   ["soundsLoaded", "u32"],
   ["voicesActive", "u32"],
@@ -11781,6 +11859,9 @@ var AudioStatsStruct = defineStruct([
 ]);
 
 // src/zig.ts
+var NativeAudioStreamState2 = NativeAudioStreamState;
+var NativeAudioStreamCloseReason2 = NativeAudioStreamCloseReason;
+var NativeAudioStreamFormat2 = NativeAudioStreamFormat;
 registerEnvVar({
   name: "OPENTUI_LIBC",
   description: "Select Linux native libc package. Supported values: glibc, musl.",
@@ -11894,6 +11975,9 @@ function toSafeFFIU32Length(value, label) {
   }
   return value;
 }
+function isFFIU32(value) {
+  return Number.isInteger(value) && value >= 0 && value <= MAX_FFI_U32;
+}
 function ptrOrNull(value) {
   return value.byteLength === 0 ? null : ptr(value);
 }
@@ -11918,6 +12002,22 @@ function getOpenTUILib(libPath) {
       args: ["u32"],
       returns: "void"
     },
+    createNativeRenderable: {
+      args: [],
+      returns: "u32"
+    },
+    destroyNativeRenderable: {
+      args: ["u32"],
+      returns: "void"
+    },
+    nativeRenderableAttachYogaNode: {
+      args: ["u32", "ptr"],
+      returns: "bool"
+    },
+    nativeRenderableSetMeasureTarget: {
+      args: ["u32", "u32", "u32"],
+      returns: "bool"
+    },
     createRenderer: {
       args: ["u32", "u32", "u8", "u8", "ptr"],
       returns: "u32"
@@ -13051,7 +13151,7 @@ function getOpenTUILib(libPath) {
       returns: "u64"
     },
     yogaNodeSetMeasureFunc: {
-      args: ["ptr", "ptr"],
+      args: ["ptr", "bool"],
       returns: "void"
     },
     yogaNodeUnsetMeasureFunc: {
@@ -13063,7 +13163,7 @@ function getOpenTUILib(libPath) {
       returns: "bool"
     },
     yogaNodeSetDirtiedFunc: {
-      args: ["ptr", "ptr"],
+      args: ["ptr", "bool"],
       returns: "void"
     },
     yogaNodeUnsetDirtiedFunc: {
@@ -13074,6 +13174,14 @@ function getOpenTUILib(libPath) {
       args: ["f32", "f32"],
       returns: "void"
     },
+    yogaSetMeasureCallback: {
+      args: ["ptr"],
+      returns: "void"
+    },
+    yogaSetDirtiedCallback: {
+      args: ["ptr"],
+      returns: "void"
+    },
     createAudioEngine: {
       args: ["ptr"],
       returns: "u32"
@@ -13118,6 +13226,42 @@ function getOpenTUILib(libPath) {
       args: ["u32"],
       returns: "i32"
     },
+    audioCreateStream: {
+      args: ["u32", "ptr", "ptr"],
+      returns: "i32"
+    },
+    audioWriteStream: {
+      args: ["u32", "u32", "ptr", "u32"],
+      returns: "i32"
+    },
+    audioEndStream: {
+      args: ["u32", "u32"],
+      returns: "i32"
+    },
+    audioRestartStream: {
+      args: ["u32", "u32"],
+      returns: "i32"
+    },
+    audioSetStreamVolume: {
+      args: ["u32", "u32", "f32"],
+      returns: "i32"
+    },
+    audioSetStreamPan: {
+      args: ["u32", "u32", "f32"],
+      returns: "i32"
+    },
+    audioSetStreamGroup: {
+      args: ["u32", "u32", "u32"],
+      returns: "i32"
+    },
+    audioGetStreamStats: {
+      args: ["u32", "u32", "ptr"],
+      returns: "i32"
+    },
+    audioCloseStream: {
+      args: ["u32", "u32", "u32", "ptr"],
+      returns: "i32"
+    },
     audioLoad: {
       args: ["u32", "ptr", "u32", "ptr"],
       returns: "i32"
@@ -13364,6 +13508,11 @@ var LogLevel2;
   LogLevel3[LogLevel3["Info"] = 2] = "Info";
   LogLevel3[LogLevel3["Debug"] = 3] = "Debug";
 })(LogLevel2 ||= {});
+var NativeMeasureTargetKind = {
+  None: 0,
+  TextBufferView: 1,
+  EditorView: 2
+};
 
 class FFIRenderLib {
   opentui;
@@ -13376,6 +13525,21 @@ class FFIRenderLib {
   _anyEventHandlers = [];
   nativeSpanFeedCallbackWrapper = null;
   nativeSpanFeedHandlers = new Map;
+  createNativeRenderable() {
+    const handle = this.opentui.symbols.createNativeRenderable();
+    if (!handle)
+      throw new Error("Failed to create native renderable");
+    return handle;
+  }
+  destroyNativeRenderable(handle) {
+    this.opentui.symbols.destroyNativeRenderable(handle);
+  }
+  nativeRenderableAttachYogaNode(handle, node) {
+    return Boolean(this.opentui.symbols.nativeRenderableAttachYogaNode(handle, node));
+  }
+  nativeRenderableSetMeasureTarget(handle, kind, target) {
+    return Boolean(this.opentui.symbols.nativeRenderableSetMeasureTarget(handle, kind, target));
+  }
   constructor(libPath) {
     this.opentui = getOpenTUILib(libPath);
     try {
@@ -13436,6 +13600,8 @@ class FFIRenderLib {
         this.opentui.symbols.destroyEventSink(this.eventSinkPtr);
         this.eventSinkPtr = null;
       }
+      this.yogaSetMeasureCallback(null);
+      this.yogaSetDirtiedCallback(null);
       this.setLogCallback(null);
     } finally {
       try {
@@ -13746,7 +13912,7 @@ class FFIRenderLib {
     const blinking = options.blinking != null ? options.blinking ? 1 : 0 : 255;
     const cursor = options.cursor != null ? MOUSE_STYLE_TO_ID[options.cursor] : 255;
     const buffer = CursorStyleOptionsStruct.pack({ style, blinking, color: options.color, cursor });
-    this.opentui.symbols.setCursorStyleOptions(renderer, ptr(buffer));
+    this.opentui.symbols.setCursorStyleOptions(renderer, buffer);
   }
   render(renderer, force) {
     return this.opentui.symbols.render(renderer, ffiBool(force));
@@ -14034,17 +14200,17 @@ class FFIRenderLib {
   yogaNodeStyleGetValue(node, kind, edgeOrGutter) {
     return this.opentui.symbols.yogaNodeStyleGetValue(node, kind, edgeOrGutter);
   }
-  yogaNodeSetMeasureFunc(node, callback) {
-    this.opentui.symbols.yogaNodeSetMeasureFunc(node, callback);
+  yogaNodeSetMeasureFunc(node, enabled) {
+    this.opentui.symbols.yogaNodeSetMeasureFunc(node, ffiBool(enabled));
   }
   yogaNodeUnsetMeasureFunc(node) {
     this.opentui.symbols.yogaNodeUnsetMeasureFunc(node);
   }
   yogaNodeHasMeasureFunc(node) {
-    return this.opentui.symbols.yogaNodeHasMeasureFunc(node);
+    return Boolean(this.opentui.symbols.yogaNodeHasMeasureFunc(node));
   }
-  yogaNodeSetDirtiedFunc(node, callback) {
-    this.opentui.symbols.yogaNodeSetDirtiedFunc(node, callback);
+  yogaNodeSetDirtiedFunc(node, enabled) {
+    this.opentui.symbols.yogaNodeSetDirtiedFunc(node, ffiBool(enabled));
   }
   yogaNodeUnsetDirtiedFunc(node) {
     this.opentui.symbols.yogaNodeUnsetDirtiedFunc(node);
@@ -14052,6 +14218,12 @@ class FFIRenderLib {
   yogaStoreMeasureResult(width, height) {
     this.opentui.symbols.yogaStoreMeasureResult(width, height);
   }
+  yogaSetMeasureCallback(callback) {
+    this.opentui.symbols.yogaSetMeasureCallback(callback);
+  }
+  yogaSetDirtiedCallback(callback) {
+    this.opentui.symbols.yogaSetDirtiedCallback(callback);
+  }
   createYogaMeasureCallback(callback) {
     return this.opentui.createCallback(callback, {
       args: ["ptr", "f32", "u32", "f32", "u32"],
@@ -14060,7 +14232,7 @@ class FFIRenderLib {
   }
   createYogaDirtiedCallback(callback) {
     return this.opentui.createCallback(callback, {
-      args: [],
+      args: ["ptr"],
       returns: "void"
     });
   }
@@ -14140,7 +14312,7 @@ class FFIRenderLib {
       return;
     }
     const chunksBuffer = StyledChunkStruct.packList(chunks);
-    this.opentui.symbols.textBufferSetStyledText(buffer, ptr(chunksBuffer), chunks.length);
+    this.opentui.symbols.textBufferSetStyledText(buffer, chunksBuffer, chunks.length);
   }
   textBufferGetLineCount(buffer) {
     return this.opentui.symbols.textBufferGetLineCount(buffer);
@@ -14844,7 +15016,12 @@ class FFIRenderLib {
     this.opentui.symbols.audioClearPlaybackDeviceSelection(engine);
   }
   audioStart(engine, options) {
-    const optionsBuffer = options == null ? null : AudioStartOptionsStruct.pack(options);
+    let optionsBuffer;
+    try {
+      optionsBuffer = options == null ? null : AudioStartOptionsStruct.pack(options);
+    } catch {
+      return -1;
+    }
     return this.opentui.symbols.audioStart(engine, optionsBuffer ? ptr(optionsBuffer) : null);
   }
   audioStartMixer(engine) {
@@ -14853,6 +15030,52 @@ class FFIRenderLib {
   audioStop(engine) {
     return this.opentui.symbols.audioStop(engine);
   }
+  audioCreateStream(engine, options) {
+    if (!isFFIU32(options.groupId) || options.format !== NativeAudioStreamFormat2.Mp3 && options.format !== NativeAudioStreamFormat2.Flac) {
+      return { status: -1, streamId: null };
+    }
+    const optionsBuffer = AudioStreamCreateOptionsStruct.pack(options);
+    const outBuffer = new ArrayBuffer(4);
+    const status = this.opentui.symbols.audioCreateStream(engine, optionsBuffer, outBuffer);
+    if (status !== 0)
+      return { status, streamId: null };
+    return { status, streamId: new Uint32Array(outBuffer)[0] ?? null };
+  }
+  audioWriteStream(engine, streamId, data) {
+    const dataLength = toSafeFFIU32Length(data.byteLength, "Audio stream data length");
+    return this.opentui.symbols.audioWriteStream(engine, streamId, dataLength === 0 ? null : data, dataLength);
+  }
+  audioEndStream(engine, streamId) {
+    return this.opentui.symbols.audioEndStream(engine, streamId);
+  }
+  audioRestartStream(engine, streamId) {
+    return this.opentui.symbols.audioRestartStream(engine, streamId);
+  }
+  audioSetStreamVolume(engine, streamId, volume) {
+    return this.opentui.symbols.audioSetStreamVolume(engine, streamId, volume);
+  }
+  audioSetStreamPan(engine, streamId, pan) {
+    return this.opentui.symbols.audioSetStreamPan(engine, streamId, pan);
+  }
+  audioSetStreamGroup(engine, streamId, groupId) {
+    if (!isFFIU32(groupId))
+      return -1;
+    return this.opentui.symbols.audioSetStreamGroup(engine, streamId, groupId);
+  }
+  audioGetStreamStats(engine, streamId) {
+    const outBuffer = new ArrayBuffer(AudioStreamStatsStruct.size);
+    const status = this.opentui.symbols.audioGetStreamStats(engine, streamId, outBuffer);
+    if (status !== 0)
+      return null;
+    return AudioStreamStatsStruct.unpack(outBuffer);
+  }
+  audioCloseStream(engine, streamId, reason) {
+    const outBuffer = new ArrayBuffer(AudioStreamStatsStruct.size);
+    const status = this.opentui.symbols.audioCloseStream(engine, streamId, reason, outBuffer);
+    if (status !== 0)
+      return { status, stats: null };
+    return { status, stats: AudioStreamStatsStruct.unpack(outBuffer) };
+  }
   audioLoad(engine, data) {
     const outBuffer = new ArrayBuffer(4);
     const dataLength = toSafeFFIU32Length(data.byteLength, "Audio data length");
@@ -14867,6 +15090,8 @@ class FFIRenderLib {
     return this.opentui.symbols.audioUnload(engine, soundId);
   }
   audioPlay(engine, soundId, options) {
+    if (options?.groupId !== undefined && !isFFIU32(options.groupId))
+      return { status: -1, voiceId: null };
     const outBuffer = new ArrayBuffer(4);
     const optionsBuffer = options ? AudioVoiceOptionsStruct.pack(options) : null;
     const status = this.opentui.symbols.audioPlay(engine, soundId, optionsBuffer ? ptr(optionsBuffer) : null, ptr(outBuffer));
@@ -14880,6 +15105,8 @@ class FFIRenderLib {
     return this.opentui.symbols.audioStopVoice(engine, voiceId);
   }
   audioSetVoiceGroup(engine, voiceId, groupId) {
+    if (!isFFIU32(groupId))
+      return -1;
     return this.opentui.symbols.audioSetVoiceGroup(engine, voiceId, groupId);
   }
   audioCreateGroup(engine, name) {
@@ -15028,7 +15255,7 @@ class FFIRenderLib {
       return;
     }
     const chunksBuffer = StyledChunkStruct.packList(nonEmptyChunks);
-    this.opentui.symbols.editorViewSetPlaceholderStyledText(view, ptr(chunksBuffer), nonEmptyChunks.length);
+    this.opentui.symbols.editorViewSetPlaceholderStyledText(view, chunksBuffer, nonEmptyChunks.length);
   }
   editorViewSetTabIndicator(view, indicator) {
     this.opentui.symbols.editorViewSetTabIndicator(view, indicator);
@@ -15317,11 +15544,52 @@ var YogaEdgeLayoutKind = {
 };
 var UNDEFINED_VALUE = { unit: 0 /* Undefined */, value: NaN };
 var nodeRegistry = new Map;
+var measureRegistry = new Map;
+var dirtiedRegistry = new Map;
+var measureCallback = null;
+var measureCallbackLib = null;
+var dirtiedCallback = null;
+var dirtiedCallbackLib = null;
 function lib() {
   return resolveRenderLib();
 }
-function pointerKey(pointer) {
-  return String(pointer);
+function ensureMeasureCallback() {
+  const renderLib = lib();
+  if (measureCallback?.ptr && measureCallbackLib === renderLib)
+    return;
+  const callback = (node, width, widthMode, height, heightMode) => {
+    const measureFunc = node ? measureRegistry.get(node) : undefined;
+    const result = measureFunc?.(width, widthMode, height, heightMode);
+    renderLib.yogaStoreMeasureResult(result?.width ?? NaN, result?.height ?? NaN);
+  };
+  measureCallback = renderLib.createYogaMeasureCallback(callback);
+  if (!measureCallback.ptr) {
+    measureCallback.close();
+    measureCallback = null;
+    throw new Error("Failed to create Yoga measure callback");
+  }
+  renderLib.yogaSetMeasureCallback(measureCallback.ptr);
+  measureCallbackLib = renderLib;
+}
+function ensureDirtiedCallback() {
+  const renderLib = lib();
+  if (dirtiedCallback?.ptr && dirtiedCallbackLib === renderLib)
+    return;
+  const callback = (node) => {
+    if (!node)
+      return;
+    const registration = dirtiedRegistry.get(node);
+    if (registration)
+      registration.callback(registration.node);
+  };
+  dirtiedCallback = renderLib.createYogaDirtiedCallback(callback);
+  if (!dirtiedCallback.ptr) {
+    dirtiedCallback.close();
+    dirtiedCallback = null;
+    throw new Error("Failed to create Yoga dirtied callback");
+  }
+  renderLib.yogaSetDirtiedCallback(dirtiedCallback.ptr);
+  dirtiedCallbackLib = renderLib;
 }
 function isValueObject(value) {
   return typeof value === "object" && value !== null && "unit" in value && "value" in value;
@@ -15424,11 +15692,9 @@ class Config {
 class Node {
   ptr;
   freed = false;
-  measureCallback = null;
-  dirtiedCallback = null;
   constructor(ptr3) {
     this.ptr = ptr3;
-    nodeRegistry.set(pointerKey(ptr3), this);
+    nodeRegistry.set(ptr3, this);
   }
   static create(config) {
     return Node.fromPointer(config ? lib().yogaNodeCreateWithConfig(config.ptr) : lib().yogaNodeCreate());
@@ -15446,8 +15712,7 @@ class Node {
     node.free();
   }
   static fromPointer(ptr3) {
-    const key = pointerKey(ptr3);
-    const existing = nodeRegistry.get(key);
+    const existing = nodeRegistry.get(ptr3);
     if (existing)
       return existing;
     return new Node(ptr3);
@@ -15468,8 +15733,7 @@ class Node {
       return;
     const nodes = this.collectSubtree([]);
     for (const node of nodes) {
-      node.closeMeasureCallback();
-      node.closeDirtiedCallback();
+      node.unregisterCallbacks();
     }
     lib().yogaNodeFreeRecursive(this.ptr);
     for (const node of nodes) {
@@ -15823,23 +16087,15 @@ class Node {
     this.unsetMeasureFunc();
     if (!measureFunc)
       return;
-    const callback = (_node, width, widthMode, height, heightMode) => {
-      const result = measureFunc(width, widthMode, height, heightMode);
-      lib().yogaStoreMeasureResult(result.width ?? NaN, result.height ?? NaN);
-    };
-    this.measureCallback = lib().createYogaMeasureCallback(callback);
-    if (!this.measureCallback.ptr) {
-      this.measureCallback.close();
-      this.measureCallback = null;
-      throw new Error("Failed to create Yoga measure callback");
-    }
-    lib().yogaNodeSetMeasureFunc(this.ptr, this.measureCallback.ptr);
+    ensureMeasureCallback();
+    measureRegistry.set(this.ptr, measureFunc);
+    lib().yogaNodeSetMeasureFunc(this.ptr, true);
   }
   unsetMeasureFunc() {
     if (this.freed)
       return;
     lib().yogaNodeUnsetMeasureFunc(this.ptr);
-    this.closeMeasureCallback();
+    measureRegistry.delete(this.ptr);
   }
   hasMeasureFunc() {
     if (this.freed)
@@ -15852,22 +16108,15 @@ class Node {
     this.unsetDirtiedFunc();
     if (!dirtiedFunc)
       return;
-    const callback = () => {
-      dirtiedFunc(this);
-    };
-    this.dirtiedCallback = lib().createYogaDirtiedCallback(callback);
-    if (!this.dirtiedCallback.ptr) {
-      this.dirtiedCallback.close();
-      this.dirtiedCallback = null;
-      throw new Error("Failed to create Yoga dirtied callback");
-    }
-    lib().yogaNodeSetDirtiedFunc(this.ptr, this.dirtiedCallback.ptr);
+    ensureDirtiedCallback();
+    dirtiedRegistry.set(this.ptr, { node: this, callback: dirtiedFunc });
+    lib().yogaNodeSetDirtiedFunc(this.ptr, true);
   }
   unsetDirtiedFunc() {
     if (this.freed)
       return;
     lib().yogaNodeUnsetDirtiedFunc(this.ptr);
-    this.closeDirtiedCallback();
+    dirtiedRegistry.delete(this.ptr);
   }
   setEnum(kind, value) {
     if (this.freed)
@@ -15907,21 +16156,14 @@ class Node {
     nodes.push(this);
     return nodes;
   }
-  closeMeasureCallback() {
-    if (!this.measureCallback)
-      return;
-    this.measureCallback.close();
-    this.measureCallback = null;
-  }
-  closeDirtiedCallback() {
-    if (!this.dirtiedCallback)
-      return;
-    this.dirtiedCallback.close();
-    this.dirtiedCallback = null;
+  unregisterCallbacks() {
+    measureRegistry.delete(this.ptr);
+    dirtiedRegistry.delete(this.ptr);
   }
   markFreed() {
+    this.unregisterCallbacks();
     this.freed = true;
-    nodeRegistry.delete(pointerKey(this.ptr));
+    nodeRegistry.delete(this.ptr);
   }
 }
 var Yoga = {
@@ -16020,7 +16262,7 @@ var Yoga = {
 };
 var yoga_default = Yoga;
 
-export { toArrayBuffer, sleep, stringWidth2 as stringWidth, DEFAULT_FOREGROUND_RGB, DEFAULT_BACKGROUND_RGB, normalizeIndexedColorIndex, ansi256IndexToRgb, RGBA, normalizeColorValue, hexToRgb, rgbToHex, hsvToRgb, parseColor, isValidBorderStyle, parseBorderStyle, BorderChars, getBorderFromSides, getBorderSides, borderCharsToArray, BorderCharArrays, KeyEvent, PasteEvent, KeyHandler, InternalKeyHandler, fonts, measureText, getCharacterPositions, coordinateToCharacterIndex, renderFontToFrameBuffer, TextAttributes, ATTRIBUTE_BASE_BITS, ATTRIBUTE_BASE_MASK, getBaseAttributes, DebugOverlayCorner, TargetChannel, createTextAttributes, attributesWithLink, getLinkId, 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, link, t, hastToStyledText, SystemClock, nonAlphanumericKeys, terminalNamedSingleStrokeKeys, parseKeypress, LinearScrollAccel, MacOSScrollAccel, parseAlign, parseAlignItems, parseBoxSizing, parseDimension, parseDirection, parseDisplay, parseEdge, parseFlexDirection, parseGutter, parseJustify, parseLogLevel, parseMeasureMode, parseOverflow, parsePositionType, parseUnit, parseWrap, MouseParser, Selection, convertGlobalToLocalSelection, ASCIIFontSelectionHelper, singleton, envRegistry, registerEnvVar, clearEnvCache, generateEnvMarkdown, generateEnvColored, env, StdinParser, treeSitterToTextChunks, treeSitterToStyledText, addDefaultParsers, TreeSitterClient, DataPathsManager, getDataPaths, extensionToFiletype, basenameToFiletype, extToFiletype, pathToFiletype, infoStringToFiletype, getTreeSitterClient, destroyTreeSitterClient, ExtmarksController, createExtmarksController, TerminalPalette, createTerminalPalette, normalizeTerminalPalette, buildTerminalPaletteSignature, decodePasteBytes, stripAnsiSequences, ClipboardTarget, Clipboard, detectLinks, OptimizedBuffer, TextBuffer, SpanInfoStruct, LogLevel2 as LogLevel, setRenderLibPath, resolveRenderLib, Align, BoxSizing, Dimension, Direction, Display, Edge, Errata, ExperimentalFeature, FlexDirection, Gutter, Justify, LogLevel as LogLevel1, MeasureMode, NodeType, Overflow, PositionType, Unit, Wrap, ALIGN_AUTO, ALIGN_FLEX_START, ALIGN_CENTER, ALIGN_FLEX_END, ALIGN_STRETCH, ALIGN_BASELINE, ALIGN_SPACE_BETWEEN, ALIGN_SPACE_AROUND, ALIGN_SPACE_EVENLY, BOX_SIZING_BORDER_BOX, BOX_SIZING_CONTENT_BOX, DIMENSION_WIDTH, DIMENSION_HEIGHT, DIRECTION_INHERIT, DIRECTION_LTR, DIRECTION_RTL, DISPLAY_FLEX, DISPLAY_NONE, DISPLAY_CONTENTS, EDGE_LEFT, EDGE_TOP, EDGE_RIGHT, EDGE_BOTTOM, EDGE_START, EDGE_END, EDGE_HORIZONTAL, EDGE_VERTICAL, EDGE_ALL, ERRATA_NONE, ERRATA_STRETCH_FLEX_BASIS, ERRATA_ABSOLUTE_POSITION_WITHOUT_INSETS_EXCLUDES_PADDING, ERRATA_ABSOLUTE_PERCENT_AGAINST_INNER_SIZE, ERRATA_ALL, ERRATA_CLASSIC, EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS, FLEX_DIRECTION_COLUMN, FLEX_DIRECTION_COLUMN_REVERSE, FLEX_DIRECTION_ROW, FLEX_DIRECTION_ROW_REVERSE, GUTTER_COLUMN, GUTTER_ROW, GUTTER_ALL, JUSTIFY_FLEX_START, JUSTIFY_CENTER, JUSTIFY_FLEX_END, JUSTIFY_SPACE_BETWEEN, JUSTIFY_SPACE_AROUND, JUSTIFY_SPACE_EVENLY, LOG_LEVEL_ERROR, LOG_LEVEL_WARN, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_VERBOSE, LOG_LEVEL_FATAL, MEASURE_MODE_UNDEFINED, MEASURE_MODE_EXACTLY, MEASURE_MODE_AT_MOST, NODE_TYPE_DEFAULT, NODE_TYPE_TEXT, OVERFLOW_VISIBLE, OVERFLOW_HIDDEN, OVERFLOW_SCROLL, POSITION_TYPE_STATIC, POSITION_TYPE_RELATIVE, POSITION_TYPE_ABSOLUTE, UNIT_UNDEFINED, UNIT_POINT, UNIT_PERCENT, UNIT_AUTO, WRAP_NO_WRAP, WRAP_WRAP, WRAP_WRAP_REVERSE, Config, Node, exports_yoga, yoga_default };
+export { toArrayBuffer, sleep, stringWidth2 as stringWidth, DEFAULT_FOREGROUND_RGB, DEFAULT_BACKGROUND_RGB, normalizeIndexedColorIndex, ansi256IndexToRgb, RGBA, normalizeColorValue, hexToRgb, rgbToHex, hsvToRgb, parseColor, isValidBorderStyle, parseBorderStyle, BorderChars, getBorderFromSides, getBorderSides, borderCharsToArray, BorderCharArrays, KeyEvent, PasteEvent, KeyHandler, InternalKeyHandler, fonts, measureText, getCharacterPositions, coordinateToCharacterIndex, renderFontToFrameBuffer, TextAttributes, ATTRIBUTE_BASE_BITS, ATTRIBUTE_BASE_MASK, getBaseAttributes, DebugOverlayCorner, TargetChannel, createTextAttributes, attributesWithLink, getLinkId, 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, link, t, hastToStyledText, SystemClock, nonAlphanumericKeys, terminalNamedSingleStrokeKeys, parseKeypress, LinearScrollAccel, MacOSScrollAccel, parseAlign, parseAlignItems, parseBoxSizing, parseDimension, parseDirection, parseDisplay, parseEdge, parseFlexDirection, parseGutter, parseJustify, parseLogLevel, parseMeasureMode, parseOverflow, parsePositionType, parseUnit, parseWrap, MouseParser, Selection, convertGlobalToLocalSelection, ASCIIFontSelectionHelper, singleton, envRegistry, registerEnvVar, clearEnvCache, generateEnvMarkdown, generateEnvColored, env, StdinParser, treeSitterToTextChunks, treeSitterToStyledText, addDefaultParsers, TreeSitterClient, DataPathsManager, getDataPaths, extensionToFiletype, basenameToFiletype, extToFiletype, pathToFiletype, infoStringToFiletype, getTreeSitterClient, destroyTreeSitterClient, ExtmarksController, createExtmarksController, TerminalPalette, createTerminalPalette, normalizeTerminalPalette, buildTerminalPaletteSignature, decodePasteBytes, stripAnsiSequences, ClipboardTarget, Clipboard, detectLinks, OptimizedBuffer, TextBuffer, SpanInfoStruct, NativeAudioStreamFormat, NativeAudioStreamState, NativeAudioStreamStateNames, NativeAudioStreamCloseReason, NativeAudioStreamState2 as NativeAudioStreamState1, NativeAudioStreamCloseReason2 as NativeAudioStreamCloseReason1, NativeAudioStreamFormat2 as NativeAudioStreamFormat1, LogLevel2 as LogLevel, NativeMeasureTargetKind, setRenderLibPath, resolveRenderLib, Align, BoxSizing, Dimension, Direction, Display, Edge, Errata, ExperimentalFeature, FlexDirection, Gutter, Justify, LogLevel as LogLevel1, MeasureMode, NodeType, Overflow, PositionType, Unit, Wrap, ALIGN_AUTO, ALIGN_FLEX_START, ALIGN_CENTER, ALIGN_FLEX_END, ALIGN_STRETCH, ALIGN_BASELINE, ALIGN_SPACE_BETWEEN, ALIGN_SPACE_AROUND, ALIGN_SPACE_EVENLY, BOX_SIZING_BORDER_BOX, BOX_SIZING_CONTENT_BOX, DIMENSION_WIDTH, DIMENSION_HEIGHT, DIRECTION_INHERIT, DIRECTION_LTR, DIRECTION_RTL, DISPLAY_FLEX, DISPLAY_NONE, DISPLAY_CONTENTS, EDGE_LEFT, EDGE_TOP, EDGE_RIGHT, EDGE_BOTTOM, EDGE_START, EDGE_END, EDGE_HORIZONTAL, EDGE_VERTICAL, EDGE_ALL, ERRATA_NONE, ERRATA_STRETCH_FLEX_BASIS, ERRATA_ABSOLUTE_POSITION_WITHOUT_INSETS_EXCLUDES_PADDING, ERRATA_ABSOLUTE_PERCENT_AGAINST_INNER_SIZE, ERRATA_ALL, ERRATA_CLASSIC, EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS, FLEX_DIRECTION_COLUMN, FLEX_DIRECTION_COLUMN_REVERSE, FLEX_DIRECTION_ROW, FLEX_DIRECTION_ROW_REVERSE, GUTTER_COLUMN, GUTTER_ROW, GUTTER_ALL, JUSTIFY_FLEX_START, JUSTIFY_CENTER, JUSTIFY_FLEX_END, JUSTIFY_SPACE_BETWEEN, JUSTIFY_SPACE_AROUND, JUSTIFY_SPACE_EVENLY, LOG_LEVEL_ERROR, LOG_LEVEL_WARN, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_VERBOSE, LOG_LEVEL_FATAL, MEASURE_MODE_UNDEFINED, MEASURE_MODE_EXACTLY, MEASURE_MODE_AT_MOST, NODE_TYPE_DEFAULT, NODE_TYPE_TEXT, OVERFLOW_VISIBLE, OVERFLOW_HIDDEN, OVERFLOW_SCROLL, POSITION_TYPE_STATIC, POSITION_TYPE_RELATIVE, POSITION_TYPE_ABSOLUTE, UNIT_UNDEFINED, UNIT_POINT, UNIT_PERCENT, UNIT_AUTO, WRAP_NO_WRAP, WRAP_WRAP, WRAP_WRAP_REVERSE, Config, Node, exports_yoga, yoga_default };
 
-//# debugId=7DC0036015F75D5364756E2164756E21
-//# sourceMappingURL=index-x7n320jr.js.map
+//# debugId=ABFD53867F2F7F9C64756E2164756E21
+//# sourceMappingURL=index-za1krqsf.js.map