nitro-graphql 1.4.1 → 1.4.3

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

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

package/dist/routes/apollo-server.js

@@ -1,4 +1,3 @@
-import { startServerAndCreateH3Handler } from "../utils/apollo.js";
 import { consola as consola$1 } from "consola";
 import defu from "defu";
 import { parse } from "graphql";
@@ -12,6 +11,7 @@ import { ApolloServer } from "@apollo/server";
 import { ApolloServerPluginLandingPageLocalDefault } from "@apollo/server/plugin/landingPage/default";
 import { makeExecutableSchema } from "@graphql-tools/schema";
 import { defineEventHandler } from "h3";
+import { startServerAndCreateH3Handler } from "nitro-graphql/utils/apollo";
 
 //#region src/routes/apollo-server.ts
 let buildSubgraphSchema = null;
@@ -65,6 +65,7 @@ async function createMergedSchema() {
 	}
 }
 let apolloServer = null;
+let serverStarted = false;
 async function createApolloServer() {
 	if (!apolloServer) {
 		const schema = await createMergedSchema();
@@ -73,6 +74,10 @@ async function createApolloServer() {
 			introspection: true,
 			plugins: [ApolloServerPluginLandingPageLocalDefault({ embed: true })]
 		}, importedConfig));
+		if (!serverStarted) {
+			await apolloServer.start();
+			serverStarted = true;
+		}
 	}
 	return apolloServer;
 }
@@ -80,7 +85,10 @@ let serverPromise = null;
 var apollo_server_default = defineEventHandler(async (event) => {
 	if (!serverPromise) serverPromise = createApolloServer();
 	const server = await serverPromise;
-	const h3Handler = startServerAndCreateH3Handler(server, { context: async () => ({ event }) });
+	const h3Handler = startServerAndCreateH3Handler(server, {
+		context: async () => ({ event }),
+		serverAlreadyStarted: true
+	});
 	return h3Handler(event);
 });
 

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

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

package/dist/routes/health.d.ts

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

package/dist/utils/apollo.d.ts

@@ -10,6 +10,7 @@ interface H3ContextFunctionArgument {
 interface H3HandlerOptions<TContext extends BaseContext> {
   context?: ContextFunction<[H3ContextFunctionArgument], TContext>;
   websocket?: Partial<Hooks>;
+  serverAlreadyStarted?: boolean;
 }
 declare function startServerAndCreateH3Handler(server: ApolloServer<BaseContext> | (() => ApolloServer<BaseContext>), options?: H3HandlerOptions<BaseContext>): EventHandler;
 declare function startServerAndCreateH3Handler<TContext extends BaseContext>(server: ApolloServer<TContext> | (() => ApolloServer<TContext>), options: WithRequired<H3HandlerOptions<TContext>, 'context'>): EventHandler;

package/dist/utils/apollo.js

@@ -8,7 +8,7 @@ function startServerAndCreateH3Handler(server, options) {
 	return eventHandler({
 		handler: async (event) => {
 			const apolloServer = typeof server === "function" ? server() : server;
-			apolloServer.startInBackgroundHandlingStartupErrorsByLoggingAndFailingAllRequests();
+			if (!options?.serverAlreadyStarted) apolloServer.startInBackgroundHandlingStartupErrorsByLoggingAndFailingAllRequests();
 			if (isMethod(event, "OPTIONS")) return null;
 			try {
 				const graphqlRequest = await toGraphqlRequest(event);

package/dist/utils/type-generation.js

@@ -4,6 +4,7 @@ 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";
@@ -192,36 +193,13 @@ async function serverTypeGeneration(app) {
 		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 mergedSchemasString = schemaStrings.join("\n\n");
 		const federationEnabled = app.options.graphql?.federation?.enabled === true;
-		let schemaWithDirectives = mergedSchemasString;
-		if (federationEnabled) {
-			const federationDirectives = `
-        directive @key(fields: String!) on OBJECT | INTERFACE
-        directive @requires(fields: String!) on FIELD_DEFINITION
-        directive @provides(fields: String!) on FIELD_DEFINITION
-        directive @external on FIELD_DEFINITION | OBJECT
-        directive @tag(name: String!) on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
-        directive @extends on OBJECT | INTERFACE
-        directive @shareable on FIELD_DEFINITION | OBJECT
-        directive @inaccessible on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
-        directive @override(from: String!) on FIELD_DEFINITION
-        directive @composeDirective(name: String!) on SCHEMA
-        directive @link(url: String!, as: String, for: Purpose, import: [String!]) on SCHEMA
-        
-        enum Purpose {
-          SECURITY
-          EXECUTION
-        }
-      `;
-			schemaWithDirectives = `${federationDirectives}\n\n${mergedSchemasString}`;
-		}
-		const mergedSchemas = mergeTypeDefs([schemaWithDirectives], {
+		const mergedSchemas = mergeTypeDefs([schemaStrings.join("\n\n")], {
 			throwOnConflict: true,
 			commentDescriptions: true,
 			sort: true
 		});
-		const schema = buildSchema(mergedSchemas);
+		const schema = federationEnabled ? buildSubgraphSchema([{ typeDefs: parse(mergedSchemas) }]) : 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");
@@ -281,7 +259,8 @@ async function generateMainClientTypes(nitro) {
 		return;
 	}
 	const graphqlString = readFileSync(schemaFilePath, "utf-8");
-	const schema = buildSchema(graphqlString);
+	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 ?? {});
 	if (types === false) return;
 	const clientTypesPath = resolve(nitro.options.buildDir, "types", "nitro-graphql-client.d.ts");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,
@@ -40,6 +40,10 @@
       "types": "./dist/utils/define.d.ts",
       "import": "./dist/utils/define.js"
     },
+    "./utils/apollo": {
+      "types": "./dist/utils/apollo.d.ts",
+      "import": "./dist/utils/apollo.js"
+    },
     "./internal": {
       "types": "./dist/internal/index.d.ts",
       "import": "./dist/internal/index.js"
@@ -112,7 +116,7 @@
     "changelogen": "^0.6.2",
     "crossws": "0.3.5",
     "eslint": "^9.34.0",
-    "graphql": "^16.11.0",
+    "graphql": "16.11.0",
     "graphql-yoga": "^5.15.1",
     "h3": "1.15.3",
     "nitropack": "^2.12.5",