Fix: srcset parsing issue (#337)

* Fix: srcset parsing * Add: srcset
eight04 · Oct 5, 2023 · 671e21f · 671e21f
1 parent 9a71160
commit 671e21f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -53,6 +53,7 @@
   "private": true,
   "dependencies": {
     "image-extensions": "^1.1.0",
+    "srcset": "^5.0.0",
     "version-compare": "^1.4.0"
   }
 }
diff --git a/src/lib/image-util.js b/src/lib/image-util.js
@@ -1,3 +1,4 @@
+import {parseSrcset} from "srcset";
 import {pref} from "./pref.js";
 
 let SRC_PROP = [];
@@ -17,25 +18,11 @@ function update() {
 }
 
 function getSrcFromSrcset(set) {
-  const rules = set.split(/\s*,\s*/).map(rule =>
-    rule.split(/\s+/).reduce((result, token) => {
-      if (token) {
-        let match;
-        if ((match = token.match(/^(\d+)[wx]$/))) {
-          result.scale = +match[1];
-        } else {
-          result.url = token;
-        }
-      }
-      return result;
-    }, {
-      scale: 1
-    })
-  );
-
+  const rules = parseSrcset(set);
   let maxRule;
   for (const rule of rules) {
-    if (!maxRule || rule.scale > maxRule.scale) {
+    // FIXME: what if the rules have both density and width?
+    if (!maxRule || (rule.density || rule.width || 0) > (maxRule.density || maxRule.width || 0)) {
       maxRule = rule;
     }
   }