feat: success colors for lighthouse in xlsx

viasite · Aug 15, 2020 · c31e554 · c31e554
1 parent e9c02ec
commit c31e554
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 32 deletions.
diff --git a/src/save-as-xlsx.js b/src/save-as-xlsx.js
@@ -17,6 +17,11 @@ module.exports = (csvPath, xlsxPath) => {
 
   // styles presets for validation
   const styles = {
+    success: {
+      fill: {
+        fgColor: { rgb: "FFA4F79A" }
+      }
+    },
     warning: {
       fill: {
         fgColor: { rgb: "FFFFDAA2" }
@@ -103,6 +108,7 @@ module.exports = (csvPath, xlsxPath) => {
         if(colsValidate[colName]){
           if(colsValidate[colName].warning && colsValidate[colName].warning(colVal)) ws[addr].s = styles.warning;
           if(colsValidate[colName].error && colsValidate[colName].error(colVal)) ws[addr].s = styles.error;
+          if(colsValidate[colName].success && colsValidate[colName].success(colVal)) ws[addr].s = styles.success;
         }
       }
     }

diff --git a/src/scrap-site.js b/src/scrap-site.js
@@ -115,9 +115,10 @@ module.exports = async (baseUrl, options = {}) => {
     });
   }
 
-  if(options.fields) {
-    //console.log('options.fields: ', options.fields);
-    fields = [...Object.keys(options.fields).map(f => 'result.' + f), ...fields];
+  if(options.fields.length > 0) {
+    // console.log('options.fields: ', options.fields);
+    const newFields = Object.keys(options.fields).map(f => 'result.' + f);
+    fields = [...fields, ...newFields];
   }
 
   if (options.skipStatic !== undefined) {

diff --git a/src/validate.js b/src/validate.js
@@ -1,10 +1,22 @@
 const {at} = require('lodash');
 
 const lighthouseValidateScore = {
+  success: (v) => v >= 90,
   warning: (v) => v < 90,
   error: (v) => v < 50,
 };
 
+const warnErrorThresholds = (warn, error, isSuccess=true) => {
+  const rules = {
+    warning: (v) => v > warn,
+    error: (v) => v > error,
+  }
+  if(isSuccess) {
+    rules.success = (v) => v <= warn;
+  }
+  return rules;
+};
+
 const colsValidate = {
   mixed_content_url: {
     error: (v) => !!v,
@@ -45,37 +57,19 @@ const colsValidate = {
     warning: (v) => v > 1000000,
   },
 
-  'lighthouse.scores.performance': lighthouseValidateScore,
-  'lighthouse.scores.pwa': lighthouseValidateScore,
-  'lighthouse.scores.accessibility': lighthouseValidateScore,
-  'lighthouse.scores.best-practices': lighthouseValidateScore,
-  'lighthouse.scores.seo': lighthouseValidateScore,
+  'lighthouse.scores.performance':       lighthouseValidateScore,
+  'lighthouse.scores.pwa':               lighthouseValidateScore,
+  'lighthouse.scores.accessibility':     lighthouseValidateScore,
+  'lighthouse.scores.best-practices':    lighthouseValidateScore,
+  'lighthouse.scores.seo':               lighthouseValidateScore,
 
   // https://web.dev/lighthouse-performance/
-  'lighthouse.first-contentful-paint': {
-    warning: (v) => v > 2000,
-    error: (v) => v > 4000
-  },
-  'lighthouse.speed-index': {
-    warning: (v) => v > 4300,
-    error: (v) => v > 5800
-  },
-  'lighthouse.largest-contentful-paint': {
-    warning: (v) => v > 2000,
-    error: (v) => v > 4000
-  },
-  'lighthouse.interactive': {
-    warning: (v) => v > 3800,
-    error: (v) => v > 7300
-  },
-  'lighthouse.total-blocking-time': {
-    warning: (v) => v > 300,
-    error: (v) => v > 600
-  },
-  'lighthouse.cumulative-layout-shift': {
-    warning: (v) => v > 100,
-    error: (v) => v > 250
-  },
+  'lighthouse.first-contentful-paint':   warnErrorThresholds(2000, 4000),
+  'lighthouse.speed-index':              warnErrorThresholds(4300, 5800),
+  'lighthouse.largest-contentful-paint': warnErrorThresholds(2000, 4000),
+  'lighthouse.interactive':              warnErrorThresholds(3800, 7300),
+  'lighthouse.total-blocking-time':      warnErrorThresholds(300, 600),
+  'lighthouse.cumulative-layout-shift':  warnErrorThresholds(100, 250),
 };
 
 const validationSum = {};