Merge pull request #226 from mgadda/mgadda/fix-unhandled-errors

Correctly load .graphqlconfigs which do not define projects

Author: mgadda

packages/server/src/MessageProcessor.js

@@ -25,6 +25,7 @@ import {
   findGraphQLConfigFile,
   getGraphQLConfig,
   GraphQLProjectConfig,
+  GraphQLConfig,
 } from 'graphql-config';
 import {GraphQLLanguageService} from 'graphql-language-service-interface';
 import {Position, Range} from 'graphql-language-service-utils';
@@ -107,12 +108,9 @@ export class MessageProcessor {
     }
 
     this._graphQLCache = await getGraphQLCache(rootPath);
+    const config = getGraphQLConfig(rootPath);
     if (this._watchmanClient) {
-      this._subcribeWatchman(
-        rootPath,
-        this._graphQLCache,
-        this._watchmanClient,
-      );
+      this._subcribeWatchman(config, this._watchmanClient);
     }
     this._languageService = new GraphQLLanguageService(this._graphQLCache);
 
@@ -135,8 +133,7 @@ export class MessageProcessor {
   // Use watchman to subscribe to project file changes only if watchman is
   // installed. Otherwise, rely on LSP watched files did change events.
   async _subcribeWatchman(
-    rootPath: string,
-    graphqlCache: GraphQLCache,
+    config: GraphQLConfig,
     watchmanClient: GraphQLWatchman,
   ) {
     if (!watchmanClient) {
@@ -147,9 +144,11 @@ export class MessageProcessor {
       await watchmanClient.checkVersion();
 
       // Otherwise, subcribe watchman according to project config(s).
-      const config = getGraphQLConfig(rootPath);
-      let projectConfigs: GraphQLProjectConfig[] =
-        Object.values(config.getProjects() || {}) || [];
+      const projectMap = config.getProjects();
+      let projectConfigs: GraphQLProjectConfig[] = projectMap
+        ? Object.values(projectMap)
+        : [];
+
       // There can either be a single config or one or more project
       // configs, but not both.
       if (projectConfigs.length === 0) {
@@ -162,7 +161,7 @@ export class MessageProcessor {
         watchmanClient.subscribe(
           projectConfig.configDir,
           this._graphQLCache.handleWatchmanSubscribeEvent(
-            rootPath,
+            config.configDir,
             projectConfig,
           ),
         );

packages/server/src/__tests__/MessageProcessor-test.js

@@ -14,12 +14,15 @@ import {beforeEach, describe, it} from 'mocha';
 
 import {MessageProcessor} from '../MessageProcessor';
 import MockWatchmanClient from '../__mocks__/MockWatchmanClient';
+import {GraphQLConfig} from 'graphql-config';
+import {GraphQLCache} from '../GraphQLCache';
 
 describe('MessageProcessor', () => {
   const mockWatchmanClient = new MockWatchmanClient();
   const messageProcessor = new MessageProcessor(undefined, mockWatchmanClient);
 
   const queryDir = `${__dirname}/__queries__`;
+  const schemaPath = `${__dirname}/__schema__/StarWarsSchema.graphql`;
   const textDocumentTestString = `
   {
     hero(episode: NEWHOPE){
@@ -46,6 +49,7 @@ describe('MessageProcessor', () => {
         };
       },
       updateFragmentDefinition() {},
+      handleWatchmanSubscribeEvent() {},
     };
     messageProcessor._languageService = {
       getAutocompleteSuggestions: (query, position, uri) => {
@@ -167,4 +171,32 @@ describe('MessageProcessor', () => {
     const result = await messageProcessor.handleDefinitionRequest(test);
     expect(result[0].uri).to.equal(`file://${queryDir}/testFragment.graphql`);
   });
+
+  it('loads configs without projects when watchman is present', async () => {
+    const config = new GraphQLConfig(
+      {
+        schemaPath,
+        includes: `${queryDir}/*.graphql`,
+      },
+      'not/a/real/config',
+    );
+
+    await messageProcessor._subcribeWatchman(config, mockWatchmanClient);
+  });
+
+  it('loads configs with projects when watchman is present', async () => {
+    const config = new GraphQLConfig(
+      {
+        projects: {
+          foo: {
+            schemaPath,
+            includes: `${queryDir}/*.graphql`,
+          },
+        },
+      },
+      'not/a/real/config',
+    );
+
+    await messageProcessor._subcribeWatchman(config, mockWatchmanClient);
+  });
 });