Merge pull request #2319 from contentstack/feat/DX-3820

feat: export and import config and code cleanup

Author: naman-contentstack

.talismanrc

@@ -1,6 +1,6 @@
 fileignoreconfig:
   - filename: pnpm-lock.yaml
-    checksum: 9c2344275cd3f95e2ade032a77908dda40f412c6b77e4a493885aad67e10db12
+    checksum: 41bc1d60449ab0682d9267172e54a5802c837869a1728b0560eea8052336c2fe
   - filename: package-lock.json
-    checksum: d523b3074e2441b4bca77213be6df16911e8ec699e51cc367520b8b56f0eaaf4
-version: "1.0"
+    checksum: 0514f96f07a6c2c5be811d8973a0b1197943303cfcf224c0b01745342699f545
+version: "1.0"

package-lock.json

@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bootstrap/2.0.0-beta.3 darwin-arm64 node-v24.12.0
+@contentstack/cli-cm-bootstrap/2.0.0-beta.4 darwin-arm64 node-v24.12.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-bootstrap/README.md

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-bootstrap",
   "description": "Bootstrap contentstack apps",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -16,7 +16,7 @@
     "test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
   },
   "dependencies": {
-    "@contentstack/cli-cm-seed": "~2.0.0-beta.3",
+    "@contentstack/cli-cm-seed": "~2.0.0-beta.4",
     "@contentstack/cli-command": "~1.7.0",
     "@contentstack/cli-utilities": "~1.15.0",
     "@oclif/core": "^4.3.0",
@@ -72,4 +72,4 @@
     }
   },
   "repository": "contentstack/cli"
-}
+}

packages/contentstack-bootstrap/package.json

@@ -16,7 +16,7 @@ $ npm install -g @contentstack/cli-cm-clone
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-clone/2.0.0-beta.4 darwin-arm64 node-v24.12.0
+@contentstack/cli-cm-clone/2.0.0-beta.5 darwin-arm64 node-v24.12.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-clone/README.md

@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-clone",
   "description": "Contentstack stack clone plugin",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.5",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@colors/colors": "^1.6.0",
-    "@contentstack/cli-cm-export": "~2.0.0-beta.4",
-    "@contentstack/cli-cm-import": "~2.0.0-beta.3",
+    "@contentstack/cli-cm-export": "~2.0.0-beta.5",
+    "@contentstack/cli-cm-import": "~2.0.0-beta.4",
     "@contentstack/cli-command": "~1.7.0",
     "@contentstack/cli-utilities": "~1.15.0",
     "@oclif/core": "^4.3.0",
@@ -64,4 +64,4 @@
       "cm:stacks:clone": "CLN"
     }
   }
-}
+}

packages/contentstack-clone/package.json

@@ -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-clone/src/lib/util/clone-handler.js

@@ -65,4 +65,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}

packages/contentstack-export-to-csv/package.json

@@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-export/2.0.0-beta.4 darwin-arm64 node-v24.12.0
+@contentstack/cli-cm-export/2.0.0-beta.5 darwin-arm64 node-v24.12.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-export/README.md

@@ -1,5 +1,4 @@
 {
-  "contentVersion": 2,
   "master_locale": {
     "name": "English - United States",
     "code": "en-us"