@utoo/web 1.2.2 → 1.2.3

package/esm/utoo/index.js

@@ -255,25 +255,25 @@ if (cachedTextEncoder) {
     };
 }
 let WASM_VECTOR_LEN = 0;
-function __wasm_bindgen_func_elem_152832(arg0, arg1, arg2) {
+function __wasm_bindgen_func_elem_152840(arg0, arg1, arg2) {
     try {
-        wasm.__wasm_bindgen_func_elem_152832(arg0, arg1, addBorrowedObject(arg2));
+        wasm.__wasm_bindgen_func_elem_152840(arg0, arg1, addBorrowedObject(arg2));
     }
     finally {
         heap[stack_pointer++] = undefined;
     }
 }
-function __wasm_bindgen_func_elem_29354(arg0, arg1) {
-    wasm.__wasm_bindgen_func_elem_29354(arg0, arg1);
+function __wasm_bindgen_func_elem_29447(arg0, arg1) {
+    wasm.__wasm_bindgen_func_elem_29447(arg0, arg1);
 }
-function __wasm_bindgen_func_elem_152568(arg0, arg1, arg2) {
-    wasm.__wasm_bindgen_func_elem_152568(arg0, arg1, addHeapObject(arg2));
+function __wasm_bindgen_func_elem_152670(arg0, arg1, arg2) {
+    wasm.__wasm_bindgen_func_elem_152670(arg0, arg1, addHeapObject(arg2));
 }
-function __wasm_bindgen_func_elem_152777(arg0, arg1, arg2) {
-    wasm.__wasm_bindgen_func_elem_152777(arg0, arg1, addHeapObject(arg2));
+function __wasm_bindgen_func_elem_152785(arg0, arg1, arg2) {
+    wasm.__wasm_bindgen_func_elem_152785(arg0, arg1, addHeapObject(arg2));
 }
-function __wasm_bindgen_func_elem_3390(arg0, arg1, arg2, arg3) {
-    wasm.__wasm_bindgen_func_elem_3390(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+function __wasm_bindgen_func_elem_3511(arg0, arg1, arg2, arg3) {
+    wasm.__wasm_bindgen_func_elem_3511(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 const __wbindgen_enum_DirEntryType = ["file", "directory"];
 const __wbindgen_enum_FileSystemChangeRecordType = ["appeared", "disappeared", "errored", "modified", "moved", "unknown"];
@@ -1251,7 +1251,7 @@ function __wbg_get_imports(memory) {
             return addHeapObject(ret);
         }, arguments);
     };
-    imports.wbg.__wbg_changedHandle_351098b912fb3009 = function (arg0) {
+    imports.wbg.__wbg_changedHandle_4d8c6b92249a3e27 = function (arg0) {
         const ret = getObject(arg0).changedHandle;
         return isLikeNone(ret) ? 0 : addHeapObject(ret);
     };
@@ -1466,6 +1466,13 @@ function __wbg_get_imports(memory) {
         const ret = Metadata.__wrap(arg0);
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_name_7716fd7c364d6ae5 = function (arg0, arg1) {
+        const ret = getObject(arg1).name;
+        const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_export, wasm.__wbindgen_export2);
+        const len1 = WASM_VECTOR_LEN;
+        getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
+        getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
+    };
     imports.wbg.__wbg_name_9136863a055402ff = function (arg0, arg1) {
         const ret = getObject(arg1).name;
         const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_export, wasm.__wbindgen_export2);
@@ -1501,6 +1508,10 @@ function __wbg_get_imports(memory) {
         const ret = new Uint8Array(getObject(arg0));
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_new_8001e3307a01feca = function (arg0) {
+        const ret = new FileSystemObserver(getObject(arg0));
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbg_new_881a222c65f168fc = function () {
         return handleError(function () {
             const ret = new AbortController();
@@ -1515,10 +1526,6 @@ function __wbg_get_imports(memory) {
         const ret = new Map();
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_new_c9c263f8e50c1faf = function (arg0) {
-        const ret = new FileSystemObserver(getObject(arg0));
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbg_new_de1e660b88fc921f = function (arg0) {
         const ret = new Int32Array(getObject(arg0));
         return addHeapObject(ret);
@@ -1530,7 +1537,7 @@ function __wbg_get_imports(memory) {
                 const a = state0.a;
                 state0.a = 0;
                 try {
-                    return __wasm_bindgen_func_elem_3390(a, state0.b, arg0, arg1);
+                    return __wasm_bindgen_func_elem_3511(a, state0.b, arg0, arg1);
                 }
                 finally {
                     state0.a = a;
@@ -1597,7 +1604,7 @@ function __wbg_get_imports(memory) {
         const ret = Date.now();
         return ret;
     };
-    imports.wbg.__wbg_observe_ebe4ca8634f9653e = function (arg0, arg1, arg2) {
+    imports.wbg.__wbg_observe_e8235923767a3bbd = function (arg0, arg1, arg2) {
         const ret = getObject(arg0).observe(getObject(arg1), getObject(arg2));
         return addHeapObject(ret);
     };
@@ -1649,7 +1656,7 @@ function __wbg_get_imports(memory) {
             return ret;
         }, arguments);
     };
-    imports.wbg.__wbg_relativePathComponents_84b0ffdf8a944179 = function (arg0) {
+    imports.wbg.__wbg_relativePathComponents_bf57d17d1baeacbf = function (arg0) {
         const ret = getObject(arg0).relativePathComponents;
         return addHeapObject(ret);
     };
@@ -1661,6 +1668,10 @@ function __wbg_get_imports(memory) {
         const ret = Promise.resolve(getObject(arg0));
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_root_ebd46cfbf4e9ba1a = function (arg0) {
+        const ret = getObject(arg0).root;
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbg_setTimeout_63008613644b07af = function () {
         return handleError(function (arg0, arg1, arg2) {
             const ret = getObject(arg0).setTimeout(getObject(arg1), arg2);
@@ -1714,7 +1725,7 @@ function __wbg_get_imports(memory) {
     imports.wbg.__wbg_set_onmessage_deb94985de696ac7 = function (arg0, arg1) {
         getObject(arg0).onmessage = getObject(arg1);
     };
-    imports.wbg.__wbg_set_recursive_5a8f2fa22a1d9d48 = function (arg0, arg1) {
+    imports.wbg.__wbg_set_recursive_38cb17f25aad7488 = function (arg0, arg1) {
         getObject(arg0).recursive = arg1 !== 0;
     };
     imports.wbg.__wbg_set_recursive_7ac0b14755335bfb = function (arg0, arg1) {
@@ -1798,7 +1809,7 @@ function __wbg_get_imports(memory) {
             getObject(arg0).truncate(arg1 >>> 0);
         }, arguments);
     };
-    imports.wbg.__wbg_type_7927e500427dce19 = function (arg0) {
+    imports.wbg.__wbg_type_d3d1c61e705de78a = function (arg0) {
         const ret = getObject(arg0).type;
         return (__wbindgen_enum_FileSystemChangeRecordType.indexOf(ret) + 1 || 7) - 1;
     };
@@ -1855,29 +1866,24 @@ function __wbg_get_imports(memory) {
             return ret;
         }, arguments);
     };
-    imports.wbg.__wbindgen_cast_128d904901c806b6 = function (arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 8667, function: Function { arguments: [Ref(NamedExternref("MessageEvent"))], shim_idx: 8668, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_152831, __wasm_bindgen_func_elem_152832);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbindgen_cast_2241b6af4c4b2941 = function (arg0, arg1) {
         // Cast intrinsic for `Ref(String) -> Externref`.
         const ret = getStringFromWasm0(arg0, arg1);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_4625c577ab2ec9ee = function (arg0) {
-        // Cast intrinsic for `U64 -> Externref`.
-        const ret = BigInt.asUintN(64, arg0);
+    imports.wbg.__wbindgen_cast_35bebb901e7f6fa2 = function (arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 8668, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 8669, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_152784, __wasm_bindgen_func_elem_152785);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_526f2cc3d412e0a4 = function (arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 8662, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 8663, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_152776, __wasm_bindgen_func_elem_152777);
+    imports.wbg.__wbindgen_cast_45cac5d4264cc30c = function (arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 8676, function: Function { arguments: [], shim_idx: 1966, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_152847, __wasm_bindgen_func_elem_29447);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_5ba20501db8214d0 = function (arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 8670, function: Function { arguments: [], shim_idx: 1967, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_152839, __wasm_bindgen_func_elem_29354);
+    imports.wbg.__wbindgen_cast_4625c577ab2ec9ee = function (arg0) {
+        // Cast intrinsic for `U64 -> Externref`.
+        const ret = BigInt.asUintN(64, arg0);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_76322aab70622876 = function (arg0, arg1) {
@@ -1887,9 +1893,14 @@ function __wbg_get_imports(memory) {
         const ret = v0;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_7eab25ba5d0f4e21 = function (arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 1966, function: Function { arguments: [], shim_idx: 1967, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_29352, __wasm_bindgen_func_elem_29354);
+    imports.wbg.__wbindgen_cast_8df4b0c353715d78 = function (arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 8673, function: Function { arguments: [Ref(NamedExternref("MessageEvent"))], shim_idx: 8674, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_152839, __wasm_bindgen_func_elem_152840);
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbindgen_cast_9997df6dde705618 = function (arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 1965, function: Function { arguments: [], shim_idx: 1966, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_29445, __wasm_bindgen_func_elem_29447);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_9ae0607507abb057 = function (arg0) {
@@ -1897,14 +1908,14 @@ function __wbg_get_imports(memory) {
         const ret = arg0;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_a981ffcb4ade917e = function (arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 8643, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 8644, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
-        const ret = makeClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_152399, __wasm_bindgen_func_elem_152568);
+    imports.wbg.__wbindgen_cast_b9410f9b8278ccec = function (arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 8668, function: Function { arguments: [Externref], shim_idx: 8669, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_152784, __wasm_bindgen_func_elem_152785);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_cast_bfef43f7beb609f0 = function (arg0, arg1) {
-        // Cast intrinsic for `Closure(Closure { dtor_idx: 8662, function: Function { arguments: [Externref], shim_idx: 8663, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_152776, __wasm_bindgen_func_elem_152777);
+    imports.wbg.__wbindgen_cast_d21c3c0a752e2b7a = function (arg0, arg1) {
+        // Cast intrinsic for `Closure(Closure { dtor_idx: 8651, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 8652, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
+        const ret = makeClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_152591, __wasm_bindgen_func_elem_152670);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_d6cd19b81560fd6e = function (arg0) {

package/esm/webpackLoaders/loaderWorkerPool.js

@@ -45,7 +45,7 @@ export const runLoaderWorkerPool = async (binding, projectCwd, loaderWorkerUrl,
                 workerData: {
                     cwd: finalCwd,
                     projectRoot: projectCwd,
-                    workerId: workerId,
+                    threadId: workerId,
                 },
                 loaderAssets: {
                     importMaps: { ...loadersImportMap },

package/esm/webpackLoaders/polyfills/fsPolyfill.js

@@ -2,15 +2,16 @@ import { Buffer } from "buffer";
 import path from "path";
 import { Stats } from "../../types";
 import { promises } from "./fsPromisesPolyfill";
+import { workerData } from "./workerThreadsPolyfill";
 function resolvePath(p) {
-    var _a, _b, _c;
+    var _a, _b;
     // @ts-ignore
-    const cwd = ((_b = (_a = self.process) === null || _a === void 0 ? void 0 : _a.cwd) === null || _b === void 0 ? void 0 : _b.call(_a)) || ((_c = self.workerData) === null || _c === void 0 ? void 0 : _c.cwd) || "/";
+    const cwd = ((_b = (_a = self.process) === null || _a === void 0 ? void 0 : _a.cwd) === null || _b === void 0 ? void 0 : _b.call(_a)) || (workerData === null || workerData === void 0 ? void 0 : workerData.cwd) || "/";
     return path.resolve(cwd, p);
 }
 function getFs() {
     // @ts-ignore
-    const fs = self.workerData.fs;
+    const fs = workerData.fs;
     if (!fs) {
         throw new Error("FS not initialized");
     }

package/esm/webpackLoaders/polyfills/fsPromisesPolyfill.js

@@ -1,15 +1,16 @@
 import { Buffer } from "buffer";
 import path from "path";
 import { Stats } from "../../types";
+import { workerData } from "./workerThreadsPolyfill";
 function resolvePath(p) {
-    var _a, _b, _c;
+    var _a, _b;
     // @ts-ignore
-    const cwd = ((_b = (_a = self.process) === null || _a === void 0 ? void 0 : _a.cwd) === null || _b === void 0 ? void 0 : _b.call(_a)) || ((_c = self.workerData) === null || _c === void 0 ? void 0 : _c.cwd) || "/";
+    const cwd = ((_b = (_a = self.process) === null || _a === void 0 ? void 0 : _a.cwd) === null || _b === void 0 ? void 0 : _b.call(_a)) || (workerData === null || workerData === void 0 ? void 0 : workerData.cwd) || "/";
     return path.resolve(cwd, p);
 }
 function getFs() {
     // @ts-ignore
-    const fs = self.workerData.fs;
+    const fs = workerData.fs;
     if (!fs) {
         throw new Error("FS not initialized");
     }

package/esm/webpackLoaders/polyfills/nodePolyFills.js

@@ -1,3 +1,5 @@
+import * as fs from "./fsPolyfill";
+import * as workerThreads from "./workerThreadsPolyfill";
 const buffer = require("buffer");
 self.Buffer = buffer.Buffer;
 const process = require("process");
@@ -5,7 +7,7 @@ const originalCwd = process.cwd;
 process.cwd = () => {
     var _a;
     // @ts-ignore
-    return ((_a = self.workerData) === null || _a === void 0 ? void 0 : _a.cwd) || (originalCwd === null || originalCwd === void 0 ? void 0 : originalCwd()) || "/";
+    return ((_a = workerThreads.workerData) === null || _a === void 0 ? void 0 : _a.cwd) || (originalCwd === null || originalCwd === void 0 ? void 0 : originalCwd()) || "/";
 };
 if (!process.versions)
     process.versions = {};
@@ -18,21 +20,17 @@ const originalResolve = path.resolve;
 path.resolve = (...args) => {
     var _a;
     // @ts-ignore
-    const cwd = ((_a = self.workerData) === null || _a === void 0 ? void 0 : _a.cwd) || "/";
+    const cwd = ((_a = workerThreads.workerData) === null || _a === void 0 ? void 0 : _a.cwd) || "/";
     return originalResolve(cwd, ...args);
 };
-import * as fs from "./fsPolyfill";
-import * as workerThreads from "./workerThreadsPolyfill";
-const workerThreadsWithLiveWorkerData = {
+const workerThreadsWithWorkerData = {
     ...workerThreads,
     get workerData() {
-        // @ts-ignore
-        return self.workerData;
+        return workerThreads.workerData;
     },
     get threadId() {
         var _a;
-        // @ts-ignore
-        return ((_a = self.workerData) === null || _a === void 0 ? void 0 : _a.workerId) || 0;
+        return ((_a = workerThreads.workerData) === null || _a === void 0 ? void 0 : _a.threadId) || 0;
     },
 };
 // Used to directly inject polyfill instance into systemjs
@@ -225,6 +223,6 @@ export default {
     get "node:util"() {
         return require("util");
     },
-    worker_threads: workerThreadsWithLiveWorkerData,
-    "node:worker_threads": workerThreadsWithLiveWorkerData,
+    worker_threads: workerThreadsWithWorkerData,
+    "node:worker_threads": workerThreadsWithWorkerData,
 };

package/esm/webpackLoaders/polyfills/workerThreadsPolyfill.js

@@ -1,5 +1,23 @@
-// @ts-ignore
-export const workerData = self.workerData;
+const globalSelf = self;
+export const workerData = new Proxy({}, {
+    get(_target, prop) {
+        var _a;
+        return (_a = globalSelf.workerData) === null || _a === void 0 ? void 0 : _a[prop];
+    },
+    has(_target, prop) {
+        return globalSelf.workerData && prop in globalSelf.workerData;
+    },
+    ownKeys(_target) {
+        return globalSelf.workerData
+            ? Reflect.ownKeys(globalSelf.workerData)
+            : [];
+    },
+    getOwnPropertyDescriptor(_target, prop) {
+        return globalSelf.workerData
+            ? Object.getOwnPropertyDescriptor(globalSelf.workerData, prop)
+            : undefined;
+    },
+});
 export const isMainThread = false;
 export const parentPort = {
     postMessage: (message) => self.postMessage(message),

package/esm/webpackLoaders/types.d.ts

@@ -1,6 +1,6 @@
 export interface LoaderRunnerMeta {
     workerData: {
-        workerId: number;
+        threadId: number;
         cwd: string;
         projectRoot: string;
     };

package/esm/webpackLoaders/worker.js

@@ -17,7 +17,7 @@ export function startLoaderWorker() {
         Project.init("");
         Project.setCwd(meta.workerData.cwd);
         self.workerData = {
-            workerId: meta.workerData.workerId,
+            threadId: meta.workerData.threadId,
             cwd: meta.workerData.cwd,
             projectRoot: meta.workerData.projectRoot,
             binding,

package/package.json

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