@contentstack/cli-cm-import 1.28.0 → 1.28.2

package/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.28.0 linux-x64 node-v22.19.0
+@contentstack/cli-cm-import/1.28.2 linux-x64 node-v22.20.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -91,9 +91,8 @@ FLAGS
                                           extensions, marketplace-apps, global-fields, labels, locales, webhooks,
                                           workflows, custom-roles, personalize projects, and taxonomies.
   -y, --yes                               [optional] Force override all Marketplace prompts.
-      --branch-alias=<value>              The alias of the branch where you want to import your content. If you don't
-                                          mention the branch alias, then by default the content will be imported to the
-                                          main branch.
+      --branch-alias=<value>              Specify the branch alias where you want to import your content. If not
+                                          specified, the content is imported into the main branch by default.
       --exclude-global-modules            Excludes the branch-independent module from the import operation.
       --import-webhook-status=<option>    [default: disable] [default: disable] (optional) This webhook state keeps the
                                           same state of webhooks as the source stack. <options: disable|current>
@@ -160,9 +159,8 @@ FLAGS
                                           extensions, marketplace-apps, global-fields, labels, locales, webhooks,
                                           workflows, custom-roles, personalize projects, and taxonomies.
   -y, --yes                               [optional] Force override all Marketplace prompts.
-      --branch-alias=<value>              The alias of the branch where you want to import your content. If you don't
-                                          mention the branch alias, then by default the content will be imported to the
-                                          main branch.
+      --branch-alias=<value>              Specify the branch alias where you want to import your content. If not
+                                          specified, the content is imported into the main branch by default.
       --exclude-global-modules            Excludes the branch-independent module from the import operation.
       --import-webhook-status=<option>    [default: disable] [default: disable] (optional) This webhook state keeps the
                                           same state of webhooks as the source stack. <options: disable|current>

package/lib/commands/cm/stacks/import.js

@@ -133,7 +133,7 @@ ImportCommand.flags = {
         exclusive: ['branch-alias'],
     }),
     'branch-alias': cli_utilities_1.flags.string({
-        description: "The alias of the branch where you want to import your content. If you don't mention the branch alias, then by default the content will be imported to the main branch.",
+        description: "Specify the branch alias where you want to import your content. If not specified, the content is imported into the main branch by default.",
         exclusive: ['branch'],
     }),
     'import-webhook-status': cli_utilities_1.flags.string({

package/lib/import/module-importer.d.ts

@@ -1,4 +1,4 @@
-import { ContentstackClient, Logger } from '@contentstack/cli-utilities';
+import { ContentstackClient } from '@contentstack/cli-utilities';
 import { ImportConfig, Modules } from '../types';
 declare class ModuleImporter {
     private managementAPIClient;
@@ -20,6 +20,6 @@ declare 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`.
      */
-    auditImportData(logger: Logger): Promise<boolean>;
+    auditImportData(): Promise<boolean>;
 }
 export default ModuleImporter;

package/lib/import/module-importer.js

@@ -41,13 +41,11 @@ class ModuleImporter {
             // To support the old config
             this.importConfig.data = backupDir;
         }
-        // NOTE init log
-        const logger = (0, utils_1.initLogger)(this.importConfig);
         // NOTE audit and fix the import content.
         if (!this.importConfig.skipAudit &&
             (!this.importConfig.moduleName ||
                 ['content-types', 'global-fields', 'entries', 'extensions', 'workflows', 'custom-roles', 'assets'].includes(this.importConfig.moduleName))) {
-            if (!(await this.auditImportData(logger))) {
+            if (!(await this.auditImportData())) {
                 return { noSuccessMsg: true };
             }
         }
@@ -120,7 +118,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) {
+    async auditImportData() {
         const basePath = (0, path_1.resolve)(this.importConfig.cliLogsPath || this.importConfig.backupDir, 'logs', 'audit');
         const auditConfig = this.importConfig.auditConfig;
         auditConfig.config.basePath = basePath;
@@ -151,7 +149,7 @@ class ModuleImporter {
             if (result) {
                 const { hasFix, config } = result;
                 if (hasFix) {
-                    logger.log((0, messages_1.$t)(messages_1.default.FINAL_REPORT_PATH, { path: config.reportPath }), 'warn');
+                    cli_utilities_1.log.warn((0, messages_1.$t)(messages_1.default.FINAL_REPORT_PATH, { path: config.reportPath }), this.importConfig.context);
                     if (this.importConfig.forceStopMarketplaceAppsPrompt ||
                         (await cli_utilities_1.cliux.inquire({
                             type: 'confirm',

package/lib/utils/backup-handler.js

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

package/lib/utils/import-config-handler.js

@@ -35,13 +35,6 @@ const setupConfig = async (importCmdFlags) => {
     config.contentDir = path.resolve(config.contentDir);
     //Note to support the old key
     config.data = config.contentDir;
-    if ((0, file_helper_1.fileExistsSync)(path.join(config.contentDir, 'export-info.json'))) {
-        config.contentVersion =
-            ((await (0, file_helper_1.readFile)(path.join(config.contentDir, 'export-info.json'))) || {}).contentVersion || 2;
-    }
-    else {
-        config.contentVersion = 1;
-    }
     const managementTokenAlias = importCmdFlags['management-token-alias'] || importCmdFlags['alias'];
     if (managementTokenAlias) {
         const { token, apiKey } = (_a = cli_utilities_1.configHandler.get(`tokens.${managementTokenAlias}`)) !== null && _a !== void 0 ? _a : {};

package/lib/utils/import-path-resolver.d.ts

@@ -19,7 +19,7 @@ export declare const resolveImportPath: (importConfig: ImportConfig, stackAPICli
  * @param importConfig - The import configuration object
  * @param resolvedPath - The resolved path
  */
-export declare const updateImportConfigWithResolvedPath: (importConfig: ImportConfig, resolvedPath: string) => void;
+export declare const updateImportConfigWithResolvedPath: (importConfig: ImportConfig, resolvedPath: string) => Promise<void>;
 /**
  * Executes the complete import path resolution logic
  * @param importConfig - The import configuration object

package/lib/utils/import-path-resolver.js

@@ -107,7 +107,7 @@ exports.resolveImportPath = resolveImportPath;
  * @param importConfig - The import configuration object
  * @param resolvedPath - The resolved path
  */
-const updateImportConfigWithResolvedPath = (importConfig, resolvedPath) => {
+const updateImportConfigWithResolvedPath = async (importConfig, resolvedPath) => {
     cli_utilities_1.log.debug(`Updating import config with resolved path: ${resolvedPath}`);
     if (!(0, file_helper_1.fileExistsSync)(resolvedPath)) {
         cli_utilities_1.log.warn(`Resolved path does not exist: ${resolvedPath}, skipping config update`);
@@ -116,7 +116,17 @@ const updateImportConfigWithResolvedPath = (importConfig, resolvedPath) => {
     importConfig.branchDir = resolvedPath;
     importConfig.contentDir = resolvedPath;
     importConfig.data = resolvedPath;
-    cli_utilities_1.log.debug(`Import config updated - contentDir: ${importConfig.contentDir}, branchDir: ${importConfig.branchDir}, data: ${importConfig.data}`);
+    const exportInfoPath = path.join(resolvedPath, 'export-info.json');
+    if ((0, file_helper_1.fileExistsSync)(exportInfoPath)) {
+        const exportInfo = await (0, file_helper_1.readFile)(exportInfoPath);
+        importConfig.contentVersion = (exportInfo === null || exportInfo === void 0 ? void 0 : exportInfo.contentVersion) || 2;
+        cli_utilities_1.log.debug(`Content version set to ${importConfig.contentVersion} from ${exportInfoPath}`);
+    }
+    else {
+        importConfig.contentVersion = 1;
+        cli_utilities_1.log.debug(`No export-info.json found at ${exportInfoPath}, setting content version to 1`);
+    }
+    cli_utilities_1.log.debug(`Import config updated - contentDir: ${importConfig.contentDir}, branchDir: ${importConfig.branchDir}, data: ${importConfig.data}, contentVersion: ${importConfig.contentVersion}`);
 };
 exports.updateImportConfigWithResolvedPath = updateImportConfigWithResolvedPath;
 /**
@@ -128,7 +138,7 @@ exports.updateImportConfigWithResolvedPath = updateImportConfigWithResolvedPath;
 const executeImportPathLogic = async (importConfig, stackAPIClient) => {
     cli_utilities_1.log.debug('Executing import path resolution logic');
     const resolvedPath = await (0, exports.resolveImportPath)(importConfig, stackAPIClient);
-    (0, exports.updateImportConfigWithResolvedPath)(importConfig, resolvedPath);
+    await (0, exports.updateImportConfigWithResolvedPath)(importConfig, resolvedPath);
     return resolvedPath;
 };
 exports.executeImportPathLogic = executeImportPathLogic;

package/lib/utils/setup-branch.js

@@ -19,7 +19,7 @@ const setupBranchConfig = async (config, stackAPIClient) => {
             .find()
             .then(({ items }) => items);
         if (branches.length) {
-            cli_utilities_1.log.info(`Stack is branch enabled and branches exist. Default import will be done in main branch.`);
+            cli_utilities_1.log.info(`The stack is branch-enabled, and branches exist. By default, content will be imported into the main branch.`);
             config.branchName = 'main';
             cli_utilities_1.log.debug(`Setting default target branch to 'main'`);
         }

package/oclif.manifest.json

@@ -111,7 +111,7 @@
           "type": "option"
         },
         "branch-alias": {
-          "description": "The alias of the branch where you want to import your content. If you don't mention the branch alias, then by default the content will be imported to the main branch.",
+          "description": "Specify the branch alias where you want to import your content. If not specified, the content is imported into the main branch by default.",
           "exclusive": [
             "branch"
           ],
@@ -212,5 +212,5 @@
       ]
     }
   },
-  "version": "1.28.0"
+  "version": "1.28.2"
 }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.28.0",
+  "version": "1.28.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.14.1",
+    "@contentstack/cli-audit": "~1.15.0",
     "@contentstack/cli-command": "~1.6.1",
     "@contentstack/cli-utilities": "~1.14.1",
     "@contentstack/management": "~1.22.0",
@@ -57,7 +57,8 @@
     "lint": "eslint src/**/*.ts",
     "format": "eslint src/**/*.ts --fix",
     "test:integration": "mocha --forbid-only \"test/run.test.js\" --integration-test --timeout 60000",
-    "test:unit": "mocha --forbid-only \"test/unit/*.test.ts\""
+    "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\"",
+    "test:unit": "mocha --forbid-only \"test/**/*.test.ts\""
   },
   "engines": {
     "node": ">=14.0.0"