Validate input schema, and validate API schema, before caching it

apollographql · Jul 14, 2021 · 2a927e3 · 2a927e3
1 parent 547ded6
commit 2a927e3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/query-planner-js/src/composedSchema/toAPISchema.ts b/query-planner-js/src/composedSchema/toAPISchema.ts
@@ -22,6 +22,8 @@ export function toAPISchema(schema: GraphQLSchema): GraphQLSchema {
     return schema.__apiSchema;
   }
 
+  assertValidSchema(schema);
+
   schema = removeInaccessibleElements(schema);
 
   // TODO: We should get a list of feature names from the schema itself, rather
@@ -39,9 +41,9 @@ export function toAPISchema(schema: GraphQLSchema): GraphQLSchema {
     directives: schemaConfig.directives.filter(isExported),
   });
 
-  schema.__apiSchema = apiSchema;
+  assertValidSchema(apiSchema);
 
-  assertValidSchema(schema);
+  schema.__apiSchema = apiSchema;
 
   return apiSchema;