nitro-graphql 0.3.2 → 0.3.3

package/dist/ecosystem/nuxt.d.ts

@@ -1,7 +1,7 @@
-import * as _nuxt_schema2 from "@nuxt/schema";
+import * as _nuxt_schema5 from "@nuxt/schema";
 
 //#region src/ecosystem/nuxt.d.ts
 interface ModuleOptions {}
-declare const _default: _nuxt_schema2.NuxtModule<ModuleOptions, ModuleOptions, false>;
+declare const _default: _nuxt_schema5.NuxtModule<ModuleOptions, ModuleOptions, false>;
 //#endregion
 export { ModuleOptions, _default as default };

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import { StandardSchemaV1 } from "./types/standard-schema.js";
 import { CodegenClientConfig, CodegenServerConfig, GenImport, NitroGraphQLOptions } from "./types/index.js";
-import * as nitropack5 from "nitropack";
+import * as nitropack0 from "nitropack";
 
 //#region src/index.d.ts
 type GraphQLFramework = 'graphql-yoga';
-declare const _default: nitropack5.NitroModule;
+declare const _default: nitropack0.NitroModule;
 //#endregion
 export { CodegenClientConfig, CodegenServerConfig, GenImport, GraphQLFramework, NitroGraphQLOptions, StandardSchemaV1, _default as default };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { relativeWithDot, scanDefs, scanResolvers } from "./utils/index.js";
+import { relativeWithDot, scanDocs, scanResolvers, scanSchemas } from "./utils/index.js";
 import { clientTypeGeneration, serverTypeGeneration } from "./utils/server-type-generation.js";
 import { rollupConfig } from "./rollup.js";
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
@@ -7,7 +7,7 @@ import { watch } from "chokidar";
 import consola from "consola";
 import defu from "defu";
 import { defineNitroModule } from "nitropack/kit";
-import { dirname, join, resolve } from "pathe";
+import { dirname, join, relative, resolve } from "pathe";
 
 //#region src/index.ts
 var src_default = defineNitroModule({
@@ -18,7 +18,12 @@ var src_default = defineNitroModule({
 			buildDir: "",
 			watchDirs: [],
 			clientDir: "",
-			serverDir: resolve(nitro.options.srcDir, "graphql")
+			serverDir: resolve(nitro.options.srcDir, "graphql"),
+			dir: {
+				build: relative(nitro.options.rootDir, nitro.options.buildDir),
+				client: "graphql",
+				server: "server"
+			}
 		};
 		nitro.hooks.hook("rollup:before", (nitro$1, rollupConfig$1) => {
 			rollupConfig$1.external = rollupConfig$1.external || [];
@@ -46,6 +51,11 @@ var src_default = defineNitroModule({
 			case "nuxt":
 				watchDirs.push(join(nitro.options.rootDir, "app", "graphql"));
 				nitro.graphql.clientDir = resolve(nitro.options.rootDir, "app", "graphql");
+				nitro.graphql.dir.client = "app/graphql";
+				break;
+			case "nitro":
+				nitro.graphql.clientDir = resolve(nitro.options.rootDir, "graphql");
+				nitro.graphql.dir.client = "graphql";
 				break;
 			default:
 		}
@@ -54,7 +64,7 @@ var src_default = defineNitroModule({
 			ignoreInitial: true,
 			ignored: nitro.options.ignore
 		}).on("all", async (event, path) => {
-			if (path.endsWith(".graphql") || path.endsWith(".gql")) await clientTypeGeneration(nitro, path);
+			if (path.endsWith(".graphql") || path.endsWith(".gql")) await clientTypeGeneration(nitro);
 		});
 		nitro.hooks.hook("close", () => {
 			watcher.close();
@@ -62,22 +72,26 @@ var src_default = defineNitroModule({
 		const tsConfigPath = resolve(nitro.options.buildDir, nitro.options.typescript.tsconfigPath);
 		const tsconfigDir = dirname(tsConfigPath);
 		const typesDir = resolve(nitro.options.buildDir, "types");
-		const defs = await scanDefs(nitro);
-		nitro.scanDefs = defs;
+		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.hooks.hook("dev:start", async () => {
-			const defs$1 = await scanDefs(nitro);
-			nitro.scanDefs = defs$1;
+			const schemas$1 = await scanSchemas(nitro);
+			nitro.scanSchemas = schemas$1;
 			const resolvers$1 = await scanResolvers(nitro);
 			nitro.scanResolvers = resolvers$1;
+			const docs$1 = await scanDocs(nitro);
+			nitro.scanDocuments = docs$1;
 		});
 		await rollupConfig(nitro);
 		await serverTypeGeneration(nitro);
-		await clientTypeGeneration(nitro, nitro.graphql.clientDir);
+		await clientTypeGeneration(nitro);
 		nitro.hooks.hook("close", async () => {
 			await serverTypeGeneration(nitro);
-			await clientTypeGeneration(nitro, nitro.graphql.clientDir);
+			await clientTypeGeneration(nitro);
 		});
 		const runtime = fileURLToPath(new URL("routes", import.meta.url));
 		const methods = [

package/dist/rollup.js

@@ -1,5 +1,5 @@
 import { getImportId, scanGraphql } from "./utils/index.js";
-import { serverTypeGeneration } from "./utils/server-type-generation.js";
+import { clientTypeGeneration, serverTypeGeneration } from "./utils/server-type-generation.js";
 import { resolve } from "pathe";
 import { readFile } from "node:fs/promises";
 import { parse } from "graphql";
@@ -7,7 +7,7 @@ import { genImport } from "knitwork";
 
 //#region src/rollup.ts
 async function rollupConfig(app) {
-	virtualDefs(app);
+	virtualSchemas(app);
 	virtualResolvers(app);
 	getGraphQLConfig(app);
 	app.hooks.hook("rollup:before", (nitro, rollupConfig$1) => {
@@ -41,20 +41,21 @@ async function rollupConfig(app) {
 	});
 	app.hooks.hook("dev:reload", async () => {
 		await serverTypeGeneration(app);
+		await clientTypeGeneration(app);
 	});
 }
-function virtualDefs(app) {
-	const getDefs = () => {
-		const defs = [...app.scanDefs, ...app.options.graphql?.typedefs ?? []];
-		return defs;
+function virtualSchemas(app) {
+	const getSchemas = () => {
+		const schemas = [...app.scanSchemas, ...app.options.graphql?.typedefs ?? []];
+		return schemas;
 	};
 	app.options.virtual ??= {};
-	app.options.virtual["#nitro-internal-virtual/server-defs"] = () => {
-		const imports = getDefs();
+	app.options.virtual["#nitro-internal-virtual/server-schemas"] = () => {
+		const imports = getSchemas();
 		const code = `
 ${imports.map((handler) => `import ${getImportId(handler)} from '${handler}';`).join("\n")}
 
-export const defs = [
+export const schemas = [
 ${imports.map((h) => `{ def: ${getImportId(h)} }`).join(",\n")}
 ];
     `;

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.EventHandler<h30.EventHandlerRequest, any>;
+declare const _default: h31.EventHandler<h31.EventHandlerRequest, any>;
 //#endregion
 export { _default as default };

package/dist/routes/apollo-server.js

@@ -2,16 +2,16 @@ import { startServerAndCreateH3Handler } from "../utils/apollo.js";
 import defu from "defu";
 import { mergeResolvers, mergeTypeDefs } from "@graphql-tools/merge";
 import { importedConfig } from "#nitro-internal-virtual/graphql-config";
-import { defs } from "#nitro-internal-virtual/server-defs";
 import { resolvers } from "#nitro-internal-virtual/server-resolvers";
+import { schemas } from "#nitro-internal-virtual/server-schemas";
 import { ApolloServer } from "@apollo/server";
 import { ApolloServerPluginLandingPageLocalDefault } from "@apollo/server/plugin/landingPage/default";
 
 //#region src/routes/apollo-server.ts
 function createMergedSchema() {
 	try {
-		const mergedDefs = defs.map((schema) => schema.def).join("\n\n");
-		const typeDefs = mergeTypeDefs([mergedDefs]);
+		const mergedSchemas = schemas.map((schema) => schema.def).join("\n\n");
+		const typeDefs = mergeTypeDefs([mergedSchemas]);
 		const mergedResolvers = mergeResolvers(resolvers.map((r) => r.resolver));
 		return {
 			typeDefs,
@@ -22,7 +22,7 @@ function createMergedSchema() {
 		throw error;
 	}
 }
-let apolloServer;
+let apolloServer = null;
 function createApolloServer() {
 	if (!apolloServer) {
 		const { typeDefs, resolvers: mergedResolvers } = createMergedSchema();
@@ -35,7 +35,7 @@ function createApolloServer() {
 	}
 	return apolloServer;
 }
-var apollo_server_default = startServerAndCreateH3Handler(createApolloServer, { context: async (event) => ({ event }) });
+var apollo_server_default = startServerAndCreateH3Handler(apolloServer || createApolloServer, { context: async (event) => ({ event }) });
 
 //#endregion
 export { apollo_server_default as default };

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

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

package/dist/routes/graphql-yoga.js

@@ -1,8 +1,8 @@
 import defu from "defu";
 import { mergeResolvers, mergeTypeDefs } from "@graphql-tools/merge";
 import { importedConfig } from "#nitro-internal-virtual/graphql-config";
-import { defs } from "#nitro-internal-virtual/server-defs";
 import { resolvers } from "#nitro-internal-virtual/server-resolvers";
+import { schemas } from "#nitro-internal-virtual/server-schemas";
 import { defineEventHandler, toWebRequest } from "h3";
 import { createSchema, createYoga } from "graphql-yoga";
 
@@ -26,8 +26,8 @@ new window.EmbeddedSandbox({
 </html>`;
 function createMergedSchema() {
 	try {
-		const mergedDefs = defs.map((schema) => schema.def).join("\n\n");
-		const typeDefs = mergeTypeDefs([mergedDefs]);
+		const mergedSchemas = schemas.map((schema) => schema.def).join("\n\n");
+		const typeDefs = mergeTypeDefs([mergedSchemas]);
 		const mergedResolvers = mergeResolvers(resolvers.map((r) => r.resolver));
 		return createSchema({
 			typeDefs,

package/dist/routes/health.d.ts

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

package/dist/types/index.d.ts

@@ -19,13 +19,19 @@ interface GenImport {
 }
 declare module 'nitropack/types' {
   interface Nitro {
-    scanDefs: string[];
+    scanSchemas: string[];
+    scanDocuments: string[];
     scanResolvers: GenImport[];
     graphql: {
       buildDir: string;
       watchDirs: string[];
       clientDir: string;
       serverDir: string;
+      dir: {
+        build: string;
+        client: string;
+        server: string;
+      };
     };
   }
 }

package/dist/utils/apollo.js

@@ -3,12 +3,12 @@ import { eventHandler, getHeaders, isMethod, readBody, setHeaders } from "h3";
 
 //#region src/utils/apollo.ts
 function startServerAndCreateH3Handler(server, options) {
-	const apolloServer = typeof server === "function" ? server() : server;
-	apolloServer.startInBackgroundHandlingStartupErrorsByLoggingAndFailingAllRequests();
 	const defaultContext = () => Promise.resolve({});
 	const contextFunction = options?.context ?? defaultContext;
 	return eventHandler({
 		handler: async (event) => {
+			const apolloServer = typeof server === "function" ? server() : server;
+			apolloServer.startInBackgroundHandlingStartupErrorsByLoggingAndFailingAllRequests();
 			if (isMethod(event, "OPTIONS")) return null;
 			try {
 				const graphqlRequest = await toGraphqlRequest(event);

package/dist/utils/index.d.ts

@@ -9,7 +9,7 @@ declare function scanGraphql(nitro: Nitro): Promise<string[]>;
 declare function scanResolvers(nitro: Nitro): Promise<GenImport[]>;
 declare function scanDirectives(nitro: Nitro): Promise<string[]>;
 declare function scanTypeDefs(nitro: Nitro): Promise<string[]>;
-declare function scanDefs(nitro: Nitro): Promise<string[]>;
-declare function unique(arr: any[]): any[];
+declare function scanSchemas(nitro: Nitro): Promise<string[]>;
+declare function scanDocs(nitro: Nitro): Promise<string[]>;
 //#endregion
-export { GLOB_SCAN_PATTERN, getImportId, relativeWithDot, scanDefs, scanDirectives, scanGraphql, scanResolvers, scanTypeDefs, unique };
+export { GLOB_SCAN_PATTERN, getImportId, relativeWithDot, scanDirectives, scanDocs, scanGraphql, scanResolvers, scanSchemas, scanTypeDefs };

package/dist/utils/index.js

@@ -71,10 +71,14 @@ async function scanTypeDefs(nitro) {
 	const files = await scanFiles(nitro, "graphql", "**/*.typedef.{ts,js}");
 	return files.map((f) => f.fullPath);
 }
-async function scanDefs(nitro) {
+async function scanSchemas(nitro) {
 	const files = await scanFiles(nitro, "graphql", "**/*.graphql");
 	return files.map((f) => f.fullPath);
 }
+async function scanDocs(nitro) {
+	const files = await scanDir(nitro, nitro.options.rootDir, nitro.graphql.dir.client, "**/*.graphql");
+	return files.map((f) => f.fullPath);
+}
 async function scanFiles(nitro, name, globPattern = GLOB_SCAN_PATTERN) {
 	const files = await Promise.all(nitro.options.scanDirs.map((dir) => scanDir(nitro, dir, name, globPattern))).then((r) => r.flat());
 	return files;
@@ -99,9 +103,6 @@ async function scanDir(nitro, dir, name, globPattern = GLOB_SCAN_PATTERN) {
 		};
 	}).sort((a, b) => a.path.localeCompare(b.path));
 }
-function unique(arr) {
-	return [...new Set(arr)];
-}
 
 //#endregion
-export { GLOB_SCAN_PATTERN, getImportId, relativeWithDot, scanDefs, scanDirectives, scanGraphql, scanResolvers, scanTypeDefs, unique };
+export { GLOB_SCAN_PATTERN, getImportId, relativeWithDot, scanDirectives, scanDocs, scanGraphql, scanResolvers, scanSchemas, scanTypeDefs };

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

@@ -2,6 +2,6 @@ import { Nitro } from "nitropack";
 
 //#region src/utils/server-type-generation.d.ts
 declare function serverTypeGeneration(app: Nitro): Promise<void>;
-declare function clientTypeGeneration(app: Nitro, path: string): Promise<void>;
+declare function clientTypeGeneration(nitro: Nitro): Promise<void>;
 //#endregion
 export { clientTypeGeneration, serverTypeGeneration };

package/dist/utils/server-type-generation.js

@@ -11,14 +11,14 @@ import { printSchemaWithDirectives } from "@graphql-tools/utils";
 //#region src/utils/server-type-generation.ts
 async function serverTypeGeneration(app) {
 	try {
-		const defs = app.scanDefs || [];
-		if (!defs.length) {
+		const schemas = app.scanSchemas || [];
+		if (!schemas.length) {
 			consola.info("No GraphQL definitions found for server type generation.");
 			return;
 		}
-		const loadDefs = loadFilesSync(defs);
-		const mergedDefs = mergeTypeDefs(loadDefs);
-		const schema = buildASTSchema(mergedDefs, {
+		const loadSchemas = loadFilesSync(schemas);
+		const mergedSchemas = mergeTypeDefs(loadSchemas);
+		const schema = buildASTSchema(mergedSchemas, {
 			assumeValidSDL: true,
 			assumeValid: true
 		});
@@ -34,22 +34,21 @@ async function serverTypeGeneration(app) {
 		consola.error("Server schema generation error:", error);
 	}
 }
-async function clientTypeGeneration(app, path) {
+async function clientTypeGeneration(nitro) {
 	try {
-		const root = app.graphql.watchDirs.find((dir) => path.startsWith(dir)) || path;
-		if (!root) return;
-		const docs = await loadGraphQLDocuments(root);
-		const schemaFilePath = join(app.graphql.buildDir, "schema.graphql");
+		const docs = nitro.scanDocuments;
+		const loadDocs = await loadGraphQLDocuments(docs);
+		const schemaFilePath = join(nitro.graphql.buildDir, "schema.graphql");
 		if (!existsSync(schemaFilePath)) {
 			consola.info("Schema file not ready yet for client type generation. Server types need to be generated first.");
 			return;
 		}
 		const graphqlString = readFileSync(schemaFilePath, "utf-8");
 		const schema = buildSchema(graphqlString);
-		const types = await generateClientTypes(schema, docs);
+		const types = await generateClientTypes(schema, loadDocs);
 		if (types === false) return;
-		const clientTypesPath = resolve(app.options.buildDir, "types", "nitro-graphql-client.d.ts");
-		const sdkTypesPath = resolve(app.graphql.clientDir, "sdk.ts");
+		const clientTypesPath = resolve(nitro.options.buildDir, "types", "nitro-graphql-client.d.ts");
+		const sdkTypesPath = resolve(nitro.graphql.clientDir, "sdk.ts");
 		writeFileSync(clientTypesPath, types.types, "utf-8");
 		writeFileSync(sdkTypesPath, types.sdk, "utf-8");
 	} catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,