From c3e4a6812ec6f8ba9ca751dc5e5cea7591626948 Mon Sep 17 00:00:00 2001
From: Johannes Raggam <thetetet@gmail.com>
Date: Tue, 2 Jan 2024 23:31:33 +0100
Subject: [PATCH] fix(pat-inject): Fix pat-inject to not break complex JSON
 pattern options.

Rework the html rebasing to fix up relative URLs in pat-inject for a
simpler and slightly more efficient method to walk over all attributes
which need rebasing.
The old method could destroy complex JSON based pattern options, like
those from pat-structure in Mockup.

Note: Only one rebase attribute per tag is currently possible. 1) This
is the same as before. 2) We don't need more.
---
 src/pat/inject/inject.js | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/pat/inject/inject.js b/src/pat/inject/inject.js
index b35bf4c80..4aea4b3f5 100644
--- a/src/pat/inject/inject.js
+++ b/src/pat/inject/inject.js
@@ -839,10 +839,10 @@ const inject = {
     _rebaseAttrs: {
         a: "href",
         form: "action",
-        img: "data-pat-inject-rebase-src",
+        img: "src",
         object: "data",
-        source: "data-pat-inject-rebase-src",
-        video: "data-pat-inject-rebase-src",
+        source: "src",
+        video: "src",
     },
 
     _rebaseOptions: {
@@ -867,13 +867,17 @@ const inject = {
             return "";
         }
 
-        // Create temporary DOM node and store the html contents on it where
-        // the original src attribute is kept.
-        const node = document.createElement("div");
-        node.innerHTML = html.replace(/(\s)(src\s*)=/gi, '$1src="" data-pat-inject-rebase-$2=').trim();
-
-        const selector = Object.keys(this._rebaseAttrs).join(",");
-        for (const el_ of node.querySelectorAll(selector)) {
+        // Parse the html string into a DOM tree.
+        const page = document.createElement("div");
+        page.innerHTML = html;
+
+        // Create efficient selector for any tag with it's corresponding
+        // attribute from _rebaseAttrs. Note: the current data structure allows
+        // only for one attribute to be rebased per tag.
+        const rebase_selector = Object.entries(this._rebaseAttrs)
+            .map(([tag, attr]) => `${tag}[${attr}]`)
+            .join(", ");
+        for (const el_ of page.querySelectorAll(rebase_selector)) {
             const attr = this._rebaseAttrs[el_.tagName.toLowerCase()];
             let value = el_.getAttribute(attr);
 
@@ -895,7 +899,10 @@ const inject = {
         }
 
         for (const [pattern_name, opts] of Object.entries(this._rebaseOptions)) {
-            for (const el_ of node.querySelectorAll(`[data-pat-${pattern_name}]`)) {
+            for (const el_ of dom.querySelectorAllAndMe(
+                page,
+                `[data-pat-${pattern_name}]`
+            )) {
                 const pattern = registry.patterns?.[pattern_name];
                 const pattern_parser = pattern?.parser;
                 if (!pattern_parser) {
@@ -927,10 +934,7 @@ const inject = {
             }
         }
 
-        return node
-            .innerHTML
-            .replace(/src="" data-pat-inject-rebase-/g, "")
-            .trim();
+        return page.innerHTML.trim();
     },
 
     _parseRawHtml(html, url = "") {