@contentstack/cli-cm-clone 1.0.0 → 1.1.2

package/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-clone
 $ csdx COMMAND
 running command...
 $ csdx (-v|--version|version)
-@contentstack/cli-cm-clone/0.1.0-beta-1 darwin-x64 node-v13.14.0
+@contentstack/cli-cm-clone/1.1.2 darwin-arm64 node-v18.11.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -33,23 +33,63 @@ USAGE
 ```
 # Commands
 <!-- commands -->
-* [`csdx cm:stacks:clone`](#csdx-cmstack-clone)
+* [`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`
+## `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]`
 
-This command allows you to migrate data (structure or content or both) from one stack to another stack (either new or existing)
+Clone data (structure/content or both) of a stack into another stack
 
 ```
 USAGE
-  $ csdx cm:stacks:clone
+  $ 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]
+
+OPTIONS
+  -n, --stack-name=stack-name                                              Name for the new stack to store the cloned
+                                                                           content.
+
+  -y, --yes                                                                [optional] Override marketplace prompts
+
+  --destination-management-token-alias=destination-management-token-alias  Source API key of the target stack token
+                                                                           alias.
+
+  --destination-stack-api-key=destination-stack-api-key                    Destination stack API Key
+
+  --import-webhook-status=disable|current                                  [default: disable] Webhook state
+
+  --source-branch=source-branch                                            Branch of the source stack.
+
+  --source-management-token-alias=source-management-token-alias            Source API key of the target stack token
+                                                                           alias.
+
+  --source-stack-api-key=source-stack-api-key                              Source stack API Key
+
+  --target-branch=target-branch                                            Branch of the target stack.
+
+  --type=a|b                                                               Type of data to clone
+                                                                           a) Structure (all modules except entries &
+                                                                           assets)
+                                                                           b) Structure with content (all modules
+                                                                           including entries & assets)
 
 DESCRIPTION
-  ...
-  Use this plugin to automate the process of cloning a stack in a few steps.
+  Use this plugin to automate the process of cloning a stack in few steps.
+
+ALIASES
+  $ csdx cm:stack-clone
 
-EXAMPLE
+EXAMPLES
   csdx cm:stacks:clone
+  csdx cm:stacks:clone --source-branch <source-branch-name> --target-branch <target-branch-name> --yes
+  csdx cm:stacks:clone --source-stack-api-key <apiKey> --destination-stack-api-key <apiKey>
+  csdx cm:stacks:clone --source-management-token-alias <management token alias> --destination-management-token-alias 
+  <management token alias>
+  csdx cm:stacks:clone --source-branch --target-branch --source-management-token-alias <management token alias> 
+  --destination-management-token-alias <management token alias>
+  csdx cm:stacks:clone --source-branch --target-branch --source-management-token-alias <management token alias> 
+  --destination-management-token-alias <management token alias> --type <value a or b>
 ```
 
-_See code: [src/commands/cm/stacks/clone.js](https://github.com/contentstack/cli/blob/v0.1.0-beta-1/src/commands/cm/stack-clone.js)_
+_See code: [src/commands/cm/stacks/clone.js](https://github.com/contentstack/cli/blob/main/packages/contentstack-clone/src/commands/cm/stacks/clone.js)_
 <!-- commandsstop -->

package/oclif.manifest.json

@@ -0,0 +1 @@
+{"version":"1.1.2","commands":{"cm:stacks:clone":{"id":"cm:stacks:clone","description":"Clone data (structure/content or both) of a stack into another stack\nUse this plugin to automate the process of cloning a stack in few steps.\n","usage":"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]","pluginName":"@contentstack/cli-cm-clone","pluginType":"core","aliases":["cm:stack-clone"],"examples":["csdx cm:stacks:clone","csdx cm:stacks:clone --source-branch <source-branch-name> --target-branch <target-branch-name> --yes","csdx cm:stacks:clone --source-stack-api-key <apiKey> --destination-stack-api-key <apiKey>","csdx cm:stacks:clone --source-management-token-alias <management token alias> --destination-management-token-alias <management token alias>","csdx cm:stacks:clone --source-branch --target-branch --source-management-token-alias <management token alias> --destination-management-token-alias <management token alias>","csdx cm:stacks:clone --source-branch --target-branch --source-management-token-alias <management token alias> --destination-management-token-alias <management token alias> --type <value a or b>"],"flags":{"source-branch":{"name":"source-branch","type":"option","description":"Branch of the source stack.","required":false},"target-branch":{"name":"target-branch","type":"option","description":"Branch of the target stack.","required":false},"source-management-token-alias":{"name":"source-management-token-alias","type":"option","description":"Source API key of the target stack token alias.","required":false},"destination-management-token-alias":{"name":"destination-management-token-alias","type":"option","description":"Source API key of the target stack token alias.","required":false},"stack-name":{"name":"stack-name","type":"option","char":"n","description":"Name for the new stack to store the cloned content.","required":false},"type":{"name":"type","type":"option","description":"Type of data to clone\na) Structure (all modules except entries & assets)\nb) Structure with content (all modules including entries & assets)\n    ","required":false,"options":["a","b"]},"source-stack-api-key":{"name":"source-stack-api-key","type":"option","description":"Source stack API Key"},"destination-stack-api-key":{"name":"destination-stack-api-key","type":"option","description":"Destination stack API Key"},"import-webhook-status":{"name":"import-webhook-status","type":"option","description":"Webhook state","required":false,"options":["disable","current"],"default":"disable"},"yes":{"name":"yes","type":"boolean","char":"y","description":"[optional] Override marketplace prompts","required":false,"allowNo":false}},"args":[]}}}

package/package.json

@@ -1,21 +1,22 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.0.0",
+  "version": "1.1.2",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
-    "@contentstack/cli-cm-export": "^1.0.0",
-    "@contentstack/cli-cm-import": "^1.0.0",
-    "@contentstack/cli-command": "^1.0.0",
+    "@contentstack/cli-cm-export": "^1.2.0",
+    "@contentstack/cli-cm-import": "^1.2.0",
+    "@contentstack/cli-command": "^1.0.2",
+    "@contentstack/cli-utilities": "^1.0.3",
     "@contentstack/management": "^1.3.0",
-    "@contentstack/cli-utilities": "^1.0.0",
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.18.3",
+    "chalk": "^4.1.0",
     "async": "^3.2.4",
     "child_process": "^1.0.2",
     "fancy-test": "^1.4.10",
-    "inquirer": "^7.3.3",
+    "inquirer": "^8.2.4",
     "ora": "^5.1.0",
     "rimraf": "^3.0.2",
     "winston": "^3.7.2"
@@ -53,11 +54,15 @@
     "bin": "csdx",
     "devPlugins": [
       "@oclif/plugin-help"
-    ]
+    ],
+    "repositoryPrefix": "<%- repo %>/blob/main/packages/contentstack-clone/<%- commandPath %>"
   },
   "repository": "https://github.com/contentstack/cli",
   "scripts": {
-    "test": "nyc --reporter=html mocha \"test/**/*.test.js\"",
+    "postpack": "rm -f oclif.manifest.json",
+    "prepack": "oclif-dev manifest && oclif-dev readme",
+    "test": "nyc --reporter=html mocha --forbid-only \"test/**/*.test.js\"",
+    "posttest": "eslint .",
     "version": "oclif-dev readme && git add README.md"
   },
   "csdxConfig": {

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

@@ -14,6 +14,7 @@ class StackCloneCommand extends Command {
       let _authToken = configHandler.get('authtoken');
       const cloneCommandFlags = self.parse(StackCloneCommand).flags;
       const {
+        yes,
         type: cloneType,
         'stack-name': stackName,
         'source-branch': sourceStackBranch,
@@ -28,6 +29,8 @@ class StackCloneCommand extends Command {
       const handleClone = async () => {
         const listOfTokens = configHandler.get('tokens');
 
+        config.forceMarketplaceAppsImport = yes;
+
         if (cloneType) {
           config.cloneType = cloneType;
         }
@@ -70,10 +73,9 @@ class StackCloneCommand extends Command {
         config.auth_token = _authToken;
         config.host = this.cmaHost;
         config.cdn = this.cdaHost;
+        config.pathDir = pathdir;
         const cloneHandler = new CloneHandler(config);
-        await cloneHandler.start();
-        let successMessage = 'Stack cloning process have been completed successfully';
-        await this.cleanUp(pathdir, successMessage);
+        cloneHandler.execute().catch();
       };
 
       if (sourceManagementTokenAlias && destinationManagementTokenAlias) {
@@ -94,9 +96,11 @@ class StackCloneCommand extends Command {
         this.exit(1);
       }
     } catch (error) {
-      await this.cleanUp(pathdir);
-      // eslint-disable-next-line no-console
-      console.log(error.message || error);
+      if (error) {
+        await this.cleanUp(pathdir);
+        // eslint-disable-next-line no-console
+        console.log(error.message || error);
+      }
     }
   }
 
@@ -142,25 +146,27 @@ class StackCloneCommand extends Command {
     const interrupt = ['SIGINT', 'SIGQUIT', 'SIGTERM'];
     const exceptions = ['unhandledRejection', 'uncaughtException'];
 
-    const cleanUp = async (exitOrError = null) => {
-      // eslint-disable-next-line no-console
-      console.log('\nCleaning up');
-      await this.cleanUp(pathDir);
-      // eslint-disable-next-line no-console
-      console.log('done');
-      // eslint-disable-next-line no-process-exit
-
-      if (exitOrError instanceof Promise) {
-        exitOrError.catch((error) => {
-          console.log((error && error.message) || '');
-        });
-      } else if (exitOrError && exitOrError.message) {
-        console.log(exitOrError.message);
-      } else if (exitOrError && exitOrError.errorMessage) {
-        console.log(exitOrError.message);
-      }
+    const cleanUp = async (exitOrError) => {
+      if (exitOrError) {
+        // eslint-disable-next-line no-console
+        console.log('\nCleaning up');
+        await this.cleanUp(pathDir);
+        // eslint-disable-next-line no-console
+        console.log('done');
+        // eslint-disable-next-line no-process-exit
+
+        if (exitOrError instanceof Promise) {
+          exitOrError.catch((error) => {
+            console.log((error && error.message) || '');
+          });
+        } else if (exitOrError.message) {
+          console.log(exitOrError.message);
+        } else if (exitOrError.errorMessage) {
+          console.log(exitOrError.message);
+        }
 
-      if (exitOrError === true) process.exit();
+        if (exitOrError === true) process.exit();
+      }
     };
 
     exceptions.forEach((event) => process.on(event, cleanUp));
@@ -174,7 +180,7 @@ Use this plugin to automate the process of cloning a stack in few steps.
 
 StackCloneCommand.examples = [
   'csdx cm:stacks:clone',
-  'csdx cm:stacks:clone --source-branch <source-branch-name> --target-branch <target-branch-name>',
+  'csdx cm:stacks:clone --source-branch <source-branch-name> --target-branch <target-branch-name> --yes',
   'csdx cm:stacks:clone --source-stack-api-key <apiKey> --destination-stack-api-key <apiKey>',
   'csdx cm:stacks:clone --source-management-token-alias <management token alias> --destination-management-token-alias <management token alias>',
   'csdx cm:stacks:clone --source-branch --target-branch --source-management-token-alias <management token alias> --destination-management-token-alias <management token alias>',
@@ -231,6 +237,11 @@ b) Structure with content (all modules including entries & assets)
     required: false,
     default: 'disable',
   }),
+  yes: flags.boolean({
+    char: 'y',
+    required: false,
+    description: '[optional] Override marketplace prompts',
+  }),
 };
 
 StackCloneCommand.usage =

package/src/lib/helpers/command-helpers.js

@@ -0,0 +1,67 @@
+const CloneCommand = function (execute, undo, params, parentContext) {
+  this.execute = execute.bind(parentContext);
+  this.undo = undo && undo.bind(parentContext);
+  this.params = params;
+};
+
+const HandleOrgCommand = function (params, parentContext) {
+  return new CloneCommand(parentContext.handleOrgSelection, null, params, parentContext);
+};
+
+const HandleStackCommand = function (params, parentContext) {
+  return new CloneCommand(parentContext.handleStackSelection, parentContext.execute, params, parentContext);
+};
+
+const HandleBranchCommand = function (params, parentContext) {
+  return new CloneCommand(parentContext.handleBranchSelection, parentContext.execute, params, parentContext);
+};
+
+const HandleDestinationStackCommand = function (params, parentContext) {
+  return new CloneCommand(parentContext.handleStackSelection, parentContext.executeDestination, params, parentContext);
+};
+
+const HandleExportCommand = function (params, parentContext) {
+  return new CloneCommand(parentContext.cmdExport, null, params, parentContext);
+};
+
+const SetBranchCommand = function (params, parentContext) {
+  return new CloneCommand(parentContext.setBranch, null, params, parentContext);
+};
+
+const CreateNewStackCommand = function (params, parentContext) {
+  return new CloneCommand(parentContext.createNewStack, parentContext.executeDestination, params, parentContext);
+};
+
+const CloneTypeSelectionCommand = function (params, parentContext) {
+  return new CloneCommand(parentContext.cloneTypeSelection, null, params, parentContext);
+};
+
+const Clone = function () {
+  const commands = [];
+
+  return {
+    execute: async function (command) {
+      commands.push(command);
+      const result = await command.execute(command.params);
+      return result;
+    },
+    undo: async function () {
+      if (commands.length) {
+        const command = commands.pop();
+        command.undo && await command.undo(command.params);
+      }
+    },
+  };
+};
+
+module.exports = {
+  HandleOrgCommand,
+  HandleStackCommand,
+  HandleBranchCommand,
+  HandleDestinationStackCommand,
+  HandleExportCommand,
+  SetBranchCommand,
+  CreateNewStackCommand,
+  CloneTypeSelectionCommand,
+  Clone,
+};

package/src/lib/util/abort-controller.js

@@ -0,0 +1,49 @@
+'use strict';
+
+const { EventEmitter } = require('events');
+
+class CustomAbortSignal {
+  constructor() {
+    this.eventEmitter = new EventEmitter();
+    this.onabort = null;
+    this.aborted = false;
+  }
+  toString() {
+    return '[object CustomAbortSignal]';
+  }
+  get [Symbol.toStringTag]() {
+    return 'CustomAbortSignal';
+  }
+  removeEventListener(name, handler) {
+    this.eventEmitter.removeListener(name, handler);
+  }
+  addEventListener(name, handler) {
+    this.eventEmitter.on(name, handler);
+  }
+  dispatchEvent(type) {
+    const event = { type, target: this };
+    const handlerName = `on${type}`;
+
+    if (typeof this[handlerName] === 'function') this[handlerName](event);
+  }
+}
+
+class CustomAbortController {
+  constructor() {
+    this.signal = new CustomAbortSignal();
+  }
+  abort() {
+    if (this.signal.aborted) return;
+
+    this.signal.aborted = true;
+    this.signal.dispatchEvent('abort');
+  }
+  toString() {
+    return '[object CustomAbortController]';
+  }
+  get [Symbol.toStringTag]() {
+    return 'CustomAbortController';
+  }
+}
+
+module.exports = { CustomAbortController, CustomAbortSignal };

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

@@ -1,12 +1,24 @@
 const ora = require('ora');
 const path = require('path');
 const inquirer = require('inquirer');
+const rimraf = require('rimraf');
+const chalk = require('chalk');
 
-let sdkInstance = require('../../lib/util/contentstack-management-sdk');
 let exportCmd = require('@contentstack/cli-cm-export');
 let importCmd = require('@contentstack/cli-cm-import');
+const { HttpClient } = require('@contentstack/cli-utilities');
+let sdkInstance = require('../../lib/util/contentstack-management-sdk');
+const defaultConfig = require('@contentstack/cli-cm-export/src/config/default');
+const { CustomAbortController } = require('./abort-controller');
+
+const {
+  HandleOrgCommand, HandleStackCommand, HandleDestinationStackCommand, HandleExportCommand,
+  SetBranchCommand, CreateNewStackCommand, CloneTypeSelectionCommand, Clone, HandleBranchCommand
+} = require('../helpers/command-helpers');
+
 let client = {};
 let config;
+let cloneCommand;
 
 let stackCreationConfirmation = [
   {
@@ -32,6 +44,7 @@ let structureList = [
   'locales',
   'environments',
   'extensions',
+  'marketplace-apps',
   'webhooks',
   'global-fields',
   'content-types',
@@ -44,9 +57,12 @@ class CloneHandler {
   constructor(opt) {
     config = opt;
     client = sdkInstance.Client(config);
+    cloneCommand = new Clone();
+    this.pathDir = opt.pathDir;
+    process.stdin.setMaxListeners(50);
   }
 
-  #handleOrgSelection(options = {}) {
+  handleOrgSelection(options = {}) {
     return new Promise(async (resolve, reject) => {
       const { msg = '', isSource = true } = options || {};
       const orgList = await this.getOrganizationChoices(msg).catch(reject);
@@ -65,113 +81,257 @@ class CloneHandler {
     });
   }
 
-  #handleStackSelection(options = {}) {
+  handleStackSelection(options = {}) {
+    let keyPressHandler;
     return new Promise(async (resolve, reject) => {
-      const { org = {}, msg = '', isSource = true } = options || {};
-      const stackList = await this.getStack(org, msg, isSource).catch(reject);
+      try {
+        const { org = {}, msg = '', isSource = true, stackAbortController } = options || {}
+
+        keyPressHandler = async function (_ch, key) {
+          if (key.name === 'left' && key.shift) {
+            stackAbortController.abort();
+            console.clear();
+            process.stdin.removeListener('keypress', keyPressHandler);
+            await cloneCommand.undo();
+          }
+        };
+        process.stdin.addListener('keypress', keyPressHandler);
 
-      if (stackList) {
-        const selectedStack = await inquirer.prompt(stackList);
+        const stackList = await this.getStack(org, msg, isSource).catch(reject)
 
-        if (isSource) {
-          config.sourceStackName = selectedStack.stack;
-          master_locale = masterLocaleList[selectedStack.stack];
-          config.source_stack = stackUidList[selectedStack.stack];
-        } else {
-          config.target_stack = stackUidList[selectedStack.stack];
-          config.destinationStackName = selectedStack.stack;
-        }
+        if (stackList) {
+          const ui = new inquirer.ui.BottomBar();
+          ui.updateBottomBar(chalk.cyan('\nPress shift & left arrow together to undo the operation\n'));
 
-        resolve(selectedStack);
+          const selectedStack = await inquirer.prompt(stackList);
+
+          if (stackAbortController.signal.aborted) {
+            return reject();
+          }
+          if (isSource) {
+            config.sourceStackName = selectedStack.stack;
+            master_locale = masterLocaleList[selectedStack.stack];
+            config.source_stack = stackUidList[selectedStack.stack];
+          } else {
+            config.target_stack = stackUidList[selectedStack.stack];
+            config.destinationStackName = selectedStack.stack;
+          }
+
+          resolve(selectedStack)
+        }
+      } catch (error) {
+        return reject(error);
+      } finally {
+        if (keyPressHandler) {
+          process.stdin.removeListener('keypress', keyPressHandler);
+        }
       }
     });
   }
 
-  start() {
+  handleBranchSelection = async (options) => {
+    const { api_key, isSource = true, returnBranch = false } = options
+    const baseUrl = defaultConfig.host.startsWith('http')
+      ? defaultConfig.host
+      : `https://${defaultConfig.host}/v3`;
+
     return new Promise(async (resolve, reject) => {
-      let sourceStack = {};
-      const handleOrgAndStackSelection = (orgMsg, stackMsg, isSource = true) => {
-        return new Promise(async (_resolve) => {
-          const org = await this.#handleOrgSelection({ msg: orgMsg, isSource }).catch((error) =>
-            reject(error.errorMessage),
-          );
+      try {
+        const headers = { api_key }
 
-          if (org) {
-            await this.#handleStackSelection({
-              org,
-              isSource,
-              msg: stackMsg,
-            })
-              .then(_resolve)
-              .catch((error) => reject(error.errorMessage));
-          }
-        });
-      };
+        if (config.auth_token) {
+          headers['authtoken'] = config.auth_token
+        } else if (config.management_token) {
+          headers['authorization'] = config.management_token
+        }
 
-      if (!config.source_stack) {
-        // NOTE Export section
-        sourceStack = await handleOrgAndStackSelection(
-          'Choose an organization where your source stack exists:',
-          'Select the source stack',
-        );
-      }
+        // NOTE validate if source branch is exist
+        if (isSource && config.sourceStackBranch) {
+          await this.validateIfBranchExist(headers, true)
+          return resolve()
+        }
 
-      if (config.source_stack) {
-        stackName.default = config.stackName || `Copy of ${sourceStack.stack || config.source_alias}`;
-        const exportRes = await this.cmdExport().catch(reject);
+        // NOTE Validate target branch is exist
+        if (!isSource && config.targetStackBranch) {
+          await this.validateIfBranchExist(headers, false)
+          return resolve()
+        }
 
-        if (!config.sourceStackBranch) {
-          try {
-            const branches = await client.stack({ api_key: config.source_stack }).branch().query().find();
+        const spinner = ora('Fetching Branches').start();
+        const result = await new HttpClient()
+          .headers(headers)
+          .get(`${baseUrl}/stacks/branches`)
+          .then(({ data: { branches } }) => branches)
+
+        const condition = (
+          result &&
+          Array.isArray(result) &&
+          result.length > 0
+        )
+
+        // NOTE if want to get only list of branches (Pass param -> returnBranch = true )
+        if (returnBranch) {
+          resolve(condition ? result : [])
+        } else {
+          // NOTE list options to use to select branch
+          if (condition) {
+            spinner.succeed('Fetched Branches');
+            const { branch } = await inquirer.prompt({
+              type: 'list',
+              name: 'branch',
+              message: 'Choose a branch',
+              choices: result.map(row => row.uid),
+            });
 
-            if (branches && branches.items && branches.items.length) {
-              config.sourceStackBranch = 'main';
+            if (isSource) {
+              config.sourceStackBranch = branch
+            } else {
+              config.targetStackBranch = branch
             }
-          } catch (_error) {}
+          } else {
+            spinner.succeed('No branches found.!');
+          }
+
+          resolve()
         }
+      } catch (e) {
+        spinner.fail();
+        console.log(e && e.message)
+        resolve()
+      }
+    })
+  }
 
-        // NOTE Import section
-        if (exportRes) {
-          let canCreateStack = false;
+  async validateIfBranchExist(headers, isSource) {
+    const branch = isSource ? config.sourceStackBranch : config.targetStackBranch
+    const spinner = ora(`Validation if ${isSource ? 'source' : 'target'} branch exist.!`).start();
+    const isBranchExist = await HttpClient.create()
+      .headers(headers)
+      .get(`https://${config.host}/v3/stacks/branches/${branch}`)
+      .then(({ data }) => data);
+
+    const completeSpinner = (msg, method = 'succeed') => {
+      spinner[method](msg)
+      spinner.stop()
+    }
+
+    if (isBranchExist && typeof isBranchExist === 'object' && typeof isBranchExist.branch === 'object') {
+      completeSpinner(`${isSource ? 'Source' : 'Target'} branch verified.!`)
+    } else {
+      completeSpinner(`${isSource ? 'Source' : 'Target'} branch not found.!`, 'fail')
+      process.exit()
+    }
+  }
 
-          if (!config.target_stack) {
-            canCreateStack = await inquirer.prompt(stackCreationConfirmation);
-          }
+  execute() {
+    return new Promise(async (resolve, reject) => {
+      let stackAbortController;
 
-          if (canCreateStack.stackCreate !== true) {
-            if (!config.target_stack) {
-              await handleOrgAndStackSelection(
-                'Choose an organization where the destination stack exists: ',
-                'Choose the destination stack:',
-                false,
+      try {
+        if (!config.source_stack) {
+          const orgMsg = 'Choose an organization where your source stack exists:';
+          const stackMsg = 'Select the source stack';
+
+          stackAbortController = new CustomAbortController();
+
+          const org = await cloneCommand.execute(new HandleOrgCommand({ msg: orgMsg, isSource: true }, this));
+          if (org) {
+            const sourceStack = await cloneCommand.execute(new HandleStackCommand({ org, isSource: true, msg: stackMsg, stackAbortController }, this));
+
+            if (config.source_stack) {
+              await cloneCommand.execute(
+                new HandleBranchCommand({ api_key: config.source_stack }, this)
               );
             }
 
-            if (config.target_stack) {
-              this.cloneTypeSelection()
-                .then(resolve)
-                .catch((error) => reject(error.errorMessage));
+            if (stackAbortController.signal.aborted) {
+              return reject();
             }
+            stackName.default = config.stackName || `Copy of ${sourceStack.stack || config.source_alias}`;
           } else {
-            const destinationOrg = await this.#handleOrgSelection({
-              isSource: false,
-              msg: 'Choose an organization where you want to create a stack: ',
-            }).catch((error) => reject(error.errorMessage));
-            const orgUid = orgUidList[destinationOrg.Organization];
-            await this.createNewStack(orgUid).catch((error) => {
-              return reject(error.errorMessage + ' Contact the Organization owner for Stack Creation access.');
-            });
+            return reject('Org not found.');
+          }
+        }
+        const exportRes = await cloneCommand.execute(new HandleExportCommand(null, this));
+        await cloneCommand.execute(new SetBranchCommand(null, this));
+
+        if (exportRes) {
+          this.executeDestination().catch(() => { reject(); });
+        }
+        return resolve();
+      } catch (error) {
+        return reject(error);
+      } finally {
+        if (stackAbortController) {
+          stackAbortController.abort();
+        }
+      }
+    });
+  }
+
+  async executeDestination() {
+    return new Promise(async (resolve, reject) => {
+      let stackAbortController;
+      try {
+        stackAbortController = new CustomAbortController();
 
-            if (config.target_stack) {
-              this.cloneTypeSelection().then(resolve).catch(reject);
+        let canCreateStack = false;
+
+        if (!config.target_stack) {
+          canCreateStack = await inquirer.prompt(stackCreationConfirmation);
+        }
+
+        if (!canCreateStack.stackCreate) {
+          if (!config.target_stack) {
+            const orgMsg = 'Choose an organization where the destination stack exists: ';
+            const org = await cloneCommand.execute(new HandleOrgCommand({ msg: orgMsg }, this));
+
+            if (org) {
+              const stackMsg = 'Choose the destination stack:';
+              await cloneCommand.execute(new HandleDestinationStackCommand({ org, msg: stackMsg, stackAbortController, isSource: false }, this));
             }
           }
+
+          // NOTE GET list of branches if branches enabled
+          if (config.target_stack) {
+            await cloneCommand.execute(new HandleBranchCommand({ isSource: false, api_key: config.target_stack }, this));
+          }
+        } else {
+          const orgMsg = 'Choose an organization where you want to create a stack: ';
+          const destinationOrg = await cloneCommand.execute(new HandleOrgCommand({ msg: orgMsg }, this));
+          const orgUid = orgUidList[destinationOrg.Organization];
+          await cloneCommand.execute(new CreateNewStackCommand({ orgUid, stackAbortController }, this));
+        }
+        await cloneCommand.execute(new CloneTypeSelectionCommand(null, this));
+        return resolve();
+      } catch (error) {
+        reject(error);
+      } finally {
+        // If not aborted and ran successfully
+        if (!stackAbortController.signal.aborted) {
+          // Call clean dir.
+          rimraf(this.pathDir, function () {
+            // eslint-disable-next-line no-console
+            console.log('Stack cloning process have been completed successfully');
+          });
         }
       }
-    });
+    })
   }
 
-  getOrganizationChoices = async (orgMessage) => {
+  async setBranch() {
+    if (!config.sourceStackBranch) {
+      try {
+        const branches = await client.stack({ api_key: config.source_stack }).branch().query().find();
+
+        if (branches && branches.items && branches.items.length) {
+          config.sourceStackBranch = 'main';
+        }
+      } catch (_error) { }
+    }
+  }
+
+  async getOrganizationChoices(orgMessage) {
     let orgChoice = {
       type: 'list',
       name: 'Organization',
@@ -183,9 +343,9 @@ class CloneHandler {
       try {
         let organizations = await client.organization().fetchAll({ limit: 100 });
         spinner.succeed('Fetched Organization');
-        for (let i = 0; i < organizations.items.length; i++) {
-          orgUidList[organizations.items[i].name] = organizations.items[i].uid;
-          orgChoice.choices.push(organizations.items[i].name);
+        for (const element of organizations.items) {
+          orgUidList[element.name] = element.uid;
+          orgChoice.choices.push(element.name);
         }
         return resolve(orgChoice);
       } catch (e) {
@@ -195,7 +355,7 @@ class CloneHandler {
     });
   };
 
-  getStack = async (answer, stkMessage) => {
+  async getStack(answer, stkMessage) {
     return new Promise(async (resolve, reject) => {
       let stackChoice = {
         type: 'list',
@@ -209,10 +369,10 @@ class CloneHandler {
         const stackList = client.stack().query({ organization_uid }).find();
         stackList
           .then((stacklist) => {
-            for (let j = 0; j < stacklist.items.length; j++) {
-              stackUidList[stacklist.items[j].name] = stacklist.items[j].api_key;
-              masterLocaleList[stacklist.items[j].name] = stacklist.items[j].master_locale;
-              stackChoice.choices.push(stacklist.items[j].name);
+            for (const element of stacklist.items) {
+              stackUidList[element.name] = element.api_key;
+              masterLocaleList[element.name] = element.master_locale;
+              stackChoice.choices.push(element.name);
             }
             spinner.succeed('Fetched stack');
             return resolve(stackChoice);
@@ -228,30 +388,63 @@ class CloneHandler {
     });
   };
 
-  async createNewStack(orgUid) {
+  async createNewStack(options) {
+    let keyPressHandler;
     return new Promise(async (resolve, reject) => {
-      let inputvalue;
+      try {
+        const { orgUid, stackAbortController } = options;
+        let inputvalue;
+        let uiPromise;
+
+        keyPressHandler = async function (_ch, key) {
+          if (key.name === 'left' && key.shift) {
+            stackAbortController.abort();
+            // We need to close the inquirer promise correctly, otherwise the unclosed question/answer text is displayed in next line.
+            if (uiPromise) {
+              uiPromise.ui.close();
+            }
+            console.clear();
+            process.stdin.removeListener('keypress', keyPressHandler);
+            await cloneCommand.undo();
+          }
+        };
+        process.stdin.addListener('keypress', keyPressHandler);
 
-      if (!config.stackName) {
-        inputvalue = await inquirer.prompt(stackName);
-      } else {
-        inputvalue = { stack: config.stackName };
-      }
+        const ui = new inquirer.ui.BottomBar();
+        ui.updateBottomBar(chalk.cyan('\nPress shift & left arrow together to undo the operation\n'));
+
+        if (!config.stackName) {
+          uiPromise = inquirer.prompt(stackName);
+          inputvalue = await uiPromise;
+        } else {
+          inputvalue = { stack: config.stackName };
+        }
+
+        if (stackAbortController.signal.aborted) {
+          return reject();
+        }
 
-      let stack = { name: inputvalue.stack, master_locale: master_locale };
-      const spinner = ora('Creating New stack').start();
-      let newStack = client.stack().create({ stack }, { organization_uid: orgUid });
-      newStack
-        .then((result) => {
-          spinner.succeed('New Stack created Successfully name as ' + result.name);
-          config.target_stack = result.api_key;
-          config.destinationStackName = result.name;
-          return resolve(result);
-        })
-        .catch((error) => {
-          spinner.fail();
-          return reject(error);
-        });
+        let stack = { name: inputvalue.stack, master_locale: master_locale };
+        const spinner = ora('Creating New stack').start();
+        let newStack = client.stack().create({ stack }, { organization_uid: orgUid });
+        newStack
+          .then((result) => {
+            spinner.succeed('New Stack created Successfully name as ' + result.name);
+            config.target_stack = result.api_key;
+            config.destinationStackName = result.name;
+            return resolve(result);
+          })
+          .catch((error) => {
+            spinner.fail();
+            return reject(error.errorMessage + ' Contact the Organization owner for Stack Creation access.');
+          });
+      } catch (error) {
+        return reject(error);
+      } finally {
+        if (keyPressHandler) {
+          process.stdin.removeListener('keypress', keyPressHandler);
+        }
+      }
     });
   }
 
@@ -323,6 +516,8 @@ class CloneHandler {
         cmd.push('--import-webhook-status', config.importWebhookStatus);
       }
 
+      if (config.forceMarketplaceAppsImport) cmd.push('-y')
+
       await importCmd.run(cmd);
       return resolve();
     });