Refactor to improve bundle size

Author: wooorm

Diff for: lib/all.js

@@ -6,12 +6,11 @@ module.exports = all
 
 // Serialize all children of `parent`.
 function all(ctx, parent) {
-  var children = parent && parent.children
-  var length = children && children.length
-  var index = -1
   var results = []
+  var children = (parent && parent.children) || []
+  var index = -1
 
-  while (++index < length) {
+  while (++index < children.length) {
     results[index] = one(ctx, children[index], index, parent)
   }
 

Diff for: lib/comment.js

@@ -5,23 +5,13 @@ var entities = require('stringify-entities')
 
 module.exports = serializeComment
 
-// See: <https://html.spec.whatwg.org/multipage/syntax.html#comments>
-var breakout = /^>|^->|<!--|-->|--!>|<!-$/g
-var subset = ['<', '>']
-var bogusSubset = ['>']
-
 function serializeComment(ctx, node) {
-  var value = node.value
-
-  if (ctx.bogusComments) {
-    return (
-      '<?' + entities(value, xtend(ctx.entities, {subset: bogusSubset})) + '>'
-    )
-  }
-
-  return '<!--' + value.replace(breakout, encode) + '-->'
+  // See: <https://html.spec.whatwg.org/multipage/syntax.html#comments>
+  return ctx.bogusComments
+    ? '<?' + entities(node.value, xtend(ctx.entities, {subset: ['>']})) + '>'
+    : '<!--' + node.value.replace(/^>|^->|<!--|-->|--!>|<!-$/g, encode) + '-->'
 
   function encode($0) {
-    return entities($0, xtend(ctx.entities, {subset: subset}))
+    return entities($0, xtend(ctx.entities, {subset: ['<', '>']}))
   }
 }

Diff for: lib/constants.js

@@ -1,71 +1,28 @@
 'use strict'
 
-// Characters.
-var nil = '\0'
-var ampersand = '&'
-var space = ' '
-var tab = '\t'
-var graveAccent = '`'
-var quotationMark = '"'
-var apostrophe = "'"
-var equalsTo = '='
-var lessThan = '<'
-var greaterThan = '>'
-var slash = '/'
-var lineFeed = '\n'
-var carriageReturn = '\r'
-var formFeed = '\f'
-
-var whitespace = [space, tab, lineFeed, carriageReturn, formFeed]
-
-// See: <https://html.spec.whatwg.org/#attribute-name-state>.
-var name = whitespace.concat(ampersand, slash, greaterThan, equalsTo)
-
-// See: <https://html.spec.whatwg.org/#attribute-value-(unquoted)-state>.
-var unquoted = whitespace.concat(ampersand, greaterThan)
-var unquotedSafe = unquoted.concat(
-  nil,
-  quotationMark,
-  apostrophe,
-  lessThan,
-  equalsTo,
-  graveAccent
-)
-
-// See: <https://html.spec.whatwg.org/#attribute-value-(single-quoted)-state>.
-var singleQuoted = [ampersand, apostrophe]
-
-// See: <https://html.spec.whatwg.org/#attribute-value-(double-quoted)-state>.
-var doubleQuoted = [ampersand, quotationMark]
-
 // Maps of subsets.
 // Each value is a matrix of tuples.
 // The first value causes parse errors, the second is valid.
 // Of both values, the first value is unsafe, and the second is safe.
 module.exports = {
+  // See: <https://html.spec.whatwg.org/#attribute-name-state>.
   name: [
-    [name, name.concat(quotationMark, apostrophe, graveAccent)],
-    [
-      name.concat(nil, quotationMark, apostrophe, lessThan),
-      name.concat(nil, quotationMark, apostrophe, lessThan, graveAccent)
-    ]
+    ['\t\n\f\r &/=>'.split(''), '\t\n\f\r "&\'/=>`'.split('')],
+    ['\0\t\n\f\r "&\'/<=>'.split(''), '\0\t\n\f\r "&\'/<=>`'.split('')]
   ],
+  // See: <https://html.spec.whatwg.org/#attribute-value-(unquoted)-state>.
   unquoted: [
-    [unquoted, unquotedSafe],
-    [unquotedSafe, unquotedSafe]
+    ['\t\n\f\r &>'.split(''), '\0\t\n\f\r "&\'<=>`'.split('')],
+    ['\0\t\n\f\r "&\'<=>`'.split(''), '\0\t\n\f\r "&\'<=>`'.split('')]
   ],
+  // See: <https://html.spec.whatwg.org/#attribute-value-(single-quoted)-state>.
   single: [
-    [singleQuoted, singleQuoted.concat(quotationMark, graveAccent)],
-    [
-      singleQuoted.concat(nil),
-      singleQuoted.concat(nil, quotationMark, graveAccent)
-    ]
+    ["&'".split(''), '"&\'`'.split('')],
+    ["\0&'".split(''), '\0"&\'`'.split('')]
   ],
+  // See: <https://html.spec.whatwg.org/#attribute-value-(double-quoted)-state>.
   double: [
-    [doubleQuoted, doubleQuoted.concat(apostrophe, graveAccent)],
-    [
-      doubleQuoted.concat(nil),
-      doubleQuoted.concat(nil, apostrophe, graveAccent)
-    ]
+    ['"&'.split(''), '"&\'`'.split('')],
+    ['\0"&'.split(''), '\0"&\'`'.split('')]
   ]
 }

Diff for: lib/doctype.js

@@ -6,44 +6,36 @@ var entities = require('stringify-entities')
 
 module.exports = serializeDoctype
 
-var docLower = 'doctype'
-var docUpper = docLower.toUpperCase()
-
 function serializeDoctype(ctx, node) {
-  var doc = ctx.upperDoctype ? docUpper : docLower
   var sep = ctx.tightDoctype ? '' : ' '
-  var name = node.name
-  var pub = node.public
-  var sys = node.system
-  var parts = ['<!' + doc]
+  var parts = ['<!' + (ctx.upperDoctype ? 'DOCTYPE' : 'doctype')]
 
-  if (name) {
-    parts.push(sep, name)
+  if (node.name) {
+    parts.push(sep, node.name)
 
-    if (pub !== null && pub !== undefined) {
-      parts.push(' public', sep, quote(ctx, pub))
-    } else if (sys !== null && sys !== undefined) {
+    if (node.public != null) {
+      parts.push(' public', sep, quote(ctx, node.public))
+    } else if (node.system != null) {
       parts.push(' system')
     }
 
-    if (sys !== null && sys !== undefined) {
-      parts.push(sep, quote(ctx, sys))
+    if (node.system != null) {
+      parts.push(sep, quote(ctx, node.system))
     }
   }
 
   return parts.join('') + '>'
 }
 
 function quote(ctx, value) {
-  var primary = ctx.quote
-  var secondary = ctx.alternative
   var string = String(value)
   var quote =
-    ccount(string, primary) > ccount(string, secondary) ? secondary : primary
+    ccount(string, ctx.quote) > ccount(string, ctx.alternative)
+      ? ctx.alternative
+      : ctx.quote
 
   return (
     quote +
-    // Prevent breaking out of doctype.
     entities(string, xtend(ctx.entities, {subset: ['<', '&', quote]})) +
     quote
   )