more ts conversion

graphql · Sep 17, 2019 · 427f27c · 427f27c
1 parent 415a957
commit 427f27c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "pretty": "node resources/pretty.js",
     "pretty-check": "node resources/pretty.js --check",
     "version:release": "lerna version",
-    "version:prerelease": "lerna versiton --conventional-prerelease",
+    "version:prerelease": "lerna version --conventional-prerelease",
     "version:graduate": "lerna version --conventional-graduate"
   },
   "devDependencies": {

diff --git a/packages/graphql-language-service-interface/src/GraphQLLanguageService.ts b/packages/graphql-language-service-interface/src/GraphQLLanguageService.ts
@@ -77,9 +77,9 @@ export class GraphQLLanguageService {
     // Perform syntax diagnostics first, as this doesn't require
     // schema/fragment definitions, even the project configuration.
     let queryHasExtensions = false;
-    const projectConfig = this._graphQLConfig.getConfigForFile(
+    const projectConfig: GraphQLProjectConfig = this._graphQLConfig.getConfigForFile(
       uri,
-    ) as GraphQLProjectConfig;
+    );
     const schemaPath = projectConfig.schemaPath;
     try {
       const queryAST = parse(query);

diff --git a/packages/graphql-language-service-interface/src/__tests__/getDefinition-test.ts b/packages/graphql-language-service-interface/src/__tests__/getDefinition-test.ts
@@ -8,7 +8,10 @@
  */
 
 import { parse } from 'graphql';
-import { getDefinitionQueryResultForFragmentSpread, getDefinitionQueryResultForNamedType } from '../getDefinition';
+import {
+  getDefinitionQueryResultForFragmentSpread,
+  getDefinitionQueryResultForNamedType,
+} from '../getDefinition';
 
 describe('getDefinition', () => {
   describe('getDefinitionQueryResultForNamedType', () => {
@@ -40,10 +43,6 @@ describe('getDefinition', () => {
           },
         ],
       );
-<<<<<<< HEAD:packages/graphql-language-service-interface/src/__tests__/getDefinition-test.js
-=======
-
->>>>>>> chore: Convert LSP tests to jest from mocha (#871):packages/graphql-language-service-interface/src/__tests__/getDefinition-test.ts
       expect(result.definitions.length).toEqual(1);
       expect(result.definitions[0].position.line).toEqual(1);
       expect(result.definitions[0].position.character).toEqual(32);
@@ -59,9 +58,9 @@ describe('getDefinition', () => {
       fragment Duck on Duck {
         cuack
       }`;
-      const fragmentSpread = parse(query).definitions[0].selectionSet.selections[0];
+      const fragmentSpread = parse(query).definitions[0].selectionSet
+        .selections[0];
       const fragmentDefinition = parse(fragment).definitions[0];
-<<<<<<< HEAD:packages/graphql-language-service-interface/src/__tests__/getDefinition-test.js
       const result = await getDefinitionQueryResultForFragmentSpread(
         query,
         fragmentSpread,
@@ -73,16 +72,6 @@ describe('getDefinition', () => {
           },
         ],
       );
-=======
-      const result = await getDefinitionQueryResultForFragmentSpread(query, fragmentSpread, [
-        {
-          file: 'someFile',
-          content: fragment,
-          definition: fragmentDefinition,
-        },
-      ]);
-
->>>>>>> chore: Convert LSP tests to jest from mocha (#871):packages/graphql-language-service-interface/src/__tests__/getDefinition-test.ts
       expect(result.definitions.length).toEqual(1);
       expect(result.definitions[0].position.line).toEqual(1);
       expect(result.definitions[0].position.character).toEqual(6);