Merge pull request #8 from modevol-com/zod

modevol-com · Dec 10, 2024 · eca5c1f · eca5c1f
2 parents 36e8cfe + a8b9087
commit eca5c1f
Show file tree

Hide file tree

Showing 12 changed files with 160 additions and 273 deletions.
diff --git a/examples/cattery-zod/package.json b/examples/cattery-zod/package.json
@@ -15,6 +15,6 @@
     "@gqloom/zod": "workspace:*",
     "graphql": "^16.8.1",
     "graphql-yoga": "^5.6.0",
-    "zod": "^3.22.4"
+    "zod": "^3.24.0"
   }
 }
diff --git a/examples/middlewares/package.json b/examples/middlewares/package.json
@@ -17,6 +17,6 @@
     "graphql": "^16.8.1",
     "graphql-yoga": "^5.6.0",
     "valibot": "1.0.0-beta.7",
-    "zod": "^3.22.4"
+    "zod": "^3.24.0"
   }
 }
diff --git a/examples/subscriptions/package.json b/examples/subscriptions/package.json
@@ -17,6 +17,6 @@
     "graphql": "^16.8.1",
     "graphql-yoga": "^5.6.0",
     "valibot": "1.0.0-beta.7",
-    "zod": "^3.22.4"
+    "zod": "^3.24.0"
   }
 }
diff --git a/packages/prisma/package.json b/packages/prisma/package.json
@@ -42,8 +42,8 @@
   "license": "MIT",
   "peerDependencies": {
     "@gqloom/core": ">= 0.5.0",
-    "prisma": ">= 5.0.0",
-    "graphql": ">= 16.8.0"
+    "graphql": ">= 16.8.0",
+    "prisma": ">= 5.0.0"
   },
   "devDependencies": {
     "@gqloom/core": "workspace:*",
@@ -53,7 +53,7 @@
     "@prisma/client": "5.20.0",
     "graphql-yoga": "^5.6.0",
     "prisma": "^5.20.0",
-    "zod": "^3.22.4"
+    "zod": "^3.24.0"
   },
   "homepage": "https://gqloom.dev/",
   "repository": {

diff --git a/packages/prisma/test/bobbin.spec.ts b/packages/prisma/test/bobbin.spec.ts
@@ -1,5 +1,5 @@
 import { type StandardSchemaV1, loom, weave } from "@gqloom/core"
-import { asInputArgs, zodSilk } from "@gqloom/zod"
+import { ZodWeaver, asInputArgs } from "@gqloom/zod"
 import { PrismaClient } from "@prisma/client"
 import { printSchema, printType } from "graphql"
 import { createYoga } from "graphql-yoga"
@@ -127,7 +127,7 @@ describe("PrismaModelBobbin", () => {
       `)
     })
 
-    it("should be able to resolve a relationField", { retry: 20 }, async () => {
+    it("should be able to resolve a relationField", async () => {
       const response = await yoga.fetch("http://localhost/graphql", {
         method: "POST",
         headers: {
@@ -155,6 +155,7 @@ describe("PrismaModelBobbin", () => {
 
       if (response.status !== 200) throw new Error("unexpected")
       const json = await response.json()
+      // if (!json?.data) return
       expect(json).toMatchObject({
         data: {
           users: [
@@ -204,17 +205,15 @@ describe("PrismaModelBobbin", () => {
 
       const r = resolver.of(g.User, {
         countUser: UserBobbin.countQuery({
-          input: zodSilk(
-            z
-              .object({
-                where: UserWhereInput,
-              })
-              .superRefine(asInputArgs())
-          ),
+          input: z
+            .object({
+              where: UserWhereInput,
+            })
+            .superRefine(asInputArgs()),
         }),
       })
 
-      const schema = weave(r)
+      const schema = weave(ZodWeaver, r)
       expect(printSchema(schema)).toMatchInlineSnapshot(`
         "type User {
           id: ID!
@@ -265,13 +264,15 @@ describe("PrismaModelBobbin", () => {
 
       const r = resolver.of(g.User, {
         findFirstUser: UserBobbin.findFirstQuery({
-          input: zodSilk.input({
-            where: UserWhereInput.optional(),
-          }),
+          input: z
+            .object({
+              where: UserWhereInput.optional(),
+            })
+            .superRefine(asInputArgs()),
         }),
       })
 
-      const schema = weave(r)
+      const schema = weave(ZodWeaver, r)
       expect(printSchema(schema)).toMatchInlineSnapshot(`
         "type User {
           id: ID!
@@ -323,13 +324,15 @@ describe("PrismaModelBobbin", () => {
 
       const r = resolver.of(g.User, {
         findManyUser: UserBobbin.findManyQuery({
-          input: zodSilk.input({
-            where: UserWhereInput.optional(),
-          }),
+          input: z
+            .object({
+              where: UserWhereInput.optional(),
+            })
+            .superRefine(asInputArgs()),
         }),
       })
 
-      const schema = weave(r)
+      const schema = weave(ZodWeaver, r)
       expect(printSchema(schema)).toMatchInlineSnapshot(`
         "type User {
           id: ID!
@@ -381,13 +384,15 @@ describe("PrismaModelBobbin", () => {
 
       const r = resolver.of(g.User, {
         findUniqueUser: UserBobbin.findUniqueQuery({
-          input: zodSilk.input({
-            where: UserWhereInput,
-          }),
+          input: z
+            .object({
+              where: UserWhereInput,
+            })
+            .superRefine(asInputArgs()),
         }),
       })
 
-      const schema = weave(r)
+      const schema = weave(ZodWeaver, r)
       expect(printSchema(schema)).toMatchInlineSnapshot(`
         "type User {
           id: ID!
@@ -439,13 +444,15 @@ describe("PrismaModelBobbin", () => {
 
       const r = resolver.of(g.User, {
         createUser: UserBobbin.createMutation({
-          input: zodSilk.input({
-            data: UserCreateInput,
-          }),
+          input: z
+            .object({
+              data: UserCreateInput,
+            })
+            .superRefine(asInputArgs()),
         }),
       })
 
-      const schema = weave(r)
+      const schema = weave(ZodWeaver, r)
       expect(printSchema(schema)).toMatchInlineSnapshot(`
         "type User {
           id: ID!
@@ -495,12 +502,14 @@ describe("PrismaModelBobbin", () => {
       })
       const r = resolver.of(g.User, {
         createManyUser: UserBobbin.createManyMutation({
-          input: zodSilk.input({
-            data: UserCreateManyInput.array(),
-          }),
+          input: z
+            .object({
+              data: UserCreateManyInput.array(),
+            })
+            .superRefine(asInputArgs()),
         }),
       })
-      const schema = weave(r)
+      const schema = weave(ZodWeaver, r)
       expect(printSchema(schema)).toMatchInlineSnapshot(`
         "type User {
           id: ID!
@@ -555,13 +564,15 @@ describe("PrismaModelBobbin", () => {
 
       const r = resolver.of(g.User, {
         deleteUser: UserBobbin.deleteMutation({
-          input: zodSilk.input({
-            where: UserDeleteInput,
-          }),
+          input: z
+            .object({
+              where: UserDeleteInput,
+            })
+            .superRefine(asInputArgs()),
         }),
       })
 
-      const schema = weave(r)
+      const schema = weave(ZodWeaver, r)
       expect(printSchema(schema)).toMatchInlineSnapshot(`
         "type User {
           id: ID!
@@ -611,13 +622,15 @@ describe("PrismaModelBobbin", () => {
 
       const r = resolver.of(g.User, {
         deleteManyUser: UserBobbin.deleteManyMutation({
-          input: zodSilk.input({
-            where: UserDeleteManyInput,
-          }),
+          input: z
+            .object({
+              where: UserDeleteManyInput,
+            })
+            .superRefine(asInputArgs()),
         }),
       })
 
-      const schema = weave(r)
+      const schema = weave(ZodWeaver, r)
       expect(printSchema(schema)).toMatchInlineSnapshot(`
         "type User {
           id: ID!
@@ -677,14 +690,16 @@ describe("PrismaModelBobbin", () => {
 
       const r = resolver.of(g.User, {
         updateUser: UserBobbin.updateMutation({
-          input: zodSilk.input({
-            data: UserUpdateInput,
-            where: UserWhereInput,
-          }),
+          input: z
+            .object({
+              data: UserUpdateInput,
+              where: UserWhereInput,
+            })
+            .superRefine(asInputArgs()),
         }),
       })
 
-      const schema = weave(r)
+      const schema = weave(ZodWeaver, r)
       expect(printSchema(schema)).toMatchInlineSnapshot(`
         "type User {
           id: ID!
@@ -744,14 +759,16 @@ describe("PrismaModelBobbin", () => {
 
       const r = resolver.of(g.User, {
         updateManyUser: UserBobbin.updateManyMutation({
-          input: zodSilk.input({
-            data: UserUpdateManyInput,
-            where: UserWhereInput,
-          }),
+          input: z
+            .object({
+              data: UserUpdateManyInput,
+              where: UserWhereInput,
+            })
+            .superRefine(asInputArgs()),
         }),
       })
 
-      const schema = weave(r)
+      const schema = weave(ZodWeaver, r)
       expect(printSchema(schema)).toMatchInlineSnapshot(`
         "type User {
           id: ID!
@@ -815,15 +832,17 @@ describe("PrismaModelBobbin", () => {
 
       const r = resolver.of(g.User, {
         upsertUser: UserBobbin.upsertMutation({
-          input: zodSilk.input({
-            where: UserWhereUniqueInput,
-            create: UserUpsertInput,
-            update: UserUpsertInput,
-          }),
+          input: z
+            .object({
+              where: UserWhereUniqueInput,
+              create: UserUpsertInput,
+              update: UserUpsertInput,
+            })
+            .superRefine(asInputArgs()),
         }),
       })
 
-      const schema = weave(r)
+      const schema = weave(ZodWeaver, r)
       expect(printSchema(schema)).toMatchInlineSnapshot(`
         "type User {
           id: ID!

diff --git a/packages/valibot/src/index.ts b/packages/valibot/src/index.ts
@@ -23,7 +23,7 @@ import {
   isNonNullType,
   isObjectType,
 } from "graphql"
-import * as v from "valibot"
+import type * as v from "valibot"
 import { type AsObjectTypeMetadata, ValibotMetadataCollector } from "./metadata"
 import type {
   EnumLike,
@@ -298,15 +298,6 @@ export class ValibotWeaver {
       )
   }
 
-  static parse<TSchema extends GenericSchemaOrAsync>(
-    this: TSchema,
-    input: unknown
-  ): Promise<v.InferOutput<TSchema>> | v.InferOutput<TSchema> {
-    return this.async
-      ? v.parseAsync(this, input)
-      : v.parse(this as v.GenericSchema, input)
-  }
-
   static getGraphQLType(schema: GenericSchemaOrAsync): GraphQLOutputType {
     return ValibotWeaver.toNullableGraphQLType(schema)
   }

diff --git a/packages/zod/CHANGELOG.md b/packages/zod/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## next (YYYY-MM-DD)
 
+* update zod version to 3.24.0 and remove unnecessary functions
+
 ## 0.5.0 (2024-12-03)
 
 * Chore: update `@standard-schema/spec` to 1.0.0-beta.4

diff --git a/packages/zod/package.json b/packages/zod/package.json
@@ -32,14 +32,14 @@
   "author": "xcfox",
   "license": "MIT",
   "peerDependencies": {
-    "graphql": ">= 16.8.0",
     "@gqloom/core": ">= 0.5.0",
-    "zod": ">= 3.0.0"
+    "graphql": ">= 16.8.0",
+    "zod": ">= 3.24.0"
   },
   "files": ["dist"],
   "devDependencies": {
     "@gqloom/core": "workspace:*",
-    "zod": "^3.22.4"
+    "zod": "^3.24.0"
   },
   "homepage": "https://gqloom.dev/",
   "repository": {