@contentstack/cli-cm-branches 1.4.0 → 1.4.1

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.1 linux-x64 node-v22.14.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,6 +84,10 @@ 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);
+                }
                 (0, forEach_1.default)(selectedItems, (item) => {
                     this.mergeSettings.mergeContent[module][item.status].push(item.value);
                     this.mergeSettings.itemMergeStrategies.push(item.value);
@@ -115,7 +120,12 @@ class MergeHandler {
         else if (this.strategy === 'overwrite_with_compare') {
             this.mergeSettings.strategy = 'overwrite_with_compare';
         }
-        await this.displayMergeSummary();
+        if (this.checkEmptySelection()) {
+            cli_utilities_1.cliux.print(chalk_1.default.red('No items selected'));
+        }
+        else {
+            await this.displayMergeSummary();
+        }
         if (!this.executeOption) {
             const executionResponse = await (0, utils_1.selectMergeExecution)();
             if (executionResponse === 'previous') {
@@ -135,6 +145,17 @@ class MergeHandler {
             }
         }
     }
+    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;
+            }
+        }
+        return true;
+    }
     displayMergeSummary() {
         if (this.mergeSettings.strategy !== 'ignore') {
             for (let module in this.branchCompareData) {

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

@@ -181,13 +181,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/oclif.manifest.json

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

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.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {