fix: added single branch export in the clone command

Author: cs-raj

packages/contentstack-clone/src/core/util/clone-handler.ts

@@ -644,8 +644,8 @@ export class CloneHandler {
         importConfig.contentDir = importConfig.data;
       }
 
-      if (!importConfig.contentDir && importConfig.sourceStackBranch && importConfig.pathDir) {
-        const dataPath = path.join(importConfig.pathDir, importConfig.sourceStackBranch);
+      if (!importConfig.contentDir && importConfig.pathDir) {
+        const dataPath = importConfig.pathDir;
         cmd.push('-d', dataPath);
         log.debug(`Import data path: ${dataPath}`, this.config.cloneContext);
       }
@@ -675,7 +675,7 @@ export class CloneHandler {
         cmd: cmd.join(' '),
         targetStack: importConfig.apiKey || importConfig.target_stack,
         targetBranch: importConfig.targetStackBranch,
-        dataPath: importConfig.contentDir || (importConfig.pathDir && importConfig.sourceStackBranch ? path.join(importConfig.pathDir, importConfig.sourceStackBranch) : undefined)
+        dataPath: importConfig.contentDir || importConfig.pathDir || undefined
       });
       log.debug('Running import command', { ...this.config.cloneContext, cmd });
       const importData = importCmd.run(cmd);
@@ -804,9 +804,10 @@ export class CloneHandler {
         ];
         let successMsg: string;
         let selectedValue: any = {};
-        // Resolve path to package root - go up 3 levels from __dirname (core/util -> package root)
+        // Export root only (single-branch layout: modules live directly under -d, not pathDir/<branch>)
         const cloneTypePackageRoot = path.resolve(__dirname, '../../..');
-        this.config.contentDir = path.join(cloneTypePackageRoot, 'contents', this.config.sourceStackBranch || '');
+        this.config.contentDir =
+          this.config.pathDir || path.join(cloneTypePackageRoot, 'contents');
         log.debug(`Clone content directory: ${this.config.contentDir}`, this.config.cloneContext);
 
         if (!this.config.cloneType) {

packages/contentstack-clone/src/types/clone-config.ts

@@ -31,7 +31,7 @@ export interface CloneConfig {
   forceStopMarketplaceAppsPrompt?: boolean;
 
   // Data and modules
-  /** Path to exported content for import (aligns with import plugin's contentDir) */
+  /** Export root directory for import (same path as export `-d`; not a branch-named subdirectory) */
   contentDir?: string;
   modules?: string[];
   filteredModules?: string[];

packages/contentstack-clone/test/lib/util/clone-handler.commands.test.ts

@@ -195,7 +195,7 @@ describe('CloneHandler - Commands', () => {
       expect(cmdArgs).to.include('dest-alias');
     });
 
-    it('should execute import command with sourceStackBranch data path (covers lines 637-641)', async () => {
+    it('should execute import command with pathDir as export root when contentDir unset (single-branch layout)', async () => {
       const config: CloneConfig = {
         cloneContext: {
           command: 'test',
@@ -216,11 +216,10 @@ describe('CloneHandler - Commands', () => {
 
       expect(fsStub.writeFileSync.calledTwice).to.be.true;
       expect(importCmdStub.run.calledOnce).to.be.true;
-      // Verify -d flag with data path is added (line 639)
       const cmdArgs = importCmdStub.run.firstCall.args[0];
       expect(cmdArgs).to.include('-d');
       const dataPathIndex = cmdArgs.indexOf('-d');
-      expect(cmdArgs[dataPathIndex + 1]).to.include('/test/path/main');
+      expect(cmdArgs[dataPathIndex + 1]).to.equal('/test/path');
     });
 
     it('should execute import command with data path instead of sourceStackBranch (covers line 637 condition)', async () => {