fix: args builder now coppies prototype methods from field builder so…

… that extending FieldBuilder class works as expected
hayes · Apr 12, 2021 · bc8fd04 · bc8fd04
1 parent 65b8942
commit bc8fd04
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 26 deletions.
diff --git a/packages/core/src/fieldUtils/input.ts b/packages/core/src/fieldUtils/input.ts
@@ -42,10 +42,18 @@ export default class InputFieldBuilder<
   argBuilder(): ArgBuilder<Types> {
     const builder: InputFieldBuilder<Types, 'Arg'>['field'] = this.field.bind(this);
 
-    ([...Object.keys(this)] as (keyof InputFieldBuilder<Types, 'Arg'>)[]).forEach((key) => {
-      ((builder as unknown) as { [s: string]: unknown })[key] =
-        typeof this[key] === 'function' ? (this[key] as Function).bind(this) : this[key];
-    });
+    const protoKeys = Object.keys(Object.getPrototypeOf(this)).filter(
+      (key) =>
+        typeof (this as Record<string, unknown>)[key] === 'function' &&
+        ((Function.prototype as unknown) as Record<string, unknown>)[key] === undefined,
+    );
+
+    ([...Object.keys(this), ...protoKeys] as (keyof InputFieldBuilder<Types, 'Arg'>)[]).forEach(
+      (key) => {
+        ((builder as unknown) as { [s: string]: unknown })[key] =
+          typeof this[key] === 'function' ? (this[key] as Function).bind(this) : this[key];
+      },
+    );
 
     return builder as ArgBuilder<Types>;
   }

diff --git a/packages/core/src/types/builder-options.ts b/packages/core/src/types/builder-options.ts
@@ -8,6 +8,7 @@ import {
   FieldRef,
   InputFieldRef,
   inputFieldShapeKey,
+  InputRef,
   InterfaceParam,
   InterfaceRef,
   MaybePromise,
@@ -31,13 +32,14 @@ export type Resolver<Parent, Args, Context, Type, Return = unknown> = (
   context: Context,
   info: GraphQLResolveInfo,
 ) => MaybePromiseWithInference<
-    Type extends unknown[]
-      ? Readonly<
-          Return extends MaybePromise<readonly Promise<unknown>[]> ? Promise<Type[number]>[] : Type
-        >
-      : Type,
-    Return
-  > & Return;
+  Type extends unknown[]
+    ? Readonly<
+        Return extends MaybePromise<readonly Promise<unknown>[]> ? Promise<Type[number]>[] : Type
+      >
+    : Type,
+  Return
+> &
+  Return;
 
 export type Subscriber<Parent, Args, Context, Shape> = (
   parent: Parent,
@@ -137,13 +139,14 @@ export type ObjectTypeOptions<
   Shape,
   Interfaces extends InterfaceParam<Types>[]
 > = (Param extends string
-    ? {}
-    : Param extends ObjectRef<unknown>
-    ? { name?: string }
-    : { name: string }) & (
-  | GiraphQLSchemaTypes.ObjectTypeOptions<Types, Shape>
-  | GiraphQLSchemaTypes.ObjectTypeWithInterfaceOptions<Types, Shape, Interfaces>
-);
+  ? {}
+  : Param extends ObjectRef<unknown>
+  ? { name?: string }
+  : { name: string }) &
+  (
+    | GiraphQLSchemaTypes.ObjectTypeOptions<Types, Shape>
+    | GiraphQLSchemaTypes.ObjectTypeWithInterfaceOptions<Types, Shape, Interfaces>
+  );
 
 export type InterfaceTypeOptions<
   Types extends SchemaTypes,
@@ -202,14 +205,21 @@ export type InputShapeFromField<Field extends InputFieldRef> = Field extends {
   : never;
 
 export type FieldKind = keyof GiraphQLSchemaTypes.FieldOptionsByKind<
-    SchemaTypes,
-    {},
-    TypeParam<SchemaTypes>,
-    boolean,
-    {},
-    {},
-    {}
-  > & keyof GiraphQLSchemaTypes.GiraphQLKindToGraphQLType;
+  SchemaTypes,
+  {},
+  TypeParam<SchemaTypes>,
+  boolean,
+  {},
+  {},
+  {}
+> &
+  keyof GiraphQLSchemaTypes.GiraphQLKindToGraphQLType;
+
+export type InputFieldKind = keyof GiraphQLSchemaTypes.InputFieldOptionsByKind<
+  SchemaTypes,
+  InputRef<unknown>,
+  boolean
+>;
 
 export type CompatibleTypes<
   Types extends SchemaTypes,