@contentstack/cli-cm-import 1.1.0 → 1.2.0

package/src/lib/util/log.js

@@ -9,11 +9,9 @@ var path = require('path');
 var mkdirp = require('mkdirp');
 var slice = Array.prototype.slice;
 
-
-
 const ansiRegexPattern = [
   '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
-'(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))'
+  '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))',
 ].join('|');
 
 function returnString(args) {
@@ -22,14 +20,18 @@ function returnString(args) {
     returnStr = args
       .map(function (item) {
         if (item && typeof item === 'object') {
-          return JSON.stringify(item).replace(/authtoken\":\"blt................/g, 'authtoken":"blt....');
+          try {
+            return JSON.stringify(item).replace(/authtoken\":\"blt................/g, 'authtoken":"blt....');
+          } catch (error) {
+            return item.message;
+          }
         }
         return item;
       })
       .join('  ')
       .trim();
   }
-  returnStr = returnStr.replace(new RegExp(ansiRegexPattern, 'g'), "").trim();
+  returnStr = returnStr.replace(new RegExp(ansiRegexPattern, 'g'), '').trim();
   return returnStr;
 }
 

package/src/lib/util/login.js

@@ -38,7 +38,8 @@ module.exports = function (config) {
       client
         .stack({ api_key: config.target_stack, management_token: config.management_token })
         .fetch()
-        .then(function () {
+        .then(function (stack) {
+          config.destinationStackName = stack.name
           return resolve();
         })
         .catch((error) => {

package/src/lib/util/lookupReplaceAssets.js

@@ -76,11 +76,15 @@ module.exports = function (data, mappedAssetUids, mappedAssetUrls, assetUidMappe
         findAssetIdsFromJsonCustomFields(data.entry, data.content_type.schema);
       } else if (schema[i].data_type === 'json' && schema[i].field_metadata.extension) {
         if (installedExtensions) {
-          const marketplaceApps = helper.readFile(marketplaceAppPath);
+          const marketplaceApps = helper.readFileSync(marketplaceAppPath);
           const oldExt = _.find(marketplaceApps, { uid: schema[i].extension_uid });
 
           if (oldExt) {
-            const ext = _.find(installedExtensions, { type: oldExt.type, title: oldExt.title, app_uid: oldExt.app_uid })
+            const ext = _.find(installedExtensions, {
+              type: oldExt.type,
+              title: oldExt.title,
+              app_uid: oldExt.app_uid,
+            });
 
             if (ext) {
               schema[i].extension_uid = ext.uid;
@@ -96,11 +100,15 @@ module.exports = function (data, mappedAssetUids, mappedAssetUrls, assetUidMappe
       if (row.data_type === 'json') {
         if (entryObj[row.uid] && row.field_metadata.extension && row.field_metadata.is_asset) {
           if (installedExtensions) {
-            const marketplaceApps = helper.readFile(marketplaceAppPath);
+            const marketplaceApps = helper.readFileSync(marketplaceAppPath);
             const oldExt = _.find(marketplaceApps, { uid: row.extension_uid });
 
             if (oldExt) {
-              const ext = _.find(installedExtensions, { type: oldExt.type, title: oldExt.title, app_uid: oldExt.app_uid })
+              const ext = _.find(installedExtensions, {
+                type: oldExt.type,
+                title: oldExt.title,
+                app_uid: oldExt.app_uid,
+              });
 
               if (ext) {
                 row.extension_uid = ext.uid;
@@ -109,11 +117,15 @@ module.exports = function (data, mappedAssetUids, mappedAssetUrls, assetUidMappe
           }
 
           if (entryObj[row.uid].metadata && entryObj[row.uid].metadata.extension_uid) {
-            const marketplaceApps = helper.readFile(marketplaceAppPath);
+            const marketplaceApps = helper.readFileSync(marketplaceAppPath);
             const oldExt = _.find(marketplaceApps, { uid: entryObj[row.uid].metadata.extension_uid });
 
             if (oldExt) {
-              const ext = _.find(installedExtensions, { type: oldExt.type, title: oldExt.title, app_uid: oldExt.app_uid })
+              const ext = _.find(installedExtensions, {
+                type: oldExt.type,
+                title: oldExt.title,
+                app_uid: oldExt.app_uid,
+              });
 
               if (ext) {
                 entryObj[row.uid].metadata.extension_uid = ext.uid;
@@ -238,7 +250,7 @@ module.exports = function (data, mappedAssetUids, mappedAssetUrls, assetUidMappe
   });
 
   if (matchedUids.length) {
-    let matchedAssetUids = helper.readFile(path.join(assetUidMapperPath, 'matched-asset-uids.json'));
+    let matchedAssetUids = helper.readFileSync(path.join(assetUidMapperPath, 'matched-asset-uids.json'));
     matchedAssetUids = matchedAssetUids || {};
     if (matchedAssetUids.hasOwnProperty(data.content_type.uid)) {
       matchedAssetUids[data.content_type.uid][data.entry.uid] = matchedUids;
@@ -251,7 +263,7 @@ module.exports = function (data, mappedAssetUids, mappedAssetUrls, assetUidMappe
   }
 
   if (unmatchedUids.length) {
-    let unmatchedAssetUids = helper.readFile(path.join(assetUidMapperPath, 'unmatched-asset-uids.json'));
+    let unmatchedAssetUids = helper.readFileSync(path.join(assetUidMapperPath, 'unmatched-asset-uids.json'));
     unmatchedAssetUids = unmatchedAssetUids || {};
     if (unmatchedAssetUids.hasOwnProperty(data.content_type.uid)) {
       unmatchedAssetUids[data.content_type.uid][data.entry.uid] = unmatchedUids;
@@ -264,7 +276,7 @@ module.exports = function (data, mappedAssetUids, mappedAssetUrls, assetUidMappe
   }
 
   if (unmatchedUrls.length) {
-    let unmatchedAssetUrls = helper.readFile(path.join(assetUidMapperPath, 'unmatched-asset-urls.json'));
+    let unmatchedAssetUrls = helper.readFileSync(path.join(assetUidMapperPath, 'unmatched-asset-urls.json'));
     unmatchedAssetUrls = unmatchedAssetUrls || {};
     if (unmatchedAssetUrls.hasOwnProperty(data.content_type.uid)) {
       unmatchedAssetUrls[data.content_type.uid][data.entry.uid] = unmatchedUrls;
@@ -277,7 +289,7 @@ module.exports = function (data, mappedAssetUids, mappedAssetUrls, assetUidMappe
   }
 
   if (matchedUrls.length) {
-    let matchedAssetUrls = helper.readFile(path.join(assetUidMapperPath, 'matched-asset-urls.json'));
+    let matchedAssetUrls = helper.readFileSync(path.join(assetUidMapperPath, 'matched-asset-urls.json'));
     matchedAssetUrls = matchedAssetUrls || {};
     if (matchedAssetUrls.hasOwnProperty(data.content_type.uid)) {
       matchedAssetUrls[data.content_type.uid][data.entry.uid] = matchedUrls;

package/src/lib/util/lookupReplaceEntries.js

@@ -22,35 +22,35 @@ module.exports = function (data, mappedUids, uidMapperPath) {
   let preserveStackVersion = config.preserveStackVersion;
 
   function gatherJsonRteEntryIds(jsonRteData) {
-    jsonRteData.children.forEach(element => {
+    jsonRteData.children.forEach((element) => {
       if (element.type) {
         switch (element.type) {
           case 'a':
           case 'p': {
             if (element.children && element.children.length > 0) {
-              gatherJsonRteEntryIds(element)
+              gatherJsonRteEntryIds(element);
             }
             break;
           }
           case 'reference': {
-            if (Object.keys(element.attrs).length > 0 && element.attrs.type === "entry") {
+            if (Object.keys(element.attrs).length > 0 && element.attrs.type === 'entry') {
               if (uids.indexOf(element.attrs['entry-uid']) === -1) {
-                uids.push(element.attrs['entry-uid'])
+                uids.push(element.attrs['entry-uid']);
               }
             }
             if (element.children && element.children.length > 0) {
-              gatherJsonRteEntryIds(element)
+              gatherJsonRteEntryIds(element);
             }
             break;
           }
         }
       }
-    })
+    });
   }
 
   const update = function (_parent, form_id, updateEntry) {
-    let _entry = updateEntry
-    let len = _parent.length
+    let _entry = updateEntry;
+    let len = _parent.length;
 
     for (let j = 0; j < len; j++) {
       if (_entry && _parent[j]) {
@@ -82,7 +82,7 @@ module.exports = function (data, mappedUids, uidMapperPath) {
           }
         } else {
           _entry = _entry[_parent[j]];
-          let _keys = _.clone(_parent).splice((j+1), len);
+          let _keys = _.clone(_parent).splice(j + 1, len);
           if (Array.isArray(_entry)) {
             for (let i = 0, _i = _entry.length; i < _i; i++) {
               update(_keys, form_id, _entry[i]);
@@ -97,43 +97,43 @@ module.exports = function (data, mappedUids, uidMapperPath) {
   const find = function (schema, _entry) {
     for (let i = 0, _i = schema.length; i < _i; i++) {
       switch (schema[i].data_type) {
-      case 'reference':
-        if (Array.isArray(schema[i].reference_to)) {
-          isNewRefFields = true
-          schema[i].reference_to.forEach(reference => {
-            parent.push(schema[i].uid)
-            update(parent, reference, _entry)
-            parent.pop()
-          })
-        } else {
-          parent.push(schema[i].uid)
-          update(parent, schema[i].reference_to, _entry)
-          parent.pop()
-        }
-        break
-      case 'global_field':
-      case 'group':
-        parent.push(schema[i].uid)
-        find(schema[i].schema, _entry)
-        parent.pop()
-        break
-      case 'blocks':
-        for (let j = 0, _j = schema[i].blocks.length; j < _j; j++) {
-          parent.push(schema[i].uid)
-          parent.push(schema[i].blocks[j].uid)
-          find(schema[i].blocks[j].schema, _entry)
-          parent.pop()
-          parent.pop()
-        }
-        break
-      case 'json':
-        if (schema[i].field_metadata.rich_text_type) {
-          findEntryIdsFromJsonRte(data.entry, data.content_type.schema)
-        }
-        break
+        case 'reference':
+          if (Array.isArray(schema[i].reference_to)) {
+            isNewRefFields = true;
+            schema[i].reference_to.forEach((reference) => {
+              parent.push(schema[i].uid);
+              update(parent, reference, _entry);
+              parent.pop();
+            });
+          } else {
+            parent.push(schema[i].uid);
+            update(parent, schema[i].reference_to, _entry);
+            parent.pop();
+          }
+          break;
+        case 'global_field':
+        case 'group':
+          parent.push(schema[i].uid);
+          find(schema[i].schema, _entry);
+          parent.pop();
+          break;
+        case 'blocks':
+          for (let j = 0, _j = schema[i].blocks.length; j < _j; j++) {
+            parent.push(schema[i].uid);
+            parent.push(schema[i].blocks[j].uid);
+            find(schema[i].blocks[j].schema, _entry);
+            parent.pop();
+            parent.pop();
+          }
+          break;
+        case 'json':
+          if (schema[i].field_metadata.rich_text_type) {
+            findEntryIdsFromJsonRte(data.entry, data.content_type.schema);
+          }
+          break;
       }
     }
-  }
+  };
 
   function findEntryIdsFromJsonRte(entry, ctSchema) {
     for (const element of ctSchema) {
@@ -141,11 +141,11 @@ module.exports = function (data, mappedUids, uidMapperPath) {
         case 'blocks': {
           if (entry[element.uid]) {
             if (element.multiple) {
-              entry[element.uid].forEach(e => {
-                let key = Object.keys(e).pop()
-                let subBlock = element.blocks.filter(e => e.uid === key).pop()
-                findEntryIdsFromJsonRte(e[key], subBlock.schema)
-              })
+              entry[element.uid].forEach((e) => {
+                let key = Object.keys(e).pop();
+                let subBlock = element.blocks.filter((e) => e.uid === key).pop();
+                findEntryIdsFromJsonRte(e[key], subBlock.schema);
+              });
             }
           }
           break;
@@ -154,11 +154,11 @@ module.exports = function (data, mappedUids, uidMapperPath) {
         case 'group': {
           if (entry[element.uid]) {
             if (element.multiple) {
-              entry[element.uid].forEach(e => {
-                findEntryIdsFromJsonRte(e, element.schema)
-              })
+              entry[element.uid].forEach((e) => {
+                findEntryIdsFromJsonRte(e, element.schema);
+              });
             } else {
-              findEntryIdsFromJsonRte(entry[element.uid], element.schema)
+              findEntryIdsFromJsonRte(entry[element.uid], element.schema);
             }
           }
           break;
@@ -166,11 +166,11 @@ module.exports = function (data, mappedUids, uidMapperPath) {
         case 'json': {
           if (entry[element.uid] && element.field_metadata.rich_text_type) {
             if (element.multiple) {
-              entry[element.uid].forEach(jsonRteData => {
-                gatherJsonRteEntryIds(jsonRteData)
-              })
+              entry[element.uid].forEach((jsonRteData) => {
+                gatherJsonRteEntryIds(jsonRteData);
+              });
             } else {
-              gatherJsonRteEntryIds(entry[element.uid])
+              gatherJsonRteEntryIds(entry[element.uid]);
             }
           }
           break;
@@ -179,7 +179,7 @@ module.exports = function (data, mappedUids, uidMapperPath) {
     }
   }
 
-  find(data.content_type.schema, data.entry)
+  find(data.content_type.schema, data.entry);
   if (isNewRefFields) {
     findUidsInNewRefFields(data.entry, uids);
   }
@@ -201,7 +201,7 @@ module.exports = function (data, mappedUids, uidMapperPath) {
   });
 
   if (unmapped.length > 0) {
-    let unmappedUids = helper.readFile(path.join(uidMapperPath, 'unmapped-uids.json'));
+    let unmappedUids = helper.readFileSync(path.join(uidMapperPath, 'unmapped-uids.json'));
     unmappedUids = unmappedUids || {};
     if (unmappedUids.hasOwnProperty(data.content_type.uid)) {
       unmappedUids[data.content_type.uid][data.entry.uid] = unmapped;
@@ -215,7 +215,7 @@ module.exports = function (data, mappedUids, uidMapperPath) {
   }
 
   if (mapped.length > 0) {
-    let _mappedUids = helper.readFile(path.join(uidMapperPath, 'mapped-uids.json'));
+    let _mappedUids = helper.readFileSync(path.join(uidMapperPath, 'mapped-uids.json'));
     _mappedUids = _mappedUids || {};
     if (_mappedUids.hasOwnProperty(data.content_type.uid)) {
       _mappedUids[data.content_type.uid][data.entry.uid] = mapped;

package/src/lib/util/marketplace-app-helper.js

@@ -1,5 +1,6 @@
+let config = require('../../config/default');
 const sdk = require('./contentstack-management-sdk');
-const { HttpClient } = require('@contentstack/cli-utilities');
+const { cliux, HttpClient, configHandler } = require('@contentstack/cli-utilities');
 
 const getInstalledExtensions = (config) => {
   const client = sdk.Client(config)
@@ -19,15 +20,13 @@ const getInstalledExtensions = (config) => {
         .then(({ items }) => resolve(items))
         .catch(reject)
     } else if (api_key && auth_token) {
+      const { cma } = configHandler.get('region') || {};
       const headers = {
         api_key,
         authtoken: auth_token
       }
       const httpClient = new HttpClient().headers(headers);
-      const baseUrl = config.host.startsWith('http')
-        ? config.host
-        : `https://${config.host}/v3`;
-      httpClient.get(`${baseUrl}/extensions/?include_marketplace_extensions=true`)
+      httpClient.get(`${cma}/v3/extensions/?include_marketplace_extensions=true`)
         .then(({ data: { extensions } }) => resolve(extensions))
     } else {
       resolve([])
@@ -35,4 +34,24 @@ const getInstalledExtensions = (config) => {
   })
 }
 
-module.exports = { getInstalledExtensions }
+const getDeveloperHubUrl = async () => {
+  const { cma, name } = configHandler.get('region') || {};
+  let developerHubBaseUrl = config.developerHubUrls[cma];
+
+  if (!developerHubBaseUrl) {
+    developerHubBaseUrl = await cliux.inquire({
+      type: 'input',
+      name: 'name',
+      validate: (url) => {
+        if (!url) return "Developer-hub URL can't be empty.";
+
+        return true;
+      },
+      message: `Enter the developer-hub base URL for the ${name} region - `,
+    });
+  }
+
+  return developerHubBaseUrl.startsWith('http') ? developerHubBaseUrl : `https://${developerHubBaseUrl}`;
+}
+
+module.exports = { getInstalledExtensions, getDeveloperHubUrl }