🐛 fixed resolverFor return type

graphql-editor · Feb 8, 2023 · c5c754d · c5c754d
1 parent 8e1ac43
commit c5c754d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 20 deletions.
diff --git a/examples/typescript-node/package.json b/examples/typescript-node/package.json
@@ -1,6 +1,6 @@
 {
  "name": "typescript-node",
- "version": "1.0.6",
+ "version": "1.0.7",
  "description": "",
  "private": true,
  "main": "index.js",

diff --git a/packages/graphql-zeus-core/TreeToTS/functions/generated.ts b/packages/graphql-zeus-core/TreeToTS/functions/generated.ts
@@ -609,19 +609,14 @@ export const InternalArgsBuilt = ({
  return arb;
 };
 
-export const resolverFor = <
- X,
- T extends keyof ResolverInputTypes,
- Z extends keyof ResolverInputTypes[T],
- RET = unknown,
->(
+export const resolverFor = <X, T extends keyof ResolverInputTypes, Z extends keyof ResolverInputTypes[T]>(
  type: T,
  field: Z,
  fn: (
  args: Required<ResolverInputTypes[T]>[Z] extends [infer Input, any] ? Input : any,
  source: any,
- ) => Z extends keyof ModelTypes[T] ? ModelTypes[T][Z] | Promise<ModelTypes[T][Z]> | X : RET,
-) => fn as (args?: any, source?: any) => RET;
+ ) => Z extends keyof ModelTypes[T] ? ModelTypes[T][Z] | Promise<ModelTypes[T][Z]> | X : never,
+) => fn as (args?: any, source?: any) => ReturnType<typeof fn>;
 
 export type UnwrapPromise<T> = T extends Promise<infer R> ? R : T;
 export type ZeusState<T extends (...args: any[]) => Promise<any>> = NonNullable<UnwrapPromise<ReturnType<T>>>;

diff --git a/packages/graphql-zeus-core/TreeToTS/functions/new/resolverFor.ts b/packages/graphql-zeus-core/TreeToTS/functions/new/resolverFor.ts
@@ -1,15 +1,10 @@
 import { ModelTypes, ResolverInputTypes } from '@/TreeToTS/functions/new/mocks';
 
-export const resolverFor = <
- X,
- T extends keyof ResolverInputTypes,
- Z extends keyof ResolverInputTypes[T],
- RET = unknown,
->(
+export const resolverFor = <X, T extends keyof ResolverInputTypes, Z extends keyof ResolverInputTypes[T]>(
  type: T,
  field: Z,
  fn: (
  args: Required<ResolverInputTypes[T]>[Z] extends [infer Input, any] ? Input : any,
  source: any,
- ) => Z extends keyof ModelTypes[T] ? ModelTypes[T][Z] | Promise<ModelTypes[T][Z]> | X : RET,
-) => fn as (args?: any, source?: any) => RET;
+ ) => Z extends keyof ModelTypes[T] ? ModelTypes[T][Z] | Promise<ModelTypes[T][Z]> | X : never,
+) => fn as (args?: any, source?: any) => ReturnType<typeof fn>;
diff --git a/packages/graphql-zeus-core/package.json b/packages/graphql-zeus-core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "graphql-zeus-core",
- "version": "5.2.6",
+ "version": "5.2.7",
  "private": false,
  "main": "./lib/index.js",
  "author": "GraphQL Editor, Artur Czemiel",

diff --git a/packages/graphql-zeus-jsonschema/package.json b/packages/graphql-zeus-jsonschema/package.json
@@ -1,6 +1,6 @@
 {
  "name": "graphql-zeus-jsonschema",
- "version": "5.2.6",
+ "version": "5.2.7",
  "private": false,
  "main": "./lib/index.js",
  "author": "GraphQL Editor, Artur Czemiel",

diff --git a/packages/graphql-zeus/package.json b/packages/graphql-zeus/package.json
@@ -1,6 +1,6 @@
 {
  "name": "graphql-zeus",
- "version": "5.2.6",
+ "version": "5.2.7",
  "private": false,
  "scripts": {
  "start": "ttsc --build tsconfig.build.json --watch",