@contentstack/cli-cm-branches 1.0.22 → 1.0.24

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.22 linux-x64 node-v18.19.0
+@contentstack/cli-cm-branches/1.0.24 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/asset-folder-create-script.js

@@ -117,9 +117,9 @@ function assetFolderCreateScript(contentType) {
 
   const createAssetTask = () => {
     return {
-      title: 'Create Assets Folder',
+      title: 'Check and create asset folder in base branch',
       successTitle: 'Assets folder Created Successfully',
-      failedTitle: 'Failed to create assets folder',
+      failedTitle: 'Failed to create assets folder in base branch',
       task: async () => {
         try {
           const baseAssetsFolderCount = await getAssetCount(branch, true);

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

@@ -12,7 +12,6 @@ function entryCreateScript(contentType) {
   const omit = require('lodash/omit');
   const compact = require('lodash/compact')
   const isPlainObject = require('lodash/isPlainObject');
-  const {cliux, LoggerService} = require('@contentstack/cli-utilities')
   module.exports = async ({ migration, stackSDKInstance, managementAPIClient, config, branch, apiKey }) => {
     const keysToRemove = [
       'content_type_uid',
@@ -44,7 +43,6 @@ function entryCreateScript(contentType) {
     let assetRefPath = {};
     let downloadedAssets = [];
     let parent=[];
-    let logger;
 
     function getValueByPath(obj, path) {
       return path.split('[').reduce((o, key) => o && o[key.replace(/\]$/, '')], obj);
@@ -473,10 +471,6 @@ function entryCreateScript(contentType) {
         successTitle: 'Entries Created Successfully',
         failedTitle: 'Failed to create entries',
         task: async () => {
-          //logger file
-          if(!fs.existsSync(path.join(filePath, 'entry-migration'))){
-            logger = new LoggerService(filePath, 'entry-migration');
-          }
 
           const compareBranchEntries = await managementAPIClient
             .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
@@ -523,17 +517,7 @@ function entryCreateScript(contentType) {
 
           async function updateEntry(entry, entryDetails) {
             Object.assign(entry, { ...entryDetails });
-            await entry.update().catch(err => {
-              let errorMsg = 'Entry update failed for uid: ' + entry?.uid + ', title: ' + entry?.title + '. ';
-              if(err?.errors?.title){
-                errorMsg +=  'title'+ err?.errors?.title;
-              }else if(err?.errors?.entry){
-                errorMsg +=  err?.errors?.entry;
-              }else{
-                errorMsg +=  (err?.entry?.errorMessage || err?.errorMessage || err?.message) ?? 'Something went wrong!';
-              }
-              logger.error(errorMsg)
-            });
+            await entry.update()
           }
 
           async function updateReferences(entryDetails, baseEntry, references) {
@@ -561,29 +545,21 @@ function entryCreateScript(contentType) {
           }
 
           try {
-            compareFilteredProperties.length !== 0 &&
-              compareFilteredProperties.forEach(async (entryDetails) => {
-                if(entryDetails !== undefined){
+            if (compareFilteredProperties.length !== 0) {
+              for (let i = 0; i < compareFilteredProperties.length; i++) {
+                let entryDetails = compareFilteredProperties[i];
+                if (entryDetails !== undefined) {
                   entryDetails = updateAssetDetailsInEntries(entryDetails);
-                  let createdEntry = await stackSDKInstance.contentType('${contentType}').entry().create({ entry: entryDetails }).catch(err => {
-                    let errorMsg = 'Entry creation failed for contentType: ' + contentType + ', title: ' + entryDetails?.title + '. ';
-                    if(err?.errors?.title){
-                      errorMsg +=  err?.errors?.title;
-                    }else if(err?.errors?.entry){
-                      errorMsg +=  err?.errors?.entry;
-                    }else{
-                      errorMsg +=  (err?.entry?.errorMessage || err?.errorMessage || err?.message) ?? 'Something went wrong!';
-                    }
-                    logger.error(errorMsg)
-                  });
-                  if(createdEntry){
+                  let createdEntry = await stackSDKInstance.contentType('${contentType}').entry().create({ entry: entryDetails })
+                  if (createdEntry) {
                     if (flag.references) {
                       await updateReferences(entryDetails, createdEntry, references);
                     }
-                    await updateEntry(createdEntry, entryDetails);
+                    await updateEntry(createdEntry, entryDetails)
                   }
                 }
-              });
+              }
+            }
           } catch (error) {
             throw error;
           }

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

@@ -12,7 +12,6 @@ function entryCreateUpdateScript(contentType) {
   const omit = require('lodash/omit');
   const compact = require('lodash/compact')
   const isPlainObject = require('lodash/isPlainObject');
-  const {cliux, LoggerService} = require('@contentstack/cli-utilities')
   module.exports = async ({ migration, stackSDKInstance, managementAPIClient, config, branch, apiKey }) => {
     const keysToRemove = [
       'content_type_uid',
@@ -45,7 +44,6 @@ function entryCreateUpdateScript(contentType) {
     let assetUrlMapper = {};
     let assetRefPath = {};
     let parent=[];
-    let logger;
   
     function converter(data) {
       let arr = [];
@@ -488,10 +486,6 @@ function entryCreateUpdateScript(contentType) {
         successMessage: 'Entries Updated Successfully',
         failedMessage: 'Failed to update entries',
         task: async () => {
-        //logger file
-        if(!fs.existsSync(path.join(filePath, 'entry-migration'))){
-          logger = new LoggerService(filePath, 'entry-migration');
-        }
           let compareBranchEntries = await managementAPIClient
           .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
           .contentType('${contentType}')
@@ -542,17 +536,7 @@ function entryCreateUpdateScript(contentType) {
           async function updateEntry(entry, entryDetails) {
             if (entry) {
               Object.assign(entry, { ...entryDetails });
-              await entry.update().catch(err => {
-                let errorMsg = 'Entry update failed for uid: ' + entry?.uid + ', title: ' + entry?.title + '.';
-                if(err?.errors?.title){
-                  errorMsg +=  err?.errors?.title;
-                }else if(err?.errors?.entry){
-                  errorMsg +=  err?.errors?.entry;
-                }else{
-                  errorMsg +=  (err?.entry?.errorMessage || err?.errorMessage || err?.message) ?? 'Something went wrong!';
-                }
-                logger.error(errorMsg)
-              });
+              await entry.update();
             }
           }
 
@@ -625,9 +609,6 @@ function entryCreateUpdateScript(contentType) {
                     .contentType('${contentType}')
                     .entry()
                     .create({ entry: entryDetails })
-                    .catch(err => {
-                      (err?.errorMessage || err?.message) ? err?.errorMessage || err?.message : 'Something went wrong!'
-                    })
 
                     if(createdEntry){
                       if (flag.references) {

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

@@ -12,7 +12,6 @@ function entryUpdateScript(contentType) {
   const omit = require('lodash/omit');
   const compact = require('lodash/compact')
   const isPlainObject = require('lodash/isPlainObject');
-  const {cliux, LoggerService} = require('@contentstack/cli-utilities')
   module.exports = async ({ migration, stackSDKInstance, managementAPIClient, config, branch, apiKey }) => {
     const keysToRemove = [
       'content_type_uid',
@@ -45,7 +44,6 @@ function entryUpdateScript(contentType) {
     let assetUrlMapper = {};
     let assetRefPath = {};
     let parent=[];
-    let logger;
   
     function converter(data) {
       let arr = [];
@@ -487,10 +485,6 @@ function entryUpdateScript(contentType) {
         successMessage: 'Entries Updated Successfully',
         failedMessage: 'Failed to update entries',
         task: async () => {
-          //logger file
-          if(!fs.existsSync(path.join(filePath, 'entry-migration'))){
-            logger = new LoggerService(filePath, 'entry-migration');
-          }
           
           let compareBranchEntries = await managementAPIClient
           .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
@@ -541,17 +535,7 @@ function entryUpdateScript(contentType) {
   
           async function updateEntry(entry, entryDetails) {
             Object.assign(entry, { ...entryDetails });
-            await entry.update().catch(err => {
-              let errorMsg = 'Entry update failed for uid: ' + entry?.uid + ', title: ' + entry?.title + '.';
-              if(err?.errors?.title){
-                errorMsg +=  err?.errors?.title;
-              }else if(err?.errors?.entry){
-                errorMsg +=  err?.errors?.entry;
-              }else{
-                errorMsg +=  (err?.entry?.errorMessage || err?.errorMessage || err?.message) ?? 'Something went wrong!';
-              }
-              logger.error(errorMsg)
-            });
+            await entry.update();
           }
 
           async function updateReferences(entryDetails, baseEntry, references) {
@@ -622,9 +606,6 @@ function entryUpdateScript(contentType) {
                     .contentType('${contentType}')
                     .entry()
                     .create({ entry: entryDetails })
-                    .catch(err => {
-                      (err?.errorMessage || err?.message) ? err?.errorMessage || err?.message : 'Something went wrong!'
-                    })
                   
                     if(createdEntry){
                       if (flag.references) {

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.22",
+  "version": "1.0.24",
   "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.22",
+  "version": "1.0.24",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.11",
+    "@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.6.0",
+    "@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"
-}
+}