nitro-graphql 2.0.0-beta.30 → 2.0.0-beta.32

package/dist/utils/index.mjs

@@ -3,7 +3,7 @@ import { createDefaultMaskError } from "./errors.mjs";
 import { readFile } from "node:fs/promises";
 import { basename, join, relative } from "pathe";
 import { hash } from "ohash";
-import { parseAsync } from "oxc-parser";
+import { parseSync } from "oxc-parser";
 import { glob } from "tinyglobby";
 
 //#region src/utils/index.ts
@@ -70,20 +70,20 @@ async function scanResolvers(nitro) {
 		"defineResolver",
 		"defineQuery",
 		"defineMutation",
-		"defineType",
+		"defineField",
 		"defineSubscription",
 		"defineDirective"
 	];
 	for (const file of files) try {
 		const fileContent = await readFile(file.fullPath, "utf-8");
-		const parsed = await parseAsync(file.fullPath, fileContent);
+		const parsed = parseSync(file.fullPath, fileContent);
 		if (parsed.errors && parsed.errors.length > 0) {
 			if (nitro.options.dev) {
 				const fileName = basename(file.fullPath);
 				const firstError = parsed.errors[0];
-				const location = firstError.labels?.[0];
+				const location = firstError?.labels?.[0];
 				const lineInfo = location ? `:${location.start}` : "";
-				const message = firstError.message.split(",")[0];
+				const message = firstError?.message.split(",")[0] || "Syntax error";
 				console.error(`✖ ${fileName}${lineInfo} - ${message}`);
 			}
 			continue;
@@ -117,7 +117,7 @@ async function scanResolvers(nitro) {
 							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({
+						if (decl.init.callee.type === "Identifier" && decl.init.callee.name === "defineField") exports.imports.push({
 							name: decl.id.name,
 							type: "type",
 							as: `_${hash(decl.id.name + file.fullPath).replace(/-/g, "").slice(0, 6)}`
@@ -137,6 +137,7 @@ async function scanResolvers(nitro) {
 			}
 		}
 		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(", ");
@@ -146,8 +147,8 @@ async function scanResolvers(nitro) {
 		}
 		if (exports.imports.length > 0) exportName.push(exports);
 	} catch (error) {
-		const relPath$1 = relative(nitro.options.rootDir, file.fullPath);
-		nitro.logger.error(`[nitro-graphql] Failed to parse resolver file ${relPath$1}:`, error);
+		const relPath = relative(nitro.options.rootDir, file.fullPath);
+		nitro.logger.error(`[nitro-graphql] Failed to parse resolver file ${relPath}:`, error);
 	}
 	return exportName;
 }
@@ -166,7 +167,7 @@ async function scanDirectives(nitro) {
 	const exportName = [];
 	for (const file of files) {
 		const fileContent = await readFile(file.fullPath, "utf-8");
-		const parsed = await parseAsync(file.fullPath, fileContent);
+		const parsed = parseSync(file.fullPath, fileContent);
 		const exports = {
 			imports: [],
 			specifier: file.fullPath
@@ -199,7 +200,7 @@ async function scanSchemas(nitro) {
 		return true;
 	}).map((f) => f.fullPath);
 }
-async function scanDocs(nitro) {
+async function scanDocuments(nitro) {
 	const files = await scanDir(nitro, nitro.options.rootDir, nitro.graphql.dir.client, "**/*.graphql");
 	const layerAppDirs = getLayerAppDirectories(nitro);
 	const layerFiles = await Promise.all(layerAppDirs.map((layerAppDir) => scanDir(nitro, layerAppDir, "graphql", "**/*.graphql"))).then((r) => r.flat());
@@ -286,4 +287,4 @@ async function scanDir(nitro, dir, name, globPattern = GLOB_SCAN_PATTERN) {
 }
 
 //#endregion
-export { GLOB_SCAN_PATTERN, createDefaultMaskError, directiveParser, generateDirectiveSchema, generateDirectiveSchemas, generateLayerIgnorePatterns, getImportId, getLayerAppDirectories, getLayerDirectories, getLayerServerDirectories, relativeWithDot, scanDirectives, scanDocs, scanExternalServiceDocs, scanGraphql, scanResolvers, scanSchemas, validateExternalServices };
+export { GLOB_SCAN_PATTERN, createDefaultMaskError, directiveParser, generateDirectiveSchema, generateDirectiveSchemas, generateLayerIgnorePatterns, getImportId, getLayerAppDirectories, getLayerDirectories, getLayerServerDirectories, relativeWithDot, scanDirectives, scanDocuments, scanExternalServiceDocs, scanGraphql, scanResolvers, scanSchemas, validateExternalServices };

package/dist/utils/path-resolver.d.mts

@@ -53,7 +53,7 @@ declare function getClientUtilsConfig(nitro: Nitro): ClientUtilsConfig;
 /**
  * Check if SDK files should be generated (category-level check)
  */
-declare function shouldGenerateSDK(nitro: Nitro): boolean;
+declare function shouldGenerateSdk(nitro: Nitro): boolean;
 /**
  * Get SDK configuration (handles false case)
  */
@@ -67,4 +67,4 @@ declare function shouldGenerateTypes(nitro: Nitro): boolean;
  */
 declare function getTypesConfig(nitro: Nitro): TypesConfig;
 //#endregion
-export { PathPlaceholders, getClientUtilsConfig, getDefaultPaths, getScaffoldConfig, getSdkConfig, getTypesConfig, replacePlaceholders, resolveFilePath, shouldGenerateClientUtils, shouldGenerateFile, shouldGenerateSDK, shouldGenerateScaffold, shouldGenerateTypes };
+export { PathPlaceholders, getClientUtilsConfig, getDefaultPaths, getScaffoldConfig, getSdkConfig, getTypesConfig, replacePlaceholders, resolveFilePath, shouldGenerateClientUtils, shouldGenerateFile, shouldGenerateScaffold, shouldGenerateSdk, shouldGenerateTypes };

package/dist/utils/path-resolver.mjs

@@ -91,7 +91,7 @@ function getClientUtilsConfig(nitro) {
 /**
 * Check if SDK files should be generated (category-level check)
 */
-function shouldGenerateSDK(nitro) {
+function shouldGenerateSdk(nitro) {
 	const sdkConfig = nitro.options.graphql?.sdk;
 	if (sdkConfig === false) return false;
 	if (sdkConfig && sdkConfig.enabled === false) return false;
@@ -124,4 +124,4 @@ function getTypesConfig(nitro) {
 }
 
 //#endregion
-export { getClientUtilsConfig, getDefaultPaths, getScaffoldConfig, getSdkConfig, getTypesConfig, replacePlaceholders, resolveFilePath, shouldGenerateClientUtils, shouldGenerateFile, shouldGenerateSDK, shouldGenerateScaffold, shouldGenerateTypes };
+export { getClientUtilsConfig, getDefaultPaths, getScaffoldConfig, getSdkConfig, getTypesConfig, replacePlaceholders, resolveFilePath, shouldGenerateClientUtils, shouldGenerateFile, shouldGenerateScaffold, shouldGenerateSdk, shouldGenerateTypes };

package/dist/utils/server-codegen.mjs

@@ -1,13 +1,16 @@
 import { defu as defu$1 } from "defu";
 import consola from "consola";
 import { parse } from "graphql";
-import { printSchemaWithDirectives } from "@graphql-tools/utils";
 import { codegen } from "@graphql-codegen/core";
 import * as typescriptPlugin from "@graphql-codegen/typescript";
+import { printSchemaWithDirectives } from "@graphql-tools/utils";
 import { CurrencyResolver, DateTimeISOResolver, DateTimeResolver, JSONObjectResolver, JSONResolver, NonEmptyStringResolver, UUIDResolver } from "graphql-scalars";
 import * as typescriptResolversPlugin from "@graphql-codegen/typescript-resolvers";
 
 //#region src/utils/server-codegen.ts
+/**
+* Plugin to add prepend comments to generated files
+*/
 function pluginContent(_schema, _documents, _config, _info) {
 	return {
 		prepend: [

package/dist/utils/type-generation.d.mts

@@ -1,12 +1,6 @@
-import { Nitro } from "nitro/types";
-
-//#region src/utils/type-generation.d.ts
-declare function serverTypeGeneration(app: Nitro, options?: {
-  silent?: boolean;
-}): Promise<void>;
-declare function clientTypeGeneration(nitro: Nitro, options?: {
-  silent?: boolean;
-  isInitial?: boolean;
-}): Promise<void>;
-//#endregion
-export { clientTypeGeneration, serverTypeGeneration };
+import { generateMainClientTypes } from "../codegen/client-types.mjs";
+import { generateExternalServicesTypes } from "../codegen/external-types.mjs";
+import { generateServerTypes } from "../codegen/server-types.mjs";
+import { validateNoDuplicateTypes } from "../codegen/validation.mjs";
+import { clientTypeGeneration, serverTypeGeneration } from "../codegen/index.mjs";
+export { clientTypeGeneration, generateExternalServicesTypes, generateMainClientTypes, generateServerTypes, serverTypeGeneration, validateNoDuplicateTypes };

package/dist/utils/type-generation.mjs

@@ -1,420 +1,7 @@
-import { downloadAndSaveSchema, generateClientTypes, generateExternalClientTypes, loadExternalSchema, loadGraphQLDocuments } from "./client-codegen.mjs";
-import { writeFileIfNotExists } from "./file-generator.mjs";
-import { getClientUtilsConfig, getDefaultPaths, getSdkConfig, getTypesConfig, resolveFilePath, shouldGenerateClientUtils, shouldGenerateTypes } from "./path-resolver.mjs";
-import { generateTypes } from "./server-codegen.mjs";
-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 { loadFilesSync } from "@graphql-tools/load-files";
-import { mergeTypeDefs } from "@graphql-tools/merge";
-import { printSchemaWithDirectives } from "@graphql-tools/utils";
+import { generateMainClientTypes } from "../codegen/client-types.mjs";
+import { generateExternalServicesTypes } from "../codegen/external-types.mjs";
+import { validateNoDuplicateTypes } from "../codegen/validation.mjs";
+import { generateServerTypes } from "../codegen/server-types.mjs";
+import { clientTypeGeneration, serverTypeGeneration } from "../codegen/index.mjs";
 
-//#region src/utils/type-generation.ts
-const logger = consola.withTag("nitro-graphql");
-let buildSubgraphSchema = null;
-async function loadFederationSupport() {
-	if (buildSubgraphSchema !== null) return buildSubgraphSchema;
-	try {
-		buildSubgraphSchema = (await import("@apollo/subgraph")).buildSubgraphSchema;
-	} catch {
-		buildSubgraphSchema = false;
-	}
-	return buildSubgraphSchema;
-}
-function generateGraphQLIndexFile(nitro, clientDir, externalServices = []) {
-	if (!shouldGenerateClientUtils(nitro)) return;
-	const placeholders = getDefaultPaths(nitro);
-	const clientUtilsConfig = getClientUtilsConfig(nitro);
-	const indexPath = resolveFilePath(clientUtilsConfig.index, clientUtilsConfig.enabled, true, "{clientGraphql}/index.ts", placeholders);
-	if (!indexPath) return;
-	if (!existsSync(indexPath)) {
-		let indexContent = `// This file is auto-generated once by nitro-graphql for quick start
-// You can modify this file according to your needs
-//
-// Export your main GraphQL service (auto-generated)
-export * from './default/ofetch'
-
-// Export external GraphQL services (auto-generated for existing services)
-// When you add new external services, don't forget to add their exports here:
-// export * from './yourServiceName/ofetch'
-`;
-		for (const service of externalServices) indexContent += `export * from './${service.name}/ofetch'\n`;
-		writeFileIfNotExists(indexPath, indexContent, "client index.ts");
-	}
-}
-function generateNuxtOfetchClient(nitro, clientDir, serviceName = "default") {
-	if (!shouldGenerateClientUtils(nitro)) return;
-	const placeholders = {
-		...getDefaultPaths(nitro),
-		serviceName
-	};
-	const clientUtilsConfig = getClientUtilsConfig(nitro);
-	const ofetchPath = resolveFilePath(clientUtilsConfig.ofetch, clientUtilsConfig.enabled, true, "{clientGraphql}/{serviceName}/ofetch.ts", placeholders);
-	if (!ofetchPath) return;
-	const serviceDir = dirname(ofetchPath);
-	if (!existsSync(serviceDir)) mkdirSync(serviceDir, { recursive: true });
-	if (existsSync(ofetchPath)) return;
-	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'
-
-export function createGraphQLClient(endpoint: string): Requester {
-  return async <R>(doc: string, vars?: any): Promise<R> => {
-    const headers = import.meta.server ? useRequestHeaders() : undefined
-
-    const result = await $fetch(endpoint, {
-      method: 'POST',
-      body: { query: doc, variables: vars },
-      headers: {
-        'Content-Type': 'application/json',
-        ...headers,
-      },
-    })
-
-    return result as R
-  }
-}
-
-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) {
-	if (!shouldGenerateClientUtils(nitro)) return;
-	const serviceName = service.name;
-	const placeholders = {
-		...getDefaultPaths(nitro),
-		serviceName
-	};
-	const clientUtilsConfig = getClientUtilsConfig(nitro);
-	const ofetchPath = resolveFilePath(service.paths?.ofetch ?? clientUtilsConfig.ofetch, clientUtilsConfig.enabled, true, "{clientGraphql}/{serviceName}/ofetch.ts", placeholders);
-	if (!ofetchPath) return;
-	const serviceDir = dirname(ofetchPath);
-	if (!existsSync(serviceDir)) mkdirSync(serviceDir, { recursive: true });
-	if (!existsSync(ofetchPath)) {
-		const capitalizedServiceName = serviceName.charAt(0).toUpperCase() + serviceName.slice(1);
-		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'
-
-export function create${capitalizedServiceName}GraphQLClient(endpoint: string = '${endpoint}'): Requester {
-  return async <R>(doc: string, vars?: any): Promise<R> => {
-    const headers = import.meta.server ? useRequestHeaders() : undefined
-
-    const result = await $fetch(endpoint, {
-      method: 'POST',
-      body: { query: doc, variables: vars },
-      headers: {
-        'Content-Type': 'application/json',
-        ...headers,
-      },
-    })
-
-    return result as R
-  }
-}
-
-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`);
-	}
-}
-/**
-* Check for duplicate type definitions using a simpler approach
-* Try to build each schema individually - if that succeeds but merging fails, we have duplicates
-* @returns true if validation passes, false if duplicates found
-*/
-function validateNoDuplicateTypes(schemas, schemaStrings) {
-	const individualSchemasByFile = /* @__PURE__ */ new Map();
-	schemaStrings.forEach((schemaContent, index) => {
-		const schemaPath = schemas[index];
-		const fileName = basename(schemaPath);
-		try {
-			parse(schemaContent);
-			individualSchemasByFile.set(fileName, schemaContent);
-		} catch (error) {
-			consola.warn(`Invalid GraphQL syntax in ${fileName}:`, error);
-			throw error;
-		}
-	});
-	try {
-		mergeTypeDefs([schemaStrings.join("\n\n")], {
-			throwOnConflict: false,
-			commentDescriptions: true,
-			sort: true
-		});
-		mergeTypeDefs([schemaStrings.join("\n\n")], {
-			throwOnConflict: true,
-			commentDescriptions: true,
-			sort: true
-		});
-	} catch (conflictError) {
-		if (conflictError?.message?.includes("already defined with a different type")) throw conflictError;
-	}
-	const typeNames = /* @__PURE__ */ new Set();
-	const duplicateTypes = [];
-	schemaStrings.forEach((schemaContent, index) => {
-		const fileName = basename(schemas[index]);
-		try {
-			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 ([
-						"String",
-						"Int",
-						"Float",
-						"Boolean",
-						"ID",
-						"DateTime",
-						"JSON"
-					].includes(typeName)) return;
-					if (typeNames.has(typeName)) {
-						const existing = duplicateTypes.find((d) => d.type === typeName);
-						if (existing) existing.files.push(fileName);
-						else {
-							const firstFile = schemas.find((_, i) => {
-								const content = schemaStrings[i];
-								if (!content) return false;
-								try {
-									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;
-								}
-							});
-							duplicateTypes.push({
-								type: typeName,
-								files: [basename(firstFile || ""), fileName]
-							});
-						}
-					} else typeNames.add(typeName);
-				}
-			});
-		} catch {}
-	});
-	if (duplicateTypes.length > 0) {
-		let errorMessage = "⚠️  DUPLICATE TYPE DEFINITIONS DETECTED!\n\n";
-		duplicateTypes.forEach(({ type, files }) => {
-			errorMessage += `❌ Type "${type}" is defined in multiple files:\n`;
-			files.forEach((fileName) => {
-				const fullPath = schemas.find((path) => basename(path) === fileName) || fileName;
-				errorMessage += `   • ${fullPath}\n`;
-			});
-			errorMessage += "\n";
-		});
-		errorMessage += "💡 Each GraphQL type should only be defined once.\n";
-		errorMessage += "   Consider using \"extend type\" syntax instead of duplicate definitions.\n";
-		errorMessage += `\n🔍 Found ${duplicateTypes.length} duplicate type(s): ${duplicateTypes.map((d) => d.type).join(", ")}`;
-		consola.error(errorMessage);
-		return false;
-	}
-	return true;
-}
-async function serverTypeGeneration(app, options = {}) {
-	try {
-		if (!shouldGenerateTypes(app)) {
-			logger.debug("Server type generation is disabled");
-			return;
-		}
-		const schemas = app.scanSchemas || [];
-		if (!schemas.length) {
-			if (!options.silent) consola.info("No GraphQL definitions found for server type generation.");
-			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,
-			commentDescriptions: true,
-			sort: true
-		});
-		let schema;
-		if (federationEnabled) {
-			const buildSubgraph = await loadFederationSupport();
-			if (!buildSubgraph) throw new Error("Federation is enabled but @apollo/subgraph is not installed. Run: pnpm add @apollo/subgraph");
-			schema = buildSubgraph([{ typeDefs: parse(mergedSchemas) }]);
-		} else schema = 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");
-		mkdirSync(dirname(schemaPath), { recursive: true });
-		writeFileSync(schemaPath, printSchema, "utf-8");
-		const placeholders = getDefaultPaths(app);
-		const typesConfig = getTypesConfig(app);
-		const serverTypesPath = resolveFilePath(typesConfig.server, typesConfig.enabled, true, "{typesDir}/nitro-graphql-server.d.ts", placeholders);
-		if (serverTypesPath) {
-			mkdirSync(dirname(serverTypesPath), { recursive: true });
-			writeFileSync(serverTypesPath, data, "utf-8");
-			if (!options.silent) logger.success(`Generated server types at: ${serverTypesPath}`);
-		}
-	} catch (error) {
-		logger.error("Server schema generation error:", error);
-	}
-}
-async function clientTypeGeneration(nitro, options = {}) {
-	try {
-		if (nitro.scanSchemas && nitro.scanSchemas.length > 0) await generateMainClientTypes(nitro, options);
-		if (nitro.options.graphql?.externalServices?.length) await generateExternalServicesTypes(nitro, options);
-	} catch (error) {
-		logger.error("Client schema generation error:", error);
-	}
-}
-/**
-* Check for old structure files and warn user about manual migration
-*/
-function checkOldStructure(clientDir) {
-	const oldOfetchPath = resolve(clientDir, "ofetch.ts");
-	const oldSdkPath = resolve(clientDir, "sdk.ts");
-	if (existsSync(oldOfetchPath) || existsSync(oldSdkPath)) {
-		const foundFiles = [];
-		if (existsSync(oldOfetchPath)) foundFiles.push("app/graphql/ofetch.ts");
-		if (existsSync(oldSdkPath)) foundFiles.push("app/graphql/sdk.ts");
-		consola.error(`⚠️  OLD GRAPHQL STRUCTURE DETECTED!
-
-📁 Found old files in app/graphql/ directory that need to be moved:
-   • ${foundFiles.join("\n   • ")}
-
-🔄 Please manually move these files to the new structure:
-   • app/graphql/ofetch.ts → app/graphql/default/ofetch.ts
-   • app/graphql/sdk.ts → app/graphql/default/sdk.ts
-
-📝 Also update your app/graphql/index.ts to include:
-   export * from './default/ofetch'
-
-💡 After moving, update your imports to use:
-   import { $sdk } from "#graphql/client"
-
-🚫 The old files will cause import conflicts until moved!`);
-	}
-}
-async function generateMainClientTypes(nitro, options = {}) {
-	checkOldStructure(nitro.graphql.clientDir);
-	const docs = nitro.scanDocuments;
-	const loadDocs = await loadGraphQLDocuments(docs);
-	const schemaFilePath = join(nitro.graphql.buildDir, "schema.graphql");
-	if (!existsSync(schemaFilePath)) {
-		if (!options.silent) 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 federationEnabled = nitro.options.graphql?.federation?.enabled === true;
-	let schema;
-	if (federationEnabled) {
-		const buildSubgraph = await loadFederationSupport();
-		if (!buildSubgraph) throw new Error("Federation is enabled but @apollo/subgraph is not installed. Run: pnpm add @apollo/subgraph");
-		schema = buildSubgraph([{ typeDefs: parse(graphqlString) }]);
-	} else schema = buildSchema(graphqlString);
-	const types = await generateClientTypes(schema, loadDocs, nitro.options.graphql?.codegen?.client ?? {}, nitro.options.graphql?.codegen?.clientSDK ?? {}, void 0, void 0, void 0, options);
-	if (types === false) return;
-	const placeholders = getDefaultPaths(nitro);
-	const typesConfig = getTypesConfig(nitro);
-	const sdkConfig = getSdkConfig(nitro);
-	const clientTypesPath = resolveFilePath(typesConfig.client, typesConfig.enabled, true, "{typesDir}/nitro-graphql-client.d.ts", placeholders);
-	if (clientTypesPath) {
-		mkdirSync(dirname(clientTypesPath), { recursive: true });
-		writeFileSync(clientTypesPath, types.types, "utf-8");
-		if (!options.silent) logger.success(`Generated client types at: ${clientTypesPath}`);
-	}
-	const sdkPath = resolveFilePath(sdkConfig.main, sdkConfig.enabled, true, "{clientGraphql}/default/sdk.ts", placeholders);
-	if (sdkPath) {
-		mkdirSync(dirname(sdkPath), { recursive: true });
-		writeFileSync(sdkPath, types.sdk, "utf-8");
-		if (!options.silent) logger.success(`Generated SDK at: ${sdkPath}`);
-	}
-	generateNuxtOfetchClient(nitro, nitro.graphql.clientDir, "default");
-	const externalServices = nitro.options.graphql?.externalServices || [];
-	if (externalServices.length > 0) generateGraphQLIndexFile(nitro, nitro.graphql.clientDir, externalServices);
-}
-async function generateExternalServicesTypes(nitro, options = {}) {
-	const externalServices = nitro.options.graphql?.externalServices || [];
-	for (const service of externalServices) try {
-		if (!options.silent) consola.info(`[graphql:${service.name}] Processing external service`);
-		await downloadAndSaveSchema(service, nitro.options.buildDir);
-		const schema = await loadExternalSchema(service, nitro.options.buildDir);
-		if (!schema) {
-			consola.warn(`[graphql:${service.name}] Failed to load schema, skipping`);
-			continue;
-		}
-		const documentPatterns = service.documents || [];
-		let loadDocs = [];
-		if (documentPatterns.length > 0) try {
-			loadDocs = await loadGraphQLDocuments(documentPatterns);
-			if (!loadDocs || loadDocs.length === 0) {
-				consola.warn(`[graphql:${service.name}] No GraphQL documents found, skipping service generation`);
-				continue;
-			}
-		} catch (error) {
-			consola.warn(`[graphql:${service.name}] No documents found, skipping service generation:`, error);
-			continue;
-		}
-		const types = await generateExternalClientTypes(service, schema, loadDocs);
-		if (types === false) {
-			consola.warn(`[graphql:${service.name}] Type generation failed`);
-			continue;
-		}
-		const placeholders = {
-			...getDefaultPaths(nitro),
-			serviceName: service.name
-		};
-		const typesConfig = getTypesConfig(nitro);
-		const sdkConfig = getSdkConfig(nitro);
-		const serviceTypesPath = resolveFilePath(service.paths?.types ?? typesConfig.external, typesConfig.enabled, true, "{typesDir}/nitro-graphql-client-{serviceName}.d.ts", placeholders);
-		if (serviceTypesPath) {
-			mkdirSync(dirname(serviceTypesPath), { recursive: true });
-			writeFileSync(serviceTypesPath, types.types, "utf-8");
-			if (!options.silent) consola.success(`[graphql:${service.name}] Generated types at: ${serviceTypesPath}`);
-		}
-		const serviceSdkPath = resolveFilePath(service.paths?.sdk ?? sdkConfig.external, sdkConfig.enabled, true, "{clientGraphql}/{serviceName}/sdk.ts", placeholders);
-		if (serviceSdkPath) {
-			mkdirSync(dirname(serviceSdkPath), { recursive: true });
-			writeFileSync(serviceSdkPath, types.sdk, "utf-8");
-			if (!options.silent) consola.success(`[graphql:${service.name}] Generated SDK at: ${serviceSdkPath}`);
-		}
-		generateExternalOfetchClient(nitro, service, service.endpoint);
-		if (!options.silent) consola.success(`[graphql:${service.name}] External service types generated successfully`);
-	} catch (error) {
-		consola.error(`[graphql:${service.name}] External service generation failed:`, error);
-	}
-}
-
-//#endregion
-export { clientTypeGeneration, serverTypeGeneration };
+export { clientTypeGeneration, generateExternalServicesTypes, generateMainClientTypes, generateServerTypes, serverTypeGeneration, validateNoDuplicateTypes };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "2.0.0-beta.30",
+  "version": "2.0.0-beta.32",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,
@@ -102,7 +102,7 @@
     "graphql-scalars": "^1.25.0",
     "knitwork": "^1.3.0",
     "ohash": "^2.0.11",
-    "oxc-parser": "^0.97.0",
+    "oxc-parser": "^0.98.0",
     "pathe": "^2.0.3",
     "tinyglobby": "^0.2.15"
   },
@@ -112,6 +112,7 @@
     "@nuxt/schema": "^4.2.1",
     "@types/node": "^24.10.1",
     "@vitejs/devtools": "^0.0.0-alpha.16",
+    "@vitest/ui": "^3.0.0",
     "bumpp": "^10.3.1",
     "changelogen": "^0.6.2",
     "crossws": "^0.4.1",
@@ -119,10 +120,11 @@
     "graphql": "16.12.0",
     "graphql-yoga": "5.16.2",
     "nitro": "npm:nitro-nightly@latest",
-    "tsdown": "^0.16.4",
+    "tsdown": "^0.16.6",
     "typescript": "^5.9.3",
     "vite": "npm:rolldown-vite@latest",
-    "vitepress-plugin-llms": "^1.9.1"
+    "vitepress-plugin-llms": "^1.9.3",
+    "vitest": "^3.0.0"
   },
   "resolutions": {
     "nitro-graphql": "link:."
@@ -140,6 +142,10 @@
     "docs:preview": "cd .docs && pnpm preview",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
+    "test": "vitest",
+    "test:ui": "vitest --ui",
+    "test:run": "vitest run",
+    "test:coverage": "vitest run --coverage",
     "test:types": "tsc --noEmit"
   }
 }