Merge branch 'development' into enhancement/DX-3527

Author: naman-contentstack

.talismanrc

@@ -1,8 +1,8 @@
 fileignoreconfig:
 - filename: package-lock.json
-  checksum: 7b7fe071c1cb7590ac4013c63ea9dae881e48733922130049e486f6334493bd0
+  checksum: fcf443a7d000c204976bec6de43a0d454184090bf7133325df0009fe245295b2
 - filename: pnpm-lock.yaml
-  checksum: 57601df23c66ae1c6a2eb2373059ed706535c8766889fa00844438cd2dc1f380
+  checksum: 577582ed82062ad359d8bc2bc0a309ab4d344a2a4122573d8cf77aeb481268f2
 - filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
   checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
 - filename: packages/contentstack-import-setup/test/config.json
@@ -86,9 +86,5 @@ fileignoreconfig:
 - filename: packages/contentstack-import-setup/src/utils/backup-handler.ts
   checksum: 7db02c6f2627400b28fc96d505bf074d477080a45ba13943709d4845b6ca0908
 - filename: packages/contentstack-import/src/utils/backup-handler.ts
-  checksum: 4f7a8bea92ebffbc34a0979b3a63fef327562a899b773481d67a675140cfa4bf
-- filename: packages/contentstack-branches/src/branch/diff-handler.ts
-  checksum: dc9760bdf71044a9baf56f38b34bafcb0ea06ba0764a624ba465b1169aa2b8df
-- filename: packages/contentstack-branches/src/utils/csv-utility.ts
-  checksum: 14844828de67bb41c7df35d19901473f930dc9269d378a6dd63b0c7165a49185
+  checksum: 0a9accdafce01837166223ed00cd801e2ebb39a4ef952231f67232859a5beea8
 version: "1.0"

package-lock.json

@@ -149,7 +149,8 @@ FLAGS
   -k, --stack-api-key=<value>   [optional] Provide the stack API key to show the difference between branches.
       --base-branch=<value>     [optional] Base branch (Target branch).
       --compare-branch=<value>  [optional] Compare branch (Source branch).
-      --csv-path=<value>        [optional] Custom path for CSV output file. If not provided, will prompt for path.
+      --csv-path=<value>        [optional] Custom path for CSV output file. If not provided, will use the current
+                                working directory.
       --format=<option>         [default: compact-text] [default: compact-text] [optional] Type of flags to show the
                                 difference between two branches. <options: compact-text, detailed-text>
                                 <options: compact-text|detailed-text>

packages/contentstack-branches/README.md

@@ -7,7 +7,7 @@
   "dependencies": {
     "@colors/colors": "^1.6.0",
     "@contentstack/cli-cm-export": "~1.20.1",
-    "@contentstack/cli-cm-import": "~1.28.0",
+    "@contentstack/cli-cm-import": "~1.28.1",
     "@contentstack/cli-command": "~1.6.1",
     "@contentstack/cli-utilities": "~1.14.1",
     "@oclif/core": "^4.3.0",

packages/contentstack-clone/package.json

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.28.0 darwin-arm64 node-v22.14.0
+@contentstack/cli-cm-import/1.28.1 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.28.0",
+  "version": "1.28.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

packages/contentstack-import/package.json

@@ -1,7 +1,7 @@
 import { resolve } from 'path';
 import { AuditFix } from '@contentstack/cli-audit';
 import messages, { $t } from '@contentstack/cli-audit/lib/messages';
-import { addLocale, cliux, ContentstackClient, Logger, log } from '@contentstack/cli-utilities';
+import { addLocale, cliux, ContentstackClient, log } from '@contentstack/cli-utilities';
 
 import startModuleImport from './modules';
 import startJSModuleImport from './modules-js';
@@ -10,7 +10,6 @@ import {
   backupHandler,
   masterLocalDetails,
   sanitizeStack,
-  initLogger,
   setupBranchConfig,
   executeImportPathLogic,
 } from '../utils';
@@ -30,14 +29,15 @@ class ModuleImporter {
   }
 
   async start(): Promise<any> {
+
     if (!this.importConfig.management_token) {
       const stackDetails: Record<string, unknown> = await this.stackAPIClient.fetch();
       this.importConfig.stackName = stackDetails.name as string;
       this.importConfig.org_uid = stackDetails.org_uid as string;
     }
-
+    
     await this.resolveImportPath();
-
+    
     await setupBranchConfig(this.importConfig, this.stackAPIClient);
     if (this.importConfig.branchAlias && this.importConfig.branchName) {
       this.stackAPIClient = this.managementAPIClient.stack({
@@ -58,9 +58,6 @@ class ModuleImporter {
       this.importConfig.data = backupDir;
     }
 
-    // NOTE init log
-    const logger = initLogger(this.importConfig);
-
     // NOTE audit and fix the import content.
     if (
       !this.importConfig.skipAudit &&
@@ -69,7 +66,7 @@ class ModuleImporter {
           this.importConfig.moduleName,
         ))
     ) {
-      if (!(await this.auditImportData(logger))) {
+      if (!(await this.auditImportData())) {
         return { noSuccessMsg: true };
       }
     }
@@ -152,7 +149,7 @@ class ModuleImporter {
    * @returns The function `auditImportData()` returns a boolean value. It returns `true` if there is a
    * fix available and the user confirms to proceed with the fix, otherwise it returns `false`.
    */
-  async auditImportData(logger: Logger) {
+  async auditImportData() {
     const basePath = resolve(this.importConfig.cliLogsPath || this.importConfig.backupDir, 'logs', 'audit');
     const auditConfig = this.importConfig.auditConfig;
     auditConfig.config.basePath = basePath;
@@ -189,7 +186,7 @@ class ModuleImporter {
         const { hasFix, config } = result;
 
         if (hasFix) {
-          logger.log($t(messages.FINAL_REPORT_PATH, { path: config.reportPath }), 'warn');
+          log.warn($t(messages.FINAL_REPORT_PATH, { path: config.reportPath }), this.importConfig.context);
 
           if (
             this.importConfig.forceStopMarketplaceAppsPrompt ||

packages/contentstack-import/src/import/module-importer.ts

@@ -54,7 +54,7 @@ export default async function backupHandler(importConfig: ImportConfig): Promise
 
   if (backupDirPath) {
     log.debug(`Starting content copy to backup directory: ${backupDirPath}`);
-    cliux.print('Copying content to the backup directory...');
+    log.info('Copying content to the backup directory...', importConfig.context);
 
     return new Promise((resolve, reject) => {
       return copy(sourceDir, backupDirPath, (error: any) => {

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

@@ -43,12 +43,6 @@ const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
   config.contentDir = path.resolve(config.contentDir);
   //Note to support the old key
   config.data = config.contentDir;
-  if (fileExistsSync(path.join(config.contentDir, 'export-info.json'))) {
-    config.contentVersion =
-      ((await readFile(path.join(config.contentDir, 'export-info.json'))) || {}).contentVersion || 2;
-  } else {
-    config.contentVersion = 1;
-  }
 
   const managementTokenAlias = importCmdFlags['management-token-alias'] || importCmdFlags['alias'];
 

packages/contentstack-import/src/utils/import-config-handler.ts

@@ -123,7 +123,7 @@ export const resolveImportPath = async (importConfig: ImportConfig, stackAPIClie
  * @param importConfig - The import configuration object
  * @param resolvedPath - The resolved path
  */
-export const updateImportConfigWithResolvedPath = (importConfig: ImportConfig, resolvedPath: string): void => {
+export const updateImportConfigWithResolvedPath = async (importConfig: ImportConfig, resolvedPath: string): Promise<void> => {
   log.debug(`Updating import config with resolved path: ${resolvedPath}`);
 
   if (!fileExistsSync(resolvedPath)) {
@@ -137,8 +137,18 @@ export const updateImportConfigWithResolvedPath = (importConfig: ImportConfig, r
 
   importConfig.data = resolvedPath;
 
+  const exportInfoPath = path.join(resolvedPath, 'export-info.json');
+  if (fileExistsSync(exportInfoPath)) {
+    const exportInfo = await readFile(exportInfoPath);
+    importConfig.contentVersion = exportInfo?.contentVersion || 2;
+    log.debug(`Content version set to ${importConfig.contentVersion} from ${exportInfoPath}`);
+  } else {
+    importConfig.contentVersion = 1;
+    log.debug(`No export-info.json found at ${exportInfoPath}, setting content version to 1`);
+  }
+
   log.debug(
-    `Import config updated - contentDir: ${importConfig.contentDir}, branchDir: ${importConfig.branchDir}, data: ${importConfig.data}`,
+    `Import config updated - contentDir: ${importConfig.contentDir}, branchDir: ${importConfig.branchDir}, data: ${importConfig.data}, contentVersion: ${importConfig.contentVersion}`,
   );
 };
 
@@ -153,7 +163,7 @@ export const executeImportPathLogic = async (importConfig: ImportConfig, stackAP
 
   const resolvedPath = await resolveImportPath(importConfig, stackAPIClient);
 
-  updateImportConfigWithResolvedPath(importConfig, resolvedPath);
+  await updateImportConfigWithResolvedPath(importConfig, resolvedPath);
 
   return resolvedPath;
 };