@cmflow/cli 3.1.5 → 3.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmflow/cli",
-  "version": "3.1.5",
+  "version": "3.2.0",
   "description": "An awesome Git Flow",
   "author": "camfou",
   "license": "MIT",

package/src/common/back/directus/directus-flow.js

@@ -23,7 +23,7 @@ export async function triggerDirectusFlow(projectId, versions, opts = {}) {
       Authorization: `Bearer ${DIRECTUS_ACCESS_TOKEN}`,
       "Content-Type": "application/json"
     },
-    body: {
+    data: {
       projectId,
       versions
     },
@@ -32,8 +32,8 @@ export async function triggerDirectusFlow(projectId, versions, opts = {}) {
     ...opts
   };
 
-  if (options.body && options.headers?.["Content-Type"] === "application/json") {
-    options.body = JSON.stringify(options.body);
+  if (options.data && options.headers?.["Content-Type"] === "application/json") {
+    options.data = JSON.stringify(options.data);
   }
 
   return httpRequest(endpoint, options);

package/src/common/back/directus/directus-flow.test.js

@@ -49,7 +49,7 @@ describe("triggerDirectusFlow", () => {
           Authorization: "Bearer token-abc",
           "Content-Type": "application/json"
         }),
-        body: expectedBody
+        data: expectedBody
       })
     );
   });

package/src/common/back/jira/jira-releases.js

@@ -1,5 +1,4 @@
 import { jiraRequest } from "./jira-request.js";
-import { jiraSearch } from "./jira-search.js";
 
 export async function getJiraReleases(projectId) {
   const endpoint = `/rest/api/3/project/${projectId}/versions?expand`;
@@ -21,7 +20,7 @@ export async function updateJiraRelease(release) {
         "Content-Type": "application/json",
         Accept: "application/json"
       },
-      body: {
+      data: {
         id: release.id,
         description: release.description,
         name: release.name,
@@ -35,9 +34,3 @@ export async function updateJiraRelease(release) {
     console.log(`Error while updating jira release ${release.id}`, er);
   }
 }
-
-export async function getJiraVersionRelatedIssues(projectId, tagVersion) {
-  return jiraSearch(`project = "${projectId}" AND fixVersion="${tagVersion}" ORDER BY created DESC`, {
-    fields: ["summary", "issuetype", "status", "assignee", "reporter", "created", "updated"]
-  });
-}

package/src/common/back/jira/jira-request.js

@@ -8,9 +8,8 @@ export async function jiraRequest(endpoint, opts = {}) {
   const jiraUrl = `${JIRA_API}${endpoint}`;
   const auth = Buffer.from(`${JIRA_EMAIL}:${JIRA_TOKEN}`).toString("base64");
 
-  if (opts.body && opts.headers?.["Content-Type"] === "application/json") {
-    opts.data = JSON.stringify(opts.body);
-    delete opts.body;
+  if (opts.data && opts.headers?.["Content-Type"] === "application/json") {
+    opts.data = JSON.stringify(opts.data);
   }
 
   return httpRequest(jiraUrl, {

package/src/common/back/jira/jira-request.spec.js

@@ -34,7 +34,7 @@ describe("jiraRequest", () => {
       method: "post",
       params: { key: "value" },
       headers: { "Content-Type": "application/json" },
-      body: { key: "value" }
+      data: { key: "value" }
     });
 
     expect(httpRequest).toHaveBeenCalledWith(expect.stringContaining("/test-endpoint"), {

package/src/common/cli/bun.js

@@ -0,0 +1,33 @@
+import { Cli } from "./cli.js";
+
+class BunCli extends Cli {
+  constructor() {
+    super("bun");
+  }
+
+  newVersion(version) {
+    return this.pm("version", "--no-git-tag-version", version);
+  }
+
+  pm(...args) {
+    return this.sync("pm", ...args);
+  }
+
+  run(...args) {
+    return super.run("run", ...args);
+  }
+
+  install(...args) {
+    return super.run("install", ...args);
+  }
+
+  /**
+   * Reinstall dependencies without bun.lock mutation
+   * @returns {Promise<unknown>}
+   */
+  restore() {
+    return super.run("install", "--frozen-lockfile");
+  }
+}
+
+export const bun = new BunCli();

package/src/common/cli/bun.test.js

@@ -0,0 +1,51 @@
+vi.mock("execa", () => {
+  const execaMock = vi.fn();
+  execaMock.sync = vi.fn();
+  return { default: execaMock };
+});
+
+const { default: execa } = await import("execa");
+const { bun } = await import("./bun.js");
+const { Cli } = await import("./cli.js");
+
+execa.sync.mockImplementation((...args) => {
+  return {
+    stdout: `CMD: ${[].concat(...args.filter((arg) => typeof arg === "string" || Array.isArray(arg))).join(" ")}`
+  };
+});
+execa.mockReturnValue({});
+
+describe("BunCli", () => {
+  beforeEach(() => {
+    vi.spyOn(Cli, "getRaw").mockImplementation((...args) => {
+      return `CMD: ${[].concat(...args.filter((arg) => typeof arg === "string" || Array.isArray(arg))).join(" ")}`;
+    });
+  });
+  describe("newVersion", () => {
+    it("should run newVersion cmd", () => {
+      const result = bun.newVersion("1.0.0");
+
+      expect(result.stdout).toEqual("CMD: bun pm version --no-git-tag-version 1.0.0");
+    });
+  });
+  describe("run", () => {
+    it('should run "run" cmd', async () => {
+      await bun.run("run-arg");
+
+      expect(execa).toHaveBeenCalledWith("bun", ["run", "run-arg"], {
+        cwd: process.cwd(),
+        stdio: "inherit"
+      });
+    });
+  });
+  describe("install", () => {
+    it('should run "install" cmd', async () => {
+      await bun.install("install-arg");
+
+      expect(execa).toHaveBeenCalledWith("bun", ["install", "install-arg"], {
+        cwd: process.cwd(),
+        stdio: "inherit"
+      });
+    });
+  });
+});

package/src/common/get-config.js

@@ -99,19 +99,21 @@ export function getConfig() {
 
   const HAS_YARN = hasYarn();
   const HAS_PNPM = fs.existsSync(join(process.cwd(), "pnpm-lock.yaml"));
+  const HAS_BUN = fs.existsSync(join(process.cwd(), "bun.lock")) || fs.existsSync(join(process.cwd(), "bun.lockb"));
   const IS_YARN_BERRY = HAS_YARN ? fs.existsSync(join(process.cwd(), ".yamlrc.yml")) : false;
   let BUMP_METHOD = get(pkg, "flow.bumpMethod", "default");
 
-  if ((IS_YARN_BERRY || HAS_PNPM) && ["native", "default"].includes(BUMP_METHOD)) {
+  if ((IS_YARN_BERRY || HAS_PNPM || HAS_BUN) && ["native", "default"].includes(BUMP_METHOD)) {
     BUMP_METHOD = "cmflow";
   }
 
   return {
     pkg,
-    PACKAGE_MANAGER: HAS_PNPM ? "pnpm" : HAS_YARN ? "yarn" : "npm",
+    PACKAGE_MANAGER: HAS_PNPM ? "pnpm" : HAS_BUN ? "bun" : HAS_YARN ? "yarn" : "npm",
     PROJECT_NAME: PROJECT_NAME || projectName,
     HAS_YARN,
     HAS_PNPM,
+    HAS_BUN,
     IS_YARN_BERRY,
     HAS_LERNA: (pkg.dependencies && pkg.dependencies.lerna) || (pkg.devDependencies && pkg.devDependencies.lerna),
     CI_SKIP: "[ci skip]",

package/src/common/get-package-manager.js

@@ -1,7 +1,12 @@
+import { bun } from "./cli/bun.js";
 import { npm } from "./cli/npm.js";
 import { pnpm } from "./cli/pnpm.js";
 import { yarn } from "./cli/yarn.js";
 
 export function getPackageManager(pkgManager) {
+  if (pkgManager === "bun") {
+    return bun;
+  }
+
   return pkgManager === "yarn" ? yarn : pkgManager === "pnpm" ? pnpm : npm;
 }

package/src/common/index.js

@@ -1,3 +1,4 @@
+export * from "./cli/bun.js";
 export * from "./cli/cli.js";
 export * from "./cli/docker.js";
 export * from "./cli/git.js";

package/src/semantic/core/prepare/bump-version.js

@@ -7,6 +7,7 @@ export async function prepare(_, context) {
     config: { PACKAGE_MANAGER, HAS_LERNA, BUMP_METHOD, WORKSPACES },
     logger
   } = context;
+  const versionPackageManager = PACKAGE_MANAGER === "yarn" ? "npm" : PACKAGE_MANAGER;
 
   logger.info(`Start bump version for all packages using method: ${BUMP_METHOD}`);
 
@@ -26,7 +27,7 @@ export async function prepare(_, context) {
       break;
     case "native:lerna":
     default:
-      getPackageManager("npm").newVersion(context.nextRelease.version);
+      getPackageManager(versionPackageManager).newVersion(context.nextRelease.version);
 
       if (HAS_LERNA) {
         await lerna.newVersion(context.nextRelease.version);