nitro-graphql 1.0.5 → 1.0.7

package/dist/ecosystem/nuxt.d.ts

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

package/dist/index.d.ts

@@ -1,9 +1,11 @@
 import { StandardSchemaV1 } from "./types/standard-schema.js";
 import { CodegenClientConfig, CodegenServerConfig, GenImport, GenericSdkConfig, NitroGraphQLOptions } from "./types/index.js";
-import * as nitropack2 from "nitropack";
+import * as nitropack0 from "nitropack";
 
 //#region src/index.d.ts
-type GraphQLFramework = 'graphql-yoga';
-declare const _default: nitropack2.NitroModule;
+interface GraphQLConfig extends Record<string, any> {
+  framework: 'graphql-yoga' | 'apollo-server';
+}
+declare const _default: nitropack0.NitroModule;
 //#endregion
-export { CodegenClientConfig, CodegenServerConfig, GenImport, GenericSdkConfig, GraphQLFramework, NitroGraphQLOptions, StandardSchemaV1, _default as default };
+export { CodegenClientConfig, CodegenServerConfig, GenImport, GenericSdkConfig, GraphQLConfig, NitroGraphQLOptions, StandardSchemaV1, _default as default };

package/dist/index.js

@@ -149,7 +149,9 @@ var src_default = defineNitroModule({
 import type { SchemaType } from './nitro-graphql-server.d.ts'
 
 declare module 'nitro-graphql' {
-  type GraphQLFramework = '${nitro.options.graphql?.framework || "graphql-yoga"}'
+  interface GraphQLConfig {
+    framework: '${nitro.options.graphql?.framework || "graphql-yoga"}'
+  }
 }
 `;
 		writeFileSync(join(typesDir, "graphql.d.ts"), graphqlDtsContent);

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

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

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

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

package/dist/routes/health.d.ts

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

package/dist/utils/client-codegen.js

@@ -9,6 +9,7 @@ import { plugin as plugin$1 } from "@graphql-codegen/typescript-generic-sdk";
 import { plugin as plugin$2 } from "@graphql-codegen/typescript-operations";
 import { GraphQLFileLoader } from "@graphql-tools/graphql-file-loader";
 import { loadDocuments, loadSchemaSync } from "@graphql-tools/load";
+import { CurrencyResolver, DateTimeISOResolver, DateTimeResolver, JSONObjectResolver, JSONResolver, NonEmptyStringResolver, UUIDResolver } from "graphql-scalars";
 
 //#region src/utils/client-codegen.ts
 function pluginContent(_schema, _documents, _config, _info) {
@@ -60,31 +61,26 @@ async function generateClientTypes(schema, docs, config = {}, sdkConfig = {}, ou
 		strictScalars: true,
 		maybeValue: "T | null | undefined",
 		inputMaybeValue: "T | undefined",
-		scalars: {
-			DateTime: "string",
-			JSON: "any",
-			UUID: "string",
-			NonEmptyString: "string",
-			Currency: "string"
-		}
-	};
-	const mergedConfig = defu$1(defaultConfig, config);
-	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"
+			DateTime: DateTimeResolver.extensions.codegenScalarType,
+			DateTimeISO: DateTimeISOResolver.extensions.codegenScalarType,
+			UUID: UUIDResolver.extensions.codegenScalarType,
+			JSON: JSONResolver.extensions.codegenScalarType,
+			JSONObject: JSONObjectResolver.extensions.codegenScalarType,
+			NonEmptyString: NonEmptyStringResolver.extensions.codegenScalarType,
+			Currency: CurrencyResolver.extensions.codegenScalarType,
+			File: {
+				input: "File",
+				output: "File"
+			}
 		}
 	};
-	const mergedSdkConfig = defu$1(defaultSdkConfig, sdkConfig);
+	const mergedConfig = defu$1(defaultConfig, config);
+	const mergedSdkConfig = defu$1(mergedConfig, sdkConfig);
 	try {
 		const output = await codegen({
 			filename: outputPath || "client-types.generated.ts",

package/dist/utils/define.d.ts

@@ -2,7 +2,7 @@ import { ApolloServerOptions } from "@apollo/server";
 import { H3Event } from "h3";
 import { YogaServerOptions } from "graphql-yoga";
 import { Resolvers, ResolversTypes } from "#graphql/server";
-import { GraphQLFramework, StandardSchemaV1 } from "nitro-graphql";
+import { GraphQLConfig, StandardSchemaV1 } from "nitro-graphql";
 
 //#region src/utils/define.d.ts
 type Flatten<T> = T extends infer U ? { [K in keyof U]: U[K] } : never;
@@ -15,7 +15,7 @@ declare function defineQuery(resolvers?: Resolvers['Query']): Resolvers;
 declare function defineMutation(resolvers?: Resolvers['Mutation']): Resolvers;
 declare function defineSubscription(resolvers?: Resolvers['Subscription']): Resolvers;
 declare function defineType(resolvers: Resolvers): Resolvers;
-type DefineServerConfig = GraphQLFramework extends 'graphql-yoga' ? Partial<YogaServerOptions<H3Event, Partial<H3Event>>> : GraphQLFramework extends 'apollo-server' ? Partial<ApolloServerOptions<H3Event>> : Record<string, any>;
-declare function defineGraphQLConfig(config: Partial<DefineServerConfig>): Partial<DefineServerConfig>;
+type DefineServerConfig<T extends GraphQLConfig = GraphQLConfig> = T['framework'] extends 'graphql-yoga' ? Partial<YogaServerOptions<H3Event, Partial<H3Event>>> : T['framework'] extends 'apollo-server' ? Partial<ApolloServerOptions<H3Event>> : Partial<YogaServerOptions<H3Event, Partial<H3Event>>> | Partial<ApolloServerOptions<H3Event>>;
+declare function defineGraphQLConfig<T extends GraphQLConfig = GraphQLConfig>(config: Partial<DefineServerConfig<T>>): Partial<DefineServerConfig<T>>;
 //#endregion
 export { DefineServerConfig, ResolverQuery, defineGraphQLConfig, defineMutation, defineQuery, defineResolver, defineSchema, defineSubscription, defineType };

package/dist/utils/server-codegen.js

@@ -4,6 +4,7 @@ import { parse } from "graphql";
 import { printSchemaWithDirectives } from "@graphql-tools/utils";
 import { codegen } from "@graphql-codegen/core";
 import * as typescriptPlugin from "@graphql-codegen/typescript";
+import { CurrencyResolver, DateTimeISOResolver, DateTimeResolver, JSONObjectResolver, JSONResolver, NonEmptyStringResolver, UUIDResolver } from "graphql-scalars";
 import * as typescriptResolversPlugin from "@graphql-codegen/typescript-resolvers";
 
 //#region src/utils/server-codegen.ts
@@ -22,13 +23,16 @@ function pluginContent(_schema, _documents, _config, _info) {
 async function generateTypes(schema, config = {}, outputPath) {
 	const defaultConfig = {
 		scalars: {
+			DateTime: DateTimeResolver.extensions.codegenScalarType,
+			DateTimeISO: DateTimeISOResolver.extensions.codegenScalarType,
+			UUID: UUIDResolver.extensions.codegenScalarType,
+			JSON: JSONResolver.extensions.codegenScalarType,
+			JSONObject: JSONObjectResolver.extensions.codegenScalarType,
+			NonEmptyString: NonEmptyStringResolver.extensions.codegenScalarType,
+			Currency: CurrencyResolver.extensions.codegenScalarType,
 			File: {
 				input: "File",
 				output: "File"
-			},
-			Cursor: {
-				input: "number",
-				output: "number"
 			}
 		},
 		defaultScalarType: "unknown",

package/package.json

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