Skip to content
This repository was archived by the owner on Sep 2, 2020. It is now read-only.

[EXPERIMENTAL] - support inputUnion #351

Closed
wants to merge 6 commits into from
Closed

[EXPERIMENTAL] - support inputUnion #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
704269d
add inputUnion fork, get tests running
acao Apr 5, 2019
f206810
cleanup, update contributing guidelines
acao Apr 5, 2019
6465439
fix command in CONTRIBUTING
acao Apr 5, 2019
7899f65
cleanup tests
acao Apr 5, 2019
d2e0716
return InputDef, add more examples
acao Apr 7, 2019
90f58ed
used NamedType instead of InputDef in InputUnionMember parser rules
acao Jun 1, 2019
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
15 changes: 15 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,21 @@ Complete your CLA here: <https://code.facebook.com/cla>
npm test
```

6. (optional) Link to `graphql/graphql-js` locally

from `graphql-js` repository:
```sh
yarn
yarn build
cd dist
yarn link
```

then from this project:
```sh
yarn link graphql
```

## Release on NPM

*Only core contributors may release to NPM.*
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@
"flow-bin": "0.68.0",
"graphql": "^14.0.2",
"graphql-language-service-interface": "^1.0.0-0",
"graphql-language-service-parser": "^0.1.0-0",
"graphql-language-service-server": "^1.0.0-0",
"graphql-language-service-types": "^0.1.0-0",
"graphql-language-service-utils": "^1.0.0-0",
"graphql-language-service-parser": "^1.2.2",
"graphql-language-service-server": "^2.0.0",
"graphql-language-service-types": "^1.2.2",
"graphql-language-service-utils": "^2.0.0",
"lerna": "^2.0.0",
"mocha": "4.1.0",
"prettier": "1.13"
Expand Down
5 changes: 5 additions & 0 deletions packages/interface/src/GraphQLLanguageService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,14 @@ const {
UNION_TYPE_DEFINITION,
SCALAR_TYPE_DEFINITION,
INPUT_OBJECT_TYPE_DEFINITION,
INPUT_UNION_TYPE_DEFINITION,
SCALAR_TYPE_EXTENSION,
OBJECT_TYPE_EXTENSION,
INTERFACE_TYPE_EXTENSION,
UNION_TYPE_EXTENSION,
ENUM_TYPE_EXTENSION,
INPUT_OBJECT_TYPE_EXTENSION,
INPUT_UNION_TYPE_EXTENSION,
DIRECTIVE_DEFINITION,
FRAGMENT_SPREAD,
OPERATION_DEFINITION,
Expand Down Expand Up @@ -89,12 +91,14 @@ export class GraphQLLanguageService {
case UNION_TYPE_DEFINITION:
case SCALAR_TYPE_DEFINITION:
case INPUT_OBJECT_TYPE_DEFINITION:
case INPUT_UNION_TYPE_EXTENSION:
case SCALAR_TYPE_EXTENSION:
case OBJECT_TYPE_EXTENSION:
case INTERFACE_TYPE_EXTENSION:
case UNION_TYPE_EXTENSION:
case ENUM_TYPE_EXTENSION:
case INPUT_OBJECT_TYPE_EXTENSION:
case INPUT_UNION_TYPE_DEFINITION:
case DIRECTIVE_DEFINITION:
return true;
}
Expand Down Expand Up @@ -261,6 +265,7 @@ export class GraphQLLanguageService {
definition =>
definition.kind === OBJECT_TYPE_DEFINITION ||
definition.kind === INPUT_OBJECT_TYPE_DEFINITION ||
definition.kind === INPUT_UNION_TYPE_DEFINITION ||
definition.kind === ENUM_TYPE_DEFINITION,
);

Expand Down
4 changes: 3 additions & 1 deletion packages/interface/src/__tests__/__schema__/HoverTestSchema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ enum Color {
BLUE
}

inputUnion InputUnionType = String | Float | Boolean

union UnionType = String | Float | Boolean

interface TestInterface {
Expand All @@ -27,11 +29,11 @@ type TestType implements TestInterface {
}

type Query {

""" This is field documentation for Query.thing """
thing: TestType
listOfThing: [TestType!]
parameterizedField(id: String!): TestType
cluck: Chicken
unionField: UnionType
inputUnionTest(input: InputUnionType): UnionType
}
8 changes: 8 additions & 0 deletions packages/interface/src/__tests__/__schema__/StarWarsSchema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,22 @@ input InputType {
value: Int = 42
}

input AltInputType {
key: String!
string: String!
}

type TestType {
testField: String
}

inputUnion ExampleInputUnion = AltInputType | InputType

type Query {
hero(episode: Episode): Character
human(id: String!): Human
droid(id: String!): Droid
inputTypeTest(args: InputType = {key: "key"}): TestType
inputUnionTest(args: ExampleInputUnion): TestType
deprecatedField: TestType @deprecated(reason: "Use test instead.")
}
3 changes: 3 additions & 0 deletions packages/interface/src/__tests__/getAutocompleteSuggestions-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ describe('getAutocompleteSuggestions', () => {
{label: 'hero', detail: 'Character'},
{label: 'human', detail: 'Human'},
{label: 'inputTypeTest', detail: 'TestType'},
{label: 'inputUnionTest', detail: 'TestType'},
]);

// Test for query text with empty lines
Expand All @@ -97,6 +98,7 @@ query name {
{label: 'hero', detail: 'Character'},
{label: 'human', detail: 'Human'},
{label: 'inputTypeTest', detail: 'TestType'},
{label: 'inputUnionTest', detail: 'TestType'},
]);
});

Expand All @@ -107,6 +109,7 @@ query name {
{label: 'hero', detail: 'Character'},
{label: 'human', detail: 'Human'},
{label: 'inputTypeTest', detail: 'TestType'},
{label: 'inputUnionTest', detail: 'TestType'},
]);
});

Expand Down
11 changes: 11 additions & 0 deletions packages/interface/src/getAutocompleteSuggestions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
GraphQLBoolean,
GraphQLEnumType,
GraphQLInputObjectType,
GraphQLInputUnionType,
GraphQLList,
SchemaMetaFieldDef,
TypeMetaFieldDef,
Expand Down Expand Up @@ -121,6 +122,7 @@ export function getAutocompleteSuggestions(
kind === 'EnumValue' ||
(kind === 'ListValue' && step === 1) ||
(kind === 'ObjectField' && step === 2) ||
(kind === 'InputUnion' && step === 2) ||
(kind === 'Argument' && step === 2)
) {
return getSuggestionsForInputValues(token, typeInfo);
Expand Down Expand Up @@ -503,6 +505,8 @@ function canUseDirective(
return locations.indexOf('ENUM_VALUE') !== -1;
case 'InputDef':
return locations.indexOf('INPUT_OBJECT') !== -1;
case 'InputUnionDef':
return locations.indexOf('INPUT_UNION') !== -1;
case 'InputValueDef':
const prevStateKind = state.prevState && state.prevState.kind;
switch (prevStateKind) {
Expand Down Expand Up @@ -628,6 +632,13 @@ export function getTypeInfo(
? objectType.getFields()
: null;
break;
case 'InputUnionValue':
const inputUnionType = getNamedType(inputType);
objectFieldDefs =
inputUnionType instanceof GraphQLInputUnionType
? inputUnionType.getFields()
: null;
break;
case 'ObjectField':
const objectField =
state.name && objectFieldDefs ? objectFieldDefs[state.name] : null;
Expand Down
11 changes: 11 additions & 0 deletions packages/parser/src/Rules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ export const ParseRules: {[name: string]: ParseRule} = {
return 'EnumDef';
case 'input':
return 'InputDef';
case 'inputUnion':
return 'InputUnionDef';
case 'extend':
return 'ExtendDef';
case 'directive':
Expand Down Expand Up @@ -196,6 +198,7 @@ export const ParseRules: {[name: string]: ParseRule} = {
Type(token: Token) {
return token.value === '[' ? 'ListType' : 'NonNullType';
},
InputUnionValue: [p('{'), list('ObjectField'), p('}')],
Copy link
Member Author

@acao acao Apr 5, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't figure out how to get Value to return this in the case statement above, but maybe that's because I never saw a kind for it?

// NonNullType has been merged into ListType to simplify.
ListType: [p('['), 'Type', p(']'), opt(p('!'))],
NonNullType: ['NamedType', opt(p('!'))],
Expand Down Expand Up @@ -252,6 +255,14 @@ export const ParseRules: {[name: string]: ParseRule} = {
list('UnionMember', p('|')),
],
UnionMember: ['NamedType'],
InputUnionDef: [
word('inputUnion'),
name('atom'),
list('Directive'),
p('='),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think we need the optional default keyword here as well?

list('InputUnionMember', p('|')),
],
InputUnionMember: ['NamedType'],
EnumDef: [
word('enum'),
name('atom'),
Expand Down
8 changes: 8 additions & 0 deletions packages/server/src/GraphQLCache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ const {
UNION_TYPE_DEFINITION,
SCALAR_TYPE_DEFINITION,
INPUT_OBJECT_TYPE_DEFINITION,
INPUT_UNION_TYPE_DEFINITION,
SCALAR_TYPE_EXTENSION,
OBJECT_TYPE_EXTENSION,
INTERFACE_TYPE_EXTENSION,
UNION_TYPE_EXTENSION,
ENUM_TYPE_EXTENSION,
INPUT_OBJECT_TYPE_EXTENSION,
INPUT_UNION_TYPE_EXTENSION,
DIRECTIVE_DEFINITION,
} = Kind;

Expand Down Expand Up @@ -228,6 +230,9 @@ export class GraphQLCache implements GraphQLCacheInterface {
InputObjectTypeDefinition(node) {
existingObjectTypes.set(node.name.value, true);
},
InputUnionTypeDefinition(node) {
existingObjectTypes.set(node.name.value, true);
},
EnumTypeDefinition(node) {
existingObjectTypes.set(node.name.value, true);
},
Expand Down Expand Up @@ -603,12 +608,14 @@ export class GraphQLCache implements GraphQLCacheInterface {
case UNION_TYPE_DEFINITION:
case SCALAR_TYPE_DEFINITION:
case INPUT_OBJECT_TYPE_DEFINITION:
case INPUT_UNION_TYPE_DEFINITION:
case SCALAR_TYPE_EXTENSION:
case OBJECT_TYPE_EXTENSION:
case INTERFACE_TYPE_EXTENSION:
case UNION_TYPE_EXTENSION:
case ENUM_TYPE_EXTENSION:
case INPUT_OBJECT_TYPE_EXTENSION:
case INPUT_UNION_TYPE_EXTENSION:
case DIRECTIVE_DEFINITION:
typeExtensions.push(definition);
break;
Expand Down Expand Up @@ -820,6 +827,7 @@ export class GraphQLCache implements GraphQLCacheInterface {
if (
definition.kind === OBJECT_TYPE_DEFINITION ||
definition.kind === INPUT_OBJECT_TYPE_DEFINITION ||
definition.kind === INPUT_UNION_TYPE_DEFINITION ||
definition.kind === ENUM_TYPE_DEFINITION
) {
objectTypeDefinitions.set(definition.name.value, {
Expand Down
8 changes: 8 additions & 0 deletions packages/server/src/__tests__/__schema__/StarWarsSchema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,21 @@ input InputType {
value: Int = 42
}

input AltInputType {
key: String!
value: String
}

type TestType {
testField: String
}

inputUnion ExampleInputUnion = InputType | AltInputType

type Query {
hero(episode: Episode): Character
human(id: String!): Human
droid(id: String!): Droid
inputTypeTest(args: InputType = {key: "key"}): TestType
inputUnionTest(args: ExampleInputUnion): TestType
}
29 changes: 2 additions & 27 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1696,7 +1696,7 @@ graphql-import@^0.4.4:
dependencies:
lodash "^4.17.4"

graphql-language-service-interface@^1.0.0-0, graphql-language-service-interface@^1.3.2:
graphql-language-service-interface@^1.0.0-0:
version "1.3.2"
resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-1.3.2.tgz#4bd5d49e23766c3d2ab65d110f26f10e321cc000"
dependencies:
Expand All @@ -1705,32 +1705,7 @@ graphql-language-service-interface@^1.0.0-0, graphql-language-service-interface@
graphql-language-service-types "^1.2.2"
graphql-language-service-utils "^1.2.2"

graphql-language-service-parser@^0.1.0-0:
version "0.1.14"
resolved "https://registry.yarnpkg.com/graphql-language-service-parser/-/graphql-language-service-parser-0.1.14.tgz#dd25abda5dcff4f2268c9a19e026004271491661"
dependencies:
graphql-language-service-types "^0.1.14"

graphql-language-service-server@^1.0.0-0:
version "1.3.2"
resolved "https://registry.yarnpkg.com/graphql-language-service-server/-/graphql-language-service-server-1.3.2.tgz#9423ede58a5b7bcaa3bbcb42f39a6c9626f6787d"
dependencies:
babylon "^6.17.4"
fb-watchman "^2.0.0"
glob "^7.1.2"
graphql-config "2.0.1"
graphql-language-service-interface "^1.3.2"
graphql-language-service-types "^1.2.2"
graphql-language-service-utils "^1.2.2"
nullthrows "^1.0.0"
vscode-jsonrpc "^3.3.0"
vscode-languageserver "^3.3.0"

graphql-language-service-types@^0.1.0-0, graphql-language-service-types@^0.1.14:
version "0.1.14"
resolved "https://registry.yarnpkg.com/graphql-language-service-types/-/graphql-language-service-types-0.1.14.tgz#e6112785fc23ea8222f59a7f00e61b359f263c88"

graphql-language-service-utils@^1.0.0-0, graphql-language-service-utils@^1.2.2:
graphql-language-service-utils@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/graphql-language-service-utils/-/graphql-language-service-utils-1.2.2.tgz#d31d4b4288085bd31d1bb8efc35790d69e496cae"
dependencies:
Expand Down