fix corner cases in conservativeCollapse & preserveLineBreaks

fixes #652

diff --git a/src/htmlminifier.js b/src/htmlminifier.js
index 447b0a5..598906a 100644 (file)
--- a/src/htmlminifier.js
+++ b/src/htmlminifier.js
@@ -804,7 +804,9 @@ function minify(value, options, partialMarkup) {
   options = options || {};
   var optionsStack = [];
   processOptions(options);
-  value = options.collapseWhitespace ? trimWhitespace(value) : value;
+  if (options.collapseWhitespace) {
+    value = collapseWhitespace(value, options, true, true);
+  }
 
   var buffer = [],
       charsPrevTag,
@@ -1085,7 +1087,7 @@ function minify(value, options, partialMarkup) {
               if (!prevComment) {
                 prevTag = charsPrevTag;
               }
-              if (buffer.length > 1 && (!prevComment || / $/.test(currentChars))) {
+              if (buffer.length > 1 && (!prevComment || !options.conservativeCollapse && / $/.test(currentChars))) {
                 var charsIndex = buffer.length - 2;
                 buffer[charsIndex] = buffer[charsIndex].replace(/\s+$/, function(trailingSpaces) {
                   text = trailingSpaces + text;
@@ -1104,13 +1106,18 @@ function minify(value, options, partialMarkup) {
               text = collapseWhitespace(text, options, /(?:^|\s)$/.test(currentChars));
             }
           }
-          text = prevTag || nextTag ? collapseWhitespaceSmart(text, prevTag, nextTag, options) : trimWhitespace(text);
+          if (prevTag || nextTag) {
+            text = collapseWhitespaceSmart(text, prevTag, nextTag, options);
+          }
+          else {
+            text = collapseWhitespace(text, options, true, true);
+          }
           if (!text && /\s$/.test(currentChars) && prevTag && prevTag.charAt(0) === '/') {
             trimTrailingWhitespace(buffer.length - 1, nextTag);
           }
         }
-        if (!stackNoCollapseWhitespace.length) {
-          text = prevTag && nextTag || nextTag === 'html' ? text : collapseWhitespaceAll(text);
+        if (!stackNoCollapseWhitespace.length && nextTag !== 'html' && !(prevTag && nextTag)) {
+          text = collapseWhitespace(text, options, false, false, true);
         }
       }
       if (options.processScripts && specialContentTags(currentTag)) {
@@ -1248,8 +1255,7 @@ function joinResultSegments(results, options) {
   else {
     str = results.join('');
   }
-
-  return options.collapseWhitespace ? trimWhitespace(str) : str;
+  return options.collapseWhitespace ? collapseWhitespace(str, options, true, true) : str;
 }
 
 exports.minify = function(value, options) {

diff --git a/tests/minifier.js b/tests/minifier.js
index bc45d12..5b08c6c 100644 (file)
--- a/tests/minifier.js
+++ b/tests/minifier.js
@@ -147,6 +147,22 @@ test('space normalization around text', function() {
   equal(minify(input), input);
   output = '<p>blah</p>';
   equal(minify(input, { collapseWhitespace: true }), output);
+  output = ' <p>blah</p> ';
+  equal(minify(input, {
+    collapseWhitespace: true,
+    conservativeCollapse: true
+  }), output);
+  output = '<p>blah</p>\n';
+  equal(minify(input, {
+    collapseWhitespace: true,
+    preserveLineBreaks: true
+  }), output);
+  output = ' <p>blah</p>\n';
+  equal(minify(input, {
+    collapseWhitespace: true,
+    conservativeCollapse: true,
+    preserveLineBreaks: true
+  }), output);
   [
     'a', 'abbr', 'acronym', 'b', 'big', 'del', 'em', 'font', 'i', 'ins', 'kbd',
     'mark', 's', 'samp', 'small', 'span', 'strike', 'strong', 'sub', 'sup',
@@ -213,8 +229,16 @@ test('space normalization around text', function() {
     ['a <nobr> b</nobr> c', 'a <nobr>b</nobr> c'],
     ['a <nobr> b </nobr> c', 'a <nobr>b</nobr> c']
   ].forEach(function(inputs) {
+    equal(minify(inputs[0], {
+      collapseWhitespace: true,
+      conservativeCollapse: true
+    }), inputs[0], inputs[0]);
     equal(minify(inputs[0], { collapseWhitespace: true }), inputs[1], inputs[0]);
     var input = '<div>' + inputs[0] + '</div>';
+    equal(minify(input, {
+      collapseWhitespace: true,
+      conservativeCollapse: true
+    }), input, input);
     var output = '<div>' + inputs[1] + '</div>';
     equal(minify(input, { collapseWhitespace: true }), output, input);
   });
@@ -226,21 +250,48 @@ test('space normalization around text', function() {
   equal(minify('<p><a href="#"><code>foo  </code></a> bar</p>', { collapseWhitespace: true }), '<p><a href="#"><code>foo</code></a> bar</p>');
   equal(minify('<p>  <a href="#">  <code>   foo</code></a> bar   </p>', { collapseWhitespace: true }), '<p><a href="#"><code>foo</code></a> bar</p>');
   equal(minify('<div> Empty <!-- or --> not </div>', { collapseWhitespace: true }), '<div>Empty<!-- or --> not</div>');
-  equal(minify('<div> a <input><!-- b --> c </div>', { removeComments: true, collapseWhitespace: true }), '<div>a <input> c</div>');
+  equal(minify('<div> a <input><!-- b --> c </div>', {
+    collapseWhitespace: true,
+    removeComments: true
+  }), '<div>a <input> c</div>');
   [
-    '  a  <? b ?>  c  ',
-    '<!-- d -->  a  <? b ?>  c  ',
-    '  <!-- d -->a  <? b ?>  c  ',
-    '  a<!-- d -->  <? b ?>  c  ',
-    '  a  <!-- d --><? b ?>  c  ',
-    '  a  <? b ?><!-- d -->  c  ',
-    '  a  <? b ?>  <!-- d -->c  ',
-    '  a  <? b ?>  c<!-- d -->  ',
-    '  a  <? b ?>  c  <!-- d -->'
-  ].forEach(function(input, index) {
-    input = input.replace(/b/, 'b' + index);
-    equal(minify(input, { removeComments: true, collapseWhitespace: true }), 'a <? b' + index + ' ?> c');
-    equal(minify('<p>' + input + '</p>', { removeComments: true, collapseWhitespace: true }), '<p>a <? b' + index + ' ?> c</p>');
+    ' a <? b ?> c ',
+    '<!-- d --> a <? b ?> c ',
+    ' <!-- d -->a <? b ?> c ',
+    ' a<!-- d --> <? b ?> c ',
+    ' a <!-- d --><? b ?> c ',
+    ' a <? b ?><!-- d --> c ',
+    ' a <? b ?> <!-- d -->c ',
+    ' a <? b ?> c<!-- d --> ',
+    ' a <? b ?> c <!-- d -->'
+  ].forEach(function(input) {
+    equal(minify(input, {
+      collapseWhitespace: true,
+      conservativeCollapse: true
+    }), input, input);
+    equal(minify(input, {
+      collapseWhitespace: true,
+      removeComments: true
+    }), 'a <? b ?> c', input);
+    equal(minify(input, {
+      collapseWhitespace: true,
+      conservativeCollapse: true,
+      removeComments: true
+    }), ' a <? b ?> c ', input);
+    input = '<p>' + input + '</p>';
+    equal(minify(input, {
+      collapseWhitespace: true,
+      conservativeCollapse: true
+    }), input, input);
+    equal(minify(input, {
+      collapseWhitespace: true,
+      removeComments: true
+    }), '<p>a <? b ?> c</p>', input);
+    equal(minify(input, {
+      collapseWhitespace: true,
+      conservativeCollapse: true,
+      removeComments: true
+    }), '<p> a <? b ?> c </p>', input);
   });
   input = '<li><i></i> <b></b> foo</li>';
   output = '<li><i></i> <b></b> foo</li>';
@@ -1949,7 +2000,7 @@ test('collapse preseving a line break', function() {
           '    <script src="scripts/application.js"></script>\n' +
           '    <link href="images/icn-32x32.png" rel="shortcut icon">\n' +
           '    <link href="images/icn-152x152.png" rel="apple-touch-icon">\n  </head>\n  <body><p>\n   test test\n\ttest\n\n</p></body>\n</html>';
-  output = '<!DOCTYPE html>\n<html lang="en" class="no-js">\n' +
+  output = '\n<!DOCTYPE html>\n<html lang="en" class="no-js">\n' +
            '<head>\n<meta charset="utf-8">\n<meta http-equiv="X-UA-Compatible" content="IE=edge">\n' +
            '<!-- Copyright Notice -->\n' +
            '<title>Carbon</title>\n<meta name="title" content="Carbon">\n' +
@@ -1970,7 +2021,7 @@ test('collapse preseving a line break', function() {
     conservativeCollapse: true,
     preserveLineBreaks: true
   }), output);
-  output = '<!DOCTYPE html>\n<html lang="en" class="no-js">\n' +
+  output = '\n<!DOCTYPE html>\n<html lang="en" class="no-js">\n' +
            '<head>\n<meta charset="utf-8">\n<meta http-equiv="X-UA-Compatible" content="IE=edge">\n' +
            '<title>Carbon</title>\n<meta name="title" content="Carbon">\n' +
            '<meta name="description" content="A front-end framework.">\n' +