@contentstack/cli-cm-export 1.20.2 → 2.0.0-beta.1

package/README.md

@@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-export/1.20.2 linux-x64 node-v22.19.0
+@contentstack/cli-cm-export/2.0.0-beta.1 linux-x64 node-v22.20.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

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

@@ -6,7 +6,7 @@ const export_1 = require("../../../export");
 const utils_1 = require("../../../utils");
 class ExportCommand extends cli_command_1.Command {
     async run() {
-        var _a;
+        var _a, _b;
         let exportDir = (0, cli_utilities_1.pathValidator)('logs');
         try {
             const { flags } = await this.parse(ExportCommand);
@@ -21,16 +21,26 @@ class ExportCommand extends cli_command_1.Command {
             const managementAPIClient = await (0, cli_utilities_1.managementSDKClient)(exportConfig);
             const moduleExporter = new export_1.ModuleExporter(managementAPIClient, exportConfig);
             await moduleExporter.start();
-            if (!((_a = exportConfig.branches) === null || _a === void 0 ? void 0 : _a.length)) {
-                (0, utils_1.writeExportMetaFile)(exportConfig);
-            }
             cli_utilities_1.log.success(`The content of the stack ${exportConfig.apiKey} has been exported successfully!`, exportConfig.context);
             cli_utilities_1.log.info(`The exported content has been stored at '${exportDir}'`, exportConfig.context);
             cli_utilities_1.log.success(`The log has been stored at '${(0, cli_utilities_1.getLogPath)()}'`, exportConfig.context);
+            // Print comprehensive summary at the end
+            if (!exportConfig.branches)
+                cli_utilities_1.CLIProgressManager.printGlobalSummary();
+            if (!((_a = cli_utilities_1.configHandler.get('log')) === null || _a === void 0 ? void 0 : _a.showConsoleLogs)) {
+                cli_utilities_1.cliux.print(`The log has been stored at '${(0, cli_utilities_1.getLogPath)()}'`, { color: 'green' });
+            }
+            // Clear progress module setting now that export is complete
+            (0, cli_utilities_1.clearProgressModuleSetting)();
         }
         catch (error) {
+            // Clear progress module setting even on error
+            (0, cli_utilities_1.clearProgressModuleSetting)();
             (0, cli_utilities_1.handleAndLogError)(error);
-            cli_utilities_1.log.info(`The log has been stored at '${(0, cli_utilities_1.getLogPath)()}'`);
+            if (!((_b = cli_utilities_1.configHandler.get('log')) === null || _b === void 0 ? void 0 : _b.showConsoleLogs)) {
+                cli_utilities_1.cliux.print(`Error: ${error}`, { color: 'red' });
+                cli_utilities_1.cliux.print(`The log has been stored at '${(0, cli_utilities_1.getLogPath)()}'`, { color: 'green' });
+            }
         }
     }
     // Create export context object
@@ -40,7 +50,6 @@ class ExportCommand extends cli_command_1.Command {
             command: ((_b = (_a = this.context) === null || _a === void 0 ? void 0 : _a.info) === null || _b === void 0 ? void 0 : _b.command) || 'cm:stacks:export',
             module: '',
             userId: cli_utilities_1.configHandler.get('userUid') || '',
-            email: cli_utilities_1.configHandler.get('email') || '',
             sessionId: ((_c = this.context) === null || _c === void 0 ? void 0 : _c.sessionId) || '',
             apiKey: apiKey || '',
             orgId: cli_utilities_1.configHandler.get('oauthOrgUid') || '',

package/lib/config/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const config = {
-    contentVersion: 2,
     versioning: false,
     host: 'https://api.contentstack.io/v3',
     developerHubUrls: {
@@ -489,6 +488,5 @@ const config = {
     writeConcurrency: 5,
     developerHubBaseUrl: '',
     marketplaceAppEncryptionKey: 'nF2ejRQcTv',
-    onlyTSModules: ['taxonomies'],
 };
 exports.default = config;

package/lib/export/module-exporter.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
-const utils_1 = require("../utils");
 const modules_1 = tslib_1.__importDefault(require("./modules"));
-const modules_js_1 = tslib_1.__importDefault(require("./modules-js"));
+const utils_1 = require("../utils");
 class ModuleExporter {
     constructor(managementAPIClient, exportConfig) {
         this.managementAPIClient = managementAPIClient;
@@ -28,6 +27,8 @@ class ModuleExporter {
                 this.exportConfig.branchEnabled = true;
                 return this.exportByBranches();
             }
+            // If branches disabled then initialize the global summary
+            cli_utilities_1.CLIProgressManager.initializeGlobalSummary('EXPORT', this.exportConfig.branchName, 'Exporting content...');
             return this.export();
         }
         catch (error) {
@@ -35,25 +36,40 @@ class ModuleExporter {
         }
     }
     async exportByBranches() {
-        // loop through the branches and export it parallel
-        for (const branch of this.exportConfig.branches) {
-            try {
-                this.exportConfig.branchName = branch.uid;
-                this.stackAPIClient.stackHeaders.branch = branch.uid;
-                this.exportConfig.branchDir = path.join(this.exportConfig.exportDir, branch.uid);
-                cli_utilities_1.log.info(`Exporting content from branch ${branch.uid}`, this.exportConfig.context);
-                (0, utils_1.writeExportMetaFile)(this.exportConfig, this.exportConfig.branchDir);
-                await this.export();
-                cli_utilities_1.log.success(`The content of branch ${branch.uid} has been exported successfully!`, this.exportConfig.context);
+        let targetBranch;
+        if (this.exportConfig.branchName) {
+            // User specified a branch - export only that branch
+            targetBranch = this.exportConfig.branches.find((branch) => branch.uid === this.exportConfig.branchName);
+            if (!targetBranch) {
+                throw new Error(`Branch '${this.exportConfig.branchName}' not found in available branches`);
             }
-            catch (error) {
-                (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.exportConfig.context), { branch: branch.uid }), cli_utilities_1.messageHandler.parse('FAILED_EXPORT_CONTENT_BRANCH', { branch: branch.uid }));
-                throw new Error(cli_utilities_1.messageHandler.parse('FAILED_EXPORT_CONTENT_BRANCH', { branch: branch.uid }));
+        }
+        else {
+            // No specific branch mentioned - export only the main branch
+            targetBranch = this.exportConfig.branches.find((branch) => branch.uid === 'main');
+            if (!targetBranch) {
+                throw new Error('No main branch or available branches found');
             }
         }
+        try {
+            this.exportConfig.branchName = targetBranch.uid;
+            this.stackAPIClient.stackHeaders.branch = targetBranch.uid;
+            this.exportConfig.branchDir = path.join(this.exportConfig.exportDir, targetBranch.uid);
+            // Initialize progress manager for the target branch
+            cli_utilities_1.CLIProgressManager.clearGlobalSummary();
+            cli_utilities_1.CLIProgressManager.initializeGlobalSummary(`EXPORT-${targetBranch.uid}`, targetBranch.uid, `Exporting "${targetBranch.uid}" branch content...`);
+            cli_utilities_1.log.info(`Exporting content from '${targetBranch.uid}' branch`, this.exportConfig.context);
+            await this.export();
+            cli_utilities_1.CLIProgressManager.printGlobalSummary();
+            cli_utilities_1.log.success(`The content of branch ${targetBranch.uid} has been exported successfully!`, this.exportConfig.context);
+        }
+        catch (error) {
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.exportConfig.context), { branch: targetBranch === null || targetBranch === void 0 ? void 0 : targetBranch.uid }), cli_utilities_1.messageHandler.parse('FAILED_EXPORT_CONTENT_BRANCH', { branch: targetBranch === null || targetBranch === void 0 ? void 0 : targetBranch.uid }));
+            throw new Error(cli_utilities_1.messageHandler.parse('FAILED_EXPORT_CONTENT_BRANCH', { branch: targetBranch === null || targetBranch === void 0 ? void 0 : targetBranch.uid }));
+        }
     }
     async export() {
-        cli_utilities_1.log.info(`Started to export content, version is ${this.exportConfig.contentVersion}`, this.exportConfig.context);
+        cli_utilities_1.log.info(`Started to export content`, this.exportConfig.context);
         // checks for single module or all modules
         if (this.exportConfig.singleModuleExport) {
             return this.exportSingleModule(this.exportConfig.moduleName);
@@ -64,28 +80,11 @@ class ModuleExporter {
         cli_utilities_1.log.info(`Exporting module: ${moduleName}`, this.exportConfig.context);
         // export the modules by name
         // calls the module runner which inturn calls the module itself
-        let exportedModuleResponse;
-        if (this.exportConfig.contentVersion === 2) {
-            exportedModuleResponse = await (0, modules_1.default)({
-                stackAPIClient: this.stackAPIClient,
-                exportConfig: this.exportConfig,
-                moduleName,
-            });
-        }
-        else {
-            //NOTE - new modules support only ts
-            if (this.exportConfig.onlyTSModules.indexOf(moduleName) === -1) {
-                exportedModuleResponse = await (0, modules_js_1.default)({
-                    stackAPIClient: this.stackAPIClient,
-                    exportConfig: this.exportConfig,
-                    moduleName,
-                });
-            }
-        }
-        // set master locale to config
-        if (moduleName === 'stack' && (exportedModuleResponse === null || exportedModuleResponse === void 0 ? void 0 : exportedModuleResponse.code)) {
-            this.exportConfig.master_locale = { code: exportedModuleResponse.code };
-        }
+        await (0, modules_1.default)({
+            stackAPIClient: this.stackAPIClient,
+            exportConfig: this.exportConfig,
+            moduleName,
+        });
     }
     async exportSingleModule(moduleName) {
         // Note stack is always exported

package/lib/export/modules/assets.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const map_1 = tslib_1.__importDefault(require("lodash/map"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const chunk_1 = tslib_1.__importDefault(require("lodash/chunk"));
 const first_1 = tslib_1.__importDefault(require("lodash/first"));
 const merge_1 = tslib_1.__importDefault(require("lodash/merge"));
@@ -17,13 +18,15 @@ const node_path_1 = require("node:path");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const config_1 = tslib_1.__importDefault(require("../../config"));
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
+const utils_1 = require("../../utils");
 class ExportAssets extends base_class_1.default {
     constructor({ exportConfig, stackAPIClient }) {
         super({ exportConfig, stackAPIClient });
         this.assetConfig = config_1.default.modules.assets;
         this.assetsFolder = [];
         this.versionedAssets = [];
-        this.exportConfig.context.module = 'assets';
+        this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.ASSETS;
+        this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.ASSETS];
     }
     get commonQueryParam() {
         return {
@@ -37,19 +40,55 @@ class ExportAssets extends base_class_1.default {
         cli_utilities_1.log.debug(`Assets root path resolved to: ${this.assetsRootPath}`, this.exportConfig.context);
         cli_utilities_1.log.debug('Fetching assets and folders count...', this.exportConfig.context);
         // NOTE step 1: Get assets and it's folder count in parallel
-        const [assetsCount, assetsFolderCount] = await Promise.all([this.getAssetsCount(), this.getAssetsCount(true)]);
-        cli_utilities_1.log.debug('Fetching assets and folders data...', this.exportConfig.context);
-        // NOTE step 2: Get assets and it's folder data in parallel
-        await Promise.all([this.getAssetsFolders(assetsFolderCount), this.getAssets(assetsCount)]);
-        // NOTE step 3: Get versioned assets
-        if (!(0, isEmpty_1.default)(this.versionedAssets) && this.assetConfig.includeVersionedAssets) {
-            cli_utilities_1.log.debug('Fetching versioned assets metadata...', this.exportConfig.context);
-            await this.getVersionedAssets();
+        const [assetsCount, assetsFolderCount] = await this.withLoadingSpinner(`${chalk_1.default.bold('ASSETS')}: Analyzing stack content...`, () => Promise.all([this.getAssetsCount(), this.getAssetsCount(true)]));
+        // Create nested progress manager
+        const progress = this.createNestedProgress(this.currentModuleName);
+        // Add sub-processes
+        if (typeof assetsFolderCount === 'number' && assetsFolderCount > 0) {
+            progress.addProcess(utils_1.PROCESS_NAMES.ASSET_FOLDERS, assetsFolderCount);
+        }
+        if (typeof assetsCount === 'number' && assetsCount > 0) {
+            progress.addProcess(utils_1.PROCESS_NAMES.ASSET_METADATA, assetsCount);
+            progress.addProcess(utils_1.PROCESS_NAMES.ASSET_DOWNLOADS, assetsCount);
+        }
+        try {
+            // Process asset folders
+            if (typeof assetsFolderCount === 'number' && assetsFolderCount > 0) {
+                progress
+                    .startProcess(utils_1.PROCESS_NAMES.ASSET_FOLDERS)
+                    .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.ASSET_FOLDERS].FETCHING, utils_1.PROCESS_NAMES.ASSET_FOLDERS);
+                await this.getAssetsFolders(assetsFolderCount);
+                progress.completeProcess(utils_1.PROCESS_NAMES.ASSET_FOLDERS, true);
+            }
+            // Process asset metadata
+            if (typeof assetsCount === 'number' && assetsCount > 0) {
+                progress
+                    .startProcess(utils_1.PROCESS_NAMES.ASSET_METADATA)
+                    .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.ASSET_METADATA].FETCHING, utils_1.PROCESS_NAMES.ASSET_METADATA);
+                await this.getAssets(assetsCount);
+                progress.completeProcess(utils_1.PROCESS_NAMES.ASSET_METADATA, true);
+            }
+            // Get versioned assets
+            if (!(0, isEmpty_1.default)(this.versionedAssets) && this.assetConfig.includeVersionedAssets) {
+                cli_utilities_1.log.debug('Fetching versioned assets metadata...', this.exportConfig.context);
+                progress.updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.ASSET_METADATA].FETCHING_VERSION, utils_1.PROCESS_NAMES.ASSET_METADATA);
+                await this.getVersionedAssets();
+            }
+            // Download all assets
+            if (typeof assetsCount === 'number' && assetsCount > 0) {
+                progress
+                    .startProcess(utils_1.PROCESS_NAMES.ASSET_DOWNLOADS)
+                    .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.ASSET_DOWNLOADS].DOWNLOADING, utils_1.PROCESS_NAMES.ASSET_DOWNLOADS);
+                cli_utilities_1.log.debug('Starting download of all assets...', this.exportConfig.context);
+                await this.downloadAssets();
+                progress.completeProcess(utils_1.PROCESS_NAMES.ASSET_DOWNLOADS, true);
+            }
+            this.completeProgress(true);
+            cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('ASSET_EXPORT_COMPLETE'), this.exportConfig.context);
+        }
+        catch (error) {
+            this.completeProgress(false, (error === null || error === void 0 ? void 0 : error.message) || 'Asset export failed');
         }
-        cli_utilities_1.log.debug('Starting download of all assets...', this.exportConfig.context);
-        // NOTE step 4: Download all assets
-        await this.downloadAssets();
-        cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('ASSET_EXPORT_COMPLETE'), this.exportConfig.context);
     }
     /**
      * @method getAssetsFolders
@@ -63,10 +102,17 @@ class ExportAssets extends base_class_1.default {
         cli_utilities_1.log.debug(`Fetching asset folders with query: ${JSON.stringify(queryParam)}`, this.exportConfig.context);
         const onSuccess = ({ response: { items } }) => {
             cli_utilities_1.log.debug(`Fetched ${(items === null || items === void 0 ? void 0 : items.length) || 0} asset folders`, this.exportConfig.context);
-            if (!(0, isEmpty_1.default)(items))
+            if (!(0, isEmpty_1.default)(items)) {
                 this.assetsFolder.push(...items);
+                items.forEach((folder) => {
+                    var _a;
+                    (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `folder: ${folder.name || folder.uid}`, null, utils_1.PROCESS_NAMES.ASSET_FOLDERS);
+                });
+            }
         };
         const onReject = ({ error }) => {
+            var _a;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(false, 'asset folder', (error === null || error === void 0 ? void 0 : error.message) || utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.ASSET_FOLDERS].FAILED, utils_1.PROCESS_NAMES.ASSET_FOLDERS);
             (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
         };
         return this.makeConcurrentCall({
@@ -114,6 +160,8 @@ class ExportAssets extends base_class_1.default {
             metaHandler = customHandler;
         }
         const onReject = ({ error }) => {
+            var _a;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(false, 'asset', (error === null || error === void 0 ? void 0 : error.message) || utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.ASSET_METADATA].FAILED, utils_1.PROCESS_NAMES.ASSET_METADATA);
             (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context), cli_utilities_1.messageHandler.parse('ASSET_QUERY_FAILED'));
         };
         const onSuccess = ({ response: { items } }) => {
@@ -132,6 +180,11 @@ class ExportAssets extends base_class_1.default {
             if (!(0, isEmpty_1.default)(items)) {
                 cli_utilities_1.log.debug(`Writing ${items.length} assets into file`, this.exportConfig.context);
                 fs === null || fs === void 0 ? void 0 : fs.writeIntoFile(items, { mapKeyVal: true });
+                // Track progress for each asset with process name
+                items.forEach((asset) => {
+                    var _a;
+                    (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `asset: ${asset.filename || asset.uid}`, null, utils_1.PROCESS_NAMES.ASSET_METADATA);
+                });
             }
         };
         return this.makeConcurrentCall({
@@ -252,6 +305,7 @@ class ExportAssets extends base_class_1.default {
         const apiBatches = (0, chunk_1.default)(listOfAssets, this.assetConfig.downloadLimit);
         const downloadedAssetsDirs = await (0, cli_utilities_1.getDirectories)((0, node_path_1.resolve)(this.assetsRootPath, 'files'));
         const onSuccess = ({ response: { data }, additionalInfo }) => {
+            var _a;
             const { asset } = additionalInfo;
             const assetFolderPath = (0, node_path_1.resolve)(this.assetsRootPath, 'files', asset.uid);
             const assetFilePath = (0, node_path_1.resolve)(assetFolderPath, asset.filename);
@@ -284,10 +338,13 @@ class ExportAssets extends base_class_1.default {
             else {
                 data.pipe(assetWriterStream);
             }
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `Downloaded asset: ${asset.filename || asset.uid}`, null, utils_1.PROCESS_NAMES.ASSET_DOWNLOADS);
             cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('ASSET_DOWNLOAD_SUCCESS', asset.filename, asset.uid), this.exportConfig.context);
         };
         const onReject = ({ error, additionalInfo }) => {
+            var _a;
             const { asset } = additionalInfo;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(false, `Failed to download asset: ${asset.filename || asset.uid}`, null, utils_1.PROCESS_NAMES.ASSET_DOWNLOADS);
             (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.exportConfig.context), { uid: asset.uid, filename: asset.filename }), cli_utilities_1.messageHandler.parse('ASSET_DOWNLOAD_FAILED', asset.filename, asset.uid));
         };
         const promisifyHandler = (input) => {

package/lib/export/modules/base-class.d.ts

@@ -1,3 +1,4 @@
+import { CLIProgressManager } from '@contentstack/cli-utilities';
 import { ExportConfig, ModuleClassParams } from '../../types';
 export type ApiOptions = {
     uid?: string;
@@ -27,7 +28,23 @@ export type ApiModuleType = 'stack' | 'asset' | 'assets' | 'entry' | 'entries' |
 export default abstract class BaseClass {
     readonly client: any;
     exportConfig: ExportConfig;
+    protected progressManager: CLIProgressManager | null;
+    protected currentModuleName: string;
     constructor({ exportConfig, stackAPIClient }: Omit<ModuleClassParams, 'moduleName'>);
+    static printFinalSummary(): 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;
+    protected withLoadingSpinner<T>(message: string, action: () => Promise<T>): Promise<T>;
     get stack(): any;
     delay(ms: number): Promise<void>;
     makeConcurrentCall(env: EnvType, promisifyHandler?: CustomPromiseHandler): Promise<void>;

package/lib/export/modules/base-class.js

@@ -11,9 +11,54 @@ const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 class BaseClass {
     constructor({ exportConfig, stackAPIClient }) {
+        this.progressManager = null;
+        this.currentModuleName = '';
         this.client = stackAPIClient;
         this.exportConfig = exportConfig;
     }
+    static printFinalSummary() {
+        cli_utilities_1.CLIProgressManager.printGlobalSummary();
+    }
+    /**
+     * 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; // Default to true for better UX
+        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; // Default to true for better UX
+        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;
+    }
+    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);
+    }
     get stack() {
         return this.client;
     }

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

@@ -24,19 +24,36 @@ class ContentTypesExport extends base_class_1.default {
         this.applyQueryFilters(this.qs, 'content-types');
         this.contentTypesDirPath = path.resolve((0, cli_utilities_1.sanitizePath)(exportConfig.data), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.contentTypesConfig.dirName));
         this.contentTypes = [];
-        this.exportConfig.context.module = 'content-types';
+        this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.CONTENT_TYPES;
+        this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.CONTENT_TYPES];
     }
     async start() {
         try {
             cli_utilities_1.log.debug('Starting content types export process...', this.exportConfig.context);
             await utils_1.fsUtil.makeDirectory(this.contentTypesDirPath);
-            cli_utilities_1.log.debug(`Created directory at path: ${this.contentTypesDirPath}`, this.exportConfig.context);
+            // Get content types count for progress tracking
+            const [totalCount] = await this.withLoadingSpinner('CONTENT-TYPES: Analyzing content types...', async () => {
+                const countResponse = await this.stackAPIClient
+                    .contentType()
+                    .query(Object.assign(Object.assign({}, this.qs), { limit: 1, include_count: true }))
+                    .find();
+                return [countResponse.count || 0];
+            });
+            if (totalCount === 0) {
+                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('CONTENT_TYPE_NO_TYPES'), this.exportConfig.context);
+                return;
+            }
+            // Create simple progress manager with total count
+            const progress = this.createSimpleProgress(this.currentModuleName, totalCount);
+            progress.updateStatus('Fetching content types...');
             await this.getContentTypes();
             await this.writeContentTypes(this.contentTypes);
             cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('CONTENT_TYPE_EXPORT_COMPLETE'), this.exportConfig.context);
+            this.completeProgress(true);
         }
         catch (error) {
             (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
+            this.completeProgress(false, (error === null || error === void 0 ? void 0 : error.message) || 'Content types export failed');
         }
     }
     async getContentTypes(skip = 0) {
@@ -62,9 +79,11 @@ class ContentTypesExport extends base_class_1.default {
         }
     }
     sanitizeAttribs(contentTypes) {
-        cli_utilities_1.log.debug(`Sanitizing ${contentTypes === null || contentTypes === void 0 ? void 0 : contentTypes.length} content types`, this.exportConfig.context);
+        cli_utilities_1.log.debug(`Sanitizing ${contentTypes.length} content types`, this.exportConfig.context);
         const updatedContentTypes = [];
         contentTypes.forEach((contentType) => {
+            var _a;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `content-type: ${contentType.uid}`);
             for (const key in contentType) {
                 if (this.contentTypesConfig.validKeys.indexOf(key) === -1) {
                     delete contentType[key];
@@ -75,11 +94,14 @@ class ContentTypesExport extends base_class_1.default {
         return updatedContentTypes;
     }
     async writeContentTypes(contentTypes) {
-        cli_utilities_1.log.debug(`Writing ${contentTypes === null || contentTypes === void 0 ? void 0 : contentTypes.length} content types to disk`, this.exportConfig.context);
-        function write(contentType) {
-            return utils_1.fsUtil.writeFile(path.join((0, cli_utilities_1.sanitizePath)(this.contentTypesDirPath), (0, cli_utilities_1.sanitizePath)(`${contentType.uid === 'schema' ? 'schema|1' : contentType.uid}.json`)), contentType);
-        }
-        await (0, utils_1.executeTask)(contentTypes, write.bind(this), {
+        cli_utilities_1.log.debug(`Writing ${contentTypes.length} content types to disk`, this.exportConfig.context);
+        const writeWithProgress = (contentType) => {
+            const filename = `${contentType.uid === 'schema' ? 'schema|1' : contentType.uid}.json`;
+            const fullPath = path.join((0, cli_utilities_1.sanitizePath)(this.contentTypesDirPath), (0, cli_utilities_1.sanitizePath)(filename));
+            cli_utilities_1.log.debug(`Writing content type to: ${fullPath}`, this.exportConfig.context);
+            return utils_1.fsUtil.writeFile(fullPath, contentType);
+        };
+        await (0, utils_1.executeTask)(contentTypes, writeWithProgress.bind(this), {
             concurrency: this.exportConfig.writeConcurrency,
         });
         const schemaFilePath = path.join(this.contentTypesDirPath, 'schema.json');

package/lib/export/modules/custom-roles.js

@@ -17,21 +17,55 @@ class ExportCustomRoles extends base_class_1.default {
         this.existingRoles = { Admin: 1, Developer: 1, 'Content Manager': 1 };
         this.localesMap = {};
         this.sourceLocalesMap = {};
-        this.exportConfig.context.module = 'custom-roles';
+        this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.CUSTOM_ROLES;
+        this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.CUSTOM_ROLES];
     }
     async start() {
-        var _a;
-        cli_utilities_1.log.debug('Starting custom roles export process...', this.exportConfig.context);
-        this.rolesFolderPath = (0, node_path_1.resolve)(this.exportConfig.data, this.exportConfig.branchName || '', this.customRolesConfig.dirName);
-        cli_utilities_1.log.debug(`Custom roles folder path: ${this.rolesFolderPath}`, this.exportConfig.context);
-        await utils_1.fsUtil.makeDirectory(this.rolesFolderPath);
-        cli_utilities_1.log.debug('Created custom roles directory', this.exportConfig.context);
-        this.customRolesLocalesFilepath = (0, node_path_1.resolve)(this.rolesFolderPath, this.customRolesConfig.customRolesLocalesFileName);
-        cli_utilities_1.log.debug(`Custom roles locales file path: ${this.customRolesLocalesFilepath}`, this.exportConfig.context);
-        await this.getCustomRoles();
-        await this.getLocales();
-        await this.getCustomRolesLocales();
-        cli_utilities_1.log.debug(`Custom roles export completed. Total custom roles: ${(_a = Object.keys(this.customRoles)) === null || _a === void 0 ? void 0 : _a.length}`, this.exportConfig.context);
+        try {
+            cli_utilities_1.log.debug('Starting custom roles export process...', this.exportConfig.context);
+            const [totalRoles, totalLocales] = await this.withLoadingSpinner('CUSTOM-ROLES: Analyzing roles and locales...', async () => {
+                var _a;
+                this.rolesFolderPath = (0, node_path_1.resolve)(this.exportConfig.data, this.exportConfig.branchName || '', this.customRolesConfig.dirName);
+                await utils_1.fsUtil.makeDirectory(this.rolesFolderPath);
+                this.customRolesLocalesFilepath = (0, node_path_1.resolve)(this.rolesFolderPath, this.customRolesConfig.customRolesLocalesFileName);
+                // Get counts for progress tracking
+                const rolesResponse = await this.stack.role().fetchAll({ include_rules: true, include_permissions: true });
+                const customRolesCount = (_a = rolesResponse === null || rolesResponse === void 0 ? void 0 : rolesResponse.items) === null || _a === void 0 ? void 0 : _a.filter((role) => !this.existingRoles[role.name]).length;
+                const localesResponse = await this.stack.locale().query({ include_count: true, limit: 1 }).find();
+                const localesCount = (localesResponse === null || localesResponse === void 0 ? void 0 : localesResponse.count) || 0;
+                return [customRolesCount, localesCount];
+            });
+            if (totalRoles === 0) {
+                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('ROLES_NO_CUSTOM_ROLES'), this.exportConfig.context);
+                return;
+            }
+            // Create nested progress manager
+            const progress = this.createNestedProgress(this.currentModuleName)
+                .addProcess(utils_1.PROCESS_NAMES.FETCH_ROLES, totalRoles)
+                .addProcess(utils_1.PROCESS_NAMES.FETCH_LOCALES, totalLocales)
+                .addProcess(utils_1.PROCESS_NAMES.PROCESS_MAPPINGS, 1);
+            progress
+                .startProcess(utils_1.PROCESS_NAMES.FETCH_ROLES)
+                .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.FETCH_ROLES].FETCHING, utils_1.PROCESS_NAMES.FETCH_ROLES);
+            await this.getCustomRoles();
+            progress.completeProcess(utils_1.PROCESS_NAMES.FETCH_ROLES, true);
+            progress
+                .startProcess(utils_1.PROCESS_NAMES.FETCH_LOCALES)
+                .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.FETCH_LOCALES].FETCHING, utils_1.PROCESS_NAMES.FETCH_LOCALES);
+            await this.getLocales();
+            progress.completeProcess(utils_1.PROCESS_NAMES.FETCH_LOCALES, true);
+            progress
+                .startProcess(utils_1.PROCESS_NAMES.PROCESS_MAPPINGS)
+                .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.PROCESS_MAPPINGS].PROCESSING, utils_1.PROCESS_NAMES.PROCESS_MAPPINGS);
+            await this.getCustomRolesLocales();
+            progress.completeProcess(utils_1.PROCESS_NAMES.PROCESS_MAPPINGS, true);
+            cli_utilities_1.log.debug(`Custom roles export completed. Total custom roles: ${Object.keys(this.customRoles || {}).length}`, this.exportConfig.context);
+            this.completeProgress(true);
+        }
+        catch (error) {
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
+            this.completeProgress(false, (error === null || error === void 0 ? void 0 : error.message) || 'Custom roles export failed');
+        }
     }
     async getCustomRoles() {
         var _a;
@@ -55,9 +89,11 @@ class ExportCustomRoles extends base_class_1.default {
             return;
         }
         customRoles.forEach((role) => {
-            cli_utilities_1.log.debug(`Processing custom role: ${role === null || role === void 0 ? void 0 : role.name} (${role === null || role === void 0 ? void 0 : role.uid})`, this.exportConfig.context);
-            cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('ROLES_EXPORTING_ROLE', role === null || role === void 0 ? void 0 : role.name), this.exportConfig.context);
+            var _a;
+            cli_utilities_1.log.debug(`Processing custom role: ${role.name} (${role.uid})`, this.exportConfig.context);
+            cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('ROLES_EXPORTING_ROLE', role.name), this.exportConfig.context);
             this.customRoles[role.uid] = role;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `role: ${role.name}`, null, utils_1.PROCESS_NAMES.FETCH_ROLES);
         });
         const customRolesFilePath = (0, node_path_1.resolve)(this.rolesFolderPath, this.customRolesConfig.fileName);
         cli_utilities_1.log.debug(`Writing custom roles to: ${customRolesFilePath}`, this.exportConfig.context);
@@ -79,21 +115,23 @@ class ExportCustomRoles extends base_class_1.default {
             cli_utilities_1.log.debug('Error occurred while fetching locales', this.exportConfig.context);
             return (0, cli_utilities_1.handleAndLogError)(err, Object.assign({}, this.exportConfig.context));
         });
-        for (const locale of locales.items) {
-            cli_utilities_1.log.debug(`Mapping locale: ${locale === null || locale === void 0 ? void 0 : locale.name} (${locale === null || locale === void 0 ? void 0 : locale.uid})`, this.exportConfig.context);
+        for (const locale of locales === null || locales === void 0 ? void 0 : locales.items) {
+            cli_utilities_1.log.debug(`Mapping locale: ${locale.name} (${locale.uid})`, this.exportConfig.context);
             this.sourceLocalesMap[locale.uid] = locale;
+            // Track progress for each locale
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `locale: ${locale.name}`, null, utils_1.PROCESS_NAMES.FETCH_LOCALES);
         }
-        cli_utilities_1.log.debug(`Mapped ${(_a = Object.keys(this.sourceLocalesMap)) === null || _a === void 0 ? void 0 : _a.length} locales`, this.exportConfig.context);
+        cli_utilities_1.log.debug(`Mapped ${Object.keys(this.sourceLocalesMap || {}).length} locales`, this.exportConfig.context);
     }
     async getCustomRolesLocales() {
         var _a, _b, _c;
         cli_utilities_1.log.debug('Processing custom roles locales mapping...', this.exportConfig.context);
         for (const role of (0, values_1.default)(this.customRoles)) {
             const customRole = role;
-            cli_utilities_1.log.debug(`Processing locales for custom role: ${customRole === null || customRole === void 0 ? void 0 : customRole.name}`, this.exportConfig.context);
+            cli_utilities_1.log.debug(`Processing locales for custom role: ${customRole.name}`, this.exportConfig.context);
             const rulesLocales = (0, find_1.default)(customRole.rules, (rule) => rule.module === 'locale');
             if ((_a = rulesLocales === null || rulesLocales === void 0 ? void 0 : rulesLocales.locales) === null || _a === void 0 ? void 0 : _a.length) {
-                cli_utilities_1.log.debug(`Found ${rulesLocales.locales.length} locales for role: ${customRole === null || customRole === void 0 ? void 0 : customRole.name}`, this.exportConfig.context);
+                cli_utilities_1.log.debug(`Found ${rulesLocales.locales.length} locales for role: ${customRole.name}`, this.exportConfig.context);
                 (0, forEach_1.default)(rulesLocales.locales, (locale) => {
                     cli_utilities_1.log.debug(`Adding locale ${locale} to custom roles mapping`, this.exportConfig.context);
                     this.localesMap[locale] = 1;
@@ -101,7 +139,7 @@ class ExportCustomRoles extends base_class_1.default {
             }
         }
         if ((_b = (0, keys_1.default)(this.localesMap)) === null || _b === void 0 ? void 0 : _b.length) {
-            cli_utilities_1.log.debug(`Processing ${(_c = (0, keys_1.default)(this.localesMap)) === null || _c === void 0 ? void 0 : _c.length} custom role locales`, this.exportConfig.context);
+            cli_utilities_1.log.debug(`Processing ${(0, keys_1.default)(this.localesMap).length} custom role locales`, this.exportConfig.context);
             for (const locale in this.localesMap) {
                 if (this.sourceLocalesMap[locale] !== undefined) {
                     const sourceLocale = this.sourceLocalesMap[locale];
@@ -116,6 +154,8 @@ class ExportCustomRoles extends base_class_1.default {
         else {
             cli_utilities_1.log.debug('No custom role locales found to process', this.exportConfig.context);
         }
+        // Track progress for mapping completion
+        (_c = this.progressManager) === null || _c === void 0 ? void 0 : _c.tick(true, 'role-locale mappings', null, utils_1.PROCESS_NAMES.PROCESS_MAPPINGS);
     }
 }
 exports.default = ExportCustomRoles;

package/lib/export/modules/entries.d.ts

@@ -13,6 +13,8 @@ export default class EntriesExport extends BaseClass {
     exportVariantEntry: boolean;
     constructor({ exportConfig, stackAPIClient }: ModuleClassParams);
     start(): Promise<void>;
+    getTotalEntriesCount(entryRequestOptions: Array<Record<string, any>>): Promise<number>;
+    setupVariantExport(): Promise<any>;
     createRequestObjects(locales: Array<Record<string, unknown>>, contentTypes: Array<Record<string, unknown>>): Array<Record<string, any>>;
     getEntries(options: Record<string, any>): Promise<any>;
     fetchEntriesVersions(entries: any, options: {