@contentstack/cli-cm-export 1.20.1 → 2.0.0-beta

package/lib/export/modules/entries.js

@@ -18,55 +18,131 @@ class EntriesExport extends base_class_1.default {
         this.localesFilePath = path.resolve((0, cli_utilities_2.sanitizePath)(exportConfig.data), (0, cli_utilities_2.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_2.sanitizePath)(exportConfig.modules.locales.dirName), (0, cli_utilities_2.sanitizePath)(exportConfig.modules.locales.fileName));
         this.schemaFilePath = path.resolve((0, cli_utilities_2.sanitizePath)(exportConfig.data), (0, cli_utilities_2.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_2.sanitizePath)(exportConfig.modules.content_types.dirName), 'schema.json');
         this.projectInstance = new cli_variants_1.ExportProjects(this.exportConfig);
-        this.exportConfig.context.module = 'entries';
+        this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.ENTRIES;
+        this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.ENTRIES];
     }
     async start() {
         var _a, _b;
         try {
             cli_utilities_1.log.debug('Starting entries export process...', this.exportConfig.context);
-            const locales = utils_1.fsUtil.readFile(this.localesFilePath);
-            if (!Array.isArray(locales) || (locales === null || locales === void 0 ? void 0 : locales.length) === 0) {
-                cli_utilities_1.log.debug(`No locales found in ${this.localesFilePath}`, this.exportConfig.context);
-            }
-            else {
-                cli_utilities_1.log.debug(`Loaded ${locales === null || locales === void 0 ? void 0 : locales.length} locales from ${this.localesFilePath}`, this.exportConfig.context);
-            }
-            const contentTypes = utils_1.fsUtil.readFile(this.schemaFilePath);
+            // Initial analysis with loading spinner
+            const [locales, contentTypes, entryRequestOptions, totalEntriesCount, variantInfo] = await this.withLoadingSpinner('ENTRIES: Analyzing content structure and entries...', async () => {
+                const locales = utils_1.fsUtil.readFile(this.localesFilePath);
+                const contentTypes = utils_1.fsUtil.readFile(this.schemaFilePath);
+                if (!Array.isArray(locales) || (locales === null || locales === void 0 ? void 0 : locales.length) === 0) {
+                    cli_utilities_1.log.debug(`No locales found in ${this.localesFilePath}`, this.exportConfig.context);
+                }
+                else {
+                    cli_utilities_1.log.debug(`Loaded ${locales === null || locales === void 0 ? void 0 : locales.length} locales from ${this.localesFilePath}`, this.exportConfig.context);
+                }
+                if ((contentTypes === null || contentTypes === void 0 ? void 0 : contentTypes.length) === 0) {
+                    cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('CONTENT_TYPE_NO_TYPES'), this.exportConfig.context);
+                    return [locales, contentTypes, [], 0, null];
+                }
+                cli_utilities_1.log.debug(`Loaded ${contentTypes === null || contentTypes === void 0 ? void 0 : contentTypes.length} content types from ${this.schemaFilePath}`, this.exportConfig.context);
+                // Create entry request objects
+                const entryRequestOptions = this.createRequestObjects(locales, contentTypes);
+                cli_utilities_1.log.debug(`Created ${entryRequestOptions.length} entry request objects for processing`, this.exportConfig.context);
+                // Get total entries count for better progress tracking
+                const totalEntriesCount = await this.getTotalEntriesCount(entryRequestOptions);
+                const variantInfo = await this.setupVariantExport();
+                return [locales, contentTypes, entryRequestOptions, totalEntriesCount, variantInfo];
+            });
             if ((contentTypes === null || contentTypes === void 0 ? void 0 : contentTypes.length) === 0) {
-                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('CONTENT_TYPE_NO_TYPES'), this.exportConfig.context);
                 return;
             }
-            cli_utilities_1.log.debug(`Loaded ${contentTypes === null || contentTypes === void 0 ? void 0 : contentTypes.length} content types from ${this.schemaFilePath}`, this.exportConfig.context);
-            // NOTE Check if variant is enabled in specific stack
-            if (this.exportConfig.personalizationEnabled) {
-                cli_utilities_1.log.debug('Personalization is enabled, checking for variant entries...', this.exportConfig.context);
-                let project_id;
-                try {
-                    const project = await this.projectInstance.projects({ connectedStackApiKey: this.exportConfig.apiKey });
-                    if (project && ((_a = project[0]) === null || _a === void 0 ? void 0 : _a.uid)) {
-                        project_id = project[0].uid;
-                        this.exportVariantEntry = true;
-                        cli_utilities_1.log.debug(`Found project with ID: ${project_id}, enabling variant entry export`, this.exportConfig.context);
+            // Create nested progress manager
+            const progress = this.createNestedProgress(this.currentModuleName);
+            // Add sub-processes
+            if (totalEntriesCount > 0) {
+                progress.addProcess(utils_1.PROCESS_NAMES.ENTRIES, totalEntriesCount);
+                if (this.entriesConfig.exportVersions) {
+                    progress.addProcess(utils_1.PROCESS_NAMES.ENTRY_VERSIONS, totalEntriesCount);
+                }
+            }
+            // Process entry collections
+            if (totalEntriesCount > 0) {
+                progress
+                    .startProcess(utils_1.PROCESS_NAMES.ENTRIES)
+                    .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.ENTRIES].PROCESSING, utils_1.PROCESS_NAMES.ENTRIES);
+                for (let entryRequestOption of entryRequestOptions) {
+                    try {
+                        cli_utilities_1.log.debug(`Processing entries for content type: ${entryRequestOption.contentType}, locale: ${entryRequestOption.locale}`, this.exportConfig.context);
+                        await this.getEntries(entryRequestOption);
+                        (_a = this.entriesFileHelper) === null || _a === void 0 ? void 0 : _a.completeFile(true);
+                        cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('ENTRIES_EXPORT_COMPLETE', entryRequestOption.contentType, entryRequestOption.locale), this.exportConfig.context);
+                    }
+                    catch (error) {
+                        (_b = this.progressManager) === null || _b === void 0 ? void 0 : _b.tick(false, `${entryRequestOption.contentType}:${entryRequestOption.locale}`, (error === null || error === void 0 ? void 0 : error.message) || utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.ENTRIES].FAILED, utils_1.PROCESS_NAMES.ENTRIES);
+                        throw error;
                     }
-                    this.variantEntries = new cli_variants_1.Export.VariantEntries(Object.assign(this.exportConfig, { project_id }));
                 }
-                catch (error) {
-                    (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
+                progress.completeProcess(utils_1.PROCESS_NAMES.ENTRIES, true);
+                if (this.entriesConfig.exportVersions) {
+                    progress.completeProcess(utils_1.PROCESS_NAMES.ENTRY_VERSIONS, true);
+                }
+                if (this.exportVariantEntry && this.variantEntries) {
+                    // Complete the variant entries export process
+                    this.variantEntries.completeExport();
                 }
             }
-            const entryRequestOptions = this.createRequestObjects(locales, contentTypes);
-            cli_utilities_1.log.debug(`Created ${entryRequestOptions.length} entry request objects for processing`, this.exportConfig.context);
-            for (let entryRequestOption of entryRequestOptions) {
-                cli_utilities_1.log.debug(`Processing entries for content type: ${entryRequestOption.contentType}, locale: ${entryRequestOption.locale}`, this.exportConfig.context);
-                await this.getEntries(entryRequestOption);
-                (_b = this.entriesFileHelper) === null || _b === void 0 ? void 0 : _b.completeFile(true);
-                cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('ENTRIES_EXPORT_COMPLETE', entryRequestOption.contentType, entryRequestOption.locale), this.exportConfig.context);
-            }
+            this.completeProgress(true);
             cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('ENTRIES_EXPORT_SUCCESS'), this.exportConfig.context);
         }
         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) || 'Entries export failed');
+        }
+    }
+    async getTotalEntriesCount(entryRequestOptions) {
+        cli_utilities_1.log.debug('Calculating total entries count for progress tracking...', this.exportConfig.context);
+        const countPromises = entryRequestOptions.map(async (option) => {
+            const countQuery = {
+                locale: option.locale,
+                limit: 1,
+                include_count: true,
+                query: { locale: option.locale },
+            };
+            this.applyQueryFilters(countQuery, 'entries');
+            try {
+                const response = await this.stackAPIClient.contentType(option.contentType).entry().query(countQuery).find();
+                const count = response.count || 0;
+                cli_utilities_1.log.debug(`Content type ${option.contentType} (${option.locale}): ${count} entries`, this.exportConfig.context);
+                return count;
+            }
+            catch (error) {
+                cli_utilities_1.log.debug(`Failed to get count for ${option.contentType}:${option.locale}`, this.exportConfig.context);
+                return 0;
+            }
+        });
+        const results = await Promise.allSettled(countPromises);
+        const totalCount = results.reduce((sum, result) => {
+            return sum + (result.status === 'fulfilled' ? result.value : 0);
+        }, 0);
+        cli_utilities_1.log.debug(`Total entries count: ${totalCount}`, this.exportConfig.context);
+        return totalCount;
+    }
+    async setupVariantExport() {
+        var _a;
+        if (!this.exportConfig.personalizationEnabled) {
+            return null;
+        }
+        cli_utilities_1.log.debug('Personalization is enabled, checking for variant entries...', this.exportConfig.context);
+        try {
+            const project = await this.projectInstance.projects({ connectedStackApiKey: this.exportConfig.apiKey });
+            if (project && ((_a = project[0]) === null || _a === void 0 ? void 0 : _a.uid)) {
+                const project_id = project[0].uid;
+                this.exportVariantEntry = true;
+                cli_utilities_1.log.debug(`Found project with ID: ${project_id}, enabling variant entry export`, this.exportConfig.context);
+                this.variantEntries = new cli_variants_1.Export.VariantEntries(Object.assign(this.exportConfig, { project_id }));
+                return { project_id };
+            }
+        }
+        catch (error) {
+            cli_utilities_1.log.debug('Failed to setup variant export', this.exportConfig.context);
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
         }
+        return null;
     }
     createRequestObjects(locales, contentTypes) {
         if (!Array.isArray(locales) || (locales === null || locales === void 0 ? void 0 : locales.length) === 0) {
@@ -145,6 +221,11 @@ class EntriesExport extends base_class_1.default {
             }
             cli_utilities_1.log.debug(`Writing ${entriesSearchResponse.items.length} entries to file`, this.exportConfig.context);
             this.entriesFileHelper.writeIntoFile(entriesSearchResponse.items, { mapKeyVal: true });
+            // Track progress for individual entries
+            entriesSearchResponse.items.forEach((entry) => {
+                var _a;
+                (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `entry: ${entry.uid}`, null, utils_1.PROCESS_NAMES.ENTRIES);
+            });
             if (this.entriesConfig.exportVersions) {
                 cli_utilities_1.log.debug('Exporting entry versions is enabled', this.exportConfig.context);
                 let versionedEntryPath = path.join((0, cli_utilities_2.sanitizePath)(this.entriesDirPath), (0, cli_utilities_2.sanitizePath)(options.contentType), (0, cli_utilities_2.sanitizePath)(options.locale), 'versions');
@@ -159,11 +240,21 @@ class EntriesExport extends base_class_1.default {
             // NOTE Export all base entry specific 'variant entries'
             if (this.exportVariantEntry) {
                 cli_utilities_1.log.debug('Exporting variant entries for base entries', this.exportConfig.context);
-                await this.variantEntries.exportVariantEntry({
-                    locale: options.locale,
-                    contentTypeUid: options.contentType,
-                    entries: entriesSearchResponse.items,
-                });
+                try {
+                    // Set parent progress manager for variant entries
+                    if (this.variantEntries && typeof this.variantEntries.setParentProgressManager === 'function') {
+                        this.variantEntries.setParentProgressManager(this.progressManager);
+                    }
+                    await this.variantEntries.exportVariantEntry({
+                        locale: options.locale,
+                        contentTypeUid: options.contentType,
+                        entries: entriesSearchResponse.items,
+                    });
+                    cli_utilities_1.log.debug(`Successfully exported variant entries for ${entriesSearchResponse.items.length} entries`, this.exportConfig.context);
+                }
+                catch (error) {
+                    cli_utilities_1.log.debug('Failed to export variant entries', this.exportConfig.context);
+                }
             }
             options.skip += this.entriesConfig.limit || 100;
             if (options.skip >= entriesSearchResponse.count) {
@@ -173,17 +264,26 @@ class EntriesExport extends base_class_1.default {
             cli_utilities_1.log.debug(`Continuing to fetch entries with skip: ${options.skip}`, this.exportConfig.context);
             return await this.getEntries(options);
         }
+        else {
+            cli_utilities_1.log.debug(`No entries found for content type: ${options.contentType}, locale: ${options.locale}`, this.exportConfig.context);
+        }
     }
     async fetchEntriesVersions(entries, options) {
         cli_utilities_1.log.debug(`Fetching versions for ${entries.length} entries`, this.exportConfig.context);
         const onSuccess = ({ response, apiData: entry }) => {
+            var _a;
             const versionFilePath = path.join((0, cli_utilities_2.sanitizePath)(options.versionedEntryPath), (0, cli_utilities_2.sanitizePath)(`${entry.uid}.json`));
             cli_utilities_1.log.debug(`Writing versioned entry to: ${versionFilePath}`, this.exportConfig.context);
             utils_1.fsUtil.writeFile(versionFilePath, response);
+            // Track version progress if the process exists
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `version: ${entry.uid}`, null, utils_1.PROCESS_NAMES.ENTRY_VERSIONS);
             cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('ENTRIES_VERSIONED_EXPORT_SUCCESS', options.contentType, entry.uid, options.locale), this.exportConfig.context);
         };
         const onReject = ({ error, apiData: { uid } = undefined }) => {
+            var _a;
             cli_utilities_1.log.debug(`Failed to fetch versioned entry for uid: ${uid}`, this.exportConfig.context);
+            // Track version failure if the process exists
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(false, `version: ${uid}`, (error === null || error === void 0 ? void 0 : error.message) || utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.ENTRY_VERSIONS].FAILED, utils_1.PROCESS_NAMES.ENTRY_VERSIONS);
             (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.exportConfig.context), { uid }), cli_utilities_1.messageHandler.parse('ENTRIES_EXPORT_VERSIONS_FAILED', uid));
         };
         cli_utilities_1.log.debug(`Starting concurrent calls for versioned entries with batch limit: ${this.entriesConfig.batchLimit}`, this.exportConfig.context);

package/lib/export/modules/environments.js

@@ -13,24 +13,47 @@ class ExportEnvironments extends base_class_1.default {
         this.environments = {};
         this.environmentConfig = exportConfig.modules.environments;
         this.qs = { include_count: true };
-        this.exportConfig.context.module = 'environments';
+        this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.ENVIRONMENTS;
+        this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.ENVIRONMENTS];
     }
     async start() {
-        cli_utilities_1.log.debug('Starting environment export process...', this.exportConfig.context);
-        this.environmentsFolderPath = (0, node_path_1.resolve)(this.exportConfig.data, this.exportConfig.branchName || '', this.environmentConfig.dirName);
-        cli_utilities_1.log.debug(`Environments folder path: ${this.environmentsFolderPath}`, this.exportConfig.context);
-        await utils_1.fsUtil.makeDirectory(this.environmentsFolderPath);
-        cli_utilities_1.log.debug('Created environments directory', this.exportConfig.context);
-        await this.getEnvironments();
-        cli_utilities_1.log.debug(`Retrieved ${Object.keys(this.environments).length} environments`, this.exportConfig.context);
-        if (this.environments === undefined || (0, isEmpty_1.default)(this.environments)) {
-            cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('ENVIRONMENT_NOT_FOUND'), this.exportConfig.context);
+        try {
+            cli_utilities_1.log.debug('Starting environment export process...', this.exportConfig.context);
+            // Setup with loading spinner
+            const [totalCount] = await this.withLoadingSpinner('ENVIRONMENTS: Analyzing environments...', async () => {
+                this.environmentsFolderPath = (0, node_path_1.resolve)(this.exportConfig.data, this.exportConfig.branchName || '', this.environmentConfig.dirName);
+                await utils_1.fsUtil.makeDirectory(this.environmentsFolderPath);
+                cli_utilities_1.log.debug(`Environments folder path: ${this.environmentsFolderPath}`, this.exportConfig.context);
+                // Get count for progress tracking
+                const countResponse = await this.stack
+                    .environment()
+                    .query(Object.assign(Object.assign({}, this.qs), { include_count: true, limit: 1 }))
+                    .find();
+                return [countResponse.count || 0];
+            });
+            if (totalCount === 0) {
+                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('ENVIRONMENT_NOT_FOUND'), this.exportConfig.context);
+                return;
+            }
+            // Create simple progress manager with total count
+            const progress = this.createSimpleProgress(this.currentModuleName, totalCount);
+            progress.updateStatus('Fetching environments...');
+            await this.getEnvironments();
+            cli_utilities_1.log.debug(`Retrieved ${Object.keys(this.environments || {}).length} environments`, this.exportConfig.context);
+            if (this.environments === undefined || (0, isEmpty_1.default)(this.environments)) {
+                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('ENVIRONMENT_NOT_FOUND'), this.exportConfig.context);
+            }
+            else {
+                const environmentsFilePath = (0, node_path_1.resolve)(this.environmentsFolderPath, this.environmentConfig.fileName);
+                cli_utilities_1.log.debug(`Writing environments to: ${environmentsFilePath}`, this.exportConfig.context);
+                utils_1.fsUtil.writeFile(environmentsFilePath, this.environments);
+                cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('ENVIRONMENT_EXPORT_COMPLETE', Object.keys(this.environments || {}).length), this.exportConfig.context);
+            }
+            this.completeProgress(true);
         }
-        else {
-            const environmentsFilePath = (0, node_path_1.resolve)(this.environmentsFolderPath, this.environmentConfig.fileName);
-            cli_utilities_1.log.debug(`Writing environments to: ${environmentsFilePath}`, this.exportConfig.context);
-            utils_1.fsUtil.writeFile(environmentsFilePath, this.environments);
-            cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('ENVIRONMENT_EXPORT_COMPLETE', Object.keys(this.environments).length), this.exportConfig.context);
+        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) || 'Environments export failed');
         }
     }
     async getEnvironments(skip = 0) {
@@ -70,16 +93,18 @@ class ExportEnvironments extends base_class_1.default {
         });
     }
     sanitizeAttribs(environments) {
-        var _a;
+        var _a, _b;
         cli_utilities_1.log.debug(`Sanitizing ${environments.length} environments`, this.exportConfig.context);
         for (let index = 0; index < (environments === null || environments === void 0 ? void 0 : environments.length); index++) {
-            const extUid = environments[index].uid;
+            const envUID = environments[index].uid;
             const envName = (_a = environments[index]) === null || _a === void 0 ? void 0 : _a.name;
-            cli_utilities_1.log.debug(`Processing environment: ${envName} (${extUid})`, this.exportConfig.context);
-            this.environments[extUid] = (0, omit_1.default)(environments[index], ['ACL']);
+            cli_utilities_1.log.debug(`Processing environment: ${envName} (${envUID})`, this.exportConfig.context);
+            this.environments[envUID] = (0, omit_1.default)(environments[index], ['ACL']);
+            // Track progress for each environment
+            (_b = this.progressManager) === null || _b === void 0 ? void 0 : _b.tick(true, `environment: ${envName || envUID}`);
             cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('ENVIRONMENT_EXPORT_SUCCESS', envName), this.exportConfig.context);
         }
-        cli_utilities_1.log.debug(`Sanitization complete. Total environments processed: ${Object.keys(this.environments).length}`, this.exportConfig.context);
+        cli_utilities_1.log.debug(`Sanitization complete. Total environments processed: ${Object.keys(this.environments || {}).length}`, this.exportConfig.context);
     }
 }
 exports.default = ExportEnvironments;

package/lib/export/modules/extensions.js

@@ -14,24 +14,47 @@ class ExportExtensions extends base_class_1.default {
         this.extensionConfig = exportConfig.modules.extensions;
         this.qs = { include_count: true };
         this.applyQueryFilters(this.qs, 'extensions');
-        this.exportConfig.context.module = 'extensions';
+        this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.EXTENSIONS;
+        this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.EXTENSIONS];
     }
     async start() {
-        cli_utilities_1.log.debug('Starting extensions export process...', this.exportConfig.context);
-        this.extensionsFolderPath = (0, node_path_1.resolve)(this.exportConfig.data, this.exportConfig.branchName || '', this.extensionConfig.dirName);
-        cli_utilities_1.log.debug(`Extensions folder path: ${this.extensionsFolderPath}`, this.exportConfig.context);
-        await utils_1.fsUtil.makeDirectory(this.extensionsFolderPath);
-        cli_utilities_1.log.debug('Created extensions directory', this.exportConfig.context);
-        await this.getExtensions();
-        cli_utilities_1.log.debug(`Retrieved ${Object.keys(this.extensions).length} extensions`, this.exportConfig.context);
-        if (this.extensions === undefined || (0, isEmpty_1.default)(this.extensions)) {
-            cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('EXTENSION_NOT_FOUND'), this.exportConfig.context);
+        try {
+            cli_utilities_1.log.debug('Starting extensions export process...', this.exportConfig.context);
+            // Setup with loading spinner
+            const [totalCount] = await this.withLoadingSpinner('EXTENSIONS: Analyzing extensions...', async () => {
+                this.extensionsFolderPath = (0, node_path_1.resolve)(this.exportConfig.data, this.exportConfig.branchName || '', this.extensionConfig.dirName);
+                await utils_1.fsUtil.makeDirectory(this.extensionsFolderPath);
+                cli_utilities_1.log.debug(`Extensions folder path: ${this.extensionsFolderPath}`, this.exportConfig.context);
+                // Get count for progress tracking
+                const countResponse = await this.stack
+                    .extension()
+                    .query(Object.assign(Object.assign({}, this.qs), { include_count: true, limit: 1 }))
+                    .find();
+                return [countResponse.count || 0];
+            });
+            if (totalCount === 0) {
+                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('EXTENSION_NOT_FOUND'), this.exportConfig.context);
+                return;
+            }
+            // Create simple progress manager with total count
+            const progress = this.createSimpleProgress(this.currentModuleName, totalCount);
+            progress.updateStatus('Fetching extensions...');
+            await this.getExtensions();
+            cli_utilities_1.log.debug(`Retrieved ${Object.keys(this.extensions || {}).length} extensions`, this.exportConfig.context);
+            if (this.extensions === undefined || (0, isEmpty_1.default)(this.extensions)) {
+                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('EXTENSION_NOT_FOUND'), this.exportConfig.context);
+            }
+            else {
+                const extensionsFilePath = (0, node_path_1.resolve)(this.extensionsFolderPath, this.extensionConfig.fileName);
+                cli_utilities_1.log.debug(`Writing extensions to: ${extensionsFilePath}`, this.exportConfig.context);
+                utils_1.fsUtil.writeFile(extensionsFilePath, this.extensions);
+                cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('EXTENSION_EXPORT_COMPLETE', Object.keys(this.extensions || {}).length), this.exportConfig.context);
+            }
+            this.completeProgress(true);
         }
-        else {
-            const extensionsFilePath = (0, node_path_1.resolve)(this.extensionsFolderPath, this.extensionConfig.fileName);
-            cli_utilities_1.log.debug(`Writing extensions to: ${extensionsFilePath}`, this.exportConfig.context);
-            utils_1.fsUtil.writeFile(extensionsFilePath, this.extensions);
-            cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('EXTENSION_EXPORT_COMPLETE', Object.keys(this.extensions).length), this.exportConfig.context);
+        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) || 'Extensions export failed');
         }
     }
     async getExtensions(skip = 0) {
@@ -71,16 +94,18 @@ class ExportExtensions extends base_class_1.default {
         });
     }
     sanitizeAttribs(extensions) {
-        var _a;
+        var _a, _b;
         cli_utilities_1.log.debug(`Sanitizing ${extensions.length} extensions`, this.exportConfig.context);
         for (let index = 0; index < (extensions === null || extensions === void 0 ? void 0 : extensions.length); index++) {
             const extUid = extensions[index].uid;
             const extTitle = (_a = extensions[index]) === null || _a === void 0 ? void 0 : _a.title;
             cli_utilities_1.log.debug(`Processing extension: ${extTitle} (${extUid})`, this.exportConfig.context);
             this.extensions[extUid] = (0, omit_1.default)(extensions[index], ['SYS_ACL']);
+            // Track progress for each extension
+            (_b = this.progressManager) === null || _b === void 0 ? void 0 : _b.tick(true, `extension: ${extTitle || extUid}`);
             cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('EXTENSION_EXPORT_SUCCESS', extTitle), this.exportConfig.context);
         }
-        cli_utilities_1.log.debug(`Sanitization complete. Total extensions processed: ${Object.keys(this.extensions).length}`, this.exportConfig.context);
+        cli_utilities_1.log.debug(`Sanitization complete. Total extensions processed: ${Object.keys(this.extensions || {}).length}`, this.exportConfig.context);
     }
 }
 exports.default = ExportExtensions;

package/lib/export/modules/global-fields.d.ts

@@ -1,5 +1,5 @@
-import { ExportConfig, ModuleClassParams } from '../../types';
 import BaseClass from './base-class';
+import { ExportConfig, ModuleClassParams } from '../../types';
 export default class GlobalFieldsExport extends BaseClass {
     private stackAPIClient;
     exportConfig: ExportConfig;

package/lib/export/modules/global-fields.js

@@ -3,8 +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 base_class_1 = tslib_1.__importDefault(require("./base-class"));
+const utils_1 = require("../../utils");
 class GlobalFieldsExport extends base_class_1.default {
     constructor({ exportConfig, stackAPIClient }) {
         super({ exportConfig, stackAPIClient });
@@ -20,24 +20,39 @@ class GlobalFieldsExport extends base_class_1.default {
         this.globalFieldsDirPath = path.resolve((0, cli_utilities_1.sanitizePath)(exportConfig.data), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.globalFieldsConfig.dirName));
         this.globalFields = [];
         this.applyQueryFilters(this.qs, 'global-fields');
-        this.exportConfig.context.module = 'global-fields';
+        this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.GLOBAL_FIELDS;
+        this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.GLOBAL_FIELDS];
     }
     async start() {
         try {
             cli_utilities_1.log.debug('Starting global fields export process...', this.exportConfig.context);
-            cli_utilities_1.log.debug(`Global fields directory path: ${this.globalFieldsDirPath}`, this.exportConfig.context);
-            await utils_1.fsUtil.makeDirectory(this.globalFieldsDirPath);
-            cli_utilities_1.log.debug('Created global fields directory', this.exportConfig.context);
+            // Get global fields count and setup with loading spinner
+            const [totalCount] = await this.withLoadingSpinner('GLOBAL-FIELDS: Analyzing global fields...', async () => {
+                await utils_1.fsUtil.makeDirectory(this.globalFieldsDirPath);
+                const countResponse = await this.stackAPIClient
+                    .globalField()
+                    .query(Object.assign(Object.assign({}, this.qs), { include_count: true, limit: 1 }))
+                    .find();
+                return [countResponse.count || 0];
+            });
+            if (totalCount === 0) {
+                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('GLOBAL_FIELDS_NOT_FOUND'), this.exportConfig.context);
+                return;
+            }
+            // Create simple progress manager for global fields
+            const progress = this.createSimpleProgress(this.currentModuleName, totalCount);
+            progress.updateStatus('Fetching global fields...');
             await this.getGlobalFields();
-            cli_utilities_1.log.debug(`Retrieved ${this.globalFields.length} global fields`, this.exportConfig.context);
             const globalFieldsFilePath = path.join(this.globalFieldsDirPath, this.globalFieldsConfig.fileName);
             cli_utilities_1.log.debug(`Writing global fields to: ${globalFieldsFilePath}`, this.exportConfig.context);
             utils_1.fsUtil.writeFile(globalFieldsFilePath, this.globalFields);
             cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('GLOBAL_FIELDS_EXPORT_COMPLETE', this.globalFields.length), this.exportConfig.context);
+            this.completeProgress(true);
         }
         catch (error) {
             cli_utilities_1.log.debug('Error occurred during global fields export', this.exportConfig.context);
             (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
+            this.completeProgress(false, (error === null || error === void 0 ? void 0 : error.message) || 'Global fields export failed');
         }
     }
     async getGlobalFields(skip = 0) {
@@ -67,6 +82,7 @@ class GlobalFieldsExport extends base_class_1.default {
     sanitizeAttribs(globalFields) {
         cli_utilities_1.log.debug(`Sanitizing ${globalFields.length} global fields`, this.exportConfig.context);
         globalFields.forEach((globalField) => {
+            var _a;
             cli_utilities_1.log.debug(`Processing global field: ${globalField.uid || 'unknown'}`, this.exportConfig.context);
             for (let key in globalField) {
                 if (this.globalFieldsConfig.validKeys.indexOf(key) === -1) {
@@ -74,6 +90,8 @@ class GlobalFieldsExport extends base_class_1.default {
                 }
             }
             this.globalFields.push(globalField);
+            // Track progress for each global field
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `global-field: ${globalField.uid}`);
         });
         cli_utilities_1.log.debug(`Sanitization complete. Total global fields processed: ${this.globalFields.length}`, this.exportConfig.context);
     }

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

@@ -1,3 +1,4 @@
 import { ModuleClassParams } from '../../types';
+import '../../utils/progress-strategy-registry';
 export default function startModuleExport(modulePayload: ModuleClassParams): Promise<any>;
 export { default as ExportAssets } from './assets';

package/lib/export/modules/index.js

@@ -29,6 +29,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExportAssets = void 0;
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+require("../../utils/progress-strategy-registry");
 async function startModuleExport(modulePayload) {
     try {
         const { default: ModuleRunner } = await (_a = `./${modulePayload.moduleName}`, Promise.resolve().then(() => __importStar(require(_a))));

package/lib/export/modules/labels.js

@@ -13,24 +13,47 @@ class ExportLabels extends base_class_1.default {
         this.labels = {};
         this.labelConfig = exportConfig.modules.labels;
         this.qs = { include_count: true };
-        this.exportConfig.context.module = 'labels';
+        this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.LABELS;
+        this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.LABELS];
     }
     async start() {
-        cli_utilities_1.log.debug('Starting labels export process...', this.exportConfig.context);
-        this.labelsFolderPath = (0, node_path_1.resolve)(this.exportConfig.data, this.exportConfig.branchName || '', this.labelConfig.dirName);
-        cli_utilities_1.log.debug(`Labels folder path: ${this.labelsFolderPath}`, this.exportConfig.context);
-        await utils_1.fsUtil.makeDirectory(this.labelsFolderPath);
-        cli_utilities_1.log.debug('Created labels directory', this.exportConfig.context);
-        await this.getLabels();
-        cli_utilities_1.log.debug(`Retrieved ${Object.keys(this.labels).length} labels`, this.exportConfig.context);
-        if (this.labels === undefined || (0, isEmpty_1.default)(this.labels)) {
-            cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('LABELS_NOT_FOUND'), this.exportConfig.context);
+        try {
+            cli_utilities_1.log.debug('Starting labels export process...', this.exportConfig.context);
+            // Setup with loading spinner
+            const [totalCount] = await this.withLoadingSpinner('LABELS: Analyzing labels...', async () => {
+                this.labelsFolderPath = (0, node_path_1.resolve)(this.exportConfig.data, this.exportConfig.branchName || '', this.labelConfig.dirName);
+                await utils_1.fsUtil.makeDirectory(this.labelsFolderPath);
+                cli_utilities_1.log.debug(`Labels folder path: ${this.labelsFolderPath}`, this.exportConfig.context);
+                // Get count for progress tracking
+                const countResponse = await this.stack
+                    .label()
+                    .query(Object.assign(Object.assign({}, this.qs), { include_count: true, limit: 1 }))
+                    .find();
+                return [countResponse.count || 0];
+            });
+            if (totalCount === 0) {
+                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('LABELS_NOT_FOUND'), this.exportConfig.context);
+                return;
+            }
+            // Create simple progress manager with total count
+            const progress = this.createSimpleProgress(this.currentModuleName, totalCount);
+            progress.updateStatus('Fetching labels...');
+            await this.getLabels();
+            cli_utilities_1.log.debug(`Retrieved ${Object.keys(this.labels || {}).length} labels`, this.exportConfig.context);
+            if (this.labels === undefined || (0, isEmpty_1.default)(this.labels)) {
+                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('LABELS_NOT_FOUND'), this.exportConfig.context);
+            }
+            else {
+                const labelsFilePath = (0, node_path_1.resolve)(this.labelsFolderPath, this.labelConfig.fileName);
+                cli_utilities_1.log.debug(`Writing labels to: ${labelsFilePath}`, this.exportConfig.context);
+                utils_1.fsUtil.writeFile(labelsFilePath, this.labels);
+                cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('LABELS_EXPORT_COMPLETE', Object.keys(this.labels || {}).length), this.exportConfig.context);
+            }
+            this.completeProgress(true);
         }
-        else {
-            const labelsFilePath = (0, node_path_1.resolve)(this.labelsFolderPath, this.labelConfig.fileName);
-            cli_utilities_1.log.debug(`Writing labels to: ${labelsFilePath}`, this.exportConfig.context);
-            utils_1.fsUtil.writeFile(labelsFilePath, this.labels);
-            cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('LABELS_EXPORT_COMPLETE', Object.keys(this.labels).length), this.exportConfig.context);
+        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) || 'Labels export failed');
         }
     }
     async getLabels(skip = 0) {
@@ -65,12 +88,14 @@ class ExportLabels extends base_class_1.default {
             }
         })
             .catch((error) => {
+            var _a;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(false, 'labels', (error === null || error === void 0 ? void 0 : error.message) || 'Failed to export labels');
             cli_utilities_1.log.debug('Error occurred while fetching labels', this.exportConfig.context);
             (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
         });
     }
     sanitizeAttribs(labels) {
-        var _a;
+        var _a, _b;
         cli_utilities_1.log.debug(`Sanitizing ${labels.length} labels`, this.exportConfig.context);
         for (let index = 0; index < (labels === null || labels === void 0 ? void 0 : labels.length); index++) {
             const labelUid = labels[index].uid;
@@ -78,6 +103,8 @@ class ExportLabels extends base_class_1.default {
             cli_utilities_1.log.debug(`Processing label: ${labelName} (${labelUid})`, this.exportConfig.context);
             this.labels[labelUid] = (0, omit_1.default)(labels[index], this.labelConfig.invalidKeys);
             cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('LABEL_EXPORT_SUCCESS', labelName), this.exportConfig.context);
+            // Track progress for each label
+            (_b = this.progressManager) === null || _b === void 0 ? void 0 : _b.tick(true, `label: ${labelName}`);
         }
         cli_utilities_1.log.debug(`Sanitization complete. Total labels processed: ${Object.keys(this.labels).length}`, this.exportConfig.context);
     }