fix: protocol handling

unjs · Sep 20, 2023 · d9be4a6 · d9be4a6
1 parent 1245a84
commit d9be4a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -50,6 +50,7 @@ export function isScriptProtocol(protocol?: string) {
 }
 
 const TRAILING_SLASH_RE = /\/$|\/\?|\/#/;
+const HTTP_PROTOCO_RE = /^https?:\/\//;
 
 export function hasTrailingSlash(input = "", queryParameters = false): boolean {
   if (!queryParameters) {
@@ -62,6 +63,10 @@ export function withoutTrailingSlash(
   input = "",
   queryParameters = false
 ): string {
+  const hasProtocolDifferentThanHttp = hasProtocol(input) && !HTTP_PROTOCO_RE.test(input);
+  if(hasProtocolDifferentThanHttp) {
+    return input;
+  }
   if (!queryParameters) {
     const url = hasTrailingSlash(input) ? input.slice(0, -1) : input;
     return url || "/";
@@ -80,6 +85,10 @@ export function withoutTrailingSlash(
 }
 
 export function withTrailingSlash(input = "", queryParameters = false): string {
+  const hasProtocolDifferentThanHttp = hasProtocol(input) && !HTTP_PROTOCO_RE.test(input);
+  if(hasProtocolDifferentThanHttp) {
+    return input;
+  }
   if (!queryParameters) {
     return input.endsWith("/") ? input : input + "/";
   }

diff --git a/test/trailing-slash.test.ts b/test/trailing-slash.test.ts
@@ -10,6 +10,7 @@ describe("withTrailingSlash, queryParams: false", () => {
     "foo?123": "foo?123/",
     "foo/?123": "foo/?123/",
     "foo/?123#abc": "foo/?123#abc/",
+    "mailto:example@example.com": "mailto:example@example.com",
   };
 
   for (const input in tests) {
@@ -31,6 +32,7 @@ describe("withTrailingSlash, queryParams: true", () => {
     "foo?123": "foo/?123",
     "foo/?123": "foo/?123",
     "foo?123#abc": "foo/?123#abc",
+    "mailto:example@example.com": "mailto:example@example.com",
   };
 
   for (const input in tests) {
@@ -54,6 +56,7 @@ describe("withoutTrailingSlash, queryParams: false", () => {
     "foo?123": "foo?123",
     "foo/?123": "foo/?123",
     "foo/?123#abc": "foo/?123#abc",
+    'scheme://host:port/path/': 'scheme://host:port/path/',
   };
 
   for (const input in tests) {
@@ -78,6 +81,7 @@ describe("withoutTrailingSlash, queryParams: true", () => {
     "foo?123": "foo?123",
     "foo/?123": "foo?123",
     "foo/?123#abc": "foo?123#abc",
+    'scheme://host:port/path/': 'scheme://host:port/path/',
   };
 
   for (const input in tests) {