@contentstack/cli-cm-branches 1.2.1 → 1.3.0

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

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

@@ -47,7 +47,7 @@ function entryCreateScript(contentType) {
     function getValueByPath(obj, path) {
       return path.split('[').reduce((o, key) => o && o[key.replace(/\]$/, '')], obj);
     }
-  
+
     function updateValueByPath(obj, path, newValue) {
       path.split('[').reduce((o, key, index, arr) => {
         if (index === arr.length - 1) {
@@ -57,10 +57,10 @@ function entryCreateScript(contentType) {
         }
       }, obj);
     }
-  
+
     const findReference = function (schema, path, flag) {
       let references = [];
-  
+
       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') {
@@ -80,7 +80,7 @@ function entryCreateScript(contentType) {
           references.push(currentPath);
         }
       }
-  
+
       return references;
     };
 
@@ -172,7 +172,7 @@ function entryCreateScript(contentType) {
       }
       parent.pop();
     }
-  
+
     function findAssetIdsFromHtmlRte(entryObj, ctSchema) {
       const regex = /<img asset_uid=\\"([^"]+)\\"/g;
       let match;
@@ -182,7 +182,7 @@ function entryCreateScript(contentType) {
         cAssetDetails.push({uid: match[1]});
       }
     }
-  
+
     function findFileUrls(schema, _entry) {
       let markdownRegEx;
       let markdownMatch;
@@ -194,7 +194,7 @@ function entryCreateScript(contentType) {
         text = JSON.stringify(_entry);
       }
       markdownRegEx = new RegExp(
-        '(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
+        '(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-|gcp-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
         'g',
       );
       while ((markdownMatch = markdownRegEx.exec(text)) !== null) {
@@ -210,7 +210,7 @@ function entryCreateScript(contentType) {
         }
       }
     }
-  
+
     function findAssetIdsFromJsonRte(entryObj, ctSchema) {
       if(ctSchema !== undefined){
         for (const element of ctSchema) {
@@ -256,7 +256,7 @@ function entryCreateScript(contentType) {
         }
       }
     }
-  
+
     function gatherJsonRteAssetIds(jsonRteData) {
       jsonRteData.children.forEach((element) => {
         if (element.type) {
@@ -300,7 +300,7 @@ function entryCreateScript(contentType) {
         }
       });
     }
-  
+
     const updateAssetDetailsInEntries = function (entry) {
       let updatedEntry = Object.assign({},entry);
       entry = updateFileFields(updatedEntry, entry, null)
@@ -313,7 +313,7 @@ function entryCreateScript(contentType) {
          entry = entry.replace(assetUrl, mappedAssetUrl);
         }
       });
-  
+
       assetUIDs.forEach(function (assetUid) {
         let uid = assetUIDMapper[assetUid];
         if (typeof uid !== 'undefined') {
@@ -338,11 +338,11 @@ function entryCreateScript(contentType) {
                 parent[pos] = '';
               }
             };
-    
+
             if (parent.uid && assetUIDMapper[parent.uid]) {
               parent.uid = assetUIDMapper[parent.uid];
             }
-    
+
             if (
               object &&
               isObject(parent[pos]) &&
@@ -359,7 +359,7 @@ function entryCreateScript(contentType) {
               ) {
                 parent = omit(parent, ['asset']);
               }
-    
+
               if (object.uid && assetUIDMapper[object.uid]) {
                 object.uid = assetUIDMapper[object.uid];
               }
@@ -376,12 +376,12 @@ function entryCreateScript(contentType) {
       } 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;
       if (cAsset && assetUID) {
@@ -434,24 +434,24 @@ function entryCreateScript(contentType) {
       }
       return cAsset;
     };
-  
+
     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 < downloadedAssets?.length; i++) {
         const asset = downloadedAssets[i];
         let requestOption = {};
-  
+
         requestOption.parent_uid = assetFolderMap[asset.parent_uid] || asset.parent_uid;
-  
+
         if (asset.hasOwnProperty('description') && typeof asset.description === 'string') {
           requestOption.description = asset.description;
         }
-  
+
         if (asset.hasOwnProperty('tags') && Array.isArray(asset.tags)) {
           requestOption.tags = asset.tags;
         }
-  
+
         if (asset.hasOwnProperty('title') && typeof asset.title === 'string') {
           requestOption.title = asset.title;
         }
@@ -467,7 +467,7 @@ function entryCreateScript(contentType) {
         assetUrlMapper[asset.url] = res && res.url;
       }
     };
-    
+
     function handleErrorMsg(err) {
       if (err?.errorMessage) {
        console.log(err.errorMessage);
@@ -482,14 +482,14 @@ function entryCreateScript(contentType) {
         limit,
         include_count: true,
       };
-  
+
       const entriesSearchResponse = await managementAPIClient
         .stack({ api_key: stackSDKInstance.api_key, branch_uid: branchName })
         .contentType(contentType)
         .entry()
         .query(requestObject)
         .find();
-  
+
       if (entriesSearchResponse?.items?.length > 0) {
         skip += limit || 100;
         entries = [...entries, ...entriesSearchResponse.items];
@@ -510,12 +510,12 @@ function entryCreateScript(contentType) {
         task: async () => {
 
           const compareBranchEntries = await getEntries(compareBranch, '${contentType}')
-          
+
           const compareFilteredProperties = compareBranchEntries.map((entry) => {
             keysToRemove.map((key) => delete entry[key]);
             return entry;
           });
-          
+
           let contentType = await managementAPIClient
           .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
           .contentType('${contentType}')
@@ -556,7 +556,7 @@ function entryCreateScript(contentType) {
             for (let i in references) {
               let compareEntryRef = getValueByPath(entryDetails, references[i]);
               let baseEntryRef = getValueByPath(baseEntry, references[i]);
-  
+
               if (compareEntryRef && compareEntryRef.length > 0 && baseEntryRef && baseEntryRef.length >= 0) {
                 let compareRefEntry = await managementAPIClient
                   .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
@@ -568,7 +568,7 @@ function entryCreateScript(contentType) {
                   .entry()
                   .query({ query: { title: compareRefEntry.title } })
                   .find();
-  
+
                   if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){
                     updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
                   }

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

@@ -33,7 +33,7 @@ function entryCreateUpdateScript(contentType) {
       'setWorkflowStage',
       'import',
     ];
-  
+
     let compareBranch = config['compare-branch'];
     let filePath = config['file-path'] || process.cwd();
     let assetDirPath = path.resolve(filePath, 'assets');
@@ -44,7 +44,7 @@ function entryCreateUpdateScript(contentType) {
     let assetUrlMapper = {};
     let assetRefPath = {};
     let parent=[];
-  
+
     function converter(data) {
       let arr = [];
       for (const elm of data) {
@@ -53,23 +53,23 @@ function entryCreateUpdateScript(contentType) {
       }
       return arr;
     }
-  
+
     function deleteUnwantedKeysFromObject(obj, keysToRemove) {
       if(obj){
         keysToRemove.map((key) => delete obj[key]);
         return obj;
       }
     }
-  
+
     function uniquelyConcatenateArrays(compareArr, baseArr) {
       let uniqueArray = compareArr.concat(baseArr.filter((item) => compareArr.indexOf(item) < 0));
       return uniqueArray;
     }
-  
+
     function getValueByPath(obj, path) {
       return path.split('[').reduce((o, key) => o && o[key.replace(/\]$/, '')], obj);
     }
-  
+
   function updateValueByPath(obj, path, newValue) {
     path.split('[').reduce((o, key, index, arr) => {
       if (index === arr.length - 1) {
@@ -82,7 +82,7 @@ function entryCreateUpdateScript(contentType) {
 
     const findReference = function (schema, path, flag) {
       let references = [];
-  
+
       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') {
@@ -102,7 +102,7 @@ function entryCreateUpdateScript(contentType) {
           references.push(currentPath);
         }
       }
-  
+
       return references;
     };
 
@@ -159,7 +159,7 @@ function entryCreateUpdateScript(contentType) {
         }
       }
     };
-  
+
     function fetchAssetFromFileFields (parent, schema, entry) {
       parent.push(schema.uid);
       let updatedEntry = entry;
@@ -205,7 +205,7 @@ function entryCreateUpdateScript(contentType) {
         assetDetails.push({uid: match[1]});
       }
     }
-  
+
     function findFileUrls(schema, _entry) {
       let markdownRegEx;
       let markdownMatch;
@@ -217,7 +217,7 @@ function entryCreateUpdateScript(contentType) {
         text = JSON.stringify(_entry);
       }
       markdownRegEx = new RegExp(
-        '(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
+        '(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-|gcp-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
         'g',
       );
       while ((markdownMatch = markdownRegEx.exec(text)) !== null) {
@@ -233,7 +233,7 @@ function entryCreateUpdateScript(contentType) {
         }
       }
     }
-  
+
     function findAssetIdsFromJsonRte(entryObj, ctSchema) {
       if(ctSchema !== undefined){
         for (const element of ctSchema) {
@@ -279,7 +279,7 @@ function entryCreateUpdateScript(contentType) {
         }
       }
     }
-  
+
     function gatherJsonRteAssetIds(jsonRteData) {
       jsonRteData.children.forEach((element) => {
         if (element.type) {
@@ -323,7 +323,7 @@ function entryCreateUpdateScript(contentType) {
         }
       });
     }
-  
+
     const updateAssetDetailsInEntries = function (entry) {
       let updatedEntry = Object.assign({},entry);
       entry = updateFileFields(updatedEntry, entry, null)
@@ -336,7 +336,7 @@ function entryCreateUpdateScript(contentType) {
          entry = entry.replace(assetUrl, mappedAssetUrl);
         }
       });
-  
+
       assetUIDs.forEach(function (assetUid) {
         let uid = assetUIDMapper[assetUid];
         if (typeof uid !== 'undefined') {
@@ -361,11 +361,11 @@ function entryCreateUpdateScript(contentType) {
                 parent[pos] = '';
               }
             };
-    
+
             if (parent.uid && assetUIDMapper[parent.uid]) {
               parent.uid = assetUIDMapper[parent.uid];
             }
-    
+
             if (
               object &&
               isObject(parent[pos]) &&
@@ -382,7 +382,7 @@ function entryCreateUpdateScript(contentType) {
               ) {
                 parent = omit(parent, ['asset']);
               }
-    
+
               if (object.uid && assetUIDMapper[object.uid]) {
                 object.uid = assetUIDMapper[object.uid];
               }
@@ -399,12 +399,12 @@ function entryCreateUpdateScript(contentType) {
       } 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) {
         const assetUID = cAsset.uid;
@@ -457,24 +457,24 @@ function entryCreateUpdateScript(contentType) {
       }
       return cAsset;
     };
-  
+
     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 < downloadedAssets?.length; i++) {
         const asset = downloadedAssets[i];
         let requestOption = {};
-  
+
         requestOption.parent_uid = assetFolderMap[asset.parent_uid] || asset.parent_uid;
-  
+
         if (asset.hasOwnProperty('description') && typeof asset.description === 'string') {
           requestOption.description = asset.description;
         }
-  
+
         if (asset.hasOwnProperty('tags') && Array.isArray(asset.tags)) {
           requestOption.tags = asset.tags;
         }
-  
+
         if (asset.hasOwnProperty('title') && typeof asset.title === 'string') {
           requestOption.title = asset.title;
         }
@@ -497,14 +497,14 @@ function entryCreateUpdateScript(contentType) {
         limit,
         include_count: true,
       };
-  
+
       const entriesSearchResponse = await managementAPIClient
         .stack({ api_key: stackSDKInstance.api_key, branch_uid: branchName })
         .contentType(contentType)
         .entry()
         .query(requestObject)
         .find();
-  
+
       if (entriesSearchResponse?.items?.length > 0) {
         skip += limit || 100;
         entries = [...entries, ...entriesSearchResponse.items];
@@ -523,14 +523,14 @@ function entryCreateUpdateScript(contentType) {
         failedMessage: 'Failed to update entries',
         task: async () => {
         let compareBranchEntries = await getEntries(compareBranch, '${contentType}')
-  
+
         let baseBranchEntries = await getEntries(branch, '${contentType}');
-  
+
         let contentType = await managementAPIClient
           .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
           .contentType('${contentType}')
           .fetch();
-        
+
           for (let i = 0; i < compareBranchEntries?.length; i++) {
             assetRefPath[compareBranchEntries[i].uid] = []
             findAssets(contentType.schema, compareBranchEntries[i], assetRefPath[compareBranchEntries[i].uid]);
@@ -557,13 +557,13 @@ function entryCreateUpdateScript(contentType) {
             }
             if (downloadedAssets?.length) await uploadAssets();
           }
-          
+
           let flag = {
             references: false
           };
-          
+
           const references = await findReference(contentType.schema, '', flag);
-  
+
           async function updateEntry(entry, entryDetails) {
             if (entry) {
               Object.assign(entry, { ...entryDetails });
@@ -575,7 +575,7 @@ function entryCreateUpdateScript(contentType) {
             for (let i in references) {
               let compareEntryRef = getValueByPath(entryDetails, references[i]);
               let baseEntryRef = getValueByPath(baseEntry, references[i]);
-  
+
               if (compareEntryRef && compareEntryRef.length > 0 && baseEntryRef && baseEntryRef.length >= 0) {
                 let compareRefEntry = await managementAPIClient
                   .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
@@ -587,7 +587,7 @@ function entryCreateUpdateScript(contentType) {
                   .entry()
                   .query({ query: { title: compareRefEntry.title } })
                   .find();
-  
+
                   if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){
                     updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
                   }
@@ -601,23 +601,23 @@ function entryCreateUpdateScript(contentType) {
                 let entryDetails = deleteUnwantedKeysFromObject(el, keysToRemove);
                 if(entryDetails !== undefined){
                   entryDetails = updateAssetDetailsInEntries(entryDetails);
-    
+
                   if (baseBranchEntries && baseBranchEntries.length) {
                     let baseEntryUid = baseBranchEntries[0].uid;
                     let entry = await stackSDKInstance.contentType('${contentType}').entry(baseEntryUid);
-                    
+
                     if (flag.references) {
                       await updateReferences(entryDetails, baseBranchEntries[0], references);
                     }
-    
+
                     await updateEntry(entry, entryDetails);
                   } else {
                     let createdEntry = await stackSDKInstance.contentType('${contentType}').entry().create({ entry: entryDetails });
-                  
+
                     if (flag.references) {
                       await updateReferences(entryDetails, createdEntry, references);
                     }
-    
+
                     await updateEntry(createdEntry, entryDetails);
                   }
                 }
@@ -630,7 +630,7 @@ function entryCreateUpdateScript(contentType) {
               //TODO: Need to discuss this approach and replace it with uid condition
               let arr = uniquelyConcatenateArrays(Array.from(compareMap.keys()), Array.from(baseMap.keys()));
 
-              // Change 
+              // Change
               for(let i  = 0; i < arr.length ; i++){
                 let entryDetails = deleteUnwantedKeysFromObject(compareMap.get(arr[i]), keysToRemove);
                 //NOTE: In the compare branch, entry must exist. Condition of deleted entry not handled
@@ -645,17 +645,17 @@ function entryCreateUpdateScript(contentType) {
                     if(createdEntry){
                       if (flag.references) {
                         await updateReferences(entryDetails, createdEntry, references);
-                      }     
+                      }
                       await updateEntry(createdEntry, entryDetails);
                     }
                   } else if (compareMap.get(arr[i]) && baseMap.get(arr[i])) {
                     let baseEntry = baseMap.get(arr[i]);
                     let entry = await stackSDKInstance.contentType('${contentType}').entry(baseEntry.uid);
-                    
+
                     if (flag.references) {
                       await updateReferences(entryDetails, baseEntry, references);
                     }
-  
+
                     await updateEntry(entry, entryDetails);
                   }
                 }
@@ -667,7 +667,7 @@ function entryCreateUpdateScript(contentType) {
         },
       };
     };
-  
+
     if (compareBranch && branch.length !== 0 && apiKey.length !== 0) {
       migration.addTask(updateEntryTask());
     } else {

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

@@ -33,7 +33,7 @@ function entryUpdateScript(contentType) {
       'setWorkflowStage',
       'import',
     ];
-  
+
     let compareBranch = config['compare-branch'];
     let filePath = config['file-path'] || process.cwd();
     let assetDirPath = path.resolve(filePath, 'assets');
@@ -44,7 +44,7 @@ function entryUpdateScript(contentType) {
     let assetUrlMapper = {};
     let assetRefPath = {};
     let parent=[];
-  
+
     function converter(data) {
       let arr = [];
       for (const elm of data) {
@@ -53,23 +53,23 @@ function entryUpdateScript(contentType) {
       }
       return arr;
     }
-  
+
     function deleteUnwantedKeysFromObject(obj, keysToRemove) {
       if(obj){
         keysToRemove.map((key) => delete obj[key]);
         return obj;
       }
     }
-  
+
     function uniquelyConcatenateArrays(compareArr, baseArr) {
       let uniqueArray = compareArr.concat(baseArr.filter((item) => compareArr.indexOf(item) < 0));
       return uniqueArray;
     }
-  
+
     function getValueByPath(obj, path) {
       return path.split('[').reduce((o, key) => o && o[key.replace(/\]$/, '')], obj);
     }
-  
+
     function updateValueByPath(obj, path, newValue) {
       path.split('[').reduce((o, key, index, arr) => {
         if (index === arr.length - 1) {
@@ -82,7 +82,7 @@ function entryUpdateScript(contentType) {
 
     const findReference = function (schema, path, flag) {
       let references = [];
-  
+
       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') {
@@ -102,7 +102,7 @@ function entryUpdateScript(contentType) {
           references.push(currentPath);
         }
       }
-  
+
       return references;
     };
 
@@ -194,7 +194,7 @@ function entryUpdateScript(contentType) {
       }
       parent.pop();
     }
-    
+
     function findAssetIdsFromHtmlRte(entryObj, ctSchema) {
       const regex = /<img asset_uid=\\"([^"]+)\\"/g;
       let match;
@@ -204,7 +204,7 @@ function entryUpdateScript(contentType) {
         assetDetails.push({uid: match[1]});
       }
     }
-  
+
     function findFileUrls(schema, _entry) {
       let markdownRegEx;
       let markdownMatch;
@@ -216,7 +216,7 @@ function entryUpdateScript(contentType) {
         text = JSON.stringify(_entry);
       }
       markdownRegEx = new RegExp(
-        '(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
+        '(https://(assets|(eu-|azure-na-|azure-eu-|gcp-na-|gcp-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))',
         'g',
       );
       while ((markdownMatch = markdownRegEx.exec(text)) !== null) {
@@ -232,7 +232,7 @@ function entryUpdateScript(contentType) {
         }
       }
     }
-  
+
     function findAssetIdsFromJsonRte(entryObj, ctSchema) {
       if(ctSchema !== undefined){
         for (const element of ctSchema) {
@@ -278,7 +278,7 @@ function entryUpdateScript(contentType) {
         }
       }
     }
-  
+
     function gatherJsonRteAssetIds(jsonRteData) {
       jsonRteData.children.forEach((element) => {
         if (element.type) {
@@ -322,7 +322,7 @@ function entryUpdateScript(contentType) {
         }
       });
     }
-  
+
     const updateAssetDetailsInEntries = function (entry) {
       let updatedEntry = Object.assign({},entry);
       entry = updateFileFields(updatedEntry, entry, null)
@@ -335,7 +335,7 @@ function entryUpdateScript(contentType) {
          entry = entry.replace(assetUrl, mappedAssetUrl);
         }
       });
-  
+
       assetUIDs.forEach(function (assetUid) {
         let uid = assetUIDMapper[assetUid];
         if (typeof uid !== 'undefined') {
@@ -360,11 +360,11 @@ function entryUpdateScript(contentType) {
                 parent[pos] = '';
               }
             };
-    
+
             if (parent.uid && assetUIDMapper[parent.uid]) {
               parent.uid = assetUIDMapper[parent.uid];
             }
-    
+
             if (
               object &&
               isObject(parent[pos]) &&
@@ -381,7 +381,7 @@ function entryUpdateScript(contentType) {
               ) {
                 parent = omit(parent, ['asset']);
               }
-    
+
               if (object.uid && assetUIDMapper[object.uid]) {
                 object.uid = assetUIDMapper[object.uid];
               }
@@ -398,12 +398,12 @@ function entryUpdateScript(contentType) {
       } 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) {
         const assetUID = cAsset.uid;
@@ -456,24 +456,24 @@ function entryUpdateScript(contentType) {
       }
       return cAsset;
     };
-  
+
     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 < downloadedAssets?.length; i++) {
         const asset = downloadedAssets[i];
         let requestOption = {};
-  
+
         requestOption.parent_uid = assetFolderMap[asset.parent_uid] || asset.parent_uid;
-  
+
         if (asset.hasOwnProperty('description') && typeof asset.description === 'string') {
           requestOption.description = asset.description;
         }
-  
+
         if (asset.hasOwnProperty('tags') && Array.isArray(asset.tags)) {
           requestOption.tags = asset.tags;
         }
-  
+
         if (asset.hasOwnProperty('title') && typeof asset.title === 'string') {
           requestOption.title = asset.title;
         }
@@ -496,14 +496,14 @@ function entryUpdateScript(contentType) {
         limit,
         include_count: true,
       };
-  
+
       const entriesSearchResponse = await managementAPIClient
         .stack({ api_key: stackSDKInstance.api_key, branch_uid: branchName })
         .contentType(contentType)
         .entry()
         .query(requestObject)
         .find();
-  
+
       if (entriesSearchResponse?.items?.length > 0) {
         skip += limit || 100;
         entries = [...entries, ...entriesSearchResponse.items];
@@ -514,18 +514,18 @@ function entryUpdateScript(contentType) {
       }
       return entries;
     };
-    
+
     const updateEntryTask = () => {
       return {
         title: 'Update Entries',
         successMessage: 'Entries Updated Successfully',
         failedMessage: 'Failed to update entries',
         task: async () => {
-          
+
         let compareBranchEntries = await getEntries(compareBranch, '${contentType}');
-  
+
         let baseBranchEntries = await getEntries(branch, '${contentType}');
-  
+
         let contentType = await managementAPIClient
           .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
           .contentType('${contentType}')
@@ -561,9 +561,9 @@ function entryUpdateScript(contentType) {
           let flag = {
             references: false
           };
-  
+
           const references = await findReference(contentType.schema, '', flag);
-  
+
           async function updateEntry(entry, entryDetails) {
             Object.assign(entry, { ...entryDetails });
             await entry.update();
@@ -573,7 +573,7 @@ function entryUpdateScript(contentType) {
             for (let i in references) {
               let compareEntryRef = getValueByPath(entryDetails, references[i]);
               let baseEntryRef = getValueByPath(baseEntry, references[i]);
-  
+
               if (compareEntryRef && compareEntryRef.length > 0 && baseEntryRef && baseEntryRef.length >= 0) {
                 let compareRefEntry = await managementAPIClient
                   .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
@@ -585,7 +585,7 @@ function entryUpdateScript(contentType) {
                   .entry()
                   .query({ query: { title: compareRefEntry.title } })
                   .find();
-  
+
                   if(baseRefEntry?.items?.length > 0 && baseRefEntry.items[0]?.uid){
                     updateValueByPath(entryDetails, references[i], baseRefEntry.items[0].uid);
                   }
@@ -602,19 +602,19 @@ function entryUpdateScript(contentType) {
                   if (baseBranchEntries && baseBranchEntries.length) {
                     let baseEntryUid = baseBranchEntries[0].uid;
                     let entry = await stackSDKInstance.contentType('${contentType}').entry(baseEntryUid);
-                    
+
                     if (flag.references) {
                       await updateReferences(entryDetails, baseBranchEntries[0], references);
                     }
-    
+
                     await updateEntry(entry, entryDetails);
                   } else {
                     let createdEntry = await stackSDKInstance.contentType('${contentType}').entry().create({ entry: entryDetails });
-                  
+
                     if (flag.references) {
                       await updateReferences(entryDetails, createdEntry, references);
                     }
-    
+
                     await updateEntry(createdEntry, entryDetails);
                   }
                 }
@@ -626,7 +626,7 @@ function entryUpdateScript(contentType) {
               //NOTE: Filter distinct entries from the base and compare branches according to their titles.
               //TODO: Need to discuss this approach and replace it with uid approach
               let arr = uniquelyConcatenateArrays(Array.from(compareMap.keys()), Array.from(baseMap.keys()));
-  
+
               arr.map(async (el) => {
                 let entryDetails = deleteUnwantedKeysFromObject(compareMap.get(el), keysToRemove);
                 //NOTE: In the compare branch, entry must exist. Condition of deleted entry not handled
@@ -637,22 +637,22 @@ function entryUpdateScript(contentType) {
                     .contentType('${contentType}')
                     .entry()
                     .create({ entry: entryDetails })
-                  
+
                     if(createdEntry){
                       if (flag.references) {
                         await updateReferences(entryDetails, createdEntry, references);
                       }
-      
+
                       await updateEntry(createdEntry, entryDetails);
                     }
                   } else if (compareMap.get(el) && baseMap.get(el)) {
                     let baseEntry = baseMap.get(el);
                     let entry = await stackSDKInstance.contentType('${contentType}').entry(baseEntry.uid);
-                    
+
                     if (flag.references) {
                       await updateReferences(entryDetails, baseEntry, references);
                     }
-  
+
                     await updateEntry(entry, entryDetails);
                   }
                 }
@@ -664,7 +664,7 @@ function entryUpdateScript(contentType) {
         },
       };
     };
-  
+
     if (compareBranch && branch.length !== 0 && apiKey.length !== 0) {
       migration.addTask(updateEntryTask());
     } else {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.1",
+  "version": "1.3.0",
   "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.2.1",
+  "version": "1.3.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.3.3",
-    "@contentstack/cli-utilities": "~1.8.1",
+    "@contentstack/cli-utilities": "~1.8.4",
     "@oclif/core": "^3.27.0",
     "chalk": "^4.1.2",
     "just-diff": "^6.0.2",