feat(drizzle): adapt Drizzle Relational API v2

examples/cattery-valibot/package.json

@@ -11,7 +11,8 @@
   "description": "",
   "devDependencies": {
     "@types/node": "^22.13.4",
-    "drizzle-kit": "^0.30.1",
+    "drizzle-kit": "1.0.0-beta.1-7946562",
+    "drizzle-orm": "1.0.0-beta.1-7946562",
     "tsx": "^4.7.2",
     "typescript": "^5.7.3"
   },
@@ -21,8 +22,8 @@
     "@gqloom/valibot": "latest",
     "@libsql/client": "^0.14.0",
     "dotenv": "^16.4.7",
-    "drizzle-orm": "^0.39.3",
     "graphql": "^16.8.1",
+    "graphql-scalars": "^1.24.1",
     "graphql-yoga": "^5.6.0",
     "valibot": "1.0.0-rc.1"
   }

examples/cattery-valibot/schema.graphql

@@ -8,12 +8,17 @@ type UsersItem {
 type CatsItem {
   id: Int!
   name: String!
-  birthday: String!
+  birthday: DateTime!
   ownerId: Int!
   age(currentYear: Int): Float!
   owner: UsersItem
 }
 
+"""
+A date-time string at UTC, such as 2007-12-03T10:15:30Z, compliant with the `date-time` format outlined in section 5.6 of the RFC 3339 profile of the ISO 8601 standard for representation of dates and times using the Gregorian calendar.
+"""
+scalar DateTime
+
 type Query {
   hello(name: String): String!
   mine: UsersItem!
@@ -22,7 +27,7 @@ type Query {
   cats(
     offset: Int
     limit: Int
-    orderBy: [CatsOrderBy!]
+    orderBy: CatsOrderBy
     where: CatsFilters
   ): [CatsItem!]!
 }
@@ -44,7 +49,9 @@ input CatsFilters {
   name: SQLiteTextFilters
   birthday: SQLiteTimestampFilters
   ownerId: SQLiteIntegerFilters
-  OR: [CatsFiltersOr!]
+  OR: [CatsFiltersNested!]
+  AND: [CatsFiltersNested!]
+  NOT: CatsFiltersNested
 }
 
 input SQLiteIntegerFilters {
@@ -54,22 +61,24 @@ input SQLiteIntegerFilters {
   lte: Int
   gt: Int
   gte: Int
-  inArray: [Int!]
-  notInArray: [Int!]
+  in: [Int!]
+  notIn: [Int!]
   isNull: Boolean
   isNotNull: Boolean
-  OR: [SQLiteIntegerFiltersOr!]
+  OR: [SQLiteIntegerFiltersNested!]
+  AND: [SQLiteIntegerFiltersNested!]
+  NOT: SQLiteIntegerFiltersNested
 }
 
-input SQLiteIntegerFiltersOr {
+input SQLiteIntegerFiltersNested {
   eq: Int
   ne: Int
   lt: Int
   lte: Int
   gt: Int
   gte: Int
-  inArray: [Int!]
-  notInArray: [Int!]
+  in: [Int!]
+  notIn: [Int!]
   isNull: Boolean
   isNotNull: Boolean
 }
@@ -85,14 +94,16 @@ input SQLiteTextFilters {
   notLike: String
   ilike: String
   notIlike: String
-  inArray: [String!]
-  notInArray: [String!]
+  in: [String!]
+  notIn: [String!]
   isNull: Boolean
   isNotNull: Boolean
-  OR: [SQLiteTextFiltersOr!]
+  OR: [SQLiteTextFiltersNested!]
+  AND: [SQLiteTextFiltersNested!]
+  NOT: SQLiteTextFiltersNested
 }
 
-input SQLiteTextFiltersOr {
+input SQLiteTextFiltersNested {
   eq: String
   ne: String
   lt: String
@@ -103,48 +114,42 @@ input SQLiteTextFiltersOr {
   notLike: String
   ilike: String
   notIlike: String
-  inArray: [String!]
-  notInArray: [String!]
+  in: [String!]
+  notIn: [String!]
   isNull: Boolean
   isNotNull: Boolean
 }
 
 input SQLiteTimestampFilters {
-  eq: String
-  ne: String
-  lt: String
-  lte: String
-  gt: String
-  gte: String
-  like: String
-  notLike: String
-  ilike: String
-  notIlike: String
-  inArray: [String!]
-  notInArray: [String!]
+  eq: DateTime
+  ne: DateTime
+  lt: DateTime
+  lte: DateTime
+  gt: DateTime
+  gte: DateTime
+  in: [DateTime!]
+  notIn: [DateTime!]
   isNull: Boolean
   isNotNull: Boolean
-  OR: [SQLiteTimestampFiltersOr!]
+  OR: [SQLiteTimestampFiltersNested!]
+  AND: [SQLiteTimestampFiltersNested!]
+  NOT: SQLiteTimestampFiltersNested
 }
 
-input SQLiteTimestampFiltersOr {
-  eq: String
-  ne: String
-  lt: String
-  lte: String
-  gt: String
-  gte: String
-  like: String
-  notLike: String
-  ilike: String
-  notIlike: String
-  inArray: [String!]
-  notInArray: [String!]
+input SQLiteTimestampFiltersNested {
+  eq: DateTime
+  ne: DateTime
+  lt: DateTime
+  lte: DateTime
+  gt: DateTime
+  gte: DateTime
+  in: [DateTime!]
+  notIn: [DateTime!]
   isNull: Boolean
   isNotNull: Boolean
 }
 
-input CatsFiltersOr {
+input CatsFiltersNested {
   id: SQLiteIntegerFilters
   name: SQLiteTextFilters
   birthday: SQLiteTimestampFilters
@@ -153,15 +158,46 @@ input CatsFiltersOr {
 
 type Mutation {
   createUser(data: CreateUserDataInput!): UsersItem!
-  createCats(values: [CreateCatsValuesInput!]!): [CatsItem!]!
+  insertCats(
+    values: [CatsInsertInput!]!
+    onConflictDoUpdate: CatsInsertOnConflictDoUpdateInput
+    onConflictDoNothing: CatsInsertOnConflictDoNothingInput
+  ): [CatsItem!]!
+  createManyCats(values: [CreateManyCatsValuesInput!]!): [CatsItem!]!
 }
 
 input CreateUserDataInput {
   name: String!
   phone: String!
 }
 
-input CreateCatsValuesInput {
+input CatsInsertInput {
+  id: Int
+  name: String!
+  birthday: DateTime!
+  ownerId: Int!
+}
+
+input CatsInsertOnConflictDoUpdateInput {
+  target: [CatsTableColumn!]!
+  set: CatsInsertInput
+  targetWhere: CatsFilters
+  setWhere: CatsFilters
+}
+
+enum CatsTableColumn {
+  id
+  name
+  birthday
+  ownerId
+}
+
+input CatsInsertOnConflictDoNothingInput {
+  target: [CatsTableColumn!]
+  where: CatsFilters
+}
+
+input CreateManyCatsValuesInput {
   name: String!
   birthday: String!
 }

examples/cattery-valibot/src/contexts/index.ts

@@ -1,16 +1,14 @@
 import { createMemoization, useContext } from "@gqloom/core/context"
-import { eq } from "drizzle-orm"
 import { GraphQLError } from "graphql"
 import type { YogaInitialContext } from "graphql-yoga"
 import { db } from "../providers"
-import { users } from "../schema"
 
 export const useCurrentUser = createMemoization(async () => {
   const phone =
     useContext<YogaInitialContext>().request.headers.get("authorization")
   if (phone == null) throw new GraphQLError("Unauthorized")
 
-  const user = await db.query.users.findFirst({ where: eq(users.phone, phone) })
+  const user = await db.query.users.findFirst({ where: { phone } })
   if (user == null) throw new GraphQLError("Unauthorized")
   return user
 })

examples/cattery-valibot/src/index.ts

@@ -1,10 +1,40 @@
 import { createServer } from "node:http"
-import { weave } from "@gqloom/core"
+import { type Middleware, weave } from "@gqloom/core"
+import { asyncContextProvider } from "@gqloom/core/context"
 import { ValibotWeaver } from "@gqloom/valibot"
+import { GraphQLDateTime, GraphQLJSONObject } from "graphql-scalars"
 import { createYoga } from "graphql-yoga"
 import { resolvers } from "./resolvers"
 
-const schema = weave(asyncContextProvider, ValibotWeaver, ...resolvers)
+const exceptionFilter: Middleware = async (next) => {
+  try {
+    return await next()
+  } catch (error) {
+    // biome-ignore lint/suspicious/noConsole: log error
+    console.error(error)
+    if (error instanceof Error) {
+      throw new GraphQLError(error.message)
+    }
+    throw new GraphQLError("There has been something wrong...")
+  }
+}
+
+const schema = weave(
+  asyncContextProvider,
+  ValibotWeaver,
+  ...resolvers,
+  exceptionFilter,
+  DrizzleWeaver.config({
+    presetGraphQLType(column) {
+      if (column.dataType === "date") {
+        return GraphQLDateTime
+      }
+      if (column.dataType === "json") {
+        return GraphQLJSONObject
+      }
+    },
+  })
+)
 
 const yoga = createYoga({ schema })
 createServer(yoga).listen(4000, () => {
@@ -13,8 +43,8 @@ createServer(yoga).listen(4000, () => {
 
 import * as fs from "fs"
 import * as path from "path"
-import { asyncContextProvider } from "@gqloom/core/context"
-import { printSchema } from "graphql"
+import { DrizzleWeaver } from "@gqloom/drizzle"
+import { GraphQLError, printSchema } from "graphql"
 if (process.env.NODE_ENV !== "production") {
   fs.writeFileSync(
     path.resolve(__dirname, "../schema.graphql"),

examples/cattery-valibot/src/providers/index.ts

@@ -1,6 +1,6 @@
 import { drizzle } from "drizzle-orm/libsql"
-import * as schema from "../schema"
+import { relations } from "../schema/relations"
 
 export const db = drizzle(process.env.DB_FILE_NAME ?? "file:local.db", {
-  schema,
+  relations,
 })

examples/cattery-valibot/src/resolvers/cat.ts

@@ -5,7 +5,7 @@ import { useCurrentUser } from "../contexts"
 import { db } from "../providers"
 import { cats } from "../schema"
 
-const catResolverFactory = drizzleResolverFactory(db, "cats")
+const catResolverFactory = drizzleResolverFactory(db, cats)
 
 export const catResolver = resolver.of(cats, {
   cats: catResolverFactory.selectArrayQuery(),
@@ -23,7 +23,9 @@ export const catResolver = resolver.of(cats, {
 
   owner: catResolverFactory.relationField("owner"),
 
-  createCats: catResolverFactory.insertArrayMutation({
+  insertCats: catResolverFactory.insertArrayMutation(),
+
+  createManyCats: catResolverFactory.insertArrayMutation({
     input: v.pipeAsync(
       v.objectAsync({
         values: v.arrayAsync(

examples/cattery-valibot/src/resolvers/user.ts

@@ -1,12 +1,11 @@
 import { mutation, query, resolver } from "@gqloom/core"
 import { drizzleResolverFactory } from "@gqloom/drizzle"
-import { eq } from "drizzle-orm"
 import * as v from "valibot"
 import { useCurrentUser } from "../contexts"
 import { db } from "../providers"
 import { users } from "../schema"
 
-const userResolverFactory = drizzleResolverFactory(db, "users")
+const userResolverFactory = drizzleResolverFactory(db, users)
 
 export const userResolver = resolver.of(users, {
   cats: userResolverFactory.relationField("cats"),
@@ -15,19 +14,11 @@ export const userResolver = resolver.of(users, {
 
   usersByName: query(users.$list())
     .input({ name: v.string() })
-    .resolve(({ name }) => {
-      return db.query.users.findMany({
-        where: eq(users.name, name),
-      })
-    }),
+    .resolve(({ name }) => db.query.users.findMany({ where: { name } })),
 
   userByPhone: query(users.$nullable())
     .input({ phone: v.string() })
-    .resolve(({ phone }) => {
-      return db.query.users.findFirst({
-        where: eq(users.phone, phone),
-      })
-    }),
+    .resolve(({ phone }) => db.query.users.findFirst({ where: { phone } })),
 
   createUser: mutation(users)
     .input({

examples/cattery-valibot/src/schema/index.ts

@@ -1,5 +1,4 @@
 import { drizzleSilk } from "@gqloom/drizzle"
-import { relations } from "drizzle-orm"
 import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core"
 
 export const users = drizzleSilk(
@@ -10,10 +9,6 @@ export const users = drizzleSilk(
   })
 )
 
-export const usersRelations = relations(users, ({ many }) => ({
-  cats: many(cats),
-}))
-
 export const cats = drizzleSilk(
   sqliteTable("cats", {
     id: integer().primaryKey({ autoIncrement: true }),
@@ -24,10 +19,3 @@ export const cats = drizzleSilk(
       .references(() => users.id),
   })
 )
-
-export const catsRelations = relations(cats, ({ one }) => ({
-  owner: one(users, {
-    fields: [cats.ownerId],
-    references: [users.id],
-  }),
-}))