nitro-graphql 2.0.0-beta.70 → 2.0.0-beta.73

package/dist/nitro/index.d.mts

@@ -1,6 +1,14 @@
-import { ClientUtilsConfig, CodegenClientConfig, CodegenServerConfig, DefineDirectiveConfig, DefineServerConfig, DirectiveArgument, DirectiveDefinition, ExplicitPathsExtendSource, ExtendSource, ExternalGraphQLService, ExternalServicePaths, FederationConfig, FileGenerationConfig, Flatten, GenImport, GenericSdkConfig, GraphQLArgumentType, GraphQLBaseType, GraphQLScalarType, LocalDirExtendSource, NitroGraphQLOptions, PathsConfig, PubSubConfig, RuntimeConfig, SSETransportConfig, SdkConfig, SecurityConfig, StandardSchemaV1, SubscriptionsConfig, TypesConfig, WatchConfig, WebSocketTransportConfig } from "./types.mjs";
+import { ClientCodegenConfig, ExternalServiceCodegenConfig, SdkCodegenConfig, ServerCodegenConfig } from "../core/types/codegen.mjs";
+import { CoreSecurityConfig } from "../core/types/config.mjs";
+import { ResolverImport, ScannedResolver } from "../core/types/scanning.mjs";
+import { DefineDirectiveConfig, DirectiveArg, DirectiveArgument, DirectiveDefinition, DirectiveLocationName, Flatten, GraphQLArgumentType, GraphQLBaseType, GraphQLScalarType } from "../core/types/define.mjs";
+import { StandardSchemaV1 } from "../core/types/standard-schema.mjs";
+import { DefineServerConfig } from "./types/define.mjs";
+import { LocalDirExtendSource } from "../core/extend/loader.mjs";
+import { CLIGraphQLOptions, ClientUtilsConfig, ExplicitPathsExtendSource, ExtendSource, ExternalGraphQLService, ExternalServicePaths, FederationConfig, FileGenerationConfig, NitroGraphQLOptions, PathsConfig, PubSubConfig, RuntimeConfig, SSETransportConfig, SdkConfig, SubscriptionsConfig, TypesConfig, WatchConfig, WebSocketTransportConfig } from "./types/config.mjs";
+import { GraphQLScanState } from "./types/augmentation.mjs";
 import { NitroAdapter } from "./adapter.mjs";
-import { resolveSecurityConfig } from "./setup/logging.mjs";
+import { resolveSecurityConfig } from "./setup/security.mjs";
 import { setupNitroGraphQL } from "./setup.mjs";
 import { NitroModule } from "nitro/types";
 import { Plugin } from "vite";
@@ -42,4 +50,4 @@ declare function graphqlModule(options?: NitroGraphQLOptions): Plugin & {
   nitro: NitroModule;
 };
 //#endregion
-export { ClientUtilsConfig, CodegenClientConfig, CodegenServerConfig, DefineDirectiveConfig, DefineServerConfig, DirectiveArgument, DirectiveDefinition, ExplicitPathsExtendSource, ExtendSource, ExternalGraphQLService, ExternalServicePaths, FederationConfig, FileGenerationConfig, Flatten, GenImport, GenericSdkConfig, GraphQLArgumentType, GraphQLBaseType, GraphQLScalarType, LocalDirExtendSource, NitroAdapter, NitroGraphQLOptions, PathsConfig, PubSubConfig, RuntimeConfig, SSETransportConfig, SdkConfig, SecurityConfig, StandardSchemaV1, SubscriptionsConfig, TypesConfig, WatchConfig, WebSocketTransportConfig, graphqlModule as default, resolveSecurityConfig, setupNitroGraphQL };
+export { CLIGraphQLOptions, ClientCodegenConfig, ClientUtilsConfig, ClientCodegenConfig as CodegenClientConfig, ServerCodegenConfig as CodegenServerConfig, DefineDirectiveConfig, DefineServerConfig, DirectiveArg, DirectiveArgument, DirectiveDefinition, DirectiveLocationName, ExplicitPathsExtendSource, ExtendSource, ExternalGraphQLService, ExternalServiceCodegenConfig, ExternalServicePaths, FederationConfig, FileGenerationConfig, Flatten, SdkCodegenConfig as GenericSdkConfig, GraphQLArgumentType, GraphQLBaseType, GraphQLScalarType, GraphQLScanState, LocalDirExtendSource, NitroAdapter, NitroGraphQLOptions, PathsConfig, PubSubConfig, ResolverImport, RuntimeConfig, SSETransportConfig, ScannedResolver, SdkCodegenConfig, SdkConfig, CoreSecurityConfig as SecurityConfig, ServerCodegenConfig, StandardSchemaV1, SubscriptionsConfig, TypesConfig, WatchConfig, WebSocketTransportConfig, graphqlModule as default, resolveSecurityConfig, setupNitroGraphQL };

package/dist/nitro/index.mjs

@@ -1,10 +1,10 @@
 import { NitroAdapter } from "./adapter.mjs";
-import { resolveSecurityConfig } from "./setup/logging.mjs";
+import { resolveSecurityConfig } from "./setup/security.mjs";
 import { setupNitroGraphQL } from "./setup.mjs";
 import { readFile } from "node:fs/promises";
 import defu from "defu";
-
 //#region src/nitro/index.ts
+const GRAPHQL_FILE_RE = /\.(?:graphql|gql)$/i;
 /**
 * Vite plugin to load GraphQL files as strings AND auto-register Nitro module
 * This prevents Vite from trying to parse .graphql/.gql files as JavaScript
@@ -42,7 +42,7 @@ function graphqlModule(options) {
 		name: "nitro-graphql",
 		enforce: "pre",
 		async load(id) {
-			if (!/\.(?:graphql|gql)$/i.test(id)) return null;
+			if (!GRAPHQL_FILE_RE.test(id)) return null;
 			try {
 				const content = await readFile(id, "utf-8");
 				return `export default ${JSON.stringify(content)}`;
@@ -59,7 +59,5 @@ function graphqlModule(options) {
 		} }
 	};
 }
-var nitro_default = graphqlModule;
-
 //#endregion
-export { NitroAdapter, nitro_default as default, resolveSecurityConfig, setupNitroGraphQL };
+export { NitroAdapter, graphqlModule as default, resolveSecurityConfig, setupNitroGraphQL };

package/dist/nitro/paths.d.mts

@@ -1,4 +1,4 @@
-import { FileGenerationConfig, SdkConfig, TypesConfig } from "./types.mjs";
+import { FileGenerationConfig, SdkConfig, TypesConfig } from "./types/config.mjs";
 import { Nitro } from "nitro/types";
 
 //#region src/nitro/paths.d.ts
@@ -16,7 +16,8 @@ interface PathPlaceholders {
 }
 /**
  * Replace placeholders in a path string
- * Supports: {serviceName}, {buildDir}, {rootDir}, {framework}, {typesDir}, {serverDir}, {clientDir}
+ * Matches any `{key}` and resolves from the placeholders record.
+ * Unknown keys pass through unchanged. `{serviceName}` defaults to 'default'.
  */
 declare function replacePlaceholders(path: string, placeholders: PathPlaceholders): string;
 /**

package/dist/nitro/paths.mjs

@@ -1,12 +1,22 @@
 import { isAbsolute, resolve } from "pathe";
-
 //#region src/nitro/paths.ts
+const PLACEHOLDER_RE = /\{(\w+)\}/g;
 /**
 * Replace placeholders in a path string
-* Supports: {serviceName}, {buildDir}, {rootDir}, {framework}, {typesDir}, {serverDir}, {clientDir}
+* Matches any `{key}` and resolves from the placeholders record.
+* Unknown keys pass through unchanged. `{serviceName}` defaults to 'default'.
 */
 function replacePlaceholders(path, placeholders) {
-	return path.replace(/\{serviceName\}/g, placeholders.serviceName || "default").replace(/\{buildDir\}/g, placeholders.buildDir).replace(/\{rootDir\}/g, placeholders.rootDir).replace(/\{framework\}/g, placeholders.framework).replace(/\{typesDir\}/g, placeholders.typesDir).replace(/\{serverDir\}/g, placeholders.serverDir).replace(/\{clientDir\}/g, placeholders.clientDir);
+	const lookup = {
+		serviceName: placeholders.serviceName || "default",
+		buildDir: placeholders.buildDir,
+		rootDir: placeholders.rootDir,
+		framework: placeholders.framework,
+		typesDir: placeholders.typesDir,
+		serverDir: placeholders.serverDir,
+		clientDir: placeholders.clientDir
+	};
+	return path.replace(PLACEHOLDER_RE, (match, key) => lookup[key] ?? match);
 }
 /**
 * Get default paths based on framework and user configuration
@@ -87,6 +97,5 @@ function getTypesConfig(nitro) {
 	if (typesConfig === false) return { enabled: false };
 	return typesConfig || {};
 }
-
 //#endregion
-export { getDefaultPaths, getSdkConfig, getTypesConfig, replacePlaceholders, resolveFilePath, shouldGenerateFile, shouldGenerateSdk, shouldGenerateTypes };
+export { getDefaultPaths, getSdkConfig, getTypesConfig, replacePlaceholders, resolveFilePath, shouldGenerateFile, shouldGenerateSdk, shouldGenerateTypes };

package/dist/nitro/rollup.mjs

@@ -1,21 +1,22 @@
-import { NitroAdapter } from "./adapter.mjs";
-import { registerAllVirtualModules } from "./virtual/generators.mjs";
+import { scanSchemasCore } from "../core/scanning/schemas.mjs";
+import { createScanContextFromNitro } from "./adapter.mjs";
+import { registerAllVirtualModules } from "./virtual/index.mjs";
 import { readFile } from "node:fs/promises";
 import { parse } from "graphql";
-
 //#region src/nitro/rollup.ts
+const GRAPHQL_FILE_RE = /\.(?:graphql|gql)$/i;
 async function rollupConfig(nitro) {
 	registerAllVirtualModules(nitro);
 	nitro.hooks.hook("rollup:before", (_, rollupConfig) => {
 		rollupConfig.plugins = rollupConfig.plugins || [];
-		const { include = /\.(?:graphql|gql)$/i, exclude, validate = false } = nitro.options.graphql?.loader || {};
+		const { include = GRAPHQL_FILE_RE, exclude, validate = false } = nitro.options.graphql?.loader || {};
 		if (Array.isArray(rollupConfig.plugins)) {
 			rollupConfig.plugins.push({
 				name: "nitro-graphql",
 				resolveId: {
 					order: "pre",
 					handler(id) {
-						if (/\.(?:graphql|gql)$/i.test(id)) return null;
+						if (GRAPHQL_FILE_RE.test(id)) return null;
 					}
 				},
 				load: {
@@ -40,7 +41,7 @@ async function rollupConfig(nitro) {
 				buildStart: {
 					order: "pre",
 					async handler() {
-						const result = await NitroAdapter.scanGraphql(nitro);
+						const result = await scanSchemasCore(createScanContextFromNitro(nitro));
 						for (const file of result.items) this.addWatchFile(file);
 					}
 				}
@@ -48,6 +49,5 @@ async function rollupConfig(nitro) {
 		}
 	});
 }
-
 //#endregion
-export { rollupConfig };
+export { rollupConfig };

package/dist/nitro/routes/_ws-handler.d.mts

@@ -0,0 +1,6 @@
+import { Hooks } from "crossws";
+
+//#region src/nitro/routes/_ws-handler.d.ts
+declare const wsHooks: Partial<Hooks>;
+//#endregion
+export { wsHooks };

package/dist/nitro/routes/_ws-handler.mjs

@@ -0,0 +1,49 @@
+import { createMergedSchema } from "../../core/schema/builder.mjs";
+import { handleProtocols } from "graphql-ws";
+import { makeHooks } from "graphql-ws/use/crossws";
+import { importedConfig } from "#nitro-graphql/graphql-config";
+import { moduleConfig } from "#nitro-graphql/module-config";
+import { directives } from "#nitro-graphql/server-directives";
+import { resolvers } from "#nitro-graphql/server-resolvers";
+import { schemas } from "#nitro-graphql/server-schemas";
+//#region src/nitro/routes/_ws-handler.ts
+let schema = null;
+/**
+* Get or create the merged GraphQL schema
+*/
+async function getSchema() {
+	if (!schema) schema = await createMergedSchema({
+		schemas,
+		resolvers,
+		directives,
+		moduleConfig
+	});
+	return schema;
+}
+const wsHooks = {
+	upgrade(request) {
+		const selected = handleProtocols(request.headers.get("sec-websocket-protocol") || "");
+		if (selected) return { headers: { "Sec-WebSocket-Protocol": selected } };
+		return {};
+	},
+	...makeHooks({
+		schema: () => getSchema(),
+		context: async (ctx) => {
+			const baseContext = { connectionParams: ctx.connectionParams };
+			if (typeof importedConfig.context === "function") {
+				const userContext = await importedConfig.context(baseContext);
+				return {
+					...baseContext,
+					...userContext
+				};
+			}
+			if (importedConfig.context && typeof importedConfig.context === "object") return {
+				...baseContext,
+				...importedConfig.context
+			};
+			return baseContext;
+		}
+	})
+};
+//#endregion
+export { wsHooks };

package/dist/nitro/routes/apollo-sandbox-script.d.mts

@@ -1,6 +1,6 @@
-import * as nitro_h311 from "nitro/h3";
+import * as nitro_h30 from "nitro/h3";
 
 //#region src/nitro/routes/apollo-sandbox-script.d.ts
-declare const _default: nitro_h311.EventHandlerWithFetch<nitro_h311.EventHandlerRequest, Promise<Response>>;
+declare const _default: nitro_h30.EventHandlerWithFetch<nitro_h30.EventHandlerRequest, Promise<Response>>;
 //#endregion
 export { _default as default };

package/dist/nitro/routes/apollo-sandbox-script.mjs

@@ -1,6 +1,5 @@
 import { createSandboxResponse } from "../../core/server/sandbox.mjs";
 import { defineEventHandler } from "nitro/h3";
-
 //#region src/nitro/routes/apollo-sandbox-script.ts
 /**
 * Proxy route for Apollo Sandbox script with long cache headers
@@ -9,6 +8,5 @@ import { defineEventHandler } from "nitro/h3";
 var apollo_sandbox_script_default = defineEventHandler(async () => {
 	return createSandboxResponse();
 });
-
 //#endregion
-export { apollo_sandbox_script_default as default };
+export { apollo_sandbox_script_default as default };

package/dist/nitro/routes/apollo-server-ws.d.mts

@@ -3,7 +3,7 @@ import * as nitro_h30 from "nitro/h3";
 //#region src/nitro/routes/apollo-server-ws.d.ts
 /**
  * Apollo Server WebSocket handler for subscriptions
- * Uses graphql-ws library with crossws adapter for proper protocol handling
+ * Uses shared WebSocket handler with graphql-ws and crossws
  *
  * Note: This handler works independently from Apollo Server for subscriptions,
  * as Apollo Server v5 requires separate WebSocket handling.

package/dist/nitro/routes/apollo-server-ws.mjs

@@ -1,53 +1,15 @@
-import { createMergedSchema } from "../../core/schema/builder.mjs";
+import { wsHooks } from "./_ws-handler.mjs";
 import { defineWebSocketHandler } from "nitro/h3";
-import { handleProtocols } from "graphql-ws";
-import { makeHooks } from "graphql-ws/use/crossws";
-import { importedConfig } from "#nitro-graphql/graphql-config";
-import { moduleConfig } from "#nitro-graphql/module-config";
-import { directives } from "#nitro-graphql/server-directives";
-import { resolvers } from "#nitro-graphql/server-resolvers";
-import { schemas } from "#nitro-graphql/server-schemas";
-
 //#region src/nitro/routes/apollo-server-ws.ts
-let schema = null;
 /**
-* Get or create the merged GraphQL schema
+* Apollo Server WebSocket handler for subscriptions
+* Uses shared WebSocket handler with graphql-ws and crossws
+*
+* Note: This handler works independently from Apollo Server for subscriptions,
+* as Apollo Server v5 requires separate WebSocket handling.
+*
+* @see https://github.com/enisdenjo/graphql-ws
 */
-async function getSchema() {
-	if (!schema) schema = await createMergedSchema({
-		schemas,
-		resolvers,
-		directives,
-		moduleConfig
-	});
-	return schema;
-}
-const hooks = {
-	upgrade(request) {
-		const selected = handleProtocols(request.headers.get("sec-websocket-protocol") || "");
-		if (selected) return { headers: { "Sec-WebSocket-Protocol": selected } };
-		return {};
-	},
-	...makeHooks({
-		schema: () => getSchema(),
-		context: async (ctx) => {
-			const baseContext = { connectionParams: ctx.connectionParams };
-			if (typeof importedConfig.context === "function") {
-				const userContext = await importedConfig.context(baseContext);
-				return {
-					...baseContext,
-					...userContext
-				};
-			}
-			if (importedConfig.context && typeof importedConfig.context === "object") return {
-				...baseContext,
-				...importedConfig.context
-			};
-			return baseContext;
-		}
-	})
-};
-var apollo_server_ws_default = defineWebSocketHandler(hooks);
-
+var apollo_server_ws_default = defineWebSocketHandler(wsHooks);
 //#endregion
-export { apollo_server_ws_default as default };
+export { apollo_server_ws_default as default };

package/dist/nitro/routes/apollo-server.d.mts

@@ -1,6 +1,6 @@
-import * as nitro_h31 from "nitro/h3";
+import * as nitro_h30 from "nitro/h3";
 
 //#region src/nitro/routes/apollo-server.d.ts
-declare const _default: nitro_h31.EventHandlerWithFetch<nitro_h31.EventHandlerRequest, Promise<any>>;
+declare const _default: nitro_h30.EventHandlerWithFetch<nitro_h30.EventHandlerRequest, Promise<unknown>>;
 //#endregion
 export { _default as default };

package/dist/nitro/routes/apollo-server.mjs

@@ -1,71 +1,30 @@
-import { createMergedSchema } from "../../core/schema/builder.mjs";
-import defu from "defu";
-import { ApolloServer } from "@apollo/server";
+import { BASE_SCHEMA_DEF } from "../../core/schema/builder.mjs";
+import { createApolloServerInstance } from "../../core/server/apollo.mjs";
 import { defineEventHandler } from "nitro/h3";
 import { importedConfig } from "#nitro-graphql/graphql-config";
 import { moduleConfig } from "#nitro-graphql/module-config";
 import { directives } from "#nitro-graphql/server-directives";
 import { resolvers } from "#nitro-graphql/server-resolvers";
 import { schemas } from "#nitro-graphql/server-schemas";
-import { ApolloServerPluginLandingPageDisabled } from "@apollo/server/plugin/disabled";
-import { ApolloServerPluginLandingPageLocalDefault } from "@apollo/server/plugin/landingPage/default";
 import { startServerAndCreateH3Handler } from "nitro-graphql/apollo";
-
 //#region src/nitro/routes/apollo-server.ts
-let apolloServer = null;
-let serverStarted = false;
-async function createApolloServer() {
-	if (!apolloServer) {
-		const schema = await createMergedSchema({
-			schemas,
-			resolvers,
-			directives,
-			moduleConfig
-		});
-		const securityConfig = moduleConfig.security || {
-			introspection: true,
-			playground: true,
-			maskErrors: false,
-			disableSuggestions: false
-		};
-		const plugins = [];
-		if (securityConfig.playground) plugins.push(ApolloServerPluginLandingPageLocalDefault({ embed: true }));
-		else plugins.push(ApolloServerPluginLandingPageDisabled());
-		const userFacingCodes = [
-			"BAD_USER_INPUT",
-			"GRAPHQL_VALIDATION_FAILED",
-			"UNAUTHENTICATED",
-			"FORBIDDEN",
-			"BAD_REQUEST"
-		];
-		apolloServer = new ApolloServer(defu({
-			schema,
-			introspection: securityConfig.introspection,
-			plugins,
-			formatError: securityConfig.maskErrors ? (formattedError, _error) => {
-				const code = formattedError?.extensions?.code;
-				if (code && userFacingCodes.includes(code)) return formattedError;
-				return {
-					message: "Internal server error",
-					extensions: { code: "INTERNAL_SERVER_ERROR" }
-				};
-			} : void 0
-		}, importedConfig));
-		if (!serverStarted) {
-			await apolloServer.start();
-			serverStarted = true;
-		}
-	}
-	return apolloServer;
-}
 let serverPromise = null;
+let cachedH3Handler = null;
 var apollo_server_default = defineEventHandler(async (event) => {
-	if (!serverPromise) serverPromise = createApolloServer();
-	return startServerAndCreateH3Handler(await serverPromise, {
-		context: async () => ({ event }),
+	if (!serverPromise) serverPromise = createApolloServerInstance({
+		schemas: [BASE_SCHEMA_DEF, ...schemas],
+		resolvers,
+		directives,
+		moduleConfig,
+		security: moduleConfig.security,
+		importedConfig
+	});
+	const server = await serverPromise;
+	if (!cachedH3Handler) cachedH3Handler = startServerAndCreateH3Handler(server, {
+		context: async (req) => ({ event: req.event }),
 		serverAlreadyStarted: true
-	})(event);
+	});
+	return cachedH3Handler(event);
 });
-
 //#endregion
-export { apollo_server_default as default };
+export { apollo_server_default as default };

package/dist/nitro/routes/debug.d.mts

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

package/dist/nitro/routes/debug.mjs

@@ -5,7 +5,6 @@ import { directives } from "#nitro-graphql/server-directives";
 import { resolvers } from "#nitro-graphql/server-resolvers";
 import { schemas } from "#nitro-graphql/server-schemas";
 import { debugInfo } from "#nitro-graphql/debug-info";
-
 //#region src/nitro/routes/debug.ts
 /**
 * Debug endpoint for inspecting virtual modules and GraphQL setup
@@ -16,11 +15,11 @@ import { debugInfo } from "#nitro-graphql/debug-info";
 * - /_nitro/graphql/debug?format=json - JSON API
 */
 var debug_default = defineEventHandler(async (event) => {
+	if (import.meta.env?.PROD || process.env.NODE_ENV === "production") return new Response("Not Found", { status: 404 });
 	const format = getQuery(event).format || "html";
 	const processedResolverFiles = debugInfo.scanned.resolverFiles.map((r) => {
-		const parts = r.specifier.split("/");
 		return {
-			file: parts[parts.length - 1],
+			file: r.specifier.split("/").at(-1),
 			fullPath: r.specifier,
 			exports: r.imports.map((i) => ({
 				name: i.name,
@@ -30,9 +29,8 @@ var debug_default = defineEventHandler(async (event) => {
 		};
 	});
 	const processedDirectiveFiles = debugInfo.scanned.directiveFiles.map((d) => {
-		const parts = d.specifier.split("/");
 		return {
-			file: parts[parts.length - 1],
+			file: d.specifier.split("/").at(-1),
 			fullPath: d.specifier,
 			exports: d.imports.map((i) => ({
 				name: i.name,
@@ -97,6 +95,5 @@ var debug_default = defineEventHandler(async (event) => {
 	event.res.headers.set("Content-Type", "text/html");
 	return generateDebugHtml(fullDebugInfo);
 });
-
 //#endregion
-export { debug_default as default };
+export { debug_default as default };

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

@@ -1,12 +1,12 @@
-import * as nitro_h35 from "nitro/h3";
+import * as nitro_h30 from "nitro/h3";
 
 //#region src/nitro/routes/graphql-yoga-ws.d.ts
 /**
  * GraphQL Yoga WebSocket handler for subscriptions
- * Uses graphql-ws library with crossws adapter for proper protocol handling
+ * Uses shared WebSocket handler with graphql-ws and crossws
  *
  * @see https://github.com/enisdenjo/graphql-ws
  */
-declare const _default: nitro_h35.EventHandler<nitro_h35.EventHandlerRequest, unknown>;
+declare const _default: nitro_h30.EventHandler<nitro_h30.EventHandlerRequest, unknown>;
 //#endregion
 export { _default as default };

package/dist/nitro/routes/graphql-yoga-ws.mjs

@@ -1,53 +1,12 @@
-import { createMergedSchema } from "../../core/schema/builder.mjs";
+import { wsHooks } from "./_ws-handler.mjs";
 import { defineWebSocketHandler } from "nitro/h3";
-import { handleProtocols } from "graphql-ws";
-import { makeHooks } from "graphql-ws/use/crossws";
-import { importedConfig } from "#nitro-graphql/graphql-config";
-import { moduleConfig } from "#nitro-graphql/module-config";
-import { directives } from "#nitro-graphql/server-directives";
-import { resolvers } from "#nitro-graphql/server-resolvers";
-import { schemas } from "#nitro-graphql/server-schemas";
-
 //#region src/nitro/routes/graphql-yoga-ws.ts
-let schema = null;
 /**
-* Get or create the merged GraphQL schema
+* GraphQL Yoga WebSocket handler for subscriptions
+* Uses shared WebSocket handler with graphql-ws and crossws
+*
+* @see https://github.com/enisdenjo/graphql-ws
 */
-async function getSchema() {
-	if (!schema) schema = await createMergedSchema({
-		schemas,
-		resolvers,
-		directives,
-		moduleConfig
-	});
-	return schema;
-}
-const hooks = {
-	upgrade(request) {
-		const selected = handleProtocols(request.headers.get("sec-websocket-protocol") || "");
-		if (selected) return { headers: { "Sec-WebSocket-Protocol": selected } };
-		return {};
-	},
-	...makeHooks({
-		schema: () => getSchema(),
-		context: async (ctx) => {
-			const baseContext = { connectionParams: ctx.connectionParams };
-			if (typeof importedConfig.context === "function") {
-				const userContext = await importedConfig.context(baseContext);
-				return {
-					...baseContext,
-					...userContext
-				};
-			}
-			if (importedConfig.context && typeof importedConfig.context === "object") return {
-				...baseContext,
-				...importedConfig.context
-			};
-			return baseContext;
-		}
-	})
-};
-var graphql_yoga_ws_default = defineWebSocketHandler(hooks);
-
+var graphql_yoga_ws_default = defineWebSocketHandler(wsHooks);
 //#endregion
-export { graphql_yoga_ws_default as default };
+export { graphql_yoga_ws_default as default };

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

@@ -1,4 +1,4 @@
-import * as nitro_h37 from "nitro/h3";
+import * as nitro_h30 from "nitro/h3";
 
 //#region src/nitro/routes/graphql-yoga.d.ts
 /**
@@ -7,6 +7,6 @@ import * as nitro_h37 from "nitro/h3";
  * Nitro/H3 wrapper around the core GraphQL Yoga server.
  * Uses virtual modules to load schemas, resolvers, and directives.
  */
-declare const _default: nitro_h37.EventHandlerWithFetch<nitro_h37.EventHandlerRequest, Promise<Response>>;
+declare const _default: nitro_h30.EventHandlerWithFetch<nitro_h30.EventHandlerRequest, Promise<Response>>;
 //#endregion
 export { _default as default };

package/dist/nitro/routes/graphql-yoga.mjs

@@ -1,29 +1,30 @@
-import { BASE_SCHEMA, createYogaServer } from "../../core/server/yoga.mjs";
+import { BASE_SCHEMA_DEF } from "../../core/schema/builder.mjs";
+import { createYogaServer } from "../../core/server/yoga.mjs";
 import { defineEventHandler, getQuery } from "nitro/h3";
 import { importedConfig } from "#nitro-graphql/graphql-config";
 import { moduleConfig } from "#nitro-graphql/module-config";
 import { directives } from "#nitro-graphql/server-directives";
 import { resolvers } from "#nitro-graphql/server-resolvers";
 import { schemas } from "#nitro-graphql/server-schemas";
-
 //#region src/nitro/routes/graphql-yoga.ts
 const PLAYGROUND_CACHE_HEADER = "public, max-age=2592000, stale-while-revalidate=86400";
 let server = null;
 var graphql_yoga_default = defineEventHandler(async (event) => {
 	if (!server) server = await createYogaServer({
-		schemas: [BASE_SCHEMA, ...schemas],
+		schemas: [BASE_SCHEMA_DEF, ...schemas],
 		resolvers,
 		directives,
 		moduleConfig,
-		endpoint: "/api/graphql",
+		endpoint: moduleConfig.endpoint?.graphql || "/api/graphql",
 		security: moduleConfig.security,
 		importedConfig
 	});
 	const response = await server.fetch(event.req, event);
 	const isPlaygroundRequest = event.req.method === "GET" && !getQuery(event).query;
 	if (event.res.status && event.res.status !== 200) return new Response(response.body, {
-		...response,
-		status: event.res.status
+		status: event.res.status,
+		statusText: response.statusText,
+		headers: response.headers
 	});
 	if (isPlaygroundRequest && response.headers.get("content-type")?.includes("text/html")) {
 		const headers = new Headers(response.headers);
@@ -36,6 +37,5 @@ var graphql_yoga_default = defineEventHandler(async (event) => {
 	}
 	return new Response(response.body, response);
 });
-
 //#endregion
-export { graphql_yoga_default as default };
+export { graphql_yoga_default as default };

package/dist/nitro/routes/health.d.mts

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