@contentstack/cli-cm-branches 1.0.26 → 1.1.1

package/README.md

@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-branches/1.0.26 linux-x64 node-v18.20.3
+@contentstack/cli-cm-branches/1.1.1 linux-x64 node-v18.20.3
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

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

@@ -465,6 +465,32 @@ function entryCreateScript(contentType) {
       }
     }
 
+    const getEntries = async (branchName, contentType, skip = 0, limit = 100, entries = []) => {
+      let requestObject = {
+        skip,
+        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];
+        if (skip >= entriesSearchResponse.count) {
+          return entries;
+        }
+        return await getEntries(branchName, contentType, skip, limit, entries);
+      }
+      return entries;
+    };
+
+
     const createEntryTask = () => {
       return {
         title: 'Create Entries',
@@ -472,14 +498,9 @@ function entryCreateScript(contentType) {
         failedTitle: 'Failed to create entries',
         task: async () => {
 
-          const compareBranchEntries = await managementAPIClient
-            .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
-            .contentType('${contentType}')
-            .entry()
-            .query()
-            .find();
+          const compareBranchEntries = await getEntries(compareBranch, '${contentType}')
           
-          const compareFilteredProperties = compareBranchEntries.items.map((entry) => {
+          const compareFilteredProperties = compareBranchEntries.map((entry) => {
             keysToRemove.map((key) => delete entry[key]);
             return entry;
           });
@@ -489,9 +510,9 @@ function entryCreateScript(contentType) {
           .contentType('${contentType}')
           .fetch();
 
-          for (let i = 0; i < compareBranchEntries?.items?.length; i++) {
-            assetRefPath[compareBranchEntries.items[i].uid] = []
-            findAssets(contentType.schema, compareBranchEntries.items[i], assetRefPath[compareBranchEntries.items[i].uid]);
+          for (let i = 0; i < compareBranchEntries?.length; i++) {
+            assetRefPath[compareBranchEntries[i].uid] = []
+            findAssets(contentType.schema, compareBranchEntries[i], assetRefPath[compareBranchEntries[i].uid]);
             cAssetDetails = [...new Map(cAssetDetails.map((item) => [item['uid'], item])).values()];
           }
           if (cAssetDetails && cAssetDetails.length) {

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

@@ -47,9 +47,9 @@ function entryCreateUpdateScript(contentType) {
   
     function converter(data) {
       let arr = [];
-      for (const elm of data.entries()) {
+      for (const elm of data) {
         // @ts-ignore
-        arr.push([elm[1].title, elm[1]]);
+        arr.push([elm.title, elm]);
       }
       return arr;
     }
@@ -479,6 +479,30 @@ function entryCreateUpdateScript(contentType) {
       }
     };
 
+    const getEntries = async (branchName, contentType, skip = 0, limit = 100, entries = []) => {
+      let requestObject = {
+        skip,
+        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];
+        if (skip >= entriesSearchResponse.count) {
+          return entries;
+        }
+        return await getEntries(branchName, contentType, skip, limit, entries);
+      }
+      return entries;
+    };
 
     const updateEntryTask = () => {
       return {
@@ -486,28 +510,23 @@ function entryCreateUpdateScript(contentType) {
         successMessage: 'Entries Updated Successfully',
         failedMessage: 'Failed to update entries',
         task: async () => {
-          let compareBranchEntries = await managementAPIClient
-          .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
-          .contentType('${contentType}')
-          .entry()
-          .query()
-          .find();
+        let compareBranchEntries = await getEntries(compareBranch, '${contentType}')
   
-        let baseBranchEntries = await stackSDKInstance.contentType('${contentType}').entry().query().find();
+        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?.items?.length; i++) {
-            assetRefPath[compareBranchEntries.items[i].uid] = []
-            findAssets(contentType.schema, compareBranchEntries.items[i], assetRefPath[compareBranchEntries.items[i].uid]);
+          for (let i = 0; i < compareBranchEntries?.length; i++) {
+            assetRefPath[compareBranchEntries[i].uid] = []
+            findAssets(contentType.schema, compareBranchEntries[i], assetRefPath[compareBranchEntries[i].uid]);
           }
 
           for (let i = 0; i < baseBranchEntries?.items?.length; i++) {
-            assetRefPath[baseBranchEntries.items[i].uid] = []
-            findAssets(contentType.schema, baseBranchEntries.items[i], assetRefPath[baseBranchEntries.items[i].uid]);
+            assetRefPath[baseBranchEntries[i].uid] = []
+            findAssets(contentType.schema, baseBranchEntries[i], assetRefPath[baseBranchEntries[i].uid]);
           }
           assetDetails = [...new Map(assetDetails.map((item) => [item['uid'], item])).values()];
           newAssetDetails = assetDetails;
@@ -571,12 +590,12 @@ function entryCreateUpdateScript(contentType) {
                 if(entryDetails !== undefined){
                   entryDetails = updateAssetDetailsInEntries(entryDetails);
     
-                  if (baseBranchEntries && baseBranchEntries.items.length) {
-                    let baseEntryUid = baseBranchEntries.items[0].uid;
+                  if (baseBranchEntries && baseBranchEntries.length) {
+                    let baseEntryUid = baseBranchEntries[0].uid;
                     let entry = await stackSDKInstance.contentType('${contentType}').entry(baseEntryUid);
                     
                     if (flag.references) {
-                      await updateReferences(entryDetails, baseBranchEntries.items[0], references);
+                      await updateReferences(entryDetails, baseBranchEntries[0], references);
                     }
     
                     await updateEntry(entry, entryDetails);
@@ -592,19 +611,20 @@ function entryCreateUpdateScript(contentType) {
                 }
               });
             } else {
-              let compareMap = new Map(converter(compareBranchEntries.items));
-              let baseMap = new Map(converter(baseBranchEntries.items));
+              let compareMap = new Map(converter(compareBranchEntries));
+              let baseMap = new Map(converter(baseBranchEntries));
 
               //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 condition
               let arr = uniquelyConcatenateArrays(Array.from(compareMap.keys()), Array.from(baseMap.keys()));
 
-              arr.map(async (el) => {
-                let entryDetails = deleteUnwantedKeysFromObject(compareMap.get(el), keysToRemove);
+              // 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
                 if(entryDetails !== undefined){
                   entryDetails = updateAssetDetailsInEntries(entryDetails);
-                  if (compareMap.get(el) && !baseMap.get(el)) {
+                  if (compareMap.get(arr[i]) && !baseMap.get(arr[i])) {
                     let createdEntry = await stackSDKInstance
                     .contentType('${contentType}')
                     .entry()
@@ -616,8 +636,8 @@ function entryCreateUpdateScript(contentType) {
                       }     
                       await updateEntry(createdEntry, entryDetails);
                     }
-                  } else if (compareMap.get(el) && baseMap.get(el)) {
-                    let baseEntry = baseMap.get(el);
+                  } 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) {
@@ -627,7 +647,7 @@ function entryCreateUpdateScript(contentType) {
                     await updateEntry(entry, entryDetails);
                   }
                 }
-              });
+              }
             }
           } catch (error) {
             throw error;

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

@@ -47,9 +47,9 @@ function entryUpdateScript(contentType) {
   
     function converter(data) {
       let arr = [];
-      for (const elm of data.entries()) {
+      for (const elm of data) {
         // @ts-ignore
-        arr.push([elm[1].title, elm[1]]);
+        arr.push([elm.title, elm]);
       }
       return arr;
     }
@@ -479,6 +479,31 @@ function entryUpdateScript(contentType) {
       }
     };
 
+    const getEntries = async (branchName, contentType, skip = 0, limit = 100, entries = []) => {
+      let requestObject = {
+        skip,
+        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];
+        if (skip >= entriesSearchResponse.count) {
+          return entries;
+        }
+        return await getEntries(branchName, contentType, skip, limit, entries);
+      }
+      return entries;
+    };
+    
     const updateEntryTask = () => {
       return {
         title: 'Update Entries',
@@ -486,28 +511,23 @@ function entryUpdateScript(contentType) {
         failedMessage: 'Failed to update entries',
         task: async () => {
           
-          let compareBranchEntries = await managementAPIClient
-          .stack({ api_key: stackSDKInstance.api_key, branch_uid: compareBranch })
-          .contentType('${contentType}')
-          .entry()
-          .query()
-          .find();
+        let compareBranchEntries = await getEntries(compareBranch, '${contentType}');
   
-        let baseBranchEntries = await stackSDKInstance.contentType('${contentType}').entry().query().find();
+        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?.items?.length; i++) {
-            assetRefPath[compareBranchEntries.items[i].uid] = []
-            findAssets(contentType.schema, compareBranchEntries.items[i], assetRefPath[compareBranchEntries.items[i].uid]);
+          for (let i = 0; i < compareBranchEntries?.length; i++) {
+            assetRefPath[compareBranchEntries[i].uid] = []
+            findAssets(contentType.schema, compareBranchEntries[i], assetRefPath[compareBranchEntries[i].uid]);
           }
 
-          for (let i = 0; i < baseBranchEntries?.items?.length; i++) {
-            assetRefPath[baseBranchEntries.items[i].uid] = []
-            findAssets(contentType.schema, baseBranchEntries.items[i], assetRefPath[baseBranchEntries.items[i].uid]);
+          for (let i = 0; i < baseBranchEntries?.length; i++) {
+            assetRefPath[baseBranchEntries[i].uid] = []
+            findAssets(contentType.schema, baseBranchEntries[i], assetRefPath[baseBranchEntries[i].uid]);
           }
           assetDetails = [...new Map(assetDetails.map((item) => [item['uid'], item])).values()];
           newAssetDetails = assetDetails;
@@ -564,16 +584,16 @@ function entryUpdateScript(contentType) {
 
           try {
             if (contentType?.options?.singleton) {
-              compareBranchEntries?.items?.map(async (el) => {
+              compareBranchEntries?.map(async (el) => {
                 let entryDetails = deleteUnwantedKeysFromObject(el, keysToRemove);
                 if(entryDetails !== undefined){
                   entryDetails = updateAssetDetailsInEntries(entryDetails);
-                  if (baseBranchEntries && baseBranchEntries.items.length) {
-                    let baseEntryUid = baseBranchEntries.items[0].uid;
+                  if (baseBranchEntries && baseBranchEntries.length) {
+                    let baseEntryUid = baseBranchEntries[0].uid;
                     let entry = await stackSDKInstance.contentType('${contentType}').entry(baseEntryUid);
                     
                     if (flag.references) {
-                      await updateReferences(entryDetails, baseBranchEntries.items[0], references);
+                      await updateReferences(entryDetails, baseBranchEntries[0], references);
                     }
     
                     await updateEntry(entry, entryDetails);
@@ -589,8 +609,8 @@ function entryUpdateScript(contentType) {
                 }
               });
             } else {
-              let compareMap = new Map(converter(compareBranchEntries.items));
-              let baseMap = new Map(converter(baseBranchEntries.items));
+              let compareMap = new Map(converter(compareBranchEntries));
+              let baseMap = new Map(converter(baseBranchEntries));
 
               //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

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.26",
+  "version": "1.1.1",
   "commands": {
     "cm:branches:create": {
       "id": "cm:branches:create",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-branches",
   "description": "Contentstack CLI plugin to do branches operations",
-  "version": "1.0.26",
+  "version": "1.1.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.18",
-    "@contentstack/cli-utilities": "~1.6.2",
-    "@oclif/core": "^2.9.3",
+    "@contentstack/cli-utilities": "~1.6.3",
+    "@oclif/core": "^3.26.5",
     "async": "^3.2.4",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
@@ -25,7 +25,7 @@
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@contentstack/cli-auth": "~1.3.18",
+    "@contentstack/cli-auth": "~1.3.19",
     "@contentstack/cli-config": "~1.6.4",
     "@contentstack/cli-dev-dependencies": "~1.2.4",
     "@oclif/plugin-help": "^5.1.19",
@@ -95,4 +95,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}