Merge 0c0c394 into a97c7d7

jungvonmatt · Jun 4, 2021 · fad81d4 · fad81d4
2 parents a97c7d7 + 0c0c394
commit fad81d4
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 51 deletions.
diff --git a/lib/config.js b/lib/config.js
@@ -24,44 +24,35 @@ const getConfig = async (args) => {
     accessToken: process.env.CONTENTFUL_DELIVERY_TOKEN,
   });
   let contentfulCliOptions = {};
-  try {
-    // get configuration from contentful rc file (created by the contentful cli command)
-    const explorer = cosmiconfig('contentful');
-    const explorerResult = await explorer.search();
-    if (explorerResult !== null) {
-      const { config } = explorerResult || {};
-      const { managementToken, activeSpaceId, activeEnvironmentId, host } = config || {};
-      contentfulCliOptions = removeEmpty({
-        spaceId: activeSpaceId,
-        managementToken: managementToken,
-        environmentId: activeEnvironmentId,
-        host,
-      });
-    }
-  } catch (error) {
-    console.log('Error:', error.message);
-    console.log(error);
+  // get configuration from contentful rc file (created by the contentful cli command)
+  const cgConfig = cosmiconfig('contentful');
+  const cgConfigResult = await cgConfig.search();
+  if (cgConfigResult !== null) {
+    const { config } = cgConfigResult || {};
+    const { managementToken, activeSpaceId, activeEnvironmentId, host } = config || {};
+    contentfulCliOptions = removeEmpty({
+      spaceId: activeSpaceId,
+      managementToken: managementToken,
+      environmentId: activeEnvironmentId,
+      host,
+    });
   }
 
   let configFileOptions = {};
-  try {
-    // get configuration from contentful-ssg rc file
-    const explorer = cosmiconfig('contentful-ssg');
-    const explorerResult = await explorer.search();
-    if (explorerResult !== null) {
-      const { config, filepath } = explorerResult || {};
+  // get configuration from contentful-ssg rc file
+  const cssgConfig = cosmiconfig('contentful-ssg');
+  const cssgConfigResult = await cssgConfig.search();
+  if (cssgConfigResult !== null) {
+    const { config, filepath } = cssgConfigResult || {};
 
-      configFileOptions = {
-        directory: path.resolve(path.dirname(filepath || ''), args.directory || 'content'),
-        ...(config || {}),
-      };
+    configFileOptions = {
+      directory: path.resolve(path.dirname(filepath || ''), args.directory || 'content'),
+      ...(config || {}),
+    };
 
-      if (configFileOptions.directory && !path.isAbsolute(configFileOptions.directory)) {
-        configFileOptions.directory = path.resolve(path.dirname(filepath || ''), configFileOptions.directory);
-      }
+    if (configFileOptions.directory && !path.isAbsolute(configFileOptions.directory)) {
+      configFileOptions.directory = path.resolve(path.dirname(filepath || ''), configFileOptions.directory);
     }
-  } catch (error) {
-    console.log('Error:', error.message);
   }
 
   return mergeOptions(defaultOptions, contentfulCliOptions, environmentOptions, configFileOptions, args || {});

diff --git a/lib/dump.js b/lib/dump.js
@@ -5,7 +5,6 @@ const dlv = require('dlv');
 const ignore = require('ignore');
 const findUp = require('find-up');
 const mm = require('micromatch');
-const UpdaterRenderer = require('listr-update-renderer');
 const fs = require('fs-extra');
 const { getContent, getContentTypeId, getContentId, getFieldSettings, convertToMap } = require('./contentful');
 const { mapAsync, forEachAsync } = require('./array');
@@ -70,6 +69,43 @@ const outputStats = (stats, locale) => {
   console.log(`\n  Saved ${chalk.cyan(cnt.reduce((acc, num) => acc + num, 0))} entries`);
 };
 
+/**
+ * This is a very simple listr renderer which does not swallow log output from
+ * the configured helper functions.
+ */
+class CustomListrRenderer {
+  constructor(tasks) {
+    this._tasks = tasks;
+  }
+
+  static get nonTTY() {
+    return false;
+  }
+
+  static subscribeTasks(tasks, indent = '') {
+    for (const task of tasks) {
+      task.subscribe((event) => {
+        if (event.type === 'STATE' && task.isPending()) {
+          console.log(`${indent}  ${chalk.yellow('\u279E')} ${task.title}`);
+        }
+        if (event.type === 'SUBTASKS' && task.subtasks.length > 0) {
+          CustomListrRenderer.subscribeTasks(task.subtasks, indent + '  ');
+        }
+      });
+    }
+  }
+
+  render() {
+    CustomListrRenderer.subscribeTasks(this._tasks);
+  }
+
+  end(err) {
+    if (!err) {
+      console.log(`  ${chalk.green('✔')} all tasks done!`);
+    }
+  }
+}
+
 /**
  * Dump contentful objects to files
  * @param {Object} config
@@ -290,16 +326,11 @@ const dump = async (config) => {
         },
       },
     ],
-    { collapse: true, renderer: UpdaterRenderer }
+    { collapse: true, renderer: CustomListrRenderer }
   );
 
-  try {
-    const ctx = await tasks.run();
-    outputStats(ctx.stats, ctx.defauleLocale);
-  } catch (error) {
-    console.error(error);
-  }
-
+  const ctx = await tasks.run();
+  outputStats(ctx.stats, ctx.defauleLocale);
   console.log('\n---------------------------------------------');
 };
 

diff --git a/lib/transform/mapper.js b/lib/transform/mapper.js
@@ -73,12 +73,8 @@ const mapDateField = (fieldContent) => {
  * @param {*} options
  */
 const mapReferenceField = (fieldContent, options) => {
-  const {
-    assets = [],
-    entries = [],
-    mapAssetLink: customMapAssetLink,
-    mapEntryLink: customMapEntryLink,
-  } = options || {};
+  const { assets = [], entries = [], mapAssetLink: customMapAssetLink, mapEntryLink: customMapEntryLink } =
+    options || {};
 
   if (isAssetLink(fieldContent)) {
     const asset = assets.get(getContentId(fieldContent));
@@ -257,6 +253,7 @@ const mapEntry = async (entry, options) => {
 
 module.exports.mapEntry = mapEntry;
 module.exports.mapField = mapField;
+module.exports.mapRichTextNodes = mapRichTextNodes;
 module.exports.mapRichTextField = mapRichTextField;
 module.exports.mapReferenceField = mapReferenceField;
 module.exports.mapDateField = mapDateField;

diff --git a/package.json b/package.json
@@ -40,7 +40,6 @@
     "js-yaml": "^4.1.0",
     "js-yaml-js-types": "^1.0.0",
     "listr": "^0.14.3",
-    "listr-update-renderer": "^0.5.0",
     "merge-options": "^3.0.4",
     "micromatch": "^4.0.4",
     "pkg-up": "^3.1.0",

diff --git a/test/localize.test.js b/test/localize.test.js
@@ -67,7 +67,8 @@ describe('Localize', () => {
       title: 'FuBK',
       description: 'Dummy image',
       file: {
-        url: '//images.ctfassets.net/gpdredy5px7h/3t1t8PDynjpXbAzv6zOVQq/7f4143c74191766d87f86d0035d91d28/FuBK_testcard_vectorized.svg',
+        url:
+          '//images.ctfassets.net/gpdredy5px7h/3t1t8PDynjpXbAzv6zOVQq/7f4143c74191766d87f86d0035d91d28/FuBK_testcard_vectorized.svg',
         details: {
           size: 120093,
           image: {

diff --git a/test/mapper.test.js b/test/mapper.test.js
@@ -313,7 +313,8 @@ describe('Mapper - mapEntry', () => {
       location: { lon: 13.422140718124993, lat: 52.47504074424066 },
       media: {
         mimeType: 'image/svg+xml',
-        url: '//images.ctfassets.net/gpdredy5px7h/3t1t8PDynjpXbAzv6zOVQq/7f4143c74191766d87f86d0035d91d28/FuBK_testcard_vectorized.svg',
+        url:
+          '//images.ctfassets.net/gpdredy5px7h/3t1t8PDynjpXbAzv6zOVQq/7f4143c74191766d87f86d0035d91d28/FuBK_testcard_vectorized.svg',
         title: 'FuBK',
         description: 'Dummy image',
         width: 768,
@@ -323,7 +324,8 @@ describe('Mapper - mapEntry', () => {
       mediaList: [
         {
           mimeType: 'image/svg+xml',
-          url: '//images.ctfassets.net/gpdredy5px7h/3t1t8PDynjpXbAzv6zOVQq/7f4143c74191766d87f86d0035d91d28/FuBK_testcard_vectorized.svg',
+          url:
+            '//images.ctfassets.net/gpdredy5px7h/3t1t8PDynjpXbAzv6zOVQq/7f4143c74191766d87f86d0035d91d28/FuBK_testcard_vectorized.svg',
           title: 'FuBK',
           description: 'Dummy image',
           width: 768,