nitro-graphql 2.0.0-beta.24 → 2.0.0-beta.25

package/README.md

@@ -56,12 +56,12 @@
 
 **GraphQL Yoga (recommended):**
 ```bash
-pnpm add nitro-graphql graphql-yoga graphql
+pnpm add nitro-graphql graphql-yoga graphql graphql-config
 ```
 
 **Apollo Server:**
 ```bash
-pnpm add nitro-graphql @apollo/server @apollo/utils.withrequired graphql
+pnpm add nitro-graphql @apollo/server @apollo/utils.withrequired graphql graphql-config
 ```
 
 ### 2. Configure
@@ -145,6 +145,8 @@ type Mutation {
 
 ```ts
 // server/graphql/hello.resolver.ts
+import { defineResolver } from 'nitro-graphql/define'
+
 export const helloResolver = defineResolver({
   Query: {
     hello: () => 'Hello from GraphQL!',
@@ -175,6 +177,7 @@ Try these working examples:
 | [**Vite + Nitro**](./playgrounds/vite/) | Vite with Nitro GraphQL integration | `cd playgrounds/vite && pnpm dev` |
 | [**Nuxt Integration**](./playgrounds/nuxt/) | Full Nuxt app with client types | `pnpm playground:nuxt` |
 | [**Apollo Federation**](./playgrounds/federation/) | Federated GraphQL services | `pnpm playground:federation` |
+| [**Drizzle ORM**](./examples/drizzle-orm/) | Drizzle ORM + Zod validation integration | `cd examples/drizzle-orm && pnpm dev` |
 
 ### 🧪 Test Projects
 
@@ -215,6 +218,8 @@ extend type Mutation {
 ### 2. Create Resolvers
 ```ts
 // server/graphql/users/user.resolver.ts
+import { defineQuery, defineMutation } from 'nitro-graphql/define'
+
 export const userQueries = defineQuery({
   users: async (_, __, { storage }) => {
     return await storage.getItem('users') || []
@@ -512,6 +517,8 @@ Create reusable GraphQL directives:
 
 ```ts
 // server/graphql/directives/auth.directive.ts
+import { defineDirective } from 'nitro-graphql/define'
+
 export const authDirective = defineDirective({
   name: 'auth',
   locations: ['FIELD_DEFINITION'],
@@ -586,7 +593,11 @@ export default defineNitroConfig({
 
 ### Core Utilities
 
-All utilities are auto-imported in resolver files:
+> **⚠️ Breaking Change**: Utilities are **NOT auto-imported**. You must explicitly import them from `nitro-graphql/define`:
+
+```typescript
+import { defineResolver, defineQuery, defineMutation, defineType, defineDirective } from 'nitro-graphql/define'
+```
 
 | Function | Purpose | Example |
 |----------|---------|---------|
@@ -595,6 +606,11 @@ All utilities are auto-imported in resolver files:
 | `defineMutation` | Mutation-only resolvers | `defineMutation({ createUser: (...) => {...} })` |
 | `defineType` | Custom type resolvers | `defineType({ User: { posts: (parent) => [...] } })` |
 | `defineDirective` | Custom directives | `defineDirective({ name: 'auth', ... })` |
+| `defineGraphQLConfig` | GraphQL server config | `defineGraphQLConfig({ maskedErrors: {...} })` |
+| `defineSchema` | Schema with Zod integration | `defineSchema({ Book: selectBookSchema })` |
+
+**Additional Utilities** from `nitro-graphql/utils`:
+- `createDefaultMaskError()` - Error handler for ZodError and HTTPError (use in `defineGraphQLConfig`)
 
 ### Type Generation
 
@@ -648,10 +664,19 @@ server/
 - ✅ Check file naming: `*.graphql`, `*.resolver.ts`
 - ✅ Verify exports are named exports
 
-**Import errors**
-- ✅ Use correct path: `nitro-graphql/define`
+**Import errors / "defineQuery is not defined"**
+- ✅ **Requires explicit imports**: Add `import { defineQuery } from 'nitro-graphql/define'` to resolver files
+- ✅ Use correct import path: `nitro-graphql/define` (not `nitro-graphql`)
 - ✅ Use named exports in resolvers
 
+Example fix:
+```typescript
+// Add this to the top of your resolver file
+import { defineQuery, defineMutation } from 'nitro-graphql/define'
+
+export const myQueries = defineQuery({ ... })
+```
+
 **Vite: "Parse failure: Expected ';', '}' or <eof>" on GraphQL files**
 - ✅ Add `graphql()` plugin from `nitro-graphql/vite`
 - ✅ Ensure `graphql()` is placed **before** `nitro()` in plugins array
@@ -848,6 +873,9 @@ File: server/graphql/users.resolver.ts
 Action: CREATE NEW FILE
 Content:
 
+// Must explicitly import (NOT auto-imported)
+import { defineQuery } from 'nitro-graphql/define'
+
 // ⚠️ CRITICAL: Use NAMED EXPORTS (not default export)
 export const userQueries = defineQuery({
   users: async (_, __, context) => {
@@ -867,7 +895,7 @@ export const userQueries = defineQuery({
   }
 })
 
-Validation: File ends with .resolver.ts and uses named export
+Validation: File ends with .resolver.ts, has import statement, and uses named export
 
 ## STEP 7: START DEV SERVER
 Command: pnpm dev
@@ -923,7 +951,8 @@ Issue: "GraphQL endpoint returns 404"
 Fix: Ensure 'nitro-graphql/nuxt' is in modules array (not just 'nitro-graphql')
 
 Issue: "defineQuery is not defined"
-Fix: Restart dev server - auto-imports need to regenerate
+Fix: Add import statement at top of resolver file:
+  import { defineQuery } from 'nitro-graphql/define'
 
 Issue: "Types not generating"
 Fix: Check .nuxt/types/nitro-graphql-server.d.ts exists, if not restart dev server
@@ -984,6 +1013,9 @@ type Mutation {
 }
 
 RESOLVERS (server/graphql/products.resolver.ts):
+// Must explicitly import (NOT auto-imported)
+import { defineQuery, defineMutation } from 'nitro-graphql/define'
+
 // Use NAMED EXPORTS only
 export const productQueries = defineQuery({
   products: async (_, __, context) => {
@@ -1013,7 +1045,7 @@ export const productMutations = defineMutation({
 KEY RULES:
 - Files: *.graphql for schemas, *.resolver.ts for resolvers
 - MUST use named exports (not default export)
-- defineQuery and defineMutation are auto-imported
+- MUST explicitly import: import { defineQuery } from 'nitro-graphql/define'
 - Context is the third parameter (access H3 event context)
 - Endpoint: http://localhost:3000/api/graphql
 
@@ -1058,6 +1090,9 @@ type Mutation {
 }
 
 RESOLVERS (server/graphql/books.resolver.ts):
+// Must explicitly import (NOT auto-imported)
+import { defineResolver } from 'nitro-graphql/define'
+
 // IMPORTANT: Use NAMED EXPORTS
 export const bookResolver = defineResolver({
   Query: {
@@ -1083,6 +1118,7 @@ export const bookResolver = defineResolver({
 
 KEY RULES:
 - framework: 'apollo-server' in config
+- MUST explicitly import: import { defineResolver } from 'nitro-graphql/define'
 - defineResolver for complete resolver maps
 - Named exports required (export const name = ...)
 - Apollo Sandbox: http://localhost:3000/api/graphql
@@ -1131,6 +1167,9 @@ extend type Mutation {
 }
 
 RESOLVERS (server/graphql/posts/post.resolver.ts):
+// Must explicitly import (NOT auto-imported)
+import { defineQuery, defineMutation } from 'nitro-graphql/define'
+
 // Use NAMED EXPORTS
 export const postQueries = defineQuery({
   posts: async (_, { limit, offset }, context) => {
@@ -1180,6 +1219,7 @@ Import types:
 import type { Post, CreatePostInput } from '#graphql/server'
 
 KEY RULES:
+- MUST explicitly import: import { defineQuery, defineMutation } from 'nitro-graphql/define'
 - Use "extend type" to add to existing Query/Mutation
 - Named exports required
 - Context has H3 event properties

package/dist/define.d.mts

@@ -43,19 +43,19 @@ declare function defineSchema<T extends Partial<Record<keyof ResolversTypes, Sta
  * ```typescript
  * export const userResolvers = defineResolver({
  *   Query: {
- *     user: async (_, { id }, context) => {
+ *     user: async (parent, { id }, context) => {
  *       return await context.storage.getItem(`user:${id}`)
  *     }
  *   },
  *   Mutation: {
- *     createUser: async (_, { input }, context) => {
+ *     createUser: async (parent, { input }, context) => {
  *       const user = { id: generateId(), ...input }
  *       await context.storage.setItem(`user:${user.id}`, user)
  *       return user
  *     }
  *   },
  *   User: {
- *     fullName: (parent) => `${parent.firstName} ${parent.lastName}`
+ *     fullName: (parent, args, context) => `${parent.firstName} ${parent.lastName}`
  *   }
  * })
  * ```
@@ -74,10 +74,10 @@ declare function defineResolver(resolvers: Resolvers): Resolvers;
  * @example
  * ```typescript
  * export const userQueries = defineQuery({
- *   user: async (_, { id }, context) => {
+ *   user: async (parent, { id }, context) => {
  *     return await fetchUser(id)
  *   },
- *   users: async (_, __, context) => {
+ *   users: async (parent, args, context) => {
  *     return await fetchAllUsers()
  *   }
  * })
@@ -100,14 +100,14 @@ declare function defineQuery(resolvers?: Resolvers['Query']): Resolvers;
  * @example
  * ```typescript
  * export const userMutations = defineMutation({
- *   createUser: async (_, { input }, context) => {
+ *   createUser: async (parent, { input }, context) => {
  *     const user = await context.db.users.create(input)
  *     return user
  *   },
- *   updateUser: async (_, { id, input }, context) => {
+ *   updateUser: async (parent, { id, input }, context) => {
  *     return await context.db.users.update(id, input)
  *   },
- *   deleteUser: async (_, { id }, context) => {
+ *   deleteUser: async (parent, { id }, context) => {
  *     return await context.db.users.delete(id)
  *   }
  * })
@@ -133,13 +133,13 @@ declare function defineMutation(resolvers?: Resolvers['Mutation']): Resolvers;
  *
  * export const messageSubscriptions = defineSubscription({
  *   messageAdded: {
- *     subscribe: async function* (_, { channelId }, context) {
+ *     subscribe: async function* (parent, { channelId }, context) {
  *       const pubsub = context.pubsub
  *       yield* pubsub.subscribe(`channel:${channelId}`)
  *     }
  *   },
  *   userStatusChanged: {
- *     subscribe: async (_, __, context) => {
+ *     subscribe: async (parent, args, context) => {
  *       return new Repeater(async (push, stop) => {
  *         // Real-time subscription logic
  *       })
@@ -197,6 +197,8 @@ declare function defineType(resolvers: Resolvers): Resolvers;
  *
  * @example
  * ```typescript
+ * import { createDefaultMaskError } from 'nitro-graphql/utils'
+ *
  * // GraphQL Yoga configuration
  * export default defineGraphQLConfig({
  *   schema: {
@@ -208,10 +210,10 @@ declare function defineType(resolvers: Resolvers): Resolvers;
  *       db: getDatabase()
  *     }
  *   },
- *   yoga: {
- *     graphiql: true,
- *     maskedErrors: false
- *   }
+ *   maskedErrors: {
+ *     maskError: createDefaultMaskError()
+ *   },
+ *   graphiql: true
  * })
  * ```
  *

package/dist/define.mjs

@@ -39,19 +39,19 @@ function defineSchema(config) {
 * ```typescript
 * export const userResolvers = defineResolver({
 *   Query: {
-*     user: async (_, { id }, context) => {
+*     user: async (parent, { id }, context) => {
 *       return await context.storage.getItem(`user:${id}`)
 *     }
 *   },
 *   Mutation: {
-*     createUser: async (_, { input }, context) => {
+*     createUser: async (parent, { input }, context) => {
 *       const user = { id: generateId(), ...input }
 *       await context.storage.setItem(`user:${user.id}`, user)
 *       return user
 *     }
 *   },
 *   User: {
-*     fullName: (parent) => `${parent.firstName} ${parent.lastName}`
+*     fullName: (parent, args, context) => `${parent.firstName} ${parent.lastName}`
 *   }
 * })
 * ```
@@ -72,10 +72,10 @@ function defineResolver(resolvers) {
 * @example
 * ```typescript
 * export const userQueries = defineQuery({
-*   user: async (_, { id }, context) => {
+*   user: async (parent, { id }, context) => {
 *     return await fetchUser(id)
 *   },
-*   users: async (_, __, context) => {
+*   users: async (parent, args, context) => {
 *     return await fetchAllUsers()
 *   }
 * })
@@ -100,14 +100,14 @@ function defineQuery(resolvers = {}) {
 * @example
 * ```typescript
 * export const userMutations = defineMutation({
-*   createUser: async (_, { input }, context) => {
+*   createUser: async (parent, { input }, context) => {
 *     const user = await context.db.users.create(input)
 *     return user
 *   },
-*   updateUser: async (_, { id, input }, context) => {
+*   updateUser: async (parent, { id, input }, context) => {
 *     return await context.db.users.update(id, input)
 *   },
-*   deleteUser: async (_, { id }, context) => {
+*   deleteUser: async (parent, { id }, context) => {
 *     return await context.db.users.delete(id)
 *   }
 * })
@@ -135,13 +135,13 @@ function defineMutation(resolvers = {}) {
 *
 * export const messageSubscriptions = defineSubscription({
 *   messageAdded: {
-*     subscribe: async function* (_, { channelId }, context) {
+*     subscribe: async function* (parent, { channelId }, context) {
 *       const pubsub = context.pubsub
 *       yield* pubsub.subscribe(`channel:${channelId}`)
 *     }
 *   },
 *   userStatusChanged: {
-*     subscribe: async (_, __, context) => {
+*     subscribe: async (parent, args, context) => {
 *       return new Repeater(async (push, stop) => {
 *         // Real-time subscription logic
 *       })
@@ -203,6 +203,8 @@ function defineType(resolvers) {
 *
 * @example
 * ```typescript
+* import { createDefaultMaskError } from 'nitro-graphql/utils'
+*
 * // GraphQL Yoga configuration
 * export default defineGraphQLConfig({
 *   schema: {
@@ -214,10 +216,10 @@ function defineType(resolvers) {
 *       db: getDatabase()
 *     }
 *   },
-*   yoga: {
-*     graphiql: true,
-*     maskedErrors: false
-*   }
+*   maskedErrors: {
+*     maskError: createDefaultMaskError()
+*   },
+*   graphiql: true
 * })
 * ```
 *

package/dist/routes/debug.d.mts

@@ -1,4 +1,4 @@
-import * as h31 from "h3";
+import * as h35 from "h3";
 
 //#region src/routes/debug.d.ts
 
@@ -10,7 +10,7 @@ import * as h31 from "h3";
  * - /_nitro/graphql/debug - HTML dashboard
  * - /_nitro/graphql/debug?format=json - JSON API
  */
-declare const _default: h31.EventHandlerWithFetch<h31.EventHandlerRequest, Promise<string | {
+declare const _default: h35.EventHandlerWithFetch<h35.EventHandlerRequest, Promise<string | {
   timestamp: string;
   environment: {
     dev: any;

package/dist/routes/graphql-yoga.d.mts

@@ -1,6 +1,6 @@
-import * as h35 from "h3";
+import * as h30 from "h3";
 
 //#region src/routes/graphql-yoga.d.ts
-declare const _default: h35.EventHandlerWithFetch<h35.EventHandlerRequest, Promise<Response>>;
+declare const _default: h30.EventHandlerWithFetch<h30.EventHandlerRequest, Promise<Response>>;
 //#endregion
 export { _default as default };

package/dist/routes/graphql-yoga.mjs

@@ -84,6 +84,10 @@ var graphql_yoga_default = defineEventHandler(async (event) => {
 		renderGraphiQL: () => apolloSandboxHtml
 	}, importedConfig));
 	const response = await yoga.handleRequest(event.req, event);
+	if (event.res.statusCode && event.res.statusCode !== 200) return new Response(response.body, {
+		...response,
+		status: event.res.statusCode
+	});
 	return new Response(response.body, response);
 });
 

package/dist/routes/health.d.mts

@@ -1,7 +1,7 @@
-import * as h30 from "h3";
+import * as h31 from "h3";
 
 //#region src/routes/health.d.ts
-declare const _default: h30.EventHandlerWithFetch<h30.EventHandlerRequest, Promise<{
+declare const _default: h31.EventHandlerWithFetch<h31.EventHandlerRequest, Promise<{
   status: string;
   message: string;
   timestamp: string;

package/dist/types/define.d.mts

@@ -8,7 +8,18 @@ import { NPMConfig } from "#graphql/server";
 type Flatten<T> = T extends infer U ? { [K in keyof U]: U[K] } : never;
 type DefineServerConfig<T extends NPMConfig = NPMConfig> = T['framework'] extends 'graphql-yoga' ? Partial<YogaServerOptions<H3Event, Partial<H3Event>>> : T['framework'] extends 'apollo-server' ? Partial<ApolloServerOptions<H3Event>> : Partial<YogaServerOptions<H3Event, Partial<H3Event>>> | Partial<ApolloServerOptions<H3Event>>;
 type DirectiveLocationName = 'QUERY' | 'MUTATION' | 'SUBSCRIPTION' | 'FIELD' | 'FRAGMENT_DEFINITION' | 'FRAGMENT_SPREAD' | 'INLINE_FRAGMENT' | 'VARIABLE_DEFINITION' | 'SCHEMA' | 'SCALAR' | 'OBJECT' | 'FIELD_DEFINITION' | 'ARGUMENT_DEFINITION' | 'INTERFACE' | 'UNION' | 'ENUM' | 'ENUM_VALUE' | 'INPUT_OBJECT' | 'INPUT_FIELD_DEFINITION';
+type GraphQLScalarType = 'String' | 'Int' | 'Float' | 'Boolean' | 'ID' | 'JSON' | 'DateTime';
+type GraphQLBaseType = GraphQLScalarType | (string & {});
 type GraphQLArgumentType = 'String' | 'Int' | 'Float' | 'Boolean' | 'ID' | 'JSON' | 'DateTime' | 'String!' | 'Int!' | 'Float!' | 'Boolean!' | 'ID!' | 'JSON!' | 'DateTime!' | '[String]' | '[String!]' | '[String]!' | '[String!]!' | '[Int]' | '[Int!]' | '[Int]!' | '[Int!]!' | '[Float]' | '[Float!]' | '[Float]!' | '[Float!]!' | '[Boolean]' | '[Boolean!]' | '[Boolean]!' | '[Boolean!]!' | '[ID]' | '[ID!]' | '[ID]!' | '[ID!]!' | '[JSON]' | '[JSON!]' | '[JSON]!' | '[JSON!]!' | '[DateTime]' | '[DateTime!]' | '[DateTime]!' | '[DateTime!]!' | (string & {});
+interface DirectiveArgument<T extends GraphQLArgumentType = GraphQLArgumentType> {
+  /**
+   * GraphQL type for the argument
+   * @example 'String', 'Int!', '[String!]!', 'DateTime', 'JSON'
+   */
+  type: T;
+  defaultValue?: any;
+  description?: string;
+}
 interface DirectiveArg {
   type: GraphQLArgumentType;
   defaultValue?: any;
@@ -35,4 +46,4 @@ interface DefineDirectiveConfig {
   transformer?: (schema: GraphQLSchema) => GraphQLSchema;
 }
 //#endregion
-export { DefineDirectiveConfig, DefineServerConfig, DirectiveDefinition, Flatten };
+export { DefineDirectiveConfig, DefineServerConfig, DirectiveArgument, DirectiveDefinition, Flatten, GraphQLArgumentType, GraphQLBaseType, GraphQLScalarType };

package/dist/types/define.mjs

@@ -0,0 +1 @@
+export {  };

package/dist/types/index.d.mts

@@ -243,4 +243,4 @@ interface NitroGraphQLOptions {
   paths?: PathsConfig;
 }
 //#endregion
-export { ClientUtilsConfig, CodegenClientConfig, ExternalGraphQLService, FileGenerationConfig, GenImport, GenericSdkConfig, NitroGraphQLOptions, ScaffoldConfig, SdkConfig, TypesConfig };
+export { ClientUtilsConfig, CodegenClientConfig, CodegenServerConfig, ExternalGraphQLService, ExternalServicePaths, FederationConfig, FileGenerationConfig, GenImport, GenericSdkConfig, NitroGraphQLOptions, PathsConfig, ScaffoldConfig, SdkConfig, StandardSchemaV1, TypesConfig };

package/dist/types/index.mjs

@@ -0,0 +1 @@
+export {  };

package/dist/types/standard-schema.mjs

@@ -0,0 +1 @@
+export {  };

package/dist/utils/errors.d.mts

@@ -0,0 +1,73 @@
+//#region src/utils/errors.d.ts
+interface MaskErrorOptions {
+  /**
+   * Default HTTP status code for validation errors (ZodError)
+   * @default 400
+   */
+  validationStatusCode?: number;
+  /**
+   * Default HTTP status code for HTTP errors when status is not provided
+   * @default 500
+   */
+  defaultHttpStatusCode?: number;
+}
+/**
+ * Default error masking function for GraphQL Yoga
+ * Handles common error types like ZodError and HTTPError
+ *
+ * @param options - Configuration options for error handling
+ *
+ * @example Basic usage
+ * ```ts
+ * import { defineGraphQLConfig } from 'nitro-graphql/define'
+ * import { createDefaultMaskError } from 'nitro-graphql/utils'
+ *
+ * export default defineGraphQLConfig({
+ *   maskedErrors: {
+ *     maskError: createDefaultMaskError()
+ *   }
+ * })
+ * ```
+ *
+ * @example Custom status codes
+ * ```ts
+ * import { defineGraphQLConfig } from 'nitro-graphql/define'
+ * import { createDefaultMaskError } from 'nitro-graphql/utils'
+ *
+ * export default defineGraphQLConfig({
+ *   maskedErrors: {
+ *     maskError: createDefaultMaskError({
+ *       validationStatusCode: 422,  // Use 422 for validation errors
+ *       defaultHttpStatusCode: 500  // Use 500 for unknown HTTP errors
+ *     })
+ *   }
+ * })
+ * ```
+ *
+ * @example Custom error handling with fallback to default
+ * ```ts
+ * import { defineGraphQLConfig } from 'nitro-graphql/define'
+ * import { createDefaultMaskError } from 'nitro-graphql/utils'
+ *
+ * const defaultMaskError = createDefaultMaskError()
+ *
+ * export default defineGraphQLConfig({
+ *   maskedErrors: {
+ *     maskError: (error: unknown) => {
+ *       // Handle custom errors first
+ *       if (error instanceof MyCustomError) {
+ *         return new GraphQLError(error.message, {
+ *           extensions: { code: 'CUSTOM_ERROR' }
+ *         })
+ *       }
+ *
+ *       // Fall back to default handling
+ *       return defaultMaskError(error)
+ *     }
+ *   }
+ * })
+ * ```
+ */
+declare function createDefaultMaskError(options?: MaskErrorOptions): (error: unknown) => Error;
+//#endregion
+export { MaskErrorOptions, createDefaultMaskError };

package/dist/utils/errors.mjs

@@ -0,0 +1,89 @@
+import { GraphQLError } from "graphql";
+
+//#region src/utils/errors.ts
+/**
+* Default error masking function for GraphQL Yoga
+* Handles common error types like ZodError and HTTPError
+*
+* @param options - Configuration options for error handling
+*
+* @example Basic usage
+* ```ts
+* import { defineGraphQLConfig } from 'nitro-graphql/define'
+* import { createDefaultMaskError } from 'nitro-graphql/utils'
+*
+* export default defineGraphQLConfig({
+*   maskedErrors: {
+*     maskError: createDefaultMaskError()
+*   }
+* })
+* ```
+*
+* @example Custom status codes
+* ```ts
+* import { defineGraphQLConfig } from 'nitro-graphql/define'
+* import { createDefaultMaskError } from 'nitro-graphql/utils'
+*
+* export default defineGraphQLConfig({
+*   maskedErrors: {
+*     maskError: createDefaultMaskError({
+*       validationStatusCode: 422,  // Use 422 for validation errors
+*       defaultHttpStatusCode: 500  // Use 500 for unknown HTTP errors
+*     })
+*   }
+* })
+* ```
+*
+* @example Custom error handling with fallback to default
+* ```ts
+* import { defineGraphQLConfig } from 'nitro-graphql/define'
+* import { createDefaultMaskError } from 'nitro-graphql/utils'
+*
+* const defaultMaskError = createDefaultMaskError()
+*
+* export default defineGraphQLConfig({
+*   maskedErrors: {
+*     maskError: (error: unknown) => {
+*       // Handle custom errors first
+*       if (error instanceof MyCustomError) {
+*         return new GraphQLError(error.message, {
+*           extensions: { code: 'CUSTOM_ERROR' }
+*         })
+*       }
+*
+*       // Fall back to default handling
+*       return defaultMaskError(error)
+*     }
+*   }
+* })
+* ```
+*/
+function createDefaultMaskError(options) {
+	const validationStatusCode = options?.validationStatusCode ?? 400;
+	const defaultHttpStatusCode = options?.defaultHttpStatusCode ?? 500;
+	return (error) => {
+		if (error && typeof error === "object" && "originalError" in error) {
+			const graphqlError = error;
+			if (graphqlError.originalError && typeof graphqlError.originalError === "object" && "issues" in graphqlError.originalError && Array.isArray(graphqlError.originalError.issues)) return new GraphQLError("Validation failed", { extensions: {
+				code: "BAD_USER_INPUT",
+				validationErrors: graphqlError.originalError.issues.map((issue) => ({
+					field: issue.path.join("."),
+					message: issue.message
+				})),
+				http: { status: validationStatusCode }
+			} });
+			if (graphqlError.originalError && typeof graphqlError.originalError === "object" && "statusCode" in graphqlError.originalError && "statusMessage" in graphqlError.originalError) {
+				const httpError = graphqlError.originalError;
+				const statusCode = httpError.statusCode ?? defaultHttpStatusCode;
+				return new GraphQLError(httpError.statusMessage || httpError.message || "Internal Server Error", { extensions: {
+					code: statusCode,
+					http: { status: statusCode }
+				} });
+			}
+		}
+		return error instanceof Error ? error : new Error(String(error));
+	};
+}
+
+//#endregion
+export { createDefaultMaskError };

package/dist/utils/index.d.mts

@@ -1,5 +1,6 @@
 import { GenImport } from "../types/index.mjs";
 import { directiveParser, generateDirectiveSchema, generateDirectiveSchemas } from "./directive-parser.mjs";
+import { createDefaultMaskError } from "./errors.mjs";
 import { Nitro } from "nitro/types";
 
 //#region src/utils/index.d.ts
@@ -36,4 +37,4 @@ declare function scanExternalServiceDocs(nitro: Nitro, serviceName: string, patt
  */
 declare function validateExternalServices(services: unknown[]): string[];
 //#endregion
-export { GLOB_SCAN_PATTERN, directiveParser, generateDirectiveSchema, generateDirectiveSchemas, generateLayerIgnorePatterns, getImportId, getLayerAppDirectories, getLayerDirectories, getLayerServerDirectories, relativeWithDot, scanDirectives, scanDocs, scanExternalServiceDocs, scanGraphql, scanResolvers, scanSchemas, validateExternalServices };
+export { GLOB_SCAN_PATTERN, createDefaultMaskError, directiveParser, generateDirectiveSchema, generateDirectiveSchemas, generateLayerIgnorePatterns, getImportId, getLayerAppDirectories, getLayerDirectories, getLayerServerDirectories, relativeWithDot, scanDirectives, scanDocs, scanExternalServiceDocs, scanGraphql, scanResolvers, scanSchemas, validateExternalServices };

package/dist/utils/index.mjs

@@ -1,4 +1,5 @@
 import { directiveParser, generateDirectiveSchema, generateDirectiveSchemas } from "./directive-parser.mjs";
+import { createDefaultMaskError } from "./errors.mjs";
 import { readFile } from "node:fs/promises";
 import { join, relative } from "pathe";
 import { hash } from "ohash";
@@ -275,4 +276,4 @@ async function scanDir(nitro, dir, name, globPattern = GLOB_SCAN_PATTERN) {
 }
 
 //#endregion
-export { GLOB_SCAN_PATTERN, directiveParser, generateDirectiveSchema, generateDirectiveSchemas, generateLayerIgnorePatterns, getImportId, getLayerAppDirectories, getLayerDirectories, getLayerServerDirectories, relativeWithDot, scanDirectives, scanDocs, scanExternalServiceDocs, scanGraphql, scanResolvers, scanSchemas, validateExternalServices };
+export { GLOB_SCAN_PATTERN, createDefaultMaskError, directiveParser, generateDirectiveSchema, generateDirectiveSchemas, generateLayerIgnorePatterns, getImportId, getLayerAppDirectories, getLayerDirectories, getLayerServerDirectories, relativeWithDot, scanDirectives, scanDocs, scanExternalServiceDocs, scanGraphql, scanResolvers, scanSchemas, validateExternalServices };

package/dist/utils/server-codegen.mjs

@@ -61,7 +61,7 @@ async function generateTypes(selectFremework, schema, config = {}, outputPath) {
 				return {
 					prepend: [
 						`import schemas from '#graphql/schema'`,
-						`import type { StandardSchemaV1 } from 'nitro-graphql'`,
+						`import type { StandardSchemaV1 } from 'nitro-graphql/types'`,
 						`
 export interface NPMConfig {
   framework: '${selectFremework || "graphql-yoga"}';

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "2.0.0-beta.24",
+  "version": "2.0.0-beta.25",
+  "packageManager": "pnpm@10.22.0",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,
@@ -59,6 +60,10 @@
     "./vite": {
       "types": "./dist/vite.d.mts",
       "import": "./dist/vite.mjs"
+    },
+    "./types": {
+      "types": "./dist/types/index.d.mts",
+      "import": "./dist/types/index.mjs"
     }
   },
   "module": "./dist/index.mjs",
@@ -66,6 +71,22 @@
   "files": [
     "dist"
   ],
+  "scripts": {
+    "prepack": "pnpm build",
+    "build": "tsdown",
+    "dev": "tsdown --watch",
+    "bumpp": "bumpp package.json",
+    "release": "pnpm build && pnpm bumpp && pnpm publish --no-git-checks --access public",
+    "playground:nitro": "cd playgrounds/nitro && pnpm install && pnpm dev",
+    "playground:nuxt": "cd playgrounds/nuxt && pnpm install && pnpm dev",
+    "playground:federation": "cd playgrounds/federation && pnpm install && pnpm dev",
+    "docs:dev": "cd .docs && pnpm install && pnpm update:metadata && pnpm dev",
+    "docs:build": "cd .docs && pnpm install && pnpm update:metadata && pnpm build",
+    "docs:preview": "cd .docs && pnpm preview",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "test:types": "tsc --noEmit"
+  },
   "peerDependencies": {
     "@apollo/server": "^5.0.0",
     "@apollo/utils.withrequired": "^3.0.0",
@@ -82,66 +103,57 @@
     }
   },
   "dependencies": {
-    "@apollo/subgraph": "^2.12.1",
-    "@graphql-codegen/core": "^5.0.0",
-    "@graphql-codegen/import-types-preset": "^3.0.1",
-    "@graphql-codegen/typescript": "^5.0.4",
-    "@graphql-codegen/typescript-generic-sdk": "^4.0.2",
-    "@graphql-codegen/typescript-operations": "^5.0.4",
-    "@graphql-codegen/typescript-resolvers": "^5.1.2",
-    "@graphql-tools/graphql-file-loader": "^8.1.6",
-    "@graphql-tools/load": "^8.1.6",
-    "@graphql-tools/load-files": "^7.0.1",
-    "@graphql-tools/merge": "^9.1.5",
-    "@graphql-tools/schema": "^10.0.29",
-    "@graphql-tools/url-loader": "^9.0.4",
-    "@graphql-tools/utils": "^10.10.3",
-    "chokidar": "^4.0.3",
-    "consola": "^3.4.2",
-    "defu": "^6.1.4",
-    "graphql-config": "^5.1.5",
-    "graphql-scalars": "^1.25.0",
-    "knitwork": "^1.3.0",
-    "ohash": "^2.0.11",
-    "oxc-parser": "^0.97.0",
-    "pathe": "^2.0.3",
-    "tinyglobby": "^0.2.15"
+    "@apollo/subgraph": "catalog:",
+    "@graphql-codegen/core": "catalog:",
+    "@graphql-codegen/import-types-preset": "catalog:",
+    "@graphql-codegen/typescript": "catalog:",
+    "@graphql-codegen/typescript-generic-sdk": "catalog:",
+    "@graphql-codegen/typescript-operations": "catalog:",
+    "@graphql-codegen/typescript-resolvers": "catalog:",
+    "@graphql-tools/graphql-file-loader": "catalog:",
+    "@graphql-tools/load": "catalog:",
+    "@graphql-tools/load-files": "catalog:",
+    "@graphql-tools/merge": "catalog:",
+    "@graphql-tools/schema": "catalog:",
+    "@graphql-tools/url-loader": "catalog:",
+    "@graphql-tools/utils": "catalog:",
+    "chokidar": "catalog:",
+    "consola": "catalog:",
+    "defu": "catalog:",
+    "graphql-config": "catalog:",
+    "graphql-scalars": "catalog:",
+    "knitwork": "catalog:",
+    "ohash": "catalog:",
+    "oxc-parser": "catalog:",
+    "pathe": "catalog:",
+    "tinyglobby": "catalog:"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^6.2.0",
-    "@nuxt/kit": "^4.2.1",
-    "@nuxt/schema": "^4.2.1",
-    "@types/node": "^24.10.1",
-    "@vitejs/devtools": "^0.0.0-alpha.16",
-    "bumpp": "^10.3.1",
-    "changelogen": "^0.6.2",
-    "crossws": "^0.4.1",
-    "eslint": "^9.39.1",
-    "graphql": "^16.12.0",
-    "graphql-yoga": "^5.16.2",
-    "h3": "^2.0.1-rc.5",
-    "nitro": "npm:nitro-nightly@latest",
-    "tsdown": "^0.16.4",
-    "typescript": "^5.9.3",
-    "vite": "npm:rolldown-vite@latest",
-    "vitepress-plugin-llms": "^1.9.1"
+    "@antfu/eslint-config": "catalog:",
+    "@nuxt/kit": "catalog:",
+    "@nuxt/schema": "catalog:",
+    "@types/node": "catalog:",
+    "@vitejs/devtools": "catalog:",
+    "bumpp": "catalog:",
+    "changelogen": "catalog:",
+    "crossws": "catalog:",
+    "eslint": "catalog:",
+    "graphql": "catalog:",
+    "graphql-yoga": "catalog:",
+    "h3": "catalog:",
+    "nitro": "catalog:",
+    "tsdown": "catalog:",
+    "typescript": "catalog:",
+    "vite": "catalog:",
+    "vitepress-plugin-llms": "catalog:"
+  },
+  "pnpm": {
+    "overrides": {
+      "nitro": "npm:nitro-nightly@latest",
+      "vite": "npm:rolldown-vite@latest"
+    }
   },
   "resolutions": {
     "nitro-graphql": "link:."
-  },
-  "scripts": {
-    "build": "tsdown",
-    "dev": "tsdown --watch",
-    "bumpp": "bumpp package.json",
-    "release": "pnpm build && pnpm bumpp && pnpm publish --no-git-checks --access public",
-    "playground:nitro": "cd playgrounds/nitro && pnpm install && pnpm dev",
-    "playground:nuxt": "cd playgrounds/nuxt && pnpm install && pnpm dev",
-    "playground:federation": "cd playgrounds/federation && pnpm install && pnpm dev",
-    "docs:dev": "cd .docs && pnpm install && pnpm update:metadata && pnpm dev",
-    "docs:build": "cd .docs && pnpm install && pnpm update:metadata && pnpm build",
-    "docs:preview": "cd .docs && pnpm preview",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "test:types": "tsc --noEmit"
   }
-}
+}