@contentstack/cli-cm-import-setup 1.7.2 → 2.0.0-beta.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2026 Contentstack
+Copyright (c) 2024 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import-setup
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import-setup/1.7.2 linux-x64 node-v22.21.1
+@contentstack/cli-cm-import-setup/2.0.0-beta.2 linux-x64 node-v22.21.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -59,44 +59,6 @@ USAGE
 
 <!-- commands -->
 * [`csdx cm:stacks:import-setup [-k <value>] [-d <value>] [-a <value>] [--modules <value,value>]`](#csdx-cmstacksimport-setup--k-value--d-value--a-value---modules-valuevalue)
-* [`csdx cm:stacks:import-setup [-k <value>] [-d <value>] [-a <value>] [--modules <value,value>]`](#csdx-cmstacksimport-setup--k-value--d-value--a-value---modules-valuevalue)
-
-## `csdx cm:stacks:import-setup [-k <value>] [-d <value>] [-a <value>] [--modules <value,value>]`
-
-Helps to generate mappers and backup folder for importing (overwriting) specific modules
-
-```
-USAGE
-  $ csdx cm:import-setup cm:stacks:import-setup [-k <value>] [-d <value>] [-a <value>] [--modules <value,value>]
-
-FLAGS
-  -B, --branch=<value>         The name of the branch where you want to import your content. If you don't mention the
-                               branch name, then by default the content will be imported to the main branch.
-  -a, --alias=<value>          The management token of the destination stack where you will import the content.
-  -d, --data-dir=<value>       The path or the location in your file system where the content, you intend to import, is
-                               stored. For example, -d "C:\Users\Name\Desktop\cli\content". If the export folder has
-                               branches involved, then the path should point till the particular branch. For example,
-                               “-d "C:\Users\Name\Desktop\cli\content\branch_name"
-  -k, --stack-api-key=<value>  API key of the target stack
-      --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.
-      --module=<option>...     [optional] Specify the modules/module to import into the target stack. currently options
-                               are global-fields, content-types, entries
-                               <options: global-fields|content-types|entries>
-
-DESCRIPTION
-  Helps to generate mappers and backup folder for importing (overwriting) specific modules
-
-ALIASES
-  $ csdx cm:import-setup
-
-EXAMPLES
-  $ csdx cm:stacks:import-setup --stack-api-key <target_stack_api_key> --data-dir <path/of/export/destination/dir> --modules <module_name, module_name>
-
-  $ csdx cm:stacks:import-setup -k <target_stack_api_key> -d <path/of/export/destination/dir> --modules <module_name, module_name>
-
-  $ csdx cm:stacks:import-setup -k <target_stack_api_key> -d <path/of/export/destination/dir> --modules <module_name, module_name> -b <branch_name>
-```
 
 ## `csdx cm:stacks:import-setup [-k <value>] [-d <value>] [-a <value>] [--modules <value,value>]`
 
@@ -107,14 +69,14 @@ USAGE
   $ csdx cm:stacks:import-setup [-k <value>] [-d <value>] [-a <value>] [--modules <value,value>]
 
 FLAGS
-  -B, --branch=<value>         The name of the branch where you want to import your content. If you don't mention the
-                               branch name, then by default the content will be imported to the main branch.
   -a, --alias=<value>          The management token of the destination stack where you will import the content.
   -d, --data-dir=<value>       The path or the location in your file system where the content, you intend to import, is
                                stored. For example, -d "C:\Users\Name\Desktop\cli\content". If the export folder has
                                branches involved, then the path should point till the particular branch. For example,
                                “-d "C:\Users\Name\Desktop\cli\content\branch_name"
   -k, --stack-api-key=<value>  API key of the target stack
+      --branch=<value>         The name of the branch where you want to import your content. If you don't mention the
+                               branch name, 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.
       --module=<option>...     [optional] Specify the modules/module to import into the target stack. currently options
@@ -124,15 +86,8 @@ FLAGS
 DESCRIPTION
   Helps to generate mappers and backup folder for importing (overwriting) specific modules
 
-ALIASES
-  $ csdx cm:import-setup
-
 EXAMPLES
-  $ csdx cm:stacks:import-setup --stack-api-key <target_stack_api_key> --data-dir <path/of/export/destination/dir> --modules <module_name, module_name>
-
-  $ csdx cm:stacks:import-setup -k <target_stack_api_key> -d <path/of/export/destination/dir> --modules <module_name, module_name>
-
-  $ csdx cm:stacks:import-setup -k <target_stack_api_key> -d <path/of/export/destination/dir> --modules <module_name, module_name> -b <branch_name>
+  $ csdx cm:stacks:import-setup --stack-api-key <target_stack_api_key> --data-dir <path/of/export/destination/dir> --modules <module_name, module_name> --branch <branch_name>
 ```
 
 _See code: [src/commands/cm/stacks/import-setup.ts](https://github.com/contentstack/cli/blob/main/packages/contentstack-import-setup/src/commands/cm/stacks/import-setup.ts)_

package/lib/commands/cm/stacks/import-setup.d.ts

@@ -7,4 +7,5 @@ export default class ImportSetupCommand extends Command {
     static aliases: string[];
     static usage: string;
     run(): Promise<void>;
+    private createImportSetupContext;
 }

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

@@ -8,34 +8,53 @@ const utils_1 = require("../../../utils");
 const import_1 = require("../../../import");
 class ImportSetupCommand extends cli_command_1.Command {
     async run() {
-        var _a, _b;
         try {
             const { flags } = await this.parse(ImportSetupCommand);
             let importSetupConfig = await (0, utils_1.setupImportConfig)(flags);
             // Prepare the context object
-            (0, cli_utilities_1.createLogContext)(((_b = (_a = this.context) === null || _a === void 0 ? void 0 : _a.info) === null || _b === void 0 ? void 0 : _b.command) || 'cm:stacks:import-setup', importSetupConfig.apiKey, cli_utilities_1.configHandler.get('authenticationMethod'));
-            importSetupConfig.context = { module: '' };
+            const context = this.createImportSetupContext(importSetupConfig.apiKey, importSetupConfig.authenticationMethod);
+            importSetupConfig.context = Object.assign({}, context);
             // Note setting host to create cma client
             importSetupConfig.host = this.cmaHost;
             importSetupConfig.region = this.region;
             importSetupConfig.developerHubBaseUrl = this.developerHubUrl;
+            if (flags.branch) {
+                cli_utilities_1.CLIProgressManager.initializeGlobalSummary(`IMPORT-SETUP-${flags.branch}`, flags.branch, `Setting up import for "${flags.branch}" branch...`);
+            }
+            else {
+                cli_utilities_1.CLIProgressManager.initializeGlobalSummary(`IMPORT-SETUP`, flags.branch, 'Setting up import...');
+            }
             const managementAPIClient = await (0, cli_utilities_1.managementSDKClient)(importSetupConfig);
             const importSetup = new import_1.ImportSetup(importSetupConfig, managementAPIClient);
             await importSetup.start();
+            cli_utilities_1.CLIProgressManager.printGlobalSummary();
             cli_utilities_1.log.success(`Backup folder and mapper files have been successfully created for the stack using the API key ${importSetupConfig.apiKey}.`, importSetupConfig.context);
             cli_utilities_1.log.success(`The backup folder has been created at '${(0, cli_utilities_1.pathValidator)(node_path_1.default.join(importSetupConfig.backupDir))}'.`, importSetupConfig.context);
         }
         catch (error) {
+            cli_utilities_1.CLIProgressManager.printGlobalSummary();
             (0, cli_utilities_1.handleAndLogError)(error);
         }
     }
+    // Create import setup context object
+    createImportSetupContext(apiKey, authenticationMethod, module) {
+        var _a, _b, _c;
+        return {
+            command: ((_b = (_a = this.context) === null || _a === void 0 ? void 0 : _a.info) === null || _b === void 0 ? void 0 : _b.command) || 'cm:stacks:import-setup',
+            module: module || '',
+            userId: cli_utilities_1.configHandler.get('userUid') || undefined,
+            email: cli_utilities_1.configHandler.get('email') || undefined,
+            sessionId: (_c = this.context) === null || _c === void 0 ? void 0 : _c.sessionId,
+            apiKey: apiKey || '',
+            orgId: cli_utilities_1.configHandler.get('oauthOrgUid') || '',
+            authenticationMethod: authenticationMethod || 'Basic Auth',
+        };
+    }
 }
 exports.default = ImportSetupCommand;
 ImportSetupCommand.description = cli_utilities_1.messageHandler.parse('Helps to generate mappers and backup folder for importing (overwriting) specific modules');
 ImportSetupCommand.examples = [
-    `csdx cm:stacks:import-setup --stack-api-key <target_stack_api_key> --data-dir <path/of/export/destination/dir> --modules <module_name, module_name>`,
-    `csdx cm:stacks:import-setup -k <target_stack_api_key> -d <path/of/export/destination/dir> --modules <module_name, module_name>`,
-    `csdx cm:stacks:import-setup -k <target_stack_api_key> -d <path/of/export/destination/dir> --modules <module_name, module_name> -b <branch_name>`,
+    `csdx cm:stacks:import-setup --stack-api-key <target_stack_api_key> --data-dir <path/of/export/destination/dir> --modules <module_name, module_name> --branch <branch_name>`,
 ];
 ImportSetupCommand.flags = {
     'stack-api-key': cli_utilities_1.flags.string({
@@ -56,15 +75,13 @@ ImportSetupCommand.flags = {
         multiple: true,
     }),
     branch: cli_utilities_1.flags.string({
-        char: 'B',
         description: "The name of the branch where you want to import your content. If you don't mention the branch name, then by default the content will be imported to the main branch.",
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['-B'], ['--branch']),
-        exclusive: ['branch-alias']
+        exclusive: ['branch-alias'],
     }),
     'branch-alias': cli_utilities_1.flags.string({
-        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.",
+        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'],
     }),
 };
-ImportSetupCommand.aliases = ['cm:import-setup'];
+ImportSetupCommand.aliases = [];
 ImportSetupCommand.usage = 'cm:stacks:import-setup [-k <value>] [-d <value>] [-a <value>] [--modules <value,value>]';

package/lib/import/import-setup.d.ts

@@ -1,14 +1,28 @@
 import { ImportConfig } from '../types';
-import { ContentstackClient } from '@contentstack/cli-utilities';
+import { backupHandler as defaultBackupHandler, setupBranchConfig as defaultSetupBranchConfig } from '../utils';
+import { ContentstackClient, log as defaultLog, handleAndLogError as defaultHandleAndLogError } from '@contentstack/cli-utilities';
+/**
+ * Dependencies for ImportSetup - can be injected for testing
+ */
+export interface ImportSetupDeps {
+    backupHandler?: typeof defaultBackupHandler;
+    setupBranchConfig?: typeof defaultSetupBranchConfig;
+    log?: typeof defaultLog;
+    handleAndLogError?: typeof defaultHandleAndLogError;
+}
 export default class ImportSetup {
     protected config: ImportConfig;
-    private managementAPIClient;
-    private importConfig;
-    private stackAPIClient;
+    private readonly managementAPIClient;
+    private readonly importConfig;
+    private readonly stackAPIClient;
     dependencyTree: {
         [key: string]: string[];
     };
-    constructor(config: ImportConfig, managementAPIClient: ContentstackClient);
+    private readonly backupHandler;
+    private readonly setupBranchConfig;
+    private readonly log;
+    private readonly handleAndLogError;
+    constructor(config: ImportConfig, managementAPIClient: ContentstackClient, deps?: ImportSetupDeps);
     /**
      * Generate mapper logic
      * This method generates dependency tree based on the selected modules

package/lib/import/import-setup.js

@@ -26,7 +26,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 class ImportSetup {
-    constructor(config, managementAPIClient) {
+    constructor(config, managementAPIClient, deps = {}) {
+        var _a, _b, _c, _d;
         this.dependencyTree = {};
         this.config = config;
         this.managementAPIClient = managementAPIClient;
@@ -34,6 +35,11 @@ class ImportSetup {
             api_key: this.config.apiKey,
             management_token: this.config.management_token,
         });
+        // Use injected dependencies or defaults
+        this.backupHandler = (_a = deps.backupHandler) !== null && _a !== void 0 ? _a : utils_1.backupHandler;
+        this.setupBranchConfig = (_b = deps.setupBranchConfig) !== null && _b !== void 0 ? _b : utils_1.setupBranchConfig;
+        this.log = (_c = deps.log) !== null && _c !== void 0 ? _c : cli_utilities_1.log;
+        this.handleAndLogError = (_d = deps.handleAndLogError) !== null && _d !== void 0 ? _d : cli_utilities_1.handleAndLogError;
     }
     /**
      * Generate mapper logic
@@ -49,7 +55,7 @@ class ImportSetup {
                 return [];
             visited.add(module);
             const dependencies = ((_a = this.config.modules[module]) === null || _a === void 0 ? void 0 : _a.dependencies) || [];
-            let allDeps = [...dependencies];
+            const allDeps = [...dependencies];
             for (const dependency of dependencies) {
                 allDeps.push(...getAllDependencies(dependency));
             }
@@ -61,7 +67,9 @@ class ImportSetup {
             allDependencies = allDependencies.filter((dep) => !assignedDependencies.has(dep)); // Remove assigned ones
             this.dependencyTree[module] = allDependencies;
             // Mark these dependencies as assigned so they won't be included in later modules
-            allDependencies.forEach((dep) => assignedDependencies.add(dep));
+            for (const dep of allDependencies) {
+                assignedDependencies.add(dep);
+            }
         }
     }
     /**
@@ -72,10 +80,13 @@ class ImportSetup {
      */
     async runModuleImports() {
         var _a;
-        cli_utilities_1.log.debug('Starting module imports', { modules: Object.keys(this.dependencyTree) });
+        this.log.debug('Starting module imports', { modules: Object.keys(this.dependencyTree) });
         for (const moduleName in this.dependencyTree) {
             try {
-                cli_utilities_1.log.debug(`Importing module: ${moduleName}`, { moduleName, dependencies: this.dependencyTree[moduleName] });
+                this.log.debug(`Importing module: ${moduleName}`, {
+                    moduleName,
+                    dependencies: this.dependencyTree[moduleName],
+                });
                 const modulePath = `./modules/${moduleName}`;
                 const { default: ModuleClass } = await (_a = modulePath, Promise.resolve().then(() => __importStar(require(_a))));
                 const modulePayload = {
@@ -85,14 +96,14 @@ class ImportSetup {
                 };
                 const moduleInstance = new ModuleClass(modulePayload);
                 await moduleInstance.start();
-                cli_utilities_1.log.debug(`Module ${moduleName} imported successfully`);
+                this.log.debug(`Module ${moduleName} imported successfully`);
             }
             catch (error) {
-                (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.config.context), { moduleName }), `Error occurred while importing '${moduleName}'`);
+                this.handleAndLogError(error, Object.assign(Object.assign({}, this.config.context), { moduleName }), `Error occurred while importing '${moduleName}'`);
                 throw error;
             }
         }
-        cli_utilities_1.log.debug('All module imports completed');
+        this.log.debug('All module imports completed');
     }
     /**
      * Start the import setup process
@@ -107,21 +118,21 @@ class ImportSetup {
                 this.config.stackName = stackDetails.name;
                 this.config.org_uid = stackDetails.org_uid;
             }
-            cli_utilities_1.log.debug('Creating backup directory');
-            const backupDir = await (0, utils_1.backupHandler)(this.config);
+            this.log.debug('Creating backup directory');
+            const backupDir = await this.backupHandler(this.config);
             if (backupDir) {
                 this.config.backupDir = backupDir;
-                cli_utilities_1.log.debug('Backup directory created', { backupDir });
+                this.log.debug('Backup directory created', { backupDir });
             }
-            cli_utilities_1.log.debug('Setting up branch configuration');
-            await (0, utils_1.setupBranchConfig)(this.config, this.stackAPIClient);
-            cli_utilities_1.log.debug('Branch configuration completed', { branchName: this.config.branchName });
+            this.log.debug('Setting up branch configuration');
+            await this.setupBranchConfig(this.config, this.stackAPIClient);
+            this.log.debug('Branch configuration completed', { branchName: this.config.branchName });
             await this.generateDependencyTree();
             await this.runModuleImports();
-            cli_utilities_1.log.debug('Import setup process completed successfully');
+            this.log.debug('Import setup process completed successfully');
         }
         catch (error) {
-            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.config.context), 'Import setup failed');
+            this.handleAndLogError(error, Object.assign({}, this.config.context), 'Import setup failed');
             throw error;
         }
     }

package/lib/import/modules/assets.js

@@ -6,10 +6,11 @@ const path_1 = require("path");
 const lodash_1 = require("lodash");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const base_setup_1 = tslib_1.__importDefault(require("./base-setup"));
+const utils_2 = require("../../utils");
 class AssetImportSetup extends base_setup_1.default {
     constructor({ config, stackAPIClient, dependencies }) {
         super({ config, stackAPIClient, dependencies });
-        this.initializeContext('assets');
+        this.currentModuleName = utils_2.MODULE_NAMES[utils_2.MODULE_CONTEXTS.ASSETS];
         this.assetsFolderPath = (0, path_1.join)((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'assets');
         this.assetsFilePath = (0, path_1.join)((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'assets', 'assets.json');
         this.assetsConfig = config.modules.assets;
@@ -27,18 +28,43 @@ class AssetImportSetup extends base_setup_1.default {
      * @returns {Promise<void>}
      */
     async start() {
+        var _a;
         try {
+            const progress = this.createNestedProgress(this.currentModuleName);
+            // Analyze to get chunk count
+            const indexerCount = await this.withLoadingSpinner('ASSETS: Analyzing import data...', async () => {
+                const basePath = this.assetsFolderPath;
+                const fs = new cli_utilities_1.FsUtility({ basePath, indexFileName: 'assets.json' });
+                const indexer = fs.indexFileContent;
+                return (0, lodash_1.values)(indexer).length;
+            });
+            if (indexerCount === 0) {
+                (0, utils_1.log)(this.config, 'No assets found in the content folder.', 'info');
+                return;
+            }
+            // Add processes - use a large number for total assets since we don't know exact count
+            // The progress will update as we process each asset
+            progress.addProcess(utils_2.PROCESS_NAMES.ASSETS_MAPPER_GENERATION, 1);
+            progress.addProcess(utils_2.PROCESS_NAMES.ASSETS_FETCH_AND_MAP, indexerCount * 10); // Estimate: ~10 assets per chunk
+            // Create mapper directory
+            progress
+                .startProcess(utils_2.PROCESS_NAMES.ASSETS_MAPPER_GENERATION)
+                .updateStatus(utils_2.PROCESS_STATUS.ASSETS_MAPPER_GENERATION.GENERATING, utils_2.PROCESS_NAMES.ASSETS_MAPPER_GENERATION);
             utils_1.fsUtil.makeDirectory(this.mapperDirPath);
-            cli_utilities_1.log.debug('Mapper directory created', { mapperDirPath: this.mapperDirPath });
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, 'mapper directory created', null, utils_2.PROCESS_NAMES.ASSETS_MAPPER_GENERATION);
+            progress.completeProcess(utils_2.PROCESS_NAMES.ASSETS_MAPPER_GENERATION, true);
+            // Fetch and map assets
+            progress
+                .startProcess(utils_2.PROCESS_NAMES.ASSETS_FETCH_AND_MAP)
+                .updateStatus(utils_2.PROCESS_STATUS.ASSETS_FETCH_AND_MAP.FETCHING, utils_2.PROCESS_NAMES.ASSETS_FETCH_AND_MAP);
             await this.fetchAndMapAssets();
-            cli_utilities_1.log.debug('Asset mapping completed', {
-                mappedCount: Object.keys(this.assetUidMapper).length,
-                duplicateCount: Object.keys(this.duplicateAssets).length
-            });
-            cli_utilities_1.log.success(`The required setup files for the asset have been generated successfully.`);
+            progress.completeProcess(utils_2.PROCESS_NAMES.ASSETS_FETCH_AND_MAP, true);
+            this.completeProgress(true);
+            (0, utils_1.log)(this.config, `The required setup files for the asset have been generated successfully.`, 'success');
         }
         catch (error) {
-            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.config.context), 'Error occurred while generating the asset mapper');
+            this.completeProgress(false, (error === null || error === void 0 ? void 0 : error.message) || 'Assets mapper generation failed');
+            (0, utils_1.log)(this.config, `Error occurred while generating the asset mapper: ${(0, cli_utilities_1.formatError)(error)}.`, 'error');
         }
     }
     /**
@@ -47,7 +73,6 @@ class AssetImportSetup extends base_setup_1.default {
      * @returns {Promise<void>} Promise<void>
      */
     async fetchAndMapAssets() {
-        cli_utilities_1.log.debug('Starting asset fetch and mapping', { assetsFolderPath: this.assetsFolderPath });
         const processName = 'mapping assets';
         const indexFileName = 'assets.json';
         const basePath = this.assetsFolderPath;
@@ -55,31 +80,38 @@ class AssetImportSetup extends base_setup_1.default {
         const indexer = fs.indexFileContent;
         const indexerCount = (0, lodash_1.values)(indexer).length;
         const onSuccess = ({ response: { items = [] } = {}, apiData: { uid, url, title } = undefined, }) => {
+            var _a, _b, _c;
             if (items.length === 1) {
                 this.assetUidMapper[uid] = items[0].uid;
                 this.assetUrlMapper[url] = items[0].url;
-                cli_utilities_1.log.info(`Mapped asset successfully: '${title}'`);
+                (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `asset: ${title}`, null, utils_2.PROCESS_NAMES.ASSETS_FETCH_AND_MAP);
+                (0, utils_1.log)(this.config, `Mapped asset successfully: '${title}'`, 'info');
             }
             else if (items.length > 1) {
                 this.duplicateAssets[uid] = items.map((asset) => {
                     return { uid: asset.uid, title: asset.title, url: asset.url };
                 });
-                cli_utilities_1.log.info(`Multiple assets found with the title '${title}'.`);
+                (_b = this.progressManager) === null || _b === void 0 ? void 0 : _b.tick(true, `asset: ${title} (duplicate)`, null, utils_2.PROCESS_NAMES.ASSETS_FETCH_AND_MAP);
+                (0, utils_1.log)(this.config, `Multiple assets found with the title '${title}'.`, 'info');
             }
             else {
-                cli_utilities_1.log.info(`Asset with title '${title}' not found in the stack!`);
+                (_c = this.progressManager) === null || _c === void 0 ? void 0 : _c.tick(false, `asset: ${title}`, 'Not found in stack', utils_2.PROCESS_NAMES.ASSETS_FETCH_AND_MAP);
+                (0, utils_1.log)(this.config, `Asset with title '${title}' not found in the stack!`, 'info');
             }
         };
         const onReject = ({ error, apiData: { title } = undefined }) => {
-            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.config.context), `Failed to map the asset '${title}'`);
+            var _a;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(false, `asset: ${title}`, (0, cli_utilities_1.formatError)(error), utils_2.PROCESS_NAMES.ASSETS_FETCH_AND_MAP);
+            (0, utils_1.log)(this.config, `Failed to map the asset '${title}'.`, 'error');
+            (0, utils_1.log)(this.config, (0, cli_utilities_1.formatError)(error), 'error');
         };
         /* eslint-disable @typescript-eslint/no-unused-vars, guard-for-in */
         for (const index in indexer) {
             const chunk = await fs.readChunkFiles.next().catch((error) => {
-                cli_utilities_1.log.error(String(error), { error });
+                (0, utils_1.log)(this.config, error, 'error');
             });
             if (chunk) {
-                let apiContent = (0, lodash_1.orderBy)((0, lodash_1.values)(chunk), '_version');
+                const apiContent = (0, lodash_1.orderBy)((0, lodash_1.values)(chunk), '_version');
                 await this.makeConcurrentCall({
                     apiContent,
                     processName,
@@ -101,7 +133,7 @@ class AssetImportSetup extends base_setup_1.default {
         }
         if (!(0, lodash_1.isEmpty)(this.duplicateAssets)) {
             utils_1.fsUtil.writeFile(this.duplicateAssetPath, this.duplicateAssets);
-            cli_utilities_1.log.info(`Duplicate asset files are stored at: ${this.duplicateAssetPath}.`);
+            (0, utils_1.log)(this.config, `Duplicate asset files are stored at: ${this.duplicateAssetPath}.`, 'info');
         }
     }
 }

package/lib/import/modules/base-setup.d.ts

@@ -1,15 +1,12 @@
-import { ApiOptions, CustomPromiseHandler, EnvType, ImportConfig, ModuleClassParams, Modules } from '../../types';
+import { ApiOptions, CustomPromiseHandler, EnvType, ImportConfig, ModuleClassParams } from '../../types';
+import { CLIProgressManager } from '@contentstack/cli-utilities';
 export default class BaseImportSetup {
     config: ImportConfig;
     stackAPIClient: ModuleClassParams['stackAPIClient'];
     dependencies: ModuleClassParams['dependencies'];
+    protected progressManager: CLIProgressManager | null;
+    protected currentModuleName: string;
     constructor({ config, stackAPIClient, dependencies }: ModuleClassParams);
-    /**
-     * Set the module name in context directly
-     * @param module - Module name to set
-     * @returns {void}
-     */
-    protected initializeContext(module?: Modules): void;
     setupDependencies(): Promise<void>;
     /**
      * @method delay
@@ -40,4 +37,20 @@ export default class BaseImportSetup {
      * @return {Promise} Promise<void>
      */
     makeAPICall(apiOptions: ApiOptions, isLastRequest?: boolean): Promise<void>;
+    /**
+     * Create simple progress manager
+     */
+    protected createSimpleProgress(moduleName: string, total?: number): CLIProgressManager;
+    /**
+     * Create nested progress manager
+     */
+    protected createNestedProgress(moduleName: string): CLIProgressManager;
+    /**
+     * Complete progress manager
+     */
+    protected completeProgress(success?: boolean, error?: string): void;
+    /**
+     * Show a loading spinner before initializing progress
+     */
+    protected withLoadingSpinner<T>(message: string, action: () => Promise<T>): Promise<T>;
 }

package/lib/import/modules/base-setup.js

@@ -23,30 +23,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../utils");
 const lodash_1 = require("lodash");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 class BaseImportSetup {
     constructor({ config, stackAPIClient, dependencies }) {
+        this.progressManager = null;
+        this.currentModuleName = '';
         this.config = config;
         this.stackAPIClient = stackAPIClient;
         this.dependencies = dependencies;
     }
-    /**
-     * Set the module name in context directly
-     * @param module - Module name to set
-     * @returns {void}
-     */
-    initializeContext(module) {
-        if (this.config.context && module) {
-            this.config.context.module = module;
-        }
-    }
     async setupDependencies() {
         var _a;
-        cli_utilities_1.log.debug('Setting up dependencies', { dependencies: this.dependencies });
         for (const moduleName of this.dependencies) {
             try {
-                cli_utilities_1.log.debug(`Importing dependency module: ${moduleName}`);
                 const modulePath = `./${moduleName}`;
                 const { default: ModuleClass } = await (_a = modulePath, Promise.resolve().then(() => __importStar(require(_a))));
                 const modulePayload = {
@@ -55,10 +46,9 @@ class BaseImportSetup {
                 };
                 const moduleInstance = new ModuleClass(modulePayload);
                 await moduleInstance.start();
-                cli_utilities_1.log.debug(`Dependency module ${moduleName} imported successfully`);
             }
             catch (error) {
-                (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.config.context), `Error importing '${moduleName}'`);
+                (0, utils_1.log)(this.config, `Error importing '${moduleName}': ${error.message}`, 'error');
             }
         }
     }
@@ -134,7 +124,7 @@ class BaseImportSetup {
             // info: Batch No. 20 of import assets is complete
             if (currentIndexer)
                 batchMsg += `Current chunk processing is (${currentIndexer}/${indexerCount})`;
-            cli_utilities_1.log.success(`Batch No. (${batchNo}/${totelBatches}) of ${processName} is complete`);
+            (0, utils_1.log)(this.config, `Batch No. (${batchNo}/${totelBatches}) of ${processName} is complete`, 'success');
         }
         // if (this.config.modules.assets.displayExecutionTime) {
         //   console.log(
@@ -192,5 +182,48 @@ class BaseImportSetup {
                 return Promise.resolve();
         }
     }
+    /**
+     * Create simple progress manager
+     */
+    createSimpleProgress(moduleName, total) {
+        var _a;
+        this.currentModuleName = moduleName;
+        const logConfig = cli_utilities_1.configHandler.get('log') || {};
+        const showConsoleLogs = (_a = logConfig.showConsoleLogs) !== null && _a !== void 0 ? _a : false;
+        this.progressManager = cli_utilities_1.CLIProgressManager.createSimple(moduleName, total, showConsoleLogs);
+        return this.progressManager;
+    }
+    /**
+     * Create nested progress manager
+     */
+    createNestedProgress(moduleName) {
+        var _a;
+        this.currentModuleName = moduleName;
+        const logConfig = cli_utilities_1.configHandler.get('log') || {};
+        const showConsoleLogs = (_a = logConfig.showConsoleLogs) !== null && _a !== void 0 ? _a : false;
+        this.progressManager = cli_utilities_1.CLIProgressManager.createNested(moduleName, showConsoleLogs);
+        return this.progressManager;
+    }
+    /**
+     * Complete progress manager
+     */
+    completeProgress(success = true, error) {
+        var _a;
+        (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.complete(success, error);
+        this.progressManager = null;
+    }
+    /**
+     * Show a loading spinner before initializing progress
+     */
+    async withLoadingSpinner(message, action) {
+        var _a;
+        const logConfig = cli_utilities_1.configHandler.get('log') || {};
+        const showConsoleLogs = (_a = logConfig.showConsoleLogs) !== null && _a !== void 0 ? _a : false;
+        if (showConsoleLogs) {
+            // If console logs are enabled, don't show spinner, just execute the action
+            return await action();
+        }
+        return await cli_utilities_1.CLIProgressManager.withLoadingSpinner(message, action);
+    }
 }
 exports.default = BaseImportSetup;

package/lib/import/modules/content-types.js

@@ -1,20 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const utils_1 = require("../../utils");
 const base_setup_1 = tslib_1.__importDefault(require("./base-setup"));
-const cli_utilities_1 = require("@contentstack/cli-utilities");
+const utils_2 = require("../../utils");
 class ContentTypesImportSetup extends base_setup_1.default {
     constructor(options) {
         super(options);
-        this.initializeContext('content-types');
+        this.currentModuleName = utils_2.MODULE_NAMES[utils_2.MODULE_CONTEXTS.CONTENT_TYPES];
     }
     async start() {
+        var _a, _b, _c;
         try {
-            await this.setupDependencies();
-            cli_utilities_1.log.success(`The required setup files for content types have been generated successfully.`);
+            const progress = this.createNestedProgress(this.currentModuleName);
+            // Add processes
+            progress.addProcess(utils_2.PROCESS_NAMES.CONTENT_TYPES_DEPENDENCY_SETUP, ((_a = this.dependencies) === null || _a === void 0 ? void 0 : _a.length) || 0);
+            progress.addProcess(utils_2.PROCESS_NAMES.CONTENT_TYPES_MAPPER_GENERATION, 1);
+            // Setup dependencies
+            if (this.dependencies && this.dependencies.length > 0) {
+                progress
+                    .startProcess(utils_2.PROCESS_NAMES.CONTENT_TYPES_DEPENDENCY_SETUP)
+                    .updateStatus(utils_2.PROCESS_STATUS.CONTENT_TYPES_DEPENDENCY_SETUP.SETTING_UP, utils_2.PROCESS_NAMES.CONTENT_TYPES_DEPENDENCY_SETUP);
+                await this.setupDependencies();
+                (_b = this.progressManager) === null || _b === void 0 ? void 0 : _b.tick(true, 'dependencies setup', null, utils_2.PROCESS_NAMES.CONTENT_TYPES_DEPENDENCY_SETUP);
+                progress.completeProcess(utils_2.PROCESS_NAMES.CONTENT_TYPES_DEPENDENCY_SETUP, true);
+            }
+            // Mapper generation
+            progress
+                .startProcess(utils_2.PROCESS_NAMES.CONTENT_TYPES_MAPPER_GENERATION)
+                .updateStatus(utils_2.PROCESS_STATUS.CONTENT_TYPES_MAPPER_GENERATION.GENERATING, utils_2.PROCESS_NAMES.CONTENT_TYPES_MAPPER_GENERATION);
+            (_c = this.progressManager) === null || _c === void 0 ? void 0 : _c.tick(true, 'mapper generation', null, utils_2.PROCESS_NAMES.CONTENT_TYPES_MAPPER_GENERATION);
+            progress.completeProcess(utils_2.PROCESS_NAMES.CONTENT_TYPES_MAPPER_GENERATION, true);
+            this.completeProgress(true);
+            (0, utils_1.log)(this.config, `The required setup files for content types have been generated successfully.`, 'success');
         }
         catch (error) {
-            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.config.context), 'Error occurred while generating the content type mapper');
+            this.completeProgress(false, (error === null || error === void 0 ? void 0 : error.message) || 'Content types mapper generation failed');
+            (0, utils_1.log)(this.config, `Error occurred while generating the content type mapper: ${error.message}.`, 'error');
         }
     }
 }