@contentstack/cli-cm-import 1.25.1 → 1.26.1

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

@@ -9,14 +9,15 @@ 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 cli_utilities_1 = require("@contentstack/cli-utilities");
 class ContentTypesImport extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
         this.isExtensionsUpdate = false;
+        this.importConfig.context.module = 'content-types';
         this.cTsConfig = importConfig.modules['content-types'];
         this.gFsConfig = importConfig.modules['global-fields'];
         this.reqConcurrency = this.cTsConfig.writeConcurrency || this.importConfig.writeConcurrency;
@@ -44,7 +45,7 @@ class ContentTypesImport extends base_class_1.default {
         this.extPendingPath = path.join((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'extensions', 'pending_extensions.js');
     }
     async start() {
-        var _a;
+        var _a, _b;
         /**
          * read content type, check if it is necessary to read the entire dir
          * Seed content types
@@ -54,51 +55,64 @@ class ContentTypesImport extends base_class_1.default {
          */
         this.cTs = utils_1.fsUtil.readFile(path.join(this.cTsFolderPath, 'schema.json'));
         if (!this.cTs || (0, lodash_1.isEmpty)(this.cTs)) {
-            (0, utils_1.log)(this.importConfig, 'No content type found to import', 'info');
+            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 = ((await 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 ((_a = this.createdCTs) === null || _a === void 0 ? void 0 : _a.length)
+        if ((_b = this.createdCTs) === null || _b === void 0 ? void 0 : _b.length) {
             utils_1.fsUtil.writeFile(this.cTsSuccessPath, this.createdCTs);
-        (0, utils_1.log)(this.importConfig, 'Created content types', 'success');
+            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();
-        (0, utils_1.log)(this.importConfig, 'Updated content types with references', 'success');
+        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);
         }
-        (0, utils_1.log)(this.importConfig, 'Updating the extensions...', 'success');
+        cli_utilities_1.log.info('Updating the extensions...', this.importConfig.context);
         await this.updatePendingExtensions();
         if (this.isExtensionsUpdate) {
-            (0, utils_1.log)(this.importConfig, 'Successfully updated the extensions.', 'success');
+            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)) {
-            (0, utils_1.log)(this.importConfig, 'No pending global fields found to update', 'info');
+            cli_utilities_1.log.info('No pending global fields found to update', this.importConfig.context);
             return;
         }
         await this.updatePendingGFs().catch((error) => {
-            (0, utils_1.log)(this.importConfig, `Error while updating pending global field ${(0, utils_1.formatError)(error)}`, 'error');
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.importConfig.context));
         });
-        (0, utils_1.log)(this.importConfig, 'Updated pending global fields with content type with references', 'success');
-        (0, utils_1.log)(this.importConfig, 'Content types have been imported successfully!', 'success');
+        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 } = {} } = {} }) => {
             this.createdCTs.push(uid);
-            (0, utils_1.log)(this.importConfig, `${uid} content type seeded`, 'info');
+            cli_utilities_1.log.info(`${uid} content type seeded`, this.importConfig.context);
+            cli_utilities_1.log.debug(`Successfully seeded content type: ${uid}`, this.importConfig.context);
         };
         const onReject = ({ error, apiData: { content_type: { uid = null } = {} } = {} }) => {
             if (error.errorCode === 115 && (error.errors.uid || error.errors.title)) {
-                (0, utils_1.log)(this.importConfig, `${uid} content type already exist`, 'info');
+                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);
             }
             else {
-                (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
-                process.exit(1);
+                (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { uid }), `Failed to seed content type ${uid}`);
             }
         };
+        cli_utilities_1.log.debug(`Starting to seed ${this.cTs.length} content types`, this.importConfig.context);
         return await this.makeConcurrentCall({
             processName: 'Import content types',
             apiContent: this.cTs,
@@ -119,6 +133,7 @@ class ContentTypesImport extends base_class_1.default {
      */
     serializeCTs(apiOptions) {
         const { apiData: contentType } = apiOptions;
+        cli_utilities_1.log.debug(`Serializing content type: ${contentType.uid} (${contentType.title})`, this.importConfig.context);
         const updatedCT = (0, lodash_1.cloneDeep)(utils_1.schemaTemplate);
         updatedCT.content_type.uid = contentType.uid;
         updatedCT.content_type.title = contentType.title;
@@ -127,12 +142,14 @@ class ContentTypesImport extends base_class_1.default {
     }
     async updateCTs() {
         const onSuccess = ({ response: contentType, apiData: { uid } }) => {
-            (0, utils_1.log)(this.importConfig, `'${uid}' updated with references`, 'success');
+            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 } }) => {
-            (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
+            (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({
             processName: 'Update content types',
             apiContent: this.cTs,
@@ -153,36 +170,50 @@ class ContentTypesImport extends base_class_1.default {
      */
     serializeUpdateCTs(apiOptions) {
         const { apiData: contentType } = apiOptions;
+        cli_utilities_1.log.debug(`Serializing update for content type: ${contentType.uid} (${contentType.title})`, this.importConfig.context);
         if (contentType.field_rules) {
             contentType.field_rules = (0, content_type_helper_1.updateFieldRules)(contentType);
             if (!contentType.field_rules.length) {
                 delete contentType.field_rules;
+                cli_utilities_1.log.debug(`Removed empty field rules for content type: ${contentType.uid}`, this.importConfig.context);
+            }
+            else {
+                cli_utilities_1.log.debug(`Updated ${contentType.field_rules.length} field rules for content type: ${contentType.uid}`, this.importConfig.context);
             }
             this.fieldRules.push(contentType.uid);
         }
         //will remove taxonomy if taxonomy doesn't exists in stack
         (0, utils_1.lookUpTaxonomy)(this.importConfig, contentType.schema, this.taxonomies);
+        cli_utilities_1.log.debug(`Processed taxonomy lookups for content type: ${contentType.uid}`, this.importConfig.context);
         (0, utils_1.lookupExtension)(this.importConfig, contentType.schema, this.importConfig.preserveStackVersion, this.installedExtensions);
+        cli_utilities_1.log.debug(`Processed extension lookups for content type: ${contentType.uid}`, this.importConfig.context);
         const contentTypePayload = this.stack.contentType(contentType.uid);
         Object.assign(contentTypePayload, (0, lodash_1.cloneDeep)(contentType));
+        cli_utilities_1.log.debug(`Content type update serialization completed for: ${contentType.uid}`, this.importConfig.context);
         apiOptions.apiData = contentTypePayload;
         return apiOptions;
     }
     async updatePendingGFs() {
+        var _a, _b;
         this.pendingGFs = utils_1.fsUtil.readFile(this.gFsPendingPath);
-        (0, utils_1.log)(this.importConfig, `Found ${this.pendingGFs.length} pending global fields to update`, 'info');
+        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));
-        const onSuccess = ({ response, apiData: { uid } = undefined }) => {
-            (0, utils_1.log)(this.importConfig, `Updated the global field ${uid} with content type references`, 'info');
+        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);
+            cli_utilities_1.log.debug(`Global field update completed for: ${uid}`, this.importConfig.context);
         };
         const onReject = ({ error, apiData: { uid } = undefined }) => {
-            (0, utils_1.log)(this.importConfig, `Failed to update the global field '${uid}' ${(0, utils_1.formatError)(error)}`, 'error');
+            (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) => {
+            return { uid };
+        });
+        cli_utilities_1.log.debug(`Prepared ${apiContent.length} global field update tasks`, this.importConfig.context);
         return await this.makeConcurrentCall({
             processName: 'Update pending global fields',
-            apiContent: (0, lodash_1.map)(this.pendingGFs, (uid) => {
-                return { uid };
-            }),
+            apiContent: apiContent,
             apiParams: {
                 serializeData: this.serializeUpdateGFs.bind(this),
                 reject: onReject.bind(this),
@@ -200,36 +231,50 @@ class ContentTypesImport extends base_class_1.default {
      */
     serializeUpdateGFs(apiOptions) {
         const { apiData: { uid }, } = apiOptions;
+        cli_utilities_1.log.debug(`Serializing global field update for: ${uid}`, this.importConfig.context);
         const globalField = (0, lodash_1.find)(this.gFs, { uid });
+        if (!globalField) {
+            cli_utilities_1.log.debug(`Global field not found: ${uid}`, this.importConfig.context);
+            apiOptions.apiData = null;
+            return apiOptions;
+        }
+        cli_utilities_1.log.debug(`Found global field: ${uid}`, this.importConfig.context);
         (0, utils_1.lookupExtension)(this.importConfig, globalField.schema, this.importConfig.preserveStackVersion, this.installedExtensions);
+        cli_utilities_1.log.debug(`Processed extension lookups for global field: ${uid}`, this.importConfig.context);
         const globalFieldPayload = this.stack.globalField(uid, { api_version: '3.2' });
         Object.assign(globalFieldPayload, (0, lodash_1.cloneDeep)(globalField));
+        cli_utilities_1.log.debug(`Global field update serialization completed for: ${uid}`, this.importConfig.context);
         apiOptions.apiData = globalFieldPayload;
         return apiOptions;
     }
     async updatePendingExtensions() {
         let apiContent = utils_1.fsUtil.readFile(this.extPendingPath);
-        if ((apiContent === null || apiContent === void 0 ? void 0 : apiContent.length) === 0) {
-            (0, utils_1.log)(this.importConfig, `No extensions found to be updated.`, 'success');
+        cli_utilities_1.log.debug(`Reading pending extensions from: ${this.extPendingPath}`, this.importConfig.context);
+        if (!apiContent || (apiContent === null || apiContent === void 0 ? void 0 : apiContent.length) === 0) {
+            cli_utilities_1.log.info(`No extensions found to be updated.`, this.importConfig.context);
+            cli_utilities_1.log.debug('Skipping extensions update - no pending extensions', this.importConfig.context);
             return;
         }
+        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: '' } }) => {
-            (0, utils_1.log)(this.importConfig, `Successfully updated the '${response.title}' extension.`, 'success');
+            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) {
                 if (!this.importConfig.skipExisting) {
-                    (0, utils_1.log)(this.importConfig, `Extension '${uid}' already exists.`, 'info');
+                    cli_utilities_1.log.info(`Extension '${uid}' already exists.`, this.importConfig.context);
                 }
+                cli_utilities_1.log.debug(`Skipping existing extension: ${uid}`, this.importConfig.context);
             }
             else {
-                (0, utils_1.log)(this.importConfig, `Failed to update '${uid}' extension due to ${(0, utils_1.formatError)(error)}.`, 'error');
-                (0, utils_1.log)(this.importConfig, error, 'error');
+                (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { uid }), `Failed to update '${uid}' extension`);
             }
         };
+        cli_utilities_1.log.debug('Starting extensions update process', this.importConfig.context);
         return await this.makeConcurrentCall({
             apiContent,
             processName: 'update extensions',

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

@@ -4,30 +4,49 @@ const tslib_1 = require("tslib");
 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 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 lodash_1 = require("lodash");
 class ImportCustomRoles extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
         this.getTransformUidsFactory = (rule) => {
+            var _a, _b, _c;
+            cli_utilities_1.log.debug(`Transforming UIDs for rule module: ${rule.module}`, this.importConfig.context);
             if (rule.module === 'environment') {
                 if (!(0, isEmpty_1.default)(this.environmentsUidMap)) {
+                    const originalEnvs = ((_a = rule.environments) === null || _a === void 0 ? void 0 : _a.length) || 0;
                     rule.environments = (0, lodash_1.map)(rule.environments, (env) => this.environmentsUidMap[env]);
+                    cli_utilities_1.log.debug(`Transformed ${originalEnvs} environment UIDs for rule`, this.importConfig.context);
+                }
+                else {
+                    cli_utilities_1.log.debug('No environment UID mappings available for transformation', this.importConfig.context);
                 }
             }
             else if (rule.module === 'locale') {
                 if (!(0, isEmpty_1.default)(this.localesUidMap)) {
+                    const originalLocales = ((_b = rule.locales) === null || _b === void 0 ? void 0 : _b.length) || 0;
                     rule.locales = (0, lodash_1.map)(rule.locales, (locale) => this.localesUidMap[locale]);
+                    cli_utilities_1.log.debug(`Transformed ${originalLocales} locale UIDs for rule`, this.importConfig.context);
+                }
+                else {
+                    cli_utilities_1.log.debug('No locale UID mappings available for transformation', this.importConfig.context);
                 }
             }
             else if (rule.module === 'entry') {
                 if (!(0, isEmpty_1.default)(this.entriesUidMap)) {
+                    const originalEntries = ((_c = rule.entries) === null || _c === void 0 ? void 0 : _c.length) || 0;
                     rule.entries = (0, lodash_1.map)(rule.entries, (entry) => this.entriesUidMap[entry]);
+                    cli_utilities_1.log.debug(`Transformed ${originalEntries} entry UIDs for rule`, this.importConfig.context);
+                }
+                else {
+                    cli_utilities_1.log.debug('No entry UID mappings available for transformation', this.importConfig.context);
                 }
             }
             return rule;
         };
+        this.importConfig.context.module = '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);
@@ -50,85 +69,133 @@ class ImportCustomRoles extends base_class_1.default {
      * @returns {Promise<void>} Promise<void>
      */
     async start() {
-        var _a, _b;
-        (0, utils_1.log)(this.importConfig, 'Migrating custom-roles', 'info');
+        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 {
-            (0, utils_1.log)(this.importConfig, `No custom-rules are found - '${this.customRolesFolderPath}'`, 'info');
+            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)
+            ? 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)
+            ? 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)
+            ? 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();
-        if ((_a = this.createdCustomRoles) === null || _a === void 0 ? void 0 : _a.length) {
+        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);
         }
-        if ((_b = this.failedCustomRoles) === null || _b === void 0 ? void 0 : _b.length) {
+        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);
         }
-        (0, utils_1.log)(this.importConfig, 'Custom roles have been imported successfully!', 'success');
+        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);
         const { items } = await this.stack
             .locale()
             .query()
             .find()
-            .then((data) => data)
-            .catch((error) => (0, utils_1.log)(this.importConfig, `Failed to fetch locale.${(0, utils_1.formatError)(error)}`, 'error'));
+            .then((data) => {
+            var _a;
+            cli_utilities_1.log.debug(`Found ${((_a = data.items) === null || _a === void 0 ? void 0 : _a.length) || 0} locales in target stack`, this.importConfig.context);
+            return data;
+        })
+            .catch((error) => {
+            cli_utilities_1.log.debug('Error fetching target stack locales', this.importConfig.context);
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.importConfig.context));
+        });
         this.targetLocalesMap = {};
         this.sourceLocalesMap = {};
+        cli_utilities_1.log.debug('Building target locales mapping', this.importConfig.context);
         (0, lodash_1.forEach)(items, (locale) => {
             this.targetLocalesMap[locale.code] = locale.uid;
         });
+        cli_utilities_1.log.debug('Building source locales mapping', this.importConfig.context);
         for (const key in this.customRolesLocales) {
             const sourceLocales = this.customRolesLocales[key];
             this.sourceLocalesMap[sourceLocales.code] = key;
         }
+        cli_utilities_1.log.debug('Creating locale UID mapping', this.importConfig.context);
         for (const key in this.sourceLocalesMap) {
             const sourceLocaleKey = this.sourceLocalesMap[key];
             this.localesUidMap[sourceLocaleKey] = this.targetLocalesMap[key];
         }
+        const localesMappingCount = Object.keys(this.localesUidMap || {}).length;
+        cli_utilities_1.log.debug(`Created ${localesMappingCount} locale UID mappings`, this.importConfig.context);
     }
     async importCustomRoles() {
+        cli_utilities_1.log.debug('Starting custom roles import process', this.importConfig.context);
         if (this.customRoles === undefined || (0, isEmpty_1.default)(this.customRoles)) {
-            (0, utils_1.log)(this.importConfig, 'No custom-roles found', 'info');
+            cli_utilities_1.log.info('No custom-roles found', this.importConfig.context);
             return;
         }
         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: '' } }) => {
             this.createdCustomRoles.push(response);
             this.customRolesUidMapper[uid] = response.uid;
-            (0, utils_1.log)(this.importConfig, `custom-role '${name}' imported successfully`, 'success');
+            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;
             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) {
-                (0, utils_1.log)(this.importConfig, `custom-role '${name}' already exists`, 'info');
+                cli_utilities_1.log.info(`custom-role '${name}' already exists`, this.importConfig.context);
             }
             else {
                 this.failedCustomRoles.push(apiData);
-                (0, utils_1.log)(this.importConfig, `custom-role '${name}' failed to be import.${(0, utils_1.formatError)(error)}`, 'error');
-                (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
+                (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);
         await this.makeConcurrentCall({
             apiContent,
             processName: 'create custom role',
@@ -141,6 +208,7 @@ class ImportCustomRoles extends base_class_1.default {
             },
             concurrencyLimit: this.importConfig.fetchConcurrency || 1,
         }, undefined, false);
+        cli_utilities_1.log.debug('Custom roles import process completed', this.importConfig.context);
     }
     /**
      * @method serializeWebhooks
@@ -148,26 +216,34 @@ class ImportCustomRoles extends base_class_1.default {
      * @returns {ApiOptions} ApiOptions
      */
     serializeWebhooks(apiOptions) {
+        var _a;
         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)) {
-            (0, utils_1.log)(this.importConfig, `custom-role '${customRole.name}' already exists. Skipping it to avoid duplicates!`, 'info');
+            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);
             apiOptions.entity = undefined;
         }
         else {
             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);
             (0, lodash_1.forEach)(customRole.rules, (rule) => {
                 rule = this.getTransformUidsFactory(rule);
                 // rules.branch is required to create custom roles.
-                if (rule.module === 'branch')
+                if (rule.module === 'branch') {
                     branchRuleExists = true;
+                    cli_utilities_1.log.debug(`Found branch rule in custom role: ${customRole.name}`, this.importConfig.context);
+                }
             });
             if (!branchRuleExists) {
+                cli_utilities_1.log.debug(`Adding default branch rule to custom role: ${customRole.name}`, this.importConfig.context);
                 customRole.rules.push({
                     module: 'branch',
                     branches: ['main'],
                     acl: { read: true },
                 });
             }
+            cli_utilities_1.log.debug(`Custom role serialization completed: ${customRole.name}`, this.importConfig.context);
             apiOptions.apiData = customRole;
         }
         return apiOptions;