Fixing double 'Rule' suffix that was accidentally introduced in #2402

IvanGoncharov · IvanGoncharov · commit de1257171fde · 2020-01-28T12:24:42.000+08:00
Big thanks to @trevor-scheer for reporting it here: https://github.com/graphql/graphql-js/pull/2402/files#r371545963
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -327,12 +327,12 @@ export {
   VariablesAreInputTypesRule,
   VariablesInAllowedPositionRule,
   // SDL-specific validation rules
-  LoneSchemaDefinitionRuleRule,
-  UniqueOperationTypesRuleRule,
-  UniqueTypeNamesRuleRule,
-  UniqueEnumValueNamesRuleRule,
+  LoneSchemaDefinitionRule,
+  UniqueOperationTypesRule,
+  UniqueTypeNamesRule,
+  UniqueEnumValueNamesRule,
   UniqueFieldDefinitionNamesRule,
-  UniqueDirectiveNamesRuleRule,
+  UniqueDirectiveNamesRule,
   PossibleTypeExtensionsRule,
   ValidationRule,
 } from './validation/index';
diff --git a/src/index.js b/src/index.js
@@ -325,12 +325,12 @@ export {
   VariablesAreInputTypesRule,
   VariablesInAllowedPositionRule,
   // SDL-specific validation rules
-  LoneSchemaDefinitionRuleRule,
-  UniqueOperationTypesRuleRule,
-  UniqueTypeNamesRuleRule,
-  UniqueEnumValueNamesRuleRule,
+  LoneSchemaDefinitionRule,
+  UniqueOperationTypesRule,
+  UniqueTypeNamesRule,
+  UniqueEnumValueNamesRule,
   UniqueFieldDefinitionNamesRule,
-  UniqueDirectiveNamesRuleRule,
+  UniqueDirectiveNamesRule,
   PossibleTypeExtensionsRule,
 } from './validation/index';
 
diff --git a/src/validation/__tests__/LoneSchemaDefinitionRule-test.js b/src/validation/__tests__/LoneSchemaDefinitionRule-test.js
@@ -4,14 +4,14 @@ import { describe, it } from 'mocha';
 
 import { buildSchema } from '../../utilities/buildASTSchema';
 
-import { LoneSchemaDefinitionRuleRule } from '../rules/LoneSchemaDefinitionRule';
+import { LoneSchemaDefinitionRule } from '../rules/LoneSchemaDefinitionRule';
 
 import { expectSDLValidationErrors } from './harness';
 
 function expectSDLErrors(sdlStr, schema) {
   return expectSDLValidationErrors(
     schema,
-    LoneSchemaDefinitionRuleRule,
+    LoneSchemaDefinitionRule,
     sdlStr,
   );
 }
diff --git a/src/validation/__tests__/UniqueDirectiveNamesRule-test.js b/src/validation/__tests__/UniqueDirectiveNamesRule-test.js
@@ -4,14 +4,14 @@ import { describe, it } from 'mocha';
 
 import { buildSchema } from '../../utilities/buildASTSchema';
 
-import { UniqueDirectiveNamesRuleRule } from '../rules/UniqueDirectiveNamesRule';
+import { UniqueDirectiveNamesRule } from '../rules/UniqueDirectiveNamesRule';
 
 import { expectSDLValidationErrors } from './harness';
 
 function expectSDLErrors(sdlStr, schema) {
   return expectSDLValidationErrors(
     schema,
-    UniqueDirectiveNamesRuleRule,
+    UniqueDirectiveNamesRule,
     sdlStr,
   );
 }
diff --git a/src/validation/__tests__/UniqueEnumValueNamesRule-test.js b/src/validation/__tests__/UniqueEnumValueNamesRule-test.js
@@ -4,14 +4,14 @@ import { describe, it } from 'mocha';
 
 import { buildSchema } from '../../utilities/buildASTSchema';
 
-import { UniqueEnumValueNamesRuleRule } from '../rules/UniqueEnumValueNamesRule';
+import { UniqueEnumValueNamesRule } from '../rules/UniqueEnumValueNamesRule';
 
 import { expectSDLValidationErrors } from './harness';
 
 function expectSDLErrors(sdlStr, schema) {
   return expectSDLValidationErrors(
     schema,
-    UniqueEnumValueNamesRuleRule,
+    UniqueEnumValueNamesRule,
     sdlStr,
   );
 }
diff --git a/src/validation/__tests__/UniqueOperationTypesRule-test.js b/src/validation/__tests__/UniqueOperationTypesRule-test.js
@@ -4,14 +4,14 @@ import { describe, it } from 'mocha';
 
 import { buildSchema } from '../../utilities/buildASTSchema';
 
-import { UniqueOperationTypesRuleRule } from '../rules/UniqueOperationTypesRule';
+import { UniqueOperationTypesRule } from '../rules/UniqueOperationTypesRule';
 
 import { expectSDLValidationErrors } from './harness';
 
 function expectSDLErrors(sdlStr, schema) {
   return expectSDLValidationErrors(
     schema,
-    UniqueOperationTypesRuleRule,
+    UniqueOperationTypesRule,
     sdlStr,
   );
 }
diff --git a/src/validation/__tests__/UniqueTypeNamesRule-test.js b/src/validation/__tests__/UniqueTypeNamesRule-test.js
@@ -4,12 +4,12 @@ import { describe, it } from 'mocha';
 
 import { buildSchema } from '../../utilities/buildASTSchema';
 
-import { UniqueTypeNamesRuleRule } from '../rules/UniqueTypeNamesRule';
+import { UniqueTypeNamesRule } from '../rules/UniqueTypeNamesRule';
 
 import { expectSDLValidationErrors } from './harness';
 
 function expectSDLErrors(sdlStr, schema) {
-  return expectSDLValidationErrors(schema, UniqueTypeNamesRuleRule, sdlStr);
+  return expectSDLValidationErrors(schema, UniqueTypeNamesRule, sdlStr);
 }
 
 function expectValidSDL(sdlStr, schema) {
diff --git a/src/validation/index.d.ts b/src/validation/index.d.ts
@@ -83,10 +83,10 @@ export { VariablesAreInputTypesRule } from './rules/VariablesAreInputTypesRule';
 export { VariablesInAllowedPositionRule } from './rules/VariablesInAllowedPositionRule';
 
 // SDL-specific validation rules
-export { LoneSchemaDefinitionRuleRule } from './rules/LoneSchemaDefinitionRule';
-export { UniqueOperationTypesRuleRule } from './rules/UniqueOperationTypesRule';
-export { UniqueTypeNamesRuleRule } from './rules/UniqueTypeNamesRule';
-export { UniqueEnumValueNamesRuleRule } from './rules/UniqueEnumValueNamesRule';
+export { LoneSchemaDefinitionRule } from './rules/LoneSchemaDefinitionRule';
+export { UniqueOperationTypesRule } from './rules/UniqueOperationTypesRule';
+export { UniqueTypeNamesRule } from './rules/UniqueTypeNamesRule';
+export { UniqueEnumValueNamesRule } from './rules/UniqueEnumValueNamesRule';
 export { UniqueFieldDefinitionNamesRule } from './rules/UniqueFieldDefinitionNamesRule';
-export { UniqueDirectiveNamesRuleRule } from './rules/UniqueDirectiveNamesRule';
+export { UniqueDirectiveNamesRule } from './rules/UniqueDirectiveNamesRule';
 export { PossibleTypeExtensionsRule } from './rules/PossibleTypeExtensionsRule';
diff --git a/src/validation/index.js b/src/validation/index.js
@@ -87,10 +87,10 @@ export { VariablesAreInputTypesRule } from './rules/VariablesAreInputTypesRule';
 export { VariablesInAllowedPositionRule } from './rules/VariablesInAllowedPositionRule';
 
 // SDL-specific validation rules
-export { LoneSchemaDefinitionRuleRule } from './rules/LoneSchemaDefinitionRule';
-export { UniqueOperationTypesRuleRule } from './rules/UniqueOperationTypesRule';
-export { UniqueTypeNamesRuleRule } from './rules/UniqueTypeNamesRule';
-export { UniqueEnumValueNamesRuleRule } from './rules/UniqueEnumValueNamesRule';
+export { LoneSchemaDefinitionRule } from './rules/LoneSchemaDefinitionRule';
+export { UniqueOperationTypesRule } from './rules/UniqueOperationTypesRule';
+export { UniqueTypeNamesRule } from './rules/UniqueTypeNamesRule';
+export { UniqueEnumValueNamesRule } from './rules/UniqueEnumValueNamesRule';
 export { UniqueFieldDefinitionNamesRule } from './rules/UniqueFieldDefinitionNamesRule';
-export { UniqueDirectiveNamesRuleRule } from './rules/UniqueDirectiveNamesRule';
+export { UniqueDirectiveNamesRule } from './rules/UniqueDirectiveNamesRule';
 export { PossibleTypeExtensionsRule } from './rules/PossibleTypeExtensionsRule';
diff --git a/src/validation/rules/LoneSchemaDefinitionRule.d.ts b/src/validation/rules/LoneSchemaDefinitionRule.d.ts
@@ -6,6 +6,6 @@ import { SDLValidationContext } from '../ValidationContext';
  *
  * A GraphQL document is only valid if it contains only one schema definition.
  */
-export function LoneSchemaDefinitionRuleRule(
+export function LoneSchemaDefinitionRule(
   context: SDLValidationContext,
 ): ASTVisitor;
diff --git a/src/validation/rules/LoneSchemaDefinitionRule.js b/src/validation/rules/LoneSchemaDefinitionRule.js
@@ -10,7 +10,7 @@ import { type SDLValidationContext } from '../ValidationContext';
  *
  * A GraphQL document is only valid if it contains only one schema definition.
  */
-export function LoneSchemaDefinitionRuleRule(
+export function LoneSchemaDefinitionRule(
   context: SDLValidationContext,
 ): ASTVisitor {
   const oldSchema = context.getSchema();
diff --git a/src/validation/rules/UniqueDirectiveNamesRule.d.ts b/src/validation/rules/UniqueDirectiveNamesRule.d.ts
@@ -6,6 +6,6 @@ import { SDLValidationContext } from '../ValidationContext';
  *
  * A GraphQL document is only valid if all defined directives have unique names.
  */
-export function UniqueDirectiveNamesRuleRule(
+export function UniqueDirectiveNamesRule(
   context: SDLValidationContext,
 ): ASTVisitor;
diff --git a/src/validation/rules/UniqueDirectiveNamesRule.js b/src/validation/rules/UniqueDirectiveNamesRule.js
@@ -10,7 +10,7 @@ import { type SDLValidationContext } from '../ValidationContext';
  *
  * A GraphQL document is only valid if all defined directives have unique names.
  */
-export function UniqueDirectiveNamesRuleRule(
+export function UniqueDirectiveNamesRule(
   context: SDLValidationContext,
 ): ASTVisitor {
   const knownDirectiveNames = Object.create(null);
diff --git a/src/validation/rules/UniqueEnumValueNamesRule.d.ts b/src/validation/rules/UniqueEnumValueNamesRule.d.ts
@@ -6,6 +6,6 @@ import { SDLValidationContext } from '../ValidationContext';
  *
  * A GraphQL enum type is only valid if all its values are uniquely named.
  */
-export function UniqueEnumValueNamesRuleRule(
+export function UniqueEnumValueNamesRule(
   context: SDLValidationContext,
 ): ASTVisitor;
diff --git a/src/validation/rules/UniqueEnumValueNamesRule.js b/src/validation/rules/UniqueEnumValueNamesRule.js
@@ -11,7 +11,7 @@ import { type SDLValidationContext } from '../ValidationContext';
  *
  * A GraphQL enum type is only valid if all its values are uniquely named.
  */
-export function UniqueEnumValueNamesRuleRule(
+export function UniqueEnumValueNamesRule(
   context: SDLValidationContext,
 ): ASTVisitor {
   const schema = context.getSchema();
diff --git a/src/validation/rules/UniqueOperationTypesRule.d.ts b/src/validation/rules/UniqueOperationTypesRule.d.ts
@@ -6,6 +6,6 @@ import { SDLValidationContext } from '../ValidationContext';
  *
  * A GraphQL document is only valid if it has only one type per operation.
  */
-export function UniqueOperationTypesRuleRule(
+export function UniqueOperationTypesRule(
   context: SDLValidationContext,
 ): ASTVisitor;
diff --git a/src/validation/rules/UniqueOperationTypesRule.js b/src/validation/rules/UniqueOperationTypesRule.js
@@ -10,7 +10,7 @@ import { type SDLValidationContext } from '../ValidationContext';
  *
  * A GraphQL document is only valid if it has only one type per operation.
  */
-export function UniqueOperationTypesRuleRule(
+export function UniqueOperationTypesRule(
   context: SDLValidationContext,
 ): ASTVisitor {
   const schema = context.getSchema();
diff --git a/src/validation/rules/UniqueTypeNamesRule.d.ts b/src/validation/rules/UniqueTypeNamesRule.d.ts
@@ -6,6 +6,6 @@ import { SDLValidationContext } from '../ValidationContext';
  *
  * A GraphQL document is only valid if all defined types have unique names.
  */
-export function UniqueTypeNamesRuleRule(
+export function UniqueTypeNamesRule(
   context: SDLValidationContext,
 ): ASTVisitor;
diff --git a/src/validation/rules/UniqueTypeNamesRule.js b/src/validation/rules/UniqueTypeNamesRule.js
@@ -12,7 +12,7 @@ import { type SDLValidationContext } from '../ValidationContext';
  *
  * A GraphQL document is only valid if all defined types have unique names.
  */
-export function UniqueTypeNamesRuleRule(
+export function UniqueTypeNamesRule(
   context: SDLValidationContext,
 ): ASTVisitor {
   const knownTypeNames = Object.create(null);
diff --git a/src/validation/specifiedRules.js b/src/validation/specifiedRules.js
@@ -85,12 +85,12 @@ import { OverlappingFieldsCanBeMergedRule } from './rules/OverlappingFieldsCanBe
 import { UniqueInputFieldNamesRule } from './rules/UniqueInputFieldNamesRule';
 
 // SDL-specific validation rules
-import { LoneSchemaDefinitionRuleRule } from './rules/LoneSchemaDefinitionRule';
-import { UniqueOperationTypesRuleRule } from './rules/UniqueOperationTypesRule';
-import { UniqueTypeNamesRuleRule } from './rules/UniqueTypeNamesRule';
-import { UniqueEnumValueNamesRuleRule } from './rules/UniqueEnumValueNamesRule';
+import { LoneSchemaDefinitionRule } from './rules/LoneSchemaDefinitionRule';
+import { UniqueOperationTypesRule } from './rules/UniqueOperationTypesRule';
+import { UniqueTypeNamesRule } from './rules/UniqueTypeNamesRule';
+import { UniqueEnumValueNamesRule } from './rules/UniqueEnumValueNamesRule';
 import { UniqueFieldDefinitionNamesRule } from './rules/UniqueFieldDefinitionNamesRule';
-import { UniqueDirectiveNamesRuleRule } from './rules/UniqueDirectiveNamesRule';
+import { UniqueDirectiveNamesRule } from './rules/UniqueDirectiveNamesRule';
 import { PossibleTypeExtensionsRule } from './rules/PossibleTypeExtensionsRule';
 
 /**
@@ -132,12 +132,12 @@ export const specifiedRules = Object.freeze([
  * @internal
  */
 export const specifiedSDLRules = Object.freeze([
-  LoneSchemaDefinitionRuleRule,
-  UniqueOperationTypesRuleRule,
-  UniqueTypeNamesRuleRule,
-  UniqueEnumValueNamesRuleRule,
+  LoneSchemaDefinitionRule,
+  UniqueOperationTypesRule,
+  UniqueTypeNamesRule,
+  UniqueEnumValueNamesRule,
   UniqueFieldDefinitionNamesRule,
-  UniqueDirectiveNamesRuleRule,
+  UniqueDirectiveNamesRule,
   KnownTypeNamesRule,
   KnownDirectivesRule,
   UniqueDirectivesPerLocationRule,

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ import { SDLValidationContext } from '../ValidationContext';`
`6`	`6`	`*`
`7`	`7`	`* A GraphQL document is only valid if it contains only one schema definition.`
`8`	`8`	`*/`
`9`		`-export function LoneSchemaDefinitionRuleRule(`
	`9`	`+export function LoneSchemaDefinitionRule(`
`10`	`10`	`context: SDLValidationContext,`
`11`	`11`	`): ASTVisitor;`