Skip to content

Commit dbb3752

Browse files
committed
move validation rule messages into rule file to make it easier to find
1 parent 472af28 commit dbb3752

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+329
-294
lines changed

src/type/__tests__/introspection.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
import { expect } from 'chai';
1111
import { describe, it } from 'mocha';
1212

13-
import { missingFieldArgMessage } from '../../validation/errors';
13+
import {
14+
missingFieldArgMessage
15+
} from '../../validation/rules/ProvidedNonNullArguments';
1416
import {
1517
graphql,
1618
GraphQLSchema,

src/validation/__tests__/ArgumentsOfCorrectType.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99

1010
import { describe, it } from 'mocha';
1111
import { expectPassesRule, expectFailsRule } from './harness';
12-
import ArgumentsOfCorrectType from '../rules/ArgumentsOfCorrectType';
13-
import { badValueMessage } from '../errors';
12+
import {
13+
ArgumentsOfCorrectType,
14+
badValueMessage
15+
} from '../rules/ArgumentsOfCorrectType';
1416

1517

1618
function badValue(argName, typeName, value, line, column) {

src/validation/__tests__/DefaultValuesOfCorrectType.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import { describe, it } from 'mocha';
1111
import { expectPassesRule, expectFailsRule } from './harness';
1212
import {
13+
DefaultValuesOfCorrectType,
1314
defaultForNonNullArgMessage,
1415
badValueForDefaultArgMessage,
15-
} from '../errors';
16-
import DefaultValuesOfCorrectType from '../rules/DefaultValuesOfCorrectType';
16+
} from '../rules/DefaultValuesOfCorrectType';
1717

1818

1919
function defaultForNonNullArg(varName, typeName, guessTypeName, line, column) {

src/validation/__tests__/FieldsOnCorrectType.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99

1010
import { describe, it } from 'mocha';
1111
import { expectPassesRule, expectFailsRule } from './harness';
12-
import FieldsOnCorrectType from '../rules/FieldsOnCorrectType';
13-
import { undefinedFieldMessage } from '../errors';
12+
import {
13+
FieldsOnCorrectType,
14+
undefinedFieldMessage,
15+
} from '../rules/FieldsOnCorrectType';
16+
1417

1518
function undefinedField(field, type, line, column) {
1619
return {

src/validation/__tests__/FragmentsOnCompositeTypes.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
import { describe, it } from 'mocha';
1111
import { expectPassesRule, expectFailsRule } from './harness';
12-
import FragmentsOnCompositeTypes from '../rules/FragmentsOnCompositeTypes';
1312
import {
14-
fragmentOnNonCompositeErrorMessage,
13+
FragmentsOnCompositeTypes,
1514
inlineFragmentOnNonCompositeErrorMessage,
16-
} from '../errors';
15+
fragmentOnNonCompositeErrorMessage,
16+
} from '../rules/FragmentsOnCompositeTypes';
1717

1818
function error(fragName, typeName, line, column) {
1919
return {

src/validation/__tests__/KnownArgumentNames.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99

1010
import { describe, it } from 'mocha';
1111
import { expectPassesRule, expectFailsRule } from './harness';
12-
import KnownArgumentNames from '../rules/KnownArgumentNames';
13-
import { unknownArgMessage, unknownDirectiveArgMessage } from '../errors';
12+
import {
13+
KnownArgumentNames,
14+
unknownArgMessage,
15+
unknownDirectiveArgMessage,
16+
} from '../rules/KnownArgumentNames';
17+
1418

1519
function unknownArg(argName, fieldName, typeName, line, column) {
1620
return {

src/validation/__tests__/KnownDirectives.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99

1010
import { describe, it } from 'mocha';
1111
import { expectPassesRule, expectFailsRule } from './harness';
12-
import KnownDirectives from '../rules/KnownDirectives';
13-
import { unknownDirectiveMessage, misplacedDirectiveMessage } from '../errors';
12+
import {
13+
KnownDirectives,
14+
unknownDirectiveMessage,
15+
misplacedDirectiveMessage,
16+
} from '../rules/KnownDirectives';
1417

1518

1619
function unknownDirective(directiveName, line, column) {

src/validation/__tests__/KnownFragmentNames.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99

1010
import { describe, it } from 'mocha';
1111
import { expectPassesRule, expectFailsRule } from './harness';
12-
import KnownFragmentNames from '../rules/KnownFragmentNames';
13-
import { unknownFragmentMessage } from '../errors';
12+
import {
13+
KnownFragmentNames,
14+
unknownFragmentMessage,
15+
} from '../rules/KnownFragmentNames';
1416

1517

1618
function undefFrag(fragName, line, column) {

src/validation/__tests__/KnownTypeNames.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99

1010
import { describe, it } from 'mocha';
1111
import { expectPassesRule, expectFailsRule } from './harness';
12-
import KnownTypeNames from '../rules/KnownTypeNames';
13-
import { unknownTypeMessage } from '../errors';
12+
import {
13+
KnownTypeNames,
14+
unknownTypeMessage,
15+
} from '../rules/KnownTypeNames';
16+
1417

1518
function unknownType(typeName, line, column) {
1619
return {

src/validation/__tests__/LoneAnonymousOperation.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99

1010
import { describe, it } from 'mocha';
1111
import { expectPassesRule, expectFailsRule } from './harness';
12-
import LoneAnonymousOperation from '../rules/LoneAnonymousOperation';
13-
import { anonOperationNotAloneMessage } from '../errors';
12+
import {
13+
LoneAnonymousOperation,
14+
anonOperationNotAloneMessage,
15+
} from '../rules/LoneAnonymousOperation';
1416

1517

1618
function anonNotAlone(line, column) {

0 commit comments

Comments
 (0)