@autochitect/engine 1.1.5 → 1.1.7

package/index.browser.mjs

@@ -82,21 +82,29 @@ export async function createEngine(wasmSource) {
   const memoryRef = { current: null };
   const imports = { wasi_snapshot_preview1: buildWasiImports(memoryRef) };
 
-  let bytes;
-  if (wasmSource instanceof ArrayBuffer || ArrayBuffer.isView(wasmSource)) {
-    bytes = wasmSource;
-  } else if (wasmSource instanceof Response || (typeof wasmSource === 'object' && typeof wasmSource.then === 'function')) {
-    const response = await wasmSource;
-    bytes = await response.arrayBuffer();
-  } else if (wasmSource instanceof URL) {
-    bytes = await (await fetch(wasmSource)).arrayBuffer();
-  } else if (typeof wasmSource === 'string') {
-    bytes = await (await fetch(wasmSource)).arrayBuffer();
-  } else {
-    throw new Error('wasmSource must be a URL, URL string, Response, or ArrayBuffer');
+  if (wasmSource == null) {
+    wasmSource = new URL('./engine.wasm', import.meta.url);
   }
 
-  const { instance } = await WebAssembly.instantiate(bytes, imports);
+  let instance;
+  if (wasmSource instanceof WebAssembly.Module) {
+    instance = await WebAssembly.instantiate(wasmSource, imports);
+  } else {
+    let bytes;
+    if (wasmSource instanceof ArrayBuffer || ArrayBuffer.isView(wasmSource)) {
+      bytes = wasmSource;
+    } else if (wasmSource instanceof Response || (typeof wasmSource === 'object' && typeof wasmSource.then === 'function')) {
+      const response = await wasmSource;
+      bytes = await response.arrayBuffer();
+    } else if (wasmSource instanceof URL) {
+      bytes = await (await fetch(wasmSource)).arrayBuffer();
+    } else if (typeof wasmSource === 'string') {
+      bytes = await (await fetch(wasmSource)).arrayBuffer();
+    } else {
+      throw new Error('wasmSource must be a WebAssembly.Module, URL, URL string, Response, or ArrayBuffer');
+    }
+    ({ instance } = await WebAssembly.instantiate(bytes, imports));
+  }
   memoryRef.current = instance.exports.memory;
 
   function writeString(str) {

package/index.d.ts

@@ -24,4 +24,4 @@ export interface Engine {
   estimate(source: string, inputs?: Record<string, unknown> | object, options?: EstimateOptions): EstimateResult;
 }
 
-export function createEngine(wasmSource?: string | URL | Response | ArrayBuffer): Promise<Engine>;
+export function createEngine(wasmSource?: string | URL | Response | ArrayBuffer | WebAssembly.Module): Promise<Engine>;

package/index.mjs

@@ -89,40 +89,44 @@ export async function createEngine(wasmSource) {
     wasmSource = join(dirname(fileURLToPath(import.meta.url)), 'engine.wasm');
   }
 
-  let bytes;
-  if (wasmSource instanceof ArrayBuffer || ArrayBuffer.isView(wasmSource)) {
-    bytes = wasmSource;
-  } else if (wasmSource instanceof Response || (typeof wasmSource === 'object' && typeof wasmSource.then === 'function')) {
-    const response = await wasmSource;
-    bytes = await response.arrayBuffer();
-  } else if (wasmSource instanceof URL) {
-    if (wasmSource.protocol === 'file:') {
-      const fs = await import('fs');
-      bytes = fs.readFileSync(wasmSource);
-    } else {
-      bytes = await (await fetch(wasmSource)).arrayBuffer();
-    }
-  } else if (typeof wasmSource === 'string') {
-    const isFilePath = wasmSource.startsWith('/') || wasmSource.startsWith('./') || wasmSource.startsWith('../') || wasmSource.startsWith('file://') || /^[a-zA-Z]:\\/.test(wasmSource);
-    if (isFilePath && typeof globalThis.process !== 'undefined') {
-      const fs = await import('fs');
-      if (wasmSource.startsWith('file://')) {
-        const { fileURLToPath } = await import('url');
-        bytes = fs.readFileSync(fileURLToPath(wasmSource));
+  let instance;
+  if (wasmSource instanceof WebAssembly.Module) {
+    instance = await WebAssembly.instantiate(wasmSource, imports);
+  } else {
+    let bytes;
+    if (wasmSource instanceof ArrayBuffer || ArrayBuffer.isView(wasmSource)) {
+      bytes = wasmSource;
+    } else if (wasmSource instanceof Response || (typeof wasmSource === 'object' && typeof wasmSource.then === 'function')) {
+      const response = await wasmSource;
+      bytes = await response.arrayBuffer();
+    } else if (wasmSource instanceof URL) {
+      if (wasmSource.protocol === 'file:') {
+        const fs = await import('fs');
+        bytes = fs.readFileSync(wasmSource);
       } else {
+        bytes = await (await fetch(wasmSource)).arrayBuffer();
+      }
+    } else if (typeof wasmSource === 'string') {
+      const isFilePath = wasmSource.startsWith('/') || wasmSource.startsWith('./') || wasmSource.startsWith('../') || wasmSource.startsWith('file://') || /^[a-zA-Z]:\\/.test(wasmSource);
+      if (isFilePath && typeof globalThis.process !== 'undefined') {
+        const fs = await import('fs');
+        if (wasmSource.startsWith('file://')) {
+          const { fileURLToPath } = await import('url');
+          bytes = fs.readFileSync(fileURLToPath(wasmSource));
+        } else {
+          bytes = fs.readFileSync(wasmSource);
+        }
+      } else if (typeof fetch !== 'undefined') {
+        bytes = await (await fetch(wasmSource)).arrayBuffer();
+      } else {
+        const fs = await import('fs');
         bytes = fs.readFileSync(wasmSource);
       }
-    } else if (typeof fetch !== 'undefined') {
-      bytes = await (await fetch(wasmSource)).arrayBuffer();
     } else {
-      const fs = await import('fs');
-      bytes = fs.readFileSync(wasmSource);
+      throw new Error('wasmSource must be a WebAssembly.Module, URL, URL string, file path, Response, or ArrayBuffer');
     }
-  } else {
-    throw new Error('wasmSource must be a URL, URL string, file path, Response, or ArrayBuffer');
+    ({ instance } = await WebAssembly.instantiate(bytes, imports));
   }
-
-  const { instance } = await WebAssembly.instantiate(bytes, imports);
   memoryRef.current = instance.exports.memory;
 
   function writeString(str) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autochitect/engine",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "A 245KB WebAssembly financial modeling engine. Define cost models in a purpose-built DSL, get instant estimates with full dependency tracing. No server required.",
   "license": "MIT",
   "type": "module",