refactor: url part of plugin

Author: alexander-akait

lib/plugin.js

@@ -5,23 +5,27 @@ var loaderUtils = require("loader-utils");
 
 module.exports = postcss.plugin("css-loader-parser", function(options) {
   return function(css) {
-    var importItems = [];
-    var urlItems = [];
+    const importItems = [];
+    const urlItems = [];
 
     if (options.import) {
       css.walkAtRules(/^import$/i, function(rule) {
-        var values = Tokenizer.parseValues(rule.params);
-        var url = values.nodes[0].nodes[0];
+        const values = Tokenizer.parseValues(rule.params);
+        let url = values.nodes[0].nodes[0];
+
         if (url && url.type === "url") {
           url = url.url;
         } else if (url && url.type === "string") {
           url = url.value;
         } else throw rule.error("Unexpected format " + rule.params);
+
         if (!url.replace(/\s/g, "").length) {
           return;
         }
+
         values.nodes[0].nodes.shift();
-        var mediaQuery = Tokenizer.stringifyValues(values);
+
+        const mediaQuery = Tokenizer.stringifyValues(values);
 
         if (loaderUtils.isUrlRequest(url)) {
           url = loaderUtils.urlToRequest(url);
@@ -35,43 +39,56 @@ module.exports = postcss.plugin("css-loader-parser", function(options) {
       });
     }
 
-    function processNode(item) {
-      switch (item.type) {
-        case "value":
-          item.nodes.forEach(processNode);
-          break;
-        case "nested-item":
-          item.nodes.forEach(processNode);
-          break;
-        case "url":
-          if (
-            options.url &&
-            item.url.replace(/\s/g, "").length &&
-            !/^#/.test(item.url) &&
-            loaderUtils.isUrlRequest(item.url)
-          ) {
+    if (options.url) {
+      css.walkDecls(decl => {
+        if (!decl.value.includes("url(")) {
+          return decl;
+        }
+
+        const parsedValue = valueParser(decl.value);
+
+        decl.value = parsedValue
+          .walk(node => {
+            if (
+              node.type !== "function" ||
+              node.value.toLowerCase() !== "url" ||
+              node.nodes.length === 0
+            ) {
+              return;
+            }
+
+            const URLNode = node.nodes[0];
+            const URLValue = URLNode.value.trim().replace(/\\[\r\n]/, "");
+
+            // Skip empty URLs
+            // Empty URL function equals request to current stylesheet where it is declared
+            if (URLValue.length === 0) {
+              return;
+            }
+
+            if (!loaderUtils.isUrlRequest(URLValue)) {
+              return;
+            }
+
+            // Remove spaces before and after
+            node.before = "";
+            node.after = "";
+
+            const requestedURL = loaderUtils.urlToRequest(URLValue);
+
             // Strip quotes, they will be re-added if the module needs them
-            item.stringType = "";
-            delete item.innerSpacingBefore;
-            delete item.innerSpacingAfter;
-            // For backward-compat after dropping css modules
-            var url = loaderUtils.urlToRequest(item.url.trim());
-            item.url = "___CSS_LOADER_URL___" + urlItems.length + "___";
+            URLNode.quote = "";
+            URLNode.value = "___CSS_LOADER_URL___" + urlItems.length + "___";
+
             urlItems.push({
-              url: url
+              url: requestedURL
             });
-          }
-          break;
-      }
-    }
+          })
+          .toString();
 
-    css.walkDecls(function(decl) {
-      var values = Tokenizer.parseValues(decl.value);
-      values.nodes.forEach(function(value) {
-        value.nodes.forEach(processNode);
+        return decl;
       });
-      decl.value = Tokenizer.stringifyValues(values);
-    });
+    }
 
     options.importItems = importItems;
     options.urlItems = urlItems;