@contentstack/cli-cm-import 1.16.4 → 1.16.5

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

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

@@ -58,7 +58,7 @@ class ImportCustomRoles extends base_class_1.default {
             this.customRolesLocales = utils_1.fsUtil.readFile((0, node_path_1.join)(this.customRolesFolderPath, this.customRolesConfig.customRolesLocalesFileName), true);
         }
         else {
-            (0, utils_1.log)(this.importConfig, `No such file or directory - '${this.customRolesFolderPath}'`, 'error');
+            (0, utils_1.log)(this.importConfig, `No custom-rules are found - '${this.customRolesFolderPath}'`, 'info');
             return;
         }
         //create webhooks in mapper directory

package/lib/import/modules/environments.js

@@ -31,7 +31,7 @@ class ImportEnvironments extends base_class_1.default {
             this.environments = utils_1.fsUtil.readFile((0, node_path_1.join)(this.environmentsFolderPath, 'environments.json'), true);
         }
         else {
-            (0, utils_1.log)(this.importConfig, `No such file or directory - '${this.environmentsFolderPath}'`, 'error');
+            (0, utils_1.log)(this.importConfig, `No Environments Found - '${this.environmentsFolderPath}'`, 'info');
             return;
         }
         await utils_1.fsUtil.makeDirectory(this.mapperDirPath);

package/lib/import/modules/extensions.js

@@ -35,7 +35,7 @@ class ImportExtensions extends base_class_1.default {
             this.extensions = utils_1.fsUtil.readFile((0, node_path_1.join)(this.extensionsFolderPath, 'extensions.json'), true);
         }
         else {
-            (0, utils_1.log)(this.importConfig, `No such file or directory - '${this.extensionsFolderPath}'`, 'error');
+            (0, utils_1.log)(this.importConfig, `No Extensions Found - '${this.extensionsFolderPath}'`, 'info');
             return;
         }
         await utils_1.fsUtil.makeDirectory(this.mapperDirPath);

package/lib/import/modules/labels.js

@@ -33,7 +33,7 @@ class Importlabels extends base_class_1.default {
             this.labels = utils_1.fsUtil.readFile((0, node_path_1.join)(this.labelsFolderPath, 'labels.json'), true);
         }
         else {
-            (0, utils_1.log)(this.importConfig, `No such file or directory - '${this.labelsFolderPath}'`, 'error');
+            (0, utils_1.log)(this.importConfig, `No labels found - '${this.labelsFolderPath}'`, 'info');
             return;
         }
         //create labels in mapper directory
@@ -54,7 +54,7 @@ class Importlabels extends base_class_1.default {
     }
     async importlabels() {
         if (this.labels === undefined || (0, isEmpty_1.default)(this.labels)) {
-            (0, utils_1.log)(this.importConfig, 'No Label Found', 'info');
+            (0, utils_1.log)(this.importConfig, 'No Labels Found', 'info');
             return;
         }
         const apiContent = (0, values_1.default)(this.labels);

package/lib/import/modules/marketplace-apps.js

@@ -40,7 +40,7 @@ class ImportMarketplaceApps {
             this.marketplaceApps = utils_1.fsUtil.readFile((0, node_path_1.join)(this.marketPlaceFolderPath, this.marketPlaceAppConfig.fileName), true);
         }
         else {
-            (0, utils_1.log)(this.importConfig, `No such file or directory - '${this.marketPlaceFolderPath}'`, 'error');
+            (0, utils_1.log)(this.importConfig, `No Marketplace apps are found - '${this.marketPlaceFolderPath}'`, 'info');
             return;
         }
         if ((0, isEmpty_1.default)(this.marketplaceApps)) {

package/lib/import/modules/taxonomies.js

@@ -33,7 +33,7 @@ class ImportTaxonomies extends base_class_1.default {
             this.taxonomies = utils_1.fsUtil.readFile((0, node_path_1.join)(this.taxonomiesFolderPath, 'taxonomies.json'), true);
         }
         else {
-            (0, utils_1.log)(this.importConfig, `No such file or directory - '${this.taxonomiesFolderPath}'`, 'error');
+            (0, utils_1.log)(this.importConfig, `No Taxonomies Found! - '${this.taxonomiesFolderPath}'`, 'info');
             return;
         }
         //Step 2 create taxonomies & terms mapper directory

package/lib/import/modules/webhooks.js

@@ -32,7 +32,7 @@ class ImportWebhooks extends base_class_1.default {
             this.webhooks = utils_1.fsUtil.readFile((0, node_path_1.join)(this.webhooksFolderPath, 'webhooks.json'), true);
         }
         else {
-            (0, utils_1.log)(this.importConfig, `No such file or directory - '${this.webhooksFolderPath}'`, 'error');
+            (0, utils_1.log)(this.importConfig, `No Webhooks Found - '${this.webhooksFolderPath}'`, 'info');
             return;
         }
         //create webhooks in mapper directory

package/lib/import/modules/workflows.js

@@ -39,7 +39,7 @@ class ImportWorkflows extends base_class_1.default {
             this.workflows = utils_1.fsUtil.readFile((0, node_path_1.join)(this.workflowsFolderPath, this.workflowsConfig.fileName), true);
         }
         else {
-            (0, utils_1.log)(this.importConfig, `No such file or directory - '${this.workflowsFolderPath}'`, 'error');
+            (0, utils_1.log)(this.importConfig, `No Workflows Found - '${this.workflowsFolderPath}'`, 'info');
             return;
         }
         //create workflows in mapper directory

package/lib/utils/asset-helper.js

@@ -237,11 +237,7 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
     assetUrls.forEach(function (assetUrl) {
         let mappedAssetUrl = mappedAssetUrls[assetUrl];
         if (typeof mappedAssetUrl !== 'undefined') {
-            //NOTE - This code was added to resolve the SRE issue but once the code was merged Assets URLs in JSON RTE started breaking
-            // const sanitizedUrl = escapeRegExp(assetUrl).replace(/\.\./g, '\\$&');
-            // const escapedMappedUrl = escapeRegExp(mappedAssetUrl).replace(/\.\./g, '\\$&');
-            // entry = entry.replace(new RegExp(sanitizedUrl, 'img'), escapedMappedUrl);
-            entry = entry.replace(new RegExp(assetUrl, 'img'), mappedAssetUrl);
+            entry = entry.split(assetUrl).join(mappedAssetUrl);
             matchedUrls.push(mappedAssetUrl);
         }
         else {
@@ -252,12 +248,8 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
         let uid = mappedAssetUids[assetUid];
         if (typeof uid !== 'undefined') {
             const escapedAssetUid = assetUid.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-            const regex = new RegExp(`\\b${escapedAssetUid}\\b`, 'img');
-            let { status } = (0, cli_utilities_1.validateRegex)(new RegExp(regex, 'img'));
-            if (status === 'safe') {
-                entry = entry.replace(regex, uid);
-                matchedUids.push(assetUid);
-            }
+            entry = entry.split(escapedAssetUid).join(uid);
+            matchedUids.push(assetUid);
         }
         else {
             unmatchedUids.push(assetUid);

package/lib/utils/entries-helper.js

@@ -86,7 +86,9 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
                 else {
                     const key = _parent[j];
                     if (Object.prototype.hasOwnProperty.call(_entry, key)) {
-                        _entry = _entry[key];
+                        const tempEntry = Object.create(null);
+                        _.merge(tempEntry, _entry);
+                        _entry = tempEntry[key];
                         let _keys = _.clone(_parent).splice(j + 1, len);
                         if (Array.isArray(_entry)) {
                             for (let i = 0, _i = _entry === null || _entry === void 0 ? void 0 : _entry.length; i < _i; i++) {
@@ -575,11 +577,10 @@ const restoreJsonRteEntryRefs = (entry, sourceStackEntry, ctSchema = [], { uidMa
 };
 exports.restoreJsonRteEntryRefs = restoreJsonRteEntryRefs;
 function updateUids(str, match, uidMapper) {
+    var _a;
     const sanitizedMatch = (0, cli_utilities_1.escapeRegExp)(match);
-    const regex = new RegExp(`\\b${sanitizedMatch}\\b`, 'g');
-    let { status } = (0, cli_utilities_1.validateRegex)(regex);
-    if (status === 'safe')
-        return str.replace(regex, (matchedString) => uidMapper[matchedString]);
+    const replacement = (_a = uidMapper[match]) !== null && _a !== void 0 ? _a : sanitizedMatch;
+    return str.split(sanitizedMatch).join(replacement);
 }
 function setDirtyTrue(jsonRteChild) {
     // also removing uids in this function

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.16.4",
+  "version": "1.16.5",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.16.4",
+  "version": "1.16.5",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.6.3",
+    "@contentstack/cli-audit": "~1.6.5",
     "@contentstack/cli-command": "~1.2.19",
-    "@contentstack/cli-utilities": "~1.7.0",
-    "@contentstack/management": "~1.15.3",
+    "@contentstack/cli-utilities": "~1.7.1",
+    "@contentstack/management": "~1.17.0",
     "@oclif/core": "^3.26.5",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",