html-minifier 3.5.15 → 3.5.16

package/README.md

@@ -22,19 +22,19 @@ How does HTMLMinifier compare to other solutions — [HTML Minifier from Will Pe
 
 | Site                                                                         | Original size *(KB)* | HTMLMinifier | minimize | Will Peavy | htmlcompressor.com |
 | ---------------------------------------------------------------------------- |:--------------------:| ------------:| --------:| ----------:| ------------------:|
-| [Google](https://www.google.com/)                                            | 45                   | **42**       | 45       | 47         | 45                 |
-| [Twitter](https://twitter.com/)                                              | 122                  | **89**       | 115      | 134        | 115                |
-| [HTMLMinifier](https://github.com/kangax/html-minifier)                      | 142                  | **110**      | 119      | 123        | 118                |
-| [New York Times](https://www.nytimes.com/)                                   | 221                  | **152**      | 172      | 168        | 156                |
-| [Stack Overflow](https://stackoverflow.com/)                                 | 247                  | **193**      | 202      | 210        | 200                |
+| [Google](https://www.google.com/)                                            | 50                   | **45**       | 49       | 51         | 49                 |
+| [Twitter](https://twitter.com/)                                              | 128                  | **94**       | 121      | 140        | 121                |
+| [HTMLMinifier](https://github.com/kangax/html-minifier)                      | 144                  | **112**      | 120      | 125        | 120                |
+| [New York Times](https://www.nytimes.com/)                                   | 212                  | **145**      | 164      | 159        | 148                |
+| [Stack Overflow](https://stackoverflow.com/)                                 | 249                  | **194**      | 203      | 212        | 201                |
 | [Bootstrap CSS](https://getbootstrap.com/docs/3.3/css/)                      | 272                  | **260**      | 269      | 229        | 269                |
-| [BBC](https://www.bbc.co.uk/)                                                | 283                  | **228**      | 275      | 278        | 262                |
-| [Amazon](https://www.amazon.co.uk/)                                          | 370                  | **315**      | 356      | 367        | n/a                |
-| [Wikipedia](https://en.wikipedia.org/wiki/President_of_the_United_States)    | 474                  | **442**      | 458      | 473        | 457                |
-| [NBC](https://www.nbc.com/)                                                  | 666                  | **627**      | 663      | 665        | n/a                |
+| [BBC](https://www.bbc.co.uk/)                                                | 295                  | **237**      | 287      | 290        | 272                |
+| [Amazon](https://www.amazon.co.uk/)                                          | 391                  | **336**      | 377      | 389        | n/a                |
+| [Wikipedia](https://en.wikipedia.org/wiki/President_of_the_United_States)    | 474                  | **442**      | 458      | 474        | 458                |
+| [NBC](https://www.nbc.com/)                                                  | 689                  | **647**      | 685      | 687        | n/a                |
 | [Eloquent Javascript](https://eloquentjavascript.net/1st_edition/print.html) | 870                  | **815**      | 840      | 864        | n/a                |
-| [ES6 table](https://kangax.github.io/compat-table/es6/)                      | 4916                 | **4189**     | 4652     | n/a        | n/a                |
-| [ES6 draft](https://tc39.github.io/ecma262/)                                 | 6099                 | **5435**     | 5597     | n/a        | n/a                |
+| [ES6 table](https://kangax.github.io/compat-table/es6/)                      | 5014                 | **4273**     | 4745     | n/a        | n/a                |
+| [ES6 draft](https://tc39.github.io/ecma262/)                                 | 6101                 | **5437**     | 5599     | n/a        | n/a                |
 
 ## Options Quick Reference
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "html-minifier",
   "description": "Highly configurable, well-tested, JavaScript-based HTML minifier.",
-  "version": "3.5.15",
+  "version": "3.5.16",
   "keywords": [
     "cli",
     "compress",
@@ -72,7 +72,7 @@
   },
   "benchmarkDependencies": {
     "brotli": "1.3.x",
-    "chalk": "2.3.x",
+    "chalk": "2.4.x",
     "cli-table": "0.3.x",
     "lzma": "2.3.x",
     "minimize": "2.2.x",

package/src/htmlminifier.js

@@ -9,10 +9,7 @@ var UglifyJS = require('uglify-js');
 var utils = require('./utils');
 
 function trimWhitespace(str) {
-  if (typeof str !== 'string') {
-    return str;
-  }
-  return str.replace(/^[ \n\r\t\f]+/, '').replace(/[ \n\r\t\f]+$/, '');
+  return str && str.replace(/^[ \n\r\t\f]+/, '').replace(/[ \n\r\t\f]+$/, '');
 }
 
 function collapseWhitespaceAll(str) {
@@ -258,7 +255,7 @@ function isSrcset(attrName, tag) {
 }
 
 function cleanAttributeValue(tag, attrName, attrValue, options, attrs) {
-  if (attrValue && isEventAttribute(attrName, options)) {
+  if (isEventAttribute(attrName, options)) {
     attrValue = trimWhitespace(attrValue).replace(/^javascript:\s*/i, '');
     return options.minifyJS(attrValue, true);
   }
@@ -314,7 +311,7 @@ function cleanAttributeValue(tag, attrName, attrValue, options, attrs) {
       return (+numString).toString();
     });
   }
-  else if (attrValue && options.customAttrCollapse && options.customAttrCollapse.test(attrName)) {
+  else if (options.customAttrCollapse && options.customAttrCollapse.test(attrName)) {
     attrValue = attrValue.replace(/\n+|\r+|\s{2,}/g, '');
   }
   else if (tag === 'script' && attrName === 'type') {
@@ -522,7 +519,7 @@ function canTrimWhitespace(tag) {
 }
 
 function normalizeAttr(attr, attrs, tag, options) {
-  var attrName = options.caseSensitive ? attr.name : attr.name.toLowerCase(),
+  var attrName = options.name(attr.name),
       attrValue = attr.value;
 
   if (options.decodeEntities && attrValue) {
@@ -538,7 +535,9 @@ function normalizeAttr(attr, attrs, tag, options) {
     return;
   }
 
-  attrValue = cleanAttributeValue(tag, attrName, attrValue, options, attrs);
+  if (attrValue) {
+    attrValue = cleanAttributeValue(tag, attrName, attrValue, options, attrs);
+  }
 
   if (options.removeEmptyAttributes &&
       canDeleteEmptyAttribute(tag, attrName, attrValue, options)) {
@@ -615,6 +614,9 @@ function identity(value) {
 
 function processOptions(values) {
   var options = {
+    name: function(name) {
+      return name.toLowerCase();
+    },
     canCollapseWhitespace: canCollapseWhitespace,
     canTrimWhitespace: canTrimWhitespace,
     html5: true,
@@ -631,7 +633,12 @@ function processOptions(values) {
   };
   Object.keys(values).forEach(function(key) {
     var value = values[key];
-    if (key === 'log') {
+    if (key === 'caseSensitive') {
+      if (value) {
+        options.name = identity;
+      }
+    }
+    else if (key === 'log') {
       if (typeof value === 'function') {
         options.log = value;
       }
@@ -732,7 +739,7 @@ function createSortFns(value, options, uidIgnore, uidAttr) {
 
   function attrNames(attrs) {
     return attrs.map(function(attr) {
-      return options.caseSensitive ? attr.name : attr.name.toLowerCase();
+      return options.name(attr.name);
     });
   }
 
@@ -756,7 +763,7 @@ function createSortFns(value, options, uidIgnore, uidAttr) {
         }
         for (var i = 0, len = attrs.length; i < len; i++) {
           var attr = attrs[i];
-          if (classChain && (options.caseSensitive ? attr.name : attr.name.toLowerCase()) === 'class') {
+          if (classChain && attr.value && options.name(attr.name) === 'class') {
             classChain.add(trimWhitespace(attr.value).split(/[ \t\n\f\r]+/).filter(shouldSkipUIDs));
           }
           else if (options.processScripts && attr.name.toLowerCase() === 'type') {
@@ -946,16 +953,13 @@ function minify(value, options, partialMarkup) {
     html5: options.html5,
 
     start: function(tag, attrs, unary, unarySlash, autoGenerated) {
-      var lowerTag = tag.toLowerCase();
-
-      if (lowerTag === 'svg') {
+      if (tag.toLowerCase() === 'svg') {
         options = Object.create(options);
-        options.keepClosingSlash = true;
         options.caseSensitive = true;
+        options.keepClosingSlash = true;
+        options.name = identity;
       }
-
-      tag = options.caseSensitive ? tag : lowerTag;
-
+      tag = options.name(tag);
       currentTag = tag;
       charsPrevTag = tag;
       if (!inlineTextTags(tag)) {
@@ -1035,11 +1039,10 @@ function minify(value, options, partialMarkup) {
       }
     },
     end: function(tag, attrs, autoGenerated) {
-      var lowerTag = tag.toLowerCase();
-      if (lowerTag === 'svg') {
+      if (tag.toLowerCase() === 'svg') {
         options = Object.getPrototypeOf(options);
       }
-      tag = options.caseSensitive ? tag : lowerTag;
+      tag = options.name(tag);
 
       // check if current tag is in a whitespace stack
       if (options.collapseWhitespace) {
@@ -1271,20 +1274,29 @@ function joinResultSegments(results, options) {
   var str;
   var maxLineLength = options.maxLineLength;
   if (maxLineLength) {
-    var token;
-    var lines = [];
-    var line = '';
-    for (var i = 0, len = results.length; i < len; i++) {
-      token = results[i];
-      if (line.length + token.length < maxLineLength) {
-        line += token;
+    var line = '', lines = [];
+    while (results.length) {
+      var len = line.length;
+      var end = results[0].indexOf('\n');
+      if (end < 0) {
+        line += results.shift();
       }
       else {
-        lines.push(line.replace(/^\n/, ''));
-        line = token;
+        line += results[0].slice(0, end);
+        results[0] = results[0].slice(end + 1);
       }
+      if (len > 0 && line.length >= maxLineLength) {
+        lines.push(line.slice(0, len));
+        line = line.slice(len);
+      }
+      else if (end >= 0) {
+        lines.push(line);
+        line = '';
+      }
+    }
+    if (line) {
+      lines.push(line);
     }
-    lines.push(line);
 
     str = lines.join('\n');
   }

package/src/htmlparser.js

@@ -267,12 +267,36 @@ function HTMLParser(html, handler) {
     }
   }
 
+  function closeIfFound(tagName) {
+    if (findTag(tagName) >= 0) {
+      parseEndTag('', tagName);
+      return true;
+    }
+  }
+
   function handleStartTag(match) {
     var tagName = match.tagName;
     var unarySlash = match.unarySlash;
 
-    if (handler.html5 && lastTag === 'p' && nonPhrasing(tagName)) {
-      parseEndTag('', lastTag);
+    if (handler.html5) {
+      if (lastTag === 'p' && nonPhrasing(tagName)) {
+        parseEndTag('', lastTag);
+      }
+      else if (tagName === 'tbody') {
+        closeIfFound('thead');
+      }
+      else if (tagName === 'tfoot') {
+        if (!closeIfFound('tbody')) {
+          closeIfFound('thead');
+        }
+      }
+      if (tagName === 'col' && findTag('colgroup') < 0) {
+        lastTag = 'colgroup';
+        stack.push({ tag: lastTag, attrs: [] });
+        if (handler.start) {
+          handler.start(lastTag, [], false, '');
+        }
+      }
     }
 
     if (!handler.html5 && !inline(tagName)) {
@@ -353,17 +377,23 @@ function HTMLParser(html, handler) {
     }
   }
 
+  function findTag(tagName) {
+    var pos;
+    var needle = tagName.toLowerCase();
+    for (pos = stack.length - 1; pos >= 0; pos--) {
+      if (stack[pos].tag.toLowerCase() === needle) {
+        break;
+      }
+    }
+    return pos;
+  }
+
   function parseEndTag(tag, tagName) {
     var pos;
 
     // Find the closest opened tag of the same type
     if (tagName) {
-      var needle = tagName.toLowerCase();
-      for (pos = stack.length - 1; pos >= 0; pos--) {
-        if (stack[pos].tag.toLowerCase() === needle) {
-          break;
-        }
-      }
+      pos = findTag(tagName);
     }
     // If no tag name is provided, clean shop
     else {