@contentstack/cli-cm-export 1.17.0 → 1.18.1

package/lib/export/modules/index.js

@@ -28,10 +28,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExportAssets = void 0;
+const cli_utilities_1 = require("@contentstack/cli-utilities");
 async function startModuleExport(modulePayload) {
-    const { default: ModuleRunner } = await (_a = `./${modulePayload.moduleName}`, Promise.resolve().then(() => __importStar(require(_a))));
-    const moduleRunner = new ModuleRunner(modulePayload);
-    return moduleRunner.start();
+    try {
+        const { default: ModuleRunner } = await (_a = `./${modulePayload.moduleName}`, Promise.resolve().then(() => __importStar(require(_a))));
+        const moduleRunner = new ModuleRunner(modulePayload);
+        return moduleRunner.start();
+    }
+    catch (error) {
+        (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, modulePayload.exportConfig.context), { module: modulePayload.moduleName }));
+        throw error;
+    }
 }
 exports.default = startModuleExport;
 var assets_1 = require("./assets");

package/lib/export/modules/labels.js

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 const omit_1 = tslib_1.__importDefault(require("lodash/omit"));
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const node_path_1 = require("node:path");
+const cli_utilities_1 = require("@contentstack/cli-utilities");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const utils_1 = require("../../utils");
 class ExportLabels extends base_class_1.default {
@@ -12,52 +13,73 @@ class ExportLabels extends base_class_1.default {
         this.labels = {};
         this.labelConfig = exportConfig.modules.labels;
         this.qs = { include_count: true };
+        this.exportConfig.context.module = 'labels';
     }
     async start() {
-        (0, utils_1.log)(this.exportConfig, 'Starting labels export', 'info');
+        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)) {
-            (0, utils_1.log)(this.exportConfig, 'No labels found', 'info');
+            cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('LABELS_NOT_FOUND'), this.exportConfig.context);
         }
         else {
-            utils_1.fsUtil.writeFile((0, node_path_1.resolve)(this.labelsFolderPath, this.labelConfig.fileName), this.labels);
-            (0, utils_1.log)(this.exportConfig, 'All the labels have been exported successfully!', 'success');
+            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);
         }
     }
     async getLabels(skip = 0) {
         if (skip) {
             this.qs.skip = skip;
+            cli_utilities_1.log.debug(`Fetching labels with skip: ${skip}`, this.exportConfig.context);
         }
+        else {
+            cli_utilities_1.log.debug('Fetching labels with initial query', this.exportConfig.context);
+        }
+        cli_utilities_1.log.debug(`Query parameters: ${JSON.stringify(this.qs)}`, this.exportConfig.context);
         await this.stack
             .label()
             .query(this.qs)
             .find()
             .then(async (data) => {
             const { items, count } = data;
+            cli_utilities_1.log.debug(`Fetched ${(items === null || items === void 0 ? void 0 : items.length) || 0} labels out of total ${count}`, this.exportConfig.context);
             if (items === null || items === void 0 ? void 0 : items.length) {
+                cli_utilities_1.log.debug(`Processing ${items.length} labels`, this.exportConfig.context);
                 this.sanitizeAttribs(items);
                 skip += this.labelConfig.limit || 100;
                 if (skip >= count) {
+                    cli_utilities_1.log.debug('Completed fetching all labels', this.exportConfig.context);
                     return;
                 }
+                cli_utilities_1.log.debug(`Continuing to fetch labels with skip: ${skip}`, this.exportConfig.context);
                 return await this.getLabels(skip);
             }
+            else {
+                cli_utilities_1.log.debug('No labels found to process', this.exportConfig.context);
+            }
         })
             .catch((error) => {
-            (0, utils_1.log)(this.exportConfig, `Failed to export labels. ${(0, utils_1.formatError)(error)}`, 'error');
-            (0, utils_1.log)(this.exportConfig, error, 'error');
+            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;
+        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;
             const labelName = (_a = labels[index]) === null || _a === void 0 ? void 0 : _a.name;
+            cli_utilities_1.log.debug(`Processing label: ${labelName} (${labelUid})`, this.exportConfig.context);
             this.labels[labelUid] = (0, omit_1.default)(labels[index], this.labelConfig.invalidKeys);
-            (0, utils_1.log)(this.exportConfig, `'${labelName}' label was exported successfully`, 'success');
+            cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('LABEL_EXPORT_SUCCESS', labelName), this.exportConfig.context);
         }
+        cli_utilities_1.log.debug(`Sanitization complete. Total labels processed: ${Object.keys(this.labels).length}`, this.exportConfig.context);
     }
 }
 exports.default = ExportLabels;

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

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

package/lib/export/modules/locales.js

@@ -2,9 +2,9 @@
 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 cli_utilities_1 = require("@contentstack/cli-utilities");
 class LocaleExport extends base_class_1.default {
     constructor({ exportConfig, stackAPIClient }) {
         super({ exportConfig, stackAPIClient });
@@ -21,36 +21,55 @@ class LocaleExport extends base_class_1.default {
         this.localesPath = path.resolve((0, cli_utilities_1.sanitizePath)(exportConfig.data), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.localeConfig.dirName));
         this.locales = {};
         this.masterLocale = {};
+        this.exportConfig.context.module = 'locales';
     }
     async start() {
         try {
-            (0, utils_1.log)(this.exportConfig, 'Starting locale export', 'success');
+            cli_utilities_1.log.debug('Starting locales export process...', this.exportConfig.context);
+            cli_utilities_1.log.debug(`Locales path: ${this.localesPath}`, this.exportConfig.context);
             await utils_1.fsUtil.makeDirectory(this.localesPath);
+            cli_utilities_1.log.debug('Created locales directory', this.exportConfig.context);
             await this.getLocales();
-            utils_1.fsUtil.writeFile(path.join(this.localesPath, this.localeConfig.fileName), this.locales);
-            utils_1.fsUtil.writeFile(path.join(this.localesPath, this.masterLocaleConfig.fileName), this.masterLocale);
-            (0, utils_1.log)(this.exportConfig, 'Completed locale export', 'success');
+            cli_utilities_1.log.debug(`Retrieved ${Object.keys(this.locales).length} locales and ${Object.keys(this.masterLocale).length} master locales`, this.exportConfig.context);
+            const localesFilePath = path.join(this.localesPath, this.localeConfig.fileName);
+            const masterLocaleFilePath = path.join(this.localesPath, this.masterLocaleConfig.fileName);
+            cli_utilities_1.log.debug(`Writing locales to: ${localesFilePath}`, this.exportConfig.context);
+            utils_1.fsUtil.writeFile(localesFilePath, this.locales);
+            cli_utilities_1.log.debug(`Writing master locale to: ${masterLocaleFilePath}`, this.exportConfig.context);
+            utils_1.fsUtil.writeFile(masterLocaleFilePath, this.masterLocale);
+            cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('LOCALES_EXPORT_COMPLETE', Object.keys(this.locales).length, Object.keys(this.masterLocale).length), this.exportConfig.context);
         }
         catch (error) {
-            (0, utils_1.log)(this.exportConfig, `Failed to export locales. ${(0, utils_1.formatError)(error)}`, 'error');
-            throw new Error('Failed to export locales');
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
+            throw error;
         }
     }
     async getLocales(skip = 0) {
+        var _a;
         if (skip) {
             this.qs.skip = skip;
+            cli_utilities_1.log.debug(`Fetching locales with skip: ${skip}`, this.exportConfig.context);
         }
+        cli_utilities_1.log.debug(`Query parameters: ${JSON.stringify(this.qs)}`, this.exportConfig.context);
         let localesFetchResponse = await this.stackAPIClient.locale().query(this.qs).find();
+        cli_utilities_1.log.debug(`Fetched ${((_a = localesFetchResponse.items) === null || _a === void 0 ? void 0 : _a.length) || 0} locales out of total ${localesFetchResponse.count}`, this.exportConfig.context);
         if (Array.isArray(localesFetchResponse.items) && localesFetchResponse.items.length > 0) {
+            cli_utilities_1.log.debug(`Processing ${localesFetchResponse.items.length} locales`, this.exportConfig.context);
             this.sanitizeAttribs(localesFetchResponse.items);
             skip += this.localeConfig.limit || 100;
             if (skip > localesFetchResponse.count) {
+                cli_utilities_1.log.debug('Completed fetching all locales', this.exportConfig.context);
                 return;
             }
+            cli_utilities_1.log.debug(`Continuing to fetch locales with skip: ${skip}`, this.exportConfig.context);
             return await this.getLocales(skip);
         }
+        else {
+            cli_utilities_1.log.debug('No locales found to process', this.exportConfig.context);
+        }
     }
     sanitizeAttribs(locales) {
+        cli_utilities_1.log.debug(`Sanitizing ${locales.length} locales`, this.exportConfig.context);
         locales.forEach((locale) => {
             var _a, _b;
             for (let key in locale) {
@@ -59,12 +78,15 @@ class LocaleExport extends base_class_1.default {
                 }
             }
             if ((locale === null || locale === void 0 ? void 0 : locale.code) === ((_b = (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.master_locale) === null || _b === void 0 ? void 0 : _b.code)) {
+                cli_utilities_1.log.debug(`Adding locale ${locale.uid} to master locale`, this.exportConfig.context);
                 this.masterLocale[locale.uid] = locale;
             }
             else {
+                cli_utilities_1.log.debug(`Adding locale ${locale.uid} to regular locales`, this.exportConfig.context);
                 this.locales[locale.uid] = locale;
             }
         });
+        cli_utilities_1.log.debug(`Sanitization complete. Master locales: ${Object.keys(this.masterLocale).length}, Regular locales: ${Object.keys(this.locales).length}`, this.exportConfig.context);
     }
 }
 exports.default = LocaleExport;

package/lib/export/modules/marketplace-apps.d.ts

@@ -1,6 +1,6 @@
+import { Command } from '@contentstack/cli-command';
 import { NodeCrypto, ContentstackMarketplaceClient } from '@contentstack/cli-utilities';
 import { ModuleClassParams, MarketplaceAppsConfig, ExportConfig, Installation } from '../../types';
-import { Command } from '@contentstack/cli-command';
 export default class ExportMarketplaceApps {
     protected marketplaceAppConfig: MarketplaceAppsConfig;
     protected installedApps: Installation[];
@@ -10,6 +10,7 @@ export default class ExportMarketplaceApps {
     appSdk: ContentstackMarketplaceClient;
     exportConfig: ExportConfig;
     command: Command;
+    query: Record<string, any>;
     constructor({ exportConfig }: Omit<ModuleClassParams, 'stackAPIClient' | 'moduleName'>);
     start(): Promise<void>;
     /**

package/lib/export/modules/marketplace-apps.js

@@ -15,58 +15,90 @@ class ExportMarketplaceApps {
         this.installedApps = [];
         this.exportConfig = exportConfig;
         this.marketplaceAppConfig = exportConfig.modules.marketplace_apps;
+        this.exportConfig.context.module = 'marketplace-apps';
     }
     async start() {
+        cli_utilities_1.log.debug('Starting marketplace apps export process...', this.exportConfig.context);
         if (!(0, cli_utilities_1.isAuthenticated)()) {
             cli_utilities_1.cliux.print('WARNING!!! To export Marketplace apps, you must be logged in. Please check csdx auth:login --help to log in', { color: 'yellow' });
             return Promise.resolve();
         }
-        (0, utils_1.log)(this.exportConfig, 'Starting marketplace app export', 'info');
         this.marketplaceAppPath = (0, node_path_1.resolve)(this.exportConfig.data, this.exportConfig.branchName || '', this.marketplaceAppConfig.dirName);
+        cli_utilities_1.log.debug(`Marketplace apps folder path: ${this.marketplaceAppPath}`, this.exportConfig.context);
         await utils_1.fsUtil.makeDirectory(this.marketplaceAppPath);
+        cli_utilities_1.log.debug('Created marketplace apps directory', this.exportConfig.context);
         this.developerHubBaseUrl = this.exportConfig.developerHubBaseUrl || (await (0, utils_1.getDeveloperHubUrl)(this.exportConfig));
+        cli_utilities_1.log.debug(`Developer hub base URL: ${this.developerHubBaseUrl}`, this.exportConfig.context);
         this.exportConfig.org_uid = await (0, utils_1.getOrgUid)(this.exportConfig);
+        this.query = { target_uids: this.exportConfig.source_stack };
+        cli_utilities_1.log.debug(`Organization UID: ${this.exportConfig.org_uid}`, this.exportConfig.context);
         // NOTE init marketplace app sdk
         const host = this.developerHubBaseUrl.split('://').pop();
+        cli_utilities_1.log.debug(`Initializing marketplace SDK with host: ${host}`, this.exportConfig.context);
         this.appSdk = await (0, cli_utilities_1.marketplaceSDKClient)({ host });
         await this.exportApps();
+        cli_utilities_1.log.debug('Marketplace apps export process completed', this.exportConfig.context);
     }
     /**
      * The function `exportApps` encrypts the configuration of installed apps using a Node.js crypto
      * library if it is available.
      */
     async exportApps() {
+        var _a, _b, _c, _d, _e, _f, _g;
+        cli_utilities_1.log.debug('Starting apps export process...', this.exportConfig.context);
+        // currently support only app_uids or installation_uids
+        const externalQuery = (_a = this.exportConfig.query) === null || _a === void 0 ? void 0 : _a.modules['marketplace-apps'];
+        if (externalQuery) {
+            if (((_c = (_b = externalQuery.app_uid) === null || _b === void 0 ? void 0 : _b.$in) === null || _c === void 0 ? void 0 : _c.length) > 0) {
+                this.query.app_uids = externalQuery.app_uid.$in.join(',');
+            }
+            if (((_e = (_d = externalQuery.installation_uid) === null || _d === void 0 ? void 0 : _d.$in) === null || _e === void 0 ? void 0 : _e.length) > 0) {
+                this.query.installation_uids = (_g = (_f = externalQuery.installation_uid) === null || _f === void 0 ? void 0 : _f.$in) === null || _g === void 0 ? void 0 : _g.join(',');
+            }
+        }
         await this.getStackSpecificApps();
+        cli_utilities_1.log.debug(`Retrieved ${this.installedApps.length} stack-specific apps`, this.exportConfig.context);
         await this.getAppManifestAndAppConfig();
+        cli_utilities_1.log.debug('Completed app manifest and configuration processing', this.exportConfig.context);
         if (!this.nodeCrypto && (0, find_1.default)(this.installedApps, (app) => !(0, isEmpty_1.default)(app.configuration))) {
+            cli_utilities_1.log.debug('Initializing NodeCrypto for app configuration encryption', this.exportConfig.context);
             this.nodeCrypto = await (0, utils_1.createNodeCryptoInstance)(this.exportConfig);
         }
         this.installedApps = (0, map_1.default)(this.installedApps, (app) => {
+            var _a;
             if ((0, has_1.default)(app, 'configuration')) {
+                cli_utilities_1.log.debug(`Encrypting configuration for app: ${((_a = app.manifest) === null || _a === void 0 ? void 0 : _a.name) || app.uid}`, this.exportConfig.context);
                 app['configuration'] = this.nodeCrypto.encrypt(app.configuration);
             }
             return app;
         });
+        cli_utilities_1.log.debug(`Processed ${this.installedApps.length} total marketplace apps`, this.exportConfig.context);
     }
     /**
      * The function `getAppManifestAndAppConfig` exports the manifest and configurations of installed
      * marketplace apps.
      */
     async getAppManifestAndAppConfig() {
+        var _a;
         if ((0, isEmpty_1.default)(this.installedApps)) {
-            (0, utils_1.log)(this.exportConfig, 'No marketplace apps found', 'info');
+            cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('MARKETPLACE_APPS_NOT_FOUND'), this.exportConfig.context);
         }
         else {
+            cli_utilities_1.log.debug(`Processing ${this.installedApps.length} installed apps`, this.exportConfig.context);
             for (const [index, app] of (0, entries_1.default)(this.installedApps)) {
                 if (app.manifest.visibility === 'private') {
+                    cli_utilities_1.log.debug(`Processing private app manifest: ${app.manifest.name}`, this.exportConfig.context);
                     await this.getPrivateAppsManifest(+index, app);
                 }
             }
             for (const [index, app] of (0, entries_1.default)(this.installedApps)) {
+                cli_utilities_1.log.debug(`Processing app configurations: ${((_a = app.manifest) === null || _a === void 0 ? void 0 : _a.name) || app.uid}`, this.exportConfig.context);
                 await this.getAppConfigurations(+index, app);
             }
-            utils_1.fsUtil.writeFile((0, node_path_1.resolve)(this.marketplaceAppPath, this.marketplaceAppConfig.fileName), this.installedApps);
-            (0, utils_1.log)(this.exportConfig, 'All the marketplace apps have been exported successfully', 'info');
+            const marketplaceAppsFilePath = (0, node_path_1.resolve)(this.marketplaceAppPath, this.marketplaceAppConfig.fileName);
+            cli_utilities_1.log.debug(`Writing marketplace apps to: ${marketplaceAppsFilePath}`, this.exportConfig.context);
+            utils_1.fsUtil.writeFile(marketplaceAppsFilePath, this.installedApps);
+            cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('MARKETPLACE_APPS_EXPORT_COMPLETE', Object.keys(this.installedApps).length), this.exportConfig.context);
         }
     }
     /**
@@ -79,14 +111,17 @@ class ExportMarketplaceApps {
      * app's manifest.
      */
     async getPrivateAppsManifest(index, appInstallation) {
+        cli_utilities_1.log.debug(`Fetching private app manifest for: ${appInstallation.manifest.name} (${appInstallation.manifest.uid})`, this.exportConfig.context);
         const manifest = await this.appSdk
             .marketplace(this.exportConfig.org_uid)
             .app(appInstallation.manifest.uid)
             .fetch({ include_oauth: true })
             .catch((error) => {
-            (0, utils_1.log)(this.exportConfig, error, 'error');
+            cli_utilities_1.log.debug(`Failed to fetch private app manifest for: ${appInstallation.manifest.name}`, this.exportConfig.context);
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context), cli_utilities_1.messageHandler.parse('MARKETPLACE_APP_MANIFEST_EXPORT_FAILED', appInstallation.manifest.name));
         });
         if (manifest) {
+            cli_utilities_1.log.debug(`Successfully fetched private app manifest for: ${appInstallation.manifest.name}`, this.exportConfig.context);
             this.installedApps[index].manifest = manifest;
         }
     }
@@ -105,7 +140,8 @@ class ExportMarketplaceApps {
         const appName = (_a = appInstallation === null || appInstallation === void 0 ? void 0 : appInstallation.manifest) === null || _a === void 0 ? void 0 : _a.name;
         const appUid = (_b = appInstallation === null || appInstallation === void 0 ? void 0 : appInstallation.manifest) === null || _b === void 0 ? void 0 : _b.uid;
         const app = appName || appUid;
-        (0, utils_1.log)(this.exportConfig, `Exporting ${app} app and it's config.`, 'info');
+        cli_utilities_1.log.debug(`Fetching app configuration for: ${app}`, this.exportConfig.context);
+        cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('MARKETPLACE_APP_CONFIG_EXPORT', app), this.exportConfig.context);
         await this.appSdk
             .marketplace(this.exportConfig.org_uid)
             .installation(appInstallation.uid)
@@ -113,28 +149,32 @@ class ExportMarketplaceApps {
             .then(async (result) => {
             const { data, error } = result;
             if ((0, has_1.default)(data, 'server_configuration') || (0, has_1.default)(data, 'configuration')) {
+                cli_utilities_1.log.debug(`Found configuration data for app: ${app}`, this.exportConfig.context);
                 if (!this.nodeCrypto && ((0, has_1.default)(data, 'server_configuration') || (0, has_1.default)(data, 'configuration'))) {
+                    cli_utilities_1.log.debug(`Initializing NodeCrypto for app: ${app}`, this.exportConfig.context);
                     this.nodeCrypto = await (0, utils_1.createNodeCryptoInstance)(this.exportConfig);
                 }
                 if (!(0, isEmpty_1.default)(data === null || data === void 0 ? void 0 : data.configuration)) {
+                    cli_utilities_1.log.debug(`Encrypting configuration for app: ${app}`, this.exportConfig.context);
                     this.installedApps[index]['configuration'] = this.nodeCrypto.encrypt(data.configuration);
                 }
                 if (!(0, isEmpty_1.default)(data === null || data === void 0 ? void 0 : data.server_configuration)) {
+                    cli_utilities_1.log.debug(`Encrypting server configuration for app: ${app}`, this.exportConfig.context);
                     this.installedApps[index]['server_configuration'] = this.nodeCrypto.encrypt(data.server_configuration);
-                    (0, utils_1.log)(this.exportConfig, `Exported ${app} app and it's config.`, 'success');
+                    cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('MARKETPLACE_APP_CONFIG_SUCCESS', app), this.exportConfig.context);
                 }
                 else {
-                    (0, utils_1.log)(this.exportConfig, `Exported ${app} app`, 'success');
+                    cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('MARKETPLACE_APP_EXPORT_SUCCESS', app), this.exportConfig.context);
                 }
             }
             else if (error) {
-                (0, utils_1.log)(this.exportConfig, `Error on exporting ${app} app and it's config.`, 'error');
-                (0, utils_1.log)(this.exportConfig, error, 'error');
+                cli_utilities_1.log.debug(`Error in app configuration data for: ${app}`, this.exportConfig.context);
+                (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context), cli_utilities_1.messageHandler.parse('MARKETPLACE_APP_CONFIG_EXPORT_FAILED', app));
             }
         })
             .catch((error) => {
-            (0, utils_1.log)(this.exportConfig, `Failed to export ${app} app config ${(0, utils_1.formatError)(error)}`, 'error');
-            (0, utils_1.log)(this.exportConfig, error, 'error');
+            cli_utilities_1.log.debug(`Failed to fetch app configuration for: ${app}`, this.exportConfig.context);
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context), cli_utilities_1.messageHandler.parse('MARKETPLACE_APP_CONFIG_EXPORT_FAILED', app));
         });
     }
     /**
@@ -145,26 +185,33 @@ class ExportMarketplaceApps {
      * the API. In this code, it is initially set to 0, indicating that no items should be skipped in
      */
     async getStackSpecificApps(skip = 0) {
+        cli_utilities_1.log.debug(`Fetching stack-specific apps with skip: ${skip}`, this.exportConfig.context);
         const collection = await this.appSdk
             .marketplace(this.exportConfig.org_uid)
             .installation()
-            .fetchAll({ target_uids: this.exportConfig.source_stack, skip })
+            .fetchAll(Object.assign(Object.assign({}, this.query), { skip }))
             .catch((error) => {
-            (0, utils_1.log)(this.exportConfig, `Failed to export marketplace-apps ${(0, utils_1.formatError)(error)}`, 'error');
-            (0, utils_1.log)(this.exportConfig, error, 'error');
+            cli_utilities_1.log.debug('Error occurred while fetching stack-specific apps', this.exportConfig.context);
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
         });
         if (collection) {
             const { items: apps, count } = collection;
+            cli_utilities_1.log.debug(`Fetched ${(apps === null || apps === void 0 ? void 0 : apps.length) || 0} apps out of total ${count}`, this.exportConfig.context);
             // NOTE Remove all the chain functions
             const installation = (0, map_1.default)(apps, (app) => (0, omitBy_1.default)(app, (val, _key) => {
                 if (val instanceof Function)
                     return true;
                 return false;
             }));
+            cli_utilities_1.log.debug(`Processed ${installation.length} app installations`, this.exportConfig.context);
             this.installedApps = this.installedApps.concat(installation);
             if (count - (skip + 50) > 0) {
+                cli_utilities_1.log.debug(`Continuing to fetch apps with skip: ${skip + 50}`, this.exportConfig.context);
                 await this.getStackSpecificApps(skip + 50);
             }
+            else {
+                cli_utilities_1.log.debug('Completed fetching all stack-specific apps', this.exportConfig.context);
+            }
         }
     }
 }

package/lib/export/modules/personalize.js

@@ -1,26 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_variants_1 = require("@contentstack/cli-variants");
-const utils_1 = require("../../utils");
+const cli_utilities_1 = require("@contentstack/cli-utilities");
 class ExportPersonalize {
     constructor({ exportConfig }) {
         this.exportConfig = exportConfig;
         this.personalizeConfig = exportConfig.modules.personalize;
+        this.exportConfig.context.module = 'personalize';
     }
     async start() {
         try {
+            cli_utilities_1.log.debug('Starting personalize export process...', this.exportConfig.context);
             if (!this.personalizeConfig.baseURL[this.exportConfig.region.name]) {
-                (0, utils_1.log)(this.exportConfig, 'Skipping Personalize project export, personalize url is not set', 'info');
+                cli_utilities_1.log.debug(`Personalize URL not set for region: ${this.exportConfig.region.name}`, this.exportConfig.context);
+                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('PERSONALIZE_URL_NOT_SET'), this.exportConfig.context);
                 this.exportConfig.personalizationEnabled = false;
                 return;
             }
             if (this.exportConfig.management_token) {
-                (0, utils_1.log)(this.exportConfig, 'Skipping Personalize project export when using management token', 'info');
+                cli_utilities_1.log.debug('Management token detected, skipping personalize export', this.exportConfig.context);
+                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('PERSONALIZE_SKIPPING_WITH_MANAGEMENT_TOKEN'), this.exportConfig.context);
                 this.exportConfig.personalizationEnabled = false;
                 return;
             }
+            cli_utilities_1.log.debug('Starting projects export for personalization...', this.exportConfig.context);
             await new cli_variants_1.ExportProjects(this.exportConfig).start();
             if (this.exportConfig.personalizationEnabled) {
+                cli_utilities_1.log.debug('Personalization is enabled, processing personalize modules...', this.exportConfig.context);
                 const moduleMapper = {
                     events: new cli_variants_1.ExportEvents(this.exportConfig),
                     attributes: new cli_variants_1.ExportAttributes(this.exportConfig),
@@ -29,22 +35,33 @@ class ExportPersonalize {
                 };
                 const order = this.exportConfig.modules.personalize
                     .exportOrder;
+                cli_utilities_1.log.debug(`Personalize export order: ${order.join(', ')}`, this.exportConfig.context);
                 for (const module of order) {
+                    cli_utilities_1.log.debug(`Processing personalize module: ${module}`, this.exportConfig.context);
                     if (moduleMapper[module]) {
+                        cli_utilities_1.log.debug(`Starting export for module: ${module}`, this.exportConfig.context);
                         await moduleMapper[module].start();
+                        cli_utilities_1.log.debug(`Completed export for module: ${module}`, this.exportConfig.context);
                     }
                     else {
-                        (0, utils_1.log)(this.exportConfig, `No implementation found for the module ${module}`, 'info');
+                        cli_utilities_1.log.debug(`Module not implemented: ${module}`, this.exportConfig.context);
+                        cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('PERSONALIZE_MODULE_NOT_IMPLEMENTED', module), this.exportConfig.context);
                     }
                 }
+                cli_utilities_1.log.debug('Completed all personalize module exports', this.exportConfig.context);
+            }
+            else {
+                cli_utilities_1.log.debug('Personalization is disabled, skipping personalize module exports', this.exportConfig.context);
             }
         }
         catch (error) {
             if (error === 'Forbidden') {
-                (0, utils_1.log)(this.exportConfig, "Personalize is not enabled in the given organization!", 'info');
+                cli_utilities_1.log.debug('Personalize access forbidden, personalization not enabled', this.exportConfig.context);
+                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('PERSONALIZE_NOT_ENABLED'), this.exportConfig.context);
             }
             else {
-                (0, utils_1.log)(this.exportConfig, error, 'error');
+                cli_utilities_1.log.debug('Error occurred during personalize export', this.exportConfig.context);
+                (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
             }
             this.exportConfig.personalizationEnabled = false;
         }