nitro-graphql 1.5.3 → 1.5.5

package/dist/ecosystem/nuxt.js

@@ -1,5 +1,6 @@
+import { getDefaultPaths, getTypesConfig, resolveFilePath } from "../utils/path-resolver.js";
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
-import { join, resolve } from "pathe";
+import { dirname, join, relative, resolve } from "pathe";
 import { defineNuxtModule, getLayerDirectories } from "@nuxt/kit";
 
 //#region src/ecosystem/nuxt.ts
@@ -11,24 +12,65 @@ var nuxt_default = defineNuxtModule({
 	},
 	setup: async (_options, nuxt) => {
 		nuxt.hooks.hook("prepare:types", (options) => {
-			options.references.push({ path: "types/nitro-graphql-client.d.ts" });
-			options.tsConfig ??= {};
-			options.tsConfig.compilerOptions ??= {};
-			options.tsConfig.compilerOptions.paths ??= {};
-			options.tsConfig.compilerOptions.paths["#graphql/client"] = ["./types/nitro-graphql-client.d.ts"];
+			const mockNitro$1 = { options: {
+				rootDir: nuxt.options.rootDir,
+				buildDir: nuxt.options.buildDir,
+				framework: { name: "nuxt" },
+				graphql: nuxt.options.nitro?.graphql
+			} };
+			const placeholders$1 = getDefaultPaths(mockNitro$1);
+			const typesConfig$1 = getTypesConfig(mockNitro$1);
+			const tsconfigDir = dirname(join(nuxt.options.buildDir, "tsconfig.json"));
+			const relativeWithDot = (from, to) => {
+				const rel = relative(from, to);
+				return rel.startsWith(".") ? rel : `./${rel}`;
+			};
+			const clientTypesPath$1 = resolveFilePath(typesConfig$1.client, typesConfig$1.enabled, true, "{typesDir}/nitro-graphql-client.d.ts", placeholders$1);
+			if (clientTypesPath$1) {
+				const relativePath = relativeWithDot(tsconfigDir, clientTypesPath$1);
+				options.references.push({ path: relativePath });
+				options.tsConfig ??= {};
+				options.tsConfig.compilerOptions ??= {};
+				options.tsConfig.compilerOptions.paths ??= {};
+				options.tsConfig.compilerOptions.paths["#graphql/client"] = [relativePath];
+				options.tsConfig.include = options.tsConfig.include || [];
+				options.tsConfig.include.push(relativePath);
+			}
 			const externalServices$1 = nuxt.options.nitro?.graphql?.externalServices || [];
 			for (const service of externalServices$1) {
-				options.references.push({ path: `types/nitro-graphql-client-${service.name}.d.ts` });
-				options.tsConfig.compilerOptions.paths[`#graphql/client/${service.name}`] = [`./types/nitro-graphql-client-${service.name}.d.ts`];
+				const servicePlaceholders = {
+					...placeholders$1,
+					serviceName: service.name
+				};
+				const externalTypesPath = resolveFilePath(service.paths?.types ?? typesConfig$1.external, typesConfig$1.enabled, true, "{typesDir}/nitro-graphql-client-{serviceName}.d.ts", servicePlaceholders);
+				if (externalTypesPath) {
+					const relativePath = relativeWithDot(tsconfigDir, externalTypesPath);
+					options.references.push({ path: relativePath });
+					options.tsConfig.compilerOptions.paths[`#graphql/client/${service.name}`] = [relativePath];
+					options.tsConfig.include.push(relativePath);
+				}
 			}
-			options.tsConfig.include = options.tsConfig.include || [];
-			options.tsConfig.include.push("./types/nitro-graphql-client.d.ts");
-			for (const service of externalServices$1) options.tsConfig.include.push(`./types/nitro-graphql-client-${service.name}.d.ts`);
 		});
 		nuxt.options.alias = nuxt.options.alias || {};
-		nuxt.options.alias["#graphql/client"] = join(nuxt.options.buildDir, "types/nitro-graphql-client.d.ts");
+		const mockNitro = { options: {
+			rootDir: nuxt.options.rootDir,
+			buildDir: nuxt.options.buildDir,
+			framework: { name: "nuxt" },
+			graphql: nuxt.options.nitro?.graphql
+		} };
+		const placeholders = getDefaultPaths(mockNitro);
+		const typesConfig = getTypesConfig(mockNitro);
+		const clientTypesPath = resolveFilePath(typesConfig.client, typesConfig.enabled, true, "{typesDir}/nitro-graphql-client.d.ts", placeholders);
+		if (clientTypesPath) nuxt.options.alias["#graphql/client"] = clientTypesPath;
 		const externalServices = nuxt.options.nitro?.graphql?.externalServices || [];
-		for (const service of externalServices) nuxt.options.alias[`#graphql/client/${service.name}`] = join(nuxt.options.buildDir, `types/nitro-graphql-client-${service.name}.d.ts`);
+		for (const service of externalServices) {
+			const servicePlaceholders = {
+				...placeholders,
+				serviceName: service.name
+			};
+			const externalTypesPath = resolveFilePath(service.paths?.types ?? typesConfig.external, typesConfig.enabled, true, "{typesDir}/nitro-graphql-client-{serviceName}.d.ts", servicePlaceholders);
+			if (externalTypesPath) nuxt.options.alias[`#graphql/client/${service.name}`] = externalTypesPath;
+		}
 		nuxt.hook("imports:dirs", (dirs) => {
 			const graphqlServerPath = nuxt.options.nitro?.graphql?.serverDir || resolve(nuxt.options.srcDir, "graphql");
 			dirs.push(graphqlServerPath);

package/dist/index.js

@@ -237,8 +237,17 @@ var src_default = defineNitroModule({
 					...placeholders,
 					serviceName: service.name
 				};
+				consola.info(`[DEBUG] External service: ${service.name}`);
+				consola.info("[DEBUG] service.paths:", service.paths);
+				consola.info("[DEBUG] service.paths?.types:", service.paths?.types);
+				consola.info("[DEBUG] typesConfig.external:", typesConfig.external);
 				const externalTypesPath = resolveFilePath(service.paths?.types ?? typesConfig.external, typesConfig.enabled, true, "{typesDir}/nitro-graphql-client-{serviceName}.d.ts", servicePlaceholders);
-				if (externalTypesPath) types.tsConfig.compilerOptions.paths[`#graphql/client/${service.name}`] = [relativeWithDot(tsconfigDir, externalTypesPath)];
+				consola.info("[DEBUG] externalTypesPath after resolveFilePath:", externalTypesPath);
+				if (externalTypesPath) {
+					const relativePath = relativeWithDot(tsconfigDir, externalTypesPath);
+					consola.info("[DEBUG] relativePath after relativeWithDot:", relativePath);
+					types.tsConfig.compilerOptions.paths[`#graphql/client/${service.name}`] = [relativePath];
+				}
 			}
 			types.tsConfig.include = types.tsConfig.include || [];
 			if (serverTypesPath) types.tsConfig.include.push(relativeWithDot(tsconfigDir, serverTypesPath));

package/dist/routes/apollo-server.d.ts

@@ -1,6 +1,6 @@
-import * as h31 from "h3";
+import * as h30 from "h3";
 
 //#region src/routes/apollo-server.d.ts
-declare const _default: h31.EventHandler<h31.EventHandlerRequest, Promise<any>>;
+declare const _default: h30.EventHandler<h30.EventHandlerRequest, Promise<any>>;
 //#endregion
 export { _default as default };

package/dist/routes/debug.d.ts

@@ -1,4 +1,4 @@
-import * as h35 from "h3";
+import * as h33 from "h3";
 
 //#region src/routes/debug.d.ts
 
@@ -10,7 +10,7 @@ import * as h35 from "h3";
  * - /_nitro/graphql/debug - HTML dashboard
  * - /_nitro/graphql/debug?format=json - JSON API
  */
-declare const _default: h35.EventHandler<h35.EventHandlerRequest, Promise<string | {
+declare const _default: h33.EventHandler<h33.EventHandlerRequest, Promise<string | {
   timestamp: string;
   environment: {
     dev: any;

package/dist/routes/graphql-yoga.d.ts

@@ -1,6 +1,6 @@
-import * as h30 from "h3";
+import * as h35 from "h3";
 
 //#region src/routes/graphql-yoga.d.ts
-declare const _default: h30.EventHandler<h30.EventHandlerRequest, Promise<Response>>;
+declare const _default: h35.EventHandler<h35.EventHandlerRequest, Promise<Response>>;
 //#endregion
 export { _default as default };

package/dist/routes/health.d.ts

@@ -1,7 +1,7 @@
-import * as h33 from "h3";
+import * as h31 from "h3";
 
 //#region src/routes/health.d.ts
-declare const _default: h33.EventHandler<h33.EventHandlerRequest, Promise<{
+declare const _default: h31.EventHandler<h31.EventHandlerRequest, Promise<{
   status: string;
   message: string;
   timestamp: string;

package/dist/utils/type-generation.js

@@ -336,7 +336,12 @@ async function generateExternalServicesTypes(nitro) {
 		};
 		const typesConfig = getTypesConfig(nitro);
 		const sdkConfig = getSdkConfig(nitro);
+		consola.info(`[TYPE-GEN DEBUG] External service: ${service.name}`);
+		consola.info("[TYPE-GEN DEBUG] service.paths:", service.paths);
+		consola.info("[TYPE-GEN DEBUG] service.paths?.types:", service.paths?.types);
+		consola.info("[TYPE-GEN DEBUG] typesConfig.external:", typesConfig.external);
 		const serviceTypesPath = resolveFilePath(service.paths?.types ?? typesConfig.external, typesConfig.enabled, true, "{typesDir}/nitro-graphql-client-{serviceName}.d.ts", placeholders);
+		consola.info("[TYPE-GEN DEBUG] serviceTypesPath after resolveFilePath:", serviceTypesPath);
 		if (serviceTypesPath) {
 			mkdirSync(dirname(serviceTypesPath), { recursive: true });
 			writeFileSync(serviceTypesPath, types.types, "utf-8");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "1.5.3",
+  "version": "1.5.5",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,