Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
10 changes: 5 additions & 5 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
8 changes: 2 additions & 6 deletions src/validation/__tests__/LoneSchemaDefinitionRule-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@ 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,
sdlStr,
);
return expectSDLValidationErrors(schema, LoneSchemaDefinitionRule, sdlStr);
}

function expectValidSDL(sdlStr, schema) {
Expand Down
8 changes: 2 additions & 6 deletions src/validation/__tests__/UniqueDirectiveNamesRule-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@ 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,
sdlStr,
);
return expectSDLValidationErrors(schema, UniqueDirectiveNamesRule, sdlStr);
}

function expectValidSDL(sdlStr, schema) {
Expand Down
8 changes: 2 additions & 6 deletions src/validation/__tests__/UniqueEnumValueNamesRule-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@ 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,
sdlStr,
);
return expectSDLValidationErrors(schema, UniqueEnumValueNamesRule, sdlStr);
}

function expectValidSDL(sdlStr, schema) {
Expand Down
8 changes: 2 additions & 6 deletions src/validation/__tests__/UniqueOperationTypesRule-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@ 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,
sdlStr,
);
return expectSDLValidationErrors(schema, UniqueOperationTypesRule, sdlStr);
}

function expectValidSDL(sdlStr, schema) {
Expand Down
4 changes: 2 additions & 2 deletions src/validation/__tests__/UniqueTypeNamesRule-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions src/validation/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
10 changes: 5 additions & 5 deletions src/validation/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
2 changes: 1 addition & 1 deletion src/validation/rules/LoneSchemaDefinitionRule.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion src/validation/rules/LoneSchemaDefinitionRule.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/validation/rules/UniqueDirectiveNamesRule.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion src/validation/rules/UniqueDirectiveNamesRule.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/validation/rules/UniqueEnumValueNamesRule.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion src/validation/rules/UniqueEnumValueNamesRule.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/validation/rules/UniqueOperationTypesRule.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion src/validation/rules/UniqueOperationTypesRule.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 1 addition & 3 deletions src/validation/rules/UniqueTypeNamesRule.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@ import { SDLValidationContext } from '../ValidationContext';
*
* A GraphQL document is only valid if all defined types have unique names.
*/
export function UniqueTypeNamesRuleRule(
context: SDLValidationContext,
): ASTVisitor;
export function UniqueTypeNamesRule(context: SDLValidationContext): ASTVisitor;
4 changes: 1 addition & 3 deletions src/validation/rules/UniqueTypeNamesRule.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ import { type SDLValidationContext } from '../ValidationContext';
*
* A GraphQL document is only valid if all defined types have unique names.
*/
export function UniqueTypeNamesRuleRule(
context: SDLValidationContext,
): ASTVisitor {
export function UniqueTypeNamesRule(context: SDLValidationContext): ASTVisitor {
const knownTypeNames = Object.create(null);
const schema = context.getSchema();

Expand Down
20 changes: 10 additions & 10 deletions src/validation/specifiedRules.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

/**
Expand Down Expand Up @@ -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,
Expand Down