clean up service stats

Author: JakeDawkins

packages/apollo-language-server/src/languageProvider.ts

@@ -93,13 +93,17 @@ function symbolForFieldDefinition(
 export class GraphQLLanguageProvider {
   constructor(public workspace: GraphQLWorkspace) {}
 
-  async provideStatus() {
+  async provideStats(uri?: DocumentUri) {
     if (
       this.workspace &&
       this.workspace.projects &&
       this.workspace.projects.length
-    )
-      return this.workspace.projects[0].getProjectStats();
+    ) {
+      if (uri) {
+        const project = this.workspace.projectForFile(uri);
+        return project ? project.getProjectStats() : { loaded: false };
+      }
+    }
 
     return {
       loaded: false

packages/apollo-language-server/src/project/client.ts

@@ -125,6 +125,7 @@ export class GraphQLClientProject extends GraphQLProject {
       : 0;
 
     return {
+      type: "client",
       serviceId: this.serviceID,
       // filter out primitives and internal Types for type stats to match engine
       types: {

packages/apollo-language-server/src/project/service.ts

@@ -45,24 +45,6 @@ export class GraphQLServiceProject extends GraphQLProject {
   validate() {}
 
   getProjectStats() {
-    // use this to remove primitives and internal fields for stats
-    const filterTypes = (type: string) =>
-      !/__.*|Boolean|ID|Int|String|Float/.test(type);
-
-    const serviceTypes = this.schema
-      ? Object.keys(this.schema.getTypeMap()).filter(filterTypes).length
-      : 0;
-
-    return {
-      loaded: true,
-      serviceId: this.displayName(),
-      types: {
-        service: serviceTypes,
-        client: 0,
-        total: serviceTypes
-      },
-      tag: this.config.tag,
-      lastFetch: this.lastLoadDate
-    };
+    return { loaded: true, type: "service" };
   }
 }

packages/apollo-language-server/src/server.ts

@@ -212,9 +212,9 @@ connection.onNotification(
   (selection: QuickPickItem) => workspace.updateSchemaTag(selection)
 );
 
-connection.onNotification("apollographql/getStatus", async () => {
-  const status = await languageProvider.provideStatus();
-  connection.sendNotification("apollographql/statusLoaded", status);
+connection.onNotification("apollographql/getStats", async ({ uri }) => {
+  const status = await languageProvider.provideStats(uri);
+  connection.sendNotification("apollographql/statsLoaded", status);
 });
 
 // Listen on the connection

packages/vscode-apollo/src/extension.ts

@@ -84,11 +84,15 @@ export function activate(context: ExtensionContext) {
   context.subscriptions.push(client.start());
 
   client.onReady().then(() => {
-    commands.registerCommand("apollographql/showStatus", () => {
-      client.sendNotification("apollographql/getStatus");
+    commands.registerCommand("apollographql/showStats", () => {
+      client.sendNotification("apollographql/getStats", {
+        uri: window.activeTextEditor
+          ? window.activeTextEditor.document.uri.toString()
+          : null
+      });
     });
 
-    client.onNotification("apollographql/statusLoaded", params => {
+    client.onNotification("apollographql/statsLoaded", params => {
       const timeSince = (date: number) => {
         const seconds = Math.floor((+new Date() - date) / 1000);
         let interval = Math.floor(seconds / 86400);
@@ -103,6 +107,12 @@ export function activate(context: ExtensionContext) {
         return `${Math.floor(seconds)}s`;
       };
 
+      // we don't support logging of stats for service projects currently
+      if (params.type === "service") {
+        client.outputChannel.show();
+        return;
+      }
+
       if (!params.loaded) {
         client.outputChannel.appendLine(
           "Service not loaded. See above errors if any are printed"

packages/vscode-apollo/src/statusBar.ts

@@ -16,7 +16,7 @@ export default class ApolloStatusBar {
     this.statusBarItem.text = "Apollo GraphQL $(rss)";
     this.statusBarItem.show();
 
-    this.statusBarItem.command = "apollographql/showStatus";
+    this.statusBarItem.command = "apollographql/showStats";
     // context.subscriptions.push(this.statusBarItem);
   }