@contentstack/cli-cm-branches 1.4.0 → 1.4.2

package/README.md

@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-branches/1.4.0 linux-x64 node-v22.14.0
+@contentstack/cli-cm-branches/1.4.2 linux-x64 node-v22.15.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/branch/merge-handler.js

@@ -5,6 +5,7 @@ const os_1 = tslib_1.__importDefault(require("os"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const forEach_1 = tslib_1.__importDefault(require("lodash/forEach"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const utils_1 = require("../utils");
 class MergeHandler {
     constructor(options) {
@@ -83,11 +84,13 @@ class MergeHandler {
                     deleted: [],
                 };
                 const selectedItems = await (0, utils_1.selectCustomPreferences)(module, this.branchCompareData[module]);
-                (0, forEach_1.default)(selectedItems, (item) => {
-                    this.mergeSettings.mergeContent[module][item.status].push(item.value);
-                    this.mergeSettings.itemMergeStrategies.push(item.value);
-                });
-                this.mergeSettings.strategy = 'ignore';
+                if (selectedItems === null || selectedItems === void 0 ? void 0 : selectedItems.length) {
+                    (0, forEach_1.default)(selectedItems, (item) => {
+                        this.mergeSettings.mergeContent[module][item.status].push(item.value);
+                        this.mergeSettings.itemMergeStrategies.push(item.value);
+                    });
+                    this.mergeSettings.strategy = 'ignore';
+                }
             }
         }
         else if (this.strategy === 'merge_prefer_base') {
@@ -115,7 +118,20 @@ class MergeHandler {
         else if (this.strategy === 'overwrite_with_compare') {
             this.mergeSettings.strategy = 'overwrite_with_compare';
         }
-        await this.displayMergeSummary();
+        const { allEmpty, moduleStatus } = this.checkEmptySelection();
+        const strategyName = this.mergeSettings.strategy;
+        if (allEmpty) {
+            cli_utilities_1.cliux.print(chalk_1.default.red(`No items selected according to the '${strategyName}' strategy.`));
+            process.exit(1);
+        }
+        for (const [type, { exists, empty }] of Object.entries(moduleStatus)) {
+            if (exists && empty) {
+                const readable = type === 'contentType' ? 'Content Types' : 'Global fields';
+                cli_utilities_1.cliux.print('\n');
+                cli_utilities_1.cliux.print(chalk_1.default.yellow(`Note: No ${readable} selected according to the '${strategyName}' strategy.`));
+            }
+        }
+        this.displayMergeSummary();
         if (!this.executeOption) {
             const executionResponse = await (0, utils_1.selectMergeExecution)();
             if (executionResponse === 'previous') {
@@ -135,6 +151,59 @@ class MergeHandler {
             }
         }
     }
+    /**
+     * Checks whether the selection of modules in the compare branch data is empty.
+     *
+     * This method evaluates the branch compare data and determines if there are any changes
+     * (added, modified, or deleted) in the modules based on the merge strategy defined in the
+     * merge settings. It categorizes the status of each module as either existing and empty or
+     * not empty.
+     *
+     * @returns An object containing:
+     * - `allEmpty`: A boolean indicating whether all modules are either non-existent or empty.
+     * - `moduleStatus`: A record mapping module types (`contentType` and `globalField`) to their
+     *   respective statuses, which include:
+     *   - `exists`: A boolean indicating whether the module exists in the branch comparison data.
+     *   - `empty`: A boolean indicating whether the module has no changes (added, modified, or deleted).
+     */
+    checkEmptySelection() {
+        const strategy = this.mergeSettings.strategy;
+        const useMergeContent = new Set(['custom_preferences', 'ignore']);
+        const modifiedOnlyStrategies = new Set(['merge_modified_only_prefer_base', 'merge_modified_only_prefer_compare']);
+        const addedOnlyStrategies = new Set(['merge_new_only']);
+        const moduleStatus = {
+            contentType: { exists: false, empty: true },
+            globalField: { exists: false, empty: true },
+        };
+        for (const module in this.branchCompareData) {
+            const content = useMergeContent.has(strategy)
+                ? this.mergeSettings.mergeContent[module]
+                : this.branchCompareData[module];
+            if (!content)
+                continue;
+            const isGlobalField = module === 'global_fields';
+            const type = isGlobalField ? 'globalField' : 'contentType';
+            moduleStatus[type].exists = true;
+            let hasChanges = false;
+            if (modifiedOnlyStrategies.has(strategy)) {
+                hasChanges = Array.isArray(content.modified) && content.modified.length > 0;
+            }
+            else if (addedOnlyStrategies.has(strategy)) {
+                hasChanges = Array.isArray(content.added) && content.added.length > 0;
+            }
+            else {
+                hasChanges =
+                    (Array.isArray(content.modified) && content.modified.length > 0) ||
+                        (Array.isArray(content.added) && content.added.length > 0) ||
+                        (Array.isArray(content.deleted) && content.deleted.length > 0);
+            }
+            if (hasChanges) {
+                moduleStatus[type].empty = false;
+            }
+        }
+        const allEmpty = Object.values(moduleStatus).every((status) => !status.exists || status.empty);
+        return { allEmpty, moduleStatus };
+    }
     displayMergeSummary() {
         if (this.mergeSettings.strategy !== 'ignore') {
             for (let module in this.branchCompareData) {
@@ -225,10 +294,10 @@ class MergeHandler {
                 });
         };
         const mergePreferencesMap = {
-            'existing_new': 'merge_existing_new',
-            'new': 'merge_new',
-            'existing': 'merge_existing',
-            'ask_preference': 'custom',
+            existing_new: 'merge_existing_new',
+            new: 'merge_new',
+            existing: 'merge_existing',
+            ask_preference: 'custom',
         };
         const selectedMergePreference = mergePreferencesMap[mergePreference];
         if (selectedMergePreference) {

package/lib/utils/branch-diff-utility.js

@@ -65,24 +65,23 @@ async function branchCompareSDK(payload, skip, limit) {
         queryParams['uid'] = payload.uid;
     const module = payload.module || 'all';
     switch (module) {
-        case 'content_types' || 'content_type':
+        case 'content_types':
+        case 'content_type':
             return await branchQuery
                 .contentTypes(queryParams)
                 .then((data) => data)
                 .catch((err) => handleErrorMsg(err, payload.spinner));
-            break;
-        case 'global_fields' || 'global_field':
+        case 'global_fields':
+        case 'global_field':
             return await branchQuery
                 .globalFields(queryParams)
                 .then((data) => data)
                 .catch((err) => handleErrorMsg(err, payload.spinner));
-            break;
         case 'all':
             return await branchQuery
                 .all(queryParams)
                 .then((data) => data)
                 .catch((err) => handleErrorMsg(err, payload.spinner));
-            break;
         default:
             handleErrorMsg({ errorMessage: 'Invalid module!' }, payload.spinner);
     }
@@ -181,13 +180,19 @@ function printCompactTextView(branchTextRes) {
     if (((_a = branchTextRes.modified) === null || _a === void 0 ? void 0 : _a.length) || ((_b = branchTextRes.added) === null || _b === void 0 ? void 0 : _b.length) || ((_c = branchTextRes.deleted) === null || _c === void 0 ? void 0 : _c.length)) {
         cli_utilities_1.cliux.print(' ');
         (0, forEach_1.default)(branchTextRes.added, (diff) => {
-            cli_utilities_1.cliux.print(chalk_1.default.green(`+ '${diff.title}' ${(0, startCase_1.default)((0, camelCase_1.default)(diff.type))}`));
+            if (diff.merge_strategy !== 'ignore') {
+                cli_utilities_1.cliux.print(chalk_1.default.green(`+ '${diff.title}' ${(0, startCase_1.default)((0, camelCase_1.default)(diff.type))}`));
+            }
         });
         (0, forEach_1.default)(branchTextRes.modified, (diff) => {
-            cli_utilities_1.cliux.print(chalk_1.default.blue(`± '${diff.title}' ${(0, startCase_1.default)((0, camelCase_1.default)(diff.type))}`));
+            if (diff.merge_strategy !== 'ignore') {
+                cli_utilities_1.cliux.print(chalk_1.default.blue(`± '${diff.title}' ${(0, startCase_1.default)((0, camelCase_1.default)(diff.type))}`));
+            }
         });
         (0, forEach_1.default)(branchTextRes.deleted, (diff) => {
-            cli_utilities_1.cliux.print(chalk_1.default.red(`- '${diff.title}' ${(0, startCase_1.default)((0, camelCase_1.default)(diff.type))}`));
+            if (diff.merge_strategy !== 'ignore') {
+                cli_utilities_1.cliux.print(chalk_1.default.red(`- '${diff.title}' ${(0, startCase_1.default)((0, camelCase_1.default)(diff.type))}`));
+            }
         });
     }
 }

package/lib/utils/index.js

@@ -73,7 +73,7 @@ async function getMergeQueueStatus(stackAPIClient, payload) {
         .mergeQueue(mergeJobUID)
         .fetch()
         .then((data) => data)
-        .catch((err) => handleErrorMsg(err));
+        .catch((err) => handleErrorMsg(err, () => getMergeQueueStatus(stackAPIClient, payload)));
 }
 exports.getMergeQueueStatus = getMergeQueueStatus;
 async function executeMergeRequest(stackAPIClient, payload) {
@@ -90,10 +90,18 @@ async function executeMergeRequest(stackAPIClient, payload) {
         .branch()
         .merge(itemMergeStrategies, queryParams)
         .then((data) => data)
-        .catch((err) => handleErrorMsg(err));
+        .catch((err) => handleErrorMsg(err, () => executeMergeRequest(stackAPIClient, payload)));
 }
 exports.executeMergeRequest = executeMergeRequest;
-function handleErrorMsg(err) {
+async function handleErrorMsg(err, retryCallback) {
+    var _a;
+    // Handle rate limit exceeded (status code 429)
+    if ((err === null || err === void 0 ? void 0 : err.status) === 429 || ((_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.status) === 429) {
+        await new Promise((resolve) => setTimeout(resolve, 1000)); // 1 sec delay
+        if (retryCallback) {
+            return retryCallback(); // Retry the request
+        }
+    }
     if (err === null || err === void 0 ? void 0 : err.errorMessage) {
         cli_utilities_1.cliux.print(`Error: ${err.errorMessage}`, { color: 'red' });
     }

package/oclif.manifest.json

@@ -355,5 +355,5 @@
       ]
     }
   },
-  "version": "1.4.0"
+  "version": "1.4.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-branches",
   "description": "Contentstack CLI plugin to do branches operations",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {