@contentstack/cli-cm-import 1.28.0 → 2.0.0-beta

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

@@ -1,29 +1,24 @@
 "use strict";
-/* eslint-disable no-prototype-builtins */
-/*!
- * Contentstack Import
- * Copyright (c) 2024 Contentstack LLC
- * MIT Licensed
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 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 utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const content_type_helper_1 = require("../../utils/content-type-helper");
+const utils_1 = require("../../utils");
 class ContentTypesImport extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
         this.isExtensionsUpdate = false;
-        this.importConfig.context.module = 'content-types';
+        this.importConfig.context.module = utils_1.MODULE_CONTEXTS.CONTENT_TYPES;
+        this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.CONTENT_TYPES];
         this.cTsConfig = importConfig.modules['content-types'];
         this.gFsConfig = importConfig.modules['global-fields'];
         this.reqConcurrency = this.cTsConfig.writeConcurrency || this.importConfig.writeConcurrency;
         this.cTsFolderPath = path.join((0, cli_utilities_1.sanitizePath)(this.importConfig.data), (0, cli_utilities_1.sanitizePath)(this.cTsConfig.dirName));
         this.cTsMapperPath = path.join((0, cli_utilities_1.sanitizePath)(this.importConfig.data), 'mapper', 'content_types');
-        this.cTsSuccessPath = path.join((0, cli_utilities_1.sanitizePath)(this.cTsMapperPath), 'success.json');
+        this.cTsSuccessPath = path.join((0, cli_utilities_1.sanitizePath)(this.importConfig.data), 'mapper', 'content_types', 'success.json');
         this.gFsFolderPath = path.resolve((0, cli_utilities_1.sanitizePath)(this.importConfig.data), (0, cli_utilities_1.sanitizePath)(this.gFsConfig.dirName));
         this.gFsMapperFolderPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'global_fields', 'success.json');
         this.gFsPendingPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'global_fields', 'pending_global_fields.js');
@@ -41,69 +36,55 @@ class ContentTypesImport extends base_class_1.default {
         this.gFs = [];
         this.createdGFs = [];
         this.pendingGFs = [];
-        this.taxonomiesPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper/taxonomies', 'success.json');
+        this.pendingExts = [];
+        this.taxonomiesPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'taxonomies', 'success.json');
         this.extPendingPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'extensions', 'pending_extensions.js');
     }
     async start() {
-        var _a, _b;
-        /**
-         * read content type, check if it is necessary to read the entire dir
-         * Seed content types
-         * Update content types, lookup extension.
-         * Update pending global fields
-         * write field rules
-         */
-        this.cTs = utils_1.fsUtil.readFile(path.join(this.cTsFolderPath, 'schema.json'));
-        if (!this.cTs || (0, lodash_1.isEmpty)(this.cTs)) {
-            cli_utilities_1.log.info('No content type found to import', this.importConfig.context);
-            return;
-        }
-        cli_utilities_1.log.debug(`Found ${this.cTs.length} content types to import`, this.importConfig.context);
-        await utils_1.fsUtil.makeDirectory(this.cTsMapperPath);
-        cli_utilities_1.log.debug('Created content types mapper directory', this.importConfig.context);
-        this.installedExtensions = (utils_1.fsUtil.readFile(this.marketplaceAppMapperPath) || { extension_uid: {} }).extension_uid;
-        cli_utilities_1.log.debug(`Loaded ${(_a = Object.keys(this.installedExtensions)) === null || _a === void 0 ? void 0 : _a.length} installed extensions`, this.importConfig.context);
-        this.taxonomies = utils_1.fsUtil.readFile(this.taxonomiesPath);
-        const taxonomyCount = Object.keys(this.taxonomies || {}).length;
-        cli_utilities_1.log.debug(`Loaded ${taxonomyCount} taxonomy definitions`, this.importConfig.context);
-        cli_utilities_1.log.info('Starting content types seeding process', this.importConfig.context);
-        await this.seedCTs();
-        if ((_b = this.createdCTs) === null || _b === void 0 ? void 0 : _b.length) {
-            utils_1.fsUtil.writeFile(this.cTsSuccessPath, this.createdCTs);
-            cli_utilities_1.log.debug(`Written ${this.createdCTs.length} successful content types to file`, this.importConfig.context);
-        }
-        cli_utilities_1.log.success('Created content types', this.importConfig.context);
-        cli_utilities_1.log.info('Starting content types update process', this.importConfig.context);
-        await this.updateCTs();
-        cli_utilities_1.log.success('Updated content types with references', this.importConfig.context);
-        if (this.fieldRules.length > 0) {
-            utils_1.fsUtil.writeFile(path.join(this.cTsFolderPath, 'field_rules_uid.json'), this.fieldRules);
-            cli_utilities_1.log.debug(`Written ${this.fieldRules.length} field rules to file`, this.importConfig.context);
-        }
-        cli_utilities_1.log.info('Updating the extensions...', this.importConfig.context);
-        await this.updatePendingExtensions();
-        if (this.isExtensionsUpdate) {
-            cli_utilities_1.log.success('Successfully updated the extensions.', this.importConfig.context);
-        }
-        cli_utilities_1.log.info('Starting pending global fields update', this.importConfig.context);
-        this.pendingGFs = utils_1.fsUtil.readFile(this.gFsPendingPath);
-        if (!this.pendingGFs || (0, lodash_1.isEmpty)(this.pendingGFs)) {
-            cli_utilities_1.log.info('No pending global fields found to update', this.importConfig.context);
-            return;
+        var _a;
+        try {
+            cli_utilities_1.log.debug('Starting content types import process...', this.importConfig.context);
+            await this.analyzeImportData();
+            if (!((_a = this.cTs) === null || _a === void 0 ? void 0 : _a.length)) {
+                cli_utilities_1.log.info('No content type found to import', this.importConfig.context);
+                return;
+            }
+            await utils_1.fsUtil.makeDirectory(this.cTsMapperPath);
+            cli_utilities_1.log.debug('Created content types mapper directory', this.importConfig.context);
+            const progress = this.initializeProgress();
+            if (this.cTs.length > 0) {
+                await this.handleContentTypesCreation(progress);
+                await this.handleContentTypesUpdate(progress);
+            }
+            if (this.fieldRules.length > 0) {
+                utils_1.fsUtil.writeFile(path.join(this.cTsFolderPath, 'field_rules_uid.json'), this.fieldRules);
+                cli_utilities_1.log.debug(`Written ${this.fieldRules.length} field rules to file`, this.importConfig.context);
+            }
+            if (this.pendingExts.length > 0) {
+                await this.handlePendingExtensions(progress);
+            }
+            if (this.pendingGFs.length > 0) {
+                await this.handlePendingGlobalFields(progress);
+            }
+            this.completeProgress(true);
+            cli_utilities_1.log.success('Content types have been imported successfully!', this.importConfig.context);
         }
-        await this.updatePendingGFs().catch((error) => {
+        catch (error) {
+            this.completeProgress(false, (error === null || error === void 0 ? void 0 : error.message) || 'Content types import failed');
             (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.importConfig.context));
-        });
-        cli_utilities_1.log.success('Updated pending global fields with content type with references', this.importConfig.context);
-        cli_utilities_1.log.success('Content types have been imported successfully!', this.importConfig.context);
+        }
     }
     async seedCTs() {
         const onSuccess = ({ response: globalField, apiData: { content_type: { uid = null } = {} } = {} }) => {
+            var _a;
             this.createdCTs.push(uid);
-            cli_utilities_1.log.info(`${uid} content type seeded`, this.importConfig.context);
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `content type: ${uid}`, null, utils_1.PROCESS_NAMES.CONTENT_TYPES_CREATE);
+            cli_utilities_1.log.success(`Content type '${uid}' created successfully`, this.importConfig.context);
             cli_utilities_1.log.debug(`Successfully seeded content type: ${uid}`, this.importConfig.context);
         };
         const onReject = ({ error, apiData: { content_type: { uid = null } = {} } = {} }) => {
+            var _a;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(false, `content type: ${uid}`, (error === null || error === void 0 ? void 0 : error.message) || `Failed to create content type '${uid}'`, utils_1.PROCESS_NAMES.CONTENT_TYPES_CREATE);
             if (error.errorCode === 115 && (error.errors.uid || error.errors.title)) {
                 cli_utilities_1.log.info(`${uid} content type already exist`, this.importConfig.context);
                 cli_utilities_1.log.debug(`Skipping existing content type: ${uid}`, this.importConfig.context);
@@ -142,12 +123,15 @@ class ContentTypesImport extends base_class_1.default {
     }
     async updateCTs() {
         const onSuccess = ({ response: contentType, apiData: { uid } }) => {
+            var _a;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `content type: ${uid}`, null, utils_1.PROCESS_NAMES.CONTENT_TYPES_UPDATE);
             cli_utilities_1.log.success(`'${uid}' updated with references`, this.importConfig.context);
             cli_utilities_1.log.debug(`Content type update completed for: ${uid}`, this.importConfig.context);
         };
         const onReject = ({ error, apiData: { uid } }) => {
+            var _a;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(false, `content type: ${uid}`, (error === null || error === void 0 ? void 0 : error.message) || `Content type '${uid}' update failed`, utils_1.PROCESS_NAMES.CONTENT_TYPES_UPDATE);
             (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { uid }), `Content type '${uid}' update failed`);
-            throw new Error(`Content type '${uid}' update error`);
         };
         cli_utilities_1.log.debug(`Starting to update ${this.cTs.length} content types with references`, this.importConfig.context);
         return await this.makeConcurrentCall({
@@ -195,16 +179,21 @@ class ContentTypesImport extends base_class_1.default {
     }
     async updatePendingGFs() {
         var _a, _b;
-        this.pendingGFs = utils_1.fsUtil.readFile(this.gFsPendingPath);
-        cli_utilities_1.log.info(`Found ${this.pendingGFs.length} pending global fields to update`, this.importConfig.context);
-        this.gFs = utils_1.fsUtil.readFile(path.resolve(this.gFsFolderPath, this.gFsConfig.fileName));
+        if (!this.pendingGFs || this.pendingGFs.length === 0) {
+            cli_utilities_1.log.info('No pending global fields found to update', this.importConfig.context);
+            return;
+        }
         cli_utilities_1.log.debug(`Found ${((_a = this.pendingGFs) === null || _a === void 0 ? void 0 : _a.length) || 0} pending global fields to update`, this.importConfig.context);
         cli_utilities_1.log.debug(`Loaded ${((_b = this.gFs) === null || _b === void 0 ? void 0 : _b.length) || 0} global fields from file`, this.importConfig.context);
         const onSuccess = ({ response: globalField, apiData: { uid } = undefined }) => {
-            cli_utilities_1.log.info(`Updated the global field ${uid} with content type references`, this.importConfig.context);
+            var _a;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `global field: ${uid}`, null, utils_1.PROCESS_NAMES.CONTENT_TYPES_GF_UPDATE);
+            cli_utilities_1.log.success(`Updated the global field ${uid} with content type references`, this.importConfig.context);
             cli_utilities_1.log.debug(`Global field update completed for: ${uid}`, this.importConfig.context);
         };
         const onReject = ({ error, apiData: { uid } = undefined }) => {
+            var _a;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(false, `global field: ${uid}`, (error === null || error === void 0 ? void 0 : error.message) || `Failed to update the global field '${uid}'`, utils_1.PROCESS_NAMES.CONTENT_TYPES_GF_UPDATE);
             (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { uid }), `Failed to update the global field '${uid}'`);
         };
         const apiContent = (0, lodash_1.map)(this.pendingGFs, (uid) => {
@@ -258,13 +247,16 @@ class ContentTypesImport extends base_class_1.default {
         cli_utilities_1.log.debug(`Found ${apiContent.length} extensions to update`, this.importConfig.context);
         this.isExtensionsUpdate = true;
         const onSuccess = ({ response, apiData: { uid, title } = { uid: null, title: '' } }) => {
+            var _a;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `extension: ${response.title || title || uid}`, null, utils_1.PROCESS_NAMES.CONTENT_TYPES_EXT_UPDATE);
             cli_utilities_1.log.success(`Successfully updated the '${response.title}' extension.`, this.importConfig.context);
             cli_utilities_1.log.debug(`Extension update completed for: ${uid}`, this.importConfig.context);
         };
         const onReject = ({ error, apiData }) => {
-            var _a;
-            const { uid } = apiData;
-            if ((_a = error === null || error === void 0 ? void 0 : error.errors) === null || _a === void 0 ? void 0 : _a.title) {
+            var _a, _b;
+            const { uid, title } = apiData;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(false, `extension: ${title || uid}`, (error === null || error === void 0 ? void 0 : error.message) || `Failed to update '${uid}' extension`, utils_1.PROCESS_NAMES.CONTENT_TYPES_EXT_UPDATE);
+            if ((_b = error === null || error === void 0 ? void 0 : error.errors) === null || _b === void 0 ? void 0 : _b.title) {
                 if (!this.importConfig.skipExisting) {
                     cli_utilities_1.log.info(`Extension '${uid}' already exists.`, this.importConfig.context);
                 }
@@ -287,5 +279,77 @@ class ContentTypesImport extends base_class_1.default {
             concurrencyLimit: this.importConfig.concurrency || this.importConfig.fetchConcurrency || 1,
         }, undefined, false);
     }
+    async analyzeImportData() {
+        var _a, _b, _c, _d, _e;
+        const [cts, gfs, pendingGfs, pendingExt] = await this.withLoadingSpinner('CONTENT TYPES: Analyzing import data...', async () => {
+            const cts = utils_1.fsUtil.readFile(path.join(this.cTsFolderPath, 'schema.json'));
+            const gfs = utils_1.fsUtil.readFile(path.resolve(this.gFsFolderPath, this.gFsConfig.fileName));
+            const pendingGfs = utils_1.fsUtil.readFile(this.gFsPendingPath);
+            const pendingExt = utils_1.fsUtil.readFile(this.extPendingPath);
+            return [cts, gfs, pendingGfs, pendingExt];
+        });
+        this.cTs = (Array.isArray(cts) ? cts : []);
+        this.gFs = (Array.isArray(gfs) ? gfs : []);
+        this.pendingGFs = (Array.isArray(pendingGfs) ? pendingGfs : []);
+        this.pendingExts = (Array.isArray(pendingExt) ? pendingExt : []);
+        const marketplaceAppData = utils_1.fsUtil.readFile(this.marketplaceAppMapperPath);
+        this.installedExtensions = (marketplaceAppData === null || marketplaceAppData === void 0 ? void 0 : marketplaceAppData.extension_uid) || { extension_uid: {} };
+        this.taxonomies = utils_1.fsUtil.readFile(this.taxonomiesPath);
+        cli_utilities_1.log.debug(`Analysis complete: ${(_a = this.cTs) === null || _a === void 0 ? void 0 : _a.length} content types, ${(_b = this.gFs) === null || _b === void 0 ? void 0 : _b.length} global fields, ${(_c = this.pendingGFs) === null || _c === void 0 ? void 0 : _c.length} pending GFs, ${(_d = Object.keys(this.installedExtensions || {})) === null || _d === void 0 ? void 0 : _d.length} extensions, ${(_e = Object.keys(this.taxonomies || {})) === null || _e === void 0 ? void 0 : _e.length} taxonomies`, this.importConfig.context);
+    }
+    initializeProgress() {
+        const progress = this.createNestedProgress(this.currentModuleName);
+        if (this.cTs.length) {
+            progress.addProcess(utils_1.PROCESS_NAMES.CONTENT_TYPES_CREATE, this.cTs.length);
+            progress.addProcess(utils_1.PROCESS_NAMES.CONTENT_TYPES_UPDATE, this.cTs.length);
+        }
+        if (this.pendingGFs.length) {
+            progress.addProcess(utils_1.PROCESS_NAMES.CONTENT_TYPES_GF_UPDATE, this.pendingGFs.length);
+        }
+        if (this.pendingExts.length) {
+            progress.addProcess(utils_1.PROCESS_NAMES.CONTENT_TYPES_EXT_UPDATE, this.pendingExts.length);
+        }
+        return progress;
+    }
+    async handlePendingGlobalFields(progress) {
+        progress
+            .startProcess(utils_1.PROCESS_NAMES.CONTENT_TYPES_GF_UPDATE)
+            .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.CONTENT_TYPES_GF_UPDATE].UPDATING, utils_1.PROCESS_NAMES.CONTENT_TYPES_GF_UPDATE);
+        cli_utilities_1.log.info('Starting pending global fields update process', this.importConfig.context);
+        await this.updatePendingGFs();
+        progress.completeProcess(utils_1.PROCESS_NAMES.CONTENT_TYPES_GF_UPDATE, true);
+    }
+    async handleContentTypesCreation(progress) {
+        var _a;
+        progress
+            .startProcess(utils_1.PROCESS_NAMES.CONTENT_TYPES_CREATE)
+            .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.CONTENT_TYPES_CREATE].CREATING, utils_1.PROCESS_NAMES.CONTENT_TYPES_CREATE);
+        cli_utilities_1.log.info('Starting content types seeding process', this.importConfig.context);
+        await this.seedCTs();
+        if ((_a = this.createdCTs) === null || _a === void 0 ? void 0 : _a.length) {
+            utils_1.fsUtil.writeFile(this.cTsSuccessPath, this.createdCTs);
+            cli_utilities_1.log.debug(`Written ${this.createdCTs.length} successful content types to file`, this.importConfig.context);
+        }
+        progress.completeProcess(utils_1.PROCESS_NAMES.CONTENT_TYPES_CREATE, true);
+    }
+    async handleContentTypesUpdate(progress) {
+        progress
+            .startProcess(utils_1.PROCESS_NAMES.CONTENT_TYPES_UPDATE)
+            .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.CONTENT_TYPES_UPDATE].UPDATING, utils_1.PROCESS_NAMES.CONTENT_TYPES_UPDATE);
+        cli_utilities_1.log.info('Starting Update process', this.importConfig.context);
+        await this.updateCTs();
+        progress.completeProcess(utils_1.PROCESS_NAMES.CONTENT_TYPES_UPDATE, true);
+    }
+    async handlePendingExtensions(progress) {
+        progress
+            .startProcess(utils_1.PROCESS_NAMES.CONTENT_TYPES_EXT_UPDATE)
+            .updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.CONTENT_TYPES_EXT_UPDATE].UPDATING, utils_1.PROCESS_NAMES.CONTENT_TYPES_EXT_UPDATE);
+        cli_utilities_1.log.info('Starting pending extensions update process', this.importConfig.context);
+        await this.updatePendingExtensions();
+        progress.completeProcess(utils_1.PROCESS_NAMES.CONTENT_TYPES_EXT_UPDATE, true);
+        if (this.isExtensionsUpdate) {
+            cli_utilities_1.log.success('Successfully updated the extensions.', this.importConfig.context);
+        }
+    }
 }
 exports.default = ContentTypesImport;

package/lib/import/modules/custom-roles.d.ts

@@ -28,10 +28,14 @@ export default class ImportCustomRoles extends BaseClass {
     getLocalesUidMap(): Promise<void>;
     importCustomRoles(): Promise<void>;
     /**
-     * @method serializeWebhooks
+     * @method serializeCustomRoles
      * @param {ApiOptions} apiOptions ApiOptions
      * @returns {ApiOptions} ApiOptions
      */
-    serializeWebhooks(apiOptions: ApiOptions): ApiOptions;
+    serializeCustomRoles(apiOptions: ApiOptions): ApiOptions;
     getTransformUidsFactory: (rule: Record<string, any>) => Record<string, any>;
+    private analyzeCustomRoles;
+    private prepareForImport;
+    private loadJsonFileIfExists;
+    private handleImportResults;
 }

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

@@ -46,7 +46,8 @@ class ImportCustomRoles extends base_class_1.default {
             }
             return rule;
         };
-        this.importConfig.context.module = 'custom-roles';
+        this.importConfig.context.module = utils_1.MODULE_CONTEXTS.CUSTOM_ROLES;
+        this.currentModuleName = utils_1.MODULE_NAMES[utils_1.MODULE_CONTEXTS.CUSTOM_ROLES];
         this.customRolesConfig = importConfig.modules.customRoles;
         this.customRolesMapperPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'custom-roles');
         this.customRolesFolderPath = (0, node_path_1.join)(this.importConfig.backupDir, this.customRolesConfig.dirName);
@@ -69,69 +70,27 @@ class ImportCustomRoles extends base_class_1.default {
      * @returns {Promise<void>} Promise<void>
      */
     async start() {
-        var _a, _b, _c;
-        cli_utilities_1.log.debug('Checking for custom roles folder existence', this.importConfig.context);
-        //Step1 check folder exists or not
-        if (utils_1.fileHelper.fileExistsSync(this.customRolesFolderPath)) {
-            cli_utilities_1.log.debug(`Found custom roles folder: ${this.customRolesFolderPath}`, this.importConfig.context);
-            this.customRoles = utils_1.fsUtil.readFile((0, node_path_1.join)(this.customRolesFolderPath, this.customRolesConfig.fileName), true);
-            this.customRolesLocales = utils_1.fsUtil.readFile((0, node_path_1.join)(this.customRolesFolderPath, this.customRolesConfig.customRolesLocalesFileName), true);
-        }
-        else {
-            cli_utilities_1.log.info(`No custom-rules are found - '${this.customRolesFolderPath}'`, this.importConfig.context);
-            return;
-        }
-        //create webhooks in mapper directory
-        cli_utilities_1.log.debug('Creating custom roles mapper directory', this.importConfig.context);
-        await utils_1.fsUtil.makeDirectory(this.customRolesMapperPath);
-        cli_utilities_1.log.debug('Loading existing custom roles UID data', this.importConfig.context);
-        this.customRolesUidMapper = utils_1.fileHelper.fileExistsSync(this.customRolesUidMapperPath)
-            ? utils_1.fsUtil.readFile((0, node_path_1.join)(this.customRolesUidMapperPath), true) || {}
-            : {};
-        cli_utilities_1.log.debug('Loading environments UID data', this.importConfig.context);
-        this.environmentsUidMap = utils_1.fileHelper.fileExistsSync(this.envUidMapperFolderPath)
-            ? utils_1.fsUtil.readFile((0, node_path_1.join)(this.envUidMapperFolderPath, 'uid-mapping.json'), true) || {}
-            : {};
-        cli_utilities_1.log.debug('Loading entries UID data', this.importConfig.context);
-        this.entriesUidMap = utils_1.fileHelper.fileExistsSync(this.entriesUidMapperFolderPath)
-            ? utils_1.fsUtil.readFile((0, node_path_1.join)(this.entriesUidMapperFolderPath, 'uid-mapping.json'), true) || {}
-            : {};
-        if (this.customRolesUidMapper && Object.keys(this.customRolesUidMapper || {}).length > 0) {
-            const customRolesUidCount = Object.keys(this.customRolesUidMapper || {}).length;
-            cli_utilities_1.log.debug(`Loaded existing custom roles UID data: ${customRolesUidCount} items`, this.importConfig.context);
-        }
-        else {
-            cli_utilities_1.log.debug('No existing custom roles UID data found', this.importConfig.context);
-        }
-        if (this.environmentsUidMap && ((_a = Object.keys(this.environmentsUidMap || {})) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-            const envUidCount = Object.keys(this.environmentsUidMap || {}).length;
-            cli_utilities_1.log.debug(`Loaded environments UID data: ${envUidCount} items`, this.importConfig.context);
-        }
-        else {
-            cli_utilities_1.log.debug('No environments UID data found', this.importConfig.context);
-        }
-        if (this.entriesUidMap && Object.keys(this.entriesUidMap || {}).length > 0) {
-            const entriesUidCount = Object.keys(this.entriesUidMap || {}).length;
-            cli_utilities_1.log.debug(`Loaded entries UID data: ${entriesUidCount} items`, this.importConfig.context);
-        }
-        else {
-            cli_utilities_1.log.debug('No entries UID data found', this.importConfig.context);
-        }
-        //source and target stack locale map
-        cli_utilities_1.log.debug('Getting locales UID mapping', this.importConfig.context);
-        await this.getLocalesUidMap();
-        cli_utilities_1.log.debug('Starting custom roles import', this.importConfig.context);
-        await this.importCustomRoles();
-        cli_utilities_1.log.debug('Processing custom roles import results', this.importConfig.context);
-        if ((_b = this.createdCustomRoles) === null || _b === void 0 ? void 0 : _b.length) {
-            utils_1.fsUtil.writeFile(this.createdCustomRolesPath, this.createdCustomRoles);
-            cli_utilities_1.log.debug(`Written ${this.createdCustomRoles.length} successful custom roles to file`, this.importConfig.context);
+        try {
+            cli_utilities_1.log.debug('Starting custom roles import process...', this.importConfig.context);
+            const [customRolesCount] = await this.analyzeCustomRoles();
+            if (customRolesCount === 0) {
+                cli_utilities_1.log.info(`No custom-rules are found - '${this.customRolesFolderPath}'`, this.importConfig.context);
+                return;
+            }
+            const progress = this.createSimpleProgress(this.currentModuleName, customRolesCount);
+            await this.prepareForImport();
+            progress.updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.CUSTOM_ROLES_BUILD_MAPPINGS].BUILDING);
+            await this.getLocalesUidMap();
+            progress.updateStatus(utils_1.PROCESS_STATUS[utils_1.PROCESS_NAMES.CUSTOM_ROLES_IMPORT].IMPORTING);
+            await this.importCustomRoles();
+            this.handleImportResults();
+            this.completeProgress(true);
+            cli_utilities_1.log.success('Custom roles have been imported successfully!', this.importConfig.context);
         }
-        if ((_c = this.failedCustomRoles) === null || _c === void 0 ? void 0 : _c.length) {
-            utils_1.fsUtil.writeFile(this.customRolesFailsPath, this.failedCustomRoles);
-            cli_utilities_1.log.debug(`Written ${this.failedCustomRoles.length} failed custom roles to file`, this.importConfig.context);
+        catch (error) {
+            this.completeProgress(false, (error === null || error === void 0 ? void 0 : error.message) || 'Custom roles import failed');
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.importConfig.context));
         }
-        cli_utilities_1.log.success('Custom roles have been imported successfully!', this.importConfig.context);
     }
     async getLocalesUidMap() {
         cli_utilities_1.log.debug('Fetching target stack locales', this.importConfig.context);
@@ -176,31 +135,35 @@ class ImportCustomRoles extends base_class_1.default {
         const apiContent = (0, values_1.default)(this.customRoles);
         cli_utilities_1.log.debug(`Importing ${apiContent.length} custom roles`, this.importConfig.context);
         const onSuccess = ({ response, apiData: { uid, name } = { uid: null, name: '' } }) => {
+            var _a;
             this.createdCustomRoles.push(response);
             this.customRolesUidMapper[uid] = response.uid;
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `custom role: ${name}`, `custom role: ${name || uid}`, utils_1.PROCESS_NAMES.CUSTOM_ROLES_IMPORT);
             cli_utilities_1.log.success(`custom-role '${name}' imported successfully`, this.importConfig.context);
             cli_utilities_1.log.debug(`Custom role import completed: ${name} (${uid})`, this.importConfig.context);
             utils_1.fsUtil.writeFile(this.customRolesUidMapperPath, this.customRolesUidMapper);
         };
         const onReject = ({ error, apiData }) => {
-            var _a;
+            var _a, _b, _c;
             const err = (error === null || error === void 0 ? void 0 : error.message) ? JSON.parse(error.message) : error;
             const { name } = apiData;
             cli_utilities_1.log.debug(`Custom role '${name}' import failed`, this.importConfig.context);
             if ((_a = err === null || err === void 0 ? void 0 : err.errors) === null || _a === void 0 ? void 0 : _a.name) {
+                (_b = this.progressManager) === null || _b === void 0 ? void 0 : _b.tick(true, `custom role: ${name}`, `custom role: ${name} (already exists)`, utils_1.PROCESS_NAMES.CUSTOM_ROLES_IMPORT);
                 cli_utilities_1.log.info(`custom-role '${name}' already exists`, this.importConfig.context);
             }
             else {
                 this.failedCustomRoles.push(apiData);
+                (_c = this.progressManager) === null || _c === void 0 ? void 0 : _c.tick(false, `custom role: ${name}`, (error === null || error === void 0 ? void 0 : error.message) || 'Failed to import custom role', utils_1.PROCESS_NAMES.CUSTOM_ROLES_IMPORT);
                 (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { name }), `custom-role '${name}' failed to be import`);
             }
         };
-        cli_utilities_1.log.debug(`Using concurrency limit: ${this.importConfig.fetchConcurrency || 1}`, this.importConfig.context);
+        cli_utilities_1.log.debug(`Using concurrency limit: ${this.importConfig.fetchConcurrency || 2}`, this.importConfig.context);
         await this.makeConcurrentCall({
             apiContent,
             processName: 'create custom role',
             apiParams: {
-                serializeData: this.serializeWebhooks.bind(this),
+                serializeData: this.serializeCustomRoles.bind(this),
                 reject: onReject.bind(this),
                 resolve: onSuccess.bind(this),
                 entity: 'create-custom-role',
@@ -211,22 +174,25 @@ class ImportCustomRoles extends base_class_1.default {
         cli_utilities_1.log.debug('Custom roles import process completed', this.importConfig.context);
     }
     /**
-     * @method serializeWebhooks
+     * @method serializeCustomRoles
      * @param {ApiOptions} apiOptions ApiOptions
      * @returns {ApiOptions} ApiOptions
      */
-    serializeWebhooks(apiOptions) {
-        var _a;
+    serializeCustomRoles(apiOptions) {
+        var _a, _b;
         const { apiData: customRole } = apiOptions;
         cli_utilities_1.log.debug(`Serializing custom role: ${customRole.name} (${customRole.uid})`, this.importConfig.context);
         if (this.customRolesUidMapper.hasOwnProperty(customRole.uid)) {
             cli_utilities_1.log.info(`custom-role '${customRole.name}' already exists. Skipping it to avoid duplicates!`, this.importConfig.context);
             cli_utilities_1.log.debug(`Skipping custom role serialization for: ${customRole.uid}`, this.importConfig.context);
+            // Still tick progress for skipped custom roles
+            (_a = this.progressManager) === null || _a === void 0 ? void 0 : _a.tick(true, `custom role: ${customRole.name} (skipped - already exists)`, utils_1.PROCESS_NAMES.CUSTOM_ROLES_IMPORT);
             apiOptions.entity = undefined;
         }
         else {
+            cli_utilities_1.log.debug(`Processing custom role: ${customRole.name}`, this.importConfig.context);
             let branchRuleExists = false;
-            cli_utilities_1.log.debug(`Processing ${((_a = customRole.rules) === null || _a === void 0 ? void 0 : _a.length) || 0} rules for custom role: ${customRole.name}`, this.importConfig.context);
+            cli_utilities_1.log.debug(`Processing ${((_b = customRole.rules) === null || _b === void 0 ? void 0 : _b.length) || 0} rules for custom role: ${customRole.name}`, this.importConfig.context);
             (0, lodash_1.forEach)(customRole.rules, (rule) => {
                 rule = this.getTransformUidsFactory(rule);
                 // rules.branch is required to create custom roles.
@@ -248,5 +214,50 @@ class ImportCustomRoles extends base_class_1.default {
         }
         return apiOptions;
     }
+    async analyzeCustomRoles() {
+        return this.withLoadingSpinner('CUSTOM ROLES: Analyzing import data...', async () => {
+            cli_utilities_1.log.debug('Checking for custom roles folder existence', this.importConfig.context);
+            if (!utils_1.fileHelper.fileExistsSync(this.customRolesFolderPath)) {
+                cli_utilities_1.log.info(`No custom-rules are found - '${this.customRolesFolderPath}'`, this.importConfig.context);
+                return [0];
+            }
+            cli_utilities_1.log.debug(`Found custom roles folder: ${this.customRolesFolderPath}`, this.importConfig.context);
+            this.customRoles = utils_1.fsUtil.readFile((0, node_path_1.join)(this.customRolesFolderPath, this.customRolesConfig.fileName), true);
+            this.customRolesLocales = utils_1.fsUtil.readFile((0, node_path_1.join)(this.customRolesFolderPath, this.customRolesConfig.customRolesLocalesFileName), true);
+            const count = Object.keys(this.customRoles || {}).length;
+            cli_utilities_1.log.debug(`Loaded ${count} custom roles from file`, this.importConfig.context);
+            return [count];
+        });
+    }
+    async prepareForImport() {
+        cli_utilities_1.log.debug('Creating custom roles mapper directory', this.importConfig.context);
+        await utils_1.fsUtil.makeDirectory(this.customRolesMapperPath);
+        this.customRolesUidMapper = this.loadJsonFileIfExists(this.customRolesUidMapperPath, 'custom roles');
+        this.environmentsUidMap = this.loadJsonFileIfExists((0, node_path_1.join)(this.envUidMapperFolderPath, 'uid-mapping.json'), 'environments');
+        this.entriesUidMap = this.loadJsonFileIfExists((0, node_path_1.join)(this.entriesUidMapperFolderPath, 'uid-mapping.json'), 'entries');
+    }
+    loadJsonFileIfExists(path, label) {
+        if (utils_1.fileHelper.fileExistsSync(path)) {
+            const data = utils_1.fsUtil.readFile(path, true);
+            const count = Object.keys(data || {}).length;
+            cli_utilities_1.log.debug(`Loaded ${label}: ${count} items`, this.importConfig.context);
+            return data || {};
+        }
+        else {
+            cli_utilities_1.log.debug(`No ${label} UID data found`, this.importConfig.context);
+            return {};
+        }
+    }
+    handleImportResults() {
+        var _a, _b;
+        if ((_a = this.createdCustomRoles) === null || _a === void 0 ? void 0 : _a.length) {
+            utils_1.fsUtil.writeFile(this.createdCustomRolesPath, this.createdCustomRoles);
+            cli_utilities_1.log.debug(`Written ${this.createdCustomRoles.length} successful custom roles to file`, this.importConfig.context);
+        }
+        if ((_b = this.failedCustomRoles) === null || _b === void 0 ? void 0 : _b.length) {
+            utils_1.fsUtil.writeFile(this.customRolesFailsPath, this.failedCustomRoles);
+            cli_utilities_1.log.debug(`Written ${this.failedCustomRoles.length} failed custom roles to file`, this.importConfig.context);
+        }
+    }
 }
 exports.default = ImportCustomRoles;

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

@@ -40,6 +40,13 @@ export default class EntriesImport extends BaseClass {
     }>;
     constructor({ importConfig, stackAPIClient }: ModuleClassParams);
     start(): Promise<any>;
+    private analyzeEntryData;
+    private initializeProgress;
+    private processEntryCreation;
+    private processEntryReplacement;
+    private processEntryReferenceUpdates;
+    private processEntryPublishing;
+    private processCleanup;
     /**
      * The function `createEntryDataForVariantEntry` writes the `entriesForVariant` data to a JSON file
      * named `data-for-variant-entry.json`.