@contentstack/cli-cm-export 2.0.0-beta.2 → 2.0.0-beta.4

package/README.md

@@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-export/2.0.0-beta.2 linux-x64 node-v22.21.1
+@contentstack/cli-cm-export/2.0.0-beta.4 linux-x64 node-v22.21.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -59,93 +59,39 @@ USAGE
 # Commands
 
 <!-- commands -->
-* [`csdx cm:stacks:export [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--content-types <value>] [--branch <value>] [--secured-assets]`](#csdx-cmstacksexport--c-value--k-value--d-value--a-value---module-value---content-types-value---branch-value---secured-assets)
-* [`csdx cm:stacks:export [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--content-types <value>] [--branch <value>] [--secured-assets]`](#csdx-cmstacksexport--c-value--k-value--d-value--a-value---module-value---content-types-value---branch-value---secured-assets)
+* [`csdx cm:stacks:export [--config <value>] [--stack-api-key <value>] [--data-dir <value>] [--alias <value>] [--module <value>] [--content-types <value>] [--branch <value>] [--secured-assets]`](#csdx-cmstacksexport---config-value---stack-api-key-value---data-dir-value---alias-value---module-value---content-types-value---branch-value---secured-assets)
 
-## `csdx cm:stacks:export [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--content-types <value>] [--branch <value>] [--secured-assets]`
+## `csdx cm:stacks:export [--config <value>] [--stack-api-key <value>] [--data-dir <value>] [--alias <value>] [--module <value>] [--content-types <value>] [--branch <value>] [--secured-assets]`
 
 Export content from a stack
 
 ```
 USAGE
-  $ csdx cm:export cm:stacks:export [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>]
-    [--content-types <value>] [--branch <value>] [--secured-assets]
+  $ csdx cm:stacks:export [--config <value>] [--stack-api-key <value>] [--data-dir <value>] [--alias <value>]
+    [--module <value>] [--content-types <value>] [--branch <value>] [--secured-assets]
 
 FLAGS
-  -B, --branch=<value>            [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.
   -a, --alias=<value>             The management token alias of the source stack from which you will export content.
   -c, --config=<value>            [optional] Path of the config
   -d, --data-dir=<value>          The path or the location in your file system to store the exported content. For e.g.,
                                   ./content
   -k, --stack-api-key=<value>     API Key of the source stack
-  -m, --module=<value>            [optional] Specific module name. If not specified, the export command will export all
-                                  the modules to the stack. The available modules are assets, content-types, entries,
-                                  environments, extensions, marketplace-apps, global-fields, labels, locales, webhooks,
-                                  workflows, custom-roles, and taxonomies.
-  -t, --content-types=<value>...  [optional]  The UID of the content type(s) whose content you want to export. In case
-                                  of multiple content types, specify the IDs separated by spaces.
   -y, --yes                       [optional] Force override all Marketplace prompts.
-      --branch-alias=<value>      (Optional) The alias of the branch from which you want to export content.
-      --secured-assets            [optional] Use this flag for assets that are secured.
-
-DESCRIPTION
-  Export content from a stack
-
-ALIASES
-  $ csdx cm:export
-
-EXAMPLES
-  $ csdx cm:stacks:export --stack-api-key <stack_api_key> --data-dir <path/of/export/destination/dir>
-
-  $ csdx cm:stacks:export --config <path/to/config/dir>
-
-  $ csdx cm:stacks:export --alias <management_token_alias>
-
-  $ csdx cm:stacks:export --alias <management_token_alias> --data-dir <path/to/export/destination/dir>
-
-  $ csdx cm:stacks:export --alias <management_token_alias> --config <path/to/config/file>
-
-  $ csdx cm:stacks:export --module <single module name>
-
-  $ csdx cm:stacks:export --branch [optional] branch name
-```
-
-## `csdx cm:stacks:export [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--content-types <value>] [--branch <value>] [--secured-assets]`
-
-Export content from a stack
-
-```
-USAGE
-  $ csdx cm:stacks:export [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--content-types
-    <value>] [--branch <value>] [--secured-assets]
-
-FLAGS
-  -B, --branch=<value>            [optional] The name of the branch where you want to export your content. If you don't
+      --branch=<value>            [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.
-  -a, --alias=<value>             The management token alias of the source stack from which you will export content.
-  -c, --config=<value>            [optional] Path of the config
-  -d, --data-dir=<value>          The path or the location in your file system to store the exported content. For e.g.,
-                                  ./content
-  -k, --stack-api-key=<value>     API Key of the source stack
-  -m, --module=<value>            [optional] Specific module name. If not specified, the export command will export all
+      --branch-alias=<value>      (Optional) The alias of the branch from which you want to export content.
+      --content-types=<value>...  [optional]  The UID of the content type(s) whose content you want to export. In case
+                                  of multiple content types, specify the IDs separated by spaces.
+      --module=<value>            [optional] Specific module name. If not specified, the export command will export all
                                   the modules to the stack. The available modules are assets, content-types, entries,
                                   environments, extensions, marketplace-apps, global-fields, labels, locales, webhooks,
-                                  workflows, custom-roles, and taxonomies.
-  -t, --content-types=<value>...  [optional]  The UID of the content type(s) whose content you want to export. In case
-                                  of multiple content types, specify the IDs separated by spaces.
-  -y, --yes                       [optional] Force override all Marketplace prompts.
-      --branch-alias=<value>      (Optional) The alias of the branch from which you want to export content.
+                                  workflows, custom-roles, taxonomies, and studio.
       --secured-assets            [optional] Use this flag for assets that are secured.
 
 DESCRIPTION
   Export content from a stack
 
-ALIASES
-  $ csdx cm:export
-
 EXAMPLES
   $ csdx cm:stacks:export --stack-api-key <stack_api_key> --data-dir <path/of/export/destination/dir>
 

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

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

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

@@ -14,7 +14,6 @@ class ExportCommand extends cli_command_1.Command {
             // 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);
@@ -67,6 +66,9 @@ class ExportCommand extends cli_command_1.Command {
         if (this.personalizeUrl) {
             exportConfig.modules.personalize.baseURL[exportConfig.region.name] = this.personalizeUrl;
         }
+        if (this.composableStudioUrl) {
+            exportConfig.modules['composable-studio'].apiBaseUrl = this.composableStudioUrl;
+        }
     }
 }
 exports.default = ExportCommand;
@@ -80,27 +82,16 @@ ExportCommand.examples = [
     'csdx cm:stacks:export --module <single module name>',
     'csdx cm:stacks:export --branch [optional] branch name',
 ];
-ExportCommand.usage = 'cm:stacks:export [-c <value>] [-k <value>] [-d <value>] [-a <value>] [--module <value>] [--content-types <value>] [--branch <value>] [--secured-assets]';
+ExportCommand.usage = 'cm:stacks:export [--config <value>] [--stack-api-key <value>] [--data-dir <value>] [--alias <value>] [--module <value>] [--content-types <value>] [--branch <value>] [--secured-assets]';
 ExportCommand.flags = {
     config: cli_utilities_1.flags.string({
         char: 'c',
         description: '[optional] Path of the config',
     }),
-    'stack-uid': cli_utilities_1.flags.string({
-        char: 's',
-        description: 'API key of the source stack',
-        hidden: true,
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['-s', '--stack-uid'], ['-k', '--stack-api-key']),
-    }),
     'stack-api-key': cli_utilities_1.flags.string({
         char: 'k',
         description: 'API Key of the source stack',
     }),
-    data: cli_utilities_1.flags.string({
-        description: 'path or location to store the data',
-        hidden: true,
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['--data'], ['--data-dir']),
-    }),
     'data-dir': cli_utilities_1.flags.string({
         char: 'd',
         description: 'The path or the location in your file system to store the exported content. For e.g., ./content',
@@ -109,33 +100,16 @@ ExportCommand.flags = {
         char: 'a',
         description: 'The management token alias of the source stack from which you will export content.',
     }),
-    'management-token-alias': cli_utilities_1.flags.string({
-        description: 'alias of the management token',
-        hidden: true,
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['--management-token-alias'], ['-a', '--alias']),
-    }),
-    'auth-token': cli_utilities_1.flags.boolean({
-        char: 'A',
-        description: 'to use auth token',
-        hidden: true,
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['-A', '--auth-token']),
-    }),
     module: cli_utilities_1.flags.string({
-        char: 'm',
-        description: '[optional] Specific module name. If not specified, the export command will export all the modules to the stack. The available modules are assets, content-types, entries, environments, extensions, marketplace-apps, global-fields, labels, locales, webhooks, workflows, custom-roles, and taxonomies.',
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['-m'], ['--module']),
+        description: '[optional] Specific module name. If not specified, the export command will export all the modules to the stack. The available modules are assets, content-types, entries, environments, extensions, marketplace-apps, global-fields, labels, locales, webhooks, workflows, custom-roles, taxonomies, and studio.',
     }),
     'content-types': cli_utilities_1.flags.string({
-        char: 't',
         description: '[optional]  The UID of the content type(s) whose content you want to export. In case of multiple content types, specify the IDs separated by spaces.',
         multiple: true,
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['-t'], ['--content-types']),
     }),
     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.",
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['-B'], ['--branch']),
         exclusive: ['branch-alias'],
     }),
     'branch-alias': cli_utilities_1.flags.string({
@@ -155,4 +129,3 @@ ExportCommand.flags = {
         hidden: true,
     }),
 };
-ExportCommand.aliases = ['cm:export'];

package/lib/config/index.js

@@ -39,6 +39,7 @@ const config = {
             'entries',
             'labels',
             'marketplace-apps',
+            'composable-studio',
         ],
         locales: {
             dirName: 'locales',
@@ -212,6 +213,12 @@ const config = {
             dirName: 'marketplace_apps',
             fileName: 'marketplace_apps.json',
         },
+        'composable-studio': {
+            dirName: 'composable_studio',
+            fileName: 'composable_studio.json',
+            apiBaseUrl: 'https://composable-studio-api.contentstack.com',
+            apiVersion: 'v1',
+        },
         taxonomies: {
             dirName: 'taxonomies',
             fileName: 'taxonomies.json',

package/lib/export/module-exporter.js

@@ -77,7 +77,7 @@ class ModuleExporter {
         return this.exportAllModules();
     }
     async exportByModuleByName(moduleName) {
-        cli_utilities_1.log.info(`Exporting module: ${moduleName}`, this.exportConfig.context);
+        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
         await (0, modules_1.default)({
@@ -93,7 +93,8 @@ class ModuleExporter {
             exportModules.push('stack');
         }
         if (!this.exportConfig.skipDependencies) {
-            const { modules: { [moduleName]: { dependencies = [] } = {} }, } = this.exportConfig;
+            const moduleConfig = this.exportConfig.modules[moduleName];
+            const dependencies = (moduleConfig === null || moduleConfig === void 0 ? void 0 : moduleConfig.dependencies) || [];
             if (dependencies.length > 0) {
                 exportModules = exportModules.concat(dependencies);
             }

package/lib/export/modules/composable-studio.d.ts

@@ -0,0 +1,15 @@
+import { HttpClient } from '@contentstack/cli-utilities';
+import { ModuleClassParams, ComposableStudioConfig, ExportConfig, ComposableStudioProject } from '../../types';
+export default class ExportComposableStudio {
+    protected composableStudioConfig: ComposableStudioConfig;
+    protected composableStudioProject: ComposableStudioProject | null;
+    protected apiClient: HttpClient;
+    composableStudioPath: string;
+    exportConfig: ExportConfig;
+    constructor({ exportConfig }: Omit<ModuleClassParams, 'stackAPIClient' | 'moduleName'>);
+    start(): Promise<void>;
+    /**
+     * Export Studio projects connected to the current stack
+     */
+    exportProjects(): Promise<void>;
+}

package/lib/export/modules/composable-studio.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_path_1 = require("node:path");
+const cli_utilities_1 = require("@contentstack/cli-utilities");
+const utils_1 = require("../../utils");
+class ExportComposableStudio {
+    constructor({ exportConfig }) {
+        this.composableStudioProject = null;
+        this.exportConfig = exportConfig;
+        this.composableStudioConfig = exportConfig.modules['composable-studio'];
+        this.exportConfig.context.module = 'composable-studio';
+        // Initialize HttpClient with Studio API base URL
+        this.apiClient = new cli_utilities_1.HttpClient();
+        this.apiClient.baseUrl(`${this.composableStudioConfig.apiBaseUrl}/${this.composableStudioConfig.apiVersion}`);
+    }
+    async start() {
+        cli_utilities_1.log.debug('Starting Studio project export process...', this.exportConfig.context);
+        if (!(0, cli_utilities_1.isAuthenticated)()) {
+            cli_utilities_1.cliux.print('WARNING!!! To export Studio projects, you must be logged in. Please check csdx auth:login --help to log in', { color: 'yellow' });
+            return Promise.resolve();
+        }
+        this.composableStudioPath = (0, node_path_1.resolve)(this.exportConfig.data, this.exportConfig.branchName || '', this.composableStudioConfig.dirName);
+        cli_utilities_1.log.debug(`Studio folder path: ${this.composableStudioPath}`, this.exportConfig.context);
+        await utils_1.fsUtil.makeDirectory(this.composableStudioPath);
+        cli_utilities_1.log.debug('Created Studio directory', this.exportConfig.context);
+        this.exportConfig.org_uid = this.exportConfig.org_uid || (await (0, utils_1.getOrgUid)(this.exportConfig));
+        cli_utilities_1.log.debug(`Organization UID: ${this.exportConfig.org_uid}`, this.exportConfig.context);
+        await this.exportProjects();
+        cli_utilities_1.log.debug('Studio project export process completed', this.exportConfig.context);
+    }
+    /**
+     * Export Studio projects connected to the current stack
+     */
+    async exportProjects() {
+        var _a, _b;
+        cli_utilities_1.log.debug('Starting Studio project export...', this.exportConfig.context);
+        try {
+            // Get authentication details - following personalization-api-adapter pattern
+            cli_utilities_1.log.debug('Initializing Studio API authentication...', this.exportConfig.context);
+            await cli_utilities_1.authenticationHandler.getAuthDetails();
+            const token = cli_utilities_1.authenticationHandler.accessToken;
+            cli_utilities_1.log.debug(`Authentication type: ${cli_utilities_1.authenticationHandler.isOauthEnabled ? 'OAuth' : 'Token'}`, this.exportConfig.context);
+            // Set authentication headers based on auth type
+            if (cli_utilities_1.authenticationHandler.isOauthEnabled) {
+                cli_utilities_1.log.debug('Setting OAuth authorization header', this.exportConfig.context);
+                this.apiClient.headers({ authorization: token });
+            }
+            else {
+                cli_utilities_1.log.debug('Setting authtoken header', this.exportConfig.context);
+                this.apiClient.headers({ authtoken: token });
+            }
+            // Set organization_uid header
+            this.apiClient.headers({
+                organization_uid: this.exportConfig.org_uid,
+                Accept: 'application/json',
+            });
+            const apiUrl = '/projects';
+            cli_utilities_1.log.debug(`Fetching projects from: ${this.composableStudioConfig.apiBaseUrl}${apiUrl}`, this.exportConfig.context);
+            // Make API call to fetch projects using HttpClient
+            const response = await this.apiClient.get(apiUrl);
+            if (response.status < 200 || response.status >= 300) {
+                throw new Error(`API call failed with status ${response.status}: ${JSON.stringify(response.data)}`);
+            }
+            const data = response.data;
+            cli_utilities_1.log.debug(`Fetched ${((_a = data.projects) === null || _a === void 0 ? void 0 : _a.length) || 0} total projects`, this.exportConfig.context);
+            // Filter projects connected to this stack
+            const connectedProject = (_b = data.projects) === null || _b === void 0 ? void 0 : _b.filter((project) => project.connectedStackApiKey === this.exportConfig.apiKey);
+            if (!connectedProject || connectedProject.length === 0) {
+                cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('COMPOSABLE_STUDIO_NOT_FOUND'), this.exportConfig.context);
+                return;
+            }
+            // Use the first connected project (stacks should have only one project)
+            this.composableStudioProject = connectedProject[0];
+            cli_utilities_1.log.debug(`Found Studio project: ${this.composableStudioProject.name}`, this.exportConfig.context);
+            // Write the project to file
+            const composableStudioFilePath = (0, node_path_1.resolve)(this.composableStudioPath, this.composableStudioConfig.fileName);
+            cli_utilities_1.log.debug(`Writing Studio project to: ${composableStudioFilePath}`, this.exportConfig.context);
+            utils_1.fsUtil.writeFile(composableStudioFilePath, this.composableStudioProject);
+            cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('COMPOSABLE_STUDIO_EXPORT_COMPLETE', this.composableStudioProject.name), this.exportConfig.context);
+        }
+        catch (error) {
+            cli_utilities_1.log.debug('Error occurred while exporting Studio project', this.exportConfig.context);
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
+        }
+    }
+}
+exports.default = ExportComposableStudio;

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

@@ -39,12 +39,14 @@ class ContentTypesExport extends base_class_1.default {
                     .find();
                 return [countResponse.count || 0];
             });
+            // Create simple progress manager with total count
+            const progress = this.createSimpleProgress(this.currentModuleName, totalCount);
             if (totalCount === 0) {
                 cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('CONTENT_TYPE_NO_TYPES'), this.exportConfig.context);
+                await this.writeContentTypes(this.contentTypes);
+                this.completeProgress(true);
                 return;
             }
-            // Create simple progress manager with total count
-            const progress = this.createSimpleProgress(this.currentModuleName, totalCount);
             progress.updateStatus('Fetching content types...');
             await this.getContentTypes();
             await this.writeContentTypes(this.contentTypes);

package/lib/export/modules/entries.js

@@ -219,7 +219,7 @@ class EntriesExport extends base_class_1.default {
                 });
                 cli_utilities_1.log.debug('Initialized FsUtility for writing entries', this.exportConfig.context);
             }
-            cli_utilities_1.log.debug(`Writing ${entriesSearchResponse.items.length} entries to file`, this.exportConfig.context);
+            cli_utilities_1.log.debug(`Writing ${entriesSearchResponse.items.length} entries to file...`, this.exportConfig.context);
             this.entriesFileHelper.writeIntoFile(entriesSearchResponse.items, { mapKeyVal: true });
             // Track progress for individual entries
             entriesSearchResponse.items.forEach((entry) => {
@@ -227,9 +227,9 @@ class EntriesExport extends base_class_1.default {
                 (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `entry: ${entry.uid}`, null, utils_1.PROCESS_NAMES.ENTRIES);
             });
             if (this.entriesConfig.exportVersions) {
-                cli_utilities_1.log.debug('Exporting entry versions is enabled', this.exportConfig.context);
+                cli_utilities_1.log.debug('Exporting entry versions is enabled.', this.exportConfig.context);
                 let versionedEntryPath = path.join((0, cli_utilities_2.sanitizePath)(this.entriesDirPath), (0, cli_utilities_2.sanitizePath)(options.contentType), (0, cli_utilities_2.sanitizePath)(options.locale), 'versions');
-                cli_utilities_1.log.debug(`Creating versioned entries directory at: ${versionedEntryPath}`, this.exportConfig.context);
+                cli_utilities_1.log.debug(`Creating versioned entries directory at: ${versionedEntryPath}.`, this.exportConfig.context);
                 utils_1.fsUtil.makeDirectory(versionedEntryPath);
                 await this.fetchEntriesVersions(entriesSearchResponse.items, {
                     locale: options.locale,
@@ -269,7 +269,7 @@ class EntriesExport extends base_class_1.default {
         }
     }
     async fetchEntriesVersions(entries, options) {
-        cli_utilities_1.log.debug(`Fetching versions for ${entries.length} entries`, this.exportConfig.context);
+        cli_utilities_1.log.debug(`Fetching versions for ${entries.length} entries...`, this.exportConfig.context);
         const onSuccess = ({ response, apiData: entry }) => {
             var _a;
             const versionFilePath = path.join((0, cli_utilities_2.sanitizePath)(options.versionedEntryPath), (0, cli_utilities_2.sanitizePath)(`${entry.uid}.json`));
@@ -305,7 +305,7 @@ class EntriesExport extends base_class_1.default {
         return new Promise(async (resolve, reject) => {
             return await this.getEntryByVersion(apiParams.queryParam, entry)
                 .then((response) => {
-                cli_utilities_1.log.debug(`Successfully fetched versions for entry: ${entry.uid}`, this.exportConfig.context);
+                cli_utilities_1.log.debug(`Successfully fetched versions for entry UID: ${entry.uid}`, this.exportConfig.context);
                 apiParams.resolve({
                     response,
                     apiData: entry,
@@ -313,7 +313,7 @@ class EntriesExport extends base_class_1.default {
                 resolve(true);
             })
                 .catch((error) => {
-                cli_utilities_1.log.debug(`Failed to fetch versions for entry: ${entry.uid}`, this.exportConfig.context);
+                cli_utilities_1.log.debug(`Failed to fetch versions for entry UID: ${entry.uid}`, this.exportConfig.context);
                 apiParams.reject({
                     error,
                     apiData: entry,
@@ -330,7 +330,7 @@ class EntriesExport extends base_class_1.default {
             },
             version: entry._version,
         };
-        cli_utilities_1.log.debug(`Fetching entry version ${entry._version} for uid: ${entry.uid}`, this.exportConfig.context);
+        cli_utilities_1.log.debug(`Fetching entry version ${entry._version} for entry UID: '${entry.uid}'.`, this.exportConfig.context);
         const entryResponse = await this.stackAPIClient
             .contentType(options.contentType)
             .entry(entry.uid)

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

@@ -35,12 +35,16 @@ class GlobalFieldsExport extends base_class_1.default {
                     .find();
                 return [countResponse.count || 0];
             });
+            // Create simple progress manager for global fields
+            const progress = this.createSimpleProgress(this.currentModuleName, totalCount);
             if (totalCount === 0) {
                 cli_utilities_1.log.info(cli_utilities_1.messageHandler.parse('GLOBAL_FIELDS_NOT_FOUND'), this.exportConfig.context);
+                const globalFieldsFilePath = path.join(this.globalFieldsDirPath, this.globalFieldsConfig.fileName);
+                cli_utilities_1.log.debug(`Writing global fields to: ${globalFieldsFilePath}`, this.exportConfig.context);
+                utils_1.fsUtil.writeFile(globalFieldsFilePath, this.globalFields);
+                this.completeProgress(true);
                 return;
             }
-            // Create simple progress manager for global fields
-            const progress = this.createSimpleProgress(this.currentModuleName, totalCount);
             progress.updateStatus('Fetching global fields...');
             await this.getGlobalFields();
             const globalFieldsFilePath = path.join(this.globalFieldsDirPath, this.globalFieldsConfig.fileName);

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

@@ -75,17 +75,17 @@ class ExportMarketplaceApps extends base_class_1.default {
     }
     async setupPaths() {
         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);
+        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);
+        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);
+        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);
+        cli_utilities_1.log.debug(`Initializing Marketplace SDK with host: '${host}'...`, this.exportConfig.context);
         this.appSdk = await (0, cli_utilities_1.marketplaceSDKClient)({ host });
     }
     async getAppsCount() {
@@ -119,17 +119,28 @@ class ExportMarketplaceApps extends base_class_1.default {
      * library if it is available.
      */
     async exportApps() {
+        var _a, _b, _c, _d, _e;
         cli_utilities_1.log.debug('Starting apps export process...', this.exportConfig.context);
+        // Process external query if provided
+        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 = externalQuery.installation_uid.$in.join(',');
+            }
+        }
         await this.getStackSpecificApps();
         cli_utilities_1.log.debug(`Retrieved ${this.installedApps.length} stack-specific apps`, 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);
+            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);
+                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;
@@ -149,18 +160,18 @@ class ExportMarketplaceApps extends base_class_1.default {
             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);
+                    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);
+                cli_utilities_1.log.debug(`Processing app configurations for: '${((_a = app.manifest) === null || _a === void 0 ? void 0 : _a.name) || app.uid}'...`, this.exportConfig.context);
                 await this.getAppConfigurations(+index, app);
                 // Track progress for each app processed
                 (_b = this.progressManager) === null || _b === void 0 ? void 0 : _b.tick(true, `app: ${((_c = app.manifest) === null || _c === void 0 ? void 0 : _c.name) || app.uid}`, null, utils_1.PROCESS_NAMES.FETCH_CONFIG_MANIFEST);
             }
             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);
+            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);
         }
@@ -175,17 +186,17 @@ class ExportMarketplaceApps extends base_class_1.default {
      * 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);
+        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) => {
-            cli_utilities_1.log.debug(`Failed to fetch private app manifest for: ${appInstallation.manifest.name}`, this.exportConfig.context);
+            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);
+            cli_utilities_1.log.debug(`Successfully fetched private app manifest for: '${appInstallation.manifest.name}'`, this.exportConfig.context);
             this.installedApps[index].manifest = manifest;
         }
     }
@@ -204,7 +215,7 @@ class ExportMarketplaceApps extends base_class_1.default {
         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;
-        cli_utilities_1.log.debug(`Fetching app configuration for: ${app}`, this.exportConfig.context);
+        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)
@@ -214,17 +225,18 @@ class ExportMarketplaceApps extends base_class_1.default {
             var _a;
             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);
+                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);
                     (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.FETCH_CONFIG_MANIFEST].PROCESSING, utils_1.PROCESS_NAMES.FETCH_CONFIG_MANIFEST);
                 }
                 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);
+                    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);
+                    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);
                     cli_utilities_1.log.success(cli_utilities_1.messageHandler.parse('MARKETPLACE_APP_CONFIG_SUCCESS', app), this.exportConfig.context);
                 }
@@ -233,12 +245,12 @@ class ExportMarketplaceApps extends base_class_1.default {
                 }
             }
             else if (error) {
-                cli_utilities_1.log.debug(`Error in app configuration data for: ${app}`, this.exportConfig.context);
+                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) => {
-            cli_utilities_1.log.debug(`Failed to fetch app configuration for: ${app}`, this.exportConfig.context);
+            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));
         });
     }
@@ -256,7 +268,7 @@ class ExportMarketplaceApps extends base_class_1.default {
             .installation()
             .fetchAll(Object.assign(Object.assign({}, this.query), { skip }))
             .catch((error) => {
-            cli_utilities_1.log.debug('Error occurred while fetching stack-specific apps', this.exportConfig.context);
+            cli_utilities_1.log.debug('An error occurred while fetching stack-specific apps.', this.exportConfig.context);
             (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
         });
         if (collection) {
@@ -276,11 +288,11 @@ class ExportMarketplaceApps extends base_class_1.default {
             });
             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);
+                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);
+                cli_utilities_1.log.debug('Completed fetching all stack-specific apps.', this.exportConfig.context);
             }
         }
     }