Merge bb0e03b into babcef7

src/analyzer/values/font-families.js

@@ -3,23 +3,22 @@ const uniquer = require('../../utils/uniquer')
 const {KEYWORDS} = require('../../utils/css')
 
 module.exports = declarations => {
-  const all = declarations
-    .reduce((prev, {property, value}) => {
-      if (property === 'font-family') {
-        prev = [...prev, value]
-      }
+  const all = declarations.reduce((prev, {property, value}) => {
+    if (KEYWORDS.includes(value)) {
+      return prev
+    }
 
-      if (property === 'font') {
-        const expanded = expand('font', value)
+    if (property === 'font-family') {
+      prev = [...prev, value]
+    }
 
-        if (expanded && expanded['font-family']) {
-          prev = [...prev, expanded['font-family']]
-        }
-      }
+    if (property === 'font') {
+      const {'font-family': family} = expand('font', value)
+      prev = [...prev, family]
+    }
 
-      return prev
-    }, [])
-    .filter(value => !KEYWORDS.includes(value))
+    return prev
+  }, [])
 
   return {
     total: all.length,

src/analyzer/values/font-sizes.js

@@ -1,32 +1,25 @@
 const expand = require('css-shorthand-expand')
 const unitSort = require('css-unit-sort')
 const uniquer = require('../../utils/uniquer')
-const utils = require('../../utils/css')
-
-const keywords = utils.KEYWORDS
+const {KEYWORDS} = require('../../utils/css')
 
 module.exports = declarations => {
-  const _all = (() => {
-    const tmp = []
-
-    declarations.forEach(declaration => {
-      if (declaration.property === 'font-size') {
-        return tmp.push(declaration.value)
-      }
-
-      if (declaration.property === 'font') {
-        const font = expand('font', declaration.value)
-
-        if (font && font['font-size']) {
-          return tmp.push(font['font-size'])
-        }
-      }
-    })
-
-    return tmp
-  })()
-
-  const all = _all.filter(v => !keywords.includes(v))
+  const all = declarations.reduce((prev, {property, value}) => {
+    if (KEYWORDS.includes(value)) {
+      return prev
+    }
+
+    if (property === 'font-size') {
+      prev = [...prev, value]
+    }
+
+    if (property === 'font') {
+      const {'font-size': size} = expand('font', value)
+      prev = [...prev, size]
+    }
+
+    return prev
+  }, [])
 
   return {
     total: all.length,