guard against undefined directives (#1506)

in --some-- codebase locations! closes #1486
ardatan · May 19, 2020 · 861e467 · 861e467
1 parent 5392a6d
commit 861e467
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/packages/utils/src/SchemaDirectiveVisitor.ts b/packages/utils/src/SchemaDirectiveVisitor.ts
@@ -135,15 +135,17 @@ export class SchemaDirectiveVisitor<TArgs = any, TContext = any> extends SchemaV
     );
 
     function visitorSelector(type: VisitableSchemaType, methodName: string): Array<SchemaDirectiveVisitor> {
-      let directiveNodes = type.astNode != null ? type.astNode.directives : [];
+      let directiveNodes = type?.astNode?.directives ?? [];
 
       const extensionASTNodes: ReadonlyArray<TypeSystemExtensionNode> = (type as {
         extensionASTNodes?: Array<TypeSystemExtensionNode>;
       }).extensionASTNodes;
 
       if (extensionASTNodes != null) {
         extensionASTNodes.forEach(extensionASTNode => {
-          directiveNodes = directiveNodes.concat(extensionASTNode.directives);
+          if (extensionASTNode.directives != null) {
+            directiveNodes = directiveNodes.concat(extensionASTNode.directives);
+          }
         });
       }
 

diff --git a/packages/utils/src/get-directives.ts b/packages/utils/src/get-directives.ts
@@ -74,22 +74,24 @@ export function getDirectives(schema: GraphQLSchema, node: DirectableGraphQLObje
   const result: DirectiveUseMap = {};
 
   astNodes.forEach(astNode => {
-    astNode.directives.forEach(directive => {
-      const schemaDirective = schemaDirectiveMap[directive.name.value];
-      if (schemaDirective) {
-        const directiveValue = getDirectiveValues(schemaDirective, astNode);
+    if (astNode.directives) {
+      astNode.directives.forEach(directive => {
+        const schemaDirective = schemaDirectiveMap[directive.name.value];
+        if (schemaDirective) {
+          const directiveValue = getDirectiveValues(schemaDirective, astNode);
 
-        if (schemaDirective.isRepeatable) {
-          if (result[schemaDirective.name]) {
-            result[schemaDirective.name] = result[schemaDirective.name].concat([directiveValue]);
+          if (schemaDirective.isRepeatable) {
+            if (result[schemaDirective.name]) {
+              result[schemaDirective.name] = result[schemaDirective.name].concat([directiveValue]);
+            } else {
+              result[schemaDirective.name] = [directiveValue];
+            }
           } else {
-            result[schemaDirective.name] = [directiveValue];
+            result[schemaDirective.name] = directiveValue;
           }
-        } else {
-          result[schemaDirective.name] = directiveValue;
         }
-      }
-    });
+      });
+    }
   });
 
   return result;