@mirascript/wasm 0.1.39 → 0.1.41

package/dist/loader/web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../src/loader/web.ts"],"names":[],"mappings":"AAuCA,eAAO,MAAM,MAAM,EAAE,OAAO,CAAC,YAAY,CAYrC,CAAC"}
+{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../src/loader/web.ts"],"names":[],"mappings":"AA2DA,eAAO,MAAM,MAAM,EAAE,OAAO,CAAC,YAAY,CAIrC,CAAC"}

package/dist/loader/web.js

@@ -1,10 +1,45 @@
-/** 回退加载 */
-async function loadFallback() {
+/** 从 Document 推断 URL */
+async function load3() {
     const fallbackUrl = (document?.currentScript instanceof HTMLScriptElement
         ? document.currentScript.src
         : (document.currentScript?.href?.baseVal ?? '')) || document.location.href;
     return await body(fetch(new URL('../../lib/wasm_bg.wasm', fallbackUrl)));
 }
+/** 从 import.meta 推断 URL */
+async function load2() {
+    return await body(fetch(new URL('../../lib/wasm_bg.wasm', import.meta.url)));
+}
+/** 由 esm 加载模块 */
+async function load1() {
+    /** 加载模块 */
+    async function loadMod(mod) {
+        if (mod && typeof mod == 'object' && 'default' in mod) {
+            return loadMod(mod.default);
+        }
+        if (mod instanceof URL ||
+            (typeof mod == 'string' &&
+                (mod.startsWith('data:') ||
+                    mod.startsWith('http:') ||
+                    mod.startsWith('https:') ||
+                    mod.startsWith('//')))) {
+            return await body(fetch(mod));
+        }
+        if (mod instanceof Response) {
+            return await body(mod);
+        }
+        if (ArrayBuffer.isView(mod) || mod instanceof ArrayBuffer) {
+            return mod;
+        }
+        if (mod instanceof WebAssembly.Module) {
+            return mod;
+        }
+        throw new Error('Failed to load wasm module');
+    }
+    // use ?url to force vite to load as bytes
+    // https://github.com/vitejs/vite/issues/12366
+    const mod = await import('../../lib/wasm_bg.wasm?url', { with: { type: 'bytes' } });
+    return await loadMod(mod);
+}
 /** 获取模块的响应体 */
 async function body(response) {
     const resp = await response;
@@ -15,38 +50,9 @@ async function body(response) {
         throw new Error(`Failed to fetch wasm module: ${resp.status} ${resp.statusText}`);
     }
 }
-/** 加载模块 */
-async function loadMod(mod) {
-    if (mod && typeof mod == 'object' && 'default' in mod) {
-        return loadMod(mod.default);
-    }
-    if (typeof mod == 'string' && mod.startsWith('data:')) {
-        return await body(fetch(mod));
-    }
-    if (mod instanceof Response) {
-        return await body(mod);
-    }
-    if (ArrayBuffer.isView(mod) || mod instanceof ArrayBuffer) {
-        return mod;
-    }
-    if (mod instanceof WebAssembly.Module) {
-        return mod;
-    }
-    throw new Error('Failed to load wasm module');
-}
 export const module = /* @__PURE__ */ (async () => {
-    try {
-        // use ?url to force vite to load as bytes
-        // https://github.com/vitejs/vite/issues/12366
-        return await loadMod(await import('../../lib/wasm_bg.wasm?url', { with: { type: 'bytes' } }));
-    }
-    catch {
-        if (!import.meta.url) {
-            return await loadFallback();
-        }
-        else {
-            return await body(fetch(new URL('../../lib/wasm_bg.wasm?url', import.meta.url)));
-        }
-    }
+    return load1()
+        .catch(async () => load2())
+        .catch(async () => load3());
 })();
 //# sourceMappingURL=web.js.map

package/dist/loader/web.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/loader/web.ts"],"names":[],"mappings":"AAAA,WAAW;AACX,KAAK,UAAU,YAAY;IACvB,MAAM,WAAW,GACb,CAAC,QAAQ,EAAE,aAAa,YAAY,iBAAiB;QACjD,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG;QAC5B,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;IACnF,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,wBAAwB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED,eAAe;AACf,KAAK,UAAU,IAAI,CAAC,QAAsC;IACtD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC;IAC5B,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;QACV,OAAO,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;IACpC,CAAC;SAAM,CAAC;QACJ,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IACtF,CAAC;AACL,CAAC;AAED,WAAW;AACX,KAAK,UAAU,OAAO,CAAC,GAAY;IAC/B,IAAI,GAAG,IAAI,OAAO,GAAG,IAAI,QAAQ,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;QACpD,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IACD,IAAI,OAAO,GAAG,IAAI,QAAQ,IAAI,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAClC,CAAC;IACD,IAAI,GAAG,YAAY,QAAQ,EAAE,CAAC;QAC1B,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,YAAY,WAAW,EAAE,CAAC;QACxD,OAAO,GAAkB,CAAC;IAC9B,CAAC;IACD,IAAI,GAAG,YAAY,WAAW,CAAC,MAAM,EAAE,CAAC;QACpC,OAAO,GAA8B,CAAC;IAC1C,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAA0B,eAAe,CAAC,CAAC,KAAK,IAAI,EAAE;IACrE,IAAI,CAAC;QACD,0CAA0C;QAC1C,8CAA8C;QAC9C,OAAO,MAAM,OAAO,CAAC,MAAM,MAAM,CAAC,4BAA4B,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IAClG,CAAC;IAAC,MAAM,CAAC;QACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACnB,OAAO,MAAM,YAAY,EAAE,CAAC;QAChC,CAAC;aAAM,CAAC;YACJ,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,4BAA4B,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACrF,CAAC;IACL,CAAC;AACL,CAAC,CAAC,EAAE,CAAC"}
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/loader/web.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,KAAK,UAAU,KAAK;IAChB,MAAM,WAAW,GACb,CAAC,QAAQ,EAAE,aAAa,YAAY,iBAAiB;QACjD,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG;QAC5B,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;IACnF,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,wBAAwB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED,2BAA2B;AAC3B,KAAK,UAAU,KAAK;IAChB,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,wBAAwB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACjF,CAAC;AAED,iBAAiB;AACjB,KAAK,UAAU,KAAK;IAChB,WAAW;IACX,KAAK,UAAU,OAAO,CAAC,GAAY;QAC/B,IAAI,GAAG,IAAI,OAAO,GAAG,IAAI,QAAQ,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;YACpD,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;QACD,IACI,GAAG,YAAY,GAAG;YAClB,CAAC,OAAO,GAAG,IAAI,QAAQ;gBACnB,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC;oBACpB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC;oBACvB,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC;oBACxB,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAChC,CAAC;YACC,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,GAAG,YAAY,QAAQ,EAAE,CAAC;YAC1B,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,YAAY,WAAW,EAAE,CAAC;YACxD,OAAO,GAAkB,CAAC;QAC9B,CAAC;QACD,IAAI,GAAG,YAAY,WAAW,CAAC,MAAM,EAAE,CAAC;YACpC,OAAO,GAA8B,CAAC;QAC1C,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAClD,CAAC;IAED,0CAA0C;IAC1C,8CAA8C;IAC9C,MAAM,GAAG,GAAY,MAAM,MAAM,CAAC,4BAA4B,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IAC7F,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AAED,eAAe;AACf,KAAK,UAAU,IAAI,CAAC,QAAsC;IACtD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC;IAC5B,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;QACV,OAAO,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;IACpC,CAAC;SAAM,CAAC;QACJ,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IACtF,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAA0B,eAAe,CAAC,CAAC,KAAK,IAAI,EAAE;IACrE,OAAO,KAAK,EAAE;SACT,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;SAC1B,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC,EAAE,CAAC"}

package/lib/wasm.d.ts

@@ -80,7 +80,6 @@ export interface InitOutput {
     readonly __wbg_compileresult_free: (a: number, b: number) => void;
     readonly __wbg_monacocompiler_free: (a: number, b: number) => void;
     readonly compile: (a: number, b: number, c: number) => number;
-    readonly compile_buffer: (a: number, b: number, c: number) => number;
     readonly compileresult_chunk: (a: number, b: number) => void;
     readonly compileresult_diagnostics: (a: number, b: number) => void;
     readonly main: () => void;
@@ -89,6 +88,7 @@ export interface InitOutput {
     readonly monacocompiler_format: (a: number, b: number) => void;
     readonly monacocompiler_new: (a: number, b: number, c: number) => number;
     readonly monacocompiler_parse: (a: number) => number;
+    readonly compile_buffer: (a: number, b: number, c: number) => number;
     readonly __wbg_config_free: (a: number, b: number) => void;
     readonly __wbg_get_config_diagnostic_error: (a: number) => number;
     readonly __wbg_get_config_diagnostic_hint: (a: number) => number;

package/lib/wasm.js

@@ -350,7 +350,7 @@ export function compile_buffer(script, config) {
     const ptr0 = passArray8ToWasm0(script, wasm.__wbindgen_export2);
     const len0 = WASM_VECTOR_LEN;
     _assertClass(config, Config);
-    const ret = wasm.compile_buffer(ptr0, len0, config.__wbg_ptr);
+    const ret = wasm.compile(ptr0, len0, config.__wbg_ptr);
     return CompileResult.__wrap(ret);
 }
 

package/lib/wasm_bg.wasm.d.ts

@@ -4,7 +4,6 @@ export const memory: WebAssembly.Memory;
 export const __wbg_compileresult_free: (a: number, b: number) => void;
 export const __wbg_monacocompiler_free: (a: number, b: number) => void;
 export const compile: (a: number, b: number, c: number) => number;
-export const compile_buffer: (a: number, b: number, c: number) => number;
 export const compileresult_chunk: (a: number, b: number) => void;
 export const compileresult_diagnostics: (a: number, b: number) => void;
 export const main: () => void;
@@ -13,6 +12,7 @@ export const monacocompiler_emit: (a: number, b: number) => void;
 export const monacocompiler_format: (a: number, b: number) => void;
 export const monacocompiler_new: (a: number, b: number, c: number) => number;
 export const monacocompiler_parse: (a: number) => number;
+export const compile_buffer: (a: number, b: number, c: number) => number;
 export const __wbg_config_free: (a: number, b: number) => void;
 export const __wbg_get_config_diagnostic_error: (a: number) => number;
 export const __wbg_get_config_diagnostic_hint: (a: number) => number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirascript/wasm",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "author": "CloudPSS",
   "license": "MIT",
   "description": "MiraScript compiler for WebAssembly",
@@ -16,9 +16,9 @@
     }
   },
   "devDependencies": {
-    "@types/node": "^25.0.9",
+    "@types/node": "^25.0.10",
     "nodemon": "^3.1.11",
-    "@mirascript/constants": "~0.1.39"
+    "@mirascript/constants": "~0.1.41"
   },
   "scripts": {
     "wasm": "wasm-pack build --target web --out-dir ../../packages/wasm/lib --no-pack ../../crates/wasm",

package/src/loader/web.ts

@@ -1,5 +1,5 @@
-/** 回退加载 */
-async function loadFallback() {
+/** 从 Document 推断 URL */
+async function load3() {
     const fallbackUrl =
         (document?.currentScript instanceof HTMLScriptElement
             ? document.currentScript.src
@@ -7,6 +7,46 @@ async function loadFallback() {
     return await body(fetch(new URL('../../lib/wasm_bg.wasm', fallbackUrl)));
 }
 
+/** 从 import.meta 推断 URL */
+async function load2() {
+    return await body(fetch(new URL('../../lib/wasm_bg.wasm', import.meta.url)));
+}
+
+/** 由 esm 加载模块 */
+async function load1() {
+    /** 加载模块 */
+    async function loadMod(mod: unknown): Promise<BufferSource> {
+        if (mod && typeof mod == 'object' && 'default' in mod) {
+            return loadMod(mod.default);
+        }
+        if (
+            mod instanceof URL ||
+            (typeof mod == 'string' &&
+                (mod.startsWith('data:') ||
+                    mod.startsWith('http:') ||
+                    mod.startsWith('https:') ||
+                    mod.startsWith('//')))
+        ) {
+            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 WebAssembly.Module) {
+            return mod as unknown as BufferSource;
+        }
+        throw new Error('Failed to load wasm module');
+    }
+
+    // use ?url to force vite to load as bytes
+    // https://github.com/vitejs/vite/issues/12366
+    const mod: unknown = await import('../../lib/wasm_bg.wasm?url', { with: { type: 'bytes' } });
+    return await loadMod(mod);
+}
+
 /** 获取模块的响应体 */
 async function body(response: Response | Promise<Response>): Promise<BufferSource> {
     const resp = await response;
@@ -17,36 +57,8 @@ async function body(response: Response | Promise<Response>): Promise<BufferSourc
     }
 }
 
-/** 加载模块 */
-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 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 WebAssembly.Module) {
-        return mod as unknown as BufferSource;
-    }
-    throw new Error('Failed to load wasm module');
-}
-
 export const module: Promise<BufferSource> = /* @__PURE__ */ (async () => {
-    try {
-        // use ?url to force vite to load as bytes
-        // https://github.com/vitejs/vite/issues/12366
-        return await loadMod(await import('../../lib/wasm_bg.wasm?url', { with: { type: 'bytes' } }));
-    } catch {
-        if (!import.meta.url) {
-            return await loadFallback();
-        } else {
-            return await body(fetch(new URL('../../lib/wasm_bg.wasm?url', import.meta.url)));
-        }
-    }
+    return load1()
+        .catch(async () => load2())
+        .catch(async () => load3());
 })();