Merge pull request #2101 from contentstack/fix/DX-3246

add path validation while import

Author: naman-contentstack

.talismanrc

@@ -1,8 +1,8 @@
 fileignoreconfig:
 - filename: package-lock.json
-  checksum: 59d20d0ac10b0d5d4014817c8453e4aa9fe0be396f7902999373273a9d471658
+  checksum: b7a69ac42575d552fa99e0f7b62fa16485cdb8bb83efec3c5d46c22537e8bc37
 - filename: pnpm-lock.yaml
-  checksum: 7cade45c0e4ff4755b6e7d0f7ce0e40fa5b62131513d9f800635ef4288fdc058
+  checksum: 62fc7744149464cc3a0b285544e90739d48e8e1384ac211d4799389c3c78db10
 - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
   checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
 - filename: packages/contentstack-import-setup/test/config.json
@@ -81,4 +81,10 @@ fileignoreconfig:
   checksum: 7024f22a6ed3908d7cf074bbd8e7107e2d9f43bbcc42939b28d360c89d44cc29
 - filename: packages/contentstack-bulk-publish/src/util/generate-bulk-publish-url.js
   checksum: 5f7c1e2fac3e7fab21e861d609c54ca7191ee09fd076dd0adc66604043bf7a43
+- filename: packages/contentstack-import/src/utils/interactive.ts
+  checksum: b401a6166313c184712ff623ea8d95a5548fb3d8b8229c053ae44a1850b54a72
+- filename: packages/contentstack-import-setup/src/utils/backup-handler.ts
+  checksum: 7db02c6f2627400b28fc96d505bf074d477080a45ba13943709d4845b6ca0908
+- filename: packages/contentstack-import/src/utils/backup-handler.ts
+  checksum: 4f7a8bea92ebffbc34a0979b3a63fef327562a899b773481d67a675140cfa4bf
 version: "1.0"

package-lock.json

@@ -16,7 +16,7 @@
     "test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
   },
   "dependencies": {
-    "@contentstack/cli-cm-seed": "~1.12.1",
+    "@contentstack/cli-cm-seed": "~1.12.2",
     "@contentstack/cli-command": "~1.6.1",
     "@contentstack/cli-utilities": "~1.14.0",
     "@oclif/core": "^4.3.0",

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/1.15.0 darwin-arm64 node-v22.13.1
+@contentstack/cli-cm-clone/1.16.1 darwin-arm64 node-v22.13.1
 $ 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": "1.16.0",
+  "version": "1.16.1",
   "author": "Contentstack",
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@colors/colors": "^1.6.0",
     "@contentstack/cli-cm-export": "~1.20.1",
-    "@contentstack/cli-cm-import": "~1.27.0",
+    "@contentstack/cli-cm-import": "~1.28.0",
     "@contentstack/cli-command": "~1.6.1",
     "@contentstack/cli-utilities": "~1.14.0",
     "@oclif/core": "^4.3.0",

packages/contentstack-clone/package.json

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import-setup
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import-setup/1.4.0 darwin-arm64 node-v22.13.1
+@contentstack/cli-cm-import-setup/1.5.0 darwin-arm64 node-v22.13.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-import-setup/README.md

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import-setup",
   "description": "Contentstack CLI plugin to setup the mappers and configurations for the import command",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

packages/contentstack-import-setup/package.json

@@ -10,15 +10,13 @@ export default async function backupHandler(importConfig: ImportConfig): Promise
     return importConfig.useBackedupDir;
   }
 
+  const sourceDir = importConfig.branchDir || importConfig.contentDir;
+
   let backupDirPath: string;
-  const subDir = isSubDirectory(importConfig);
+  const subDir = isSubDirectory(importConfig, sourceDir);
 
   if (subDir) {
-    backupDirPath = path.resolve(
-      sanitizePath(importConfig.contentDir),
-      '..',
-      '_backup_' + Math.floor(Math.random() * 1000),
-    );
+    backupDirPath = path.resolve(sanitizePath(sourceDir), '..', '_backup_' + Math.floor(Math.random() * 1000));
     if (importConfig.createBackupDir) {
       cliux.print(
         `Warning!!! Provided backup directory path is a sub directory of the content directory, Cannot copy to a sub directory. Hence new backup directory created - ${backupDirPath}`,
@@ -42,7 +40,7 @@ export default async function backupHandler(importConfig: ImportConfig): Promise
   if (backupDirPath) {
     cliux.print('Copying content to the backup directory...');
     return new Promise((resolve, reject) => {
-      return copy(importConfig.contentDir, backupDirPath, (error: any) => {
+      return copy(sourceDir, backupDirPath, (error: any) => {
         if (error) {
           trace(error, 'error', true);
           return reject(error);
@@ -58,8 +56,8 @@ export default async function backupHandler(importConfig: ImportConfig): Promise
  * @param importConfig
  * @returns
  */
-function isSubDirectory(importConfig: ImportConfig) {
-  const parent = importConfig.contentDir;
+function isSubDirectory(importConfig: ImportConfig, sourceDir: string) {
+  const parent = sourceDir;
   const child = importConfig.createBackupDir ? importConfig.createBackupDir : process.cwd();
   const relative = path.relative(parent, child);
 

packages/contentstack-import-setup/src/utils/backup-handler.ts

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.27.0 darwin-arm64 node-v22.14.0
+@contentstack/cli-cm-import/1.28.0 darwin-arm64 node-v22.14.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-import/README.md

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.27.0",
+  "version": "1.28.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {