@utoo/web 1.0.0 → 1.0.2

package/esm/worker.js

@@ -1,118 +1,11 @@
 import * as comlink from "comlink";
+import { internalEndpoint } from "./internalProject";
 import { HandShake } from "./message";
-import initWasm, { Project as ProjectInternal } from "./utoo";
-const projectEndpoint = {
-    projectInternal: undefined,
-    wasmInit: undefined,
-    // This should be called only once
-    async mount(opt) {
-        var _a;
-        const { cwd, wasmUrl, threadWorkerUrl, logFilter } = opt;
-        // Set global log filter before wasm init
-        if (logFilter) {
-            globalThis.__UTOO_LOG_FILTER__ = logFilter;
-        }
-        (_a = this.wasmInit) !== null && _a !== void 0 ? _a : (this.wasmInit = initWasm(wasmUrl));
-        await this.wasmInit;
-        // Pass logFilter to thread worker via URL query string
-        let finalThreadWorkerUrl = threadWorkerUrl;
-        if (logFilter) {
-            const url = new URL(threadWorkerUrl, self.location.href);
-            url.searchParams.set("logFilter", logFilter);
-            finalThreadWorkerUrl = url.toString();
-        }
-        this.projectInternal = new ProjectInternal(cwd, finalThreadWorkerUrl);
-        return;
-    },
-    async install(packageLock, maxConcurrentDownloads) {
-        await this.wasmInit;
-        await this.projectInternal.install(packageLock, maxConcurrentDownloads);
-        return;
-    },
-    async build() {
-        await this.wasmInit;
-        return await this.projectInternal.build();
-    },
-    async readFile(path, encoding) {
-        await this.wasmInit;
-        let ret;
-        if (encoding === "utf8") {
-            ret = await this.projectInternal.readToString(path);
-        }
-        else {
-            ret = await this.projectInternal.read(path);
-        }
-        return ret;
-    },
-    async writeFile(path, content, _encoding) {
-        await this.wasmInit;
-        if (typeof content === "string") {
-            return await this.projectInternal.writeString(path, content);
-        }
-        else {
-            return await this.projectInternal.write(path, content);
-        }
-    },
-    async copyFile(src, dst) {
-        await this.wasmInit;
-        return await this.projectInternal.copyFile(src, dst);
-    },
-    async readdir(path, options) {
-        await this.wasmInit;
-        const dirEntries = (options === null || options === void 0 ? void 0 : options.recursive)
-            ? await this.projectInternal.readDir(path)
-            : // TODO: support recursive readDirAll
-                await this.projectInternal.readDir(path);
-        const rawDirents = dirEntries.map((e) => {
-            const dir = e.toJSON();
-            return {
-                name: dir.name,
-                type: dir.type,
-            };
-        });
-        // WARN: This is a hack, functions can not be structurally cloned
-        return rawDirents;
-    },
-    async mkdir(path, options) {
-        await this.wasmInit;
-        if (options === null || options === void 0 ? void 0 : options.recursive) {
-            return await this.projectInternal.createDirAll(path);
-        }
-        else {
-            return await this.projectInternal.createDir(path);
-        }
-    },
-    async rm(path, options) {
-        await this.wasmInit;
-        let metadata = (await this.projectInternal.metadata(path)).toJSON();
-        switch (metadata.type) {
-            case "file":
-                return await this.projectInternal.removeFile(path);
-            case "directory":
-                return await this.projectInternal.removeDir(path, !!(options === null || options === void 0 ? void 0 : options.recursive));
-            default:
-                // nothing to remove now
-                break;
-        }
-    },
-    async rmdir(path, options) {
-        await this.wasmInit;
-        return await this.projectInternal.removeDir(path, !!(options === null || options === void 0 ? void 0 : options.recursive));
-    },
-    async gzip(files) {
-        await this.wasmInit;
-        return await this.projectInternal.gzip(files);
-    },
-    async sigMd5(content) {
-        await this.wasmInit;
-        return await this.projectInternal.sigMd5(content);
-    },
-};
 const ConnectedPorts = new Set();
 self.addEventListener("message", (e) => {
     const port = e.ports[0];
     if (e.data === HandShake && !ConnectedPorts.has(port)) {
-        comlink.expose(projectEndpoint, port);
+        comlink.expose(internalEndpoint, port);
         ConnectedPorts.add(port);
     }
 });

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@utoo/web",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
   "files": [
     "esm/*"
   ],
   "scripts": {
-    "install-toolchain": "cargo install wasm-bindgen-cli && brew install binaryen",
+    "install-toolchain": "cargo install wasm-bindgen-cli@0.2.104 && brew install binaryen",
     "build-wasm": "cargo build -p utoo-wasm --target wasm32-unknown-unknown -Z build-std=panic_abort,std",
     "build-wasm:pm": "cargo build -p utoo-wasm --target wasm32-unknown-unknown --no-default-features -Z build-std=panic_abort,std",
     "bindgen-dev": "wasm-bindgen ../../target/wasm32-unknown-unknown/wasm-dev/utoo_wasm.wasm --out-dir src/utoo --out-name index --target web --debug --keep-debug --no-demangle",
@@ -18,16 +18,26 @@
     "dev": "npm run build-wasm -- --profile wasm-dev && npm run bindgen-dev && npm run tsc && cp src/utoo/index_bg.wasm esm/utoo",
     "dev:pm": "npm run build-wasm:pm -- --profile wasm-dev && npm run bindgen-dev && npm run tsc && cp src/utoo/index_bg.wasm esm/utoo",
     "wasm-opt": "wasm-opt src/utoo/index_bg.wasm -o esm/utoo/index_bg.wasm --enable-threads --enable-bulk-memory --enable-nontrapping-float-to-int -Oz",
-    "build": "npm run build-wasm -- --release && npm run bindgen-build && npm run tsc && npm run wasm-opt",
-    "build:local": "npm run build-wasm -- --profile release-local && npm run bindgen-build:local && npm run tsc && cp src/utoo/index_bg.wasm esm/utoo",
+    "build": "npm run build-wasm -- --release && npm run bindgen-build && npm run build-loaderWorker && npm run tsc && npm run wasm-opt",
+    "build:local": "npm run build-wasm -- --profile release-local && npm run bindgen-build:local && npm run tsc && cp src/utoo/index_bg.wasm esm/utoo && npm run build-loaderWorker",
+    "build-loaderWorker": "node cli/umd.js -e ./src/webpackLoaders/worker/index.ts -o ./src/webpackLoaders/workerContent.js -t webworker --se true",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "comlink": "^4.4.2",
+    "systemjs": "^6.15.1",
+    "loader-runner": "^4.3.0",
+    "less": "^4.0.0",
     "@utoo/pack-shared": "^0.0.7"
   },
   "devDependencies": {
-    "typescript": "^5.8.3"
+    "typescript": "^5.8.3",
+    "@types/systemjs": "^6.15.1",
+    "webpack": "^5.0.0",
+    "webpack-merge": "^6.0.1",
+    "node-stdlib-browser": "^1.3.1",
+    "ts-loader": "^9.5.2",
+    "yargs": "^18.0.0"
   },
   "engines": {
     "node": ">= 20"