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

Fix edge case for empty operations #959

Merged
merged 2 commits into from
Feb 2, 2019
Merged

Fix edge case for empty operations #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af1ecce
Filter out 'undefined' definitions before checking the length.
trevor-scheer Feb 1, 2019
b46b3d1
Update changelog
trevor-scheer Feb 2, 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Upcoming

- `apollo-language-server`
- Fix edge case for empty operations [#959](https://github.com/apollographql/apollo-tooling/pull/959)

## `[email protected]`

- `apollo` 2.4.1
Expand Down
6 changes: 5 additions & 1 deletion packages/apollo-language-server/src/project/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,13 +350,17 @@ export class GraphQLClientProject extends GraphQLProject {
const filtered = Object.create(null);
for (const operationName in current) {
const document = current[operationName];

let serviceOnly: DocumentNode = removeDirectiveAnnotatedFields(
removeDirectives(document, clientOnlyDirectives as string[]),
clientSchemaDirectives as string[]
);

if (addTypename)
serviceOnly = withTypenameFieldAddedWhereNeeded(serviceOnly);
if (serviceOnly.definitions.length) {
// In the case we've made a document empty by filtering client directives,
// we don't want to include that in the result we pass on.
if (serviceOnly.definitions.filter(Boolean).length) {
filtered[operationName] = serviceOnly;
}
}
Expand Down