vite-awesome-svg-loader 2.0.0 → 2.0.1

package/index.js

@@ -84,14 +84,17 @@ function matchesPath(relPathWithSlash, matchers) {
   for (const matcher of matchers) {
     const isRegex = matcher instanceof RegExp;
     for (const entry of toMatch) {
-      if (isRegex) {
-        return !!matcher.exec(entry);
+      const matches = isRegex ? matcher.test(entry) : entry === matcher;
+      if (matches) {
+        return true;
       }
-      return entry === matcher;
     }
   }
   return false;
 }
+function normalizeSelector(selector) {
+  return selector.replaceAll(/\s+/g, " ").trim();
+}
 function selectorsToList(relPathWithSlash, selectors, returnEmptyList) {
   const resolvedSelectors = [];
   if (returnEmptyList) {
@@ -99,11 +102,13 @@ function selectorsToList(relPathWithSlash, selectors, returnEmptyList) {
   }
   for (const selector of selectors) {
     if (typeof selector === "string") {
-      resolvedSelectors.push(selector);
+      resolvedSelectors.push(normalizeSelector(selector));
       continue;
     }
     if (matchesPath(relPathWithSlash, selector.files)) {
-      resolvedSelectors.push(...selector.selectors);
+      for (const selectorStr of selector.selectors) {
+        resolvedSelectors.push(normalizeSelector(selectorStr));
+      }
     }
   }
   return resolvedSelectors;
@@ -119,7 +124,7 @@ function matchesSelectors(node, selectors) {
 }
 function replaceColor(color, replacements) {
   if (!color) {
-    return "";
+    return replacements.default || "";
   }
   return replacements.replacements[color.toLowerCase()] || replacements.default || color;
 }
@@ -471,14 +476,17 @@ function viteAwesomeSvgLoader(options = {}) {
         mergedOptions.skipTransformsSelectors,
         shouldSkipTransforms
       );
-      let hash = relPathWithSlash + "-";
+      const hashParts = [relPathWithSlash];
+      for (const arr of [skipPreserveLineWidthSelectors, skipReplaceColorsSelectors, skipTransformsSelectors]) {
+        hashParts.push(arr.join(","));
+      }
       for (const param of [shouldSkipTransforms, shouldPreserveLineWidth, shouldReplaceColors]) {
-        hash += param ? "1" : "0";
+        hashParts.push(param ? "1" : "0");
       }
       if (shouldReplaceColors) {
-        hash += JSON.stringify(colorReplacements);
+        hashParts.push(JSON.stringify(colorReplacements));
       }
-      hash = new import_imurmurhash.default(hash).result();
+      const hash = new import_imurmurhash.default(hashParts.join("__")).result();
       const fileNameNoExt = import_path2.default.basename(relPathWithSlash).split(".")[0];
       const assetFileNameNoExt = `${fileNameNoExt}-${hash}`;
       const assetFileName = assetFileNameNoExt + ".svg";

package/index.mjs

@@ -51,14 +51,17 @@ function matchesPath(relPathWithSlash, matchers) {
   for (const matcher of matchers) {
     const isRegex = matcher instanceof RegExp;
     for (const entry of toMatch) {
-      if (isRegex) {
-        return !!matcher.exec(entry);
+      const matches = isRegex ? matcher.test(entry) : entry === matcher;
+      if (matches) {
+        return true;
       }
-      return entry === matcher;
     }
   }
   return false;
 }
+function normalizeSelector(selector) {
+  return selector.replaceAll(/\s+/g, " ").trim();
+}
 function selectorsToList(relPathWithSlash, selectors, returnEmptyList) {
   const resolvedSelectors = [];
   if (returnEmptyList) {
@@ -66,11 +69,13 @@ function selectorsToList(relPathWithSlash, selectors, returnEmptyList) {
   }
   for (const selector of selectors) {
     if (typeof selector === "string") {
-      resolvedSelectors.push(selector);
+      resolvedSelectors.push(normalizeSelector(selector));
       continue;
     }
     if (matchesPath(relPathWithSlash, selector.files)) {
-      resolvedSelectors.push(...selector.selectors);
+      for (const selectorStr of selector.selectors) {
+        resolvedSelectors.push(normalizeSelector(selectorStr));
+      }
     }
   }
   return resolvedSelectors;
@@ -86,7 +91,7 @@ function matchesSelectors(node, selectors) {
 }
 function replaceColor(color, replacements) {
   if (!color) {
-    return "";
+    return replacements.default || "";
   }
   return replacements.replacements[color.toLowerCase()] || replacements.default || color;
 }
@@ -438,14 +443,17 @@ function viteAwesomeSvgLoader(options = {}) {
         mergedOptions.skipTransformsSelectors,
         shouldSkipTransforms
       );
-      let hash = relPathWithSlash + "-";
+      const hashParts = [relPathWithSlash];
+      for (const arr of [skipPreserveLineWidthSelectors, skipReplaceColorsSelectors, skipTransformsSelectors]) {
+        hashParts.push(arr.join(","));
+      }
       for (const param of [shouldSkipTransforms, shouldPreserveLineWidth, shouldReplaceColors]) {
-        hash += param ? "1" : "0";
+        hashParts.push(param ? "1" : "0");
       }
       if (shouldReplaceColors) {
-        hash += JSON.stringify(colorReplacements);
+        hashParts.push(JSON.stringify(colorReplacements));
       }
-      hash = new MurmurHash3(hash).result();
+      const hash = new MurmurHash3(hashParts.join("__")).result();
       const fileNameNoExt = path2.basename(relPathWithSlash).split(".")[0];
       const assetFileNameNoExt = `${fileNameNoExt}-${hash}`;
       const assetFileName = assetFileNameNoExt + ".svg";

package/package.json

@@ -27,7 +27,7 @@
     "vite-awesome-svg-loader",
     "svgo"
   ],
-  "version": "2.0.0",
+  "version": "2.0.1",
   "homepage": "https://github.com/matafokka/vite-awesome-svg-loader",
   "repository": "https://github.com/matafokka/vite-awesome-svg-loader",
   "license": "LGPL-2.1-or-later",