@mirascript/wasm 0.1.47 → 0.1.49

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

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

package/dist/loader/web.js

@@ -1,48 +1,60 @@
 /** 从 Document 推断 URL */
-async function load4() {
+async function loadDocument() {
     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 推断 URL */
-async function load2() {
+async function loadUrl() {
     return await body(fetch(new URL('../../lib/wasm_bg.wasm', import.meta.url)));
 }
-/** 从 import.meta.resolve 推断 URL */
-async function load3() {
-    return await body(fetch(new URL(import.meta.resolve('../../lib/wasm_bg.wasm'))));
-}
 /** 由 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');
-    }
+async function loadEsm() {
     // 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);
+    const m = await import('../../lib/wasm_bg.wasm?url', { with: { type: 'bytes' } });
+    return await mod(m);
+}
+/** 由 esm.sh 加载模块 */
+async function loadEsmSh() {
+    const url = new URL(import.meta.url);
+    const { pathname } = url;
+    if (!pathname.includes('/@mirascript/wasm')) {
+        throw new Error('Not loaded from esm.sh');
+    }
+    const segments = pathname.split('/');
+    let newUrl = url.origin;
+    for (let i = 0; i < segments.length; i++) {
+        const segment = segments[i];
+        newUrl += segment + '/';
+        if (i >= 1 && segments[i - 1] === '@mirascript' && (segment === 'wasm' || segment?.startsWith('wasm@'))) {
+            break;
+        }
+    }
+    newUrl += 'lib/wasm_bg.wasm';
+    return await body(fetch(newUrl));
+}
+/** 加载模块 */
+async function mod(m) {
+    if (m && typeof m == 'object' && 'default' in m) {
+        return mod(m.default);
+    }
+    if (m instanceof URL ||
+        (typeof m == 'string' &&
+            (m.startsWith('data:') || m.startsWith('http:') || m.startsWith('https:') || m.startsWith('//')))) {
+        return await body(fetch(m));
+    }
+    if (m instanceof Response) {
+        return await body(m);
+    }
+    if (ArrayBuffer.isView(m) || m instanceof ArrayBuffer) {
+        return m;
+    }
+    if (m instanceof WebAssembly.Module) {
+        return m;
+    }
+    throw new Error('Failed to load wasm module');
 }
 /** 获取模块的响应体 */
 async function body(response) {
@@ -55,9 +67,18 @@ async function body(response) {
     }
 }
 export const module = /* @__PURE__ */ (async () => {
-    return load1()
-        .catch(async () => load2())
-        .catch(async () => load3())
-        .catch(async () => load4());
+    const candidates = [loadEsmSh, loadEsm, loadUrl, loadDocument];
+    for (const candidate of candidates) {
+        try {
+            const mod = await candidate();
+            if (mod == null)
+                continue;
+            return mod;
+        }
+        catch {
+            // ignore
+        }
+    }
+    throw new Error('Failed to load wasm module');
 })();
 //# 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":"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"}
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/loader/web.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirascript/wasm",
-  "version": "0.1.47",
+  "version": "0.1.49",
   "author": "CloudPSS",
   "license": "MIT",
   "description": "MiraScript compiler for WebAssembly",
@@ -18,7 +18,7 @@
   "devDependencies": {
     "@types/node": "^25.2.3",
     "nodemon": "^3.1.11",
-    "@mirascript/constants": "~0.1.47"
+    "@mirascript/constants": "~0.1.49"
   },
   "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 @@
 /** 从 Document 推断 URL */
-async function load4() {
+async function loadDocument() {
     const fallbackUrl =
         (document?.currentScript instanceof HTMLScriptElement
             ? document.currentScript.src
@@ -8,48 +8,60 @@ async function load4() {
 }
 
 /** 从 import.meta.url 推断 URL */
-async function load2() {
+async function loadUrl() {
     return await body(fetch(new URL('../../lib/wasm_bg.wasm', import.meta.url)));
 }
 
-/** 从 import.meta.resolve 推断 URL */
-async function load3() {
-    return await body(fetch(new URL(import.meta.resolve('../../lib/wasm_bg.wasm'))));
+/** 由 esm 加载模块 */
+async function loadEsm() {
+    // use ?url to force vite to load as bytes
+    // https://github.com/vitejs/vite/issues/12366
+    const m: unknown = await import('../../lib/wasm_bg.wasm?url', { with: { type: 'bytes' } });
+    return await mod(m);
 }
 
-/** 由 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;
+/** 由 esm.sh 加载模块 */
+async function loadEsmSh() {
+    const url = new URL(import.meta.url);
+    const { pathname } = url;
+    if (!pathname.includes('/@mirascript/wasm')) {
+        throw new Error('Not loaded from esm.sh');
+    }
+    const segments = pathname.split('/');
+    let newUrl = url.origin;
+    for (let i = 0; i < segments.length; i++) {
+        const segment = segments[i]!;
+        newUrl += segment + '/';
+        if (i >= 1 && segments[i - 1] === '@mirascript' && (segment === 'wasm' || segment?.startsWith('wasm@'))) {
+            break;
         }
-        throw new Error('Failed to load wasm module');
     }
+    newUrl += 'lib/wasm_bg.wasm';
+    return await body(fetch(newUrl));
+}
 
-    // 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 mod(m: unknown): Promise<BufferSource> {
+    if (m && typeof m == 'object' && 'default' in m) {
+        return mod(m.default);
+    }
+    if (
+        m instanceof URL ||
+        (typeof m == 'string' &&
+            (m.startsWith('data:') || m.startsWith('http:') || m.startsWith('https:') || m.startsWith('//')))
+    ) {
+        return await body(fetch(m));
+    }
+    if (m instanceof Response) {
+        return await body(m);
+    }
+    if (ArrayBuffer.isView(m) || m instanceof ArrayBuffer) {
+        return m as ArrayBuffer;
+    }
+    if (m instanceof WebAssembly.Module) {
+        return m as unknown as BufferSource;
+    }
+    throw new Error('Failed to load wasm module');
 }
 
 /** 获取模块的响应体 */
@@ -63,8 +75,15 @@ async function body(response: Response | Promise<Response>): Promise<BufferSourc
 }
 
 export const module: Promise<BufferSource> = /* @__PURE__ */ (async () => {
-    return load1()
-        .catch(async () => load2())
-        .catch(async () => load3())
-        .catch(async () => load4());
+    const candidates = [loadEsmSh, loadEsm, loadUrl, loadDocument];
+    for (const candidate of candidates) {
+        try {
+            const mod = await candidate();
+            if (mod == null) continue;
+            return mod;
+        } catch {
+            // ignore
+        }
+    }
+    throw new Error('Failed to load wasm module');
 })();