vscode-apollo 1.20.0 → 2.0.1

package/src/language-server/utilities/__tests__/graphql.test.ts

@@ -32,8 +32,7 @@ describe("withTypenameFieldAddedWhereNeeded", () => {
             value
           }
         }
-      }
-      "
+      }"
     `);
   });
 
@@ -71,8 +70,7 @@ describe("withTypenameFieldAddedWhereNeeded", () => {
             }
           }
         }
-      }
-      "
+      }"
     `);
   });
 });
@@ -83,14 +81,13 @@ describe("removeDirectiveAnnotatedFields", () => {
       print(
         removeDirectiveAnnotatedFields(
           parse(`query Query { fieldToKeep fieldToRemove @client }`),
-          ["client"]
-        )
-      )
+          ["client"],
+        ),
+      ),
     ).toMatchInlineSnapshot(`
             "query Query {
               fieldToKeep
-            }
-            "
+            }"
         `);
   });
 
@@ -106,14 +103,13 @@ describe("removeDirectiveAnnotatedFields", () => {
               }
             }
           `),
-          ["client"]
-        )
-      )
+          ["client"],
+        ),
+      ),
     ).toMatchInlineSnapshot(`
       "query Query {
         fieldToKeep
-      }
-      "
+      }"
     `);
   });
 
@@ -130,16 +126,15 @@ describe("removeDirectiveAnnotatedFields", () => {
               hello
             }
           `),
-          ["client"]
-        )
-      )
+          ["client"],
+        ),
+      ),
     ).toMatchInlineSnapshot(`
         "{
           me {
             name
           }
-        }
-        "
+        }"
     `);
   });
 
@@ -155,16 +150,15 @@ describe("removeDirectiveAnnotatedFields", () => {
               }
             }
           `),
-          ["client"]
-        )
-      )
+          ["client"],
+        ),
+      ),
     ).toMatchInlineSnapshot(`
             "{
               me {
                 name
               }
-            }
-            "
+            }"
         `);
   });
 
@@ -181,16 +175,15 @@ describe("removeDirectiveAnnotatedFields", () => {
               ... ClientObject
             }
           `),
-          ["client"]
-        )
-      )
+          ["client"],
+        ),
+      ),
     ).toMatchInlineSnapshot(`
       "{
         me {
           name
         }
-      }
-      "
+      }"
     `);
   });
 
@@ -232,9 +225,9 @@ describe("removeDirectiveAnnotatedFields", () => {
               }
             }
           `),
-          ["client"]
-        )
-      )
+          ["client"],
+        ),
+      ),
     ).toMatchInlineSnapshot(`
       "fragment LaunchTile on Launch {
         __typename
@@ -258,8 +251,7 @@ describe("removeDirectiveAnnotatedFields", () => {
           }
           ...LaunchTile
         }
-      }
-      "
+      }"
     `);
   });
 
@@ -287,9 +279,9 @@ describe("removeDirectiveAnnotatedFields", () => {
               }
             }
           `),
-          ["client"]
-        )
-      )
+          ["client"],
+        ),
+      ),
     ).toMatchInlineSnapshot(`
       "fragment One on Node {
         ...Two
@@ -308,8 +300,7 @@ describe("removeDirectiveAnnotatedFields", () => {
         me {
           ...One
         }
-      }
-      "
+      }"
     `);
   });
 
@@ -333,16 +324,15 @@ describe("removeDirectiveAnnotatedFields", () => {
               }
             }
           `),
-          ["client"]
-        )
-      )
+          ["client"],
+        ),
+      ),
     ).toMatchInlineSnapshot(`
       "{
         me {
           name
         }
-      }
-      "
+      }"
     `);
   });
 
@@ -366,14 +356,13 @@ describe("removeDirectiveAnnotatedFields", () => {
               }
             }
           `),
-          ["client"]
-        )
-      )
+          ["client"],
+        ),
+      ),
     ).toMatchInlineSnapshot(`
       "{
         name
-      }
-      "
+      }"
     `);
   });
 
@@ -392,9 +381,9 @@ describe("removeDirectiveAnnotatedFields", () => {
               }
             }
           `),
-          ["client"]
-        )
-      )
+          ["client"],
+        ),
+      ),
     ).toMatchInlineSnapshot(`
       "fragment One on Node {
         id
@@ -404,8 +393,7 @@ describe("removeDirectiveAnnotatedFields", () => {
         me {
           name
         }
-      }
-      "
+      }"
     `);
   });
 });

package/src/language-server/utilities/debouncer.ts

@@ -2,7 +2,7 @@ import debounce from "lodash.debounce";
 
 export function debounceHandler(
   handler: (...args: any[]) => any,
-  leading: boolean = true
+  leading: boolean = true,
 ) {
   return debounce(handler, 250, { leading });
 }

package/src/language-server/utilities/debug.ts

@@ -1,4 +1,5 @@
-import { Connection } from "src/messages";
+import { LanguageServerNotifications as Notifications } from "../../messages";
+import { Connection } from "vscode-languageserver/node";
 
 /**
  * for errors (and other logs in debug mode) we want to print
@@ -32,17 +33,17 @@ export class Debug {
   public static SetConnection(conn: Connection) {
     Debug.connection = conn;
     Debug.infoLogger = (message) =>
-      Debug.connection!.sendNotification("serverDebugMessage", {
+      Debug.connection!.sendNotification(Notifications.ServerDebugMessage, {
         type: "info",
         message: message,
       });
     Debug.warningLogger = (message) =>
-      Debug.connection!.sendNotification("serverDebugMessage", {
+      Debug.connection!.sendNotification(Notifications.ServerDebugMessage, {
         type: "warning",
         message: message,
       });
     Debug.errorLogger = (message) =>
-      Debug.connection!.sendNotification("serverDebugMessage", {
+      Debug.connection!.sendNotification(Notifications.ServerDebugMessage, {
         type: "error",
         message: message,
       });
@@ -81,7 +82,7 @@ export class Debug {
 
   public static sendErrorTelemetry(message: string) {
     Debug.connection &&
-      Debug.connection.sendNotification("serverDebugMessage", {
+      Debug.connection.sendNotification(Notifications.ServerDebugMessage, {
         type: "errorTelemetry",
         message: message,
       });

package/src/language-server/utilities/graphql.ts

@@ -19,6 +19,7 @@ import {
   isUnionType,
   FragmentDefinitionNode,
   InlineFragmentNode,
+  DocumentNode,
 } from "graphql";
 
 import { ExecutionContext } from "graphql/execution/execute";
@@ -36,7 +37,7 @@ export function isNamedNode(node: ASTNode): node is NamedNode {
 }
 
 export function isDirectiveDefinitionNode(
-  node: ASTNode
+  node: ASTNode,
 ): node is DirectiveDefinitionNode {
   return node.kind === Kind.DIRECTIVE_DEFINITION;
 }
@@ -58,7 +59,7 @@ export function highlightNodeForNode(node: ASTNode): ASTNode {
 export function getFieldDef(
   schema: GraphQLSchema,
   parentType: GraphQLCompositeType,
-  fieldAST: FieldNode
+  fieldAST: FieldNode,
 ): GraphQLField<any, any> | undefined {
   const name = fieldAST.name.value;
   if (
@@ -93,7 +94,7 @@ export function getFieldDef(
  */
 export function removeDirectives<AST extends ASTNode>(
   ast: AST,
-  directiveNames: string[]
+  directiveNames: string[],
 ): AST {
   if (!directiveNames.length) return ast;
   return visit(ast, {
@@ -117,7 +118,7 @@ export function removeDirectives<AST extends ASTNode>(
  */
 function removeOrphanedFragmentDefinitions<AST extends ASTNode>(
   ast: AST,
-  fragmentNamesEligibleForRemoval: Set<string>
+  fragmentNamesEligibleForRemoval: Set<string>,
 ): AST {
   /**
    * Flag to keep track of removing any fragments
@@ -172,7 +173,7 @@ function removeOrphanedFragmentDefinitions<AST extends ASTNode>(
       */
     return removeOrphanedFragmentDefinitions(
       ast,
-      fragmentNamesEligibleForRemoval
+      fragmentNamesEligibleForRemoval,
     );
   }
 
@@ -208,7 +209,7 @@ function removeNodesWithEmptySelectionSets<AST extends ASTNode>(ast: AST): AST {
  */
 export function removeDirectiveAnnotatedFields<AST extends ASTNode>(
   ast: AST,
-  directiveNames: string[]
+  directiveNames: string[],
 ): AST {
   print;
   if (!directiveNames.length) return ast;
@@ -236,7 +237,7 @@ export function removeDirectiveAnnotatedFields<AST extends ASTNode>(
         "directives" in node &&
         node.directives &&
         node.directives.find((directive) =>
-          directiveNames.includes(directive.name.value)
+          directiveNames.includes(directive.name.value),
         )
       ) {
         /*
@@ -307,18 +308,18 @@ const typenameField = {
   name: { kind: Kind.NAME, value: "__typename" },
 };
 
-export function withTypenameFieldAddedWhereNeeded(ast: ASTNode) {
+export function withTypenameFieldAddedWhereNeeded(ast: DocumentNode) {
   return visit(ast, {
-    enter: {
-      SelectionSet(node: SelectionSetNode) {
+    SelectionSet: {
+      enter(node: SelectionSetNode) {
         return {
           ...node,
           selections: node.selections.filter(
             (selection) =>
               !(
-                selection.kind === "Field" &&
+                selection.kind === Kind.FIELD &&
                 selection.name.value === "__typename"
-              )
+              ),
           ),
         };
       },
@@ -357,7 +358,7 @@ export function simpleCollectFields(
   context: ExecutionContext,
   selectionSet: SelectionSetNode,
   fields: Record<string, FieldNode[]>,
-  visitedFragmentNames: Record<string, boolean>
+  visitedFragmentNames: Record<string, boolean>,
 ): Record<string, FieldNode[]> {
   for (const selection of selectionSet.selections) {
     switch (selection.kind) {
@@ -374,7 +375,7 @@ export function simpleCollectFields(
           context,
           selection.selectionSet,
           fields,
-          visitedFragmentNames
+          visitedFragmentNames,
         );
         break;
       }
@@ -388,7 +389,7 @@ export function simpleCollectFields(
           context,
           fragment.selectionSet,
           fields,
-          visitedFragmentNames
+          visitedFragmentNames,
         );
         break;
       }
@@ -397,7 +398,7 @@ export function simpleCollectFields(
   return fields;
 }
 export function hasClientDirective(
-  node: FieldNode | InlineFragmentNode | FragmentDefinitionNode
+  node: FieldNode | InlineFragmentNode | FragmentDefinitionNode,
 ) {
   return (
     node.directives &&

package/src/language-server/utilities/source.ts

@@ -7,12 +7,12 @@ import {
   TypeInfo,
   GraphQLSchema,
   getVisitFn,
-  Visitor,
+  ASTVisitor,
   ASTKindToNode,
 } from "graphql";
 import { SourceLocation, getLocation } from "graphql/language/location";
 
-import { Position, Range } from "vscode-languageserver";
+import { Position, Range } from "vscode-languageserver/node";
 
 import { isNode } from "./graphql";
 
@@ -22,7 +22,7 @@ type applyArg = [
   string | number | undefined,
   any,
   readonly (string | number)[],
-  readonly any[]
+  readonly any[],
 ];
 
 /**
@@ -31,8 +31,8 @@ type applyArg = [
  */
 export function visitWithTypeInfo(
   typeInfo: TypeInfo,
-  visitor: Visitor<ASTKindToNode>
-): Visitor<ASTKindToNode> {
+  visitor: ASTVisitor,
+): ASTVisitor {
   return {
     enter(node: ASTNode) {
       typeInfo.enter(node);
@@ -67,23 +67,23 @@ export function visitWithTypeInfo(
 
 export function positionFromPositionInContainingDocument(
   source: Source,
-  position: Position
+  position: Position,
 ) {
   if (!source.locationOffset) return position;
   return Position.create(
     position.line - (source.locationOffset.line - 1),
-    position.character
+    position.character,
   );
 }
 
 export function positionInContainingDocument(
   source: Source,
-  position: Position
+  position: Position,
 ): Position {
   if (!source.locationOffset) return position;
   return Position.create(
     source.locationOffset.line - 1 + position.line,
-    position.character
+    position.character,
   );
 }
 
@@ -91,7 +91,7 @@ export function rangeInContainingDocument(source: Source, range: Range): Range {
   if (!source.locationOffset) return range;
   return Range.create(
     positionInContainingDocument(source, range.start),
-    positionInContainingDocument(source, range.end)
+    positionInContainingDocument(source, range.end),
   );
 }
 
@@ -101,13 +101,13 @@ export function rangeForASTNode(node: ASTNode): Range {
 
   return Range.create(
     positionFromSourceLocation(source, getLocation(source, location.start)),
-    positionFromSourceLocation(source, getLocation(source, location.end))
+    positionFromSourceLocation(source, getLocation(source, location.end)),
   );
 }
 
 export function positionFromSourceLocation(
   source: Source,
-  location: SourceLocation
+  location: SourceLocation,
 ) {
   return Position.create(
     (source.locationOffset ? source.locationOffset.line - 1 : 0) +
@@ -117,7 +117,7 @@ export function positionFromSourceLocation(
       ? source.locationOffset.column - 1
       : 0) +
       location.column -
-      1
+      1,
   );
 }
 
@@ -132,7 +132,7 @@ export function positionToOffset(source: Source, position: Position): number {
     position.character +
     linesUntilPosition
       .map(
-        (line) => line.length + lineEndingLength // count EOL
+        (line) => line.length + lineEndingLength, // count EOL
       )
       .reduce((a, b) => a + b, 0)
   );
@@ -142,7 +142,7 @@ export function getASTNodeAndTypeInfoAtPosition(
   source: Source,
   position: Position,
   root: ASTNode,
-  schema: GraphQLSchema
+  schema: GraphQLSchema,
 ): [ASTNode, TypeInfo] | null {
   const offset = positionToOffset(source, position);
 
@@ -171,7 +171,7 @@ export function getASTNodeAndTypeInfoAtPosition(
         }
         return;
       },
-    })
+    }),
   );
 
   if (nodeContainingPosition) {

package/src/language-server/utilities/uri.ts

@@ -1,4 +1,4 @@
-import URI from "vscode-uri";
+import { URI } from "vscode-uri";
 
 const withUnixSeparator = (uriString: string) =>
   uriString.split(/[\/\\]/).join("/");
@@ -10,7 +10,7 @@ export const normalizeURI = (uriString: string) => {
   } else if (uriString.match(/^[a-zA-Z]:[\/\\].*/)) {
     // uri with a drive prefix but not file:///
     parsed = URI.file(
-      URI.parse("file:///" + withUnixSeparator(uriString)).fsPath
+      URI.parse("file:///" + withUnixSeparator(uriString)).fsPath,
     );
   } else {
     parsed = URI.parse(withUnixSeparator(uriString));