feat: update import paths for GraphQL types and enhance resolver context handling

productdevbook · productdevbook · commit af53be02055d · 2025-07-13T15:15:05.000+03:00
diff --git a/README.md b/README.md
@@ -173,7 +173,7 @@ The module automatically generates TypeScript types from your GraphQL schema:
 These types are automatically available in your resolvers:
 
 ```ts
-import type { QueryResolvers } from '#build/graphql-types.generated'
+import type { QueryResolvers } from '#graphql/server'
 // server/graphql/users/user-queries.ts
 import { defineResolver } from 'nitro-graphql'
 
diff --git a/playground-nuxt/server/graphql/todos/todo-mutations.resolver.ts b/playground-nuxt/server/graphql/todos/todo-mutations.resolver.ts
@@ -1,4 +1,4 @@
-import type { Todo } from '#build/graphql-types.generated'
+import type { Todo } from '#graphql/server'
 
 export default defineResolver({
   Mutation: {
diff --git a/playground-nuxt/server/graphql/users/user-queries.resolver.ts b/playground-nuxt/server/graphql/users/user-queries.resolver.ts
@@ -1,4 +1,4 @@
-import type { User } from '#build/graphql-types.generated'
+import type { User } from '#graphql/server'
 
 // Mock database
 const users: User[] = [
diff --git a/playground/server/graphql/todos/todo-mutations.resolver.ts b/playground/server/graphql/todos/todo-mutations.resolver.ts
@@ -1,4 +1,4 @@
-import type { Todo } from '#build/graphql-types.generated'
+import type { Todo } from '#graphql/server'
 
 export default defineResolver({
   Mutation: {
diff --git a/playground/server/graphql/todos/todo-queries.resolver.ts b/playground/server/graphql/todos/todo-queries.resolver.ts
@@ -1,6 +1,6 @@
 export default defineResolver({
   Query: {
-    todos: async (_parent, _args, { storage }) => {
+    todos: async (_parent, _args, context) => {
       // const todos = await storage.getItem('todos') || []
       return [{
         id: '1',
@@ -10,8 +10,8 @@ export default defineResolver({
       }]
     },
 
-    todo: async (_parent, { id }, { storage }) => {
-      const todos = await storage.getItem('todos') || []
+    todo: async (_parent, { id }, context) => {
+      const todos = []
       return todos.find((todo: any) => todo.id === id) || null
     },
   },
diff --git a/playground/server/graphql/users/user-queries.resolver.ts b/playground/server/graphql/users/user-queries.resolver.ts
@@ -1,4 +1,4 @@
-import type { User } from '#build/graphql-types.generated'
+import type { User } from '#graphql/server'
 
 // Mock database
 const users: User[] = [
diff --git a/playground/server/routes/index.ts b/playground/server/routes/index.ts
@@ -1,4 +1,4 @@
-export default defineEventHandler(() => {
+export default defineEventHandler((event) => {
   return `
     <!DOCTYPE html>
     <html>
diff --git a/src/codegen.ts b/src/codegen.ts
@@ -57,7 +57,7 @@ export async function generateTypes(
     },
     defaultScalarType: 'unknown',
     defaultMapper: `ResolverReturnType<{T}>`,
-    contextType: './context#GraphQLContext',
+    contextType: 'h3#H3Event',
     maybeValue: 'T | null | undefined',
     inputMaybeValue: 'T | undefined',
     enumsAsTypes: true,
diff --git a/src/index.ts b/src/index.ts
@@ -18,6 +18,7 @@ export default defineNitroModule({
       buildDir: '',
       watchDirs: [],
       clientDir: '',
+      serverDir: resolve(nitro.options.srcDir, 'graphql'),
     }
 
     nitro.options.runtimeConfig.graphql = defu(nitro.options.runtimeConfig.graphql || {}, {
diff --git a/src/routes/graphql.ts b/src/routes/graphql.ts
@@ -1,10 +1,10 @@
 import type { YogaServerInstance } from 'graphql-yoga'
 import { defs } from '#nitro-internal-virtual/server-defs'
-import { resolvers } from '#nitro-internal-virtual/server-resolvers'
 
+import { resolvers } from '#nitro-internal-virtual/server-resolvers'
 import { mergeResolvers, mergeTypeDefs } from '@graphql-tools/merge'
 import { createSchema, createYoga } from 'graphql-yoga'
-import { defineEventHandler } from 'h3'
+import { defineEventHandler, toWebRequest } from 'h3'
 // TODO: https://github.com/nitrojs/nitro/issues/3403 if used import this error.
 // import { createMergedSchema } from 'nitro-graphql/internal'
 
@@ -64,6 +64,8 @@ export default defineEventHandler(async (event) => {
       renderGraphiQL: () => apolloSandboxHtml,
     })
   }
+  const request = toWebRequest(event)
+  const response = await yoga.handleRequest(request, event as any)
 
-  return yoga.handle(event.node.req, event.node.res)
+  return new Response(response.body, response)
 })
diff --git a/src/types.ts b/src/types.ts
@@ -15,6 +15,7 @@ declare module 'nitropack/types' {
       buildDir: string
       watchDirs: string[]
       clientDir: string
+      serverDir: string
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { Todo } from '#build/graphql-types.generated'`
	`1`	`+import type { Todo } from '#graphql/server'`
`2`	`2`
`3`	`3`	`export default defineResolver({`
`4`	`4`	`Mutation: {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { User } from '#build/graphql-types.generated'`
	`1`	`+import type { User } from '#graphql/server'`
`2`	`2`
`3`	`3`	`// Mock database`
`4`	`4`	`const users: User[] = [`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export default defineEventHandler(() => {`
	`1`	`+export default defineEventHandler((event) => {`
`2`	`2`	return `
`3`	`3`	`<!DOCTYPE html>`
`4`	`4`	`<html>`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ export default defineNitroModule({`
`18`	`18`	`buildDir: '',`
`19`	`19`	`watchDirs: [],`
`20`	`20`	`clientDir: '',`
	`21`	`+ serverDir: resolve(nitro.options.srcDir, 'graphql'),`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`nitro.options.runtimeConfig.graphql = defu(nitro.options.runtimeConfig.graphql \|\| {}, {`