Use name repeatable instead of isRepeatable in all places except introspection

OlegIlyenko · OlegIlyenko · commit 89f5780fa4d5 · 2018-11-07T14:04:28.000+01:00
diff --git a/src/language/__tests__/schema-parser-test.js b/src/language/__tests__/schema-parser-test.js
@@ -833,7 +833,7 @@ input Hello {
             },
           },
           arguments: [],
-          isRepeatable: false,
+          repeatable: false,
           locations: [
             {
               kind: 'Name',
@@ -884,7 +884,7 @@ input Hello {
             },
           },
           arguments: [],
-          isRepeatable: true,
+          repeatable: true,
           locations: [
             {
               kind: 'Name',
diff --git a/src/language/ast.js b/src/language/ast.js
@@ -508,7 +508,7 @@ export type DirectiveDefinitionNode = {
   +description?: StringValueNode,
   +name: NameNode,
   +arguments?: $ReadOnlyArray<InputValueDefinitionNode>,
-  +isRepeatable: boolean,
+  +repeatable: boolean,
   +locations: $ReadOnlyArray<NameNode>,
 };
 
diff --git a/src/language/parser.js b/src/language/parser.js
@@ -1368,7 +1368,7 @@ function parseDirectiveDefinition(lexer: Lexer<*>): DirectiveDefinitionNode {
     description,
     name,
     arguments: args,
-    isRepeatable: repeatable,
+    repeatable,
     locations,
     loc: loc(lexer, start),
   };
diff --git a/src/language/printer.js b/src/language/printer.js
@@ -181,13 +181,13 @@ const printDocASTReducer = {
   ),
 
   DirectiveDefinition: addDescription(
-    ({ name, arguments: args, locations, isRepeatable }) =>
+    ({ name, arguments: args, locations, repeatable }) =>
       'directive @' +
       name +
       (hasMultilineItems(args)
         ? wrap('(\n', indent(join(args, '\n')), '\n)')
         : wrap('(', join(args, ', '), ')')) +
-      (isRepeatable ? ' repeatable' : '') +
+      (repeatable ? ' repeatable' : '') +
       ' on ' +
       join(locations, ' | '),
   ),
diff --git a/src/type/directives.js b/src/type/directives.js
@@ -44,15 +44,14 @@ export class GraphQLDirective {
   locations: Array<DirectiveLocationEnum>;
   args: Array<GraphQLArgument>;
   astNode: ?DirectiveDefinitionNode;
-  isRepeatable: boolean;
+  repeatable: boolean;
 
   constructor(config: GraphQLDirectiveConfig): void {
     this.name = config.name;
     this.description = config.description;
     this.locations = config.locations;
     this.astNode = config.astNode;
-    this.isRepeatable =
-      config.isRepeatable == null ? false : config.isRepeatable;
+    this.repeatable = config.repeatable == null ? false : config.repeatable;
 
     invariant(config.name, 'Directive must be named.');
     invariant(
@@ -96,7 +95,7 @@ export type GraphQLDirectiveConfig = {|
   locations: Array<DirectiveLocationEnum>,
   args?: ?GraphQLFieldConfigArgumentMap,
   astNode?: ?DirectiveDefinitionNode,
-  isRepeatable?: ?boolean,
+  repeatable?: ?boolean,
 |};
 
 /**
diff --git a/src/type/introspection.js b/src/type/introspection.js
@@ -102,7 +102,7 @@ export const __Directive = new GraphQLObjectType({
       type: GraphQLNonNull(GraphQLBoolean),
       description:
         'Permits using the directive multiple times at the same location.',
-      resolve: directive => directive.isRepeatable,
+      resolve: directive => directive.repeatable,
     },
   }),
 });
diff --git a/src/utilities/__tests__/buildASTSchema-test.js b/src/utilities/__tests__/buildASTSchema-test.js
@@ -104,7 +104,7 @@ describe('Schema Builder', () => {
     expect(output).to.equal(body);
 
     const schema = buildASTSchema(parse(body));
-    expect(schema.getDirective('foo').isRepeatable).to.equal(true);
+    expect(schema.getDirective('foo').repeatable).to.equal(true);
   });
 
   it('Supports descriptions', () => {
diff --git a/src/utilities/__tests__/buildClientSchema-test.js b/src/utilities/__tests__/buildClientSchema-test.js
@@ -596,7 +596,7 @@ describe('Type System: build schema from introspection', () => {
         new GraphQLDirective({
           name: 'customRepeatableDirective',
           description: 'This is a custom repeatable directive',
-          isRepeatable: true,
+          repeatable: true,
           locations: ['FIELD'],
         }),
       ],
diff --git a/src/utilities/__tests__/extendSchema-test.js b/src/utilities/__tests__/extendSchema-test.js
@@ -120,7 +120,7 @@ const RepeatableDirective = new GraphQLDirective({
   args: {
     input: { type: SomeInputType },
   },
-  isRepeatable: true,
+  repeatable: true,
   locations: [DirectiveLocation.OBJECT, DirectiveLocation.INTERFACE],
 });
 
diff --git a/src/utilities/buildASTSchema.js b/src/utilities/buildASTSchema.js
@@ -282,7 +282,7 @@ export class ASTDefinitionBuilder {
       args:
         directiveNode.arguments &&
         this._makeInputValues(directiveNode.arguments),
-      isRepeatable: directiveNode.isRepeatable,
+      repeatable: directiveNode.repeatable,
       astNode: directiveNode,
     });
   }
diff --git a/src/utilities/buildClientSchema.js b/src/utilities/buildClientSchema.js
@@ -355,7 +355,7 @@ export function buildClientSchema(
       description: directiveIntrospection.description,
       locations: directiveIntrospection.locations.slice(),
       args: buildInputValueDefMap(directiveIntrospection.args),
-      isRepeatable:
+      repeatable:
         directiveIntrospection.isRepeatable === undefined
           ? false
           : directiveIntrospection.isRepeatable,
diff --git a/src/utilities/extendSchema.js b/src/utilities/extendSchema.js
@@ -320,7 +320,7 @@ export function extendSchema(
       locations: directive.locations,
       args: extendArgs(directive.args),
       astNode: directive.astNode,
-      isRepeatable: directive.isRepeatable,
+      repeatable: directive.repeatable,
     });
   }
 
diff --git a/src/utilities/findBreakingChanges.js b/src/utilities/findBreakingChanges.js
@@ -856,7 +856,7 @@ export function findRemovedDirectiveRepeatable(
       continue;
     }
 
-    if (oldDirective.isRepeatable && !newDirective.isRepeatable) {
+    if (oldDirective.repeatable && !newDirective.repeatable) {
       removedRepeatable.push({
         type: BreakingChangeType.DIRECTIVE_REPEATABLE_REMOVED,
         description: `Repeatable flag was removed from ${newDirective.name}`,
diff --git a/src/utilities/schemaPrinter.js b/src/utilities/schemaPrinter.js
@@ -309,7 +309,7 @@ function printDirective(directive, options) {
     'directive @' +
     directive.name +
     printArgs(options, directive.args) +
-    (directive.isRepeatable ? ' repeatable' : '') +
+    (directive.repeatable ? ' repeatable' : '') +
     ' on ' +
     directive.locations.join(' | ')
   );
diff --git a/src/validation/__tests__/harness.js b/src/validation/__tests__/harness.js
@@ -396,7 +396,7 @@ export const testSchema = new GraphQLSchema({
           description: 'Some generic ID.',
         },
       },
-      isRepeatable: true,
+      repeatable: true,
       locations: ['OBJECT'],
     }),
   ],
diff --git a/src/validation/rules/UniqueDirectivesPerLocation.js b/src/validation/rules/UniqueDirectivesPerLocation.js
@@ -40,13 +40,13 @@ export function UniqueDirectivesPerLocation(
     ? schema.getDirectives()
     : specifiedDirectives;
   for (const directive of definedDirectives) {
-    uniqueDirectiveMap[directive.name] = !directive.isRepeatable;
+    uniqueDirectiveMap[directive.name] = !directive.repeatable;
   }
 
   const astDefinitions = context.getDocument().definitions;
   for (const def of astDefinitions) {
     if (def.kind === Kind.DIRECTIVE_DEFINITION) {
-      uniqueDirectiveMap[def.name.value] = !def.isRepeatable;
+      uniqueDirectiveMap[def.name.value] = !def.repeatable;
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ export class ASTDefinitionBuilder {`
`282`	`282`	`args:`
`283`	`283`	`directiveNode.arguments &&`
`284`	`284`	`this._makeInputValues(directiveNode.arguments),`
`285`		`- isRepeatable: directiveNode.isRepeatable,`
	`285`	`+ repeatable: directiveNode.repeatable,`
`286`	`286`	`astNode: directiveNode,`
`287`	`287`	`});`
`288`	`288`	`}`