@mxpicture/build-api 0.2.20 → 0.2.22

package/dist/pkg/SyncPkgVersion.d.ts

@@ -3,11 +3,10 @@ import { WorkspacePaths } from "../workspace/WorkspacePaths.js";
 export declare const runSyncPkgVersion: (params: SyncPkgVersionParams) => Promise<void>;
 export declare class SyncPkgVersion {
     protected readonly paths: WorkspacePaths;
-    protected readonly bump?: BumpParams | undefined;
-    constructor(paths: WorkspacePaths, bump?: BumpParams | undefined);
+    protected readonly bump: BumpParams | null;
+    protected readonly noTag: boolean;
+    constructor(paths: WorkspacePaths, bump: BumpParams | null, noTag: boolean);
     run(): Promise<void>;
     protected read(): Promise<PackageEntry[]>;
-    protected readRoot(): Promise<PackageEntry>;
-    protected write(entries: PackageEntry[]): Promise<void>;
-    protected writeRoot(entry: PackageEntry): Promise<void>;
+    protected write(packages: PackageEntry[]): Promise<void>;
 }

package/dist/pkg/SyncPkgVersion.js

@@ -1,45 +1,56 @@
 import { join } from "node:path";
-import { readPackageEntries, readPackageEntryThrow, writePackageEntries, writePackageEntry, } from "../workspace/workspace.pkg.js";
+import { readPackageEntries, readPackageEntryThrow, writePackageEntries, } from "../workspace/workspace.pkg.js";
 import { WorkspacePaths } from "../workspace/WorkspacePaths.js";
 import { bumpVersion, compareVersionsGT, concatVersion, splitVersion, } from "./pkg.common.js";
-export const runSyncPkgVersion = async (params) => new SyncPkgVersion(WorkspacePaths.instance(params.repoRoot, params.workspacesName), params.bump).run();
+import { verifiedGit } from "../git/git.util.js";
+export const runSyncPkgVersion = async (params) => new SyncPkgVersion(WorkspacePaths.instance(params.repoRoot, params.workspacesName), params.noBump ? null : (params.bump ?? { patch: true }), !!params.noTag).run();
 export class SyncPkgVersion {
     paths;
     bump;
-    constructor(paths, bump) {
+    noTag;
+    constructor(paths, bump, noTag) {
         this.paths = paths;
         this.bump = bump;
+        this.noTag = noTag;
     }
     async run() {
-        const [entries, root] = await Promise.all([this.read(), this.readRoot()]);
-        let maxVersion = splitVersion(root.content.version);
-        for (const entry of entries) {
+        const packages = await this.read();
+        let maxVersion = {
+            major: 0,
+            minor: 0,
+            patch: 0,
+            prefix: null,
+        };
+        for (const entry of packages) {
             const version = splitVersion(entry.content.version);
             if (compareVersionsGT(version, maxVersion))
                 maxVersion = version;
         }
         // bump
-        maxVersion = bumpVersion(maxVersion, this.bump ?? { patch: true });
+        if (this.bump)
+            maxVersion = bumpVersion(maxVersion, this.bump);
         const newVersion = concatVersion(maxVersion);
         // set/update
-        root.content.version = newVersion;
-        root.modified = true;
-        for (const entry of entries) {
+        for (const entry of packages) {
             entry.content.version = newVersion;
             entry.modified = true;
         }
-        await Promise.all([this.write(entries), this.writeRoot(root)]);
+        await this.write(packages);
+        // create tag
+        if (!this.noTag) {
+            const git = await verifiedGit(this.paths.repoRoot);
+            await git.addAnnotatedTag(`v${newVersion}`, `Release v${newVersion}`);
+            await git.pushTags();
+        }
     }
     async read() {
-        return await readPackageEntries(this.paths.repoRoot);
-    }
-    async readRoot() {
-        return readPackageEntryThrow(join(this.paths.repoRoot, "package.json"));
-    }
-    async write(entries) {
-        await writePackageEntries(entries);
+        const [packages, root] = await Promise.all([
+            readPackageEntries(this.paths.repoRoot),
+            readPackageEntryThrow(join(this.paths.repoRoot, "package.json")),
+        ]);
+        return [...packages, root];
     }
-    async writeRoot(entry) {
-        await writePackageEntry(entry);
+    async write(packages) {
+        await writePackageEntries(packages);
     }
 }

package/dist/pkg/UpdatePackages.js

@@ -81,11 +81,13 @@ export class UpdatePackages {
         // Group by package name to identify duplicates
         const packageVersions = new Map();
         for (const dir of versionDirs) {
-            const match = dir.match(/@mxpicture\+([^@]+)@(.+)/);
+            const match = dir.match(/\/(@?[a-z-+]+)@(.+)$/);
             if (!match)
                 continue;
             const [, pkgName, version] = match;
-            const key = `@mxpicture/${pkgName.replace(/\+/g, "/")}`;
+            if (!micromatch.isMatch(pkgName, this.patternWoSlash))
+                continue;
+            const key = pkgName.replace(/\+/g, "/");
             if (!packageVersions.has(key))
                 packageVersions.set(key, []);
             packageVersions.get(key).push(version.split("_")[0]); // Remove peer dep suffixes

package/dist/types/types.package.d.ts

@@ -34,6 +34,8 @@ export interface BumpParams {
 }
 export interface SyncPkgVersionParams extends RunRepoRootWsParams {
     bump?: BumpParams;
+    noBump?: boolean;
+    noTag?: boolean;
 }
 export interface UpdatePackagesParams extends RunRepoRootWsParams {
     pattern: string;

package/package.json

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