Maybe fix

Author: dsherret

deno.json

@@ -26,7 +26,7 @@
     "test:js-ext": "deno task test:main --js-ext mjs --out lib_out_js_file && cat tests/lib_out_js_file/deno_test.mjs > /dev/null",
     "test:check": "deno task test:main --check",
     "test:inline": "deno task test:main --inline --out lib_inline",
-    "test:start": "cd tests && deno run -A ../main.ts -p deno_test --features start && deno test -A test.ts"
+    "test:start": "cd tests && deno run -A ../main.ts -p deno_test --features start && USES_START=1 deno test -A test.ts"
   },
   "imports": {
     "@david/path": "jsr:@david/path@^0.2.0",

lib/wasmbuild_bg.js

@@ -8,14 +8,6 @@ export function __wbg_set_wasm(val) {
   wasm = val;
 }
 
-const heap = new Array(128).fill(undefined);
-
-heap.push(undefined, null, true, false);
-
-function getObject(idx) {
-  return heap[idx];
-}
-
 let WASM_VECTOR_LEN = 0;
 
 let cachedUint8ArrayMemory0 = null;
@@ -100,17 +92,6 @@ function getDataViewMemory0() {
   return cachedDataViewMemory0;
 }
 
-let heap_next = heap.length;
-
-function addHeapObject(obj) {
-  if (heap_next === heap.length) heap.push(heap.length + 1);
-  const idx = heap_next;
-  heap_next = heap[idx];
-
-  heap[idx] = obj;
-  return idx;
-}
-
 const lTextDecoder = typeof TextDecoder === "undefined"
   ? (0, module.require)("util").TextDecoder
   : TextDecoder;
@@ -129,62 +110,48 @@ function getStringFromWasm0(ptr, len) {
   );
 }
 
-function dropObject(idx) {
-  if (idx < 132) return;
-  heap[idx] = heap_next;
-  heap_next = idx;
-}
-
-function takeObject(idx) {
-  const ret = getObject(idx);
-  dropObject(idx);
-  return ret;
-}
-
 function passArray8ToWasm0(arg, malloc) {
   const ptr = malloc(arg.length * 1, 1) >>> 0;
   getUint8ArrayMemory0().set(arg, ptr / 1);
   WASM_VECTOR_LEN = arg.length;
   return ptr;
 }
+
+function takeFromExternrefTable0(idx) {
+  const value = wasm.__wbindgen_export_2.get(idx);
+  wasm.__externref_table_dealloc(idx);
+  return value;
+}
 /**
  * @param {string} name
  * @param {string} ext
  * @param {Uint8Array} wasm_bytes
  * @returns {any}
  */
 export function generate_bindgen(name, ext, wasm_bytes) {
-  try {
-    const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-    const ptr0 = passStringToWasm0(
-      name,
-      wasm.__wbindgen_malloc,
-      wasm.__wbindgen_realloc,
-    );
-    const len0 = WASM_VECTOR_LEN;
-    const ptr1 = passStringToWasm0(
-      ext,
-      wasm.__wbindgen_malloc,
-      wasm.__wbindgen_realloc,
-    );
-    const len1 = WASM_VECTOR_LEN;
-    const ptr2 = passArray8ToWasm0(wasm_bytes, wasm.__wbindgen_malloc);
-    const len2 = WASM_VECTOR_LEN;
-    wasm.generate_bindgen(retptr, ptr0, len0, ptr1, len1, ptr2, len2);
-    var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-    var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-    var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-    if (r2) {
-      throw takeObject(r1);
-    }
-    return takeObject(r0);
-  } finally {
-    wasm.__wbindgen_add_to_stack_pointer(16);
+  const ptr0 = passStringToWasm0(
+    name,
+    wasm.__wbindgen_malloc,
+    wasm.__wbindgen_realloc,
+  );
+  const len0 = WASM_VECTOR_LEN;
+  const ptr1 = passStringToWasm0(
+    ext,
+    wasm.__wbindgen_malloc,
+    wasm.__wbindgen_realloc,
+  );
+  const len1 = WASM_VECTOR_LEN;
+  const ptr2 = passArray8ToWasm0(wasm_bytes, wasm.__wbindgen_malloc);
+  const len2 = WASM_VECTOR_LEN;
+  const ret = wasm.generate_bindgen(ptr0, len0, ptr1, len1, ptr2, len2);
+  if (ret[2]) {
+    throw takeFromExternrefTable0(ret[1]);
   }
+  return takeFromExternrefTable0(ret[0]);
 }
 
 export function __wbg_String_8f0eb39a4a4c2f66(arg0, arg1) {
-  const ret = String(getObject(arg1));
+  const ret = String(arg1);
   const ptr1 = passStringToWasm0(
     ret,
     wasm.__wbindgen_malloc,
@@ -197,64 +164,65 @@ export function __wbg_String_8f0eb39a4a4c2f66(arg0, arg1) {
 
 export function __wbg_new_405e22f390576ce2() {
   const ret = new Object();
-  return addHeapObject(ret);
+  return ret;
 }
 
 export function __wbg_new_5e0be73521bc8c17() {
   const ret = new Map();
-  return addHeapObject(ret);
+  return ret;
 }
 
 export function __wbg_new_78feb108b6472713() {
   const ret = new Array();
-  return addHeapObject(ret);
+  return ret;
 }
 
 export function __wbg_new_c68d7209be747379(arg0, arg1) {
   const ret = new Error(getStringFromWasm0(arg0, arg1));
-  return addHeapObject(ret);
+  return ret;
 }
 
 export function __wbg_set_37837023f3d740e8(arg0, arg1, arg2) {
-  getObject(arg0)[arg1 >>> 0] = takeObject(arg2);
+  arg0[arg1 >>> 0] = arg2;
 }
 
 export function __wbg_set_3f1d0b984ed272ed(arg0, arg1, arg2) {
-  getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
+  arg0[arg1] = arg2;
 }
 
 export function __wbg_set_8fc6bf8a5b1071d1(arg0, arg1, arg2) {
-  const ret = getObject(arg0).set(getObject(arg1), getObject(arg2));
-  return addHeapObject(ret);
+  const ret = arg0.set(arg1, arg2);
+  return ret;
 }
 
 export function __wbindgen_error_new(arg0, arg1) {
   const ret = new Error(getStringFromWasm0(arg0, arg1));
-  return addHeapObject(ret);
+  return ret;
+}
+
+export function __wbindgen_init_externref_table() {
+  const table = wasm.__wbindgen_export_2;
+  const offset = table.grow(4);
+  table.set(0, undefined);
+  table.set(offset + 0, undefined);
+  table.set(offset + 1, null);
+  table.set(offset + 2, true);
+  table.set(offset + 3, false);
 }
 
 export function __wbindgen_is_string(arg0) {
-  const ret = typeof (getObject(arg0)) === "string";
+  const ret = typeof arg0 === "string";
   return ret;
 }
 
 export function __wbindgen_number_new(arg0) {
   const ret = arg0;
-  return addHeapObject(ret);
-}
-
-export function __wbindgen_object_clone_ref(arg0) {
-  const ret = getObject(arg0);
-  return addHeapObject(ret);
-}
-
-export function __wbindgen_object_drop_ref(arg0) {
-  takeObject(arg0);
+  return ret;
 }
 
 export function __wbindgen_string_new(arg0, arg1) {
   const ret = getStringFromWasm0(arg0, arg1);
-  return addHeapObject(ret);
+  return ret;
 }
 
 export function __wbindgen_throw(arg0, arg1) {

lib/wasmbuild_bg.wasm

@@ -3,13 +3,9 @@ import * as wasm from "./lib/deno_test.js";
 import * as wasm2 from "./lib_inline/deno_test.js";
 
 Deno.test("test works export", () => {
-  function hasStart() {
-    return Deno.readTextFileSync(import.meta.dirname + "/lib/deno_test.js")
-      .includes("__wbindgen_start");
-  }
   assertEquals(
     wasm.greet("Deno"),
-    hasStart() ? "Hello, Deno! Result: 4" : "Hello, Deno! Result: 3",
+    Deno.env.get("USES_START") ? "Hello, Deno! Result: 4" : "Hello, Deno! Result: 3",
   );
 });