nitro-graphql 1.0.1 → 1.0.3

package/dist/ecosystem/nuxt.d.ts

@@ -1,7 +1,7 @@
-import * as _nuxt_schema0 from "@nuxt/schema";
+import * as _nuxt_schema3 from "@nuxt/schema";
 
 //#region src/ecosystem/nuxt.d.ts
 interface ModuleOptions {}
-declare const _default: _nuxt_schema0.NuxtModule<ModuleOptions, ModuleOptions, false>;
+declare const _default: _nuxt_schema3.NuxtModule<ModuleOptions, ModuleOptions, false>;
 //#endregion
 export { ModuleOptions, _default as default };

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import { StandardSchemaV1 } from "./types/standard-schema.js";
-import { CodegenClientConfig, CodegenServerConfig, GenImport, NitroGraphQLOptions } from "./types/index.js";
-import * as nitropack7 from "nitropack";
+import { CodegenClientConfig, CodegenServerConfig, GenImport, GenericSdkConfig, NitroGraphQLOptions } from "./types/index.js";
+import * as nitropack2 from "nitropack";
 
 //#region src/index.d.ts
 type GraphQLFramework = 'graphql-yoga';
-declare const _default: nitropack7.NitroModule;
+declare const _default: nitropack2.NitroModule;
 //#endregion
-export { CodegenClientConfig, CodegenServerConfig, GenImport, GraphQLFramework, NitroGraphQLOptions, StandardSchemaV1, _default as default };
+export { CodegenClientConfig, CodegenServerConfig, GenImport, GenericSdkConfig, GraphQLFramework, NitroGraphQLOptions, StandardSchemaV1, _default as default };

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

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

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

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

package/dist/routes/health.d.ts

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

package/dist/types/index.d.ts

@@ -2,11 +2,21 @@ import { StandardSchemaV1 } from "./standard-schema.js";
 import { ESMCodeGenOptions } from "knitwork";
 import { IResolvers } from "@graphql-tools/utils";
 import { TypeScriptPluginConfig } from "@graphql-codegen/typescript";
+import { plugin as plugin$1 } from "@graphql-codegen/typescript-generic-sdk";
 import { TypeScriptDocumentsPluginConfig } from "@graphql-codegen/typescript-operations";
 import { TypeScriptResolversPluginConfig } from "@graphql-codegen/typescript-resolvers";
 
 //#region src/types/index.d.ts
 type CodegenServerConfig = TypeScriptPluginConfig & TypeScriptResolversPluginConfig;
+type DocumentModeConfig = Pick<Parameters<typeof plugin$1>[2], 'documentMode'>;
+type DocumentModeEnum = NonNullable<DocumentModeConfig['documentMode']>;
+type DocumentModeType = `${DocumentModeEnum}`;
+type GenericSdkConfig = Omit<Parameters<typeof plugin$1>[2], 'documentMode'> & {
+  documentMode?: DocumentModeType;
+};
+type CodegenClientConfig = TypeScriptPluginConfig & TypeScriptDocumentsPluginConfig & {
+  endpoint?: string;
+};
 interface IESMImport {
   name: string;
   as?: string;
@@ -46,10 +56,6 @@ declare module 'nitropack' {
     graphql?: NitroGraphQLOptions;
   }
 }
-interface CodegenClientConfig extends TypeScriptPluginConfig, TypeScriptDocumentsPluginConfig {
-  endpoint?: string;
-  documentMode?: 'string' | 'graphQLTag' | 'documentNode' | 'documentNodeImportFragments' | 'external';
-}
 interface NitroGraphQLOptions {
   framework: 'graphql-yoga' | 'apollo-server';
   endpoint?: {
@@ -67,7 +73,8 @@ interface NitroGraphQLOptions {
   codegen?: {
     server?: CodegenServerConfig;
     client?: CodegenClientConfig;
+    clientSDK?: GenericSdkConfig;
   };
 }
 //#endregion
-export { CodegenClientConfig, CodegenServerConfig, GenImport, NitroGraphQLOptions };
+export { CodegenClientConfig, CodegenServerConfig, GenImport, GenericSdkConfig, NitroGraphQLOptions };

package/dist/utils/client-codegen.d.ts

@@ -1,4 +1,4 @@
-import { CodegenClientConfig } from "../types/index.js";
+import { CodegenClientConfig, GenericSdkConfig } from "../types/index.js";
 import { GraphQLSchema } from "graphql";
 import { Source } from "@graphql-tools/utils";
 import { LoadSchemaOptions, UnnormalizedTypeDefPointer } from "@graphql-tools/load";
@@ -15,7 +15,7 @@ type GraphQLTypeDefPointer = UnnormalizedTypeDefPointer | UnnormalizedTypeDefPoi
 type GraphQLLoadSchemaOptions = Partial<LoadSchemaOptions>;
 declare function graphQLLoadSchemaSync(schemaPointers: GraphQLTypeDefPointer, data?: GraphQLLoadSchemaOptions): Promise<GraphQLSchema | undefined>;
 declare function loadGraphQLDocuments(patterns: string | string[]): Promise<Source[]>;
-declare function generateClientTypes(schema: GraphQLSchema, docs: Source[], config?: CodegenClientConfig, outputPath?: string): Promise<false | {
+declare function generateClientTypes(schema: GraphQLSchema, docs: Source[], config?: CodegenClientConfig, sdkConfig?: GenericSdkConfig, outputPath?: string): Promise<false | {
   types: string;
   sdk: string;
 }>;

package/dist/utils/client-codegen.js

@@ -47,14 +47,13 @@ async function loadGraphQLDocuments(patterns) {
 		else throw e;
 	}
 }
-async function generateClientTypes(schema, docs, config = {}, outputPath) {
+async function generateClientTypes(schema, docs, config = {}, sdkConfig = {}, outputPath) {
 	if (docs.length === 0) {
 		consola$1.info("[graphql] No client GraphQL files found. Skipping client type generation.");
 		return false;
 	}
 	consola$1.info(`[graphql] Found ${docs.length} client GraphQL documents`);
 	const defaultConfig = {
-		documentMode: "string",
 		emitLegacyCommonJSImports: false,
 		useTypeImports: true,
 		enumsAsTypes: true,
@@ -70,6 +69,22 @@ async function generateClientTypes(schema, docs, config = {}, outputPath) {
 		}
 	};
 	const mergedConfig = defu$1(config, defaultConfig);
+	const defaultSdkConfig = {
+		documentMode: "string",
+		pureMagicComment: true,
+		strictScalars: true,
+		useTypeImports: true,
+		dedupeOperationSuffix: true,
+		rawRequest: true,
+		scalars: {
+			DateTime: "Date",
+			JSON: "any",
+			UUID: "string",
+			NonEmptyString: "string",
+			Currency: "string"
+		}
+	};
+	const mergedSdkConfig = defu$1(sdkConfig, defaultSdkConfig);
 	try {
 		const output = await codegen({
 			filename: outputPath || "client-types.generated.ts",
@@ -91,26 +106,9 @@ async function generateClientTypes(schema, docs, config = {}, outputPath) {
 			baseOutputDir: outputPath || "client-types.generated.ts",
 			schema: parse(printSchemaWithDirectives(schema)),
 			documents: [...docs],
-			config: {
-				fetcher: "function",
-				documentMode: "string",
-				pureMagicComment: true,
-				strictScalars: true,
-				avoidOptionals: true,
-				useTypeImports: true,
-				dedupeOperationSuffix: true,
-				exportFragmentSpreadSubTypes: true,
-				enumsAsTypes: true,
-				scalars: {
-					DateTime: "Date",
-					JSON: "any",
-					UUID: "string",
-					NonEmptyString: "string",
-					Currency: "string"
-				}
-			},
+			config: mergedSdkConfig,
 			presetConfig: { typesPath: "#graphql/client" },
-			plugins: [{ pluginContent: {} }, { typescriptGenericSdk: { rawRequest: false } }],
+			plugins: [{ pluginContent: {} }, { typescriptGenericSdk: {} }],
 			pluginMap: {
 				pluginContent: { plugin: pluginContent },
 				typescriptGenericSdk: { plugin: plugin$1 }

package/dist/utils/type-generation.js

@@ -14,7 +14,6 @@ function generateNuxtOfetchClient(clientDir) {
 	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
-import type { ExecutionResult } from 'graphql'
 import type { Requester } from './sdk'
 import { getSdk } from './sdk'
 
@@ -29,11 +28,9 @@ export function createGraphQLClient(endpoint: string): Requester {
         'Content-Type': 'application/json',
         ...headers,
       },
-    }) as ExecutionResult
+    })
 
-    return result.errors?.length
-      ? Promise.reject(new Error(result.errors[0]?.message || 'GraphQL error'))
-      : result.data as R
+    return result as R
   }
 }
 
@@ -77,7 +74,7 @@ async function clientTypeGeneration(nitro) {
 		}
 		const graphqlString = readFileSync(schemaFilePath, "utf-8");
 		const schema = buildSchema(graphqlString);
-		const types = await generateClientTypes(schema, loadDocs, nitro.options.graphql?.codegen?.client ?? {});
+		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");

package/package.json

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