@contentstack/cli-cm-clone 1.3.0 → 1.4.1

package/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-clone
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-clone/1.3.0 linux-x64 node-v16.19.1
+@contentstack/cli-cm-clone/1.4.1 linux-x64 node-v16.20.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.0",
+  "version": "1.4.1",
   "commands": {
     "cm:stacks:clone": {
       "id": "cm:stacks:clone",

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
-    "@contentstack/cli-cm-export": "^1.4.0",
-    "@contentstack/cli-cm-import": "^1.4.0",
-    "@contentstack/cli-command": "^1.2.0",
-    "@contentstack/cli-utilities": "^1.2.0",
+    "@contentstack/cli-cm-export": "^1.5.1",
+    "@contentstack/cli-cm-import": "^1.5.1",
+    "@contentstack/cli-command": "^1.2.2",
+    "@contentstack/cli-utilities": "^1.3.1",
     "@contentstack/management": "^1.6.1",
     "async": "^3.2.4",
     "chalk": "^4.1.0",
@@ -63,6 +63,10 @@
   "csdxConfig": {
     "expiredCommands": {
       "cm:stack-clone": "csdx cm:stacks:clone"
+    },
+    "shortCommandName": {
+      "cm:stacks:clone": "CLN",
+      "cm:stack-clone": "O-CLN"
     }
   }
 }

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

@@ -1,5 +1,5 @@
 const { Command } = require('@contentstack/cli-command');
-const { configHandler, flags } = require('@contentstack/cli-utilities');
+const { configHandler, flags, isAuthenticated, managementSDKClient } = require('@contentstack/cli-utilities');
 const { CloneHandler } = require('../../../lib/util/clone-handler');
 let config = require('../../../lib/util/dummyConfig.json');
 const path = require('path');
@@ -11,7 +11,6 @@ class StackCloneCommand extends Command {
   async run() {
     try {
       let self = this;
-      let _authToken = configHandler.get('authtoken');
       const { flags: cloneCommandFlags } = await self.parse(StackCloneCommand);
       const {
         yes,
@@ -70,17 +69,19 @@ class StackCloneCommand extends Command {
         await this.removeContentDirIfNotEmptyBeforeClone(pathdir); // NOTE remove if folder not empty before clone
         this.registerCleanupOnInterrupt(pathdir);
 
-        config.auth_token = _authToken;
+        config.auth_token = configHandler.get('authtoken');
         config.host = this.cmaHost;
         config.cdn = this.cdaHost;
         config.pathDir = pathdir;
         const cloneHandler = new CloneHandler(config);
+        const managementAPIClient = await managementSDKClient(config);
+        cloneHandler.setClient(managementAPIClient);
         cloneHandler.execute().catch();
       };
 
       if (sourceManagementTokenAlias && destinationManagementTokenAlias) {
         if (sourceStackBranch || targetStackBranch) {
-          if (_authToken) {
+          if (isAuthenticated()) {
             handleClone();
           } else {
             console.log('Please login to execute this command, csdx auth:login');
@@ -89,7 +90,7 @@ class StackCloneCommand extends Command {
         } else {
           handleClone();
         }
-      } else if (_authToken) {
+      } else if (isAuthenticated()) {
         handleClone();
       } else {
         console.log('Please login to execute this command, csdx auth:login');

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

@@ -6,7 +6,6 @@ const chalk = require('chalk');
 
 let exportCmd = require('@contentstack/cli-cm-export');
 let importCmd = require('@contentstack/cli-cm-import');
-let sdkInstance = require('../../lib/util/contentstack-management-sdk');
 const { CustomAbortController } = require('./abort-controller');
 
 const {
@@ -61,11 +60,13 @@ let master_locale;
 class CloneHandler {
   constructor(opt) {
     config = opt;
-    client = sdkInstance.Client(config);
     cloneCommand = new Clone();
     this.pathDir = opt.pathDir;
     process.stdin.setMaxListeners(50);
   }
+  setClient(managementSDKClient) {
+    client = managementSDKClient;
+  }
 
   handleOrgSelection(options = {}) {
     return new Promise(async (resolve, reject) => {
@@ -498,6 +499,11 @@ 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'));
+      }
 
       if (config.source_alias) {
         cmd.push('-a', config.source_alias);

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

@@ -1,21 +0,0 @@
-const contentstacksdk = require('@contentstack/management');
-
-exports.Client = function (config) {
-  const option = {
-    host: config.host,
-    authtoken: config.auth_token,
-    maxContentLength: 100000000,
-    maxBodyLength: 1000000000,
-    logHandler: (_level, _data) => {
-      // empty log handler
-    },
-  };
-
-  if (config.target_stack) {
-    option.api_key = config.target_stack;
-  }
-  if (config.source_stack) {
-    option.api_key = config.source_stack;
-  }
-  return contentstacksdk.client(option);
-};