nitro-graphql 2.0.0-beta.22 → 2.0.0-beta.23

package/README.md

@@ -61,7 +61,7 @@ pnpm add nitro-graphql graphql-yoga graphql
 
 **Apollo Server:**
 ```bash
-pnpm add nitro-graphql @apollo/server @apollo/utils.withrequired @as-integrations/h3 graphql
+pnpm add nitro-graphql @apollo/server @apollo/utils.withrequired graphql
 ```
 
 ### 2. Configure
@@ -1029,7 +1029,7 @@ Now implement this setup.
 Set up nitro-graphql with Apollo Server following these exact specifications:
 
 INSTALLATION:
-1. Run: pnpm add nitro-graphql @apollo/server @apollo/utils.withrequired @as-integrations/h3 graphql
+1. Run: pnpm add nitro-graphql @apollo/server @apollo/utils.withrequired graphql
 
 CONFIGURATION (nitro.config.ts):
 import { defineNitroConfig } from 'nitro/config'

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

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

package/dist/routes/debug.d.mts

@@ -1,4 +1,4 @@
-import * as h35 from "h3";
+import * as h33 from "h3";
 
 //#region src/routes/debug.d.ts
 
@@ -10,7 +10,7 @@ import * as h35 from "h3";
  * - /_nitro/graphql/debug - HTML dashboard
  * - /_nitro/graphql/debug?format=json - JSON API
  */
-declare const _default: h35.EventHandlerWithFetch<h35.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 h33 from "h3";
+import * as h35 from "h3";
 
 //#region src/routes/graphql-yoga.d.ts
-declare const _default: h33.EventHandlerWithFetch<h33.EventHandlerRequest, Promise<Response>>;
+declare const _default: h35.EventHandlerWithFetch<h35.EventHandlerRequest, Promise<Response>>;
 //#endregion
 export { _default as default };

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/utils/apollo.mjs

@@ -1,60 +1,58 @@
 import { HeaderMap } from "@apollo/server";
-import { eventHandler, getHeaders, isMethod, readBody, setHeaders } from "h3";
+import { eventHandler, getRequestURL, readBody } from "h3";
 
 //#region src/utils/apollo.ts
 function startServerAndCreateH3Handler(server, options) {
 	const defaultContext = () => Promise.resolve({});
 	const contextFunction = options?.context ?? defaultContext;
-	return eventHandler({
-		handler: async (event) => {
-			const apolloServer = typeof server === "function" ? server() : server;
-			if (!options?.serverAlreadyStarted) apolloServer.startInBackgroundHandlingStartupErrorsByLoggingAndFailingAllRequests();
-			if (isMethod(event, "OPTIONS")) return null;
-			try {
-				const graphqlRequest = await toGraphqlRequest(event);
-				const { body, headers, status } = await apolloServer.executeHTTPGraphQLRequest({
-					httpGraphQLRequest: graphqlRequest,
-					context: () => contextFunction({ event })
-				});
-				if (body.kind === "chunked") throw new Error("Incremental delivery not implemented");
-				setHeaders(event, Object.fromEntries(headers));
-				event.res.status = status || 200;
-				return body.string;
-			} catch (error) {
-				if (error instanceof SyntaxError) {
-					event.res.status = 400;
-					return error.message;
-				} else throw error;
-			}
-		},
-		websocket: options?.websocket
+	return eventHandler(async (event) => {
+		const apolloServer = typeof server === "function" ? server() : server;
+		if (!options?.serverAlreadyStarted) apolloServer.startInBackgroundHandlingStartupErrorsByLoggingAndFailingAllRequests();
+		if (event.req.method === "OPTIONS") {
+			event.res.status = 204;
+			return null;
+		}
+		try {
+			const graphqlRequest = await toGraphqlRequest(event);
+			const { body, headers, status } = await apolloServer.executeHTTPGraphQLRequest({
+				httpGraphQLRequest: graphqlRequest,
+				context: () => contextFunction({ event })
+			});
+			if (body.kind === "chunked") throw new Error("Incremental delivery not implemented");
+			for (const [key, value] of headers) event.res.headers.set(key, value);
+			event.res.status = status || 200;
+			return body.string;
+		} catch (error) {
+			if (error instanceof SyntaxError) {
+				event.res.status = 400;
+				return error.message;
+			} else throw error;
+		}
 	});
 }
 async function toGraphqlRequest(event) {
+	const url = getRequestURL(event);
 	return {
 		method: event.req.method || "POST",
-		headers: normalizeHeaders(getHeaders(event)),
-		search: normalizeQueryString(event.req.url),
+		headers: normalizeHeaders(Object.fromEntries(event.req.headers.entries())),
+		search: url.search.slice(1),
 		body: await normalizeBody(event)
 	};
 }
 function normalizeHeaders(headers) {
 	const headerMap = new HeaderMap();
-	for (const [key, value] of Object.entries(headers)) if (Array.isArray(value)) headerMap.set(key, value.join(","));
-	else if (value) headerMap.set(key, value);
+	for (const [key, value] of Object.entries(headers)) if (value !== void 0) headerMap.set(key, value);
 	return headerMap;
 }
-function normalizeQueryString(url) {
-	if (!url) return "";
-	return url.split("?")[1] || "";
-}
 async function normalizeBody(event) {
-	if (isMethod(event, [
+	const PayloadMethods = [
 		"PATCH",
 		"POST",
 		"PUT",
 		"DELETE"
-	])) return await readBody(event);
+	];
+	const method = event.req.method;
+	if (method && PayloadMethods.includes(method)) return await readBody(event);
 }
 
 //#endregion

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "2.0.0-beta.22",
+  "version": "2.0.0-beta.23",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,
@@ -69,7 +69,6 @@
   "peerDependencies": {
     "@apollo/server": "^5.0.0",
     "@apollo/utils.withrequired": "^3.0.0",
-    "@as-integrations/h3": "^2.0.0",
     "graphql": "^16.11.0",
     "h3": "^2.0.1-rc.2",
     "nitro": "^3.0.1-alpha.0"
@@ -80,9 +79,6 @@
     },
     "@apollo/utils.withrequired": {
       "optional": true
-    },
-    "@as-integrations/h3": {
-      "optional": true
     }
   },
   "dependencies": {
@@ -119,10 +115,10 @@
     "@vitejs/devtools": "^0.0.0-alpha.16",
     "bumpp": "^10.3.1",
     "changelogen": "^0.6.2",
-    "crossws": "0.3.5",
+    "crossws": "^0.4.1",
     "eslint": "^9.39.1",
     "graphql": "^16.12.0",
-    "graphql-yoga": "^5.16.0",
+    "graphql-yoga": "^5.16.2",
     "h3": "^2.0.1-rc.5",
     "nitro": "npm:nitro-nightly@latest",
     "tsdown": "^0.16.1",