nitro-graphql 2.0.0-beta.26 → 2.0.0-beta.28

package/README.md

@@ -61,7 +61,7 @@ pnpm add nitro-graphql@beta graphql-yoga graphql graphql-config
 
 **Apollo Server:**
 ```bash
-pnpm add nitro-graphql@beta @apollo/server @apollo/utils.withrequired graphql graphql-config
+pnpm add nitro-graphql@beta @apollo/server graphql graphql-config
 ```
 
 ### 2. Configure

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

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

package/dist/routes/debug.d.mts

@@ -1,4 +1,4 @@
-import * as h31 from "h3";
+import * as h33 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: h33.EventHandlerWithFetch<h33.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/health.d.mts

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

package/dist/setup.mjs

@@ -18,6 +18,12 @@ const logger = consola.withTag("nitro-graphql");
 * Used by both the direct Nitro module export and the Vite plugin's nitro: hook
 */
 async function setupNitroGraphQL(nitro) {
+	nitro.options.graphql ||= {};
+	nitro.options.graphql.types = defu(nitro.options.graphql.types, {
+		server: ".graphql/nitro-graphql-server.d.ts",
+		client: ".graphql/nitro-graphql-client.d.ts",
+		enabled: true
+	});
 	if (!nitro.options.graphql?.framework) logger.warn("No GraphQL framework specified. Please set graphql.framework to \"graphql-yoga\" or \"apollo-server\".");
 	if (nitro.options.graphql?.externalServices?.length) {
 		const validationErrors = validateExternalServices(nitro.options.graphql.externalServices);
@@ -43,12 +49,17 @@ async function setupNitroGraphQL(nitro) {
 	};
 	nitro.hooks.hook("rollup:before", (_, rollupConfig$1) => {
 		rollupConfig$1.external = rollupConfig$1.external || [];
-		const codegenExternals = ["oxc-parser", "@oxc-parser"];
-		if (Array.isArray(rollupConfig$1.external)) rollupConfig$1.external.push(...codegenExternals);
+		const allExternals = [...["oxc-parser", "@oxc-parser"]];
+		if (!nitro.options.graphql?.federation?.enabled) allExternals.push(...[
+			"@apollo/subgraph",
+			"@apollo/federation-internals",
+			"@apollo/cache-control-types"
+		]);
+		if (Array.isArray(rollupConfig$1.external)) rollupConfig$1.external.push(...allExternals);
 		else if (typeof rollupConfig$1.external === "function") {
 			const originalExternal = rollupConfig$1.external;
 			rollupConfig$1.external = (id, parent, isResolved) => {
-				if (codegenExternals.some((external) => id.includes(external))) return true;
+				if (allExternals.some((external) => id.includes(external))) return true;
 				return originalExternal(id, parent, isResolved);
 			};
 		}

package/dist/utils/apollo.d.mts

@@ -1,9 +1,9 @@
 import { ApolloServer, BaseContext, ContextFunction } from "@apollo/server";
 import { EventHandler, H3Event } from "h3";
-import { WithRequired } from "@apollo/utils.withrequired";
 import { Hooks } from "crossws";
 
 //#region src/utils/apollo.d.ts
+type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] };
 interface H3ContextFunctionArgument {
   event: H3Event;
 }

package/dist/utils/type-generation.mjs

@@ -6,13 +6,22 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import consola from "consola";
 import { basename, dirname, join, resolve } from "pathe";
 import { buildSchema, parse } from "graphql";
-import { buildSubgraphSchema } from "@apollo/subgraph";
 import { loadFilesSync } from "@graphql-tools/load-files";
 import { mergeTypeDefs } from "@graphql-tools/merge";
 import { printSchemaWithDirectives } from "@graphql-tools/utils";
 
 //#region src/utils/type-generation.ts
 const logger = consola.withTag("nitro-graphql");
+let buildSubgraphSchema = null;
+async function loadFederationSupport() {
+	if (buildSubgraphSchema !== null) return buildSubgraphSchema;
+	try {
+		buildSubgraphSchema = (await import("@apollo/subgraph")).buildSubgraphSchema;
+	} catch {
+		buildSubgraphSchema = false;
+	}
+	return buildSubgraphSchema;
+}
 function generateGraphQLIndexFile(nitro, clientDir, externalServices = []) {
 	if (!shouldGenerateClientUtils(nitro)) return;
 	const placeholders = getDefaultPaths(nitro);
@@ -258,7 +267,12 @@ async function serverTypeGeneration(app, options = {}) {
 			commentDescriptions: true,
 			sort: true
 		});
-		const schema = federationEnabled ? buildSubgraphSchema([{ typeDefs: parse(mergedSchemas) }]) : buildSchema(mergedSchemas);
+		let schema;
+		if (federationEnabled) {
+			const buildSubgraph = await loadFederationSupport();
+			if (!buildSubgraph) throw new Error("Federation is enabled but @apollo/subgraph is not installed. Run: pnpm add @apollo/subgraph");
+			schema = buildSubgraph([{ typeDefs: parse(mergedSchemas) }]);
+		} else schema = buildSchema(mergedSchemas);
 		const data = await generateTypes(app.options.graphql?.framework || "graphql-yoga", schema, app.options.graphql ?? {});
 		const printSchema = printSchemaWithDirectives(schema);
 		const schemaPath = resolve(app.graphql.buildDir, "schema.graphql");
@@ -322,7 +336,14 @@ async function generateMainClientTypes(nitro, options = {}) {
 		return;
 	}
 	const graphqlString = readFileSync(schemaFilePath, "utf-8");
-	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 ?? {}, void 0, void 0, void 0, options);
+	const federationEnabled = nitro.options.graphql?.federation?.enabled === true;
+	let schema;
+	if (federationEnabled) {
+		const buildSubgraph = await loadFederationSupport();
+		if (!buildSubgraph) throw new Error("Federation is enabled but @apollo/subgraph is not installed. Run: pnpm add @apollo/subgraph");
+		schema = buildSubgraph([{ typeDefs: parse(graphqlString) }]);
+	} else schema = buildSchema(graphqlString);
+	const types = await generateClientTypes(schema, loadDocs, nitro.options.graphql?.codegen?.client ?? {}, nitro.options.graphql?.codegen?.clientSDK ?? {}, void 0, void 0, void 0, options);
 	if (types === false) return;
 	const placeholders = getDefaultPaths(nitro);
 	const typesConfig = getTypesConfig(nitro);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "2.0.0-beta.26",
+  "version": "2.0.0-beta.28",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,
@@ -72,7 +72,6 @@
   ],
   "peerDependencies": {
     "@apollo/server": "^5.0.0",
-    "@apollo/utils.withrequired": "^3.0.0",
     "graphql": "^16.11.0",
     "h3": "^2.0.1-rc.2",
     "nitro": "^3.0.1-alpha.0"
@@ -80,9 +79,6 @@
   "peerDependenciesMeta": {
     "@apollo/server": {
       "optional": true
-    },
-    "@apollo/utils.withrequired": {
-      "optional": true
     }
   },
   "dependencies": {