@contentstack/cli-cm-import 1.25.1 → 1.26.0

package/lib/import/modules/entries.js

@@ -17,6 +17,7 @@ class EntriesImport extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
         this.entriesForVariant = [];
+        this.importConfig.context.module = 'entries';
         this.assetUidMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'assets', 'uid-mapping.json');
         this.assetUrlMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'assets', 'url-mapping.json');
         this.entriesMapperPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.data), 'mapper', 'entries');
@@ -47,73 +48,95 @@ class EntriesImport extends base_class_1.default {
         try {
             this.cTs = utils_1.fsUtil.readFile(path.join(this.cTsPath, 'schema.json'));
             if (!this.cTs || (0, lodash_1.isEmpty)(this.cTs)) {
-                (0, utils_1.log)(this.importConfig, 'No content type found', 'info');
+                cli_utilities_1.log.info('No content type found', this.importConfig.context);
                 return;
             }
+            cli_utilities_1.log.debug(`Found ${this.cTs.length} content types for entry import`, this.importConfig.context);
             this.installedExtensions = ((await utils_1.fsUtil.readFile(this.marketplaceAppMapperPath)) || { extension_uid: {} }).extension_uid;
+            cli_utilities_1.log.debug('Loaded installed extensions for entry processing', this.importConfig.context);
             this.assetUidMapper = utils_1.fsUtil.readFile(this.assetUidMapperPath) || {};
             this.assetUrlMapper = utils_1.fsUtil.readFile(this.assetUrlMapperPath) || {};
+            cli_utilities_1.log.debug(`Loaded asset mappings - UIDs: ${Object.keys(this.assetUidMapper).length}, URLs: ${Object.keys(this.assetUrlMapper).length}`, this.importConfig.context);
             this.taxonomies = utils_1.fsUtil.readFile(this.taxonomiesPath);
+            cli_utilities_1.log.debug('Loaded taxonomy data for entry processing', this.importConfig.context);
             utils_1.fsUtil.makeDirectory(this.entriesMapperPath);
+            cli_utilities_1.log.debug('Created entries mapper directory', this.importConfig.context);
+            cli_utilities_1.log.info('Preparing content types for entry import', this.importConfig.context);
             await this.disableMandatoryCTReferences();
             this.locales = (0, lodash_1.values)(utils_1.fsUtil.readFile(this.localesPath));
             this.locales.unshift(this.importConfig.master_locale); // adds master locale to the list
+            cli_utilities_1.log.debug(`Processing entries for ${(0, lodash_1.values)(this.locales).length} locales`, this.importConfig.context);
             //Create Entries
+            cli_utilities_1.log.info('Starting entry creation process', this.importConfig.context);
             const entryRequestOptions = this.populateEntryCreatePayload();
+            cli_utilities_1.log.debug(`Generated ${entryRequestOptions.length} entry creation tasks`, this.importConfig.context);
             for (let entryRequestOption of entryRequestOptions) {
                 await this.createEntries(entryRequestOption);
             }
+            cli_utilities_1.log.success('Entry creation process completed', this.importConfig.context);
             if (this.importConfig.replaceExisting) {
                 // Note: Instead of using entryRequestOptions, we can prepare request options for replace, to avoid unnecessary operations
+                cli_utilities_1.log.info('Starting entry replacement process', this.importConfig.context);
                 for (let entryRequestOption of entryRequestOptions) {
                     await this.replaceEntries(entryRequestOption).catch((error) => {
-                        (0, utils_1.log)(this.importConfig, `Error while replacing the existing entries ${(0, utils_1.formatError)(error)}`, 'error');
+                        (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { cTUid: entryRequestOption.cTUid, locale: entryRequestOption.locale }), 'Error while replacing existing entries');
                     });
                 }
+                cli_utilities_1.log.success('Entry replacement process completed', this.importConfig.context);
             }
+            cli_utilities_1.log.debug('Writing entry UID mappings to file', this.importConfig.context);
             await utils_1.fileHelper.writeLargeFile(path.join(this.entriesMapperPath, 'uid-mapping.json'), this.entriesUidMapper); // TBD: manages mapper in one file, should find an alternative
             utils_1.fsUtil.writeFile(path.join(this.entriesMapperPath, 'failed-entries.json'), this.failedEntries);
             if (((_a = this.autoCreatedEntries) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-                (0, utils_1.log)(this.importConfig, 'Removing entries from master language which got created by default', 'info');
+                cli_utilities_1.log.info(`Removing ${this.autoCreatedEntries.length} entries from master language which got created by default`, this.importConfig.context);
                 await this.removeAutoCreatedEntries().catch((error) => {
-                    (0, utils_1.log)(this.importConfig, `Error while removing auto created entries in master locale ${(0, utils_1.formatError)(error)}`, 'error');
+                    (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.importConfig.context), 'Error while removing auto created entries in master locale');
                 });
+                cli_utilities_1.log.success('Auto-created entries cleanup completed', this.importConfig.context);
             }
             // Update entries with references
+            cli_utilities_1.log.info('Starting entry references update process', this.importConfig.context);
             const entryUpdateRequestOptions = this.populateEntryUpdatePayload();
+            cli_utilities_1.log.debug(`Generated ${entryUpdateRequestOptions.length} entry update tasks`, this.importConfig.context);
             for (let entryUpdateRequestOption of entryUpdateRequestOptions) {
                 await this.updateEntriesWithReferences(entryUpdateRequestOption).catch((error) => {
-                    (0, utils_1.log)(this.importConfig, `Error while updating entries references of ${entryUpdateRequestOption.cTUid} in locale ${entryUpdateRequestOption.locale}`, '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), { cTUid: entryUpdateRequestOption.cTUid, locale: entryUpdateRequestOption.locale }), `Error while updating entries references of ${entryUpdateRequestOption.cTUid} in locale ${entryUpdateRequestOption.locale}`);
                 });
             }
             utils_1.fsUtil.writeFile(path.join(this.entriesMapperPath, 'failed-entries.json'), this.failedEntries);
-            (0, utils_1.log)(this.importConfig, 'Restoring content type changes', 'info');
+            cli_utilities_1.log.success('Entry references update process completed', this.importConfig.context);
+            cli_utilities_1.log.info('Restoring content type changes', this.importConfig.context);
             await this.enableMandatoryCTReferences().catch((error) => {
-                (0, utils_1.log)(this.importConfig, `Error while updating content type references ${(0, utils_1.formatError)(error)}`, 'error');
+                (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.importConfig.context), 'Error while updating content type references');
             });
+            cli_utilities_1.log.success('Content type references restored successfully', this.importConfig.context);
             // Update field rule of content types which are got removed earlier
-            (0, utils_1.log)(this.importConfig, 'Updating the field rules of content type', 'info');
+            cli_utilities_1.log.info('Updating the field rules of content type', this.importConfig.context);
             await this.updateFieldRules().catch((error) => {
-                (0, utils_1.log)(this.importConfig, `Error while updating field rules of content type ${(0, utils_1.formatError)(error)}`, 'error');
+                (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.importConfig.context), 'Error while updating field rules of content type');
             });
-            (0, utils_1.log)(this.importConfig, 'Entries imported successfully', 'success');
+            cli_utilities_1.log.success('Entries imported successfully', this.importConfig.context);
             // Publishing entries
             if (!this.importConfig.skipEntriesPublish) {
-                (0, utils_1.log)(this.importConfig, 'Publishing entries', 'info');
+                cli_utilities_1.log.info('Starting entry publishing process', this.importConfig.context);
                 this.envs = utils_1.fileHelper.readFileSync(this.envPath);
+                cli_utilities_1.log.debug(`Loaded ${Object.keys(this.envs).length} environments for publishing`, this.importConfig.context);
                 for (let entryRequestOption of entryRequestOptions) {
                     await this.publishEntries(entryRequestOption).catch((error) => {
-                        (0, utils_1.log)(this.importConfig, `Error in publishing entries of ${entryRequestOption.cTUid} in locale ${entryRequestOption.locale} ${(0, utils_1.formatError)(error)}`, 'error');
+                        (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { cTUid: entryRequestOption.cTUid, locale: entryRequestOption.locale }), `Error in publishing entries of ${entryRequestOption.cTUid} in locale ${entryRequestOption.locale}`);
                     });
                 }
-                (0, utils_1.log)(this.importConfig, 'All the entries have been published successfully', 'success');
+                cli_utilities_1.log.success('All the entries have been published successfully', this.importConfig.context);
             }
+            else {
+                cli_utilities_1.log.info('Skipping entry publishing as per configuration', this.importConfig.context);
+            }
+            cli_utilities_1.log.debug('Creating entry data for variant entries', this.importConfig.context);
             this.createEntryDataForVariantEntry();
         }
         catch (error) {
             this.createEntryDataForVariantEntry();
-            (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.importConfig.context));
             throw new Error('Error while importing entries');
         }
     }
@@ -128,11 +151,13 @@ class EntriesImport extends base_class_1.default {
         }
     }
     async disableMandatoryCTReferences() {
+        cli_utilities_1.log.debug(`Starting to disable mandatory CT references for ${this.cTs.length} content types`, this.importConfig.context);
         const onSuccess = ({ response: contentType, apiData: { uid } }) => {
-            (0, utils_1.log)(this.importConfig, `${uid} content type references removed temporarily`, 'success');
+            cli_utilities_1.log.success(`${uid} content type references removed temporarily`, this.importConfig.context);
+            cli_utilities_1.log.debug(`Successfully processed content type: ${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 }));
             throw new Error(`${uid} content type references removal failed`);
         };
         return await this.makeConcurrentCall({
@@ -147,7 +172,9 @@ class EntriesImport extends base_class_1.default {
             },
             concurrencyLimit: this.importConcurrency,
         }).then(() => {
+            cli_utilities_1.log.debug(`Writing ${this.modifiedCTs.length} modified content types to file`, this.importConfig.context);
             utils_1.fsUtil.writeFile(this.modifiedCTsPath, this.modifiedCTs);
+            cli_utilities_1.log.success('Content type reference removal completed', this.importConfig.context);
         });
     }
     /**
@@ -227,10 +254,12 @@ class EntriesImport extends base_class_1.default {
         const indexer = fs.indexFileContent;
         const indexerCount = (0, lodash_1.values)(indexer).length;
         if (indexerCount === 0) {
+            cli_utilities_1.log.debug(`No entries found for content type ${cTUid} in locale ${locale}`, this.importConfig.context);
             return Promise.resolve();
         }
-        // log(this.importConfig, `Starting to create entries for ${cTUid} in locale ${locale}`, 'info');
+        cli_utilities_1.log.debug(`Starting to create entries for ${cTUid} in locale ${locale} - ${indexerCount} chunks to process`, this.importConfig.context);
         const isMasterLocale = locale === ((_b = (_a = this.importConfig) === null || _a === void 0 ? void 0 : _a.master_locale) === null || _b === void 0 ? void 0 : _b.code);
+        cli_utilities_1.log.debug(`Processing ${isMasterLocale ? 'master' : 'non-master'} locale: ${locale}`, this.importConfig.context);
         // Write created entries
         const entriesCreateFileHelper = new cli_utilities_1.FsUtility({
             moduleName: 'entries',
@@ -250,19 +279,22 @@ class EntriesImport extends base_class_1.default {
             omitKeys: this.entriesConfig.invalidKeys,
         });
         const contentType = (0, lodash_1.find)(this.cTs, { uid: cTUid });
+        cli_utilities_1.log.debug(`Found content type schema for ${cTUid}`, this.importConfig.context);
         const onSuccess = ({ response, apiData: entry, additionalInfo }) => {
             var _a, _b;
             if ((_a = additionalInfo[entry.uid]) === null || _a === void 0 ? void 0 : _a.isLocalized) {
                 let oldUid = additionalInfo[entry.uid].entryOldUid;
                 this.entriesForVariant.push({ content_type: cTUid, entry_uid: oldUid, locale });
-                (0, utils_1.log)(this.importConfig, `Localized entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`, 'info');
+                cli_utilities_1.log.info(`Localized entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`, this.importConfig.context);
+                cli_utilities_1.log.debug(`Mapped localized entry UID: ${entry.uid} → ${oldUid}`, this.importConfig.context);
                 entry.uid = oldUid;
                 entry.entryOldUid = oldUid;
                 entry.sourceEntryFilePath = path.join((0, cli_utilities_1.sanitizePath)(basePath), (0, cli_utilities_1.sanitizePath)(additionalInfo.entryFileName)); // stores source file path temporarily
                 entriesCreateFileHelper.writeIntoFile({ [oldUid]: entry }, { mapKeyVal: true });
             }
             else {
-                (0, utils_1.log)(this.importConfig, `Created entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`, 'info');
+                cli_utilities_1.log.info(`Created entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`, this.importConfig.context);
+                cli_utilities_1.log.debug(`Created entry UID mapping: ${entry.uid} → ${response.uid}`, this.importConfig.context);
                 this.entriesForVariant.push({ content_type: cTUid, entry_uid: entry.uid, locale });
                 // This is for creating localized entries that do not have a counterpart in master locale.
                 // For example : To create entry1 in fr-fr, where en-us is the master locale
@@ -270,6 +302,7 @@ class EntriesImport extends base_class_1.default {
                 // thus entry1 has to be removed from en-us at the end.
                 if (!isMasterLocale && !((_b = additionalInfo[entry.uid]) === null || _b === void 0 ? void 0 : _b.isLocalized)) {
                     this.autoCreatedEntries.push({ cTUid, locale, entryUid: response.uid });
+                    cli_utilities_1.log.debug(`Marked entry for auto-cleanup: ${response.uid} in master locale`, this.importConfig.context);
                 }
                 this.entriesUidMapper[entry.uid] = response.uid;
                 entry.sourceEntryFilePath = path.join((0, cli_utilities_1.sanitizePath)(basePath), (0, cli_utilities_1.sanitizePath)(additionalInfo.entryFileName)); // stores source file path temporarily
@@ -282,6 +315,7 @@ class EntriesImport extends base_class_1.default {
             const { title, uid } = entry;
             // NOTE Remove from list if any entry import failed
             this.entriesForVariant = this.entriesForVariant.filter((item) => !(item.locale === locale && item.entry_uid === uid));
+            cli_utilities_1.log.debug(`Removed failed entry from variant list: ${uid}`, this.importConfig.context);
             // NOTE: write existing entries into files to handler later
             if (error.errorCode === 119) {
                 if (((_a = error === null || error === void 0 ? void 0 : error.errors) === null || _a === void 0 ? void 0 : _a.title) || ((_b = error === null || error === void 0 ? void 0 : error.errors) === null || _b === void 0 ? void 0 : _b.uid)) {
@@ -289,29 +323,30 @@ class EntriesImport extends base_class_1.default {
                         entry.entryOldUid = uid;
                         entry.sourceEntryFilePath = path.join((0, cli_utilities_1.sanitizePath)(basePath), (0, cli_utilities_1.sanitizePath)(additionalInfo.entryFileName)); // stores source file path temporarily
                         existingEntriesFileHelper.writeIntoFile({ [uid]: entry }, { mapKeyVal: true });
+                        cli_utilities_1.log.debug(`Queued existing entry for replacement: ${title} (${uid})`, this.importConfig.context);
                     }
                     if (!this.importConfig.skipExisting) {
-                        (0, utils_1.log)(this.importConfig, `Entry '${title}' already exists`, 'info');
+                        cli_utilities_1.log.info(`Entry '${title}' already exists`, this.importConfig.context);
                     }
                 }
                 else {
-                    (0, utils_1.log)(this.importConfig, `${title} entry of content type ${cTUid} in locale ${locale} failed to create`, '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), { cTUid: cTUid, locale }));
                     this.failedEntries.push({ content_type: cTUid, locale, entry: { uid, title } });
                 }
             }
             else {
-                (0, utils_1.log)(this.importConfig, `${title} entry of content type ${cTUid} in locale ${locale} failed to create`, '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), { cTUid: cTUid, locale }));
                 this.failedEntries.push({ content_type: cTUid, locale, entry: { uid, title } });
             }
         };
         for (const index in indexer) {
+            cli_utilities_1.log.debug(`Processing chunk ${index} of ${indexerCount} for ${cTUid} in ${locale}`, this.importConfig.context);
             const chunk = await fs.readChunkFiles.next().catch((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), { cTUid: cTUid, locale }));
             });
             if (chunk) {
                 let apiContent = (0, lodash_1.values)(chunk);
+                cli_utilities_1.log.debug(`Processing ${apiContent.length} entries in chunk ${index}`, this.importConfig.context);
                 await this.makeConcurrentCall({
                     apiContent,
                     processName,
@@ -329,7 +364,7 @@ class EntriesImport extends base_class_1.default {
                 }).then(() => {
                     entriesCreateFileHelper === null || entriesCreateFileHelper === void 0 ? void 0 : entriesCreateFileHelper.completeFile(true);
                     existingEntriesFileHelper === null || existingEntriesFileHelper === void 0 ? void 0 : existingEntriesFileHelper.completeFile(true);
-                    (0, utils_1.log)(this.importConfig, `Created entries for content type ${cTUid} in locale ${locale}`, 'success');
+                    cli_utilities_1.log.success(`Created entries for content type ${cTUid} in locale ${locale}`, this.importConfig.context);
                 });
             }
         }
@@ -342,23 +377,29 @@ class EntriesImport extends base_class_1.default {
     serializeEntries(apiOptions) {
         let { apiData: entry, additionalInfo: { cTUid, locale, contentType, isMasterLocale }, } = apiOptions;
         try {
+            cli_utilities_1.log.debug(`Serializing entry: ${entry.title} (${entry.uid}) for ${cTUid} in ${locale}`, this.importConfig.context);
             if (this.jsonRteCTs.indexOf(cTUid) > -1) {
                 entry = (0, utils_1.removeUidsFromJsonRteFields)(entry, contentType.schema);
+                cli_utilities_1.log.debug(`Removed UIDs from JSON RTE fields for entry: ${entry.uid}`, this.importConfig.context);
             }
             // remove entry references from json-rte fields
             if (this.jsonRteCTsWithRef.indexOf(cTUid) > -1) {
                 entry = (0, utils_1.removeEntryRefsFromJSONRTE)(entry, contentType.schema);
+                cli_utilities_1.log.debug(`Removed entry references from JSON RTE fields for entry: ${entry.uid}`, this.importConfig.context);
             }
             if (this.rteCTsWithRef.indexOf(cTUid) > -1) {
                 entry = (0, utils_1.removeEntryRefsFromJSONRTE)(entry, contentType.schema);
+                cli_utilities_1.log.debug(`Removed entry references from RTE fields for entry: ${entry.uid}`, this.importConfig.context);
             }
             //will remove term if term doesn't exists in taxonomy
             (0, utils_1.lookUpTerms)(contentType === null || contentType === void 0 ? void 0 : contentType.schema, entry, this.taxonomies, this.importConfig);
+            cli_utilities_1.log.debug(`Processed taxonomy terms for entry: ${entry.uid}`, this.importConfig.context);
             // will replace all old asset uid/urls with new ones
             entry = (0, utils_1.lookupAssets)({
                 content_type: contentType,
                 entry: entry,
             }, this.assetUidMapper, this.assetUrlMapper, path.join(this.entriesPath, cTUid), this.installedExtensions);
+            cli_utilities_1.log.debug(`Processed asset lookups for entry: ${entry.uid}`, this.importConfig.context);
             delete entry.publish_details;
             // checking the entry is a localized one or not
             if (!isMasterLocale && this.entriesUidMapper.hasOwnProperty(entry.uid)) {
@@ -369,13 +410,14 @@ class EntriesImport extends base_class_1.default {
                     isLocalized: true,
                     entryOldUid: entry.uid,
                 };
+                cli_utilities_1.log.debug(`Prepared localized entry: ${entry.uid} → ${this.entriesUidMapper[entry.uid]}`, this.importConfig.context);
                 return apiOptions;
             }
             apiOptions.apiData = entry;
+            cli_utilities_1.log.debug(`Entry serialization completed for: ${entry.uid}`, this.importConfig.context);
         }
         catch (error) {
-            (0, utils_1.log)(this.importConfig, `${entry.title} entry of content type ${cTUid} in locale ${locale} failed to create`, '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), { cTUid, locale }));
             this.failedEntries.push({ content_type: cTUid, locale, entry: { uid: entry.uid, title: entry.title } });
             apiOptions.apiData = null;
         }
@@ -389,8 +431,10 @@ class EntriesImport extends base_class_1.default {
         const indexer = fs.indexFileContent;
         const indexerCount = (0, lodash_1.values)(indexer).length;
         if (indexerCount === 0) {
+            cli_utilities_1.log.debug(`No existing entries found for replacement in ${cTUid} - ${locale}`, this.importConfig.context);
             return Promise.resolve();
         }
+        cli_utilities_1.log.debug(`Starting to replace entries for ${cTUid} in locale ${locale} - ${indexerCount} chunks to process`, this.importConfig.context);
         // Write updated entries
         const entriesReplaceFileHelper = new cli_utilities_1.FsUtility({
             moduleName: 'entries',
@@ -401,18 +445,19 @@ class EntriesImport extends base_class_1.default {
             useIndexer: true,
             omitKeys: this.entriesConfig.invalidKeys,
         });
-        // log(this.importConfig, `Starting to update entries with references for ${cTUid} in locale ${locale}`, 'info');
         const contentType = (0, lodash_1.find)(this.cTs, { uid: cTUid });
+        cli_utilities_1.log.debug(`Found content type schema for replacement: ${cTUid}`, this.importConfig.context);
         const onSuccess = ({ response, apiData: entry, additionalInfo }) => {
-            (0, utils_1.log)(this.importConfig, `Replaced entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`, 'info');
+            cli_utilities_1.log.info(`Replaced entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`, this.importConfig.context);
+            cli_utilities_1.log.debug(`Replaced entry UID mapping: ${entry.uid} → ${response.uid}`, this.importConfig.context);
             this.entriesUidMapper[entry.uid] = response.uid;
             entriesReplaceFileHelper.writeIntoFile({ [entry.uid]: entry }, { mapKeyVal: true });
         };
         const onReject = ({ error, apiData: { uid, title } }) => {
             // NOTE Remove from list if any entry import failed
             this.entriesForVariant = this.entriesForVariant.filter((item) => !(item.locale === locale && item.entry_uid === uid));
-            (0, utils_1.log)(this.importConfig, `${title} entry of content type ${cTUid} in locale ${locale} failed to replace`, 'error');
-            (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
+            cli_utilities_1.log.debug(`Removed failed replacement entry from variant list: ${uid}`, this.importConfig.context);
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { cTUid, locale }));
             this.failedEntries.push({
                 content_type: cTUid,
                 locale,
@@ -421,11 +466,13 @@ class EntriesImport extends base_class_1.default {
             });
         };
         for (const index in indexer) {
+            cli_utilities_1.log.debug(`Processing replacement chunk ${index} of ${indexerCount} for ${cTUid} in ${locale}`, this.importConfig.context);
             const chunk = await fs.readChunkFiles.next().catch((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), { cTUid, locale }));
             });
             if (chunk) {
                 let apiContent = (0, lodash_1.values)(chunk);
+                cli_utilities_1.log.debug(`Processing ${apiContent.length} entries for replacement in chunk ${index}`, this.importConfig.context);
                 await this.makeConcurrentCall({
                     apiContent,
                     processName,
@@ -441,7 +488,7 @@ class EntriesImport extends base_class_1.default {
                     concurrencyLimit: this.importConcurrency,
                 }, this.replaceEntriesHandler.bind(this)).then(() => {
                     entriesReplaceFileHelper === null || entriesReplaceFileHelper === void 0 ? void 0 : entriesReplaceFileHelper.completeFile(true);
-                    (0, utils_1.log)(this.importConfig, `Replaced entries for content type ${cTUid} in locale ${locale}`, 'success');
+                    cli_utilities_1.log.success(`Replaced entries for content type ${cTUid} in locale ${locale}`, this.importConfig.context);
                 });
             }
         }
@@ -515,18 +562,21 @@ class EntriesImport extends base_class_1.default {
         const indexer = fs.indexFileContent;
         const indexerCount = (0, lodash_1.values)(indexer).length;
         if (indexerCount === 0) {
+            cli_utilities_1.log.debug(`No entries found for reference updates in ${cTUid} - ${locale}`, this.importConfig.context);
             return Promise.resolve();
         }
-        // log(this.importConfig, `Starting to update entries with references for ${cTUid} in locale ${locale}`, 'info');
+        cli_utilities_1.log.debug(`Starting to update entries with references for ${cTUid} in locale ${locale} - ${indexerCount} chunks to process`, this.importConfig.context);
         const contentType = (0, lodash_1.find)(this.cTs, { uid: cTUid });
+        cli_utilities_1.log.debug(`Found content type schema for reference updates: ${cTUid}`, this.importConfig.context);
         const onSuccess = ({ response, apiData: { uid, url, title } }) => {
-            (0, utils_1.log)(this.importConfig, `Updated entry: '${title}' of content type ${cTUid} in locale ${locale}`, 'info');
+            cli_utilities_1.log.info(`Updated entry: '${title}' of content type ${cTUid} in locale ${locale}`, this.importConfig.context);
+            cli_utilities_1.log.debug(`Updated entry references for: ${uid}`, this.importConfig.context);
         };
         const onReject = ({ error, apiData: { uid, title } }) => {
             // NOTE Remove from list if any entry import failed
             this.entriesForVariant = this.entriesForVariant.filter((item) => !(item.locale === locale && item.entry_uid === uid));
-            (0, utils_1.log)(this.importConfig, `${title} entry of content type ${cTUid} in locale ${locale} failed to update`, 'error');
-            (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
+            cli_utilities_1.log.debug(`Removed failed reference update entry from variant list: ${uid}`, this.importConfig.context);
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { cTUid, locale }));
             this.failedEntries.push({
                 content_type: cTUid,
                 locale,
@@ -535,11 +585,13 @@ class EntriesImport extends base_class_1.default {
             });
         };
         for (const index in indexer) {
+            cli_utilities_1.log.debug(`Processing reference update chunk ${index} of ${indexerCount} for ${cTUid} in ${locale}`, this.importConfig.context);
             const chunk = await fs.readChunkFiles.next().catch((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), { cTUid, locale }), 'Error');
             });
             if (chunk) {
                 let apiContent = (0, lodash_1.values)(chunk);
+                cli_utilities_1.log.debug(`Processing ${apiContent.length} entries for reference updates in chunk ${index}`, this.importConfig.context);
                 await this.makeConcurrentCall({
                     apiContent,
                     processName,
@@ -555,7 +607,7 @@ class EntriesImport extends base_class_1.default {
                     },
                     concurrencyLimit: this.importConcurrency,
                 }).then(() => {
-                    (0, utils_1.log)(this.importConfig, `Updated entries for content type ${cTUid} in locale ${locale}`, 'success');
+                    cli_utilities_1.log.success(`Updated entries for content type ${cTUid} in locale ${locale}`, this.importConfig.context);
                 });
             }
         }
@@ -568,9 +620,11 @@ class EntriesImport extends base_class_1.default {
     serializeUpdateEntries(apiOptions) {
         let { apiData: entry, additionalInfo: { cTUid, locale, contentType }, } = apiOptions;
         try {
+            cli_utilities_1.log.debug(`Serializing entry update: ${entry.title} (${entry.uid}) for ${cTUid} in ${locale}`, this.importConfig.context);
             const sourceEntryFilePath = entry.sourceEntryFilePath;
             const sourceEntry = (utils_1.fsUtil.readFile(sourceEntryFilePath) || {})[entry.entryOldUid];
             const newUid = this.entriesUidMapper[entry.entryOldUid];
+            cli_utilities_1.log.debug(`Updating entry references: ${entry.entryOldUid} → ${newUid}`, this.importConfig.context);
             // Removing temp values
             delete entry.sourceEntryFilePath;
             delete entry.entryOldUid;
@@ -581,33 +635,36 @@ class EntriesImport extends base_class_1.default {
                     mappedAssetUids: this.assetUidMapper,
                     mappedAssetUrls: this.assetUrlMapper,
                 });
+                cli_utilities_1.log.debug(`Restored JSON RTE entry references for: ${newUid}`, this.importConfig.context);
             }
             entry = (0, utils_1.lookupAssets)({
                 content_type: contentType,
                 entry: entry,
             }, this.assetUidMapper, this.assetUrlMapper, path.join(this.entriesPath, cTUid), this.installedExtensions);
+            cli_utilities_1.log.debug(`Processed asset lookups for entry update: ${newUid}`, this.importConfig.context);
             entry = (0, utils_1.lookupEntries)({
                 content_type: contentType,
                 entry,
             }, this.entriesUidMapper, path.join(this.entriesMapperPath, cTUid, locale));
+            cli_utilities_1.log.debug(`Processed entry lookups for entry update: ${newUid}`, this.importConfig.context);
             const entryResponse = this.stack.contentType(contentType.uid).entry(newUid);
             Object.assign(entryResponse, (0, lodash_1.cloneDeep)(entry), { uid: newUid });
             delete entryResponse.publish_details;
             apiOptions.apiData = entryResponse;
+            cli_utilities_1.log.debug(`Entry update serialization completed for: ${newUid}`, this.importConfig.context);
         }
         catch (error) {
-            (0, utils_1.log)(this.importConfig, `${entry.title} entry of content type ${cTUid} in locale ${locale} failed to update`, '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), { cTUid, locale }));
             apiOptions.apiData = null;
         }
         return apiOptions;
     }
     async enableMandatoryCTReferences() {
         const onSuccess = ({ response: contentType, apiData: { uid } }) => {
-            (0, utils_1.log)(this.importConfig, `${uid} content type references updated`, 'success');
+            cli_utilities_1.log.success(`${uid} content type references updated`, 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 }), 'Error');
             throw new Error(`Failed to update references of content type ${uid}`);
         };
         return await this.makeConcurrentCall({
@@ -645,12 +702,12 @@ class EntriesImport extends base_class_1.default {
         const onSuccess = ({ response, apiData: { entryUid } }) => {
             // NOTE Remove entry from list
             this.entriesForVariant = this.entriesForVariant.filter((item) => { var _a, _b; return !(item.entry_uid === entryUid && item.locale === ((_b = (_a = this.importConfig) === null || _a === void 0 ? void 0 : _a.master_locale) === null || _b === void 0 ? void 0 : _b.code)); });
-            (0, utils_1.log)(this.importConfig, `Auto created entry in master locale removed - entry uid ${entryUid} `, 'success');
+            cli_utilities_1.log.success(`Auto created entry in master locale removed - entry uid ${entryUid} `, this.importConfig.context);
         };
         const onReject = ({ error, apiData: { entryUid } }) => {
             // NOTE Remove entry from list
             this.entriesForVariant = this.entriesForVariant.filter((item) => { var _a, _b; return !(item.entry_uid === entryUid && item.locale === ((_b = (_a = this.importConfig) === null || _a === void 0 ? void 0 : _a.master_locale) === null || _b === void 0 ? void 0 : _b.code)); });
-            (0, utils_1.log)(this.importConfig, `Failed to remove auto created entry in master locale - entry uid ${entryUid} \n ${(0, utils_1.formatError)(error)}`, 'error');
+            (0, cli_utilities_1.handleAndLogError)(error, Object.assign({}, this.importConfig.context), `Failed to remove auto created entry in master locale - entry uid ${entryUid}`);
         };
         return await this.makeConcurrentCall({
             processName: 'Remove auto created entry in master locale',
@@ -669,18 +726,24 @@ class EntriesImport extends base_class_1.default {
         var _a, _b, _c;
         let cTsWithFieldRules = utils_1.fsUtil.readFile(path.join(this.cTsPath + '/field_rules_uid.json'));
         if (!cTsWithFieldRules || (cTsWithFieldRules === null || cTsWithFieldRules === void 0 ? void 0 : cTsWithFieldRules.length) === 0) {
+            cli_utilities_1.log.debug('No content types with field rules found to update', this.importConfig.context);
             return;
         }
+        cli_utilities_1.log.debug(`Found ${cTsWithFieldRules.length} content types with field rules to update`, this.importConfig.context);
         for (let cTUid of cTsWithFieldRules) {
+            cli_utilities_1.log.debug(`Processing field rules for content type: ${cTUid}`, this.importConfig.context);
             const cTs = utils_1.fsUtil.readFile(path.join(this.cTsPath, 'schema.json'));
             const contentType = (0, lodash_1.find)(cTs, { uid: cTUid });
             if (contentType.field_rules) {
+                cli_utilities_1.log.debug(`Found ${contentType.field_rules.length} field rules for content type: ${cTUid}`, this.importConfig.context);
                 const fieldDatatypeMap = {};
                 for (let i = 0; i < ((_a = contentType.schema) === null || _a === void 0 ? void 0 : _a.length); i++) {
                     const field = contentType.schema[i].uid;
                     fieldDatatypeMap[field] = contentType.schema[i].data_type;
                 }
+                cli_utilities_1.log.debug(`Built field datatype map for ${Object.keys(fieldDatatypeMap).length} fields`, this.importConfig.context);
                 let fieldRuleLength = (_b = contentType.field_rules) === null || _b === void 0 ? void 0 : _b.length;
+                let updatedRulesCount = 0;
                 for (let k = 0; k < fieldRuleLength; k++) {
                     let fieldRuleConditionLength = (_c = contentType.field_rules[k].conditions) === null || _c === void 0 ? void 0 : _c.length;
                     for (let i = 0; i < fieldRuleConditionLength; i++) {
@@ -692,32 +755,36 @@ class EntriesImport extends base_class_1.default {
                                 let splittedFieldRulesValue = element;
                                 if (this.entriesUidMapper.hasOwnProperty(splittedFieldRulesValue)) {
                                     updatedValue.push(this.entriesUidMapper[splittedFieldRulesValue]);
+                                    cli_utilities_1.log.debug(`Updated field rule reference: ${splittedFieldRulesValue} → ${this.entriesUidMapper[splittedFieldRulesValue]}`, this.importConfig.context);
                                 }
                                 else {
                                     updatedValue.push(element);
                                 }
                             }
                             contentType.field_rules[k].conditions[i].value = updatedValue.join('.');
+                            updatedRulesCount++;
                         }
                     }
                 }
+                cli_utilities_1.log.debug(`Updated ${updatedRulesCount} field rule references for content type: ${cTUid}`, this.importConfig.context);
                 const contentTypeResponse = await this.stack
                     .contentType(contentType.uid)
                     .fetch()
                     .catch((error) => {
-                    (0, utils_1.log)(this.importConfig, `failed to update the field rules of ${cTUid} ${(0, utils_1.formatError)(error)}`, 'error');
+                    (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { cTUid }));
                 });
                 if (!contentTypeResponse) {
+                    cli_utilities_1.log.debug(`Skipping field rules update for ${cTUid} - content type not found`, this.importConfig.context);
                     continue;
                 }
                 contentTypeResponse.field_rules = contentType.field_rules;
                 await contentTypeResponse.update().catch((error) => {
-                    (0, utils_1.log)(this.importConfig, `failed to update the field rules of ${cTUid} ${(0, utils_1.formatError)(error)}`, 'error');
+                    (0, cli_utilities_1.handleAndLogError)(error, Object.assign(Object.assign({}, this.importConfig.context), { cTUid }));
                 });
-                (0, utils_1.log)(this.importConfig, `Updated the field rules of ${cTUid}`, 'info');
+                cli_utilities_1.log.success(`Updated the field rules of ${cTUid}`, this.importConfig.context);
             }
             else {
-                (0, utils_1.log)(this.importConfig, `No field rules found in content type ${cTUid} to update`, 'info');
+                cli_utilities_1.log.info(`No field rules found in content type ${cTUid} to update`, this.importConfig.context);
             }
         }
     }
@@ -730,19 +797,21 @@ class EntriesImport extends base_class_1.default {
         const indexerCount = (0, lodash_1.values)(indexer).length;
         const contentType = (0, lodash_1.find)(this.cTs, { uid: cTUid });
         if (indexerCount === 0) {
+            cli_utilities_1.log.debug(`No entries found for publishing in ${cTUid} - ${locale}`, this.importConfig.context);
             return Promise.resolve();
         }
-        // log(this.importConfig, `Starting publish entries for ${cTUid} in locale ${locale}`, 'info');
+        cli_utilities_1.log.debug(`Starting to publish entries for ${cTUid} in locale ${locale} - ${indexerCount} chunks to process`, this.importConfig.context);
         const onSuccess = ({ response, apiData: { environments, entryUid, locales }, additionalInfo }) => {
-            (0, utils_1.log)(this.importConfig, `Published the entry: '${entryUid}' of Content Type '${cTUid}' and Locale '${locale}' in Environments '${environments === null || environments === void 0 ? void 0 : environments.join(',')}' and Locales '${locales === null || locales === void 0 ? void 0 : locales.join(',')}'`, 'info');
+            cli_utilities_1.log.success(`Published the entry: '${entryUid}' of Content Type '${cTUid}' and Locale '${locale}' in Environments '${environments === null || environments === void 0 ? void 0 : environments.join(',')}' and Locales '${locales === null || locales === void 0 ? void 0 : locales.join(',')}'`, this.importConfig.context);
+            cli_utilities_1.log.debug(`Published entry ${entryUid} to ${(environments === null || environments === void 0 ? void 0 : environments.length) || 0} environments and ${(locales === null || locales === void 0 ? void 0 : locales.length) || 0} locales`, this.importConfig.context);
         };
         const onReject = ({ error, apiData: { environments, entryUid, locales }, additionalInfo }) => {
-            (0, utils_1.log)(this.importConfig, `Failed to publish: '${entryUid}' entry of Content Type '${cTUid}' and Locale '${locale}' in Environments '${environments === null || environments === void 0 ? void 0 : environments.join(',')}' and Locales '${locales === null || locales === void 0 ? void 0 : locales.join(',')}'`, '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), { cTUid, locale }), `Failed to publish: '${entryUid}' entry of Content Type '${cTUid}' and Locale '${locale}' in Environments '${environments === null || environments === void 0 ? void 0 : environments.join(',')}' and Locales '${locales === null || locales === void 0 ? void 0 : locales.join(',')}'`);
         };
         for (const index in indexer) {
+            cli_utilities_1.log.debug(`Processing publish chunk ${index} of ${indexerCount} for ${cTUid} in ${locale}`, this.importConfig.context);
             const chunk = await fs.readChunkFiles.next().catch((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), { cTUid, locale }));
             });
             if (chunk) {
                 let apiContent = (0, lodash_1.values)(chunk);
@@ -755,7 +824,9 @@ class EntriesImport extends base_class_1.default {
                     return []; // Return an empty array if publish_details is empty
                 });
                 apiContent = apiContentDuplicate;
+                cli_utilities_1.log.debug(`Processing ${apiContent.length} publishable entries in chunk ${index}`, this.importConfig.context);
                 if ((apiContent === null || apiContent === void 0 ? void 0 : apiContent.length) === 0) {
+                    cli_utilities_1.log.debug(`No publishable entries found in chunk ${index}`, this.importConfig.context);
                     continue;
                 }
                 else {
@@ -774,7 +845,7 @@ class EntriesImport extends base_class_1.default {
                         },
                         concurrencyLimit: this.importConcurrency,
                     }).then(() => {
-                        (0, utils_1.log)(this.importConfig, `Published entries for content type ${cTUid} in locale ${locale}`, 'success');
+                        cli_utilities_1.log.success(`Published entries for content type ${cTUid} in locale ${locale}`, this.importConfig.context);
                     });
                 }
             }