nitro-graphql 1.4.3 → 1.5.0

package/dist/utils/client-codegen.js

@@ -29,8 +29,7 @@ function pluginContent(_schema, _documents, _config, _info) {
 	};
 }
 async function graphQLLoadSchemaSync(schemaPointers, data = {}) {
-	const pointers = Array.isArray(schemaPointers) ? schemaPointers : [schemaPointers];
-	const filteredPointers = [...pointers, "!**/vfs/**"];
+	const filteredPointers = [...Array.isArray(schemaPointers) ? schemaPointers : [schemaPointers], "!**/vfs/**"];
 	let result;
 	try {
 		result = loadSchemaSync(filteredPointers, {
@@ -58,8 +57,7 @@ async function loadExternalSchema(service, buildDir) {
 			const defaultPath = resolve(buildDir, "graphql", "schemas", `${service.name}.graphql`);
 			const schemaFilePath = service.downloadPath ? resolve(service.downloadPath) : defaultPath;
 			if (existsSync(schemaFilePath)) try {
-				const result$1 = loadSchemaSync([schemaFilePath], { loaders: [new GraphQLFileLoader()] });
-				return result$1;
+				return loadSchemaSync([schemaFilePath], { loaders: [new GraphQLFileLoader()] });
 			} catch {
 				consola$1.warn(`[graphql:${service.name}] Cached schema invalid, loading from source`);
 			}
@@ -70,14 +68,13 @@ async function loadExternalSchema(service, buildDir) {
 		if (hasLocalFiles) loaders.push(new GraphQLFileLoader());
 		if (hasUrls) loaders.push(new UrlLoader());
 		if (loaders.length === 0) throw new Error("No appropriate loaders found for schema sources");
-		const result = loadSchemaSync(schemas, {
+		return loadSchemaSync(schemas, {
 			loaders,
 			...Object.keys(headers).length > 0 && { headers }
 		});
-		return result;
 	} catch (error) {
 		consola$1.error(`[graphql:${service.name}] Failed to load external schema:`, error);
-		return void 0;
+		return;
 	}
 }
 /**
@@ -91,7 +88,7 @@ function isUrl(path) {
 */
 async function downloadAndSaveSchema(service, buildDir) {
 	const downloadMode = service.downloadSchema;
-	if (!downloadMode || downloadMode === "manual") return void 0;
+	if (!downloadMode || downloadMode === "manual") return;
 	const defaultPath = resolve(buildDir, "graphql", "schemas", `${service.name}.graphql`);
 	const schemaFilePath = service.downloadPath ? resolve(service.downloadPath) : defaultPath;
 	try {
@@ -104,15 +101,13 @@ async function downloadAndSaveSchema(service, buildDir) {
 		if (downloadMode === "always") {
 			shouldDownload = true;
 			if (fileExists && hasUrlSchemas) try {
-				const remoteSchema = loadSchemaSync(schemas.filter(isUrl), {
+				const remoteSchemaString = printSchemaWithDirectives(loadSchemaSync(schemas.filter(isUrl), {
 					loaders: [new UrlLoader()],
 					...Object.keys(headers).length > 0 && { headers }
-				});
-				const remoteSchemaString = printSchemaWithDirectives(remoteSchema);
+				}));
 				const remoteHash = createHash("md5").update(remoteSchemaString).digest("hex");
 				const localSchemaString = readFileSync(schemaFilePath, "utf-8");
-				const localHash = createHash("md5").update(localSchemaString).digest("hex");
-				if (remoteHash === localHash) {
+				if (remoteHash === createHash("md5").update(localSchemaString).digest("hex")) {
 					shouldDownload = false;
 					consola$1.info(`[graphql:${service.name}] Schema is up-to-date, using cached version`);
 				}
@@ -137,24 +132,21 @@ async function downloadAndSaveSchema(service, buildDir) {
 		} else if (downloadMode === true || downloadMode === "once") shouldDownload = !fileExists;
 		if (shouldDownload) {
 			if (hasUrlSchemas && hasLocalSchemas) {
-				const schema = loadSchemaSync(schemas, {
+				const schemaString = printSchemaWithDirectives(loadSchemaSync(schemas, {
 					loaders: [new GraphQLFileLoader(), new UrlLoader()],
 					...Object.keys(headers).length > 0 && { headers }
-				});
-				const schemaString = printSchemaWithDirectives(schema);
+				}));
 				mkdirSync(dirname(schemaFilePath), { recursive: true });
 				writeFileSync(schemaFilePath, schemaString, "utf-8");
 			} else if (hasUrlSchemas) {
-				const schema = loadSchemaSync(schemas, {
+				const schemaString = printSchemaWithDirectives(loadSchemaSync(schemas, {
 					loaders: [new UrlLoader()],
 					...Object.keys(headers).length > 0 && { headers }
-				});
-				const schemaString = printSchemaWithDirectives(schema);
+				}));
 				mkdirSync(dirname(schemaFilePath), { recursive: true });
 				writeFileSync(schemaFilePath, schemaString, "utf-8");
 			} else if (hasLocalSchemas) {
-				const schema = loadSchemaSync(schemas, { loaders: [new GraphQLFileLoader()] });
-				const schemaString = printSchemaWithDirectives(schema);
+				const schemaString = printSchemaWithDirectives(loadSchemaSync(schemas, { loaders: [new GraphQLFileLoader()] }));
 				mkdirSync(dirname(schemaFilePath), { recursive: true });
 				writeFileSync(schemaFilePath, schemaString, "utf-8");
 			}
@@ -162,13 +154,12 @@ async function downloadAndSaveSchema(service, buildDir) {
 		return schemaFilePath;
 	} catch (error) {
 		consola$1.error(`[graphql:${service.name}] Failed to download/copy schema:`, error);
-		return void 0;
+		return;
 	}
 }
 async function loadGraphQLDocuments(patterns) {
 	try {
-		const result = await loadDocuments(patterns, { loaders: [new GraphQLFileLoader()] });
-		return result;
+		return await loadDocuments(patterns, { loaders: [new GraphQLFileLoader()] });
 	} catch (e) {
 		if ((e.message || "").includes("Unable to find any GraphQL type definitions for the following pointers:")) return [];
 		else throw e;
@@ -180,7 +171,7 @@ async function generateClientTypes(schema, docs, config = {}, sdkConfig = {}, ou
 		return false;
 	}
 	const serviceLabel = serviceName ? `:${serviceName}` : "";
-	const defaultConfig = {
+	const mergedConfig = defu$1({
 		emitLegacyCommonJSImports: false,
 		useTypeImports: true,
 		enumsAsTypes: true,
@@ -204,12 +195,11 @@ async function generateClientTypes(schema, docs, config = {}, sdkConfig = {}, ou
 				output: "File"
 			}
 		}
-	};
-	const mergedConfig = defu$1(defaultConfig, config);
+	}, config);
 	const mergedSdkConfig = defu$1(mergedConfig, sdkConfig);
 	try {
-		if (docs.length === 0) {
-			const output$1 = await codegen({
+		if (docs.length === 0) return {
+			types: await codegen({
 				filename: outputPath || "client-types.generated.ts",
 				schema: parse(printSchemaWithDirectives(schema)),
 				documents: [],
@@ -219,8 +209,8 @@ async function generateClientTypes(schema, docs, config = {}, sdkConfig = {}, ou
 					pluginContent: { plugin: pluginContent },
 					typescript: { plugin }
 				}
-			});
-			const sdkContent$1 = `// THIS FILE IS GENERATED, DO NOT EDIT!
+			}),
+			sdk: `// THIS FILE IS GENERATED, DO NOT EDIT!
 /* eslint-disable eslint-comments/no-unlimited-disable */
 /* tslint:disable */
 /* eslint-disable */
@@ -244,12 +234,8 @@ export function getSdk(requester: Requester): Sdk {
     }
   }
 }
-`;
-			return {
-				types: output$1,
-				sdk: sdkContent$1
-			};
-		}
+`
+		};
 		const output = await codegen({
 			filename: outputPath || "client-types.generated.ts",
 			schema: parse(printSchemaWithDirectives(schema)),
@@ -279,16 +265,14 @@ export function getSdk(requester: Requester): Sdk {
 				typescriptGenericSdk: { plugin: plugin$1 }
 			}
 		});
-		const results = await Promise.all(sdkOutput.map(async (config$1) => {
-			return {
-				file: config$1.filename,
-				content: await codegen(config$1)
-			};
-		}));
-		const sdkContent = results[0]?.content || "";
 		return {
 			types: output,
-			sdk: sdkContent
+			sdk: (await Promise.all(sdkOutput.map(async (config$1) => {
+				return {
+					file: config$1.filename,
+					content: await codegen(config$1)
+				};
+			})))[0]?.content || ""
 		};
 	} catch (error) {
 		consola$1.warn(`[graphql${serviceLabel}] Client type generation failed:`, error);
@@ -299,9 +283,7 @@ export function getSdk(requester: Requester): Sdk {
 * Generate client types for external GraphQL service
 */
 async function generateExternalClientTypes(service, schema, docs) {
-	const config = service.codegen?.client || {};
-	const sdkConfig = service.codegen?.clientSDK || {};
-	return generateClientTypes(schema, docs, config, sdkConfig, void 0, service.name);
+	return generateClientTypes(schema, docs, service.codegen?.client || {}, service.codegen?.clientSDK || {}, void 0, service.name);
 }
 
 //#endregion

package/dist/utils/directive-parser.js

@@ -109,14 +109,12 @@ var DirectiveParser = class {
 	*/
 	extractStringLiteral(node) {
 		if (node?.type === "Literal" && typeof node.value === "string") return node.value;
-		return void 0;
 	}
 	/**
 	* Extract boolean literal value
 	*/
 	extractBooleanLiteral(node) {
 		if (node?.type === "Literal" && typeof node.value === "boolean") return node.value;
-		return void 0;
 	}
 	/**
 	* Extract array of strings
@@ -169,7 +167,6 @@ var DirectiveParser = class {
 	*/
 	extractLiteralValue(node) {
 		if (node?.type === "Literal") return node.value;
-		return void 0;
 	}
 };
 /**
@@ -177,15 +174,12 @@ var DirectiveParser = class {
 */
 function generateDirectiveSchema(directive) {
 	let args = "";
-	if (directive.args && Object.keys(directive.args).length > 0) {
-		const argDefs = Object.entries(directive.args).map(([name, arg]) => {
-			let defaultValue = "";
-			if (arg.defaultValue !== void 0) if (typeof arg.defaultValue === "string") defaultValue = ` = "${arg.defaultValue}"`;
-			else defaultValue = ` = ${arg.defaultValue}`;
-			return `${name}: ${arg.type}${defaultValue}`;
-		});
-		args = `(${argDefs.join(", ")})`;
-	}
+	if (directive.args && Object.keys(directive.args).length > 0) args = `(${Object.entries(directive.args).map(([name, arg]) => {
+		let defaultValue = "";
+		if (arg.defaultValue !== void 0) if (typeof arg.defaultValue === "string") defaultValue = ` = "${arg.defaultValue}"`;
+		else defaultValue = ` = ${arg.defaultValue}`;
+		return `${name}: ${arg.type}${defaultValue}`;
+	}).join(", ")})`;
 	const locations = directive.locations.join(" | ");
 	return `directive @${directive.name}${args} on ${locations}`;
 }
@@ -220,10 +214,7 @@ ${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");
-			shouldWrite = existingContent !== content;
-		}
+		if (existsSync(directivesPath)) shouldWrite = readFileSync(directivesPath, "utf-8") !== content;
 		if (shouldWrite) writeFileSync(directivesPath, content, "utf-8");
 		if (!nitro.scanSchemas.includes(directivesPath)) nitro.scanSchemas.push(directivesPath);
 	}

package/dist/utils/index.js

@@ -44,56 +44,83 @@ function relativeWithDot(from, to) {
 	return RELATIVE_RE.test(rel) ? rel : `./${rel}`;
 }
 async function scanGraphql(nitro) {
-	const files = await scanFiles(nitro, "graphql");
-	return files.map((f) => f.fullPath);
+	return (await scanFiles(nitro, "graphql")).map((f) => f.fullPath);
 }
 async function scanResolvers(nitro) {
 	const files = await scanFiles(nitro, "graphql", "**/*.resolver.{ts,js}");
 	const exportName = [];
-	for (const file of files) {
+	const VALID_DEFINE_FUNCTIONS = [
+		"defineResolver",
+		"defineQuery",
+		"defineMutation",
+		"defineType",
+		"defineSubscription",
+		"defineDirective"
+	];
+	for (const file of files) try {
 		const fileContent = await readFile(file.fullPath, "utf-8");
 		const parsed = await parseAsync(file.fullPath, fileContent);
 		const exports = {
 			imports: [],
 			specifier: file.fullPath
 		};
-		for (const node of parsed.program.body) if (node.type === "ExportNamedDeclaration" && node.declaration && node.declaration.type === "VariableDeclaration") {
-			for (const decl of node.declaration.declarations) if (decl.type === "VariableDeclarator" && decl.init && decl.id.type === "Identifier") {
-				if (decl.init && decl.init.type === "CallExpression") {
-					if (decl.init.callee.type === "Identifier" && decl.init.callee.name === "defineResolver") exports.imports.push({
-						name: decl.id.name,
-						type: "resolver",
-						as: `_${hash(decl.id.name + file.fullPath).replace(/-/g, "").slice(0, 6)}`
-					});
-					if (decl.init.callee.type === "Identifier" && decl.init.callee.name === "defineQuery") exports.imports.push({
-						name: decl.id.name,
-						type: "query",
-						as: `_${hash(decl.id.name + file.fullPath).replace(/-/g, "").slice(0, 6)}`
-					});
-					if (decl.init.callee.type === "Identifier" && decl.init.callee.name === "defineMutation") exports.imports.push({
-						name: decl.id.name,
-						type: "mutation",
-						as: `_${hash(decl.id.name + file.fullPath).replace(/-/g, "").slice(0, 6)}`
-					});
-					if (decl.init.callee.type === "Identifier" && decl.init.callee.name === "defineType") exports.imports.push({
-						name: decl.id.name,
-						type: "type",
-						as: `_${hash(decl.id.name + file.fullPath).replace(/-/g, "").slice(0, 6)}`
-					});
-					if (decl.init.callee.type === "Identifier" && decl.init.callee.name === "defineSubscription") exports.imports.push({
-						name: decl.id.name,
-						type: "subscription",
-						as: `_${hash(decl.id.name + file.fullPath).replace(/-/g, "").slice(0, 6)}`
-					});
-					if (decl.init.callee.type === "Identifier" && decl.init.callee.name === "defineDirective") exports.imports.push({
-						name: decl.id.name,
-						type: "directive",
-						as: `_${hash(decl.id.name + file.fullPath).replace(/-/g, "").slice(0, 6)}`
-					});
+		let hasDefaultExport = false;
+		let hasNamedExport = false;
+		const namedExports = [];
+		for (const node of parsed.program.body) {
+			if (node.type === "ExportDefaultDeclaration") hasDefaultExport = true;
+			if (node.type === "ExportNamedDeclaration" && node.declaration && node.declaration.type === "VariableDeclaration") {
+				for (const decl of node.declaration.declarations) if (decl.type === "VariableDeclarator" && decl.init && decl.id.type === "Identifier") {
+					hasNamedExport = true;
+					namedExports.push(decl.id.name);
+					if (decl.init && decl.init.type === "CallExpression") {
+						if (decl.init.callee.type === "Identifier" && decl.init.callee.name === "defineResolver") exports.imports.push({
+							name: decl.id.name,
+							type: "resolver",
+							as: `_${hash(decl.id.name + file.fullPath).replace(/-/g, "").slice(0, 6)}`
+						});
+						if (decl.init.callee.type === "Identifier" && decl.init.callee.name === "defineQuery") exports.imports.push({
+							name: decl.id.name,
+							type: "query",
+							as: `_${hash(decl.id.name + file.fullPath).replace(/-/g, "").slice(0, 6)}`
+						});
+						if (decl.init.callee.type === "Identifier" && decl.init.callee.name === "defineMutation") exports.imports.push({
+							name: decl.id.name,
+							type: "mutation",
+							as: `_${hash(decl.id.name + file.fullPath).replace(/-/g, "").slice(0, 6)}`
+						});
+						if (decl.init.callee.type === "Identifier" && decl.init.callee.name === "defineType") exports.imports.push({
+							name: decl.id.name,
+							type: "type",
+							as: `_${hash(decl.id.name + file.fullPath).replace(/-/g, "").slice(0, 6)}`
+						});
+						if (decl.init.callee.type === "Identifier" && decl.init.callee.name === "defineSubscription") exports.imports.push({
+							name: decl.id.name,
+							type: "subscription",
+							as: `_${hash(decl.id.name + file.fullPath).replace(/-/g, "").slice(0, 6)}`
+						});
+						if (decl.init.callee.type === "Identifier" && decl.init.callee.name === "defineDirective") exports.imports.push({
+							name: decl.id.name,
+							type: "directive",
+							as: `_${hash(decl.id.name + file.fullPath).replace(/-/g, "").slice(0, 6)}`
+						});
+					}
 				}
 			}
 		}
+		if (nitro.options.dev) {
+			const relPath = relative(nitro.options.rootDir, file.fullPath);
+			if (hasDefaultExport && !hasNamedExport) nitro.logger.warn(`[nitro-graphql] ${relPath}: Using default export instead of named export. Resolvers must use named exports like "export const myResolver = defineQuery(...)". Default exports are not detected.`);
+			if (exports.imports.length === 0 && hasNamedExport) {
+				const validFunctions = VALID_DEFINE_FUNCTIONS.join(", ");
+				nitro.logger.warn(`[nitro-graphql] ${relPath}: File has named exports [${namedExports.join(", ")}] but none use the required define functions (${validFunctions}). Exports will not be registered.`);
+			}
+			if (!hasDefaultExport && !hasNamedExport) nitro.logger.warn(`[nitro-graphql] ${relPath}: No exports found. Resolver files must export resolvers using defineResolver, defineQuery, defineMutation, etc.`);
+		}
 		if (exports.imports.length > 0) exportName.push(exports);
+	} catch (error) {
+		const relPath = relative(nitro.options.rootDir, file.fullPath);
+		nitro.logger.error(`[nitro-graphql] Failed to parse resolver file ${relPath}:`, error);
 	}
 	return exportName;
 }
@@ -123,12 +150,10 @@ async function scanDirectives(nitro) {
 	return exportName;
 }
 async function scanTypeDefs(nitro) {
-	const files = await scanFiles(nitro, "graphql", "**/*.typedef.{ts,js}");
-	return files.map((f) => f.fullPath);
+	return (await scanFiles(nitro, "graphql", "**/*.typedef.{ts,js}")).map((f) => f.fullPath);
 }
 async function scanSchemas(nitro) {
-	const files = await scanFiles(nitro, "graphql", "**/*.graphql");
-	return files.map((f) => f.fullPath);
+	return (await scanFiles(nitro, "graphql", "**/*.graphql")).map((f) => f.fullPath);
 }
 async function scanDocs(nitro) {
 	const files = await scanDir(nitro, nitro.options.rootDir, nitro.graphql.dir.client, "**/*.graphql");
@@ -141,16 +166,12 @@ async function scanDocs(nitro) {
 		seenPaths.add(file.fullPath);
 		return true;
 	});
-	const externalServices = nitro.options.graphql?.externalServices || [];
-	const externalPatterns = externalServices.flatMap((service) => service.documents || []);
+	const externalPatterns = (nitro.options.graphql?.externalServices || []).flatMap((service) => service.documents || []);
 	return allFiles.filter((f) => !f.path.startsWith("external/")).filter((f) => {
 		const relativePath = f.path;
 		for (const pattern of externalPatterns) {
 			const clientDirPattern = `${nitro.graphql.dir.client}/`;
-			const cleanPattern = pattern.replace(/* @__PURE__ */ new RegExp(`^${clientDirPattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`), "");
-			const patternDir = cleanPattern.split("/")[0];
-			const fileDir = relativePath.split("/")[0];
-			if (patternDir === fileDir) return false;
+			if (pattern.replace(/* @__PURE__ */ new RegExp(`^${clientDirPattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`), "").split("/")[0] === relativePath.split("/")[0]) return false;
 		}
 		return true;
 	}).map((f) => f.fullPath);
@@ -213,7 +234,7 @@ async function scanFiles(nitro, name, globPattern = GLOB_SCAN_PATTERN) {
 	});
 }
 async function scanDir(nitro, dir, name, globPattern = GLOB_SCAN_PATTERN) {
-	const fileNames = await glob(join(name, globPattern), {
+	return (await glob(join(name, globPattern), {
 		cwd: dir,
 		dot: true,
 		ignore: nitro.options.ignore,
@@ -224,8 +245,7 @@ async function scanDir(nitro, dir, name, globPattern = GLOB_SCAN_PATTERN) {
 			return [];
 		}
 		throw error;
-	});
-	return fileNames.map((fullPath) => {
+	})).map((fullPath) => {
 		return {
 			fullPath,
 			path: relative(join(dir, name), fullPath)

package/dist/utils/server-codegen.js

@@ -21,7 +21,7 @@ function pluginContent(_schema, _documents, _config, _info) {
 	};
 }
 async function generateTypes(selectFremework, schema, config = {}, outputPath) {
-	const defaultConfig = {
+	const mergedConfig = defu$1({
 		scalars: {
 			DateTime: DateTimeResolver.extensions.codegenScalarType,
 			DateTimeISO: DateTimeISOResolver.extensions.codegenScalarType,
@@ -43,9 +43,8 @@ async function generateTypes(selectFremework, schema, config = {}, outputPath) {
 		declarationKind: "interface",
 		enumsAsTypes: true,
 		...config.federation?.enabled && { federation: true }
-	};
-	const mergedConfig = defu$1(defaultConfig, config.codegen?.server);
-	const output = await codegen({
+	}, config.codegen?.server);
+	return await codegen({
 		filename: outputPath || "types.generated.ts",
 		schema: parse(printSchemaWithDirectives(schema)),
 		documents: [],
@@ -131,7 +130,6 @@ type ResolverReturnTypeObject<T extends object> =
 		consola.withTag("graphql").error("Error generating types:", e);
 		return "";
 	});
-	return output;
 }
 
 //#endregion

package/dist/utils/type-generation.js

@@ -31,8 +31,7 @@ function generateNuxtOfetchClient(clientDir, serviceName = "default") {
 	const serviceDir = resolve(clientDir, serviceName);
 	const ofetchPath = resolve(serviceDir, "ofetch.ts");
 	if (!existsSync(serviceDir)) mkdirSync(serviceDir, { recursive: true });
-	if (!existsSync(ofetchPath)) {
-		const ofetchContent = `// This file is auto-generated once by nitro-graphql for quick start
+	if (!existsSync(ofetchPath)) writeFileSync(ofetchPath, `// 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'
@@ -54,9 +53,7 @@ export function createGraphQLClient(endpoint: string): Requester {
   }
 }
 
-export const $sdk = getSdk(createGraphQLClient('/api/graphql'))`;
-		writeFileSync(ofetchPath, ofetchContent, "utf-8");
-	}
+export const $sdk = getSdk(createGraphQLClient('/api/graphql'))`, "utf-8");
 }
 function generateExternalOfetchClient(clientDir, serviceName, endpoint) {
 	const serviceDir = resolve(clientDir, serviceName);
@@ -64,7 +61,7 @@ function generateExternalOfetchClient(clientDir, serviceName, endpoint) {
 	if (!existsSync(serviceDir)) mkdirSync(serviceDir, { recursive: true });
 	if (!existsSync(ofetchPath)) {
 		const capitalizedServiceName = serviceName.charAt(0).toUpperCase() + serviceName.slice(1);
-		const ofetchContent = `// This file is auto-generated once by nitro-graphql for quick start
+		writeFileSync(ofetchPath, `// 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'
@@ -86,8 +83,7 @@ export function create${capitalizedServiceName}GraphQLClient(endpoint: string =
   }
 }
 
-export const $${serviceName}Sdk: Sdk = getSdk(create${capitalizedServiceName}GraphQLClient())`;
-		writeFileSync(ofetchPath, ofetchContent, "utf-8");
+export const $${serviceName}Sdk: Sdk = getSdk(create${capitalizedServiceName}GraphQLClient())`, "utf-8");
 	}
 }
 /**
@@ -127,8 +123,7 @@ function validateNoDuplicateTypes(schemas, schemaStrings) {
 	schemaStrings.forEach((schemaContent, index) => {
 		const fileName = basename(schemas[index]);
 		try {
-			const document = parse(schemaContent);
-			document.definitions.forEach((def) => {
+			parse(schemaContent).definitions.forEach((def) => {
 				if (def.kind === "ObjectTypeDefinition" || def.kind === "InterfaceTypeDefinition" || def.kind === "UnionTypeDefinition" || def.kind === "EnumTypeDefinition" || def.kind === "InputObjectTypeDefinition" || def.kind === "ScalarTypeDefinition") {
 					const typeName = def.name.value;
 					if ([
@@ -148,8 +143,7 @@ function validateNoDuplicateTypes(schemas, schemaStrings) {
 								const content = schemaStrings[i];
 								if (!content) return false;
 								try {
-									const doc = parse(content);
-									return doc.definitions.some((d) => (d.kind === "ObjectTypeDefinition" || d.kind === "InterfaceTypeDefinition" || d.kind === "UnionTypeDefinition" || d.kind === "EnumTypeDefinition" || d.kind === "InputObjectTypeDefinition" || d.kind === "ScalarTypeDefinition") && d.name.value === typeName);
+									return parse(content).definitions.some((d) => (d.kind === "ObjectTypeDefinition" || d.kind === "InterfaceTypeDefinition" || d.kind === "UnionTypeDefinition" || d.kind === "EnumTypeDefinition" || d.kind === "InputObjectTypeDefinition" || d.kind === "ScalarTypeDefinition") && d.name.value === typeName);
 								} catch {
 									return false;
 								}
@@ -189,10 +183,8 @@ async function serverTypeGeneration(app) {
 			consola.info("No GraphQL definitions found for server type generation.");
 			return;
 		}
-		const loadSchemas = loadFilesSync(schemas);
-		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 schemaStrings = loadFilesSync(schemas).map((schema$1) => typeof schema$1 === "string" ? schema$1 : schema$1.loc?.source?.body || "").filter(Boolean);
+		if (!validateNoDuplicateTypes(schemas, schemaStrings)) return;
 		const federationEnabled = app.options.graphql?.federation?.enabled === true;
 		const mergedSchemas = mergeTypeDefs([schemaStrings.join("\n\n")], {
 			throwOnConflict: true,
@@ -214,8 +206,7 @@ async function serverTypeGeneration(app) {
 }
 async function clientTypeGeneration(nitro) {
 	try {
-		const hasServerSchema = nitro.scanSchemas && nitro.scanSchemas.length > 0;
-		if (hasServerSchema) await generateMainClientTypes(nitro);
+		if (nitro.scanSchemas && nitro.scanSchemas.length > 0) await generateMainClientTypes(nitro);
 		if (nitro.options.graphql?.externalServices?.length) await generateExternalServicesTypes(nitro);
 	} catch (error) {
 		consola.error("Client schema generation error:", error);
@@ -259,9 +250,7 @@ async function generateMainClientTypes(nitro) {
 		return;
 	}
 	const graphqlString = readFileSync(schemaFilePath, "utf-8");
-	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 ?? {});
+	const types = await generateClientTypes(nitro.options.graphql?.federation?.enabled === true ? buildSubgraphSchema([{ typeDefs: parse(graphqlString) }]) : buildSchema(graphqlString), 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");
 	const defaultServiceDir = resolve(nitro.graphql.clientDir, "default");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "1.4.3",
+  "version": "1.5.0",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,
@@ -60,7 +60,6 @@
   ],
   "peerDependencies": {
     "@apollo/server": "^5.0.0",
-    "@apollo/subgraph": "^2.0.0",
     "@apollo/utils.withrequired": "^3.0.0",
     "@as-integrations/h3": "^2.0.0",
     "graphql": "^16.11.0",
@@ -71,9 +70,6 @@
     "@apollo/server": {
       "optional": true
     },
-    "@apollo/subgraph": {
-      "optional": true
-    },
     "@apollo/utils.withrequired": {
       "optional": true
     },
@@ -82,46 +78,46 @@
     }
   },
   "dependencies": {
-    "@graphql-codegen/core": "^4.0.2",
+    "@apollo/subgraph": "^2.11.3",
+    "@graphql-codegen/core": "^5.0.0",
     "@graphql-codegen/import-types-preset": "^3.0.1",
-    "@graphql-codegen/typescript": "^4.1.6",
+    "@graphql-codegen/typescript": "^5.0.2",
     "@graphql-codegen/typescript-generic-sdk": "^4.0.2",
-    "@graphql-codegen/typescript-operations": "^4.6.1",
-    "@graphql-codegen/typescript-resolvers": "^4.5.2",
-    "@graphql-tools/graphql-file-loader": "^8.1.0",
+    "@graphql-codegen/typescript-operations": "^5.0.2",
+    "@graphql-codegen/typescript-resolvers": "^5.1.0",
+    "@graphql-tools/graphql-file-loader": "^8.1.2",
     "@graphql-tools/load": "^8.1.2",
     "@graphql-tools/load-files": "^7.0.1",
     "@graphql-tools/merge": "^9.1.1",
     "@graphql-tools/schema": "^10.0.25",
-    "@graphql-tools/url-loader": "^8.0.33",
+    "@graphql-tools/url-loader": "^9.0.0",
     "@graphql-tools/utils": "^10.9.1",
     "chokidar": "^4.0.3",
     "consola": "^3.4.2",
     "defu": "^6.1.4",
     "graphql-config": "^5.1.5",
-    "graphql-scalars": "^1.24.2",
+    "graphql-scalars": "^1.25.0",
     "knitwork": "^1.2.0",
     "ohash": "^2.0.11",
-    "oxc-parser": "^0.86.0",
+    "oxc-parser": "^0.95.0",
     "pathe": "^2.0.3",
-    "tinyglobby": "^0.2.14"
+    "tinyglobby": "^0.2.15"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^5.2.2",
-    "@apollo/subgraph": "^2.11.2",
-    "@nuxt/kit": "^4.1.0",
-    "@nuxt/schema": "^4.1.0",
-    "@types/node": "^22.18.1",
-    "bumpp": "^10.2.3",
+    "@antfu/eslint-config": "^6.0.0",
+    "@nuxt/kit": "^4.1.3",
+    "@nuxt/schema": "^4.1.3",
+    "@types/node": "^24.9.1",
+    "bumpp": "^10.3.1",
     "changelogen": "^0.6.2",
     "crossws": "0.3.5",
-    "eslint": "^9.34.0",
+    "eslint": "^9.38.0",
     "graphql": "16.11.0",
-    "graphql-yoga": "^5.15.1",
+    "graphql-yoga": "^5.16.0",
     "h3": "1.15.3",
-    "nitropack": "^2.12.5",
-    "tsdown": "^0.14.2",
-    "typescript": "^5.9.2"
+    "nitropack": "^2.12.7",
+    "tsdown": "^0.15.9",
+    "typescript": "^5.9.3"
   },
   "resolutions": {
     "nitro-graphql": "link:."