@contentstack/cli-cm-clone 1.9.0 → 1.10.1

package/README.md

@@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-clone
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-clone/1.9.0 darwin-arm64 node-v20.8.0
+@contentstack/cli-cm-clone/1.10.1 darwin-arm64 node-v20.8.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -51,6 +51,7 @@ USAGE
     [--destination-stack-api-key <value>] [--import-webhook-status disable|current]
 
 FLAGS
+  -c, --config=<value>                          Path for the external configuration
   -n, --stack-name=<value>                      Name for the new stack to store the cloned content.
   -y, --yes                                     [Optional] Override marketplace prompts
   --destination-management-token-alias=<value>  Source API key of the target stack token alias.
@@ -101,6 +102,7 @@ USAGE
     [--destination-stack-api-key <value>] [--import-webhook-status disable|current]
 
 FLAGS
+  -c, --config=<value>                          Path for the external configuration
   -n, --stack-name=<value>                      Name for the new stack to store the cloned content.
   -y, --yes                                     [Optional] Override marketplace prompts
   --destination-management-token-alias=<value>  Source API key of the target stack token alias.

package/package.json

@@ -1,27 +1,29 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.9.0",
+  "version": "1.10.1",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
-    "@contentstack/cli-cm-export": "~1.10.2",
-    "@contentstack/cli-cm-import": "~1.13.0",
-    "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.10",
     "@colors/colors": "^1.5.0",
+    "@contentstack/cli-cm-export": "~1.11.0",
+    "@contentstack/cli-cm-import": "~1.14.0",
+    "@contentstack/cli-command": "~1.2.16",
+    "@contentstack/cli-utilities": "~1.5.12",
     "async": "^3.2.4",
     "chalk": "^4.1.0",
     "child_process": "^1.0.2",
     "fancy-test": "^1.4.10",
     "inquirer": "8.2.4",
+    "lodash": "^4.17.20",
+    "merge": "^2.1.1",
     "ora": "^5.1.0",
     "prompt": "^1.3.0",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.5",
     "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@oclif/test": "^1.2.7",
+    "@oclif/test": "^2.5.6",
     "chai": "^4.2.0",
     "eslint": "^8.18.0",
     "eslint-config-oclif": "^4.0.0",
@@ -70,4 +72,4 @@
       "cm:stack-clone": "O-CLN"
     }
   }
-}
+}

package/src/commands/cm/stacks/clone.js

@@ -2,9 +2,10 @@ const { Command } = require('@contentstack/cli-command');
 const { configHandler, flags, isAuthenticated, managementSDKClient } = require('@contentstack/cli-utilities');
 const { CloneHandler } = require('../../../lib/util/clone-handler');
 const path = require('path');
-const rimraf = require('rimraf');
+const { rimraf } = require('rimraf');
+const merge = require('merge');
 let pathdir = path.join(__dirname.split('src')[0], 'contents');
-const { readdirSync } = require('fs');
+const { readdirSync, readFileSync } = require('fs');
 let config = {};
 
 class StackCloneCommand extends Command {
@@ -23,11 +24,17 @@ class StackCloneCommand extends Command {
         'source-management-token-alias': sourceManagementTokenAlias,
         'destination-management-token-alias': destinationManagementTokenAlias,
         'import-webhook-status': importWebhookStatus,
+        config: externalConfigPath,
       } = cloneCommandFlags;
 
       const handleClone = async () => {
         const listOfTokens = configHandler.get('tokens');
 
+        if (externalConfigPath) {
+          let externalConfig = readFileSync(externalConfigPath, 'utf-8');
+          externalConfig = JSON.parse(externalConfig);
+          config = merge.recursive(config, externalConfig);
+        }
         config.forceStopMarketplaceAppsPrompt = yes;
         config.skipAudit = cloneCommandFlags['skip-audit'];
 
@@ -124,26 +131,23 @@ class StackCloneCommand extends Command {
     }
   }
 
-  cleanUp(pathDir, message) {
-    return new Promise((resolve) => {
-      rimraf(pathDir, function (err) {
-        if (err) {
-          console.log('\nCleaning up');
-          const skipCodeArr = ['ENOENT', 'EBUSY', 'EPERM', 'EMFILE', 'ENOTEMPTY'];
-
-          if (skipCodeArr.includes(err.code)) {
-            process.exit();
-          }
-        }
+  async cleanUp(pathDir, message) {
+    try {
+      await rimraf(pathDir);
+      if (message) {
+        // eslint-disable-next-line no-console
+        console.log(message);
+      }
+    } catch (err) {
+      if (err) {
+        console.log('\nCleaning up');
+        const skipCodeArr = ['ENOENT', 'EBUSY', 'EPERM', 'EMFILE', 'ENOTEMPTY'];
 
-        if (message) {
-          // eslint-disable-next-line no-console
-          console.log(message);
+        if (skipCodeArr.includes(err.code)) {
+          process.exit();
         }
-
-        resolve();
-      });
-    });
+      }
+    }
   }
 
   registerCleanupOnInterrupt(pathDir) {
@@ -249,6 +253,11 @@ b) Structure with content (all modules including entries & assets)
   'skip-audit': flags.boolean({
     description: 'Skips the audit fix.',
   }),
+  config: flags.string({
+    char: 'c',
+    required: false,
+    description: 'Path for the external configuration',
+  }),
 };
 
 StackCloneCommand.usage =

package/src/lib/util/clone-handler.js

@@ -8,6 +8,7 @@ let { default: importCmd } = require('@contentstack/cli-cm-import');
 const { CustomAbortController } = require('./abort-controller');
 const prompt = require('prompt');
 const colors = require('@colors/colors/safe');
+const cloneDeep = require("lodash/cloneDeep")
 
 const {
   HandleOrgCommand,
@@ -616,23 +617,29 @@ class CloneHandler {
 
   async cmdExport() {
     return new Promise((resolve, reject) => {
-      const cmd = ['-k', config.source_stack, '-d', __dirname.split('src')[0] + 'contents'];
-      if (config.cloneType === 'a') {
-        config.filteredModules = ['stack'].concat(structureList);
-        cmd.push('-c');
-        cmd.push(path.join(__dirname, 'dummyConfig.json'));
+      // Creating export specific config by merging external configurations
+      let exportConfig = Object.assign({}, cloneDeep(config), {...config?.export});
+      delete exportConfig.import;
+      delete exportConfig.export;
+
+      const cmd = ['-k', exportConfig.source_stack, '-d', __dirname.split('src')[0] + 'contents'];
+      if (exportConfig.cloneType === 'a') {
+        exportConfig.filteredModules = ['stack'].concat(structureList);
       }
 
-      if (config.source_alias) {
-        cmd.push('-a', config.source_alias);
+      if (exportConfig.source_alias) {
+        cmd.push('-a', exportConfig.source_alias);
       }
-      if (config.sourceStackBranch) {
-        cmd.push('--branch', config.sourceStackBranch);
+      if (exportConfig.sourceStackBranch) {
+        cmd.push('--branch', exportConfig.sourceStackBranch);
       }
 
-      if (config.forceStopMarketplaceAppsPrompt) cmd.push('-y');
+      if (exportConfig.forceStopMarketplaceAppsPrompt) cmd.push('-y');
 
-      fs.writeFileSync(path.join(__dirname, 'dummyConfig.json'), JSON.stringify(config));
+      cmd.push('-c');
+      cmd.push(path.join(__dirname, 'dummyConfig.json'));
+
+      fs.writeFileSync(path.join(__dirname, 'dummyConfig.json'), JSON.stringify(exportConfig));
       let exportData = exportCmd.run(cmd);
       exportData.then(() => resolve(true)).catch(reject);
     });
@@ -640,27 +647,33 @@ class CloneHandler {
 
   async cmdImport() {
     return new Promise(async (resolve, _reject) => {
+      // Creating export specific config by merging external configurations
+      let importConfig = Object.assign({}, cloneDeep(config), {...config?.import});
+      delete importConfig.import;
+      delete importConfig.export;
+
       const cmd = ['-c', path.join(__dirname, 'dummyConfig.json')];
 
-      if (config.destination_alias) {
-        cmd.push('-a', config.destination_alias);
+      if (importConfig.destination_alias) {
+        cmd.push('-a', importConfig.destination_alias);
       }
-      if (!config.data && config.sourceStackBranch) {
-        cmd.push('-d', path.join(config.pathDir, config.sourceStackBranch));
+      if (!importConfig.data && importConfig.sourceStackBranch) {
+        cmd.push('-d', path.join(importConfig.pathDir, importConfig.sourceStackBranch));
       }
-      if (config.targetStackBranch) {
-        cmd.push('--branch', config.targetStackBranch);
+      if (importConfig.targetStackBranch) {
+        cmd.push('--branch', importConfig.targetStackBranch);
       }
-      if (config.importWebhookStatus) {
-        cmd.push('--import-webhook-status', config.importWebhookStatus);
+      if (importConfig.importWebhookStatus) {
+        cmd.push('--import-webhook-status', importConfig.importWebhookStatus);
       }
 
-      if (config.skipAudit) cmd.push('--skip-audit');
+      if (importConfig.skipAudit) cmd.push('--skip-audit');
 
-      if (config.forceStopMarketplaceAppsPrompt) cmd.push('-y');
+      if (importConfig.forceStopMarketplaceAppsPrompt) cmd.push('-y');
 
-      fs.writeFileSync(path.join(__dirname, 'dummyConfig.json'), JSON.stringify(config));
+      fs.writeFileSync(path.join(__dirname, 'dummyConfig.json'), JSON.stringify(importConfig));
       await importCmd.run(cmd);
+      fs.writeFileSync(path.join(__dirname, 'dummyConfig.json'), JSON.stringify({}))
       return resolve();
     });
   }