vscode-apollo 1.20.0 → 2.0.1

package/src/language-server/index.ts

@@ -7,7 +7,6 @@ export { LoadingHandler } from "./loadingHandler";
 // projects
 export { GraphQLProject } from "./project/base";
 export { isClientProject, GraphQLClientProject } from "./project/client";
-export { isServiceProject, GraphQLServiceProject } from "./project/service";
 
 // GraphQLSchemaProvider
 export {

package/src/language-server/languageProvider.ts

@@ -16,15 +16,12 @@ import {
   CodeActionKind,
   MarkupKind,
   CompletionItemKind,
-} from "vscode-languageserver";
+} from "vscode-languageserver/node";
 
 // should eventually be moved into this package, since we're overriding a lot of the existing behavior here
-import { getAutocompleteSuggestions } from "graphql-language-service-interface";
-import { Position as GraphQlPosition } from "graphql-language-service-utils";
-import {
-  getTokenAtPosition,
-  getTypeInfo,
-} from "graphql-language-service-interface/dist/getAutocompleteSuggestions";
+import { getAutocompleteSuggestions } from "graphql-language-service";
+import { Position as GraphQlPosition } from "graphql-language-service";
+import { getTokenAtPosition, getTypeInfo } from "graphql-language-service";
 import type { GraphQLWorkspace } from "./workspace";
 import type { DocumentUri } from "./project/base";
 
@@ -65,7 +62,7 @@ import { GraphQLClientProject, isClientProject } from "./project/client";
 import { isNotNullOrUndefined } from "../tools";
 import type { CodeActionInfo } from "./errors/validation";
 import { GraphQLDiagnostic } from "./diagnostics";
-import type { ProjectStats } from "src/messages";
+import type { ProjectStats } from "../messages";
 import { isInterfaceType } from "graphql";
 
 const DirectiveLocations = Object.keys(DirectiveLocation);
@@ -93,7 +90,7 @@ function locationForASTNode(node: ASTNode): Location | null {
 }
 
 function symbolForFieldDefinition(
-  definition: FieldDefinitionNode
+  definition: FieldDefinitionNode,
 ): DocumentSymbol {
   return {
     name: definition.name.value,
@@ -118,7 +115,7 @@ export class GraphQLLanguageProvider {
   async provideCompletionItems(
     uri: DocumentUri,
     position: Position,
-    _token: CancellationToken
+    _token: CancellationToken,
   ): Promise<CompletionItem[]> {
     const project = this.workspace.projectForFile(uri);
     if (!(project && project instanceof GraphQLClientProject)) return [];
@@ -130,11 +127,11 @@ export class GraphQLLanguageProvider {
 
     const rawPositionInDocument = positionFromPositionInContainingDocument(
       document.source,
-      position
+      position,
     );
     const positionInDocument = new GraphQlPosition(
       rawPositionInDocument.line,
-      rawPositionInDocument.character
+      rawPositionInDocument.character,
     );
 
     const token = getTokenAtPosition(document.source.body, positionInDocument);
@@ -152,7 +149,7 @@ export class GraphQLLanguageProvider {
     const suggestions = getAutocompleteSuggestions(
       project.schema,
       document.source.body,
-      positionInDocument
+      positionInDocument,
     );
 
     if (
@@ -185,7 +182,7 @@ export class GraphQLLanguageProvider {
           return suggest;
         } else {
           const requiredArgs = suggestedField.args.filter((a) =>
-            isNonNullType(a.type)
+            isNonNullType(a.type),
           );
           const paramsSection =
             requiredArgs.length > 0
@@ -239,7 +236,7 @@ export class GraphQLLanguageProvider {
 
         const content = [
           [`\`\`\`graphql`, `@${suggest.label}${argsString}`, `\`\`\``].join(
-            "\n"
+            "\n",
           ),
         ];
 
@@ -273,7 +270,7 @@ export class GraphQLLanguageProvider {
   async provideHover(
     uri: DocumentUri,
     position: Position,
-    _token: CancellationToken
+    _token: CancellationToken,
   ): Promise<Hover | null> {
     const project = this.workspace.projectForFile(uri);
     if (!(project && project instanceof GraphQLClientProject)) return null;
@@ -285,14 +282,14 @@ export class GraphQLLanguageProvider {
 
     const positionInDocument = positionFromPositionInContainingDocument(
       document.source,
-      position
+      position,
     );
 
     const nodeAndTypeInfo = getASTNodeAndTypeInfoAtPosition(
       document.source,
       positionInDocument,
       document.ast,
-      project.schema
+      project.schema,
     );
 
     if (nodeAndTypeInfo) {
@@ -332,7 +329,7 @@ export class GraphQLLanguageProvider {
             const isResolvedLocally =
               node.directives &&
               node.directives.some(
-                (directive) => directive.name.value === "client"
+                (directive) => directive.name.value === "client",
               );
 
             const content = [
@@ -370,7 +367,7 @@ export class GraphQLLanguageProvider {
 
         case Kind.NAMED_TYPE: {
           const type = project.schema.getType(
-            node.name.value
+            node.name.value,
           ) as GraphQLNamedType | void;
           if (!type) break;
 
@@ -436,7 +433,7 @@ export class GraphQLLanguageProvider {
   async provideDefinition(
     uri: DocumentUri,
     position: Position,
-    _token: CancellationToken
+    _token: CancellationToken,
   ): Promise<Definition | null> {
     const project = this.workspace.projectForFile(uri);
     if (!(project && project instanceof GraphQLClientProject)) return null;
@@ -448,14 +445,14 @@ export class GraphQLLanguageProvider {
 
     const positionInDocument = positionFromPositionInContainingDocument(
       document.source,
-      position
+      position,
     );
 
     const nodeAndTypeInfo = getASTNodeAndTypeInfoAtPosition(
       document.source,
       positionInDocument,
       document.ast,
-      project.schema
+      project.schema,
     );
 
     if (nodeAndTypeInfo) {
@@ -500,7 +497,7 @@ export class GraphQLLanguageProvider {
     uri: DocumentUri,
     position: Position,
     _context: ReferenceContext,
-    _token: CancellationToken
+    _token: CancellationToken,
   ): Promise<Location[] | null> {
     const project = this.workspace.projectForFile(uri);
     if (!project) return null;
@@ -511,14 +508,14 @@ export class GraphQLLanguageProvider {
 
     const positionInDocument = positionFromPositionInContainingDocument(
       document.source,
-      position
+      position,
     );
 
     const nodeAndTypeInfo = getASTNodeAndTypeInfoAtPosition(
       document.source,
       positionInDocument,
       document.ast,
-      project.schema
+      project.schema,
     );
 
     if (nodeAndTypeInfo) {
@@ -579,7 +576,7 @@ export class GraphQLLanguageProvider {
 
   async provideDocumentSymbol(
     uri: DocumentUri,
-    _token: CancellationToken
+    _token: CancellationToken,
   ): Promise<DocumentSymbol[]> {
     const project = this.workspace.projectForFile(uri);
     if (!project) return [];
@@ -628,7 +625,7 @@ export class GraphQLLanguageProvider {
 
   async provideWorkspaceSymbol(
     query: string,
-    _token: CancellationToken
+    _token: CancellationToken,
   ): Promise<SymbolInformation[]> {
     const symbols: SymbolInformation[] = [];
     for (const project of this.workspace.projects) {
@@ -650,7 +647,7 @@ export class GraphQLLanguageProvider {
 
   async provideCodeLenses(
     uri: DocumentUri,
-    _token: CancellationToken
+    _token: CancellationToken,
   ): Promise<CodeLens[]> {
     const project = this.workspace.projectForFile(uri);
     if (!(project && project instanceof GraphQLClientProject)) return [];
@@ -736,7 +733,7 @@ export class GraphQLLanguageProvider {
   async provideCodeAction(
     uri: DocumentUri,
     range: Range,
-    _token: CancellationToken
+    _token: CancellationToken,
   ): Promise<CodeAction[]> {
     function isPositionLessThanOrEqual(a: Position, b: Position) {
       return a.line !== b.line ? a.line < b.line : a.character <= b.character;
@@ -782,12 +779,12 @@ export class GraphQLLanguageProvider {
       const { extensions } = error;
       if (!extensions || !extensions.codeAction) continue;
 
-      const { message, edits }: CodeActionInfo = extensions.codeAction;
+      const { message, edits }: CodeActionInfo = extensions.codeAction as any;
 
       const codeAction = CodeAction.create(
         message,
         { changes: { [uri]: edits } },
-        CodeActionKind.QuickFix
+        CodeActionKind.QuickFix,
       );
 
       result.push(codeAction);

package/src/language-server/loadingHandler.ts

@@ -1,4 +1,5 @@
-import { IConnection, NotificationType } from "vscode-languageserver";
+import { LanguageServerNotifications as Notifications } from "../messages";
+import { Connection, NotificationType } from "vscode-languageserver/node";
 
 // XXX I think we want to combine this into an interface
 // with the errors tooling as well
@@ -10,27 +11,18 @@ export interface LoadingHandler {
 }
 
 export class LanguageServerLoadingHandler implements LoadingHandler {
-  constructor(private connection: IConnection) {}
+  constructor(private connection: Connection) {}
   private latestLoadingToken = 0;
   async handle<T>(message: string, value: Promise<T>): Promise<T> {
     const token = this.latestLoadingToken;
     this.latestLoadingToken += 1;
-    this.connection.sendNotification(
-      new NotificationType<any, void>("apollographql/loading"),
-      { message, token }
-    );
+    this.connection.sendNotification(Notifications.Loading, { message, token });
     try {
       const ret = await value;
-      this.connection.sendNotification(
-        new NotificationType<any, void>("apollographql/loadingComplete"),
-        token
-      );
+      this.connection.sendNotification(Notifications.LoadingComplete, token);
       return ret;
     } catch (e) {
-      this.connection.sendNotification(
-        new NotificationType<any, void>("apollographql/loadingComplete"),
-        token
-      );
+      this.connection.sendNotification(Notifications.LoadingComplete, token);
       this.showError(`Error in "${message}": ${e}`);
       throw e;
     }
@@ -38,23 +30,14 @@ export class LanguageServerLoadingHandler implements LoadingHandler {
   handleSync<T>(message: string, value: () => T): T {
     const token = this.latestLoadingToken;
     this.latestLoadingToken += 1;
-    this.connection.sendNotification(
-      new NotificationType<any, void>("apollographql/loading"),
-      { message, token }
-    );
+    this.connection.sendNotification(Notifications.Loading, { message, token });
     try {
       const ret = value();
-      this.connection.sendNotification(
-        new NotificationType<any, void>("apollographql/loadingComplete"),
-        token
-      );
+      this.connection.sendNotification(Notifications.LoadingComplete, token);
       return ret;
     } catch (e) {
-      this.connection.sendNotification(
-        new NotificationType<any, void>("apollographql/loadingComplete"),
-        token
-      );
-      this.showError(`Error in "${message}": ${e}`);
+      Notifications.LoadingComplete,
+        this.showError(`Error in "${message}": ${e}`);
       throw e;
     }
   }

package/src/language-server/project/base.ts

@@ -1,6 +1,6 @@
 import path, { extname } from "path";
 import { lstatSync, readFileSync } from "fs";
-import URI from "vscode-uri";
+import { URI } from "vscode-uri";
 
 import {
   TypeSystemDefinitionNode,
@@ -17,7 +17,7 @@ import {
   NotificationHandler,
   PublishDiagnosticsParams,
   Position,
-} from "vscode-languageserver";
+} from "vscode-languageserver/node";
 
 import { GraphQLDocument, extractGraphQLDocuments } from "../document";
 
@@ -28,9 +28,8 @@ import {
   ClientConfig,
   isClientConfig,
   isLocalServiceConfig,
-  isServiceConfig,
   keyEnvVar,
-  ServiceConfig,
+  RoverConfig,
 } from "../config";
 import {
   schemaProviderFromConfig,
@@ -38,7 +37,7 @@ import {
   SchemaResolveConfig,
 } from "../providers/schema";
 import { ApolloEngineClient, ClientIdentity } from "../engine";
-import type { ProjectStats } from "src/messages";
+import type { ProjectStats } from "../../messages";
 
 export type DocumentUri = string;
 
@@ -60,8 +59,8 @@ const fileAssociations: { [extension: string]: string } = {
 };
 
 interface GraphQLProjectConfig {
-  clientIdentity?: ClientIdentity;
-  config: ClientConfig | ServiceConfig;
+  clientIdentity: ClientIdentity;
+  config: ClientConfig | RoverConfig;
   configFolderURI: URI;
   loadingHandler: LoadingHandler;
 }
@@ -98,12 +97,21 @@ export abstract class GraphQLProject implements GraphQLSchemaProvider {
     // if a config doesn't have a uri associated, we can assume the `rootURI` is the project's root.
     this.rootURI = config.configDirURI || configFolderURI;
 
-    const { includes, excludes } = config.isClient
+    const { includes = [], excludes = [] } = isClientConfig(config)
       ? config.client
-      : config.service;
+      : {
+          /** TODO */
+        };
     const fileSet = new FileSet({
       rootURI: this.rootURI,
-      includes: [...includes, ".env", "apollo.config.js", "apollo.config.cjs"],
+      includes: [
+        ...includes,
+        ".env",
+        "apollo.config.js",
+        "apollo.config.cjs",
+        "apollo.config.mjs",
+        "apollo.config.ts",
+      ],
       // We do not want to include the local schema file in our list of documents
       excludes: [...excludes, ...this.getRelativeLocalSchemaFilePaths()],
       configURI: config.configURI,
@@ -116,7 +124,7 @@ export abstract class GraphQLProject implements GraphQLSchemaProvider {
       this.engineClient = new ApolloEngineClient(
         engine.apiKey!,
         engine.endpoint,
-        clientIdentity
+        clientIdentity,
       );
     }
 
@@ -130,7 +138,7 @@ export abstract class GraphQLProject implements GraphQLSchemaProvider {
       .catch((error) => {
         console.error(error);
         this.loadingHandler.showError(
-          `Error initializing Apollo GraphQL project "${this.displayName}": ${error}`
+          `Error initializing Apollo GraphQL project "${this.displayName}": ${error}`,
         );
       });
   }
@@ -202,7 +210,7 @@ export abstract class GraphQLProject implements GraphQLSchemaProvider {
 
           this.fileDidChange(uri);
         }
-      })()
+      })(),
     );
   }
 
@@ -231,7 +239,7 @@ export abstract class GraphQLProject implements GraphQLSchemaProvider {
   documentDidChange(document: TextDocument) {
     const documents = extractGraphQLDocuments(
       document,
-      this.config.client && this.config.client.tagName
+      this.config.client && this.config.client.tagName,
     );
     if (documents) {
       this.documentsByFile.set(document.uri, documents);
@@ -258,7 +266,7 @@ export abstract class GraphQLProject implements GraphQLSchemaProvider {
               const conflictingFilePath =
                 filePathForOperationName[operationName];
               throw new Error(
-                `️️There are multiple definitions for the \`${definition.name.value}\` operation. Please fix all naming conflicts before continuing.\nConflicting definitions found at ${filePath} and ${conflictingFilePath}.`
+                `️️There are multiple definitions for the \`${definition.name.value}\` operation. Please fix all naming conflicts before continuing.\nConflicting definitions found at ${filePath} and ${conflictingFilePath}.`,
               );
             }
             filePathForOperationName[operationName] = filePath;
@@ -298,13 +306,12 @@ export abstract class GraphQLProject implements GraphQLSchemaProvider {
   }
 
   private getRelativeLocalSchemaFilePaths(): string[] {
-    const serviceConfig = isServiceConfig(this.config)
-      ? this.config.service
-      : isClientConfig(this.config) &&
-        typeof this.config.client.service === "object" &&
-        isLocalServiceConfig(this.config.client.service)
-      ? this.config.client.service
-      : undefined;
+    const serviceConfig =
+      isClientConfig(this.config) &&
+      typeof this.config.client.service === "object" &&
+      isLocalServiceConfig(this.config.client.service)
+        ? this.config.client.service
+        : undefined;
     const localSchemaFile = serviceConfig?.localSchemaFile;
     return (
       localSchemaFile === undefined
@@ -313,7 +320,7 @@ export abstract class GraphQLProject implements GraphQLSchemaProvider {
         ? localSchemaFile
         : [localSchemaFile]
     ).map((filePath) =>
-      path.relative(this.rootURI.fsPath, path.join(process.cwd(), filePath))
+      path.relative(this.rootURI.fsPath, path.join(process.cwd(), filePath)),
     );
   }
 
@@ -333,13 +340,13 @@ export abstract class GraphQLProject implements GraphQLSchemaProvider {
 
   documentAt(
     uri: DocumentUri,
-    position: Position
+    position: Position,
   ): GraphQLDocument | undefined {
     const queryDocuments = this.documentsByFile.get(uri);
     if (!queryDocuments) return undefined;
 
     return queryDocuments.find((document) =>
-      document.containsPosition(position)
+      document.containsPosition(position),
     );
   }