@contentstack/cli-cm-export 2.0.0-beta.13 → 2.0.0-beta.15

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.13 linux-x64 node-v22.22.1
+@contentstack/cli-cm-export/2.0.0-beta.15 linux-x64 node-v22.22.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/config/index.js

@@ -201,6 +201,7 @@ const config = {
         stack: {
             dirName: 'stack',
             fileName: 'stack.json',
+            invalidKeys: ['SYS_ACL', 'user_uids', 'owner_uid', 'description', 'master_key'],
         },
         dependency: {
             entries: ['stack', 'locales', 'content-types'],

package/lib/export/module-exporter.js

@@ -1,7 +1,6 @@
 "use strict";
 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 modules_1 = tslib_1.__importDefault(require("./modules"));
 const utils_1 = require("../utils");
@@ -54,7 +53,6 @@ class ModuleExporter {
         try {
             this.exportConfig.branchName = targetBranch.uid;
             this.stackAPIClient.stackHeaders.branch = targetBranch.uid;
-            this.exportConfig.branchDir = path.join(this.exportConfig.exportDir, targetBranch.uid);
             // Initialize progress manager for the target branch
             cli_utilities_1.CLIProgressManager.clearGlobalSummary();
             cli_utilities_1.CLIProgressManager.initializeGlobalSummary(`EXPORT-${targetBranch.uid}`, targetBranch.uid, `Exporting "${targetBranch.uid}" branch content...`);

package/lib/export/modules/assets.js

@@ -37,7 +37,7 @@ class ExportAssets extends base_class_1.default {
         };
     }
     async start() {
-        this.assetsRootPath = (0, node_path_1.resolve)(this.exportConfig.exportDir, this.exportConfig.branchName || '', this.assetConfig.dirName);
+        this.assetsRootPath = (0, node_path_1.resolve)((0, utils_1.getExportBasePath)(this.exportConfig), this.assetConfig.dirName);
         cli_utilities_2.log.debug(`Assets root path resolved to: ${this.assetsRootPath}`, this.exportConfig.context);
         cli_utilities_2.log.debug('Fetching assets and folders count...', this.exportConfig.context);
         // NOTE step 1: Get assets and it's folder count in parallel

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

@@ -19,7 +19,7 @@ class ExportComposableStudio {
             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.exportDir, this.exportConfig.branchName || '', this.composableStudioConfig.dirName);
+        this.composableStudioPath = (0, node_path_1.resolve)((0, utils_1.getExportBasePath)(this.exportConfig), 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);

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

@@ -22,7 +22,7 @@ class ContentTypesExport extends base_class_1.default {
         }
         // Add after existing qs setup and before contentTypesDirPath
         this.applyQueryFilters(this.qs, 'content-types');
-        this.contentTypesDirPath = path.resolve((0, cli_utilities_1.sanitizePath)(exportConfig.exportDir), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.contentTypesConfig.dirName));
+        this.contentTypesDirPath = path.resolve((0, cli_utilities_1.sanitizePath)((0, utils_1.getExportBasePath)(exportConfig)), (0, cli_utilities_1.sanitizePath)(this.contentTypesConfig.dirName));
         this.contentTypes = [];
         this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.CONTENT_TYPES;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.CONTENT_TYPES];

package/lib/export/modules/custom-roles.js

@@ -25,7 +25,7 @@ class ExportCustomRoles extends base_class_1.default {
             cli_utilities_1.log.debug('Starting custom roles export process...', this.exportConfig.context);
             const [totalRoles, totalLocales] = await this.withLoadingSpinner('CUSTOM-ROLES: Analyzing roles and locales...', async () => {
                 var _a;
-                this.rolesFolderPath = (0, node_path_1.resolve)(this.exportConfig.exportDir, this.exportConfig.branchName || '', this.customRolesConfig.dirName);
+                this.rolesFolderPath = (0, node_path_1.resolve)((0, utils_1.getExportBasePath)(this.exportConfig), this.customRolesConfig.dirName);
                 await utils_1.fsUtil.makeDirectory(this.rolesFolderPath);
                 this.customRolesLocalesFilepath = (0, node_path_1.resolve)(this.rolesFolderPath, this.customRolesConfig.customRolesLocalesFileName);
                 // Get counts for progress tracking

package/lib/export/modules/entries.js

@@ -14,9 +14,10 @@ class EntriesExport extends base_class_1.default {
         this.stackAPIClient = stackAPIClient;
         this.exportConfig = exportConfig;
         this.entriesConfig = exportConfig.modules.entries;
-        this.entriesDirPath = path.resolve((0, cli_utilities_1.sanitizePath)(exportConfig.exportDir), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.entriesConfig.dirName));
-        this.localesFilePath = path.resolve((0, cli_utilities_1.sanitizePath)(exportConfig.exportDir), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(exportConfig.modules.locales.dirName), (0, cli_utilities_1.sanitizePath)(exportConfig.modules.locales.fileName));
-        this.contentTypesDirPath = path.resolve((0, cli_utilities_1.sanitizePath)(exportConfig.exportDir), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(exportConfig.modules.content_types.dirName));
+        const basePath = (0, utils_1.getExportBasePath)(exportConfig);
+        this.entriesDirPath = path.resolve((0, cli_utilities_1.sanitizePath)(basePath), (0, cli_utilities_1.sanitizePath)(this.entriesConfig.dirName));
+        this.localesFilePath = path.resolve((0, cli_utilities_1.sanitizePath)(basePath), (0, cli_utilities_1.sanitizePath)(exportConfig.modules.locales.dirName), (0, cli_utilities_1.sanitizePath)(exportConfig.modules.locales.fileName));
+        this.contentTypesDirPath = path.resolve((0, cli_utilities_1.sanitizePath)(basePath), (0, cli_utilities_1.sanitizePath)(exportConfig.modules.content_types.dirName));
         this.projectInstance = new cli_variants_1.ExportProjects(this.exportConfig);
         this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.ENTRIES;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.ENTRIES];

package/lib/export/modules/environments.js

@@ -21,7 +21,7 @@ class ExportEnvironments extends base_class_1.default {
             cli_utilities_1.log.debug('Starting environment export process...', this.exportConfig.context);
             // Setup with loading spinner
             const [totalCount] = await this.withLoadingSpinner('ENVIRONMENTS: Analyzing environments...', async () => {
-                this.environmentsFolderPath = (0, node_path_1.resolve)(this.exportConfig.exportDir, this.exportConfig.branchName || '', this.environmentConfig.dirName);
+                this.environmentsFolderPath = (0, node_path_1.resolve)((0, utils_1.getExportBasePath)(this.exportConfig), this.environmentConfig.dirName);
                 await utils_1.fsUtil.makeDirectory(this.environmentsFolderPath);
                 cli_utilities_1.log.debug(`Environments folder path: ${this.environmentsFolderPath}`, this.exportConfig.context);
                 // Get count for progress tracking

package/lib/export/modules/extensions.js

@@ -22,7 +22,7 @@ class ExportExtensions extends base_class_1.default {
             cli_utilities_1.log.debug('Starting extensions export process...', this.exportConfig.context);
             // Setup with loading spinner
             const [totalCount] = await this.withLoadingSpinner('EXTENSIONS: Analyzing extensions...', async () => {
-                this.extensionsFolderPath = (0, node_path_1.resolve)(this.exportConfig.exportDir, this.exportConfig.branchName || '', this.extensionConfig.dirName);
+                this.extensionsFolderPath = (0, node_path_1.resolve)((0, utils_1.getExportBasePath)(this.exportConfig), this.extensionConfig.dirName);
                 await utils_1.fsUtil.makeDirectory(this.extensionsFolderPath);
                 cli_utilities_1.log.debug(`Extensions folder path: ${this.extensionsFolderPath}`, this.exportConfig.context);
                 // Get count for progress tracking

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

@@ -17,7 +17,7 @@ class GlobalFieldsExport extends base_class_1.default {
             limit: this.globalFieldsConfig.limit,
             include_global_field_schema: true,
         };
-        this.globalFieldsDirPath = path.resolve((0, cli_utilities_1.sanitizePath)(exportConfig.exportDir), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.globalFieldsConfig.dirName));
+        this.globalFieldsDirPath = path.resolve((0, cli_utilities_1.sanitizePath)((0, utils_1.getExportBasePath)(exportConfig)), (0, cli_utilities_1.sanitizePath)(this.globalFieldsConfig.dirName));
         this.globalFields = [];
         this.applyQueryFilters(this.qs, 'global-fields');
         this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.GLOBAL_FIELDS;

package/lib/export/modules/labels.js

@@ -21,7 +21,7 @@ class ExportLabels extends base_class_1.default {
             cli_utilities_1.log.debug('Starting labels export process...', this.exportConfig.context);
             // Setup with loading spinner
             const [totalCount] = await this.withLoadingSpinner('LABELS: Analyzing labels...', async () => {
-                this.labelsFolderPath = (0, node_path_1.resolve)(this.exportConfig.exportDir, this.exportConfig.branchName || '', this.labelConfig.dirName);
+                this.labelsFolderPath = (0, node_path_1.resolve)((0, utils_1.getExportBasePath)(this.exportConfig), this.labelConfig.dirName);
                 await utils_1.fsUtil.makeDirectory(this.labelsFolderPath);
                 cli_utilities_1.log.debug(`Labels folder path: ${this.labelsFolderPath}`, this.exportConfig.context);
                 // Get count for progress tracking

package/lib/export/modules/locales.js

@@ -18,7 +18,7 @@ class LocaleExport extends base_class_1.default {
                 BASE: this.localeConfig.requiredKeys,
             },
         };
-        this.localesPath = path.resolve((0, cli_utilities_1.sanitizePath)(exportConfig.exportDir), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.localeConfig.dirName));
+        this.localesPath = path.resolve((0, cli_utilities_1.sanitizePath)((0, utils_1.getExportBasePath)(exportConfig)), (0, cli_utilities_1.sanitizePath)(this.localeConfig.dirName));
         this.locales = {};
         this.masterLocale = {};
         this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.LOCALES;

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

@@ -72,7 +72,7 @@ class ExportMarketplaceApps extends base_class_1.default {
         }
     }
     async setupPaths() {
-        this.marketplaceAppPath = (0, node_path_1.resolve)(this.exportConfig.exportDir, this.exportConfig.branchName || '', this.marketplaceAppConfig.dirName);
+        this.marketplaceAppPath = (0, node_path_1.resolve)((0, utils_1.getExportBasePath)(this.exportConfig), 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);

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

@@ -8,6 +8,16 @@ export default class ExportStack extends BaseClass {
     start(): Promise<void>;
     getStack(): Promise<any>;
     getLocales(skip?: number): Promise<any>;
-    exportStack(): Promise<any>;
+    /**
+     * Reuse stack snapshot from `getStack()` when present so we do not call `stack.fetch()` twice
+     * (same GET /stacks payload as writing stack.json). Falls back to `this.stack.fetch()` otherwise.
+     */
+    exportStack(preloadedStack?: Record<string, any> | null): Promise<any>;
+    private isStackFetchPayload;
+    /**
+     * Management-token exports cannot use Stack CMA endpoints for full metadata; write api_key from config only.
+     */
+    private writeStackJsonFromConfigApiKeyOnly;
+    private persistStackJsonPayload;
     exportStackSettings(): Promise<any>;
 }

package/lib/export/modules/stack.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const find_1 = tslib_1.__importDefault(require("lodash/find"));
+const omit_1 = tslib_1.__importDefault(require("lodash/omit"));
 const node_path_1 = require("node:path");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const constants_1 = require("../../constants");
@@ -12,40 +13,36 @@ class ExportStack extends base_class_1.default {
         super({ exportConfig, stackAPIClient });
         this.stackConfig = exportConfig.modules.stack;
         this.qs = { include_count: true };
-        this.stackFolderPath = (0, node_path_1.resolve)(this.exportConfig.exportDir, this.exportConfig.branchName || '', this.stackConfig.dirName);
+        this.stackFolderPath = (0, node_path_1.resolve)((0, utils_1.getExportBasePath)(this.exportConfig), this.stackConfig.dirName);
         this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.STACK;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.STACK];
     }
     async start() {
+        var _a;
         try {
             cli_utilities_1.log.debug('Starting stack export process...', this.exportConfig.context);
-            // Initial analysis with loading spinner
+            // Initial analysis with loading spinner (skip getStack when using management token — no SDK snapshot)
             const [stackData] = await this.withLoadingSpinner('STACK: Analyzing stack configuration...', async () => {
-                const stackData = (0, cli_utilities_1.isAuthenticated)() ? await this.getStack() : null;
+                const stackData = this.exportConfig.management_token || !(0, cli_utilities_1.isAuthenticated)() ? null : await this.getStack();
                 return [stackData];
             });
             // Create nested progress manager
             const progress = this.createNestedProgress(this.currentModuleName);
-            // Add processes based on configuration
-            let processCount = 0;
-            if (stackData === null || stackData === void 0 ? void 0 : stackData.org_uid) {
-                cli_utilities_1.log.debug(`Found organization UID: '${stackData.org_uid}'.`, this.exportConfig.context);
-                this.exportConfig.org_uid = stackData.org_uid;
+            const orgUid = (_a = stackData === null || stackData === void 0 ? void 0 : stackData.org_uid) !== null && _a !== void 0 ? _a : stackData === null || stackData === void 0 ? void 0 : stackData.organization_uid;
+            if (orgUid) {
+                cli_utilities_1.log.debug(`Found organization UID: '${orgUid}'.`, this.exportConfig.context);
+                this.exportConfig.org_uid = orgUid;
                 this.exportConfig.sourceStackName = stackData.name;
                 cli_utilities_1.log.debug(`Set source stack name: ${stackData.name}`, this.exportConfig.context);
             }
             if (!this.exportConfig.management_token) {
                 progress.addProcess(utils_1.PROCESS_NAMES.STACK_SETTINGS, 1);
-                processCount++;
             }
+            progress.addProcess(utils_1.PROCESS_NAMES.STACK_DETAILS, 1);
             if (!this.exportConfig.preserveStackVersion && !this.exportConfig.hasOwnProperty('master_locale')) {
                 progress.addProcess(utils_1.PROCESS_NAMES.STACK_LOCALE, 1);
-                processCount++;
-            }
-            else if (this.exportConfig.preserveStackVersion) {
-                progress.addProcess(utils_1.PROCESS_NAMES.STACK_DETAILS, 1);
-                processCount++;
             }
+            let stackDetailsExportResult;
             // Execute processes
             if (!this.exportConfig.management_token) {
                 progress
@@ -53,9 +50,19 @@ class ExportStack extends base_class_1.default {
                     .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.STACK_SETTINGS].EXPORTING, utils_1.PROCESS_NAMES.STACK_SETTINGS);
                 await this.exportStackSettings();
                 progress.completeProcess(utils_1.PROCESS_NAMES.STACK_SETTINGS, true);
+                progress
+                    .startProcess(utils_1.PROCESS_NAMES.STACK_DETAILS)
+                    .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.STACK_DETAILS].EXPORTING, utils_1.PROCESS_NAMES.STACK_DETAILS);
+                stackDetailsExportResult = await this.exportStack(stackData);
+                progress.completeProcess(utils_1.PROCESS_NAMES.STACK_DETAILS, true);
             }
             else {
                 cli_utilities_1.log.info('Skipping stack settings export: Operation is not supported when using a management token.', this.exportConfig.context);
+                progress
+                    .startProcess(utils_1.PROCESS_NAMES.STACK_DETAILS)
+                    .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.STACK_DETAILS].EXPORTING, utils_1.PROCESS_NAMES.STACK_DETAILS);
+                stackDetailsExportResult = await this.writeStackJsonFromConfigApiKeyOnly();
+                progress.completeProcess(utils_1.PROCESS_NAMES.STACK_DETAILS, true);
             }
             if (!this.exportConfig.preserveStackVersion && !this.exportConfig.hasOwnProperty('master_locale')) {
                 progress
@@ -71,13 +78,8 @@ class ExportStack extends base_class_1.default {
                 return masterLocale;
             }
             else if (this.exportConfig.preserveStackVersion) {
-                progress
-                    .startProcess(utils_1.PROCESS_NAMES.STACK_DETAILS)
-                    .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.STACK_DETAILS].EXPORTING, utils_1.PROCESS_NAMES.STACK_DETAILS);
-                const stackResult = await this.exportStack();
-                progress.completeProcess(utils_1.PROCESS_NAMES.STACK_DETAILS, true);
                 this.completeProgress(true);
-                return stackResult;
+                return stackDetailsExportResult;
             }
             else {
                 cli_utilities_1.log.debug('Locale locale already set, skipping locale fetch', this.exportConfig.context);
@@ -161,22 +163,30 @@ class ExportStack extends base_class_1.default {
             throw error;
         });
     }
-    async exportStack() {
+    /**
+     * Reuse stack snapshot from `getStack()` when present so we do not call `stack.fetch()` twice
+     * (same GET /stacks payload as writing stack.json). Falls back to `this.stack.fetch()` otherwise.
+     */
+    async exportStack(preloadedStack) {
+        var _a;
         cli_utilities_1.log.debug(`Starting stack export for: '${this.exportConfig.apiKey}'...`, this.exportConfig.context);
         await utils_1.fsUtil.makeDirectory(this.stackFolderPath);
         cli_utilities_1.log.debug(`Created stack directory at: '${this.stackFolderPath}'`, this.exportConfig.context);
+        if (this.isStackFetchPayload(preloadedStack)) {
+            cli_utilities_1.log.debug('Reusing stack payload from analysis step (no extra stack.fetch).', this.exportConfig.context);
+            try {
+                return this.persistStackJsonPayload(preloadedStack);
+            }
+            catch (error) {
+                (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(false, 'stack export', (error === null || error === void 0 ? void 0 : error.message) || utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.STACK_DETAILS].FAILED, utils_1.PROCESS_NAMES.STACK_DETAILS);
+                (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
+                return undefined;
+            }
+        }
         return this.stack
             .fetch()
             .then((resp) => {
-            var _a;
-            const stackFilePath = (0, node_path_1.resolve)(this.stackFolderPath, this.stackConfig.fileName);
-            cli_utilities_1.log.debug(`Writing stack data to: '${stackFilePath}'`, this.exportConfig.context);
-            utils_1.fsUtil.writeFile(stackFilePath, resp);
-            // Track progress for stack export completion
-            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `stack: ${this.exportConfig.apiKey}`, null, utils_1.PROCESS_NAMES.STACK_DETAILS);
-            cli_utilities_1.log.success(`Stack details exported successfully for stack ${this.exportConfig.apiKey}`, this.exportConfig.context);
-            cli_utilities_1.log.debug('Stack export completed successfully.', this.exportConfig.context);
-            return resp;
+            return this.persistStackJsonPayload(resp);
         })
             .catch((error) => {
             var _a;
@@ -185,6 +195,40 @@ class ExportStack extends base_class_1.default {
             (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.exportConfig.context));
         });
     }
+    isStackFetchPayload(data) {
+        return (typeof data === 'object' &&
+            data !== null &&
+            !Array.isArray(data) &&
+            ('api_key' in data || 'uid' in data));
+    }
+    /**
+     * Management-token exports cannot use Stack CMA endpoints for full metadata; write api_key from config only.
+     */
+    async writeStackJsonFromConfigApiKeyOnly() {
+        var _a;
+        if (!this.exportConfig.apiKey || typeof this.exportConfig.apiKey !== 'string') {
+            throw new Error('Stack API key is required to write stack.json when using a management token.');
+        }
+        cli_utilities_1.log.debug('Writing config-based stack.json (api_key only, no stack fetch).', this.exportConfig.context);
+        await utils_1.fsUtil.makeDirectory(this.stackFolderPath);
+        const payload = { api_key: this.exportConfig.apiKey };
+        const stackFilePath = (0, node_path_1.resolve)(this.stackFolderPath, this.stackConfig.fileName);
+        utils_1.fsUtil.writeFile(stackFilePath, payload);
+        (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `stack: ${this.exportConfig.apiKey}`, null, utils_1.PROCESS_NAMES.STACK_DETAILS);
+        cli_utilities_1.log.success(`Stack identifier written to stack.json from config for stack ${this.exportConfig.apiKey}`, this.exportConfig.context);
+        return payload;
+    }
+    persistStackJsonPayload(resp) {
+        var _a, _b;
+        const sanitized = (0, omit_1.default)(resp, (_a = this.stackConfig.invalidKeys) !== null && _a !== void 0 ? _a : []);
+        const stackFilePath = (0, node_path_1.resolve)(this.stackFolderPath, this.stackConfig.fileName);
+        cli_utilities_1.log.debug(`Writing stack data to: '${stackFilePath}'`, this.exportConfig.context);
+        utils_1.fsUtil.writeFile(stackFilePath, sanitized);
+        (_b = this.progressManager) === null || _b === void 0 ? void 0 : _b.tick(true, `stack: ${this.exportConfig.apiKey}`, null, utils_1.PROCESS_NAMES.STACK_DETAILS);
+        cli_utilities_1.log.success(`Stack details exported successfully for stack ${this.exportConfig.apiKey}`, this.exportConfig.context);
+        cli_utilities_1.log.debug('Stack export completed successfully.', this.exportConfig.context);
+        return sanitized;
+    }
     async exportStackSettings() {
         cli_utilities_1.log.info('Exporting stack settings...', this.exportConfig.context);
         await utils_1.fsUtil.makeDirectory(this.stackFolderPath);

package/lib/export/modules/taxonomies.js

@@ -19,7 +19,7 @@ class ExportTaxonomies extends base_class_1.default {
         this.applyQueryFilters(this.qs, 'taxonomies');
         this.exportConfig.context.module = utils_1.MODULE_CONTEXTS.TAXONOMIES;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.TAXONOMIES];
-        this.localesFilePath = (0, node_path_1.resolve)((0, cli_utilities_1.sanitizePath)(exportConfig.exportDir), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(exportConfig.modules.locales.dirName), (0, cli_utilities_1.sanitizePath)(exportConfig.modules.locales.fileName));
+        this.localesFilePath = (0, node_path_1.resolve)((0, cli_utilities_1.sanitizePath)((0, utils_1.getExportBasePath)(exportConfig)), (0, cli_utilities_1.sanitizePath)(exportConfig.modules.locales.dirName), (0, cli_utilities_1.sanitizePath)(exportConfig.modules.locales.fileName));
     }
     async start() {
         var _a;
@@ -62,7 +62,7 @@ class ExportTaxonomies extends base_class_1.default {
      */
     async initializeExport() {
         return this.withLoadingSpinner('TAXONOMIES: Analyzing taxonomy structure...', async () => {
-            this.taxonomiesFolderPath = (0, node_path_1.resolve)(this.exportConfig.exportDir, this.exportConfig.branchName || '', this.taxonomiesConfig.dirName);
+            this.taxonomiesFolderPath = (0, node_path_1.resolve)((0, utils_1.getExportBasePath)(this.exportConfig), this.taxonomiesConfig.dirName);
             cli_utilities_1.log.debug(`Taxonomies folder path: '${this.taxonomiesFolderPath}'`, this.exportConfig.context);
             await utils_1.fsUtil.makeDirectory(this.taxonomiesFolderPath);
             cli_utilities_1.log.debug('Created taxonomies directory.', this.exportConfig.context);

package/lib/export/modules/webhooks.js

@@ -21,7 +21,7 @@ class ExportWebhooks extends base_class_1.default {
             cli_utilities_1.log.debug('Starting webhooks export process...', this.exportConfig.context);
             // Setup with loading spinner
             const [totalCount] = await this.withLoadingSpinner('WEBHOOKS: Analyzing webhooks...', async () => {
-                this.webhooksFolderPath = (0, node_path_1.resolve)(this.exportConfig.exportDir, this.exportConfig.branchName || '', this.webhookConfig.dirName);
+                this.webhooksFolderPath = (0, node_path_1.resolve)((0, utils_1.getExportBasePath)(this.exportConfig), this.webhookConfig.dirName);
                 await utils_1.fsUtil.makeDirectory(this.webhooksFolderPath);
                 // Get count for progress tracking
                 const countResponse = await this.stack.webhook().fetchAll(Object.assign(Object.assign({}, this.qs), { limit: 1 }));

package/lib/export/modules/workflows.js

@@ -22,7 +22,7 @@ class ExportWorkFlows extends base_class_1.default {
             // Setup with loading spinner
             const [totalCount] = await this.withLoadingSpinner('WORKFLOWS: Analyzing workflows...', async () => {
                 var _a;
-                this.webhooksFolderPath = (0, node_path_1.resolve)(this.exportConfig.exportDir, this.exportConfig.branchName || '', this.workflowConfig.dirName);
+                this.webhooksFolderPath = (0, node_path_1.resolve)((0, utils_1.getExportBasePath)(this.exportConfig), this.workflowConfig.dirName);
                 await utils_1.fsUtil.makeDirectory(this.webhooksFolderPath);
                 // Get count for progress tracking
                 const countResponse = await this.stack.workflow().fetchAll(Object.assign(Object.assign({}, this.qs), { limit: 1 }));

package/lib/types/default-config.d.ts

@@ -132,6 +132,7 @@ export default interface DefaultConfig {
         stack: {
             dirName: string;
             fileName: string;
+            invalidKeys: string[];
             dependencies?: Modules[];
         };
         dependency: {

package/lib/types/export-config.d.ts

@@ -15,7 +15,6 @@ export default interface ExportConfig extends DefaultConfig {
     contentTypes?: string[];
     branches?: branch[];
     branchEnabled?: boolean;
-    branchDir?: string;
     singleModuleExport?: boolean;
     moduleName?: Modules;
     master_locale: masterLocale;

package/lib/types/index.d.ts

@@ -93,6 +93,7 @@ export interface CustomRoleConfig {
 export interface StackConfig {
     dirName: string;
     fileName: string;
+    invalidKeys: string[];
     dependencies?: Modules[];
     limit?: number;
 }

package/lib/utils/export-config-handler.js

@@ -33,6 +33,9 @@ const setupConfig = async (exportCmdFlags) => {
     }
     config.exportDir = config.exportDir.replace(/['"]/g, '');
     config.exportDir = path.resolve(config.exportDir);
+    if ((0, file_helper_1.isDirectoryNonEmpty)(config.exportDir)) {
+        cli_utilities_1.cliux.print('\nThe export directory is not empty. Existing files in this folder may be overwritten.', { color: 'yellow' });
+    }
     const managementTokenAlias = exportCmdFlags['management-token-alias'] || exportCmdFlags['alias'];
     if (managementTokenAlias) {
         cli_utilities_1.log.debug('Using management token alias', { alias: managementTokenAlias });

package/lib/utils/file-helper.d.ts

@@ -11,4 +11,8 @@ export declare const writeFile: (filePath: string, data: any) => Promise<any>;
 export declare const writeLargeFile: (filePath: string, data: any) => Promise<any>;
 export declare const makeDirectory: (dir: string) => void;
 export declare const readdir: (dirPath: string) => any;
+/**
+ * Returns true if the path exists, is a directory, and contains at least one entry.
+ */
+export declare function isDirectoryNonEmpty(absolutePath: string): boolean;
 export declare const fsUtil: FsUtility;

package/lib/utils/file-helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fsUtil = exports.readdir = exports.makeDirectory = exports.writeLargeFile = exports.writeFile = exports.writeFileSync = exports.readLargeFile = exports.readFile = exports.readFileSync = void 0;
+exports.fsUtil = exports.isDirectoryNonEmpty = exports.readdir = exports.makeDirectory = exports.writeLargeFile = exports.writeFile = exports.writeFileSync = exports.readLargeFile = exports.readFile = exports.readFileSync = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const path = tslib_1.__importStar(require("path"));
@@ -114,6 +114,31 @@ const readdir = function (dirPath) {
     }
 };
 exports.readdir = readdir;
+/**
+ * Returns true if the path exists, is a directory, and contains at least one entry.
+ */
+function isDirectoryNonEmpty(absolutePath) {
+    if (!absolutePath || !fs.existsSync(absolutePath)) {
+        return false;
+    }
+    let stat;
+    try {
+        stat = fs.statSync(absolutePath);
+    }
+    catch (_a) {
+        return false;
+    }
+    if (!stat.isDirectory()) {
+        return false;
+    }
+    try {
+        return fs.readdirSync(absolutePath).length > 0;
+    }
+    catch (_b) {
+        return false;
+    }
+}
+exports.isDirectoryNonEmpty = isDirectoryNonEmpty;
 exports.fileExistsSync = function (path) {
     return fs.existsSync(path);
 };

package/lib/utils/index.d.ts

@@ -4,6 +4,7 @@ export * as fileHelper from './file-helper';
 export { fsUtil } from './file-helper';
 export { default as setupBranches } from './setup-branches';
 export { default as setupExportDir } from './setup-export-dir';
+export { getExportBasePath } from './path-helper';
 export { log, unlinkFileLogger } from './logger';
 export { default as login } from './basic-login';
 export * from './common-helper';

package/lib/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PROCESS_STATUS = exports.PROCESS_NAMES = exports.MODULE_NAMES = exports.MODULE_CONTEXTS = exports.login = exports.unlinkFileLogger = exports.log = exports.setupExportDir = exports.setupBranches = exports.fsUtil = exports.fileHelper = exports.setupExportConfig = exports.interactive = void 0;
+exports.PROCESS_STATUS = exports.PROCESS_NAMES = exports.MODULE_NAMES = exports.MODULE_CONTEXTS = exports.login = exports.unlinkFileLogger = exports.log = exports.getExportBasePath = exports.setupExportDir = exports.setupBranches = exports.fsUtil = exports.fileHelper = exports.setupExportConfig = exports.interactive = void 0;
 const tslib_1 = require("tslib");
 exports.interactive = tslib_1.__importStar(require("./interactive"));
 var export_config_handler_1 = require("./export-config-handler");
@@ -12,6 +12,8 @@ var setup_branches_1 = require("./setup-branches");
 Object.defineProperty(exports, "setupBranches", { enumerable: true, get: function () { return tslib_1.__importDefault(setup_branches_1).default; } });
 var setup_export_dir_1 = require("./setup-export-dir");
 Object.defineProperty(exports, "setupExportDir", { enumerable: true, get: function () { return tslib_1.__importDefault(setup_export_dir_1).default; } });
+var path_helper_1 = require("./path-helper");
+Object.defineProperty(exports, "getExportBasePath", { enumerable: true, get: function () { return path_helper_1.getExportBasePath; } });
 var logger_1 = require("./logger");
 Object.defineProperty(exports, "log", { enumerable: true, get: function () { return logger_1.log; } });
 Object.defineProperty(exports, "unlinkFileLogger", { enumerable: true, get: function () { return logger_1.unlinkFileLogger; } });

package/lib/utils/path-helper.d.ts

@@ -0,0 +1,6 @@
+import { ExportConfig } from '../types';
+/**
+ * Returns the base path under which module content should be exported.
+ * Content is always written directly under this path (no branch subfolder).
+ */
+export declare function getExportBasePath(exportConfig: ExportConfig): string;

package/lib/utils/path-helper.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getExportBasePath = void 0;
+/**
+ * Returns the base path under which module content should be exported.
+ * Content is always written directly under this path (no branch subfolder).
+ */
+function getExportBasePath(exportConfig) {
+    return exportConfig.exportDir;
+}
+exports.getExportBasePath = getExportBasePath;

package/lib/utils/setup-branches.js

@@ -1,8 +1,5 @@
 "use strict";
 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 file_helper_1 = require("./file-helper");
 const setupBranches = async (config, stackAPIClient) => {
     if (typeof config !== 'object') {
@@ -42,9 +39,6 @@ const setupBranches = async (config, stackAPIClient) => {
         }
     }
     (0, file_helper_1.makeDirectory)(config.exportDir);
-    // create branch info file
-    (0, file_helper_1.writeFileSync)(path.join((0, cli_utilities_1.sanitizePath)(config.exportDir), 'branches.json'), branches);
-    // add branches list in the
     config.branches = branches;
 };
 exports.default = setupBranches;

package/lib/utils/setup-export-dir.d.ts

@@ -1,2 +1,2 @@
 import { ExportConfig } from '../types';
-export default function setupExportDir(exportConfig: ExportConfig): Promise<void[]>;
+export default function setupExportDir(exportConfig: ExportConfig): Promise<void>;

package/lib/utils/setup-export-dir.js

@@ -1,13 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const path_1 = tslib_1.__importDefault(require("path"));
-const cli_utilities_1 = require("@contentstack/cli-utilities");
 const file_helper_1 = require("./file-helper");
 async function setupExportDir(exportConfig) {
     (0, file_helper_1.makeDirectory)(exportConfig.exportDir);
-    if (exportConfig.branches) {
-        return Promise.all(exportConfig.branches.map((branch) => (0, file_helper_1.makeDirectory)(path_1.default.join((0, cli_utilities_1.sanitizePath)(exportConfig.exportDir), (0, cli_utilities_1.sanitizePath)(branch.uid)))));
-    }
+    // Single-branch export: content goes directly under exportDir; no per-branch subdirs.
 }
 exports.default = setupExportDir;

package/oclif.manifest.json

@@ -121,5 +121,5 @@
       ]
     }
   },
-  "version": "2.0.0-beta.13"
+  "version": "2.0.0-beta.15"
 }

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.15",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~2.0.0-beta.4",
-    "@contentstack/cli-utilities": "~2.0.0-beta.4",
-    "@contentstack/cli-variants": "~2.0.0-beta.10",
+    "@contentstack/cli-command": "~2.0.0-beta.6",
+    "@contentstack/cli-utilities": "~2.0.0-beta.7",
+    "@contentstack/cli-variants": "~2.0.0-beta.12",
     "@oclif/core": "^4.8.0",
     "async": "^3.2.6",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
     "chalk": "^5.6.2",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "merge": "^2.1.1",
     "mkdirp": "^1.0.4",
     "progress-stream": "^2.0.0",