@mxpicture/build-api 0.2.25 → 0.2.26

package/dist/deps/FixWorkspaceDeps.js

@@ -19,8 +19,8 @@ export class IFixWorkspaceDeps {
             logInfo("🔧 Fixing workspace dependencies...\n");
         else
             logInfo("🔧 Restoring workspace dependencies...\n");
-        const ws = workspace();
-        const pkgs = await ws.loadPackages();
+        const ws = await workspace().read();
+        const pkgs = ws.packages;
         const mapEntries = this.buildMapEntries(pkgs);
         const versionMap = new Map();
         const workspacePackages = new Set();

package/dist/npmPublish/NpmPublisher.js

@@ -8,7 +8,7 @@ export const runNpmPublisher = async (params) => {
 export class NpmPublisher {
     constructor() { }
     async run() {
-        const pkgs = await workspace().loadPackages();
+        const pkgs = (await workspace().read()).packages;
         const results = await Promise.allSettled(pkgs.map((d) => this.runPackage(d)));
         const failures = results.filter((r) => r.status === "rejected");
         if (failures.length > 0) {

package/dist/pkg/SyncPkgVersion.js

@@ -41,9 +41,8 @@ export class SyncPkgVersion {
         }
     }
     async read() {
-        const ws = workspace();
-        await ws.loadPackages();
-        return [ws.mainPackage, ...ws.packages];
+        const ws = await workspace().read();
+        return [ws.rootPackage, ...ws.packages];
     }
     async write() {
         return workspace().write();

package/dist/pkg/UpdatePackages.js

@@ -45,8 +45,7 @@ export class UpdatePackages {
         }
     }
     async getPackages() {
-        const ws = workspace();
-        const pkgs = await ws.loadPackages();
+        const pkgs = (await workspace().read()).packages;
         const packageNames = new Set();
         this.filterPackages(pkgs.map((p) => p.content), packageNames);
         return packageNames;

package/dist/workspace/Workspace.d.ts

@@ -4,7 +4,7 @@ export declare const initWorkspace: (repoRoot: string) => Workspace;
 export declare const workspace: () => Workspace;
 interface WorkspaceData {
     pnpmWs: PnpmWorkspace;
-    mainPackage: Pkg;
+    rootPackage: Pkg;
     packages: Pkg[];
 }
 export declare class Workspace {
@@ -15,11 +15,10 @@ export declare class Workspace {
     private constructor();
     get pnpmWs(): PnpmWorkspace;
     get packages(): Pkg[];
-    get mainPackage(): Pkg;
+    get rootPackage(): Pkg;
     protected set data(c: WorkspaceData);
     protected get data(): WorkspaceData;
-    read(): Promise<void>;
-    loadPackages(): Promise<Pkg[]>;
+    read(): Promise<Workspace>;
     write(): Promise<void>;
 }
 export {};

package/dist/workspace/Workspace.js

@@ -24,8 +24,8 @@ export class Workspace {
     get packages() {
         return this.data.packages;
     }
-    get mainPackage() {
-        return this.data.mainPackage;
+    get rootPackage() {
+        return this.data.rootPackage;
     }
     set data(c) {
         this._data = c;
@@ -36,34 +36,27 @@ export class Workspace {
         return this._data;
     }
     async read() {
-        if (!this._data) {
-            const pnpmWs = await readWorkspaceYaml(this.repoRoot);
-            const packages = pnpmWs.packages.map((repoPath) => new Pkg(this.repoRoot, repoPath));
-            this.data = {
-                pnpmWs,
-                packages,
-                mainPackage: new Pkg(this.repoRoot, "."),
-            };
-        }
-    }
-    async loadPackages() {
-        try {
-            await this.read();
-            await Promise.all([
-                this.mainPackage.read(),
-                ...this.packages.map((pkg) => pkg.read()),
-            ]);
-            return this.packages;
-        }
-        catch {
-            return [];
-        }
+        if (this._data)
+            return this;
+        const pnpmWs = await readWorkspaceYaml(this.repoRoot);
+        const rootPackage = new Pkg(this.repoRoot, ".");
+        const packages = pnpmWs.packages.map((repoPath) => new Pkg(this.repoRoot, repoPath));
+        await Promise.all([
+            rootPackage.read(),
+            ...packages.map((pkg) => pkg.read()),
+        ]);
+        this.data = {
+            pnpmWs,
+            packages,
+            rootPackage,
+        };
+        return this;
     }
     async write() {
         if (!this._data)
             return;
         await Promise.all([
-            this.mainPackage.write(),
+            this.rootPackage.write(),
             ...this.packages.map((pkg) => pkg.write()),
         ]);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mxpicture/build-api",
-  "version": "0.2.25",
+  "version": "0.2.26",
   "description": "Build utilities API",
   "type": "module",
   "author": "MXPicture",