From e9828813e12b8ce6d6f6023b8dcb8594990ce976 Mon Sep 17 00:00:00 2001 From: Shadaj Laddad Date: Fri, 27 Jul 2018 13:51:57 -0700 Subject: [PATCH 1/6] Support code-completing default values for variables --- .../getAutocompleteSuggestions-test.js | 12 ++++++++ .../src/getAutocompleteSuggestions.js | 13 ++++++++ packages/parser/src/Rules.js | 30 ++++++++++++++++--- 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/packages/interface/src/__tests__/getAutocompleteSuggestions-test.js b/packages/interface/src/__tests__/getAutocompleteSuggestions-test.js index b148da30..21fa854e 100644 --- a/packages/interface/src/__tests__/getAutocompleteSuggestions-test.js +++ b/packages/interface/src/__tests__/getAutocompleteSuggestions-test.js @@ -284,4 +284,16 @@ query name { expect( testSuggestions('type Type { field(arg: String @', new Position(0, 31)), ).to.deep.equal([{label: 'onAllDefs'}, {label: 'onArg'}])); + + it('provides correct suggestions for default variables', () => { + const result = testSuggestions( + 'query foo($episode: Episode = ) {', + new Position(0, 30), + ); + expect(result).to.deep.equal([ + {label: 'EMPIRE', detail: 'Episode'}, + {label: 'JEDI', detail: 'Episode'}, + {label: 'NEWHOPE', detail: 'Episode'}, + ]); + }); }); diff --git a/packages/interface/src/getAutocompleteSuggestions.js b/packages/interface/src/getAutocompleteSuggestions.js index 5efd0bd2..627dcc32 100644 --- a/packages/interface/src/getAutocompleteSuggestions.js +++ b/packages/interface/src/getAutocompleteSuggestions.js @@ -158,6 +158,19 @@ export function getAutocompleteSuggestions( return getSuggestionsForDirective(token, state, schema); } + if ( + state.kind === 'DefaultValue' && + state.prevState && + state.prevState.type + ) { + return getSuggestionsForInputValues( + token, + (({ + inputType: schema.getType(state.prevState.type), + }: any): TypeInfo), + ); + } + return []; } diff --git a/packages/parser/src/Rules.js b/packages/parser/src/Rules.js index cb33f089..2a257301 100644 --- a/packages/parser/src/Rules.js +++ b/packages/parser/src/Rules.js @@ -300,15 +300,37 @@ function name(style: string): Rule { }; } -// A Name Token which will decorate the previous state with a `type`. +// A Name Token which will decorate the first non-type parent state with a `type`. function type(style: string) { return { style, match: (token: Token) => token.kind === 'Name', update(state: State, token: Token) { - if (state.prevState && state.prevState.prevState) { - state.name = token.value; - state.prevState.prevState.type = token.value; + let currentState = state; + let currentTypeString = token.value; + currentState.name = currentTypeString; + + while ( + currentState && + (currentState.kind === 'NamedType' || + currentState.kind === 'Type' || + currentState.kind === 'ListType' || + currentState.kind === 'NonNullType') + ) { + if (currentState.kind === 'ListType') { + currentTypeString = `[${currentTypeString}]`; + } + + currentState = currentState.prevState; + } + + if (currentState) { + currentState.type = currentTypeString; + + // needed for fragment completion + if (currentState.kind === 'TypeCondition' && currentState.prevState) { + currentState.prevState.type = currentTypeString; + } } }, }; From 40daad8a5f19f3615ddb3c9d9e0b7fb04ffcdb2c Mon Sep 17 00:00:00 2001 From: Martijn Walraven Date: Sun, 4 Nov 2018 07:00:58 -0800 Subject: [PATCH 2/6] Revert code for default variable autocompletion and mark test as pending The test didn't pass after rebasing on top of the lastest upstream, and I'd like us to take the time to see if we can find a cleaner solution. --- .../getAutocompleteSuggestions-test.js | 2 +- .../src/getAutocompleteSuggestions.js | 14 ++------- packages/parser/src/Rules.js | 30 +++---------------- 3 files changed, 8 insertions(+), 38 deletions(-) diff --git a/packages/interface/src/__tests__/getAutocompleteSuggestions-test.js b/packages/interface/src/__tests__/getAutocompleteSuggestions-test.js index 21fa854e..0fb9623b 100644 --- a/packages/interface/src/__tests__/getAutocompleteSuggestions-test.js +++ b/packages/interface/src/__tests__/getAutocompleteSuggestions-test.js @@ -285,7 +285,7 @@ query name { testSuggestions('type Type { field(arg: String @', new Position(0, 31)), ).to.deep.equal([{label: 'onAllDefs'}, {label: 'onArg'}])); - it('provides correct suggestions for default variables', () => { + it.skip('provides correct suggestions for default variables', () => { const result = testSuggestions( 'query foo($episode: Episode = ) {', new Position(0, 30), diff --git a/packages/interface/src/getAutocompleteSuggestions.js b/packages/interface/src/getAutocompleteSuggestions.js index 627dcc32..2673a586 100644 --- a/packages/interface/src/getAutocompleteSuggestions.js +++ b/packages/interface/src/getAutocompleteSuggestions.js @@ -158,17 +158,9 @@ export function getAutocompleteSuggestions( return getSuggestionsForDirective(token, state, schema); } - if ( - state.kind === 'DefaultValue' && - state.prevState && - state.prevState.type - ) { - return getSuggestionsForInputValues( - token, - (({ - inputType: schema.getType(state.prevState.type), - }: any): TypeInfo), - ); + // Default variable values + if (kind === 'DefaultValue') { + return getSuggestionsForInputValues(token, typeInfo); } return []; diff --git a/packages/parser/src/Rules.js b/packages/parser/src/Rules.js index 2a257301..cb33f089 100644 --- a/packages/parser/src/Rules.js +++ b/packages/parser/src/Rules.js @@ -300,37 +300,15 @@ function name(style: string): Rule { }; } -// A Name Token which will decorate the first non-type parent state with a `type`. +// A Name Token which will decorate the previous state with a `type`. function type(style: string) { return { style, match: (token: Token) => token.kind === 'Name', update(state: State, token: Token) { - let currentState = state; - let currentTypeString = token.value; - currentState.name = currentTypeString; - - while ( - currentState && - (currentState.kind === 'NamedType' || - currentState.kind === 'Type' || - currentState.kind === 'ListType' || - currentState.kind === 'NonNullType') - ) { - if (currentState.kind === 'ListType') { - currentTypeString = `[${currentTypeString}]`; - } - - currentState = currentState.prevState; - } - - if (currentState) { - currentState.type = currentTypeString; - - // needed for fragment completion - if (currentState.kind === 'TypeCondition' && currentState.prevState) { - currentState.prevState.type = currentTypeString; - } + if (state.prevState && state.prevState.prevState) { + state.name = token.value; + state.prevState.prevState.type = token.value; } }, }; From d5fe81d1864cce1b20507f9d9dce0d0698bc42c5 Mon Sep 17 00:00:00 2001 From: Martijn Walraven Date: Sun, 4 Nov 2018 07:07:15 -0800 Subject: [PATCH 3/6] Remove `graphql-config` dependency --- packages/interface/package.json | 1 - packages/parser/package.json | 1 - packages/types/package.json | 7 ++----- packages/utils/package.json | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/interface/package.json b/packages/interface/package.json index 340f5bb6..c983481a 100644 --- a/packages/interface/package.json +++ b/packages/interface/package.json @@ -29,7 +29,6 @@ "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0" }, "dependencies": { - "graphql-config": "2.0.1", "graphql-language-service-parser": "^1.2.2", "graphql-language-service-types": "^1.2.2", "graphql-language-service-utils": "^2.0.0" diff --git a/packages/parser/package.json b/packages/parser/package.json index 846dba6e..dae7c270 100644 --- a/packages/parser/package.json +++ b/packages/parser/package.json @@ -29,7 +29,6 @@ "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0" }, "dependencies": { - "graphql-config": "2.0.1", "graphql-language-service-types": "^1.2.2" } } diff --git a/packages/types/package.json b/packages/types/package.json index 24d8d9e5..a4fca76d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -26,9 +26,6 @@ "prepublish": "node ../../resources/prepublish.js" }, "peerDependencies": { - "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0" - }, - "dependencies": { - "graphql-config": "2.0.1" + "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0" } -} +} \ No newline at end of file diff --git a/packages/utils/package.json b/packages/utils/package.json index 71e14d7b..cf751afb 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -29,7 +29,6 @@ "graphql": "^0.12.0 || ^0.13.0" }, "dependencies": { - "graphql-config": "2.0.1", "graphql-language-service-types": "^1.2.2" } } From 22a5b056daef977b5121b999ae87f36206c2f321 Mon Sep 17 00:00:00 2001 From: Martijn Walraven Date: Sun, 4 Nov 2018 07:20:09 -0800 Subject: [PATCH 4/6] Add @apollographql scope to packages --- package.json | 10 ++++---- packages/graphql-language-server/package.json | 2 +- .../graphql-language-service/package.json | 10 ++++---- packages/graphql-language-service/src/cli.js | 2 +- .../graphql-language-service/src/client.js | 4 ++-- packages/interface/package.json | 10 ++++---- .../interface/src/GraphQLLanguageService.js | 6 ++--- .../getAutocompleteSuggestions-test.js | 4 ++-- .../src/__tests__/getHoverInformation-test.js | 2 +- packages/interface/src/autocompleteUtils.js | 2 +- .../src/getAutocompleteSuggestions.js | 6 ++--- packages/interface/src/getDefinition.js | 4 ++-- packages/interface/src/getDiagnostics.js | 6 ++--- packages/interface/src/getHoverInformation.js | 4 ++-- packages/interface/src/getOutline.js | 4 ++-- packages/parser/package.json | 6 ++--- packages/parser/src/CharacterStream.js | 2 +- packages/parser/src/RuleHelpers.js | 2 +- packages/parser/src/Rules.js | 2 +- packages/parser/src/onlineParser.js | 2 +- packages/server/package.json | 10 ++++---- packages/server/src/GraphQLCache.js | 2 +- packages/server/src/GraphQLWatchman.js | 2 +- packages/server/src/MessageProcessor.js | 8 +++---- .../src/__mocks__/MockWatchmanClient.js | 2 +- .../src/__tests__/MessageProcessor-test.js | 2 +- packages/server/src/findGraphQLTags.js | 2 +- packages/types/package.json | 4 ++-- packages/utils/package.json | 6 ++--- packages/utils/src/Range.js | 2 +- packages/utils/src/validateWithCustomRules.js | 2 +- versions.json | 23 ------------------- 32 files changed, 66 insertions(+), 89 deletions(-) delete mode 100644 versions.json diff --git a/package.json b/package.json index 680a9e19..4966a31b 100644 --- a/package.json +++ b/package.json @@ -53,11 +53,11 @@ "fetch-mock": "^6.0.0", "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", + "@apollographql/graphql-language-service-interface": "^1.0.0-0", + "@apollographql/graphql-language-service-parser": "^0.1.0-0", + "@apollographql/graphql-language-service-server": "^1.0.0-0", + "@apollographql/graphql-language-service-types": "^0.1.0-0", + "@apollographql/graphql-language-service-utils": "^1.0.0-0", "lerna": "^2.0.0", "mocha": "4.1.0", "prettier": "1.13" diff --git a/packages/graphql-language-server/package.json b/packages/graphql-language-server/package.json index e8850378..8c2639a6 100644 --- a/packages/graphql-language-server/package.json +++ b/packages/graphql-language-server/package.json @@ -1,5 +1,5 @@ { - "name": "graphql-language-server", + "name": "@apollographql/graphql-language-server", "version": "1.2.2", "description": "An interface for building GraphQL language services for IDEs", "scripts": { diff --git a/packages/graphql-language-service/package.json b/packages/graphql-language-service/package.json index 8fb73cf3..ae97015c 100644 --- a/packages/graphql-language-service/package.json +++ b/packages/graphql-language-service/package.json @@ -1,6 +1,6 @@ { - "name": "graphql-language-service", - "repository": "https://github.com/graphql/graphql-language-service", + "name": "@apollographql/graphql-language-service", + "repository": "https://github.com/apollographql/graphql-language-service", "version": "2.0.0", "description": "An interface for building GraphQL language services for IDEs", "contributors": [ @@ -34,9 +34,9 @@ "dependencies": { "babel-polyfill": "6.16.0", "graphql-config": "2.0.1", - "graphql-language-service-interface": "^2.0.0", - "graphql-language-service-server": "^2.0.0", - "graphql-language-service-utils": "^2.0.0", + "@apollographql/graphql-language-service-interface": "^2.0.0", + "@apollographql/graphql-language-service-server": "^2.0.0", + "@apollographql/graphql-language-service-utils": "^2.0.0", "yargs": "^3.32.0 || ^7.0.0" } } diff --git a/packages/graphql-language-service/src/cli.js b/packages/graphql-language-service/src/cli.js index 2771dc6b..586a9e70 100644 --- a/packages/graphql-language-service/src/cli.js +++ b/packages/graphql-language-service/src/cli.js @@ -10,7 +10,7 @@ import yargs from 'yargs'; import client from './client'; -import {Logger, startServer} from 'graphql-language-service-server'; +import {Logger, startServer} from '@apollographql/graphql-language-service-server'; import watchman from 'fb-watchman'; const {argv} = yargs diff --git a/packages/graphql-language-service/src/client.js b/packages/graphql-language-service/src/client.js index 31fee197..524c9233 100644 --- a/packages/graphql-language-service/src/client.js +++ b/packages/graphql-language-service/src/client.js @@ -17,8 +17,8 @@ import { getAutocompleteSuggestions, getDiagnostics, getOutline, -} from 'graphql-language-service-interface'; -import {Position} from 'graphql-language-service-utils'; +} from '@apollographql/graphql-language-service-interface'; +import {Position} from '@apollographql/graphql-language-service-utils'; import path from 'path'; const GRAPHQL_SUCCESS_CODE = 0; diff --git a/packages/interface/package.json b/packages/interface/package.json index c983481a..b62c427d 100644 --- a/packages/interface/package.json +++ b/packages/interface/package.json @@ -1,6 +1,6 @@ { - "name": "graphql-language-service-interface", - "repository": "https://github.com/graphql/graphql-language-service", + "name": "@apollographql/graphql-language-service-interface", + "repository": "https://github.com/apollographql/graphql-language-service", "version": "2.0.0", "description": "Interface to the GraphQL Language Service", "contributors": [ @@ -29,8 +29,8 @@ "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0" }, "dependencies": { - "graphql-language-service-parser": "^1.2.2", - "graphql-language-service-types": "^1.2.2", - "graphql-language-service-utils": "^2.0.0" + "@apollographql/graphql-language-service-parser": "^2.0.0", + "@apollographql/graphql-language-service-types": "^2.0.0", + "@apollographql/graphql-language-service-utils": "^2.0.0" } } diff --git a/packages/interface/src/GraphQLLanguageService.js b/packages/interface/src/GraphQLLanguageService.js index d3118d07..3bc83167 100644 --- a/packages/interface/src/GraphQLLanguageService.js +++ b/packages/interface/src/GraphQLLanguageService.js @@ -24,8 +24,8 @@ import type { GraphQLConfig, GraphQLProjectConfig, Uri, -} from 'graphql-language-service-types'; -import type {Position} from 'graphql-language-service-utils'; +} from '@apollographql/graphql-language-service-types'; +import type {Position} from '@apollographql/graphql-language-service-utils'; import type {Hover} from 'vscode-languageserver-types'; import {Kind, parse, print} from 'graphql'; @@ -37,7 +37,7 @@ import { getDefinitionQueryResultForDefinitionNode, getDefinitionQueryResultForNamedType, } from './getDefinition'; -import {getASTNodeAtPosition} from 'graphql-language-service-utils'; +import {getASTNodeAtPosition} from '@apollographql/graphql-language-service-utils'; const { FRAGMENT_DEFINITION, diff --git a/packages/interface/src/__tests__/getAutocompleteSuggestions-test.js b/packages/interface/src/__tests__/getAutocompleteSuggestions-test.js index 0fb9623b..7668534f 100644 --- a/packages/interface/src/__tests__/getAutocompleteSuggestions-test.js +++ b/packages/interface/src/__tests__/getAutocompleteSuggestions-test.js @@ -8,13 +8,13 @@ * @flow */ -import type {CompletionItem} from 'graphql-language-service-types'; +import type {CompletionItem} from '@apollographql/graphql-language-service-types'; import {expect} from 'chai'; import {beforeEach, describe, it} from 'mocha'; import fs from 'fs'; import {buildSchema} from 'graphql'; -import {Position} from 'graphql-language-service-utils'; +import {Position} from '@apollographql/graphql-language-service-utils'; import path from 'path'; import {getAutocompleteSuggestions} from '../getAutocompleteSuggestions'; diff --git a/packages/interface/src/__tests__/getHoverInformation-test.js b/packages/interface/src/__tests__/getHoverInformation-test.js index ce664ece..feeaba27 100644 --- a/packages/interface/src/__tests__/getHoverInformation-test.js +++ b/packages/interface/src/__tests__/getHoverInformation-test.js @@ -14,7 +14,7 @@ import {expect} from 'chai'; import {beforeEach, describe, it} from 'mocha'; import fs from 'fs'; import {buildSchema} from 'graphql'; -import {Position} from 'graphql-language-service-utils'; +import {Position} from '@apollographql/graphql-language-service-utils'; import path from 'path'; import {getHoverInformation} from '../getHoverInformation'; diff --git a/packages/interface/src/autocompleteUtils.js b/packages/interface/src/autocompleteUtils.js index 0adc27de..8dd0a515 100644 --- a/packages/interface/src/autocompleteUtils.js +++ b/packages/interface/src/autocompleteUtils.js @@ -20,7 +20,7 @@ import type { ContextToken, State, TypeInfo, -} from 'graphql-language-service-types'; +} from '@apollographql/graphql-language-service-types'; // Utility for returning the state representing the Definition this token state // is within, if any. diff --git a/packages/interface/src/getAutocompleteSuggestions.js b/packages/interface/src/getAutocompleteSuggestions.js index 2673a586..72a66aab 100644 --- a/packages/interface/src/getAutocompleteSuggestions.js +++ b/packages/interface/src/getAutocompleteSuggestions.js @@ -18,8 +18,8 @@ import type { ContextToken, State, TypeInfo, -} from 'graphql-language-service-types'; -import type {Position} from 'graphql-language-service-utils'; +} from '@apollographql/graphql-language-service-types'; +import type {Position} from '@apollographql/graphql-language-service-utils'; import { GraphQLBoolean, @@ -37,7 +37,7 @@ import { isCompositeType, isInputType, } from 'graphql'; -import {CharacterStream, onlineParser} from 'graphql-language-service-parser'; +import {CharacterStream, onlineParser} from '@apollographql/graphql-language-service-parser'; import { forEachState, getDefinitionState, diff --git a/packages/interface/src/getDefinition.js b/packages/interface/src/getDefinition.js index aff0af3e..e0feda42 100644 --- a/packages/interface/src/getDefinition.js +++ b/packages/interface/src/getDefinition.js @@ -24,8 +24,8 @@ import type { Range, Uri, ObjectTypeInfo, -} from 'graphql-language-service-types'; -import {locToRange, offsetToPosition} from 'graphql-language-service-utils'; +} from '@apollographql/graphql-language-service-types'; +import {locToRange, offsetToPosition} from '@apollographql/graphql-language-service-utils'; import invariant from 'assert'; export const LANGUAGE = 'GraphQL'; diff --git a/packages/interface/src/getDiagnostics.js b/packages/interface/src/getDiagnostics.js index b052221f..35fd8826 100644 --- a/packages/interface/src/getDiagnostics.js +++ b/packages/interface/src/getDiagnostics.js @@ -19,16 +19,16 @@ import type { import type { Diagnostic, CustomValidationRule, -} from 'graphql-language-service-types'; +} from '@apollographql/graphql-language-service-types'; import invariant from 'assert'; import {findDeprecatedUsages, parse} from 'graphql'; -import {CharacterStream, onlineParser} from 'graphql-language-service-parser'; +import {CharacterStream, onlineParser} from '@apollographql/graphql-language-service-parser'; import { Position, Range, validateWithCustomRules, -} from 'graphql-language-service-utils'; +} from '@apollographql/graphql-language-service-utils'; export const SEVERITY = { ERROR: 1, diff --git a/packages/interface/src/getHoverInformation.js b/packages/interface/src/getHoverInformation.js index b21bbb77..0248870f 100644 --- a/packages/interface/src/getHoverInformation.js +++ b/packages/interface/src/getHoverInformation.js @@ -14,9 +14,9 @@ */ import type {GraphQLSchema} from 'graphql'; -import type {ContextToken} from 'graphql-language-service-types'; +import type {ContextToken} from '@apollographql/graphql-language-service-types'; import type {Hover} from 'vscode-languageserver-types'; -import type {Position} from 'graphql-language-service-utils'; +import type {Position} from '@apollographql/graphql-language-service-utils'; import {getTokenAtPosition, getTypeInfo} from './getAutocompleteSuggestions'; import {GraphQLNonNull, GraphQLList} from 'graphql'; diff --git a/packages/interface/src/getOutline.js b/packages/interface/src/getOutline.js index 48320499..abca5c84 100644 --- a/packages/interface/src/getOutline.js +++ b/packages/interface/src/getOutline.js @@ -12,10 +12,10 @@ import type { Outline, TextToken, TokenKind, -} from 'graphql-language-service-types'; +} from '@apollographql/graphql-language-service-types'; import {Kind, parse, visit} from 'graphql'; -import {offsetToPosition} from 'graphql-language-service-utils'; +import {offsetToPosition} from '@apollographql/graphql-language-service-utils'; const {INLINE_FRAGMENT} = Kind; diff --git a/packages/parser/package.json b/packages/parser/package.json index dae7c270..30e9e297 100644 --- a/packages/parser/package.json +++ b/packages/parser/package.json @@ -1,6 +1,6 @@ { - "name": "graphql-language-service-parser", - "repository": "https://github.com/graphql/graphql-language-service", + "name": "@apollographql/graphql-language-service-parser", + "repository": "https://github.com/apollographql/graphql-language-service", "version": "1.2.2", "description": "An online parser for GraphQL for use in syntax-highlighters and code intelligence tools", "contributors": [ @@ -29,6 +29,6 @@ "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0" }, "dependencies": { - "graphql-language-service-types": "^1.2.2" + "@apollographql/graphql-language-service-types": "^2.0.0" } } diff --git a/packages/parser/src/CharacterStream.js b/packages/parser/src/CharacterStream.js index 730d4aa0..291870d7 100644 --- a/packages/parser/src/CharacterStream.js +++ b/packages/parser/src/CharacterStream.js @@ -22,7 +22,7 @@ import type { TokenPattern, CharacterStream as CharacterStreamInterface, -} from 'graphql-language-service-types'; +} from '@apollographql/graphql-language-service-types'; export default class CharacterStream implements CharacterStreamInterface { _start: number; diff --git a/packages/parser/src/RuleHelpers.js b/packages/parser/src/RuleHelpers.js index 18b5de59..77a2f73a 100644 --- a/packages/parser/src/RuleHelpers.js +++ b/packages/parser/src/RuleHelpers.js @@ -10,7 +10,7 @@ // These functions help build matching rules for ParseRules. -import type {Rule, Token} from 'graphql-language-service-types'; +import type {Rule, Token} from '@apollographql/graphql-language-service-types'; // An optional rule. export function opt(ofRule: Rule | string): Rule { diff --git a/packages/parser/src/Rules.js b/packages/parser/src/Rules.js index cb33f089..41ce1703 100644 --- a/packages/parser/src/Rules.js +++ b/packages/parser/src/Rules.js @@ -14,7 +14,7 @@ import type { Token, Rule, ParseRule, -} from 'graphql-language-service-types'; +} from '@apollographql/graphql-language-service-types'; import {opt, list, butNot, t, p} from './RuleHelpers'; /** diff --git a/packages/parser/src/onlineParser.js b/packages/parser/src/onlineParser.js index c88805f2..b58c5e29 100644 --- a/packages/parser/src/onlineParser.js +++ b/packages/parser/src/onlineParser.js @@ -36,7 +36,7 @@ import type { CharacterStream, State, Token, -} from 'graphql-language-service-types'; +} from '@apollographql/graphql-language-service-types'; import {LexRules, ParseRules, isIgnored} from './Rules'; diff --git a/packages/server/package.json b/packages/server/package.json index fb36ebf6..d6eb605b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { - "name": "graphql-language-service-server", - "repository": "https://github.com/graphql/graphql-language-service", + "name": "@apollographql/graphql-language-service-server", + "repository": "https://github.com/apollographql/graphql-language-service", "version": "2.0.0", "description": "Server process backing the GraphQL Language Service", "contributors": [ @@ -33,9 +33,9 @@ "fb-watchman": "^2.0.0", "glob": "^7.1.2", "graphql-config": "2.0.1", - "graphql-language-service-interface": "^2.0.0", - "graphql-language-service-types": "^1.2.2", - "graphql-language-service-utils": "^2.0.0", + "@apollographql/graphql-language-service-interface": "^2.0.0", + "@apollographql/graphql-language-service-types": "^2.0.0", + "@apollographql/graphql-language-service-utils": "^2.0.0", "nullthrows": "^1.0.0", "vscode-jsonrpc": "^3.3.0", "vscode-languageserver": "^3.3.0" diff --git a/packages/server/src/GraphQLCache.js b/packages/server/src/GraphQLCache.js index 80c7a4bf..c07a1355 100644 --- a/packages/server/src/GraphQLCache.js +++ b/packages/server/src/GraphQLCache.js @@ -19,7 +19,7 @@ import type { ObjectTypeInfo, Uri, GraphQLProjectConfig, -} from 'graphql-language-service-types'; +} from '@apollographql/graphql-language-service-types'; import fs from 'fs'; import path from 'path'; diff --git a/packages/server/src/GraphQLWatchman.js b/packages/server/src/GraphQLWatchman.js index c81d564b..bceae6be 100644 --- a/packages/server/src/GraphQLWatchman.js +++ b/packages/server/src/GraphQLWatchman.js @@ -8,7 +8,7 @@ * @flow */ -import type {Uri} from 'graphql-language-service-types'; +import type {Uri} from '@apollographql/graphql-language-service-types'; import watchman from 'fb-watchman'; diff --git a/packages/server/src/MessageProcessor.js b/packages/server/src/MessageProcessor.js index 7ad6aa7b..6f81fcb9 100644 --- a/packages/server/src/MessageProcessor.js +++ b/packages/server/src/MessageProcessor.js @@ -15,8 +15,8 @@ import type { GraphQLCache, Range as RangeType, Uri, -} from 'graphql-language-service-types'; -import {FileChangeTypeKind} from 'graphql-language-service-types'; +} from '@apollographql/graphql-language-service-types'; +import {FileChangeTypeKind} from '@apollographql/graphql-language-service-types'; import {extname, dirname} from 'path'; import {readFileSync} from 'fs'; @@ -27,8 +27,8 @@ import { GraphQLProjectConfig, GraphQLConfig, } from 'graphql-config'; -import {GraphQLLanguageService} from 'graphql-language-service-interface'; -import {Position, Range} from 'graphql-language-service-utils'; +import {GraphQLLanguageService} from '@apollographql/graphql-language-service-interface'; +import {Position, Range} from '@apollographql/graphql-language-service-utils'; import { CancellationToken, NotificationMessage, diff --git a/packages/server/src/__mocks__/MockWatchmanClient.js b/packages/server/src/__mocks__/MockWatchmanClient.js index 529b8326..2722758a 100644 --- a/packages/server/src/__mocks__/MockWatchmanClient.js +++ b/packages/server/src/__mocks__/MockWatchmanClient.js @@ -8,7 +8,7 @@ * @flow */ -import type {Uri} from 'graphql-language-service-types'; +import type {Uri} from '@apollographql/graphql-language-service-types'; import type {WatchmanCommandResponse} from '../GraphQLWatchman'; class MockWatchmanClient { diff --git a/packages/server/src/__tests__/MessageProcessor-test.js b/packages/server/src/__tests__/MessageProcessor-test.js index 07f4bd00..79994d3a 100644 --- a/packages/server/src/__tests__/MessageProcessor-test.js +++ b/packages/server/src/__tests__/MessageProcessor-test.js @@ -9,7 +9,7 @@ */ import {expect} from 'chai'; -import {Position, Range} from 'graphql-language-service-utils'; +import {Position, Range} from '@apollographql/graphql-language-service-utils'; import {beforeEach, describe, it} from 'mocha'; import {MessageProcessor} from '../MessageProcessor'; diff --git a/packages/server/src/findGraphQLTags.js b/packages/server/src/findGraphQLTags.js index f1a06a5e..79a0f372 100644 --- a/packages/server/src/findGraphQLTags.js +++ b/packages/server/src/findGraphQLTags.js @@ -8,7 +8,7 @@ * @flow */ -import {Position, Range} from 'graphql-language-service-utils'; +import {Position, Range} from '@apollographql/graphql-language-service-utils'; import {parse} from 'babylon'; diff --git a/packages/types/package.json b/packages/types/package.json index a4fca76d..efde346d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { - "name": "graphql-language-service-types", - "repository": "https://github.com/graphql/graphql-language-service", + "name": "@apollographql/graphql-language-service-types", + "repository": "https://github.com/apollographql/graphql-language-service", "version": "1.2.2", "description": "Types for building GraphQL language services for IDEs", "contributors": [ diff --git a/packages/utils/package.json b/packages/utils/package.json index cf751afb..99f06dae 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { - "name": "graphql-language-service-utils", - "repository": "https://github.com/graphql/graphql-language-service", + "name": "@apollographql/graphql-language-service-utils", + "repository": "https://github.com/apollographql/graphql-language-service", "version": "2.0.0", "description": "Utilities to support the GraphQL Language Service", "contributors": [ @@ -29,6 +29,6 @@ "graphql": "^0.12.0 || ^0.13.0" }, "dependencies": { - "graphql-language-service-types": "^1.2.2" + "@apollographql/graphql-language-service-types": "^2.0.0" } } diff --git a/packages/utils/src/Range.js b/packages/utils/src/Range.js index 2d0d02a8..224e9300 100644 --- a/packages/utils/src/Range.js +++ b/packages/utils/src/Range.js @@ -12,7 +12,7 @@ import type {Location} from 'graphql/language'; import type { Range as RangeInterface, Position as PositionInterface, -} from 'graphql-language-service-types'; +} from '@apollographql/graphql-language-service-types'; export class Range implements RangeInterface { start: PositionInterface; diff --git a/packages/utils/src/validateWithCustomRules.js b/packages/utils/src/validateWithCustomRules.js index 63aacea0..0ad2f1f8 100644 --- a/packages/utils/src/validateWithCustomRules.js +++ b/packages/utils/src/validateWithCustomRules.js @@ -11,7 +11,7 @@ import type {DocumentNode} from 'graphql/language'; import type {GraphQLError} from 'graphql/error'; import type {GraphQLSchema} from 'graphql/type'; -import type {CustomValidationRule} from 'graphql-language-service-types'; +import type {CustomValidationRule} from '@apollographql/graphql-language-service-types'; import {specifiedRules, TypeInfo, validate} from 'graphql'; diff --git a/versions.json b/versions.json deleted file mode 100644 index ac5d4c3b..00000000 --- a/versions.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "graphql-language-service": { - "version": "0.0.42" - }, - "graphql-language-server": { - "version": "0.0.4" - }, - "graphql-language-service-interface": { - "version": "0.0.23" - }, - "graphql-language-service-parser": { - "version": "0.0.17" - }, - "graphql-language-service-server": { - "version": "0.0.37" - }, - "graphql-language-service-types": { - "version": "0.0.23" - }, - "graphql-language-service-utils": { - "version": "0.0.21" - } -} From 96d4a8f236260091949134c9914ebdbbbcbcd309 Mon Sep 17 00:00:00 2001 From: Martijn Walraven Date: Sun, 4 Nov 2018 08:12:40 -0800 Subject: [PATCH 5/6] Add `graphql` v14 to peer dependencies --- packages/graphql-language-service/package.json | 2 +- packages/interface/package.json | 2 +- packages/parser/package.json | 2 +- packages/server/package.json | 2 +- packages/utils/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/graphql-language-service/package.json b/packages/graphql-language-service/package.json index ae97015c..828ce012 100644 --- a/packages/graphql-language-service/package.json +++ b/packages/graphql-language-service/package.json @@ -29,7 +29,7 @@ "prepublish": "node ../../resources/prepublish.js" }, "peerDependencies": { - "graphql": "^0.6.0 || ^0.7.0 || ^0.8.0-b || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0" + "graphql": "^0.6.0 || ^0.7.0 || ^0.8.0-b || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0" }, "dependencies": { "babel-polyfill": "6.16.0", diff --git a/packages/interface/package.json b/packages/interface/package.json index b62c427d..7eb7e4bc 100644 --- a/packages/interface/package.json +++ b/packages/interface/package.json @@ -26,7 +26,7 @@ "prepublish": "node ../../resources/prepublish.js" }, "peerDependencies": { - "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0" + "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0" }, "dependencies": { "@apollographql/graphql-language-service-parser": "^2.0.0", diff --git a/packages/parser/package.json b/packages/parser/package.json index 30e9e297..aa66a960 100644 --- a/packages/parser/package.json +++ b/packages/parser/package.json @@ -26,7 +26,7 @@ "prepublish": "node ../../resources/prepublish.js" }, "peerDependencies": { - "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0" + "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0" }, "dependencies": { "@apollographql/graphql-language-service-types": "^2.0.0" diff --git a/packages/server/package.json b/packages/server/package.json index d6eb605b..95c99fe2 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -26,7 +26,7 @@ "prepublish": "node ../../resources/prepublish.js" }, "peerDependencies": { - "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0" + "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0" }, "dependencies": { "babylon": "^6.17.4", diff --git a/packages/utils/package.json b/packages/utils/package.json index 99f06dae..8eeb1042 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -26,7 +26,7 @@ "prepublish": "node ../../resources/prepublish.js" }, "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0" }, "dependencies": { "@apollographql/graphql-language-service-types": "^2.0.0" From ae8ed6164c3033819b54a8cb9a6eceddafa17e2e Mon Sep 17 00:00:00 2001 From: Martijn Walraven Date: Sun, 4 Nov 2018 08:19:35 -0800 Subject: [PATCH 6/6] v2.0.2 --- lerna.json | 2 +- packages/interface/package.json | 4 ++-- packages/parser/package.json | 2 +- packages/types/package.json | 4 ++-- packages/utils/package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lerna.json b/lerna.json index e6dba404..3afb4330 100644 --- a/lerna.json +++ b/lerna.json @@ -5,5 +5,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "2.0.0" + "version": "2.0.2" } diff --git a/packages/interface/package.json b/packages/interface/package.json index 7eb7e4bc..b5461750 100644 --- a/packages/interface/package.json +++ b/packages/interface/package.json @@ -1,7 +1,7 @@ { "name": "@apollographql/graphql-language-service-interface", "repository": "https://github.com/apollographql/graphql-language-service", - "version": "2.0.0", + "version": "2.0.2", "description": "Interface to the GraphQL Language Service", "contributors": [ "Greg Hurrell (https://greg.hurrell.net/)", @@ -31,6 +31,6 @@ "dependencies": { "@apollographql/graphql-language-service-parser": "^2.0.0", "@apollographql/graphql-language-service-types": "^2.0.0", - "@apollographql/graphql-language-service-utils": "^2.0.0" + "@apollographql/graphql-language-service-utils": "^2.0.2" } } diff --git a/packages/parser/package.json b/packages/parser/package.json index aa66a960..8b4401e5 100644 --- a/packages/parser/package.json +++ b/packages/parser/package.json @@ -1,7 +1,7 @@ { "name": "@apollographql/graphql-language-service-parser", "repository": "https://github.com/apollographql/graphql-language-service", - "version": "1.2.2", + "version": "2.0.2", "description": "An online parser for GraphQL for use in syntax-highlighters and code intelligence tools", "contributors": [ "Greg Hurrell (https://greg.hurrell.net/)", diff --git a/packages/types/package.json b/packages/types/package.json index efde346d..57e894ae 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,7 +1,7 @@ { "name": "@apollographql/graphql-language-service-types", "repository": "https://github.com/apollographql/graphql-language-service", - "version": "1.2.2", + "version": "2.0.2", "description": "Types for building GraphQL language services for IDEs", "contributors": [ "Greg Hurrell (https://greg.hurrell.net/)", @@ -28,4 +28,4 @@ "peerDependencies": { "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0" } -} \ No newline at end of file +} diff --git a/packages/utils/package.json b/packages/utils/package.json index 8eeb1042..98cf7705 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,7 +1,7 @@ { "name": "@apollographql/graphql-language-service-utils", "repository": "https://github.com/apollographql/graphql-language-service", - "version": "2.0.0", + "version": "2.0.2", "description": "Utilities to support the GraphQL Language Service", "contributors": [ "Greg Hurrell (https://greg.hurrell.net/)",