@contentstack/cli-cm-branches 1.0.21 → 1.0.23

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.0.21 linux-x64 node-v18.19.0
+@contentstack/cli-cm-branches/1.0.23 linux-x64 node-v18.19.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/commands/cm/branches/merge.js

@@ -21,22 +21,28 @@ class BranchMergeCommand extends cli_command_1.Command {
                 host: this.cmaHost,
                 format: 'compact-text',
             });
-            await new branch_1.MergeHandler({
-                stackAPIKey: branchMergeFlags['stack-api-key'],
-                compareBranch: branchMergeFlags['compare-branch'],
-                strategy: branchMergeFlags.strategy,
-                strategySubOption: branchMergeFlags['strategy-sub-options'],
-                baseBranch: branchMergeFlags['base-branch'],
-                branchCompareData: branchCompareData,
-                mergeComment: branchMergeFlags.comment,
-                executeOption: branchMergeFlags['merge-action'],
-                noRevert: branchMergeFlags['no-revert'],
-                format: 'compact-text',
-                exportSummaryPath: branchMergeFlags['export-summary-path'],
-                mergeSummary: branchMergeFlags.mergeSummary,
-                host: this.cmaHost,
-                enableEntryExp: false,
-            }).start();
+            const isCompareDataValid = (0, utils_1.validateCompareData)(branchCompareData);
+            if (isCompareDataValid) {
+                await new branch_1.MergeHandler({
+                    stackAPIKey: branchMergeFlags['stack-api-key'],
+                    compareBranch: branchMergeFlags['compare-branch'],
+                    strategy: branchMergeFlags.strategy,
+                    strategySubOption: branchMergeFlags['strategy-sub-options'],
+                    baseBranch: branchMergeFlags['base-branch'],
+                    branchCompareData: branchCompareData,
+                    mergeComment: branchMergeFlags.comment,
+                    executeOption: branchMergeFlags['merge-action'],
+                    noRevert: branchMergeFlags['no-revert'],
+                    format: 'compact-text',
+                    exportSummaryPath: branchMergeFlags['export-summary-path'],
+                    mergeSummary: branchMergeFlags.mergeSummary,
+                    host: this.cmaHost,
+                    enableEntryExp: false,
+                }).start();
+            }
+            else {
+                cli_utilities_1.cliux.print("No changes found to merge.");
+            }
         }
         catch (error) {
             console.log('Error in Merge operations', error);

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

@@ -185,7 +185,7 @@ function entryCreateScript(contentType) {
         text = JSON.stringify(_entry);
       }
       markdownRegEx = new RegExp(
-        '(https://(assets|(eu-|azure-na-|azure-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
+        '(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
         'g',
       );
       while ((markdownMatch = markdownRegEx.exec(text)) !== null) {

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

@@ -207,7 +207,7 @@ function entryCreateUpdateScript(contentType) {
         text = JSON.stringify(_entry);
       }
       markdownRegEx = new RegExp(
-        '(https://(assets|(eu-|azure-na-|azure-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
+        '(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
         'g',
       );
       while ((markdownMatch = markdownRegEx.exec(text)) !== null) {

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

@@ -207,7 +207,7 @@ function entryUpdateScript(contentType) {
         text = JSON.stringify(_entry);
       }
       markdownRegEx = new RegExp(
-        '(https://(assets|(eu-|azure-na-|azure-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
+        '(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
         'g',
       );
       while ((markdownMatch = markdownRegEx.exec(text)) !== null) {

package/lib/utils/index.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteBranchUtility = exports.branchDiffUtility = exports.interactive = exports.handleErrorMsg = exports.executeMergeRequest = exports.getMergeQueueStatus = exports.readFile = exports.writeFile = exports.refreshbranchConfig = exports.getbranchConfig = exports.getbranchesList = void 0;
+exports.deleteBranchUtility = exports.branchDiffUtility = exports.interactive = exports.validateCompareData = exports.handleErrorMsg = exports.executeMergeRequest = exports.getMergeQueueStatus = exports.readFile = 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 forEach_1 = tslib_1.__importDefault(require("lodash/forEach"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const getbranchesList = (branchResult, baseBranch) => {
     const branches = [];
@@ -106,6 +107,25 @@ function handleErrorMsg(err) {
     process.exit(1);
 }
 exports.handleErrorMsg = handleErrorMsg;
+function validateCompareData(branchCompareData) {
+    let validCompareData = false;
+    if (branchCompareData.content_types) {
+        (0, forEach_1.default)(branchCompareData.content_types, (value, key) => {
+            if ((value === null || value === void 0 ? void 0 : value.length) > 0) {
+                validCompareData = true;
+            }
+        });
+    }
+    if (branchCompareData.global_fields) {
+        (0, forEach_1.default)(branchCompareData.global_fields, (value, key) => {
+            if ((value === null || value === void 0 ? void 0 : value.length) > 0) {
+                validCompareData = true;
+            }
+        });
+    }
+    return validCompareData;
+}
+exports.validateCompareData = validateCompareData;
 tslib_1.__exportStar(require("./interactive"), exports);
 tslib_1.__exportStar(require("./merge-helper"), exports);
 tslib_1.__exportStar(require("./create-merge-scripts"), exports);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.21",
+  "version": "1.0.23",
   "commands": {
     "cm:branches:create": {
       "id": "cm:branches:create",

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-branches",
   "description": "Contentstack CLI plugin to do branches operations",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.10",
+    "@contentstack/cli-utilities": "~1.6.0",
     "@oclif/core": "^2.9.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
@@ -26,10 +26,10 @@
   },
   "devDependencies": {
     "@contentstack/cli-auth": "~1.3.17",
-    "@contentstack/cli-config": "~1.4.15",
+    "@contentstack/cli-config": "~1.6.1",
     "@contentstack/cli-dev-dependencies": "~1.2.4",
     "@oclif/plugin-help": "^5.1.19",
-    "@oclif/test": "^1.2.6",
+    "@oclif/test": "^2.5.6",
     "@types/flat": "^5.0.2",
     "assert": "^2.0.0",
     "chai": "^4.2.0",
@@ -95,4 +95,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}