@tahminator/pipeline 1.0.53 → 1.0.55-beta.46bb197d

package/dist/index.d.ts

@@ -6,3 +6,4 @@ export * from "./pulumi";
 export * from "./types";
 export * from "./env";
 export * from "./utils";
+export * from "./versioning";

package/dist/index.js

@@ -6,3 +6,4 @@ export * from "./pulumi";
 export * from "./types";
 export * from "./env";
 export * from "./utils";
+export * from "./versioning";

package/dist/internal/upload-npm/beta/index.js

@@ -4,6 +4,8 @@ import { EnvClient, EnvClientStrategy } from "../../../env";
 import { GitHubClient } from "../../../gh";
 import { NPMClient } from "../../../npm";
 import { Utils } from "../../../utils";
+import { VersioningClient } from "../../../versioning";
+import { VersioningStrategy } from "../../../versioning/types";
 const { sha, prId } = await yargs(hideBin(process.argv))
     .option("sha", {
     type: "string",
@@ -24,13 +26,14 @@ async function main() {
         privateKey: await Utils.decodeBase64EncodedString(githubAppPrivateKeyB64),
     });
     const npmClient = await NPMClient.create();
+    const versioningClient = new VersioningClient(VersioningStrategy.JSTS);
     const shortSha = await getShortSha(sha);
     const lastTag = (await ghClient.getLatestTag()) ?? GitHubClient.BASE_VERSION;
     const betaVersion = `${lastTag}-beta.${shortSha}`;
     if (!Utils.SemVer.validate(betaVersion)) {
         throw new Error(`Generated invalid beta version: ${betaVersion}`);
     }
-    await Utils.updateAllPackageJsonsWithVersion(betaVersion);
+    await versioningClient.update(betaVersion);
     await npmClient.publish(false, true);
     console.log(`Uploaded ${betaVersion} to NPM.`);
     await ghClient.sendPrMessage({
@@ -40,7 +43,7 @@ async function main() {
         message: `
 ## Test Version Uploaded
 
-Uploaded ${betaVersion} to NPM. View version on NPM registry [here](https://www.npmjs.com/package/@tahminator/pipeline/v/${betaVersion}).
+Uploaded \`${betaVersion}\` to NPM. View version on NPM registry [here](https://www.npmjs.com/package/@tahminator/pipeline/v/${betaVersion}).
 `,
     });
 }

package/dist/pulumi/strategy/workspace.js

@@ -45,10 +45,14 @@ export class LocalWorkspacePulumiClientStrategy {
                 return line;
             }
             const trimmed = line.trimStart();
-            const symbol = trimmed.startsWith("+-") ? "!"
-                : trimmed.startsWith("+") ? "+"
-                    : trimmed.startsWith("-") ? "-"
-                        : trimmed.startsWith("~") ? "!"
+            const symbol = trimmed.startsWith("+-") ?
+                "-" // replace
+                : trimmed.startsWith("+") ?
+                    "+" // create
+                    : trimmed.startsWith("-") ?
+                        "-" // delete
+                        : trimmed.startsWith("~") ?
+                            "!" // modify
                             : null;
             if (!symbol) {
                 return line;

package/dist/utils/client.d.ts

@@ -9,7 +9,6 @@ export declare class Utils {
     static Log: typeof Log;
     static SemVer: typeof SemVer;
     static generateShortId(...args: Parameters<typeof generateShortId>): string;
-    static updateAllPackageJsonsWithVersion(version: string): Promise<void>;
     static isCmdAvailable(...args: Parameters<typeof isCmdAvailable>): Promise<boolean>;
     static decodeBase64EncodedString(...args: Parameters<typeof decodeBase64EncodedString>): Promise<string>;
 }

package/dist/utils/client.js

@@ -1,4 +1,3 @@
-import { $ } from "bun";
 import { decodeBase64EncodedString } from "./b64";
 import { isCmdAvailable } from "./cmd";
 import { Colors } from "./colors";
@@ -13,18 +12,6 @@ export class Utils {
     static generateShortId(...args) {
         return generateShortId(...args);
     }
-    static async updateAllPackageJsonsWithVersion(version) {
-        const files = (await $ `find . -name "package.json" -not -path "*/node_modules/*"`.text())
-            .trim()
-            .split("\n");
-        for (const fileLocation of files) {
-            const file = Bun.file(fileLocation);
-            const pkg = await file.json();
-            pkg.version = version;
-            await Bun.write(fileLocation, JSON.stringify(pkg, null, 2) + "\n");
-            console.log(`Successfully updated version in ${fileLocation} to ${version}`);
-        }
-    }
     static async isCmdAvailable(...args) {
         return isCmdAvailable(...args);
     }

package/dist/versioning/base.d.ts

@@ -0,0 +1,6 @@
+import type { IVersioningClient } from "./types";
+export declare abstract class BaseVersioningClient implements IVersioningClient {
+    abstract update(version: string): Promise<void>;
+    protected logFileLocationUpdated(fileLocation: string, version: string): void;
+    protected findFiles(filePattern: string, pathExclusionRegex?: RegExp): Promise<string[]>;
+}

package/dist/versioning/base.js

@@ -0,0 +1,16 @@
+export class BaseVersioningClient {
+    logFileLocationUpdated(fileLocation, version) {
+        console.log(`Successfully updated version in ${fileLocation} to ${version}`);
+    }
+    async findFiles(filePattern, pathExclusionRegex) {
+        const glob = new Bun.Glob(filePattern);
+        const files = [];
+        for await (const file of glob.scan(".")) {
+            if (pathExclusionRegex && pathExclusionRegex.test(file)) {
+                continue;
+            }
+            files.push(file);
+        }
+        return files;
+    }
+}

package/dist/versioning/client.d.ts

@@ -0,0 +1,7 @@
+import { VersioningStrategy, type IVersioningClient } from "./types";
+export declare class VersioningClient implements IVersioningClient {
+    private readonly delegate;
+    constructor(strategy: VersioningStrategy);
+    private getDelegate;
+    update(version: string): Promise<void>;
+}

package/dist/versioning/client.js

@@ -0,0 +1,20 @@
+import { JavaMavenVersioningClient } from "./java/maven";
+import { JavascriptPackageJsonVersioningClient } from "./jsts";
+import { VersioningStrategy } from "./types";
+export class VersioningClient {
+    delegate;
+    constructor(strategy) {
+        this.delegate = this.getDelegate(strategy);
+    }
+    getDelegate(strategy) {
+        switch (strategy) {
+            case VersioningStrategy.JSTS:
+                return new JavascriptPackageJsonVersioningClient();
+            case VersioningStrategy.JAVA_MAVEN:
+                return new JavaMavenVersioningClient();
+        }
+    }
+    async update(version) {
+        await this.delegate.update(version);
+    }
+}

package/dist/versioning/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./client";
+export * from "./types";

package/dist/versioning/index.js

@@ -0,0 +1,2 @@
+export * from "./client";
+export * from "./types";

package/dist/versioning/java/maven/index.d.ts

@@ -0,0 +1,8 @@
+import type { IJavaMavenVersioningClient } from "../../types";
+import { BaseVersioningClient } from "../../base";
+export declare class JavaMavenVersioningClient extends BaseVersioningClient implements IJavaMavenVersioningClient {
+    private readonly parser;
+    private readonly builder;
+    constructor();
+    update(version: string): Promise<void>;
+}

package/dist/versioning/java/maven/index.js

@@ -0,0 +1,39 @@
+import XMLBuilderClient, {} from "fast-xml-builder";
+import { XMLParser } from "fast-xml-parser";
+import { BaseVersioningClient } from "../../base";
+export class JavaMavenVersioningClient extends BaseVersioningClient {
+    parser;
+    builder;
+    constructor() {
+        super();
+        this.parser = new XMLParser({
+            ignoreAttributes: false,
+            preserveOrder: true,
+            attributeNamePrefix: "@_",
+            allowBooleanAttributes: true,
+        });
+        this.builder = new XMLBuilderClient({
+            ignoreAttributes: false,
+            preserveOrder: true,
+            attributeNamePrefix: "@_",
+        });
+    }
+    async update(version) {
+        const files = await this.findFiles("pom.xml");
+        for (const fileLocation of files) {
+            const file = Bun.file(fileLocation);
+            const oldPomStr = await file.text();
+            const pom = this.parser.parse(oldPomStr);
+            if (!pom.project) {
+                throw new Error("Can't find project tag inside of pom.xml");
+            }
+            if (!pom.project.version) {
+                throw new Error("Can't find version tag inside of project tag in pom.xml");
+            }
+            pom.project.version = version;
+            const newPomStr = this.builder.build(pom);
+            await Bun.write(fileLocation, newPomStr);
+            this.logFileLocationUpdated(fileLocation, version);
+        }
+    }
+}

package/dist/versioning/jsts/index.d.ts

@@ -0,0 +1,5 @@
+import type { IJavascriptPackageJsonVersioningClient } from "../types";
+import { BaseVersioningClient } from "../base";
+export declare class JavascriptPackageJsonVersioningClient extends BaseVersioningClient implements IJavascriptPackageJsonVersioningClient {
+    update(version: string): Promise<void>;
+}

package/dist/versioning/jsts/index.js

@@ -0,0 +1,13 @@
+import { BaseVersioningClient } from "../base";
+export class JavascriptPackageJsonVersioningClient extends BaseVersioningClient {
+    async update(version) {
+        const files = await this.findFiles("**/package.json", /(^|\/)node_modules\//);
+        for (const fileLocation of files) {
+            const file = Bun.file(fileLocation);
+            const pkg = await file.json();
+            pkg.version = version;
+            await Bun.write(fileLocation, JSON.stringify(pkg, null, 2) + "\n");
+            this.logFileLocationUpdated(fileLocation, version);
+        }
+    }
+}

package/dist/versioning/types.d.ts

@@ -0,0 +1,11 @@
+export declare enum VersioningStrategy {
+    JSTS = 0,
+    JAVA_MAVEN = 1
+}
+export interface IVersioningClient {
+    update(version: string): Promise<void>;
+}
+export interface IJavascriptPackageJsonVersioningClient extends IVersioningClient {
+}
+export interface IJavaMavenVersioningClient extends IVersioningClient {
+}

package/dist/versioning/types.js

@@ -0,0 +1,5 @@
+export var VersioningStrategy;
+(function (VersioningStrategy) {
+    VersioningStrategy[VersioningStrategy["JSTS"] = 0] = "JSTS";
+    VersioningStrategy[VersioningStrategy["JAVA_MAVEN"] = 1] = "JAVA_MAVEN";
+})(VersioningStrategy || (VersioningStrategy = {}));

package/package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "author": "Tahmid Ahmed",
   "description": "A collection of Bun shell scripts that can be re-used in various CICD pipelines.",
-  "version": "1.0.53",
+  "version": "1.0.55-beta.46bb197d",
   "repository": {
     "url": "git+https://github.com/tahminator/pipeline.git"
   },
@@ -52,6 +52,8 @@
     "@octokit/rest": "^22.0.1",
     "@pulumi/pulumi": "^3.230.0",
     "ansi-to-html": "^0.7.2",
+    "fast-xml-builder": "^1.1.5",
+    "fast-xml-parser": "^5.7.2",
     "neverthrow": "^8.2.0",
     "semver": "^7.7.4",
     "yaml": "^2.8.2",