@mirascript/wasm 0.1.5 → 0.1.7

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

@@ -1 +1 @@
-{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../src/loader/web.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAWnD,eAAO,MAAM,MAAM,EAAE,OAAO,CAAC,SAAS,CAKlC,CAAC"}
+{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../src/loader/web.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AA8BnD,eAAO,MAAM,MAAM,EAAE,OAAO,CAAC,SAAS,CAYlC,CAAC"}

package/dist/loader/web.js

@@ -5,10 +5,35 @@ async function loadFallback() {
         : (document.currentScript?.href?.baseVal ?? '')) || document.location.href;
     return await fetch(new URL('../../lib/wasm_bg.wasm', fallbackUrl));
 }
+/** 加载模块 */
+async function loadMod(mod) {
+    if (mod && typeof mod == 'object' && 'default' in mod) {
+        return loadMod(mod.default);
+    }
+    if (typeof mod == 'string' && mod.startsWith('data:')) {
+        return fetch(mod);
+    }
+    if (mod instanceof Response ||
+        ArrayBuffer.isView(mod) ||
+        mod instanceof ArrayBuffer ||
+        mod instanceof WebAssembly.Module) {
+        return mod;
+    }
+    throw new Error('Failed to load wasm module');
+}
 export const module = /* @__PURE__ */ (async () => {
-    if (!import.meta.url) {
-        return await loadFallback();
+    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 fetch(new URL('../../lib/wasm_bg.wasm?url', import.meta.url));
+        }
     }
-    return await fetch(new URL('../../lib/wasm_bg.wasm?url', import.meta.url));
 })();
 //# 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":"AAEA,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,KAAK,CAAC,IAAI,GAAG,CAAC,wBAAwB,EAAE,WAAW,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAuB,eAAe,CAAC,CAAC,KAAK,IAAI,EAAE;IAClE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACnB,OAAO,MAAM,YAAY,EAAE,CAAC;IAChC,CAAC;IACD,OAAO,MAAM,KAAK,CAAC,IAAI,GAAG,CAAC,4BAA4B,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/E,CAAC,CAAC,EAAE,CAAC"}
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/loader/web.ts"],"names":[],"mappings":"AAEA,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,KAAK,CAAC,IAAI,GAAG,CAAC,wBAAwB,EAAE,WAAW,CAAC,CAAC,CAAC;AACvE,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,KAAK,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IACD,IACI,GAAG,YAAY,QAAQ;QACvB,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC;QACvB,GAAG,YAAY,WAAW;QAC1B,GAAG,YAAY,WAAW,CAAC,MAAM,EACnC,CAAC;QACC,OAAO,GAAG,CAAC;IACf,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAuB,eAAe,CAAC,CAAC,KAAK,IAAI,EAAE;IAClE,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,KAAK,CAAC,IAAI,GAAG,CAAC,4BAA4B,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/E,CAAC;IACL,CAAC;AACL,CAAC,CAAC,EAAE,CAAC"}

package/lib/wasm.d.ts

@@ -3,12 +3,12 @@
 export function main(): void;
 export function compile_buffer(script: Uint8Array, config: Config): CompileResult;
 export function compile(script: string, config: Config): CompileResult;
-export function constant_keywords(): string[];
+export function get_diagnostic_message(code: DiagnosticCode): string | undefined;
 export function numeric_keywords(): string[];
-export function reserved_keywords(): string[];
-export function control_keywords(): string[];
 export function keywords(): string[];
-export function get_diagnostic_message(code: DiagnosticCode): string | undefined;
+export function constant_keywords(): string[];
+export function control_keywords(): string[];
+export function reserved_keywords(): string[];
 export enum DiagnosticCode {
   ErrorStart = 1000,
   InternalError = 1001,

package/lib/wasm.js

@@ -183,32 +183,36 @@ export function compile(script, config) {
     return CompileResult.__wrap(ret);
 }
 
-function getArrayJsValueFromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    const mem = getDataViewMemory0();
-    const result = [];
-    for (let i = ptr; i < ptr + 4 * len; i += 4) {
-        result.push(takeObject(mem.getUint32(i, true)));
-    }
-    return result;
-}
 /**
- * @returns {string[]}
+ * @param {DiagnosticCode} code
+ * @returns {string | undefined}
  */
-export function constant_keywords() {
+export function get_diagnostic_message(code) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.constant_keywords(retptr);
+        wasm.get_diagnostic_message(retptr, code);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
-        wasm.__wbindgen_export(r0, r1 * 4, 4);
+        let v1;
+        if (r0 !== 0) {
+            v1 = getStringFromWasm0(r0, r1).slice();
+            wasm.__wbindgen_export(r0, r1 * 1, 1);
+        }
         return v1;
     } finally {
         wasm.__wbindgen_add_to_stack_pointer(16);
     }
 }
 
+function getArrayJsValueFromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    const mem = getDataViewMemory0();
+    const result = [];
+    for (let i = ptr; i < ptr + 4 * len; i += 4) {
+        result.push(takeObject(mem.getUint32(i, true)));
+    }
+    return result;
+}
 /**
  * @returns {string[]}
  */
@@ -229,10 +233,10 @@ export function numeric_keywords() {
 /**
  * @returns {string[]}
  */
-export function reserved_keywords() {
+export function keywords() {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.reserved_keywords(retptr);
+        wasm.keywords(retptr);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
         var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
@@ -246,10 +250,10 @@ export function reserved_keywords() {
 /**
  * @returns {string[]}
  */
-export function control_keywords() {
+export function constant_keywords() {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.control_keywords(retptr);
+        wasm.constant_keywords(retptr);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
         var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
@@ -263,10 +267,10 @@ export function control_keywords() {
 /**
  * @returns {string[]}
  */
-export function keywords() {
+export function control_keywords() {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.keywords(retptr);
+        wasm.control_keywords(retptr);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
         var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
@@ -278,20 +282,16 @@ export function keywords() {
 }
 
 /**
- * @param {DiagnosticCode} code
- * @returns {string | undefined}
+ * @returns {string[]}
  */
-export function get_diagnostic_message(code) {
+export function reserved_keywords() {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.get_diagnostic_message(retptr, code);
+        wasm.reserved_keywords(retptr);
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-        let v1;
-        if (r0 !== 0) {
-            v1 = getStringFromWasm0(r0, r1).slice();
-            wasm.__wbindgen_export(r0, r1 * 1, 1);
-        }
+        var v1 = getArrayJsValueFromWasm0(r0, r1).slice();
+        wasm.__wbindgen_export(r0, r1 * 4, 4);
         return v1;
     } finally {
         wasm.__wbindgen_add_to_stack_pointer(16);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirascript/wasm",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "type": "module",
   "description": "MiraScript compiler for WebAssembly",
   "main": "dist/index.js",

package/src/loader/wasm.d.ts

@@ -0,0 +1,4 @@
+declare module '*.wasm?url' {
+    const value: BufferSource;
+    export default value;
+}

package/src/loader/web.ts

@@ -9,9 +9,35 @@ async function loadFallback() {
     return await fetch(new URL('../../lib/wasm_bg.wasm', fallbackUrl));
 }
 
+/** 加载模块 */
+async function loadMod(mod: unknown): Promise<InitInput> {
+    if (mod && typeof mod == 'object' && 'default' in mod) {
+        return loadMod(mod.default);
+    }
+    if (typeof mod == 'string' && mod.startsWith('data:')) {
+        return fetch(mod);
+    }
+    if (
+        mod instanceof Response ||
+        ArrayBuffer.isView(mod) ||
+        mod instanceof ArrayBuffer ||
+        mod instanceof WebAssembly.Module
+    ) {
+        return mod;
+    }
+    throw new Error('Failed to load wasm module');
+}
+
 export const module: Promise<InitInput> = /* @__PURE__ */ (async () => {
-    if (!import.meta.url) {
-        return await loadFallback();
+    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 fetch(new URL('../../lib/wasm_bg.wasm?url', import.meta.url));
+        }
     }
-    return await fetch(new URL('../../lib/wasm_bg.wasm?url', import.meta.url));
 })();