Skip to content

Commit 7412faa

Browse files
committed
Do not import internal graphql/language/kinds module
They are not part of the official API and it broke in 0.13: graphql/graphql-js#1221
1 parent 5f4f583 commit 7412faa

File tree

46 files changed

+123
-45
lines changed

Some content is hidden

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

46 files changed

+123
-45
lines changed

spec/schema/preparation/ast-transformation-modules/add-filter-arguments-to-fields-transformer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {NamedTypeNode, ObjectTypeDefinitionNode, parse} from "graphql";
2-
import {NAMED_TYPE, OBJECT_TYPE_DEFINITION} from "graphql/language/kinds";
2+
import {NAMED_TYPE, OBJECT_TYPE_DEFINITION} from "../../../../src/graphql/kinds";
33
import {FILTER_ARG} from "../../../../src/schema/schema-defaults";
44
import {AddFilterArgumentsToFieldsTransformer} from "../../../../src/schema/preparation/post-merge-ast-transformation-modules/add-filter-arguments-to-fields-transformer";
55

spec/schema/preparation/ast-transformation-modules/add-filter-input-types-transformer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {parse} from "graphql";
2-
import {INPUT_OBJECT_TYPE_DEFINITION} from "graphql/language/kinds";
2+
import {INPUT_OBJECT_TYPE_DEFINITION} from "../../../../src/graphql/kinds";
33
import {AddFilterInputTypesTransformer} from "../../../../src/schema/preparation/post-merge-ast-transformation-modules/add-filter-input-types-transformer";
44
import {getNamedInputTypeDefinitionAST} from "../../../../src/schema/schema-utils";
55

spec/schema/preparation/ast-transformation-modules/add-namespaces-to-types-transformer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {parse} from "graphql";
22
import {findDirectiveWithName, getObjectTypes} from "../../../../src/schema/schema-utils";
33
import {AddNamespacesToTypesTransformer} from "../../../../src/schema/preparation/pre-merge-ast-transformation-modules/add-namespaces-to-types-transformer";
44
import {NAMESPACE_DIRECTIVE, ROOT_ENTITY_DIRECTIVE} from "../../../../src/schema/schema-defaults";
5-
import {STRING} from "graphql/language/kinds";
5+
import {STRING} from "../../../../src/graphql/kinds";
66

77
const modelWithRootEntity = `
88
type Stuff @rootEntity {

spec/schema/preparation/ast-transformation-modules/add-order-by-enums-transformer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {parse} from "graphql";
2-
import {ENUM_TYPE_DEFINITION, INPUT_OBJECT_TYPE_DEFINITION} from "graphql/language/kinds";
2+
import {ENUM_TYPE_DEFINITION, INPUT_OBJECT_TYPE_DEFINITION} from "../../../../src/graphql/kinds";
33
import {AddFilterInputTypesTransformer} from "../../../../src/schema/preparation/post-merge-ast-transformation-modules/add-filter-input-types-transformer";
44
import {getNamedInputTypeDefinitionAST, getNamedTypeDefinitionAST} from "../../../../src/schema/schema-utils";
55
import {AddOrderbyInputEnumsTransformer} from "../../../../src/schema/preparation/post-merge-ast-transformation-modules/add-orderby-enums-transformer";

spec/schema/preparation/ast-transformation-modules/add-orderby-arguments-to-fields-transformer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {ListTypeNode, NamedTypeNode, NonNullTypeNode, ObjectTypeDefinitionNode, parse} from "graphql";
2-
import {LIST_TYPE, NAMED_TYPE, NON_NULL_TYPE, OBJECT_TYPE_DEFINITION} from "graphql/language/kinds";
2+
import {LIST_TYPE, NAMED_TYPE, NON_NULL_TYPE, OBJECT_TYPE_DEFINITION} from "../../../../src/graphql/kinds";
33
import {ORDER_BY_ARG} from "../../../../src/schema/schema-defaults";
44
import {AddOrderbyArgumentsToFieldsTransformer} from "../../../../src/schema/preparation/post-merge-ast-transformation-modules/add-orderby-arguments-to-fields-transformer";
55

spec/schema/preparation/ast-transformation-modules/add-root-query-type-transformer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {ObjectTypeDefinitionNode, parse} from "graphql";
2-
import {OBJECT_TYPE_DEFINITION} from "graphql/language/kinds";
2+
import {OBJECT_TYPE_DEFINITION} from "../../../../src/graphql/kinds";
33
import {getNamedTypeDefinitionAST} from "../../../../src/schema/schema-utils";
44
import {AddRootQueryTypeTransformer} from "../../../../src/schema/preparation/post-merge-ast-transformation-modules/add-root-query-type-transformer";
55

spec/schema/preparation/ast-transformation-modules/add-root-schema-transformer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {parse, SchemaDefinitionNode} from "graphql";
2-
import {SCHEMA_DEFINITION} from "graphql/language/kinds";
2+
import {SCHEMA_DEFINITION} from "../../../../src/graphql/kinds";
33
import {AddRootSchemaTransformer} from "../../../../src/schema/preparation/post-merge-ast-transformation-modules/add-root-schema-transformer";
44

55
const sdl = `

spec/schema/preparation/ast-transformation-modules/non-nullable-lists-transformer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {ListTypeNode, NonNullTypeNode, ObjectTypeDefinitionNode, parse} from "graphql";
22
import {NonNullableListsTransformer} from "../../../../src/schema/preparation/post-merge-ast-transformation-modules/non-nullable-lists-transformer";
3-
import {LIST_TYPE, NAMED_TYPE, NON_NULL_TYPE} from "graphql/language/kinds";
3+
import {LIST_TYPE, NAMED_TYPE, NON_NULL_TYPE} from "../../../../src/graphql/kinds";
44

55
const sdl1 = `
66
type Stuff {

src/database/index-definition.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
} from "../schema/schema-defaults";
1313
import {getNodeByName, isRootEntityType} from "../schema/schema-utils";
1414
import {compact, flatMap, objectValues} from "../utils/utils";
15-
import {DOCUMENT, LIST, OBJECT} from "graphql/language/kinds";
15+
import {DOCUMENT, LIST, OBJECT} from "../graphql/kinds";
1616

1717
export interface IndexDefinition {
1818
id: string,

src/graphql/kinds.ts

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
// This is a copy of graphql/language/kinds so that we don't need to rely on internal modules
2+
// (they tend to break: https://github.com/graphql/graphql-js/issues/1221)
3+
4+
/**
5+
* Copyright (c) 2015-present, Facebook, Inc.
6+
*
7+
* This source code is licensed under the MIT license found in the
8+
* LICENSE file in the root directory of this source tree.
9+
*
10+
* @flow
11+
*/
12+
13+
// Name
14+
15+
export const NAME: 'Name' = 'Name';
16+
17+
// Document
18+
19+
export const DOCUMENT: 'Document' = 'Document';
20+
export const OPERATION_DEFINITION: 'OperationDefinition' = 'OperationDefinition';
21+
export const VARIABLE_DEFINITION: 'VariableDefinition' = 'VariableDefinition';
22+
export const VARIABLE: 'Variable' = 'Variable';
23+
export const SELECTION_SET: 'SelectionSet' = 'SelectionSet';
24+
export const FIELD: 'Field' = 'Field';
25+
export const ARGUMENT: 'Argument' = 'Argument';
26+
27+
// Fragments
28+
29+
export const FRAGMENT_SPREAD: 'FragmentSpread' = 'FragmentSpread';
30+
export const INLINE_FRAGMENT: 'InlineFragment' = 'InlineFragment';
31+
export const FRAGMENT_DEFINITION: 'FragmentDefinition' = 'FragmentDefinition';
32+
33+
// Values
34+
35+
export const INT: 'IntValue' = 'IntValue';
36+
export const FLOAT: 'FloatValue' = 'FloatValue';
37+
export const STRING: 'StringValue' = 'StringValue';
38+
export const BOOLEAN: 'BooleanValue' = 'BooleanValue';
39+
export const NULL: 'NullValue' = 'NullValue';
40+
export const ENUM: 'EnumValue' = 'EnumValue';
41+
export const LIST: 'ListValue' = 'ListValue';
42+
export const OBJECT: 'ObjectValue' = 'ObjectValue';
43+
export const OBJECT_FIELD: 'ObjectField' = 'ObjectField';
44+
45+
// Directives
46+
47+
export const DIRECTIVE: 'Directive' = 'Directive';
48+
49+
// Types
50+
51+
export const NAMED_TYPE: 'NamedType' = 'NamedType';
52+
export const LIST_TYPE: 'ListType' = 'ListType';
53+
export const NON_NULL_TYPE: 'NonNullType' = 'NonNullType';
54+
55+
// Type System Definitions
56+
57+
export const SCHEMA_DEFINITION: 'SchemaDefinition' = 'SchemaDefinition';
58+
export const OPERATION_TYPE_DEFINITION: 'OperationTypeDefinition' = 'OperationTypeDefinition';
59+
60+
// Type Definitions
61+
62+
export const SCALAR_TYPE_DEFINITION: 'ScalarTypeDefinition' = 'ScalarTypeDefinition';
63+
export const OBJECT_TYPE_DEFINITION: 'ObjectTypeDefinition' = 'ObjectTypeDefinition';
64+
export const FIELD_DEFINITION: 'FieldDefinition' = 'FieldDefinition';
65+
export const INPUT_VALUE_DEFINITION: 'InputValueDefinition' = 'InputValueDefinition';
66+
export const INTERFACE_TYPE_DEFINITION: 'InterfaceTypeDefinition' = 'InterfaceTypeDefinition';
67+
export const UNION_TYPE_DEFINITION: 'UnionTypeDefinition' = 'UnionTypeDefinition';
68+
export const ENUM_TYPE_DEFINITION: 'EnumTypeDefinition' = 'EnumTypeDefinition';
69+
export const ENUM_VALUE_DEFINITION: 'EnumValueDefinition' = 'EnumValueDefinition';
70+
export const INPUT_OBJECT_TYPE_DEFINITION: 'InputObjectTypeDefinition' = 'InputObjectTypeDefinition';
71+
72+
// Type Extensions
73+
74+
export const TYPE_EXTENSION_DEFINITION: 'TypeExtensionDefinition' = 'TypeExtensionDefinition';
75+
76+
// Directive Definitions
77+
78+
export const DIRECTIVE_DEFINITION: 'DirectiveDefinition' = 'DirectiveDefinition';

0 commit comments

Comments
 (0)