Fixed the issue of exporting multiple branches

Author: cs-raj

.talismanrc

@@ -65,4 +65,6 @@ fileignoreconfig:
   checksum: a4a968a20d5ab7cbc08c266819907541bbf793cc098521a5e810ada3cbacbee6
 - filename: packages/contentstack-clone/src/commands/cm/stacks/clone.js
   checksum: 433a84a882ea3f12b27127d47d289dfc64dda6b6fc956369f5851daaa57ae493
-version: "1.0"
+- filename: packages/contentstack-clone/src/lib/util/clone-handler.js
+  checksum: 89215a2549276407db2dbd25506acabdeb6f9bc53984a7c8b4456cd4df77cf43
+version: "1.0"

packages/contentstack-clone/src/commands/cm/stacks/clone.js

@@ -1,5 +1,5 @@
 const { Command } = require('@contentstack/cli-command');
-const { configHandler, flags, isAuthenticated, managementSDKClient, getBranchFromAlias } = require('@contentstack/cli-utilities');
+const { configHandler, flags, isAuthenticated, managementSDKClient } = require('@contentstack/cli-utilities');
 const { CloneHandler } = require('../../../lib/util/clone-handler');
 const path = require('path');
 const { rimraf } = require('rimraf');
@@ -83,8 +83,6 @@ class StackCloneCommand extends Command {
         }
 
         const managementAPIClient = await managementSDKClient(config);
-        
-        await this.resolveBranchAliases(config, managementAPIClient);
 
         await this.removeContentDirIfNotEmptyBeforeClone(pathdir); // NOTE remove if folder not empty before clone
         this.registerCleanupOnInterrupt(pathdir);
@@ -126,32 +124,7 @@ class StackCloneCommand extends Command {
     }
   }
 
-  async resolveBranchAliases(config, managementAPIClient) {
-    try {
-      if (config.sourceStackBranchAlias && !config.sourceStackBranch) {
-        console.log(`Resolving source branch alias: ${config.sourceStackBranchAlias}`);
-        const sourceStack = managementAPIClient.stack({ api_key: config.source_stack });
-        config.sourceStackBranch = await getBranchFromAlias(sourceStack, config.sourceStackBranchAlias);
-        console.log(`Source branch alias resolved to: ${config.sourceStackBranch}`);
-      }
-
-      if (config.targetStackBranchAlias && !config.targetStackBranch) {
-        console.log(`Resolving target branch alias: ${config.targetStackBranchAlias}`);
-        const targetStack = managementAPIClient.stack({ api_key: config.target_stack });
-        config.targetStackBranch = await getBranchFromAlias(targetStack, config.targetStackBranchAlias);
-      }
-
-      if (!config.sourceStackBranch && !config.sourceStackBranchAlias) {
-        console.log('No source branch specified, will use default branch');
-      }
-      if (!config.targetStackBranch && !config.targetStackBranchAlias) {
-        console.log('No target branch specified, will use default branch');
-      }
 
-    } catch (error) {
-      throw error;
-    }
-  }
 
   async removeContentDirIfNotEmptyBeforeClone(dir) {
     try {

packages/contentstack-clone/src/lib/util/clone-handler.js

@@ -21,7 +21,7 @@ const {
   Clone,
   HandleBranchCommand,
 } = require('../helpers/command-helpers');
-const { configHandler } = require('@contentstack/cli-utilities');
+const { configHandler, getBranchFromAlias } = require('@contentstack/cli-utilities');
 
 let client = {};
 let config;
@@ -137,16 +137,24 @@ class CloneHandler {
       let spinner;
       try {
         const stackAPIClient = client.stack({
-          api_key: config.target_stack ? config.target_stack : config.source_stack,
+          api_key: isSource ? config.source_stack : config.target_stack,
           management_token: config.management_token,
         });
 
+        if (!config.sourceStackBranch && config.sourceStackBranchAlias) {
+          await this.resolveBranchAliases(true);
+          return resolve();
+        }
         // NOTE validate if source branch is exist
         if (isSource && config.sourceStackBranch) {
           await this.validateIfBranchExist(stackAPIClient, true);
           return resolve();
         }
 
+        if (!config.targetStackBranch && config.targetStackBranchAlias) {
+          await this.resolveBranchAliases();
+          return resolve();
+        }
         // NOTE Validate target branch is exist
         if (!isSource && config.targetStackBranch) {
           await this.validateIfBranchExist(stackAPIClient, false);
@@ -272,6 +280,8 @@ class CloneHandler {
             return reject('Org not found.');
           }
         } else {
+          this.setExectingCommand(2);
+          await this.handleBranchSelection({ api_key: config.sourceStack });
           const exportRes = await cloneCommand.execute(new HandleExportCommand(null, this));
           await cloneCommand.execute(new SetBranchCommand(null, this));
 
@@ -471,7 +481,7 @@ class CloneHandler {
         } else {
           organizations = await client.organization().fetchAll({ limit: 100 });
         }
-        
+
         spinner.succeed('Fetched Organization');
         for (const element of organizations.items || [organizations]) {
           orgUidList[element.name] = element.uid;
@@ -579,6 +589,20 @@ class CloneHandler {
     });
   }
 
+  async resolveBranchAliases(isSource = false) {
+    try {
+      if (isSource) {
+        const sourceStack = client.stack({ api_key: config.source_stack });
+        config.sourceStackBranch = await getBranchFromAlias(sourceStack, config.sourceStackBranchAlias);
+      } else {
+        const targetStack = client.stack({ api_key: config.target_stack });
+        config.targetStackBranch = await getBranchFromAlias(targetStack, config.targetStackBranchAlias);
+      }
+    } catch (error) {
+      throw error;
+    }
+  }
+
   async cloneTypeSelection() {
     console.clear();
     return new Promise(async (resolve, reject) => {