Revert "fix: database presets merge types"

This reverts commit 2630b6b.
sandros94 · Jul 11, 2024 · 451052b · 451052b
1 parent 2630b6b
commit 451052b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/module.ts b/src/module.ts
@@ -54,10 +54,6 @@ export default defineNuxtModule<ModuleOptions>({
         ws: '',
         NS: '',
         DB: '',
-        KV: undefined,
-        SC: undefined,
-        AC: undefined,
-        auth: undefined,
       },
     },
     server: {

diff --git a/src/runtime/composables/surreal-fetch.ts b/src/runtime/composables/surreal-fetch.ts
@@ -4,6 +4,7 @@ import { hash } from 'ohash'
 import { createDefu, defu } from 'defu'
 
 import type {
+  DatabasePreset,
   DatabasePresetKeys,
   KeysOf,
   PickFrom,
@@ -96,7 +97,9 @@ export function useSurrealRPC<
   })
 }
 
-export function useSurrealDatabases() {
+export function useSurrealDatabases(): {
+  [key in DatabasePresetKeys]: DatabasePreset
+} {
   const {
     databases: publicDatabases,
     defaultDatabase,

diff --git a/src/runtime/server/utils/surreal-fetch.ts b/src/runtime/server/utils/surreal-fetch.ts
@@ -1,5 +1,6 @@
 // The following nitropack import is from https://github.com/nuxt/module-builder/issues/141#issuecomment-2078248248
 import type {} from 'nitropack'
+import type { PublicRuntimeConfig, RuntimeConfig } from 'nuxt/schema'
 import type { FetchOptions, ResponseType } from 'ofetch'
 import { textToBase64 } from 'undio'
 import type { H3Event } from 'h3'
@@ -57,7 +58,10 @@ export function useSurrealDatabases(event?: H3Event): {
     return true
   })
 
-  const databases = defuDatabases(privateDatabases, publicDatabases)
+  const databases = defuDatabases<
+    RuntimeConfig['surrealdb']['databases'],
+    PublicRuntimeConfig['surrealdb']['databases'][]
+  >(privateDatabases, publicDatabases)
 
   return databases
 }