Skip to content

Commit 451052b

Browse files
committed
Revert "fix: database presets merge types"
This reverts commit 2630b6b.
1 parent 2630b6b commit 451052b

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

Diff for: src/module.ts

-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ export default defineNuxtModule<ModuleOptions>({
5454
ws: '',
5555
NS: '',
5656
DB: '',
57-
KV: undefined,
58-
SC: undefined,
59-
AC: undefined,
60-
auth: undefined,
6157
},
6258
},
6359
server: {

Diff for: src/runtime/composables/surreal-fetch.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { hash } from 'ohash'
44
import { createDefu, defu } from 'defu'
55

66
import type {
7+
DatabasePreset,
78
DatabasePresetKeys,
89
KeysOf,
910
PickFrom,
@@ -96,7 +97,9 @@ export function useSurrealRPC<
9697
})
9798
}
9899

99-
export function useSurrealDatabases() {
100+
export function useSurrealDatabases(): {
101+
[key in DatabasePresetKeys]: DatabasePreset
102+
} {
100103
const {
101104
databases: publicDatabases,
102105
defaultDatabase,

Diff for: src/runtime/server/utils/surreal-fetch.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// The following nitropack import is from https://github.com/nuxt/module-builder/issues/141#issuecomment-2078248248
22
import type {} from 'nitropack'
3+
import type { PublicRuntimeConfig, RuntimeConfig } from 'nuxt/schema'
34
import type { FetchOptions, ResponseType } from 'ofetch'
45
import { textToBase64 } from 'undio'
56
import type { H3Event } from 'h3'
@@ -57,7 +58,10 @@ export function useSurrealDatabases(event?: H3Event): {
5758
return true
5859
})
5960

60-
const databases = defuDatabases(privateDatabases, publicDatabases)
61+
const databases = defuDatabases<
62+
RuntimeConfig['surrealdb']['databases'],
63+
PublicRuntimeConfig['surrealdb']['databases'][]
64+
>(privateDatabases, publicDatabases)
6165

6266
return databases
6367
}

0 commit comments

Comments
 (0)