@utoo/web 0.0.1-alpha.3 → 0.0.1-alpha.9

package/esm/index.d.ts

@@ -1,17 +1,22 @@
-import { ProjectEndpoint, DirEntry } from "./type";
+import { Dirent, ProjectEndpoint } from "./type";
+import { MountOpt } from "./worker";
 export declare class Project implements ProjectEndpoint {
     #private;
-    private cwd;
     private remote;
-    constructor(cwd: string);
+    constructor(opt: MountOpt & {
+        worker?: Worker;
+    });
     install(packageLock: string): Promise<void>;
     build(): Promise<void>;
-    readFile(path: string): Promise<string>;
-    writeFile(path: string, content: string): Promise<void>;
+    readFile(path: string, encoding?: "utf8"): Promise<any>;
+    writeFile(path: string, content: string | Uint8Array, encoding?: "utf8"): Promise<void>;
     copyFile(src: string, dst: string): Promise<void>;
-    readDir(path: string): Promise<DirEntry[]>;
-    createDir(path: string): Promise<void>;
-    createDirAll(path: string): Promise<void>;
-    static fork(port1: MessagePort, port2: MessagePort): ProjectEndpoint;
+    readdir(path: string, options?: {
+        recursive?: boolean;
+    }): Promise<Dirent[]>;
+    mkdir(path: string, options?: {
+        recursive?: boolean;
+    }): Promise<void>;
+    static fork(channel: MessageChannel): ProjectEndpoint;
 }
 export * from "./type";

package/esm/index.js

@@ -12,17 +12,19 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var _Project_tunnel;
 import * as comlink from "comlink";
 import { Fork, HandShake } from "./message";
+import { Dirent } from "./type";
 let ProjectWorker;
 const ConnectedPorts = new Set();
 export class Project {
-    constructor(cwd) {
+    constructor(opt) {
         var _a, _b;
         _Project_tunnel.set(this, void 0);
-        this.cwd = cwd;
+        const { cwd, worker, wasmUrl } = opt;
         const { port1, port2 } = new MessageChannel();
         (_a = this.remote) !== null && _a !== void 0 ? _a : (this.remote = comlink.wrap(port1));
         if (!ProjectWorker) {
-            ProjectWorker = new Worker(new URL("./worker", import.meta.url));
+            ProjectWorker =
+                worker || new Worker(new URL("./worker", import.meta.url));
             self.addEventListener("message", (e) => {
                 const port = e.ports[0];
                 if (e.data === Fork && !ConnectedPorts.has(port)) {
@@ -31,7 +33,7 @@ export class Project {
             });
         }
         ProjectWorker.postMessage(HandShake, [port2]);
-        __classPrivateFieldSet(this, _Project_tunnel, (_b = __classPrivateFieldGet(this, _Project_tunnel, "f")) !== null && _b !== void 0 ? _b : this.remote.mount(this.cwd), "f");
+        __classPrivateFieldSet(this, _Project_tunnel, (_b = __classPrivateFieldGet(this, _Project_tunnel, "f")) !== null && _b !== void 0 ? _b : this.remote.mount({ cwd, wasmUrl }), "f");
     }
     async install(packageLock) {
         await __classPrivateFieldGet(this, _Project_tunnel, "f");
@@ -41,34 +43,33 @@ export class Project {
         await __classPrivateFieldGet(this, _Project_tunnel, "f");
         return await this.remote.build();
     }
-    async readFile(path) {
+    async readFile(path, encoding) {
         await __classPrivateFieldGet(this, _Project_tunnel, "f");
-        return await this.remote.readFile(path);
+        return (await this.remote.readFile(path, encoding));
     }
-    async writeFile(path, content) {
+    async writeFile(path, content, encoding) {
         await __classPrivateFieldGet(this, _Project_tunnel, "f");
-        return await this.remote.writeFile(path, content);
+        return await this.remote.writeFile(path, content, encoding);
     }
     async copyFile(src, dst) {
         await __classPrivateFieldGet(this, _Project_tunnel, "f");
         return await this.remote.copyFile(src, dst);
     }
-    async readDir(path) {
+    async readdir(path, options) {
         await __classPrivateFieldGet(this, _Project_tunnel, "f");
-        return await this.remote.readDir(path);
+        const dirEntry = (await this.remote.readdir(path, options));
+        return dirEntry.map((e) => new Dirent(e));
     }
-    async createDir(path) {
+    async mkdir(path, options) {
         await __classPrivateFieldGet(this, _Project_tunnel, "f");
-        return await this.remote.createDir(path);
+        return await this.remote.mkdir(path, options);
     }
-    async createDirAll(path) {
-        await __classPrivateFieldGet(this, _Project_tunnel, "f");
-        return await this.remote.createDirAll(path);
-    }
-    // This should be called from different worker
-    static fork(port1, port2) {
-        self.postMessage(Fork, [port2]);
-        return new ForkedProject(port1);
+    static fork(channel) {
+        self.postMessage(Fork, {
+            targetOrigin: "*",
+            transfer: [channel.port2],
+        });
+        return new ForkedProject(channel.port1);
     }
 }
 _Project_tunnel = new WeakMap();
@@ -83,23 +84,20 @@ class ForkedProject {
     async build() {
         return await this.endpoint.build();
     }
-    async readFile(path) {
-        return await this.endpoint.readFile(path);
+    async readFile(path, encoding) {
+        return (await this.endpoint.readFile(path, encoding));
     }
-    async writeFile(path, content) {
-        return await this.endpoint.writeFile(path, content);
+    async writeFile(path, content, encoding) {
+        return await this.endpoint.writeFile(path, content, encoding);
     }
     async copyFile(src, dst) {
         return await this.endpoint.copyFile(src, dst);
     }
-    async readDir(path) {
-        return await this.endpoint.readDir(path);
-    }
-    async createDir(path) {
-        return await this.endpoint.createDir(path);
+    async readdir(path, options) {
+        return await this.endpoint.readdir(path, options);
     }
-    async createDirAll(path) {
-        return await this.endpoint.createDirAll(path);
+    async mkdir(path, options) {
+        return await this.endpoint.mkdir(path, options);
     }
 }
 export * from "./type";

package/esm/type.d.ts

@@ -1,15 +1,28 @@
-import type { DirEntryType } from "./utoo";
-export interface DirEntry {
+import { DirEntryType } from "./utoo";
+export interface RawDirent {
     name: string;
     type: DirEntryType;
 }
+export declare class Dirent {
+    private rawDirent;
+    name: string;
+    constructor(rawDirent: RawDirent);
+    isDirectory(): boolean;
+    isFile(): boolean;
+}
 export interface ProjectEndpoint {
     install: (packageLock: string) => Promise<void>;
     build: () => Promise<void>;
-    readFile(path: string): Promise<string>;
-    writeFile(path: string, content: string): Promise<void>;
-    readDir(path: string): Promise<DirEntry[]>;
-    createDir(path: string): Promise<void>;
-    createDirAll(path: string): Promise<void>;
+    readFile(path: string): Promise<Uint8Array>;
+    readFile(path: string, encoding?: "utf8"): Promise<string>;
+    writeFile(path: string, content: string | Uint8Array, encoding?: "utf8"): Promise<void>;
+    readdir(path: string, options?: {
+        recursive?: boolean;
+    }): Promise<Dirent[]>;
+    mkdir(path: string, options?: {
+        recursive?: boolean;
+    }): Promise<void>;
     copyFile(src: string, dst: string): Promise<void>;
 }
+export interface ProjectEndpoint {
+}

package/esm/type.js

@@ -1 +1,12 @@
-export {};
+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/utoo/index.d.ts

@@ -1,18 +1,15 @@
+export function init_pack(): void;
 /**
- * @param {PartialProjectOptions} partial_options
- * @returns {Promise<void>}
+ * Entry point for web workers
+ * @param {number} ptr
  */
-export function build(partial_options: PartialProjectOptions): Promise<void>;
-export function init_pack(): void;
+export function wasm_thread_entry_point(ptr: number): void;
 export class CreateSyncAccessHandleOptions {
     static __wrap(ptr: any): any;
     __destroy_into_raw(): number | undefined;
     __wbg_ptr: number | undefined;
     free(): void;
 }
-/**
- * Directory entry with name and type information
- */
 export class DirEntry {
     static __wrap(ptr: any): any;
     toJSON(): {
@@ -40,27 +37,6 @@ export class DirEntry {
      */
     get type(): DirEntryType;
 }
-export class PartialProjectOptions {
-    __destroy_into_raw(): number | undefined;
-    __wbg_ptr: number | undefined;
-    free(): void;
-    /**
-     * @param {string} arg0
-     */
-    set project_path(arg0: string);
-    /**
-     * @returns {string}
-     */
-    get project_path(): string;
-    /**
-     * @param {string | null} [arg0]
-     */
-    set config(arg0: string | null);
-    /**
-     * @returns {string | undefined}
-     */
-    get config(): string | undefined;
-}
 export class Project {
     /**
      * @param {string} cwd
@@ -79,20 +55,31 @@ export class Project {
      */
     install(package_lock: string): Promise<void>;
     /**
-     * @returns {Promise<void>}
+     * @returns {Promise<any>}
      */
-    build(): Promise<void>;
+    build(): Promise<any>;
+    /**
+     * @param {string} path
+     * @returns {Promise<Uint8Array>}
+     */
+    read(path: string): Promise<Uint8Array>;
     /**
      * @param {string} path
      * @returns {Promise<string>}
      */
-    readFile(path: string): Promise<string>;
+    readToString(path: string): Promise<string>;
+    /**
+     * @param {string} path
+     * @param {Uint8Array} content
+     * @returns {Promise<void>}
+     */
+    write(path: string, content: Uint8Array): Promise<void>;
     /**
      * @param {string} path
      * @param {string} content
      * @returns {Promise<void>}
      */
-    writeFile(path: string, content: string): Promise<void>;
+    writeString(path: string, content: string): Promise<void>;
     /**
      * @param {string} path
      * @returns {Promise<DirEntry[]>}
@@ -116,5 +103,5 @@ export class Project {
     copyFile(src: string, dst: string): Promise<void>;
 }
 export default __wbg_init;
-export function initSync(module: any): any;
-declare function __wbg_init(module_or_path: any): Promise<any>;
+export function initSync(module: any, memory: any): any;
+declare function __wbg_init(module_or_path: any, memory: any): Promise<any>;