@utoo/web 1.4.0 → 1.4.1

package/esm/utoo/index.js

@@ -1480,7 +1480,7 @@ function __wbg_get_imports(memory) {
                     const a = state0.a;
                     state0.a = 0;
                     try {
-                        return __wasm_bindgen_func_elem_3890(a, state0.b, arg0, arg1);
+                        return __wasm_bindgen_func_elem_3879(a, state0.b, arg0, arg1);
                     }
                     finally {
                         state0.a = a;
@@ -1807,33 +1807,33 @@ function __wbg_get_imports(memory) {
             }, arguments);
         },
         __wbindgen_cast_0000000000000001: function (arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 1451, function: Function { arguments: [Externref], shim_idx: 5637, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21830, __wasm_bindgen_func_elem_80453);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 1458, function: Function { arguments: [Externref], shim_idx: 5646, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21941, __wasm_bindgen_func_elem_80607);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000002: function (arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 1451, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 5619, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
-            const ret = makeClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21830, __wasm_bindgen_func_elem_80283);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 1458, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 5628, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
+            const ret = makeClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21941, __wasm_bindgen_func_elem_80437);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000003: function (arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 1451, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 5637, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21830, __wasm_bindgen_func_elem_80453);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 1458, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 5646, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21941, __wasm_bindgen_func_elem_80607);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000004: function (arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 1451, function: Function { arguments: [Ref(NamedExternref("MessageEvent"))], shim_idx: 5640, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21830, __wasm_bindgen_func_elem_80489);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 1458, function: Function { arguments: [Ref(NamedExternref("MessageEvent"))], shim_idx: 5649, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21941, __wasm_bindgen_func_elem_80643);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000005: function (arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 1451, function: Function { arguments: [], shim_idx: 1452, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21830, __wasm_bindgen_func_elem_21831);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 1458, function: Function { arguments: [], shim_idx: 1459, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21941, __wasm_bindgen_func_elem_21942);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000006: function (arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 5643, function: Function { arguments: [], shim_idx: 1452, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_80509, __wasm_bindgen_func_elem_21831);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 5652, function: Function { arguments: [], shim_idx: 1459, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_80663, __wasm_bindgen_func_elem_21942);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000007: function (arg0) {
@@ -1881,25 +1881,25 @@ function __wbg_get_imports(memory) {
         "./index_bg.js": import0,
     };
 }
-function __wasm_bindgen_func_elem_21831(arg0, arg1) {
-    wasm.__wasm_bindgen_func_elem_21831(arg0, arg1);
+function __wasm_bindgen_func_elem_21942(arg0, arg1) {
+    wasm.__wasm_bindgen_func_elem_21942(arg0, arg1);
 }
-function __wasm_bindgen_func_elem_80453(arg0, arg1, arg2) {
-    wasm.__wasm_bindgen_func_elem_80453(arg0, arg1, addHeapObject(arg2));
+function __wasm_bindgen_func_elem_80607(arg0, arg1, arg2) {
+    wasm.__wasm_bindgen_func_elem_80607(arg0, arg1, addHeapObject(arg2));
 }
-function __wasm_bindgen_func_elem_80283(arg0, arg1, arg2) {
-    wasm.__wasm_bindgen_func_elem_80283(arg0, arg1, addHeapObject(arg2));
+function __wasm_bindgen_func_elem_80437(arg0, arg1, arg2) {
+    wasm.__wasm_bindgen_func_elem_80437(arg0, arg1, addHeapObject(arg2));
 }
-function __wasm_bindgen_func_elem_80489(arg0, arg1, arg2) {
+function __wasm_bindgen_func_elem_80643(arg0, arg1, arg2) {
     try {
-        wasm.__wasm_bindgen_func_elem_80489(arg0, arg1, addBorrowedObject(arg2));
+        wasm.__wasm_bindgen_func_elem_80643(arg0, arg1, addBorrowedObject(arg2));
     }
     finally {
         heap[stack_pointer++] = undefined;
     }
 }
-function __wasm_bindgen_func_elem_3890(arg0, arg1, arg2, arg3) {
-    wasm.__wasm_bindgen_func_elem_3890(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+function __wasm_bindgen_func_elem_3879(arg0, arg1, arg2, arg3) {
+    wasm.__wasm_bindgen_func_elem_3879(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 const __wbindgen_enum_DirEntryType = ["file", "directory"];
 const __wbindgen_enum_FileSystemChangeRecordType = ["appeared", "disappeared", "errored", "modified", "moved", "unknown"];

package/esm/webpackLoaders/cjs.js

@@ -44,7 +44,9 @@ const executeModule = (moduleCode, moduleId, id, importMaps, entrypoint) => {
     const moduleRequire = (childId) => loadModule(childId, context, importMaps, entrypoint);
     moduleRequire.resolve = (request) => request;
     const module = { exports: finalExports, require: moduleRequire };
-    if (moduleId.includes("node_modules")) {
+    if (moduleId.includes("node_modules") ||
+        id in importMaps ||
+        moduleId in importMaps) {
         installedModules[moduleId] = module;
     }
     if (moduleId === entrypoint) {
@@ -93,6 +95,15 @@ const loadModule = (id, context, importMaps, entrypoint) => {
         const cachedId = resolutionCache[cacheKey];
         if (installedModules[cachedId])
             return installedModules[cachedId].exports;
+        const sysCached = System.get(cachedId) || (id !== cachedId && System.get(id));
+        if (sysCached)
+            return sysCached.default;
+        // importMaps takes priority over cached FS path
+        const importMapCode = importMaps[cachedId] || importMaps[id];
+        if (importMapCode) {
+            const mid = importMaps[cachedId] ? cachedId : id;
+            return executeModule(importMapCode, mid, id, importMaps, entrypoint);
+        }
         const code = tryReadFile(cachedId);
         if (code !== null) {
             return executeModule(code, cachedId, id, importMaps, entrypoint);

package/esm/webpackLoaders/polyfills/fsPolyfill/index.js

@@ -211,11 +211,7 @@ export function readFile(path, options, cb) {
     const promise = encoding
         ? fs.readToString(resolvedPath)
         : fs.read(resolvedPath);
-    promise
-        .then((data) => {
-        cb(null, encoding ? data : Buffer.from(data));
-    })
-        .catch((e) => cb(translateError(e, path, "open")));
+    promise.then((data) => cb(null, encoding ? data : Buffer.from(data)), (e) => cb(translateError(e, path, "open")));
 }
 export function readdir(path, options, cb) {
     if (typeof options === "function") {
@@ -238,8 +234,7 @@ export function readdir(path, options, cb) {
             return json.name;
         });
         cb(null, result);
-    })
-        .catch((e) => cb(translateError(e, path, "scandir")));
+    }, (e) => cb(translateError(e, path, "scandir")));
 }
 export function writeFile(path, data, options, cb) {
     if (typeof options === "function") {
@@ -251,9 +246,7 @@ export function writeFile(path, data, options, cb) {
     const promise = typeof data === "string"
         ? fs.writeString(resolvedPath, data)
         : fs.write(resolvedPath, data);
-    promise
-        .then(() => cb(null))
-        .catch((e) => cb(translateError(e, path, "open")));
+    promise.then(() => cb(null), (e) => cb(translateError(e, path, "open")));
 }
 export function mkdir(path, options, cb) {
     if (typeof options === "function") {
@@ -265,9 +258,7 @@ export function mkdir(path, options, cb) {
     const promise = (options === null || options === void 0 ? void 0 : options.recursive)
         ? fs.createDirAll(resolvedPath)
         : fs.createDir(resolvedPath);
-    promise
-        .then(() => cb(null))
-        .catch((e) => cb(translateError(e, path, "mkdir")));
+    promise.then(() => cb(null), (e) => cb(translateError(e, path, "mkdir")));
 }
 export function rm(path, options, cb) {
     if (typeof options === "function") {
@@ -286,8 +277,7 @@ export function rm(path, options, cb) {
             return fs.removeDir(resolvedPath, !!(options === null || options === void 0 ? void 0 : options.recursive));
         }
     })
-        .then(() => cb(null))
-        .catch((e) => cb(translateError(e, path, "rm")));
+        .then(() => cb(null), (e) => cb(translateError(e, path, "rm")));
 }
 export function rmdir(path, options, cb) {
     if (typeof options === "function") {
@@ -296,14 +286,12 @@ export function rmdir(path, options, cb) {
     }
     getFs()
         .removeDir(resolvePath(path), !!(options === null || options === void 0 ? void 0 : options.recursive))
-        .then(() => cb(null))
-        .catch((e) => cb(translateError(e, path, "rmdir")));
+        .then(() => cb(null), (e) => cb(translateError(e, path, "rmdir")));
 }
 export function copyFile(src, dst, cb) {
     getFs()
         .copyFile(resolvePath(src), resolvePath(dst))
-        .then(() => cb(null))
-        .catch((e) => cb(translateError(e, src, "copyfile")));
+        .then(() => cb(null), (e) => cb(translateError(e, src, "copyfile")));
 }
 export function stat(p, cb) {
     getFs()
@@ -314,8 +302,7 @@ export function stat(p, cb) {
             type: json.type,
             size: Number(json.file_size || 0),
         }));
-    })
-        .catch((e) => cb(translateError(e, p, "stat")));
+    }, (e) => cb(translateError(e, p, "stat")));
 }
 export function lstat(p, cb) {
     getFs()
@@ -326,8 +313,7 @@ export function lstat(p, cb) {
             type: json.type,
             size: Number(json.file_size || 0),
         }));
-    })
-        .catch((e) => cb(translateError(e, p, "lstat")));
+    }, (e) => cb(translateError(e, p, "lstat")));
 }
 export function realpath(p, cb) {
     cb(null, p);
@@ -342,8 +328,7 @@ export function access(p, mode, cb) {
         .then(() => {
         if (cb)
             cb(null);
-    })
-        .catch((e) => {
+    }, (e) => {
         if (cb)
             cb(translateError(e, p, "access"));
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/web",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
   "files": [