feat: unwrap Promise fields for expose, fixes hayes#793

moonflare · Feb 20, 2023 · 16742d8 · 16742d8
1 parent fe8ef17
commit 16742d8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 12 deletions.
diff --git a/packages/converter/tests/__snapshots__/index.test.ts.snap b/packages/converter/tests/__snapshots__/index.test.ts.snap
@@ -180,6 +180,10 @@ builder.objectType('Giraffe', {
             type: 'Int',
             resolve: (parent, args, context, info) => { throw new Error('Not implemented'); },
         }),
+        favoriteFood: t.field({
+            type: 'String',
+            resolve: (parent, args, context, info) => { throw new Error('Not implemented'); },
+        }),
         name: t.field({
             type: 'String',
             resolve: (parent, args, context, info) => { throw new Error('Not implemented'); },
@@ -393,6 +397,7 @@ input Example2 {
 
 type Giraffe implements Animal {
   age: Int!
+  favoriteFood: String!
   name: String!
   species: String
 }

diff --git a/packages/converter/tests/examples/random-stuff.ts b/packages/converter/tests/examples/random-stuff.ts
@@ -34,6 +34,10 @@ class Giraffe extends Animal {
     this.name = name;
     this.age = age;
   }
+
+  get favoriteFood() {
+    return Promise.resolve('acacia trees');
+  }
 }
 
 const builder = new SchemaBuilder<Types>({});
@@ -58,6 +62,7 @@ builder.objectType(Giraffe, {
   fields: (t) => ({
     name: t.exposeString('name', {}),
     age: t.exposeInt('age', {}),
+    favoriteFood: t.exposeString('favoriteFood'),
   }),
 });
 

diff --git a/packages/core/src/types/builder-options.ts b/packages/core/src/types/builder-options.ts
@@ -237,7 +237,11 @@ export type CompatibleTypes<
   Type extends TypeParam<Types>,
   Nullable extends FieldNullability<Type>,
 > = {
-  [K in keyof ParentShape]-?: ParentShape[K] extends ShapeFromTypeParam<Types, Type, Nullable>
+  [K in keyof ParentShape]-?: Awaited<ParentShape[K]> extends ShapeFromTypeParam<
+    Types,
+    Type,
+    Nullable
+  >
     ? K
     : never;
 }[keyof ParentShape] &
@@ -249,7 +253,7 @@ export type ExposeNullability<
   ParentShape,
   Name extends keyof ParentShape,
   Nullable extends FieldNullability<Type>,
-> = ParentShape[Name] extends ShapeFromTypeParam<Types, Type, Nullable>
+> = Awaited<ParentShape[Name]> extends ShapeFromTypeParam<Types, Type, Nullable>
   ? {
       nullable?: Nullable & ExposeNullableOption<Types, Type, ParentShape, Name>;
     }
@@ -264,15 +268,15 @@ export type ExposeNullableOption<
   Name extends keyof ParentShape,
 > = FieldNullability<Type> &
   (Type extends [unknown]
-    ? ParentShape[Name] extends readonly (infer T)[] | null | undefined
+    ? Awaited<ParentShape[Name]> extends readonly (infer T)[] | null | undefined
       ? [T] extends [NonNullable<T>]
-        ? ParentShape[Name] extends NonNullable<ParentShape[Name]>
+        ? Awaited<ParentShape[Name]> extends NonNullable<Awaited<ParentShape[Name]>>
           ? boolean | { items: boolean; list: boolean }
           : true | { items: boolean; list: true }
-        : ParentShape[Name] extends NonNullable<ParentShape[Name]>
+        : Awaited<ParentShape[Name]> extends NonNullable<Awaited<ParentShape[Name]>>
         ? { items: true; list: boolean }
         : { items: true; list: true }
       : never
-    : ParentShape[Name] extends NonNullable<ParentShape[Name]>
+    : Awaited<ParentShape[Name]> extends NonNullable<Awaited<ParentShape[Name]>>
     ? boolean
     : true);
diff --git a/packages/deno/packages/core/types/builder-options.ts b/packages/deno/packages/core/types/builder-options.ts