fix(schema): Fix directives cannot be extends

CHANGELOG.md

@@ -4,6 +4,8 @@
 <!-- here goes all the unreleased changes descriptions -->
 ### Features
 - expose `createResolversMap` utility that generates apollo-like resolvers object
+### Fixes
+- properly inherit directives while extending `@InputType` or `@ObjectType` classes (#626)
 
 ## v1.0.0-rc.1
 ### Features

src/schema/utils.ts

@@ -15,6 +15,7 @@ export function getFieldMetadataFromInputType(type: GraphQLInputObjectType) {
  const superField = fieldInfo[fieldName];
  fieldsMap[fieldName] = {
  type: superField.type,
+ astNode: superField.astNode,
  description: superField.description,
  defaultValue: superField.defaultValue,
  };
@@ -36,6 +37,7 @@ export function getFieldMetadataFromObjectType(type: GraphQLObjectType | GraphQL
  argMap[name] = arg;
  return argMap;
  }, {}),
+ astNode: superField.astNode,
  resolve: superField.resolve,
  description: superField.description,
  deprecationReason: superField.deprecationReason,

tests/functional/directives.ts

@@ -36,6 +36,9 @@ describe("Directives", () => {
  append: string;
  }
 
+ @InputType()
+ class SubDirectiveOnFieldInput extends DirectiveOnFieldInput {}
+
  @InputType()
  @Directive("@upper")
  class DirectiveOnClassInput {
@@ -97,6 +100,14 @@ describe("Directives", () => {
  }
  }
 
+ @ObjectType()
+ class SubSampleObjectType extends SampleObjectType {
+ @Field()
+ withInput(@Arg("input") input: SubDirectiveOnFieldInput): string {
+ return `hello${input.append}`;
+ }
+ }
+
  @Resolver()
  class SampleResolver {
  @Query(() => SampleObjectType)
@@ -206,8 +217,16 @@ describe("Directives", () => {
  }
  }
 
+ @Resolver(of => SubSampleObjectType)
+ class SubSampleResolver {
+ @Query(() => SubSampleObjectType)
+ subObjectType(): SubSampleObjectType {
+ return new SubSampleObjectType();
+ }
+ }
+
  schema = await buildSchema({
- resolvers: [SampleResolver, SampleObjectTypeResolver],
+ resolvers: [SampleResolver, SampleObjectTypeResolver, SubSampleResolver],
  });
 
  SchemaDirectiveVisitor.visitSchemaDirectives(schema, {
@@ -376,6 +395,16 @@ describe("Directives", () => {
  expect(fields.append).toHaveProperty("astNode");
  assertValidDirective(fields.append.astNode, "upper");
  });
+
+ it("adds inherited field directives to input type fields while extending input type class", async () => {
+ const fields = (schema.getType(
+ "SubDirectiveOnFieldInput",
+ ) as GraphQLInputObjectType).getFields();
+
+ expect(fields).toHaveProperty("append");
+ expect(fields.append).toHaveProperty("astNode");
+ assertValidDirective(fields.append.astNode, "upper");
+ });
  });
 
  describe("ObjectType", () => {
@@ -415,6 +444,43 @@ describe("Directives", () => {
  fieldResolverWithAppendDefinition: "hello, world!",
  });
  });
+
+ it("call object type directives while extending field type class", async () => {
+ const query = `query {
+ subObjectType {
+ withDirective
+ # withDirectiveWithArgs
+ withUpper
+ withUpperDefinition
+ withAppend(append: ", world!")
+ withAppendDefinition(append: ", world!")
+ withUpperAndAppend(append: ", world!")
+ withInput(input: { append: ", world!" })
+ withInputUpper(input: { append: ", world!" })
+ withInputOnClass(input: { append: ", world!" })
+ withInputUpperOnClass(input: { append: ", world!" })
+ fieldResolverWithAppendDefinition(append: ", world!")
+ }
+ }`;
+
+ const { data } = await graphql(schema, query);
+
+ expect(data).toHaveProperty("subObjectType");
+ expect(data!.subObjectType).toEqual({
+ withDirective: "withDirective",
+ // withDirectiveWithArgs: "withDirectiveWithArgs",
+ withUpper: "WITHUPPER",
+ withUpperDefinition: "WITHUPPERDEFINITION",
+ withAppend: "hello, world!",
+ withAppendDefinition: "hello, world!",
+ withUpperAndAppend: "HELLO, WORLD!",
+ withInput: "hello, WORLD!",
+ withInputUpper: "HELLO, WORLD!",
+ withInputOnClass: "hello, WORLD!",
+ withInputUpperOnClass: "HELLO, WORLD!",
+ fieldResolverWithAppendDefinition: "hello, world!",
+ });
+ });
  });
  });