@wundergraph/composition 0.47.1 → 0.47.2

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

@@ -9,10 +9,10 @@ const ast_1 = require("../../schema-building/ast");
 const utils_1 = require("../../ast/utils");
 const errors_1 = require("../../errors/errors");
 const utils_2 = require("./utils");
-const string_constants_1 = require("../utils/string-constants");
+const strings_1 = require("../constants/strings");
 const utils_3 = require("../utils/utils");
 const merge_1 = require("@graphql-tools/merge");
-const constants_1 = require("../utils/constants");
+const constants_1 = require("../constants/constants");
 const normalization_factory_1 = require("../normalization/normalization-factory");
 const utils_4 = require("../normalization/utils");
 const types_1 = require("../../schema-building/types");
@@ -20,15 +20,16 @@ const utils_5 = require("../../schema-building/utils");
 const walkers_1 = require("./walkers");
 const lodash_1 = require("lodash");
 const type_merging_1 = require("../schema-building/type-merging");
-const string_constants_2 = require("../../utils/string-constants");
+const string_constants_1 = require("../../utils/string-constants");
 const integer_constants_1 = require("../../utils/integer-constants");
 const utils_6 = require("../../utils/utils");
 const warnings_1 = require("../warnings/warnings");
+const directive_definitions_1 = require("../constants/directive-definitions");
 class FederationFactory {
     authorizationDataByParentTypeName;
     coordsByNamedTypeName = new Map();
     disableResolvabilityValidation = false;
-    clientDefinitions = [constants_1.DEPRECATED_DEFINITION];
+    clientDefinitions = [];
     currentSubgraphName = '';
     concreteTypeNamesByAbstractTypeName;
     subgraphNamesByNamedTypeNameByFieldCoords = new Map();
@@ -49,18 +50,17 @@ class FederationFactory {
     parentDefinitionDataByTypeName = new Map();
     parentTagDataByTypeName = new Map();
     persistedDirectiveDefinitionByDirectiveName = new Map([
-        [string_constants_2.AUTHENTICATED, constants_1.AUTHENTICATED_DEFINITION],
-        [string_constants_2.DEPRECATED, constants_1.DEPRECATED_DEFINITION],
-        [string_constants_2.INACCESSIBLE, constants_1.INACCESSIBLE_DEFINITION],
-        [string_constants_2.ONE_OF, constants_1.ONE_OF_DEFINITION],
-        [string_constants_2.REQUIRES_SCOPES, constants_1.REQUIRES_SCOPES_DEFINITION],
-        [string_constants_2.SEMANTIC_NON_NULL, constants_1.SEMANTIC_NON_NULL_DEFINITION],
-        [string_constants_2.TAG, constants_1.TAG_DEFINITION],
+        [string_constants_1.AUTHENTICATED, directive_definitions_1.AUTHENTICATED_DEFINITION],
+        [string_constants_1.DEPRECATED, directive_definitions_1.DEPRECATED_DEFINITION],
+        [string_constants_1.INACCESSIBLE, directive_definitions_1.INACCESSIBLE_DEFINITION],
+        [string_constants_1.ONE_OF, directive_definitions_1.ONE_OF_DEFINITION],
+        [string_constants_1.REQUIRES_SCOPES, directive_definitions_1.REQUIRES_SCOPES_DEFINITION],
+        [string_constants_1.SEMANTIC_NON_NULL, directive_definitions_1.SEMANTIC_NON_NULL_DEFINITION],
+        [string_constants_1.TAG, directive_definitions_1.TAG_DEFINITION],
     ]);
-    persistedDirectiveDefinitions = new Set([string_constants_2.AUTHENTICATED, string_constants_2.DEPRECATED, string_constants_2.INACCESSIBLE, string_constants_2.TAG, string_constants_2.REQUIRES_SCOPES]);
     potentialPersistedDirectiveDefinitionDataByDirectiveName = new Map();
     referencedPersistedDirectiveNames = new Set();
-    routerDefinitions = [constants_1.DEPRECATED_DEFINITION, constants_1.TAG_DEFINITION];
+    routerDefinitions = [];
     subscriptionFilterDataByFieldPath = new Map();
     tagNamesByCoords = new Map();
     warnings;
@@ -75,6 +75,43 @@ class FederationFactory {
         this.internalSubgraphBySubgraphName = internalSubgraphBySubgraphName;
         this.warnings = warnings;
     }
+    extractPersistedDirectives({ data, directivesByName }) {
+        for (const [directiveName, directiveNodes] of directivesByName) {
+            const definition = this.persistedDirectiveDefinitionByDirectiveName.get(directiveName);
+            // @authenticated and @requiresScopes are handled differently
+            if (!definition) {
+                continue;
+            }
+            this.referencedPersistedDirectiveNames.add(directiveName);
+            if (string_constants_1.AUTHORIZATION_DIRECTIVES.has(directiveName) || directiveNodes.length < 1) {
+                continue;
+            }
+            switch (directiveName) {
+                case string_constants_1.DEPRECATED: {
+                    data.isDeprecated = true;
+                    (0, utils_5.upsertDeprecatedDirective)(data, directiveNodes[0]);
+                    break;
+                }
+                case string_constants_1.TAG: {
+                    (0, utils_5.upsertTagDirectives)(data, directiveNodes);
+                    break;
+                }
+                default: {
+                    const existingDirectives = data.directivesByDirectiveName.get(directiveName);
+                    if (!existingDirectives) {
+                        data.directivesByDirectiveName.set(directiveName, [...directiveNodes]);
+                        break;
+                    }
+                    // Only add one instance of certain directives.
+                    if (string_constants_1.NON_REPEATABLE_PERSISTED_DIRECTIVES.has(directiveName)) {
+                        break;
+                    }
+                    existingDirectives.push(...directiveNodes);
+                }
+            }
+        }
+        return data;
+    }
     getValidImplementedInterfaces(data) {
         const interfaces = [];
         if (data.implementedInterfaceTypeNames.size < 1) {
@@ -85,7 +122,7 @@ class FederationFactory {
         const invalidImplementationTypeStringByTypeName = new Map();
         for (const interfaceName of data.implementedInterfaceTypeNames) {
             interfaces.push((0, utils_1.stringToNamedTypeNode)(interfaceName));
-            const implementationData = (0, utils_6.getOrThrowError)(this.parentDefinitionDataByTypeName, interfaceName, string_constants_2.PARENT_DEFINITION_DATA);
+            const implementationData = (0, utils_6.getOrThrowError)(this.parentDefinitionDataByTypeName, interfaceName, string_constants_1.PARENT_DEFINITION_DATA);
             if (implementationData.kind !== graphql_1.Kind.INTERFACE_TYPE_DEFINITION) {
                 invalidImplementationTypeStringByTypeName.set(implementationData.name, (0, utils_6.kindToNodeType)(implementationData.kind));
                 continue;
@@ -280,7 +317,7 @@ class FederationFactory {
     }
     generateTagData() {
         for (const [path, tagNames] of this.tagNamesByCoords) {
-            const paths = path.split(string_constants_2.PERIOD);
+            const paths = path.split(string_constants_1.PERIOD);
             if (paths.length < 1) {
                 continue;
             }
@@ -315,7 +352,10 @@ class FederationFactory {
     upsertEnumValueData(enumValueDataByName, incomingData, isParentInaccessible) {
         const existingData = enumValueDataByName.get(incomingData.name);
         const targetData = existingData || this.copyEnumValueData(incomingData);
-        (0, utils_5.extractPersistedDirectives)(targetData.persistedDirectivesData, incomingData.directivesByDirectiveName, this.persistedDirectiveDefinitionByDirectiveName);
+        this.extractPersistedDirectives({
+            data: targetData.persistedDirectivesData,
+            directivesByName: incomingData.directivesByDirectiveName,
+        });
         const isValueInaccessible = (0, utils_5.isNodeDataInaccessible)(incomingData);
         if (isParentInaccessible || isValueInaccessible) {
             this.inaccessibleCoords.add(targetData.federatedCoords);
@@ -328,13 +368,19 @@ class FederationFactory {
         targetData.appearances += 1;
         (0, utils_6.addNewObjectValueMapEntries)(incomingData.configureDescriptionDataBySubgraphName, targetData.configureDescriptionDataBySubgraphName);
         (0, utils_5.setLongestDescription)(targetData, incomingData);
-        (0, utils_6.addIterableValuesToSet)(incomingData.subgraphNames, targetData.subgraphNames);
+        (0, utils_6.addIterableToSet)({
+            source: incomingData.subgraphNames,
+            target: targetData.subgraphNames,
+        });
     }
     // To facilitate the splitting of tag paths, field arguments do not use the renamedPath property for tagNamesByPath
     upsertInputValueData(inputValueDataByValueName, incomingData, parentCoords, isParentInaccessible) {
         const existingData = inputValueDataByValueName.get(incomingData.name);
         const targetData = existingData || this.copyInputValueData(incomingData);
-        (0, utils_5.extractPersistedDirectives)(targetData.persistedDirectivesData, incomingData.directivesByDirectiveName, this.persistedDirectiveDefinitionByDirectiveName);
+        this.extractPersistedDirectives({
+            data: targetData.persistedDirectivesData,
+            directivesByName: incomingData.directivesByDirectiveName,
+        });
         this.recordTagNamesByCoords(targetData, `${parentCoords}.${targetData.name}`);
         this.namedInputValueTypeNames.add(targetData.namedTypeName);
         (0, utils_6.getValueOrDefault)(this.coordsByNamedTypeName, targetData.namedTypeName, () => new Set()).add(targetData.federatedCoords);
@@ -344,8 +390,14 @@ class FederationFactory {
         }
         (0, utils_6.addNewObjectValueMapEntries)(incomingData.configureDescriptionDataBySubgraphName, targetData.configureDescriptionDataBySubgraphName);
         (0, utils_5.setLongestDescription)(targetData, incomingData);
-        (0, utils_6.addIterableValuesToSet)(incomingData.requiredSubgraphNames, targetData.requiredSubgraphNames);
-        (0, utils_6.addIterableValuesToSet)(incomingData.subgraphNames, targetData.subgraphNames);
+        (0, utils_6.addIterableToSet)({
+            source: incomingData.requiredSubgraphNames,
+            target: targetData.requiredSubgraphNames,
+        });
+        (0, utils_6.addIterableToSet)({
+            source: incomingData.subgraphNames,
+            target: targetData.subgraphNames,
+        });
         this.handleInputValueInaccessibility(isParentInaccessible, targetData, parentCoords);
         // TODO refactor type merging
         const mergeResult = (0, type_merging_1.getMostRestrictiveMergedTypeNode)(targetData.type, incomingData.type, targetData.originalCoords, this.errors);
@@ -382,7 +434,7 @@ class FederationFactory {
         this.inaccessibleCoords.add(inputValueData.federatedCoords);
     }
     handleSubscriptionFilterDirective(incomingData, targetData) {
-        const subscriptionFilters = incomingData.directivesByDirectiveName.get(string_constants_2.SUBSCRIPTION_FILTER);
+        const subscriptionFilters = incomingData.directivesByDirectiveName.get(string_constants_1.SUBSCRIPTION_FILTER);
         if (!subscriptionFilters) {
             return;
         }
@@ -474,18 +526,21 @@ class FederationFactory {
         if (!subgraphNamesByNamedTypeName) {
             return;
         }
-        (0, utils_6.addIterableValuesToSet)(incomingData.subgraphNames, (0, utils_6.getValueOrDefault)(subgraphNamesByNamedTypeName, incomingData.namedTypeName, () => new Set()));
+        (0, utils_6.addIterableToSet)({
+            source: incomingData.subgraphNames,
+            target: (0, utils_6.getValueOrDefault)(subgraphNamesByNamedTypeName, incomingData.namedTypeName, () => new Set()),
+        });
     }
     upsertFieldData(fieldDataByFieldName, incomingData, isParentInaccessible) {
-        if (incomingData.directivesByDirectiveName.has(string_constants_2.SEMANTIC_NON_NULL)) {
-            this.referencedPersistedDirectiveNames.add(string_constants_2.SEMANTIC_NON_NULL);
-        }
         const existingData = fieldDataByFieldName.get(incomingData.name);
         const targetData = existingData || this.copyFieldData(incomingData, isParentInaccessible || (0, utils_5.isNodeDataInaccessible)(incomingData));
         (0, utils_6.getValueOrDefault)(this.coordsByNamedTypeName, incomingData.namedTypeName, () => new Set()).add(targetData.federatedCoords);
         this.namedOutputTypeNames.add(incomingData.namedTypeName);
         this.handleSubscriptionFilterDirective(incomingData, targetData);
-        (0, utils_5.extractPersistedDirectives)(targetData.persistedDirectivesData, incomingData.directivesByDirectiveName, this.persistedDirectiveDefinitionByDirectiveName);
+        this.extractPersistedDirectives({
+            data: targetData.persistedDirectivesData,
+            directivesByName: incomingData.directivesByDirectiveName,
+        });
         const isFieldInaccessible = isParentInaccessible || (0, utils_5.isNodeDataInaccessible)(targetData);
         if (isFieldInaccessible) {
             this.inaccessibleCoords.add(targetData.federatedCoords);
@@ -517,7 +572,10 @@ class FederationFactory {
                         }
                     }
                 }
-                (0, utils_6.addIterableValuesToSet)(incomingData.subgraphNames, (0, utils_6.getValueOrDefault)(subgraphNamesByNamedTypeName, incomingData.namedTypeName, () => new Set()));
+                (0, utils_6.addIterableToSet)({
+                    source: incomingData.subgraphNames,
+                    target: (0, utils_6.getValueOrDefault)(subgraphNamesByNamedTypeName, incomingData.namedTypeName, () => new Set()),
+                });
             }
             else {
                 /* If the named types match but there has already been a disparity in the named type names returned by the
@@ -533,9 +591,18 @@ class FederationFactory {
         (0, utils_5.setLongestDescription)(targetData, incomingData);
         targetData.isInaccessible ||= incomingData.isInaccessible;
         (0, utils_6.addNewObjectValueMapEntries)(incomingData.externalFieldDataBySubgraphName, targetData.externalFieldDataBySubgraphName);
-        (0, utils_6.addMapEntries)(incomingData.isShareableBySubgraphName, targetData.isShareableBySubgraphName);
-        (0, utils_6.addMapEntries)(incomingData.nullLevelsBySubgraphName, targetData.nullLevelsBySubgraphName);
-        (0, utils_6.addIterableValuesToSet)(incomingData.subgraphNames, targetData.subgraphNames);
+        (0, utils_6.addMapEntries)({
+            source: incomingData.isShareableBySubgraphName,
+            target: targetData.isShareableBySubgraphName,
+        });
+        (0, utils_6.addMapEntries)({
+            source: incomingData.nullLevelsBySubgraphName,
+            target: targetData.nullLevelsBySubgraphName,
+        });
+        (0, utils_6.addIterableToSet)({
+            source: incomingData.subgraphNames,
+            target: targetData.subgraphNames,
+        });
     }
     getClientSchemaUnionMembers(unionData) {
         const members = [];
@@ -562,7 +629,10 @@ class FederationFactory {
             directivesByDirectiveName: (0, utils_6.copyArrayValueMap)(sourceData.directivesByDirectiveName),
             extensionType: sourceData.extensionType,
             name: sourceData.name,
-            persistedDirectivesData: (0, utils_5.extractPersistedDirectives)((0, utils_5.newPersistedDirectivesData)(), sourceData.directivesByDirectiveName, this.persistedDirectiveDefinitionByDirectiveName),
+            persistedDirectivesData: this.extractPersistedDirectives({
+                data: (0, utils_5.newPersistedDirectivesData)(),
+                directivesByName: sourceData.directivesByDirectiveName,
+            }),
             description: (0, utils_5.getInitialFederatedDescription)(sourceData),
         };
     }
@@ -580,7 +650,10 @@ class FederationFactory {
                 name: (0, utils_1.stringToNameNode)(sourceData.name),
             },
             parentTypeName: sourceData.parentTypeName,
-            persistedDirectivesData: (0, utils_5.extractPersistedDirectives)((0, utils_5.newPersistedDirectivesData)(), sourceData.directivesByDirectiveName, this.persistedDirectiveDefinitionByDirectiveName),
+            persistedDirectivesData: this.extractPersistedDirectives({
+                data: (0, utils_5.newPersistedDirectivesData)(),
+                directivesByName: sourceData.directivesByDirectiveName,
+            }),
             subgraphNames: new Set(sourceData.subgraphNames),
             description: (0, utils_5.getInitialFederatedDescription)(sourceData),
         };
@@ -605,7 +678,10 @@ class FederationFactory {
             },
             originalCoords: sourceData.originalCoords,
             originalParentTypeName: sourceData.originalParentTypeName,
-            persistedDirectivesData: (0, utils_5.extractPersistedDirectives)((0, utils_5.newPersistedDirectivesData)(), sourceData.directivesByDirectiveName, this.persistedDirectiveDefinitionByDirectiveName),
+            persistedDirectivesData: this.extractPersistedDirectives({
+                data: (0, utils_5.newPersistedDirectivesData)(),
+                directivesByName: sourceData.directivesByDirectiveName,
+            }),
             renamedParentTypeName: sourceData.renamedParentTypeName,
             requiredSubgraphNames: new Set(sourceData.requiredSubgraphNames),
             subgraphNames: new Set(sourceData.subgraphNames),
@@ -627,9 +703,6 @@ class FederationFactory {
         return inputValueDataByInputValueName;
     }
     copyFieldData(sourceData, isInaccessible) {
-        if (sourceData.directivesByDirectiveName.has(string_constants_2.SEMANTIC_NON_NULL)) {
-            this.referencedPersistedDirectiveNames.add(string_constants_2.SEMANTIC_NON_NULL);
-        }
         return {
             argumentDataByName: this.copyInputValueDataByValueName(sourceData.argumentDataByName, isInaccessible, sourceData.federatedCoords),
             configureDescriptionDataBySubgraphName: (0, utils_6.copyObjectValueMap)(sourceData.configureDescriptionDataBySubgraphName),
@@ -653,7 +726,10 @@ class FederationFactory {
             },
             nullLevelsBySubgraphName: sourceData.nullLevelsBySubgraphName,
             originalParentTypeName: sourceData.originalParentTypeName,
-            persistedDirectivesData: (0, utils_5.extractPersistedDirectives)((0, utils_5.newPersistedDirectivesData)(), sourceData.directivesByDirectiveName, this.persistedDirectiveDefinitionByDirectiveName),
+            persistedDirectivesData: this.extractPersistedDirectives({
+                data: (0, utils_5.newPersistedDirectivesData)(),
+                directivesByName: sourceData.directivesByDirectiveName,
+            }),
             renamedParentTypeName: sourceData.renamedParentTypeName,
             subgraphNames: new Set(sourceData.subgraphNames),
             type: sourceData.type,
@@ -787,7 +863,10 @@ class FederationFactory {
             }
             return targetData;
         }
-        (0, utils_5.extractPersistedDirectives)(existingData.persistedDirectivesData, incomingData.directivesByDirectiveName, this.persistedDirectiveDefinitionByDirectiveName);
+        this.extractPersistedDirectives({
+            data: existingData.persistedDirectivesData,
+            directivesByName: incomingData.directivesByDirectiveName,
+        });
         return existingData;
     }
     upsertParentDefinitionData(incomingData, subgraphName) {
@@ -837,7 +916,10 @@ class FederationFactory {
                 }
                 targetData.appearances += 1;
                 targetData.isInaccessible ||= isParentInaccessible;
-                (0, utils_6.addIterableValuesToSet)(incomingData.subgraphNames, targetData.subgraphNames);
+                (0, utils_6.addIterableToSet)({
+                    source: incomingData.subgraphNames,
+                    target: targetData.subgraphNames,
+                });
                 for (const data of incomingData.enumValueDataByName.values()) {
                     this.upsertEnumValueData(targetData.enumValueDataByName, data, isParentInaccessible);
                 }
@@ -851,7 +933,10 @@ class FederationFactory {
                     this.propagateInaccessibilityToExistingChildren(targetData);
                 }
                 targetData.isInaccessible ||= isParentInaccessible;
-                (0, utils_6.addIterableValuesToSet)(incomingData.subgraphNames, targetData.subgraphNames);
+                (0, utils_6.addIterableToSet)({
+                    source: incomingData.subgraphNames,
+                    target: targetData.subgraphNames,
+                });
                 for (const inputValueData of incomingData.inputValueDataByName.values()) {
                     this.upsertInputValueData(targetData.inputValueDataByName, inputValueData, targetData.name, targetData.isInaccessible);
                 }
@@ -866,8 +951,14 @@ class FederationFactory {
                     this.propagateInaccessibilityToExistingChildren(targetData);
                 }
                 targetData.isInaccessible ||= isParentInaccessible;
-                (0, utils_6.addIterableValuesToSet)(compositeOutputData.implementedInterfaceTypeNames, targetData.implementedInterfaceTypeNames);
-                (0, utils_6.addIterableValuesToSet)(compositeOutputData.subgraphNames, targetData.subgraphNames);
+                (0, utils_6.addIterableToSet)({
+                    source: compositeOutputData.implementedInterfaceTypeNames,
+                    target: targetData.implementedInterfaceTypeNames,
+                });
+                (0, utils_6.addIterableToSet)({
+                    source: compositeOutputData.subgraphNames,
+                    target: targetData.subgraphNames,
+                });
                 for (const fieldData of compositeOutputData.fieldDataByName.values()) {
                     this.upsertFieldData(targetData.fieldDataByName, fieldData, targetData.isInaccessible);
                 }
@@ -876,12 +967,21 @@ class FederationFactory {
                 if (!(0, utils_5.areKindsEqual)(targetData, incomingData)) {
                     return;
                 }
-                (0, utils_6.addMapEntries)(incomingData.memberByMemberTypeName, targetData.memberByMemberTypeName);
-                (0, utils_6.addIterableValuesToSet)(incomingData.subgraphNames, targetData.subgraphNames);
+                (0, utils_6.addMapEntries)({
+                    source: incomingData.memberByMemberTypeName,
+                    target: targetData.memberByMemberTypeName,
+                });
+                (0, utils_6.addIterableToSet)({
+                    source: incomingData.subgraphNames,
+                    target: targetData.subgraphNames,
+                });
                 return;
             default:
                 // Scalar
-                (0, utils_6.addIterableValuesToSet)(incomingData.subgraphNames, targetData.subgraphNames);
+                (0, utils_6.addIterableToSet)({
+                    source: incomingData.subgraphNames,
+                    target: targetData.subgraphNames,
+                });
                 return;
         }
     }
@@ -941,7 +1041,10 @@ class FederationFactory {
         }
         (0, utils_5.setLongestDescription)(existingData, incomingData);
         existingData.repeatable &&= incomingData.repeatable;
-        (0, utils_6.addIterableValuesToSet)(incomingData.subgraphNames, existingData.subgraphNames);
+        (0, utils_6.addIterableToSet)({
+            source: incomingData.subgraphNames,
+            target: existingData.subgraphNames,
+        });
     }
     shouldUpdateFederatedFieldAbstractNamedType(abstractTypeName, objectTypeNames) {
         if (!abstractTypeName) {
@@ -970,7 +1073,7 @@ class FederationFactory {
     }
     handleDisparateFieldNamedTypes() {
         for (const [fieldCoordinates, subgraphNamesByNamedTypeName] of this.subgraphNamesByNamedTypeNameByFieldCoords) {
-            const coordinates = fieldCoordinates.split(string_constants_2.PERIOD);
+            const coordinates = fieldCoordinates.split(string_constants_1.PERIOD);
             if (coordinates.length !== 2) {
                 continue;
             }
@@ -1136,7 +1239,7 @@ class FederationFactory {
     }
     handleEntityInterfaces() {
         for (const [entityInterfaceTypeName, entityInterfaceData] of this.entityInterfaceFederationDataByTypeName) {
-            const entityInterfaceFederationData = (0, utils_6.getOrThrowError)(this.parentDefinitionDataByTypeName, entityInterfaceTypeName, string_constants_2.PARENT_DEFINITION_DATA);
+            const entityInterfaceFederationData = (0, utils_6.getOrThrowError)(this.parentDefinitionDataByTypeName, entityInterfaceTypeName, string_constants_1.PARENT_DEFINITION_DATA);
             if (entityInterfaceFederationData.kind !== graphql_1.Kind.INTERFACE_TYPE_DEFINITION) {
                 // TODO error
                 continue;
@@ -1158,7 +1261,7 @@ class FederationFactory {
                 this.internalGraph.setSubgraphName(subgraphName);
                 const interfaceObjectNode = this.internalGraph.addOrUpdateNode(entityInterfaceTypeName, { isAbstract: true });
                 for (const concreteTypeName of concreteTypeNames) {
-                    const concreteTypeData = (0, utils_6.getOrThrowError)(this.parentDefinitionDataByTypeName, concreteTypeName, string_constants_2.PARENT_DEFINITION_DATA);
+                    const concreteTypeData = (0, utils_6.getOrThrowError)(this.parentDefinitionDataByTypeName, concreteTypeName, string_constants_1.PARENT_DEFINITION_DATA);
                     if (!(0, utils_3.isObjectDefinitionData)(concreteTypeData)) {
                         continue;
                     }
@@ -1167,7 +1270,10 @@ class FederationFactory {
                     entityData.subgraphNames.add(subgraphName);
                     const configurationData = configurationDataByTypeName.get(concreteTypeName);
                     if (configurationData) {
-                        (0, utils_6.addIterableValuesToSet)(interfaceObjectConfiguration.fieldNames, configurationData.fieldNames);
+                        (0, utils_6.addIterableToSet)({
+                            source: interfaceObjectConfiguration.fieldNames,
+                            target: configurationData.fieldNames,
+                        });
                         if (!configurationData.keys) {
                             configurationData.keys = [...keys];
                         }
@@ -1251,7 +1357,7 @@ class FederationFactory {
         const coords = (0, utils_3.getNodeCoords)(data);
         const persistedDirectiveNodes = [];
         for (const [directiveName, directiveNodes] of data.persistedDirectivesData.directivesByDirectiveName) {
-            if (directiveName === string_constants_2.SEMANTIC_NON_NULL && (0, utils_5.isFieldData)(data)) {
+            if (directiveName === string_constants_1.SEMANTIC_NON_NULL && (0, utils_5.isFieldData)(data)) {
                 persistedDirectiveNodes.push((0, utils_6.generateSemanticNonNullDirective)((0, utils_6.getFirstEntry)(data.nullLevelsBySubgraphName) ?? new Set([0])));
                 continue;
             }
@@ -1336,7 +1442,7 @@ class FederationFactory {
             }
         }
         if (invalidRequiredArguments.length > 0) {
-            this.errors.push((0, errors_1.invalidRequiredInputValueError)(string_constants_2.FIELD, fieldPath, invalidRequiredArguments));
+            this.errors.push((0, errors_1.invalidRequiredInputValueError)(string_constants_1.FIELD, fieldPath, invalidRequiredArguments));
         }
         else if (argumentNames.length > 0) {
             // fieldConfiguration might already exist through subscriptionFilter
@@ -1377,7 +1483,7 @@ class FederationFactory {
         }
     }
     validateOneOfDirective({ data, inputValueNodes, requiredFieldNames }) {
-        if (!data.directivesByDirectiveName.has(string_constants_2.ONE_OF)) {
+        if (!data.directivesByDirectiveName.has(string_constants_1.ONE_OF)) {
             return true;
         }
         if (requiredFieldNames.size > 0) {
@@ -1402,12 +1508,15 @@ class FederationFactory {
             }
             switch (parentDefinitionData.kind) {
                 case graphql_1.Kind.ENUM_TYPE_DEFINITION: {
+                    if (strings_1.IGNORED_FEDERATED_TYPE_NAMES.has(parentTypeName)) {
+                        break;
+                    }
                     const enumValueNodes = [];
                     const clientEnumValueNodes = [];
                     const mergeMethod = this.getEnumValueMergeMethod(parentTypeName);
                     (0, utils_5.propagateAuthDirectives)(parentDefinitionData, this.authorizationDataByParentTypeName.get(parentTypeName));
                     for (const enumValueData of parentDefinitionData.enumValueDataByName.values()) {
-                        const enumValueNode = (0, utils_5.getNodeForRouterSchemaByData)(enumValueData, this.persistedDirectiveDefinitionByDirectiveName, this.errors);
+                        const enumValueNode = this.getNodeForRouterSchemaByData(enumValueData);
                         const isValueInaccessible = (0, utils_5.isNodeDataInaccessible)(enumValueData);
                         const clientEnumValueNode = {
                             ...enumValueData.node,
@@ -1447,7 +1556,7 @@ class FederationFactory {
                         break;
                     }
                     if (clientEnumValueNodes.length < 1) {
-                        this.errors.push((0, errors_1.allChildDefinitionsAreInaccessibleError)((0, utils_6.kindToNodeType)(parentDefinitionData.kind), parentTypeName, string_constants_2.ENUM_VALUE));
+                        this.errors.push((0, errors_1.allChildDefinitionsAreInaccessibleError)((0, utils_6.kindToNodeType)(parentDefinitionData.kind), parentTypeName, string_constants_1.ENUM_VALUE));
                         break;
                     }
                     this.clientDefinitions.push({
@@ -1458,6 +1567,9 @@ class FederationFactory {
                     break;
                 }
                 case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION: {
+                    if (strings_1.IGNORED_FEDERATED_TYPE_NAMES.has(parentTypeName)) {
+                        break;
+                    }
                     const invalidRequiredInputs = new Array();
                     const inputValueNodes = new Array();
                     const clientInputValueNodes = new Array();
@@ -1485,7 +1597,7 @@ class FederationFactory {
                         }
                     }
                     if (invalidRequiredInputs.length > 0) {
-                        this.errors.push((0, errors_1.invalidRequiredInputValueError)(string_constants_2.INPUT_OBJECT, parentTypeName, invalidRequiredInputs, false));
+                        this.errors.push((0, errors_1.invalidRequiredInputValueError)(string_constants_1.INPUT_OBJECT, parentTypeName, invalidRequiredInputs, false));
                         break;
                     }
                     if (!this.validateOneOfDirective({
@@ -1565,7 +1677,7 @@ class FederationFactory {
                     if (clientSchemaFieldNodes.length < 1) {
                         const error = isQuery
                             ? (0, errors_1.noQueryRootTypeError)(false)
-                            : (0, errors_1.allChildDefinitionsAreInaccessibleError)((0, utils_6.kindToNodeType)(parentDefinitionData.kind), parentTypeName, string_constants_2.FIELD);
+                            : (0, errors_1.allChildDefinitionsAreInaccessibleError)((0, utils_6.kindToNodeType)(parentDefinitionData.kind), parentTypeName, string_constants_1.FIELD);
                         this.errors.push(error);
                         break;
                     }
@@ -1577,7 +1689,7 @@ class FederationFactory {
                     break;
                 }
                 case graphql_1.Kind.SCALAR_TYPE_DEFINITION: {
-                    if (constants_1.BASE_SCALARS.has(parentTypeName)) {
+                    if (strings_1.IGNORED_FEDERATED_TYPE_NAMES.has(parentTypeName)) {
                         break;
                     }
                     (0, utils_5.propagateAuthDirectives)(parentDefinitionData, this.authorizationDataByParentTypeName.get(parentTypeName));
@@ -1603,7 +1715,7 @@ class FederationFactory {
                     }
                     const clientMembers = this.getClientSchemaUnionMembers(parentDefinitionData);
                     if (clientMembers.length < 1) {
-                        this.errors.push((0, errors_1.allChildDefinitionsAreInaccessibleError)(string_constants_2.UNION, parentTypeName, 'union member type'));
+                        this.errors.push((0, errors_1.allChildDefinitionsAreInaccessibleError)(string_constants_1.UNION, parentTypeName, 'union member type'));
                         break;
                     }
                     this.clientDefinitions.push({
@@ -1627,7 +1739,7 @@ class FederationFactory {
             }
             for (const coords of fieldCoords) {
                 // The coords should all be exactly <parentTypeName>.<fieldName>
-                const segments = coords.split(string_constants_2.PERIOD);
+                const segments = coords.split(string_constants_1.PERIOD);
                 switch (segments.length) {
                     case 2: {
                         const parentAuthData = (0, utils_6.getValueOrDefault)(this.authorizationDataByParentTypeName, segments[0], () => (0, utils_3.newAuthorizationData)(segments[0]));
@@ -1655,14 +1767,14 @@ class FederationFactory {
         this.handleEntityInterfaces();
         // generate the map of tag data that is used by contracts
         this.generateTagData();
-        this.pushVersionTwoDirectiveDefinitionsToDocumentDefinitions();
+        this.#addDirectiveDefinitionsAndDepsToRouterAndClientSchemas();
         // The named type auth data can only be pushed to the field once it has all been consolidated
         this.pushNamedTypeAuthDataToFields();
     }
     validateInterfaceImplementationsAndPushToDocumentDefinitions(interfaceImplementations) {
         for (const { data, clientSchemaFieldNodes } of interfaceImplementations) {
             data.node.interfaces = this.getValidImplementedInterfaces(data);
-            this.routerDefinitions.push((0, utils_5.getNodeForRouterSchemaByData)(data, this.persistedDirectiveDefinitionByDirectiveName, this.errors));
+            this.routerDefinitions.push(this.getNodeForRouterSchemaByData(data));
             if ((0, utils_5.isNodeDataInaccessible)(data)) {
                 this.validateReferencesOfInaccessibleType(data);
                 this.internalGraph.setNodeInaccessible(data.name);
@@ -1685,45 +1797,37 @@ class FederationFactory {
             });
         }
     }
-    pushVersionTwoDirectiveDefinitionsToDocumentDefinitions() {
-        if (!this.isVersionTwo) {
-            if (this.referencedPersistedDirectiveNames.has(string_constants_2.SEMANTIC_NON_NULL)) {
-                this.clientDefinitions.push(constants_1.SEMANTIC_NON_NULL_DEFINITION);
-                // Recreate the array until all directive imports are usage-based.
-                this.routerDefinitions = [constants_1.DEPRECATED_DEFINITION, constants_1.SEMANTIC_NON_NULL_DEFINITION, constants_1.TAG_DEFINITION];
+    #addDirectiveDefinitionsAndDepsToRouterAndClientSchemas() {
+        const clientDependencies = new Set();
+        const routerDependencies = new Set();
+        for (const directiveName of this.referencedPersistedDirectiveNames) {
+            const definition = constants_1.DIRECTIVE_DEFINITION_BY_NAME.get(directiveName);
+            if (!definition) {
+                continue;
             }
-            return;
-        }
-        if (this.referencedPersistedDirectiveNames.has(string_constants_2.SEMANTIC_NON_NULL)) {
-            this.clientDefinitions.push(constants_1.SEMANTIC_NON_NULL_DEFINITION);
-            // Recreate the array until all directive imports are usage-based.
-            this.routerDefinitions = [
-                constants_1.AUTHENTICATED_DEFINITION,
-                constants_1.DEPRECATED_DEFINITION,
-                constants_1.INACCESSIBLE_DEFINITION,
-                constants_1.REQUIRES_SCOPES_DEFINITION,
-                constants_1.SEMANTIC_NON_NULL_DEFINITION,
-                constants_1.TAG_DEFINITION,
-                constants_1.SCOPE_SCALAR_DEFINITION,
-            ];
-            return;
+            const dependencies = strings_1.DEPENDENCIES_BY_DIRECTIVE_NAME.get(directiveName) ?? [];
+            if (strings_1.CLIENT_PERSISTED_DIRECTIVE_NAMES.has(directiveName)) {
+                this.clientDefinitions.push(definition);
+                (0, utils_6.addIterableToSet)({
+                    source: dependencies,
+                    target: clientDependencies,
+                });
+            }
+            this.routerDefinitions.push(definition);
+            (0, utils_6.addIterableToSet)({
+                source: dependencies,
+                target: routerDependencies,
+            });
         }
-        // Recreate the array until all directive imports are usage-based.
-        this.routerDefinitions = [
-            constants_1.AUTHENTICATED_DEFINITION,
-            constants_1.DEPRECATED_DEFINITION,
-            constants_1.INACCESSIBLE_DEFINITION,
-            constants_1.REQUIRES_SCOPES_DEFINITION,
-            constants_1.TAG_DEFINITION,
-            constants_1.SCOPE_SCALAR_DEFINITION,
-        ];
+        this.clientDefinitions.push(...clientDependencies);
+        this.routerDefinitions.push(...routerDependencies);
     }
     validatePathSegmentInaccessibility(path) {
         if (!path) {
             return false;
         }
-        const coordinates = path.split(string_constants_2.LEFT_PARENTHESIS)[0];
-        const segments = coordinates.split(string_constants_2.PERIOD);
+        const coordinates = path.split(string_constants_1.LEFT_PARENTHESIS)[0];
+        const segments = coordinates.split(string_constants_1.PERIOD);
         let segment = segments[0];
         for (let i = 0; i < segments.length; i++) {
             if (this.inaccessibleCoords.has(segment)) {
@@ -1752,7 +1856,7 @@ class FederationFactory {
         }
     }
     validateQueryRootType() {
-        const query = this.parentDefinitionDataByTypeName.get(string_constants_2.QUERY);
+        const query = this.parentDefinitionDataByTypeName.get(string_constants_1.QUERY);
         if (!query || query.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION || query.fieldDataByName.size < 1) {
             this.errors.push((0, errors_1.noQueryRootTypeError)());
             return;
@@ -1765,7 +1869,7 @@ class FederationFactory {
         this.errors.push((0, errors_1.noQueryRootTypeError)());
     }
     validateSubscriptionFieldConditionFieldPath(conditionFieldPath, objectData, inputFieldPath, directiveSubgraphName, fieldErrorMessages) {
-        const paths = conditionFieldPath.split(string_constants_2.PERIOD);
+        const paths = conditionFieldPath.split(string_constants_1.PERIOD);
         if (paths.length < 1) {
             fieldErrorMessages.push((0, errors_1.invalidSubscriptionFieldConditionFieldPathErrorMessage)(inputFieldPath, conditionFieldPath));
             return [];
@@ -1801,7 +1905,7 @@ class FederationFactory {
                 lastData = { kind: graphql_1.Kind.SCALAR_TYPE_DEFINITION, name: fieldData.namedTypeName };
                 continue;
             }
-            lastData = (0, utils_6.getOrThrowError)(this.parentDefinitionDataByTypeName, fieldData.namedTypeName, string_constants_2.PARENT_DEFINITION_DATA);
+            lastData = (0, utils_6.getOrThrowError)(this.parentDefinitionDataByTypeName, fieldData.namedTypeName, string_constants_1.PARENT_DEFINITION_DATA);
         }
         if (!(0, utils_5.isLeafKind)(lastData.kind)) {
             fieldErrorMessages.push((0, errors_1.nonLeafSubscriptionFieldConditionFieldPathFinalFieldErrorMessage)(inputFieldPath, conditionFieldPath, paths[paths.length - 1], (0, utils_6.kindToNodeType)(lastData.kind), lastData.name));
@@ -1816,7 +1920,7 @@ class FederationFactory {
             return false;
         }
         let hasErrors = false;
-        const validFieldNames = new Set([string_constants_2.FIELD_PATH, string_constants_2.VALUES]);
+        const validFieldNames = new Set([string_constants_1.FIELD_PATH, string_constants_1.VALUES]);
         const duplicatedFieldNames = new Set();
         const invalidFieldNames = new Set();
         const fieldErrorMessages = [];
@@ -1824,17 +1928,17 @@ class FederationFactory {
             const inputFieldName = objectFieldNode.name.value;
             const inputFieldPath = inputPath + `.${inputFieldName}`;
             switch (inputFieldName) {
-                case string_constants_2.FIELD_PATH: {
-                    if (validFieldNames.has(string_constants_2.FIELD_PATH)) {
-                        validFieldNames.delete(string_constants_2.FIELD_PATH);
+                case string_constants_1.FIELD_PATH: {
+                    if (validFieldNames.has(string_constants_1.FIELD_PATH)) {
+                        validFieldNames.delete(string_constants_1.FIELD_PATH);
                     }
                     else {
                         hasErrors = true;
-                        duplicatedFieldNames.add(string_constants_2.FIELD_PATH);
+                        duplicatedFieldNames.add(string_constants_1.FIELD_PATH);
                         break;
                     }
                     if (objectFieldNode.value.kind !== graphql_1.Kind.STRING) {
-                        fieldErrorMessages.push((0, errors_1.invalidInputFieldTypeErrorMessage)(inputFieldPath, string_constants_2.STRING, (0, utils_6.kindToNodeType)(objectFieldNode.value.kind)));
+                        fieldErrorMessages.push((0, errors_1.invalidInputFieldTypeErrorMessage)(inputFieldPath, string_constants_1.STRING, (0, utils_6.kindToNodeType)(objectFieldNode.value.kind)));
                         hasErrors = true;
                         break;
                     }
@@ -1846,18 +1950,18 @@ class FederationFactory {
                     condition.fieldPath = fieldPath;
                     break;
                 }
-                case string_constants_2.VALUES: {
-                    if (validFieldNames.has(string_constants_2.VALUES)) {
-                        validFieldNames.delete(string_constants_2.VALUES);
+                case string_constants_1.VALUES: {
+                    if (validFieldNames.has(string_constants_1.VALUES)) {
+                        validFieldNames.delete(string_constants_1.VALUES);
                     }
                     else {
                         hasErrors = true;
-                        duplicatedFieldNames.add(string_constants_2.VALUES);
+                        duplicatedFieldNames.add(string_constants_1.VALUES);
                         break;
                     }
                     const objectFieldValueKind = objectFieldNode.value.kind;
                     if (objectFieldValueKind == graphql_1.Kind.NULL || objectFieldValueKind == graphql_1.Kind.OBJECT) {
-                        fieldErrorMessages.push((0, errors_1.invalidInputFieldTypeErrorMessage)(inputFieldPath, string_constants_2.LIST, (0, utils_6.kindToNodeType)(objectFieldNode.value.kind)));
+                        fieldErrorMessages.push((0, errors_1.invalidInputFieldTypeErrorMessage)(inputFieldPath, string_constants_1.LIST, (0, utils_6.kindToNodeType)(objectFieldNode.value.kind)));
                         hasErrors = true;
                         break;
                     }
@@ -1915,7 +2019,7 @@ class FederationFactory {
         }
         const objectFieldNode = objectValueNode.fields[0];
         const fieldName = objectFieldNode.name.value;
-        if (!string_constants_1.SUBSCRIPTION_FILTER_INPUT_NAMES.has(fieldName)) {
+        if (!strings_1.SUBSCRIPTION_FILTER_INPUT_NAMES.has(fieldName)) {
             errorMessages.push((0, errors_1.subscriptionFilterConditionInvalidInputFieldErrorMessage)(inputPath, fieldName));
             return false;
         }
@@ -1923,34 +2027,34 @@ class FederationFactory {
         switch (objectFieldNode.value.kind) {
             case graphql_1.Kind.OBJECT: {
                 switch (fieldName) {
-                    case string_constants_2.IN_UPPER: {
+                    case string_constants_1.IN_UPPER: {
                         configuration.in = { fieldPath: [], values: [] };
                         return this.validateSubscriptionFieldCondition(objectFieldNode.value, configuration.in, objectData, depth, inputPath + `.IN`, directiveSubgraphName, errorMessages);
                     }
-                    case string_constants_2.NOT_UPPER: {
+                    case string_constants_1.NOT_UPPER: {
                         configuration.not = {};
                         return this.validateSubscriptionFilterCondition(objectFieldNode.value, configuration.not, objectData, depth, inputPath + `.NOT`, directiveSubgraphName, errorMessages);
                     }
                     default:
                         // The field is guaranteed to be an AND or an OR
-                        errorMessages.push((0, errors_1.subscriptionFilterConditionInvalidInputFieldTypeErrorMessage)(inputFieldPath, string_constants_2.LIST, string_constants_2.OBJECT));
+                        errorMessages.push((0, errors_1.subscriptionFilterConditionInvalidInputFieldTypeErrorMessage)(inputFieldPath, string_constants_1.LIST, string_constants_1.OBJECT));
                         return false;
                 }
             }
             case graphql_1.Kind.LIST: {
                 const listConfigurations = [];
                 switch (fieldName) {
-                    case string_constants_2.AND_UPPER: {
+                    case string_constants_1.AND_UPPER: {
                         configuration.and = listConfigurations;
                         break;
                     }
-                    case string_constants_2.OR_UPPER: {
+                    case string_constants_1.OR_UPPER: {
                         configuration.or = listConfigurations;
                         break;
                     }
                     default:
                         // The field is guaranteed to be an IN or a NOT
-                        errorMessages.push((0, errors_1.subscriptionFilterConditionInvalidInputFieldTypeErrorMessage)(inputFieldPath, string_constants_2.OBJECT, string_constants_2.LIST));
+                        errorMessages.push((0, errors_1.subscriptionFilterConditionInvalidInputFieldTypeErrorMessage)(inputFieldPath, string_constants_1.OBJECT, string_constants_1.LIST));
                         return false;
                 }
                 const listLength = objectFieldNode.value.values.length;
@@ -1980,7 +2084,7 @@ class FederationFactory {
                 return isValid;
             }
             default: {
-                const expectedTypeString = string_constants_1.SUBSCRIPTION_FILTER_LIST_INPUT_NAMES.has(fieldName) ? string_constants_2.LIST : string_constants_2.OBJECT;
+                const expectedTypeString = strings_1.SUBSCRIPTION_FILTER_LIST_INPUT_NAMES.has(fieldName) ? string_constants_1.LIST : string_constants_1.OBJECT;
                 errorMessages.push((0, errors_1.subscriptionFilterConditionInvalidInputFieldTypeErrorMessage)(inputFieldPath, expectedTypeString, (0, utils_6.kindToNodeType)(objectFieldNode.value.kind)));
                 return false;
             }
@@ -1994,13 +2098,13 @@ class FederationFactory {
         const argumentNode = directiveNode.arguments[0];
         if (argumentNode.value.kind !== graphql_1.Kind.OBJECT) {
             this.errors.push((0, errors_1.invalidSubscriptionFilterDirectiveError)(fieldPath, [
-                (0, errors_1.subscriptionFilterConditionInvalidInputFieldTypeErrorMessage)(string_constants_2.CONDITION, string_constants_2.OBJECT, (0, utils_6.kindToNodeType)(argumentNode.value.kind)),
+                (0, errors_1.subscriptionFilterConditionInvalidInputFieldTypeErrorMessage)(string_constants_1.CONDITION, string_constants_1.OBJECT, (0, utils_6.kindToNodeType)(argumentNode.value.kind)),
             ]));
             return;
         }
         const condition = {};
         const errorMessages = [];
-        if (!this.validateSubscriptionFilterCondition(argumentNode.value, condition, objectData, 0, string_constants_2.CONDITION, directiveSubgraphName, errorMessages)) {
+        if (!this.validateSubscriptionFilterCondition(argumentNode.value, condition, objectData, 0, string_constants_1.CONDITION, directiveSubgraphName, errorMessages)) {
             this.errors.push((0, errors_1.invalidSubscriptionFilterDirectiveError)(fieldPath, errorMessages));
             this.isMaxDepth = false;
             return;
@@ -2087,7 +2191,7 @@ class FederationFactory {
         for (const subgraph of this.internalSubgraphBySubgraphName.values()) {
             subgraphConfigBySubgraphName.set(subgraph.name, {
                 configurationDataByTypeName: subgraph.configurationDataByTypeName,
-                directiveDefinitionByDirectiveName: subgraph.directiveDefinitionByDirectiveName,
+                directiveDefinitionByName: subgraph.directiveDefinitionByName,
                 isVersionTwo: subgraph.isVersionTwo,
                 parentDefinitionDataByTypeName: subgraph.parentDefinitionDataByTypeName,
                 schema: subgraph.schema,
@@ -2125,16 +2229,16 @@ class FederationFactory {
                 continue;
             }
             if (!tagNames.isDisjointFrom(childTagData.tagNames)) {
-                (0, utils_6.getValueOrDefault)(childData.persistedDirectivesData.directivesByDirectiveName, string_constants_2.INACCESSIBLE, () => [
-                    (0, utils_6.generateSimpleDirective)(string_constants_2.INACCESSIBLE),
+                (0, utils_6.getValueOrDefault)(childData.persistedDirectivesData.directivesByDirectiveName, string_constants_1.INACCESSIBLE, () => [
+                    (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
                 ]);
                 this.inaccessibleCoords.add(`${parentDefinitionData.name}.${childName}`);
                 accessibleChildren -= 1;
             }
         }
         if (accessibleChildren < 1) {
-            parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.set(string_constants_2.INACCESSIBLE, [
-                (0, utils_6.generateSimpleDirective)(string_constants_2.INACCESSIBLE),
+            parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.set(string_constants_1.INACCESSIBLE, [
+                (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
             ]);
             this.inaccessibleCoords.add(parentDefinitionData.name);
         }
@@ -2148,16 +2252,16 @@ class FederationFactory {
             }
             const childTagData = childTagDataByChildName.get(childName);
             if (!childTagData || tagNames.isDisjointFrom(childTagData.tagNames)) {
-                (0, utils_6.getValueOrDefault)(childData.persistedDirectivesData.directivesByDirectiveName, string_constants_2.INACCESSIBLE, () => [
-                    (0, utils_6.generateSimpleDirective)(string_constants_2.INACCESSIBLE),
+                (0, utils_6.getValueOrDefault)(childData.persistedDirectivesData.directivesByDirectiveName, string_constants_1.INACCESSIBLE, () => [
+                    (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
                 ]);
                 this.inaccessibleCoords.add(`${parentDefinitionData.name}.${childName}`);
                 accessibleChildren -= 1;
             }
         }
         if (accessibleChildren < 1) {
-            parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.set(string_constants_2.INACCESSIBLE, [
-                (0, utils_6.generateSimpleDirective)(string_constants_2.INACCESSIBLE),
+            parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.set(string_constants_1.INACCESSIBLE, [
+                (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
             ]);
             this.inaccessibleCoords.add(parentDefinitionData.name);
         }
@@ -2166,17 +2270,17 @@ class FederationFactory {
         if (!this.isVersionTwo) {
             /* If all the subgraphs are version one, the @inaccessible directive won't be present.
              ** However, contracts require @inaccessible to exclude applicable tagged types. */
-            this.routerDefinitions.push(constants_1.INACCESSIBLE_DEFINITION);
+            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_2.PARENT_DEFINITION_DATA);
+                const parentDefinitionData = (0, utils_6.getOrThrowError)(this.parentDefinitionDataByTypeName, parentTypeName, string_constants_1.PARENT_DEFINITION_DATA);
                 if ((0, utils_5.isNodeDataInaccessible)(parentDefinitionData)) {
                     continue;
                 }
                 if (!contractTagOptions.tagNamesToExclude.isDisjointFrom(parentTagData.tagNames)) {
-                    parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.set(string_constants_2.INACCESSIBLE, [
-                        (0, utils_6.generateSimpleDirective)(string_constants_2.INACCESSIBLE),
+                    parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.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
@@ -2208,8 +2312,8 @@ class FederationFactory {
                                 continue;
                             }
                             if (!contractTagOptions.tagNamesToExclude.isDisjointFrom(childTagData.tagNames)) {
-                                (0, utils_6.getValueOrDefault)(fieldData.persistedDirectivesData.directivesByDirectiveName, string_constants_2.INACCESSIBLE, () => [
-                                    (0, utils_6.generateSimpleDirective)(string_constants_2.INACCESSIBLE),
+                                (0, utils_6.getValueOrDefault)(fieldData.persistedDirectivesData.directivesByDirectiveName, string_constants_1.INACCESSIBLE, () => [
+                                    (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
                                 ]);
                                 this.inaccessibleCoords.add(fieldData.federatedCoords);
                                 accessibleFields -= 1;
@@ -2221,14 +2325,14 @@ class FederationFactory {
                                     continue;
                                 }
                                 if (!contractTagOptions.tagNamesToExclude.isDisjointFrom(argTagNames)) {
-                                    (0, utils_6.getValueOrDefault)(inputValueData.persistedDirectivesData.directivesByDirectiveName, string_constants_2.INACCESSIBLE, () => [(0, utils_6.generateSimpleDirective)(string_constants_2.INACCESSIBLE)]);
+                                    (0, utils_6.getValueOrDefault)(inputValueData.persistedDirectivesData.directivesByDirectiveName, string_constants_1.INACCESSIBLE, () => [(0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE)]);
                                     this.inaccessibleCoords.add(inputValueData.federatedCoords);
                                 }
                             }
                         }
                         if (accessibleFields < 1) {
-                            parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.set(string_constants_2.INACCESSIBLE, [
-                                (0, utils_6.generateSimpleDirective)(string_constants_2.INACCESSIBLE),
+                            parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.set(string_constants_1.INACCESSIBLE, [
+                                (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
                             ]);
                             this.inaccessibleCoords.add(parentTypeName);
                         }
@@ -2243,8 +2347,8 @@ class FederationFactory {
                 }
                 const parentTagData = this.parentTagDataByTypeName.get(parentTypeName);
                 if (!parentTagData) {
-                    parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.set(string_constants_2.INACCESSIBLE, [
-                        (0, utils_6.generateSimpleDirective)(string_constants_2.INACCESSIBLE),
+                    parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.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
@@ -2254,8 +2358,8 @@ class FederationFactory {
                     continue;
                 }
                 if (parentTagData.childTagDataByChildName.size < 1) {
-                    parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.set(string_constants_2.INACCESSIBLE, [
-                        (0, utils_6.generateSimpleDirective)(string_constants_2.INACCESSIBLE),
+                    parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.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
@@ -2281,16 +2385,16 @@ class FederationFactory {
                             }
                             const childTagData = parentTagData.childTagDataByChildName.get(fieldName);
                             if (!childTagData || contractTagOptions.tagNamesToInclude.isDisjointFrom(childTagData.tagNames)) {
-                                (0, utils_6.getValueOrDefault)(fieldData.persistedDirectivesData.directivesByDirectiveName, string_constants_2.INACCESSIBLE, () => [
-                                    (0, utils_6.generateSimpleDirective)(string_constants_2.INACCESSIBLE),
+                                (0, utils_6.getValueOrDefault)(fieldData.persistedDirectivesData.directivesByDirectiveName, string_constants_1.INACCESSIBLE, () => [
+                                    (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
                                 ]);
                                 this.inaccessibleCoords.add(fieldData.federatedCoords);
                                 accessibleFields -= 1;
                             }
                         }
                         if (accessibleFields < 1) {
-                            parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.set(string_constants_2.INACCESSIBLE, [
-                                (0, utils_6.generateSimpleDirective)(string_constants_2.INACCESSIBLE),
+                            parentDefinitionData.persistedDirectivesData.directivesByDirectiveName.set(string_constants_1.INACCESSIBLE, [
+                                (0, utils_6.generateSimpleDirective)(string_constants_1.INACCESSIBLE),
                             ]);
                             this.inaccessibleCoords.add(parentTypeName);
                         }
@@ -2322,7 +2426,7 @@ class FederationFactory {
         for (const subgraph of this.internalSubgraphBySubgraphName.values()) {
             subgraphConfigBySubgraphName.set(subgraph.name, {
                 configurationDataByTypeName: subgraph.configurationDataByTypeName,
-                directiveDefinitionByDirectiveName: subgraph.directiveDefinitionByDirectiveName,
+                directiveDefinitionByName: subgraph.directiveDefinitionByName,
                 isVersionTwo: subgraph.isVersionTwo,
                 parentDefinitionDataByTypeName: subgraph.parentDefinitionDataByTypeName,
                 schema: subgraph.schema,
@@ -2375,7 +2479,10 @@ function initializeFederationFactory({ disableResolvabilityValidation, subgraphs
         const implementations = entityInterfaceData.concreteTypeNames.size;
         for (const [subgraphName, subgraphData] of entityInterfaceData.subgraphDataByTypeName) {
             const definedConcreteTypeNames = (0, utils_6.getValueOrDefault)(definedConcreteTypeNamesBySubgraphName, subgraphName, () => new Set());
-            (0, utils_6.addIterableValuesToSet)(subgraphData.concreteTypeNames, definedConcreteTypeNames);
+            (0, utils_6.addIterableToSet)({
+                source: subgraphData.concreteTypeNames,
+                target: definedConcreteTypeNames,
+            });
             if (!subgraphData.isInterfaceObject) {
                 if (subgraphData.resolvable && subgraphData.concreteTypeNames.size !== implementations) {
                     (0, utils_6.getValueOrDefault)(invalidEntityInterfacesByTypeName, typeName, () => new Array()).push({
@@ -2386,7 +2493,10 @@ function initializeFederationFactory({ disableResolvabilityValidation, subgraphs
                 }
                 continue;
             }
-            (0, utils_6.addIterableValuesToSet)(entityInterfaceData.concreteTypeNames, definedConcreteTypeNames);
+            (0, utils_6.addIterableToSet)({
+                source: entityInterfaceData.concreteTypeNames,
+                target: definedConcreteTypeNames,
+            });
             const { parentDefinitionDataByTypeName } = (0, utils_6.getOrThrowError)(result.internalSubgraphBySubgraphName, subgraphName, 'internalSubgraphBySubgraphName');
             const invalidTypeNames = [];
             for (const concreteTypeName of entityInterfaceData.concreteTypeNames) {