fix: hot reload client types (#10)

* fix: update version to 0.3.2, remove unused GraphQL queries and mutations, and refactor type generation functions for improved clarity and functionality

* refactor: rename 'defs' to 'schemas' for consistency and clarity, update related imports and type generation logic

Author: productdevbook

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "packageManager": "pnpm@10.13.1",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",

playground/client/mutations.graphql

@@ -0,0 +1,3 @@
+query GetUsers {
+  hello
+}

playground/client/queries.graphql

@@ -0,0 +1,27 @@
+// THIS FILE IS GENERATED, DO NOT EDIT!
+/* eslint-disable eslint-comments/no-unlimited-disable */
+/* tslint:disable */
+/* eslint-disable */
+/* prettier-ignore */
+import type * as Types from '#graphql/client';
+
+export type GetUsersQueryVariables = Types.Exact<{ [key: string]: never; }>;
+
+
+export type GetUsersQuery = { __typename?: 'Query', hello: string };
+
+
+export const GetUsersDocument = /*#__PURE__*/ `
+    query GetUsers {
+  hello
+}
+    `;
+export type Requester<C = {}> = <R, V>(doc: string, vars?: V, options?: C) => Promise<R> | AsyncIterable<R>
+export function getSdk<C>(requester: Requester<C>) {
+  return {
+    GetUsers(variables?: Types.GetUsersQueryVariables, options?: C): Promise<Types.GetUsersQuery> {
+      return requester<Types.GetUsersQuery, Types.GetUsersQueryVariables>(GetUsersDocument, variables, options) as Promise<Types.GetUsersQuery>;
+    }
+  };
+}
+export type Sdk = ReturnType<typeof getSdk>;

playground/graphql/queries.graphql

@@ -3,13 +3,13 @@ import type { NitroGraphQLOptions } from './types'
 import { existsSync, mkdirSync, writeFileSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'
 import { watch } from 'chokidar'
-import consola from 'consola'
 
+import consola from 'consola'
 import defu from 'defu'
 import { defineNitroModule } from 'nitropack/kit'
-import { dirname, join, resolve } from 'pathe'
+import { dirname, join, relative, resolve } from 'pathe'
 import { rollupConfig } from './rollup'
-import { relativeWithDot, scanDefs, scanResolvers } from './utils'
+import { relativeWithDot, scanDocs, scanResolvers, scanSchemas } from './utils'
 import { clientTypeGeneration, serverTypeGeneration } from './utils/server-type-generation'
 
 export type * from './types'
@@ -28,6 +28,11 @@ export default defineNitroModule({
       watchDirs: [],
       clientDir: '',
       serverDir: resolve(nitro.options.srcDir, 'graphql'),
+      dir: {
+        build: relative(nitro.options.rootDir, nitro.options.buildDir),
+        client: 'graphql',
+        server: 'server',
+      },
     }
 
     nitro.hooks.hook('rollup:before', (nitro, rollupConfig) => {
@@ -68,6 +73,11 @@ export default defineNitroModule({
       case 'nuxt':
         watchDirs.push(join(nitro.options.rootDir, 'app', 'graphql'))
         nitro.graphql.clientDir = resolve(nitro.options.rootDir, 'app', 'graphql')
+        nitro.graphql.dir.client = 'app/graphql'
+        break
+      case 'nitro':
+        nitro.graphql.clientDir = resolve(nitro.options.rootDir, 'graphql')
+        nitro.graphql.dir.client = 'graphql'
         break
       default:
     }
@@ -78,7 +88,7 @@ export default defineNitroModule({
       ignored: nitro.options.ignore,
     }).on('all', async (event, path) => {
       if (path.endsWith('.graphql') || path.endsWith('.gql')) {
-        await clientTypeGeneration(nitro, path)
+        await clientTypeGeneration(nitro)
       }
     })
 
@@ -93,29 +103,35 @@ export default defineNitroModule({
     const tsconfigDir = dirname(tsConfigPath)
     const typesDir = resolve(nitro.options.buildDir, 'types')
 
-    const defs = await scanDefs(nitro)
-    nitro.scanDefs = defs
+    const schemas = await scanSchemas(nitro)
+    nitro.scanSchemas = schemas
+
+    const docs = await scanDocs(nitro)
+    nitro.scanDocuments = docs
 
     const resolvers = await scanResolvers(nitro)
     nitro.scanResolvers = resolvers
 
     nitro.hooks.hook('dev:start', async () => {
-      const defs = await scanDefs(nitro)
-      nitro.scanDefs = defs
+      const schemas = await scanSchemas(nitro)
+      nitro.scanSchemas = schemas
 
       const resolvers = await scanResolvers(nitro)
       nitro.scanResolvers = resolvers
+
+      const docs = await scanDocs(nitro)
+      nitro.scanDocuments = docs
     })
 
     await rollupConfig(nitro)
 
     // Generate server and client types
     await serverTypeGeneration(nitro)
-    await clientTypeGeneration(nitro, nitro.graphql.clientDir)
+    await clientTypeGeneration(nitro)
 
     nitro.hooks.hook('close', async () => {
       await serverTypeGeneration(nitro)
-      await clientTypeGeneration(nitro, nitro.graphql.clientDir)
+      await clientTypeGeneration(nitro)
     })
 
     const runtime = fileURLToPath(
@@ -182,7 +198,7 @@ export default defineNitroModule({
             return 'schemas'
           }
 
-          // resolsvers and defs are not in the same directory, so we need to check both
+          // resolsvers and schemas are not in the same directory, so we need to check both
           if (id.endsWith('.resolver.ts')) {
             return 'resolvers'
           }

playground/graphql/sdk.ts

@@ -5,10 +5,10 @@ import { parse } from 'graphql'
 import { genImport } from 'knitwork'
 import { resolve } from 'pathe'
 import { getImportId, scanGraphql } from './utils'
-import { serverTypeGeneration } from './utils/server-type-generation'
+import { clientTypeGeneration, serverTypeGeneration } from './utils/server-type-generation'
 
 export async function rollupConfig(app: Nitro) {
-  virtualDefs(app)
+  virtualSchemas(app)
   virtualResolvers(app)
   getGraphQLConfig(app)
   app.hooks.hook('rollup:before', (nitro, rollupConfig) => {
@@ -40,9 +40,8 @@ export async function rollupConfig(app: Nitro) {
             return `export default ${JSON.stringify(content)}`
           }
           catch (error) {
-            // Dosya okuma hatası vs
             if ((error as any).code === 'ENOENT') {
-              return null // Dosya bulunamazsa sessizce geç
+              return null
             }
             this.error(`Failed to read GraphQL file ${id}: ${(error as any).message}`)
           }
@@ -77,29 +76,30 @@ export async function rollupConfig(app: Nitro) {
 
   app.hooks.hook('dev:reload', async () => {
     await serverTypeGeneration(app)
+    await clientTypeGeneration(app)
   })
 }
 
-export function virtualDefs(app: Nitro) {
-  const getDefs = () => {
-    const defs: string[] = [
-      ...app.scanDefs,
+export function virtualSchemas(app: Nitro) {
+  const getSchemas = () => {
+    const schemas: string[] = [
+      ...app.scanSchemas,
       ...(app.options.graphql?.typedefs ?? []),
     ]
 
-    return defs
+    return schemas
   }
 
   app.options.virtual ??= {}
-  app.options.virtual['#nitro-internal-virtual/server-defs'] = () => {
-    const imports = getDefs()
+  app.options.virtual['#nitro-internal-virtual/server-schemas'] = () => {
+    const imports = getSchemas()
 
     const code = /* js */`
 ${imports
   .map(handler => `import ${getImportId(handler)} from '${handler}';`)
   .join('\n')}
 
-export const defs = [
+export const schemas = [
 ${imports
   .map(
     h =>

src/index.ts

@@ -1,7 +1,7 @@
 import type { BaseContext } from '@apollo/server'
 import { importedConfig } from '#nitro-internal-virtual/graphql-config'
-import { defs } from '#nitro-internal-virtual/server-defs'
 import { resolvers } from '#nitro-internal-virtual/server-resolvers'
+import { schemas } from '#nitro-internal-virtual/server-schemas'
 import { ApolloServer } from '@apollo/server'
 import { ApolloServerPluginLandingPageLocalDefault } from '@apollo/server/plugin/landingPage/default'
 // TODO: fix bug
@@ -12,8 +12,8 @@ import { startServerAndCreateH3Handler } from '../utils/apollo'
 
 function createMergedSchema() {
   try {
-    const mergedDefs = defs.map(schema => schema.def).join('\n\n')
-    const typeDefs = mergeTypeDefs([mergedDefs])
+    const mergedSchemas = schemas.map(schema => schema.def).join('\n\n')
+    const typeDefs = mergeTypeDefs([mergedSchemas])
     const mergedResolvers = mergeResolvers(resolvers.map(r => r.resolver))
 
     return {
@@ -27,7 +27,7 @@ function createMergedSchema() {
   }
 }
 
-let apolloServer: ApolloServer<BaseContext>
+let apolloServer: ApolloServer<BaseContext> | null = null
 
 function createApolloServer() {
   if (!apolloServer) {
@@ -45,6 +45,9 @@ function createApolloServer() {
   return apolloServer
 }
 
-export default startServerAndCreateH3Handler(createApolloServer, {
-  context: async event => ({ event }),
-})
+export default startServerAndCreateH3Handler(
+  apolloServer || createApolloServer,
+  {
+    context: async event => ({ event }),
+  },
+)

src/rollup.ts

@@ -1,8 +1,8 @@
 import type { YogaServerInstance } from 'graphql-yoga'
 import { importedConfig } from '#nitro-internal-virtual/graphql-config'
 
-import { defs } from '#nitro-internal-virtual/server-defs'
 import { resolvers } from '#nitro-internal-virtual/server-resolvers'
+import { schemas } from '#nitro-internal-virtual/server-schemas'
 
 import { mergeResolvers, mergeTypeDefs } from '@graphql-tools/merge'
 import defu from 'defu'
@@ -39,8 +39,8 @@ new window.EmbeddedSandbox({
 // Schema ve yoga instance'ını build time'da oluştur
 function createMergedSchema() {
   try {
-    const mergedDefs = defs.map(schema => schema.def).join('\n\n')
-    const typeDefs = mergeTypeDefs([mergedDefs])
+    const mergedSchemas = schemas.map(schema => schema.def).join('\n\n')
+    const typeDefs = mergeTypeDefs([mergedSchemas])
     const mergedResolvers = mergeResolvers(resolvers.map(r => r.resolver))
 
     return createSchema({

src/routes/apollo-server.ts

@@ -22,13 +22,19 @@ export interface GenImport {
 
 declare module 'nitropack/types' {
   interface Nitro {
-    scanDefs: string[]
+    scanSchemas: string[]
+    scanDocuments: string[]
     scanResolvers: GenImport[]
     graphql: {
       buildDir: string
       watchDirs: string[]
       clientDir: string
       serverDir: string
+      dir: {
+        build: string
+        client: string
+        server: string
+      }
     }
   }
 }