@contentstack/cli-cm-clone 1.4.11 → 1.4.12

package/README.md

@@ -1,27 +1,29 @@
-@contentstack/cli-cm-clone
-==========================
+# @contentstack/cli-cm-clone
 
 It is Contentstack’s CLI plugin to clone a stack. Using this command, you can export a stack’s content/schema to a new or existing stack. Refer to the [Clone a Stack](https://www.contentstack.com/docs/developers/cli/clone-a-stack/) documentation to learn more.
 
-
 <!-- toc -->
+* [@contentstack/cli-cm-clone](#contentstackcli-cm-clone)
 * [Usage](#usage)
 * [Commands](#commands)
 <!-- tocstop -->
+
 # Usage
+
 <!-- usage -->
 ```sh-session
 $ npm install -g @contentstack/cli-cm-clone
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-clone/1.4.11 linux-x64 node-v16.20.1
+@contentstack/cli-cm-clone/1.4.12 linux-x64 node-v18.16.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
 ...
 ```
 <!-- usagestop -->
+
 ```sh-session
 $ npm install -g @contentstack/cli-cm-clone
 $ csdx COMMAND
@@ -31,7 +33,9 @@ USAGE
   $ csdx COMMAND
 ...
 ```
+
 # Commands
+
 <!-- commands -->
 * [`csdx cm:stacks:clone [--source-branch <value>] [--target-branch <value>] [--source-management-token-alias <value>] [--destination-management-token-alias <value>] [-n <value>] [--type a|b] [--source-stack-api-key <value>] [--destination-stack-api-key <value>] [--import-webhook-status disable|current]`](#csdx-cmstacksclone---source-branch-value---target-branch-value---source-management-token-alias-value---destination-management-token-alias-value--n-value---type-ab---source-stack-api-key-value---destination-stack-api-key-value---import-webhook-status-disablecurrent)
 * [`csdx cm:stacks:clone [--source-branch <value>] [--target-branch <value>] [--source-management-token-alias <value>] [--destination-management-token-alias <value>] [-n <value>] [--type a|b] [--source-stack-api-key <value>] [--destination-stack-api-key <value>] [--import-webhook-status disable|current]`](#csdx-cmstacksclone---source-branch-value---target-branch-value---source-management-token-alias-value---destination-management-token-alias-value--n-value---type-ab---source-stack-api-key-value---destination-stack-api-key-value---import-webhook-status-disablecurrent-1)

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.11",
+  "version": "1.4.12",
   "commands": {
     "cm:stacks:clone": {
       "id": "cm:stacks:clone",

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
+    "@contentstack/cli-cm-export": "^1.6.0",
+    "@contentstack/cli-cm-import": "^1.6.0",
+    "@contentstack/cli-command": "^1.2.10",
+    "@contentstack/cli-utilities": "^1.5.0",
+    "@contentstack/management": "^1.8.0",
     "@colors/colors": "^1.5.0",
-    "@contentstack/cli-cm-export": "^1.5.9",
-    "@contentstack/cli-cm-import": "^1.5.11",
-    "@contentstack/cli-command": "^1.2.9",
-    "@contentstack/cli-utilities": "^1.4.5",
     "async": "^3.2.4",
     "chalk": "^4.1.0",
     "child_process": "^1.0.2",

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

@@ -1,11 +1,11 @@
 const { Command } = require('@contentstack/cli-command');
 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');
 const rimraf = require('rimraf');
 let pathdir = path.join(__dirname.split('src')[0], 'contents');
 const { readdirSync } = require('fs');
+let config = {};
 
 class StackCloneCommand extends Command {
   async run() {
@@ -76,7 +76,7 @@ class StackCloneCommand extends Command {
         const cloneHandler = new CloneHandler(config);
         const managementAPIClient = await managementSDKClient(config);
         cloneHandler.setClient(managementAPIClient);
-        cloneHandler.execute().catch((error)=>{
+        cloneHandler.execute().catch((error) => {
           console.log(error);
         });
       };

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

@@ -2,12 +2,13 @@ const ora = require('ora');
 const path = require('path');
 const inquirer = require('inquirer');
 const chalk = require('chalk');
+const fs = require('fs');
+let { default: exportCmd } = require('@contentstack/cli-cm-export');
+let { default: importCmd } = require('@contentstack/cli-cm-import');
+const { CustomAbortController } = require('./abort-controller');
 const prompt = require('prompt');
 const colors = require('@colors/colors/safe');
 
-let exportCmd = require('@contentstack/cli-cm-export');
-let importCmd = require('@contentstack/cli-cm-import');
-
 const {
   HandleOrgCommand,
   HandleStackCommand,
@@ -19,6 +20,7 @@ const {
   Clone,
   HandleBranchCommand,
 } = require('../helpers/command-helpers');
+const { configHandler } = require('@contentstack/cli-utilities')
 
 let client = {};
 let config;
@@ -60,7 +62,7 @@ let master_locale;
 // Overrides prompt's stop method
 prompt.stop = function () {
   if (prompt.stopped) {
-      return;
+    return;
   }
   prompt.emit('stop');
   prompt.stopped = true;
@@ -301,7 +303,13 @@ class CloneHandler {
   async executeBranchPrompt(parentParams) {
     try {
       this.setExectingCommand(2);
-      await cloneCommand.execute(new HandleBranchCommand({ api_key: config.source_stack }, this, this.executeStackPrompt.bind(this, parentParams)));
+      await cloneCommand.execute(
+        new HandleBranchCommand(
+          { api_key: config.source_stack },
+          this,
+          this.executeStackPrompt.bind(this, parentParams),
+        ),
+      );
       await this.executeExport();
     } catch (error) {
       throw error;
@@ -314,7 +322,9 @@ class CloneHandler {
       await cloneCommand.execute(new SetBranchCommand(null, this));
 
       if (exportRes) {
-        this.executeDestination().catch(() => { throw ''; });
+        this.executeDestination().catch(() => {
+          throw '';
+        });
       }
     } catch (error) {
       throw error;
@@ -340,9 +350,14 @@ class CloneHandler {
 
         let org;
         if (!config.target_stack) {
-          org = await cloneCommand.execute(new HandleOrgCommand({
-            msg: !canCreateStack.stackCreate ? orgMsgExistingStack : orgMsgNewStack
-          }, this));
+          org = await cloneCommand.execute(
+            new HandleOrgCommand(
+              {
+                msg: !canCreateStack.stackCreate ? orgMsgExistingStack : orgMsgNewStack,
+              },
+              this,
+            ),
+          );
         }
 
         const params = { org, canCreateStack };
@@ -402,7 +417,13 @@ class CloneHandler {
   async executeBranchDestinationPrompt(parentParams) {
     try {
       this.setExectingCommand(2);
-      await cloneCommand.execute(new HandleBranchCommand({ isSource: false, api_key: config.target_stack }, this, this.executeStackDestinationPrompt.bind(this, parentParams)));
+      await cloneCommand.execute(
+        new HandleBranchCommand(
+          { isSource: false, api_key: config.target_stack },
+          this,
+          this.executeStackDestinationPrompt.bind(this, parentParams),
+        ),
+      );
       this.removeBackKeyPressHandler();
       await cloneCommand.execute(new CloneTypeSelectionCommand(null, this));
     } catch (error) {
@@ -441,9 +462,17 @@ class CloneHandler {
     return new Promise(async (resolve, reject) => {
       const spinner = ora('Fetching Organization').start();
       try {
-        let organizations = await client.organization().fetchAll({ limit: 100 });
+        let organizations;
+        const configOrgUid = configHandler.get('oauthOrgUid');
+
+        if (configOrgUid) {
+          organizations = await client.organization(configOrgUid).fetch();
+        } else {
+          organizations = await client.organization().fetchAll({ limit: 100 });
+        }
+        
         spinner.succeed('Fetched Organization');
-        for (const element of organizations.items) {
+        for (const element of organizations.items || [organizations]) {
           orgUidList[element.name] = element.uid;
           orgChoice.choices.push(element.name);
         }
@@ -529,7 +558,12 @@ class CloneHandler {
 
   getNewStackPromptResult() {
     return new Promise((resolve) => {
-      prompt.get({ properties: { name: { description: colors.white(stackName.message), default: colors.grey(stackName.default), } } },
+      prompt.get(
+        {
+          properties: {
+            name: { description: colors.white(stackName.message), default: colors.grey(stackName.default) },
+          },
+        },
         function (_, result) {
           if (prompt.stopped) {
             prompt.stopped = false;
@@ -539,7 +573,8 @@ class CloneHandler {
             _name = _name.replace(//g, '');
             resolve({ stack: _name });
           }
-        });
+        },
+      );
     });
   }
 
@@ -597,6 +632,7 @@ class CloneHandler {
 
       if (config.forceStopMarketplaceAppsPrompt) cmd.push('-y');
 
+      fs.writeFileSync(path.join(__dirname, 'dummyConfig.json'), JSON.stringify(config));
       let exportData = exportCmd.run(cmd);
       exportData.then(() => resolve(true)).catch(reject);
     });
@@ -609,8 +645,8 @@ class CloneHandler {
       if (config.destination_alias) {
         cmd.push('-a', config.destination_alias);
       }
-      if (config.sourceStackBranch) {
-        cmd.push('-d', path.join(__dirname, config.sourceStackBranch));
+      if (!config.data && config.sourceStackBranch) {
+        cmd.push('-d', path.join(config.pathDir, config.sourceStackBranch));
       }
       if (config.targetStackBranch) {
         cmd.push('--branch', config.targetStackBranch);
@@ -621,6 +657,7 @@ class CloneHandler {
 
       if (config.forceStopMarketplaceAppsPrompt) cmd.push('-y');
 
+      fs.writeFileSync(path.join(__dirname, 'dummyConfig.json'), JSON.stringify(config));
       await importCmd.run(cmd);
       return resolve();
     });