@contentstack/cli-cm-import 1.12.0 → 1.12.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.12.0 linux-x64 node-v18.18.2
+@contentstack/cli-cm-import/1.12.1 linux-x64 node-v18.19.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

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

@@ -4,7 +4,6 @@ const tslib_1 = require("tslib");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const cli_command_1 = require("@contentstack/cli-command");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
-const log_1 = require("../../../utils/log");
 const import_1 = require("../../../import");
 const utils_1 = require("../../../utils");
 class ImportCommand extends cli_command_1.Command {
@@ -26,7 +25,6 @@ class ImportCommand extends cli_command_1.Command {
             (0, utils_1.log)(importConfig, `The log has been stored at '${node_path_1.default.join(importConfig.backupDir, 'logs', 'import')}'`, 'success');
         }
         catch (error) {
-            (0, log_1.trace)(error, 'error', true);
             (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/import/modules/entries.d.ts

@@ -63,7 +63,7 @@ export default class EntriesImport extends BaseClass {
         cTUid: string;
         locale: string;
     }): Promise<void>;
-    replaceEntriesHandler({ apiParams, element: entry, isLastRequest, }: {
+    replaceEntriesHandler({ apiParams, element: entry }: {
         apiParams: ApiOptions;
         element: Record<string, string>;
         isLastRequest: boolean;

package/lib/import/modules/entries.js

@@ -39,6 +39,7 @@ class EntriesImport extends base_class_1.default {
         this.failedEntries = [];
     }
     async start() {
+        var _a;
         try {
             this.cTs = utils_1.fsUtil.readFile(path.join(this.cTsPath, 'schema.json'));
             if (!this.cTs || (0, lodash_1.isEmpty)(this.cTs)) {
@@ -68,7 +69,7 @@ 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) {
+            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');
                 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');
@@ -409,7 +410,7 @@ class EntriesImport extends base_class_1.default {
             }
         }
     }
-    async replaceEntriesHandler({ apiParams, element: entry, isLastRequest, }) {
+    async replaceEntriesHandler({ apiParams, element: entry }) {
         const { additionalInfo: { cTUid, locale } = {} } = apiParams;
         return new Promise(async (resolve, reject) => {
             const { items: [entryInStack] = [] } = (await this.stack
@@ -538,6 +539,7 @@ class EntriesImport extends base_class_1.default {
             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, {
+                    uidMapper: this.entriesUidMapper,
                     mappedAssetUids: this.assetUidMapper,
                     mappedAssetUrls: this.assetUrlMapper,
                 });
@@ -618,6 +620,7 @@ class EntriesImport extends base_class_1.default {
         });
     }
     async updateFieldRules() {
+        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) {
             return;
@@ -627,13 +630,13 @@ class EntriesImport extends base_class_1.default {
             const contentType = (0, lodash_1.find)(cTs, { uid: cTUid });
             if (contentType.field_rules) {
                 const fieldDatatypeMap = {};
-                for (let i = 0; i < contentType.schema.length; i++) {
+                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;
                 }
-                let fieldRuleLength = contentType.field_rules.length;
+                let fieldRuleLength = (_b = contentType.field_rules) === null || _b === void 0 ? void 0 : _b.length;
                 for (let k = 0; k < fieldRuleLength; k++) {
-                    let fieldRuleConditionLength = contentType.field_rules[k].conditions.length;
+                    let fieldRuleConditionLength = (_c = contentType.field_rules[k].conditions) === null || _c === void 0 ? void 0 : _c.length;
                     for (let i = 0; i < fieldRuleConditionLength; i++) {
                         if (fieldDatatypeMap[contentType.field_rules[k].conditions[i].operand_field] === 'reference') {
                             let fieldRulesValue = contentType.field_rules[k].conditions[i].value;
@@ -723,13 +726,14 @@ class EntriesImport extends base_class_1.default {
      * @returns {ApiOptions} ApiOptions
      */
     serializePublishEntries(apiOptions) {
+        var _a;
         let { apiData: entry, additionalInfo } = apiOptions;
         const requestObject = {
             environments: [],
             locales: [],
             entryUid: this.entriesUidMapper[entry.uid],
         };
-        if (entry.publish_details && entry.publish_details.length > 0) {
+        if (entry.publish_details && ((_a = entry.publish_details) === null || _a === void 0 ? void 0 : _a.length) > 0) {
             (0, lodash_1.forEach)(entry.publish_details, (pubObject) => {
                 if (this.envs.hasOwnProperty(pubObject.environment) &&
                     (0, lodash_1.indexOf)(requestObject.environments, this.envs[pubObject.environment].name) === -1) {

package/lib/types/entries.d.ts

@@ -0,0 +1,11 @@
+type EntryJsonRTEFieldDataType = {
+    uid?: string;
+    type?: string;
+    text?: string;
+    attrs?: {
+        'entry-uid'?: string;
+        type?: string;
+    } & Record<string, any>;
+    children?: EntryJsonRTEFieldDataType[];
+};
+export { EntryJsonRTEFieldDataType };

package/lib/types/entries.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/index.d.ts

@@ -72,3 +72,4 @@ export interface TermsConfig {
 }
 export { default as DefaultConfig } from './default-config';
 export { default as ImportConfig } from './import-config';
+export * from './entries';

package/lib/types/index.js

@@ -1,2 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./entries"), exports);

package/lib/utils/entries-helper.d.ts

@@ -7,4 +7,4 @@ export declare const lookupEntries: (data: {
 }, mappedUids: Record<string, any>, uidMapperPath: string) => any;
 export declare const removeUidsFromJsonRteFields: (entry: Record<string, any>, ctSchema?: Record<string, any>[]) => Record<string, any>;
 export declare const removeEntryRefsFromJSONRTE: (entry: Record<string, any>, ctSchema?: Record<string, any>[]) => Record<string, any>;
-export declare const restoreJsonRteEntryRefs: (entry: Record<string, any>, sourceStackEntry: any, ctSchema: any, { mappedAssetUids, mappedAssetUrls }: any) => Record<string, any>;
+export declare const restoreJsonRteEntryRefs: (entry: Record<string, any>, sourceStackEntry: any, ctSchema: any, { uidMapper, mappedAssetUids, mappedAssetUrls }: any) => Record<string, any>;

package/lib/utils/entries-helper.js

@@ -2,6 +2,7 @@
 /**
  * Entries lookup
  */
+// FIXME refactor the complete file/code after discussed with the team
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.restoreJsonRteEntryRefs = exports.removeEntryRefsFromJSONRTE = exports.removeUidsFromJsonRteFields = exports.lookupEntries = void 0;
 const tslib_1 = require("tslib");
@@ -18,7 +19,9 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
     let isNewRefFields = false;
     let preserveStackVersion = config_1.default.preserveStackVersion;
     function gatherJsonRteEntryIds(jsonRteData) {
-        jsonRteData.children.forEach((element) => {
+        var _a;
+        (_a = jsonRteData.children) === null || _a === void 0 ? void 0 : _a.forEach((element) => {
+            var _a, _b;
             if (element.type) {
                 switch (element.type) {
                     default: {
@@ -28,7 +31,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                         break;
                     }
                     case 'reference': {
-                        if (Object.keys(element.attrs).length > 0 && element.attrs.type === 'entry') {
+                        if (((_a = Object.keys(element.attrs)) === null || _a === void 0 ? void 0 : _a.length) > 0 && ((_b = element.attrs) === null || _b === void 0 ? void 0 : _b.type) === 'entry') {
                             if (uids.indexOf(element.attrs['entry-uid']) === -1) {
                                 uids.push(element.attrs['entry-uid']);
                             }
@@ -43,13 +46,14 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
         });
     }
     const update = function (_parent, form_id, updateEntry) {
+        var _a, _b, _c;
         let _entry = updateEntry;
-        let len = _parent.length;
+        let len = _parent === null || _parent === void 0 ? void 0 : _parent.length;
         for (let j = 0; j < len; j++) {
             if (_entry && _parent[j]) {
                 if (j === len - 1 && _entry[_parent[j]]) {
                     if (form_id !== '_assets') {
-                        if (_entry[_parent[j]].length) {
+                        if ((_a = _entry[_parent[j]]) === null || _a === void 0 ? void 0 : _a.length) {
                             _entry[_parent[j]].forEach((item, idx) => {
                                 if (typeof item.uid === 'string' && item._content_type_uid) {
                                     uids.push(item.uid);
@@ -69,12 +73,12 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                     }
                     else if (Array.isArray(_entry[_parent[j]])) {
                         for (const element of _entry[_parent[j]]) {
-                            if (element.uid.length) {
+                            if ((_b = element.uid) === null || _b === void 0 ? void 0 : _b.length) {
                                 uids.push(element.uid);
                             }
                         }
                     }
-                    else if (_entry[_parent[j]].uid.length) {
+                    else if ((_c = _entry[_parent[j]].uid) === null || _c === void 0 ? void 0 : _c.length) {
                         uids.push(_entry[_parent[j]].uid);
                     }
                 }
@@ -82,7 +86,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                     _entry = _entry[_parent[j]];
                     let _keys = _.clone(_parent).splice(j + 1, len);
                     if (Array.isArray(_entry)) {
-                        for (let i = 0, _i = _entry.length; i < _i; i++) {
+                        for (let i = 0, _i = _entry === null || _entry === void 0 ? void 0 : _entry.length; i < _i; i++) {
                             update(_keys, form_id, _entry[i]);
                         }
                     }
@@ -94,6 +98,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
         }
     };
     const find = function (schema = [], _entry) {
+        var _a;
         for (let i = 0, _i = schema === null || schema === void 0 ? void 0 : schema.length; i < _i; i++) {
             switch (schema[i].data_type) {
                 case 'reference':
@@ -118,7 +123,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                     parent.pop();
                     break;
                 case 'blocks':
-                    for (let j = 0, _j = schema[i].blocks.length; j < _j; j++) {
+                    for (let j = 0, _j = (_a = schema[i].blocks) === null || _a === void 0 ? void 0 : _a.length; j < _j; j++) {
                         parent.push(schema[i].uid);
                         parent.push(schema[i].blocks[j].uid);
                         find(schema[i].blocks[j].schema, _entry);
@@ -135,12 +140,13 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
         }
     };
     function findEntryIdsFromJsonRte(entry, ctSchema = []) {
+        var _a, _b, _c;
         for (const element of ctSchema) {
             switch (element.data_type) {
                 case 'blocks': {
                     if (entry[element.uid]) {
                         if (element.multiple) {
-                            entry[element.uid].forEach((e) => {
+                            (_a = entry[element.uid]) === null || _a === void 0 ? void 0 : _a.forEach((e) => {
                                 let key = Object.keys(e).pop();
                                 let subBlock = element.blocks.filter((e) => e.uid === key).pop();
                                 findEntryIdsFromJsonRte(e[key], subBlock.schema);
@@ -153,7 +159,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                 case 'group': {
                     if (entry[element.uid]) {
                         if (element.multiple) {
-                            entry[element.uid].forEach((e) => {
+                            (_b = entry[element.uid]) === null || _b === void 0 ? void 0 : _b.forEach((e) => {
                                 findEntryIdsFromJsonRte(e, element.schema);
                             });
                         }
@@ -166,7 +172,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                 case 'json': {
                     if (entry[element.uid] && element.field_metadata.rich_text_type) {
                         if (element.multiple) {
-                            entry[element.uid].forEach((jsonRteData) => {
+                            (_c = entry[element.uid]) === null || _c === void 0 ? void 0 : _c.forEach((jsonRteData) => {
                                 gatherJsonRteEntryIds(jsonRteData);
                             });
                         }
@@ -192,6 +198,9 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
     let entry = JSON.stringify(data.entry);
     uids.forEach(function (uid) {
         if (mappedUids.hasOwnProperty(uid)) {
+            // NOTE g: matches the pattern multiple times
+            // NOTE i: makes the regex case insensitive
+            // NOTE m: enables multi-line mode. Where ^ and $ match the start and end of the entire string. Without this, multi-line strings match the beginning and end of each line.
             entry = entry.replace(new RegExp(uid, 'img'), mappedUids[uid]);
             mapped.push(uid);
         }
@@ -256,8 +265,9 @@ const removeUidsFromJsonRteFields = (entry, ctSchema = []) => {
                 if (entry[element.uid]) {
                     if (element.multiple) {
                         entry[element.uid] = entry[element.uid].map((e) => {
+                            var _a;
                             let key = Object.keys(e).pop();
-                            let subBlock = element.blocks.filter((block) => block.uid === key).pop();
+                            let subBlock = (_a = element.blocks) === null || _a === void 0 ? void 0 : _a.filter((block) => block.uid === key).pop();
                             e[key] = (0, exports.removeUidsFromJsonRteFields)(e[key], subBlock.schema);
                             return e;
                         });
@@ -312,7 +322,7 @@ const removeUidsFromJsonRteFields = (entry, ctSchema = []) => {
 };
 exports.removeUidsFromJsonRteFields = removeUidsFromJsonRteFields;
 function removeUidsFromChildren(children) {
-    if (children.length && children.length > 0) {
+    if ((children === null || children === void 0 ? void 0 : children.length) && children.length > 0) {
         return children.map((child) => {
             if (child.type && child.type.length > 0) {
                 delete child.uid; // remove uid
@@ -340,14 +350,16 @@ function removeUidsFromChildren(children) {
     }
 }
 const removeEntryRefsFromJSONRTE = (entry, ctSchema = []) => {
+    var _a, _b;
     for (const element of ctSchema) {
         switch (element.data_type) {
             case 'blocks': {
                 if (entry[element.uid]) {
                     if (element.multiple) {
                         entry[element.uid] = entry[element.uid].map((e) => {
+                            var _a;
                             let key = Object.keys(e).pop();
-                            let subBlock = element.blocks.filter((block) => block.uid === key).pop();
+                            let subBlock = (_a = element.blocks) === null || _a === void 0 ? void 0 : _a.filter((block) => block.uid === key).pop();
                             e[key] = (0, exports.removeEntryRefsFromJSONRTE)(e[key], subBlock.schema);
                             return e;
                         });
@@ -374,10 +386,12 @@ const removeEntryRefsFromJSONRTE = (entry, ctSchema = []) => {
                 const structuredPTag = '{"type":"p","attrs":{},"children":[{"text":""}]}';
                 if (entry[element.uid] && element.field_metadata.rich_text_type) {
                     if (element.multiple) {
+                        entry[element.uid] = entry[element.uid].map(removeReferenceInJsonRTE);
                         entry[element.uid] = entry[element.uid].map((jsonRteData) => {
+                            var _a;
                             // repeated code from else block, will abstract later
-                            let entryReferences = jsonRteData.children.filter((e) => doEntryReferencesExist(e));
-                            if (entryReferences.length > 0) {
+                            let entryReferences = (_a = jsonRteData.children) === null || _a === void 0 ? void 0 : _a.filter((e) => doEntryReferencesExist(e));
+                            if ((entryReferences === null || entryReferences === void 0 ? void 0 : entryReferences.length) > 0) {
                                 jsonRteData.children = jsonRteData.children.filter((e) => !doEntryReferencesExist(e));
                                 if (jsonRteData.children.length === 0) {
                                     // empty children array are no longer acceptable by the API, a default structure must be there
@@ -391,10 +405,12 @@ const removeEntryRefsFromJSONRTE = (entry, ctSchema = []) => {
                         });
                     }
                     else {
-                        let entryReferences = entry[element.uid].children.filter((e) => doEntryReferencesExist(e));
-                        if (entryReferences.length > 0) {
+                        // NOTE Clean up all the reference
+                        entry[element.uid] = removeReferenceInJsonRTE(entry[element.uid]);
+                        let entryReferences = (_a = entry[element.uid].children) === null || _a === void 0 ? void 0 : _a.filter((e) => doEntryReferencesExist(e));
+                        if ((entryReferences === null || entryReferences === void 0 ? void 0 : entryReferences.length) > 0) {
                             entry[element.uid].children = entry[element.uid].children.filter((e) => !doEntryReferencesExist(e));
-                            if (entry[element.uid].children.length === 0) {
+                            if (((_b = entry[element.uid].children) === null || _b === void 0 ? void 0 : _b.length) === 0) {
                                 entry[element.uid].children.push(JSON.parse(structuredPTag));
                             }
                         }
@@ -410,9 +426,11 @@ exports.removeEntryRefsFromJSONRTE = removeEntryRefsFromJSONRTE;
 function doEntryReferencesExist(element) {
     // checks if the children of p element contain any references
     // only checking one level deep, not recursive
-    if (element.length) {
+    if (element === null || element === void 0 ? void 0 : element.length) {
         for (const item of element) {
-            if ((item.type === 'p' || item.type === 'a' || item.type === 'span') && item.children && item.children.length > 0) {
+            if ((item.type === 'p' || item.type === 'a' || item.type === 'span') &&
+                item.children &&
+                item.children.length > 0) {
                 return doEntryReferencesExist(item.children);
             }
             else if (isEntryRef(item)) {
@@ -424,28 +442,31 @@ function doEntryReferencesExist(element) {
         if (isEntryRef(element)) {
             return true;
         }
-        if ((element.type === 'p' || element.type === 'a' || element.type === 'span') && element.children && element.children.length > 0) {
+        if ((element.type === 'p' || element.type === 'a' || element.type === 'span') &&
+            element.children &&
+            element.children.length > 0) {
             return doEntryReferencesExist(element.children);
         }
     }
     return false;
 }
 function isEntryRef(element) {
-    return element.type === 'reference' && element.attrs.type === 'entry';
+    var _a;
+    return element.type === 'reference' && ((_a = element.attrs) === null || _a === void 0 ? void 0 : _a.type) === 'entry';
 }
-const restoreJsonRteEntryRefs = (entry, sourceStackEntry, ctSchema = [], { mappedAssetUids, mappedAssetUrls }) => {
-    // let mappedAssetUids = fileHelper.readFileSync(this.mappedAssetUidPath) || {};
-    // let mappedAssetUrls = fileHelper.readFileSync(this.mappedAssetUrlPath) || {};
+const restoreJsonRteEntryRefs = (entry, sourceStackEntry, ctSchema = [], { uidMapper, mappedAssetUids, mappedAssetUrls }) => {
     for (const element of ctSchema) {
         switch (element.data_type) {
             case 'blocks': {
                 if (entry[element.uid]) {
                     if (element.multiple && Array.isArray(entry[element.uid])) {
                         entry[element.uid] = entry[element.uid].map((e, eIndex) => {
+                            var _a;
                             let key = Object.keys(e).pop();
-                            let subBlock = element.blocks.filter((block) => block.uid === key).pop();
+                            let subBlock = (_a = element.blocks) === null || _a === void 0 ? void 0 : _a.filter((block) => block.uid === key).pop();
                             let sourceStackElement = sourceStackEntry[element.uid][eIndex][key];
                             e[key] = (0, exports.restoreJsonRteEntryRefs)(e[key], sourceStackElement, subBlock.schema, {
+                                uidMapper,
                                 mappedAssetUids,
                                 mappedAssetUrls,
                             });
@@ -461,13 +482,18 @@ const restoreJsonRteEntryRefs = (entry, sourceStackEntry, ctSchema = [], { mappe
                     if (element.multiple && Array.isArray(entry[element.uid])) {
                         entry[element.uid] = entry[element.uid].map((e, eIndex) => {
                             let sourceStackElement = sourceStackEntry[element.uid][eIndex];
-                            e = (0, exports.restoreJsonRteEntryRefs)(e, sourceStackElement, element.schema, { mappedAssetUids, mappedAssetUrls });
+                            e = (0, exports.restoreJsonRteEntryRefs)(e, sourceStackElement, element.schema, {
+                                uidMapper,
+                                mappedAssetUids,
+                                mappedAssetUrls,
+                            });
                             return e;
                         });
                     }
                     else {
                         let sourceStackElement = sourceStackEntry[element.uid];
                         entry[element.uid] = (0, exports.restoreJsonRteEntryRefs)(entry[element.uid], sourceStackElement, element.schema, {
+                            uidMapper,
                             mappedAssetUids,
                             mappedAssetUrls,
                         });
@@ -478,55 +504,23 @@ const restoreJsonRteEntryRefs = (entry, sourceStackEntry, ctSchema = [], { mappe
             case 'json': {
                 if (entry[element.uid] && element.field_metadata.rich_text_type) {
                     if (element.multiple && Array.isArray(entry[element.uid])) {
-                        entry[element.uid] = entry[element.uid].map((field, index) => {
-                            // i am facing a Maximum call stack exceeded issue,
-                            // probably because of this loop operation
-                            let entryRefs = sourceStackEntry[element.uid][index].children
-                                .map((e, i) => {
-                                return { index: i, value: e };
-                            })
-                                .filter((e) => doEntryReferencesExist(e.value))
-                                .map((e) => {
-                                // commenting the line below resolved the maximum call stack exceeded issue
-                                // e.value = this.setDirtyTrue(e.value)
-                                setDirtyTrue(e.value);
-                                return e;
-                            })
-                                .map((e) => {
-                                // commenting the line below resolved the maximum call stack exceeded issue
-                                // e.value = this.resolveAssetRefsInEntryRefsForJsonRte(e, mappedAssetUids, mappedAssetUrls)
-                                resolveAssetRefsInEntryRefsForJsonRte(e.value, mappedAssetUids, mappedAssetUrls);
-                                return e;
+                        entry[element.uid] = sourceStackEntry[element.uid].map((jsonRTE) => {
+                            jsonRTE = restoreReferenceInJsonRTE(jsonRTE, uidMapper);
+                            jsonRTE.children = jsonRTE.children.map((child) => {
+                                child = setDirtyTrue(child);
+                                child = resolveAssetRefsInEntryRefsForJsonRte(child, mappedAssetUids, mappedAssetUrls);
+                                return child;
                             });
-                            if (entryRefs.length > 0) {
-                                entryRefs.forEach((entryRef) => {
-                                    field.children.splice(entryRef.index, 0, entryRef.value);
-                                });
-                            }
-                            return field;
+                            return jsonRTE;
                         });
                     }
                     else {
-                        let entryRefs = sourceStackEntry[element.uid].children
-                            .map((e, index) => {
-                            return { index: index, value: e };
-                        })
-                            .filter((e) => doEntryReferencesExist(e.value))
-                            .map((e) => {
-                            setDirtyTrue(e.value);
-                            return e;
-                        })
-                            .map((e) => {
-                            resolveAssetRefsInEntryRefsForJsonRte(e.value, mappedAssetUids, mappedAssetUrls);
-                            return e;
+                        entry[element.uid] = restoreReferenceInJsonRTE(sourceStackEntry[element.uid], uidMapper);
+                        entry[element.uid].children = entry[element.uid].children.map((child) => {
+                            child = setDirtyTrue(child);
+                            child = resolveAssetRefsInEntryRefsForJsonRte(child, mappedAssetUids, mappedAssetUrls);
+                            return child;
                         });
-                        if (entryRefs.length > 0) {
-                            entryRefs.forEach((entryRef) => {
-                                if (!_.isEmpty(entry[element.uid]) && entry[element.uid].children) {
-                                    entry[element.uid].children.splice(entryRef.index, 0, entryRef.value);
-                                }
-                            });
-                        }
                     }
                 }
                 break;
@@ -550,8 +544,9 @@ function setDirtyTrue(jsonRteChild) {
     return jsonRteChild;
 }
 function resolveAssetRefsInEntryRefsForJsonRte(jsonRteChild, mappedAssetUids, mappedAssetUrls) {
+    var _a;
     if (jsonRteChild.type) {
-        if (jsonRteChild.attrs.type === 'asset') {
+        if (((_a = jsonRteChild.attrs) === null || _a === void 0 ? void 0 : _a.type) === 'asset') {
             let assetUrl;
             if (mappedAssetUids[jsonRteChild.attrs['asset-uid']]) {
                 jsonRteChild.attrs['asset-uid'] = mappedAssetUids[jsonRteChild.attrs['asset-uid']];
@@ -577,3 +572,62 @@ function resolveAssetRefsInEntryRefsForJsonRte(jsonRteChild, mappedAssetUids, ma
     }
     return jsonRteChild;
 }
+/**
+ * The function removes references from a JSON RTE (Rich Text Editor) object.
+ * @param {EntryJsonRTEFieldDataType} jsonRTE - The parameter `jsonRTE` is of type
+ * `EntryJsonRTEFieldDataType`. It represents a JSON object that contains rich text content. The
+ * function `removeReferenceInJsonRTE` takes this JSON object as input and removes any references
+ * present in the content. It recursively traverses the JSON
+ * @returns the modified `jsonRTE` object after removing any references in the JSON RTE.
+ */
+function removeReferenceInJsonRTE(jsonRTE) {
+    var _a;
+    // NOTE Other possible reference logic will be added related to JSON RTE (Ex missing assets, extensions etc.,)
+    if ((jsonRTE === null || jsonRTE === void 0 ? void 0 : jsonRTE.children) && Array.isArray(jsonRTE.children)) {
+        jsonRTE.children = (_a = jsonRTE === null || jsonRTE === void 0 ? void 0 : jsonRTE.children) === null || _a === void 0 ? void 0 : _a.map((child) => {
+            const { children, attrs, type } = child;
+            if (type === 'reference' && (attrs === null || attrs === void 0 ? void 0 : attrs['entry-uid'])) {
+                child = {
+                    type: 'p',
+                    attrs: {},
+                    children: [{ text: '' }],
+                };
+            }
+            if (!_.isEmpty(children)) {
+                return removeReferenceInJsonRTE(child);
+            }
+            return child;
+        });
+    }
+    return jsonRTE;
+}
+/**
+ * The function `restoreReferenceInJsonRTE` takes a JSON object `jsonRTE` and a mapping object
+ * `uidMapper`, and recursively replaces the `entry-uid` attribute values in any `reference` type
+ * elements with their corresponding values from the `uidMapper` object.
+ * @param {EntryJsonRTEFieldDataType} jsonRTE - The `jsonRTE` parameter is an object that represents a
+ * JSON structure. It contains a `children` property which is an array of objects. Each object
+ * represents a child element in the JSON structure and can have properties like `children`, `attrs`,
+ * and `type`.
+ * @param uidMapper - The `uidMapper` parameter is an object that maps entry UIDs to their
+ * corresponding restored UIDs. It is used to replace the `entry-uid` attribute in the JSON RTE with
+ * the restored UID.
+ * @returns the updated `jsonRTE` object with the restored references.
+ */
+function restoreReferenceInJsonRTE(jsonRTE, uidMapper) {
+    var _a;
+    if ((jsonRTE === null || jsonRTE === void 0 ? void 0 : jsonRTE.children) && Array.isArray(jsonRTE.children)) {
+        jsonRTE.children = (_a = jsonRTE === null || jsonRTE === void 0 ? void 0 : jsonRTE.children) === null || _a === void 0 ? void 0 : _a.map((child, index) => {
+            const { children, attrs, type } = child;
+            if (type === 'reference' && (attrs === null || attrs === void 0 ? void 0 : attrs['entry-uid'])) {
+                jsonRTE.children[index] = child;
+                jsonRTE.children[index].attrs['entry-uid'] = uidMapper[child.attrs['entry-uid']];
+            }
+            if (!_.isEmpty(children)) {
+                return restoreReferenceInJsonRTE(child, uidMapper);
+            }
+            return child;
+        });
+    }
+    return jsonRTE;
+}

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.12.0",
+  "version": "1.12.1",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
@@ -99,4 +99,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}