@contentstack/cli-cm-import-setup 1.7.2 → 2.0.0-beta.1

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

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const utils_1 = require("../../utils");
 const path_1 = require("path");
 const lodash_1 = require("lodash");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
-class marketplaceAppImportSetup {
-    constructor({ config, stackAPIClient, dependencies }) {
-        this.config = config;
-        if (this.config.context) {
-            this.config.context.module = 'marketplace-apps';
-        }
-        this.stackAPIClient = stackAPIClient;
+const base_setup_1 = tslib_1.__importDefault(require("./base-setup"));
+const utils_2 = require("../../utils");
+class marketplaceAppImportSetup extends base_setup_1.default {
+    constructor({ config, stackAPIClient }) {
+        super({ config, stackAPIClient, dependencies: [] });
+        this.currentModuleName = utils_2.MODULE_NAMES[utils_2.MODULE_CONTEXTS.MARKETPLACE_APPS];
         this.marketplaceAppsFilePath = (0, path_1.join)((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'marketplace_apps', 'marketplace_apps.json');
         this.marketplaceAppsConfig = config.modules['marketplace-apps'];
         this.marketplaceAppsUidMapperPath = (0, path_1.join)((0, cli_utilities_1.sanitizePath)(this.config.backupDir), 'mapper', 'marketplace_apps');
@@ -22,29 +22,47 @@ class marketplaceAppImportSetup {
      * @returns {Promise<void>}
      */
     async start() {
+        var _a, _b;
         try {
-            if (!utils_1.fileHelper.fileExistsSync(this.marketplaceAppsFilePath)) {
-                cli_utilities_1.log.info('No Marketplace apps found in the content folder.');
-                return;
-            }
-            const sourceMarketplaceApps = await utils_1.fsUtil.readFile(this.marketplaceAppsFilePath);
+            const sourceMarketplaceApps = await this.withLoadingSpinner('MARKETPLACE APPS: Analyzing import data...', async () => {
+                return await utils_1.fsUtil.readFile(this.marketplaceAppsFilePath);
+            });
             if (!(0, lodash_1.isEmpty)(sourceMarketplaceApps)) {
-                utils_1.fsUtil.makeDirectory(this.marketplaceAppsUidMapperPath); // Use fsUtil
+                const appsArray = Array.isArray(sourceMarketplaceApps) ? sourceMarketplaceApps : Object.values(sourceMarketplaceApps);
+                const progress = this.createNestedProgress(this.currentModuleName);
+                // Add processes
+                progress.addProcess(utils_2.PROCESS_NAMES.MARKETPLACE_APPS_MAPPER_GENERATION, 1);
+                progress.addProcess(utils_2.PROCESS_NAMES.MARKETPLACE_APPS_FETCH, appsArray.length);
+                // Create mapper directory
+                progress
+                    .startProcess(utils_2.PROCESS_NAMES.MARKETPLACE_APPS_MAPPER_GENERATION)
+                    .updateStatus(utils_2.PROCESS_STATUS.MARKETPLACE_APPS_MAPPER_GENERATION.GENERATING, utils_2.PROCESS_NAMES.MARKETPLACE_APPS_MAPPER_GENERATION);
+                utils_1.fsUtil.makeDirectory(this.marketplaceAppsUidMapperPath);
+                (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, 'mapper directory created', null, utils_2.PROCESS_NAMES.MARKETPLACE_APPS_MAPPER_GENERATION);
+                progress.completeProcess(utils_2.PROCESS_NAMES.MARKETPLACE_APPS_MAPPER_GENERATION, true);
+                // Fetch marketplace apps
+                progress
+                    .startProcess(utils_2.PROCESS_NAMES.MARKETPLACE_APPS_FETCH)
+                    .updateStatus(utils_2.PROCESS_STATUS.MARKETPLACE_APPS_FETCH.FETCHING, utils_2.PROCESS_NAMES.MARKETPLACE_APPS_FETCH);
                 this.developerHubBaseUrl = this.config.developerHubBaseUrl || (await (0, cli_utilities_1.createDeveloperHubUrl)(this.config.host));
                 // NOTE init marketplace app sdk
                 const host = this.developerHubBaseUrl.split('://').pop();
                 this.appSdk = await (0, cli_utilities_1.marketplaceSDKClient)({ host });
                 const targetMarketplaceApps = await this.getMarketplaceApps();
+                (_b = this.progressManager) === null || _b === void 0 ? void 0 : _b.tick(true, 'marketplace apps fetched', null, utils_2.PROCESS_NAMES.MARKETPLACE_APPS_FETCH);
                 this.createMapper(sourceMarketplaceApps, targetMarketplaceApps);
                 await utils_1.fsUtil.writeFile((0, path_1.join)(this.marketplaceAppsUidMapperPath, 'uid-mapping.json'), this.marketplaceAppMapper);
-                cli_utilities_1.log.success(`The required setup files for Marketplace apps have been generated successfully.`);
+                progress.completeProcess(utils_2.PROCESS_NAMES.MARKETPLACE_APPS_FETCH, true);
+                this.completeProgress(true);
+                (0, utils_1.log)(this.config, `The required setup files for Marketplace apps have been generated successfully.`, 'success');
             }
             else {
-                cli_utilities_1.log.info('No Marketplace apps found in the content folder.');
+                (0, utils_1.log)(this.config, 'No Marketplace apps found in the content folder.', 'info');
             }
         }
         catch (error) {
-            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.config.context), 'Error occurred while generating the Marketplace app mapper');
+            this.completeProgress(false, (error === null || error === void 0 ? void 0 : error.message) || 'Marketplace apps mapper generation failed');
+            (0, utils_1.log)(this.config, `Error occurred while generating the Marketplace app mapper: ${error.message}.`, 'error');
         }
     }
     async getMarketplaceApps() {
@@ -61,7 +79,9 @@ class marketplaceAppImportSetup {
         });
     }
     createMapper(sourceMarketplaceApps, targetMarketplaceApps) {
-        sourceMarketplaceApps.forEach((sourceApp) => {
+        const appsArray = Array.isArray(sourceMarketplaceApps) ? sourceMarketplaceApps : Object.values(sourceMarketplaceApps);
+        appsArray.forEach((sourceApp) => {
+            var _a, _b;
             // Find matching target item based on manifest.name
             // TBD: This logic is not foolproof, need to find a better way to match source and target apps
             // Reason: While importing apps, if an app exist in the target with the same name, it will be a conflict and will not be imported
@@ -86,9 +106,11 @@ class marketplaceAppImportSetup {
                         });
                     }
                 });
+                (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `app: ${sourceAppName}`, null, utils_2.PROCESS_NAMES.MARKETPLACE_APPS_FETCH);
             }
             else {
-                cli_utilities_1.log.info(`No matching Marketplace app found in the target stack with name ${sourceAppName}`);
+                (_b = this.progressManager) === null || _b === void 0 ? void 0 : _b.tick(false, `app: ${sourceAppName}`, 'Not found in target stack', utils_2.PROCESS_NAMES.MARKETPLACE_APPS_FETCH);
+                (0, utils_1.log)(this.config, `No matching Marketplace app found in the target stack with name ${sourceAppName}`, 'info');
             }
         });
     }

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

@@ -1,11 +1,9 @@
 /// <reference types="lodash" />
 import { ModuleClassParams } from '../../types';
-export default class TaxonomiesImportSetup {
-    private config;
+import BaseImportSetup from './base-setup';
+export default class TaxonomiesImportSetup extends BaseImportSetup {
     private taxonomiesFilePath;
     private taxonomiesFolderPath;
-    private stackAPIClient;
-    private dependencies;
     private taxonomiesConfig;
     private termsSuccessPath;
     private taxSuccessPath;
@@ -16,7 +14,7 @@ export default class TaxonomiesImportSetup {
     taxonomiesMapper: Record<string, unknown>;
     termsMapper: Record<string, unknown>;
     masterLocaleFilePath: string;
-    constructor({ config, stackAPIClient, dependencies }: ModuleClassParams);
+    constructor({ config, stackAPIClient }: ModuleClassParams);
     /**
      * Start the taxonomies import setup
      * This method reads the taxonomies from the content folder and generates a mapper file
@@ -26,12 +24,12 @@ export default class TaxonomiesImportSetup {
     /**
      * Setup taxonomies using legacy format (root-level taxonomy files)
      */
-    setupTaxonomiesLegacy(taxonomies: any): Promise<void>;
+    setupTaxonomiesLegacy(taxonomies: any, progress: any): Promise<void>;
     /**
      * Setup taxonomies using locale-based format (taxonomies organized by locale)
      * For locale-based structure, we query the target stack for each taxonomy+locale combination
      */
-    setupTaxonomiesByLocale(taxonomies: any): Promise<void>;
+    setupTaxonomiesByLocale(taxonomies: any, progress: any): Promise<void>;
     /**
      * Detect if locale-based folder structure exists
      * @returns {boolean} true if locale-based structure detected, false otherwise

package/lib/import/modules/taxonomies.js

@@ -6,17 +6,16 @@ const omit_1 = tslib_1.__importDefault(require("lodash/omit"));
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const utils_1 = require("../../utils");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
-class TaxonomiesImportSetup {
-    constructor({ config, stackAPIClient, dependencies }) {
+const base_setup_1 = tslib_1.__importDefault(require("./base-setup"));
+const utils_2 = require("../../utils");
+class TaxonomiesImportSetup extends base_setup_1.default {
+    constructor({ config, stackAPIClient }) {
         var _a, _b, _c;
+        super({ config, stackAPIClient, dependencies: [] });
         this.isLocaleBasedStructure = false;
         this.taxonomiesMapper = {};
         this.termsMapper = {};
-        this.config = config;
-        if (this.config.context) {
-            this.config.context.module = 'taxonomies';
-        }
-        this.stackAPIClient = stackAPIClient;
+        this.currentModuleName = utils_2.MODULE_NAMES[utils_2.MODULE_CONTEXTS.TAXONOMIES];
         this.taxonomiesFolderPath = (0, path_1.join)((0, cli_utilities_1.sanitizePath)(this.config.contentDir), 'taxonomies');
         this.taxonomiesFilePath = (0, path_1.join)(this.taxonomiesFolderPath, 'taxonomies.json');
         this.taxonomiesConfig = config.modules.taxonomies;
@@ -35,58 +34,90 @@ class TaxonomiesImportSetup {
      * @returns {Promise<void>}
      */
     async start() {
+        var _a;
         try {
-            const taxonomies = utils_1.fsUtil.readFile(this.taxonomiesFilePath);
+            const taxonomies = await this.withLoadingSpinner('TAXONOMIES: Analyzing import data...', async () => {
+                return utils_1.fsUtil.readFile(this.taxonomiesFilePath);
+            });
             if (!(0, isEmpty_1.default)(taxonomies)) {
-                // 1. Detect locale-based structure
+                const taxonomiesArray = Object.values(taxonomies);
+                const progress = this.createNestedProgress(this.currentModuleName);
+                // Detect locale-based structure
                 this.isLocaleBasedStructure = this.detectLocaleBasedStructure();
-                // 2. Create mapper directory
+                // Add processes
+                progress.addProcess(utils_2.PROCESS_NAMES.TAXONOMIES_MAPPER_GENERATION, 1);
+                progress.addProcess(utils_2.PROCESS_NAMES.TAXONOMIES_FETCH, taxonomiesArray.length);
+                progress.addProcess(utils_2.PROCESS_NAMES.TAXONOMIES_TERMS_FETCH, taxonomiesArray.length);
+                // Create mapper directory
+                progress
+                    .startProcess(utils_2.PROCESS_NAMES.TAXONOMIES_MAPPER_GENERATION)
+                    .updateStatus(utils_2.PROCESS_STATUS.TAXONOMIES_MAPPER_GENERATION.GENERATING, utils_2.PROCESS_NAMES.TAXONOMIES_MAPPER_GENERATION);
                 utils_1.fsUtil.makeDirectory(this.taxonomiesMapperDirPath);
                 utils_1.fsUtil.makeDirectory(this.termsMapperDirPath);
+                (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, 'mapper directories created', null, utils_2.PROCESS_NAMES.TAXONOMIES_MAPPER_GENERATION);
+                progress.completeProcess(utils_2.PROCESS_NAMES.TAXONOMIES_MAPPER_GENERATION, true);
+                // Fetch taxonomies
+                progress
+                    .startProcess(utils_2.PROCESS_NAMES.TAXONOMIES_FETCH)
+                    .updateStatus(utils_2.PROCESS_STATUS.TAXONOMIES_FETCH.FETCHING, utils_2.PROCESS_NAMES.TAXONOMIES_FETCH);
                 if (this.isLocaleBasedStructure) {
-                    cli_utilities_1.log.info('Detected locale-based folder structure for taxonomies');
-                    await this.setupTaxonomiesByLocale(taxonomies);
+                    (0, utils_1.log)(this.config, 'Detected locale-based folder structure for taxonomies', 'info');
+                    await this.setupTaxonomiesByLocale(taxonomies, progress);
                 }
                 else {
-                    cli_utilities_1.log.info('Using legacy folder structure for taxonomies');
-                    await this.setupTaxonomiesLegacy(taxonomies);
+                    (0, utils_1.log)(this.config, 'Using legacy folder structure for taxonomies', 'info');
+                    await this.setupTaxonomiesLegacy(taxonomies, progress);
                 }
+                progress.completeProcess(utils_2.PROCESS_NAMES.TAXONOMIES_FETCH, true);
+                progress.completeProcess(utils_2.PROCESS_NAMES.TAXONOMIES_TERMS_FETCH, true);
                 if (this.taxonomiesMapper !== undefined && !(0, isEmpty_1.default)(this.taxonomiesMapper)) {
                     utils_1.fsUtil.writeFile(this.taxSuccessPath, this.taxonomiesMapper);
                 }
                 if (this.termsMapper !== undefined && !(0, isEmpty_1.default)(this.termsMapper)) {
                     utils_1.fsUtil.writeFile(this.termsSuccessPath, this.termsMapper);
                 }
-                cli_utilities_1.log.success(`The required setup files for taxonomies have been generated successfully.`);
+                this.completeProgress(true);
+                (0, utils_1.log)(this.config, `The required setup files for taxonomies have been generated successfully.`, 'success');
             }
             else {
-                cli_utilities_1.log.info('No taxonomies found in the content folder.');
+                (0, utils_1.log)(this.config, 'No taxonomies found in the content folder.', 'info');
             }
         }
         catch (error) {
-            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.config.context), 'Error generating taxonomies mapper');
+            this.completeProgress(false, (error === null || error === void 0 ? void 0 : error.message) || 'Taxonomies mapper generation failed');
+            (0, utils_1.log)(this.config, `Error generating taxonomies mapper: ${error.message}`, 'error');
         }
     }
     /**
      * Setup taxonomies using legacy format (root-level taxonomy files)
      */
-    async setupTaxonomiesLegacy(taxonomies) {
+    async setupTaxonomiesLegacy(taxonomies, progress) {
+        var _a, _b, _c, _d, _e;
         for (const taxonomy of Object.values(taxonomies)) {
-            let targetTaxonomy = await this.getTaxonomies(taxonomy);
-            if (!targetTaxonomy) {
-                cli_utilities_1.log.info(`Taxonomies with uid '${taxonomy.uid}' not found in the stack!`);
-                continue;
-            }
-            targetTaxonomy = this.sanitizeTaxonomyAttribs(targetTaxonomy);
-            this.taxonomiesMapper[taxonomy.uid] = targetTaxonomy;
-            const terms = await this.getAllTermsOfTaxonomy(targetTaxonomy);
-            if (Array.isArray(terms) && terms.length > 0) {
-                cli_utilities_1.log.info(`Terms found for taxonomy '${taxonomy.uid}', processing...`);
-                const sanitizedTerms = this.sanitizeTermsAttribs(terms);
-                this.termsMapper[taxonomy.uid] = sanitizedTerms;
+            try {
+                let targetTaxonomy = await this.getTaxonomies(taxonomy);
+                if (!targetTaxonomy) {
+                    (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(false, `taxonomy: ${taxonomy.uid}`, 'Not found in stack', utils_2.PROCESS_NAMES.TAXONOMIES_FETCH);
+                    (0, utils_1.log)(this.config, `Taxonomies with uid '${taxonomy.uid}' not found in the stack!`, 'info');
+                    continue;
+                }
+                targetTaxonomy = this.sanitizeTaxonomyAttribs(targetTaxonomy);
+                this.taxonomiesMapper[taxonomy.uid] = targetTaxonomy;
+                (_b = this.progressManager) === null || _b === void 0 ? void 0 : _b.tick(true, `taxonomy: ${taxonomy.uid}`, null, utils_2.PROCESS_NAMES.TAXONOMIES_FETCH);
+                const terms = await this.getAllTermsOfTaxonomy(targetTaxonomy);
+                if (Array.isArray(terms) && terms.length > 0) {
+                    (0, utils_1.log)(this.config, `Terms found for taxonomy '${taxonomy.uid}', processing...`, 'info');
+                    const sanitizedTerms = this.sanitizeTermsAttribs(terms);
+                    this.termsMapper[taxonomy.uid] = sanitizedTerms;
+                    (_c = this.progressManager) === null || _c === void 0 ? void 0 : _c.tick(true, `terms: ${taxonomy.uid} (${terms.length})`, null, utils_2.PROCESS_NAMES.TAXONOMIES_TERMS_FETCH);
+                }
+                else {
+                    (0, utils_1.log)(this.config, `No terms found for taxonomy '${taxonomy.uid}', skipping...`, 'info');
+                    (_d = this.progressManager) === null || _d === void 0 ? void 0 : _d.tick(true, `terms: ${taxonomy.uid} (none)`, null, utils_2.PROCESS_NAMES.TAXONOMIES_TERMS_FETCH);
+                }
             }
-            else {
-                cli_utilities_1.log.info(`No terms found for taxonomy '${taxonomy.uid}', skipping...`);
+            catch (error) {
+                (_e = this.progressManager) === null || _e === void 0 ? void 0 : _e.tick(false, `taxonomy: ${taxonomy.uid}`, (error === null || error === void 0 ? void 0 : error.message) || 'Failed to fetch', utils_2.PROCESS_NAMES.TAXONOMIES_FETCH);
             }
         }
     }
@@ -94,29 +125,39 @@ class TaxonomiesImportSetup {
      * Setup taxonomies using locale-based format (taxonomies organized by locale)
      * For locale-based structure, we query the target stack for each taxonomy+locale combination
      */
-    async setupTaxonomiesByLocale(taxonomies) {
+    async setupTaxonomiesByLocale(taxonomies, progress) {
+        var _a, _b, _c, _d, _e;
         const locales = this.loadAvailableLocales();
         for (const localeCode of Object.keys(locales)) {
-            cli_utilities_1.log.info(`Processing taxonomies for locale: ${localeCode}`);
+            (0, utils_1.log)(this.config, `Processing taxonomies for locale: ${localeCode}`, 'info');
             for (const taxonomy of Object.values(taxonomies)) {
-                // Query target stack for this taxonomy in this locale
-                let targetTaxonomy = await this.getTaxonomies(taxonomy, localeCode);
-                if (!targetTaxonomy) {
-                    cli_utilities_1.log.info(`Taxonomy '${taxonomy.uid}' not found in target stack for locale: ${localeCode}`);
-                    continue;
+                try {
+                    // Query target stack for this taxonomy in this locale
+                    let targetTaxonomy = await this.getTaxonomies(taxonomy, localeCode);
+                    if (!targetTaxonomy) {
+                        (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(false, `taxonomy: ${taxonomy.uid} (${localeCode})`, 'Not found in stack', utils_2.PROCESS_NAMES.TAXONOMIES_FETCH);
+                        (0, utils_1.log)(this.config, `Taxonomy '${taxonomy.uid}' not found in target stack for locale: ${localeCode}`, 'info');
+                        continue;
+                    }
+                    targetTaxonomy = this.sanitizeTaxonomyAttribs(targetTaxonomy);
+                    // Store with composite key: taxonomyUID_locale
+                    // const mapperKey = `${taxonomy.uid}_${localeCode}`; // TODO: Unsure about this required or not
+                    this.taxonomiesMapper[taxonomy.uid] = targetTaxonomy;
+                    (_b = this.progressManager) === null || _b === void 0 ? void 0 : _b.tick(true, `taxonomy: ${taxonomy.uid} (${localeCode})`, null, utils_2.PROCESS_NAMES.TAXONOMIES_FETCH);
+                    const terms = await this.getAllTermsOfTaxonomy(targetTaxonomy, localeCode);
+                    if (Array.isArray(terms) && terms.length > 0) {
+                        (0, utils_1.log)(this.config, `Terms found for taxonomy '${taxonomy.uid} for locale: ${localeCode}', processing...`, 'info');
+                        const sanitizedTerms = this.sanitizeTermsAttribs(terms);
+                        this.termsMapper[taxonomy.uid] = sanitizedTerms;
+                        (_c = this.progressManager) === null || _c === void 0 ? void 0 : _c.tick(true, `terms: ${taxonomy.uid} (${localeCode}, ${terms.length})`, null, utils_2.PROCESS_NAMES.TAXONOMIES_TERMS_FETCH);
+                    }
+                    else {
+                        (0, utils_1.log)(this.config, `No terms found for taxonomy '${taxonomy.uid} for locale: ${localeCode}', skipping...`, 'info');
+                        (_d = this.progressManager) === null || _d === void 0 ? void 0 : _d.tick(true, `terms: ${taxonomy.uid} (${localeCode}, none)`, null, utils_2.PROCESS_NAMES.TAXONOMIES_TERMS_FETCH);
+                    }
                 }
-                targetTaxonomy = this.sanitizeTaxonomyAttribs(targetTaxonomy);
-                // Store with composite key: taxonomyUID_locale
-                // const mapperKey = `${taxonomy.uid}_${localeCode}`; // TODO: Unsure about this required or not
-                this.taxonomiesMapper[taxonomy.uid] = targetTaxonomy;
-                const terms = await this.getAllTermsOfTaxonomy(targetTaxonomy, localeCode);
-                if (Array.isArray(terms) && terms.length > 0) {
-                    cli_utilities_1.log.info(`Terms found for taxonomy '${taxonomy.uid} for locale: ${localeCode}', processing...`);
-                    const sanitizedTerms = this.sanitizeTermsAttribs(terms);
-                    this.termsMapper[taxonomy.uid] = sanitizedTerms;
-                }
-                else {
-                    cli_utilities_1.log.info(`No terms found for taxonomy '${taxonomy.uid} for locale: ${localeCode}', skipping...`);
+                catch (error) {
+                    (_e = this.progressManager) === null || _e === void 0 ? void 0 : _e.tick(false, `taxonomy: ${taxonomy.uid} (${localeCode})`, (error === null || error === void 0 ? void 0 : error.message) || 'Failed to fetch', utils_2.PROCESS_NAMES.TAXONOMIES_FETCH);
                 }
             }
         }
@@ -130,10 +171,10 @@ class TaxonomiesImportSetup {
         const masterLocaleFolder = (0, path_1.join)(this.taxonomiesFolderPath, masterLocaleCode);
         // Check if master locale folder exists (indicates new locale-based structure)
         if (!utils_1.fileHelper.fileExistsSync(masterLocaleFolder)) {
-            cli_utilities_1.log.info('No locale-based folder structure detected');
+            (0, utils_1.log)(this.config, 'No locale-based folder structure detected', 'info');
             return false;
         }
-        cli_utilities_1.log.info('Locale-based folder structure detected');
+        (0, utils_1.log)(this.config, 'Locale-based folder structure detected', 'info');
         return true;
     }
     /**
@@ -150,17 +191,17 @@ class TaxonomiesImportSetup {
                 // The file contains an object with UID as key, extract the code
                 const firstLocale = Object.values(masterLocaleData)[0];
                 if (firstLocale === null || firstLocale === void 0 ? void 0 : firstLocale.code) {
-                    cli_utilities_1.log.info(`Master locale loaded from file: ${firstLocale.code}`);
+                    (0, utils_1.log)(this.config, `Master locale loaded from file: ${firstLocale.code}`, 'info');
                     return firstLocale.code;
                 }
             }
             catch (error) {
-                cli_utilities_1.log.warn('Error reading master-locale.json, using fallback', { error });
+                (0, utils_1.log)(this.config, 'Error reading master-locale.json, using fallback', 'warn');
             }
         }
         // Fallback to config or default
         const fallbackCode = ((_a = this.config.master_locale) === null || _a === void 0 ? void 0 : _a.code) || 'en-us';
-        cli_utilities_1.log.info(`Using fallback master locale: ${fallbackCode}`);
+        (0, utils_1.log)(this.config, `Using fallback master locale: ${fallbackCode}`, 'info');
         return fallbackCode;
     }
     /**
@@ -174,7 +215,7 @@ class TaxonomiesImportSetup {
         locales[masterLocaleCode] = masterLocaleCode;
         // Then load additional locales from locales.json if it exists
         if (!utils_1.fileHelper.fileExistsSync(this.localesFilePath)) {
-            cli_utilities_1.log.info('No locales file found, using only master locale');
+            (0, utils_1.log)(this.config, 'No locales file found, using only master locale', 'info');
             return locales;
         }
         try {
@@ -184,11 +225,11 @@ class TaxonomiesImportSetup {
                     locales[locale.code] = locale.code;
                 }
             }
-            cli_utilities_1.log.info(`Loaded ${Object.keys(locales).length} locales (1 master + ${Object.keys(locales).length - 1} additional)`);
+            (0, utils_1.log)(this.config, `Loaded ${Object.keys(locales).length} locales (1 master + ${Object.keys(locales).length - 1} additional)`, 'info');
             return locales;
         }
         catch (error) {
-            cli_utilities_1.log.error('Error loading locales file, using only master locale', { error });
+            (0, utils_1.log)(this.config, 'Error loading locales file, using only master locale', 'error');
             return locales;
         }
     }
@@ -270,10 +311,11 @@ class TaxonomiesImportSetup {
         const taxInfo = taxonomyUid ? ` (${taxonomyUid}${context})` : '';
         if ((err === null || err === void 0 ? void 0 : err.errorMessage) || (err === null || err === void 0 ? void 0 : err.message)) {
             const errorMsg = (err === null || err === void 0 ? void 0 : err.errorMessage) || ((_a = err === null || err === void 0 ? void 0 : err.errors) === null || _a === void 0 ? void 0 : _a.taxonomy) || ((_b = err === null || err === void 0 ? void 0 : err.errors) === null || _b === void 0 ? void 0 : _b.term) || (err === null || err === void 0 ? void 0 : err.message);
-            cli_utilities_1.log.error(`${errorMsg}${taxInfo}`, { error: err, taxonomyUid, locale });
+            (0, utils_1.log)(this.config, `${errorMsg}${taxInfo}`, 'error');
         }
         else {
-            cli_utilities_1.log.error(`Error fetching taxonomy data${taxInfo}!`, { error: err, taxonomyUid, locale });
+            (0, utils_1.log)(this.config, `Error fetching taxonomy data${taxInfo}!`, 'error');
+            (0, utils_1.log)(this.config, err, 'error');
         }
     }
 }

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

@@ -38,7 +38,6 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
     authtoken?: string;
     destinationStackName?: string;
     org_uid?: string;
-    contentVersion: number;
     stackName?: string;
     branchName: string;
     selectedModules: Modules[];
@@ -46,6 +45,7 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
     backupDir: string;
     createBackupDir?: string;
     region: any;
+    authenticationMethod?: string;
 }
 type branch = {
     uid: string;

package/lib/types/index.d.ts

@@ -115,5 +115,12 @@ export type TaxonomyQueryParams = {
     locale?: string;
 };
 export interface Context {
+    command: string;
     module: string;
+    userId: string | undefined;
+    email: string | undefined;
+    sessionId: string | undefined;
+    apiKey: string;
+    orgId: string;
+    authenticationMethod?: string;
 }

package/lib/utils/constants.d.ts

@@ -0,0 +1,39 @@
+export declare const PROCESS_NAMES: {
+    readonly ENTRIES_MAPPER_GENERATION: "Mapper Generation";
+    readonly CONTENT_TYPES_MAPPER_GENERATION: "Mapper Generation";
+    readonly CONTENT_TYPES_DEPENDENCY_SETUP: "Dependency Setup";
+    readonly GLOBAL_FIELDS_MAPPER_GENERATION: "Mapper Generation";
+    readonly GLOBAL_FIELDS_DEPENDENCY_SETUP: "Dependency Setup";
+    readonly EXTENSIONS_MAPPER_GENERATION: "Mapper Generation";
+    readonly ASSETS_MAPPER_GENERATION: "Mapper Generation";
+    readonly ASSETS_FETCH_AND_MAP: "Fetch and Map";
+    readonly CUSTOM_ROLES_MAPPER_GENERATION: "Mapper Generation";
+    readonly MARKETPLACE_APPS_MAPPER_GENERATION: "Mapper Generation";
+    readonly MARKETPLACE_APPS_FETCH: "Fetch Apps";
+    readonly TAXONOMIES_MAPPER_GENERATION: "Mapper Generation";
+    readonly TAXONOMIES_FETCH: "Fetch Taxonomies";
+    readonly TAXONOMIES_TERMS_FETCH: "Fetch Terms";
+};
+export declare const MODULE_CONTEXTS: {
+    readonly ENTRIES: "entries";
+    readonly CONTENT_TYPES: "content-types";
+    readonly GLOBAL_FIELDS: "global-fields";
+    readonly EXTENSIONS: "extensions";
+    readonly ASSETS: "assets";
+    readonly CUSTOM_ROLES: "custom-roles";
+    readonly MARKETPLACE_APPS: "marketplace-apps";
+    readonly TAXONOMIES: "taxonomies";
+};
+export declare const MODULE_NAMES: {
+    readonly entries: "Entries";
+    readonly "content-types": "Content Types";
+    readonly "global-fields": "Global Fields";
+    readonly extensions: "Extensions";
+    readonly assets: "Assets";
+    readonly "custom-roles": "Custom Roles";
+    readonly "marketplace-apps": "Marketplace Apps";
+    readonly taxonomies: "Taxonomies";
+};
+export declare const PROCESS_STATUS: Record<keyof typeof PROCESS_NAMES, Record<string, string>>;
+export type ImportSetupProcessName = (typeof PROCESS_NAMES)[keyof typeof PROCESS_NAMES];
+export type ImportSetupModuleContext = (typeof MODULE_CONTEXTS)[keyof typeof MODULE_CONTEXTS];

package/lib/utils/constants.js

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PROCESS_STATUS = exports.MODULE_NAMES = exports.MODULE_CONTEXTS = exports.PROCESS_NAMES = void 0;
+exports.PROCESS_NAMES = {
+    // Entries module
+    ENTRIES_MAPPER_GENERATION: 'Mapper Generation',
+    // Content Types module
+    CONTENT_TYPES_MAPPER_GENERATION: 'Mapper Generation',
+    CONTENT_TYPES_DEPENDENCY_SETUP: 'Dependency Setup',
+    // Global Fields module
+    GLOBAL_FIELDS_MAPPER_GENERATION: 'Mapper Generation',
+    GLOBAL_FIELDS_DEPENDENCY_SETUP: 'Dependency Setup',
+    // Extensions module
+    EXTENSIONS_MAPPER_GENERATION: 'Mapper Generation',
+    // Assets module
+    ASSETS_MAPPER_GENERATION: 'Mapper Generation',
+    ASSETS_FETCH_AND_MAP: 'Fetch and Map',
+    // Custom Roles module
+    CUSTOM_ROLES_MAPPER_GENERATION: 'Mapper Generation',
+    // Marketplace Apps module
+    MARKETPLACE_APPS_MAPPER_GENERATION: 'Mapper Generation',
+    MARKETPLACE_APPS_FETCH: 'Fetch Apps',
+    // Taxonomies module
+    TAXONOMIES_MAPPER_GENERATION: 'Mapper Generation',
+    TAXONOMIES_FETCH: 'Fetch Taxonomies',
+    TAXONOMIES_TERMS_FETCH: 'Fetch Terms',
+};
+exports.MODULE_CONTEXTS = {
+    ENTRIES: 'entries',
+    CONTENT_TYPES: 'content-types',
+    GLOBAL_FIELDS: 'global-fields',
+    EXTENSIONS: 'extensions',
+    ASSETS: 'assets',
+    CUSTOM_ROLES: 'custom-roles',
+    MARKETPLACE_APPS: 'marketplace-apps',
+    TAXONOMIES: 'taxonomies',
+};
+// Display names for modules to avoid scattering user-facing strings
+exports.MODULE_NAMES = {
+    [exports.MODULE_CONTEXTS.ENTRIES]: 'Entries',
+    [exports.MODULE_CONTEXTS.CONTENT_TYPES]: 'Content Types',
+    [exports.MODULE_CONTEXTS.GLOBAL_FIELDS]: 'Global Fields',
+    [exports.MODULE_CONTEXTS.EXTENSIONS]: 'Extensions',
+    [exports.MODULE_CONTEXTS.ASSETS]: 'Assets',
+    [exports.MODULE_CONTEXTS.CUSTOM_ROLES]: 'Custom Roles',
+    [exports.MODULE_CONTEXTS.MARKETPLACE_APPS]: 'Marketplace Apps',
+    [exports.MODULE_CONTEXTS.TAXONOMIES]: 'Taxonomies',
+};
+exports.PROCESS_STATUS = {
+    // Entries
+    ENTRIES_MAPPER_GENERATION: {
+        GENERATING: 'Generating mapper files...',
+        FAILED: 'Failed to generate mapper files.',
+    },
+    // Content Types
+    CONTENT_TYPES_MAPPER_GENERATION: {
+        GENERATING: 'Generating mapper files...',
+        FAILED: 'Failed to generate mapper files.',
+    },
+    CONTENT_TYPES_DEPENDENCY_SETUP: {
+        SETTING_UP: 'Setting up dependencies...',
+        FAILED: 'Failed to setup dependencies.',
+    },
+    // Global Fields
+    GLOBAL_FIELDS_MAPPER_GENERATION: {
+        GENERATING: 'Generating mapper files...',
+        FAILED: 'Failed to generate mapper files.',
+    },
+    GLOBAL_FIELDS_DEPENDENCY_SETUP: {
+        SETTING_UP: 'Setting up dependencies...',
+        FAILED: 'Failed to setup dependencies.',
+    },
+    // Extensions
+    EXTENSIONS_MAPPER_GENERATION: {
+        GENERATING: 'Generating mapper files...',
+        FAILED: 'Failed to generate mapper files.',
+    },
+    // Assets
+    ASSETS_MAPPER_GENERATION: {
+        GENERATING: 'Generating mapper files...',
+        FAILED: 'Failed to generate mapper files.',
+    },
+    ASSETS_FETCH_AND_MAP: {
+        FETCHING: 'Fetching and mapping assets...',
+        FAILED: 'Failed to fetch and map assets.',
+    },
+    // Custom Roles
+    CUSTOM_ROLES_MAPPER_GENERATION: {
+        GENERATING: 'Generating mapper files...',
+        FAILED: 'Failed to generate mapper files.',
+    },
+    // Marketplace Apps
+    MARKETPLACE_APPS_MAPPER_GENERATION: {
+        GENERATING: 'Generating mapper files...',
+        FAILED: 'Failed to generate mapper files.',
+    },
+    MARKETPLACE_APPS_FETCH: {
+        FETCHING: 'Fetching marketplace apps...',
+        FAILED: 'Failed to fetch marketplace apps.',
+    },
+    // Taxonomies
+    TAXONOMIES_MAPPER_GENERATION: {
+        GENERATING: 'Generating mapper files...',
+        FAILED: 'Failed to generate mapper files.',
+    },
+    TAXONOMIES_FETCH: {
+        FETCHING: 'Fetching taxonomies...',
+        FAILED: 'Failed to fetch taxonomies.',
+    },
+    TAXONOMIES_TERMS_FETCH: {
+        FETCHING: 'Fetching terms...',
+        FAILED: 'Failed to fetch terms.',
+    },
+};

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

@@ -5,7 +5,6 @@ const merge_1 = tslib_1.__importDefault(require("merge"));
 const path = tslib_1.__importStar(require("path"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const config_1 = tslib_1.__importDefault(require("../config"));
-const file_helper_1 = require("./file-helper");
 const interactive_1 = require("./interactive");
 const login_handler_1 = tslib_1.__importDefault(require("./login-handler"));
 const setupConfig = async (importCmdFlags) => {
@@ -32,13 +31,6 @@ const setupConfig = async (importCmdFlags) => {
     config.contentDir = path.resolve(config.contentDir);
     //Note to support the old key
     config.data = config.contentDir;
-    if ((0, file_helper_1.fileExistsSync)(path.join(config.contentDir, 'export-info.json'))) {
-        config.contentVersion =
-            ((await (0, file_helper_1.readFile)(path.join(config.contentDir, 'export-info.json'))) || {}).contentVersion || 2;
-    }
-    else {
-        config.contentVersion = 1;
-    }
     const managementTokenAlias = importCmdFlags['management-token-alias'] || importCmdFlags['alias'];
     if (managementTokenAlias) {
         const { token, apiKey } = (_a = cli_utilities_1.configHandler.get(`tokens.${managementTokenAlias}`)) !== null && _a !== void 0 ? _a : {};

package/lib/utils/index.d.ts

@@ -7,3 +7,4 @@ export { log, unlinkFileLogger } from './logger';
 export * from './log';
 export * from './common-helper';
 export { setupBranchConfig } from './setup-branch';
+export { MODULE_CONTEXTS, MODULE_NAMES, PROCESS_NAMES, PROCESS_STATUS } from './constants';