@contentstack/cli-cm-import 1.8.4 → 1.9.1

package/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.8.4 linux-x64 node-v18.17.1
+@contentstack/cli-cm-import/1.9.1 linux-x64 node-v18.18.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/bin/dev

@@ -1,17 +1,6 @@
 #!/usr/bin/env node
 
-const oclif = require('@oclif/core');
-
-const path = require('path');
-const project = path.join(__dirname, '..', 'tsconfig.json');
-
-// In dev mode -> use ts-node and dev plugins
-process.env.NODE_ENV = 'development';
-
-require('ts-node').register({ project });
-
-// In dev mode, always show stack traces
-oclif.settings.debug = true;
-
-// Start the CLI
-oclif.run().then(oclif.flush).catch(oclif.Errors.handle);
+(async () => {
+  const oclif = require('@oclif/core');
+  await oclif.execute({ type: 'cjs', development: true, dir: __dirname });
+})();

package/lib/commands/cm/stacks/import.js

@@ -11,21 +11,22 @@ class ImportCommand extends cli_command_1.Command {
         // setup import config
         // initialize the importer
         // start import
-        let contentDir;
+        let backupDir;
         try {
             const { flags } = await this.parse(ImportCommand);
             let importConfig = await (0, utils_1.setupImportConfig)(flags);
             // Note setting host to create cma client
             importConfig.host = this.cmaHost;
-            contentDir = importConfig.contentDir;
+            backupDir = importConfig.backupDir;
             const managementAPIClient = await (0, cli_utilities_1.managementSDKClient)(importConfig);
             const moduleImporter = new import_1.ModuleImporter(managementAPIClient, importConfig);
             await moduleImporter.start();
             (0, utils_1.log)(importConfig, `The content has been imported to the stack ${importConfig.apiKey} successfully!`, 'success');
+            (0, utils_1.log)(importConfig, `The log has been stored at '${node_path_1.default.join(importConfig.backupDir, 'logs', 'import')}'`, 'success');
         }
         catch (error) {
-            (0, utils_1.log)({ data: contentDir }, `Failed to import stack content - ${(0, utils_1.formatError)(error)}`, 'error');
-            (0, utils_1.log)({ data: contentDir }, `The log has been stored at ${{ data: contentDir } ? node_path_1.default.join(contentDir || __dirname, 'logs', 'import') : node_path_1.default.join(__dirname, 'logs')}`, 'info');
+            (0, utils_1.log)({ data: backupDir }, `Failed to import stack content - ${(0, utils_1.formatError)(error)}`, 'error');
+            (0, utils_1.log)({ data: backupDir }, `The log has been stored at ${{ data: backupDir } ? node_path_1.default.join(backupDir || __dirname, 'logs', 'import') : node_path_1.default.join(__dirname, 'logs')}`, 'info');
         }
     }
 }

package/lib/config/index.js

@@ -84,9 +84,9 @@ const config = {
             publishAssets: true,
             fileName: 'assets.json',
             importSameStructure: true,
-            uploadAssetsConcurrency: 10,
+            uploadAssetsConcurrency: 2,
             displayExecutionTime: false,
-            importFoldersConcurrency: 10,
+            importFoldersConcurrency: 1,
             includeVersionedAssets: false,
             host: 'https://api.contentstack.io',
             folderValidKeys: ['name', 'parent_uid'],
@@ -367,19 +367,6 @@ const config = {
         stacks: '/stacks/',
         labels: '/labels/',
     },
-    updatedModules: [
-        'assets',
-        'extensions',
-        'locales',
-        'marketplace-apps',
-        'labels',
-        'global-fields',
-        'content-types',
-        'webhooks',
-        'custom-roles',
-        'workflows',
-        'entries',
-    ],
     rateLimit: 5,
     preserveStackVersion: false,
     entriesPublish: true,
@@ -390,7 +377,6 @@ const config = {
     developerHubBaseUrl: '',
     marketplaceAppEncryptionKey: 'nF2ejRQcTv',
     getEncryptionKeyMaxRetry: 3,
-    useNewModuleStructure: false,
     // useBackedupDir: '',
     // backupConcurrency: 10,
 };

package/lib/import/module-importer.js

@@ -23,7 +23,7 @@ class ModuleImporter {
         const httpClient = new cli_utilities_1.HttpClient({
             headers: { api_key: this.importConfig.apiKey, authorization: this.importConfig.management_token },
         });
-        const { data } = await httpClient.post('https://api.contentstack.io/v3/locales', {
+        const { data } = await httpClient.post(`https://${this.importConfig.host}/v3/locales`, {
             locale: {
                 name: 'English',
                 code: 'en-us',
@@ -47,6 +47,7 @@ class ModuleImporter {
         return this.import();
     }
     async import() {
+        (0, utils_1.log)(this.importConfig, `Starting to import content version ${this.importConfig.contentVersion}`, 'info');
         // checks for single module or all modules
         if (this.importConfig.singleModuleImport) {
             return this.importByModuleByName(this.importConfig.moduleName);
@@ -55,14 +56,10 @@ class ModuleImporter {
     }
     async importByModuleByName(moduleName) {
         (0, utils_1.log)(this.importConfig, `Starting import of ${moduleName} module`, 'info');
-        const basePath = `${this.importConfig.backupDir}/${moduleName}`;
         // import the modules by name
         // calls the module runner which inturn calls the module itself
         // Todo: Implement a mechanism to determine whether module is new or old
-        if (this.importConfig.useNewModuleStructure &&
-            this.importConfig.updatedModules.indexOf(moduleName) !== -1
-        //&& new FsUtility({ basePath }).isNewFsStructure
-        ) {
+        if (this.importConfig.contentVersion === 2) {
             return (0, modules_1.default)({
                 stackAPIClient: this.stackAPIClient,
                 importConfig: this.importConfig,

package/lib/import/modules/assets.js

@@ -7,6 +7,7 @@ const filter_1 = tslib_1.__importDefault(require("lodash/filter"));
 const unionBy_1 = tslib_1.__importDefault(require("lodash/unionBy"));
 const orderBy_1 = tslib_1.__importDefault(require("lodash/orderBy"));
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
+const uniq_1 = tslib_1.__importDefault(require("lodash/uniq"));
 const node_fs_1 = require("node:fs");
 const includes_1 = tslib_1.__importDefault(require("lodash/includes"));
 const node_path_1 = require("node:path");
@@ -210,9 +211,11 @@ class ImportAssets extends base_class_1.default {
         };
         const serializeData = (apiOptions) => {
             const { apiData: asset } = apiOptions;
-            const publishDetails = (0, filter_1.default)(asset.publish_details, 'environment');
+            const publishDetails = (0, filter_1.default)(asset.publish_details, ({ environment }) => {
+                return this.environments.hasOwnProperty(environment);
+            });
+            const environments = (0, uniq_1.default)((0, map_1.default)(publishDetails, ({ environment }) => this.environments[environment].name));
             const locales = (0, map_1.default)(publishDetails, 'locale');
-            const environments = (0, map_1.default)(publishDetails, ({ environment }) => this.environments[environment].name);
             asset.locales = locales;
             asset.environments = environments;
             apiOptions.uid = this.assetsUidMap[asset.uid];

package/lib/import/modules/base-class.js

@@ -90,7 +90,7 @@ class BaseClass {
             // info: Batch No. 20 of import assets is complete
             if (currentIndexer)
                 batchMsg += `Current chunk processing is (${currentIndexer}/${indexerCount})`;
-            (0, utils_1.log)(this.importConfig, `Batch No. (${batchNo}/${totelBatches}) of ${processName} is complete. ${batchMsg}`, 'success');
+            (0, utils_1.log)(this.importConfig, `Batch No. (${batchNo}/${totelBatches}) of ${processName} is complete`, 'success');
         }
         if (this.importConfig.modules.assets.displayExecutionTime) {
             console.log(`Time taken to execute: ${exeTime} milliseconds; wait time: ${exeTime < 1000 ? 1000 - exeTime : 0} milliseconds`);
@@ -105,7 +105,7 @@ class BaseClass {
      * @return {Promise} Promise<void>
      */
     makeAPICall(apiOptions, isLastRequest = false) {
-        var _a, _b;
+        var _a;
         if (apiOptions.serializeData instanceof Function) {
             apiOptions = apiOptions.serializeData(apiOptions);
         }
@@ -169,18 +169,21 @@ class BaseClass {
             case 'create-cts':
                 return this.stack.contentType().create(apiData).then(onSuccess).catch(onReject);
             case 'update-cts':
-                if (additionalInfo.skip) {
-                    return Promise.resolve(onSuccess(apiData));
+                if (!apiData) {
+                    return Promise.resolve();
                 }
                 return apiData.update().then(onSuccess).catch(onReject);
             case 'update-gfs':
+                if (!apiData) {
+                    return Promise.resolve();
+                }
                 return apiData.update().then(onSuccess).catch(onReject);
             case 'create-environments':
-            // return this.stack
-            //   .environment()
-            //   .create({ environment: omit(apiData, ['uid']) as EnvironmentData })
-            //   .then(onSuccess)
-            //   .catch(onReject);
+                return this.stack
+                    .environment()
+                    .create({ environment: (0, omit_1.default)(apiData, ['uid']) })
+                    .then(onSuccess)
+                    .catch(onReject);
             case 'create-labels':
                 return this.stack
                     .label()
@@ -215,6 +218,12 @@ class BaseClass {
                     .then(onSuccess)
                     .catch(onReject);
             case 'create-entries':
+                if (!apiData) {
+                    return Promise.resolve();
+                }
+                if ((_a = additionalInfo[apiData === null || apiData === void 0 ? void 0 : apiData.uid]) === null || _a === void 0 ? void 0 : _a.isLocalized) {
+                    return apiData.update({ locale: additionalInfo.locale }).then(onSuccess).catch(onReject);
+                }
                 return this.stack
                     .contentType(additionalInfo.cTUid)
                     .entry()
@@ -222,22 +231,28 @@ class BaseClass {
                     .then(onSuccess)
                     .catch(onReject);
             case 'update-entries':
+                if (!apiData) {
+                    return Promise.resolve();
+                }
                 return apiData.update({ locale: additionalInfo.locale }).then(onSuccess).catch(onReject);
             case 'publish-entries':
-                if (additionalInfo.skip) {
-                    return Promise.resolve(onSuccess(apiData));
+                if (!apiData || !apiData.entryUid) {
+                    return Promise.resolve();
                 }
                 return this.stack
                     .contentType(additionalInfo.cTUid)
-                    .entry(additionalInfo.entryUid)
-                    .publish({ publishDetails: apiData, locale: additionalInfo.locale })
+                    .entry(apiData.entryUid)
+                    .publish({
+                    publishDetails: { environments: apiData.environments, locales: apiData.locales },
+                    locale: additionalInfo.locale,
+                })
                     .then(onSuccess)
                     .catch(onReject);
             case 'delete-entries':
                 return this.stack
                     .contentType(apiData.cTUid)
                     .entry(apiData.entryUid)
-                    .delete({ locale: (_b = (_a = this.importConfig) === null || _a === void 0 ? void 0 : _a.master_locale) === null || _b === void 0 ? void 0 : _b.code })
+                    .delete({ locale: additionalInfo.locale })
                     .then(onSuccess)
                     .catch(onReject);
             default:

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

@@ -26,7 +26,7 @@ export default class ImportCustomRoles extends BaseClass {
      */
     start(): Promise<void>;
     getLocalesUidMap(): Promise<void>;
-    importCustomRoles(): Promise<string>;
+    importCustomRoles(): Promise<void>;
     /**
      * @method serializeWebhooks
      * @param {ApiOptions} apiOptions ApiOptions

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

@@ -4,7 +4,6 @@ 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 config_1 = tslib_1.__importDefault(require("../../config"));
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const lodash_1 = require("lodash");
@@ -13,17 +12,23 @@ class ImportCustomRoles extends base_class_1.default {
         super({ importConfig, stackAPIClient });
         this.getTransformUidsFactory = (rule) => {
             if (rule.module === 'environment') {
-                rule.environments = (0, lodash_1.map)(rule.environments, (env) => this.environmentsUidMap[env]);
+                if (!(0, isEmpty_1.default)(this.environmentsUidMap)) {
+                    rule.environments = (0, lodash_1.map)(rule.environments, (env) => this.environmentsUidMap[env]);
+                }
             }
             else if (rule.module === 'locale') {
-                rule.locales = (0, lodash_1.map)(rule.locales, (locale) => this.localesUidMap[locale]);
+                if (!(0, isEmpty_1.default)(this.localesUidMap)) {
+                    rule.locales = (0, lodash_1.map)(rule.locales, (locale) => this.localesUidMap[locale]);
+                }
             }
             else if (rule.module === 'entry') {
-                rule.entries = (0, lodash_1.map)(rule.entries, (entry) => this.entriesUidMap[entry]);
+                if (!(0, isEmpty_1.default)(this.entriesUidMap)) {
+                    rule.entries = (0, lodash_1.map)(rule.entries, (entry) => this.entriesUidMap[entry]);
+                }
             }
             return rule;
         };
-        this.customRolesConfig = config_1.default.modules.customRoles;
+        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);
         this.customRolesUidMapperPath = (0, node_path_1.join)(this.customRolesMapperPath, 'uid-mapping.json');
@@ -102,7 +107,7 @@ class ImportCustomRoles extends base_class_1.default {
     async importCustomRoles() {
         if (this.customRoles === undefined || (0, isEmpty_1.default)(this.customRoles)) {
             (0, utils_1.log)(this.importConfig, 'No custom-roles found', 'info');
-            return (0, node_path_1.resolve)();
+            return;
         }
         const apiContent = (0, values_1.default)(this.customRoles);
         const onSuccess = ({ response, apiData: { uid, name } = { uid: null, name: '' } }) => {
@@ -134,7 +139,7 @@ class ImportCustomRoles extends base_class_1.default {
                 entity: 'create-custom-role',
                 includeParamOnCompletion: true,
             },
-            concurrencyLimit: config_1.default.fetchConcurrency || 1,
+            concurrencyLimit: this.importConfig.fetchConcurrency || 1,
         }, undefined, false);
     }
     /**

package/lib/import/modules/entries.js

@@ -35,6 +35,7 @@ class EntriesImport extends base_class_1.default {
         this.jsonRteCTsWithRef = [];
         this.envs = {};
         this.autoCreatedEntries = [];
+        this.failedEntries = [];
     }
     async start() {
         try {
@@ -57,6 +58,12 @@ class EntriesImport extends base_class_1.default {
             }
             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 (this.autoCreatedEntries.length > 0) {
+                (0, utils_1.log)(this.importConfig, 'Removing entries from master language which got created by default', 'info');
+                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');
+                });
+            }
             // Update entries with references
             const entryUpdateRequestOptions = this.populateEntryUpdatePayload();
             for (let entryUpdateRequestOption of entryUpdateRequestOptions) {
@@ -70,12 +77,6 @@ class EntriesImport extends base_class_1.default {
             await this.enableMandatoryCTReferences().catch((error) => {
                 (0, utils_1.log)(this.importConfig, `Error while updating content type references ${(0, utils_1.formatError)(error)}`, 'error');
             });
-            if (this.autoCreatedEntries.length > 0) {
-                (0, utils_1.log)(this.importConfig, 'Removing entries from master language which got created by default', 'info');
-                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');
-                });
-            }
             // 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');
             await this.updateFieldRules().catch((error) => {
@@ -139,15 +140,6 @@ class EntriesImport extends base_class_1.default {
             jsonRteEmbeddedEntries: false,
         };
         (0, utils_1.suppressSchemaReference)(contentType.schema, flag);
-        // Check if suppress modified flag
-        if (flag.suppressed) {
-            this.modifiedCTs.push((0, lodash_1.find)(this.cTs, { uid: contentType.uid }));
-        }
-        else {
-            // Note: Skips the content type from update if no reference found
-            apiOptions.additionalInfo = { skip: true };
-            return apiOptions;
-        }
         if (flag.references) {
             this.refCTs.push(contentType.uid);
         }
@@ -160,6 +152,15 @@ class EntriesImport extends base_class_1.default {
                 }
             }
         }
+        // Check if suppress modified flag
+        if (flag.suppressed) {
+            this.modifiedCTs.push((0, lodash_1.find)(this.cTs, { uid: contentType.uid }));
+        }
+        else {
+            // Note: Skips the content type from update if no reference found
+            apiOptions.apiData = null;
+            return apiOptions;
+        }
         (0, utils_1.lookupExtension)(this.importConfig, contentType.schema, this.importConfig.preserveStackVersion, this.installedExtensions);
         const contentTypePayload = this.stack.contentType(contentType.uid);
         Object.assign(contentTypePayload, (0, lodash_1.cloneDeep)(contentType));
@@ -189,11 +190,11 @@ class EntriesImport extends base_class_1.default {
         if (indexerCount === 0) {
             return Promise.resolve();
         }
-        (0, utils_1.log)(this.importConfig, `Starting to create entries for ${cTUid} in locale ${locale}`, 'info');
+        // log(this.importConfig, `Starting to create entries for ${cTUid} in locale ${locale}`, 'info');
         const isMasterLocale = locale === ((_b = (_a = this.importConfig) === null || _a === void 0 ? void 0 : _a.master_locale) === null || _b === void 0 ? void 0 : _b.code);
         // Write created entries
         const entriesCreateFileHelper = new cli_utilities_1.FsUtility({
-            moduleName: 'created-entries',
+            moduleName: 'entries',
             indexFileName: 'index.json',
             basePath: path.join(this.entriesMapperPath, cTUid, locale),
             chunkFileSize: this.entriesConfig.chunkFileSize,
@@ -201,15 +202,30 @@ class EntriesImport extends base_class_1.default {
             omitKeys: this.entriesConfig.invalidKeys,
         });
         const contentType = (0, lodash_1.find)(this.cTs, { uid: cTUid });
-        const onSuccess = ({ response, apiData: entry, additionalInfo: { entryFileName } }) => {
-            (0, utils_1.log)(this.importConfig, `Created entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`, 'info');
-            this.entriesUidMapper[entry.uid] = response.uid;
-            entry.sourceEntryFilePath = path.join(basePath, entryFileName); // stores source file path temporarily
-            entry.entryOldUid = entry.uid; // stores old uid temporarily
-            if (!isMasterLocale) {
-                this.autoCreatedEntries.push({ cTUid, locale, entryUid: response.uid });
+        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;
+                (0, utils_1.log)(this.importConfig, `Localized entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`, 'info');
+                entry.uid = oldUid;
+                entry.entryOldUid = oldUid;
+                entry.sourceEntryFilePath = path.join(basePath, 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');
+                // 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
+                // entry1 will get created in en-us first, then fr-fr version will be created
+                // 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 });
+                }
+                this.entriesUidMapper[entry.uid] = response.uid;
+                entry.sourceEntryFilePath = path.join(basePath, additionalInfo.entryFileName); // stores source file path temporarily
+                entry.entryOldUid = entry.uid; // stores old uid temporarily
+                entriesCreateFileHelper.writeIntoFile({ [entry.uid]: entry }, { mapKeyVal: true });
             }
-            entriesCreateFileHelper.writeIntoFile({ [response.uid]: entry }, { mapKeyVal: true });
         };
         const onReject = ({ error, apiData: { uid, title } }) => {
             (0, utils_1.log)(this.importConfig, `${title} entry of content type ${cTUid} in locale ${locale} failed to create`, 'error');
@@ -233,7 +249,7 @@ class EntriesImport extends base_class_1.default {
                         entity: 'create-entries',
                         includeParamOnCompletion: true,
                         serializeData: this.serializeEntries.bind(this),
-                        additionalInfo: { contentType, locale, cTUid, entryFileName: indexer[index] },
+                        additionalInfo: { contentType, locale, cTUid, entryFileName: indexer[index], isMasterLocale },
                     },
                     concurrencyLimit: this.importConcurrency,
                 }).then(() => {
@@ -249,21 +265,40 @@ class EntriesImport extends base_class_1.default {
      * @returns {ApiOptions} ApiOptions
      */
     serializeEntries(apiOptions) {
-        let { apiData: entry, additionalInfo: { cTUid, locale, contentType }, } = apiOptions;
-        if (this.jsonRteCTs.indexOf(cTUid) > -1) {
-            entry = (0, utils_1.removeUidsFromJsonRteFields)(entry, contentType.schema);
+        let { apiData: entry, additionalInfo: { cTUid, locale, contentType, isMasterLocale }, } = apiOptions;
+        try {
+            if (this.jsonRteCTs.indexOf(cTUid) > -1) {
+                entry = (0, utils_1.removeUidsFromJsonRteFields)(entry, contentType.schema);
+            }
+            // remove entry references from json-rte fields
+            if (this.jsonRteCTsWithRef.indexOf(cTUid) > -1) {
+                entry = (0, utils_1.removeEntryRefsFromJSONRTE)(entry, contentType.schema);
+            }
+            // 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);
+            delete entry.publish_details;
+            // checking the entry is a localized one or not
+            if (!isMasterLocale && this.entriesUidMapper.hasOwnProperty(entry.uid)) {
+                const entryResponse = this.stack.contentType(contentType.uid).entry(this.entriesUidMapper[entry.uid]);
+                Object.assign(entryResponse, (0, lodash_1.cloneDeep)(entry), { uid: this.entriesUidMapper[entry.uid] });
+                apiOptions.apiData = entryResponse;
+                apiOptions.additionalInfo[entryResponse.uid] = {
+                    isLocalized: true,
+                    entryOldUid: entry.uid
+                };
+                return apiOptions;
+            }
+            apiOptions.apiData = entry;
         }
-        // remove entry references from json-rte fields
-        if (this.jsonRteCTsWithRef.indexOf(cTUid) > -1) {
-            entry = (0, utils_1.removeEntryRefsFromJSONRTE)(entry, contentType.schema);
+        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');
+            this.failedEntries.push({ content_type: cTUid, locale, entry: { uid: entry.uid, title: entry.title } });
+            apiOptions.apiData = null;
         }
-        // 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);
-        delete entry.publish_details;
-        apiOptions.apiData = entry;
         return apiOptions;
     }
     populateEntryUpdatePayload() {
@@ -288,7 +323,7 @@ class EntriesImport extends base_class_1.default {
         if (indexerCount === 0) {
             return Promise.resolve();
         }
-        (0, utils_1.log)(this.importConfig, `Starting to update entries with references for ${cTUid} in locale ${locale}`, 'info');
+        // 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 });
         const onSuccess = ({ response, apiData: { uid, url, title } }) => {
             (0, utils_1.log)(this.importConfig, `Updated entry: '${title}' of content type ${cTUid} in locale ${locale}`, 'info');
@@ -296,7 +331,12 @@ class EntriesImport extends base_class_1.default {
         const onReject = ({ error, apiData: { uid, title } }) => {
             (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');
-            this.failedEntries.push({ content_type: cTUid, locale, entry: { uid: this.entriesUidMapper[uid], title } });
+            this.failedEntries.push({
+                content_type: cTUid,
+                locale,
+                entry: { uid: this.entriesUidMapper[uid], title },
+                entryId: uid,
+            });
         };
         for (const index in indexer) {
             const chunk = await fs.readChunkFiles.next().catch((error) => {
@@ -331,26 +371,34 @@ class EntriesImport extends base_class_1.default {
      */
     serializeUpdateEntries(apiOptions) {
         let { apiData: entry, additionalInfo: { cTUid, locale, contentType }, } = apiOptions;
-        const sourceEntryFilePath = entry.sourceEntryFilePath;
-        const sourceEntry = (utils_1.fsUtil.readFile(sourceEntryFilePath) || {})[entry.entryOldUid];
-        // Removing temp values
-        delete entry.sourceEntryFilePath;
-        delete entry.entryOldUid;
-        if (this.jsonRteCTs.indexOf(cTUid) > -1) {
-            // the entries stored in eSuccessFilePath, have the same uids as the entries from source data
-            entry = (0, utils_1.restoreJsonRteEntryRefs)(entry, sourceEntry, contentType.schema, {
-                mappedAssetUids: this.assetUidMapper,
-                mappedAssetUrls: this.assetUrlMapper,
-            });
+        try {
+            const sourceEntryFilePath = entry.sourceEntryFilePath;
+            const sourceEntry = (utils_1.fsUtil.readFile(sourceEntryFilePath) || {})[entry.entryOldUid];
+            const newUid = this.entriesUidMapper[entry.entryOldUid];
+            // Removing temp values
+            delete entry.sourceEntryFilePath;
+            delete entry.entryOldUid;
+            if (this.jsonRteCTs.indexOf(cTUid) > -1) {
+                // the entries stored in eSuccessFilePath, have the same uids as the entries from source data
+                entry = (0, utils_1.restoreJsonRteEntryRefs)(entry, sourceEntry, contentType.schema, {
+                    mappedAssetUids: this.assetUidMapper,
+                    mappedAssetUrls: this.assetUrlMapper,
+                });
+            }
+            entry = (0, utils_1.lookupEntries)({
+                content_type: contentType,
+                entry,
+            }, this.entriesUidMapper, path.join(this.entriesMapperPath, cTUid, locale));
+            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;
+        }
+        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');
+            apiOptions.apiData = null;
         }
-        entry = (0, utils_1.lookupEntries)({
-            content_type: contentType,
-            entry,
-        }, this.entriesUidMapper, path.join(this.entriesMapperPath, cTUid, locale));
-        const entryResponse = this.stack.contentType(contentType.uid).entry(this.entriesUidMapper[entry.uid]);
-        Object.assign(entryResponse, (0, lodash_1.cloneDeep)(entry));
-        delete entryResponse.publish_details;
-        apiOptions.apiData = entryResponse;
         return apiOptions;
     }
     async enableMandatoryCTReferences() {
@@ -391,6 +439,7 @@ class EntriesImport extends base_class_1.default {
         return apiOptions;
     }
     async removeAutoCreatedEntries() {
+        var _a, _b;
         const onSuccess = ({ response, apiData: { entryUid } }) => {
             (0, utils_1.log)(this.importConfig, `Auto created entry in master locale removed - entry uid ${entryUid} `, 'success');
         };
@@ -405,6 +454,7 @@ class EntriesImport extends base_class_1.default {
                 resolve: onSuccess.bind(this),
                 entity: 'delete-entries',
                 includeParamOnCompletion: true,
+                additionalInfo: { locale: (_b = (_a = this.importConfig) === null || _a === void 0 ? void 0 : _a.master_locale) === null || _b === void 0 ? void 0 : _b.code },
             },
             concurrencyLimit: this.importConcurrency,
         });
@@ -418,12 +468,12 @@ class EntriesImport extends base_class_1.default {
             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) {
-                let fieldRuleLength = contentType.field_rules.length;
                 const fieldDatatypeMap = {};
                 for (let i = 0; i < contentType.schema.length; i++) {
                     const field = contentType.schema[i].uid;
                     fieldDatatypeMap[field] = contentType.schema[i].data_type;
                 }
+                let fieldRuleLength = contentType.field_rules.length;
                 for (let k = 0; k < fieldRuleLength; k++) {
                     let fieldRuleConditionLength = contentType.field_rules[k].conditions.length;
                     for (let i = 0; i < fieldRuleConditionLength; i++) {
@@ -460,7 +510,7 @@ class EntriesImport extends base_class_1.default {
                 (0, utils_1.log)(this.importConfig, `Updated the field rules of ${cTUid}`, 'info');
             }
             else {
-                (0, utils_1.log)(this.importConfig, `No field rules found in content type ${cTUid} to update`, 'error');
+                (0, utils_1.log)(this.importConfig, `No field rules found in content type ${cTUid} to update`, 'info');
             }
         }
     }
@@ -475,12 +525,12 @@ class EntriesImport extends base_class_1.default {
         if (indexerCount === 0) {
             return Promise.resolve();
         }
-        (0, utils_1.log)(this.importConfig, `Starting publish entries for ${cTUid} in locale ${locale}`, 'info');
-        const onSuccess = ({ response, apiData: { environments }, additionalInfo: { entryUid } }) => {
+        // log(this.importConfig, `Starting publish entries for ${cTUid} in locale ${locale}`, 'info');
+        const onSuccess = ({ response, apiData: { environments, entryUid }, additionalInfo }) => {
             (0, utils_1.log)(this.importConfig, `Published entry: '${entryUid}' of content type ${cTUid} and locale ${locale} in ${environments === null || environments === void 0 ? void 0 : environments.join(',')} environments`, 'info');
         };
-        const onReject = ({ error, apiData, additionalInfo: { entryUid } }) => {
-            (0, utils_1.log)(this.importConfig, `${entryUid} entry of content type ${cTUid} in locale ${locale} failed to publish`, 'error');
+        const onReject = ({ error, apiData, additionalInfo }) => {
+            (0, utils_1.log)(this.importConfig, `${apiData.entryUid} entry of content type ${cTUid} in locale ${locale} failed to publish`, 'error');
             (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
         };
         for (const index in indexer) {
@@ -516,10 +566,10 @@ class EntriesImport extends base_class_1.default {
      */
     serializePublishEntries(apiOptions) {
         let { apiData: entry, additionalInfo } = apiOptions;
-        additionalInfo.entryUid = this.entriesUidMapper[entry.uid];
         const requestObject = {
             environments: [],
             locales: [],
+            entryUid: this.entriesUidMapper[entry.uid],
         };
         if (entry.publish_details && entry.publish_details.length > 0) {
             (0, lodash_1.forEach)(entry.publish_details, (pubObject) => {
@@ -533,7 +583,8 @@ class EntriesImport extends base_class_1.default {
             });
         }
         else {
-            additionalInfo.skip = true;
+            apiOptions.apiData = null;
+            return apiOptions;
         }
         apiOptions.apiData = requestObject;
         return apiOptions;