nitro-graphql 1.1.2 → 1.2.0

package/dist/utils/type-generation.js

@@ -1,4 +1,4 @@
-import { generateClientTypes, loadGraphQLDocuments } from "./client-codegen.js";
+import { downloadAndSaveSchema, generateClientTypes, generateExternalClientTypes, loadExternalSchema, loadGraphQLDocuments } from "./client-codegen.js";
 import { generateTypes } from "./server-codegen.js";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import consola from "consola";
@@ -9,8 +9,27 @@ import { mergeTypeDefs } from "@graphql-tools/merge";
 import { printSchemaWithDirectives } from "@graphql-tools/utils";
 
 //#region src/utils/type-generation.ts
-function generateNuxtOfetchClient(clientDir) {
-	const ofetchPath = resolve(clientDir, "ofetch.ts");
+function generateGraphQLIndexFile(clientDir, externalServices = []) {
+	const indexPath = resolve(clientDir, "index.ts");
+	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`;
+		writeFileSync(indexPath, indexContent, "utf-8");
+	}
+}
+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
 // You can modify this file according to your needs
@@ -38,6 +57,38 @@ export const $sdk = getSdk(createGraphQLClient('/api/graphql'))`;
 		writeFileSync(ofetchPath, ofetchContent, "utf-8");
 	}
 }
+function generateExternalOfetchClient(clientDir, serviceName, endpoint) {
+	const serviceDir = resolve(clientDir, serviceName);
+	const ofetchPath = resolve(serviceDir, "ofetch.ts");
+	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
+// 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())`;
+		writeFileSync(ofetchPath, ofetchContent, "utf-8");
+	}
+}
 async function serverTypeGeneration(app) {
 	try {
 		const schemas = app.scanSchemas || [];
@@ -65,28 +116,101 @@ async function serverTypeGeneration(app) {
 }
 async function clientTypeGeneration(nitro) {
 	try {
-		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, 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 sdkTypesPath = resolve(nitro.graphql.clientDir, "sdk.ts");
-		mkdirSync(dirname(clientTypesPath), { recursive: true });
-		writeFileSync(clientTypesPath, types.types, "utf-8");
-		mkdirSync(dirname(sdkTypesPath), { recursive: true });
-		writeFileSync(sdkTypesPath, types.sdk, "utf-8");
-		if (nitro.options.framework?.name === "nuxt") generateNuxtOfetchClient(nitro.graphql.clientDir);
+		await generateMainClientTypes(nitro);
+		if (nitro.options.graphql?.externalServices?.length) await generateExternalServicesTypes(nitro);
 	} catch (error) {
 		consola.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) {
+	checkOldStructure(nitro.graphql.clientDir);
+	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, 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");
+	if (nitro.options.framework?.name === "nuxt") {
+		generateNuxtOfetchClient(nitro.graphql.clientDir, "default");
+		const externalServices = nitro.options.graphql?.externalServices || [];
+		generateGraphQLIndexFile(nitro.graphql.clientDir, externalServices);
+	}
+}
+async function generateExternalServicesTypes(nitro) {
+	const externalServices = nitro.options.graphql?.externalServices || [];
+	for (const service of externalServices) try {
+		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);
+		} catch (error) {
+			consola.warn(`[graphql:${service.name}] No documents found:`, error);
+		}
+		const types = await generateExternalClientTypes(service, schema, loadDocs);
+		if (types === false) {
+			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);
+		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 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,
@@ -72,6 +72,7 @@
     "@graphql-tools/load-files": "^7.0.1",
     "@graphql-tools/merge": "^9.1.0",
     "@graphql-tools/schema": "^10.0.24",
+    "@graphql-tools/url-loader": "^8.0.33",
     "@graphql-tools/utils": "^10.9.0",
     "chokidar": "^4.0.3",
     "consola": "^3.4.2",
@@ -88,8 +89,8 @@
     "@antfu/eslint-config": "^4.17.0",
     "@apollo/server": "^5.0.0",
     "@graphql-codegen/import-types-preset": "^3.0.1",
-    "@nuxt/kit": "4.0.0-rc.0",
-    "@nuxt/schema": "4.0.0-rc.0",
+    "@nuxt/kit": "^4.0.3",
+    "@nuxt/schema": "^4.0.3",
     "@types/node": "^20.19.9",
     "bumpp": "^10.2.0",
     "changelogen": "^0.6.2",