@contentstack/cli-variants 1.3.2 → 2.0.0-beta

package/lib/utils/variant-api-adapter.js

@@ -40,7 +40,7 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d;
             cli_utilities_1.log.debug('Initializing VariantHttpClient...', (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
             yield cli_utilities_1.authenticationHandler.getAuthDetails();
             const token = cli_utilities_1.authenticationHandler.accessToken;
@@ -53,7 +53,6 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
                 cli_utilities_1.log.debug('Setting authtoken header', (_d = this.exportConfig) === null || _d === void 0 ? void 0 : _d.context);
                 this.apiClient.headers({ authtoken: token });
             }
-            cli_utilities_1.log.debug('VariantHttpClient initialization completed', (_e = this.exportConfig) === null || _e === void 0 ? void 0 : _e.context);
         });
     }
     variantEntry(options) {
@@ -171,28 +170,24 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
     createVariantEntry(input, options, apiParams) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const { reject, resolve, variantUid, log } = apiParams;
+            const { reject, resolve, variantUid } = apiParams;
             const variantConfig = this.config.modules.variantEntry;
             const { locale = variantConfig.query.locale || 'en-us', variant_id, entry_uid, content_type_uid } = options;
-            log.debug(`Creating variant entry for content type: ${content_type_uid}, entry: ${entry_uid}, variant: ${variant_id}`, (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
+            cli_utilities_1.log.debug(`Creating variant entry for content type: ${content_type_uid}, entry: ${entry_uid}, variant: ${variant_id}`, (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
             let endpoint = `content_types/${content_type_uid}/entries/${entry_uid}/variants/${variant_id}?locale=${locale}`;
             const query = this.constructQuery((0, omit_1.default)(variantConfig.query, ['locale']));
             if (query) {
                 endpoint = endpoint.concat(query);
             }
-            log.debug(`Making API call to: ${endpoint}`, (_b = this.exportConfig) === null || _b === void 0 ? void 0 : _b.context);
+            cli_utilities_1.log.debug(`Making API call to: ${endpoint}`, (_b = this.exportConfig) === null || _b === void 0 ? void 0 : _b.context);
             const onSuccess = (response) => {
-                var _a;
-                log.debug(`Variant entry created successfully: ${variantUid}`, (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
-                resolve({ response, apiData: { variantUid, entryUid: entry_uid }, log });
+                resolve({ response, apiData: { variantUid, entryUid: entry_uid }, log: cli_utilities_1.log });
             };
             const onReject = (error) => {
-                var _a;
-                log.debug(`Failed to create variant entry: ${variantUid}`, (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
                 reject({
                     error,
                     apiData: { variantUid, entryUid: entry_uid },
-                    log,
+                    log: cli_utilities_1.log,
                 });
             };
             try {
@@ -222,23 +217,23 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
     publishVariantEntry(input, options, apiParams) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const { reject, resolve, log, variantUid } = apiParams;
+            const { reject, resolve, variantUid } = apiParams;
             const { entry_uid, content_type_uid } = options;
-            log.debug(`Publishing variant entry for content type: ${content_type_uid}, entry: ${entry_uid}`, (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
+            cli_utilities_1.log.debug(`Publishing variant entry for content type: ${content_type_uid}, entry: ${entry_uid}`, (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
             let endpoint = `content_types/${content_type_uid}/entries/${entry_uid}/publish`;
-            log.debug(`Making API call to: ${endpoint}`, (_b = this.exportConfig) === null || _b === void 0 ? void 0 : _b.context);
+            cli_utilities_1.log.debug(`Making API call to: ${endpoint}`, (_b = this.exportConfig) === null || _b === void 0 ? void 0 : _b.context);
             const onSuccess = (response) => {
                 var _a;
-                log.debug(`Variant entry published successfully: ${entry_uid}`, (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
-                resolve({ response, apiData: { entryUid: entry_uid, variantUid, locales: input.entry.locales }, log });
+                cli_utilities_1.log.debug(`Variant entry published successfully: ${entry_uid}`, (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
+                resolve({ response, apiData: { entryUid: entry_uid, variantUid, locales: input.entry.locales }, log: cli_utilities_1.log });
             };
             const onReject = (error) => {
                 var _a;
-                log.debug(`Failed to publish variant entry: ${entry_uid}`, (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
+                cli_utilities_1.log.debug(`Failed to publish variant entry: ${entry_uid}`, (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
                 reject({
                     error,
                     apiData: { entryUid: entry_uid, variantUid, locales: input.entry.locales },
-                    log,
+                    log: cli_utilities_1.log,
                 });
             };
             try {
@@ -275,9 +270,7 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
             cli_utilities_1.log.debug(`API request failed with status: ${status}`, (_c = this.exportConfig) === null || _c === void 0 ? void 0 : _c.context);
             // Refresh the access token if the response status is 401
             yield cli_utilities_1.authenticationHandler.refreshAccessToken(res);
-            const errorMsg = (data === null || data === void 0 ? void 0 : data.errors)
-                ? (0, error_helper_1.formatErrors)(data.errors)
-                : (data === null || data === void 0 ? void 0 : data.error_message) || (data === null || data === void 0 ? void 0 : data.message) || data;
+            const errorMsg = (data === null || data === void 0 ? void 0 : data.errors) ? (0, error_helper_1.formatErrors)(data.errors) : (data === null || data === void 0 ? void 0 : data.error_message) || (data === null || data === void 0 ? void 0 : data.message) || data;
             cli_utilities_1.log.debug(`API error: ${errorMsg}`, (_d = this.exportConfig) === null || _d === void 0 ? void 0 : _d.context);
             throw errorMsg;
         });
@@ -287,38 +280,27 @@ exports.VariantHttpClient = VariantHttpClient;
 class VariantManagementSDK extends adapter_helper_1.AdapterHelper {
     init() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            cli_utilities_1.log.debug('Initializing VariantManagementSDK...', (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
             this.apiClient = yield (0, cli_utilities_1.managementSDKClient)(this.config);
-            cli_utilities_1.log.debug('VariantManagementSDK initialized successfully', (_b = this.exportConfig) === null || _b === void 0 ? void 0 : _b.context);
         });
     }
     variantEntry(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            cli_utilities_1.log.debug('VariantEntry method called (SDK placeholder implementation)', (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
             // TODO SDK implementation
             return { entry: {} };
         });
     }
     variantEntries(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            cli_utilities_1.log.debug('VariantEntries method called (SDK placeholder implementation)', (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
             // TODO SDK implementation
             return { entries: [{}] };
         });
     }
     createVariantEntry(input, options, apiParams) {
-        var _a;
-        cli_utilities_1.log.debug('CreateVariantEntry method called (SDK placeholder implementation)', (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
         // FIXME placeholder
         return Promise.resolve({});
     }
     handleVariantAPIRes(res) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            cli_utilities_1.log.debug('HandleVariantAPIRes method called (SDK implementation)', (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
             return res.data;
         });
     }
@@ -337,6 +319,9 @@ exports.VariantManagementSDK = VariantManagementSDK;
 class VariantAdapter {
     constructor(config, options) {
         var _a, _b, _c, _d;
+        this.progressManager = null;
+        this.parentProgressManager = null;
+        this.currentModuleName = '';
         cli_utilities_1.log.debug('Initializing VariantAdapter...', (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
         if (config.httpClient) {
             cli_utilities_1.log.debug('Using HTTP client variant instance', (_b = this.exportConfig) === null || _b === void 0 ? void 0 : _b.context);
@@ -351,6 +336,78 @@ class VariantAdapter {
         this.messages = messages_1.default;
         cli_utilities_1.log.debug('VariantAdapter initialized successfully', (_d = this.exportConfig) === null || _d === void 0 ? void 0 : _d.context);
     }
+    /**
+     * Set parent progress manager for sub-module integration
+     */
+    setParentProgressManager(parentProgress) {
+        this.parentProgressManager = parentProgress;
+        this.progressManager = parentProgress;
+    }
+    /**
+     * Create simple progress manager for single process tracking
+     */
+    createSimpleProgress(moduleName, total) {
+        var _a;
+        this.currentModuleName = moduleName;
+        // If we have a parent progress manager, use it instead of creating a new one
+        if (this.parentProgressManager) {
+            this.progressManager = this.parentProgressManager;
+            return this.progressManager;
+        }
+        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 for multi-process tracking
+     */
+    createNestedProgress(moduleName) {
+        var _a;
+        this.currentModuleName = moduleName;
+        // If we have a parent progress manager, use it instead of creating a new one
+        if (this.parentProgressManager) {
+            this.progressManager = this.parentProgressManager;
+            return this.progressManager;
+        }
+        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;
+        // Only complete progress if we own the progress manager (no parent)
+        if (!this.parentProgressManager) {
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.complete(success, error);
+        }
+        this.progressManager = null;
+    }
+    /**
+     * Execute action with loading spinner for initial setup tasks
+     */
+    withLoadingSpinner(message, action) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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 yield action();
+            }
+            return yield cli_utilities_1.CLIProgressManager.withLoadingSpinner(message, action);
+        });
+    }
+    /**
+     * Update progress for a specific item
+     */
+    updateProgress(success, itemName, error, processName) {
+        var _a;
+        (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(success, itemName, error, processName);
+    }
 }
 exports.VariantAdapter = VariantAdapter;
 exports.default = VariantAdapter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-variants",
-  "version": "1.3.2",
+  "version": "2.0.0-beta",
   "description": "Variants plugin",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -27,7 +27,7 @@
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@contentstack/cli-utilities": "~1.14.0",
+    "@contentstack/cli-utilities": "~1.14.1",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",
     "lodash": "^4.17.21",

package/src/export/attributes.ts

@@ -1,16 +1,18 @@
 import omit from 'lodash/omit';
 import { resolve as pResolve } from 'node:path';
 import { sanitizePath, log, handleAndLogError } from '@contentstack/cli-utilities';
-import {fsUtil, PersonalizationAdapter } from '../utils';
 import { PersonalizeConfig, ExportConfig, AttributesConfig, AttributeStruct } from '../types';
+import { fsUtil, PersonalizationAdapter } from '../utils';
+import { PROCESS_NAMES, MODULE_CONTEXTS, EXPORT_PROCESS_STATUS } from '../utils/constants';
 
 export default class ExportAttributes extends PersonalizationAdapter<ExportConfig> {
   private attributesConfig: AttributesConfig;
   private attributesFolderPath: string;
   private attributes: Record<string, unknown>[];
+  public exportConfig: ExportConfig;
   public personalizeConfig: PersonalizeConfig;
 
-  constructor(readonly exportConfig: ExportConfig) {
+  constructor(exportConfig: ExportConfig) {
     super({
       config: exportConfig,
       baseURL: exportConfig.modules.personalize.baseURL[exportConfig.region.name],
@@ -26,45 +28,73 @@ export default class ExportAttributes extends PersonalizationAdapter<ExportConfi
       sanitizePath(this.attributesConfig.dirName),
     );
     this.attributes = [];
-    this.exportConfig.context.module = 'attributes';
+    this.exportConfig.context.module = MODULE_CONTEXTS.ATTRIBUTES;
   }
 
   async start() {
     try {
       log.info('Starting attributes export', this.exportConfig.context);
-      
-      log.debug('Initializing personalization adapter...', this.exportConfig.context);
-      await this.init();
-      log.debug('Personalization adapter initialized successfully', this.exportConfig.context);
-      
-      log.debug(`Creating attributes directory at: ${this.attributesFolderPath}`, this.exportConfig.context);
-      await fsUtil.makeDirectory(this.attributesFolderPath);
-      log.debug('Attributes directory created successfully', this.exportConfig.context);
-      
-      log.debug('Fetching attributes from personalization API...', this.exportConfig.context);
-      this.attributes = (await this.getAttributes()) as AttributeStruct[];
-      log.debug(`Fetched ${this.attributes?.length || 0} attributes`, this.exportConfig.context);
+
+      // Initial setup with loading spinner
+      await this.withLoadingSpinner('ATTRIBUTES: Initializing export and fetching data...', async () => {
+        log.debug('Initializing personalization adapter...', this.exportConfig.context);
+        await this.init();
+        log.debug('Personalization adapter initialized successfully', this.exportConfig.context);
+
+        log.debug(`Creating attributes directory at: ${this.attributesFolderPath}`, this.exportConfig.context);
+        await fsUtil.makeDirectory(this.attributesFolderPath);
+        log.debug('Attributes directory created successfully', this.exportConfig.context);
+        log.debug('Fetching attributes from personalization API...', this.exportConfig.context);
+        this.attributes = (await this.getAttributes()) as AttributeStruct[];
+        log.debug(`Fetched ${this.attributes?.length || 0} attributes`, this.exportConfig.context);
+      });
 
       if (!this.attributes?.length) {
         log.debug('No attributes found, completing export', this.exportConfig.context);
         log.info('No Attributes found with the given project!', this.exportConfig.context);
+        return;
+      }
+
+      let progress: any;
+
+      if (this.parentProgressManager) {
+        // Use parent progress manager - we're part of the personalize modules process
+        progress = this.parentProgressManager;
+        this.progressManager = this.parentProgressManager;
+
+        progress.updateProcessTotal(PROCESS_NAMES.ATTRIBUTES, this.attributes.length);
       } else {
-        log.debug(`Processing ${this.attributes.length} attributes`, this.exportConfig.context);
-        this.sanitizeAttribs();
-        log.debug('Attributes sanitization completed', this.exportConfig.context);
-        
-        const attributesFilePath = pResolve(sanitizePath(this.attributesFolderPath), sanitizePath(this.attributesConfig.fileName));
-        log.debug(`Writing attributes to: ${attributesFilePath}`, this.exportConfig.context);
-        fsUtil.writeFile(attributesFilePath, this.attributes);
-        
-        log.debug('Attributes export completed successfully', this.exportConfig.context);
-        log.success(
-          `Attributes exported successfully! Total attributes: ${this.attributes.length}`,
-          this.exportConfig.context,
-        );
+        progress = this.createSimpleProgress(PROCESS_NAMES.ATTRIBUTES, this.attributes.length);
+      }
+
+      log.debug(`Processing ${this.attributes.length} attributes`, this.exportConfig.context);
+
+      progress.updateStatus(EXPORT_PROCESS_STATUS[PROCESS_NAMES.ATTRIBUTES].EXPORTING, PROCESS_NAMES.ATTRIBUTES);
+
+      this.sanitizeAttribs();
+      log.debug('Attributes sanitization completed', this.exportConfig.context);
+
+      progress.updateStatus(EXPORT_PROCESS_STATUS[PROCESS_NAMES.ATTRIBUTES].EXPORTING, PROCESS_NAMES.ATTRIBUTES);
+      const attributesFilePath = pResolve(
+        sanitizePath(this.attributesFolderPath),
+        sanitizePath(this.attributesConfig.fileName),
+      );
+      log.debug(`Writing attributes to: ${attributesFilePath}`, this.exportConfig.context);
+      fsUtil.writeFile(attributesFilePath, this.attributes);
+
+      // Complete progress only if we're managing our own progress
+      if (!this.parentProgressManager) {
+        this.completeProgress(true);
       }
-    } catch (error) {
+
+      log.debug('Attributes export completed successfully', this.exportConfig.context);
+      log.success(
+        `Attributes exported successfully! Total attributes: ${this.attributes.length}`,
+        this.exportConfig.context,
+      );
+    } catch (error: any) {
       log.debug(`Error occurred during attributes export: ${error}`, this.exportConfig.context);
+      this.completeProgress(false, error?.message || 'Attributes export failed');
       handleAndLogError(error, { ...this.exportConfig.context });
     }
   }
@@ -74,10 +104,30 @@ export default class ExportAttributes extends PersonalizationAdapter<ExportConfi
    */
   sanitizeAttribs() {
     log.debug(`Sanitizing ${this.attributes?.length || 0} attributes`, this.exportConfig.context);
-    log.debug(`Invalid keys to remove: ${JSON.stringify(this.attributesConfig.invalidKeys)}`, this.exportConfig.context);
-    
-    this.attributes = this.attributes?.map((audience) => omit(audience, this.attributesConfig.invalidKeys)) || [];
-    
-    log.debug(`Sanitization complete. Total attributes after sanitization: ${this.attributes.length}`, this.exportConfig.context);
+
+    this.attributes =
+      this.attributes?.map((attribute, index) => {
+        const sanitizedAttribute = omit(attribute, this.attributesConfig.invalidKeys);
+
+        // Update progress for each processed attribute
+        if (this.progressManager) {
+          const processName = this.parentProgressManager ? PROCESS_NAMES.ATTRIBUTES : undefined;
+          this.updateProgress(
+            true,
+            `attribute ${index + 1}/${this.attributes.length}: ${
+              (attribute as any)?.name || (attribute as any)?.uid || 'unknown'
+            }`,
+            undefined,
+            processName,
+          );
+        }
+
+        return sanitizedAttribute;
+      }) || [];
+
+    log.debug(
+      `Sanitization complete. Total attributes after sanitization: ${this.attributes.length}`,
+      this.exportConfig.context,
+    );
   }
 }

package/src/export/audiences.ts

@@ -1,73 +1,99 @@
 import omit from 'lodash/omit';
 import { resolve as pResolve } from 'node:path';
-import { log, handleAndLogError } from '@contentstack/cli-utilities';
-
+import { sanitizePath, log, handleAndLogError } from '@contentstack/cli-utilities';
+import { PersonalizeConfig, ExportConfig, AudiencesConfig, AudienceStruct } from '../types';
 import { fsUtil, PersonalizationAdapter } from '../utils';
-import { PersonalizeConfig, ExportConfig, AudienceStruct, AudiencesConfig } from '../types';
+import { PROCESS_NAMES, MODULE_CONTEXTS, EXPORT_PROCESS_STATUS } from '../utils/constants';
 
 export default class ExportAudiences extends PersonalizationAdapter<ExportConfig> {
   private audiencesConfig: AudiencesConfig;
   private audiencesFolderPath: string;
   private audiences: Record<string, unknown>[];
+  public exportConfig: ExportConfig;
   public personalizeConfig: PersonalizeConfig;
 
-  constructor(readonly exportConfig: ExportConfig) {
+  constructor(exportConfig: ExportConfig) {
     super({
       config: exportConfig,
       baseURL: exportConfig.modules.personalize.baseURL[exportConfig.region.name],
       headers: { 'X-Project-Uid': exportConfig.project_id },
     });
+    this.exportConfig = exportConfig;
     this.personalizeConfig = exportConfig.modules.personalize;
     this.audiencesConfig = exportConfig.modules.audiences;
     this.audiencesFolderPath = pResolve(
-      exportConfig.data,
-      exportConfig.branchName || '',
-      this.personalizeConfig.dirName,
-      this.audiencesConfig.dirName,
+      sanitizePath(exportConfig.data),
+      sanitizePath(exportConfig.branchName || ''),
+      sanitizePath(this.personalizeConfig.dirName),
+      sanitizePath(this.audiencesConfig.dirName),
     );
     this.audiences = [];
-    this.exportConfig.context.module = 'audiences';
+    this.exportConfig.context.module = MODULE_CONTEXTS.AUDIENCES;
   }
 
   async start() {
     try {
       log.debug('Starting audiences export process...', this.exportConfig.context);
       log.info('Starting audiences export', this.exportConfig.context);
-      
-      log.debug('Initializing personalization adapter...', this.exportConfig.context);
-      await this.init();
-      log.debug('Personalization adapter initialized successfully', this.exportConfig.context);
-      
-      log.debug(`Creating audiences directory at: ${this.audiencesFolderPath}`, this.exportConfig.context);
-      await fsUtil.makeDirectory(this.audiencesFolderPath);
-      log.debug('Audiences directory created successfully', this.exportConfig.context);
-      
-      log.debug('Fetching audiences from personalization API...', this.exportConfig.context);
-      this.audiences = (await this.getAudiences()) as AudienceStruct[];
-      log.debug(`Fetched ${this.audiences?.length || 0} audiences`, this.exportConfig.context);
+
+      await this.withLoadingSpinner('AUDIENCES: Initializing export and fetching data...', async () => {
+        log.debug('Initializing personalization adapter...', this.exportConfig.context);
+        await this.init();
+        log.debug('Personalization adapter initialized successfully', this.exportConfig.context);
+
+        log.debug(`Creating audiences directory at: ${this.audiencesFolderPath}`, this.exportConfig.context);
+        await fsUtil.makeDirectory(this.audiencesFolderPath);
+        log.debug('Audiences directory created successfully', this.exportConfig.context);
+
+        log.debug('Fetching audiences from personalization API...', this.exportConfig.context);
+        this.audiences = (await this.getAudiences()) as AudienceStruct[];
+        log.debug(`Fetched ${this.audiences?.length || 0} audiences`, this.exportConfig.context);
+      });
 
       if (!this.audiences?.length) {
         log.debug('No audiences found, completing export', this.exportConfig.context);
         log.info('No Audiences found with the given project!', this.exportConfig.context);
         return;
+      }
+
+      let progress: any;
+
+      if (this.parentProgressManager) {
+        progress = this.parentProgressManager;
+        this.progressManager = this.parentProgressManager;
+        progress.updateProcessTotal(PROCESS_NAMES.AUDIENCES, this.audiences.length);
       } else {
-        log.debug(`Processing ${this.audiences.length} audiences`, this.exportConfig.context);
-        this.sanitizeAttribs();
-        log.debug('Audiences sanitization completed', this.exportConfig.context);
-        
-        const audiencesFilePath = pResolve(this.audiencesFolderPath, this.audiencesConfig.fileName);
-        log.debug(`Writing audiences to: ${audiencesFilePath}`, this.exportConfig.context);
-        fsUtil.writeFile(audiencesFilePath, this.audiences);
-        
-        log.debug('Audiences export completed successfully', this.exportConfig.context);
-        log.success(
-          `Audiences exported successfully! Total audiences: ${this.audiences.length}`,
-          this.exportConfig.context,
-        );
-        return;
+        progress = this.createSimpleProgress(PROCESS_NAMES.AUDIENCES, this.audiences.length);
       }
-    } catch (error) {
+
+      log.debug(`Processing ${this.audiences.length} audiences`, this.exportConfig.context);
+      progress.updateStatus(EXPORT_PROCESS_STATUS[PROCESS_NAMES.AUDIENCES].EXPORTING, PROCESS_NAMES.AUDIENCES);
+
+      this.sanitizeAttribs();
+      log.debug('Audiences sanitization completed', this.exportConfig.context);
+
+      // Write audiences to file
+      progress.updateStatus(EXPORT_PROCESS_STATUS[PROCESS_NAMES.AUDIENCES].EXPORTING, PROCESS_NAMES.AUDIENCES);
+      const audiencesFilePath = pResolve(
+        sanitizePath(this.audiencesFolderPath),
+        sanitizePath(this.audiencesConfig.fileName),
+      );
+      log.debug(`Writing audiences to: ${audiencesFilePath}`, this.exportConfig.context);
+      fsUtil.writeFile(audiencesFilePath, this.audiences);
+
+      // Complete progress only if we're managing our own progress
+      if (!this.parentProgressManager) {
+        this.completeProgress(true);
+      }
+
+      log.debug('Audiences export completed successfully', this.exportConfig.context);
+      log.success(
+        `Audiences exported successfully! Total audiences: ${this.audiences.length}`,
+        this.exportConfig.context,
+      );
+    } catch (error: any) {
       log.debug(`Error occurred during audiences export: ${error}`, this.exportConfig.context);
+      this.completeProgress(false, error?.message || 'Audiences export failed');
       handleAndLogError(error, { ...this.exportConfig.context });
     }
   }
@@ -77,10 +103,30 @@ export default class ExportAudiences extends PersonalizationAdapter<ExportConfig
    */
   sanitizeAttribs() {
     log.debug(`Sanitizing ${this.audiences?.length || 0} audiences`, this.exportConfig.context);
-    log.debug(`Invalid keys to remove: ${JSON.stringify(this.audiencesConfig.invalidKeys)}`, this.exportConfig.context);
-    
-    this.audiences = this.audiences?.map((audience) => omit(audience, this.audiencesConfig.invalidKeys)) || [];
-    
-    log.debug(`Sanitization complete. Total audiences after sanitization: ${this.audiences.length}`, this.exportConfig.context);
+
+    this.audiences =
+      this.audiences?.map((audience, index) => {
+        const sanitizedAudience = omit(audience, this.audiencesConfig.invalidKeys);
+
+        // Update progress for each processed audience
+        if (this.progressManager) {
+          const processName = this.parentProgressManager ? PROCESS_NAMES.AUDIENCES : undefined;
+          this.updateProgress(
+            true,
+            `audience ${index + 1}/${this.audiences.length}: ${
+              (audience as any).name || (audience as any).uid || 'unknown'
+            }`,
+            undefined,
+            processName,
+          );
+        }
+
+        return sanitizedAudience;
+      }) || [];
+
+    log.debug(
+      `Sanitization complete. Total audiences after sanitization: ${this.audiences.length}`,
+      this.exportConfig.context,
+    );
   }
 }