@contentstack/cli-cm-branches 1.4.1 → 1.4.3

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.1 linux-x64 node-v22.14.0
+@contentstack/cli-cm-branches/1.4.3 linux-x64 node-v22.16.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/branch/merge-handler.js

@@ -84,15 +84,13 @@ class MergeHandler {
                     deleted: [],
                 };
                 const selectedItems = await (0, utils_1.selectCustomPreferences)(module, this.branchCompareData[module]);
-                if (!selectedItems.length) {
-                    cli_utilities_1.cliux.print(chalk_1.default.red('No items were selected'));
-                    process.exit(1);
+                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';
                 }
-                (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') {
@@ -120,12 +118,20 @@ class MergeHandler {
         else if (this.strategy === 'overwrite_with_compare') {
             this.mergeSettings.strategy = 'overwrite_with_compare';
         }
-        if (this.checkEmptySelection()) {
-            cli_utilities_1.cliux.print(chalk_1.default.red('No items selected'));
+        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);
         }
-        else {
-            await this.displayMergeSummary();
+        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') {
@@ -145,16 +151,58 @@ 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() {
-        var _a, _b, _c, _d, _e, _f;
-        for (let module in this.branchCompareData) {
-            if (((_b = (_a = this.mergeSettings.mergeContent[module]) === null || _a === void 0 ? void 0 : _a.modified) === null || _b === void 0 ? void 0 : _b.length)
-                || ((_d = (_c = this.mergeSettings.mergeContent[module]) === null || _c === void 0 ? void 0 : _c.added) === null || _d === void 0 ? void 0 : _d.length)
-                || ((_f = (_e = this.mergeSettings.mergeContent[module]) === null || _e === void 0 ? void 0 : _e.deleted) === null || _f === void 0 ? void 0 : _f.length)) {
-                return false;
+        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;
             }
         }
-        return true;
+        const allEmpty = Object.values(moduleStatus).every((status) => !status.exists || status.empty);
+        return { allEmpty, moduleStatus };
     }
     displayMergeSummary() {
         if (this.mergeSettings.strategy !== 'ignore') {
@@ -246,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);
     }

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.1"
+  "version": "1.4.3"
 }

package/package.json

@@ -1,30 +1,30 @@
 {
   "name": "@contentstack/cli-cm-branches",
   "description": "Contentstack CLI plugin to do branches operations",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.5.0",
-    "@oclif/core": "^4.2.7",
-    "@contentstack/cli-utilities": "~1.11.0",
+    "@oclif/core": "^4.3.0",
+    "@contentstack/cli-utilities": "~1.12.0",
     "chalk": "^4.1.2",
     "just-diff": "^6.0.2",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@contentstack/cli-dev-dependencies": "~1.3.0",
-    "@oclif/plugin-help": "^6.2.25",
+    "@oclif/plugin-help": "^6.2.28",
     "@types/flat": "^5.0.5",
     "chai": "^4.5.0",
-    "dotenv": "^16.4.7",
+    "dotenv": "^16.5.0",
     "dotenv-expand": "^9.0.0",
     "eslint": "^8.57.1",
-    "eslint-config-oclif": "^6.0.15",
+    "eslint-config-oclif": "^6.0.62",
     "mocha": "10.8.2",
     "nyc": "^15.1.0",
-    "oclif": "^4.17.30",
-    "sinon": "^19.0.2",
+    "oclif": "^4.17.46",
+    "sinon": "^19.0.5",
     "ts-node": "^10.9.2",
     "typescript": "^4.9.5"
   },