@contentstack/cli-cm-clone 1.15.0 → 1.16.0

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.15.0 darwin-arm64 node-v18.20.2
+@contentstack/cli-cm-clone/1.15.0 darwin-arm64 node-v22.13.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -62,9 +62,11 @@ FLAGS
       --skip-audit                                  (optional) Skips the audit fix that occurs during an import
                                                     operation.
       --source-branch=<value>                       Branch of the source stack.
+      --source-branch-alias=<value>                 Alias of Branch of the source stack.
       --source-management-token-alias=<value>       Source management token alias.
       --source-stack-api-key=<value>                Source stack API key
       --target-branch=<value>                       Branch of the target stack.
+      --target-branch-alias=<value>                 Alias of Branch of the target stack.
       --type=<option>                               Type of data to clone. You can select option a or b.
                                                     a) Structure (all modules except entries & assets).
                                                     b) Structure with content (all modules including entries & assets).
@@ -115,9 +117,11 @@ FLAGS
       --skip-audit                                  (optional) Skips the audit fix that occurs during an import
                                                     operation.
       --source-branch=<value>                       Branch of the source stack.
+      --source-branch-alias=<value>                 Alias of Branch of the source stack.
       --source-management-token-alias=<value>       Source management token alias.
       --source-stack-api-key=<value>                Source stack API key
       --target-branch=<value>                       Branch of the target stack.
+      --target-branch-alias=<value>                 Alias of Branch of the target stack.
       --type=<option>                               Type of data to clone. You can select option a or b.
                                                     a) Structure (all modules except entries & assets).
                                                     b) Structure with content (all modules including entries & assets).

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@colors/colors": "^1.6.0",
-    "@contentstack/cli-cm-export": "~1.18.0",
-    "@contentstack/cli-cm-import": "~1.26.0",
-    "@contentstack/cli-command": "~1.6.0",
-    "@contentstack/cli-utilities": "~1.13.0",
+    "@contentstack/cli-cm-export": "~1.20.0",
+    "@contentstack/cli-cm-import": "~1.27.0",
+    "@contentstack/cli-command": "~1.6.1",
+    "@contentstack/cli-utilities": "~1.14.0",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",
     "chalk": "^4.1.2",

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

@@ -18,7 +18,9 @@ class StackCloneCommand extends Command {
         type: cloneType,
         'stack-name': stackName,
         'source-branch': sourceStackBranch,
+        'source-branch-alias': sourceStackBranchAlias,
         'target-branch': targetStackBranch,
+        'target-branch-alias': targetStackBranchAlias,
         'source-stack-api-key': sourceStackApiKey,
         'destination-stack-api-key': destinationStackApiKey,
         'source-management-token-alias': sourceManagementTokenAlias,
@@ -47,8 +49,14 @@ class StackCloneCommand extends Command {
         if (sourceStackBranch) {
           config.sourceStackBranch = sourceStackBranch;
         }
+        if (sourceStackBranchAlias) {
+          config.sourceStackBranchAlias = sourceStackBranchAlias;
+        }
         if (targetStackBranch) {
           config.targetStackBranch = targetStackBranch;
+        }
+         if (targetStackBranchAlias) {
+          config.targetStackBranchAlias = targetStackBranchAlias;
         }
         if (sourceStackApiKey) {
           config.source_stack = sourceStackApiKey;
@@ -74,6 +82,8 @@ class StackCloneCommand extends Command {
           config.importWebhookStatus = importWebhookStatus;
         }
 
+        const managementAPIClient = await managementSDKClient(config);
+
         await this.removeContentDirIfNotEmptyBeforeClone(pathdir); // NOTE remove if folder not empty before clone
         this.registerCleanupOnInterrupt(pathdir);
 
@@ -82,7 +92,6 @@ class StackCloneCommand extends Command {
         config.cdn = this.cdaHost;
         config.pathDir = pathdir;
         const cloneHandler = new CloneHandler(config);
-        const managementAPIClient = await managementSDKClient(config);
         cloneHandler.setClient(managementAPIClient);
         cloneHandler.execute().catch((error) => {
           console.log(error);
@@ -115,6 +124,8 @@ class StackCloneCommand extends Command {
     }
   }
 
+
+
   async removeContentDirIfNotEmptyBeforeClone(dir) {
     try {
       const dirNotEmpty = readdirSync(dir).length;
@@ -202,11 +213,25 @@ StackCloneCommand.flags = {
     required: false,
     multiple: false,
     description: 'Branch of the source stack.',
+    exclusive: ['source-branch-alias']
+  }),
+  'source-branch-alias': flags.string({
+    required: false,
+    multiple: false,
+    description: 'Alias of Branch of the source stack.',
+    exclusive: ['source-branch']
   }),
   'target-branch': flags.string({
     required: false,
     multiple: false,
     description: 'Branch of the target stack.',
+    exclusive: ['target-branch-alias']
+  }),
+  'target-branch-alias': flags.string({
+    required: false,
+    multiple: false,
+    description: 'Alias of Branch of the target stack.',
+    exclusive: ['target-branch']
   }),
   'source-management-token-alias': flags.string({
     required: false,
@@ -229,8 +254,8 @@ StackCloneCommand.flags = {
     multiple: false,
     options: ['a', 'b'],
     description: ` Type of data to clone. You can select option a or b.
-a) Structure (all modules except entries & assets).
-b) Structure with content (all modules including entries & assets).
+      a) Structure (all modules except entries & assets).
+      b) Structure with content (all modules including entries & assets).
     `,
   }),
   'source-stack-api-key': flags.string({

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

@@ -8,7 +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 cloneDeep = require('lodash/cloneDeep');
 
 const {
   HandleOrgCommand,
@@ -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,7 +137,7 @@ 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,
         });
 
@@ -145,12 +145,18 @@ class CloneHandler {
         if (isSource && config.sourceStackBranch) {
           await this.validateIfBranchExist(stackAPIClient, true);
           return resolve();
+        } else if(isSource && config.sourceStackBranchAlias) {
+          await this.resolveBranchAliases(true);
+          return resolve();
         }
 
         // NOTE Validate target branch is exist
         if (!isSource && config.targetStackBranch) {
           await this.validateIfBranchExist(stackAPIClient, false);
           return resolve();
+        } else if (!isSource && config.targetStackBranchAlias) {
+          await this.resolveBranchAliases();
+          return resolve();
         }
         spinner = ora('Fetching Branches').start();
         const result = await stackAPIClient
@@ -272,6 +278,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 +479,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 +587,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) => {
@@ -618,7 +640,7 @@ class CloneHandler {
   async cmdExport() {
     return new Promise((resolve, reject) => {
       // Creating export specific config by merging external configurations
-      let exportConfig = Object.assign({}, cloneDeep(config), {...config?.export});
+      let exportConfig = Object.assign({}, cloneDeep(config), { ...config?.export });
       delete exportConfig.import;
       delete exportConfig.export;
 
@@ -648,7 +670,7 @@ 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});
+      let importConfig = Object.assign({}, cloneDeep(config), { ...config?.import });
       delete importConfig.import;
       delete importConfig.export;
 
@@ -673,7 +695,7 @@ class CloneHandler {
 
       fs.writeFileSync(path.join(__dirname, 'dummyConfig.json'), JSON.stringify(importConfig));
       await importCmd.run(cmd);
-      fs.writeFileSync(path.join(__dirname, 'dummyConfig.json'), JSON.stringify({}))
+      fs.writeFileSync(path.join(__dirname, 'dummyConfig.json'), JSON.stringify({}));
       return resolve();
     });
   }