@contentstack/cli-cm-import 2.0.0-beta.6 → 2.0.0-beta.7

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

@@ -10,6 +10,7 @@ const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const lodash_1 = require("lodash");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../../constants");
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const global_field_helper_1 = require("../../utils/global-field-helper");
@@ -27,13 +28,13 @@ class ImportGlobalFields extends base_class_1.default {
         this.pendingGFs = [];
         this.existingGFs = [];
         this.reqConcurrency = this.gFsConfig.writeConcurrency || this.config.writeConcurrency;
-        this.gFsMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'mapper', 'global_fields');
+        this.gFsMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.GLOBAL_FIELDS);
         this.gFsFolderPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), (0, cli_utilities_1.sanitizePath)(this.gFsConfig.dirName));
-        this.gFsFailsPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'mapper', 'global_fields', 'fails.json');
-        this.gFsSuccessPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'mapper', 'global_fields', 'success.json');
-        this.gFsUidMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'mapper', 'global_fields', 'uid-mapping.json');
-        this.gFsPendingPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'mapper', 'global_fields', 'pending_global_fields.js');
-        this.marketplaceAppMapperPath = path.join((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'mapper', 'marketplace_apps', 'uid-mapping.json');
+        this.gFsFailsPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.backupDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.GLOBAL_FIELDS, constants_1.PATH_CONSTANTS.FILES.FAILS);
+        this.gFsSuccessPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.backupDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.GLOBAL_FIELDS, constants_1.PATH_CONSTANTS.FILES.SUCCESS);
+        this.gFsUidMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.backupDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.GLOBAL_FIELDS, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
+        this.gFsPendingPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.backupDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.GLOBAL_FIELDS, constants_1.PATH_CONSTANTS.FILES.PENDING_GLOBAL_FIELDS);
+        this.marketplaceAppMapperPath = path.join((0, cli_utilities_1.sanitizePath)(this.config.backupDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.MARKETPLACE_APPS, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
     }
     /**
      * @method start

package/lib/import/modules/labels.js

@@ -6,6 +6,7 @@ const node_path_1 = require("node:path");
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const values_1 = tslib_1.__importDefault(require("lodash/values"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../../constants");
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 class ImportLabels extends base_class_1.default {
@@ -14,11 +15,11 @@ class ImportLabels extends base_class_1.default {
         this.importConfig.context.module = utils_1.MODULE_CONTEXTS.LABELS;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.LABELS];
         this.labelsConfig = importConfig.modules.labels;
-        this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'labels');
+        this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.LABELS);
         this.labelsFolderPath = (0, node_path_1.join)(this.importConfig.backupDir, this.labelsConfig.dirName);
-        this.labelUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
-        this.createdLabelPath = (0, node_path_1.join)(this.mapperDirPath, 'success.json');
-        this.labelFailsPath = (0, node_path_1.join)(this.mapperDirPath, 'fails.json');
+        this.labelUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
+        this.createdLabelPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.SUCCESS);
+        this.labelFailsPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.FAILS);
         this.labels = {};
         this.failedLabel = [];
         this.createdLabel = [];

package/lib/import/modules/locales.js

@@ -10,6 +10,7 @@ const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const lodash_1 = require("lodash");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../../constants");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const utils_1 = require("../../utils");
 class ImportLocales extends base_class_1.default {
@@ -27,11 +28,11 @@ class ImportLocales extends base_class_1.default {
         this.createdLocales = [];
         this.failedLocales = [];
         this.reqConcurrency = this.localeConfig.writeConcurrency || this.config.writeConcurrency;
-        this.langMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'mapper', 'languages');
+        this.langMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.backupDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.LANGUAGES);
         this.langFolderPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), (0, cli_utilities_1.sanitizePath)(this.localeConfig.dirName));
-        this.langFailsPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'mapper', 'languages', 'fails.json');
-        this.langSuccessPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'mapper', 'languages', 'success.json');
-        this.langUidMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'mapper', 'languages', 'uid-mapper.json');
+        this.langFailsPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.backupDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.LANGUAGES, constants_1.PATH_CONSTANTS.FILES.FAILS);
+        this.langSuccessPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.backupDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.LANGUAGES, constants_1.PATH_CONSTANTS.FILES.SUCCESS);
+        this.langUidMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.config.backupDir), constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.LANGUAGES, constants_1.PATH_CONSTANTS.FILES.UID_MAPPER);
     }
     async start() {
         try {

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

@@ -13,6 +13,7 @@ const filter_1 = tslib_1.__importDefault(require("lodash/filter"));
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const toLower_1 = tslib_1.__importDefault(require("lodash/toLower"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../../constants");
 const interactive_1 = require("../../utils/interactive");
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
@@ -22,9 +23,9 @@ class ImportMarketplaceApps extends base_class_1.default {
         this.importConfig.context.module = utils_1.MODULE_CONTEXTS.MARKETPLACE_APPS;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.MARKETPLACE_APPS];
         this.marketPlaceAppConfig = importConfig.modules.marketplace_apps;
-        this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'marketplace_apps');
+        this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.MARKETPLACE_APPS);
         this.marketPlaceFolderPath = (0, node_path_1.join)(this.importConfig.backupDir, this.marketPlaceAppConfig.dirName);
-        this.marketPlaceUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
+        this.marketPlaceUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
         this.appNameMapping = {};
         this.appUidMapping = {};
         this.appOriginalName = undefined;

package/lib/import/modules/stack.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const node_path_1 = require("node:path");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../../constants");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const utils_1 = require("../../utils");
 class ImportStack extends base_class_1.default {
@@ -12,8 +13,8 @@ class ImportStack extends base_class_1.default {
         this.envUidMapper = {};
         this.importConfig.context.module = utils_1.MODULE_CONTEXTS.STACK;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.STACK];
-        this.stackSettingsPath = (0, node_path_1.join)(this.importConfig.backupDir, 'stack', 'settings.json');
-        this.envUidMapperPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'environments', 'uid-mapping.json');
+        this.stackSettingsPath = (0, node_path_1.join)(this.importConfig.backupDir, constants_1.PATH_CONSTANTS.CONTENT_DIRS.STACK, constants_1.PATH_CONSTANTS.FILES.SETTINGS);
+        this.envUidMapperPath = (0, node_path_1.join)(this.importConfig.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.ENVIRONMENTS, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
     }
     /**
      * @method start

package/lib/import/modules/taxonomies.d.ts

@@ -10,6 +10,8 @@ export default class ImportTaxonomies extends BaseClass {
     private termsMapperDirPath;
     private termsSuccessPath;
     private termsFailsPath;
+    private localesFilePath;
+    private isLocaleBasedStructure;
     createdTaxonomies: Record<string, unknown>;
     failedTaxonomies: Record<string, unknown>;
     createdTerms: Record<string, Record<string, unknown>>;
@@ -26,13 +28,34 @@ export default class ImportTaxonomies extends BaseClass {
      * @async
      * @returns {Promise<any>} Promise<any>
      */
-    importTaxonomies(): Promise<any>;
+    importTaxonomies({ apiContent, localeCode }: {
+        apiContent: any[];
+        localeCode?: string;
+    }): Promise<void>;
     /**
-     * @method serializeTaxonomiesData
+     * Import taxonomies using legacy structure (taxonomies/{uid}.json)
+     */
+    importTaxonomiesLegacy(): Promise<void>;
+    /**
+     * Import taxonomies using locale-based structure (taxonomies/{locale}/{uid}.json)
+     */
+    importTaxonomiesByLocale(): Promise<void>;
+    handleSuccess(apiData: any, locale?: string): void;
+    handleFailure(error: any, apiData: any, locale?: string): void;
+    /**
+     * @method serializeTaxonomy
      * @param {ApiOptions} apiOptions ApiOptions
      * @returns {ApiOptions} ApiOptions
      */
-    serializeTaxonomiesData(apiOptions: ApiOptions): ApiOptions;
+    serializeTaxonomy(apiOptions: ApiOptions): ApiOptions;
+    loadTaxonomyFile(filePath: string): Record<string, unknown> | undefined;
+    findTaxonomyFilePath(taxonomyUID: string): string | undefined;
+    findTaxonomyInLocaleFolders(taxonomyUID: string): string | undefined;
+    loadAvailableLocales(): Record<string, string>;
+    /**
+     * Detect if locale-based folder structure exists (taxonomies/{locale}/{uid}.json)
+     */
+    detectAndScanLocaleStructure(): boolean;
     /**
      * create taxonomies success and fail in (mapper/taxonomies)
      * create terms success and fail in (mapper/taxonomies/terms)

package/lib/import/modules/taxonomies.js

@@ -5,11 +5,13 @@ const node_path_1 = require("node:path");
 const values_1 = tslib_1.__importDefault(require("lodash/values"));
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../../constants");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const utils_1 = require("../../utils");
 class ImportTaxonomies extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
+        this.isLocaleBasedStructure = false;
         this.createdTaxonomies = {};
         this.failedTaxonomies = {};
         this.createdTerms = {};
@@ -17,13 +19,14 @@ class ImportTaxonomies extends base_class_1.default {
         this.importConfig.context.module = utils_1.MODULE_CONTEXTS.TAXONOMIES;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.TAXONOMIES];
         this.taxonomiesConfig = importConfig.modules.taxonomies;
-        this.taxonomiesMapperDirPath = (0, node_path_1.join)(importConfig.backupDir, 'mapper', 'taxonomies');
-        this.termsMapperDirPath = (0, node_path_1.join)(this.taxonomiesMapperDirPath, 'terms');
-        this.taxonomiesFolderPath = (0, node_path_1.join)(importConfig.backupDir, this.taxonomiesConfig.dirName);
-        this.taxSuccessPath = (0, node_path_1.join)(this.taxonomiesMapperDirPath, 'success.json');
-        this.taxFailsPath = (0, node_path_1.join)(this.taxonomiesMapperDirPath, 'fails.json');
-        this.termsSuccessPath = (0, node_path_1.join)(this.termsMapperDirPath, 'success.json');
-        this.termsFailsPath = (0, node_path_1.join)(this.termsMapperDirPath, 'fails.json');
+        this.taxonomiesMapperDirPath = (0, node_path_1.join)(importConfig.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.TAXONOMIES);
+        this.termsMapperDirPath = (0, node_path_1.join)(this.taxonomiesMapperDirPath, constants_1.PATH_CONSTANTS.MAPPER_MODULES.TAXONOMY_TERMS);
+        this.taxonomiesFolderPath = (0, node_path_1.join)(importConfig.contentDir, this.taxonomiesConfig.dirName);
+        this.taxSuccessPath = (0, node_path_1.join)(this.taxonomiesMapperDirPath, constants_1.PATH_CONSTANTS.FILES.SUCCESS);
+        this.taxFailsPath = (0, node_path_1.join)(this.taxonomiesMapperDirPath, constants_1.PATH_CONSTANTS.FILES.FAILS);
+        this.termsSuccessPath = (0, node_path_1.join)(this.termsMapperDirPath, constants_1.PATH_CONSTANTS.FILES.SUCCESS);
+        this.termsFailsPath = (0, node_path_1.join)(this.termsMapperDirPath, constants_1.PATH_CONSTANTS.FILES.FAILS);
+        this.localesFilePath = (0, node_path_1.join)(importConfig.backupDir, importConfig.modules.locales.dirName, importConfig.modules.locales.fileName);
     }
     /**
      * @method start
@@ -37,11 +40,20 @@ class ImportTaxonomies extends base_class_1.default {
                 cli_utilities_1.log.info('No taxonomies found to import', this.importConfig.context);
                 return;
             }
-            const progress = this.createSimpleProgress(this.currentModuleName, taxonomiesCount);
             await this.prepareMapperDirectories();
+            // Check if locale-based structure exists before import
+            this.isLocaleBasedStructure = this.detectAndScanLocaleStructure();
+            const progress = this.createSimpleProgress(this.currentModuleName, taxonomiesCount);
             progress.updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.TAXONOMIES_IMPORT].IMPORTING);
             cli_utilities_1.log.debug('Starting taxonomies import', this.importConfig.context);
-            await this.importTaxonomies();
+            if (this.isLocaleBasedStructure) {
+                cli_utilities_1.log.debug('Detected locale-based folder structure for taxonomies', this.importConfig.context);
+                await this.importTaxonomiesByLocale();
+            }
+            else {
+                cli_utilities_1.log.debug('Using legacy folder structure for taxonomies', this.importConfig.context);
+                await this.importTaxonomiesLegacy();
+            }
             this.createSuccessAndFailedFile();
             this.completeProgressWithMessage();
         }
@@ -56,83 +68,189 @@ class ImportTaxonomies extends base_class_1.default {
      * @async
      * @returns {Promise<any>} Promise<any>
      */
-    async importTaxonomies() {
-        cli_utilities_1.log.debug('Validating taxonomies data', this.importConfig.context);
-        if (this.taxonomies === undefined || (0, isEmpty_1.default)(this.taxonomies)) {
-            cli_utilities_1.log.info('No Taxonomies Found!', this.importConfig.context);
+    async importTaxonomies({ apiContent, localeCode }) {
+        if (!apiContent || (apiContent === null || apiContent === void 0 ? void 0 : apiContent.length) === 0) {
+            cli_utilities_1.log.debug('No taxonomies to import', this.importConfig.context);
             return;
         }
-        const apiContent = (0, values_1.default)(this.taxonomies);
-        cli_utilities_1.log.debug(`Starting to import ${apiContent.length} taxonomies`, this.importConfig.context);
-        const onSuccess = ({ apiData }) => {
-            var _a, _b, _c;
-            const taxonomyUID = (_a = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy) === null || _a === void 0 ? void 0 : _a.uid;
-            const taxonomyName = (_b = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy) === null || _b === void 0 ? void 0 : _b.name;
-            const termsCount = Object.keys((apiData === null || apiData === void 0 ? void 0 : apiData.terms) || {}).length;
-            this.createdTaxonomies[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy;
-            this.createdTerms[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.terms;
-            (_c = this.progressManager) === null || _c === void 0 ? void 0 : _c.tick(true, null, `taxonomy: ${taxonomyName || taxonomyUID} (${termsCount} terms)`, utils_1.PROCESS_NAMES.TAXONOMIES_IMPORT);
-            cli_utilities_1.log.success(`Taxonomy '${taxonomyUID}' imported successfully!`, this.importConfig.context);
-            cli_utilities_1.log.debug(`Taxonomy '${taxonomyName}' imported with ${termsCount} terms successfully!`, this.importConfig.context);
-        };
-        const onReject = ({ error, apiData }) => {
-            var _a, _b, _c, _d;
-            const taxonomyUID = (_a = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy) === null || _a === void 0 ? void 0 : _a.uid;
-            const taxonomyName = (_b = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy) === null || _b === void 0 ? void 0 : _b.name;
-            if ((error === null || error === void 0 ? void 0 : error.status) === 409 && (error === null || error === void 0 ? void 0 : error.statusText) === 'Conflict') {
-                cli_utilities_1.log.info(`Taxonomy '${taxonomyUID}' already exists!`, this.importConfig.context);
-                cli_utilities_1.log.debug(`Adding existing taxonomy '${taxonomyUID}' to created list`, this.importConfig.context);
-                this.createdTaxonomies[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy;
-                this.createdTerms[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.terms;
-                (_c = this.progressManager) === null || _c === void 0 ? void 0 : _c.tick(true, null, `taxonomy: ${taxonomyName || taxonomyUID} already exists`, utils_1.PROCESS_NAMES.TAXONOMIES_IMPORT);
-            }
-            else {
-                this.failedTaxonomies[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy;
-                this.failedTerms[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.terms;
-                (_d = this.progressManager) === null || _d === void 0 ? void 0 : _d.tick(false, `taxonomy: ${taxonomyName || taxonomyUID}`, (error === null || error === void 0 ? void 0 : error.message) || 'Failed to import taxonomy', utils_1.PROCESS_NAMES.TAXONOMIES_IMPORT);
-                (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { taxonomyUID }), `Taxonomy '${taxonomyUID}' failed to be imported`);
-            }
-        };
-        cli_utilities_1.log.debug(`Using concurrency limit: ${this.importConfig.fetchConcurrency || 2}`, this.importConfig.context);
+        const onSuccess = ({ apiData }) => this.handleSuccess(apiData, localeCode);
+        const onReject = ({ error, apiData }) => this.handleFailure(error, apiData, localeCode);
         await this.makeConcurrentCall({
             apiContent,
             processName: 'import taxonomies',
             apiParams: {
-                serializeData: this.serializeTaxonomiesData.bind(this),
+                serializeData: this.serializeTaxonomy.bind(this),
                 reject: onReject,
                 resolve: onSuccess,
                 entity: 'import-taxonomy',
                 includeParamOnCompletion: true,
+                queryParam: {
+                    locale: localeCode,
+                },
             },
             concurrencyLimit: this.importConfig.concurrency || this.importConfig.fetchConcurrency || 1,
         }, undefined, false);
-        cli_utilities_1.log.debug('Taxonomies import process completed', this.importConfig.context);
     }
     /**
-     * @method serializeTaxonomiesData
+     * Import taxonomies using legacy structure (taxonomies/{uid}.json)
+     */
+    async importTaxonomiesLegacy() {
+        const apiContent = (0, values_1.default)(this.taxonomies);
+        await this.importTaxonomies({ apiContent });
+    }
+    /**
+     * Import taxonomies using locale-based structure (taxonomies/{locale}/{uid}.json)
+     */
+    async importTaxonomiesByLocale() {
+        const locales = this.loadAvailableLocales();
+        const apiContent = (0, values_1.default)(this.taxonomies);
+        for (const localeCode of Object.keys(locales)) {
+            await this.importTaxonomies({ apiContent, localeCode });
+        }
+    }
+    handleSuccess(apiData, locale) {
+        var _a;
+        const { taxonomy, terms } = apiData || {};
+        const taxonomyUID = taxonomy === null || taxonomy === void 0 ? void 0 : taxonomy.uid;
+        const taxonomyName = taxonomy === null || taxonomy === void 0 ? void 0 : taxonomy.name;
+        const termsCount = Object.keys(terms || {}).length;
+        this.createdTaxonomies[taxonomyUID] = taxonomy;
+        this.createdTerms[taxonomyUID] = terms;
+        (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `taxonomy: ${taxonomyName || taxonomyUID}`, null, utils_1.PROCESS_NAMES.TAXONOMIES_IMPORT);
+        cli_utilities_1.log.success(`Taxonomy '${taxonomyUID}' imported successfully${locale ? ` for locale: ${locale}` : ''}!`, this.importConfig.context);
+        cli_utilities_1.log.debug(`Created taxonomy '${taxonomyName}' with ${termsCount} terms${locale ? ` for locale: ${locale}` : ''}`, this.importConfig.context);
+    }
+    handleFailure(error, apiData, locale) {
+        var _a, _b, _c, _d, _e, _f;
+        const taxonomyUID = (_a = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy) === null || _a === void 0 ? void 0 : _a.uid;
+        const taxonomyName = (_b = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy) === null || _b === void 0 ? void 0 : _b.name;
+        if ((error === null || error === void 0 ? void 0 : error.status) === 409 && (error === null || error === void 0 ? void 0 : error.statusText) === 'Conflict') {
+            (_c = this.progressManager) === null || _c === void 0 ? void 0 : _c.tick(true, null, `taxonomy: ${taxonomyName || taxonomyUID} (already exists)`, utils_1.PROCESS_NAMES.TAXONOMIES_IMPORT);
+            cli_utilities_1.log.info(`Taxonomy '${taxonomyUID}' already exists ${locale ? ` for locale: ${locale}` : ''}!`, this.importConfig.context);
+            this.createdTaxonomies[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy;
+            this.createdTerms[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.terms;
+            return;
+        }
+        const errMsg = (error === null || error === void 0 ? void 0 : error.errorMessage) || ((_d = error === null || error === void 0 ? void 0 : error.errors) === null || _d === void 0 ? void 0 : _d.taxonomy) || ((_e = error === null || error === void 0 ? void 0 : error.errors) === null || _e === void 0 ? void 0 : _e.term) || (error === null || error === void 0 ? void 0 : error.message);
+        (_f = this.progressManager) === null || _f === void 0 ? void 0 : _f.tick(false, `taxonomy: ${taxonomyName || taxonomyUID}`, errMsg || 'Failed to import taxonomy', utils_1.PROCESS_NAMES.TAXONOMIES_IMPORT);
+        if (errMsg) {
+            cli_utilities_1.log.error(`Taxonomy '${taxonomyUID}' failed to import${locale ? ` for locale: ${locale}` : ''}! ${errMsg}`, this.importConfig.context);
+        }
+        else {
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { taxonomyUID, locale }), `Taxonomy '${taxonomyUID}' failed`);
+        }
+        this.failedTaxonomies[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.taxonomy;
+        this.failedTerms[taxonomyUID] = apiData === null || apiData === void 0 ? void 0 : apiData.terms;
+    }
+    /**
+     * @method serializeTaxonomy
      * @param {ApiOptions} apiOptions ApiOptions
      * @returns {ApiOptions} ApiOptions
      */
-    serializeTaxonomiesData(apiOptions) {
-        var _a, _b;
-        const { apiData: taxonomyData } = apiOptions;
-        cli_utilities_1.log.debug(`Serializing taxonomy: ${(_a = taxonomyData.taxonomy) === null || _a === void 0 ? void 0 : _a.name} (${(_b = taxonomyData.taxonomy) === null || _b === void 0 ? void 0 : _b.uid})`, this.importConfig.context);
-        const taxonomyUID = taxonomyData === null || taxonomyData === void 0 ? void 0 : taxonomyData.uid;
-        const filePath = (0, node_path_1.join)(this.taxonomiesFolderPath, `${taxonomyUID}.json`);
-        cli_utilities_1.log.debug(`Looking for taxonomy file: ${filePath}`, this.importConfig.context);
-        if (utils_1.fileHelper.fileExistsSync(filePath)) {
-            const taxonomyDetails = utils_1.fsUtil.readFile(filePath, true);
-            cli_utilities_1.log.debug(`Successfully loaded taxonomy details from ${filePath}`, this.importConfig.context);
+    serializeTaxonomy(apiOptions) {
+        const { apiData, queryParam: { locale }, } = apiOptions;
+        const taxonomyUID = apiData === null || apiData === void 0 ? void 0 : apiData.uid;
+        if (!taxonomyUID) {
+            cli_utilities_1.log.debug('No taxonomy UID provided for serialization', this.importConfig.context);
+            apiOptions.apiData = undefined;
+            return apiOptions;
+        }
+        const context = locale ? ` for locale: ${locale}` : '';
+        cli_utilities_1.log.debug(`Serializing taxonomy: ${taxonomyUID}${context}`, this.importConfig.context);
+        // Determine file path - if locale is provided, use it directly, otherwise search
+        const filePath = locale
+            ? (0, node_path_1.join)(this.taxonomiesFolderPath, locale, `${taxonomyUID}.json`)
+            : this.findTaxonomyFilePath(taxonomyUID);
+        if (!filePath || !utils_1.fileHelper.fileExistsSync(filePath)) {
+            cli_utilities_1.log.debug(`Taxonomy file not found for: ${taxonomyUID}${context}`, this.importConfig.context);
+            apiOptions.apiData = undefined;
+            return apiOptions;
+        }
+        const taxonomyDetails = this.loadTaxonomyFile(filePath);
+        if (taxonomyDetails) {
             const termCount = Object.keys((taxonomyDetails === null || taxonomyDetails === void 0 ? void 0 : taxonomyDetails.terms) || {}).length;
-            cli_utilities_1.log.debug(`Taxonomy has ${termCount} term entries`, this.importConfig.context);
-            apiOptions.apiData = { filePath, taxonomy: taxonomyDetails === null || taxonomyDetails === void 0 ? void 0 : taxonomyDetails.taxonomy, terms: taxonomyDetails === null || taxonomyDetails === void 0 ? void 0 : taxonomyDetails.terms };
+            cli_utilities_1.log.debug(`Taxonomy has ${termCount} term entries${context}`, this.importConfig.context);
+            apiOptions.apiData = {
+                filePath,
+                taxonomy: taxonomyDetails === null || taxonomyDetails === void 0 ? void 0 : taxonomyDetails.taxonomy,
+                terms: taxonomyDetails === null || taxonomyDetails === void 0 ? void 0 : taxonomyDetails.terms,
+            };
         }
         else {
-            cli_utilities_1.log.debug(`File does not exist for taxonomy: ${taxonomyUID}`, this.importConfig.context);
             apiOptions.apiData = undefined;
         }
         return apiOptions;
     }
+    loadTaxonomyFile(filePath) {
+        if (!utils_1.fileHelper.fileExistsSync(filePath)) {
+            cli_utilities_1.log.debug(`File does not exist: ${filePath}`, this.importConfig.context);
+            return undefined;
+        }
+        try {
+            const taxonomyDetails = utils_1.fsUtil.readFile(filePath, true);
+            cli_utilities_1.log.debug(`Successfully loaded taxonomy from: ${filePath}`, this.importConfig.context);
+            return taxonomyDetails;
+        }
+        catch (error) {
+            cli_utilities_1.log.debug(`Error loading taxonomy file: ${filePath}`, this.importConfig.context);
+            return undefined;
+        }
+    }
+    findTaxonomyFilePath(taxonomyUID) {
+        if (this.isLocaleBasedStructure) {
+            return this.findTaxonomyInLocaleFolders(taxonomyUID);
+        }
+        const legacyPath = (0, node_path_1.join)(this.taxonomiesFolderPath, `${taxonomyUID}.json`);
+        return utils_1.fileHelper.fileExistsSync(legacyPath) ? legacyPath : undefined;
+    }
+    findTaxonomyInLocaleFolders(taxonomyUID) {
+        const locales = this.loadAvailableLocales();
+        for (const localeCode of Object.keys(locales)) {
+            const filePath = (0, node_path_1.join)(this.taxonomiesFolderPath, localeCode, `${taxonomyUID}.json`);
+            if (utils_1.fileHelper.fileExistsSync(filePath)) {
+                return filePath;
+            }
+        }
+        return undefined;
+    }
+    loadAvailableLocales() {
+        var _a;
+        if (!utils_1.fileHelper.fileExistsSync(this.localesFilePath)) {
+            cli_utilities_1.log.debug('No locales file found', this.importConfig.context);
+            return {};
+        }
+        try {
+            const localesData = utils_1.fsUtil.readFile(this.localesFilePath, true);
+            const locales = {};
+            const masterCode = ((_a = this.importConfig.master_locale) === null || _a === void 0 ? void 0 : _a.code) || 'en-us';
+            locales[masterCode] = masterCode;
+            for (const [, locale] of Object.entries(localesData || {})) {
+                if (locale === null || locale === void 0 ? void 0 : locale.code) {
+                    locales[locale.code] = locale.code;
+                }
+            }
+            cli_utilities_1.log.debug(`Loaded ${Object.keys(locales).length} locales from file`, this.importConfig.context);
+            return locales;
+        }
+        catch (error) {
+            cli_utilities_1.log.debug('Error loading locales file', this.importConfig.context);
+            return {};
+        }
+    }
+    /**
+     * Detect if locale-based folder structure exists (taxonomies/{locale}/{uid}.json)
+     */
+    detectAndScanLocaleStructure() {
+        var _a;
+        const masterLocaleCode = ((_a = this.importConfig.master_locale) === null || _a === void 0 ? void 0 : _a.code) || 'en-us';
+        const masterLocaleFolder = (0, node_path_1.join)(this.taxonomiesFolderPath, masterLocaleCode);
+        if (!utils_1.fileHelper.fileExistsSync(masterLocaleFolder)) {
+            cli_utilities_1.log.debug('No locale-based folder structure detected', this.importConfig.context);
+            return false;
+        }
+        cli_utilities_1.log.debug('Locale-based folder structure detected', this.importConfig.context);
+        return true;
+    }
     /**
      * create taxonomies success and fail in (mapper/taxonomies)
      * create terms success and fail in (mapper/taxonomies/terms)

package/lib/import/modules/variant-entries.js

@@ -3,6 +3,7 @@ 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 constants_1 = require("../../constants");
 const cli_variants_1 = require("@contentstack/cli-variants");
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
@@ -13,7 +14,7 @@ class ImportVariantEntries extends base_class_1.default {
         this.config.context.module = utils_1.MODULE_CONTEXTS.VARIANT_ENTRIES;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.VARIANT_ENTRIES];
         this.personalize = importConfig.modules.personalize;
-        this.projectMapperFilePath = path_1.default.resolve((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'mapper', (0, cli_utilities_1.sanitizePath)(this.personalize.dirName), 'projects', 'projects.json');
+        this.projectMapperFilePath = path_1.default.resolve((0, cli_utilities_1.sanitizePath)(this.config.backupDir), constants_1.PATH_CONSTANTS.MAPPER, (0, cli_utilities_1.sanitizePath)(this.personalize.dirName), 'projects', 'projects.json');
     }
     /**
      * @method start

package/lib/import/modules/webhooks.js

@@ -5,6 +5,7 @@ const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const values_1 = tslib_1.__importDefault(require("lodash/values"));
 const node_path_1 = require("node:path");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../../constants");
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 class ImportWebhooks extends base_class_1.default {
@@ -13,11 +14,11 @@ class ImportWebhooks extends base_class_1.default {
         this.importConfig.context.module = utils_1.MODULE_CONTEXTS.WEBHOOKS;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.WEBHOOKS];
         this.webhooksConfig = importConfig.modules.webhooks;
-        this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'webhooks');
+        this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.WEBHOOKS);
         this.webhooksFolderPath = (0, node_path_1.join)(this.importConfig.backupDir, this.webhooksConfig.dirName);
-        this.webhookUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
-        this.createdWebhooksPath = (0, node_path_1.join)(this.mapperDirPath, 'success.json');
-        this.failedWebhooksPath = (0, node_path_1.join)(this.mapperDirPath, 'fails.json');
+        this.webhookUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
+        this.createdWebhooksPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.SUCCESS);
+        this.failedWebhooksPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.FAILS);
         this.webhooks = {};
         this.failedWebhooks = [];
         this.createdWebhooks = [];

package/lib/import/modules/workflows.d.ts

@@ -20,7 +20,7 @@ export default class ImportWorkflows extends BaseClass {
     start(): Promise<void>;
     getRoles(): Promise<void>;
     importWorkflows(): Promise<void>;
-    updateNextAvailableStagesUid(workflow: Record<string, any>, newWorkflowStages: Record<string, any>[], oldWorkflowStages: Record<string, any>[]): Promise<import("@contentstack/management/types/stack/workflow").Workflow>;
+    updateNextAvailableStagesUid(workflow: Record<string, any>, newWorkflowStages: Record<string, any>[], oldWorkflowStages: Record<string, any>[]): Promise<any>;
     /**
      * @method serializeWorkflows
      * @param {ApiOptions} apiOptions ApiOptions

package/lib/import/modules/workflows.js

@@ -11,6 +11,7 @@ const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const cloneDeep_1 = tslib_1.__importDefault(require("lodash/cloneDeep"));
 const findIndex_1 = tslib_1.__importDefault(require("lodash/findIndex"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../../constants");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const utils_1 = require("../../utils");
 class ImportWorkflows extends base_class_1.default {
@@ -19,11 +20,11 @@ class ImportWorkflows extends base_class_1.default {
         this.importConfig.context.module = utils_1.MODULE_CONTEXTS.WORKFLOWS;
         this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.WORKFLOWS];
         this.workflowsConfig = importConfig.modules.workflows;
-        this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'workflows');
+        this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.WORKFLOWS);
         this.workflowsFolderPath = (0, node_path_1.join)(this.importConfig.backupDir, this.workflowsConfig.dirName);
-        this.workflowUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
-        this.createdWorkflowsPath = (0, node_path_1.join)(this.mapperDirPath, 'success.json');
-        this.failedWorkflowsPath = (0, node_path_1.join)(this.mapperDirPath, 'fails.json');
+        this.workflowUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
+        this.createdWorkflowsPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.SUCCESS);
+        this.failedWorkflowsPath = (0, node_path_1.join)(this.mapperDirPath, constants_1.PATH_CONSTANTS.FILES.FAILS);
         this.workflows = {};
         this.failedWebhooks = [];
         this.createdWorkflows = [];

package/lib/utils/common-helper.js

@@ -11,6 +11,7 @@ const tslib_1 = require("tslib");
 const _ = tslib_1.__importStar(require("lodash"));
 const path = tslib_1.__importStar(require("path"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../constants");
 const file_helper_1 = require("./file-helper");
 const config_1 = tslib_1.__importDefault(require("../config"));
 const promise_limit_1 = tslib_1.__importDefault(require("promise-limit"));
@@ -137,8 +138,8 @@ const field_rules_update = (importConfig, ctPath) => {
                             for (let i = 0; i < fieldRuleConditionLength; i++) {
                                 if (schema.field_rules[k].conditions[i].operand_field === 'reference') {
                                     cli_utilities_1.log.debug(`Processing reference field rule condition`);
-                                    let entryMapperPath = path.resolve(importConfig.contentDir, 'mapper', 'entries');
-                                    let entryUidMapperPath = path.join(entryMapperPath, 'uid-mapping.json');
+                                    let entryMapperPath = path.resolve(importConfig.contentDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.ENTRIES);
+                                    let entryUidMapperPath = path.join(entryMapperPath, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
                                     let fieldRulesValue = schema.field_rules[k].conditions[i].value;
                                     let fieldRulesArray = fieldRulesValue.split('.');
                                     let updatedValue = [];

package/lib/utils/extension-helper.js

@@ -11,13 +11,14 @@ exports.lookupExtension = void 0;
  */
 const node_path_1 = require("node:path");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
+const constants_1 = require("../constants");
 // eslint-disable-next-line camelcase
 const lookupExtension = function (config, schema, preserveStackVersion, installedExtensions) {
     cli_utilities_1.log.debug('Starting extension lookup process...');
     const fs = new cli_utilities_1.FsUtility({ basePath: config.backupDir });
-    const extensionPath = (0, node_path_1.join)(config.backupDir, 'mapper/extensions', 'uid-mapping.json');
-    const globalfieldsPath = (0, node_path_1.join)(config.backupDir, 'mapper/globalfields', 'uid-mapping.json');
-    const marketPlaceAppsPath = (0, node_path_1.join)(config.backupDir, 'mapper/marketplace_apps', 'uid-mapping.json');
+    const extensionPath = (0, node_path_1.join)(config.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.EXTENSIONS, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
+    const globalfieldsPath = (0, node_path_1.join)(config.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.GLOBAL_FIELDS, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
+    const marketPlaceAppsPath = (0, node_path_1.join)(config.backupDir, constants_1.PATH_CONSTANTS.MAPPER, constants_1.PATH_CONSTANTS.MAPPER_MODULES.MARKETPLACE_APPS, constants_1.PATH_CONSTANTS.FILES.UID_MAPPING);
     cli_utilities_1.log.debug(`Extension mapping paths - Extensions: ${extensionPath}, Global fields: ${globalfieldsPath}, Marketplace apps: ${marketPlaceAppsPath}`);
     for (let i in schema) {
         if (schema[i].data_type === 'group') {

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

@@ -109,8 +109,6 @@ const setupConfig = async (importCmdFlags) => {
     if (importCmdFlags['exclude-global-modules']) {
         config['exclude-global-modules'] = importCmdFlags['exclude-global-modules'];
     }
-    // Set progress supported module to check and display console logs
-    cli_utilities_1.configHandler.set('log.progressSupportedModule', 'import');
     // Add authentication details to config for context tracking
     config.authenticationMethod = authenticationMethod;
     cli_utilities_1.log.debug('Import configuration setup completed.', Object.assign({}, config));

package/oclif.manifest.json

@@ -168,5 +168,5 @@
       ]
     }
   },
-  "version": "2.0.0-beta.6"
+  "version": "2.0.0-beta.7"
 }