@contentstack/cli-cm-import 1.14.2 → 1.15.0

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.14.2 linux-x64 node-v18.19.1
+@contentstack/cli-cm-import/1.15.0 linux-x64 node-v18.19.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/import/module-importer.js

@@ -99,6 +99,7 @@ class ModuleImporter {
         const basePath = (0, path_1.resolve)(this.importConfig.backupDir, 'logs', 'audit');
         const auditConfig = this.importConfig.auditConfig;
         auditConfig.config.basePath = basePath;
+        auditConfig.config.branch = this.importConfig.branchName;
         try {
             const args = [
                 '--data-dir',

package/lib/import/modules/entries.d.ts

@@ -36,6 +36,8 @@ export default class EntriesImport extends BaseClass {
     private autoCreatedEntries;
     private taxonomiesPath;
     taxonomies: Record<string, unknown>;
+    rteCTs: any;
+    rteCTsWithRef: any;
     constructor({ importConfig, stackAPIClient }: ModuleClassParams);
     start(): Promise<any>;
     disableMandatoryCTReferences(): Promise<void>;

package/lib/import/modules/entries.js

@@ -37,6 +37,8 @@ class EntriesImport extends base_class_1.default {
         this.envs = {};
         this.autoCreatedEntries = [];
         this.failedEntries = [];
+        this.rteCTs = [];
+        this.rteCTsWithRef = [];
     }
     async start() {
         var _a;
@@ -150,6 +152,8 @@ class EntriesImport extends base_class_1.default {
             references: false,
             jsonRte: false,
             jsonRteEmbeddedEntries: false,
+            rte: false,
+            rteEmbeddedEntries: false,
         };
         (0, utils_1.suppressSchemaReference)(contentType.schema, flag);
         if (flag.references) {
@@ -164,6 +168,15 @@ class EntriesImport extends base_class_1.default {
                 }
             }
         }
+        if (flag.rte) {
+            this.rteCTs.push(contentType.uid);
+            if (flag.rteEmbeddedEntries) {
+                this.rteCTsWithRef.push(contentType.uid);
+                if (this.refCTs.indexOf(contentType.uid) === -1) {
+                    this.refCTs.push(contentType.uid);
+                }
+            }
+        }
         // Check if suppress modified flag
         if (flag.suppressed) {
             this.modifiedCTs.push((0, lodash_1.find)(this.cTs, { uid: contentType.uid }));
@@ -318,6 +331,12 @@ class EntriesImport extends base_class_1.default {
             if (this.jsonRteCTsWithRef.indexOf(cTUid) > -1) {
                 entry = (0, utils_1.removeEntryRefsFromJSONRTE)(entry, contentType.schema);
             }
+            if (this.rteCTs.indexOf(cTUid) > -1) {
+                entry = (0, utils_1.removeEntryRefsFromJSONRTE)(entry, contentType.schema);
+            }
+            if (this.rteCTsWithRef.indexOf(cTUid) > -1) {
+                entry = (0, utils_1.removeEntryRefsFromJSONRTE)(entry, contentType.schema);
+            }
             //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);
             // will replace all old asset uid/urls with new ones
@@ -536,7 +555,7 @@ class EntriesImport extends base_class_1.default {
             // Removing temp values
             delete entry.sourceEntryFilePath;
             delete entry.entryOldUid;
-            if (this.jsonRteCTs.indexOf(cTUid) > -1) {
+            if (this.jsonRteCTs.indexOf(cTUid) > -1 || this.rteCTs.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,
@@ -544,6 +563,10 @@ class EntriesImport extends base_class_1.default {
                     mappedAssetUrls: this.assetUrlMapper,
                 });
             }
+            entry = (0, utils_1.lookupAssets)({
+                content_type: contentType,
+                entry: entry,
+            }, this.assetUidMapper, this.assetUrlMapper, path.join(this.entriesPath, cTUid), this.installedExtensions);
             entry = (0, utils_1.lookupEntries)({
                 content_type: contentType,
                 entry,

package/lib/types/default-config.d.ts

@@ -153,6 +153,7 @@ export default interface DefaultConfig {
         noTerminalOutput?: boolean;
         config?: {
             basePath?: string;
+            branch?: string;
         } & Record<string, any>;
     };
 }

package/lib/utils/asset-helper.js

@@ -11,6 +11,7 @@ let _ = require('lodash');
 let { marked } = require('marked');
 let helper = require('./file-helper');
 const MAX_RETRY_LIMIT = 5;
+const escapeRegExp = (str) => str.replace(/[*+?^${}()|[\]\\]/g, '\\$&');
 function validate(req) {
     if (typeof req !== 'object') {
         throw new Error(`Invalid params passed for request\n${JSON.stringify(arguments)}`);
@@ -234,8 +235,8 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
     assetUrls.forEach(function (assetUrl) {
         let mappedAssetUrl = mappedAssetUrls[assetUrl];
         if (typeof mappedAssetUrl !== 'undefined') {
-            const sanitizedUrl = (0, cli_utilities_1.escapeRegExp)(assetUrl);
-            const escapedMappedUrl = (0, cli_utilities_1.escapeRegExp)(mappedAssetUrl);
+            const sanitizedUrl = escapeRegExp(assetUrl).replace(/\.\./g, '\\$&');
+            const escapedMappedUrl = escapeRegExp(mappedAssetUrl).replace(/\.\./g, '\\$&');
             entry = entry.replace(new RegExp(sanitizedUrl, 'img'), escapedMappedUrl);
             matchedUrls.push(mappedAssetUrl);
         }

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

@@ -68,6 +68,11 @@ const suppressSchemaReference = function (schema, flag) {
             if (schema[i].field_metadata.embed_entry === true)
                 flag.jsonRteEmbeddedEntries = true;
         }
+        else if (schema[i].data_type === 'text' && schema[i].field_metadata.rich_text_type) {
+            flag.rte = true;
+            if (schema[i].field_metadata.embed_entry === true)
+                flag.rteEmbeddedEntries = true;
+        }
         if ((schema[i].hasOwnProperty('mandatory') && schema[i].mandatory) ||
             (schema[i].hasOwnProperty('unique') && schema[i].unique)) {
             if (schema[i].uid !== 'title') {

package/lib/utils/entries-helper.js

@@ -418,6 +418,21 @@ const removeEntryRefsFromJSONRTE = (entry, ctSchema = []) => {
                 }
                 break;
             }
+            case 'text': {
+                if (entry[element.uid] && element.field_metadata.rich_text_type) {
+                    if (element.multiple) {
+                        let rteContent = [];
+                        for (let i = 0; i < entry[element.uid].length; i++) {
+                            rteContent.push('<p></p>');
+                        }
+                        entry[element.uid] = rteContent;
+                    }
+                    else {
+                        entry[element.uid] = '<p></p>';
+                    }
+                }
+                break;
+            }
         }
     }
     return entry;
@@ -525,11 +540,34 @@ const restoreJsonRteEntryRefs = (entry, sourceStackEntry, ctSchema = [], { uidMa
                 }
                 break;
             }
+            case 'text': {
+                if (entry[element.uid] && element.field_metadata.rich_text_type) {
+                    entry[element.uid] = sourceStackEntry[element.uid];
+                    const matches = Object.keys(uidMapper).filter((uid) => {
+                        if (sourceStackEntry[element.uid].indexOf(uid) !== -1)
+                            return uid;
+                    });
+                    if (element.multiple && Array.isArray(entry[element.uid])) {
+                        for (let i = 0; i < matches.length; i++) {
+                            entry[element.uid] = entry[element.uid].map((el) => updateUids(el, matches[i], uidMapper));
+                        }
+                    }
+                    else {
+                        for (let i = 0; i < matches.length; i++) {
+                            entry[element.uid] = updateUids(entry[element.uid], matches[i], uidMapper);
+                        }
+                    }
+                }
+                break;
+            }
         }
     }
     return entry;
 };
 exports.restoreJsonRteEntryRefs = restoreJsonRteEntryRefs;
+function updateUids(str, match, uidMapper) {
+    return str.replace(new RegExp(match, 'g'), (match) => uidMapper[match]);
+}
 function setDirtyTrue(jsonRteChild) {
     // also removing uids in this function
     if (jsonRteChild.type) {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.14.2",
+  "version": "1.15.0",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.14.2",
+  "version": "1.15.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.5.0",
+    "@contentstack/cli-audit": "~1.5.1",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.6.0",
     "@contentstack/management": "~1.15.3",
@@ -34,7 +34,7 @@
     "@types/mocha": "^8.2.2",
     "@types/node": "^14.14.32",
     "@types/sinon": "^10.0.2",
-    "@types/tar": "^4.0.3",
+    "@types/tar": "^6.1.3",
     "@types/uuid": "^9.0.7",
     "@typescript-eslint/eslint-plugin": "^5.48.2",
     "chai": "^4.2.0",
@@ -99,4 +99,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}