refactor

Author: jellizaveta

src/scriptlets/href-sanitizer.ts

@@ -188,6 +188,7 @@ export function hrefSanitizer(
     const REMOVE_HASH_TRANSFORM_MARKER = 'removeHash';
     const REMOVE_PARAM_TRANSFORM_MARKER = 'removeParam';
     const MARKER_SEPARATOR = ':';
+    const COMMA = ',';
 
     // Regular expression to find not valid characters at the beginning and at the end of the string,
     // \x21-\x7e is a range that includes the ASCII characters from ! (hex 21) to ~ (hex 7E).
@@ -420,30 +421,28 @@ export function hrefSanitizer(
      * @returns URL without the parameter(s) or empty string if no parameter is found
      */
     const removeParam = (url: string, transformValue: string) => {
-        // get the parameter values to remove
-        const paramNamesToRemoveStr = transformValue.includes(MARKER_SEPARATOR)
-            ? transformValue.split(MARKER_SEPARATOR)[1]
-            : undefined;
-
         const urlObj = new URL(url, window.location.origin);
 
-        // if the parameter(s) value is specified, remove it
-        if (paramNamesToRemoveStr) {
-            const initSearchParamsLength = urlObj.searchParams.toString().length;
+        // get the parameter values to remove
+        const paramNamesToRemoveStr = transformValue.split(MARKER_SEPARATOR)[1];
 
-            const removeParams = paramNamesToRemoveStr.split(',');
-            removeParams.forEach((param) => {
-                if (urlObj.searchParams.has(param)) {
-                    urlObj.searchParams.delete(param);
-                }
-            });
+        if (!paramNamesToRemoveStr) {
+            urlObj.search = '';
+            return urlObj.toString().replace(window.location.origin, '');
+        }
 
-            // if the parameter(s) is not found, return empty string
-            if (initSearchParamsLength === urlObj.searchParams.toString().length) {
-                return '';
+        const initSearchParamsLength = urlObj.searchParams.toString().length;
+
+        const removeParams = paramNamesToRemoveStr.split(COMMA);
+        removeParams.forEach((param) => {
+            if (urlObj.searchParams.has(param)) {
+                urlObj.searchParams.delete(param);
             }
-        } else {
-            urlObj.search = '';
+        });
+
+        // if the parameter(s) is not found, return empty string
+        if (initSearchParamsLength === urlObj.searchParams.toString().length) {
+            return '';
         }
 
         return urlObj.toString().replace(window.location.origin, '');