Merge pull request #228 from lostplan/glob-error-227

Check type of statCache entries

Author: mgadda

packages/server/src/GraphQLCache.js

@@ -243,6 +243,11 @@ export class GraphQLCache implements GraphQLCacheInterface {
     includes: string[],
   ): Promise<Array<GraphQLFileMetadata>> => {
     let pattern: string;
+
+    if (includes.length === 0) {
+      return Promise.resolve([]);
+    }
+
     // See https://github.com/graphql/graphql-language-service/issues/221
     // for details on why special handling is required here for the
     // includes.length === 1 case.
@@ -251,6 +256,7 @@ export class GraphQLCache implements GraphQLCacheInterface {
     } else {
       pattern = `{${includes.join(',')}}`;
     }
+
     return new Promise((resolve, reject) => {
       const globResult = new glob.Glob(
         pattern,
@@ -276,13 +282,17 @@ export class GraphQLCache implements GraphQLCacheInterface {
       );
       globResult.on('end', () => {
         resolve(
-          Object.keys(globResult.statCache).map(filePath => ({
-            filePath,
-            mtime: Math.trunc(
-              globResult.statCache[filePath].mtime.getTime() / 1000,
-            ),
-            size: globResult.statCache[filePath].size,
-          })),
+          Object.keys(globResult.statCache)
+            .filter(
+              filePath => typeof globResult.statCache[filePath] === 'object',
+            )
+            .map(filePath => ({
+              filePath,
+              mtime: Math.trunc(
+                globResult.statCache[filePath].mtime.getTime() / 1000,
+              ),
+              size: globResult.statCache[filePath].size,
+            })),
         );
       });
     });

packages/server/src/__tests__/.graphqlconfig

@@ -36,12 +36,19 @@
       "schemaPath": "__schema__/StarWarsSchema.graphql",
       "includes": [ "__queries__/*.graphql" ]
     },
-    "testSingularMultipleIncludes": {
+    "testMultipleIncludes": {
       "schemaPath": "__schema__/StarWarsSchema.graphql",
       "includes": [
         "__queries__/*.graphql",
         "__fragments__/*.graphql"
       ]
+    },
+    "testNoIncludes": {
+      "schemaPath": "__schema__/StarWarsSchema.graphql"
+    },
+    "testBadIncludes": {
+      "schemaPath": "__schema__/StarWarsSchema.graphql",
+      "includes": ["nope.nopeql"]
     }
   },
   "extensions": {

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

@@ -166,9 +166,21 @@ describe('GraphQLCache', () => {
     });
 
     it('it caches fragments found through multiple globs in `includes`', async () => {
-      const config = graphQLRC.getProjectConfig('testSingularMultipleIncludes');
+      const config = graphQLRC.getProjectConfig('testMultipleIncludes');
       const fragmentDefinitions = await cache.getFragmentDefinitions(config);
       expect(fragmentDefinitions.get('testFragment')).to.not.be.undefined;
     });
+
+    it('handles empty includes', async () => {
+      const config = graphQLRC.getProjectConfig('testNoIncludes');
+      const fragmentDefinitions = await cache.getFragmentDefinitions(config);
+      expect(fragmentDefinitions.get('testFragment')).to.be.undefined;
+    });
+
+    it('handles non-existent includes', async () => {
+      const config = graphQLRC.getProjectConfig('testBadIncludes');
+      const fragmentDefinitions = await cache.getFragmentDefinitions(config);
+      expect(fragmentDefinitions.get('testFragment')).to.be.undefined;
+    });
   });
 });

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

@@ -15,7 +15,6 @@ 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();