Refactor internals

Author: wooorm

lib/all.js

@@ -4,7 +4,7 @@ var one = require('./one')
 
 module.exports = all
 
-// Stringify all children of `parent`.
+// Serialize all children of `parent`.
 function all(ctx, parent) {
   var children = parent && parent.children
   var length = children && children.length

lib/comment.js

@@ -1,8 +1,7 @@
 'use strict'
 
-module.exports = comment
+module.exports = serializeComment
 
-// Stringify a comment `node`.
-function comment(ctx, node) {
+function serializeComment(ctx, node) {
   return '<!--' + node.value + '-->'
 }

lib/doctype.js

@@ -1,12 +1,11 @@
 'use strict'
 
-module.exports = doctype
+module.exports = serializeDoctype
 
 var docLower = 'doctype'
 var docUpper = docLower.toUpperCase()
 
-// Stringify a doctype `node`.
-function doctype(ctx, node) {
+function serializeDoctype(ctx, node) {
   var doc = ctx.upperDoctype ? docUpper : docLower
   var sep = ctx.tightDoctype ? '' : ' '
   var name = node.name
@@ -17,13 +16,13 @@ function doctype(ctx, node) {
   if (name) {
     val.push(sep, name)
 
-    if (pub != null) {
+    if (pub !== null && pub !== undefined) {
       val.push(' public', sep, smart(pub))
-    } else if (sys != null) {
+    } else if (sys !== null && sys !== undefined) {
       val.push(' system')
     }
 
-    if (sys != null) {
+    if (sys !== null && sys !== undefined) {
       val.push(sep, smart(sys))
     }
   }

lib/element.js

@@ -10,7 +10,7 @@ var ccount = require('ccount')
 var all = require('./all')
 var constants = require('./constants')
 
-module.exports = element
+module.exports = serializeElement
 
 var space = ' '
 var quotationMark = '"'
@@ -20,9 +20,8 @@ var lessThan = '<'
 var greaterThan = '>'
 var slash = '/'
 
-// Stringify an element `node`.
 // eslint-disable-next-line complexity
-function element(ctx, node, index, parent) {
+function serializeElement(ctx, node, index, parent) {
   var parentSchema = ctx.schema
   var name = node.tagName
   var value = ''
@@ -38,7 +37,7 @@ function element(ctx, node, index, parent) {
     ctx.schema = svg
   }
 
-  attrs = attributes(ctx, node.properties)
+  attrs = serializeAttributes(ctx, node.properties)
 
   if (ctx.schema.space === 'svg') {
     omit = false
@@ -95,8 +94,7 @@ function element(ctx, node, index, parent) {
   return value
 }
 
-// Stringify all attributes.
-function attributes(ctx, props) {
+function serializeAttributes(ctx, props) {
   var values = []
   var key
   var value
@@ -108,11 +106,11 @@ function attributes(ctx, props) {
   for (key in props) {
     value = props[key]
 
-    if (value == null) {
+    if (value === null || value === undefined) {
       continue
     }
 
-    result = attribute(ctx, key, value)
+    result = serializeAttribute(ctx, key, value)
 
     if (result) {
       values.push(result)
@@ -139,8 +137,7 @@ function attributes(ctx, props) {
   return values.join('')
 }
 
-// Stringify one attribute.
-function attribute(ctx, key, value) {
+function serializeAttribute(ctx, key, value) {
   var schema = ctx.schema
   var info = find(schema, key)
   var name = info.attribute
@@ -155,14 +152,15 @@ function attribute(ctx, key, value) {
   }
 
   if (
-    value == null ||
+    value === null ||
+    value === undefined ||
     value === false ||
     (typeof value === 'number' && isNaN(value))
   ) {
     return ''
   }
 
-  name = attributeName(ctx, name)
+  name = serializeAttributeName(ctx, name)
 
   if (value === true) {
     // There is currently only one boolean property in SVG: `[download]` on
@@ -184,20 +182,18 @@ function attribute(ctx, key, value) {
     return name
   }
 
-  return name + attributeValue(ctx, key, value, info)
+  return name + serializeAttributeValue(ctx, key, value, info)
 }
 
-// Stringify the attribute name.
-function attributeName(ctx, name) {
+function serializeAttributeName(ctx, name) {
   // Always encode without parse errors in non-HTML.
   var valid = ctx.schema.space === 'html' ? ctx.valid : 1
   var subset = constants.name[valid][ctx.safe]
 
   return entities(name, xtend(ctx.entities, {subset: subset}))
 }
 
-// Stringify the attribute value.
-function attributeValue(ctx, key, value, info) {
+function serializeAttributeValue(ctx, key, value, info) {
   var options = ctx.entities
   var quote = ctx.quote
   var alternative = ctx.alternative

lib/index.js

@@ -11,7 +11,6 @@ module.exports = toHtml
 var quotationMark = '"'
 var apostrophe = "'"
 
-// Stringify the given hast node.
 function toHtml(node, options) {
   var settings = options || {}
   var quote = settings.quote || quotationMark

lib/omission/closing.js

@@ -2,7 +2,7 @@
 
 var convert = require('unist-util-is/convert')
 var element = require('hast-util-is-element')
-var whiteSpaceLeft = require('./util/white-space-left')
+var whiteSpaceStart = require('./util/white-space-start')
 var after = require('./util/siblings').after
 var omission = require('./omission')
 
@@ -87,7 +87,7 @@ module.exports = omission({
 // Macro for `</head>`, `</colgroup>`, and `</caption>`.
 function headOrColgroupOrCaption(node, index, parent) {
   var next = after(parent, index, true)
-  return !next || (!isComment(next) && !whiteSpaceLeft(next))
+  return !next || (!isComment(next) && !whiteSpaceStart(next))
 }
 
 // Whether to omit `</html>`.

lib/omission/omission.js

@@ -11,8 +11,9 @@ function omission(handlers) {
   // Check if a given node can have a tag omitted.
   function omit(node, index, parent) {
     var name = node.tagName
-    var fn = own.call(handlers, name) ? handlers[name] : false
 
-    return fn ? fn(node, index, parent) : false
+    return own.call(handlers, name)
+      ? handlers[name](node, index, parent)
+      : false
   }
 }

lib/omission/opening.js

@@ -5,12 +5,10 @@ var element = require('hast-util-is-element')
 var before = require('./util/siblings').before
 var first = require('./util/first')
 var place = require('./util/place')
-var whiteSpaceLeft = require('./util/white-space-left')
+var whiteSpaceStart = require('./util/white-space-start')
 var closing = require('./closing')
 var omission = require('./omission')
 
-var own = {}.hasOwnProperty
-
 var isComment = convert('comment')
 
 var uniqueHeadMetadata = ['title', 'base']
@@ -36,7 +34,7 @@ function html(node) {
 function head(node) {
   var children = node.children
   var length = children.length
-  var map = {}
+  var seen = []
   var index = -1
   var child
   var name
@@ -46,23 +44,24 @@ function head(node) {
     name = child.tagName
 
     if (element(child, uniqueHeadMetadata)) {
-      if (own.call(map, name)) {
+      if (seen.indexOf(name) !== -1) {
         return false
       }
 
-      map[name] = true
+      seen.push(name)
     }
   }
 
-  return Boolean(length)
+  return length !== 0
 }
 
 // Whether to omit `<body>`.
 function body(node) {
   var head = first(node, true)
 
   return (
-    !head || (!isComment(head) && !whiteSpaceLeft(head) && !element(head, meta))
+    !head ||
+    (!isComment(head) && !whiteSpaceStart(head) && !element(head, meta))
   )
 }
 

lib/omission/util/siblings.js

@@ -12,15 +12,13 @@ function siblings(increment) {
   // Find applicable siblings in a direction.
   function sibling(parent, index, includeWhiteSpace) {
     var siblings = parent && parent.children
-    var next
-
-    index += increment
-    next = siblings && siblings[index]
+    var offset = index + increment
+    var next = siblings && siblings[offset]
 
     if (!includeWhiteSpace) {
       while (next && whiteSpace(next)) {
-        index += increment
-        next = siblings[index]
+        offset += increment
+        next = siblings[offset]
       }
     }
 

lib/omission/util/white-space-left.js renamed to lib/omission/util/white-space-start.js

@@ -3,11 +3,11 @@
 var convert = require('unist-util-is/convert')
 var whiteSpace = require('hast-util-whitespace')
 
-module.exports = whiteSpaceLeft
+module.exports = whiteSpaceStart
 
 var isText = convert('text')
 
 // Check if `node` starts with white-space.
-function whiteSpaceLeft(node) {
+function whiteSpaceStart(node) {
   return isText(node) && whiteSpace(node.value.charAt(0))
 }