@contentstack/cli-cm-bulk-publish 0.1.1-beta.1 → 0.1.1-beta.4

package/src/producer/nonlocalized-field-changes.js

@@ -8,7 +8,7 @@
 /* eslint-disable node/no-extraneous-require */
 const _ = require('lodash')
 const {getQueue} = require('../util/queue')
-const {bulkPublish, publishEntry, initializeLogger} = require('../consumer/publish')
+const {performBulkPublish, publishEntry, initializeLogger} = require('../consumer/publish')
 const retryFailedLogs = require('../util/retryfailed')
 const {validateFile} = require('../util/fs')
 const {setDelayForBulkPublish} = require('../util')
@@ -24,7 +24,7 @@ let filePath
 function setConfig(conf, bp) {
   if (bp) {
     logFileName = 'bulk-nonlocalized-field-changes'
-    queue.consumer = bulkPublish
+    queue.consumer = performBulkPublish
   } else {
     logFileName = 'nonlocalized-field-changes'
     queue.consumer = publishEntry
@@ -65,7 +65,7 @@ async function getLocalizedEntry(stack, entry, contentType, locale, sourceEnv) {
         resolve({})
       }
       if (typeof error === 'string') {
-        if (!JSON.parse(error).errorCode === 141) console.log(error)
+        if (JSON.parse(error).errorCode !== 141) console.log(error)
       }
     })
   })
@@ -276,7 +276,8 @@ async function getEntries(stack, schema, contentType, languages, masterLocale, b
         bulkPublishSet = []
         return resolve()
       }
-      return getEntries(stack, schema, contentType, languages, masterLocale, bulkPublish, environments, skipCount)
+      await getEntries(stack, schema, contentType, languages, masterLocale, bulkPublish, environments, skipCount)
+      return resolve()
     })
     .catch(error => reject(error))
     return resolve()
@@ -305,44 +306,32 @@ async function start({retryFailed, bulkPublish, sourceEnv, contentTypes, environ
     process.exit(0)  
   })
 
-  try {
-    if (retryFailed) {
-      if (typeof retryFailed === 'string') {
-        if (!validateFile(retryFailed, ['nonlocalized-field-changes', 'bulk-nonlocalized-field-changes'])) {
-          return false
-        }
+  if (retryFailed) {
+    if (typeof retryFailed === 'string') {
+      if (!validateFile(retryFailed, ['nonlocalized-field-changes', 'bulk-nonlocalized-field-changes'])) {
+        return false
+      }
 
-        bulkPublish = retryFailed.match(new RegExp('bulk')) ? true : false
-        setConfig(config, bulkPublish)
+      bulkPublish = retryFailed.match(new RegExp('bulk')) ? true : false
+      setConfig(config, bulkPublish)
 
-        if (bulkPublish) {
-          await retryFailedLogs(retryFailed, queue, 'bulk')
-        } else {
-          await retryFailedLogs(retryFailed, {entryQueue: queue}, 'publish')
-        }
-      }
-    } else {
-      setConfig(config, bulkPublish)  
-      try {
-        const masterLocale = 'en-us'
-        const languages = await getLanguages(stack)
-        // const {contentTypes} = config.nonlocalized_field_changes
-        for (let i = 0; i < contentTypes.length; i += 1) {
-          try {
-            /* eslint-disable no-await-in-loop */
-            const schema = await getContentTypeSchema(stack, contentTypes[i])
-            await getEntries(stack, schema, contentTypes[i], languages, masterLocale, bulkPublish, environments, sourceEnv)
-            /* eslint-enable no-await-in-loop */
-          } catch (error) {
-            throw error
-          }
-        }
-      } catch (error) {
-        throw error
+      if (bulkPublish) {
+        await retryFailedLogs(retryFailed, queue, 'bulk')
+      } else {
+        await retryFailedLogs(retryFailed, {entryQueue: queue}, 'publish')
       }
     }
-  } catch(error) {
-    throw error
+  } else {
+    setConfig(config, bulkPublish)  
+    const masterLocale = 'en-us'
+    const languages = await getLanguages(stack)
+    // const {contentTypes} = config.nonlocalized_field_changes
+    for (let i = 0; i < contentTypes.length; i += 1) {
+      /* eslint-disable no-await-in-loop */
+      const schema = await getContentTypeSchema(stack, contentTypes[i])
+      await getEntries(stack, schema, contentTypes[i], languages, masterLocale, bulkPublish, environments, sourceEnv)
+      /* eslint-enable no-await-in-loop */
+    }
   }
 }
 

package/src/producer/publish-assets.js

@@ -2,7 +2,7 @@
 /* eslint-disable new-cap */
 /* eslint-disable camelcase */
 const {getQueue} = require('../util/queue')
-const {bulkPublish, publishAsset, initializeLogger} = require('../consumer/publish')
+const {performBulkPublish, publishAsset, initializeLogger} = require('../consumer/publish')
 const retryFailedLogs = require('../util/retryfailed')
 const {validateFile} = require('../util/fs')
 const {setDelayForBulkPublish} = require('../util')
@@ -62,6 +62,7 @@ async function getAssets(stack, folder, bulkPublish, environments, locale, skip
           return resolve(true)
         }
         await getAssets(stack, folder, bulkPublish, environments, locale, skip)
+        return resolve()
       } else {
         // throw new Error(JSON.stringify({errorMessage: "No Assets found"}))
       }
@@ -76,7 +77,7 @@ async function getAssets(stack, folder, bulkPublish, environments, locale, skip
 
 function setConfig(conf, bp) {
   if (bp) {
-    queue.consumer = bulkPublish
+    queue.consumer = performBulkPublish
     logFileName = 'bulk-publish-assets'
   } else {
     queue.consumer = publishAsset
@@ -99,32 +100,24 @@ async function start({retryFailed, bulkPublish, environments, folderUid, locales
     process.exit(0)  
   })
 
-  try {
-    if (retryFailed) {
-      if (!validateFile(retryFailed, ['publish-assets', 'bulk-publish-assets'])) {
-        return false
-      }
+  if (retryFailed) {
+    if (!validateFile(retryFailed, ['publish-assets', 'bulk-publish-assets'])) {
+      return false
+    }
 
-      bulkPublish = retryFailed.match(new RegExp('bulk')) ? true : false
-      setConfig(config, bulkPublish)
+    bulkPublish = retryFailed.match(new RegExp('bulk')) ? true : false
+    setConfig(config, bulkPublish)
 
-      if (bulkPublish) {
-        await retryFailedLogs(retryFailed, queue, 'bulk')
-      } else {
-        await retryFailedLogs(retryFailed, {assetQueue: queue}, 'publish')
-      }
-    } else if (folderUid) {
-      setConfig(config, bulkPublish)
-      for (let loc = 0; loc < locales.length; loc += 1) {
-        try {
-          await getAssets(stack, folderUid, bulkPublish, environments, locales[loc])
-        } catch(error) {
-          throw error
-        }
-      }
+    if (bulkPublish) {
+      await retryFailedLogs(retryFailed, queue, 'bulk')
+    } else {
+      await retryFailedLogs(retryFailed, {assetQueue: queue}, 'publish')
+    }
+  } else if (folderUid) {
+    setConfig(config, bulkPublish)
+    for (let loc = 0; loc < locales.length; loc += 1) {
+      await getAssets(stack, folderUid, bulkPublish, environments, locales[loc])
     }
-  } catch (error) {
-    throw error
   }
 }
 

package/src/producer/publish-edits.js

@@ -5,7 +5,7 @@
 /* eslint-disable max-params */
 /* eslint-disable camelcase */
 const {getQueue} = require('../util/queue')
-const {bulkPublish, publishEntry, initializeLogger} = require('../consumer/publish')
+const {performBulkPublish, publishEntry, initializeLogger} = require('../consumer/publish')
 const retryFailedLogs = require('../util/retryfailed')
 const {validateFile} = require('../util/fs')
 const {setDelayForBulkPublish} = require('../util')
@@ -83,6 +83,7 @@ async function getEntries(stack, contentType, environmentUid, locale, bulkPublis
         return resolve()
       }
       await getEntries(stack, contentType, environmentUid, locale, bulkPublish, environments, skipCount)
+      return resolve()
     })
     .catch(error =>{
       reject(error)
@@ -93,7 +94,7 @@ async function getEntries(stack, contentType, environmentUid, locale, bulkPublis
 function setConfig(conf, bp) {
   if (bp) {
     logFileName = 'bulk-publish-edits'
-    queue.consumer = bulkPublish
+    queue.consumer = performBulkPublish
   } else {
     logFileName = 'publish-edits'
     queue.consumer = publishEntry
@@ -115,43 +116,31 @@ async function start({retryFailed, bulkPublish, sourceEnv, contentTypes, locales
     process.exit(0)  
   })
 
-  try {
-    if (retryFailed) {
-      if (typeof retryFailed === 'string') {
-        if (!validateFile(retryFailed, ['publish-edits', 'bulk-publish-edits'])) {
-          return false
-        }
-        
-        bulkPublish = retryFailed.match(new RegExp('bulk')) ? true : false
-        setConfig(config, bulkPublish)
-
-        if (bulkPublish) {
-          await retryFailedLogs(retryFailed, queue, 'bulk')
-        } else {
-          await retryFailedLogs(retryFailed, {entryQueue: queue}, 'publish')
-        }
+  if (retryFailed) {
+    if (typeof retryFailed === 'string') {
+      if (!validateFile(retryFailed, ['publish-edits', 'bulk-publish-edits'])) {
+        return false
       }
-    } else if (sourceEnv) {
+
+      bulkPublish = retryFailed.match(new RegExp('bulk')) ? true : false
       setConfig(config, bulkPublish)
-      try {
-        const environmentDetails = await getEnvironment(stack, sourceEnv)
-        for (let i = 0; i < contentTypes.length; i += 1) {
-          for (let j = 0; j < locales.length; j += 1) {
-            try {
-              /* eslint-disable no-await-in-loop */
-              await getEntries(stack, contentTypes[i], environmentDetails.uid, locales[j], bulkPublish, environments)
-              /* eslint-enable no-await-in-loop */
-            } catch (error) {
-              throw error
-            }
-          }
-        }
-      } catch (error) {
-        throw error
+
+      if (bulkPublish) {
+        await retryFailedLogs(retryFailed, queue, 'bulk')
+      } else {
+        await retryFailedLogs(retryFailed, {entryQueue: queue}, 'publish')
+      }
+    }
+  } else if (sourceEnv) {
+    setConfig(config, bulkPublish)
+    const environmentDetails = await getEnvironment(stack, sourceEnv)
+    for (let i = 0; i < contentTypes.length; i += 1) {
+      for (let j = 0; j < locales.length; j += 1) {
+        /* eslint-disable no-await-in-loop */
+        await getEntries(stack, contentTypes[i], environmentDetails.uid, locales[j], bulkPublish, environments)
+        /* eslint-enable no-await-in-loop */
       }
     }
-  } catch(error) {
-    throw error
   }
 }
 

package/src/producer/publish-entries.js

@@ -4,7 +4,7 @@
 /* eslint-disable max-depth */
 /* eslint-disable no-console */
 const {getQueue} = require('../util/queue')
-const {bulkPublish, publishEntry, initializeLogger} = require('../consumer/publish')
+const {performBulkPublish, publishEntry, initializeLogger} = require('../consumer/publish')
 const retryFailedLogs = require('../util/retryfailed')
 const {validateFile} = require('../util/fs')
 const {isEmpty} = require('../util')
@@ -51,7 +51,7 @@ async function getEntries(stack, contentType, locale, bulkPublish, environments,
             bulkPublishSet = []
           }
 
-          if (index === entriesResponse.items.length - 1 && bulkPublishSet.length <= 10) {
+          if (index === entriesResponse.items.length - 1 && bulkPublishSet.length <= 10 && bulkPublishSet.length > 0) {
             await queue.Enqueue({
               entries: bulkPublishSet, locale, Type: 'entry', environments: environments, stack: stack
             })
@@ -69,6 +69,7 @@ async function getEntries(stack, contentType, locale, bulkPublish, environments,
         return resolve()
       }
       await getEntries(stack, contentType, locale, bulkPublish, environments, skipCount)
+      return resolve()
     })
     .catch(error => reject(error))
   })
@@ -93,7 +94,7 @@ async function getContentTypes(stack, skip = 0, contentTypes = []) {
 
 function setConfig(conf, bp) {
   if (bp) {
-    queue.consumer = bulkPublish
+    queue.consumer = performBulkPublish
     logFileName = 'bulk-publish-entries'
   } else {
     queue.consumer = publishEntry
@@ -115,42 +116,34 @@ async function start({retryFailed, bulkPublish, publishAllContentTypes, contentT
     }
     process.exit(0)  
   })
-  try {
-    if (retryFailed) {
-      if (typeof retryFailed === 'string') {
-        if (!validateFile(retryFailed, ['publish-entries', 'bulk-publish-entries'])) {
-          return false
-        }
-        
-        bulkPublish = retryFailed.match(new RegExp('bulk')) ? true : false
-        setConfig(config, bulkPublish)
-        if (bulkPublish) {
-          await retryFailedLogs(retryFailed, queue, 'bulk')
-        } else {
-          await retryFailedLogs(retryFailed, {entryQueue: queue}, 'publish')
-        }
+  if (retryFailed) {
+    if (typeof retryFailed === 'string') {
+      if (!validateFile(retryFailed, ['publish-entries', 'bulk-publish-entries'])) {
+        return false
       }
-    } else {
+
+      bulkPublish = retryFailed.match(new RegExp('bulk')) ? true : false
       setConfig(config, bulkPublish)
-      if (publishAllContentTypes) {
-        allContentTypes = await getContentTypes(stack)
+      if (bulkPublish) {
+        await retryFailedLogs(retryFailed, queue, 'bulk')
       } else {
-        allContentTypes = contentTypes
+        await retryFailedLogs(retryFailed, {entryQueue: queue}, 'publish')
       }
-      for (let loc = 0; loc < locales.length; loc += 1) {
-        for (let i = 0; i < allContentTypes.length; i += 1) {
-          try {
-            /* eslint-disable no-await-in-loop */
-            await getEntries(stack, allContentTypes[i].uid || allContentTypes[i], locales[loc], bulkPublish, environments)
-            /* eslint-enable no-await-in-loop */
-          } catch (error) {
-            throw error
-          }
-        }
+    }
+  } else {
+    setConfig(config, bulkPublish)
+    if (publishAllContentTypes) {
+      allContentTypes = await getContentTypes(stack)
+    } else {
+      allContentTypes = contentTypes
+    }
+    for (let loc = 0; loc < locales.length; loc += 1) {
+      for (let i = 0; i < allContentTypes.length; i += 1) {
+        /* eslint-disable no-await-in-loop */
+        await getEntries(stack, allContentTypes[i].uid || allContentTypes[i], locales[loc], bulkPublish, environments)
+        /* eslint-enable no-await-in-loop */
       }
     }
-  } catch(error) {
-    throw error
   }
 }
 

package/src/producer/publish-unpublished-env.js

@@ -5,7 +5,7 @@
 /* eslint-disable new-cap */
 /* eslint-disable camelcase */
 const {getQueue} = require('../util/queue')
-const {bulkPublish, publishEntry, initializeLogger} = require('../consumer/publish')
+const {performBulkPublish, publishEntry, initializeLogger} = require('../consumer/publish')
 const retryFailedLogs = require('../util/retryfailed')
 const {validateFile} = require('../util/fs')
 const {setDelayForBulkPublish} = require('../util')
@@ -21,7 +21,7 @@ let filePath
 function setConfig(conf, bp) {
   if (bp) {
     logFileName = 'bulk-publish-draft'
-    queue.consumer = bulkPublish
+    queue.consumer = performBulkPublish
   } else {
     logFileName = 'publish-draft'
     queue.consumer = publishEntry
@@ -98,6 +98,7 @@ async function getEntries(stack, contentType, environmentUid, locale, bulkPublis
         return resolve()
       }
       await getEntries(stack, contentType, environmentUid, locale, bulkPublish, environments, skipCount)
+      return resolve()
     })
     .catch(error => {
       reject(error)
@@ -117,44 +118,32 @@ async function start({sourceEnv, environments, locale, contentTypes, bulkPublish
     process.exit(0)  
   })
 
-  try {
-    if (retryFailed) {
-      if (typeof retryFailed === 'string') {
-        if (!validateFile(retryFailed, ['publish-draft', 'bulk-publish-draft'])) {
-          return false
-        }
+  if (retryFailed) {
+    if (typeof retryFailed === 'string') {
+      if (!validateFile(retryFailed, ['publish-draft', 'bulk-publish-draft'])) {
+        return false
+      }
 
-        bulkPublish = retryFailed.match(new RegExp('bulk')) ? true : false
-        setConfig(config, bulkPublish)
+      bulkPublish = retryFailed.match(new RegExp('bulk')) ? true : false
+      setConfig(config, bulkPublish)
 
-        if (bulkPublish) {
-          await retryFailedLogs(retryFailed, queue, 'bulk')
-        } else {
-          await retryFailedLogs(retryFailed, {entryQueue: queue}, 'publish')
-        }
+      if (bulkPublish) {
+        await retryFailedLogs(retryFailed, queue, 'bulk')
+      } else {
+        await retryFailedLogs(retryFailed, {entryQueue: queue}, 'publish')
       }
-    } else {
-      setConfig(config, bulkPublish)  
-      try {
-        if (sourceEnv) {
-          const environmentDetails = await getEnvironment(stack, sourceEnv)
-          for (let i = 0; i < contentTypes.length; i += 1) {
-            try {
-              /* eslint-disable no-await-in-loop */
-              await getEntries(stack, contentTypes[i], environmentDetails.uid, locale, bulkPublish, environments)
-              /* eslint-enable no-await-in-loop */
-              changedFlag = false
-            } catch (error) {
-              throw error
-            }
-          }
-        }
-      } catch (error) {
-        throw error
+    }
+  } else {
+    setConfig(config, bulkPublish)  
+    if (sourceEnv) {
+      const environmentDetails = await getEnvironment(stack, sourceEnv)
+      for (let i = 0; i < contentTypes.length; i += 1) {
+        /* eslint-disable no-await-in-loop */
+        await getEntries(stack, contentTypes[i], environmentDetails.uid, locale, bulkPublish, environments)
+        /* eslint-enable no-await-in-loop */
+        changedFlag = false
       }
     }
-  } catch(error) {
-    throw error
   }
 }
 

package/src/producer/revert.js

@@ -11,7 +11,7 @@ const {getQueue} = require('../util/queue')
 const {validateFile} = require('../util/fs')
 const Configstore = require('configstore')
 let config = new Configstore('contentstack_cli')
-const {initializeLogger, bulkUnPublish, publishUsingVersion} = require('../consumer/publish')
+const {initializeLogger, performBulkUnPublish, publishUsingVersion} = require('../consumer/publish')
 const getStack = require('../util/client.js').getStack
 
 // for checking if a logfile has been provided by user
@@ -35,7 +35,7 @@ function setConfig(conf) {
   config = conf
   unpublishQueue.config = conf
   publishQueue.config = conf
-  unpublishQueue.consumer = bulkUnPublish
+  unpublishQueue.consumer = performBulkUnPublish
   publishQueue.consumer = publishUsingVersion
 }
 
@@ -328,8 +328,8 @@ async function revertUsingLogs(logFileName) {
   }
 }
 
-async function start({retryFailed, logFile}, config) {
-  setConfig(config)
+async function start({retryFailed, logFile}, cfg) {
+  setConfig(cfg)
   if (retryFailed) {
     if (typeof retryFailed === 'string') {
       if (!validateFile(retryFailed, ['revert'])) {