@contentstack/cli-cm-export 1.17.0 → 1.18.0

package/README.md

@@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-export/1.17.0 linux-x64 node-v22.16.0
+@contentstack/cli-cm-export/1.18.0 linux-x64 node-v22.17.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/commands/cm/stacks/export.d.ts

@@ -7,4 +7,6 @@ export default class ExportCommand extends Command {
     static flags: FlagInput;
     static aliases: string[];
     run(): Promise<void>;
+    private createExportContext;
+    private assignExportConfig;
 }

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

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
 const cli_command_1 = require("@contentstack/cli-command");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const export_1 = require("../../../export");
@@ -12,14 +10,13 @@ class ExportCommand extends cli_command_1.Command {
         let exportDir = (0, cli_utilities_1.pathValidator)('logs');
         try {
             const { flags } = await this.parse(ExportCommand);
-            let exportConfig = await (0, utils_1.setupExportConfig)(flags);
-            // Note setting host to create cma client
-            exportConfig.host = this.cmaHost;
-            exportConfig.region = this.region;
-            if (this.developerHubUrl)
-                exportConfig.developerHubBaseUrl = this.developerHubUrl;
-            if (this.personalizeUrl)
-                exportConfig.modules.personalize.baseURL[exportConfig.region.name] = this.personalizeUrl;
+            const exportConfig = await (0, utils_1.setupExportConfig)(flags);
+            // Prepare the context object
+            const context = this.createExportContext(exportConfig.apiKey, exportConfig.authenticationMethod);
+            exportConfig.context = Object.assign({}, context);
+            //log.info(`Using Cli Version: ${this.context?.cliVersion}`, exportConfig.context);
+            // Assign exportConfig variables
+            this.assignExportConfig(exportConfig);
             exportDir = (0, cli_utilities_1.sanitizePath)(exportConfig.cliLogsPath || exportConfig.data || exportConfig.exportDir);
             const managementAPIClient = await (0, cli_utilities_1.managementSDKClient)(exportConfig);
             const moduleExporter = new export_1.ModuleExporter(managementAPIClient, exportConfig);
@@ -27,12 +24,39 @@ class ExportCommand extends cli_command_1.Command {
             if (!((_a = exportConfig.branches) === null || _a === void 0 ? void 0 : _a.length)) {
                 (0, utils_1.writeExportMetaFile)(exportConfig);
             }
-            (0, utils_1.log)(exportConfig, `The content of the stack ${exportConfig.apiKey} has been exported successfully!`, 'success');
-            (0, utils_1.log)(exportConfig, `The log has been stored at '${(0, cli_utilities_1.pathValidator)(path_1.default.join(exportDir, 'logs', 'export'))}'`, 'success');
+            cli_utilities_1.log.success(`The content of the stack ${exportConfig.apiKey} has been exported successfully!`, exportConfig.context);
+            cli_utilities_1.log.info(`The exported content has been stored at '${exportDir}'`, exportConfig.context);
+            cli_utilities_1.log.success(`The log has been stored at '${(0, cli_utilities_1.getLogPath)()}'`, exportConfig.context);
         }
         catch (error) {
-            (0, utils_1.log)({ data: exportDir }, `Failed to export stack content - ${(0, utils_1.formatError)(error)}`, 'error');
-            (0, utils_1.log)({ data: exportDir }, `The log has been stored at ${exportDir}`, 'info');
+            (0, cli_utilities_1.handleAndLogError)(error);
+            cli_utilities_1.log.info(`The log has been stored at '${(0, cli_utilities_1.getLogPath)()}'`);
+        }
+    }
+    // Create export context object
+    createExportContext(apiKey, authenticationMethod) {
+        var _a, _b, _c;
+        return {
+            command: ((_b = (_a = this.context) === null || _a === void 0 ? void 0 : _a.info) === null || _b === void 0 ? void 0 : _b.command) || 'cm:stacks:export',
+            module: '',
+            userId: cli_utilities_1.configHandler.get('userUid') || '',
+            email: cli_utilities_1.configHandler.get('email') || '',
+            sessionId: ((_c = this.context) === null || _c === void 0 ? void 0 : _c.sessionId) || '',
+            apiKey: apiKey || '',
+            orgId: cli_utilities_1.configHandler.get('oauthOrgUid') || '',
+            authenticationMethod: authenticationMethod || 'Basic Auth',
+        };
+    }
+    // Assign values to exportConfig
+    assignExportConfig(exportConfig) {
+        // Note setting host to create cma client
+        exportConfig.host = this.cmaHost;
+        exportConfig.region = this.region;
+        if (this.developerHubUrl) {
+            exportConfig.developerHubBaseUrl = this.developerHubUrl;
+        }
+        if (this.personalizeUrl) {
+            exportConfig.modules.personalize.baseURL[exportConfig.region.name] = this.personalizeUrl;
         }
     }
 }
@@ -101,7 +125,7 @@ ExportCommand.flags = {
     branch: cli_utilities_1.flags.string({
         char: 'B',
         // default: 'main',
-        description: '[optional] The name of the branch where you want to export your content. If you don\'t mention the branch name, then by default the content will be exported from all the branches of your stack.',
+        description: "[optional] The name of the branch where you want to export your content. If you don't mention the branch name, then by default the content will be exported from all the branches of your stack.",
         parse: (0, cli_utilities_1.printFlagDeprecation)(['-B'], ['--branch']),
     }),
     'secured-assets': cli_utilities_1.flags.boolean({
@@ -112,5 +136,9 @@ ExportCommand.flags = {
         required: false,
         description: '[optional] Force override all Marketplace prompts.',
     }),
+    query: cli_utilities_1.flags.string({
+        description: '[optional] Query object (inline JSON or file path) to filter module exports.',
+        hidden: true,
+    }),
 };
 ExportCommand.aliases = ['cm:export'];

package/lib/export/module-exporter.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
+const cli_utilities_1 = require("@contentstack/cli-utilities");
 const utils_1 = require("../utils");
 const modules_1 = tslib_1.__importDefault(require("./modules"));
 const modules_js_1 = tslib_1.__importDefault(require("./modules-js"));
@@ -32,19 +33,19 @@ class ModuleExporter {
                 this.exportConfig.branchName = branch.uid;
                 this.stackAPIClient.stackHeaders.branch = branch.uid;
                 this.exportConfig.branchDir = path.join(this.exportConfig.exportDir, branch.uid);
-                (0, utils_1.log)(this.exportConfig, `Exporting content from branch ${branch.uid}`, 'success');
+                cli_utilities_1.log.info(`Exporting content from branch ${branch.uid}`, this.exportConfig.context);
                 (0, utils_1.writeExportMetaFile)(this.exportConfig, this.exportConfig.branchDir);
                 await this.export();
-                (0, utils_1.log)(this.exportConfig, `The content of branch ${branch.uid} has been exported successfully!`, 'success');
+                cli_utilities_1.log.success(`The content of branch ${branch.uid} has been exported successfully!`, this.exportConfig.context);
             }
             catch (error) {
-                (0, utils_1.log)(this.exportConfig, (0, utils_1.formatError)(error), 'error');
-                throw new Error(`Failed to export contents from branch ${branch.uid}`);
+                (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.exportConfig.context), { branch: branch.uid }), cli_utilities_1.messageHandler.parse('FAILED_EXPORT_CONTENT_BRANCH', { branch: branch.uid }));
+                throw new Error(cli_utilities_1.messageHandler.parse('FAILED_EXPORT_CONTENT_BRANCH', { branch: branch.uid }));
             }
         }
     }
     async export() {
-        (0, utils_1.log)(this.exportConfig, `Started to export content, version is ${this.exportConfig.contentVersion}`, 'info');
+        cli_utilities_1.log.info(`Started to export content, version is ${this.exportConfig.contentVersion}`, this.exportConfig.context);
         // checks for single module or all modules
         if (this.exportConfig.singleModuleExport) {
             return this.exportSingleModule(this.exportConfig.moduleName);
@@ -52,7 +53,7 @@ class ModuleExporter {
         return this.exportAllModules();
     }
     async exportByModuleByName(moduleName) {
-        (0, utils_1.log)(this.exportConfig, `Starting export of ${moduleName} module`, 'info');
+        cli_utilities_1.log.info(`Exporting module: ${moduleName}`, this.exportConfig.context);
         // export the modules by name
         // calls the module runner which inturn calls the module itself
         let exportedModuleResponse;
@@ -80,10 +81,15 @@ class ModuleExporter {
     }
     async exportSingleModule(moduleName) {
         // Note stack is always exported
-        let exportModules = ['stack'];
-        const { modules: { [moduleName]: { dependencies = [] } = {} }, } = this.exportConfig;
-        if (dependencies.length > 0) {
-            exportModules = exportModules.concat(dependencies);
+        let exportModules = [];
+        if (!this.exportConfig.skipStackSettings) {
+            exportModules.push('stack');
+        }
+        if (!this.exportConfig.skipDependencies) {
+            const { modules: { [moduleName]: { dependencies = [] } = {} }, } = this.exportConfig;
+            if (dependencies.length > 0) {
+                exportModules = exportModules.concat(dependencies);
+            }
         }
         exportModules.push(moduleName);
         for (const moduleName of exportModules) {

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

@@ -40,11 +40,6 @@ export default class ExportAssets extends BaseClass {
      * @returns Promise<any|void>
      */
     getVersionedAssets(): Promise<any | void>;
-    /**
-     * @method getAssetsCount
-     * @param isDir boolean
-     * @returns Promise<number|undefined>
-     */
     getAssetsCount(isDir?: boolean): Promise<number | void>;
     /**
      * @method downloadAssets

package/lib/export/modules/assets.js

@@ -16,7 +16,6 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const config_1 = tslib_1.__importDefault(require("../../config"));
-const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 class ExportAssets extends base_class_1.default {
     constructor({ exportConfig, stackAPIClient }) {
@@ -24,6 +23,7 @@ class ExportAssets extends base_class_1.default {
         this.assetConfig = config_1.default.modules.assets;
         this.assetsFolder = [];
         this.versionedAssets = [];
+        this.exportConfig.context.module = 'assets';
     }
     get commonQueryParam() {
         return {
@@ -34,17 +34,22 @@ class ExportAssets extends base_class_1.default {
     }
     async start() {
         this.assetsRootPath = (0, node_path_1.resolve)(this.exportConfig.data, this.exportConfig.branchName || '', this.assetConfig.dirName);
+        cli_utilities_1.log.debug(`Assets root path resolved to: ${this.assetsRootPath}`, this.exportConfig.context);
+        cli_utilities_1.log.debug('Fetching assets and folders count...', this.exportConfig.context);
         // NOTE step 1: Get assets and it's folder count in parallel
         const [assetsCount, assetsFolderCount] = await Promise.all([this.getAssetsCount(), this.getAssetsCount(true)]);
+        cli_utilities_1.log.debug('Fetching assets and folders data...', this.exportConfig.context);
         // NOTE step 2: Get assets and it's folder data in parallel
         await Promise.all([this.getAssetsFolders(assetsFolderCount), this.getAssets(assetsCount)]);
         // NOTE step 3: Get versioned assets
         if (!(0, isEmpty_1.default)(this.versionedAssets) && this.assetConfig.includeVersionedAssets) {
+            cli_utilities_1.log.debug('Fetching versioned assets metadata...', this.exportConfig.context);
             await this.getVersionedAssets();
         }
+        cli_utilities_1.log.debug('Starting download of all assets...', this.exportConfig.context);
         // NOTE step 4: Download all assets
         await this.downloadAssets();
-        (0, utils_1.log)(this.exportConfig, 'Assets exported successfully.!', 'info');
+        cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('ASSET_EXPORT_COMPLETE'), this.exportConfig.context);
     }
     /**
      * @method getAssetsFolders
@@ -55,13 +60,14 @@ class ExportAssets extends base_class_1.default {
         if (!totalCount)
             return Promise.resolve();
         const queryParam = Object.assign(Object.assign({}, this.commonQueryParam), { query: { is_dir: true } });
+        cli_utilities_1.log.debug(`Fetching asset folders with query: ${JSON.stringify(queryParam)}`, this.exportConfig.context);
         const onSuccess = ({ response: { items } }) => {
+            cli_utilities_1.log.debug(`Fetched ${(items === null || items === void 0 ? void 0 : items.length) || 0} asset folders`, this.exportConfig.context);
             if (!(0, isEmpty_1.default)(items))
                 this.assetsFolder.push(...items);
         };
         const onReject = ({ error }) => {
-            (0, utils_1.log)(this.exportConfig, 'Export asset folder query failed', 'error');
-            (0, utils_1.log)(this.exportConfig, error, 'error');
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
         };
         return this.makeConcurrentCall({
             totalCount,
@@ -75,9 +81,11 @@ class ExportAssets extends base_class_1.default {
             concurrencyLimit: this.assetConfig.fetchConcurrency,
         }).then(() => {
             if (!(0, isEmpty_1.default)(this.assetsFolder)) {
-                new cli_utilities_1.FsUtility({ basePath: this.assetsRootPath }).writeFile((0, node_path_1.resolve)(this.assetsRootPath, 'folders.json'), this.assetsFolder);
+                const path = (0, node_path_1.resolve)(this.assetsRootPath, 'folders.json');
+                cli_utilities_1.log.debug(`Writing asset folders to ${path}`, this.exportConfig.context);
+                new cli_utilities_1.FsUtility({ basePath: this.assetsRootPath }).writeFile(path, this.assetsFolder);
             }
-            (0, utils_1.log)(this.exportConfig, 'Assets folder Exported successfully.!', 'info');
+            cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('ASSET_FOLDERS_EXPORT_COMPLETE', this.assetsFolder.length), this.exportConfig.context);
         });
     }
     /**
@@ -88,12 +96,15 @@ class ExportAssets extends base_class_1.default {
     getAssets(totalCount) {
         if (!totalCount)
             return Promise.resolve();
+        cli_utilities_1.log.debug(`Fetching ${totalCount} assets...`, this.exportConfig.context);
         let fs;
         let metaHandler;
         const queryParam = Object.assign(Object.assign({}, this.commonQueryParam), { include_publish_details: true, except: { BASE: this.assetConfig.invalidKeys } });
+        this.applyQueryFilters(queryParam, 'assets');
         if (this.assetConfig.includeVersionedAssets) {
             const customHandler = (array) => {
                 const versionAssets = (0, filter_1.default)(array, ({ _version }) => _version > 1);
+                cli_utilities_1.log.debug(`Found ${versionAssets.length} versioned assets`, this.exportConfig.context);
                 if (!(0, isEmpty_1.default)(versionAssets)) {
                     this.versionedAssets.push(...(0, map_1.default)(versionAssets, ({ uid, _version }) => ({
                         [uid]: _version,
@@ -103,11 +114,12 @@ class ExportAssets extends base_class_1.default {
             metaHandler = customHandler;
         }
         const onReject = ({ error }) => {
-            (0, utils_1.log)(this.exportConfig, 'Export asset query failed', 'error');
-            (0, utils_1.log)(this.exportConfig, error.message, 'error');
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context), cli_utilities_1.messageHandler.parse('ASSET_QUERY_FAILED'));
         };
         const onSuccess = ({ response: { items } }) => {
+            cli_utilities_1.log.debug(`Fetched ${(items === null || items === void 0 ? void 0 : items.length) || 0} assets`, this.exportConfig.context);
             if (!fs && !(0, isEmpty_1.default)(items)) {
+                cli_utilities_1.log.debug('Initializing FsUtility for writing assets metadata', this.exportConfig.context);
                 fs = new cli_utilities_1.FsUtility({
                     metaHandler,
                     moduleName: 'assets',
@@ -117,8 +129,10 @@ class ExportAssets extends base_class_1.default {
                     metaPickKeys: (0, merge_1.default)(['uid', 'url', 'filename', 'parent_uid'], this.assetConfig.assetsMetaKeys),
                 });
             }
-            if (!(0, isEmpty_1.default)(items))
+            if (!(0, isEmpty_1.default)(items)) {
+                cli_utilities_1.log.debug(`Writing ${items.length} assets into file`, this.exportConfig.context);
                 fs === null || fs === void 0 ? void 0 : fs.writeIntoFile(items, { mapKeyVal: true });
+            }
         };
         return this.makeConcurrentCall({
             module: 'assets',
@@ -132,7 +146,7 @@ class ExportAssets extends base_class_1.default {
             concurrencyLimit: this.assetConfig.fetchConcurrency,
         }).then(() => {
             fs === null || fs === void 0 ? void 0 : fs.completeFile(true);
-            (0, utils_1.log)(this.exportConfig, 'Assets metadata exported successfully.!', 'info');
+            cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('ASSET_METADATA_EXPORT_COMPLETE'), this.exportConfig.context);
         });
     }
     /**
@@ -140,6 +154,7 @@ class ExportAssets extends base_class_1.default {
      * @returns Promise<any|void>
      */
     getVersionedAssets() {
+        cli_utilities_1.log.debug('Preparing to fetch versioned assets...', this.exportConfig.context);
         let fs;
         const queryParam = Object.assign(Object.assign({}, this.commonQueryParam), { include_publish_details: true, except: { BASE: this.assetConfig.invalidKeys } });
         const versionedAssets = (0, map_1.default)(this.versionedAssets, (element) => {
@@ -150,11 +165,13 @@ class ExportAssets extends base_class_1.default {
             }
             return batch;
         }).flat();
+        cli_utilities_1.log.debug(`Prepared ${versionedAssets.length} versioned asset queries`, this.exportConfig.context);
         const apiBatches = (0, chunk_1.default)(versionedAssets, this.assetConfig.fetchConcurrency);
         const promisifyHandler = (input) => {
             const { index, batchIndex, apiParams, isLastRequest } = input;
             const batch = apiBatches[batchIndex][index];
             const [uid, version] = (0, first_1.default)((0, entries_1.default)(batch));
+            cli_utilities_1.log.debug(`Fetching versioned asset [UID: ${uid}, Version: ${version}]`, this.exportConfig.context);
             if (apiParams === null || apiParams === void 0 ? void 0 : apiParams.queryParam) {
                 apiParams.uid = uid;
                 apiParams.queryParam.version = version;
@@ -172,15 +189,13 @@ class ExportAssets extends base_class_1.default {
                     metaPickKeys: (0, merge_1.default)(['uid', 'url', 'filename', '_version', 'parent_uid'], this.assetConfig.assetsMetaKeys),
                 });
             }
-            if (!(0, isEmpty_1.default)(response))
-                fs === null || fs === void 0 ? void 0 : fs.writeIntoFile([response], {
-                    mapKeyVal: true,
-                    keyName: ['uid', '_version'],
-                });
+            if (!(0, isEmpty_1.default)(response)) {
+                cli_utilities_1.log.debug(`Writing versioned asset: UID=${response.uid}, Version=${response._version}`, this.exportConfig.context);
+                fs === null || fs === void 0 ? void 0 : fs.writeIntoFile([response], { mapKeyVal: true, keyName: ['uid', '_version'] });
+            }
         };
         const onReject = ({ error }) => {
-            (0, utils_1.log)(this.exportConfig, 'Export versioned asset query failed', 'error');
-            (0, utils_1.log)(this.exportConfig, error, 'error');
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context), cli_utilities_1.messageHandler.parse('ASSET_VERSIONED_QUERY_FAILED'));
         };
         return this.makeConcurrentCall({
             apiBatches,
@@ -195,26 +210,24 @@ class ExportAssets extends base_class_1.default {
             concurrencyLimit: this.assetConfig.fetchConcurrency,
         }, promisifyHandler).then(() => {
             fs === null || fs === void 0 ? void 0 : fs.completeFile(true);
-            (0, utils_1.log)(this.exportConfig, 'Assets folder Exported successfully.!', 'info');
+            cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('ASSET_VERSIONED_METADATA_EXPORT_COMPLETE'), this.exportConfig.context);
         });
     }
-    /**
-     * @method getAssetsCount
-     * @param isDir boolean
-     * @returns Promise<number|undefined>
-     */
     getAssetsCount(isDir = false) {
         const queryParam = Object.assign(Object.assign({ limit: 1 }, this.commonQueryParam), { skip: 10 ** 100 });
         if (isDir)
             queryParam.query = { is_dir: true };
+        cli_utilities_1.log.debug(`Querying count of assets${isDir ? ' (folders only)' : ''} with params: ${JSON.stringify(queryParam)}`, this.exportConfig.context);
         return this.stack
             .asset()
             .query(queryParam)
             .count()
-            .then(({ assets }) => assets)
+            .then(({ assets }) => {
+            cli_utilities_1.log.debug(`Received asset count: ${assets}`, this.exportConfig.context);
+            return assets;
+        })
             .catch((error) => {
-            (0, utils_1.log)(this.exportConfig, 'Get count query failed', 'error');
-            (0, utils_1.log)(this.exportConfig, error, 'error');
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context), cli_utilities_1.messageHandler.parse('ASSET_COUNT_QUERY_FAILED'));
         });
     }
     /**
@@ -227,6 +240,7 @@ class ExportAssets extends base_class_1.default {
             createDirIfNotExist: false,
             basePath: this.assetsRootPath,
         });
+        cli_utilities_1.log.debug('Reading asset metadata for download...', this.exportConfig.context);
         const assetsMetaData = fs.getPlainMeta();
         let listOfAssets = (0, values_1.default)(assetsMetaData).flat();
         if (this.assetConfig.includeVersionedAssets) {
@@ -234,19 +248,20 @@ class ExportAssets extends base_class_1.default {
             listOfAssets.push(...(0, values_1.default)(versionedAssetsMetaData).flat());
         }
         listOfAssets = (0, uniqBy_1.default)(listOfAssets, 'url');
+        cli_utilities_1.log.debug(`Total unique assets to download: ${listOfAssets.length}`, this.exportConfig.context);
         const apiBatches = (0, chunk_1.default)(listOfAssets, this.assetConfig.downloadLimit);
         const downloadedAssetsDirs = await (0, cli_utilities_1.getDirectories)((0, node_path_1.resolve)(this.assetsRootPath, 'files'));
         const onSuccess = ({ response: { data }, additionalInfo }) => {
             const { asset } = additionalInfo;
             const assetFolderPath = (0, node_path_1.resolve)(this.assetsRootPath, 'files', asset.uid);
             const assetFilePath = (0, node_path_1.resolve)(assetFolderPath, asset.filename);
+            cli_utilities_1.log.debug(`Saving asset to: ${assetFilePath}`, this.exportConfig.context);
             if (!(0, includes_1.default)(downloadedAssetsDirs, asset.uid)) {
                 fs.createFolderIfNotExist(assetFolderPath);
             }
             const assetWriterStream = (0, node_fs_1.createWriteStream)(assetFilePath);
             assetWriterStream.on('error', (error) => {
-                (0, utils_1.log)(this.exportConfig, `Downloaded failed ${asset.filename}: ${asset.uid}!`, 'error');
-                (0, utils_1.log)(this.exportConfig, error, 'error');
+                (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.exportConfig.context), { uid: asset.uid, filename: asset.fileName }), cli_utilities_1.messageHandler.parse('ASSET_DOWNLOAD_FAILED', asset.filename, asset.uid));
             });
             /**
              * NOTE if pipe not working as expected add the following code below to fix the issue
@@ -269,12 +284,11 @@ class ExportAssets extends base_class_1.default {
             else {
                 data.pipe(assetWriterStream);
             }
-            (0, utils_1.log)(this.exportConfig, `Downloaded ${asset.filename}: ${asset.uid} successfully!`, 'success');
+            cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('ASSET_DOWNLOAD_SUCCESS', asset.filename, asset.uid), this.exportConfig.context);
         };
         const onReject = ({ error, additionalInfo }) => {
             const { asset } = additionalInfo;
-            (0, utils_1.log)(this.exportConfig, `Downloaded failed ${asset.filename}: ${asset.uid}!`, 'error');
-            (0, utils_1.log)(this.exportConfig, error, 'error');
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.exportConfig.context), { uid: asset.uid, filename: asset.filename }), cli_utilities_1.messageHandler.parse('ASSET_DOWNLOAD_FAILED', asset.filename, asset.uid));
         };
         const promisifyHandler = (input) => {
             const { index, batchIndex } = input;
@@ -282,6 +296,7 @@ class ExportAssets extends base_class_1.default {
             const url = this.assetConfig.securedAssets
                 ? `${asset.url}?authtoken=${cli_utilities_1.configHandler.get('authtoken')}`
                 : asset.url;
+            cli_utilities_1.log.debug(`Preparing to download asset: ${asset.filename} (UID: ${asset.uid}) from URL: ${url}`, this.exportConfig.context);
             return this.makeAPICall({
                 reject: onReject,
                 resolve: onSuccess,
@@ -296,7 +311,7 @@ class ExportAssets extends base_class_1.default {
             totalCount: listOfAssets.length,
             concurrencyLimit: this.assetConfig.downloadLimit,
         }, promisifyHandler).then(() => {
-            (0, utils_1.log)(this.exportConfig, 'Assets download completed successfully.!', 'info');
+            cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('ASSET_DOWNLOAD_COMPLETE'), this.exportConfig.context);
         });
     }
 }

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

@@ -46,4 +46,5 @@ export default abstract class BaseClass {
      * @returns Promise<any>
      */
     makeAPICall({ module: moduleName, reject, resolve, url, uid, additionalInfo, queryParam }: ApiOptions, isLastRequest?: boolean): Promise<any>;
+    protected applyQueryFilters(requestObject: any, moduleName: string): any;
 }

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

@@ -8,7 +8,7 @@ const chunk_1 = tslib_1.__importDefault(require("lodash/chunk"));
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const entries_1 = tslib_1.__importDefault(require("lodash/entries"));
 const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
-const utils_1 = require("../../utils");
+const cli_utilities_1 = require("@contentstack/cli-utilities");
 class BaseClass {
     constructor({ exportConfig, stackAPIClient }) {
         this.client = stackAPIClient;
@@ -76,7 +76,7 @@ class BaseClass {
     async logMsgAndWaitIfRequired(module, start, batchNo) {
         const end = Date.now();
         const exeTime = end - start;
-        (0, utils_1.log)(this.exportConfig, `Batch No. ${batchNo} of ${module} is complete.`, 'success');
+        cli_utilities_1.log.success(`Batch No. ${batchNo} of ${module} is complete. Time taken: ${exeTime} milliseconds`, this.exportConfig.context);
         if (this.exportConfig.modules.assets.displayExecutionTime) {
             console.log(`Time taken to execute: ${exeTime} milliseconds; wait time: ${exeTime < 1000 ? 1000 - exeTime : 0} milliseconds`);
         }
@@ -120,5 +120,19 @@ class BaseClass {
                 return Promise.resolve();
         }
     }
+    applyQueryFilters(requestObject, moduleName) {
+        var _a, _b;
+        if ((_b = (_a = this.exportConfig.query) === null || _a === void 0 ? void 0 : _a.modules) === null || _b === void 0 ? void 0 : _b[moduleName]) {
+            const moduleQuery = this.exportConfig.query.modules[moduleName];
+            // Merge the query parameters with existing requestObject
+            if (moduleQuery) {
+                if (!requestObject.query) {
+                    requestObject.query = moduleQuery;
+                }
+                Object.assign(requestObject.query, moduleQuery);
+            }
+        }
+        return requestObject;
+    }
 }
 exports.default = BaseClass;

package/lib/export/modules/content-types.d.ts

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

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
-const utils_1 = require("../../utils");
-const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const base_class_1 = tslib_1.__importDefault(require("./base-class"));
+const utils_1 = require("../../utils");
 class ContentTypesExport extends base_class_1.default {
     constructor({ exportConfig, stackAPIClient }) {
         super({ exportConfig, stackAPIClient });
@@ -20,29 +20,36 @@ class ContentTypesExport extends base_class_1.default {
         if (Array.isArray(this.exportConfig.contentTypes) && this.exportConfig.contentTypes.length > 0) {
             this.qs.uid = { $in: this.exportConfig.contentTypes };
         }
+        // Add after existing qs setup and before contentTypesDirPath
+        this.applyQueryFilters(this.qs, 'content-types');
         this.contentTypesDirPath = path.resolve((0, cli_utilities_1.sanitizePath)(exportConfig.data), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.contentTypesConfig.dirName));
         this.contentTypes = [];
+        this.exportConfig.context.module = 'content-types';
     }
     async start() {
         try {
-            (0, utils_1.log)(this.exportConfig, 'Starting content type export', 'success');
+            cli_utilities_1.log.debug('Starting content types export process...', this.exportConfig.context);
             await utils_1.fsUtil.makeDirectory(this.contentTypesDirPath);
+            cli_utilities_1.log.debug(`Created directory at path: ${this.contentTypesDirPath}`, this.exportConfig.context);
             await this.getContentTypes();
             await this.writeContentTypes(this.contentTypes);
-            (0, utils_1.log)(this.exportConfig, 'Content type(s) exported successfully', 'success');
+            cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('CONTENT_TYPE_EXPORT_COMPLETE'), this.exportConfig.context);
         }
         catch (error) {
-            (0, utils_1.log)(this.exportConfig, `Failed to export content types ${(0, utils_1.formatError)(error)}`, 'error');
-            throw new Error('Failed to export content types');
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
         }
     }
     async getContentTypes(skip = 0) {
+        var _a;
         if (skip) {
             this.qs.skip = skip;
+            cli_utilities_1.log.debug(`Fetching content types with skip: ${skip}`, this.exportConfig.context);
         }
+        cli_utilities_1.log.debug(`Querying content types with parameters: ${JSON.stringify(this.qs, null, 2)}`, this.exportConfig.context);
         const contentTypeSearchResponse = await this.stackAPIClient.contentType().query(this.qs).find();
+        cli_utilities_1.log.debug(`Fetched ${((_a = contentTypeSearchResponse.items) === null || _a === void 0 ? void 0 : _a.length) || 0} content types out of total ${contentTypeSearchResponse.count}`, this.exportConfig.context);
         if (Array.isArray(contentTypeSearchResponse.items) && contentTypeSearchResponse.items.length > 0) {
-            let updatedContentTypes = this.sanitizeAttribs(contentTypeSearchResponse.items);
+            const updatedContentTypes = this.sanitizeAttribs(contentTypeSearchResponse.items);
             this.contentTypes.push(...updatedContentTypes);
             skip += this.contentTypesConfig.limit || 100;
             if (skip >= contentTypeSearchResponse.count) {
@@ -51,13 +58,14 @@ class ContentTypesExport extends base_class_1.default {
             return await this.getContentTypes(skip);
         }
         else {
-            (0, utils_1.log)(this.exportConfig, 'No content types returned for the given query', 'info');
+            cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('CONTENT_TYPE_NO_TYPES'), this.exportConfig.context);
         }
     }
     sanitizeAttribs(contentTypes) {
-        let updatedContentTypes = [];
+        cli_utilities_1.log.debug(`Sanitizing ${contentTypes === null || contentTypes === void 0 ? void 0 : contentTypes.length} content types`, this.exportConfig.context);
+        const updatedContentTypes = [];
         contentTypes.forEach((contentType) => {
-            for (let key in contentType) {
+            for (const key in contentType) {
                 if (this.contentTypesConfig.validKeys.indexOf(key) === -1) {
                     delete contentType[key];
                 }
@@ -67,11 +75,16 @@ class ContentTypesExport extends base_class_1.default {
         return updatedContentTypes;
     }
     async writeContentTypes(contentTypes) {
+        cli_utilities_1.log.debug(`Writing ${contentTypes === null || contentTypes === void 0 ? void 0 : contentTypes.length} content types to disk`, this.exportConfig.context);
         function write(contentType) {
             return utils_1.fsUtil.writeFile(path.join((0, cli_utilities_1.sanitizePath)(this.contentTypesDirPath), (0, cli_utilities_1.sanitizePath)(`${contentType.uid === 'schema' ? 'schema|1' : contentType.uid}.json`)), contentType);
         }
-        await (0, utils_1.executeTask)(contentTypes, write.bind(this), { concurrency: this.exportConfig.writeConcurrency });
-        return utils_1.fsUtil.writeFile(path.join(this.contentTypesDirPath, 'schema.json'), contentTypes);
+        await (0, utils_1.executeTask)(contentTypes, write.bind(this), {
+            concurrency: this.exportConfig.writeConcurrency,
+        });
+        const schemaFilePath = path.join(this.contentTypesDirPath, 'schema.json');
+        cli_utilities_1.log.debug(`Writing aggregate schema to: ${schemaFilePath}`, this.exportConfig.context);
+        return utils_1.fsUtil.writeFile(schemaFilePath, contentTypes);
     }
 }
 exports.default = ContentTypesExport;