@contentstack/cli-cm-import 1.8.0 → 1.8.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.0 linux-x64 node-v18.17.1
+@contentstack/cli-cm-import/1.8.1 linux-x64 node-v18.17.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/import/modules-js/entries.js

@@ -395,12 +395,12 @@ module.exports = class ImportEntries {
             })
                 .catch((error) => {
                 var _a, _b;
-                let title = (_b = JSON.parse(((_a = error === null || error === void 0 ? void 0 : error.request) === null || _a === void 0 ? void 0 : _a.data) || "{}").entry) === null || _b === void 0 ? void 0 : _b.title;
+                let title = (_b = JSON.parse(((_a = error === null || error === void 0 ? void 0 : error.request) === null || _a === void 0 ? void 0 : _a.data) || '{}').entry) === null || _b === void 0 ? void 0 : _b.title;
                 addlogs(this.config, chalk.red("Failed to create entries in '" +
                     lang +
                     "' language. " +
                     'Title of the failed entry: ' +
-                    `'${title || ""}'`), 'error');
+                    `'${title || ''}'`), 'error');
                 return reject(error);
             });
         });
@@ -990,6 +990,7 @@ module.exports = class ImportEntries {
                     break;
                 }
                 case 'json': {
+                    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((jsonRteData) => {
@@ -997,6 +998,9 @@ module.exports = class ImportEntries {
                                 let entryReferences = jsonRteData.children.filter((e) => this.doEntryReferencesExist(e));
                                 if (entryReferences.length > 0) {
                                     jsonRteData.children = jsonRteData.children.filter((e) => !this.doEntryReferencesExist(e));
+                                    if (jsonRteData.children.length === 0) {
+                                        jsonRteData.children.push(JSON.parse(structuredPTag));
+                                    }
                                     return jsonRteData; // return jsonRteData without entry references
                                 }
                                 else {
@@ -1008,6 +1012,9 @@ module.exports = class ImportEntries {
                             let entryReferences = entry[element.uid].children.filter((e) => this.doEntryReferencesExist(e));
                             if (entryReferences.length > 0) {
                                 entry[element.uid].children = entry[element.uid].children.filter((e) => !this.doEntryReferencesExist(e));
+                                if (entry[element.uid].children.length === 0) {
+                                    entry[element.uid].children.push(JSON.parse(structuredPTag));
+                                }
                             }
                         }
                     }

package/lib/utils/asset-helper.js

@@ -75,6 +75,9 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
                 (schema[i].field_metadata.markdown || schema[i].field_metadata.rich_text_type)) {
                 parent.push(schema[i].uid);
                 findFileUrls(schema[i], entryToFind, assetUrls);
+                if (schema[i].field_metadata.rich_text_type) {
+                    findAssetIdsFromHtmlRte(entryToFind, schema[i]);
+                }
                 parent.pop();
             }
             if (schema[i].data_type === 'group' || schema[i].data_type === 'global_field') {
@@ -131,6 +134,14 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
             return row;
         });
     }
+    function findAssetIdsFromHtmlRte(entryObj, ctSchema) {
+        const regex = /<img asset_uid=\\"([^"]+)\\"/g;
+        let match;
+        const entry = JSON.stringify(entryObj);
+        while ((match = regex.exec(entry)) !== null) {
+            assetUids.push(match[1]);
+        }
+    }
     function findAssetIdsFromJsonRte(entryObj, ctSchema) {
         for (const element of ctSchema) {
             switch (element.data_type) {
@@ -329,7 +340,8 @@ function findFileUrls(schema, _entry, assetUrls) {
     markdownRegEx = new RegExp('(https://(assets|(eu-|azure-na-|azure-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))', 'g');
     while ((markdownMatch = markdownRegEx.exec(text)) !== null) {
         if (markdownMatch && typeof markdownMatch[0] === 'string') {
-            assetUrls.push(markdownMatch[0]);
+            let assetUrl = markdownMatch[0].replace(/\\/g, '');
+            assetUrls.push(assetUrl);
         }
     }
 }

package/lib/utils/content-type-helper.js

@@ -89,7 +89,7 @@ const removeReferenceFields = async function (schema, flag = { supressed: false
                 await (0, exports.removeReferenceFields)(schema[i].blocks[block].schema, flag, stackAPIClient);
             }
         }
-        else if (schema[i].data_type === 'reference' || schema[i].reference_to) {
+        else if (schema[i].data_type === 'reference') {
             flag.supressed = true;
             // Check if content-type exists
             // If exists, then no change should be required.
@@ -128,7 +128,15 @@ const removeReferenceFields = async function (schema, flag = { supressed: false
                     });
                 }
             }
-            return true;
+        }
+        else if (
+        // handling entry references in json rte
+        schema[i].data_type === 'json' &&
+            schema[i].field_metadata.allow_json_rte &&
+            schema[i].field_metadata.embed_entry &&
+            schema[i].reference_to.length > 1) {
+            flag.supressed = true;
+            schema[i].reference_to = ['sys_assets'];
         }
         else if (
         // handling entry references in json rte
@@ -138,7 +146,6 @@ const removeReferenceFields = async function (schema, flag = { supressed: false
             schema[i].reference_to.length > 1) {
             flag.supressed = true;
             schema[i].reference_to = ['sys_assets'];
-            return true;
         }
     }
 };

package/lib/utils/entries-helper.js

@@ -372,6 +372,7 @@ const removeEntryRefsFromJSONRTE = (entry, ctSchema) => {
                 break;
             }
             case 'json': {
+                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((jsonRteData) => {
@@ -379,6 +380,9 @@ const removeEntryRefsFromJSONRTE = (entry, ctSchema) => {
                             let entryReferences = jsonRteData.children.filter((e) => doEntryReferencesExist(e));
                             if (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 
+                                    jsonRteData.children.push(JSON.parse(structuredPTag));
+                                }
                                 return jsonRteData; // return jsonRteData without entry references
                             }
                             else {
@@ -390,6 +394,9 @@ const removeEntryRefsFromJSONRTE = (entry, ctSchema) => {
                         let entryReferences = entry[element.uid].children.filter((e) => doEntryReferencesExist(e));
                         if (entryReferences.length > 0) {
                             entry[element.uid].children = entry[element.uid].children.filter((e) => !doEntryReferencesExist(e));
+                            if (entry[element.uid].children.length === 0) {
+                                entry[element.uid].children.push(JSON.parse(structuredPTag));
+                            }
                         }
                     }
                 }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.0",
+  "version": "1.8.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.8.0",
+  "version": "1.8.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {