remove interface inheritance from validate relationship directive rule

Author: a-alle

packages/graphql/src/schema/validation/custom-rules/directives/relationship.ts

@@ -31,7 +31,6 @@ import { DocumentValidationError } from "../utils/document-validation-error";
 
 export function verifyRelationshipArgumentValue(
     objectTypeToRelationshipsPerRelationshipTypeMap: Map<string, Map<string, [string, string, string][]>>,
-    interfaceToImplementationsMap: Map<string, Set<string>>,
     extra?: {
         enums: EnumTypeDefinitionNode[];
         interfaces: InterfaceTypeDefinitionNode[];
@@ -51,8 +50,8 @@ export function verifyRelationshipArgumentValue(
             // delegate
             return;
         }
-        if (!parentDef) {
-            console.error("No parent definition");
+        if (!parentDef || parentDef.kind === Kind.INTERFACE_TYPE_DEFINITION) {
+            // @relationship can only be present on fields of Object Types
             return;
         }
         const typeArg = directiveNode.arguments?.find((a) => a.name.value === "type");
@@ -72,8 +71,7 @@ export function verifyRelationshipArgumentValue(
                 parentDef,
                 currentRelationship,
                 typeValue,
-                objectTypeToRelationshipsPerRelationshipTypeMap,
-                interfaceToImplementationsMap
+                objectTypeToRelationshipsPerRelationshipTypeMap
             );
         }
 
@@ -149,44 +147,17 @@ function checkRelationshipFieldsForDuplicates(
 }
 
 function verifyRelationshipFields(
-    parentDef: ObjectTypeDefinitionNode | InterfaceTypeDefinitionNode,
+    parentDef: ObjectTypeDefinitionNode,
     currentRelationship: [string, string, string],
     typeValue: any,
-    objectTypeToRelationshipsPerRelationshipTypeMap: Map<string, Map<string, [string, string, string][]>>,
-    interfaceToImplementationsMap: Map<string, Set<string>>
+    objectTypeToRelationshipsPerRelationshipTypeMap: Map<string, Map<string, [string, string, string][]>>
 ) {
     const relationshipFieldsForCurrentType = objectTypeToRelationshipsPerRelationshipTypeMap.get(parentDef.name.value);
     checkRelationshipFieldsForDuplicates(relationshipFieldsForCurrentType, currentRelationship, typeValue);
     objectTypeToRelationshipsPerRelationshipTypeMap.set(
         parentDef.name.value,
         getUpdatedRelationshipFieldsForCurrentType(relationshipFieldsForCurrentType, currentRelationship, typeValue)
     );
-
-    if (parentDef.kind === Kind.INTERFACE_TYPE_DEFINITION) {
-        const dependents = interfaceToImplementationsMap.get(parentDef.name.value);
-        dependents?.forEach((dependentTypeName) => {
-            const relationshipFieldsForDependentType =
-                objectTypeToRelationshipsPerRelationshipTypeMap.get(dependentTypeName);
-            checkRelationshipFieldsForDuplicates(relationshipFieldsForDependentType, currentRelationship, typeValue);
-        });
-    }
-
-    if (parentDef.kind === Kind.OBJECT_TYPE_DEFINITION) {
-        parentDef.interfaces?.forEach((i) => {
-            const relationshipFieldsForImplementedInterface = objectTypeToRelationshipsPerRelationshipTypeMap.get(
-                i.name.value
-            );
-            checkRelationshipFieldsForDuplicates(
-                relationshipFieldsForImplementedInterface,
-                currentRelationship,
-                typeValue
-            );
-
-            const implementations = interfaceToImplementationsMap.get(i.name.value) || new Set<string>();
-            implementations.add(parentDef.name.value);
-            interfaceToImplementationsMap.set(i.name.value, implementations);
-        });
-    }
 }
 
 export function verifyRelationshipFieldType({

packages/graphql/src/schema/validation/custom-rules/directives/valid-directive.ts

@@ -43,7 +43,6 @@ function getValidationFunction(
         string,
         Map<string, [string, string, string][]>
     >,
-    interfaceToImplementationsMap: Map<string, Set<string>>,
     extra: {
         enums: EnumTypeDefinitionNode[];
         interfaces: InterfaceTypeDefinitionNode[];
@@ -66,7 +65,6 @@ function getValidationFunction(
         case "relationship":
             return verifyRelationshipArgumentValue(
                 objectTypeToFieldNameDirectionAndFieldTypePerRelationshipTypeMap,
-                interfaceToImplementationsMap,
                 extra
             );
         default:
@@ -108,13 +106,11 @@ export function directiveIsValid(
             string,
             Map<string, [string, string, string][]>
         >();
-        const interfaceToImplementationsMap = new Map<string, Set<string>>();
         return {
             Directive(directiveNode: DirectiveNode, _key, _parent, path, ancenstors) {
                 const validationFn = getValidationFunction(
                     directiveNode.name.value,
                     objectTypeToFieldNameDirectionAndFieldTypePerRelationshipTypeMap,
-                    interfaceToImplementationsMap,
                     extra,
                     callbacks
                 );