fix: use NuxtError error type for async data composables

Author: johannschopplich

docs/api/use-kql.md

@@ -13,7 +13,7 @@ function useKql<
 >(
   query: MaybeRefOrGetter<ReqT>,
   opts?: UseKqlOptions<ResT>
-): AsyncData<ResT, FetchError>
+): AsyncData<ResT, NuxtError>
 
 type UseKqlOptions<T> = AsyncDataOptions<T> & Pick<
   NitroFetchOptions<string>,

playground/nuxt.config.ts

@@ -31,7 +31,7 @@ export default defineNuxtConfig({
     },
   },
 
-  experimental: {
+  future: {
     typescriptBundlerResolution: true,
   },
 

src/runtime/composables/useKirbyData.ts

@@ -1,10 +1,9 @@
 import { computed } from 'vue'
 import { joinURL } from 'ufo'
 import { hash } from 'ohash'
-import type { FetchError } from 'ofetch'
 import type { NitroFetchOptions } from 'nitropack'
 import type { WatchSource } from 'vue'
-import type { AsyncData, AsyncDataOptions } from 'nuxt/app'
+import type { AsyncData, AsyncDataOptions, NuxtError } from 'nuxt/app'
 import { toValue } from '@vueuse/core'
 import type { MaybeRefOrGetter } from '@vueuse/core'
 import type { ModuleOptions } from '../../module'
@@ -95,7 +94,7 @@ export function useKirbyData<T = any>(
 
   let controller: AbortController | undefined
 
-  return useAsyncData<T, FetchError>(
+  return useAsyncData<T, NuxtError>(
     key.value,
     async (nuxt) => {
       controller?.abort?.()
@@ -153,5 +152,5 @@ export function useKirbyData<T = any>(
       }
     },
     asyncDataOptions,
-  ) as AsyncData<T, FetchError>
+  ) as AsyncData<T, NuxtError>
 }

src/runtime/composables/useKql.ts

@@ -1,9 +1,8 @@
 import { computed } from 'vue'
 import { hash } from 'ohash'
-import type { FetchError } from 'ofetch'
 import type { NitroFetchOptions } from 'nitropack'
 import type { WatchSource } from 'vue'
-import type { AsyncData, AsyncDataOptions } from 'nuxt/app'
+import type { AsyncData, AsyncDataOptions, NuxtError } from 'nuxt/app'
 import type { KirbyQueryRequest, KirbyQueryResponse } from 'kirby-types'
 import { toValue } from '@vueuse/core'
 import type { MaybeRefOrGetter } from '@vueuse/core'
@@ -83,7 +82,7 @@ export function useKql<
 
   let controller: AbortController | undefined
 
-  return useAsyncData<ResT, FetchError>(
+  return useAsyncData<ResT, NuxtError>(
     key.value,
     async (nuxt) => {
       controller?.abort?.()
@@ -141,5 +140,5 @@ export function useKql<
       }
     },
     asyncDataOptions,
-  ) as AsyncData<ResT, FetchError>
+  ) as AsyncData<ResT, NuxtError>
 }

src/runtime/server/handler.ts

@@ -1,8 +1,8 @@
 import { createError, defineEventHandler, getRouterParam, readBody } from 'h3'
-import type { FetchError } from 'ofetch'
 import type { ModuleOptions } from '../../module'
 import { createAuthHeader } from '../utils'
 import type { ServerFetchOptions } from '../types'
+import type { NuxtError } from '#app'
 
 // @ts-expect-error: Will be resolved by Nitro
 import { defineCachedFunction } from '#internal/nitro'
@@ -47,7 +47,7 @@ async function fetcher({
       statusMessage: isQueryRequest
         ? 'Failed to execute KQL query'
         : `Failed to fetch "${path}"`,
-      data: (err as FetchError).message,
+      data: (err as NuxtError).message,
     })
   }
 }

test/fixture/nuxt.config.ts

@@ -35,7 +35,7 @@ export default defineNuxtConfig({
     },
   },
 
-  experimental: {
+  future: {
     typescriptBundlerResolution: true,
   },