fix: top level array body with params

Author: ajaishankar

src/fetcher.ts

@@ -86,7 +86,7 @@ function getHeaders(init?: HeadersInit) {
   return headers
 }
 
-function getBody(method: Method, payload: Record<string, unknown>) {
+function getBody(method: Method, payload: any) {
   const body = sendBody(method) ? JSON.stringify(payload) : undefined
   // if delete don't send body if empty
   return method === 'delete' && body === '{}' ? undefined : body
@@ -109,7 +109,14 @@ function mergeRequestInit(
 }
 
 function getFetchParams(request: Request) {
-  const payload = Array.isArray(request.payload) ? [...request.payload] : { ...request.payload } 
+  // clone payload
+  // if body is a top level array [ 'a', 'b', param: value ] with param values
+  // using spread [ ...payload ] returns [ 'a', 'b' ] and skips custom keys
+  // cloning with Object.assign() preserves all keys
+  const payload = Object.assign(
+    Array.isArray(request.payload) ? [] : {},
+    request.payload,
+  )
 
   const path = getPath(request.path, payload)
   const query = getQuery(request.method, payload, request.queryParams)

src/types.ts

@@ -136,7 +136,7 @@ export type Request = {
   method: Method
   path: string
   queryParams: string[] // even if a post these will be sent in query
-  payload: Record<string, unknown>
+  payload: any
   init?: RequestInit
   fetch: Fetch
 }

test/fetch.test.ts

@@ -64,6 +64,19 @@ describe('fetch', () => {
     })
   })
 
+  methods.forEach((method) => {
+    it(`${method.toUpperCase()} /bodyarray/{id}`, async () => {
+      const fun = fetcher.path('/bodyarray/{id}').method(method).create()
+
+      const { data } = await fun(Object.assign(['b', 'c'], { id: 1 }))
+
+      expect(data.params).toEqual({ id: '1' })
+      expect(data.body).toEqual(['b', 'c'])
+      expect(data.query).toEqual({})
+      expect(data.headers).toEqual(expectedHeaders)
+    })
+  })
+
   methods.forEach((method) => {
     it(`${method.toUpperCase()} /bodyquery/{id}`, async () => {
       const fun = fetcher

test/mocks/handlers.ts

@@ -43,6 +43,9 @@ const methods = {
   withBody: ['post', 'put', 'patch', 'delete'].map((method) => {
     return (rest as any)[method](`${HOST}/body/:id`, getResult)
   }),
+  withBodyArray: ['post', 'put', 'patch', 'delete'].map((method) => {
+    return (rest as any)[method](`${HOST}/bodyarray/:id`, getResult)
+  }),
   withBodyAndQuery: ['post', 'put', 'patch', 'delete'].map((method) => {
     return (rest as any)[method](`${HOST}/bodyquery/:id`, getResult)
   }),
@@ -73,6 +76,7 @@ const methods = {
 export const handlers = [
   ...methods.withQuery,
   ...methods.withBody,
+  ...methods.withBodyArray,
   ...methods.withBodyAndQuery,
   ...methods.withError,
 ]

test/paths.ts

@@ -3,7 +3,7 @@ export type Data = {
   params: string[]
   headers: Record<string, string>
   query: Record<string, string | string[]>
-  body: Record<string, any>
+  body: any
 }
 
 type Query = {
@@ -22,6 +22,14 @@ type Body = {
   responses: { 200: { schema: Data } }
 }
 
+type BodyArray = {
+  parameters: {
+    path: { id: number }
+    body: { payload: string[] }
+  }
+  responses: { 200: { schema: Data } }
+}
+
 type BodyAndQuery = {
   parameters: {
     path: { id: number }
@@ -41,6 +49,12 @@ export type paths = {
     patch: Body
     delete: Body
   }
+  '/bodyarray/{id}': {
+    post: BodyArray
+    put: BodyArray
+    patch: BodyArray
+    delete: BodyArray
+  }
   '/bodyquery/{id}': {
     post: BodyAndQuery
     put: BodyAndQuery