fix(joinURL): preserve params from input path

unjs · Dec 12, 2020 · 8f8f10a · 8f8f10a
1 parent ad33243
commit 8f8f10a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/index.ts b/src/index.ts
@@ -72,6 +72,14 @@ export function getParams (input: InputURL): SearchParams {
 export function joinURL (input0: string, ...input: string[]): string {
   const path = input.map(parseURL)
   const baseURL = parseURL(input0)
+
+  for (const p of path) {
+    p.url.searchParams.forEach((value, key) => {
+      baseURL.url.searchParams.set(key, value)
+    })
+  }
+
   baseURL.url.pathname = joinPath(baseURL.url.pathname, ...path.map(p => p.url.pathname))
+
   return normalizeURL(baseURL)
 }
diff --git a/test/join.test.ts b/test/join.test.ts
@@ -10,7 +10,8 @@ describe('joinURL', () => {
     { input: ['a', 'b/', 'c'], out: 'a/b/c' },
     { input: ['a', 'b/', '/c'], out: 'a/b/c' },
     { input: ['/a?foo=bar#123', 'b/', 'c/'], out: '/a/b/c/?foo=bar#123' },
-    { input: ['http://foo.com', 'a'], out: 'http://foo.com/a' }
+    { input: ['http://foo.com', 'a'], out: 'http://foo.com/a' },
+    { input: ['a?p1=1', 'b?p2=2'], out: 'a/b?p1=1&p2=2' }
   ]
 
   for (const t of tests) {