feat: enhance client type generation by merging server scalars into client config and improve error logging

productdevbook · productdevbook · commit a761808971ed · 2026-01-09T20:45:39.000+03:00
diff --git a/src/core/codegen/client.ts b/src/core/codegen/client.ts
@@ -18,6 +18,7 @@ import { plugin as typescriptPlugin } from '@graphql-codegen/typescript'
 import { plugin as typescriptGenericSdk } from '@graphql-codegen/typescript-generic-sdk'
 import { plugin as typescriptOperations } from '@graphql-codegen/typescript-operations'
 import { printSchemaWithDirectives } from '@graphql-tools/utils'
+import consola from 'consola'
 import { defu } from 'defu'
 import { Kind, parse } from 'graphql'
 import { DEFAULT_GRAPHQL_SCALARS } from '../constants'
@@ -194,7 +195,9 @@ export async function generateClientTypesCore(
       sdk: sdkContent,
     }
   }
-  catch {
+  catch (error) {
+    // Log codegen errors - these are usually configuration issues like missing scalar definitions
+    consola.error('[nitro-graphql] Client type generation failed:', (error as Error).message)
     return false
   }
 }
diff --git a/src/nitro/codegen.ts b/src/nitro/codegen.ts
@@ -167,16 +167,26 @@ async function generateMainClientTypes(
   // Read schema as string to avoid graphql instance mismatch
   const schemaString = readFileSync(schemaPath, 'utf-8')
 
+  // Merge server scalars into client config if client scalars not explicitly set
+  // This ensures custom scalars defined for server types are also available for client types
+  const serverScalars = nitro.options.graphql?.codegen?.server?.scalars
+  const clientConfig = nitro.options.graphql?.codegen?.client || {}
+  const mergedClientConfig = {
+    ...clientConfig,
+    scalars: clientConfig.scalars ?? serverScalars,
+  }
+
   const types = await generateClientTypesCore({
     schemaString,
     documents: docs,
-    config: nitro.options.graphql?.codegen?.client as any,
+    config: mergedClientConfig as any,
     sdkConfig: nitro.options.graphql?.codegen?.clientSDK as any,
     options,
   })
 
-  if (types === false)
+  if (types === false) {
     return
+  }
 
   const placeholders = getDefaultPaths(nitro)
   const typesConfig = getTypesConfig(nitro)
@@ -185,6 +195,7 @@ async function generateMainClientTypes(
 
   // Write client types
   const clientPath = resolveFilePath(typesConfig.client, typesConfig.enabled, true, '{typesDir}/nitro-graphql-client.d.ts', placeholders)
+
   if (clientPath) {
     writeFile(clientPath, types.types)
     if (!options.silent)

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import { plugin as typescriptPlugin } from '@graphql-codegen/typescript'`
`18`	`18`	`import { plugin as typescriptGenericSdk } from '@graphql-codegen/typescript-generic-sdk'`
`19`	`19`	`import { plugin as typescriptOperations } from '@graphql-codegen/typescript-operations'`
`20`	`20`	`import { printSchemaWithDirectives } from '@graphql-tools/utils'`
	`21`	`+import consola from 'consola'`
`21`	`22`	`import { defu } from 'defu'`
`22`	`23`	`import { Kind, parse } from 'graphql'`
`23`	`24`	`import { DEFAULT_GRAPHQL_SCALARS } from '../constants'`
`@@ -194,7 +195,9 @@ export async function generateClientTypesCore(`
`194`	`195`	`sdk: sdkContent,`
`195`	`196`	`}`
`196`	`197`	`}`
`197`		`- catch {`
	`198`	`+ catch (error) {`
	`199`	`+ // Log codegen errors - these are usually configuration issues like missing scalar definitions`
	`200`	`+ consola.error('[nitro-graphql] Client type generation failed:', (error as Error).message)`
`198`	`201`	`return false`
`199`	`202`	`}`
`200`	`203`	`}`