fix: Fixes match url with query params

Author: igorjacauna

package.json

@@ -43,6 +43,7 @@
   },
   "dependencies": {
     "axios": "1.4.0",
-    "ohash": "1.1.3"
+    "ohash": "1.1.3",
+    "ufo": "1.3.0"
   }
-}
+}

src/runtime/helpers.ts

@@ -1,22 +1,31 @@
 import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
 import { isEqual } from 'ohash';
+import { $URL } from 'ufo';
 
 export function hasSameParams(requestParams: object, proxyParams?: object) {
   if (!proxyParams) return true;
   return isEqual(requestParams, proxyParams);
 }
 
+// eslint-disable-next-line complexity
 export function matchRequest(
   verb: string,
   path: string,
   config: AxiosRequestConfig,
   params?: object,
 ) {
-  return (
-    config.method === verb &&
-    config.url === path &&
-    hasSameParams(config.params, params)
-  );
+  const requestURL = new $URL(config.url);
+  const matchURL = new $URL(path);
+
+  const sameMethod = config.method === verb;
+  const samePath = requestURL.pathname === matchURL.pathname;
+
+  if (!sameMethod) return false;
+  if (!samePath) return false;
+
+  if (params) return hasSameParams(params, config.params || requestURL.query);
+
+  return true;
 }
 
 export function matchResponse(

test/index.test.ts

@@ -153,7 +153,7 @@ describe('axios-dev-proxy tests', () => {
       expect(responseGet.status).toEqual(201);
     });
 
-    it('should modify response with query params', async () => {
+    it('should modify response with query params in config', async () => {
       server.get('/').reply(200, { data: 1 });
 
       proxy.onGet('/').replyOnce(201, {
@@ -165,7 +165,19 @@ describe('axios-dev-proxy tests', () => {
       expect(response.status).toEqual(201);
     });
 
-    it('should modify response for route with specific query params', async () => {
+    it('should modify response with query params in path', async () => {
+      server.get('/?q=2').reply(200, { data: 1 });
+
+      proxy.onGet('/').replyOnce(201, {
+        data: 2,
+      });
+
+      const response = await api.get('/?q=2');
+      expect(response.data).toEqual({ data: 2 });
+      expect(response.status).toEqual(201);
+    });
+
+    it('should modify response for route with specific query params in options', async () => {
       server.get('/').reply(200, { data: 1 }).get('/').reply(200, { data: 2 });
 
       proxy.onGet('/', { q: 'param' }).replyOnce(201, {
@@ -180,6 +192,26 @@ describe('axios-dev-proxy tests', () => {
       expect(response2.data).toEqual({ data: 2 });
       expect(response2.status).toEqual(201);
     });
+
+    it('should modify response for route with specific query params in path', async () => {
+      server
+        .get('/?q=param')
+        .reply(200, { data: 1 })
+        .get('/?q=param2')
+        .reply(200, { data: 2 });
+
+      proxy.onGet('/', { q: 'param2' }).replyOnce(201, {
+        data: 2,
+      });
+
+      const response = await api.get('/?q=param');
+      expect(response.data).toEqual({ data: 1 });
+      expect(response.status).toEqual(200);
+
+      const response2 = await api.get('/?q=param2');
+      expect(response2.data).toEqual({ data: 2 });
+      expect(response2.status).toEqual(201);
+    });
   });
 
   describe('always GET configs', () => {

yarn.lock

@@ -3613,6 +3613,11 @@ [email protected], typescript@^5.0.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"
   integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
 
+[email protected]:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.0.tgz#c92f8ac209daff607c57bbd75029e190930a0019"
+  integrity sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==
+
 ufo@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.2.0.tgz#28d127a087a46729133fdc89cb1358508b3f80ba"