fix(url-parser): pathnames assigning an unneeded forward slash to com…

…ponents without hostnames
itsmichaelbtw · Dec 13, 2022 · ec8acd7 · ec8acd7
1 parent c19ebb5
commit ec8acd7
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/lib/core/parsers/base-url-parser.ts b/lib/core/parsers/base-url-parser.ts
@@ -30,7 +30,7 @@ interface ParamsConversionOutput {
 const DEFAULT_PROTOCOL = "http";
 
 const PARSE_URL =
-    /^(?:([^:\/?#]+):)?(?:\/\/((?:([^@\/\n]+)@)?((?:[0-9]{1,3}\.){3}[0-9]{1,3}|\[[0-9a-f:]+\]|[^#:\/?\n]+)(?::(\d*))?))?(?:[\/]*([^?#]*))(?:[\?]*([^#]*))?(?:[\#]*(.*))?/i;
+    /^(?:([^:\/?#]+):)?(?:[\/\/]+((?:([^@\/\n]+)@)?((?:[0-9]{1,3}\.){3}[0-9]{1,3}|\[[0-9a-f:]+\]|[^#:\/?\n]+)(?::(\d*))?))?(?:[\/]*([^?#]*))(?:[\?]*([^#]*))?(?:[\#]*(.*))?/i;
 
 const IPV4_REGEX = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/;
 const IPV6_REGEX = /^(\[[0-9a-f:]+\])$/i;
@@ -144,14 +144,18 @@ export class BaseURLParser {
     protected $component: EnforceComponent;
 
     constructor(input: string | SerializeComponent) {
+        if (input && !isString(input) && !isObject(input)) {
+            throw new TypeError("Invalid input. Must be a string or an object.");
+        }
+
         this.$component = createEmptyScheme<EnforceComponent>(URL_COMPONENT_KEYS, "");
 
         if (isString(input) && input) {
             this.$component = this.parse(input);
             return;
         }
 
-        if (isObject(input)) {
+        if (isObject(input) && !isEmpty(input)) {
             if (input.href) {
                 this.$component = this.parse(input.href);
             } else {
@@ -291,7 +295,11 @@ export class BaseURLParser {
             return;
         }
 
-        this.$component.pathname = ensureLeadingToken("/", pathname);
+        if (this.$component.hostname) {
+            this.$component.pathname = ensureLeadingToken("/", pathname);
+        } else {
+            this.$component.pathname = pathname;
+        }
     }
 
     protected parseParams(params: CustomSearchParams): void {