nitro-graphql 1.4.3 → 2.0.0-beta.1

package/dist/ecosystem/nuxt.js

@@ -43,9 +43,7 @@ var nuxt_default = defineNuxtModule({
 			nitroConfig.graphql.layerDirectories = layerDirectories;
 			nitroConfig.graphql.layerServerDirs = layerServerDirs;
 			nitroConfig.graphql.layerAppDirs = layerAppDirs;
-			const appGraphqlDir = resolve(nuxt.options.rootDir, "app/graphql");
-			const hasAppGraphqlDir = existsSync(appGraphqlDir);
-			if (!hasAppGraphqlDir) {
+			if (!existsSync(resolve(nuxt.options.rootDir, "app/graphql"))) {
 				const defaultDir = join(clientDir, "default");
 				if (!existsSync(defaultDir)) mkdirSync(defaultDir, { recursive: true });
 				const sampleQueryFile = join(defaultDir, "queries.graphql");

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { StandardSchemaV1 } from "./types/standard-schema.js";
 import { CodegenClientConfig, CodegenServerConfig, ExternalGraphQLService, FederationConfig, GenImport, GenericSdkConfig, NitroGraphQLOptions } from "./types/index.js";
-import * as nitropack0 from "nitropack";
+import * as nitro_types0 from "nitro/types";
 
 //#region src/index.d.ts
-declare const _default: nitropack0.NitroModule;
+declare const _default: nitro_types0.NitroModule;
 //#endregion
 export { CodegenClientConfig, CodegenServerConfig, ExternalGraphQLService, FederationConfig, GenImport, GenericSdkConfig, NitroGraphQLOptions, StandardSchemaV1, _default as default };

package/dist/index.js

@@ -7,7 +7,6 @@ import { fileURLToPath } from "node:url";
 import { watch } from "chokidar";
 import consola from "consola";
 import defu from "defu";
-import { defineNitroModule } from "nitropack/kit";
 import { dirname, join, relative, resolve } from "pathe";
 
 //#region src/index.ts
@@ -96,28 +95,21 @@ var src_default = defineNitroModule({
 		nitro.hooks.hook("close", () => {
 			watcher.close();
 		});
-		const tsConfigPath = resolve(nitro.options.buildDir, nitro.options.typescript.tsconfigPath);
-		const tsconfigDir = dirname(tsConfigPath);
+		const tsconfigDir = dirname(resolve(nitro.options.buildDir, nitro.options.typescript.tsconfigPath));
 		const typesDir = resolve(nitro.options.buildDir, "types");
-		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.scanSchemas = await scanSchemas(nitro);
+		nitro.scanDocuments = await scanDocs(nitro);
+		nitro.scanResolvers = await scanResolvers(nitro);
 		const directives = await scanDirectives(nitro);
 		nitro.scanDirectives = directives;
 		await generateDirectiveSchemas(nitro, directives);
 		nitro.hooks.hook("dev:start", async () => {
-			const schemas$1 = await scanSchemas(nitro);
-			nitro.scanSchemas = schemas$1;
-			const resolvers$1 = await scanResolvers(nitro);
-			nitro.scanResolvers = resolvers$1;
+			nitro.scanSchemas = await scanSchemas(nitro);
+			nitro.scanResolvers = await scanResolvers(nitro);
 			const directives$1 = await scanDirectives(nitro);
 			nitro.scanDirectives = directives$1;
 			await generateDirectiveSchemas(nitro, directives$1);
-			const docs$1 = await scanDocs(nitro);
-			nitro.scanDocuments = docs$1;
+			nitro.scanDocuments = await scanDocs(nitro);
 		});
 		await rollupConfig(nitro);
 		await serverTypeGeneration(nitro);
@@ -128,9 +120,9 @@ var src_default = defineNitroModule({
 		});
 		const runtime = fileURLToPath(new URL("routes", import.meta.url));
 		const methods = [
-			"get",
-			"post",
-			"options"
+			"GET",
+			"POST",
+			"OPTIONS"
 		];
 		if (nitro.options.graphql?.framework === "graphql-yoga") for (const method of methods) nitro.options.handlers.push({
 			route: nitro.options.runtimeConfig.graphql?.endpoint?.graphql || "/api/graphql",
@@ -145,7 +137,7 @@ var src_default = defineNitroModule({
 		nitro.options.handlers.push({
 			route: nitro.options.runtimeConfig.graphql?.endpoint?.healthCheck || "/api/graphql/health",
 			handler: join(runtime, "health"),
-			method: "get"
+			method: "GET"
 		});
 		if (nitro.options.imports) {
 			nitro.options.imports.presets ??= [];
@@ -170,7 +162,6 @@ var src_default = defineNitroModule({
 				if (id.endsWith(".graphql") || id.endsWith(".gql")) return "schemas";
 				if (id.endsWith(".resolver.ts")) return "resolvers";
 				if (typeof manualChunks === "function") return manualChunks(id, meta);
-				return void 0;
 			};
 			rollupConfig$1.output.chunkFileNames = (chunkInfo) => {
 				if (chunkInfo.moduleIds && chunkInfo.moduleIds.some((id) => id.endsWith(".graphql") || id.endsWith(".resolver.ts") || id.endsWith(".gql"))) return `chunks/graphql/[name].mjs`;

package/dist/rollup.js

@@ -49,26 +49,23 @@ async function rollupConfig(app) {
 }
 function virtualSchemas(app) {
 	const getSchemas = () => {
-		const schemas = [...app.scanSchemas, ...app.options.graphql?.typedefs ?? []];
-		return schemas;
+		return [...app.scanSchemas, ...app.options.graphql?.typedefs ?? []];
 	};
 	app.options.virtual ??= {};
 	app.options.virtual["#nitro-internal-virtual/server-schemas"] = () => {
 		const imports = getSchemas();
-		const code = `
+		return `
 ${imports.map((handler) => `import ${getImportId(handler)} from '${handler}';`).join("\n")}
 
 export const schemas = [
 ${imports.map((h) => `{ def: ${getImportId(h)} }`).join(",\n")}
 ];
     `;
-		return code;
 	};
 }
 function virtualResolvers(app) {
 	const getResolvers = () => {
-		const resolvers = [...app.scanResolvers];
-		return resolvers;
+		return [...app.scanResolvers];
 	};
 	app.options.virtual ??= {};
 	app.options.virtual["#nitro-internal-virtual/server-resolvers"] = () => {
@@ -76,22 +73,19 @@ function virtualResolvers(app) {
 		const importsContent = [...imports.map(({ specifier, imports: imports$1, options }) => {
 			return genImport(specifier, imports$1, options);
 		})];
-		const data = imports.map(({ imports: imports$1 }) => imports$1.map((i) => `{ resolver: ${i.as} }`).join(",\n")).filter(Boolean).join(",\n");
 		const content = [
 			"export const resolvers = [",
-			data,
+			imports.map(({ imports: imports$1 }) => imports$1.map((i) => `{ resolver: ${i.as} }`).join(",\n")).filter(Boolean).join(",\n"),
 			"]",
 			""
 		];
 		content.unshift(...importsContent);
-		const code = content.join("\n");
-		return code;
+		return content.join("\n");
 	};
 }
 function virtualDirectives(app) {
 	const getDirectives = () => {
-		const directives = [...app.scanDirectives || []];
-		return directives;
+		return [...app.scanDirectives || []];
 	};
 	app.options.virtual ??= {};
 	app.options.virtual["#nitro-internal-virtual/server-directives"] = () => {
@@ -99,16 +93,14 @@ function virtualDirectives(app) {
 		const importsContent = [...imports.map(({ specifier, imports: imports$1, options }) => {
 			return genImport(specifier, imports$1, options);
 		})];
-		const data = imports.map(({ imports: imports$1 }) => imports$1.map((i) => `{ directive: ${i.as} }`).join(",\n")).filter(Boolean).join(",\n");
 		const content = [
 			"export const directives = [",
-			data,
+			imports.map(({ imports: imports$1 }) => imports$1.map((i) => `{ directive: ${i.as} }`).join(",\n")).filter(Boolean).join(",\n"),
 			"]",
 			""
 		];
 		content.unshift(...importsContent);
-		const code = content.join("\n");
-		return code;
+		return content.join("\n");
 	};
 }
 function getGraphQLConfig(app) {

package/dist/routes/apollo-server.d.ts

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

package/dist/routes/apollo-server.js

@@ -18,8 +18,7 @@ let buildSubgraphSchema = null;
 async function loadFederationSupport() {
 	if (buildSubgraphSchema !== null) return buildSubgraphSchema;
 	try {
-		const apolloSubgraph = await import("@apollo/subgraph");
-		buildSubgraphSchema = apolloSubgraph.buildSubgraphSchema;
+		buildSubgraphSchema = (await import("@apollo/subgraph")).buildSubgraphSchema;
 	} catch {
 		buildSubgraphSchema = false;
 	}
@@ -27,8 +26,7 @@ async function loadFederationSupport() {
 }
 async function createMergedSchema() {
 	try {
-		const mergedSchemas = schemas.map((schema$1) => schema$1.def).join("\n\n");
-		const typeDefs = mergeTypeDefs([mergedSchemas], {
+		const typeDefs = mergeTypeDefs([schemas.map((schema$1) => schema$1.def).join("\n\n")], {
 			throwOnConflict: true,
 			commentDescriptions: true,
 			sort: true
@@ -38,13 +36,11 @@ async function createMergedSchema() {
 		let schema;
 		if (federationEnabled) {
 			const buildSubgraph = await loadFederationSupport();
-			if (buildSubgraph) {
-				const typeDefsDoc = typeof typeDefs === "string" ? parse(typeDefs) : typeDefs;
-				schema = buildSubgraph({
-					typeDefs: typeDefsDoc,
-					resolvers: mergedResolvers
-				});
-			} else {
+			if (buildSubgraph) schema = buildSubgraph({
+				typeDefs: typeof typeDefs === "string" ? parse(typeDefs) : typeDefs,
+				resolvers: mergedResolvers
+			});
+			else {
 				console.warn("Federation enabled but @apollo/subgraph not available, falling back to regular schema");
 				schema = makeExecutableSchema({
 					typeDefs,
@@ -68,9 +64,8 @@ let apolloServer = null;
 let serverStarted = false;
 async function createApolloServer() {
 	if (!apolloServer) {
-		const schema = await createMergedSchema();
 		apolloServer = new ApolloServer(defu({
-			schema,
+			schema: await createMergedSchema(),
 			introspection: true,
 			plugins: [ApolloServerPluginLandingPageLocalDefault({ embed: true })]
 		}, importedConfig));
@@ -84,12 +79,10 @@ async function createApolloServer() {
 let serverPromise = null;
 var apollo_server_default = defineEventHandler(async (event) => {
 	if (!serverPromise) serverPromise = createApolloServer();
-	const server = await serverPromise;
-	const h3Handler = startServerAndCreateH3Handler(server, {
+	return startServerAndCreateH3Handler(await serverPromise, {
 		context: async () => ({ event }),
 		serverAlreadyStarted: true
-	});
-	return h3Handler(event);
+	})(event);
 });
 
 //#endregion

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

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

package/dist/routes/graphql-yoga.js

@@ -8,7 +8,7 @@ import { directives } from "#nitro-internal-virtual/server-directives";
 import { resolvers } from "#nitro-internal-virtual/server-resolvers";
 import { schemas } from "#nitro-internal-virtual/server-schemas";
 import { makeExecutableSchema } from "@graphql-tools/schema";
-import { defineEventHandler, toWebRequest } from "h3";
+import { defineEventHandler } from "h3";
 import { createYoga } from "graphql-yoga";
 
 //#region src/routes/graphql-yoga.ts
@@ -16,8 +16,7 @@ let buildSubgraphSchema = null;
 async function loadFederationSupport() {
 	if (buildSubgraphSchema !== null) return buildSubgraphSchema;
 	try {
-		const apolloSubgraph = await import("@apollo/subgraph");
-		buildSubgraphSchema = apolloSubgraph.buildSubgraphSchema;
+		buildSubgraphSchema = (await import("@apollo/subgraph")).buildSubgraphSchema;
 	} catch {
 		buildSubgraphSchema = false;
 	}
@@ -42,8 +41,7 @@ new window.EmbeddedSandbox({
 </html>`;
 async function createMergedSchema() {
 	try {
-		const mergedSchemas = schemas.map((schema$1) => schema$1.def).join("\n\n");
-		const typeDefs = mergeTypeDefs([mergedSchemas], {
+		const typeDefs = mergeTypeDefs([schemas.map((schema$1) => schema$1.def).join("\n\n")], {
 			throwOnConflict: true,
 			commentDescriptions: true,
 			sort: true
@@ -53,13 +51,11 @@ async function createMergedSchema() {
 		let schema;
 		if (federationEnabled) {
 			const buildSubgraph = await loadFederationSupport();
-			if (buildSubgraph) {
-				const typeDefsDoc = typeof typeDefs === "string" ? parse(typeDefs) : typeDefs;
-				schema = buildSubgraph({
-					typeDefs: typeDefsDoc,
-					resolvers: mergedResolvers
-				});
-			} else {
+			if (buildSubgraph) schema = buildSubgraph({
+				typeDefs: typeof typeDefs === "string" ? parse(typeDefs) : typeDefs,
+				resolvers: mergedResolvers
+			});
+			else {
 				console.warn("Federation enabled but @apollo/subgraph not available, falling back to regular schema");
 				schema = makeExecutableSchema({
 					typeDefs,
@@ -81,17 +77,13 @@ async function createMergedSchema() {
 }
 let yoga;
 var graphql_yoga_default = defineEventHandler(async (event) => {
-	if (!yoga) {
-		const schema = await createMergedSchema();
-		yoga = createYoga(defu({
-			schema,
-			graphqlEndpoint: "/api/graphql",
-			landingPage: false,
-			renderGraphiQL: () => apolloSandboxHtml
-		}, importedConfig));
-	}
-	const request = toWebRequest(event);
-	const response = await yoga.handleRequest(request, event);
+	if (!yoga) yoga = createYoga(defu({
+		schema: await createMergedSchema(),
+		graphqlEndpoint: "/api/graphql",
+		landingPage: false,
+		renderGraphiQL: () => apolloSandboxHtml
+	}, importedConfig));
+	const response = await yoga.handleRequest(event.req, event);
 	return new Response(response.body, response);
 });
 

package/dist/routes/health.d.ts

@@ -1,10 +1,6 @@
-import * as h33 from "h3";
+import * as h30 from "h3";
 
 //#region src/routes/health.d.ts
-declare const _default: h33.EventHandler<h33.EventHandlerRequest, Promise<{
-  status: string;
-  message: string;
-  timestamp: string;
-}>>;
+declare const _default: h30.EventHandler<h30.EventHandlerRequest, unknown>;
 //#endregion
 export { _default as default };

package/dist/routes/health.js

@@ -1,11 +1,12 @@
-import { defineEventHandler, setResponseStatus } from "h3";
-import { useRuntimeConfig } from "nitropack/runtime";
+import { defineEventHandler } from "h3";
+import { useRuntimeConfig } from "nitro/runtime";
 
 //#region src/routes/health.ts
 var health_default = defineEventHandler(async (event) => {
 	const runtime = useRuntimeConfig();
 	if (!runtime.graphql || !runtime.graphql.endpoint?.graphql) {
-		setResponseStatus(event, 404);
+		event.res.status = 404;
+		event.res.statusText = "Not Found";
 		return {
 			status: "error",
 			message: "GraphQL health check endpoint is not configured",
@@ -31,7 +32,8 @@ var health_default = defineEventHandler(async (event) => {
 		};
 		throw new Error("Invalid response from GraphQL server");
 	} catch (error) {
-		setResponseStatus(event, 503);
+		event.res.status = 503;
+		event.res.statusText = "Service Unavailable";
 		return {
 			status: "unhealthy",
 			message: error instanceof Error ? error.message : "GraphQL server is not responding",

package/dist/types/index.d.ts

@@ -27,7 +27,7 @@ interface GenImport {
   imports: IESMImport[];
   options?: ESMCodeGenOptions;
 }
-declare module 'nitropack/types' {
+declare module 'nitro/types' {
   interface Nitro {
     scanSchemas: string[];
     scanDocuments: string[];
@@ -46,7 +46,7 @@ declare module 'nitropack/types' {
     };
   }
 }
-declare module 'nitropack' {
+declare module 'nitro/types' {
   interface NitroOptions {
     graphql?: NitroGraphQLOptions;
   }

package/dist/utils/apollo.js

@@ -49,13 +49,12 @@ function normalizeQueryString(url) {
 	return url.split("?")[1] || "";
 }
 async function normalizeBody(event) {
-	const PayloadMethods = [
+	if (isMethod(event, [
 		"PATCH",
 		"POST",
 		"PUT",
 		"DELETE"
-	];
-	if (isMethod(event, PayloadMethods)) return await readBody(event);
+	])) return await readBody(event);
 }
 
 //#endregion

package/dist/utils/client-codegen.js

@@ -29,8 +29,7 @@ function pluginContent(_schema, _documents, _config, _info) {
 	};
 }
 async function graphQLLoadSchemaSync(schemaPointers, data = {}) {
-	const pointers = Array.isArray(schemaPointers) ? schemaPointers : [schemaPointers];
-	const filteredPointers = [...pointers, "!**/vfs/**"];
+	const filteredPointers = [...Array.isArray(schemaPointers) ? schemaPointers : [schemaPointers], "!**/vfs/**"];
 	let result;
 	try {
 		result = loadSchemaSync(filteredPointers, {
@@ -58,8 +57,7 @@ async function loadExternalSchema(service, buildDir) {
 			const defaultPath = resolve(buildDir, "graphql", "schemas", `${service.name}.graphql`);
 			const schemaFilePath = service.downloadPath ? resolve(service.downloadPath) : defaultPath;
 			if (existsSync(schemaFilePath)) try {
-				const result$1 = loadSchemaSync([schemaFilePath], { loaders: [new GraphQLFileLoader()] });
-				return result$1;
+				return loadSchemaSync([schemaFilePath], { loaders: [new GraphQLFileLoader()] });
 			} catch {
 				consola$1.warn(`[graphql:${service.name}] Cached schema invalid, loading from source`);
 			}
@@ -70,14 +68,13 @@ async function loadExternalSchema(service, buildDir) {
 		if (hasLocalFiles) loaders.push(new GraphQLFileLoader());
 		if (hasUrls) loaders.push(new UrlLoader());
 		if (loaders.length === 0) throw new Error("No appropriate loaders found for schema sources");
-		const result = loadSchemaSync(schemas, {
+		return loadSchemaSync(schemas, {
 			loaders,
 			...Object.keys(headers).length > 0 && { headers }
 		});
-		return result;
 	} catch (error) {
 		consola$1.error(`[graphql:${service.name}] Failed to load external schema:`, error);
-		return void 0;
+		return;
 	}
 }
 /**
@@ -91,7 +88,7 @@ function isUrl(path) {
 */
 async function downloadAndSaveSchema(service, buildDir) {
 	const downloadMode = service.downloadSchema;
-	if (!downloadMode || downloadMode === "manual") return void 0;
+	if (!downloadMode || downloadMode === "manual") return;
 	const defaultPath = resolve(buildDir, "graphql", "schemas", `${service.name}.graphql`);
 	const schemaFilePath = service.downloadPath ? resolve(service.downloadPath) : defaultPath;
 	try {
@@ -104,15 +101,13 @@ async function downloadAndSaveSchema(service, buildDir) {
 		if (downloadMode === "always") {
 			shouldDownload = true;
 			if (fileExists && hasUrlSchemas) try {
-				const remoteSchema = loadSchemaSync(schemas.filter(isUrl), {
+				const remoteSchemaString = printSchemaWithDirectives(loadSchemaSync(schemas.filter(isUrl), {
 					loaders: [new UrlLoader()],
 					...Object.keys(headers).length > 0 && { headers }
-				});
-				const remoteSchemaString = printSchemaWithDirectives(remoteSchema);
+				}));
 				const remoteHash = createHash("md5").update(remoteSchemaString).digest("hex");
 				const localSchemaString = readFileSync(schemaFilePath, "utf-8");
-				const localHash = createHash("md5").update(localSchemaString).digest("hex");
-				if (remoteHash === localHash) {
+				if (remoteHash === createHash("md5").update(localSchemaString).digest("hex")) {
 					shouldDownload = false;
 					consola$1.info(`[graphql:${service.name}] Schema is up-to-date, using cached version`);
 				}
@@ -137,24 +132,21 @@ async function downloadAndSaveSchema(service, buildDir) {
 		} else if (downloadMode === true || downloadMode === "once") shouldDownload = !fileExists;
 		if (shouldDownload) {
 			if (hasUrlSchemas && hasLocalSchemas) {
-				const schema = loadSchemaSync(schemas, {
+				const schemaString = printSchemaWithDirectives(loadSchemaSync(schemas, {
 					loaders: [new GraphQLFileLoader(), new UrlLoader()],
 					...Object.keys(headers).length > 0 && { headers }
-				});
-				const schemaString = printSchemaWithDirectives(schema);
+				}));
 				mkdirSync(dirname(schemaFilePath), { recursive: true });
 				writeFileSync(schemaFilePath, schemaString, "utf-8");
 			} else if (hasUrlSchemas) {
-				const schema = loadSchemaSync(schemas, {
+				const schemaString = printSchemaWithDirectives(loadSchemaSync(schemas, {
 					loaders: [new UrlLoader()],
 					...Object.keys(headers).length > 0 && { headers }
-				});
-				const schemaString = printSchemaWithDirectives(schema);
+				}));
 				mkdirSync(dirname(schemaFilePath), { recursive: true });
 				writeFileSync(schemaFilePath, schemaString, "utf-8");
 			} else if (hasLocalSchemas) {
-				const schema = loadSchemaSync(schemas, { loaders: [new GraphQLFileLoader()] });
-				const schemaString = printSchemaWithDirectives(schema);
+				const schemaString = printSchemaWithDirectives(loadSchemaSync(schemas, { loaders: [new GraphQLFileLoader()] }));
 				mkdirSync(dirname(schemaFilePath), { recursive: true });
 				writeFileSync(schemaFilePath, schemaString, "utf-8");
 			}
@@ -162,13 +154,12 @@ async function downloadAndSaveSchema(service, buildDir) {
 		return schemaFilePath;
 	} catch (error) {
 		consola$1.error(`[graphql:${service.name}] Failed to download/copy schema:`, error);
-		return void 0;
+		return;
 	}
 }
 async function loadGraphQLDocuments(patterns) {
 	try {
-		const result = await loadDocuments(patterns, { loaders: [new GraphQLFileLoader()] });
-		return result;
+		return await loadDocuments(patterns, { loaders: [new GraphQLFileLoader()] });
 	} catch (e) {
 		if ((e.message || "").includes("Unable to find any GraphQL type definitions for the following pointers:")) return [];
 		else throw e;
@@ -180,7 +171,7 @@ async function generateClientTypes(schema, docs, config = {}, sdkConfig = {}, ou
 		return false;
 	}
 	const serviceLabel = serviceName ? `:${serviceName}` : "";
-	const defaultConfig = {
+	const mergedConfig = defu$1({
 		emitLegacyCommonJSImports: false,
 		useTypeImports: true,
 		enumsAsTypes: true,
@@ -204,12 +195,11 @@ async function generateClientTypes(schema, docs, config = {}, sdkConfig = {}, ou
 				output: "File"
 			}
 		}
-	};
-	const mergedConfig = defu$1(defaultConfig, config);
+	}, config);
 	const mergedSdkConfig = defu$1(mergedConfig, sdkConfig);
 	try {
-		if (docs.length === 0) {
-			const output$1 = await codegen({
+		if (docs.length === 0) return {
+			types: await codegen({
 				filename: outputPath || "client-types.generated.ts",
 				schema: parse(printSchemaWithDirectives(schema)),
 				documents: [],
@@ -219,8 +209,8 @@ async function generateClientTypes(schema, docs, config = {}, sdkConfig = {}, ou
 					pluginContent: { plugin: pluginContent },
 					typescript: { plugin }
 				}
-			});
-			const sdkContent$1 = `// THIS FILE IS GENERATED, DO NOT EDIT!
+			}),
+			sdk: `// THIS FILE IS GENERATED, DO NOT EDIT!
 /* eslint-disable eslint-comments/no-unlimited-disable */
 /* tslint:disable */
 /* eslint-disable */
@@ -244,12 +234,8 @@ export function getSdk(requester: Requester): Sdk {
     }
   }
 }
-`;
-			return {
-				types: output$1,
-				sdk: sdkContent$1
-			};
-		}
+`
+		};
 		const output = await codegen({
 			filename: outputPath || "client-types.generated.ts",
 			schema: parse(printSchemaWithDirectives(schema)),
@@ -279,16 +265,14 @@ export function getSdk(requester: Requester): Sdk {
 				typescriptGenericSdk: { plugin: plugin$1 }
 			}
 		});
-		const results = await Promise.all(sdkOutput.map(async (config$1) => {
-			return {
-				file: config$1.filename,
-				content: await codegen(config$1)
-			};
-		}));
-		const sdkContent = results[0]?.content || "";
 		return {
 			types: output,
-			sdk: sdkContent
+			sdk: (await Promise.all(sdkOutput.map(async (config$1) => {
+				return {
+					file: config$1.filename,
+					content: await codegen(config$1)
+				};
+			})))[0]?.content || ""
 		};
 	} catch (error) {
 		consola$1.warn(`[graphql${serviceLabel}] Client type generation failed:`, error);
@@ -299,9 +283,7 @@ export function getSdk(requester: Requester): Sdk {
 * Generate client types for external GraphQL service
 */
 async function generateExternalClientTypes(service, schema, docs) {
-	const config = service.codegen?.client || {};
-	const sdkConfig = service.codegen?.clientSDK || {};
-	return generateClientTypes(schema, docs, config, sdkConfig, void 0, service.name);
+	return generateClientTypes(schema, docs, service.codegen?.client || {}, service.codegen?.clientSDK || {}, void 0, service.name);
 }
 
 //#endregion

package/dist/utils/directive-parser.js

@@ -109,14 +109,12 @@ var DirectiveParser = class {
 	*/
 	extractStringLiteral(node) {
 		if (node?.type === "Literal" && typeof node.value === "string") return node.value;
-		return void 0;
 	}
 	/**
 	* Extract boolean literal value
 	*/
 	extractBooleanLiteral(node) {
 		if (node?.type === "Literal" && typeof node.value === "boolean") return node.value;
-		return void 0;
 	}
 	/**
 	* Extract array of strings
@@ -169,7 +167,6 @@ var DirectiveParser = class {
 	*/
 	extractLiteralValue(node) {
 		if (node?.type === "Literal") return node.value;
-		return void 0;
 	}
 };
 /**
@@ -177,15 +174,12 @@ var DirectiveParser = class {
 */
 function generateDirectiveSchema(directive) {
 	let args = "";
-	if (directive.args && Object.keys(directive.args).length > 0) {
-		const argDefs = Object.entries(directive.args).map(([name, arg]) => {
-			let defaultValue = "";
-			if (arg.defaultValue !== void 0) if (typeof arg.defaultValue === "string") defaultValue = ` = "${arg.defaultValue}"`;
-			else defaultValue = ` = ${arg.defaultValue}`;
-			return `${name}: ${arg.type}${defaultValue}`;
-		});
-		args = `(${argDefs.join(", ")})`;
-	}
+	if (directive.args && Object.keys(directive.args).length > 0) args = `(${Object.entries(directive.args).map(([name, arg]) => {
+		let defaultValue = "";
+		if (arg.defaultValue !== void 0) if (typeof arg.defaultValue === "string") defaultValue = ` = "${arg.defaultValue}"`;
+		else defaultValue = ` = ${arg.defaultValue}`;
+		return `${name}: ${arg.type}${defaultValue}`;
+	}).join(", ")})`;
 	const locations = directive.locations.join(" | ");
 	return `directive @${directive.name}${args} on ${locations}`;
 }
@@ -220,10 +214,7 @@ ${directiveSchemas.join("\n\n")}`;
 		const targetDir = dirname(directivesPath);
 		if (!existsSync(targetDir)) mkdirSync(targetDir, { recursive: true });
 		let shouldWrite = true;
-		if (existsSync(directivesPath)) {
-			const existingContent = readFileSync(directivesPath, "utf-8");
-			shouldWrite = existingContent !== content;
-		}
+		if (existsSync(directivesPath)) shouldWrite = readFileSync(directivesPath, "utf-8") !== content;
 		if (shouldWrite) writeFileSync(directivesPath, content, "utf-8");
 		if (!nitro.scanSchemas.includes(directivesPath)) nitro.scanSchemas.push(directivesPath);
 	}

package/dist/utils/index.d.ts

@@ -1,6 +1,6 @@
 import { GenImport } from "../types/index.js";
 import { directiveParser, generateDirectiveSchema, generateDirectiveSchemas } from "./directive-parser.js";
-import { Nitro } from "nitropack";
+import { Nitro } from "nitro/types";
 
 //#region src/utils/index.d.ts
 declare const GLOB_SCAN_PATTERN = "**/*.{graphql,gql,js,mjs,cjs,ts,mts,cts,tsx,jsx}";

package/dist/utils/index.js

@@ -44,8 +44,7 @@ function relativeWithDot(from, to) {
 	return RELATIVE_RE.test(rel) ? rel : `./${rel}`;
 }
 async function scanGraphql(nitro) {
-	const files = await scanFiles(nitro, "graphql");
-	return files.map((f) => f.fullPath);
+	return (await scanFiles(nitro, "graphql")).map((f) => f.fullPath);
 }
 async function scanResolvers(nitro) {
 	const files = await scanFiles(nitro, "graphql", "**/*.resolver.{ts,js}");
@@ -123,12 +122,10 @@ async function scanDirectives(nitro) {
 	return exportName;
 }
 async function scanTypeDefs(nitro) {
-	const files = await scanFiles(nitro, "graphql", "**/*.typedef.{ts,js}");
-	return files.map((f) => f.fullPath);
+	return (await scanFiles(nitro, "graphql", "**/*.typedef.{ts,js}")).map((f) => f.fullPath);
 }
 async function scanSchemas(nitro) {
-	const files = await scanFiles(nitro, "graphql", "**/*.graphql");
-	return files.map((f) => f.fullPath);
+	return (await scanFiles(nitro, "graphql", "**/*.graphql")).map((f) => f.fullPath);
 }
 async function scanDocs(nitro) {
 	const files = await scanDir(nitro, nitro.options.rootDir, nitro.graphql.dir.client, "**/*.graphql");
@@ -141,16 +138,12 @@ async function scanDocs(nitro) {
 		seenPaths.add(file.fullPath);
 		return true;
 	});
-	const externalServices = nitro.options.graphql?.externalServices || [];
-	const externalPatterns = externalServices.flatMap((service) => service.documents || []);
+	const externalPatterns = (nitro.options.graphql?.externalServices || []).flatMap((service) => service.documents || []);
 	return allFiles.filter((f) => !f.path.startsWith("external/")).filter((f) => {
 		const relativePath = f.path;
 		for (const pattern of externalPatterns) {
 			const clientDirPattern = `${nitro.graphql.dir.client}/`;
-			const cleanPattern = pattern.replace(/* @__PURE__ */ new RegExp(`^${clientDirPattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`), "");
-			const patternDir = cleanPattern.split("/")[0];
-			const fileDir = relativePath.split("/")[0];
-			if (patternDir === fileDir) return false;
+			if (pattern.replace(/* @__PURE__ */ new RegExp(`^${clientDirPattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`), "").split("/")[0] === relativePath.split("/")[0]) return false;
 		}
 		return true;
 	}).map((f) => f.fullPath);
@@ -213,7 +206,7 @@ async function scanFiles(nitro, name, globPattern = GLOB_SCAN_PATTERN) {
 	});
 }
 async function scanDir(nitro, dir, name, globPattern = GLOB_SCAN_PATTERN) {
-	const fileNames = await glob(join(name, globPattern), {
+	return (await glob(join(name, globPattern), {
 		cwd: dir,
 		dot: true,
 		ignore: nitro.options.ignore,
@@ -224,8 +217,7 @@ async function scanDir(nitro, dir, name, globPattern = GLOB_SCAN_PATTERN) {
 			return [];
 		}
 		throw error;
-	});
-	return fileNames.map((fullPath) => {
+	})).map((fullPath) => {
 		return {
 			fullPath,
 			path: relative(join(dir, name), fullPath)

package/dist/utils/server-codegen.js

@@ -21,7 +21,7 @@ function pluginContent(_schema, _documents, _config, _info) {
 	};
 }
 async function generateTypes(selectFremework, schema, config = {}, outputPath) {
-	const defaultConfig = {
+	const mergedConfig = defu$1({
 		scalars: {
 			DateTime: DateTimeResolver.extensions.codegenScalarType,
 			DateTimeISO: DateTimeISOResolver.extensions.codegenScalarType,
@@ -43,9 +43,8 @@ async function generateTypes(selectFremework, schema, config = {}, outputPath) {
 		declarationKind: "interface",
 		enumsAsTypes: true,
 		...config.federation?.enabled && { federation: true }
-	};
-	const mergedConfig = defu$1(defaultConfig, config.codegen?.server);
-	const output = await codegen({
+	}, config.codegen?.server);
+	return await codegen({
 		filename: outputPath || "types.generated.ts",
 		schema: parse(printSchemaWithDirectives(schema)),
 		documents: [],
@@ -131,7 +130,6 @@ type ResolverReturnTypeObject<T extends object> =
 		consola.withTag("graphql").error("Error generating types:", e);
 		return "";
 	});
-	return output;
 }
 
 //#endregion

package/dist/utils/type-generation.d.ts

@@ -1,4 +1,4 @@
-import { Nitro } from "nitropack";
+import { Nitro } from "nitro/types";
 
 //#region src/utils/type-generation.d.ts
 declare function serverTypeGeneration(app: Nitro): Promise<void>;

package/dist/utils/type-generation.js

@@ -31,8 +31,7 @@ function generateNuxtOfetchClient(clientDir, serviceName = "default") {
 	const serviceDir = resolve(clientDir, serviceName);
 	const ofetchPath = resolve(serviceDir, "ofetch.ts");
 	if (!existsSync(serviceDir)) mkdirSync(serviceDir, { recursive: true });
-	if (!existsSync(ofetchPath)) {
-		const ofetchContent = `// This file is auto-generated once by nitro-graphql for quick start
+	if (!existsSync(ofetchPath)) writeFileSync(ofetchPath, `// This file is auto-generated once by nitro-graphql for quick start
 // You can modify this file according to your needs
 import type { Requester } from './sdk'
 import { getSdk } from './sdk'
@@ -54,9 +53,7 @@ export function createGraphQLClient(endpoint: string): Requester {
   }
 }
 
-export const $sdk = getSdk(createGraphQLClient('/api/graphql'))`;
-		writeFileSync(ofetchPath, ofetchContent, "utf-8");
-	}
+export const $sdk = getSdk(createGraphQLClient('/api/graphql'))`, "utf-8");
 }
 function generateExternalOfetchClient(clientDir, serviceName, endpoint) {
 	const serviceDir = resolve(clientDir, serviceName);
@@ -64,7 +61,7 @@ function generateExternalOfetchClient(clientDir, serviceName, endpoint) {
 	if (!existsSync(serviceDir)) mkdirSync(serviceDir, { recursive: true });
 	if (!existsSync(ofetchPath)) {
 		const capitalizedServiceName = serviceName.charAt(0).toUpperCase() + serviceName.slice(1);
-		const ofetchContent = `// This file is auto-generated once by nitro-graphql for quick start
+		writeFileSync(ofetchPath, `// This file is auto-generated once by nitro-graphql for quick start
 // You can modify this file according to your needs
 import type { Sdk, Requester } from './sdk'
 import { getSdk } from './sdk'
@@ -86,8 +83,7 @@ export function create${capitalizedServiceName}GraphQLClient(endpoint: string =
   }
 }
 
-export const $${serviceName}Sdk: Sdk = getSdk(create${capitalizedServiceName}GraphQLClient())`;
-		writeFileSync(ofetchPath, ofetchContent, "utf-8");
+export const $${serviceName}Sdk: Sdk = getSdk(create${capitalizedServiceName}GraphQLClient())`, "utf-8");
 	}
 }
 /**
@@ -127,8 +123,7 @@ function validateNoDuplicateTypes(schemas, schemaStrings) {
 	schemaStrings.forEach((schemaContent, index) => {
 		const fileName = basename(schemas[index]);
 		try {
-			const document = parse(schemaContent);
-			document.definitions.forEach((def) => {
+			parse(schemaContent).definitions.forEach((def) => {
 				if (def.kind === "ObjectTypeDefinition" || def.kind === "InterfaceTypeDefinition" || def.kind === "UnionTypeDefinition" || def.kind === "EnumTypeDefinition" || def.kind === "InputObjectTypeDefinition" || def.kind === "ScalarTypeDefinition") {
 					const typeName = def.name.value;
 					if ([
@@ -148,8 +143,7 @@ function validateNoDuplicateTypes(schemas, schemaStrings) {
 								const content = schemaStrings[i];
 								if (!content) return false;
 								try {
-									const doc = parse(content);
-									return doc.definitions.some((d) => (d.kind === "ObjectTypeDefinition" || d.kind === "InterfaceTypeDefinition" || d.kind === "UnionTypeDefinition" || d.kind === "EnumTypeDefinition" || d.kind === "InputObjectTypeDefinition" || d.kind === "ScalarTypeDefinition") && d.name.value === typeName);
+									return parse(content).definitions.some((d) => (d.kind === "ObjectTypeDefinition" || d.kind === "InterfaceTypeDefinition" || d.kind === "UnionTypeDefinition" || d.kind === "EnumTypeDefinition" || d.kind === "InputObjectTypeDefinition" || d.kind === "ScalarTypeDefinition") && d.name.value === typeName);
 								} catch {
 									return false;
 								}
@@ -189,10 +183,8 @@ async function serverTypeGeneration(app) {
 			consola.info("No GraphQL definitions found for server type generation.");
 			return;
 		}
-		const loadSchemas = loadFilesSync(schemas);
-		const schemaStrings = loadSchemas.map((schema$1) => typeof schema$1 === "string" ? schema$1 : schema$1.loc?.source?.body || "").filter(Boolean);
-		const isValid = validateNoDuplicateTypes(schemas, schemaStrings);
-		if (!isValid) return;
+		const schemaStrings = loadFilesSync(schemas).map((schema$1) => typeof schema$1 === "string" ? schema$1 : schema$1.loc?.source?.body || "").filter(Boolean);
+		if (!validateNoDuplicateTypes(schemas, schemaStrings)) return;
 		const federationEnabled = app.options.graphql?.federation?.enabled === true;
 		const mergedSchemas = mergeTypeDefs([schemaStrings.join("\n\n")], {
 			throwOnConflict: true,
@@ -214,8 +206,7 @@ async function serverTypeGeneration(app) {
 }
 async function clientTypeGeneration(nitro) {
 	try {
-		const hasServerSchema = nitro.scanSchemas && nitro.scanSchemas.length > 0;
-		if (hasServerSchema) await generateMainClientTypes(nitro);
+		if (nitro.scanSchemas && nitro.scanSchemas.length > 0) await generateMainClientTypes(nitro);
 		if (nitro.options.graphql?.externalServices?.length) await generateExternalServicesTypes(nitro);
 	} catch (error) {
 		consola.error("Client schema generation error:", error);
@@ -259,9 +250,7 @@ async function generateMainClientTypes(nitro) {
 		return;
 	}
 	const graphqlString = readFileSync(schemaFilePath, "utf-8");
-	const federationEnabled = nitro.options.graphql?.federation?.enabled === true;
-	const schema = federationEnabled ? buildSubgraphSchema([{ typeDefs: parse(graphqlString) }]) : buildSchema(graphqlString);
-	const types = await generateClientTypes(schema, loadDocs, nitro.options.graphql?.codegen?.client ?? {}, nitro.options.graphql?.codegen?.clientSDK ?? {});
+	const types = await generateClientTypes(nitro.options.graphql?.federation?.enabled === true ? buildSubgraphSchema([{ typeDefs: parse(graphqlString) }]) : buildSchema(graphqlString), loadDocs, nitro.options.graphql?.codegen?.client ?? {}, nitro.options.graphql?.codegen?.clientSDK ?? {});
 	if (types === false) return;
 	const clientTypesPath = resolve(nitro.options.buildDir, "types", "nitro-graphql-client.d.ts");
 	const defaultServiceDir = resolve(nitro.graphql.clientDir, "default");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "1.4.3",
+  "version": "2.0.0-beta.1",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,
@@ -60,20 +60,16 @@
   ],
   "peerDependencies": {
     "@apollo/server": "^5.0.0",
-    "@apollo/subgraph": "^2.0.0",
     "@apollo/utils.withrequired": "^3.0.0",
     "@as-integrations/h3": "^2.0.0",
     "graphql": "^16.11.0",
-    "h3": "^1.15.3",
-    "nitropack": "^2.11.13"
+    "h3": "^2.0.1-rc.2",
+    "nitro": "^3.0.1-alpha.0"
   },
   "peerDependenciesMeta": {
     "@apollo/server": {
       "optional": true
     },
-    "@apollo/subgraph": {
-      "optional": true
-    },
     "@apollo/utils.withrequired": {
       "optional": true
     },
@@ -82,18 +78,19 @@
     }
   },
   "dependencies": {
-    "@graphql-codegen/core": "^4.0.2",
+    "@apollo/subgraph": "^2.11.2",
+    "@graphql-codegen/core": "^5.0.0",
     "@graphql-codegen/import-types-preset": "^3.0.1",
-    "@graphql-codegen/typescript": "^4.1.6",
+    "@graphql-codegen/typescript": "^5.0.1",
     "@graphql-codegen/typescript-generic-sdk": "^4.0.2",
-    "@graphql-codegen/typescript-operations": "^4.6.1",
-    "@graphql-codegen/typescript-resolvers": "^4.5.2",
-    "@graphql-tools/graphql-file-loader": "^8.1.0",
+    "@graphql-codegen/typescript-operations": "^5.0.1",
+    "@graphql-codegen/typescript-resolvers": "^5.0.1",
+    "@graphql-tools/graphql-file-loader": "^8.1.2",
     "@graphql-tools/load": "^8.1.2",
     "@graphql-tools/load-files": "^7.0.1",
     "@graphql-tools/merge": "^9.1.1",
     "@graphql-tools/schema": "^10.0.25",
-    "@graphql-tools/url-loader": "^8.0.33",
+    "@graphql-tools/url-loader": "^9.0.0",
     "@graphql-tools/utils": "^10.9.1",
     "chokidar": "^4.0.3",
     "consola": "^3.4.2",
@@ -102,26 +99,25 @@
     "graphql-scalars": "^1.24.2",
     "knitwork": "^1.2.0",
     "ohash": "^2.0.11",
-    "oxc-parser": "^0.86.0",
+    "oxc-parser": "^0.93.0",
     "pathe": "^2.0.3",
-    "tinyglobby": "^0.2.14"
+    "tinyglobby": "^0.2.15"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^5.2.2",
-    "@apollo/subgraph": "^2.11.2",
-    "@nuxt/kit": "^4.1.0",
-    "@nuxt/schema": "^4.1.0",
-    "@types/node": "^22.18.1",
+    "@antfu/eslint-config": "^5.4.1",
+    "@nuxt/kit": "^4.1.2",
+    "@nuxt/schema": "^4.1.2",
+    "@types/node": "^24.6.2",
     "bumpp": "^10.2.3",
     "changelogen": "^0.6.2",
     "crossws": "0.3.5",
-    "eslint": "^9.34.0",
+    "eslint": "^9.37.0",
     "graphql": "16.11.0",
-    "graphql-yoga": "^5.15.1",
-    "h3": "1.15.3",
-    "nitropack": "^2.12.5",
-    "tsdown": "^0.14.2",
-    "typescript": "^5.9.2"
+    "graphql-yoga": "^5.16.0",
+    "h3": "^2.0.1-rc.2",
+    "nitro": "^3.0.1-alpha.0",
+    "tsdown": "^0.15.6",
+    "typescript": "^5.9.3"
   },
   "resolutions": {
     "nitro-graphql": "link:."