@mirascript/bindings 0.1.76 → 0.1.79

package/dist/loader.d.ts

@@ -2,8 +2,8 @@
 export declare class ModuleLoader<T> {
     private readonly loader;
     constructor(loader: () => Promise<T>);
-    private module;
     private loading;
+    private result;
     /** 加载模块 */
     readonly load: () => Promise<T>;
     /**

package/dist/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,YAAY;AACZ,qBAAa,YAAY,CAAC,CAAC;IACX,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC;IACrD,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,OAAO,CAAyB;IAExC,WAAW;IACX,QAAQ,CAAC,IAAI,QAAa,OAAO,CAAC,CAAC,CAAC,CA0BlC;IACF;;;OAGG;IACH,QAAQ,CAAC,GAAG,QAAO,CAAC,CAMlB;CACL"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAsBA,YAAY;AACZ,qBAAa,YAAY,CAAC,CAAC;IACX,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC;IACrD,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,MAAM,CAA8B;IAE5C,WAAW;IACX,QAAQ,CAAC,IAAI,QAAa,OAAO,CAAC,CAAC,CAAC,CAclC;IACF;;;OAGG;IACH,QAAQ,CAAC,GAAG,QAAO,CAAC,CAMlB;CACL"}

package/dist/loader.js

@@ -1,43 +1,57 @@
+/** 模块加载结果 */
+class ModuleResult {
+    constructor(module, error) {
+        this.module = module;
+        this.error = error;
+    }
+    /** 获取模块，如果模块未加载则抛出错误 */
+    get() {
+        if (this.module != null)
+            return this.module;
+        throw this.error ?? new Error('Module is not loaded.');
+    }
+}
+/** 运行模块加载器 */
+async function runLoader(loader) {
+    try {
+        const module = await loader();
+        return new ModuleResult(module, undefined);
+    }
+    catch (error) {
+        return new ModuleResult(undefined, error);
+    }
+}
 /** 模块加载器 */
 export class ModuleLoader {
     constructor(loader) {
         this.loader = loader;
         /** 加载模块 */
         this.load = async () => {
-            const { module, loading, loader } = this;
-            if (module != null)
-                return module;
+            const { result, loading, loader } = this;
+            if (result?.module != null)
+                return result.module;
             if (loading != null)
-                return loading;
-            const l = (async () => {
-                const mod = await loader();
-                this.module = mod;
-                return mod;
-            })();
-            // Use .then() rather than .finally() to make Node.js happy
-            // Avoid Unhandled rejection
-            void l.then(() => {
-                if (this.loading === l) {
-                    this.loading = undefined;
-                }
-            }, () => {
+                return loading.then((r) => r.get());
+            const l = runLoader(loader).then((r) => {
                 if (this.loading === l) {
                     this.loading = undefined;
+                    this.result = r;
                 }
+                return r;
             });
             this.loading = l;
-            return l;
+            return l.then((r) => r.get());
         };
         /**
          * 获取已加载的模块
          * @throws {Error} 模块尚未加载
          */
         this.get = () => {
-            const { module } = this;
-            if (module == null) {
+            const { result } = this;
+            if (result == null) {
                 throw new Error('MiraScript compiler module is not loaded.');
             }
-            return module;
+            return result.get();
         };
     }
 }

package/dist/loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,YAAY;AACZ,MAAM,OAAO,YAAY;IACrB,YAA6B,MAAwB;QAAxB,WAAM,GAAN,MAAM,CAAkB;QAIrD,WAAW;QACF,SAAI,GAAG,KAAK,IAAgB,EAAE;YACnC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YACzC,IAAI,MAAM,IAAI,IAAI;gBAAE,OAAO,MAAM,CAAC;YAClC,IAAI,OAAO,IAAI,IAAI;gBAAE,OAAO,OAAO,CAAC;YAEpC,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;gBAClB,MAAM,GAAG,GAAG,MAAM,MAAM,EAAE,CAAC;gBAC3B,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;gBAClB,OAAO,GAAG,CAAC;YACf,CAAC,CAAC,EAAE,CAAC;YACL,2DAA2D;YAC3D,4BAA4B;YAC5B,KAAK,CAAC,CAAC,IAAI,CACP,GAAG,EAAE;gBACD,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;oBACrB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;gBAC7B,CAAC;YACL,CAAC,EACD,GAAG,EAAE;gBACD,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;oBACrB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;gBAC7B,CAAC;YACL,CAAC,CACJ,CAAC;YACF,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,CAAC;QACb,CAAC,CAAC;QACF;;;WAGG;QACM,QAAG,GAAG,GAAM,EAAE;YACnB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YACxB,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;YACjE,CAAC;YACD,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC;IA1CsD,CAAC;CA2C5D"}
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,MAAM,YAAY;IACd,YACa,MAAqB,EACrB,KAAwB;QADxB,WAAM,GAAN,MAAM,CAAe;QACrB,UAAK,GAAL,KAAK,CAAmB;IAClC,CAAC;IACJ,wBAAwB;IACxB,GAAG;QACC,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC,MAAM,CAAC;QAC5C,MAAM,IAAI,CAAC,KAAK,IAAI,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC3D,CAAC;CACJ;AAED,cAAc;AACd,KAAK,UAAU,SAAS,CAAI,MAAwB;IAChD,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,MAAM,EAAE,CAAC;QAC9B,OAAO,IAAI,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,IAAI,YAAY,CAAI,SAAS,EAAE,KAAc,CAAC,CAAC;IAC1D,CAAC;AACL,CAAC;AACD,YAAY;AACZ,MAAM,OAAO,YAAY;IACrB,YAA6B,MAAwB;QAAxB,WAAM,GAAN,MAAM,CAAkB;QAIrD,WAAW;QACF,SAAI,GAAG,KAAK,IAAgB,EAAE;YACnC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YACzC,IAAI,MAAM,EAAE,MAAM,IAAI,IAAI;gBAAE,OAAO,MAAM,CAAC,MAAM,CAAC;YACjD,IAAI,OAAO,IAAI,IAAI;gBAAE,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;YAEzD,MAAM,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBACnC,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;oBACrB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;oBACzB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBACpB,CAAC;gBACD,OAAO,CAAC,CAAC;YACb,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QAClC,CAAC,CAAC;QACF;;;WAGG;QACM,QAAG,GAAG,GAAM,EAAE;YACnB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;YACxB,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;YACjE,CAAC;YACD,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC;QACxB,CAAC,CAAC;IA9BsD,CAAC;CA+B5D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirascript/bindings",
-  "version": "0.1.76",
+  "version": "0.1.79",
   "author": "CloudPSS",
   "license": "MIT",
   "description": "MiraScript compiler bindings",
@@ -32,11 +32,11 @@
     }
   },
   "dependencies": {
-    "@mirascript/napi": "~0.1.76",
-    "@mirascript/wasm": "~0.1.76"
+    "@mirascript/wasm": "~0.1.79",
+    "@mirascript/napi": "~0.1.79"
   },
   "devDependencies": {
-    "@types/node": "^26.1.1"
+    "@types/node": "^26.1.2"
   },
   "scripts": {
     "watch": "pnpm build --watch",

package/src/loader.ts

@@ -1,46 +1,56 @@
+/** 模块加载结果 */
+class ModuleResult<T> {
+    constructor(
+        readonly module: T | undefined,
+        readonly error: Error | undefined,
+    ) {}
+    /** 获取模块，如果模块未加载则抛出错误 */
+    get(): T {
+        if (this.module != null) return this.module;
+        throw this.error ?? new Error('Module is not loaded.');
+    }
+}
+
+/** 运行模块加载器 */
+async function runLoader<T>(loader: () => Promise<T>): Promise<ModuleResult<T>> {
+    try {
+        const module = await loader();
+        return new ModuleResult(module, undefined);
+    } catch (error) {
+        return new ModuleResult<T>(undefined, error as Error);
+    }
+}
 /** 模块加载器 */
 export class ModuleLoader<T> {
     constructor(private readonly loader: () => Promise<T>) {}
-    private module: T | undefined;
-    private loading: Promise<T> | undefined;
+    private loading: Promise<ModuleResult<T>> | undefined;
+    private result: ModuleResult<T> | undefined;
 
     /** 加载模块 */
     readonly load = async (): Promise<T> => {
-        const { module, loading, loader } = this;
-        if (module != null) return module;
-        if (loading != null) return loading;
+        const { result, loading, loader } = this;
+        if (result?.module != null) return result.module;
+        if (loading != null) return loading.then((r) => r.get());
 
-        const l = (async () => {
-            const mod = await loader();
-            this.module = mod;
-            return mod;
-        })();
-        // Use .then() rather than .finally() to make Node.js happy
-        // Avoid Unhandled rejection
-        void l.then(
-            () => {
-                if (this.loading === l) {
-                    this.loading = undefined;
-                }
-            },
-            () => {
-                if (this.loading === l) {
-                    this.loading = undefined;
-                }
-            },
-        );
+        const l = runLoader(loader).then((r) => {
+            if (this.loading === l) {
+                this.loading = undefined;
+                this.result = r;
+            }
+            return r;
+        });
         this.loading = l;
-        return l;
+        return l.then((r) => r.get());
     };
     /**
      * 获取已加载的模块
      * @throws {Error} 模块尚未加载
      */
     readonly get = (): T => {
-        const { module } = this;
-        if (module == null) {
+        const { result } = this;
+        if (result == null) {
             throw new Error('MiraScript compiler module is not loaded.');
         }
-        return module;
+        return result.get();
     };
 }