nitro-graphql 1.4.4 → 1.5.1

package/dist/utils/type-generation.js

@@ -1,4 +1,6 @@
 import { downloadAndSaveSchema, generateClientTypes, generateExternalClientTypes, loadExternalSchema, loadGraphQLDocuments } from "./client-codegen.js";
+import { writeFileIfNotExists } from "./file-generator.js";
+import { getClientUtilsConfig, getDefaultPaths, getSdkConfig, getTypesConfig, resolveFilePath, shouldGenerateClientUtils, shouldGenerateTypes } from "./path-resolver.js";
 import { generateTypes } from "./server-codegen.js";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import consola from "consola";
@@ -10,12 +12,16 @@ import { mergeTypeDefs } from "@graphql-tools/merge";
 import { printSchemaWithDirectives } from "@graphql-tools/utils";
 
 //#region src/utils/type-generation.ts
-function generateGraphQLIndexFile(clientDir, externalServices = []) {
-	const indexPath = resolve(clientDir, "index.ts");
+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'
 
@@ -24,14 +30,21 @@ export * from './default/ofetch'
 // export * from './yourServiceName/ofetch'
 `;
 		for (const service of externalServices) indexContent += `export * from './${service.name}/ofetch'\n`;
-		writeFileSync(indexPath, indexContent, "utf-8");
+		writeFileIfNotExists(indexPath, indexContent, "client index.ts");
 	}
 }
-function generateNuxtOfetchClient(clientDir, serviceName = "default") {
-	const serviceDir = resolve(clientDir, serviceName);
-	const ofetchPath = resolve(serviceDir, "ofetch.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)) writeFileSync(ofetchPath, `// This file is auto-generated once by nitro-graphql for quick start
+	if (!existsSync(ofetchPath)) writeFileIfNotExists(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'
@@ -53,15 +66,23 @@ export function createGraphQLClient(endpoint: string): Requester {
   }
 }
 
-export const $sdk = getSdk(createGraphQLClient('/api/graphql'))`, "utf-8");
+export const $sdk = getSdk(createGraphQLClient('/api/graphql'))`, `${serviceName} ofetch.ts`);
 }
-function generateExternalOfetchClient(clientDir, serviceName, endpoint) {
-	const serviceDir = resolve(clientDir, serviceName);
-	const ofetchPath = resolve(serviceDir, "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);
-		const ofetchContent = `// This file is auto-generated once by nitro-graphql for quick start
+		writeFileIfNotExists(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'
@@ -83,8 +104,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())`, `${serviceName} external ofetch.ts`);
 	}
 }
 /**
@@ -179,6 +199,10 @@ function validateNoDuplicateTypes(schemas, schemaStrings) {
 }
 async function serverTypeGeneration(app) {
 	try {
+		if (!shouldGenerateTypes(app)) {
+			consola.debug("[nitro-graphql] Server type generation is disabled");
+			return;
+		}
 		const schemas = app.scanSchemas || [];
 		if (!schemas.length) {
 			consola.info("No GraphQL definitions found for server type generation.");
@@ -198,9 +222,14 @@ async function serverTypeGeneration(app) {
 		const schemaPath = resolve(app.graphql.buildDir, "schema.graphql");
 		mkdirSync(dirname(schemaPath), { recursive: true });
 		writeFileSync(schemaPath, printSchema, "utf-8");
-		const serverTypesPath = resolve(app.options.buildDir, "types", "nitro-graphql-server.d.ts");
-		mkdirSync(dirname(serverTypesPath), { recursive: true });
-		writeFileSync(serverTypesPath, data, "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");
+			consola.success(`[nitro-graphql] Generated server types at: ${serverTypesPath}`);
+		}
 	} catch (error) {
 		consola.error("Server schema generation error:", error);
 	}
@@ -251,20 +280,27 @@ async function generateMainClientTypes(nitro) {
 		return;
 	}
 	const graphqlString = readFileSync(schemaFilePath, "utf-8");
-	const schema = nitro.options.graphql?.federation?.enabled === true ? 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");
-	const sdkTypesPath = resolve(defaultServiceDir, "sdk.ts");
-	mkdirSync(dirname(clientTypesPath), { recursive: true });
-	writeFileSync(clientTypesPath, types.types, "utf-8");
-	mkdirSync(defaultServiceDir, { recursive: true });
-	writeFileSync(sdkTypesPath, types.sdk, "utf-8");
+	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");
+		consola.success(`[nitro-graphql] 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");
+		consola.success(`[nitro-graphql] Generated SDK at: ${sdkPath}`);
+	}
 	if (nitro.options.framework?.name === "nuxt") {
-		generateNuxtOfetchClient(nitro.graphql.clientDir, "default");
+		generateNuxtOfetchClient(nitro, nitro.graphql.clientDir, "default");
 		const externalServices = nitro.options.graphql?.externalServices || [];
-		generateGraphQLIndexFile(nitro.graphql.clientDir, externalServices);
+		generateGraphQLIndexFile(nitro, nitro.graphql.clientDir, externalServices);
 	}
 }
 async function generateExternalServicesTypes(nitro) {
@@ -294,14 +330,25 @@ async function generateExternalServicesTypes(nitro) {
 			consola.warn(`[graphql:${service.name}] Type generation failed`);
 			continue;
 		}
-		const serviceTypesPath = resolve(nitro.options.buildDir, "types", `nitro-graphql-client-${service.name}.d.ts`);
-		const serviceDir = resolve(nitro.graphql.clientDir, service.name);
-		const serviceSdkPath = resolve(serviceDir, "sdk.ts");
-		mkdirSync(dirname(serviceTypesPath), { recursive: true });
-		writeFileSync(serviceTypesPath, types.types, "utf-8");
-		mkdirSync(serviceDir, { recursive: true });
-		writeFileSync(serviceSdkPath, types.sdk, "utf-8");
-		if (nitro.options.framework?.name === "nuxt") generateExternalOfetchClient(nitro.graphql.clientDir, service.name, service.endpoint);
+		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");
+			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");
+			consola.success(`[graphql:${service.name}] Generated SDK at: ${serviceSdkPath}`);
+		}
+		if (nitro.options.framework?.name === "nuxt") generateExternalOfetchClient(nitro, service, service.endpoint);
 		consola.success(`[graphql:${service.name}] External service types generated successfully`);
 	} catch (error) {
 		consola.error(`[graphql:${service.name}] External service generation failed:`, error);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "1.4.4",
+  "version": "1.5.1",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,
@@ -78,13 +78,13 @@
     }
   },
   "dependencies": {
-    "@apollo/subgraph": "^2.11.2",
+    "@apollo/subgraph": "^2.11.3",
     "@graphql-codegen/core": "^5.0.0",
     "@graphql-codegen/import-types-preset": "^3.0.1",
-    "@graphql-codegen/typescript": "^5.0.1",
+    "@graphql-codegen/typescript": "^5.0.2",
     "@graphql-codegen/typescript-generic-sdk": "^4.0.2",
-    "@graphql-codegen/typescript-operations": "^5.0.1",
-    "@graphql-codegen/typescript-resolvers": "^5.0.1",
+    "@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",
@@ -96,27 +96,27 @@
     "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.93.0",
+    "oxc-parser": "^0.95.0",
     "pathe": "^2.0.3",
     "tinyglobby": "^0.2.15"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^5.4.1",
-    "@nuxt/kit": "^4.1.2",
-    "@nuxt/schema": "^4.1.2",
-    "@types/node": "^24.6.2",
-    "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.37.0",
+    "eslint": "^9.38.0",
     "graphql": "16.11.0",
     "graphql-yoga": "^5.16.0",
     "h3": "1.15.3",
-    "nitropack": "^2.12.6",
-    "tsdown": "^0.15.6",
+    "nitropack": "^2.12.7",
+    "tsdown": "^0.15.9",
     "typescript": "^5.9.3"
   },
   "resolutions": {