sort query parameters

Author: StarpTech

src/http-data-source.ts

@@ -109,6 +109,10 @@ export abstract class HTTPDataSource<TContext = any> extends DataSource {
         }
       }
     }
+
+    // avoid cache fragmentation when the query order is not guaranteed
+    params.sort()
+
     return params.toString()
   }
 
@@ -342,7 +346,7 @@ export abstract class HTTPDataSource<TContext = any> extends DataSource {
   }
 
   private async request<TResult = unknown>(request: Request): Promise<Response<TResult>> {
-    if (Object.keys(request?.query).length > 0) {
+    if (Object.keys(request.query).length > 0) {
       request.path = request.path + '?' + this.buildQueryString(request.query)
     }
 

test/http-data-source.test.ts

@@ -551,6 +551,49 @@ test('Should be able to define a custom cache key for request memoization', asyn
   t.deepEqual(response.body, wanted)
 })
 
+test('Should correctly calculate and sort query parameters', async (t) => {
+  t.plan(3)
+
+  const path = '/'
+
+  const wanted = { name: 'foo' }
+
+  const server = http.createServer((req, res) => {
+    t.is(req.method, 'GET')
+    t.is(req.url, '/?a=1&b=2&z=z')
+    res.writeHead(200, {
+      'content-type': 'application/json',
+    })
+    res.write(JSON.stringify(wanted))
+    res.end()
+    res.socket?.unref()
+  })
+
+  t.teardown(server.close.bind(server))
+
+  server.listen()
+
+  const baseURL = `http://localhost:${(server.address() as AddressInfo)?.port}`
+
+  const dataSource = new (class extends HTTPDataSource {
+    constructor() {
+      super(baseURL)
+    }
+    getFoo() {
+      return this.get(path, {
+        query: {
+          b: 2,
+          a: 1,
+          z: 'z',
+        },
+      })
+    }
+  })()
+
+  let response = await dataSource.getFoo()
+  t.deepEqual(response.body, wanted)
+})
+
 test('Should call onError on request error', async (t) => {
   t.plan(11)
 
@@ -1394,4 +1437,4 @@ test('Should be able to pass custom Undici Pool', async (t) => {
   const response = await dataSource.getFoo()
 
   t.deepEqual(response.body, wanted)
-})
+})