removed unnecessary code

Author: naman-contentstack

.talismanrc

@@ -84,7 +84,29 @@ fileignoreconfig:
   - filename: packages/contentstack-export/test/unit/export/modules/workflows.test.ts
     checksum: 9da983731811064de04e60a7ddd05ea558661dd17ac4e0c7da5be6cca8b2749d
   - filename: packages/contentstack-export/test/unit/utils/export-config-handler.test.ts
-    checksum: 0a4588401231be884781043314ad59e42c8896cb0a8cc288b1e10f6e4d79506a
+    checksum: 18600d1aab9507e3f8ee3caed3e6bd79ee05aff9444a2461fcb2f4d7fe6f27a6
   - filename: packages/contentstack-import/test/unit/import/modules/entries.test.ts
     checksum: 544e11881bc55ea7a1afc05e067d7b29fb2d165783ccd0ce3ff741ef7106b134
+  - filename: packages/contentstack-export/src/export/modules/environments.ts
+    checksum: 9c6e2cd260fba0ffd4deaf38835924642ab5ec2a4140185b3fe7eaec13305acb
+  - filename: packages/contentstack-import/src/utils/common-helper.ts
+    checksum: 68b605f9e952b05cbf1e9be04214e48f7409bce1eb5a3440183cea13b8cce49a
+  - filename: packages/contentstack-export/src/utils/marketplace-app-helper.ts
+    checksum: f5783ace09260150f63edc65e2d91b40310db60b57f9f56675e49b791bac84c8
+  - filename: packages/contentstack-import/src/utils/asset-helper.ts
+    checksum: e34bb0522ca8317408f905ee864e25d43acf52c595acaf397d1f35fcc49cbf4a
+  - filename: packages/contentstack-import/src/utils/login-handler.ts
+    checksum: 8bcefa5db69f894f3db49d8bca662dcc30f9247a3c4bf278c0d84d24a42481f6
+  - filename: packages/contentstack-import/src/utils/marketplace-app-helper.ts
+    checksum: caba03ffade8217dc8f82217a7f767fa6562fba63421d48f0aa8412b8463e21a
+  - filename: packages/contentstack-clone/src/lib/util/clone-handler.js
+    checksum: 3cf5eec54f0940eb269e3576298f1170268105073210af4a842b38fd7e969f43
+  - filename: packages/contentstack-import/src/import/modules/marketplace-apps.ts
+    checksum: b232e1c5a2b9dec7d6f01e671fd04eaa09351904ef0d20a8ab10f8ca60a2c365
+  - filename: packages/contentstack-export/src/export/modules/stack.ts
+    checksum: c2f1e06199bf55fd6d2ebd493edf9e746eabc00fd7c3b8da2785b024a35c9e7c
+  - filename: packages/contentstack-export/src/utils/basic-login.ts
+    checksum: d777e56768b53ecd9e5b0a27f4a59950e0791a5487dbcf4d2666510195e20767
+  - filename: packages/contentstack-import/test/unit/utils/import-config-handler.test.ts
+    checksum: 5c0add2367ef71367709a6668f4814f80fedda4cafba1f2149f8ceb136128c18
 version: '1.0'

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

@@ -76,7 +76,6 @@ class CloneHandler {
     cloneCommand = new Clone();
     this.pathDir = opt.pathDir;
     process.stdin.setMaxListeners(50);
-    log.debug('Initializing CloneHandler', config.cloneContext, { pathDir: opt.pathDir, cloneType: opt.cloneType });
   }
   setClient(managementSDKClient) {
     client = managementSDKClient;
@@ -706,9 +705,14 @@ class CloneHandler {
       delete exportConfig.import;
       delete exportConfig.export;
 
+      // Map source_stack to apiKey for export config
+      if (exportConfig.source_stack) {
+        exportConfig.apiKey = exportConfig.source_stack;
+      }
+
       const exportDir = __dirname.split('src')[0] + 'contents';
       log.debug(`Export directory: ${exportDir}`, config.cloneContext);
-      const cmd = ['-k', exportConfig.source_stack, '-d', exportDir];
+      const cmd = ['-k', exportConfig.apiKey || exportConfig.source_stack, '-d', exportDir];
 
       if (exportConfig.cloneType === 'a') {
         exportConfig.filteredModules = ['stack'].concat(structureList);
@@ -738,7 +742,7 @@ class CloneHandler {
       log.debug('Export command prepared', config.cloneContext, { 
         cmd: cmd.join(' '),
         exportDir,
-        sourceStack: exportConfig.source_stack,
+        sourceStack: exportConfig.apiKey || exportConfig.source_stack,
         branch: exportConfig.sourceStackBranch 
       });
       log.debug('Running export command', config.cloneContext, { cmd });
@@ -760,14 +764,22 @@ class CloneHandler {
       delete importConfig.import;
       delete importConfig.export;
 
+      // Map target_stack to apiKey and data to contentDir for import config
+      if (importConfig.target_stack) {
+        importConfig.apiKey = importConfig.target_stack;
+      }
+      if (importConfig.data) {
+        importConfig.contentDir = importConfig.data;
+      }
+
       const configFilePath = path.join(__dirname, 'dummyConfig.json');
       const cmd = ['-c', configFilePath];
 
       if (importConfig.destination_alias) {
         cmd.push('-a', importConfig.destination_alias);
         log.debug(`Using destination alias: ${importConfig.destination_alias}`, config.cloneContext);
       }
-      if (!importConfig.data && importConfig.sourceStackBranch) {
+      if (!importConfig.contentDir && !importConfig.data && importConfig.sourceStackBranch) {
         const dataPath = path.join(importConfig.pathDir, importConfig.sourceStackBranch);
         cmd.push('-d', dataPath);
         log.debug(`Import data path: ${dataPath}`, config.cloneContext);
@@ -795,9 +807,9 @@ class CloneHandler {
       fs.writeFileSync(configFilePath, JSON.stringify(importConfig));
       log.debug('Import command prepared', config.cloneContext, { 
         cmd: cmd.join(' '),
-        targetStack: importConfig.target_stack,
+        targetStack: importConfig.apiKey || importConfig.target_stack,
         targetBranch: importConfig.targetStackBranch,
-        dataPath: importConfig.data || path.join(importConfig.pathDir, importConfig.sourceStackBranch)
+        dataPath: importConfig.contentDir || importConfig.data || path.join(importConfig.pathDir, importConfig.sourceStackBranch)
       });
       log.debug('Running import command', config.cloneContext, { cmd });
       await importCmd.run(cmd);

packages/contentstack-export/src/commands/cm/stacks/export.ts

@@ -98,7 +98,7 @@ export default class ExportCommand extends Command {
       // Assign exportConfig variables
       this.assignExportConfig(exportConfig);
 
-      exportDir = sanitizePath(exportConfig.cliLogsPath || exportConfig.data || exportConfig.exportDir);
+      exportDir = sanitizePath(exportConfig.cliLogsPath || exportConfig.exportDir);
       const managementAPIClient: ContentstackClient = await managementSDKClient(exportConfig);
       const moduleExporter = new ModuleExporter(managementAPIClient, exportConfig);
       await moduleExporter.start();

packages/contentstack-export/src/export/modules/assets.ts

@@ -47,8 +47,8 @@ export default class ExportAssets extends BaseClass {
   }
 
   async start(): Promise<void> {
-    this.assetsRootPath = pResolve(
-      this.exportConfig.data,
+      this.assetsRootPath = pResolve(
+      this.exportConfig.exportDir,
       this.exportConfig.branchName || '',
       this.assetConfig.dirName,
     );

packages/contentstack-export/src/export/modules/composable-studio.ts

@@ -41,7 +41,7 @@ export default class ExportComposableStudio {
     }
 
     this.composableStudioPath = pResolve(
-      this.exportConfig.data,
+      this.exportConfig.exportDir,
       this.exportConfig.branchName || '',
       this.composableStudioConfig.dirName,
     );

packages/contentstack-export/src/export/modules/content-types.ts

@@ -47,7 +47,7 @@ export default class ContentTypesExport extends BaseClass {
     this.applyQueryFilters(this.qs, 'content-types');
 
     this.contentTypesDirPath = path.resolve(
-      sanitizePath(exportConfig.data),
+      sanitizePath(exportConfig.exportDir),
       sanitizePath(exportConfig.branchName || ''),
       sanitizePath(this.contentTypesConfig.dirName),
     );

packages/contentstack-export/src/export/modules/custom-roles.ts

@@ -43,7 +43,7 @@ export default class ExportCustomRoles extends BaseClass {
         'CUSTOM-ROLES: Analyzing roles and locales...',
         async () => {
           this.rolesFolderPath = pResolve(
-            this.exportConfig.data,
+            this.exportConfig.exportDir,
             this.exportConfig.branchName || '',
             this.customRolesConfig.dirName,
           );

packages/contentstack-export/src/export/modules/entries.ts

@@ -41,18 +41,18 @@ export default class EntriesExport extends BaseClass {
     this.exportConfig = exportConfig;
     this.entriesConfig = exportConfig.modules.entries;
     this.entriesDirPath = path.resolve(
-      sanitizePath(exportConfig.data),
+      sanitizePath(exportConfig.exportDir),
       sanitizePath(exportConfig.branchName || ''),
       sanitizePath(this.entriesConfig.dirName),
     );
     this.localesFilePath = path.resolve(
-      sanitizePath(exportConfig.data),
+      sanitizePath(exportConfig.exportDir),
       sanitizePath(exportConfig.branchName || ''),
       sanitizePath(exportConfig.modules.locales.dirName),
       sanitizePath(exportConfig.modules.locales.fileName),
     );
     this.schemaFilePath = path.resolve(
-      sanitizePath(exportConfig.data),
+      sanitizePath(exportConfig.exportDir),
       sanitizePath(exportConfig.branchName || ''),
       sanitizePath(exportConfig.modules.content_types.dirName),
       'schema.json',

packages/contentstack-export/src/export/modules/environments.ts

@@ -32,7 +32,7 @@ export default class ExportEnvironments extends BaseClass {
       // Setup with loading spinner
       const [totalCount] = await this.withLoadingSpinner('ENVIRONMENTS: Analyzing environments...', async () => {
         this.environmentsFolderPath = pResolve(
-          this.exportConfig.data,
+          this.exportConfig.exportDir,
           this.exportConfig.branchName || '',
           this.environmentConfig.dirName,
         );

packages/contentstack-export/src/export/modules/extensions.ts

@@ -33,7 +33,7 @@ export default class ExportExtensions extends BaseClass {
       // Setup with loading spinner
       const [totalCount] = await this.withLoadingSpinner('EXTENSIONS: Analyzing extensions...', async () => {
         this.extensionsFolderPath = pResolve(
-          this.exportConfig.data,
+          this.exportConfig.exportDir,
           this.exportConfig.branchName || '',
           this.extensionConfig.dirName,
         );