fix: empty url with whitespace characters (#44)

BREAKING CHANGE: empty urls with only spaces and newlines contain whitespaces characters in `before` property (before we duplicate their in `before` and `after`)

Author: evilebottnawi

lib/parse.js

@@ -12,7 +12,14 @@ module.exports = function(input) {
   var tokens = [];
   var value = input;
 
-  var next, quote, prev, token, escape, escapePos, whitespacePos;
+  var next,
+    quote,
+    prev,
+    token,
+    escape,
+    escapePos,
+    whitespacePos,
+    parenthesesOpenPos;
   var pos = 0;
   var code = value.charCodeAt(pos);
   var max = value.length;
@@ -144,11 +151,12 @@ module.exports = function(input) {
         next += 1;
         code = value.charCodeAt(next);
       } while (code <= 32);
+      parenthesesOpenPos = pos;
       token = {
         type: "function",
         sourceIndex: pos - name.length,
         value: name,
-        before: value.slice(pos + 1, next)
+        before: value.slice(parenthesesOpenPos + 1, next)
       };
       pos = next;
 
@@ -175,26 +183,31 @@ module.exports = function(input) {
           whitespacePos -= 1;
           code = value.charCodeAt(whitespacePos);
         } while (code <= 32);
-        if (pos !== whitespacePos + 1) {
-          token.nodes = [
-            {
-              type: "word",
-              sourceIndex: pos,
-              value: value.slice(pos, whitespacePos + 1)
-            }
-          ];
+        if (parenthesesOpenPos < whitespacePos) {
+          if (pos !== whitespacePos + 1) {
+            token.nodes = [
+              {
+                type: "word",
+                sourceIndex: pos,
+                value: value.slice(pos, whitespacePos + 1)
+              }
+            ];
+          } else {
+            token.nodes = [];
+          }
+          if (token.unclosed && whitespacePos + 1 !== next) {
+            token.after = "";
+            token.nodes.push({
+              type: "space",
+              sourceIndex: whitespacePos + 1,
+              value: value.slice(whitespacePos + 1, next)
+            });
+          } else {
+            token.after = value.slice(whitespacePos + 1, next);
+          }
         } else {
-          token.nodes = [];
-        }
-        if (token.unclosed && whitespacePos + 1 !== next) {
           token.after = "";
-          token.nodes.push({
-            type: "space",
-            sourceIndex: whitespacePos + 1,
-            value: value.slice(whitespacePos + 1, next)
-          });
-        } else {
-          token.after = value.slice(whitespacePos + 1, next);
+          token.nodes = [];
         }
         pos = next + 1;
         code = value.charCodeAt(pos);

test/parse.js

@@ -902,6 +902,104 @@ var tests = [
       }
     ]
   },
+  {
+    message: "should parse empty url with space",
+    fixture: "url( )",
+    expected: [
+      {
+        type: "function",
+        sourceIndex: 0,
+        value: "url",
+        before: " ",
+        after: "",
+        nodes: []
+      }
+    ]
+  },
+  {
+    message: "should parse empty url with multiple spaces",
+    fixture: "url(   )",
+    expected: [
+      {
+        type: "function",
+        sourceIndex: 0,
+        value: "url",
+        before: "   ",
+        after: "",
+        nodes: []
+      }
+    ]
+  },
+  {
+    message: "should parse empty url with newline (LF)",
+    fixture: "url(\n)",
+    expected: [
+      {
+        type: "function",
+        sourceIndex: 0,
+        value: "url",
+        before: "\n",
+        after: "",
+        nodes: []
+      }
+    ]
+  },
+  {
+    message: "should parse empty url with newline (CRLF)",
+    fixture: "url(\r\n)",
+    expected: [
+      {
+        type: "function",
+        sourceIndex: 0,
+        value: "url",
+        before: "\r\n",
+        after: "",
+        nodes: []
+      }
+    ]
+  },
+  {
+    message: "should parse empty url with multiple newlines (LF)",
+    fixture: "url(\n\n\n)",
+    expected: [
+      {
+        type: "function",
+        sourceIndex: 0,
+        value: "url",
+        before: "\n\n\n",
+        after: "",
+        nodes: []
+      }
+    ]
+  },
+  {
+    message: "should parse empty url with multiple newlines (CRLF)",
+    fixture: "url(\r\n\r\n\r\n)",
+    expected: [
+      {
+        type: "function",
+        sourceIndex: 0,
+        value: "url",
+        before: "\r\n\r\n\r\n",
+        after: "",
+        nodes: []
+      }
+    ]
+  },
+  {
+    message: "should parse empty url with whitespace characters",
+    fixture: "url(  \n \t  \r\n  )",
+    expected: [
+      {
+        type: "function",
+        sourceIndex: 0,
+        value: "url",
+        before: "  \n \t  \r\n  ",
+        after: "",
+        nodes: []
+      }
+    ]
+  },
   {
     message: "should parse comments",
     fixture: "/*before*/ 1px /*between*/ 1px /*after*/",

test/stringify.js

@@ -27,12 +27,48 @@ var tests = [
   },
   {
     message: "Should correctly add comments",
-    fixture: "/*comment*/ 1px /* unclosed "
+    fixture: "/!*comment*!/ 1px /!* unclosed "
   },
   {
     message: "Should correctly process comments inside functions",
     fixture:
-      "/*before*/ rgb( /*red component*/ 12,  54 /*green component*/, /* blue */ 65)/* after */ "
+      "/!*before*!/ rgb( /!*red component*!/ 12,  54 /!*green component*!/, /!* blue *!/ 65)/!* after *!/ "
+  },
+  {
+    message: "Should correctly process empty url",
+    fixture: "url()"
+  },
+  {
+    message: "Should correctly process empty url with space",
+    fixture: "url( )"
+  },
+  {
+    message: "Should correctly process empty url with spaces",
+    fixture: "url(   )"
+  },
+  {
+    message: "Should correctly process empty url with tab",
+    fixture: "url(\t)"
+  },
+  {
+    message: "Should correctly process empty url with newline (LF)",
+    fixture: "url(\n)"
+  },
+  {
+    message: "Should correctly process empty url with newline (LF)",
+    fixture: "url(\n\n\n)"
+  },
+  {
+    message: "Should correctly process empty url with multiple newlines (CRLF)",
+    fixture: "url(\r\n)"
+  },
+  {
+    message: "Should correctly process empty url with multiple newlines (CRLF)",
+    fixture: "url(\r\n\r\n\r\n)"
+  },
+  {
+    message: "Should correctly process empty url whitespace characters",
+    fixture: "url(  \n \t  \n  )"
   }
 ];