@contentstack/cli-cm-import 0.1.1-beta.1 → 0.1.1-beta.12

package/README.md

@@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (-v|--version|version)
-@contentstack/cli-cm-import/0.1.1-beta.1 darwin-x64 node-v10.19.0
+@contentstack/cli-cm-import/0.1.1-beta.12 linux-x64 node-v12.18.4
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -37,10 +37,11 @@ USAGE
 
 OPTIONS
   -A, --auth-token                                     to use auth token
+  -B, --branch=branch                                  [optional] branch name
   -a, --management-token-alias=management-token-alias  alias of the management token
+  -b, --backup-dir=backup-dir                          [optional] backup directory name when using specific module
   -c, --config=config                                  [optional] path of config file
   -d, --data=data                                      path and location where data is stored
-  -l, --master-lang=master-lang                        code of the target stack's master language
   -m, --module=module                                  [optional] specific module name
   -s, --stack-uid=stack-uid                            API key of the target stack
 
@@ -50,13 +51,16 @@ DESCRIPTION
 
 EXAMPLES
   csdx cm:import -A
-  csdx cm:import -A -l "master-language" -s "stack_ApiKey" -d "path/of/export/destination/dir"
-  csdx cm:import -A -c "path/of/config/dir"
-  csdx cm:import -a "management_token_alias"
-  csdx cm:import -a "management_token_alias" -l "master-language" -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 -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>
 ```
 
-_See code: [src/commands/cm/import.js](https://github.com/contentstack/cli/blob/v0.1.1-beta.1/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.12/packages/contentstack-import/src/commands/cm/import.js)_
 <!-- commandsstop -->

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.1.1-beta.1","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 -l \"master-language\" -s \"stack_ApiKey\" -d \"path/of/export/destination/dir\"","csdx cm:import -A -c \"path/of/config/dir\"","csdx cm:import -a \"management_token_alias\"","csdx cm:import -a \"management_token_alias\" -l \"master-language\" -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\""],"flags":{"config":{"name":"config","type":"option","char":"c","description":"[optional] path of config file"},"master-lang":{"name":"master-lang","type":"option","char":"l","description":"code of the target stack's master language"},"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"}},"args":[]}}}
+{"version":"0.1.1-beta.12","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,24 +1,24 @@
 {
 	"name": "@contentstack/cli-cm-import",
 	"description": "Contentstack CLI plugin to import content into stack",
-	"version": "0.1.1-beta.1",
+	"version": "0.1.1-beta.12",
 	"author": "Contentstack",
 	"bugs": "https://github.com/contentstack/cli/issues",
 	"dependencies": {
-		"@contentstack/management": "1.0.0",
+		"@contentstack/cli-command": "0.1.0-beta",
+		"@contentstack/management": "github:contentstack/contentstack-management-javascript#65e8588",
 		"@oclif/command": "^1.6.1",
-		"@contentstack/cli-command": "0.1.1-beta.1",
 		"@oclif/config": "^1.15.1",
-		"axios": "^0.19.2",
+		"axios": "^0.21.1",
 		"bluebird": "3.5.1",
 		"configstore": "^5.0.1",
-		"debug": "4.1.0",
-		"lodash": "4.17.15",
+		"debug": "^4.1.0",
+		"lodash": "^4.17.20",
 		"marked": "0.7.0",
-		"mkdirp": "0.5.1",
+		"mkdirp": "^1.0.4",
 		"ncp": "2.0.0",
 		"request": "2.88.0",
-		"winston": "2.2.0"
+		"winston": "2.4.5"
 	},
 	"devDependencies": {
 		"@oclif/dev-cli": "^1.22.2",
@@ -28,7 +28,7 @@
 		"eslint": "^5.16.0",
 		"eslint-config-oclif": "^3.1.0",
 		"globby": "^10.0.2",
-		"mocha": "^5.2.0",
+		"mocha": "^8.2.1",
 		"nyc": "^14.1.1"
 	},
 	"engines": {
@@ -42,7 +42,9 @@
 	],
 	"homepage": "https://github.com/contentstack/cli",
 	"keywords": [
-		"contentstack","cli","plugin"
+		"contentstack",
+		"cli",
+		"plugin"
 	],
 	"scripts": {
 		"pack": "npm pack && mv *.tgz ../../build",
@@ -51,6 +53,7 @@
 		"test": "nyc mocha --forbid-only \"test/**/*.test.js\"",
 		"version": "oclif-dev readme && git add README.md"
 	},
+	"main": "./src/commands/cm/import.js",
 	"license": "MIT",
 	"oclif": {
 		"commands": "./src/commands",

package/src/app.js

@@ -9,95 +9,125 @@ let Bluebird = require('bluebird')
 let fs = require('fs')
 let path = require('path')
 const chalk = require('chalk')
-
+const helper = require('./lib/util/fs')
+let _ = require('lodash')
 let login = require('./lib/util/login')
 let util = require('./lib/util/index')
-let {addlogs} = require('./lib/util/log')
+let { addlogs } = require('./lib/util/log')
 
-exports.initial = function (configData) { 
+exports.initial = function (configData) {
+  return new Promise(function (resolve, reject) {
+    let config = util.initialization(configData)
+    config.oldPath = config.data
+    if (config) {
+      login(config)
+        .then(function () {
+          if (fs.existsSync(config.data)) {
+            let migrationBackupDirPath = path.join(process.cwd(), '_backup_' + Math.floor((Math.random() * 1000)))
+            return createBackup(migrationBackupDirPath, config).then((basePath) => {
+              config.data = basePath
+              return util.sanitizeStack(config)
+            }).catch(e => {
+              console.error(e)
+              process.exit(1)
+            })
+              .then(() => {
+                let types = config.modules.types
+                if (config.moduleName) {
+                  singleImport(config.moduleName, types, config).then(() => {
+                    return resolve()
+                  })
+                } else {
+                  allImport(config, types).then(() => {
+                    return resolve()
+                  })
+                }
+              }).catch(e => {
+                console.error(e)
+                return reject(e)
+              })
+          } else {
+            let filename = path.basename(config.data)
+            addlogs(config, chalk.red(filename + " Folder does not Exist"), 'error')
+            return
+          }
+        }).catch(error => {
+          return
+        })
+    }
+  })
+}
 
-  let config = util.initialization(configData)
-  config.oldPath = config.data
-  if (config && config !== undefined) {
-    login(config)
-    .then(function () {
-      if (fs.existsSync(config.data)) {
-      let migrationBackupDirPath = path.join(process.cwd(), '_backup_' + Math.floor((Math.random() * 1000)))
-      return createBackup(migrationBackupDirPath, config).then((basePath) => {
-        config.data = basePath
-        return util.sanitizeStack(config)
-      }).catch(e=>{
-        console.error(e)
-        process.exit(1)
-      })
-     .then(() => {
-        let types = config.modules.types    
-        if (config.moduleName && config.moduleName !== undefined) {
-          singleExport(config.moduleName, types, config)
-        } else {
-          allExport(config, types)
+let singleImport = async (moduleName, types, config) => {
+  return new Promise(async (resolve, reject) => {
+    if (types.indexOf(moduleName) > -1) {
+      if (!config.master_locale) {
+        try {
+          var masterLocalResponse = await util.masterLocalDetails(config)
+          let master_locale = { code: masterLocalResponse.code }
+          config['master_locale'] = master_locale
+        } catch (error) {
+          console.log("Error to fetch the stack details" + error);
+        }
+      }
+      let exportedModule = require('./lib/import/' + moduleName)
+      exportedModule.start(config).then(async function () {
+        if (moduleName === 'content-types') {
+          let ctPath = path.resolve(config.data, config.modules.content_types.dirName)
+          let fieldPath = path.join(ctPath + '/field_rules_uid.json')
+          if (fieldPath && fieldPath !== undefined) {
+            await util.field_rules_update(config, ctPath)
+          }
         }
-      }).catch(e=>{
-        console.error(e)
-        process.exit(1)
+        addlogs(config, moduleName + ' imported successfully!', 'success')
+        addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'success')
+        return resolve()
+      }).catch(function (error) {
+        addlogs(config, 'Failed to migrate ' + moduleName, 'error')
+        addlogs(config, error, 'error')
+        addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'error')
+        return reject(error)
       })
-    } else {    
-      let filename = path.basename(config.data)
-      addlogs(config, chalk.red(filename + " Folder does not Exist"), 'error')
-      return
+    } else {
+      addlogs(config, 'Please provide valid module name.', 'error')
+      return reject()
     }
-    }).catch(error => {      
-      return
-    })
-  }
+  })
 }
 
-
-let singleExport = (moduleName, types, config) => {
-  if (types.indexOf(moduleName) > -1) {
-    let exportedModule = require('./lib/import/' + moduleName)
-    exportedModule.start(config).then(function () {
-      addlogs(config, moduleName + ' imported successfully!', 'success')
-    addlogs(config, 'The log for this is stored at' + path.join(config.oldPath, 'logs', 'import'), 'success')
-    }).catch(function (error) {
-      addlogs(config, 'Failed to migrate ' + moduleName, 'error')
+let allImport = async (config, types) => {
+  return new Promise(async (resolve, reject) => {
+    try {
+      for (let i = 0; i < types.length; i++) {
+        let type = types[i]
+        var exportedModule = require('./lib/import/' + type)
+        if (i === 0 && !config.master_locale) {
+          var masterLocalResponse = await util.masterLocalDetails(config)
+          let master_locale = { code: masterLocalResponse.code }
+          config['master_locale'] = master_locale
+        }
+        await exportedModule.start(config).then(result => {
+          return
+        })
+      }
+      if (config.target_stack && config.source_stack) {
+        addlogs(config, chalk.green('The data of the ' + config.sourceStackName + ' stack has been imported into ' + config.destinationStackName + ' stack successfully!'), 'success')
+        addlogs(config, 'The log for this is stored at ' + path.join(config.data, 'logs', 'import'), 'success')
+      } else {
+        addlogs(config, chalk.green('Stack: ' + config.target_stack + ' has been imported succesfully!'), 'success')
+        addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'success')
+      }
+      return resolve()
+    } catch (error) {
+      addlogs(config, chalk.red('Failed to migrate stack: ' + config.target_stack + '. Please check error logs for more info'), 'error')
       addlogs(config, error, 'error')
-    addlogs(config, 'The log for this is stored at' + path.join(config.oldPath, 'logs', 'import'), 'error')
-    })
-  } else {
-    addlogs(config, 'Please provide valid module name.', 'error')
-  }
-}
-
-let allExport = async (config, types) => {
-  let counter = 0
-  Bluebird.map(types, function (type) {
-    if (config.preserveStackVersion) {
-      let exportedModule = require('./lib/import/' + types[counter])
-      counter++
-      return exportedModule.start(config)
-    } else if(!config.preserveStackVersion && type !== 'stack')  {
-      let exportedModule = require('./lib/import/' + types[counter])
-      counter++
-      return exportedModule.start(config)
-    } else {
-      counter++
+      addlogs(config, 'The log for this is stored at ' + path.join(config.oldPath, 'logs', 'import'), 'error')
+      return reject(error)
     }
-  }, {
-    concurrency: 1
-  }).then(function () {
-    addlogs(config, chalk.green('Stack: ' + config.target_stack + ' has been imported succesfully!'), 'success')
-    addlogs(config, 'The log for this is stored at' + path.join(config.oldPath, 'logs', 'import'), 'success')
-  }).catch(function (error) {    
-    addlogs(config, chalk.red('Failed to migrate stack: ' + config.target_stack + '. Please check error logs for more info'), 'error')
-    addlogs(config, error, 'error')
-    addlogs(config, 'The log for this is stored at' + path.join(config.oldPath, 'logs', 'import'), 'error')
-
   })
 }
 
-
-function createBackup (backupDirPath, config) {
+function createBackup(backupDirPath, config) {
   return new Promise((resolve, reject) => {
     if (config.hasOwnProperty('useBackedupDir') && fs.existsSync(config.useBackedupDir)) {
       return resolve(config.useBackedupDir)
@@ -119,4 +149,4 @@ function createBackup (backupDirPath, config) {
       })
     }
   })
-}
+}

package/src/commands/cm/import.js

@@ -1,4 +1,3 @@
-// const {Command, flags} = require('@oclif/command')
 const {Command, flags} = require('@contentstack/cli-command')
 const {cli} = require('cli-ux')
 let _ = require('lodash')
@@ -14,79 +13,109 @@ const {configWithMToken,
 
 class ImportCommand extends Command {
   async run() {
-    const {flags} = this.parse(ImportCommand)
-    const extConfig = flags.config
-    const masterLang = flags['master-lang']
-    let targetStack = flags['stack-uid']
-    const data = flags.data
-    const moduleName = flags.module
-    const alias = flags['management-token-alias']
-    const authToken = flags['auth-token']
+    let self = this
+    const importCommandFlags = self.parse(ImportCommand).flags
+    const extConfig = importCommandFlags.config
+    let targetStack = importCommandFlags['stack-uid']
+    const data = importCommandFlags.data
+    const moduleName = importCommandFlags.module
+    const backupdir = importCommandFlags["backup-dir"]
+    const alias = importCommandFlags['management-token-alias']
+    const authToken = importCommandFlags['auth-token']
     let _authToken = credStore.get('authtoken')
-    let host = this.config.userConfig.getRegion()
+    let branchName = importCommandFlags.branch
+    let host = self.cmaHost
+    
+  return new Promise(function (resolve, reject) {  
+    if (alias) {
+      let managementTokens = self.getToken(alias)
 
-    let cmaMainURL = host.cma.split('//')
-    let cdaMainURL = host.cda.split('//')
-    host.cma = cmaMainURL[1]
-    host.cda = cdaMainURL[1]
-
-    if (alias && alias !== undefined) {
-      let managementTokens = this.getToken(alias)
-
-      if (managementTokens && managementTokens !== undefined) {
-        if (extConfig && extConfig !== undefined) {
+      if (managementTokens) {
+        if (extConfig && _authToken) {
           configWithMToken(
             extConfig,
             managementTokens,
             moduleName,
-            host
+            host,
+            _authToken,
+            branchName,
+            backupdir
           )
-        } else if (masterLang && data) {
+          .then(() => {
+            return resolve()
+          })
+        } else if (data) {
           parameterWithMToken(
-            masterLang,
             managementTokens,
             data,
             moduleName,
-            host
+            host,
+            _authToken,
+            branchName,
+            backupdir
           )
+          .then(() => {
+            return resolve()
+          })
         } else {
           withoutParameterMToken(
             managementTokens,
             moduleName,
-            host
+            host,
+            _authToken,
+            branchName,
+            backupdir
           )
+          .then(() => {
+            return resolve()
+          })
         } 
       } else {
-        this.log('management Token is not present please add managment token first')
+        console.log('management Token is not present please add managment token first')
       }
-    } else if (authToken && authToken !== undefined && _authToken && _authToken !== undefined) {
-      if (extConfig && extConfig !== undefined) {
+    } else if (authToken && _authToken) {
+      if (extConfig) {
         configWithAuthToken(
           extConfig,
           _authToken,
           moduleName,
-          host
+          host,
+          branchName,
+          backupdir
         )
-      } else if (masterLang && targetStack && data) {
+        .then(() => {
+          return resolve()
+        })
+      } else if (targetStack && data) {
         parametersWithAuthToken(
-          masterLang,
           _authToken,
           targetStack,
           data,
           moduleName,
-          host
+          host,
+          backupdir,
+          branchName
         )
+        .then(() => {
+          return resolve()
+        })
       } else {
         withoutParametersWithAuthToken(
           _authToken,
           moduleName,
-          host
+          host,
+          backupdir,
+          branchName
         )
+        .then(() => {
+          return resolve()
+        })
       }
     } else  {
-      this.log('Provide alias for managementToken or authtoken')
+      console.log('Provide alias for managementToken or authtoken')
     }
-  }
+  })
+}
 }
 
 ImportCommand.description = `Import script for importing the content into new stack
@@ -95,21 +124,49 @@ Once you export content from the source stack, import it to your destination sta
 `
 ImportCommand.examples = [
   `csdx cm:import -A`, 
-  `csdx cm:import -A -l "master-language" -s "stack_ApiKey" -d "path/of/export/destination/dir"`,
-  `csdx cm:import -A -c "path/of/config/dir"`,
-  `csdx cm:import -a "management_token_alias"`,
-  `csdx cm:import -a "management_token_alias" -l "master-language" -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 -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>`,
 ]
 ImportCommand.flags = {
-  config: flags.string({char: 'c', description: '[optional] path of config file'}),
-  'master-lang': flags.string({char: 'l', description: "code of the target stack's master language"}),
-  'stack-uid': flags.string({char: 's', description: 'API key of the target stack'}),
-  data: flags.string({char: 'd', description: 'path and location where data is stored'}),
-  'management-token-alias': flags.string({char: 'a', description: 'alias of the management token'}),
-  'auth-token': flags.boolean({char: 'A', description: 'to use auth token'}),
-  module: flags.string({char: 'm', description: '[optional] specific module name'})
+  config: flags.string({
+    char: 'c', 
+    description: '[optional] path of config file'
+  }),
+  'stack-uid': flags.string({
+    char: 's', 
+    description: 'API key of the target stack'
+  }),
+  data: flags.string({
+    char: 'd', 
+    description: 'path and location where data is stored'
+  }),
+  'management-token-alias': flags.string({
+    char: 'a', 
+    description: 'alias of the management token'
+  }),
+  'auth-token': flags.boolean({
+    char: 'A', 
+    description: 'to use auth token'
+  }),
+  module: flags.string({
+    char: 'm', 
+    description: '[optional] specific module name'
+  }),
+  "backup-dir": flags.string({
+    char: 'b', 
+    description: '[optional] backup directory name when using specific module'
+  }),
+  'branch': flags.string({
+    char: 'B', 
+    description: '[optional] branch name'
+  })
 }
 
-module.exports = ImportCommand
+module.exports = ImportCommand