refactor: reorder headers and query in fetch options

Author: johannschopplich

src/runtime/composables/$kirby.ts

@@ -82,23 +82,23 @@ export function $kirby<T = any>(
     method: 'POST',
     body: {
       path,
-      query,
-      headers: Object.keys(baseHeaders).length ? baseHeaders : undefined,
       method,
+      query,
       body,
+      headers: Object.keys(baseHeaders).length ? baseHeaders : undefined,
       cache,
     } satisfies ServerFetchOptions,
   }
 
   const _clientFetchOptions: NitroFetchOptions<string> = {
     baseURL: kql.url,
     query,
+    method,
+    body,
     headers: {
       ...baseHeaders,
       ...createAuthHeader(kql),
     },
-    method,
-    body,
   }
 
   const request = useRequestFetch()(kql.client ? path : buildApiProxyPath(_key), {

src/runtime/composables/$kql.ts

@@ -70,9 +70,9 @@ export function $kql<T extends KirbyQueryResponse<any, boolean> = KirbyQueryResp
   const _serverFetchOptions: NitroFetchOptions<string> = {
     method: 'POST',
     body: {
+      headers: Object.keys(baseHeaders).length ? baseHeaders : undefined,
       query,
       cache,
-      headers: Object.keys(baseHeaders).length ? baseHeaders : undefined,
     } satisfies ServerFetchOptions,
   }
 

src/runtime/server/handler.ts

@@ -5,7 +5,7 @@ import { useRuntimeConfig } from '#imports'
 import { consola } from 'consola'
 import { destr } from 'destr'
 import { createError, defineEventHandler, getRouterParam, readBody, setResponseHeader, setResponseStatus, splitCookiesString } from 'h3'
-import { defineCachedFunction } from 'nitropack/runtime'
+import { defineCachedFunction } from 'nitropack/runtime/internal/cache'
 import { base64ToUint8Array, uint8ArrayToBase64, uint8ArrayToString } from 'uint8array-extras'
 import { createAuthHeader } from '../utils'
 
@@ -46,8 +46,8 @@ export default defineEventHandler(async (event) => {
             body: query,
           }
         : {
-            query,
             method,
+            query,
             body,
           }),
       headers: {
@@ -57,7 +57,7 @@ export default defineEventHandler(async (event) => {
     })
 
     // Serialize the response data
-    const dataArray = new Uint8Array(response._data ?? ([] as unknown as ArrayBuffer))
+    const dataArray = new Uint8Array(response._data ?? [])
     const data = uint8ArrayToBase64(dataArray)
 
     return {