Refactor utilities

Author: wooorm

lib/handlers/blockquote.js

@@ -2,9 +2,8 @@
 
 module.exports = blockquote
 
-var all = require('../all')
-var wrap = require('../wrap')
+var wrapChildren = require('../util/wrap-children')
 
 function blockquote(h, node) {
-  return h(node, 'blockquote', wrap(all(h, node)))
+  return h(node, 'blockquote', wrapChildren(h, node))
 }

lib/handlers/code.js

@@ -10,18 +10,20 @@ var trim = require('trim-trailing-lines')
 var prefix = 'language-'
 
 function code(h, node) {
-  var values = node.children
-  var length = values.length
+  var children = node.children
+  var length = children.length
   var index = -1
-  var value
+  var child
   var classList
+  var className
   var lang
 
   if (node.tagName === 'pre') {
     while (++index < length) {
-      value = values[index]
-      if (is(value, 'code') && has(value, 'className')) {
-        classList = value.properties.className
+      child = children[index]
+
+      if (is(child, 'code') && has(child, 'className')) {
+        classList = child.properties.className
         break
       }
     }
@@ -32,10 +34,10 @@ function code(h, node) {
     index = -1
 
     while (++index < length) {
-      value = classList[index]
+      className = classList[index]
 
-      if (value.slice(0, prefix.length) === prefix) {
-        lang = value.slice(prefix.length)
+      if (className.slice(0, prefix.length) === prefix) {
+        lang = className.slice(prefix.length)
         break
       }
     }

lib/handlers/index.js

@@ -1,7 +1,7 @@
 'use strict'
 
 var all = require('../all')
-var wrapped = require('../wrap-children')
+var wrapped = require('../util/wrap-children')
 
 exports.root = require('./root')
 exports.text = require('./text')

lib/handlers/list-item.js

@@ -3,14 +3,12 @@
 module.exports = listItem
 
 var is = require('hast-util-is-element')
-var all = require('../all')
-var wrap = require('../wrap')
+var wrapChildren = require('../util/wrap-children')
 
 function listItem(h, node) {
   var children = node.children
   var head = children[0]
   var checked = null
-  var loose = false
   var checkbox
   var grandchildren
   var content
@@ -26,12 +24,10 @@ function listItem(h, node) {
       checkbox.properties.type === 'checkbox'
     ) {
       checked = Boolean(checkbox.properties.checked)
-    } else {
-      checkbox = null
     }
   }
 
-  content = wrap(all(h, node))
+  content = wrapChildren(h, node)
 
   /* Remove initial spacing if we previously found a checkbox. */
   if (checked !== null) {
@@ -48,21 +44,19 @@ function listItem(h, node) {
     }
   }
 
-  if (content.length > 1) {
-    /* More than one node is always loose. */
-    loose = true
-  } else if (content.length === 1) {
+  /* Drop empty paragraph. */
+  if (content.length === 1) {
     head = content[0]
 
-    if (head.type === 'paragraph') {
-      /* One `paragraph`, always tight. Ensure it isn’t empty. */
-      loose = false
-
-      if (head.children.length === 0) {
-        content = []
-      }
+    if (head.type === 'paragraph' && head.children.length === 0) {
+      content = []
     }
   }
 
-  return h(node, 'listItem', {loose: loose, checked: checked}, content)
+  return h(
+    node,
+    'listItem',
+    {loose: content.length > 1, checked: checked},
+    content
+  )
 }

lib/handlers/list.js

@@ -3,48 +3,24 @@
 module.exports = list
 
 var has = require('hast-util-has-property')
-var all = require('../all')
+var wrapListItems = require('../util/wrap-list-items')
+var loose = require('../util/list-loose')
 
 function list(h, node) {
   var ordered = node.tagName === 'ol'
   var start = null
-  var loose = false
-  var content
-  var child
-  var length
-  var index
+  var children
 
   if (ordered) {
     start = has(node, 'start') ? node.properties.start : 1
   }
 
-  content = all(h, node)
-  length = content.length
-  index = -1
-
-  while (++index < length) {
-    child = content[index]
-
-    if (child.type !== 'listItem') {
-      child = {
-        type: 'listItem',
-        loose: false,
-        checked: null,
-        children: [child]
-      }
-
-      content[index] = child
-    }
-
-    if (child.loose === true) {
-      loose = true
-    }
-  }
+  children = wrapListItems(h, node)
 
   return h(
     node,
     'list',
-    {ordered: ordered, start: start, loose: loose},
-    content
+    {ordered: ordered, start: start, loose: loose(children)},
+    children
   )
 }

lib/handlers/root.js

@@ -3,7 +3,7 @@
 module.exports = root
 
 var all = require('../all')
-var wrap = require('../wrap')
+var wrap = require('../util/wrap')
 
 function root(h, node) {
   var children = all(h, node)

lib/util/list-loose.js

@@ -0,0 +1,16 @@
+'use strict'
+
+module.exports = loose
+
+function loose(children) {
+  var length = children.length
+  var index = -1
+
+  while (++index < length) {
+    if (children[index].loose) {
+      return true
+    }
+  }
+
+  return false
+}

lib/wrap-children.js renamed to lib/util/wrap-children.js

@@ -2,7 +2,7 @@
 
 module.exports = wrapped
 
-var all = require('./all')
+var all = require('../all')
 var wrap = require('./wrap')
 
 function wrapped(h, node) {

lib/util/wrap-list-items.js

@@ -0,0 +1,27 @@
+'use strict'
+
+module.exports = wrapped
+
+var all = require('../all')
+
+function wrapped(h, node) {
+  var children = all(h, node)
+  var length = children.length
+  var index = -1
+  var child
+
+  while (++index < length) {
+    child = children[index]
+
+    if (child.type !== 'listItem') {
+      children[index] = {
+        type: 'listItem',
+        loose: false,
+        checked: null,
+        children: [child]
+      }
+    }
+  }
+
+  return children
+}