@mirascript/wasm 0.1.64 → 0.1.70

package/README.md

@@ -1,12 +1,12 @@
 # @mirascript/wasm
 
-`@mirascript/wasm` 提供 MiraScript 编译器的 WebAssembly 封装，适用于浏览器、Web Worker 以及不方便加载原生 Node 模块的环境。
+`@mirascript/wasm` 提供 MiraScript 编译器的 WebAssembly 封装，适用于浏览器、Web Worker 和其他不便使用原生模块的环境。
 
-## 功能
+## 能力概览
 
-- 初始化 WebAssembly 编译器模块
-- 创建底层编译配置对象
-- 提供同步编译接口，输出字节码和诊断信息
+- 初始化 WebAssembly 编译模块
+- 提供同步编译接口
+- 返回编译产物与诊断信息
 
 ## 安装
 
@@ -14,7 +14,7 @@
 pnpm add @mirascript/wasm
 ```
 
-## 基本用法
+## 快速开始
 
 ```ts
 import { init, compileSync } from '@mirascript/wasm';
@@ -29,6 +29,10 @@ console.log(result.diagnostics);
 console.log(result.chunk);
 ```
 
+## 使用建议
+
+如果项目需要同时兼容 Node.js 与浏览器，优先使用 `@mirascript/bindings` 统一加载入口。
+
 ## 构建
 
 ```bash
@@ -36,8 +40,4 @@ pnpm --filter @mirascript/wasm build:dev
 pnpm --filter @mirascript/wasm build
 ```
 
-构建依赖 `wasm-pack` 与 Rust 工具链。
-
-## 说明
-
-如果你的代码既要在 Node.js 运行，也要在浏览器运行，优先使用 `@mirascript/bindings`，由它自动选择原生或 WebAssembly 实现。
+构建依赖 Rust 工具链与 `wasm-pack`。

package/lib/wasm.d.ts

@@ -80,12 +80,12 @@ 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 compileresult_chunk: (a: number, b: number) => void;
-    readonly compileresult_diagnostics: (a: number, b: number) => void;
+    readonly compileresult_chunk: (a: number) => [number, number];
+    readonly compileresult_diagnostics: (a: number) => [number, number];
     readonly main: () => void;
-    readonly monacocompiler_diagnostics: (a: number, b: number) => void;
-    readonly monacocompiler_emit: (a: number, b: number) => void;
-    readonly monacocompiler_format: (a: number, b: number) => void;
+    readonly monacocompiler_diagnostics: (a: number) => [number, number];
+    readonly monacocompiler_emit: (a: number) => [number, number];
+    readonly monacocompiler_format: (a: number) => [number, number];
     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;
@@ -111,10 +111,10 @@ export interface InitOutput {
     readonly __wbg_set_config_input_mode: (a: number, b: number) => void;
     readonly __wbg_set_config_trivia: (a: number, b: number) => void;
     readonly config_new: () => number;
-    readonly __wbindgen_export: (a: number, b: number, c: number) => void;
-    readonly __wbindgen_export2: (a: number, b: number) => number;
-    readonly __wbindgen_export3: (a: number, b: number, c: number, d: number) => number;
-    readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
+    readonly __wbindgen_free: (a: number, b: number, c: number) => void;
+    readonly __wbindgen_malloc: (a: number, b: number) => number;
+    readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
+    readonly __wbindgen_externrefs: WebAssembly.Table;
     readonly __wbindgen_start: () => void;
 }
 

package/lib/wasm.js

@@ -21,36 +21,22 @@ export class CompileResult {
      * @returns {Uint8Array | undefined}
      */
     chunk() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.compileresult_chunk(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            let v1;
-            if (r0 !== 0) {
-                v1 = getArrayU8FromWasm0(r0, r1).slice();
-                wasm.__wbindgen_export(r0, r1 * 1, 1);
-            }
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
+        const ret = wasm.compileresult_chunk(this.__wbg_ptr);
+        let v1;
+        if (ret[0] !== 0) {
+            v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+            wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
         }
+        return v1;
     }
     /**
      * @returns {Uint32Array}
      */
     diagnostics() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.compileresult_diagnostics(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayU32FromWasm0(r0, r1).slice();
-            wasm.__wbindgen_export(r0, r1 * 4, 4);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.compileresult_diagnostics(this.__wbg_ptr);
+        var v1 = getArrayU32FromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
+        return v1;
     }
 }
 if (Symbol.dispose) CompileResult.prototype[Symbol.dispose] = CompileResult.prototype.free;
@@ -254,62 +240,41 @@ export class MonacoCompiler {
      * @returns {Uint32Array}
      */
     diagnostics() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.monacocompiler_diagnostics(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            var v1 = getArrayU32FromWasm0(r0, r1).slice();
-            wasm.__wbindgen_export(r0, r1 * 4, 4);
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
-        }
+        const ret = wasm.monacocompiler_diagnostics(this.__wbg_ptr);
+        var v1 = getArrayU32FromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
+        return v1;
     }
     /**
      * @returns {Uint8Array | undefined}
      */
     emit() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.monacocompiler_emit(retptr, this.__wbg_ptr);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
-            let v1;
-            if (r0 !== 0) {
-                v1 = getArrayU8FromWasm0(r0, r1).slice();
-                wasm.__wbindgen_export(r0, r1 * 1, 1);
-            }
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
+        const ret = wasm.monacocompiler_emit(this.__wbg_ptr);
+        let v1;
+        if (ret[0] !== 0) {
+            v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+            wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
         }
+        return v1;
     }
     /**
      * @returns {string | undefined}
      */
     format() {
-        try {
-            const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            wasm.monacocompiler_format(retptr, this.__wbg_ptr);
-            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);
-            }
-            return v1;
-        } finally {
-            wasm.__wbindgen_add_to_stack_pointer(16);
+        const ret = wasm.monacocompiler_format(this.__wbg_ptr);
+        let v1;
+        if (ret[0] !== 0) {
+            v1 = getStringFromWasm0(ret[0], ret[1]).slice();
+            wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
         }
+        return v1;
     }
     /**
      * @param {string} input
      * @param {Config} config
      */
     constructor(input, config) {
-        const ptr0 = passStringToWasm0(input, wasm.__wbindgen_export2, wasm.__wbindgen_export3);
+        const ptr0 = passStringToWasm0(input, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
         const len0 = WASM_VECTOR_LEN;
         _assertClass(config, Config);
         const ret = wasm.monacocompiler_new(ptr0, len0, config.__wbg_ptr);
@@ -333,7 +298,7 @@ if (Symbol.dispose) MonacoCompiler.prototype[Symbol.dispose] = MonacoCompiler.pr
  * @returns {CompileResult}
  */
 export function compile(script, config) {
-    const ptr0 = passStringToWasm0(script, wasm.__wbindgen_export2, wasm.__wbindgen_export3);
+    const ptr0 = passStringToWasm0(script, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len0 = WASM_VECTOR_LEN;
     _assertClass(config, Config);
     const ret = wasm.compile(ptr0, len0, config.__wbg_ptr);
@@ -346,7 +311,7 @@ export function compile(script, config) {
  * @returns {CompileResult}
  */
 export function compile_buffer(script, config) {
-    const ptr0 = passArray8ToWasm0(script, wasm.__wbindgen_export2);
+    const ptr0 = passArray8ToWasm0(script, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
     _assertClass(config, Config);
     const ret = wasm.compile_buffer(ptr0, len0, config.__wbg_ptr);
@@ -370,22 +335,28 @@ function __wbg_get_imports() {
                 deferred0_1 = arg1;
                 console.error(getStringFromWasm0(arg0, arg1));
             } finally {
-                wasm.__wbindgen_export(deferred0_0, deferred0_1, 1);
+                wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
             }
         },
         __wbg_new_227d7c05414eb861: function() {
             const ret = new Error();
-            return addHeapObject(ret);
+            return ret;
         },
         __wbg_stack_3b0d974bbf31e44f: function(arg0, arg1) {
-            const ret = getObject(arg1).stack;
-            const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_export2, wasm.__wbindgen_export3);
+            const ret = arg1.stack;
+            const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
             const len1 = WASM_VECTOR_LEN;
             getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
             getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
         },
-        __wbindgen_object_drop_ref: function(arg0) {
-            takeObject(arg0);
+        __wbindgen_init_externref_table: function() {
+            const table = wasm.__wbindgen_externrefs;
+            const offset = table.grow(4);
+            table.set(0, undefined);
+            table.set(offset + 0, undefined);
+            table.set(offset + 1, null);
+            table.set(offset + 2, true);
+            table.set(offset + 3, false);
         },
     };
     return {
@@ -404,27 +375,12 @@ const MonacoCompilerFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_monacocompiler_free(ptr, 1));
 
-function addHeapObject(obj) {
-    if (heap_next === heap.length) heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
-
-    heap[idx] = obj;
-    return idx;
-}
-
 function _assertClass(instance, klass) {
     if (!(instance instanceof klass)) {
         throw new Error(`expected instance of ${klass.name}`);
     }
 }
 
-function dropObject(idx) {
-    if (idx < 1028) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-}
-
 function getArrayU32FromWasm0(ptr, len) {
     ptr = ptr >>> 0;
     return getUint32ArrayMemory0().subarray(ptr / 4, ptr / 4 + len);
@@ -463,13 +419,6 @@ function getUint8ArrayMemory0() {
     return cachedUint8ArrayMemory0;
 }
 
-function getObject(idx) { return heap[idx]; }
-
-let heap = new Array(1024).fill(undefined);
-heap.push(undefined, null, true, false);
-
-let heap_next = heap.length;
-
 function passArray8ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 1, 1) >>> 0;
     getUint8ArrayMemory0().set(arg, ptr / 1);
@@ -514,12 +463,6 @@ function passStringToWasm0(arg, malloc, realloc) {
     return ptr;
 }
 
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-}
-
 let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
 cachedTextDecoder.decode();
 const MAX_SAFARI_DECODE_BYTES = 2146435072;

package/lib/wasm_bg.wasm.d.ts

@@ -4,12 +4,12 @@ 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 compileresult_chunk: (a: number, b: number) => void;
-export const compileresult_diagnostics: (a: number, b: number) => void;
+export const compileresult_chunk: (a: number) => [number, number];
+export const compileresult_diagnostics: (a: number) => [number, number];
 export const main: () => void;
-export const monacocompiler_diagnostics: (a: number, b: number) => void;
-export const monacocompiler_emit: (a: number, b: number) => void;
-export const monacocompiler_format: (a: number, b: number) => void;
+export const monacocompiler_diagnostics: (a: number) => [number, number];
+export const monacocompiler_emit: (a: number) => [number, number];
+export const monacocompiler_format: (a: number) => [number, number];
 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;
@@ -35,8 +35,8 @@ export const __wbg_set_config_diagnostic_warning: (a: number, b: number) => void
 export const __wbg_set_config_input_mode: (a: number, b: number) => void;
 export const __wbg_set_config_trivia: (a: number, b: number) => void;
 export const config_new: () => number;
-export const __wbindgen_export: (a: number, b: number, c: number) => void;
-export const __wbindgen_export2: (a: number, b: number) => number;
-export const __wbindgen_export3: (a: number, b: number, c: number, d: number) => number;
-export const __wbindgen_add_to_stack_pointer: (a: number) => number;
+export const __wbindgen_free: (a: number, b: number, c: number) => void;
+export const __wbindgen_malloc: (a: number, b: number) => number;
+export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
+export const __wbindgen_externrefs: WebAssembly.Table;
 export const __wbindgen_start: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirascript/wasm",
-  "version": "0.1.64",
+  "version": "0.1.70",
   "author": "CloudPSS",
   "license": "MIT",
   "description": "MiraScript compiler for WebAssembly",
@@ -30,9 +30,9 @@
     }
   },
   "devDependencies": {
-    "@types/node": "^26.0.1",
+    "@types/node": "^26.1.1",
     "nodemon": "^3.1.14",
-    "@mirascript/constants": "~0.1.64"
+    "@mirascript/constants": "~0.1.70"
   },
   "scripts": {
     "wasm": "wasm-pack build --target web --out-dir ../../packages/wasm/lib --no-pack ../../crates/wasm",