fix: merge querystring with params (#53)

src/gaxios.ts

@@ -126,6 +126,19 @@ export class Gaxios {
       opts.url = baseUrl + opts.url;
     }
 
+    const parsedUrl = new URL(opts.url);
+    opts.url = `${parsedUrl.origin}${parsedUrl.pathname}`;
+    opts.params = extend(
+        qs.parse(parsedUrl.search.substr(1)),  // removes leading ?
+        opts.params);
+
+    opts.paramsSerializer = opts.paramsSerializer || this.paramsSerializer;
+    if (opts.params) {
+      parsedUrl.search = opts.paramsSerializer(opts.params);
+    }
+
+    opts.url = parsedUrl.href;
+
     if (typeof options.maxContentLength === 'number') {
       opts.size = options.maxContentLength;
     }
@@ -147,19 +160,12 @@ export class Gaxios {
     }
 
     opts.validateStatus = opts.validateStatus || this.validateStatus;
-    opts.paramsSerializer = opts.paramsSerializer || this.paramsSerializer;
     opts.responseType = opts.responseType || 'json';
     if (!opts.headers['Accept'] && opts.responseType === 'json') {
       opts.headers['Accept'] = 'application/json';
     }
     opts.method = opts.method || 'GET';
 
-    if (opts.params) {
-      const parts = new URL(opts.url);
-      parts.search = opts.paramsSerializer(opts.params);
-      opts.url = parts.href;
-    }
-
     const proxy = loadProxy();
     if (proxy) {
       if (this.agentCache.has(proxy)) {

test/test.getch.ts

@@ -123,7 +123,17 @@ describe('🥁 configuration options', () => {
     assert.strictEqual(response, res);
   });
 
-  it('should encode query string parameters', async () => {
+  it('should encode URL parameters', async () => {
+    const path = '/?james=kirk&montgomery=scott';
+    const opts = {url: `${url}${path}`};
+    const scope = nock(url).get(path).reply(200, {});
+    const res = await request(opts);
+    assert.strictEqual(res.status, 200);
+    assert.strictEqual(res.config.url, url + path);
+    scope.done();
+  });
+
+  it('should encode parameters from the params option', async () => {
     const opts = {url, params: {james: 'kirk', montgomery: 'scott'}};
     const path = '/?james=kirk&montgomery=scott';
     const scope = nock(url).get(path).reply(200, {});
@@ -133,14 +143,27 @@ describe('🥁 configuration options', () => {
     scope.done();
   });
 
+  it('should merge URL parameters with the params option', async () => {
+    const opts = {
+      url: `${url}/?james=beckwith&montgomery=scott`,
+      params: {james: 'kirk'}
+    };
+    const path = '/?james=kirk&montgomery=scott';
+    const scope = nock(url).get(path).reply(200, {});
+    const res = await request(opts);
+    assert.strictEqual(res.status, 200);
+    assert.strictEqual(res.config.url, url + path);
+    scope.done();
+  });
+
   it('should allow overriding the param serializer', async () => {
     const qs = '?oh=HAI';
     const params = {james: 'kirk'};
     const opts: GaxiosOptions = {
       url,
       params,
       paramsSerializer: (ps) => {
-        assert.deepStrictEqual(params, ps);
+        assert.deepEqual(params, ps);
         return '?oh=HAI';
       }
     };