fix: add support for Drizzle types

Author: atinux

docs/content/docs/3.guides/2.drizzle.md

@@ -185,7 +185,7 @@ export default defineTask({
         createdAt: new Date()
       }
     ]
-    await useDrizzle().insert(tables.users).values(users)
+    useDrizzle().insert(tables.users).values(users)
     return { result: 'success' }
   }
 })
@@ -199,7 +199,7 @@ To run the seed task, start your dev server and open the Nuxt DevTools. Go to _T
 
 ```ts [server/api/todos/index.get.ts]
 export default eventHandler(async () => {
-  const todos = await useDrizzle().select().from(tables.todos).all()
+  const todos = useDrizzle().select().from(tables.todos).all()
 
   return todos
 })
@@ -211,7 +211,7 @@ export default eventHandler(async () => {
 export default eventHandler(async (event) => {
   const { title } = await readBody(event)
 
-  const todo = await useDrizzle().insert(tables.todos).values({
+  const todo = useDrizzle().insert(tables.todos).values({
     title,
     createdAt: new Date()
   }).returning().get()
@@ -227,7 +227,7 @@ export default eventHandler(async (event) => {
   const { id } = getRouterParams(event)
   const { completed } = await readBody(event)
 
-  const todo = await useDrizzle().update(tables.todos).set({
+  const todo = useDrizzle().update(tables.todos).set({
     completed
   }).where(eq(tables.todos.id, Number(id))).returning().get()
 
@@ -241,7 +241,7 @@ export default eventHandler(async (event) => {
 export default eventHandler(async (event) => {
   const { id } = getRouterParams(event)
 
-  const deletedTodo = await useDrizzle().delete(tables.todos).where(and(
+  const deletedTodo = useDrizzle().delete(tables.todos).where(and(
     eq(tables.todos.id, Number(id))
   )).returning().get()
 

playground/server/api/tests/db.ts

@@ -3,6 +3,7 @@ import { sqliteTable, integer, text } from 'drizzle-orm/sqlite-core'
 export default defineEventHandler(async () => {
   const db0 = useDatabase('db')
 
+
   const _tables = await db0.sql`
     SELECT
       name,
@@ -14,7 +15,7 @@ export default defineEventHandler(async () => {
       name NOT LIKE 'sqlite_%' and name NOT LIKE '_litestream_%' and name NOT LIKE '__drizzle%'
     ;`
 
-  const db = await useDrizzle()
+  const db = useDrizzle()
 
   const drizzleTables = await db.all(sql`
     SELECT

playground/server/api/todos/[id].delete.ts

@@ -6,7 +6,7 @@ export default eventHandler(async (event) => {
   }).parse)
 
   // List todos for the current user
-  const db = await useDrizzle()
+  const db = useDrizzle()
   const deletedTodo = await db.delete(tables.todos).where(and(
     eq(tables.todos.id, Number(id))
   )).returning().then(r => r[0])

playground/server/api/todos/[id].patch.ts

@@ -9,7 +9,7 @@ export default eventHandler(async (event) => {
   }).parse)
 
   // List todos for the current user
-  const db = await useDrizzle()
+  const db = useDrizzle()
   const todo = await db.update(tables.todos).set({
     completed
   }).where(eq(tables.todos.id, Number(id))).returning().then(r => r[0])

playground/server/api/todos/index.get.ts

@@ -1,6 +1,6 @@
 export default eventHandler(async () => {
   // List todos for the current user
-  const db = await useDrizzle()
+  const db = useDrizzle()
   const todos = await db.select().from(tables.todos)
 
   return todos

playground/server/api/todos/index.post.ts

@@ -4,7 +4,7 @@ export default eventHandler(async (event) => {
   }).parse)
 
   // List todos for the current user
-  const db = await useDrizzle()
+  const db = useDrizzle()
   const todo = await db.insert(tables.todos).values({
     title,
     createdAt: new Date()

playground/server/utils/drizzle.ts

@@ -22,6 +22,6 @@ export const tables = {
   todos
 }
 
-export async function useDrizzle() {
+export function useDrizzle() {
   return hubDrizzle({ schema: tables })
 }

playground/tsconfig.json

@@ -1,3 +1,17 @@
 {
-  "extends": "./.nuxt/tsconfig.json"
+  "files": [],
+  "references": [
+    {
+      "path": "./.nuxt/tsconfig.app.json"
+    },
+    {
+      "path": "./.nuxt/tsconfig.server.json"
+    },
+    {
+      "path": "./.nuxt/tsconfig.shared.json"
+    },
+    {
+      "path": "./.nuxt/tsconfig.node.json"
+    }
+  ]
 }

src/features/database.ts

@@ -1,7 +1,7 @@
 import { mkdir, writeFile } from 'node:fs/promises'
 import { defu } from 'defu'
 import { join } from 'pathe'
-import { addServerImportsDir, addServerScanDir, addServerTemplate, addTypeTemplate, logger } from '@nuxt/kit'
+import { addServerImportsDir, addServerScanDir, addServerTemplate, addTemplate, addTypeTemplate, logger } from '@nuxt/kit'
 import { copyDatabaseMigrationsToHubDir, copyDatabaseQueriesToHubDir } from '../runtime/database/server/utils/migrations/helpers'
 import { logWhenReady } from '../features'
 import { resolve } from '../module'
@@ -209,15 +209,23 @@ export function hubDrizzle(options) {
 }`
     }
 
-    addServerTemplate({
-      filename: '#hub/drizzle-orm',
-      getContents: () => drizzleOrmContent
+
+    // addServerTemplate({
+    //   filename: '#hub-drizzle-orm.mjs',
+    //   getContents: () => drizzleOrmContent
+    // })
+    const template = addTemplate({
+      filename: 'hub/drizzle-orm.mjs',
+      getContents: () => drizzleOrmContent,
+      write: true
     })
+    nuxt.options.nitro.alias!['#hub/drizzle-orm'] = template.dst
     addTypeTemplate({
-      filename: 'types/hub/drizzle-orm.d.ts',
-      getContents: () => drizzleOrmTypes
-    })
+      filename: 'hub/drizzle-orm.d.ts',
+      getContents: () => drizzleOrmTypes,
+    }, { nitro: true })
     addServerImportsDir(resolve('runtime/database/server/drizzle-utils'))
+    console.log(nuxt.options.nitro.alias)
   }
 }