Update GH action

Author: johnsamuelwrites

public/generated/automate_packed_runtime.mjs

@@ -1,26 +1,49 @@
-import { createWasiImports } from "./automate_packed/host_shim.mjs";
+function createImportValue(entry, memoryRef, outputCallback) {
+  if (entry.kind === "function") {
+    return () => 0;
+  }
+  if (entry.kind === "memory") {
+    const memory = new WebAssembly.Memory({ initial: 16 });
+    memoryRef.current = memory;
+    return memory;
+  }
+  if (entry.kind === "table") {
+    return new WebAssembly.Table({ initial: 0, element: "anyfunc" });
+  }
+  if (entry.kind === "global") {
+    return new WebAssembly.Global({ value: "i32", mutable: true }, 0);
+  }
+  outputCallback(`Unsupported WASM import kind: ${entry.kind}`);
+  return undefined;
+}
+
+function createImportObject(module, memoryRef, outputCallback) {
+  const imports = {};
+  for (const entry of WebAssembly.Module.imports(module)) {
+    if (!imports[entry.module]) {
+      imports[entry.module] = {};
+    }
+    imports[entry.module][entry.name] = createImportValue(entry, memoryRef, outputCallback);
+  }
+  return imports;
+}
 
 export async function loadAutomaginariumPacked(options = {}) {
   const wasmUrl = options.wasmUrl || new URL("./automate_packed/module.wasm", import.meta.url);
   const memoryRef = { current: null };
-  const imports = {
-    ...createWasiImports(memoryRef, options.outputCallback || (() => {})),
-  };
+  const outputCallback = options.outputCallback || (() => {});
 
-  let instance;
+  let module;
   if (options.bytes) {
-    const result = await WebAssembly.instantiate(options.bytes, imports);
-    instance = result.instance;
-  } else if (typeof WebAssembly.instantiateStreaming === "function") {
-    const result = await WebAssembly.instantiateStreaming(fetch(wasmUrl), imports);
-    instance = result.instance;
+    module = await WebAssembly.compile(options.bytes);
   } else {
     const response = await fetch(wasmUrl);
     const bytes = await response.arrayBuffer();
-    const result = await WebAssembly.instantiate(bytes, imports);
-    instance = result.instance;
+    module = await WebAssembly.compile(bytes);
   }
 
+  const imports = createImportObject(module, memoryRef, outputCallback);
+  const instance = await WebAssembly.instantiate(module, imports);
   memoryRef.current = instance.exports.memory || memoryRef.current;
   return instance.exports;
 }

tests/stage5-static.js

@@ -32,7 +32,8 @@ function testRuntimeLoaderIsCommitted() {
   assert(fs.existsSync(path.join(root, "public/generated/automate_packed_runtime.mjs")));
   const loader = read("public/generated/automate_packed_runtime.mjs");
   assert(loader.includes("./automate_packed/module.wasm"));
-  assert(loader.includes("./automate_packed/host_shim.mjs"));
+  assert(loader.includes("WebAssembly.Module.imports"));
+  assert(loader.includes("createImportObject"));
 }
 
 testPagesEntrypoints();