@contentstack/cli-cm-branches 1.0.0

package/lib/utils/entry-create-script.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.entryCreateScript = void 0;
+function entryCreateScript(contentType) {
+    return `
+module.exports = async ({ migration, stackSDKInstance, managementAPIClient, config, branch, apiKey }) => {
+  const keysToRemove = [
+    'content_type_uid',
+    'created_at',
+    'updated_at',
+    'created_by',
+    'updated_by',
+    'ACL',
+    'stackHeaders',
+    'urlPath',
+    '_version',
+    '_in_progress',
+    'update',
+    'delete',
+    'fetch',
+    'publish',
+    'unpublish',
+    'publishRequest',
+    'setWorkflowStage',
+    'import',
+  ];
+
+  let compareBranch = config['compare-branch'];
+
+  const createEntryTask = () => {
+    return {
+      title: 'Create Entries',
+      successTitle: 'Entries Created Successfully',
+      failedTitle: 'Failed to create entries',
+      task: async () => {
+        const compareBranchEntries = await managementAPIClient
+          .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch }) //
+          .contentType('${contentType}')
+          .entry()
+          .query()
+          .find();
+        const compareFilteredProperties = compareBranchEntries.items.map((entry) => {
+          keysToRemove.map((key) => delete entry[key]);
+          return entry;
+        });
+        try {
+          compareFilteredProperties.length !== 0 &&
+            compareFilteredProperties.forEach(async (entryDetails) => {
+              await stackSDKInstance.contentType('${contentType}').entry().create({ entry: entryDetails });
+            });
+        } catch (error) {
+          throw error;
+        }
+      },
+    };
+  };
+  if (compareBranch && branch.length !== 0 && apiKey.length !== 0) {
+    migration.addTask(createEntryTask());
+  } else {
+    if (apiKey.length === 0) {
+      console.error('Please provide api key using --stack-api-key flag');
+    }
+    if (!compareBranch) {
+      console.error('Please provide compare branch through --config compare-branch:<value> flag');
+    }
+    if (branch.length === 0) {
+      console.error('Please provide branch name through --branch flag');
+    }
+  }
+};
+`;
+}
+exports.entryCreateScript = entryCreateScript;

package/lib/utils/entry-update-script.js

@@ -0,0 +1,126 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.entryUpdateScript = void 0;
+function entryUpdateScript(contentType) {
+    return `
+module.exports = async ({ migration, stackSDKInstance, managementAPIClient, config, branch, apiKey }) => {
+  const keysToRemove = [
+    'content_type_uid',
+    'created_at',
+    'updated_at',
+    'created_by',
+    'updated_by',
+    'ACL',
+    'stackHeaders',
+    'urlPath',
+    '_version',
+    '_in_progress',
+    'update',
+    'delete',
+    'fetch',
+    'publish',
+    'unpublish',
+    'publishRequest',
+    'setWorkflowStage',
+    'import',
+  ];
+
+  let compareBranch = config['compare-branch'];
+
+  function converter(data) {
+    let arr = [];
+    for (const elm of data.entries()) {
+      // @ts-ignore
+      arr.push([elm[1].title, elm[1]]);
+    }
+    return arr;
+  }
+
+  function deleteUnwantedKeysFromObject(obj, keysToRemove) {
+    if(obj){
+      keysToRemove.map((key) => delete obj[key]);
+      return obj;
+    }
+  }
+
+  function uniquelyConcatenateArrays(compareArr, baseArr) {
+    let uniqueArray = compareArr.concat(baseArr.filter((item) => compareArr.indexOf(item) < 0));
+    return uniqueArray;
+  }
+
+  const updateEntryTask = () => {
+    return {
+      title: 'Update Entries',
+      successMessage: 'Entries Updated Successfully',
+      failedMessage: 'Failed to update entries',
+      task: async () => {
+        let compareBranchEntries = await managementAPIClient
+        .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
+        .contentType('${contentType}')
+        .entry()
+        .query()
+        .find();
+
+      let baseBranchEntries = await stackSDKInstance.contentType('${contentType}').entry().query().find();
+
+      let contentType = await managementAPIClient
+        .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
+        .contentType('${contentType}')
+        .fetch();
+        try {
+          if (contentType.options.singleton) {
+            compareBranchEntries.items.map(async (el) => {
+              let entryDetails = deleteUnwantedKeysFromObject(el, keysToRemove);
+
+              if (baseBranchEntries.items.length) {
+                let baseEntryUid = baseBranchEntries.items[0].uid;
+                let entry = await stackSDKInstance.contentType('${contentType}').entry(baseEntryUid);
+                Object.assign(entry, { ...entryDetails });
+                entry.update();
+              } else {
+                await stackSDKInstance.contentType('${contentType}').entry().create({ entry: entryDetails });
+              }
+            });
+          } else {
+            let compareMap = new Map(converter(compareBranchEntries.items));
+            let baseMap = new Map(converter(baseBranchEntries.items));
+
+            let arr = uniquelyConcatenateArrays(Array.from(compareMap.keys()), Array.from(baseMap.keys()));
+
+            arr.map(async (el) => {
+              let entryDetails = deleteUnwantedKeysFromObject(compareMap.get(el), keysToRemove);
+
+              if (compareMap.get(el) && !baseMap.get(el)) {
+                await stackSDKInstance.contentType('${contentType}').entry().create({ entry: entryDetails });
+              } else if (compareMap.get(el) && baseMap.get(el)) {
+                let baseEntry = baseMap.get(el);
+
+                let entry = await stackSDKInstance.contentType('${contentType}').entry(baseEntry.uid);
+                Object.assign(entry, { ...entryDetails });
+                entry.update();
+              }
+            });
+          }
+        } catch (error) {
+          throw error;
+        }
+      },
+    };
+  };
+
+  if (compareBranch && branch.length !== 0 && apiKey.length !== 0) {
+    migration.addTask(updateEntryTask());
+  } else {
+    if (apiKey.length === 0) {
+      console.error('Please provide api key using --stack-api-key flag');
+    }
+    if (!compareBranch) {
+      console.error('Please provide compare branch through --config compare-branch:<value> flag');
+    }
+    if (branch.length === 0) {
+      console.error('Please provide branch name through --branch flag');
+    }
+  }
+};`;
+}
+exports.entryUpdateScript = entryUpdateScript;

package/lib/utils/index.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteBranchUtility = exports.branchDiffUtility = exports.interactive = exports.handleErrorMsg = exports.executeMergeRequest = exports.getMergeQueueStatus = exports.writeFile = exports.refreshbranchConfig = exports.getbranchConfig = exports.getbranchesList = void 0;
+const tslib_1 = require("tslib");
+/**
+ * Command specific utilities can be written here
+ */
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const cli_utilities_1 = require("@contentstack/cli-utilities");
+const getbranchesList = (branchResult, baseBranch) => {
+    const branches = [];
+    branchResult.map((item) => {
+        branches.push({
+            Branch: item.uid,
+            Source: item.source,
+            Aliases: item.alias,
+            Created: new Date(item.created_at).toLocaleDateString(),
+            Updated: new Date(item.updated_at).toLocaleDateString(),
+        });
+    });
+    const currentBranch = branches.filter((branch) => branch.Branch === baseBranch);
+    const otherBranches = branches.filter((branch) => branch.Branch !== baseBranch);
+    return { currentBranch, otherBranches, branches };
+};
+exports.getbranchesList = getbranchesList;
+const getbranchConfig = (stackApiKey) => {
+    return cli_utilities_1.configHandler.get(`baseBranch.${stackApiKey}`);
+};
+exports.getbranchConfig = getbranchConfig;
+const refreshbranchConfig = async (apiKey, branchUid) => {
+    const branchConfig = cli_utilities_1.configHandler.get(`baseBranch.${apiKey}`);
+    if (branchConfig === branchUid) {
+        await cli_utilities_1.configHandler.set(`baseBranch.${apiKey}`, 'main');
+    }
+};
+exports.refreshbranchConfig = refreshbranchConfig;
+const writeFile = (filePath, data) => {
+    return new Promise((resolve, reject) => {
+        data = typeof data === 'object' ? JSON.stringify(data, null, 2) : data || '{}';
+        fs_1.default.writeFile(path_1.default.resolve(filePath), data, (error) => {
+            if (error) {
+                return reject(error);
+            }
+            resolve('done');
+        });
+    });
+};
+exports.writeFile = writeFile;
+async function getMergeQueueStatus(stackAPIClient, payload) {
+    const mergeJobUID = payload.uid;
+    return await stackAPIClient
+        .branch()
+        .mergeQueue(mergeJobUID)
+        .fetch()
+        .then((data) => data)
+        .catch((err) => handleErrorMsg(err));
+}
+exports.getMergeQueueStatus = getMergeQueueStatus;
+async function executeMergeRequest(stackAPIClient, payload) {
+    const { host, apiKey, params: { base_branch, compare_branch, default_merge_strategy, item_merge_strategies, merge_comment, no_revert }, } = payload;
+    const queryParams = {
+        base_branch,
+        compare_branch,
+        default_merge_strategy,
+        merge_comment,
+        no_revert,
+    };
+    const itemMergeStrategies = default_merge_strategy === 'ignore' ? { item_merge_strategies } : {};
+    return await stackAPIClient
+        .branch()
+        .merge(itemMergeStrategies, queryParams)
+        .then((data) => data)
+        .catch((err) => handleErrorMsg(err));
+}
+exports.executeMergeRequest = executeMergeRequest;
+function handleErrorMsg(err) {
+    if (err === null || err === void 0 ? void 0 : err.errorMessage) {
+        cli_utilities_1.cliux.print(`Error: ${err.errorMessage}`, { color: 'red' });
+    }
+    else if (err === null || err === void 0 ? void 0 : err.message) {
+        cli_utilities_1.cliux.print(`Error: ${err.message}`, { color: 'red' });
+    }
+    else {
+        console.log(err);
+        cli_utilities_1.cliux.print(`Error: ${cli_utilities_1.messageHandler.parse('CLI_BRANCH_API_FAILED')}`, { color: 'red' });
+    }
+    process.exit(1);
+}
+exports.handleErrorMsg = handleErrorMsg;
+tslib_1.__exportStar(require("./interactive"), exports);
+tslib_1.__exportStar(require("./merge-helper"), exports);
+tslib_1.__exportStar(require("./create-merge-scripts"), exports);
+tslib_1.__exportStar(require("./entry-update-script"), exports);
+tslib_1.__exportStar(require("./entry-create-script"), exports);
+exports.interactive = tslib_1.__importStar(require("./interactive"));
+exports.branchDiffUtility = tslib_1.__importStar(require("./branch-diff-utility"));
+exports.deleteBranchUtility = tslib_1.__importStar(require("./delete-branch"));

package/lib/utils/interactive.js

@@ -0,0 +1,244 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.askBranchNameConfirmation = exports.selectCustomPreferences = exports.askMergeComment = exports.askExportMergeSummaryPath = exports.selectMergeExecution = exports.selectMergeStrategySubOptions = exports.selectMergeStrategy = exports.inquireRequireFieldValidation = exports.askConfirmation = exports.askBranchUid = exports.askSourceBranch = exports.askBaseBranch = exports.askStackAPIKey = exports.askCompareBranch = exports.selectModule = void 0;
+const tslib_1 = require("tslib");
+const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
+const startCase_1 = tslib_1.__importDefault(require("lodash/startCase"));
+const camelCase_1 = tslib_1.__importDefault(require("lodash/camelCase"));
+const forEach_1 = tslib_1.__importDefault(require("lodash/forEach"));
+const cli_utilities_1 = require("@contentstack/cli-utilities");
+async function selectModule() {
+    return await cli_utilities_1.cliux.inquire({
+        type: 'list',
+        name: 'module',
+        message: 'CLI_BRANCH_MODULE',
+        choices: [
+            { name: 'Content Types', value: 'content-types' },
+            { name: 'Global Fields', value: 'global-fields' },
+            { name: 'All', value: 'all' },
+        ],
+        validate: inquireRequireFieldValidation,
+    });
+}
+exports.selectModule = selectModule;
+async function askCompareBranch() {
+    return await cli_utilities_1.cliux.inquire({
+        type: 'input',
+        message: 'CLI_BRANCH_COMPARE_BRANCH',
+        name: 'compare_branch',
+        validate: inquireRequireFieldValidation,
+    });
+}
+exports.askCompareBranch = askCompareBranch;
+async function askStackAPIKey() {
+    return await cli_utilities_1.cliux.inquire({
+        type: 'input',
+        message: 'CLI_BRANCH_STACK_API_KEY',
+        name: 'api_key',
+        validate: inquireRequireFieldValidation,
+    });
+}
+exports.askStackAPIKey = askStackAPIKey;
+async function askBaseBranch() {
+    return await cli_utilities_1.cliux.inquire({
+        type: 'input',
+        message: 'CLI_BRANCH_BASE_BRANCH',
+        name: 'branch_branch',
+        validate: inquireRequireFieldValidation,
+    });
+}
+exports.askBaseBranch = askBaseBranch;
+async function askSourceBranch() {
+    return await cli_utilities_1.cliux.inquire({
+        type: 'input',
+        message: 'CLI_BRANCH_SOURCE_BRANCH',
+        name: 'source_branch',
+        validate: inquireRequireFieldValidation,
+    });
+}
+exports.askSourceBranch = askSourceBranch;
+async function askBranchUid() {
+    return await cli_utilities_1.cliux.inquire({
+        type: 'input',
+        message: 'CLI_BRANCH_BRANCH_UID',
+        name: 'branch_uid',
+        validate: inquireRequireFieldValidation,
+    });
+}
+exports.askBranchUid = askBranchUid;
+async function askConfirmation() {
+    const resp = await cli_utilities_1.cliux.inquire({
+        type: 'confirm',
+        message: 'Are you sure you want to delete this branch?',
+        name: 'confirm',
+    });
+    return resp;
+}
+exports.askConfirmation = askConfirmation;
+function inquireRequireFieldValidation(input) {
+    if ((0, isEmpty_1.default)(input)) {
+        return cli_utilities_1.messageHandler.parse('CLI_BRANCH_REQUIRED_FIELD');
+    }
+    return true;
+}
+exports.inquireRequireFieldValidation = inquireRequireFieldValidation;
+async function selectMergeStrategy() {
+    const strategy = await cli_utilities_1.cliux
+        .inquire({
+        type: 'list',
+        name: 'module',
+        choices: [
+            { name: 'Merge, Prefer Base', value: 'merge_prefer_base' },
+            { name: 'Merge, Prefer Compare', value: 'merge_prefer_compare' },
+            { name: 'Merge, Ask for Preference', value: 'custom_preferences' },
+            { name: 'Overwrite with Compare', value: 'overwrite_with_compare' },
+        ],
+        message: 'What merge strategy would you like to choose? <doc link>',
+    })
+        .then((name) => name)
+        .catch((err) => {
+        cli_utilities_1.cliux.error('Failed to collect the merge strategy');
+        process.exit(1);
+    });
+    return strategy;
+}
+exports.selectMergeStrategy = selectMergeStrategy;
+async function selectMergeStrategySubOptions() {
+    const strategy = await cli_utilities_1.cliux
+        .inquire({
+        type: 'list',
+        name: 'module',
+        choices: [
+            { name: 'New in Compare Only', value: 'new' },
+            { name: 'Modified Only', value: 'modified' },
+            { name: 'Both', value: 'both' },
+            { name: 'Go Back', value: 'previous' },
+            { name: 'Start Over', value: 'restart' },
+        ],
+        message: 'What do you want to merge?',
+    })
+        .then((name) => name)
+        .catch((err) => {
+        cli_utilities_1.cliux.error('Failed to collect the merge strategy');
+        process.exit(1);
+    });
+    return strategy;
+}
+exports.selectMergeStrategySubOptions = selectMergeStrategySubOptions;
+async function selectMergeExecution() {
+    const strategy = await cli_utilities_1.cliux
+        .inquire({
+        type: 'list',
+        name: 'module',
+        choices: [
+            { name: 'Execute Merge', value: 'both' },
+            { name: 'Export Merge Summary', value: 'export' },
+            { name: 'Go Back', value: 'previous' },
+            { name: 'Start Over', value: 'restart' },
+        ],
+        message: 'What would you like to do?',
+    })
+        .then((name) => name)
+        .catch((err) => {
+        cli_utilities_1.cliux.error('Exiting the merge process...');
+        process.exit(1);
+    });
+    return strategy;
+}
+exports.selectMergeExecution = selectMergeExecution;
+async function askExportMergeSummaryPath() {
+    return await cli_utilities_1.cliux.inquire({
+        type: 'input',
+        message: 'Enter the file path to export the summary',
+        name: 'filePath',
+        validate: inquireRequireFieldValidation,
+    });
+}
+exports.askExportMergeSummaryPath = askExportMergeSummaryPath;
+async function askMergeComment() {
+    return await cli_utilities_1.cliux.inquire({
+        type: 'input',
+        message: 'Enter a comment for merge',
+        name: 'comment',
+        validate: inquireRequireFieldValidation,
+    });
+}
+exports.askMergeComment = askMergeComment;
+async function selectCustomPreferences(module, payload) {
+    // cliux.print(`\n Select from ${startCase(camelCase(module))}`, { color: 'yellow' });
+    var _a, _b, _c;
+    // parse rows
+    const tableRows = [];
+    if (((_a = payload.modified) === null || _a === void 0 ? void 0 : _a.length) || ((_b = payload.added) === null || _b === void 0 ? void 0 : _b.length) || ((_c = payload.deleted) === null || _c === void 0 ? void 0 : _c.length)) {
+        (0, forEach_1.default)(payload.added, (item) => {
+            const row = {};
+            row.name = `+ ${item.title}`;
+            row.status = 'added';
+            row.value = item;
+            tableRows.push(row);
+        });
+        (0, forEach_1.default)(payload.modified, (item) => {
+            const row = {};
+            row.name = `± ${item.title}`;
+            row.status = 'modified';
+            row.value = item;
+            tableRows.push(row);
+        });
+        (0, forEach_1.default)(payload.deleted, (item) => {
+            const row = {};
+            row.name = `- ${item.title}`;
+            row.status = 'deleted';
+            row.value = item;
+            tableRows.push(row);
+        });
+    }
+    else {
+        return;
+    }
+    const selectedStrategies = await cli_utilities_1.cliux.inquire({
+        type: 'table',
+        message: `Select the ${(0, startCase_1.default)((0, camelCase_1.default)(module))} changes for merge`,
+        name: 'mergeContentTypePreferences',
+        selectAll: true,
+        pageSize: 10,
+        columns: [
+            {
+                name: 'Merge Prefer Base',
+                value: 'merge_prefer_base',
+            },
+            {
+                name: 'Merge Prefer Compare',
+                value: 'merge_prefer_compare',
+            },
+            {
+                name: 'Overwrite(Use Compare)',
+                value: 'overwrite_with_compare',
+            },
+            {
+                name: 'Ignore(Use Base)',
+                value: 'ignore',
+            },
+        ],
+        rows: tableRows,
+    });
+    let updatedArray = [];
+    (0, forEach_1.default)(selectedStrategies, (strategy, index) => {
+        const selectedItem = tableRows[index];
+        if (strategy && selectedItem) {
+            delete selectedItem.value.status;
+            selectedItem.value.merge_strategy = strategy;
+            updatedArray.push(selectedItem);
+        }
+    });
+    return updatedArray; // selected items
+}
+exports.selectCustomPreferences = selectCustomPreferences;
+async function askBranchNameConfirmation() {
+    return await cli_utilities_1.cliux.inquire({
+        type: 'input',
+        message: 'CLI_BRANCH_NAME_CONFIRMATION',
+        name: 'branch_name',
+        validate: inquireRequireFieldValidation,
+    });
+}
+exports.askBranchNameConfirmation = askBranchNameConfirmation;

package/lib/utils/merge-helper.js

@@ -0,0 +1,138 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchMergeStatus = exports.executeMerge = exports.displayMergeSummary = exports.displayBranchStatus = exports.setupMergeInputs = exports.prepareMergeRequestPayload = void 0;
+const tslib_1 = require("tslib");
+const startCase_1 = tslib_1.__importDefault(require("lodash/startCase"));
+const camelCase_1 = tslib_1.__importDefault(require("lodash/camelCase"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const cli_utilities_1 = require("@contentstack/cli-utilities");
+const _1 = require("./");
+const prepareMergeRequestPayload = (options) => {
+    return {
+        base_branch: options.baseBranch,
+        compare_branch: options.compareBranch,
+        default_merge_strategy: options.strategy,
+        item_merge_strategies: options.itemMergeStrategies,
+        merge_comment: options.mergeComment,
+        no_revert: options.noRevert,
+    };
+};
+exports.prepareMergeRequestPayload = prepareMergeRequestPayload;
+const setupMergeInputs = async (mergeFlags) => {
+    if (!mergeFlags['stack-api-key']) {
+        mergeFlags['stack-api-key'] = await (0, _1.askStackAPIKey)();
+    }
+    if (!mergeFlags['compare-branch']) {
+        mergeFlags['compare-branch'] = await (0, _1.askCompareBranch)();
+    }
+    if (!mergeFlags['base-branch']) {
+        mergeFlags['base-branch'] = (0, _1.getbranchConfig)(mergeFlags['stack-api-key']);
+        if (!mergeFlags['base-branch']) {
+            mergeFlags['base-branch'] = await (0, _1.askBaseBranch)();
+        }
+        else {
+            cli_utilities_1.cliux.print(`\nBase branch: ${mergeFlags['base-branch']}\n`, { color: 'grey' });
+        }
+    }
+    return mergeFlags;
+};
+exports.setupMergeInputs = setupMergeInputs;
+const displayBranchStatus = async (options) => {
+    const spinner = cli_utilities_1.cliux.loaderV2('Loading branch differences...');
+    let payload = {
+        module: '',
+        apiKey: options.stackAPIKey,
+        baseBranch: options.baseBranch,
+        compareBranch: options.compareBranch,
+        host: options.host,
+    };
+    payload.spinner = spinner;
+    const branchDiffData = await _1.branchDiffUtility.fetchBranchesDiff(payload);
+    const diffData = _1.branchDiffUtility.filterBranchDiffDataByModule(branchDiffData);
+    cli_utilities_1.cliux.loaderV2('', spinner);
+    let parsedResponse = {};
+    for (let module in diffData) {
+        const branchModuleData = diffData[module];
+        payload.module = module;
+        cli_utilities_1.cliux.print(' ');
+        cli_utilities_1.cliux.print(`${(0, startCase_1.default)((0, camelCase_1.default)(module))} Summary:`, { color: 'yellow' });
+        const diffSummary = _1.branchDiffUtility.parseSummary(branchModuleData, options.baseBranch, options.compareBranch);
+        _1.branchDiffUtility.printSummary(diffSummary);
+        const spinner1 = cli_utilities_1.cliux.loaderV2('Loading branch differences...');
+        if (options.format === 'compact-text') {
+            const branchTextRes = _1.branchDiffUtility.parseCompactText(branchModuleData);
+            cli_utilities_1.cliux.loaderV2('', spinner1);
+            _1.branchDiffUtility.printCompactTextView(branchTextRes);
+            parsedResponse[module] = branchTextRes;
+        }
+        else if (options.format === 'detailed-text') {
+            const verboseRes = await _1.branchDiffUtility.parseVerbose(branchModuleData, payload);
+            cli_utilities_1.cliux.loaderV2('', spinner1);
+            _1.branchDiffUtility.printVerboseTextView(verboseRes);
+            parsedResponse[module] = verboseRes;
+        }
+    }
+    return parsedResponse;
+};
+exports.displayBranchStatus = displayBranchStatus;
+const displayMergeSummary = (options) => {
+    cli_utilities_1.cliux.print(' ');
+    cli_utilities_1.cliux.print(`Merge Summary:`, { color: 'yellow' });
+    for (let module in options.compareData) {
+        if (options.format === 'compact-text') {
+            _1.branchDiffUtility.printCompactTextView(options.compareData[module]);
+        }
+        else if (options.format === 'detailed-text') {
+            _1.branchDiffUtility.printVerboseTextView(options.compareData[module]);
+        }
+    }
+    cli_utilities_1.cliux.print(' ');
+};
+exports.displayMergeSummary = displayMergeSummary;
+const executeMerge = async (apiKey, mergePayload, host) => {
+    var _a, _b;
+    const stackAPIClient = await (await (0, cli_utilities_1.managementSDKClient)({ host })).stack({ api_key: apiKey });
+    const mergeResponse = await (0, _1.executeMergeRequest)(stackAPIClient, { params: mergePayload });
+    if (((_a = mergeResponse.merge_details) === null || _a === void 0 ? void 0 : _a.status) === 'in_progress') {
+        // TBD call the queue with the id
+        return await (0, exports.fetchMergeStatus)(stackAPIClient, { uid: mergeResponse.uid });
+    }
+    else if (((_b = mergeResponse.merge_details) === null || _b === void 0 ? void 0 : _b.status) === 'complete') {
+        // return the merge id success
+        return mergeResponse;
+    }
+};
+exports.executeMerge = executeMerge;
+const fetchMergeStatus = async (stackAPIClient, mergePayload) => {
+    return new Promise(async (resolve, reject) => {
+        var _a, _b, _c;
+        const mergeStatusResponse = await (0, _1.getMergeQueueStatus)(stackAPIClient, { uid: mergePayload.uid });
+        if (((_a = mergeStatusResponse === null || mergeStatusResponse === void 0 ? void 0 : mergeStatusResponse.queue) === null || _a === void 0 ? void 0 : _a.length) >= 1) {
+            const mergeRequestStatusResponse = mergeStatusResponse.queue[0];
+            const mergeStatus = (_b = mergeRequestStatusResponse.merge_details) === null || _b === void 0 ? void 0 : _b.status;
+            if (mergeStatus === 'complete') {
+                resolve(mergeRequestStatusResponse);
+            }
+            else if (mergeStatus === 'in-progress' || mergeStatus === 'in_progress') {
+                setTimeout(async () => {
+                    await (0, exports.fetchMergeStatus)(stackAPIClient, mergePayload).then(resolve).catch(reject);
+                }, 5000);
+            }
+            else if (mergeStatus === 'failed') {
+                if (((_c = mergeRequestStatusResponse === null || mergeRequestStatusResponse === void 0 ? void 0 : mergeRequestStatusResponse.errors) === null || _c === void 0 ? void 0 : _c.length) > 0) {
+                    const errorPath = path_1.default.join(process.cwd(), 'merge-error.log');
+                    await (0, _1.writeFile)(errorPath, mergeRequestStatusResponse.errors);
+                    cli_utilities_1.cliux.print(`\nComplete error log can be found in ${path_1.default.resolve(errorPath)}`, { color: 'grey' });
+                }
+                return reject(`merge uid: ${mergePayload.uid}`);
+            }
+            else {
+                return reject(`Invalid merge status found with merge ID ${mergePayload.uid}`);
+            }
+        }
+        else {
+            return reject(`No queue found with merge ID ${mergePayload.uid}`);
+        }
+    });
+};
+exports.fetchMergeStatus = fetchMergeStatus;