nitro-graphql 2.0.0-beta.15 → 2.0.0-beta.17

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

@@ -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/graphql-yoga.d.ts

@@ -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.ts

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

package/dist/setup.js

@@ -93,7 +93,7 @@ async function setupNitroGraphQL(nitro) {
 	const watcher = watch(watchDirs, {
 		persistent: true,
 		ignoreInitial: true,
-		ignored: [...nitro.options.ignore, ...generateLayerIgnorePatterns(nitro)]
+		ignored: [...nitro.options.ignore, ...generateLayerIgnorePatterns()]
 	}).on("all", async (_, path) => {
 		if (path.endsWith(".graphql") || path.endsWith(".gql")) if (path.includes(nitro.graphql.serverDir) || path.includes("server/graphql") || path.includes("server\\graphql")) {
 			await serverTypeGeneration(nitro);
@@ -218,16 +218,39 @@ async function setupNitroGraphQL(nitro) {
 		if (!rollupConfig$1.output.inlineDynamicImports) {
 			rollupConfig$1.output.manualChunks = (id, meta) => {
 				if (id.endsWith(".graphql") || id.endsWith(".gql")) return "schemas";
-				if (id.endsWith(".resolver.ts")) return "resolvers";
+				if (id.endsWith(".resolver.ts")) {
+					let graphqlIndex = id.indexOf("server/graphql/");
+					let baseLength = 15;
+					if (graphqlIndex === -1) {
+						graphqlIndex = id.indexOf("routes/graphql/");
+						baseLength = 15;
+					}
+					if (graphqlIndex !== -1) return id.slice(graphqlIndex + baseLength).replace(/\.resolver\.ts$/, "");
+					return "resolvers";
+				}
 				if (typeof manualChunks === "function") return manualChunks(id, meta);
 			};
-			rollupConfig$1.output.advancedChunks = { groups: [{
-				name: "schemas",
-				test: /\.(?:graphql|gql)$/
-			}, {
-				name: "resolvers",
-				test: /\.resolver\.ts$/
-			}] };
+			rollupConfig$1.output.advancedChunks = {
+				groups: [{
+					name: "schemas",
+					test: /\.(?:graphql|gql)$/
+				}, {
+					name: (moduleId) => {
+						if (!moduleId.endsWith(".resolver.ts")) return;
+						let graphqlIndex = moduleId.indexOf("server/graphql/");
+						let baseLength = 15;
+						if (graphqlIndex === -1) {
+							graphqlIndex = moduleId.indexOf("routes/graphql/");
+							baseLength = 15;
+						}
+						if (graphqlIndex !== -1) return moduleId.slice(graphqlIndex + baseLength).replace(/\.resolver\.ts$/, "");
+						return "resolvers";
+					},
+					test: /\.resolver\.(?:ts|js)$/
+				}],
+				minSize: 0,
+				minShareCount: 1
+			};
 		}
 		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`;
@@ -293,7 +316,7 @@ export default <IGraphQLConfig> {
 }`, "graphql.config.ts");
 		const serverSchemaPath = resolveFilePath(scaffoldConfig.serverSchema, scaffoldConfig.enabled, true, "{serverGraphql}/schema.ts", placeholders);
 		const serverConfigPath = resolveFilePath(scaffoldConfig.serverConfig, scaffoldConfig.enabled, true, "{serverGraphql}/config.ts", placeholders);
-		const serverContextPath = resolveFilePath(scaffoldConfig.serverContext, scaffoldConfig.enabled, true, "{serverGraphql}/context.ts", placeholders);
+		const serverContextPath = resolveFilePath(scaffoldConfig.serverContext, scaffoldConfig.enabled, true, "{serverGraphql}/context.d.ts", placeholders);
 		if (serverSchemaPath || serverConfigPath || serverContextPath) {
 			if (!existsSync(nitro.graphql.serverDir)) mkdirSync(nitro.graphql.serverDir, { recursive: true });
 		}
@@ -321,7 +344,7 @@ export default defineGraphQLConfig({
 		if (serverContextPath) writeFileIfNotExists(serverContextPath, `// Example context definition - please change it to your needs
 // import type { Database } from '../utils/useDb'
 
-declare module 'h3' {
+declare module 'nitro/h3' {
   interface H3EventContext {
     // Add your custom context properties here
     // useDatabase: () => Database
@@ -333,10 +356,13 @@ declare module 'h3' {
     //   }
     // }
   }
-}`, "server context.ts");
-		if (existsSync(join(nitro.graphql.serverDir, "context.d.ts"))) {
-			consola.warn("nitro-graphql: Found context.d.ts file. Please rename it to context.ts for the new structure.");
-			consola.info("The context file should now be context.ts instead of context.d.ts");
+}
+
+export {}
+`, "server context.d.ts");
+		if (existsSync(join(nitro.graphql.serverDir, "context.ts"))) {
+			consola.warn("nitro-graphql: Found context.ts file. Please rename it to context.d.ts for type-only definitions.");
+			consola.info("The context file should now be context.d.ts instead of context.ts");
 		}
 	} else consola.info("[nitro-graphql] Scaffold file generation is disabled (library mode)");
 }

package/dist/utils/server-codegen.js

@@ -37,7 +37,7 @@ async function generateTypes(selectFremework, schema, config = {}, outputPath) {
 		},
 		defaultScalarType: "unknown",
 		defaultMapper: `ResolverReturnType<{T}>`,
-		contextType: "h3#H3Event",
+		contextType: "nitro/h3#H3Event",
 		maybeValue: "T | null | undefined",
 		inputMaybeValue: "T | undefined",
 		declarationKind: "interface",

package/dist/utils/type-generation.js

@@ -45,7 +45,7 @@ function generateNuxtOfetchClient(nitro, clientDir, serviceName = "default") {
 	const serviceDir = dirname(ofetchPath);
 	if (!existsSync(serviceDir)) mkdirSync(serviceDir, { recursive: true });
 	if (existsSync(ofetchPath)) return;
-	writeFileIfNotExists(ofetchPath, `// This file is auto-generated once by nitro-graphql for quick start
+	writeFileIfNotExists(ofetchPath, nitro.options.framework?.name === "nuxt" ? `// 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'
@@ -67,6 +67,26 @@ export function createGraphQLClient(endpoint: string): Requester {
   }
 }
 
+export const $sdk = getSdk(createGraphQLClient('/api/graphql'))` : `// 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 { ofetch } from 'ofetch'
+import { getSdk } from './sdk'
+
+export function createGraphQLClient(endpoint: string): Requester {
+  return async <R>(doc: string, vars?: any): Promise<R> => {
+    const result = await ofetch(endpoint, {
+      method: 'POST',
+      body: { query: doc, variables: vars },
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    })
+
+    return result as R
+  }
+}
+
 export const $sdk = getSdk(createGraphQLClient('/api/graphql'))`, `${serviceName} ofetch.ts`);
 }
 function generateExternalOfetchClient(nitro, service, endpoint) {
@@ -83,7 +103,7 @@ function generateExternalOfetchClient(nitro, service, endpoint) {
 	if (!existsSync(serviceDir)) mkdirSync(serviceDir, { recursive: true });
 	if (!existsSync(ofetchPath)) {
 		const capitalizedServiceName = serviceName.charAt(0).toUpperCase() + serviceName.slice(1);
-		writeFileIfNotExists(ofetchPath, `// This file is auto-generated once by nitro-graphql for quick start
+		writeFileIfNotExists(ofetchPath, nitro.options.framework?.name === "nuxt" ? `// 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'
@@ -105,6 +125,26 @@ export function create${capitalizedServiceName}GraphQLClient(endpoint: string =
   }
 }
 
+export const $${serviceName}Sdk: Sdk = getSdk(create${capitalizedServiceName}GraphQLClient())` : `// 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 { ofetch } from 'ofetch'
+import { getSdk } from './sdk'
+
+export function create${capitalizedServiceName}GraphQLClient(endpoint: string = '${endpoint}'): Requester {
+  return async <R>(doc: string, vars?: any): Promise<R> => {
+    const result = await ofetch(endpoint, {
+      method: 'POST',
+      body: { query: doc, variables: vars },
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    })
+
+    return result as R
+  }
+}
+
 export const $${serviceName}Sdk: Sdk = getSdk(create${capitalizedServiceName}GraphQLClient())`, `${serviceName} external ofetch.ts`);
 	}
 }

package/dist/vite.js

@@ -38,6 +38,8 @@ function graphql(options) {
 		},
 		nitro: { async setup(nitro) {
 			if (options) nitro.options.graphql = defu(nitro.options.graphql || {}, options);
+			nitro.options.graphql = nitro.options.graphql || {};
+			nitro.options.graphql._vitePlugin = true;
 			await setupNitroGraphQL(nitro);
 		} }
 	};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "2.0.0-beta.15",
+  "version": "2.0.0-beta.17",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,