@utoo/web 1.2.0-rc.1 → 1.2.0-rc.11

package/package.json

@@ -1,37 +1,38 @@
 {
   "name": "@utoo/web",
-  "version": "1.2.0-rc.1",
+  "version": "1.2.0-rc.11",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
   "files": [
-    "esm/*"
+    "esm"
   ],
   "scripts": {
-    "install-toolchain": "cargo install wasm-bindgen-cli@0.2.104 && brew install binaryen",
+    "install-toolchain": "cargo install wasm-bindgen-cli@0.2.104 && brew install binaryen llvm",
     "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",
     "bindgen-build": "wasm-bindgen ../../target/wasm32-unknown-unknown/release/utoo_wasm.wasm --out-dir src/utoo --out-name index --target web",
     "bindgen-build:local": "wasm-bindgen ../../target/wasm32-unknown-unknown/release-local/utoo_wasm.wasm --out-dir src/utoo --out-name index --target web",
-    "pretsc": "npm run build --workspace @utoo/pack-shared",
-    "tsc": "rm -rf esm && tsc -p ./tsconfig.json",
-    "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",
+    "tsc": "rm -rf esm && tsc -p ./tsconfig.build.json",
+    "copy-wasm": "cp src/utoo/index_bg.wasm esm/utoo",
+    "build:shared": "npx turbo run build --filter=@utoo/pack-shared",
+    "dev": "npm run build-wasm -- --profile wasm-dev && npm run bindgen-dev && npx turbo run tsc --filter=@utoo/web  && npm run build-loaderWorker && npm run copy-wasm",
+    "dev:pm": "npm run build-wasm:pm -- --profile wasm-dev && npm run bindgen-dev && npm run tsc && npm run copy-wasm",
     "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 build-loaderWorker && npm run wasm-opt",
-    "build:local": "npm run build-wasm -- --profile release-local && npm run bindgen-build:local && npm run tsc && npm run build-loaderWorker && cp src/utoo/index_bg.wasm esm/utoo",
-    "build-loaderWorker": "node cli/umd.js -e ./src/webpackLoaders/worker/index.ts -o ./esm/loaderWorker.js -t webworker",
-    "prepublishOnly": "npm run build"
+    "build:local": "CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ npm run build-wasm -- --profile release-local && npm run bindgen-build:local && npm run build:shared && npm run tsc && npm run build-loaderWorker && npm run copy-wasm",
+    "build-loaderWorker": "node cli/umd.js -e ./src/webpackLoaders/worker.ts -o ./esm/loaderWorker.js -t webworker",
+    "clean": "rm -rf esm src/utoo",
+    "prepublishOnly": "turbo run build --filter=@utoo/web"
   },
   "dependencies": {
-    "@utoo/pack-shared": "^0.0.7",
+    "@utoo/pack-shared": "^0.0.8",
     "comlink": "^4.4.2",
-    "micromatch": "^4.0.8",
     "systemjs": "^6.15.1"
   },
   "devDependencies": {
-    "@types/micromatch": "^4.0.8",
     "@types/systemjs": "^6.15.1",
+    "binaryen": "^125.0.0",
     "node-stdlib-browser": "^1.3.1",
     "ts-loader": "^9.5.2",
     "typescript": "^5.8.3",

package/esm/internalProject.js

@@ -1,110 +0,0 @@
-import { runLoaderWorkerPool } from "./loaderWorkerPool";
-import initWasm, { init_log_filter, Project as ProjectInternal, } from "./utoo";
-class InternalEndpoint {
-    constructor() {
-        this.loaderWorkerPoolInitialized = false;
-    }
-    // This should be called only once
-    async mount(opt) {
-        var _a;
-        this.options = opt;
-        const { cwd, wasmUrl, threadWorkerUrl, logFilter } = opt;
-        (_a = this.wasmInit) !== null && _a !== void 0 ? _a : (this.wasmInit = initWasm(wasmUrl));
-        await this.wasmInit;
-        // Initialize log filter after wasm init
-        const filter = logFilter || "pack_core=info,pack_api=info,utoo_wasm=info";
-        init_log_filter(filter);
-        this.projectInternal = new ProjectInternal(cwd, threadWorkerUrl);
-        return;
-    }
-    async install(packageLock, maxConcurrentDownloads) {
-        await this.wasmInit;
-        await this.projectInternal.install(packageLock, maxConcurrentDownloads);
-        return;
-    }
-    async build() {
-        var _a, _b;
-        const binding = await this.wasmInit;
-        if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.loaderWorkerUrl) && !this.loaderWorkerPoolInitialized) {
-            runLoaderWorkerPool(binding, this.options.cwd, this.projectInternal, this.options.loaderWorkerUrl, (_b = this.options) === null || _b === void 0 ? void 0 : _b.loadersImportMap);
-            this.loaderWorkerPoolInitialized = true;
-        }
-        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 internalEndpoint = new InternalEndpoint();
-export { internalEndpoint };

package/esm/loaderWorkerPool.d.ts

@@ -1,3 +0,0 @@
-import { Binding } from "./type";
-import { Project as ProjectInternal } from "./utoo";
-export declare const runLoaderWorkerPool: (binding: Binding, projectCwd: string, projectInternal: ProjectInternal, workerUrl: string, loadersImportMap?: Record<string, string>) => Promise<void>;

package/esm/loaderWorkerPool.js

@@ -1,125 +0,0 @@
-import { SAB_OP_COPY_FILE, SAB_OP_MKDIR, SAB_OP_READ_DIR, SAB_OP_READ_FILE, SAB_OP_RM, SAB_OP_RMDIR, SAB_OP_WRITE_FILE, SabComHost, } from "./sabcom";
-import initWasm, { registerWorkerScheduler, workerCreated, } from "./utoo";
-let nextWorkerId = 0;
-const loaderWorkers = {};
-export const runLoaderWorkerPool = async (binding, projectCwd, projectInternal, workerUrl, loadersImportMap) => {
-    registerWorkerScheduler(async (creation) => {
-        const { options: { filename, cwd }, } = creation;
-        nextWorkerId += 1;
-        const workerId = nextWorkerId;
-        const sab = new SharedArrayBuffer(1024 * 1024 * 10); // 10MB
-        const sabHost = new SabComHost(sab);
-        const worker = new Worker(workerUrl, { name: filename });
-        worker.onmessage = async (event) => {
-            if (event.data === "sab_request") {
-                const { op, data: path } = sabHost.readRequest();
-                try {
-                    if (op === SAB_OP_READ_FILE) {
-                        const bytes = await projectInternal.read(path);
-                        sabHost.writeResponse(bytes);
-                    }
-                    else if (op === SAB_OP_READ_DIR) {
-                        const entries = await projectInternal.readDir(path);
-                        sabHost.writeResponse(JSON.stringify(entries.map((e) => e.toJSON())));
-                    }
-                    else if (op === SAB_OP_WRITE_FILE) {
-                        const { content, encoding } = JSON.parse(path);
-                        const filePath = content.path;
-                        const fileContent = content.data;
-                        // TODO: handle binary content (base64?)
-                        await projectInternal.writeString(filePath, fileContent);
-                        sabHost.writeResponse("ok");
-                    }
-                    else if (op === SAB_OP_MKDIR) {
-                        const { path: dirPath, recursive } = JSON.parse(path);
-                        if (recursive) {
-                            await projectInternal.createDirAll(dirPath);
-                        }
-                        else {
-                            await projectInternal.createDir(dirPath);
-                        }
-                        sabHost.writeResponse("ok");
-                    }
-                    else if (op === SAB_OP_RM) {
-                        const { path: rmPath, recursive } = JSON.parse(path);
-                        // Mimic internalProject.rm logic
-                        const metadata = await projectInternal.metadata(rmPath);
-                        const type = metadata.toJSON().type;
-                        if (type === "file") {
-                            await projectInternal.removeFile(rmPath);
-                        }
-                        else if (type === "directory") {
-                            await projectInternal.removeDir(rmPath, !!recursive);
-                        }
-                        sabHost.writeResponse("ok");
-                    }
-                    else if (op === SAB_OP_RMDIR) {
-                        const { path: rmPath, recursive } = JSON.parse(path);
-                        await projectInternal.removeDir(rmPath, !!recursive);
-                        sabHost.writeResponse("ok");
-                    }
-                    else if (op === SAB_OP_COPY_FILE) {
-                        const { src, dst } = JSON.parse(path);
-                        await projectInternal.copyFile(src, dst);
-                        sabHost.writeResponse("ok");
-                    }
-                    else {
-                        sabHost.writeError("Unknown op");
-                    }
-                }
-                catch (e) {
-                    sabHost.writeError(e.message);
-                }
-            }
-        };
-        let finalCwd = cwd;
-        let finalFilename = filename;
-        if (projectCwd) {
-            const sep = "/";
-            const pCwd = projectCwd.endsWith(sep)
-                ? projectCwd.slice(0, -1)
-                : projectCwd;
-            let cCwd = cwd.startsWith(sep) ? cwd.slice(1) : cwd;
-            if (cCwd === "." || cCwd === "./") {
-                cCwd = "";
-            }
-            finalCwd = cCwd ? `${pCwd}${sep}${cCwd}` : pCwd;
-            if (!filename.startsWith("/")) {
-                let fName = filename;
-                if (fName.startsWith("./"))
-                    fName = fName.slice(2);
-                finalFilename = `${pCwd}${sep}${fName}`;
-            }
-        }
-        worker.postMessage([
-            // @ts-ignore
-            initWasm.__wbindgen_wasm_module,
-            binding.memory,
-            {
-                workerData: {
-                    cwd: finalCwd,
-                    workerId: workerId,
-                },
-                loaderAssets: {
-                    importMaps: { ...loadersImportMap },
-                    entrypoint: finalFilename,
-                },
-                sab,
-            },
-        ]);
-        const workers = loaderWorkers[filename] || (loaderWorkers[filename] = new Map());
-        workers.set(workerId, worker);
-        workerCreated(workerId);
-    }, (termination) => {
-        const { workerId, options } = termination;
-        const entrypoint = options.filename;
-        const workers = loaderWorkers[entrypoint];
-        if (workers) {
-            const worker = workers.get(workerId);
-            if (worker) {
-                worker.terminate();
-                workers.delete(workerId);
-            }
-        }
-    });
-};

package/esm/sabcom.d.ts

@@ -1,31 +0,0 @@
-export declare const SAB_STATE_IDLE = 0;
-export declare const SAB_STATE_REQUEST = 1;
-export declare const SAB_STATE_RESPONSE = 2;
-export declare const SAB_STATE_ERROR = 3;
-export declare const SAB_OP_READ_FILE = 1;
-export declare const SAB_OP_READ_DIR = 2;
-export declare const SAB_OP_WRITE_FILE = 3;
-export declare const SAB_OP_MKDIR = 4;
-export declare const SAB_OP_RM = 5;
-export declare const SAB_OP_RMDIR = 6;
-export declare const SAB_OP_COPY_FILE = 7;
-export declare class SabComHost {
-    private sab;
-    private int32;
-    private uint8;
-    constructor(sab: SharedArrayBuffer);
-    readRequest(): {
-        op: number;
-        data: string;
-    };
-    writeResponse(data: Uint8Array | string): void;
-    writeError(message: string): void;
-}
-export declare class SabComClient {
-    private sab;
-    private notifyHost;
-    private int32;
-    private uint8;
-    constructor(sab: SharedArrayBuffer, notifyHost: () => void);
-    call(op: number, data: string): Uint8Array<ArrayBuffer>;
-}

package/esm/sabcom.js

@@ -1,71 +0,0 @@
-export const SAB_STATE_IDLE = 0;
-export const SAB_STATE_REQUEST = 1;
-export const SAB_STATE_RESPONSE = 2;
-export const SAB_STATE_ERROR = 3;
-export const SAB_OP_READ_FILE = 1;
-export const SAB_OP_READ_DIR = 2;
-export const SAB_OP_WRITE_FILE = 3;
-export const SAB_OP_MKDIR = 4;
-export const SAB_OP_RM = 5;
-export const SAB_OP_RMDIR = 6;
-export const SAB_OP_COPY_FILE = 7;
-// Layout:
-// 0: State (Int32)
-// 1: Op (Int32)
-// 2: Data Length (Int32)
-// 12...: Data (Uint8) - Start at byte 12 (3 * 4 bytes)
-export class SabComHost {
-    constructor(sab) {
-        this.sab = sab;
-        this.int32 = new Int32Array(sab);
-        this.uint8 = new Uint8Array(sab);
-    }
-    readRequest() {
-        const op = this.int32[1];
-        const len = this.int32[2];
-        const data = new TextDecoder().decode(this.uint8.slice(12, 12 + len));
-        return { op, data };
-    }
-    writeResponse(data) {
-        if (typeof data === "string") {
-            data = new TextEncoder().encode(data);
-        }
-        // TODO: Check size overflow
-        this.int32[2] = data.length;
-        this.uint8.set(data, 12);
-        Atomics.store(this.int32, 0, SAB_STATE_RESPONSE);
-        Atomics.notify(this.int32, 0);
-    }
-    writeError(message) {
-        const data = new TextEncoder().encode(message);
-        this.int32[2] = data.length;
-        this.uint8.set(data, 12);
-        Atomics.store(this.int32, 0, SAB_STATE_ERROR);
-        Atomics.notify(this.int32, 0);
-    }
-}
-export class SabComClient {
-    constructor(sab, notifyHost) {
-        this.sab = sab;
-        this.notifyHost = notifyHost;
-        this.int32 = new Int32Array(sab);
-        this.uint8 = new Uint8Array(sab);
-    }
-    call(op, data) {
-        const encoded = new TextEncoder().encode(data);
-        this.int32[1] = op;
-        this.int32[2] = encoded.length;
-        this.uint8.set(encoded, 12);
-        Atomics.store(this.int32, 0, SAB_STATE_REQUEST);
-        this.notifyHost();
-        Atomics.wait(this.int32, 0, SAB_STATE_REQUEST);
-        const state = Atomics.load(this.int32, 0);
-        if (state === SAB_STATE_ERROR) {
-            const len = this.int32[2];
-            const msg = new TextDecoder().decode(this.uint8.slice(12, 12 + len));
-            throw new Error(msg);
-        }
-        const len = this.int32[2];
-        return this.uint8.slice(12, 12 + len);
-    }
-}

package/esm/type.js

@@ -1,12 +0,0 @@
-export class Dirent {
-    constructor(rawDirent) {
-        this.rawDirent = rawDirent;
-        this.name = this.rawDirent.name;
-    }
-    isDirectory() {
-        return this.rawDirent.type === "directory";
-    }
-    isFile() {
-        return this.rawDirent.type === "file";
-    }
-}

package/esm/webpackLoaders/loaders/less-loader/index.d.ts

@@ -1,3 +0,0 @@
-export const __esModule: boolean;
-export default lessLoader;
-declare function lessLoader(source: any): Promise<void>;

package/esm/webpackLoaders/loaders/less-loader/index.js

@@ -1,103 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-exports.default = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _options = _interopRequireDefault(require("./options.json"));
-var _utils = require("./utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-async function lessLoader(source) {
-    const options = this.getOptions(_options.default);
-    const callback = this.async();
-    let implementation;
-    try {
-        implementation = (0, _utils.getLessImplementation)(this, options.implementation);
-    }
-    catch (error) {
-        callback(error);
-        return;
-    }
-    if (!implementation) {
-        callback(new Error(`The Less implementation "${options.implementation}" not found`));
-        return;
-    }
-    const lessOptions = (0, _utils.getLessOptions)(this, options, implementation);
-    const useSourceMap = typeof options.sourceMap === "boolean" ? options.sourceMap : this.sourceMap;
-    if (useSourceMap) {
-        lessOptions.sourceMap = {
-            outputSourceFiles: true
-        };
-    }
-    let data = source;
-    if (typeof options.additionalData !== "undefined") {
-        data = typeof options.additionalData === "function" ? `${await options.additionalData(data, this)}` : `${options.additionalData}\n${data}`;
-    }
-    const logger = this.getLogger("less-loader");
-    const loaderContext = this;
-    const loggerListener = {
-        error(message) {
-            // TODO enable by default in the next major release
-            if (options.lessLogAsWarnOrErr) {
-                loaderContext.emitError(new Error(message));
-            }
-            else {
-                logger.error(message);
-            }
-        },
-        warn(message) {
-            // TODO enable by default in the next major release
-            if (options.lessLogAsWarnOrErr) {
-                loaderContext.emitWarning(new Error(message));
-            }
-            else {
-                logger.warn(message);
-            }
-        },
-        info(message) {
-            logger.log(message);
-        },
-        debug(message) {
-            logger.debug(message);
-        }
-    };
-    implementation.logger.addListener(loggerListener);
-    let result;
-    try {
-        result = await implementation.render(data, lessOptions);
-    }
-    catch (error) {
-        if (error.filename) {
-            // `less` returns forward slashes on windows when `webpack` resolver return an absolute windows path in `WebpackFileManager`
-            // Ref: https://github.com/webpack-contrib/less-loader/issues/357
-            this.addDependency(_path.default.normalize(error.filename));
-        }
-        callback((0, _utils.errorFactory)(error));
-        return;
-    }
-    finally {
-        // Fix memory leaks in `less`
-        implementation.logger.removeListener(loggerListener);
-        delete lessOptions.pluginManager.webpackLoaderContext;
-        delete lessOptions.pluginManager;
-    }
-    const { css, imports } = result;
-    imports.forEach(item => {
-        if ((0, _utils.isUnsupportedUrl)(item)) {
-            return;
-        }
-        // `less` return forward slashes on windows when `webpack` resolver return an absolute windows path in `WebpackFileManager`
-        // Ref: https://github.com/webpack-contrib/less-loader/issues/357
-        const normalizedItem = _path.default.normalize(item);
-        // Custom `importer` can return only `contents` so item will be relative
-        if (_path.default.isAbsolute(normalizedItem)) {
-            this.addDependency(normalizedItem);
-        }
-    });
-    let map = typeof result.map === "string" ? JSON.parse(result.map) : result.map;
-    if (map && useSourceMap) {
-        map = (0, _utils.normalizeSourceMap)(map, this.rootContext);
-    }
-    callback(null, css, map);
-}
-var _default = exports.default = lessLoader;

package/esm/webpackLoaders/loaders/less-loader/options.json

@@ -1,67 +0,0 @@
-{
-    "title": "Less Loader options",
-    "type": "object",
-    "properties": {
-        "lessOptions": {
-            "description": "Options to pass through to `Less`.",
-            "link": "https://github.com/webpack-contrib/less-loader#lessoptions",
-            "anyOf": [
-                {
-                    "type": "object",
-                    "additionalProperties": true
-                },
-                {
-                    "instanceof": "Function"
-                }
-            ]
-        },
-        "additionalData": {
-            "description": "Prepends/Appends `Less` code to the actual entry file.",
-            "link": "https://github.com/webpack-contrib/less-loader#additionalData",
-            "anyOf": [
-                {
-                    "type": "string"
-                },
-                {
-                    "instanceof": "Function"
-                }
-            ]
-        },
-        "sourceMap": {
-            "description": "Enables/Disables generation of source maps.",
-            "link": "https://github.com/webpack-contrib/less-loader#sourcemap",
-            "type": "boolean"
-        },
-        "webpackImporter": {
-            "description": "Enables/Disables default `webpack` importer.",
-            "link": "https://github.com/webpack-contrib/less-loader#webpackimporter",
-            "anyOf": [
-                {
-                    "type": "boolean"
-                },
-                {
-                    "type": "string",
-                    "enum": ["only"]
-                }
-            ]
-        },
-        "implementation": {
-            "description": "The implementation of the `Less` to be used.",
-            "link": "https://github.com/webpack-contrib/less-loader#implementation",
-            "anyOf": [
-                {
-                    "type": "string"
-                },
-                {
-                    "type": "object"
-                }
-            ]
-        },
-        "lessLogAsWarnOrErr": {
-            "description": "Less warnings and errors will be webpack warnings or errors.",
-            "link": "https://github.com/webpack-contrib/less-loader#lesslogaswarnorerr",
-            "type": "boolean"
-        }
-    },
-    "additionalProperties": false
-}

package/esm/webpackLoaders/loaders/less-loader/utils.d.ts

@@ -1,14 +0,0 @@
-export const __esModule: boolean;
-export function errorFactory(error: any): Error;
-export function getLessImplementation(loaderContext: any, implementation: any): any;
-/**
- * Get the `less` options from the loader context and normalizes its values
- *
- * @param {object} loaderContext
- * @param {object} loaderOptions
- * @param {object} implementation
- * @returns {Object}
- */
-export function getLessOptions(loaderContext: object, loaderOptions: object, implementation: object): Object;
-export function isUnsupportedUrl(url: any): boolean;
-export function normalizeSourceMap(map: any): any;