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

package/src/config/index.js

@@ -1,110 +1,110 @@
 module.exports = {
-  "alias": "Placeholder Management Token Alias",
-  "publish_unpublished_env": {
-    "contentTypes": [
-      "placeholder content type"
+  alias: 'Placeholder Management Token Alias',
+  publish_unpublished_env: {
+    contentTypes: [
+      'placeholder content type',
     ],
-    "sourceEnv": "placeholder source env",
-    "locale": "placeholder locale",
-    "environments": [
-      "placeholder env"
+    sourceEnv: 'placeholder source env',
+    locale: 'placeholder locale',
+    environments: [
+      'placeholder env',
     ],
-    "bulkPublish": true
+    bulkPublish: true,
   },
-  "publish_assets": {
-    "environments": [
-      "placeholder env"
-    ],
-    "folderUid": "placeholder folder uid",
-    "bulkPublish": true,
-    "locales": [
-      "placeholder locale"
-    ]
+  publish_assets: {
+    environments: [
+      'placeholder env',
+    ],
+    folderUid: 'placeholder folder uid',
+    bulkPublish: true,
+    locales: [
+      'placeholder locale',
+    ],
   },
-  "publish_entries": {
-    "contentTypes": [
-      "placeholder content type"
+  publish_entries: {
+    contentTypes: [
+      'placeholder content type',
     ],
-    "locales": [
-      "placeholder locale",
+    locales: [
+      'placeholder locale',
     ],
-    "bulkPublish": true,
-    "environments": [
-      "placeholder env"
+    bulkPublish: true,
+    environments: [
+      'placeholder env',
     ],
-    "publishAllContentTypes": false
+    publishAllContentTypes: false,
   },
-  "Unpublish": {
-    "filter": {
-      "environment": "placeholder env",
-      "content_type_uid": "placeholder content type",
-      "locale": "placeholder locale",
-      "type": "placeholder types"
+  Unpublish: {
+    filter: {
+      environment: 'placeholder env',
+      content_type_uid: 'placeholder content type',
+      locale: 'placeholder locale',
+      type: 'placeholder types',
     },
-    "deliveryToken": "placeholder delivery token",
-    "bulkUnpublish": true
+    deliveryToken: 'placeholder delivery token',
+    bulkUnpublish: true,
   },
-  "cross_env_publish": {
-    "filter": {
-      "environment": "placeholder env",
-      "content_type_uid": "placeholder content type",
-      "locale": "placeholder locale",
-      "type": "placeholder types"
+  cross_env_publish: {
+    filter: {
+      environment: 'placeholder env',
+      content_type_uid: 'placeholder content type',
+      locale: 'placeholder locale',
+      type: 'placeholder types',
     },
-    "deliveryToken": "placeholder delivery token",
-    "destEnv": [
-      "placeholder env"
+    deliveryToken: 'placeholder delivery token',
+    destEnv: [
+      'placeholder env',
     ],
-    "bulkPublish": true
+    bulkPublish: true,
   },
-  "publish_edits_on_env": {
-    "contentTypes": [
-      "placeholder content type"
+  publish_edits_on_env: {
+    contentTypes: [
+      'placeholder content type',
     ],
-    "sourceEnv": "placeholder source env",
-    "environments": [
-      "placeholder env"
+    sourceEnv: 'placeholder source env',
+    environments: [
+      'placeholder env',
     ],
-    "locales": [
-      "placeholder locale"
+    locales: [
+      'placeholder locale',
     ],
-    "bulkPublish": true
+    bulkPublish: true,
   },
-  "nonlocalized_field_changes": {
-    "sourceEnv": "placeholder env",
-    "contentTypes": [
-      "placeholder content type"
+  nonlocalized_field_changes: {
+    sourceEnv: 'placeholder env',
+    contentTypes: [
+      'placeholder content type',
     ],
-    "environments": [
-      "placeholder env"
+    environments: [
+      'placeholder env',
     ],
-    "bulkPublish": true
+    bulkPublish: true,
   },
-  "addFields": {
-    "deleteFields": [
-      "updated_by",
-      "created_by",
-      "created_at",
-      "updated_at",
-      "_version",
-      "ACL"
-    ],
-    "locales": [
-      "placeholder locale"
-    ],
-    "contentTypes": [
-      "placeholder content type"
-    ],
-    "environments": [
-      "placeholder env"
-    ],
-    "defaults": {
-      "number": null,
-      "boolean": false,
-      "isodate": [],
-      "file": null,
-      "reference": []
+  addFields: {
+    deleteFields: [
+      'updated_by',
+      'created_by',
+      'created_at',
+      'updated_at',
+      '_version',
+      'ACL',
+    ],
+    locales: [
+      'placeholder locale',
+    ],
+    contentTypes: [
+      'placeholder content type',
+    ],
+    environments: [
+      'placeholder env',
+    ],
+    defaults: {
+      number: null,
+      boolean: false,
+      isodate: [],
+      file: null,
+      reference: [],
     },
-    "bulkPublish": true
-  }
-}
+    bulkPublish: true,
+  },
+}

package/src/consumer/publish.js

@@ -91,8 +91,7 @@ async function UnpublishEntry(data, config, queue) {
   const entryObj = data.obj
   const stack = entryObj.stack
   lang.push(entryObj.locale)
-
-  stack.contentType(entryObj.content_type).entry(entryObj.entryUid).unpublish({publishDetails: {environments: entryObj.environments, locales: lang}})
+  stack.contentType(entryObj.content_type).entry(entryObj.entryUid).unpublish({publishDetails: {environments: entryObj.environments, locales: lang}, locale: entryObj.locale})
   .then(unpublishEntryResponse => {
     if (!unpublishEntryResponse.error_message) {
       delete entryObj.stack
@@ -140,7 +139,7 @@ async function UnpublishAsset(data, config, queue) {
   })
 }
 
-async function bulkPublish(data, config, queue) {
+async function performBulkPublish(data, config, queue) {
   let conf
   const bulkPublishObj = data.obj
   const stack = bulkPublishObj.stack
@@ -167,7 +166,6 @@ async function bulkPublish(data, config, queue) {
         queue.Enqueue(data)
       } else {
         delete bulkPublishObj.stack
-        const entries = bulkPublishObj.entries.map(entry => entry.uid)
         console.log(chalk.red(`Bulk entries ${JSON.stringify(removePublishDetails(bulkPublishObj.entries))} failed to publish with error ${formatError(error)}`))
         addLogs(logger, {options: bulkPublishObj, api_key: stack.stackHeaders.api_key, alias: stack.alias, host: stack.host}, 'error')
       }
@@ -205,7 +203,7 @@ async function bulkPublish(data, config, queue) {
   }
 }
 
-async function bulkUnPublish(data, config, queue) {
+async function performBulkUnPublish(data, config, queue) {
   let conf
   const bulkUnPublishObj = data.obj
   const stack = bulkUnPublishObj.stack
@@ -433,8 +431,8 @@ async function publishUsingVersion(data, config, queue) {
 }
 
 module.exports = {
-  bulkPublish,
-  bulkUnPublish,
+  performBulkPublish,
+  performBulkUnPublish,
   initializeLogger,
   publishEntry,
   publishAsset,

package/src/producer/add-fields.js

@@ -8,17 +8,16 @@
 const {getQueue} = require('../util/queue')
 const defaultConfig = require('../config/defaults.json')
 const req = require('../util/request')
-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 stack = require('../util/client.js').stack
 const {setDelayForBulkPublish} = require('../util')
 const {Command} = require('@contentstack/cli-command')
 const command = new Command()
 const {isEmpty} = require('../util')
 
 const queue = getQueue()
-queue.consumer = bulkPublish
+queue.consumer = performBulkPublish
 let logFileName
 let bulkPublishSet = []
 let filePath
@@ -38,7 +37,7 @@ const deleteFields = ['updated_by', 'created_by', 'created_at', 'updated_at', '_
 function setConfig(conf, bp) {
   if (bp) {
     logFileName = 'bulk-add-fields'
-    queue.consumer = bulkPublish
+    queue.consumer = performBulkPublish
   } else {
     logFileName = 'add-fields'
     queue.consumer = publishEntry
@@ -286,42 +285,38 @@ async function start({contentTypes, locales, environments, retryFailed, bulkPubl
     process.exit(0)  
   })
 
-  try {
-    if (retryFailed) {
-      if (typeof retryFailed === 'string') {
-        if (!validateFile(retryFailed, ['bulk-add-fields', 'add-fields'])) {
-          return false
-        }
+  if (retryFailed) {
+    if (typeof retryFailed === 'string') {
+      if (!validateFile(retryFailed, ['bulk-add-fields', 'add-fields'])) {
+        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)  
-      for (let i = 0; i < contentTypes.length; i += 1) {
-        getContentTypeSchema(stack, contentTypes[i])
-        .then(async schema => {
-          for (let j = 0; j < locales.length; j += 1) {
-            try {
-              await getEntries(stack, config, schema, contentTypes[i], locales[j], bulkPublish, environments)
-            } catch (err) {
-              console.log(`Failed to get Entries with contentType ${contentTypes[i]} and locale ${locales[j]}`)
-            }
+    }
+  } else {
+    setConfig(config, bulkPublish)  
+    for (let i = 0; i < contentTypes.length; i += 1) {
+      getContentTypeSchema(stack, contentTypes[i])
+      .then(async schema => {
+        for (let j = 0; j < locales.length; j += 1) {
+          try {
+            await getEntries(stack, config, schema, contentTypes[i], locales[j], bulkPublish, environments)
+          } catch (err) {
+            console.log(`Failed to get Entries with contentType ${contentTypes[i]} and locale ${locales[j]}`)
           }
-        })
-        .catch(err => {
-          console.log(`Failed to fetch schema${JSON.stringify(err)}`)
-        })
-      }
+        }
+      })
+      .catch(err => {
+        console.log(`Failed to fetch schema${JSON.stringify(err)}`)
+      })
     }
-  } catch(error) {
-    throw error
   }
 }
 

package/src/producer/cross-publish.js

@@ -7,11 +7,10 @@ const {getQueue} = require('../util/queue')
 const defaults = require('../config/defaults.json')
 const req = require('../util/request')
 const {
-  bulkPublish, publishEntry, publishAsset, initializeLogger,
+  performBulkPublish, publishEntry, publishAsset, initializeLogger,
 } = require('../consumer/publish')
 const retryFailedLogs = require('../util/retryfailed')
 const {validateFile} = require('../util/fs')
-const types = 'asset_published,entry_published'
 const queue = getQueue()
 const entryQueue = getQueue()
 const assetQueue = getQueue()
@@ -38,71 +37,70 @@ function getQueryParams(filter) {
 }
 
 async function bulkAction(stack, items, bulkPublish, filter, destEnv) {
-  for (let index = 0; index < items.length; index++) {
-    changedFlag = true
-    if (items[index].data.publish_details) {
-      items[index].data.publish_details.version = items[index].data._version
-    }
-
-    if (bulkPublish) {
-      if (bulkPublishSet.length < 10 && items[index].type === 'entry_published') {
-        bulkPublishSet.push({
-          uid: items[index].data.uid,
-          content_type: items[index].content_type_uid,
-          locale: items[index].data.publish_details.locale || 'en-us',
-          version: items[index].data._version,
-          publish_details: [items[index].data.publish_details] || [],
-        })
-      }
+  return new Promise(async resolve => {
+    for (let index = 0; index < items.length; index++) {
+      changedFlag = true
+
+      if (bulkPublish) {
+        if (bulkPublishSet.length < 10 && items[index].type === 'entry_published') {
+          bulkPublishSet.push({
+            uid: items[index].data.uid,
+            content_type: items[index].content_type_uid,
+            locale: items[index].data.locale || 'en-us',
+            publish_details: [items[index].data.publish_details] || [],
+          })
+        }
 
-      if (bulkPublishAssetSet.length < 10 && items[index].type === 'asset_published') {
-        bulkPublishAssetSet.push({
-          uid: items[index].data.uid,
-          version: items[index].data._version,
-          publish_details: [items[index].data.publish_details] || [],
-        })
-      }
+        if (bulkPublishAssetSet.length < 10 && items[index].type === 'asset_published') {
+          bulkPublishAssetSet.push({
+            uid: items[index].data.uid,
+            version: items[index].data._version,
+            publish_details: [items[index].data.publish_details] || [],
+          })
+        }
 
-      if (bulkPublishAssetSet.length === 10) {
-        await queue.Enqueue({
-          assets: bulkPublishAssetSet, Type: 'asset', locale: filter.locale, environments: destEnv, stack: stack
-        })
-        bulkPublishAssetSet = []
-      }
+        if (bulkPublishAssetSet.length === 10) {
+          await queue.Enqueue({
+            assets: bulkPublishAssetSet, Type: 'asset', locale: filter.locale, environments: destEnv, stack: stack
+          })
+          bulkPublishAssetSet = []
+        }
 
-      if (bulkPublishSet.length === 10) {
-        await queue.Enqueue({
-          entries: bulkPublishSet, locale: filter.locale, Type: 'entry', environments: destEnv, stack: stack
-        })
-        bulkPublishSet = []
-      }
+        if (bulkPublishSet.length === 10) {
+          await queue.Enqueue({
+            entries: bulkPublishSet, locale: filter.locale, Type: 'entry', environments: destEnv, stack: stack
+          })
+          bulkPublishSet = []
+        }
 
-      if (index === items.length - 1 && bulkPublishAssetSet.length <= 10 && bulkPublishAssetSet.length > 0) {
-        await queue.Enqueue({
-          assets: bulkPublishAssetSet, Type: 'asset', locale: filter.locale, environments: destEnv, stack: stack
-        })
-        bulkPublishAssetSet = []
-      }
+        if (index === items.length - 1 && bulkPublishAssetSet.length <= 10 && bulkPublishAssetSet.length > 0) {
+          await queue.Enqueue({
+            assets: bulkPublishAssetSet, Type: 'asset', locale: filter.locale, environments: destEnv, stack: stack
+          })
+          bulkPublishAssetSet = []
+        }
 
-      if (index === items.length - 1 && bulkPublishSet.length <= 10 && bulkPublishSet.length > 0) {
-        await queue.Enqueue({
-          entries: bulkPublishSet, locale: filter.locale, Type: 'entry', environments: destEnv, stack: stack
-        })
-        bulkPublishSet = []
-      }
-    } else {
-      if (items[index].type === 'entry_published') {
-        await entryQueue.Enqueue({
-          content_type: items[index].content_type_uid, publish_details: [items[index].data.publish_details], environments: destEnv, entryUid: items[index].data.uid, locale: items[index].data.publish_details.locale || 'en-us', Type: 'entry', stack: stack
-        })
-      }
-      if (items[index].type === 'asset_published') {
-        await assetQueue.Enqueue({
-          assetUid: items[index].data.uid, publish_details: [items[index].data.publish_details], environments: destEnv, Type: 'asset', stack: stack
-        })
+        if (index === items.length - 1 && bulkPublishSet.length <= 10 && bulkPublishSet.length > 0) {
+          await queue.Enqueue({
+            entries: bulkPublishSet, locale: filter.locale, Type: 'entry', environments: destEnv, stack: stack
+          })
+          bulkPublishSet = []
+        }
+      } else {
+        if (items[index].type === 'entry_published') {
+          await entryQueue.Enqueue({
+            content_type: items[index].content_type_uid, publish_details: [items[index].data.publish_details], environments: destEnv, entryUid: items[index].data.uid, locale: items[index].data.locale || 'en-us', Type: 'entry', stack: stack
+          })
+        }
+        if (items[index].type === 'asset_published') {
+          await assetQueue.Enqueue({
+            assetUid: items[index].data.uid, publish_details: [items[index].data.publish_details], environments: destEnv, Type: 'asset', stack: stack
+          })
+        }
       }
     }
-  }
+    return resolve()
+  })
 }
 
 async function getSyncEntries(stack, config, queryParams, bulkPublish, filter, deliveryToken, destEnv, paginationToken = null) {
@@ -118,40 +116,39 @@ async function getSyncEntries(stack, config, queryParams, bulkPublish, filter, d
       }
       const entriesResponse = await req(conf)
       if (entriesResponse.items.length > 0) {
-        bulkAction(stack, entriesResponse.items, bulkPublish, filter, destEnv)
+        await bulkAction(stack, entriesResponse.items, bulkPublish, filter, destEnv)
       }
       if (!entriesResponse.pagination_token) {
         if (!changedFlag) console.log('No Entries/Assets Found published on specified environment')
         return resolve()
       }
-      setTimeout(() => {
-        getSyncEntries(stack, config, queryParams, bulkPublish, filter, deliveryToken, destEnv, entriesResponse.pagination_token)
+      setTimeout(async () => {
+        await getSyncEntries(stack, config, queryParams, bulkPublish, filter, deliveryToken, destEnv, entriesResponse.pagination_token)
       }, 3000)
     } catch (error) {
       reject(error)
     }
+    return resolve()
   })
-  // return true
 }
 
 function setConfig(conf, bp) {
   if (bp) {
     logFileName = 'bulk-cross-publish'
-    queue.consumer = bulkPublish
+    queue.consumer = performBulkPublish
   } else {
     logFileName = 'cross-publish'
     entryQueue.consumer = publishEntry
     assetQueue.consumer = publishAsset
   }
 
-  config = conf
   queue.config = conf
   entryQueue.config = conf
   assetQueue.config = conf
   filePath = initializeLogger(logFileName)
 }
 
-async function start({retryFailed, bulkPublish, filter, deliveryToken, destEnv, f_types}, stack, config) {
+async function start({retryFailed, bulkPublish, filter, deliveryToken, contentType, environment, locale, onlyAssets, onlyEntries, destEnv, f_types}, stack, config) {
   process.on('beforeExit', async () => {
     const isErrorLogEmpty = await isEmpty(`${filePath}.error`)
     const isSuccessLogEmpty = await isEmpty(`${filePath}.success`)
@@ -163,34 +160,44 @@ async function start({retryFailed, bulkPublish, filter, deliveryToken, destEnv,
     process.exit(0)
   })
 
-  try {
-    if (retryFailed) {
-      if (typeof retryFailed === 'string' && retryFailed.length > 0) {
-        if (!validateFile(retryFailed, ['cross-publish', 'bulk-cross-publish'])) {
-          return false
-        }
+  if (retryFailed) {
+    if (typeof retryFailed === 'string' && retryFailed.length > 0) {
+      if (!validateFile(retryFailed, ['cross-publish', 'bulk-cross-publish'])) {
+        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, assetQueue}, 'publish')
-        }
-      }
-    } else {
-      setConfig(config, bulkPublish)  
-      filter.type = (f_types) ? f_types : types // types mentioned in the config file (f_types) are given preference
-      const queryParams = getQueryParams(filter)
-      try {
-        await getSyncEntries(stack, config, queryParams, bulkPublish, filter, deliveryToken, destEnv)
-      } catch (error) {
-        throw error
+      if (bulkPublish) {
+        await retryFailedLogs(retryFailed, queue, 'bulk')
+      } else {
+        await retryFailedLogs(retryFailed, {entryQueue, assetQueue}, 'publish')
       }
     }
-  } catch(error) {
-    throw error
+  } else {
+    let filter = {
+      environment,
+      locale,
+    }
+    if (f_types)
+      filter.type = f_types
+    // filter.type = (f_types) ? f_types : types // types mentioned in the config file (f_types) are given preference
+    if (contentType) {
+      filter.content_type_uid = contentType
+      filter.type = 'entry_published'
+    }
+    if (onlyAssets) {
+      filter.type = 'asset_published'
+      delete filter.content_type_uid
+    }
+    if (onlyEntries) {
+      filter.type = 'entry_published'
+    }
+    setConfig(config, bulkPublish)
+    // filter.type = (f_types) ? f_types : types // types mentioned in the config file (f_types) are given preference
+    const queryParams = getQueryParams(filter)
+    await getSyncEntries(stack, config, queryParams, bulkPublish, filter, deliveryToken, destEnv)
   }
 }
 
@@ -199,4 +206,4 @@ module.exports = {
   setConfig,
   getQueryParams,
   start,
-}
+}