nitro-graphql 1.5.5 → 1.5.7

package/dist/ecosystem/{nuxt.js → nuxt.mjs}

@@ -1,4 +1,4 @@
-import { getDefaultPaths, getTypesConfig, resolveFilePath } from "../utils/path-resolver.js";
+import { getDefaultPaths, getTypesConfig, resolveFilePath } from "../utils/path-resolver.mjs";
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { dirname, join, relative, resolve } from "pathe";
 import { defineNuxtModule, getLayerDirectories } from "@nuxt/kit";

package/dist/{index.d.ts → index.d.mts}

@@ -1,8 +1,7 @@
-import { StandardSchemaV1 } from "./types/standard-schema.js";
-import { ClientUtilsConfig, CodegenClientConfig, CodegenServerConfig, ExternalGraphQLService, ExternalServicePaths, FederationConfig, FileGenerationConfig, GenImport, GenericSdkConfig, NitroGraphQLOptions, PathsConfig, ScaffoldConfig, SdkConfig, TypesConfig } from "./types/index.js";
-import * as nitropack0 from "nitropack";
+import { StandardSchemaV1 } from "./types/standard-schema.mjs";
+import { ClientUtilsConfig, CodegenClientConfig, CodegenServerConfig, ExternalGraphQLService, ExternalServicePaths, FederationConfig, FileGenerationConfig, GenImport, GenericSdkConfig, NitroGraphQLOptions, PathsConfig, ScaffoldConfig, SdkConfig, TypesConfig } from "./types/index.mjs";
 
 //#region src/index.d.ts
-declare const _default: nitropack0.NitroModule;
+declare const _default: any;
 //#endregion
 export { ClientUtilsConfig, CodegenClientConfig, CodegenServerConfig, ExternalGraphQLService, ExternalServicePaths, FederationConfig, FileGenerationConfig, GenImport, GenericSdkConfig, NitroGraphQLOptions, PathsConfig, ScaffoldConfig, SdkConfig, StandardSchemaV1, TypesConfig, _default as default };

package/dist/{index.js → index.mjs}

@@ -1,9 +1,9 @@
-import { generateDirectiveSchemas } from "./utils/directive-parser.js";
-import { generateLayerIgnorePatterns, getLayerAppDirectories, getLayerServerDirectories, relativeWithDot, scanDirectives, scanDocs, scanResolvers, scanSchemas, validateExternalServices } from "./utils/index.js";
-import { writeFileIfNotExists } from "./utils/file-generator.js";
-import { getDefaultPaths, getScaffoldConfig, getTypesConfig, resolveFilePath, shouldGenerateScaffold } from "./utils/path-resolver.js";
-import { clientTypeGeneration, serverTypeGeneration } from "./utils/type-generation.js";
-import { rollupConfig } from "./rollup.js";
+import { generateDirectiveSchemas } from "./utils/directive-parser.mjs";
+import { generateLayerIgnorePatterns, getLayerAppDirectories, getLayerServerDirectories, relativeWithDot, scanDirectives, scanDocs, scanResolvers, scanSchemas, validateExternalServices } from "./utils/index.mjs";
+import { writeFileIfNotExists } from "./utils/file-generator.mjs";
+import { getDefaultPaths, getScaffoldConfig, getTypesConfig, resolveFilePath, shouldGenerateScaffold } from "./utils/path-resolver.mjs";
+import { clientTypeGeneration, serverTypeGeneration } from "./utils/type-generation.mjs";
+import { rollupConfig } from "./rollup.mjs";
 import { existsSync, mkdirSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { watch } from "chokidar";
@@ -237,17 +237,8 @@ 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);
-				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];
-				}
+				if (externalTypesPath) types.tsConfig.compilerOptions.paths[`#graphql/client/${service.name}`] = [relativeWithDot(tsconfigDir, externalTypesPath)];
 			}
 			types.tsConfig.include = types.tsConfig.include || [];
 			if (serverTypesPath) types.tsConfig.include.push(relativeWithDot(tsconfigDir, serverTypesPath));

package/dist/{rollup.js → rollup.mjs}

@@ -1,5 +1,5 @@
-import { getImportId, scanGraphql } from "./utils/index.js";
-import { clientTypeGeneration, serverTypeGeneration } from "./utils/type-generation.js";
+import { getImportId, scanGraphql } from "./utils/index.mjs";
+import { clientTypeGeneration, serverTypeGeneration } from "./utils/type-generation.mjs";
 import { resolve } from "pathe";
 import { readFile } from "node:fs/promises";
 import { parse } from "graphql";

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

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

package/dist/routes/{debug.d.ts → debug.d.mts}

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

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

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

package/dist/routes/{health.d.ts → health.d.mts}

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

package/dist/types/{index.d.ts → index.d.mts}

@@ -1,4 +1,4 @@
-import { StandardSchemaV1 } from "./standard-schema.js";
+import { StandardSchemaV1 } from "./standard-schema.mjs";
 import { ESMCodeGenOptions } from "knitwork";
 import { IResolvers } from "@graphql-tools/utils";
 import { TypeScriptPluginConfig } from "@graphql-codegen/typescript";

package/dist/types/{standard-schema.d.ts → standard-schema.d.mts}

@@ -1,8 +1,8 @@
 //#region src/types/standard-schema.d.ts
 /** The Standard Schema interface. */
-interface StandardSchemaV1<Input$1 = unknown, Output$1 = Input$1> {
+interface StandardSchemaV1<Input = unknown, Output = Input> {
   /** The Standard Schema properties. */
-  readonly '~standard': StandardSchemaV1.Props<Input$1, Output$1>;
+  readonly '~standard': StandardSchemaV1.Props<Input, Output>;
 }
 declare namespace StandardSchemaV1 {
   /** The Standard Schema properties interface. */

package/dist/utils/{client-codegen.d.ts → client-codegen.d.mts}

@@ -1,4 +1,4 @@
-import { CodegenClientConfig, ExternalGraphQLService, GenericSdkConfig } from "../types/index.js";
+import { CodegenClientConfig, ExternalGraphQLService, GenericSdkConfig } from "../types/index.mjs";
 import { GraphQLSchema } from "graphql";
 import { Source } from "@graphql-tools/utils";
 import { LoadSchemaOptions, UnnormalizedTypeDefPointer } from "@graphql-tools/load";

package/dist/utils/{index.d.ts → index.d.mts}

@@ -1,5 +1,5 @@
-import { GenImport } from "../types/index.js";
-import { directiveParser, generateDirectiveSchema, generateDirectiveSchemas } from "./directive-parser.js";
+import { GenImport } from "../types/index.mjs";
+import { directiveParser, generateDirectiveSchema, generateDirectiveSchemas } from "./directive-parser.mjs";
 import { Nitro } from "nitropack";
 
 //#region src/utils/index.d.ts

package/dist/utils/{index.js → index.mjs}

@@ -1,4 +1,4 @@
-import { directiveParser, generateDirectiveSchema, generateDirectiveSchemas } from "./directive-parser.js";
+import { directiveParser, generateDirectiveSchema, generateDirectiveSchemas } from "./directive-parser.mjs";
 import { join, relative } from "pathe";
 import { readFile } from "node:fs/promises";
 import { hash } from "ohash";

package/dist/utils/{path-resolver.d.ts → path-resolver.d.mts}

@@ -1,4 +1,4 @@
-import { ClientUtilsConfig, FileGenerationConfig, ScaffoldConfig, SdkConfig, TypesConfig } from "../types/index.js";
+import { ClientUtilsConfig, FileGenerationConfig, ScaffoldConfig, SdkConfig, TypesConfig } from "../types/index.mjs";
 import { Nitro } from "nitropack/types";
 
 //#region src/utils/path-resolver.d.ts

package/dist/utils/{server-codegen.d.ts → server-codegen.d.mts}

@@ -1,4 +1,4 @@
-import { NitroGraphQLOptions } from "../types/index.js";
+import { NitroGraphQLOptions } from "../types/index.mjs";
 import { GraphQLSchema } from "graphql";
 
 //#region src/utils/server-codegen.d.ts

package/dist/utils/{server-codegen.js → server-codegen.mjs}

@@ -103,12 +103,14 @@ type ResolverReturnType<T> = T extends BuiltIns
 ? T
 : T extends (...args: any[]) => unknown
 ? T | undefined
+: T extends { __typename?: any }
+? T
 : T extends object
 ? T extends Array<infer ItemType> // Test for arrays/tuples, per https://github.com/microsoft/TypeScript/issues/35156
   ? ItemType[] extends T // Test for arrays (non-tuples) specifically
     ? Array<ResolverReturnType<ItemType>>
-    : ResolverReturnTypeObject<T> // Tuples behave properly
-  : ResolverReturnTypeObject<T>
+    : { [K in keyof T]: ResolverReturnType<T[K]> }
+  : { [K in keyof T]: ResolverReturnType<T[K]> }
 : unknown;
 
 type ResolverReturnTypeObject<T extends object> =

package/dist/utils/{type-generation.js → type-generation.mjs}

@@ -1,7 +1,7 @@
-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 { 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";
@@ -336,12 +336,7 @@ 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.5",
+  "version": "1.5.7",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,

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

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

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

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