Skip to content

Commit f9e6d81

Browse files
IvanGoncharovleebyron
authored andcommitted
Fix extensionASTNodes assigment (#1390)
* Cleanup extendSchema tests * Fix 'extensionASTNodes' assigment
1 parent 3521e14 commit f9e6d81

File tree

2 files changed

+291
-247
lines changed

2 files changed

+291
-247
lines changed

src/type/definition.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ import type {
2828
InputObjectTypeDefinitionNode,
2929
ObjectTypeExtensionNode,
3030
InterfaceTypeExtensionNode,
31+
UnionTypeExtensionNode,
32+
EnumTypeExtensionNode,
33+
InputObjectTypeExtensionNode,
3134
OperationDefinitionNode,
3235
FieldNode,
3336
FragmentDefinitionNode,
@@ -972,7 +975,7 @@ export class GraphQLUnionType {
972975
name: string;
973976
description: ?string;
974977
astNode: ?UnionTypeDefinitionNode;
975-
extensionASTNodes: ?$ReadOnlyArray<ObjectTypeExtensionNode>;
978+
extensionASTNodes: ?$ReadOnlyArray<UnionTypeExtensionNode>;
976979
resolveType: ?GraphQLTypeResolver<*, *>;
977980

978981
_typeConfig: GraphQLUnionTypeConfig<*, *>;
@@ -982,6 +985,7 @@ export class GraphQLUnionType {
982985
this.name = config.name;
983986
this.description = config.description;
984987
this.astNode = config.astNode;
988+
this.extensionASTNodes = config.extensionASTNodes;
985989
this.resolveType = config.resolveType;
986990
this._typeConfig = config;
987991
invariant(typeof config.name === 'string', 'Must provide name.');
@@ -1032,6 +1036,7 @@ export type GraphQLUnionTypeConfig<TSource, TContext> = {
10321036
resolveType?: ?GraphQLTypeResolver<TSource, TContext>,
10331037
description?: ?string,
10341038
astNode?: ?UnionTypeDefinitionNode,
1039+
extensionASTNodes?: ?$ReadOnlyArray<UnionTypeExtensionNode>,
10351040
};
10361041

10371042
/**
@@ -1059,7 +1064,7 @@ export class GraphQLEnumType /* <T> */ {
10591064
name: string;
10601065
description: ?string;
10611066
astNode: ?EnumTypeDefinitionNode;
1062-
extensionASTNodes: ?$ReadOnlyArray<ObjectTypeExtensionNode>;
1067+
extensionASTNodes: ?$ReadOnlyArray<EnumTypeExtensionNode>;
10631068

10641069
_values: Array<GraphQLEnumValue /* <T> */>;
10651070
_valueLookup: Map<any /* T */, GraphQLEnumValue>;
@@ -1069,6 +1074,7 @@ export class GraphQLEnumType /* <T> */ {
10691074
this.name = config.name;
10701075
this.description = config.description;
10711076
this.astNode = config.astNode;
1077+
this.extensionASTNodes = config.extensionASTNodes;
10721078
this._values = defineEnumValues(this, config.values);
10731079
this._valueLookup = new Map(
10741080
this._values.map(enumValue => [enumValue.value, enumValue]),
@@ -1157,6 +1163,7 @@ export type GraphQLEnumTypeConfig /* <T> */ = {
11571163
values: GraphQLEnumValueConfigMap /* <T> */,
11581164
description?: ?string,
11591165
astNode?: ?EnumTypeDefinitionNode,
1166+
extensionASTNodes?: ?$ReadOnlyArray<EnumTypeExtensionNode>,
11601167
};
11611168

11621169
export type GraphQLEnumValueConfigMap /* <T> */ = ObjMap<
@@ -1203,7 +1210,7 @@ export class GraphQLInputObjectType {
12031210
name: string;
12041211
description: ?string;
12051212
astNode: ?InputObjectTypeDefinitionNode;
1206-
extensionASTNodes: ?$ReadOnlyArray<ObjectTypeExtensionNode>;
1213+
extensionASTNodes: ?$ReadOnlyArray<InputObjectTypeExtensionNode>;
12071214

12081215
_typeConfig: GraphQLInputObjectTypeConfig;
12091216
_fields: GraphQLInputFieldMap;
@@ -1212,6 +1219,7 @@ export class GraphQLInputObjectType {
12121219
this.name = config.name;
12131220
this.description = config.description;
12141221
this.astNode = config.astNode;
1222+
this.extensionASTNodes = config.extensionASTNodes;
12151223
this._typeConfig = config;
12161224
invariant(typeof config.name === 'string', 'Must provide name.');
12171225
}
@@ -1257,6 +1265,7 @@ export type GraphQLInputObjectTypeConfig = {
12571265
fields: Thunk<GraphQLInputFieldConfigMap>,
12581266
description?: ?string,
12591267
astNode?: ?InputObjectTypeDefinitionNode,
1268+
extensionASTNodes?: ?$ReadOnlyArray<InputObjectTypeExtensionNode>,
12601269
};
12611270

12621271
export type GraphQLInputFieldConfig = {

0 commit comments

Comments
 (0)