@contentstack/cli-cm-branches 1.0.19 → 1.0.21

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Contentstack
+Copyright (c) 2024 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

package/lib/branch/merge-handler.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+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");
@@ -217,49 +218,52 @@ class MergeHandler {
     async executeEntryExpFlow(mergeJobUID, mergePayload) {
         const { mergeContent } = this.mergeSettings;
         let mergePreference = await (0, utils_1.selectContentMergePreference)();
-        let selectedMergePreference;
         const updateEntryMergeStrategy = (items, mergeStrategy) => {
             items &&
                 items.forEach((item) => {
                     item.entry_merge_strategy = mergeStrategy;
                 });
         };
-        switch (mergePreference) {
-            case 'existing_new':
-                selectedMergePreference = 'merge_existing_new';
-                updateEntryMergeStrategy(mergeContent.content_types.added, selectedMergePreference);
-                updateEntryMergeStrategy(mergeContent.content_types.modified, selectedMergePreference);
-                break;
-            case 'new':
-                selectedMergePreference = 'merge_new';
-                updateEntryMergeStrategy(mergeContent.content_types.added, selectedMergePreference);
-                break;
-            case 'existing':
-                selectedMergePreference = 'merge_existing';
-                updateEntryMergeStrategy(mergeContent.content_types.modified, selectedMergePreference);
-                break;
-            case 'ask_preference':
-                selectedMergePreference = 'custom';
+        const mergePreferencesMap = {
+            'existing_new': 'merge_existing_new',
+            'new': 'merge_new',
+            'existing': 'merge_existing',
+            'ask_preference': 'custom',
+        };
+        const selectedMergePreference = mergePreferencesMap[mergePreference];
+        if (selectedMergePreference) {
+            if (selectedMergePreference === 'custom') {
                 const selectedMergeItems = await (0, utils_1.selectContentMergeCustomPreferences)(mergeContent.content_types);
                 mergeContent.content_types = {
                     added: [],
                     modified: [],
                     deleted: [],
                 };
-                selectedMergeItems.forEach((item) => {
+                selectedMergeItems === null || selectedMergeItems === void 0 ? void 0 : selectedMergeItems.forEach((item) => {
                     mergeContent.content_types[item.status].push(item.value);
                 });
-                break;
-            default:
-                cli_utilities_1.cliux.error(`error: Invalid preference ${mergePreference}`);
-                process.exit(1);
+            }
+            else {
+                updateEntryMergeStrategy(mergeContent.content_types.added, selectedMergePreference);
+                updateEntryMergeStrategy(mergeContent.content_types.modified, selectedMergePreference);
+            }
+        }
+        else {
+            cli_utilities_1.cliux.error(`error: Invalid preference ${mergePreference}`);
+            process.exit(1);
         }
         let scriptFolderPath = (0, utils_1.generateMergeScripts)(mergeContent.content_types, mergeJobUID);
         if (scriptFolderPath !== undefined) {
             cli_utilities_1.cliux.success(`\nSuccess! We have generated entry migration files in the folder ${scriptFolderPath}`);
             cli_utilities_1.cliux.print('\nWARNING!!! Migration is not intended to be run more than once. Migrated(entries/assets) will be duplicated if run more than once', { color: 'yellow' });
-            const migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config {compare-branch:${mergePayload.compare_branch},file-path:./${scriptFolderPath}} --branch ${mergePayload.base_branch} --stack-api-key ${this.stackAPIKey}`;
-            cli_utilities_1.cliux.print(`\nKindly follow the steps in the guide "https://www.contentstack.com/docs/developers/cli/migrate-branch-entries" to update the migration scripts, and then run the command:\n\n${migrationCommand}`, { color: 'blue' });
+            let migrationCommand;
+            if (os_1.default.platform() === 'win32') {
+                migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config compare-branch:${mergePayload.compare_branch} file-path:./${scriptFolderPath} --branch ${mergePayload.base_branch} --stack-api-key ${this.stackAPIKey}`;
+            }
+            else {
+                migrationCommand = `csdx cm:stacks:migration --multiple --file-path ./${scriptFolderPath} --config {compare-branch:${mergePayload.compare_branch},file-path:./${scriptFolderPath}} --branch ${mergePayload.base_branch} --stack-api-key ${this.stackAPIKey}`;
+            }
+            cli_utilities_1.cliux.print(`\nKindly follow the steps in the guide "https://www.contentstack.com/docs/developers/cli/entry-migration" to update the migration scripts, and then run the command:\n\n${migrationCommand}`, { color: 'blue' });
         }
     }
     async restartMergeProcess() {

package/lib/utils/create-merge-scripts.js

@@ -26,22 +26,19 @@ function generateMergeScripts(mergeSummary, mergeJobUID) {
             merge_existing_new: entry_create_update_script_1.entryCreateUpdateScript,
             merge_existing: entry_update_script_1.entryUpdateScript,
             merge_new: entry_create_script_1.entryCreateScript,
-            ignore: entry_create_update_script_1.entryCreateUpdateScript,
         };
         const processContentTypes = (contentTypes, messageType) => {
             if (contentTypes && contentTypes.length > 0) {
-                processContentType({ type: 'assets', uid: '', entry_merge_strategy: '' }, mergeStrategies['asset_create_folder']);
                 contentTypes.forEach((contentType) => {
                     const mergeStrategy = contentType.entry_merge_strategy;
                     if (mergeStrategies.hasOwnProperty(mergeStrategy)) {
                         processContentType(contentType, mergeStrategies[mergeStrategy]);
                     }
                 });
-            }
-            else {
-                cli_utilities_1.cliux.print(`No ${messageType} entries selected for merge`, { color: 'yellow' });
+                cli_utilities_1.cliux.print(`Info: Entries of ${messageType} content types selected for the migration`, { color: 'blue' });
             }
         };
+        processContentType({ type: 'assets', uid: '', entry_merge_strategy: '' }, mergeStrategies['asset_create_folder']);
         processContentTypes(mergeSummary.modified, 'Modified');
         processContentTypes(mergeSummary.added, 'New');
         return scriptFolderPath;
@@ -61,6 +58,9 @@ function getContentTypeMergeStatus(status) {
     else if (status === 'merge_existing_new') {
         return 'created_updated';
     }
+    else if (status === 'ignore') {
+        return;
+    }
     else {
         return '';
     }
@@ -83,11 +83,12 @@ function createMergeScripts(contentType, mergeJobUID, content) {
                 fs_1.default.mkdirSync(fullPath);
             }
             let filePath;
+            let milliSeconds = date.getMilliseconds().toString().padStart(3, '0');
             if (contentType.type === 'assets') {
-                filePath = `${fullPath}/${fileCreatedAt}_create_assets_folder.js`;
+                filePath = `${fullPath}/${fileCreatedAt}${milliSeconds}_create_assets_folder.js`;
             }
             else {
-                filePath = `${fullPath}/${fileCreatedAt}_${getContentTypeMergeStatus(contentType.entry_merge_strategy)}_${contentType.uid}.js`;
+                filePath = `${fullPath}/${fileCreatedAt}${milliSeconds}_${getContentTypeMergeStatus(contentType.entry_merge_strategy)}_${contentType.uid}.js`;
             }
             fs_1.default.writeFileSync(filePath, content, 'utf-8');
         }

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

@@ -5,6 +5,14 @@ function entryCreateScript(contentType) {
     return `
   const fs = require('fs');
   const path = require('path');
+  const { marked } = require('marked');
+  const has = require('lodash/has');
+  const isArray = require('lodash/isArray');
+  const isObject = require('lodash/isObject');
+  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',
@@ -34,20 +42,18 @@ function entryCreateScript(contentType) {
     let assetUIDMapper = {};
     let assetUrlMapper = {};
     let assetRefPath = {};
-    let isAssetDownload = false;
+    let downloadedAssets = [];
+    let parent=[];
+    let logger;
 
     function getValueByPath(obj, path) {
       return path.split('[').reduce((o, key) => o && o[key.replace(/\]$/, '')], obj);
     }
   
-    function updateValueByPath(obj, path, newValue, type, fileIndex) {
+    function updateValueByPath(obj, path, newValue) {
       path.split('[').reduce((o, key, index, arr) => {
         if (index === arr.length - 1) {
-          if (type === 'file') {
-            o[key.replace(/]$/, '')][fileIndex] = newValue;
-          } else {
             o[key.replace(/]$/, '')][0].uid = newValue;
-          }
         } else {
           return o[key.replace(/\]$/, '')];
         }
@@ -80,35 +86,52 @@ function entryCreateScript(contentType) {
       return references;
     };
 
-    const findAssets = function (schema, entry, refPath, path) {
+    const findAssets = function (schema, entry) {
       for (const i in schema) {
-        const currentPath = path ? path + '[' + schema[i].uid : schema[i].uid;
         if (schema[i].data_type === 'group' || schema[i].data_type === 'global_field') {
-          findAssets(schema[i].schema, entry, refPath, currentPath + '[0]');
-        } else if (schema[i].data_type === 'blocks') {
-          for (const block in schema[i].blocks) {
+          parent.push(schema[i].uid);
+          findAssets(schema[i].schema, entry);
+          parent.pop();
+        }
+        if (schema[i].data_type === 'blocks') {
+          for (const j = 0; j < schema[i].blocks; j++) {
             {
-              if (schema[i].blocks[block].schema) {
-                findAssets(
-                  schema[i].blocks[block].schema,
-                  entry,
-                  refPath,
-                  currentPath + '[' + block + '][' + schema[i].blocks[block].uid + ']',
-                );
+              if (schema[i].blocks[j].schema) {
+                parent.push(schema[i].uid);
+                parent.push(j);
+                parent.push(schema[i].blocks[j].uid);
+                findAssets(schema[i].blocks[j].schema, entry);
+                parent.pop();
+                parent.pop();
+                parent.pop();
               }
             }
           }
-        } else if (schema[i].data_type === 'json' && schema[i].field_metadata.rich_text_type) {
-          findAssetIdsFromJsonRte(entry, schema, refPath, path);
-        } else if (
+        }
+        if (schema[i].data_type === 'json' && schema[i].field_metadata.rich_text_type) {
+          parent.push(schema[i].uid);
+          findAssetIdsFromJsonRte(entry, schema);
+          parent.pop();
+        }
+        if (
           schema[i].data_type === 'text' &&
           schema[i].field_metadata &&
           (schema[i].field_metadata.markdown || schema[i].field_metadata.rich_text_type)
         ) {
+          parent.push(schema[i].uid);
           findFileUrls(schema[i], entry);
-        } else if (schema[i].data_type === 'file') {
-          refPath.push(currentPath)
-          const imgDetails = getValueByPath(entry, currentPath);
+          if (schema[i].field_metadata.rich_text_type) {
+            findAssetIdsFromHtmlRte(entry, schema[i]);
+          }
+          parent.pop();
+        }
+        if (schema[i].data_type === 'file') {
+          parent.push(schema[i].uid);
+          let updatedEntry = entry;
+          for (let i = 0; i < parent.length; i++) {
+            updatedEntry = updatedEntry[parent[i]];
+          }
+          const imgDetails = updatedEntry;
           if (schema[i].multiple) {
             if (imgDetails && imgDetails.length) {
               imgDetails.forEach((img) => {
@@ -136,10 +159,21 @@ function entryCreateScript(contentType) {
               cAssetDetails.push(obj);
             }
           }
+          parent.pop();
         }
       }
     };
   
+    function findAssetIdsFromHtmlRte(entryObj, ctSchema) {
+      const regex = /<img asset_uid=\\"([^"]+)\\"/g;
+      let match;
+      const entry = JSON.stringify(entryObj);
+      while ((match = regex.exec(entry)) !== null) {
+        //insert into asset details
+        cAssetDetails.push({uid: match[1]});
+      }
+    }
+  
     function findFileUrls(schema, _entry) {
       let markdownRegEx;
       let markdownMatch;
@@ -259,31 +293,8 @@ function entryCreateScript(contentType) {
     }
   
     const updateAssetDetailsInEntries = function (entry) {
-      assetRefPath[entry.uid].forEach((refPath) => {
-        let imgDetails = entry[refPath];
-        if (imgDetails !== undefined) {
-          if (imgDetails && !Array.isArray(imgDetails)) {
-            entry[refPath] = assetUIDMapper[imgDetails.uid];
-          } else if (imgDetails && Array.isArray(imgDetails)) {
-            for (let i = 0; i < imgDetails.length; i++) {
-              const img = imgDetails[i];
-              entry[refPath][i] = assetUIDMapper[img.uid];
-            }
-          }
-        } else {
-          imgDetails = getValueByPath(entry, refPath);
-          if (imgDetails && !Array.isArray(imgDetails)) {
-            const imgUID = imgDetails?.uid;
-            updateValueByPath(entry, refPath, assetUIDMapper[imgUID], 'file', 0);
-          } else if (imgDetails && Array.isArray(imgDetails)) {
-            for (let i = 0; i < imgDetails.length; i++) {
-              const img = imgDetails[i];
-              const imgUID = img?.uid;
-              updateValueByPath(entry, refPath, assetUIDMapper[imgUID], 'file', i);
-            }
-          }
-        }
-      });
+      let updatedEntry = Object.assign({},entry);
+      entry = updateFileFields(updatedEntry, entry, null)
       entry = JSON.stringify(entry);
       const assetUrls = cAssetDetails.map((asset) => asset.url);
       const assetUIDs = cAssetDetails.map((asset) => asset.uid);
@@ -302,6 +313,65 @@ function entryCreateScript(contentType) {
       });
       return JSON.parse(entry);
     };
+
+    function updateFileFields(
+      object,
+      parent,
+      pos
+    ) {
+      if (isPlainObject(object) && has(object, 'filename') && has(object, 'uid')) {
+        if (typeof pos !== 'undefined') {
+          if (typeof pos === 'number' || typeof pos === 'string') {
+            const replacer = () => {
+              if (assetUIDMapper.hasOwnProperty(object.uid)) {
+                parent[pos] = assetUIDMapper[object.uid];
+              } else {
+                parent[pos] = '';
+              }
+            };
+    
+            if (parent.uid && assetUIDMapper[parent.uid]) {
+              parent.uid = assetUIDMapper[parent.uid];
+            }
+    
+            if (
+              object &&
+              isObject(parent[pos]) &&
+              parent[pos].uid &&
+              parent[pos].url &&
+              has(parent, 'asset') &&
+              has(parent, '_content_type_uid') &&
+              parent._content_type_uid === 'sys_assets'
+            ) {
+              if (
+                has(parent, 'asset') &&
+                has(parent, '_content_type_uid') &&
+                parent._content_type_uid === 'sys_assets'
+              ) {
+                parent = omit(parent, ['asset']);
+              }
+    
+              if (object.uid && assetUIDMapper[object.uid]) {
+                object.uid = assetUIDMapper[object.uid];
+              }
+              if (object.url && assetUrlMapper[object.url]) {
+                object.url = assetUrlMapper[object.url];
+              }
+            } else {
+              replacer();
+            }
+          }
+        }
+      } else if (isPlainObject(object)) {
+        for (let key in object) updateFileFields(object[key], object, key);
+      } else if (isArray(object) && object.length) {
+        for (let i = 0; i <= object.length; i++){
+          updateFileFields(object[i], object, i);
+        }    
+        parent[pos] = compact(object);
+      }
+      return object;
+    }
   
     const checkAndDownloadAsset = async function (cAsset) {
       const assetUID = cAsset?.uid;
@@ -318,7 +388,6 @@ function entryCreateScript(contentType) {
             return false;
         }
         else {
-          isAssetDownload = true;
           const cAssetDetail = await managementAPIClient
             .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
             .asset(assetUID)
@@ -360,8 +429,8 @@ function entryCreateScript(contentType) {
     const uploadAssets = async function () {
       const assetFolderMap = JSON.parse(fs.readFileSync(path.resolve(filePath, 'folder-mapper.json'), 'utf8'));
       const stackAPIClient = managementAPIClient.stack({ api_key: stackSDKInstance.api_key, branch_uid: branch });
-      for (let i = 0; i < cAssetDetails?.length; i++) {
-        const asset = cAssetDetails[i];
+      for (let i = 0; i < downloadedAssets?.length; i++) {
+        const asset = downloadedAssets[i];
         let requestOption = {};
   
         requestOption.parent_uid = assetFolderMap[asset.parent_uid] || asset.parent_uid;
@@ -404,6 +473,11 @@ 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 })
             .contentType('${contentType}')
@@ -435,9 +509,10 @@ function entryCreateScript(contentType) {
               const updatedCAsset = await checkAndDownloadAsset(asset);
               if (updatedCAsset) {
                 cAssetDetails[i] = updatedCAsset;
+                downloadedAssets.push(updatedCAsset)
               }
             }
-            if (isAssetDownload) await uploadAssets();
+            if (downloadedAssets?.length) await uploadAssets();
           }
 
           let flag = {
@@ -448,7 +523,17 @@ function entryCreateScript(contentType) {
 
           async function updateEntry(entry, entryDetails) {
             Object.assign(entry, { ...entryDetails });
-            await entry.update();
+            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)
+            });
           }
 
           async function updateReferences(entryDetails, baseEntry, references) {
@@ -480,8 +565,16 @@ function entryCreateScript(contentType) {
               compareFilteredProperties.forEach(async (entryDetails) => {
                 if(entryDetails !== undefined){
                   entryDetails = updateAssetDetailsInEntries(entryDetails);
-                  let createdEntry = await stackSDKInstance.contentType('${contentType}').entry().create({ entry: entryDetails }).catch(error => {
-                    throw error;
+                  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){
                     if (flag.references) {

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

@@ -5,6 +5,14 @@ function entryCreateUpdateScript(contentType) {
     return `
   const fs = require('fs');
   const path = require('path');
+  const { marked } = require('marked');
+  const has = require('lodash/has');
+  const isArray = require('lodash/isArray');
+  const isObject = require('lodash/isObject');
+  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',
@@ -32,10 +40,12 @@ function entryCreateUpdateScript(contentType) {
     let assetDirPath = path.resolve(filePath, 'assets');
     let assetDetails = [];
     let newAssetDetails = [];
+    let downloadedAssets = [];
     let assetUIDMapper = {};
     let assetUrlMapper = {};
     let assetRefPath = {};
-    let isAssetDownload = false;
+    let parent=[];
+    let logger;
   
     function converter(data) {
       let arr = [];
@@ -62,14 +72,10 @@ function entryCreateUpdateScript(contentType) {
       return path.split('[').reduce((o, key) => o && o[key.replace(/\]$/, '')], obj);
     }
   
-  function updateValueByPath(obj, path, newValue, type, fileIndex) {
+  function updateValueByPath(obj, path, newValue) {
     path.split('[').reduce((o, key, index, arr) => {
       if (index === arr.length - 1) {
-        if (type === 'file') {
-          o[key.replace(/]$/, '')][fileIndex] = newValue;
-        } else {
           o[key.replace(/]$/, '')][0].uid = newValue;
-        }
       } else {
         return o[key.replace(/\]$/, '')];
       }
@@ -102,65 +108,93 @@ function entryCreateUpdateScript(contentType) {
       return references;
     };
 
-  const findAssets = function (schema, entry, refPath, path) {
-    for (const i in schema) {
-      const currentPath = path ? path + '[' + schema[i].uid : schema[i].uid;
-      if (schema[i].data_type === 'group' || schema[i].data_type === 'global_field') {
-        findAssets(schema[i].schema, entry, refPath, currentPath + '[0]');
-      } else if (schema[i].data_type === 'blocks') {
-        for (const block in schema[i].blocks) {
-          {
-            if (schema[i].blocks[block].schema) {
-              findAssets(
-                schema[i].blocks[block].schema,
-                entry,
-                refPath,
-                currentPath + '[' + block + '][' + schema[i].blocks[block].uid + ']',
-              );
+    const findAssets = function (schema, entry) {
+      for (const i in schema) {
+        if (schema[i].data_type === 'group' || schema[i].data_type === 'global_field') {
+          parent.push(schema[i].uid);
+          findAssets(schema[i].schema, entry);
+          parent.pop();
+        }
+        if (schema[i].data_type === 'blocks') {
+          for (const j = 0; j < schema[i].blocks; j++) {
+            {
+              if (schema[i].blocks[j].schema) {
+                parent.push(schema[i].uid);
+                parent.push(j);
+                parent.push(schema[i].blocks[j].uid);
+                findAssets(schema[i].blocks[j].schema, entry);
+                parent.pop();
+                parent.pop();
+                parent.pop();
+              }
             }
           }
         }
-      } else if (schema[i].data_type === 'json' && schema[i].field_metadata.rich_text_type) {
-        findAssetIdsFromJsonRte(entry, schema, refPath, path);
-      } else if (
-        schema[i].data_type === 'text' &&
-        schema[i].field_metadata &&
-        (schema[i].field_metadata.markdown || schema[i].field_metadata.rich_text_type)
-      ) {
-        findFileUrls(schema[i], entry);
-      } else if (schema[i].data_type === 'file') {
-        refPath.push(currentPath)
-        const imgDetails = getValueByPath(entry, currentPath);
-        if (schema[i].multiple) {
-          if (imgDetails && imgDetails.length) {
-            imgDetails.forEach((img) => {
+        if (schema[i].data_type === 'json' && schema[i].field_metadata.rich_text_type) {
+          parent.push(schema[i].uid);
+          findAssetIdsFromJsonRte(entry, schema);
+          parent.pop();
+        }
+        if (
+          schema[i].data_type === 'text' &&
+          schema[i].field_metadata &&
+          (schema[i].field_metadata.markdown || schema[i].field_metadata.rich_text_type)
+        ) {
+          parent.push(schema[i].uid);
+          findFileUrls(schema[i], entry);
+          if (schema[i].field_metadata.rich_text_type) {
+            findAssetIdsFromHtmlRte(entry, schema[i]);
+          }
+          parent.pop();
+        }
+        if (schema[i].data_type === 'file') {
+          parent.push(schema[i].uid);
+          let updatedEntry = entry;
+          for (let i = 0; i < parent.length; i++) {
+            updatedEntry = updatedEntry[parent[i]];
+          }
+          const imgDetails = updatedEntry;
+          if (schema[i].multiple) {
+            if (imgDetails && imgDetails.length) {
+              imgDetails.forEach((img) => {
+                const obj = {
+                  uid: img.uid,
+                  parent_uid: img.parent_uid,
+                  description: img.description,
+                  title: img.title,
+                  filename: img.filename,
+                  url: img.url,
+                };
+                assetDetails.push(obj);
+              });
+            }
+          } else {
+            if (imgDetails) {
               const obj = {
-                uid: img.uid,
-                parent_uid: img.parent_uid,
-                description: img.description,
-                title: img.title,
-                filename: img.filename,
-                url: img.url,
+                uid: imgDetails.uid,
+                parent_uid: imgDetails.parent_uid,
+                description: imgDetails.description,
+                title: imgDetails.title,
+                filename: imgDetails.filename,
+                url: imgDetails.url,
               };
               assetDetails.push(obj);
-            });
-          }
-        } else {
-          if (imgDetails) {
-            const obj = {
-              uid: imgDetails.uid,
-              parent_uid: imgDetails.parent_uid,
-              description: imgDetails.description,
-              title: imgDetails.title,
-              filename: imgDetails.filename,
-              url: imgDetails.url,
-            };
-            assetDetails.push(obj);
+            }
           }
+          parent.pop();
         }
       }
+    };
+  
+    function findAssetIdsFromHtmlRte(entryObj, ctSchema) {
+      const regex = /<img asset_uid=\\"([^"]+)\\"/g;
+      let match;
+      const entry = JSON.stringify(entryObj);
+      while ((match = regex.exec(entry)) !== null) {
+        //insert into asset details
+        assetDetails.push({uid: match[1]});
+      }
     }
-  };
   
     function findFileUrls(schema, _entry) {
       let markdownRegEx;
@@ -281,31 +315,8 @@ function entryCreateUpdateScript(contentType) {
     }
   
     const updateAssetDetailsInEntries = function (entry) {
-    assetRefPath[entry.uid].forEach((refPath) => {
-      let imgDetails = entry[refPath];
-      if (imgDetails !== undefined) {
-        if (imgDetails && !Array.isArray(imgDetails)) {
-          entry[refPath] = assetUIDMapper[imgDetails.uid];
-        } else if (imgDetails && Array.isArray(imgDetails)) {
-          for (let i = 0; i < imgDetails.length; i++) {
-            const img = imgDetails[i];
-            entry[refPath][i] = assetUIDMapper[img.uid];
-          }
-        }
-      } else {
-        imgDetails = getValueByPath(entry, refPath);
-        if (imgDetails && !Array.isArray(imgDetails)) {
-          const imgUID = imgDetails?.uid;
-          updateValueByPath(entry, refPath, assetUIDMapper[imgUID], 'file', 0);
-        } else if (imgDetails && Array.isArray(imgDetails)) {
-          for (let i = 0; i < imgDetails.length; i++) {
-            const img = imgDetails[i];
-            const imgUID = img?.uid;
-            updateValueByPath(entry, refPath, assetUIDMapper[imgUID], 'file', i);
-          }
-        }
-      }
-    });
+      let updatedEntry = Object.assign({},entry);
+      entry = updateFileFields(updatedEntry, entry, null)
       entry = JSON.stringify(entry);
       const assetUrls = assetDetails.map((asset) => asset.url);
       const assetUIDs = assetDetails.map((asset) => asset.uid);
@@ -324,6 +335,65 @@ function entryCreateUpdateScript(contentType) {
       });
       return JSON.parse(entry);
     };
+
+    function updateFileFields(
+      object,
+      parent,
+      pos
+    ) {
+      if (isPlainObject(object) && has(object, 'filename') && has(object, 'uid')) {
+        if (typeof pos !== 'undefined') {
+          if (typeof pos === 'number' || typeof pos === 'string') {
+            const replacer = () => {
+              if (assetUIDMapper.hasOwnProperty(object.uid)) {
+                parent[pos] = assetUIDMapper[object.uid];
+              } else {
+                parent[pos] = '';
+              }
+            };
+    
+            if (parent.uid && assetUIDMapper[parent.uid]) {
+              parent.uid = assetUIDMapper[parent.uid];
+            }
+    
+            if (
+              object &&
+              isObject(parent[pos]) &&
+              parent[pos].uid &&
+              parent[pos].url &&
+              has(parent, 'asset') &&
+              has(parent, '_content_type_uid') &&
+              parent._content_type_uid === 'sys_assets'
+            ) {
+              if (
+                has(parent, 'asset') &&
+                has(parent, '_content_type_uid') &&
+                parent._content_type_uid === 'sys_assets'
+              ) {
+                parent = omit(parent, ['asset']);
+              }
+    
+              if (object.uid && assetUIDMapper[object.uid]) {
+                object.uid = assetUIDMapper[object.uid];
+              }
+              if (object.url && assetUrlMapper[object.url]) {
+                object.url = assetUrlMapper[object.url];
+              }
+            } else {
+              replacer();
+            }
+          }
+        }
+      } else if (isPlainObject(object)) {
+        for (let key in object) updateFileFields(object[key], object, key);
+      } else if (isArray(object) && object.length) {
+        for (let i = 0; i <= object.length; i++){
+          updateFileFields(object[i], object, i);
+        }    
+        parent[pos] = compact(object);
+      }
+      return object;
+    }
   
     const checkAndDownloadAsset = async function (cAsset) {
       if (cAsset) {
@@ -340,7 +410,6 @@ function entryCreateUpdateScript(contentType) {
           return false;
         }
         else {
-          isAssetDownload = true;
           const cAssetDetail = await managementAPIClient
             .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
             .asset(assetUID)
@@ -382,8 +451,8 @@ function entryCreateUpdateScript(contentType) {
     const uploadAssets = async function () {
       const assetFolderMap = JSON.parse(fs.readFileSync(path.resolve(filePath, 'folder-mapper.json'), 'utf8'));
       const stackAPIClient = managementAPIClient.stack({ api_key: stackSDKInstance.api_key, branch_uid: branch });
-      for (let i = 0; i < assetDetails?.length; i++) {
-        const asset = assetDetails[i];
+      for (let i = 0; i < downloadedAssets?.length; i++) {
+        const asset = downloadedAssets[i];
         let requestOption = {};
   
         requestOption.parent_uid = assetFolderMap[asset.parent_uid] || asset.parent_uid;
@@ -419,6 +488,10 @@ 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}')
@@ -454,9 +527,10 @@ function entryCreateUpdateScript(contentType) {
               const updatedCAsset = await checkAndDownloadAsset(asset);
               if(updatedCAsset){
                 newAssetDetails[i] = updatedCAsset;
+                downloadedAssets.push(updatedCAsset)
               }
             }
-            if (isAssetDownload) await uploadAssets();
+            if (downloadedAssets?.length) await uploadAssets();
           }
           
           let flag = {
@@ -468,7 +542,17 @@ function entryCreateUpdateScript(contentType) {
           async function updateEntry(entry, entryDetails) {
             if (entry) {
               Object.assign(entry, { ...entryDetails });
-              await entry.update();
+              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)
+              });
             }
           }
 

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

@@ -5,6 +5,14 @@ function entryUpdateScript(contentType) {
     return `
   const fs = require('fs');
   const path = require('path');
+  const { marked } = require('marked');
+  const has = require('lodash/has');
+  const isArray = require('lodash/isArray');
+  const isObject = require('lodash/isObject');
+  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',
@@ -32,10 +40,12 @@ function entryUpdateScript(contentType) {
     let assetDirPath = path.resolve(filePath, 'assets');
     let assetDetails = [];
     let newAssetDetails = [];
+    let downloadedAssets = [];
     let assetUIDMapper = {};
     let assetUrlMapper = {};
     let assetRefPath = {};
-    let isAssetDownload = false;
+    let parent=[];
+    let logger;
   
     function converter(data) {
       let arr = [];
@@ -62,14 +72,10 @@ function entryUpdateScript(contentType) {
       return path.split('[').reduce((o, key) => o && o[key.replace(/\]$/, '')], obj);
     }
   
-    function updateValueByPath(obj, path, newValue, type, fileIndex) {
+    function updateValueByPath(obj, path, newValue) {
       path.split('[').reduce((o, key, index, arr) => {
         if (index === arr.length - 1) {
-          if (type === 'file') {
-            o[key.replace(/]$/, '')][fileIndex] = newValue;
-          } else {
             o[key.replace(/]$/, '')][0].uid = newValue;
-          }
         } else {
           return o[key.replace(/\]$/, '')];
         }
@@ -102,35 +108,52 @@ function entryUpdateScript(contentType) {
       return references;
     };
 
-    const findAssets = function (schema, entry, refPath, path) {
+    const findAssets = function (schema, entry) {
       for (const i in schema) {
-        const currentPath = path ? path + '[' + schema[i].uid : schema[i].uid;
         if (schema[i].data_type === 'group' || schema[i].data_type === 'global_field') {
-          findAssets(schema[i].schema, entry, refPath, currentPath + '[0]');
-        } else if (schema[i].data_type === 'blocks') {
-          for (const block in schema[i].blocks) {
+          parent.push(schema[i].uid);
+          findAssets(schema[i].schema, entry);
+          parent.pop();
+        }
+        if (schema[i].data_type === 'blocks') {
+          for (const j = 0; j < schema[i].blocks; j++) {
             {
-              if (schema[i].blocks[block].schema) {
-                findAssets(
-                  schema[i].blocks[block].schema,
-                  entry,
-                  refPath,
-                  currentPath + '[' + block + '][' + schema[i].blocks[block].uid + ']',
-                );
+              if (schema[i].blocks[j].schema) {
+                parent.push(schema[i].uid);
+                parent.push(j);
+                parent.push(schema[i].blocks[j].uid);
+                findAssets(schema[i].blocks[j].schema, entry);
+                parent.pop();
+                parent.pop();
+                parent.pop();
               }
             }
           }
-        } else if (schema[i].data_type === 'json' && schema[i].field_metadata.rich_text_type) {
-          findAssetIdsFromJsonRte(entry, schema, refPath, path);
-        } else if (
+        }
+        if (schema[i].data_type === 'json' && schema[i].field_metadata.rich_text_type) {
+          parent.push(schema[i].uid);
+          findAssetIdsFromJsonRte(entry, schema);
+          parent.pop();
+        }
+        if (
           schema[i].data_type === 'text' &&
           schema[i].field_metadata &&
           (schema[i].field_metadata.markdown || schema[i].field_metadata.rich_text_type)
         ) {
+          parent.push(schema[i].uid);
           findFileUrls(schema[i], entry);
-        } else if (schema[i].data_type === 'file') {
-          refPath.push(currentPath)
-          const imgDetails = getValueByPath(entry, currentPath);
+          if (schema[i].field_metadata.rich_text_type) {
+            findAssetIdsFromHtmlRte(entry, schema[i]);
+          }
+          parent.pop();
+        }
+        if (schema[i].data_type === 'file') {
+          parent.push(schema[i].uid);
+          let updatedEntry = entry;
+          for (let i = 0; i < parent.length; i++) {
+            updatedEntry = updatedEntry[parent[i]];
+          }
+          const imgDetails = updatedEntry;
           if (schema[i].multiple) {
             if (imgDetails && imgDetails.length) {
               imgDetails.forEach((img) => {
@@ -158,10 +181,21 @@ function entryUpdateScript(contentType) {
               assetDetails.push(obj);
             }
           }
+          parent.pop();
         }
       }
     };
   
+    function findAssetIdsFromHtmlRte(entryObj, ctSchema) {
+      const regex = /<img asset_uid=\\"([^"]+)\\"/g;
+      let match;
+      const entry = JSON.stringify(entryObj);
+      while ((match = regex.exec(entry)) !== null) {
+        //insert into asset details
+        assetDetails.push({uid: match[1]});
+      }
+    }
+  
     function findFileUrls(schema, _entry) {
       let markdownRegEx;
       let markdownMatch;
@@ -281,31 +315,8 @@ function entryUpdateScript(contentType) {
     }
   
     const updateAssetDetailsInEntries = function (entry) {
-      assetRefPath[entry.uid].forEach((refPath) => {
-        let imgDetails = entry[refPath];
-        if (imgDetails !== undefined) {
-          if (imgDetails && !Array.isArray(imgDetails)) {
-            entry[refPath] = assetUIDMapper[imgDetails.uid];
-          } else if (imgDetails && Array.isArray(imgDetails)) {
-            for (let i = 0; i < imgDetails.length; i++) {
-              const img = imgDetails[i];
-              entry[refPath][i] = assetUIDMapper[img.uid];
-            }
-          }
-        } else {
-          imgDetails = getValueByPath(entry, refPath);
-          if (imgDetails && !Array.isArray(imgDetails)) {
-            const imgUID = imgDetails?.uid;
-            updateValueByPath(entry, refPath, assetUIDMapper[imgUID], 'file', 0);
-          } else if (imgDetails && Array.isArray(imgDetails)) {
-            for (let i = 0; i < imgDetails.length; i++) {
-              const img = imgDetails[i];
-              const imgUID = img?.uid;
-              updateValueByPath(entry, refPath, assetUIDMapper[imgUID], 'file', i);
-            }
-          }
-        }
-      });
+      let updatedEntry = Object.assign({},entry);
+      entry = updateFileFields(updatedEntry, entry, null)
       entry = JSON.stringify(entry);
       const assetUrls = assetDetails.map((asset) => asset.url);
       const assetUIDs = assetDetails.map((asset) => asset.uid);
@@ -324,6 +335,65 @@ function entryUpdateScript(contentType) {
       });
       return JSON.parse(entry);
     };
+
+    function updateFileFields(
+      object,
+      parent,
+      pos
+    ) {
+      if (isPlainObject(object) && has(object, 'filename') && has(object, 'uid')) {
+        if (typeof pos !== 'undefined') {
+          if (typeof pos === 'number' || typeof pos === 'string') {
+            const replacer = () => {
+              if (assetUIDMapper.hasOwnProperty(object.uid)) {
+                parent[pos] = assetUIDMapper[object.uid];
+              } else {
+                parent[pos] = '';
+              }
+            };
+    
+            if (parent.uid && assetUIDMapper[parent.uid]) {
+              parent.uid = assetUIDMapper[parent.uid];
+            }
+    
+            if (
+              object &&
+              isObject(parent[pos]) &&
+              parent[pos].uid &&
+              parent[pos].url &&
+              has(parent, 'asset') &&
+              has(parent, '_content_type_uid') &&
+              parent._content_type_uid === 'sys_assets'
+            ) {
+              if (
+                has(parent, 'asset') &&
+                has(parent, '_content_type_uid') &&
+                parent._content_type_uid === 'sys_assets'
+              ) {
+                parent = omit(parent, ['asset']);
+              }
+    
+              if (object.uid && assetUIDMapper[object.uid]) {
+                object.uid = assetUIDMapper[object.uid];
+              }
+              if (object.url && assetUrlMapper[object.url]) {
+                object.url = assetUrlMapper[object.url];
+              }
+            } else {
+              replacer();
+            }
+          }
+        }
+      } else if (isPlainObject(object)) {
+        for (let key in object) updateFileFields(object[key], object, key);
+      } else if (isArray(object) && object.length) {
+        for (let i = 0; i <= object.length; i++){
+          updateFileFields(object[i], object, i);
+        }    
+        parent[pos] = compact(object);
+      }
+      return object;
+    }
   
     const checkAndDownloadAsset = async function (cAsset) {
       if (cAsset) {
@@ -340,7 +410,6 @@ function entryUpdateScript(contentType) {
             return false;
           }
         else {
-          isAssetDownload = true;
           const cAssetDetail = await managementAPIClient
             .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
             .asset(assetUID)
@@ -382,8 +451,8 @@ function entryUpdateScript(contentType) {
     const uploadAssets = async function () {
       const assetFolderMap = JSON.parse(fs.readFileSync(path.resolve(filePath, 'folder-mapper.json'), 'utf8'));
       const stackAPIClient = managementAPIClient.stack({ api_key: stackSDKInstance.api_key, branch_uid: branch });
-      for (let i = 0; i < assetDetails?.length; i++) {
-        const asset = assetDetails[i];
+      for (let i = 0; i < downloadedAssets?.length; i++) {
+        const asset = downloadedAssets[i];
         let requestOption = {};
   
         requestOption.parent_uid = assetFolderMap[asset.parent_uid] || asset.parent_uid;
@@ -418,6 +487,11 @@ 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 })
           .contentType('${contentType}')
@@ -453,9 +527,10 @@ function entryUpdateScript(contentType) {
               const updatedCAsset = await checkAndDownloadAsset(asset);
               if(updatedCAsset){
                 newAssetDetails[i] = updatedCAsset;
+                downloadedAssets.push(updatedCAsset);
               }
             }
-            if (isAssetDownload) await uploadAssets();
+            if (downloadedAssets?.length) await uploadAssets();
           }
 
           let flag = {
@@ -466,7 +541,17 @@ function entryUpdateScript(contentType) {
   
           async function updateEntry(entry, entryDetails) {
             Object.assign(entry, { ...entryDetails });
-            await entry.update();
+            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)
+            });
           }
 
           async function updateReferences(entryDetails, baseEntry, references) {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.19",
+  "version": "1.0.21",
   "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.19",
+  "version": "1.0.21",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.8",
+    "@contentstack/cli-utilities": "~1.5.10",
     "@oclif/core": "^2.9.3",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
@@ -95,4 +95,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}