some review tweaks

Author: lostplan

packages/interface/src/GraphQLLanguageService.js

@@ -107,14 +107,6 @@ export class GraphQLLanguageService {
       ];
     }
 
-    const schema = await this._graphQLCache
-      .getSchema(projectConfig.projectName, queryHasExtensions)
-      .catch(() => null);
-
-    if (!schema) {
-      return [];
-    }
-
     // If there's a matching config, proceed to prepare to run validation
     let source = query;
     const fragmentDefinitions = await this._graphQLCache.getFragmentDefinitions(
@@ -155,6 +147,14 @@ export class GraphQLLanguageService {
       /* eslint-enable no-implicit-coercion */
     }
 
+    const schema = await this._graphQLCache
+      .getSchema(projectConfig.projectName, queryHasExtensions)
+      .catch(() => null);
+
+    if (!schema) {
+      return [];
+    }
+
     return validateQuery(validationAst, schema, customRules, isRelayCompatMode);
   }
 

packages/server/src/GraphQLCache.js

@@ -448,7 +448,9 @@ export class GraphQLCache implements GraphQLCacheInterface {
     let schema = null;
 
     if (endpointInfo) {
-      schemaCacheKey = `${endpointInfo.endpointName}:${projectName}`;
+      const {endpoint, endpointName} = endpointInfo;
+
+      schemaCacheKey = `${endpointName}:${projectName}`;
 
       // Maybe use cache
       if (this._schemaMap.has(schemaCacheKey)) {
@@ -460,7 +462,7 @@ export class GraphQLCache implements GraphQLCacheInterface {
 
       // Read schema from network
       try {
-        schema = await endpointInfo.endpoint.resolveSchema();
+        schema = await endpoint.resolveSchema();
       } catch (failure) {
         // Never mind
       }