@cmflow/cli 3.3.0 → 3.4.0-alpha.3

package/src/commands/prompts/branches.js

@@ -1,38 +0,0 @@
-import inquirer from "inquirer";
-
-import { git } from "../../common/index.js";
-
-function toRemote(branch, origin) {
-  branch = branch.replace(`${origin}/`);
-  return `${origin}/${branch}`;
-}
-
-export function branches({ fromBranch, origin, PRODUCTION_BRANCH, DEVELOP_BRANCH, message = "Start your branch from:" }) {
-  const currentBranch = git.getBranchName();
-  const originDevelop = `${origin}/${DEVELOP_BRANCH}`;
-  const originProduction = `${origin}/${PRODUCTION_BRANCH}`;
-
-  let startFromBranches = [originProduction];
-
-  if (startFromBranches.indexOf(toRemote(currentBranch, origin)) === -1 && git.branchExists(currentBranch, origin)) {
-    startFromBranches = startFromBranches.concat(toRemote(currentBranch, origin));
-  }
-
-  const remoteBranches = git
-    .branchesInfos("-r")
-    .map((info) => info.branch)
-    .filter((name) => !startFromBranches.includes(name) && ![originDevelop, originProduction].includes(name));
-
-  if (remoteBranches.length) {
-    startFromBranches = startFromBranches.concat(new inquirer.Separator(), remoteBranches);
-  }
-
-  return {
-    type: "list",
-    name: "fromBranch",
-    message,
-    default: startFromBranches.indexOf(fromBranch || originProduction),
-    choices: startFromBranches,
-    when: !fromBranch || currentBranch !== DEVELOP_BRANCH
-  };
-}

package/src/commands/pull.js

@@ -1,30 +0,0 @@
-import { git } from "../common/index.js";
-
-export class Pull {
-  mapContext(options, context) {
-    return { ...context, targetBranch: options.branch };
-  }
-
-  getTasks(context) {
-    const { targetBranch } = context;
-
-    return [
-      {
-        title: "Git fetch",
-        task: () => git.fetch("--all", "--prune", "--tags")
-      },
-      {
-        title: `Delete local branch ${targetBranch}`,
-        task: () => git.branch("-D", targetBranch).catch(() => {})
-      },
-      {
-        title: `Checkout origin/${targetBranch}`,
-        task: () => git.checkout(`origin/${targetBranch}`, "--track")
-      }
-    ];
-  }
-
-  success(context) {
-    console.log(`BRANCH ${context.targetBranch} RETRIEVE DONE`);
-  }
-}

package/src/commands/push.js

@@ -1,23 +0,0 @@
-import chalk from "chalk";
-import figures from "figures";
-
-import { Rebase } from "./rebase.js";
-import { pushBranch } from "./tasks/push-branch.js";
-
-export class Push extends Rebase {
-  mapContext(commander, context) {
-    return {
-      ...super.mapContext(commander, context),
-      force: !!commander.force,
-      checkStatus: true
-    };
-  }
-
-  getTasks(context) {
-    return [...super.getTasks(context), pushBranch(context)];
-  }
-
-  success(context) {
-    console.log(chalk.green(figures.tick), "Branch", chalk.green(context.featureBranch), "rebased and pushed.");
-  }
-}

package/src/commands/rebase.js

@@ -1,35 +0,0 @@
-import chalk from "chalk";
-import figures from "figures";
-
-import { git } from "../common/cli/git.js";
-import { Fetch } from "./fetch.js";
-import { runTest } from "./tasks/run-test.js";
-import { updateBranch } from "./tasks/update-branch.js";
-import { updateDependencies } from "./tasks/update-dependencies.js";
-
-export class Rebase extends Fetch {
-  mapContext(commander, context) {
-    return {
-      ...context,
-      origin: context.ORIGIN,
-      featureBranch: git.getBranchName(),
-      fromBranch: context.PRODUCTION_BRANCH,
-      checkStatus: commander.force === undefined ? true : !!commander.force,
-      rebase: true,
-      skipTest: !commander.cucumber && !commander.unitTest,
-      skipUnit: !commander.unitTest,
-      skipE2E: context.HAS_E2E ? !commander.cucumber : true
-    };
-  }
-
-  getTasks(context) {
-    return [...super.getTasks(context), updateBranch(context), updateDependencies(context), ...runTest(context)];
-  }
-
-  success(context) {
-    console.log(
-      chalk.green(figures.tick),
-      `Branch ${chalk.green(context.featureBranch)} rebased from ${chalk.green(context.fromBranch)} HEAD`
-    );
-  }
-}

package/src/commands/release.js

@@ -1,21 +0,0 @@
-import semantic_release from "semantic-release";
-
-delete process.env.CIRCLE_PR_NUMBER;
-delete process.env.CIRCLE_PULL_REQUEST;
-delete process.env.CI_PULL_REQUEST;
-
-export function release(options = {}) {
-  semantic_release({
-    dryRun: process.argv.includes("--dry-run"),
-    ci: false,
-    noCi: true,
-    ...options
-  })
-    .then(() => {
-      process.exitCode = 0;
-    })
-    .catch((err) => {
-      console.log("Error while releasing", err);
-      process.exitCode = 1;
-    });
-}

package/src/commands/republish.js

@@ -1,21 +0,0 @@
-import chalk from "chalk";
-import figures from "figures";
-
-import { Fetch } from "./fetch.js";
-import { rebaseAllBranches } from "./tasks/rebase-all-branches.js";
-
-export class Republish extends Fetch {
-  mapContext(commander, context) {
-    return {
-      ...super.mapContext(commander, context)
-    };
-  }
-
-  getTasks(context) {
-    return [...super.getTasks(context), rebaseAllBranches(context)];
-  }
-
-  success() {
-    console.log(chalk.green(figures.tick), "All branches rebased and pushed.");
-  }
-}

package/src/commands/start.js

@@ -1,109 +0,0 @@
-import chalk from "chalk";
-import figures from "figures";
-
-import { git } from "../common/cli/git.js";
-import { WORKFLOW_CONFIGURATION } from "../workflow/index.js";
-import { Fetch } from "./fetch.js";
-import { branches } from "./prompts/branches.js";
-import { updateDependencies } from "./tasks/update-dependencies.js";
-
-function sanitize(name) {
-  return name
-    .replace(/[/\\_|. ]/gi, "-")
-    .split("-")
-    .filter(Boolean)
-    .join("-");
-}
-
-export class Start extends Fetch {
-  mapContext(options, context) {
-    options.branchName = options.branchName || "";
-    const type = WORKFLOW_CONFIGURATION.map(({ type }) => type).find((t) => options.branchName.startsWith(`${t}-`));
-
-    if (!options.branchName && options.jiraId) {
-      options.branchName = options.jiraId;
-    }
-
-    if (options.branchName.startsWith("CMAB-")) {
-      const [, key, ...rest] = options.branchName.split("-");
-      options.jiraId = `CMAB-${key}`;
-      options.branchName = rest.join("-");
-    }
-
-    return {
-      ...context,
-      origin: context.ORIGIN,
-      jiraId: options.jiraId,
-      branchName: options.branchName,
-      type
-    };
-  }
-
-  prompt(context) {
-    return [
-      {
-        type: "input",
-        name: "jiraId",
-        message: "What is the Jira ID ? (leave blank to skip)",
-        default: context.jiraId,
-        when: !context.jiraId
-      },
-      {
-        type: "list",
-        name: "type",
-        message: "Choose the type of your branch:",
-        choices: ["fix", "feat", "chore", "docs", "tech"],
-        default: context.type,
-        when: !context.type && !context.jiraId
-      },
-      {
-        type: "input",
-        name: "branchName",
-        message: "What is the branch name ?",
-        validate(branch) {
-          if (!branch.length) {
-            return "Branch name is required";
-          }
-
-          if (git.branchExists(branch, context.origin)) {
-            return `${branch} already exists`;
-          }
-
-          return true;
-        },
-
-        when: !context.branchName
-      },
-
-      branches(context)
-    ];
-  }
-
-  getTasks(context) {
-    context.branchName = sanitize(context.branchName);
-
-    context.featureBranch = context.jiraId
-      ? `${context.jiraId}-${context.branchName}`
-      : context.branchName.includes(context.type + "-")
-        ? context.branchName
-        : `${context.type}-${context.branchName}`;
-
-    context.fromBranch = context.fromBranch || context.PRODUCTION_BRANCH;
-
-    return [
-      ...super.getTasks(context),
-      {
-        title: `Create branch from ${chalk.green(context.fromBranch)}`,
-        task: () => git.checkout("--no-track", "-b", context.featureBranch, context.fromBranch).toObservable()
-      },
-      updateDependencies(context)
-    ];
-  }
-
-  success(context) {
-    console.log(
-      chalk.green(figures.tick),
-      `New branch ${chalk.green(context.featureBranch)} created from ${chalk.green(context.fromBranch)} HEAD`
-    );
-  }
-}

package/src/commands/tasks/merge-branch.js

@@ -1,65 +0,0 @@
-import { git } from "../../common/index.js";
-
-function setGHToken(context) {
-  const {
-    logger,
-    config: { SCM_TOKEN, REPOSITORY_URL, ORIGIN }
-  } = context;
-
-  if (SCM_TOKEN) {
-    const repository = REPOSITORY_URL.replace("https://", "");
-
-    logger.info(`Configure remote repository ${repository}`);
-    git.remote("remove", ORIGIN).sync();
-    git.remote("add", ORIGIN, `https://${SCM_TOKEN}@${repository}`).sync();
-  }
-}
-
-async function gitMep(context) {
-  const {
-    logger,
-    branch,
-    config: { PRODUCTION_BRANCH, ORIGIN }
-  } = context;
-
-  logger.info(`Branch ${branch.name} is candidate to MEP`);
-
-  git.reset("--hard");
-  git.clean("-f", "-d").sync();
-
-  logger.info("Checkout production branch");
-
-  git.config("--replace-all", "remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*");
-  git.fetch().sync();
-  git.fetch("--tags").sync();
-  git.checkout("-qf", PRODUCTION_BRANCH).sync();
-
-  logger.info(`Current branch: ${PRODUCTION_BRANCH}`);
-
-  const building = git.getLastCommitMsg();
-  logger.info("Last commit message on production", building);
-
-  logger.info(`Merge ${branch.name} into ${PRODUCTION_BRANCH} branch`);
-  git.merge("--no-ff", "-m", `${branch.name}`, branch.name);
-  logger.info(`${branch.name} merged into ${PRODUCTION_BRANCH} branch`);
-
-  setGHToken(context);
-
-  logger.info(`Push ${PRODUCTION_BRANCH} branch`);
-  await git.push(ORIGIN, PRODUCTION_BRANCH);
-  logger.info(`${PRODUCTION_BRANCH} branch pushed`);
-
-  logger.info(`Remove ${ORIGIN}/${branch.name} branch`);
-  await git.push(ORIGIN, ":" + branch.name);
-  logger.info(`${ORIGIN}/${branch.name} branch correctly removed`);
-}
-
-export function mergeBranch(context) {
-  const { BRANCH_NAME, PRODUCTION_BRANCH } = context;
-  return {
-    title: `Merge ${BRANCH_NAME} into ${PRODUCTION_BRANCH}`,
-    task: async () => {
-      await gitMep(context);
-    }
-  };
-}

package/src/commands/tasks/push-branch.js

@@ -1,10 +0,0 @@
-import { git } from "../../common/cli/git.js";
-
-export function pushBranch({ origin = "origin", featureBranch, upstream = true, noVerify = true }) {
-  return {
-    title: `Push ${featureBranch}`,
-    task: () => {
-      return git.push(...[upstream ? "-u" : "", "-f", origin, featureBranch, noVerify ? "--no-verify" : ""].filter(Boolean)).toObservable();
-    }
-  };
-}

package/src/commands/tasks/rebase-all-branches.js

@@ -1,29 +0,0 @@
-import { git } from "../../common/cli/git.js";
-
-export function rebaseAllBranches(context) {
-  const { origin = "origin", upstream = true, noVerify = true } = context;
-  return {
-    title: "Rebase all branches",
-    task: async () => {
-      const remoteBranches = git
-        .branches("-r")
-        .filter((b) => !new RegExp(`${context.PRODUCTION_BRANCH}|${context.DEVELOP_BRANCH}`).test(b));
-      for (const remoteBranch of remoteBranches) {
-        const branch = remoteBranch.split("/")[1];
-        try {
-          await git.branch("-D", branch);
-        } catch {}
-        try {
-          await git.checkout("--track", remoteBranch);
-          await git.rebase(`${origin}/${context.PRODUCTION_BRANCH}`);
-          await git.push(...[upstream ? "-u" : "", "-f", origin, branch, noVerify ? "--no-verify" : ""].filter(Boolean));
-        } catch {
-          try {
-            await git.rebase("--abort");
-            await git.reset("--hard");
-          } catch {}
-        }
-      }
-    }
-  };
-}

package/src/commands/tasks/refresh-repository.js

@@ -1,34 +0,0 @@
-import Listr from "listr";
-import { catchError, EMPTY } from "rxjs";
-
-import { git } from "../../common/index.js";
-
-function pipe(observable, output) {
-  observable.pipe(
-    catchError((err) => {
-      output.push(err);
-      return EMPTY;
-    })
-  );
-
-  observable.subscribe((result) => {
-    output.push(result);
-  });
-
-  return observable;
-}
-
-export function refreshRepository(context) {
-  const { output = [] } = context;
-
-  return {
-    title: "Refresh local repository",
-    task: () =>
-      new Listr([
-        {
-          title: "Git fetch",
-          task: () => pipe(git.fetch("--prune").toObservable(), output)
-        }
-      ])
-  };
-}

package/src/commands/tasks/run-test.js

@@ -1,21 +0,0 @@
-import { getPackageManager, git } from "../../common/index.js";
-
-export const runTest = ({ E2E_CMD, PACKAGE_MANAGER, skipTest, skipUnit, skipE2E }) => {
-  return [
-    {
-      title: "Unit test",
-      skip: () => skipTest || skipUnit,
-      task: () => getPackageManager(PACKAGE_MANAGER).run("test")
-    },
-    {
-      title: "E2E test",
-      skip: () => skipTest || skipE2E,
-      task: () => getPackageManager(PACKAGE_MANAGER).run(E2E_CMD || "test_e2e")
-    },
-    {
-      title: "Reset changes",
-      skip: () => skipTest,
-      task: () => git.reset("--hard") // reset files updated unit test
-    }
-  ];
-};

package/src/commands/tasks/update-branch.js

@@ -1,43 +0,0 @@
-import chalk from "chalk";
-import Listr from "listr";
-
-import { git } from "../../common/cli/git.js";
-
-async function checkBranchRemoteStatus({ featureBranch, origin, force }) {
-  const isBranchExists = git.branchExists(featureBranch, origin);
-
-  if (isBranchExists && !force) {
-    const result = git.checkBranchRemoteStatus(featureBranch);
-
-    if (result) {
-      throw new Error("Remote branch changed, check diff before continue");
-    }
-  }
-}
-
-export const updateBranch = ({ origin, featureBranch, fromBranch, force, checkStatus = true, rebase = true }) => {
-  return {
-    title: "Rebase branch",
-    task: () =>
-      new Listr(
-        [
-          {
-            title: "Check status",
-            enabled: () => checkStatus,
-            task: () =>
-              checkBranchRemoteStatus({
-                force,
-                featureBranch,
-                origin
-              })
-          },
-          {
-            title: `Rebase from ${origin}/${chalk.green(fromBranch)}`,
-            enabled: () => rebase,
-            task: () => git.rebase(`${origin}/${fromBranch}`).toObservable()
-          }
-        ],
-        { concurrent: false }
-      )
-  };
-};

package/src/commands/tasks/update-dependencies.js

@@ -1,42 +0,0 @@
-import Listr from "listr";
-import { catchError } from "rxjs";
-
-import { getPackageManager } from "../../common/index.js";
-import { refreshMetadata, shouldReinstall } from "../utils/check-install.js";
-
-export const updateDependencies = ({ PACKAGE_MANAGER }) => {
-  const reinstall = shouldReinstall();
-
-  return {
-    title: "Install",
-    enabled: () => reinstall,
-    task: () =>
-      new Listr(
-        [
-          {
-            title: `Restore dependencies using ${PACKAGE_MANAGER.toUpperCase()}`,
-            task: () =>
-              getPackageManager(PACKAGE_MANAGER)
-                .restore()
-                .toObservable()
-                .pipe(
-                  catchError((error) => {
-                    if (PACKAGE_MANAGER === "yarn") {
-                      if (error.stderr.startsWith("error Your lockfile needs to be updated")) {
-                        throw new Error("yarn.lock file is outdated. Run yarn, commit the updated lockfile and try again.");
-                      }
-                    }
-
-                    throw error;
-                  })
-                )
-          },
-          {
-            title: "Refresh metadata",
-            task: () => refreshMetadata()
-          }
-        ],
-        { concurrency: false }
-      )
-  };
-};

package/src/commands/utils/check-install.js

@@ -1,31 +0,0 @@
-import isEqual from "lodash/isEqual.js";
-
-import { getPackageJson, git } from "../../common/index.js";
-
-function getDeps() {
-  const pkg = getPackageJson();
-  return {
-    dependencies: pkg.dependencies,
-    devDependencies: pkg.devDependencies
-  };
-}
-
-export function getHash() {
-  return Buffer.from(JSON.stringify(getDeps())).toString("base64");
-}
-
-export function getDepsFromHash() {
-  try {
-    return JSON.parse(Buffer.from(git.config("--local", "npm.hash"), "base64").toString("utf8"));
-  } catch {
-    return "";
-  }
-}
-
-export function shouldReinstall() {
-  return !isEqual(getDeps(), getDepsFromHash());
-}
-
-export function refreshMetadata() {
-  git.config("--local", "npm.hash", `${getHash()}`);
-}

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

@@ -1,40 +0,0 @@
-import axiosRetry from "axios-retry";
-
-import { getConfig } from "../../get-config.js";
-import { httpRequest } from "../http/http-request.js";
-
-/**
- * Trigger a Directus Flow
- *
- * @param {string} projectId - The project identifier to send to the flow
- * @param {string[]} versions - The versions list to send to the flow
- * @param {object} [opts] - Additional request options (e.g., rejectUnauthorized)
- * @returns {Promise<unknown>} The parsed JSON response
- */
-export async function triggerDirectusFlow(projectId, versions, opts = {}) {
-  const { DIRECTUS_URL, DIRECTUS_FLOW_ID, DIRECTUS_ACCESS_TOKEN } = getConfig();
-
-  const endpoint = `${DIRECTUS_URL}/flows/trigger/${DIRECTUS_FLOW_ID}`;
-
-  const options = {
-    method: "post",
-    callee: "DIRECTUS",
-    headers: {
-      Authorization: `Bearer ${DIRECTUS_ACCESS_TOKEN}`,
-      "Content-Type": "application/json"
-    },
-    data: {
-      projectId,
-      versions
-    },
-    retries: 3,
-    retryDelay: axiosRetry.exponentialDelay,
-    ...opts
-  };
-
-  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

@@ -1,62 +0,0 @@
-// Use vi.hoisted to create mock references that are available to mock factories
-const httpRequestMock = vi.hoisted(() => vi.fn());
-
-// Mock get-config to provide DIRECTUS_* env values
-vi.mock("../../get-config.js", () => ({
-  getConfig: () => ({
-    DIRECTUS_URL: "https://directus.example.com",
-    DIRECTUS_FLOW_ID: "flow-123",
-    DIRECTUS_ACCESS_TOKEN: "token-abc"
-  })
-}));
-
-// Spy/mock for httpRequest
-vi.mock("../http/http-request.js", () => ({
-  httpRequest: httpRequestMock
-}));
-
-// Now import the SUT after mocks are in place
-import { triggerDirectusFlow } from "./directus-flow.js";
-
-describe("triggerDirectusFlow", () => {
-  beforeEach(() => {
-    httpRequestMock.mockReset();
-  });
-
-  it("should call httpRequest with the expected endpoint, headers and body", async () => {
-    httpRequestMock.mockResolvedValue({ ok: true, data: { status: "queued" } });
-
-    const projectId = "CMAB";
-    const versions = ["2.3.0", "2.2.0"];
-    const opts = { rejectUnauthorized: true };
-
-    const result = await triggerDirectusFlow(projectId, versions, opts);
-
-    expect(result).toEqual({ ok: true, data: { status: "queued" } });
-
-    expect(httpRequestMock).toHaveBeenCalledTimes(1);
-
-    const expectedEndpoint = "https://directus.example.com/flows/trigger/flow-123";
-    const expectedBody = JSON.stringify({ projectId, versions });
-
-    expect(httpRequestMock).toHaveBeenCalledWith(
-      expectedEndpoint,
-      expect.objectContaining({
-        method: "post",
-        callee: "DIRECTUS",
-        rejectUnauthorized: true,
-        headers: expect.objectContaining({
-          Authorization: "Bearer token-abc",
-          "Content-Type": "application/json"
-        }),
-        data: expectedBody
-      })
-    );
-  });
-
-  it("should propagate errors from httpRequest", async () => {
-    httpRequestMock.mockRejectedValue(new Error("network error"));
-
-    await expect(triggerDirectusFlow("CMAB", ["1.0.0"])).rejects.toThrow("network error");
-  });
-});

package/src/common/back/http/http-proxy.js

@@ -1,15 +0,0 @@
-import { HttpsProxyAgent } from "https-proxy-agent";
-
-import { getConfig } from "../../get-config.js";
-
-const { HTTPS_PROXY } = getConfig();
-
-export const getHttpProxy = (opts) => {
-  if (HTTPS_PROXY) {
-    console.debug({
-      message: `Using proxy agent for ${opts.callee} requests`,
-      value: HTTPS_PROXY
-    });
-    return new HttpsProxyAgent(HTTPS_PROXY, opts);
-  }
-};