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.

Sign up for GitHub

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

Merge extendType functionality changes from #1322 #1373

Merged
merged 14 commits into from
Jun 7, 2018
Merged

Merge extendType functionality changes from #1322 #1373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4b29c35
Extend the extend functionality
grenierdev Apr 22, 2018
38cfdba
Fix flowtype
grenierdev Apr 26, 2018
5e171de
Extract logic from _makeInputValues to its own function
grenierdev Apr 26, 2018
5061360
Fix lint and minor refactors
grenierdev Apr 26, 2018
db7d4c0
Fix type error due to copy & paste
grenierdev Apr 26, 2018
50ab294
Fix array syntax
grenierdev Apr 26, 2018
fed46bf
Fix test more verbose
grenierdev Apr 26, 2018
112e366
Removed unnecessary check
grenierdev Apr 26, 2018
b122ea0
Extend directive
grenierdev Apr 28, 2018
371b09f
Moved new tests into existing tests
grenierdev Apr 28, 2018
5b896c6
Fix lint errors
grenierdev Apr 29, 2018
b9bbe83
Added missing description
grenierdev Apr 29, 2018
e227d13
Pull, fix merge conflicts, and address previous comments
mjmahone Jun 7, 2018
717eb0c
fix enum value error test
mjmahone Jun 7, 2018
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
3 changes: 3 additions & 0 deletions src/type/definition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,7 @@ export class GraphQLUnionType {
name: string;
description: ?string;
astNode: ?UnionTypeDefinitionNode;
extensionASTNodes: ?$ReadOnlyArray<ObjectTypeExtensionNode>;
resolveType: ?GraphQLTypeResolver<*, *>;

_typeConfig: GraphQLUnionTypeConfig<*, *>;
Expand Down Expand Up @@ -1081,6 +1082,7 @@ export class GraphQLEnumType /* <T> */ {
name: string;
description: ?string;
astNode: ?EnumTypeDefinitionNode;
extensionASTNodes: ?$ReadOnlyArray<ObjectTypeExtensionNode>;

_values: Array<GraphQLEnumValue /* <T> */>;
_valueLookup: Map<any /* T */, GraphQLEnumValue>;
Expand Down Expand Up @@ -1230,6 +1232,7 @@ export class GraphQLInputObjectType {
name: string;
description: ?string;
astNode: ?InputObjectTypeDefinitionNode;
extensionASTNodes: ?$ReadOnlyArray<ObjectTypeExtensionNode>;

_typeConfig: GraphQLInputObjectTypeConfig;
_fields: GraphQLInputFieldMap;
Expand Down
Loading