@wundergraph/composition 0.59.0 → 0.62.2

package/dist/v1/federation/federation-factory.js

@@ -2358,7 +2358,7 @@ class FederationFactory {
             })).subscriptionFilterCondition = result.condition;
         }
     }
-    mergeSubscriptionFilterTargetResults({ directiveNode, abstractTypeData, targets, directiveSubgraphName, }) {
+    mergeSubscriptionFilterTargetResults({ abstractTypeData, directiveNode, directiveSubgraphName, targets, }) {
         const aggregatedErrors = [];
         let firstCondition = null;
         for (const target of targets) {
@@ -2375,7 +2375,6 @@ class FederationFactory {
                 ? (0, errors_1.subscriptionFilterUnionMemberInvalidError)(abstractTypeData.name, target.name, result.errors.map((error) => error.message).join(string_constants_1.LITERAL_NEW_LINE))
                 : (0, errors_1.subscriptionFilterInterfaceImplementationInvalidError)(abstractTypeData.name, target.name, result.errors.map((error) => error.message).join(string_constants_1.LITERAL_NEW_LINE));
             aggregatedErrors.push(wrapped);
-            continue;
         }
         if (firstCondition === null || aggregatedErrors.length > 0) {
             return { errors: aggregatedErrors, success: false };
@@ -2531,13 +2530,21 @@ class FederationFactory {
              ** However, contracts require @inaccessible to exclude applicable tagged types. */
             this.routerDefinitions.push(directive_definitions_1.INACCESSIBLE_DEFINITION);
         }
-        if (contractTagOptions.tagNamesToExclude.size > 0) {
-            for (const [parentTypeName, parentTagData] of this.parentTagDataByTypeName) {
-                const parentDefinitionData = (0, utils_6.getOrThrowError)(this.parentDefinitionDataByTypeName, parentTypeName, string_constants_1.PARENT_DEFINITION_DATA);
+        const tagIntersection = contractTagOptions.tagNamesToExclude.intersection(contractTagOptions.tagNamesToInclude);
+        if (tagIntersection.size > 0) {
+            return {
+                errors: [(0, errors_1.intersectingExcludeAndIncludeContractTagsError)([...tagIntersection])],
+                success: false,
+                warnings: this.warnings,
+            };
+        }
+        if (contractTagOptions.tagNamesToInclude.size > 0) {
+            for (const [parentTypeName, parentDefinitionData] of this.parentDefinitionDataByTypeName) {
                 if ((0, utils_5.isNodeDataInaccessible)(parentDefinitionData)) {
                     continue;
                 }
-                if (!contractTagOptions.tagNamesToExclude.isDisjointFrom(parentTagData.tagNames)) {
+                const parentTagData = this.parentTagDataByTypeName.get(parentTypeName);
+                if (!parentTagData) {
                     parentDefinitionData.federatedDirectivesData.directivesByName.set(string_constants_1.INACCESSIBLE, [
                         (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
                     ]);
@@ -2545,50 +2552,42 @@ class FederationFactory {
                     // If the parent is inaccessible, there is no need to assess further
                     continue;
                 }
+                if (!contractTagOptions.tagNamesToInclude.isDisjointFrom(parentTagData.tagNames)) {
+                    continue;
+                }
                 if (parentTagData.childTagDataByChildName.size < 1) {
+                    parentDefinitionData.federatedDirectivesData.directivesByName.set(string_constants_1.INACCESSIBLE, [
+                        (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
+                    ]);
+                    this.inaccessibleCoords.add(parentTypeName);
+                    // If the parent is inaccessible, there is no need to assess further
                     continue;
                 }
                 switch (parentDefinitionData.kind) {
                     case graphql_1.Kind.SCALAR_TYPE_DEFINITION:
                     // intentional fallthrough
-                    case graphql_1.Kind.UNION_TYPE_DEFINITION: {
-                        break;
-                    }
-                    case graphql_1.Kind.ENUM_TYPE_DEFINITION: {
-                        this.handleChildTagExclusions(parentDefinitionData, parentDefinitionData.enumValueDataByName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToExclude);
+                    case graphql_1.Kind.UNION_TYPE_DEFINITION:
+                        continue;
+                    case graphql_1.Kind.ENUM_TYPE_DEFINITION:
+                        this.handleChildTagInclusions(parentDefinitionData, parentDefinitionData.enumValueDataByName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToInclude);
                         break;
-                    }
-                    case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION: {
-                        this.handleChildTagExclusions(parentDefinitionData, parentDefinitionData.inputValueDataByName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToExclude);
+                    case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION:
+                        this.handleChildTagInclusions(parentDefinitionData, parentDefinitionData.inputValueDataByName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToInclude);
                         break;
-                    }
-                    default: {
+                    default:
                         let accessibleFields = parentDefinitionData.fieldDataByName.size;
-                        for (const [fieldName, childTagData] of parentTagData.childTagDataByChildName) {
-                            const fieldData = (0, utils_6.getOrThrowError)(parentDefinitionData.fieldDataByName, fieldName, `${parentTypeName}.fieldDataByFieldName`);
+                        for (const [fieldName, fieldData] of parentDefinitionData.fieldDataByName) {
                             if ((0, utils_5.isNodeDataInaccessible)(fieldData)) {
                                 accessibleFields -= 1;
                                 continue;
                             }
-                            if (!contractTagOptions.tagNamesToExclude.isDisjointFrom(childTagData.tagNames)) {
+                            const childTagData = parentTagData.childTagDataByChildName.get(fieldName);
+                            if (!childTagData || contractTagOptions.tagNamesToInclude.isDisjointFrom(childTagData.tagNames)) {
                                 (0, utils_6.getValueOrDefault)(fieldData.federatedDirectivesData.directivesByName, string_constants_1.INACCESSIBLE, () => [
                                     (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
                                 ]);
                                 this.inaccessibleCoords.add(fieldData.federatedCoords);
                                 accessibleFields -= 1;
-                                continue;
-                            }
-                            for (const [argumentName, argTagNames] of childTagData.tagNamesByArgumentName) {
-                                const inputValueData = (0, utils_6.getOrThrowError)(fieldData.argumentDataByName, argumentName, `${fieldName}.argumentDataByArgumentName`);
-                                if ((0, utils_5.isNodeDataInaccessible)(inputValueData)) {
-                                    continue;
-                                }
-                                if (!contractTagOptions.tagNamesToExclude.isDisjointFrom(argTagNames)) {
-                                    (0, utils_6.getValueOrDefault)(inputValueData.federatedDirectivesData.directivesByName, string_constants_1.INACCESSIBLE, () => [
-                                        (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
-                                    ]);
-                                    this.inaccessibleCoords.add(inputValueData.federatedCoords);
-                                }
                             }
                         }
                         if (accessibleFields < 1) {
@@ -2597,17 +2596,16 @@ class FederationFactory {
                             ]);
                             this.inaccessibleCoords.add(parentTypeName);
                         }
-                    }
                 }
             }
         }
-        else if (contractTagOptions.tagNamesToInclude.size > 0) {
-            for (const [parentTypeName, parentDefinitionData] of this.parentDefinitionDataByTypeName) {
+        if (contractTagOptions.tagNamesToExclude.size > 0) {
+            for (const [parentTypeName, parentTagData] of this.parentTagDataByTypeName) {
+                const parentDefinitionData = (0, utils_6.getOrThrowError)(this.parentDefinitionDataByTypeName, parentTypeName, string_constants_1.PARENT_DEFINITION_DATA);
                 if ((0, utils_5.isNodeDataInaccessible)(parentDefinitionData)) {
                     continue;
                 }
-                const parentTagData = this.parentTagDataByTypeName.get(parentTypeName);
-                if (!parentTagData) {
+                if (!contractTagOptions.tagNamesToExclude.isDisjointFrom(parentTagData.tagNames)) {
                     parentDefinitionData.federatedDirectivesData.directivesByName.set(string_constants_1.INACCESSIBLE, [
                         (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
                     ]);
@@ -2615,42 +2613,50 @@ class FederationFactory {
                     // If the parent is inaccessible, there is no need to assess further
                     continue;
                 }
-                if (!contractTagOptions.tagNamesToInclude.isDisjointFrom(parentTagData.tagNames)) {
-                    continue;
-                }
                 if (parentTagData.childTagDataByChildName.size < 1) {
-                    parentDefinitionData.federatedDirectivesData.directivesByName.set(string_constants_1.INACCESSIBLE, [
-                        (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
-                    ]);
-                    this.inaccessibleCoords.add(parentTypeName);
-                    // If the parent is inaccessible, there is no need to assess further
                     continue;
                 }
                 switch (parentDefinitionData.kind) {
                     case graphql_1.Kind.SCALAR_TYPE_DEFINITION:
                     // intentional fallthrough
-                    case graphql_1.Kind.UNION_TYPE_DEFINITION:
-                        continue;
-                    case graphql_1.Kind.ENUM_TYPE_DEFINITION:
-                        this.handleChildTagInclusions(parentDefinitionData, parentDefinitionData.enumValueDataByName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToInclude);
+                    case graphql_1.Kind.UNION_TYPE_DEFINITION: {
                         break;
-                    case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION:
-                        this.handleChildTagInclusions(parentDefinitionData, parentDefinitionData.inputValueDataByName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToInclude);
+                    }
+                    case graphql_1.Kind.ENUM_TYPE_DEFINITION: {
+                        this.handleChildTagExclusions(parentDefinitionData, parentDefinitionData.enumValueDataByName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToExclude);
                         break;
-                    default:
+                    }
+                    case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION: {
+                        this.handleChildTagExclusions(parentDefinitionData, parentDefinitionData.inputValueDataByName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToExclude);
+                        break;
+                    }
+                    default: {
                         let accessibleFields = parentDefinitionData.fieldDataByName.size;
-                        for (const [fieldName, fieldData] of parentDefinitionData.fieldDataByName) {
+                        for (const [fieldName, childTagData] of parentTagData.childTagDataByChildName) {
+                            const fieldData = (0, utils_6.getOrThrowError)(parentDefinitionData.fieldDataByName, fieldName, `${parentTypeName}.fieldDataByFieldName`);
                             if ((0, utils_5.isNodeDataInaccessible)(fieldData)) {
                                 accessibleFields -= 1;
                                 continue;
                             }
-                            const childTagData = parentTagData.childTagDataByChildName.get(fieldName);
-                            if (!childTagData || contractTagOptions.tagNamesToInclude.isDisjointFrom(childTagData.tagNames)) {
+                            if (!contractTagOptions.tagNamesToExclude.isDisjointFrom(childTagData.tagNames)) {
                                 (0, utils_6.getValueOrDefault)(fieldData.federatedDirectivesData.directivesByName, string_constants_1.INACCESSIBLE, () => [
                                     (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
                                 ]);
                                 this.inaccessibleCoords.add(fieldData.federatedCoords);
                                 accessibleFields -= 1;
+                                continue;
+                            }
+                            for (const [argumentName, argTagNames] of childTagData.tagNamesByArgumentName) {
+                                const inputValueData = (0, utils_6.getOrThrowError)(fieldData.argumentDataByName, argumentName, `${fieldName}.argumentDataByArgumentName`);
+                                if ((0, utils_5.isNodeDataInaccessible)(inputValueData)) {
+                                    continue;
+                                }
+                                if (!contractTagOptions.tagNamesToExclude.isDisjointFrom(argTagNames)) {
+                                    (0, utils_6.getValueOrDefault)(inputValueData.federatedDirectivesData.directivesByName, string_constants_1.INACCESSIBLE, () => [
+                                        (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
+                                    ]);
+                                    this.inaccessibleCoords.add(inputValueData.federatedCoords);
+                                }
                             }
                         }
                         if (accessibleFields < 1) {
@@ -2659,6 +2665,7 @@ class FederationFactory {
                             ]);
                             this.inaccessibleCoords.add(parentTypeName);
                         }
+                    }
                 }
             }
         }