Rename directiveVisitors option to just directives.

ardatan · Mar 14, 2018 · 6776473 · 6776473
1 parent 69e1ede
commit 6776473
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/Interfaces.ts b/src/Interfaces.ts
@@ -82,7 +82,7 @@ export interface IExecutableSchemaDefinition<TContext = any> {
   allowUndefinedInResolve?: boolean;
   resolverValidationOptions?: IResolverValidationOptions;
   directiveResolvers?: IDirectiveResolvers<any, TContext>;
-  directiveVisitors?: { [name: string]: typeof SchemaDirectiveVisitor };
+  directives?: { [name: string]: typeof SchemaDirectiveVisitor };
   parseOptions?: GraphQLParseOptions;
 }
 

diff --git a/src/schemaGenerator.ts b/src/schemaGenerator.ts
@@ -114,7 +114,7 @@ function makeExecutableSchema<TContext = any>({
   allowUndefinedInResolve = true,
   resolverValidationOptions = {},
   directiveResolvers = null,
-  directiveVisitors = null,
+  directives = null,
   parseOptions = {},
 }: IExecutableSchemaDefinition<TContext>) {
   const jsSchema = _generateSchema(
@@ -142,10 +142,10 @@ function makeExecutableSchema<TContext = any>({
     attachDirectiveResolvers(jsSchema, directiveResolvers);
   }
 
-  if (directiveVisitors) {
+  if (directives) {
     SchemaDirectiveVisitor.visitSchemaDirectives(
       jsSchema,
-      directiveVisitors,
+      directives,
     );
   }
 
@@ -692,10 +692,10 @@ function attachDirectiveResolvers(
     );
   }
 
-  const directiveVisitors = Object.create(null);
+  const directives = Object.create(null);
 
   Object.keys(directiveResolvers).forEach(directiveName => {
-    directiveVisitors[directiveName] = class extends SchemaDirectiveVisitor {
+    directives[directiveName] = class extends SchemaDirectiveVisitor {
       public visitFieldDefinition(field: GraphQLField<any, any>) {
         const resolver = directiveResolvers[directiveName];
         const originalResolver = field.resolve || defaultFieldResolver;
@@ -716,7 +716,7 @@ function attachDirectiveResolvers(
 
   SchemaDirectiveVisitor.visitSchemaDirectives(
     schema,
-    directiveVisitors,
+    directives,
   );
 }
 

diff --git a/src/test/testDirectives.ts b/src/test/testDirectives.ts
@@ -398,7 +398,7 @@ describe('@directives', () => {
     let argumentCount = 0;
     let fieldCount = 0;
 
-    const directiveVisitors = {
+    const directives = {
       directive: class extends SchemaDirectiveVisitor {
         public visitEnumValue(value: GraphQLEnumValue) {
           ++enumValueCount;
@@ -444,7 +444,7 @@ describe('@directives', () => {
 
     makeExecutableSchema({
       typeDefs: schemaText,
-      directiveVisitors,
+      directives,
     });
 
     assert.strictEqual(enumValueCount, 2);
@@ -537,7 +537,7 @@ describe('@directives', () => {
       type Query {
         hello: String @upper
       }`,
-      directiveVisitors: {
+      directives: {
         upper: class extends SchemaDirectiveVisitor {
           public visitFieldDefinition(field: GraphQLField<any, any>) {
             const { resolve = defaultFieldResolver } = field;
@@ -582,7 +582,7 @@ describe('@directives', () => {
         today: Date @date(format: "mmmm d, yyyy")
       }`,
 
-      directiveVisitors: {
+      directives: {
         date: class extends SchemaDirectiveVisitor {
           public visitFieldDefinition(field: GraphQLField<any, any>) {
             const { resolve = defaultFieldResolver } = field;
@@ -640,7 +640,7 @@ describe('@directives', () => {
         greeting: String @intl
       }`,
 
-      directiveVisitors: {
+      directives: {
         intl: class extends SchemaDirectiveVisitor {
           public visitFieldDefinition(field: GraphQLField<any, any>, details: {
             objectType: GraphQLObjectType,
@@ -720,7 +720,7 @@ describe('@directives', () => {
         users: [User]
       }`,
 
-      directiveVisitors: {
+      directives: {
         auth: class extends SchemaDirectiveVisitor {
           public visitObject(type: GraphQLObjectType) {
             this.ensureFieldsWrapped(type);
@@ -870,7 +870,7 @@ describe('@directives', () => {
         title: String! @length(max: 10)
       }`,
 
-      directiveVisitors: {
+      directives: {
         length: class extends SchemaDirectiveVisitor {
           public visitInputFieldDefinition(field: GraphQLInputField) {
             this.wrapType(field);
@@ -956,7 +956,7 @@ describe('@directives', () => {
         address: String
       }`,
 
-      directiveVisitors: {
+      directives: {
         uniqueID: class extends SchemaDirectiveVisitor {
           public visitObject(type: GraphQLObjectType) {
             const { name, from } = this.args;