maint(pat inject): Move core.utils.rebaseURL to inject patterns.

core.utils.rebaseURL was only used by the inject pattern and is in this form not useful for broader use.
If you need to rebase an relative or absolute URL against a base url, use:
new URL(url, base_url)

Author: thet

src/core/utils.js

@@ -156,14 +156,6 @@ function extend(obj) {
 }
 // END: Taken from Underscore.js until here.
 
-function rebaseURL(base, url) {
-    base = new URL(base, window.location).href; // If base is relative make it absolute.
-    if (url.indexOf("://") !== -1 || url[0] === "/" || url.indexOf("data:") === 0) {
-        return url;
-    }
-    return base.slice(0, base.lastIndexOf("/") + 1) + url;
-}
-
 function findLabel(input) {
     var $label;
     for (
@@ -683,7 +675,6 @@ var utils = {
     escapeRegExp: escapeRegExp,
     isObject: isObject,
     extend: extend,
-    rebaseURL: rebaseURL,
     findLabel: findLabel,
     elementInViewport: elementInViewport,
     removeWildcardClass: removeWildcardClass,

src/core/utils.test.js

@@ -3,50 +3,6 @@ import $ from "jquery";
 import { jest } from "@jest/globals";
 
 describe("basic tests", function () {
-    describe("rebaseURL", function () {
-        it("Keep URL with scheme", function () {
-            expect(
-                utils.rebaseURL("http://example.com/foo/", "http://other.com/me")
-            ).toBe("http://other.com/me");
-        });
-
-        it("Keep URL with absolute path", function () {
-            expect(utils.rebaseURL("http://example.com/foo/", "/me")).toBe("/me");
-        });
-
-        it("Rebase to base with filename", function () {
-            expect(
-                utils.rebaseURL("http://example.com/foo/index.html", "me/page.html")
-            ).toBe("http://example.com/foo/me/page.html");
-        });
-
-        it("Rebase to base with directory path", function () {
-            expect(utils.rebaseURL("http://example.com/foo/", "me/page.html")).toBe(
-                "http://example.com/foo/me/page.html"
-            );
-        });
-
-        it("Rebase with absolute base url", function () {
-            expect(
-                utils.rebaseURL("/foo/", "me/page.html").indexOf("/foo/me/page.html") > 0
-            ).toBe(true);
-        });
-
-        it("Rebase with relative base url", function () {
-            expect(
-                utils
-                    .rebaseURL("example.com/foo/", "me/page.html")
-                    .indexOf("example.com/foo/me/page.html") > 0
-            ).toBe(true);
-        });
-
-        it("Doesn't rebase data: urls", function () {
-            expect(
-                utils.rebaseURL("http://example.com/foo/", "data:image-base64gibberish")
-            ).toBe("data:image-base64gibberish");
-        });
-    });
-
     describe("removeDuplicateObjects", function () {
         it("removes removes duplicates inside an array of objects", function () {
             var objs = [];

src/pat/inject/inject.js

@@ -861,6 +861,14 @@ const inject = {
         "inject": ["url"],
     },
 
+    _rebaseURL(base, url) {
+        if (url.indexOf("://") !== -1 || url[0] === "/" || url.indexOf("data:") === 0) {
+            return url;
+        }
+        base = new URL(base, window.location).href; // If base is relative make it absolute.
+        return base.slice(0, base.lastIndexOf("/") + 1) + url;
+    },
+
     _rebaseHTML(base, html) {
         if (html === "") {
             // Special case, source is none
@@ -889,7 +897,7 @@ const inject = {
                 value.slice(0, 6) !== "teams:" &&
                 value.slice(0, 11) !== "javascript:"
             ) {
-                value = utils.rebaseURL(base, value);
+                value = this._rebaseURL(base, value);
                 $el_.attr(attrName, value);
             }
         });
@@ -915,9 +923,9 @@ const inject = {
                         }
                         changed = true;
                         if (Array.isArray(val)) {
-                            config[opt] = val.map((it) => utils.rebaseURL(base, it));
+                            config[opt] = val.map((it) => this._rebaseURL(base, it));
                         } else {
-                            config[opt] = utils.rebaseURL(base, val);
+                            config[opt] = this._rebaseURL(base, val);
                         }
                     }
                 }
@@ -945,9 +953,7 @@ const inject = {
             .trim();
     },
 
-    _parseRawHtml(html, url) {
-        url = url || "";
-
+    _parseRawHtml(html, url = "") {
         // remove script tags and head and replace body by a div
         const title = html.match(/\<title\>(.*)\<\/title\>/);
         let clean_html = html

src/pat/inject/inject.test.js

@@ -253,6 +253,55 @@ describe("pat-inject", function () {
         });
     });
 
+    describe("rebaseURL", function () {
+        it("Keep URL with scheme", function () {
+            expect(
+                pattern._rebaseURL("http://example.com/foo/", "http://other.com/me")
+            ).toBe("http://other.com/me");
+        });
+
+        it("Keep URL with absolute path", function () {
+            expect(pattern._rebaseURL("http://example.com/foo/", "/me")).toBe("/me");
+        });
+
+        it("Rebase to base with filename", function () {
+            expect(
+                pattern._rebaseURL("http://example.com/foo/index.html", "me/page.html")
+            ).toBe("http://example.com/foo/me/page.html");
+        });
+
+        it("Rebase to base with directory path", function () {
+            expect(pattern._rebaseURL("http://example.com/foo/", "me/page.html")).toBe(
+                "http://example.com/foo/me/page.html"
+            );
+        });
+
+        it("Rebase with absolute base url", function () {
+            expect(
+                pattern
+                    ._rebaseURL("/foo/", "me/page.html")
+                    .indexOf("/foo/me/page.html") > 0
+            ).toBe(true);
+        });
+
+        it("Rebase with relative base url", function () {
+            expect(
+                pattern
+                    ._rebaseURL("example.com/foo/", "me/page.html")
+                    .indexOf("example.com/foo/me/page.html") > 0
+            ).toBe(true);
+        });
+
+        it("Doesn't rebase data: urls", function () {
+            expect(
+                pattern._rebaseURL(
+                    "http://example.com/foo/",
+                    "data:image-base64gibberish"
+                )
+            ).toBe("data:image-base64gibberish");
+        });
+    });
+
     describe("rebaseHTML", function () {
         it("Basic markup with DOCTYPE", function () {
             expect(
@@ -276,7 +325,7 @@ describe("pat-inject", function () {
         });
 
         it("Element without link attribute", function () {
-            var spy_rebaseURL = jest.spyOn(utils, "rebaseURL");
+            var spy_rebaseURL = jest.spyOn(pattern, "_rebaseURL");
             expect(pattern._rebaseHTML("base", "<a>This is a test</a>")).toBe(
                 "<a>This is a test</a>"
             );