fix: Allow prefixUrl to work (#370)

* fix: Allow prefixUrl to work

* Add back ability to merge queryParams

Co-authored-by: Alex Gherghisan <alexghr@users.noreply.github.com>

* Changes per feedback

---------

Co-authored-by: Alex Gherghisan <alexghr@users.noreply.github.com>

Author: Mnkras

src/lib/fetch.ts

@@ -11,7 +11,33 @@ export function createFetch(got: Got): GotFetch {
   const globalCache = new Map();
 
   return async (input, opts) => {
-    const url = new URL(typeof input === 'string' ? input : input.url);
+    let url = input.toString();
+    let searchParams: URLSearchParams = new URLSearchParams();
+
+    try {
+      const urlObj = new URL(
+        typeof input === "string"
+          ? input
+          : input.url
+      );
+
+      searchParams = new URLSearchParams(urlObj.searchParams);
+      urlObj.search = "";
+
+      url = urlObj.href;
+    } catch (e) {
+      // Ignore url parsing failure, likely prefixUrl is being used
+      // When using prefixUrl, the path cannot start with a "/"
+      if (url.startsWith("/")) {
+        url = url.substring(1);
+      }
+
+      if (url.includes("?")) {
+        const [path, search] = url.split("?");
+        url = path;
+        searchParams = new URLSearchParams(search);
+      }
+    }
     const request: RequestInit = typeof input === 'object' ? input : opts || {};
 
     if (request.mode === 'no-cors' || request.mode === 'same-origin' || request.mode === 'navigate') {
@@ -31,18 +57,10 @@ export function createFetch(got: Got): GotFetch {
       throw new TypeError(format('request.headers must be plain object: %j', request.headers));
     }
 
-    // got does not merge base searchParams with the url's searchParams
-    // but it does merge searchParams options
-    // so we clone the url's searchParams
-    // we also clear the url's search to work around this bug
-    // https://github.com/sindresorhus/got/issues/1188
-    const searchParams = new URLSearchParams(url.searchParams);
-    url.search = '';
-
     const gotOpts: GotOptions = {
       // url needs to be stringified to support UNIX domain sockets, and
       // For more info see https://github.com/alexghr/got-fetch/pull/8
-      url: url.toString(),
+      url,
       searchParams,
       followRedirect: true,
       throwHttpErrors: false,
@@ -107,7 +125,7 @@ export function createFetch(got: Got): GotFetch {
               // using Array.prototype.at would've been nice but it's not
               // supported by anything below Node 16.8
             ? r.redirectUrls[r.redirectUrls.length - 1]
-            : url.href,
+            : r.url,
       });
     });
   }

src/test/fetch.request.test.ts

@@ -2,7 +2,7 @@ import got from 'got';
 import { URLSearchParams } from 'url';
 
 import { createFetch } from '../lib/fetch';
-import { Interceptor, intercept, assert200, url } from './util';
+import { Interceptor, intercept, assert200, url, ORIGIN } from './util';
 
 describe('fetch request', () => {
   let interceptor: Interceptor;
@@ -37,6 +37,18 @@ describe('fetch request', () => {
       const fetch = createFetch(got);
       await assert200(fetch(url('/foo')));
     });
+
+    it('allows prefixUrl', async () => {
+      expect.assertions(1);
+      interceptor.intercept('/foo', 'get').reply(200);
+
+      const prefixedClient = got.extend({
+        prefixUrl: ORIGIN
+      })
+
+      const fetch = createFetch(prefixedClient);
+      await assert200(fetch('/foo'));
+    });
   });
 
   describe('querystring', () => {
@@ -48,13 +60,27 @@ describe('fetch request', () => {
       await assert200(fetch(url('/', { foo: '123', bar: '456' })));
     });
 
-    it('merges query string parameters', async () => {
-      expect.assertions(1);
-      interceptor.intercept('/', 'get').query({ foo: '123', bar: '456' }).reply(200);
+  });
 
-      const fetch = createFetch(got.extend({ searchParams: { bar: '456' } }));
-      await assert200(fetch(url('/', { foo: '123' })));
-    });
+  it('merges query string parameters', async () => {
+    expect.assertions(1);
+    interceptor.intercept('/', 'get').query({ foo: '123', bar: '456' }).reply(200);
+
+    const fetch = createFetch(got.extend({ searchParams: { bar: '456' } }));
+    await assert200(fetch(url('/', { foo: '123' })));
+  });
+
+  it('merges query string parameters with prefixUrl', async () => {
+    expect.assertions(1);
+    interceptor.intercept('/foo', 'get').query({ foo: '123', bar: '456' }).reply(200);
+
+    const prefixedClient = got.extend({
+      prefixUrl: ORIGIN,
+      searchParams: { bar: '456' }
+    })
+
+    const fetch = createFetch(prefixedClient);
+    await assert200(fetch('/foo?foo=123'));
   });
 
   describe('headers', () => {
@@ -175,7 +201,7 @@ describe('fetch request', () => {
 
     });
 
-    it.only("sends own content-type header", async () => {
+    it("sends own content-type header", async () => {
       expect.assertions(1);
 
       // as set by the client

src/test/util.ts

@@ -1,7 +1,7 @@
 import nock from 'nock';
 import { URL } from 'url';
 
-const ORIGIN = 'https://example.com';
+export const ORIGIN = 'https://example.com';
 
 export type Interceptor = nock.Scope;
 export function intercept(): Interceptor {