@contentstack/cli-cm-import 0.1.1-beta.16 → 0.1.1-beta.17

package/README.md

@@ -34,7 +34,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (-v|--version|version)
-@contentstack/cli-cm-import/0.1.1-beta.16 linux-x64 node-v16.14.2
+@contentstack/cli-cm-import/0.1.1-beta.17 linux-x64 node-v16.14.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -80,5 +80,5 @@ EXAMPLES
   csdx cm:import -A -B <branch name>
 ```
 
-_See code: [src/commands/cm/import.js](https://github.com/contentstack/cli/blob/v0.1.1-beta.16/packages/contentstack-import/src/commands/cm/import.js)_
+_See code: [src/commands/cm/import.js](https://github.com/contentstack/cli/blob/v0.1.1-beta.17/packages/contentstack-import/src/commands/cm/import.js)_
 <!-- commandsstop -->

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.1.1-beta.16","commands":{"cm:import":{"id":"cm:import","description":"Import script for importing the content into new stack\n...\nOnce you export content from the source stack, import it to your destination stack by using the cm:import command.\n","pluginName":"@contentstack/cli-cm-import","pluginType":"core","aliases":[],"examples":["csdx cm:import -A","csdx cm:import -A -s <stack_ApiKey> -d <path/of/export/destination/dir>","csdx cm:import -A -c <path/of/config/dir>","csdx cm:import -A -m <single module name>","csdx cm:import -A -m <single module name> -b <backup dir>","csdx cm:import -a <management_token_alias>","csdx cm:import -a <management_token_alias> -d <path/of/export/destination/dir>","csdx cm:import -a <management_token_alias> -c <path/of/config/file>","csdx cm:import -A -m <single module name>","csdx cm:import -A -B <branch name>"],"flags":{"config":{"name":"config","type":"option","char":"c","description":"[optional] path of config file"},"stack-uid":{"name":"stack-uid","type":"option","char":"s","description":"API key of the target stack"},"data":{"name":"data","type":"option","char":"d","description":"path and location where data is stored"},"management-token-alias":{"name":"management-token-alias","type":"option","char":"a","description":"alias of the management token"},"auth-token":{"name":"auth-token","type":"boolean","char":"A","description":"to use auth token","allowNo":false},"module":{"name":"module","type":"option","char":"m","description":"[optional] specific module name"},"backup-dir":{"name":"backup-dir","type":"option","char":"b","description":"[optional] backup directory name when using specific module"},"branch":{"name":"branch","type":"option","char":"B","description":"[optional] branch name"}},"args":[]}}}
+{"version":"0.1.1-beta.17","commands":{"cm:import":{"id":"cm:import","description":"Import script for importing the content into new stack\n...\nOnce you export content from the source stack, import it to your destination stack by using the cm:import command.\n","pluginName":"@contentstack/cli-cm-import","pluginType":"core","aliases":[],"examples":["csdx cm:import -A","csdx cm:import -A -s <stack_ApiKey> -d <path/of/export/destination/dir>","csdx cm:import -A -c <path/of/config/dir>","csdx cm:import -A -m <single module name>","csdx cm:import -A -m <single module name> -b <backup dir>","csdx cm:import -a <management_token_alias>","csdx cm:import -a <management_token_alias> -d <path/of/export/destination/dir>","csdx cm:import -a <management_token_alias> -c <path/of/config/file>","csdx cm:import -A -m <single module name>","csdx cm:import -A -B <branch name>"],"flags":{"config":{"name":"config","type":"option","char":"c","description":"[optional] path of config file"},"stack-uid":{"name":"stack-uid","type":"option","char":"s","description":"API key of the target stack"},"data":{"name":"data","type":"option","char":"d","description":"path and location where data is stored"},"management-token-alias":{"name":"management-token-alias","type":"option","char":"a","description":"alias of the management token"},"auth-token":{"name":"auth-token","type":"boolean","char":"A","description":"to use auth token","allowNo":false},"module":{"name":"module","type":"option","char":"m","description":"[optional] specific module name"},"backup-dir":{"name":"backup-dir","type":"option","char":"b","description":"[optional] backup directory name when using specific module"},"branch":{"name":"branch","type":"option","char":"B","description":"[optional] branch name"}},"args":[]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@contentstack/cli-cm-import",
 	"description": "Contentstack CLI plugin to import content into stack",
-	"version": "0.1.1-beta.16",
+	"version": "0.1.1-beta.17",
 	"author": "Contentstack",
 	"bugs": "https://github.com/contentstack/cli/issues",
 	"dependencies": {

package/src/lib/import/content-types.js

@@ -191,6 +191,7 @@ importContentTypes.prototype = {
       // eslint-disable-next-line no-undef
       return Promise.map(globalFieldPendingPath, function (globalfield) {
         let Obj = _.find(self.globalfields, {uid: globalfield})
+        supress(Obj.schema)
         let globalFieldObj = stack.globalField(globalfield)
         Object.assign(globalFieldObj, _.cloneDeep(Obj))
         return globalFieldObj.update()

package/src/lib/import/entries.js

@@ -906,7 +906,7 @@ importEntries.prototype = {
     for (let i = 0; i < ctSchema.length; i++) {
       switch(ctSchema[i].data_type) {
         case 'blocks': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid]) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid] = entry[ctSchema[i].uid].map(e => {
                 let key = Object.keys(e).pop()
@@ -920,7 +920,7 @@ importEntries.prototype = {
         }
         case 'global_field':
         case 'group': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid]) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid] = entry[ctSchema[i].uid].map(e => {
                 e = this.removeEntryRefsFromJSONRTE(e, ctSchema[i].schema)
@@ -933,7 +933,7 @@ importEntries.prototype = {
           break;
         }
         case 'json': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid] && ctSchema[i].field_metadata.rich_text_type) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid] = entry[ctSchema[i].uid].map(jsonRteData => {
                 // repeated code from else block, will abstract later
@@ -987,7 +987,7 @@ importEntries.prototype = {
     for (let i = 0; i < ctSchema.length; i++) {
       switch (ctSchema[i].data_type) {
         case 'blocks': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid]) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid] = entry[ctSchema[i].uid].map((e, eIndex) => {
                 let key = Object.keys(e).pop()
@@ -1002,7 +1002,7 @@ importEntries.prototype = {
         }
         case 'global_field':
         case 'group': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid]) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid] = entry[ctSchema[i].uid].map((e, eIndex) => {
                 let sourceStackElement = sourceStackEntry[ctSchema[i].uid][eIndex]
@@ -1017,7 +1017,7 @@ importEntries.prototype = {
           break;
         }
         case 'json': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid] && ctSchema[i].field_metadata.rich_text_type) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid] = entry[ctSchema[i].uid].map((field, index) => {
                 field.children = [
@@ -1060,7 +1060,7 @@ importEntries.prototype = {
     for (let i = 0; i < ctSchema.length; i++) {
       switch (ctSchema[i].data_type) {
         case 'blocks': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid]) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid] = entry[ctSchema[i].uid].map(e => {
                 let key = Object.keys(e).pop()
@@ -1074,7 +1074,7 @@ importEntries.prototype = {
         }
         case 'global_field':
         case 'group': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid]) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid] = entry[ctSchema[i].uid].map(e => {
                 e = this.generateUidsForJsonRteFields(e, ctSchema[i].schema)
@@ -1087,7 +1087,7 @@ importEntries.prototype = {
           break;
         }
         case 'json': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid] && ctSchema[i].field_metadata.rich_text_type) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid] = entry[ctSchema[i].uid].map(jsonRteData => {
                 jsonRteData.uid = this.generateUid()

package/src/lib/import/extensions.js

@@ -76,7 +76,7 @@ importExtensions.prototype = {
           })
         }
         // the extensions has already been created
-        addlogs(config, chalk.white('The extension: \'' + ext.name +
+        addlogs(config, chalk.white('The extension: \'' + ext.title +
             '\' already exists. Skipping it to avoid duplicates!'), 'success')
         // import 2 extensions at a time
       }, {

package/src/lib/util/contentstack-management-sdk.js

@@ -1,4 +1,7 @@
 const contentstacksdk = require("@contentstack/management");
+const https = require("https");
+
+const { addlogs } = require("./log");
 
 exports.Client = function (config) {
   const option = {
@@ -8,6 +11,17 @@ exports.Client = function (config) {
     api_key: config.target_stack,
     maxContentLength: 100000000,
     maxBodyLength: 1000000000,
+    maxRequests: 10,
+    retryLimit: 5,
+    timeout: 60000,
+    httpsAgent: new https.Agent({
+      maxSockets: 100,
+      maxFreeSockets: 10,
+      keepAlive: true,
+      timeout: 60000, // active socket keepalive for 60 seconds
+      freeSocketTimeout: 30000, // free socket keepalive for 30 seconds
+    }),
+    retryDelay: Math.floor(Math.random() * (8000 - 3000 + 1) + 3000),
     logHandler: (level, data) => {},
     retryCondition: (error) => {
       // no async function should be used here
@@ -22,12 +36,12 @@ exports.Client = function (config) {
     retryDelayOptions: {
       base: 1000,
     },
-  }
-  if (typeof config.branchName === 'string') {
+  };
+  if (typeof config.branchName === "string") {
     option.headers = {
       branch: config.branchName,
-    }
+    };
   }
-  const client = contentstacksdk.client(option)
-  return client
-}
+  const client = contentstacksdk.client(option);
+  return client;
+};

package/src/lib/util/lookupReplaceAssets.js

@@ -67,7 +67,7 @@ module.exports = function (data, mappedAssetUids, mappedAssetUrls, assetUidMappe
     for (let i = 0; i < ctSchema.length; i++) {
       switch (ctSchema[i].data_type) {
         case 'blocks': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid]) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid].forEach(e => {
                 let key = Object.keys(e).pop()
@@ -80,7 +80,7 @@ module.exports = function (data, mappedAssetUids, mappedAssetUrls, assetUidMappe
         }
         case 'global_field':
         case 'group': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid]) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid].forEach(e => {
                 findAssetIdsFromJsonRte(e, ctSchema[i].schema)
@@ -92,7 +92,7 @@ module.exports = function (data, mappedAssetUids, mappedAssetUrls, assetUidMappe
           break;
         }
         case 'json': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid] && ctSchema[i].field_metadata.rich_text_type) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid].forEach(jsonRteData => {
                 gatherJsonRteAssetIds(jsonRteData)
@@ -235,7 +235,7 @@ function findFileUrls (schema, _entry, assetUrls) {
   var text;
   // Regex to detect v3 asset uri patterns
   if (schema && schema.field_metadata && schema.field_metadata.markdown) {
-    text = marked(_entry);
+    text = marked(JSON.stringify(_entry));
   } else {
     text = JSON.stringify(_entry);
   }

package/src/lib/util/lookupReplaceEntries.js

@@ -133,7 +133,7 @@ module.exports = function (data, mappedUids, uidMapperPath) {
     for (let i = 0; i < ctSchema.length; i++) {
       switch (ctSchema[i].data_type) {
         case 'blocks': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid]) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid].forEach(e => {
                 let key = Object.keys(e).pop()
@@ -146,7 +146,7 @@ module.exports = function (data, mappedUids, uidMapperPath) {
         }
         case 'global_field':
         case 'group': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid]) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid].forEach(e => {
                 findEntryIdsFromJsonRte(e, ctSchema[i].schema)
@@ -158,7 +158,7 @@ module.exports = function (data, mappedUids, uidMapperPath) {
           break;
         }
         case 'json': {
-          if (entry[ctSchema[i].uid] !== undefined) {
+          if (entry[ctSchema[i].uid] && ctSchema[i].field_metadata.rich_text_type) {
             if (ctSchema[i].multiple) {
               entry[ctSchema[i].uid].forEach(jsonRteData => {
                 gatherJsonRteEntryIds(jsonRteData)