@mirascript/wasm 0.1.17 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirascript/wasm",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "author": "CloudPSS",
   "license": "MIT",
   "description": "MiraScript compiler for WebAssembly",

package/src/index.ts

@@ -4,14 +4,17 @@ import type { Config, InputMode, DiagnosticPositionEncoding, ScriptInput } from
 export type { WasmCompileResult, WasmConfig };
 
 export let wasm: typeof import('../lib/wasm.js');
-export const ready = Promise.all([import('../lib/wasm.js'), import('@mirascript/wasm/loader')]).then(
-    async ([_wasm, { module }]) => {
-        wasm = _wasm;
-        await wasm.default({
-            module_or_path: await module,
-        });
-    },
-);
+
+const module = import('@mirascript/wasm/loader').then(async ({ module }) => module);
+
+// 避免 vite 打包时出错
+void import('../lib/wasm.js').then(async (mod) => {
+    mod.initSync({ module: await module });
+    wasm = mod;
+});
+export const ready = module.then(async () => {
+    await new Promise<void>((resolve) => setTimeout(resolve, 1));
+});
 
 /** 创建可重用的配置 */
 export function createConfig(config?: Config | WasmConfig): WasmConfig {

package/src/loader/node.ts

@@ -1,5 +1,4 @@
 import fs from 'node:fs/promises';
-import type { InitInput } from '../../lib/wasm.js';
 
 const file = /* @__PURE__ */ new URL('../../lib/wasm_bg.wasm', import.meta.url);
-export const module: Promise<InitInput> = /* @__PURE__ */ fs.readFile(file);
+export const module: Promise<BufferSource> = /* @__PURE__ */ fs.readFile(file);

package/src/loader/web.ts

@@ -1,34 +1,43 @@
-import type { InitInput } from '../../lib/wasm.js';
-
 /** 回退加载 */
 async function loadFallback() {
     const fallbackUrl =
         (document?.currentScript instanceof HTMLScriptElement
             ? document.currentScript.src
             : (document.currentScript?.href?.baseVal ?? '')) || document.location.href;
-    return await fetch(new URL('../../lib/wasm_bg.wasm', fallbackUrl));
+    return await body(fetch(new URL('../../lib/wasm_bg.wasm', fallbackUrl)));
+}
+
+/** 获取模块的响应体 */
+async function body(response: Response | Promise<Response>): Promise<BufferSource> {
+    const resp = await response;
+    if (resp.ok) {
+        return await resp.arrayBuffer();
+    } else {
+        throw new Error(`Failed to fetch wasm module: ${resp.status} ${resp.statusText}`);
+    }
 }
 
 /** 加载模块 */
-async function loadMod(mod: unknown): Promise<InitInput> {
+async function loadMod(mod: unknown): Promise<BufferSource> {
     if (mod && typeof mod == 'object' && 'default' in mod) {
         return loadMod(mod.default);
     }
     if (typeof mod == 'string' && mod.startsWith('data:')) {
-        return fetch(mod);
+        return await body(fetch(mod));
+    }
+    if (mod instanceof Response) {
+        return await body(mod);
+    }
+    if (ArrayBuffer.isView(mod) || mod instanceof ArrayBuffer) {
+        return mod as ArrayBuffer;
     }
-    if (
-        mod instanceof Response ||
-        ArrayBuffer.isView(mod) ||
-        mod instanceof ArrayBuffer ||
-        mod instanceof WebAssembly.Module
-    ) {
-        return mod;
+    if (mod instanceof WebAssembly.Module) {
+        return mod as unknown as BufferSource;
     }
     throw new Error('Failed to load wasm module');
 }
 
-export const module: Promise<InitInput> = /* @__PURE__ */ (async () => {
+export const module: Promise<BufferSource> = /* @__PURE__ */ (async () => {
     try {
         // use ?url to force vite to load as bytes
         // https://github.com/vitejs/vite/issues/12366
@@ -37,7 +46,7 @@ export const module: Promise<InitInput> = /* @__PURE__ */ (async () => {
         if (!import.meta.url) {
             return await loadFallback();
         } else {
-            return await fetch(new URL('../../lib/wasm_bg.wasm?url', import.meta.url));
+            return await body(fetch(new URL('../../lib/wasm_bg.wasm?url', import.meta.url)));
         }
     }
 })();