fix: custom fetch key to support v3.0.0-rc.5

Author: johannschopplich

src/runtime/composables/$kql.ts

@@ -1,5 +1,5 @@
 import { hash as ohash } from 'ohash'
-import type { KirbyQueryRequest, KirbyQueryResponse } from '../types'
+import type { KirbyQueryRequest, KirbyQueryResponse } from '#nuxt-kql'
 import { useNuxtApp } from '#imports'
 import { apiRoute } from '#build/nuxt-kql/options'
 

src/runtime/composables/$publicKql.ts

@@ -1,7 +1,7 @@
 import type { FetchOptions } from 'ohmyfetch'
-import type { KirbyQueryRequest, KirbyQueryResponse } from '../types'
 import type { ModuleOptions } from '../../module'
 import { getAuthHeaders, headersToObject } from '../utils'
+import type { KirbyQueryRequest, KirbyQueryResponse } from '#nuxt-kql'
 import { useRuntimeConfig } from '#imports'
 
 export type PublicKqlOptions = Omit<FetchOptions, 'baseURL' | 'body' | 'params' | 'parseResponse' | 'responseType' | 'response'>
@@ -13,7 +13,7 @@ export function $publicKql<T extends KirbyQueryResponse = KirbyQueryResponse>(
   const { kql } = useRuntimeConfig().public
 
   if (!kql?.clientRequests)
-    throw new Error('Fetching from Kirby client-side isn\'t allowed. Enable it by setting `clientRequests` to `true`.')
+    throw new Error('Fetching from Kirby client-side isn\'t allowed. Enable it by setting "clientRequests" to "true".')
 
   return $fetch<T>(kql.prefix, {
     ...opts,

src/runtime/composables/useKql.ts

@@ -1,8 +1,9 @@
 import { computed, unref } from 'vue'
+import { hash } from 'ohash'
 import type { Ref } from 'vue'
 import type { NitroFetchRequest } from 'nitropack'
 import type { AsyncData, UseFetchOptions } from 'nuxt/app'
-import type { KirbyQueryRequest, KirbyQueryResponse } from '../types'
+import type { KirbyQueryRequest, KirbyQueryResponse } from '#nuxt-kql'
 import { useFetch } from '#imports'
 import { apiRoute } from '#build/nuxt-kql/options'
 
@@ -19,6 +20,7 @@ export function useKql<
 
   return useFetch<ResT, Error, NitroFetchRequest, ResT>(apiRoute, {
     ...opts,
+    key: hash(_query.value),
     method: 'POST',
     body: { query: _query.value },
   }) as AsyncData<ResT, true | Error>

src/runtime/composables/usePublicKql.ts

@@ -1,10 +1,11 @@
 import { computed, unref } from 'vue'
+import { hash } from 'ohash'
 import type { Ref } from 'vue'
 import type { NitroFetchRequest } from 'nitropack'
 import type { AsyncData, UseFetchOptions } from 'nuxt/app'
-import type { KirbyQueryRequest, KirbyQueryResponse } from '../types'
 import type { ModuleOptions } from '../../module'
 import { getAuthHeaders } from '../utils'
+import type { KirbyQueryRequest, KirbyQueryResponse } from '#nuxt-kql'
 import { useFetch, useRuntimeConfig } from '#imports'
 
 export type UseKqlOptions<T> = Omit<UseFetchOptions<T>, 'baseURL' | 'body' | 'params' | 'parseResponse' | 'responseType' | 'response'>
@@ -16,7 +17,7 @@ export function usePublicKql<
   const { kql } = useRuntimeConfig().public
 
   if (!kql?.clientRequests)
-    throw new Error('Fetching queries client-side isn\'t allowed. Enable it by setting `clientRequests` to `true`.')
+    throw new Error('Fetching queries client-side isn\'t allowed. Enable it by setting "clientRequests" to "true".')
 
   const _query = computed(() => unref(query))
 
@@ -25,6 +26,7 @@ export function usePublicKql<
 
   return useFetch<ResT, Error, NitroFetchRequest, ResT>(kql.prefix, {
     ...opts,
+    key: hash(_query.value),
     baseURL: kql.url,
     method: 'POST',
     body: _query.value,

src/runtime/server/api/kql.ts

@@ -1,7 +1,7 @@
 import { createError, defineEventHandler, useBody } from 'h3'
 import type { ModuleOptions } from '../../../module'
-import type { KirbyQueryRequest, KirbyQueryResponse } from '../../types'
 import { getAuthHeaders } from '../../utils'
+import type { KirbyQueryRequest, KirbyQueryResponse } from '#nuxt-kql'
 import { useRuntimeConfig } from '#imports'
 
 export default defineEventHandler(async (event): Promise<KirbyQueryResponse> => {