Ensure URLs without target params stay untouched

Author: Ndpnt

src/archivist/extract/exposedFilters.js

@@ -1,25 +1,28 @@
 export function removeQueryParams(webPageDOM, paramsToRemove = []) {
-  if (typeof paramsToRemove === 'string') {
-    paramsToRemove = [paramsToRemove];
-  }
+  const normalizedParams = Array.isArray(paramsToRemove) ? paramsToRemove : [paramsToRemove];
 
-  if (!paramsToRemove.length) {
+  if (!normalizedParams.length) {
     return;
   }
 
-  const elements = [
-    ...webPageDOM.querySelectorAll('a[href]'),
-    ...webPageDOM.querySelectorAll('img[src]'),
-  ];
+  const elements = webPageDOM.querySelectorAll('a[href], img[src]');
 
-  elements.forEach(element => {
+  for (const element of elements) {
     try {
-      const url = new URL(element.href || element.src);
+      const urlString = element.href || element.src;
+      const url = new URL(urlString);
+
+      const hasTargetParams = normalizedParams.some(param => url.searchParams.has(param));
+
+      if (hasTargetParams) {
+        normalizedParams.forEach(param => url.searchParams.delete(param));
 
-      paramsToRemove.forEach(param => url.searchParams.delete(param));
-      element[element.tagName === 'A' ? 'href' : 'src'] = url.toString();
-    } catch (error) {
-      // ignore if the element has not a valid URL
+        const attributeName = element.tagName === 'A' ? 'href' : 'src';
+
+        element[attributeName] = url.toString();
+      }
+    } catch {
+      // Silently ignore invalid URLs
     }
-  });
+  }
 }

src/archivist/extract/exposedFilters.test.js

@@ -157,6 +157,60 @@ describe('exposedFilters', () => {
       });
     });
 
+    describe('with URLs without target parameters', () => {
+      let absoluteLink;
+      let relativeLink;
+      let anchorLink;
+      let img;
+      const originalAbsoluteHref = 'https://example.com/page?keep=value&preserve=me';
+      const originalRelativeHref = './relative/path?existing=param';
+      const originalAnchorHref = '#section1';
+      const originalImgSrc = 'https://example.com/image.jpg?width=100&height=200';
+
+      before(() => {
+        absoluteLink = webPageDOM.createElement('a');
+        absoluteLink.setAttribute('href', originalAbsoluteHref);
+        webPageDOM.body.appendChild(absoluteLink);
+
+        relativeLink = webPageDOM.createElement('a');
+        relativeLink.setAttribute('href', originalRelativeHref);
+        webPageDOM.body.appendChild(relativeLink);
+
+        anchorLink = webPageDOM.createElement('a');
+        anchorLink.setAttribute('href', originalAnchorHref);
+        webPageDOM.body.appendChild(anchorLink);
+
+        img = webPageDOM.createElement('img');
+        img.setAttribute('src', originalImgSrc);
+        webPageDOM.body.appendChild(img);
+
+        removeQueryParams(webPageDOM, [ 'utm_source', 'utm_medium', 'session_id' ]);
+      });
+
+      after(() => {
+        absoluteLink.remove();
+        relativeLink.remove();
+        anchorLink.remove();
+        img.remove();
+      });
+
+      it('leaves absolute link URLs untouched', () => {
+        expect(absoluteLink.getAttribute('href')).to.equal(originalAbsoluteHref);
+      });
+
+      it('leaves relative link URLs untouched', () => {
+        expect(relativeLink.getAttribute('href')).to.equal(originalRelativeHref);
+      });
+
+      it('leaves anchor link URLs untouched', () => {
+        expect(anchorLink.getAttribute('href')).to.equal(originalAnchorHref);
+      });
+
+      it('leaves image source URLs untouched', () => {
+        expect(img.getAttribute('src')).to.equal(originalImgSrc);
+      });
+    });
+
     describe('textual content preservation', () => {
       let codeElement;
       let paragraphElement;