nitro-graphql 1.4.0 → 1.4.2

package/dist/index.js

@@ -60,9 +60,12 @@ var src_default = defineNitroModule({
 		const watchDirs = [];
 		switch (nitro.options.framework.name) {
 			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";
+				if (!nitro.graphql.clientDir) {
+					nitro.graphql.clientDir = resolve(nitro.options.rootDir, "app", "graphql");
+					nitro.graphql.dir.client = "app/graphql";
+				}
+				if (!nitro.options.graphql?.serverDir) nitro.graphql.serverDir = resolve(nitro.options.rootDir, "server", "graphql");
+				watchDirs.push(nitro.graphql.clientDir);
 				const layerServerDirs = getLayerServerDirectories(nitro);
 				const layerAppDirs = getLayerAppDirectories(nitro);
 				for (const layerServerDir of layerServerDirs) watchDirs.push(join(layerServerDir, "graphql"));

package/dist/utils/directive-parser.js

@@ -194,9 +194,9 @@ function generateDirectiveSchema(directive) {
 */
 async function generateDirectiveSchemas(nitro, directives) {
 	if (directives.length === 0) return;
-	const { existsSync, readFileSync, writeFileSync } = await import("node:fs");
+	const { existsSync, readFileSync, writeFileSync, mkdirSync } = await import("node:fs");
 	const { readFile } = await import("node:fs/promises");
-	const { resolve } = await import("pathe");
+	const { resolve, dirname } = await import("pathe");
 	const directiveSchemas = [];
 	const seenDirectives = /* @__PURE__ */ new Set();
 	const parser = new DirectiveParser();
@@ -217,6 +217,8 @@ async function generateDirectiveSchemas(nitro, directives) {
 # To define custom directives, create .directive.ts files using defineDirective()
 
 ${directiveSchemas.join("\n\n")}`;
+		const targetDir = dirname(directivesPath);
+		if (!existsSync(targetDir)) mkdirSync(targetDir, { recursive: true });
 		let shouldWrite = true;
 		if (existsSync(directivesPath)) {
 			const existingContent = readFileSync(directivesPath, "utf-8");

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.0",
+  "version": "1.4.2",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,