feat: upgrade to drizzle-orm 1.0.0-beta

nuxt.config.ts

@@ -35,7 +35,6 @@ export default defineNuxtConfig({
     viewTransition: true,
     scanPageMeta: true,
     granularCachedData: true,
-    typescriptPlugin: true,
     viteEnvironmentApi: true
   },
 

package.json

@@ -14,6 +14,7 @@
     "update:all": "taze -I -l latest",
     "update:newest": "taze -I -l newest",
     "db:generate": "drizzle-kit generate",
+    "db:drizzle": "drizzle-kit",
     "db:migrate": "tsx ./tools/migrate.ts",
     "db:migrate:local": "tsx --env-file=.env ./tools/migrate.ts",
     "db:seed": "tsx ./tools/seed.ts",
@@ -25,7 +26,6 @@
   "dependencies": {
     "@nuxt/hints": "1.0.0-alpha.3",
     "date-fns": "4.1.0",
-    "drizzle-orm": "0.45.0",
     "modern-normalize": "3.0.1",
     "nuxt": "4.2.1",
     "ulid": "3.0.2",
@@ -40,8 +40,9 @@
     "@types/ws": "8.18.1",
     "@vueuse/core": "14.1.0",
     "consola": "3.4.2",
-    "drizzle-kit": "0.31.8",
-    "drizzle-seed": "0.3.1",
+    "drizzle-kit": "1.0.0-beta.2-b782ae1",
+    "drizzle-orm": "1.0.0-beta.2-b782ae1",
+    "drizzle-seed": "1.0.0-beta.2-b782ae1",
     "husky": "9.1.7",
     "sass": "1.94.2",
     "taze": "19.9.2",

server/api/checklists/[checklistId]/index.get.ts

@@ -17,10 +17,10 @@ export default defineEventHandler(async (event) : Promise<ReturnData> => {
         name: true
       },
 
-      where: and(
-        eq(tables.checklists.userId, userId),
-        eq(tables.checklists.id, checklistId)
-      )
+      where: {
+        userId,
+        id: checklistId
+      }
     })
 
   if (result === undefined) {

server/api/checklists/[checklistId]/items/index.post.ts

@@ -1,6 +1,16 @@
-import { eq } from 'drizzle-orm'
 import * as v from 'valibot'
 
+interface ReturnEquipment {
+  id: number;
+  name: string;
+  weight: number;
+}
+
+interface ReturnData {
+  id: number;
+  equipment: ReturnEquipment;
+}
+
 const bodySchema = v.object({
   equipmentId: idValidatorNumber
 })
@@ -9,7 +19,7 @@ function validateBody(body: unknown) {
   return v.parse(bodySchema, body)
 }
 
-export default defineEventHandler(async (event) => {
+export default defineEventHandler(async (event) : Promise<ReturnData | undefined> => {
   const { db } = event.context
 
   await validateSessionUser(event)
@@ -37,7 +47,9 @@ export default defineEventHandler(async (event) => {
     }
 
     const insertedItem = await db.query.checklistItems.findFirst({
-      where: eq(tables.checklistItems.id, foundItem.itemId),
+      where: {
+        id: foundItem.itemId
+      },
 
       columns: {
         id: true

server/api/checklists/index.get.ts

@@ -1,5 +1,3 @@
-import { desc, eq } from 'drizzle-orm'
-
 interface ReturnData {
   readonly id: string;
   readonly name: string;
@@ -15,8 +13,14 @@ export default defineEventHandler(async (event) : Promise<ReturnData[]> => {
         name: true
       },
 
-      orderBy: [desc(tables.checklists.createdAt)],
-      where: eq(tables.checklists.userId, userId),
+      orderBy: {
+        createdAt: 'desc'
+      },
+
+      where: {
+        userId
+      },
+
       limit: 100
     })
 

server/api/search/brands.get.ts

@@ -1,5 +1,3 @@
-import { asc, ilike } from 'drizzle-orm'
-
 interface ReturnType {
   id: number
   name: string
@@ -18,8 +16,16 @@ export default defineEventHandler(async (event) : Promise<ReturnType[]> => {
       name: true
     },
 
-    where: ilike(tables.brands.name, `%${search}%`),
-    orderBy: asc(tables.brands.name),
+    where: {
+      name: {
+        ilike: `%${search}%`
+      }
+    },
+
+    orderBy: {
+      name: 'asc'
+    },
+
     limit: 10
   })
 

server/api/search/equipment.get.ts

@@ -47,8 +47,15 @@ export default defineEventHandler(async (event) : Promise<ReturnData[]> => {
 
   const result = await event.context.db.query.equipment
     .findMany({
-      orderBy: [asc(tables.equipment.name)],
-      where: like(tables.equipment.name, `%${searchString}%`),
+      orderBy: {
+        name: 'asc'
+      },
+      where: {
+        name: {
+          like: `%${searchString}%`
+        }
+      },
+
       limit: 100
     })
 

server/database/relations.ts

@@ -0,0 +1,103 @@
+import { defineRelations } from 'drizzle-orm'
+import * as schema from './schema'
+
+export const relations = defineRelations(schema, (r) => ({
+  users: {
+    equipment: r.many.equipment({
+      from: r.users.id,
+      to: r.equipment.creatorId
+    }),
+
+    userEquipment: r.many.userEquipment({
+      from: r.users.id,
+      to: r.userEquipment.userId
+    }),
+
+    checklists: r.many.checklists({
+      from: r.users.id,
+      to: r.checklists.userId
+    }),
+
+    oauthAccounts: r.many.oauthAccounts({
+      from: r.users.id,
+      to: r.oauthAccounts.userId
+    })
+  },
+
+  oauthProviders: {
+    oauthAccounts: r.many.oauthAccounts({
+      from: r.oauthProviders.id,
+      to: r.oauthAccounts.providerId
+    })
+  },
+
+  equipmentTypes: {
+    equipment: r.many.equipment({
+      from: r.equipmentTypes.id,
+      to: r.equipment.equipmentTypeId
+    }),
+
+    equipmentTypeAttributes: r.many.equipmentTypeAttributes({
+      from: r.equipmentTypes.id,
+      to: r.equipmentTypeAttributes.equipmentTypeId
+    })
+  },
+
+  equipmentGroups: {
+    equipment: r.many.equipment({
+      from: r.equipmentGroups.id,
+      to: r.equipment.equipmentGroupId
+    })
+  },
+
+  brands: {
+    equipment: r.many.equipment({
+      from: r.brands.id,
+      to: r.equipment.brandId
+    })
+  },
+
+  equipment: {
+    userEquipment: r.many.userEquipment({
+      from: r.equipment.id,
+      to: r.userEquipment.equipmentId
+    }),
+
+    checklistItems: r.many.checklistItems({
+      from: r.equipment.id,
+      to: r.checklistItems.equipmentId
+    }),
+
+    equipmentAttributeValues: r.many.equipmentAttributeValues({
+      from: r.equipment.id,
+      to: r.equipmentAttributeValues.equipmentId
+    })
+  },
+
+  equipmentAttributes: {
+    equipmentTypeAttributes: r.many.equipmentTypeAttributes({
+      from: r.equipmentAttributes.id,
+      to: r.equipmentTypeAttributes.equipmentAttributeId
+    }),
+
+    equipmentAttributeValues: r.many.equipmentAttributeValues({
+      from: r.equipmentAttributes.id,
+      to: r.equipmentAttributeValues.equipmentAttributeId
+    })
+  },
+
+  checklists: {
+    checklistItems: r.many.checklistItems({
+      from: r.checklists.id,
+      to: r.checklistItems.checklistId
+    })
+  },
+
+  checklistItems: {
+    equipment: r.one.equipment({
+      from: r.checklistItems.equipmentId,
+      to: r.equipment.id,
+      optional: false
+    })
+  }
+}))

server/database/schema.ts

@@ -1,4 +1,4 @@
-import { relations, sql } from 'drizzle-orm'
+import { sql } from 'drizzle-orm'
 import { limits } from '../../constants'
 
 import {
@@ -519,131 +519,3 @@ export const checklistItems = pgTable('checklistItems', {
 }, (table) => [
   unique().on(table.checklistId, table.equipmentId)
 ])
-
-/**
- * Relations
- */
-
-export const usersRelations = relations(users, ({ many }) => ({
-  equipment: many(equipment),
-  userEquipment: many(userEquipment),
-  checklists: many(checklists),
-  oauthAccounts: many(oauthAccounts)
-}))
-
-export const oauthProvidersRelations = relations(oauthProviders, ({ many }) => ({
-  oauthAccounts: many(oauthAccounts)
-}))
-
-export const equipmentTypesRelations = relations(equipmentTypes, ({ many }) => ({
-  equipment: many(equipment),
-  equipmentTypeAttributes: many(equipmentTypeAttributes)
-}))
-
-export const equipmentGroupsRelations = relations(equipmentGroups, ({ many }) => ({
-  equipment: many(equipment)
-}))
-
-export const brandsRelations = relations(brands, ({ many }) => ({
-  equipment: many(equipment)
-}))
-
-export const equipmentRelations = relations(equipment, ({ many, one }) => ({
-  userEquipment: many(userEquipment),
-  checklistItems: many(checklistItems),
-  equipmentAttributeValues: many(equipmentAttributeValues),
-
-  equipmentType: one(equipmentTypes, {
-    fields: [equipment.equipmentTypeId],
-    references: [equipmentTypes.id]
-  }),
-
-  equipmentGroup: one(equipmentGroups, {
-    fields: [equipment.equipmentGroupId],
-    references: [equipmentGroups.id]
-  }),
-
-  creatorId: one(users, {
-    fields: [equipment.creatorId],
-    references: [users.id]
-  }),
-
-  brand: one(brands, {
-    fields: [equipment.brandId],
-    references: [brands.id]
-  })
-}))
-
-export const equipmentAttributesRelations = relations(equipmentAttributes, ({ many }) => ({
-  equipmentTypeAttributes: many(equipmentTypeAttributes),
-  equipmentAttributeValues: many(equipmentAttributeValues)
-}))
-
-export const equipmentTypeAttributesRelations = relations(equipmentTypeAttributes, ({ one }) => ({
-  equipmentType: one(equipmentTypes, {
-    fields: [equipmentTypeAttributes.equipmentTypeId],
-    references: [equipmentTypes.id]
-  }),
-
-  equipmentAttribute: one(equipmentAttributes, {
-    fields: [equipmentTypeAttributes.equipmentAttributeId],
-    references: [equipmentAttributes.id]
-  })
-}))
-
-export const equipmentAttributeValuesRelations = relations(equipmentAttributeValues, ({ one }) => ({
-  equipment: one(equipment, {
-    fields: [equipmentAttributeValues.equipmentId],
-    references: [equipment.id]
-  }),
-
-  equipmentAttribute: one(equipmentAttributes, {
-    fields: [equipmentAttributeValues.equipmentAttributeId],
-    references: [equipmentAttributes.id]
-  })
-}))
-
-export const oauthAccountsRelations = relations(oauthAccounts, ({ one }) => ({
-  user: one(users, {
-    fields: [oauthAccounts.userId],
-    references: [users.id]
-  }),
-
-  provider: one(oauthProviders, {
-    fields: [oauthAccounts.providerId],
-    references: [oauthProviders.id]
-  })
-}))
-
-export const userEquipmentRelations = relations(userEquipment, ({ one }) => ({
-  user: one(users, {
-    fields: [userEquipment.userId],
-    references: [users.id]
-  }),
-
-  equipment: one(equipment, {
-    fields: [userEquipment.equipmentId],
-    references: [equipment.id]
-  })
-}))
-
-export const checklistsRelations = relations(checklists, ({ many, one }) => ({
-  checklistItems: many(checklistItems),
-
-  user: one(users, {
-    fields: [checklists.userId],
-    references: [users.id]
-  })
-}))
-
-export const checklistItemsRelations = relations(checklistItems, ({ one }) => ({
-  checklists: one(checklists, {
-    fields: [checklistItems.checklistId],
-    references: [checklists.id]
-  }),
-
-  equipment: one(equipment, {
-    fields: [checklistItems.equipmentId],
-    references: [equipment.id]
-  })
-}))