npm - @wundergraph/composition - Versions diffs - 0.47.1 → 0.47.2 - Mend

@wundergraph/composition 0.47.1 → 0.47.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (60) hide show

package/dist/index.d.ts +7 -2
package/dist/index.js +7 -2
package/dist/index.js.map +1 -1
package/dist/normalization/types.d.ts +3 -3
package/dist/schema-building/ast.d.ts +1 -1
package/dist/schema-building/utils.d.ts +7 -6
package/dist/schema-building/utils.js +6 -37
package/dist/schema-building/utils.js.map +1 -1
package/dist/subgraph/types.d.ts +3 -3
package/dist/tsconfig.tsbuildinfo +1 -1
package/dist/utils/composition-version.js +1 -1
package/dist/utils/params.d.ts +12 -0
package/dist/utils/params.js +3 -0
package/dist/utils/params.js.map +1 -0
package/dist/utils/utils.d.ts +4 -2
package/dist/utils/utils.js +12 -3
package/dist/utils/utils.js.map +1 -1
package/dist/v1/constants/constants.d.ts +7 -0
package/dist/v1/constants/constants.js +60 -0
package/dist/v1/constants/constants.js.map +1 -0
package/dist/v1/constants/directive-definitions.d.ts +30 -0
package/dist/v1/{utils/constants.js → constants/directive-definitions.js} +186 -454
package/dist/v1/constants/directive-definitions.js.map +1 -0
package/dist/v1/{utils/integer-constants.js → constants/integers.js} +1 -1
package/dist/v1/constants/integers.js.map +1 -0
package/dist/v1/constants/non-directive-definitions.d.ts +9 -0
package/dist/v1/constants/non-directive-definitions.js +166 -0
package/dist/v1/constants/non-directive-definitions.js.map +1 -0
package/dist/v1/constants/strings.d.ts +11 -0
package/dist/v1/constants/strings.js +82 -0
package/dist/v1/constants/strings.js.map +1 -0
package/dist/v1/constants/type-nodes.d.ts +3 -0
package/dist/v1/constants/type-nodes.js +15 -0
package/dist/v1/constants/type-nodes.js.map +1 -0
package/dist/v1/federation/federation-factory.d.ts +11 -11
package/dist/v1/federation/federation-factory.js +257 -147
package/dist/v1/federation/federation-factory.js.map +1 -1
package/dist/v1/federation/params.d.ts +7 -2
package/dist/v1/federation/utils.js +1 -1
package/dist/v1/federation/utils.js.map +1 -1
package/dist/v1/normalization/directive-definition-data.js +55 -53
package/dist/v1/normalization/directive-definition-data.js.map +1 -1
package/dist/v1/normalization/normalization-factory.d.ts +9 -8
package/dist/v1/normalization/normalization-factory.js +251 -239
package/dist/v1/normalization/normalization-factory.js.map +1 -1
package/dist/v1/normalization/types.d.ts +9 -1
package/dist/v1/normalization/utils.js +1 -1
package/dist/v1/normalization/utils.js.map +1 -1
package/dist/v1/normalization/walkers.js +21 -38
package/dist/v1/normalization/walkers.js.map +1 -1
package/dist/v1/utils/utils.js +15 -6
package/dist/v1/utils/utils.js.map +1 -1
package/package.json +2 -2
package/dist/v1/utils/constants.d.ts +0 -50
package/dist/v1/utils/constants.js.map +0 -1
package/dist/v1/utils/integer-constants.js.map +0 -1
package/dist/v1/utils/string-constants.d.ts +0 -7
package/dist/v1/utils/string-constants.js +0 -41
package/dist/v1/utils/string-constants.js.map +0 -1
/package/dist/v1/{utils/integer-constants.d.ts → constants/integers.d.ts} +0 -0

package/dist/v1/normalization/normalization-factory.js CHANGED Viewed

@@ -7,10 +7,10 @@ exports.batchNormalize = batchNormalize;
 const graphql_1 = require("graphql");
 const utils_1 = require("../../ast/utils");
 const utils_2 = require("./utils");
-const constants_1 = require("../utils/constants");
+const constants_1 = require("../constants/constants");
 const utils_3 = require("../utils/utils");
 const errors_1 = require("../../errors/errors");
-const string_constants_1 = require("../utils/string-constants");
+const strings_1 = require("../constants/strings");
 const buildASTSchema_1 = require("../../buildASTSchema/buildASTSchema");
 const merge_1 = require("@graphql-tools/merge");
 const subgraph_1 = require("../subgraph/subgraph");
@@ -20,11 +20,12 @@ const types_1 = require("../../schema-building/types");
 const utils_4 = require("../../schema-building/utils");
 const ast_1 = require("../../schema-building/ast");
 const graph_1 = require("../../resolvability-graph/graph");
-const integer_constants_1 = require("../utils/integer-constants");
-const string_constants_2 = require("../../utils/string-constants");
-const integer_constants_2 = require("../../utils/integer-constants");
+const integers_1 = require("../constants/integers");
+const string_constants_1 = require("../../utils/string-constants");
+const integer_constants_1 = require("../../utils/integer-constants");
 const utils_5 = require("../../utils/utils");
 const utils_6 = require("../../router-configuration/utils");
+const non_directive_definitions_1 = require("../constants/non-directive-definitions");
 function normalizeSubgraphFromString(subgraphSDL, noLocation = true) {
     const { error, documentNode } = (0, utils_1.safeParse)(subgraphSDL, noLocation);
     if (error || !documentNode) {
@@ -43,10 +44,10 @@ class NormalizationFactory {
     concreteTypeNamesByAbstractTypeName = new Map();
     conditionalFieldDataByCoords = new Map();
     configurationDataByTypeName = new Map();
-    customDirectiveDefinitions = new Map();
+    customDirectiveDefinitionByName = new Map();
     definedDirectiveNames = new Set();
-    directiveDefinitionByDirectiveName = new Map();
-    directiveDefinitionDataByDirectiveName = (0, utils_2.initializeDirectiveDefinitionDatas)();
+    directiveDefinitionByName = new Map();
+    directiveDefinitionDataByName = (0, utils_2.initializeDirectiveDefinitionDatas)();
     doesParentRequireFetchReasons = false;
     edfsDirectiveReferences = new Set();
     errors = new Array();
@@ -83,16 +84,13 @@ class NormalizationFactory {
     usesEdfsNatsStreamConfiguration = false;
     warnings = [];
     constructor(internalGraph, subgraphName) {
-        for (const [baseDirectiveName, baseDirectiveDefinition] of constants_1.BASE_DIRECTIVE_DEFINITION_BY_DIRECTIVE_NAME) {
-            this.directiveDefinitionByDirectiveName.set(baseDirectiveName, baseDirectiveDefinition);
-        }
-        this.subgraphName = subgraphName || string_constants_2.NOT_APPLICABLE;
+        this.subgraphName = subgraphName || string_constants_1.NOT_APPLICABLE;
         this.internalGraph = internalGraph;
         this.internalGraph.setSubgraphName(this.subgraphName);
         this.schemaData = {
             directivesByDirectiveName: new Map(),
             kind: graphql_1.Kind.SCHEMA_DEFINITION,
-            name: string_constants_2.SCHEMA,
+            name: string_constants_1.SCHEMA,
             operationTypes: new Map(),
         };
     }
@@ -120,7 +118,7 @@ class NormalizationFactory {
         }
     }
     isTypeNameRootType(typeName) {
-        return string_constants_2.ROOT_TYPE_NAMES.has(typeName) || this.operationTypeNodeByTypeName.has(typeName);
+        return string_constants_1.ROOT_TYPE_NAMES.has(typeName) || this.operationTypeNodeByTypeName.has(typeName);
     }
     isArgumentValueValid(typeNode, argumentValue) {
         if (argumentValue.kind === graphql_1.Kind.NULL) {
@@ -141,37 +139,37 @@ class NormalizationFactory {
             }
             case graphql_1.Kind.NAMED_TYPE: {
                 switch (typeNode.name.value) {
-                    case string_constants_2.BOOLEAN_SCALAR: {
+                    case string_constants_1.BOOLEAN_SCALAR: {
                         return argumentValue.kind === graphql_1.Kind.BOOLEAN;
                     }
-                    case string_constants_2.FLOAT_SCALAR: {
+                    case string_constants_1.FLOAT_SCALAR: {
                         return argumentValue.kind === graphql_1.Kind.FLOAT || argumentValue.kind === graphql_1.Kind.INT;
                     }
-                    case string_constants_2.ID_SCALAR: {
+                    case string_constants_1.ID_SCALAR: {
                         return argumentValue.kind === graphql_1.Kind.STRING || argumentValue.kind === graphql_1.Kind.INT;
                     }
-                    case string_constants_2.INT_SCALAR: {
+                    case string_constants_1.INT_SCALAR: {
                         return argumentValue.kind === graphql_1.Kind.INT;
                     }
-                    case string_constants_2.FIELD_SET_SCALAR:
+                    case string_constants_1.FIELD_SET_SCALAR:
                     // intentional fallthrough
-                    case string_constants_2.SCOPE_SCALAR:
+                    case string_constants_1.SCOPE_SCALAR:
                     // intentional fallthrough
-                    case string_constants_2.STRING_SCALAR: {
+                    case string_constants_1.STRING_SCALAR: {
                         return argumentValue.kind === graphql_1.Kind.STRING;
                     }
-                    case string_constants_2.LINK_IMPORT: {
+                    case string_constants_1.LINK_IMPORT: {
                         return true;
                     }
-                    case string_constants_2.LINK_PURPOSE: {
+                    case string_constants_1.LINK_PURPOSE: {
                         if (argumentValue.kind !== graphql_1.Kind.ENUM) {
                             return false;
                         }
-                        return argumentValue.value === string_constants_2.SECURITY || argumentValue.value === string_constants_2.EXECUTION;
+                        return argumentValue.value === string_constants_1.SECURITY || argumentValue.value === string_constants_1.EXECUTION;
                     }
-                    case string_constants_2.SUBSCRIPTION_FIELD_CONDITION:
+                    case string_constants_1.SUBSCRIPTION_FIELD_CONDITION:
                     // intentional fallthrough
-                    case string_constants_2.SUBSCRIPTION_FILTER_CONDITION:
+                    case string_constants_1.SUBSCRIPTION_FILTER_CONDITION:
                         return argumentValue.kind === graphql_1.Kind.OBJECT;
                     default: {
                         const parentData = this.parentDefinitionDataByTypeName.get(typeNode.name.value);
@@ -190,7 +188,7 @@ class NormalizationFactory {
                             if (!enumValue) {
                                 return false;
                             }
-                            return !enumValue.directivesByDirectiveName.has(string_constants_2.INACCESSIBLE);
+                            return !enumValue.directivesByDirectiveName.has(string_constants_1.INACCESSIBLE);
                         }
                         if (parentData.kind !== graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION) {
                             return false;
@@ -206,26 +204,26 @@ class NormalizationFactory {
         }
     }
     handleFieldInheritableDirectives({ directivesByDirectiveName, fieldName, inheritedDirectiveNames, parentData, }) {
-        if (this.doesParentRequireFetchReasons && !directivesByDirectiveName.has(string_constants_2.REQUIRE_FETCH_REASONS)) {
-            directivesByDirectiveName.set(string_constants_2.REQUIRE_FETCH_REASONS, [(0, utils_5.generateSimpleDirective)(string_constants_2.REQUIRE_FETCH_REASONS)]);
-            inheritedDirectiveNames.add(string_constants_2.REQUIRE_FETCH_REASONS);
+        if (this.doesParentRequireFetchReasons && !directivesByDirectiveName.has(string_constants_1.REQUIRE_FETCH_REASONS)) {
+            directivesByDirectiveName.set(string_constants_1.REQUIRE_FETCH_REASONS, [(0, utils_5.generateSimpleDirective)(string_constants_1.REQUIRE_FETCH_REASONS)]);
+            inheritedDirectiveNames.add(string_constants_1.REQUIRE_FETCH_REASONS);
         }
-        if (this.doesParentRequireFetchReasons || directivesByDirectiveName.has(string_constants_2.REQUIRE_FETCH_REASONS)) {
+        if (this.doesParentRequireFetchReasons || directivesByDirectiveName.has(string_constants_1.REQUIRE_FETCH_REASONS)) {
             parentData.requireFetchReasonsFieldNames.add(fieldName);
         }
         if (!(0, utils_3.isObjectDefinitionData)(parentData)) {
             return;
         }
-        if (this.isParentObjectExternal && !directivesByDirectiveName.has(string_constants_2.EXTERNAL)) {
-            directivesByDirectiveName.set(string_constants_2.EXTERNAL, [(0, utils_5.generateSimpleDirective)(string_constants_2.EXTERNAL)]);
-            inheritedDirectiveNames.add(string_constants_2.EXTERNAL);
+        if (this.isParentObjectExternal && !directivesByDirectiveName.has(string_constants_1.EXTERNAL)) {
+            directivesByDirectiveName.set(string_constants_1.EXTERNAL, [(0, utils_5.generateSimpleDirective)(string_constants_1.EXTERNAL)]);
+            inheritedDirectiveNames.add(string_constants_1.EXTERNAL);
         }
-        if (directivesByDirectiveName.has(string_constants_2.EXTERNAL)) {
+        if (directivesByDirectiveName.has(string_constants_1.EXTERNAL)) {
             this.unvalidatedExternalFieldCoords.add(`${parentData.name}.${fieldName}`);
         }
-        if (this.isParentObjectShareable && !directivesByDirectiveName.has(string_constants_2.SHAREABLE)) {
-            directivesByDirectiveName.set(string_constants_2.SHAREABLE, [(0, utils_5.generateSimpleDirective)(string_constants_2.SHAREABLE)]);
-            inheritedDirectiveNames.add(string_constants_2.SHAREABLE);
+        if (this.isParentObjectShareable && !directivesByDirectiveName.has(string_constants_1.SHAREABLE)) {
+            directivesByDirectiveName.set(string_constants_1.SHAREABLE, [(0, utils_5.generateSimpleDirective)(string_constants_1.SHAREABLE)]);
+            inheritedDirectiveNames.add(string_constants_1.SHAREABLE);
         }
     }
     extractDirectives(node, directivesByDirectiveName) {
@@ -237,7 +235,7 @@ class NormalizationFactory {
         for (const directiveNode of node.directives) {
             const directiveName = directiveNode.name.value;
             // Don't create pointless repetitions of @shareable
-            if (directiveName === string_constants_2.SHAREABLE) {
+            if (directiveName === string_constants_1.SHAREABLE) {
                 (0, utils_5.getValueOrDefault)(directivesByDirectiveName, directiveName, () => [directiveNode]);
             }
             else {
@@ -246,23 +244,23 @@ class NormalizationFactory {
             if (!isCompositeKind) {
                 continue;
             }
-            this.doesParentRequireFetchReasons ||= directiveName === string_constants_2.REQUIRE_FETCH_REASONS;
+            this.doesParentRequireFetchReasons ||= directiveName === string_constants_1.REQUIRE_FETCH_REASONS;
             if (!isObjectKind) {
                 continue;
             }
-            this.isParentObjectExternal ||= directiveName === string_constants_2.EXTERNAL;
-            this.isParentObjectShareable ||= directiveName === string_constants_2.SHAREABLE;
+            this.isParentObjectExternal ||= directiveName === string_constants_1.EXTERNAL;
+            this.isParentObjectShareable ||= directiveName === string_constants_1.SHAREABLE;
         }
         return directivesByDirectiveName;
     }
     validateDirective({ data, definitionData, directiveCoords, directiveNode, errorMessages, requiredArgumentNames, }) {
         const directiveName = directiveNode.name.value;
         const parentTypeName = data.kind === graphql_1.Kind.FIELD_DEFINITION ? data.renamedParentTypeName || data.originalParentTypeName : data.name;
-        const isAuthenticated = directiveName === string_constants_2.AUTHENTICATED;
+        const isAuthenticated = directiveName === string_constants_1.AUTHENTICATED;
         const isField = (0, utils_4.isFieldData)(data);
-        const isOverride = directiveName === string_constants_2.OVERRIDE;
-        const isRequiresScopes = directiveName === string_constants_2.REQUIRES_SCOPES;
-        const isSemanticNonNull = directiveName === string_constants_2.SEMANTIC_NON_NULL;
+        const isOverride = directiveName === string_constants_1.OVERRIDE;
+        const isRequiresScopes = directiveName === string_constants_1.REQUIRES_SCOPES;
+        const isSemanticNonNull = directiveName === string_constants_1.SEMANTIC_NON_NULL;
         if (!directiveNode.arguments || directiveNode.arguments.length < 1) {
             if (definitionData.requiredArgumentNames.size > 0) {
                 errorMessages.push((0, errors_1.undefinedRequiredArgumentsErrorMessage)(directiveName, requiredArgumentNames, []));
@@ -325,7 +323,7 @@ class NormalizationFactory {
                 });
                 continue;
             }
-            if (!isRequiresScopes || argumentName !== string_constants_2.SCOPES) {
+            if (!isRequiresScopes || argumentName !== string_constants_1.SCOPES) {
                 continue;
             }
             this.extractRequiredScopes({
@@ -363,7 +361,7 @@ class NormalizationFactory {
     validateDirectives(data, directiveCoords) {
         const undefinedDirectiveNames = new Set();
         for (const [directiveName, directiveNodes] of data.directivesByDirectiveName) {
-            const definitionData = this.directiveDefinitionDataByDirectiveName.get(directiveName);
+            const definitionData = this.directiveDefinitionDataByName.get(directiveName);
             if (!definitionData) {
                 if (!undefinedDirectiveNames.has(directiveName)) {
                     this.errors.push((0, errors_1.undefinedDirectiveError)(directiveName, directiveCoords));
@@ -445,7 +443,7 @@ class NormalizationFactory {
          * 2. It's a V2 subgraph (but extends is temporarily propagated to handle @external key fields)
          * 3. And (of course) if @extends isn't defined at all
          */
-        if (isRootType || !directivesByDirectiveName.has(string_constants_2.EXTENDS)) {
+        if (isRootType || !directivesByDirectiveName.has(string_constants_1.EXTENDS)) {
             return types_1.ExtensionType.NONE;
         }
         // If a V1 non-root Object defines @extends, it is considered an extension across subgraphs.
@@ -484,14 +482,14 @@ class NormalizationFactory {
         };
         for (const argument of directiveNode.arguments) {
             switch (argument.name.value) {
-                case string_constants_2.PROPAGATE: {
+                case string_constants_1.PROPAGATE: {
                     if (argument.value.kind != graphql_1.Kind.BOOLEAN) {
                         return;
                     }
                     configureDescriptionData.propagate = argument.value.value;
                     break;
                 }
-                case string_constants_2.DESCRIPTION_OVERRIDE: {
+                case string_constants_1.DESCRIPTION_OVERRIDE: {
                     if (argument.value.kind != graphql_1.Kind.STRING) {
                         return;
                     }
@@ -509,7 +507,7 @@ class NormalizationFactory {
         data.configureDescriptionDataBySubgraphName.set(this.subgraphName, configureDescriptionData);
     }
     extractConfigureDescriptionsData(data) {
-        const configureDescriptionNodes = data.directivesByDirectiveName.get(string_constants_2.CONFIGURE_DESCRIPTION);
+        const configureDescriptionNodes = data.directivesByDirectiveName.get(string_constants_1.CONFIGURE_DESCRIPTION);
         if (configureDescriptionNodes && configureDescriptionNodes.length == 1) {
             this.extractConfigureDescriptionData(data, configureDescriptionNodes[0]);
         }
@@ -538,8 +536,8 @@ class NormalizationFactory {
         this.extractImplementedInterfaceTypeNames(node, data.implementedInterfaceTypeNames);
         data.description ||= (0, utils_1.formatDescription)('description' in node ? node.description : undefined);
         this.extractConfigureDescriptionsData(data);
-        data.isEntity ||= data.directivesByDirectiveName.has(string_constants_2.KEY);
-        data.isInaccessible ||= data.directivesByDirectiveName.has(string_constants_2.INACCESSIBLE);
+        data.isEntity ||= data.directivesByDirectiveName.has(string_constants_1.KEY);
+        data.isInaccessible ||= data.directivesByDirectiveName.has(string_constants_1.INACCESSIBLE);
         data.subgraphNames.add(this.subgraphName);
     }
     addConcreteTypeNamesForImplementedInterfaces(interfaceTypeNames, concreteTypeName) {
@@ -604,7 +602,7 @@ class NormalizationFactory {
             if (handledLocations.has(locationName)) {
                 continue;
             }
-            if (!string_constants_2.EXECUTABLE_DIRECTIVE_LOCATIONS.has(locationName) && !string_constants_1.TYPE_SYSTEM_DIRECTIVE_LOCATIONS.has(locationName)) {
+            if (!string_constants_1.EXECUTABLE_DIRECTIVE_LOCATIONS.has(locationName) && !strings_1.TYPE_SYSTEM_DIRECTIVE_LOCATIONS.has(locationName)) {
                 errorMessages.push((0, errors_1.invalidDirectiveDefinitionLocationErrorMessage)(locationName));
                 handledLocations.add(locationName);
                 continue;
@@ -662,18 +660,23 @@ class NormalizationFactory {
             return false;
         }
         this.definedDirectiveNames.add(name);
-        this.directiveDefinitionByDirectiveName.set(name, node);
         // Normalize federation directives by replacing them with predefined definitions
-        if (constants_1.V2_DIRECTIVE_DEFINITION_BY_DIRECTIVE_NAME.has(name)) {
+        const definition = constants_1.V2_DIRECTIVE_DEFINITION_BY_DIRECTIVE_NAME.get(name);
+        // Add the V2 directive definitions regardless of use so the subgraph can be recognised as a V2 subgraph.
+        if (definition) {
+            this.directiveDefinitionByName.set(name, definition);
+            // Uses of the directive also set this boolean in the walker.
             this.isSubgraphVersionTwo = true;
             return false;
         }
-        if (constants_1.ALL_IN_BUILT_DIRECTIVE_NAMES.has(name)) {
+        // Other known directives will only be added if they are used.
+        if (constants_1.DIRECTIVE_DEFINITION_BY_NAME.has(name)) {
             return false;
         }
+        this.directiveDefinitionByName.set(name, node);
         const errorMessages = [];
         const { argumentTypeNodeByName, optionalArgumentNames, requiredArgumentNames } = this.extractArgumentData(node.arguments, errorMessages);
-        this.directiveDefinitionDataByDirectiveName.set(name, {
+        this.directiveDefinitionDataByName.set(name, {
             argumentTypeNodeByName: argumentTypeNodeByName,
             isRepeatable: node.repeatable,
             locations: this.extractDirectiveLocations(node, errorMessages),
@@ -701,7 +704,7 @@ class NormalizationFactory {
             ]),
             federatedCoords: `${parentTypeName}.${name}`,
             inheritedDirectiveNames,
-            isInaccessible: directivesByDirectiveName.has(string_constants_2.INACCESSIBLE),
+            isInaccessible: directivesByDirectiveName.has(string_constants_1.INACCESSIBLE),
             isShareableBySubgraphName: new Map([[this.subgraphName, isShareable]]),
             kind: graphql_1.Kind.FIELD_DEFINITION,
             name,
@@ -732,7 +735,7 @@ class NormalizationFactory {
             ? `${originalParentTypeName}${fieldName ? `.${fieldName}` : ''}(${name}: ...)`
             : `${originalParentTypeName}.${name}`;
         if (node.defaultValue && !(0, utils_4.areDefaultValuesCompatible)(node.type, node.defaultValue)) {
-            this.errors.push((0, errors_1.incompatibleInputValueDefaultValueTypeError)((isArgument ? string_constants_2.ARGUMENT : string_constants_2.INPUT_FIELD) + ` "${name}"`, originalCoords, (0, merge_1.printTypeNode)(node.type), (0, graphql_1.print)(node.defaultValue)));
+            this.errors.push((0, errors_1.incompatibleInputValueDefaultValueTypeError)((isArgument ? string_constants_1.ARGUMENT : string_constants_1.INPUT_FIELD) + ` "${name}"`, originalCoords, (0, merge_1.printTypeNode)(node.type), (0, graphql_1.print)(node.defaultValue)));
         }
         const federatedCoords = isArgument
             ? `${federatedParentTypeName}${fieldName ? `.${fieldName}` : ''}(${name}: ...)`
@@ -788,8 +791,8 @@ class NormalizationFactory {
             extensionType,
             fieldDataByName: new Map(),
             implementedInterfaceTypeNames: this.extractImplementedInterfaceTypeNames(node, new Set()),
-            isEntity: directivesByDirectiveName.has(string_constants_2.KEY),
-            isInaccessible: directivesByDirectiveName.has(string_constants_2.INACCESSIBLE),
+            isEntity: directivesByDirectiveName.has(string_constants_1.KEY),
+            isInaccessible: directivesByDirectiveName.has(string_constants_1.INACCESSIBLE),
             kind: graphql_1.Kind.INTERFACE_TYPE_DEFINITION,
             name: typeName,
             node: (0, ast_1.getMutableInterfaceNode)(node.name),
@@ -808,11 +811,11 @@ class NormalizationFactory {
         }
         switch (operationTypeNode) {
             case graphql_1.OperationTypeNode.MUTATION:
-                return string_constants_2.MUTATION;
+                return string_constants_1.MUTATION;
             case graphql_1.OperationTypeNode.SUBSCRIPTION:
-                return string_constants_2.SUBSCRIPTION;
+                return string_constants_1.SUBSCRIPTION;
             default:
-                return string_constants_2.QUERY;
+                return string_constants_1.QUERY;
         }
     }
     addInterfaceObjectFieldsByNode(node) {
@@ -838,13 +841,13 @@ class NormalizationFactory {
                 return;
             }
             this.updateCompositeOutputDataByNode(node, parentData, extensionType);
-            if (!directivesByDirectiveName.has(string_constants_2.INTERFACE_OBJECT)) {
+            if (!directivesByDirectiveName.has(string_constants_1.INTERFACE_OBJECT)) {
                 this.addConcreteTypeNamesForImplementedInterfaces(parentData.implementedInterfaceTypeNames, typeName);
             }
             return;
         }
         const implementedInterfaceTypeNames = this.extractImplementedInterfaceTypeNames(node, new Set());
-        if (!directivesByDirectiveName.has(string_constants_2.INTERFACE_OBJECT)) {
+        if (!directivesByDirectiveName.has(string_constants_1.INTERFACE_OBJECT)) {
             this.addConcreteTypeNamesForImplementedInterfaces(implementedInterfaceTypeNames, typeName);
         }
         const newParentData = {
@@ -853,8 +856,8 @@ class NormalizationFactory {
             extensionType,
             fieldDataByName: new Map(),
             implementedInterfaceTypeNames,
-            isEntity: directivesByDirectiveName.has(string_constants_2.KEY),
-            isInaccessible: directivesByDirectiveName.has(string_constants_2.INACCESSIBLE),
+            isEntity: directivesByDirectiveName.has(string_constants_1.KEY),
+            isInaccessible: directivesByDirectiveName.has(string_constants_1.INACCESSIBLE),
             isRootType,
             kind: graphql_1.Kind.OBJECT_TYPE_DEFINITION,
             name: typeName,
@@ -880,7 +883,7 @@ class NormalizationFactory {
                 return;
             }
             this.setParentDataExtensionType(parentData, extensionType);
-            parentData.isInaccessible ||= directivesByDirectiveName.has(string_constants_2.INACCESSIBLE);
+            parentData.isInaccessible ||= directivesByDirectiveName.has(string_constants_1.INACCESSIBLE);
             parentData.subgraphNames.add(this.subgraphName);
             parentData.description ||= (0, utils_1.formatDescription)('description' in node ? node.description : undefined);
             this.extractConfigureDescriptionsData(parentData);
@@ -892,7 +895,7 @@ class NormalizationFactory {
             directivesByDirectiveName,
             extensionType,
             enumValueDataByName: new Map(),
-            isInaccessible: directivesByDirectiveName.has(string_constants_2.INACCESSIBLE),
+            isInaccessible: directivesByDirectiveName.has(string_constants_1.INACCESSIBLE),
             kind: graphql_1.Kind.ENUM_TYPE_DEFINITION,
             name: typeName,
             node: (0, ast_1.getMutableEnumNode)(node.name),
@@ -911,21 +914,26 @@ class NormalizationFactory {
         if (parentData) {
             if (parentData.kind !== graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION) {
                 this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToNodeType)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
-                return;
+                return {
+                    success: false,
+                };
             }
             this.setParentDataExtensionType(parentData, extensionType);
-            parentData.isInaccessible ||= directivesByDirectiveName.has(string_constants_2.INACCESSIBLE);
+            parentData.isInaccessible ||= directivesByDirectiveName.has(string_constants_1.INACCESSIBLE);
             parentData.subgraphNames.add(this.subgraphName);
             parentData.description ||= (0, utils_1.formatDescription)('description' in node ? node.description : undefined);
             this.extractConfigureDescriptionsData(parentData);
-            return;
+            return {
+                success: true,
+                data: parentData,
+            };
         }
         const newParentData = {
             configureDescriptionDataBySubgraphName: new Map(),
             directivesByDirectiveName,
             extensionType,
             inputValueDataByName: new Map(),
-            isInaccessible: directivesByDirectiveName.has(string_constants_2.INACCESSIBLE),
+            isInaccessible: directivesByDirectiveName.has(string_constants_1.INACCESSIBLE),
             kind: graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION,
             name: typeName,
             node: (0, ast_1.getMutableInputObjectNode)(node.name),
@@ -935,6 +943,10 @@ class NormalizationFactory {
         };
         this.extractConfigureDescriptionsData(newParentData);
         this.parentDefinitionDataByTypeName.set(typeName, newParentData);
+        return {
+            success: true,
+            data: newParentData,
+        };
     }
     upsertScalarByNode(node, isRealExtension = false) {
         const typeName = node.name.value;
@@ -1036,7 +1048,7 @@ class NormalizationFactory {
         // full validation happens elsewhere
         let keyNumber = 0;
         for (const directive of node.directives) {
-            if (directive.name.value !== string_constants_2.KEY) {
+            if (directive.name.value !== string_constants_1.KEY) {
                 continue;
             }
             keyNumber += 1;
@@ -1046,13 +1058,13 @@ class NormalizationFactory {
             let rawFieldSet;
             let isUnresolvable = false;
             for (const arg of directive.arguments) {
-                if (arg.name.value === string_constants_2.RESOLVABLE) {
+                if (arg.name.value === string_constants_1.RESOLVABLE) {
                     if (arg.value.kind === graphql_1.Kind.BOOLEAN && !arg.value.value) {
                         isUnresolvable = true;
                     }
                     continue;
                 }
-                if (arg.name.value !== string_constants_2.FIELDS) {
+                if (arg.name.value !== string_constants_1.FIELDS) {
                     rawFieldSet = undefined;
                     break;
                 }
@@ -1067,7 +1079,7 @@ class NormalizationFactory {
             }
             const { error, documentNode } = (0, utils_1.safeParse)('{' + rawFieldSet + '}');
             if (error || !documentNode) {
-                this.errors.push((0, errors_1.invalidDirectiveError)(string_constants_2.KEY, parentTypeName, (0, utils_5.numberToOrdinal)(keyNumber), [
+                this.errors.push((0, errors_1.invalidDirectiveError)(string_constants_1.KEY, parentTypeName, (0, utils_5.numberToOrdinal)(keyNumber), [
                     (0, errors_1.unparsableFieldSetErrorMessage)(rawFieldSet, error),
                 ]));
                 continue;
@@ -1373,7 +1385,7 @@ class NormalizationFactory {
              * For V2 subgraphs, this will propagate as an error; for V1 subgraphs, this will propagate as a warning.
              * */
             if (errorMessages.length > 0) {
-                allErrorMessages.push(` On field "${fieldCoords}":\n -` + errorMessages.join(string_constants_2.HYPHEN_JOIN));
+                allErrorMessages.push(` On field "${fieldCoords}":\n -` + errorMessages.join(string_constants_1.HYPHEN_JOIN));
                 continue;
             }
             if (configuration) {
@@ -1392,7 +1404,7 @@ class NormalizationFactory {
         if (data.implementedInterfaceTypeNames.size < 1) {
             return;
         }
-        const isParentInaccessible = data.directivesByDirectiveName.has(string_constants_2.INACCESSIBLE);
+        const isParentInaccessible = data.directivesByDirectiveName.has(string_constants_1.INACCESSIBLE);
         const implementationErrorsMap = new Map();
         const invalidImplementationTypeStringByTypeName = new Map();
         let doesInterfaceImplementItself = false;
@@ -1537,7 +1549,7 @@ class NormalizationFactory {
                 }
             }
         }
-        const levelsArg = directiveNode.arguments?.find((arg) => arg.name.value === string_constants_2.LEVELS);
+        const levelsArg = directiveNode.arguments?.find((arg) => arg.name.value === string_constants_1.LEVELS);
         if (!levelsArg || levelsArg.value.kind !== graphql_1.Kind.LIST) {
             // Should never happen because the argument will have just been validated.
             errorMessages.push(errors_1.semanticNonNullArgumentErrorMessage);
@@ -1589,19 +1601,19 @@ class NormalizationFactory {
     }
     getKafkaPublishConfiguration(directive, argumentDataByArgumentName, fieldName, errorMessages) {
         const topics = [];
-        let providerId = string_constants_2.DEFAULT_EDFS_PROVIDER_ID;
+        let providerId = string_constants_1.DEFAULT_EDFS_PROVIDER_ID;
         for (const argumentNode of directive.arguments || []) {
             switch (argumentNode.name.value) {
-                case string_constants_2.TOPIC: {
+                case string_constants_1.TOPIC: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
-                        errorMessages.push((0, errors_1.invalidEventSubjectErrorMessage)(string_constants_2.TOPIC));
+                        errorMessages.push((0, errors_1.invalidEventSubjectErrorMessage)(string_constants_1.TOPIC));
                         continue;
                     }
                     (0, utils_2.validateArgumentTemplateReferences)(argumentNode.value.value, argumentDataByArgumentName, errorMessages);
                     topics.push(argumentNode.value.value);
                     break;
                 }
-                case string_constants_2.PROVIDER_ID: {
+                case string_constants_1.PROVIDER_ID: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
                         errorMessages.push(errors_1.invalidEventProviderIdErrorMessage);
                         continue;
@@ -1614,22 +1626,22 @@ class NormalizationFactory {
         if (errorMessages.length > 0) {
             return;
         }
-        return { fieldName, providerId, providerType: string_constants_2.PROVIDER_TYPE_KAFKA, topics, type: string_constants_2.PUBLISH };
+        return { fieldName, providerId, providerType: string_constants_1.PROVIDER_TYPE_KAFKA, topics, type: string_constants_1.PUBLISH };
     }
     getKafkaSubscribeConfiguration(directive, argumentDataByArgumentName, fieldName, errorMessages) {
         const topics = [];
-        let providerId = string_constants_2.DEFAULT_EDFS_PROVIDER_ID;
+        let providerId = string_constants_1.DEFAULT_EDFS_PROVIDER_ID;
         for (const argumentNode of directive.arguments || []) {
             switch (argumentNode.name.value) {
-                case string_constants_2.TOPICS: {
+                case string_constants_1.TOPICS: {
                     //@TODO list coercion
                     if (argumentNode.value.kind !== graphql_1.Kind.LIST) {
-                        errorMessages.push((0, errors_1.invalidEventSubjectsErrorMessage)(string_constants_2.TOPICS));
+                        errorMessages.push((0, errors_1.invalidEventSubjectsErrorMessage)(string_constants_1.TOPICS));
                         continue;
                     }
                     for (const value of argumentNode.value.values) {
                         if (value.kind !== graphql_1.Kind.STRING || value.value.length < 1) {
-                            errorMessages.push((0, errors_1.invalidEventSubjectsItemErrorMessage)(string_constants_2.TOPICS));
+                            errorMessages.push((0, errors_1.invalidEventSubjectsItemErrorMessage)(string_constants_1.TOPICS));
                             break;
                         }
                         (0, utils_2.validateArgumentTemplateReferences)(value.value, argumentDataByArgumentName, errorMessages);
@@ -1637,7 +1649,7 @@ class NormalizationFactory {
                     }
                     break;
                 }
-                case string_constants_2.PROVIDER_ID: {
+                case string_constants_1.PROVIDER_ID: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
                         errorMessages.push(errors_1.invalidEventProviderIdErrorMessage);
                         continue;
@@ -1653,26 +1665,26 @@ class NormalizationFactory {
         return {
             fieldName,
             providerId,
-            providerType: string_constants_2.PROVIDER_TYPE_KAFKA,
+            providerType: string_constants_1.PROVIDER_TYPE_KAFKA,
             topics: topics,
-            type: string_constants_2.SUBSCRIBE,
+            type: string_constants_1.SUBSCRIBE,
         };
     }
     getNatsPublishAndRequestConfiguration(eventType, directive, argumentDataByArgumentName, fieldName, errorMessages) {
         const subjects = [];
-        let providerId = string_constants_2.DEFAULT_EDFS_PROVIDER_ID;
+        let providerId = string_constants_1.DEFAULT_EDFS_PROVIDER_ID;
         for (const argumentNode of directive.arguments || []) {
             switch (argumentNode.name.value) {
-                case string_constants_2.SUBJECT: {
+                case string_constants_1.SUBJECT: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
-                        errorMessages.push((0, errors_1.invalidEventSubjectErrorMessage)(string_constants_2.SUBJECT));
+                        errorMessages.push((0, errors_1.invalidEventSubjectErrorMessage)(string_constants_1.SUBJECT));
                         continue;
                     }
                     (0, utils_2.validateArgumentTemplateReferences)(argumentNode.value.value, argumentDataByArgumentName, errorMessages);
                     subjects.push(argumentNode.value.value);
                     break;
                 }
-                case string_constants_2.PROVIDER_ID: {
+                case string_constants_1.PROVIDER_ID: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
                         errorMessages.push(errors_1.invalidEventProviderIdErrorMessage);
                         continue;
@@ -1685,25 +1697,25 @@ class NormalizationFactory {
         if (errorMessages.length > 0) {
             return;
         }
-        return { fieldName, providerId, providerType: string_constants_2.PROVIDER_TYPE_NATS, subjects, type: eventType };
+        return { fieldName, providerId, providerType: string_constants_1.PROVIDER_TYPE_NATS, subjects, type: eventType };
     }
     getNatsSubscribeConfiguration(directive, argumentDataByArgumentName, fieldName, errorMessages) {
         const subjects = [];
-        let providerId = string_constants_2.DEFAULT_EDFS_PROVIDER_ID;
-        let consumerInactiveThreshold = integer_constants_1.DEFAULT_CONSUMER_INACTIVE_THRESHOLD;
+        let providerId = string_constants_1.DEFAULT_EDFS_PROVIDER_ID;
+        let consumerInactiveThreshold = integers_1.DEFAULT_CONSUMER_INACTIVE_THRESHOLD;
         let consumerName = '';
         let streamName = '';
         for (const argumentNode of directive.arguments || []) {
             switch (argumentNode.name.value) {
-                case string_constants_2.SUBJECTS: {
+                case string_constants_1.SUBJECTS: {
                     // @TODO list coercion
                     if (argumentNode.value.kind !== graphql_1.Kind.LIST) {
-                        errorMessages.push((0, errors_1.invalidEventSubjectsErrorMessage)(string_constants_2.SUBJECTS));
+                        errorMessages.push((0, errors_1.invalidEventSubjectsErrorMessage)(string_constants_1.SUBJECTS));
                         continue;
                     }
                     for (const value of argumentNode.value.values) {
                         if (value.kind !== graphql_1.Kind.STRING || value.value.length < 1) {
-                            errorMessages.push((0, errors_1.invalidEventSubjectsItemErrorMessage)(string_constants_2.SUBJECTS));
+                            errorMessages.push((0, errors_1.invalidEventSubjectsItemErrorMessage)(string_constants_1.SUBJECTS));
                             break;
                         }
                         (0, utils_2.validateArgumentTemplateReferences)(value.value, argumentDataByArgumentName, errorMessages);
@@ -1711,7 +1723,7 @@ class NormalizationFactory {
                     }
                     break;
                 }
-                case string_constants_2.PROVIDER_ID: {
+                case string_constants_1.PROVIDER_ID: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
                         errorMessages.push(errors_1.invalidEventProviderIdErrorMessage);
                         continue;
@@ -1719,7 +1731,7 @@ class NormalizationFactory {
                     providerId = argumentNode.value.value;
                     break;
                 }
-                case string_constants_2.STREAM_CONFIGURATION: {
+                case string_constants_1.STREAM_CONFIGURATION: {
                     this.usesEdfsNatsStreamConfiguration = true;
                     if (argumentNode.value.kind !== graphql_1.Kind.OBJECT || argumentNode.value.fields.length < 1) {
                         errorMessages.push(errors_1.invalidNatsStreamInputErrorMessage);
@@ -1727,13 +1739,13 @@ class NormalizationFactory {
                     }
                     let isValid = true;
                     const invalidFieldNames = new Set();
-                    const allowedFieldNames = new Set(string_constants_1.STREAM_CONFIGURATION_FIELD_NAMES);
-                    const missingRequiredFieldNames = new Set([string_constants_2.CONSUMER_NAME, string_constants_2.STREAM_NAME]);
+                    const allowedFieldNames = new Set(strings_1.STREAM_CONFIGURATION_FIELD_NAMES);
+                    const missingRequiredFieldNames = new Set([string_constants_1.CONSUMER_NAME, string_constants_1.STREAM_NAME]);
                     const duplicateFieldNames = new Set();
                     const invalidRequiredFieldNames = new Set();
                     for (const field of argumentNode.value.fields) {
                         const fieldName = field.name.value;
-                        if (!string_constants_1.STREAM_CONFIGURATION_FIELD_NAMES.has(fieldName)) {
+                        if (!strings_1.STREAM_CONFIGURATION_FIELD_NAMES.has(fieldName)) {
                             invalidFieldNames.add(fieldName);
                             isValid = false;
                             continue;
@@ -1750,7 +1762,7 @@ class NormalizationFactory {
                             missingRequiredFieldNames.delete(fieldName);
                         }
                         switch (fieldName) {
-                            case string_constants_2.CONSUMER_NAME:
+                            case string_constants_1.CONSUMER_NAME:
                                 if (field.value.kind != graphql_1.Kind.STRING || field.value.value.length < 1) {
                                     invalidRequiredFieldNames.add(fieldName);
                                     isValid = false;
@@ -1758,7 +1770,7 @@ class NormalizationFactory {
                                 }
                                 consumerName = field.value.value;
                                 break;
-                            case string_constants_2.STREAM_NAME:
+                            case string_constants_1.STREAM_NAME:
                                 if (field.value.kind != graphql_1.Kind.STRING || field.value.value.length < 1) {
                                     invalidRequiredFieldNames.add(fieldName);
                                     isValid = false;
@@ -1766,9 +1778,9 @@ class NormalizationFactory {
                                 }
                                 streamName = field.value.value;
                                 break;
-                            case string_constants_2.CONSUMER_INACTIVE_THRESHOLD:
+                            case string_constants_1.CONSUMER_INACTIVE_THRESHOLD:
                                 if (field.value.kind != graphql_1.Kind.INT) {
-                                    errorMessages.push((0, errors_1.invalidArgumentValueErrorMessage)((0, graphql_1.print)(field.value), 'edfs__NatsStreamConfiguration', `consumerInactiveThreshold`, string_constants_2.INT_SCALAR));
+                                    errorMessages.push((0, errors_1.invalidArgumentValueErrorMessage)((0, graphql_1.print)(field.value), 'edfs__NatsStreamConfiguration', `consumerInactiveThreshold`, string_constants_1.INT_SCALAR));
                                     isValid = false;
                                     continue;
                                 }
@@ -1777,7 +1789,7 @@ class NormalizationFactory {
                                     consumerInactiveThreshold = parseInt(field.value.value, 10);
                                 }
                                 catch (e) {
-                                    errorMessages.push((0, errors_1.invalidArgumentValueErrorMessage)((0, graphql_1.print)(field.value), 'edfs__NatsStreamConfiguration', `consumerInactiveThreshold`, string_constants_2.INT_SCALAR));
+                                    errorMessages.push((0, errors_1.invalidArgumentValueErrorMessage)((0, graphql_1.print)(field.value), 'edfs__NatsStreamConfiguration', `consumerInactiveThreshold`, string_constants_1.INT_SCALAR));
                                     isValid = false;
                                 }
                                 break;
@@ -1793,19 +1805,19 @@ class NormalizationFactory {
             return;
         }
         if (consumerInactiveThreshold < 0) {
-            consumerInactiveThreshold = integer_constants_1.DEFAULT_CONSUMER_INACTIVE_THRESHOLD;
-            this.warnings.push((0, warnings_1.consumerInactiveThresholdInvalidValueWarning)(this.subgraphName, `The value has been set to ${integer_constants_1.DEFAULT_CONSUMER_INACTIVE_THRESHOLD}.`));
+            consumerInactiveThreshold = integers_1.DEFAULT_CONSUMER_INACTIVE_THRESHOLD;
+            this.warnings.push((0, warnings_1.consumerInactiveThresholdInvalidValueWarning)(this.subgraphName, `The value has been set to ${integers_1.DEFAULT_CONSUMER_INACTIVE_THRESHOLD}.`));
         }
-        else if (consumerInactiveThreshold > integer_constants_2.MAX_INT32) {
+        else if (consumerInactiveThreshold > integer_constants_1.MAX_INT32) {
             consumerInactiveThreshold = 0;
             this.warnings.push((0, warnings_1.consumerInactiveThresholdInvalidValueWarning)(this.subgraphName, 'The value has been set to 0. This means the consumer will remain indefinitely active until its manual deletion.'));
         }
         return {
             fieldName,
             providerId,
-            providerType: string_constants_2.PROVIDER_TYPE_NATS,
+            providerType: string_constants_1.PROVIDER_TYPE_NATS,
             subjects,
-            type: string_constants_2.SUBSCRIBE,
+            type: string_constants_1.SUBSCRIBE,
             ...(consumerName && streamName
                 ? {
                     streamConfiguration: {
@@ -1819,19 +1831,19 @@ class NormalizationFactory {
     }
     getRedisPublishConfiguration(directive, argumentDataByArgumentName, fieldName, errorMessages) {
         const channels = [];
-        let providerId = string_constants_2.DEFAULT_EDFS_PROVIDER_ID;
+        let providerId = string_constants_1.DEFAULT_EDFS_PROVIDER_ID;
         for (const argumentNode of directive.arguments || []) {
             switch (argumentNode.name.value) {
-                case string_constants_2.CHANNEL: {
+                case string_constants_1.CHANNEL: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
-                        errorMessages.push((0, errors_1.invalidEventSubjectErrorMessage)(string_constants_2.CHANNEL));
+                        errorMessages.push((0, errors_1.invalidEventSubjectErrorMessage)(string_constants_1.CHANNEL));
                         continue;
                     }
                     (0, utils_2.validateArgumentTemplateReferences)(argumentNode.value.value, argumentDataByArgumentName, errorMessages);
                     channels.push(argumentNode.value.value);
                     break;
                 }
-                case string_constants_2.PROVIDER_ID: {
+                case string_constants_1.PROVIDER_ID: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
                         errorMessages.push(errors_1.invalidEventProviderIdErrorMessage);
                         continue;
@@ -1844,22 +1856,22 @@ class NormalizationFactory {
         if (errorMessages.length > 0) {
             return;
         }
-        return { fieldName, providerId, providerType: string_constants_2.PROVIDER_TYPE_REDIS, channels, type: string_constants_2.PUBLISH };
+        return { fieldName, providerId, providerType: string_constants_1.PROVIDER_TYPE_REDIS, channels, type: string_constants_1.PUBLISH };
     }
     getRedisSubscribeConfiguration(directive, argumentDataByArgumentName, fieldName, errorMessages) {
         const channels = [];
-        let providerId = string_constants_2.DEFAULT_EDFS_PROVIDER_ID;
+        let providerId = string_constants_1.DEFAULT_EDFS_PROVIDER_ID;
         for (const argumentNode of directive.arguments || []) {
             switch (argumentNode.name.value) {
-                case string_constants_2.CHANNELS: {
+                case string_constants_1.CHANNELS: {
                     //@TODO list coercion
                     if (argumentNode.value.kind !== graphql_1.Kind.LIST) {
-                        errorMessages.push((0, errors_1.invalidEventSubjectsErrorMessage)(string_constants_2.CHANNELS));
+                        errorMessages.push((0, errors_1.invalidEventSubjectsErrorMessage)(string_constants_1.CHANNELS));
                         continue;
                     }
                     for (const value of argumentNode.value.values) {
                         if (value.kind !== graphql_1.Kind.STRING || value.value.length < 1) {
-                            errorMessages.push((0, errors_1.invalidEventSubjectsItemErrorMessage)(string_constants_2.CHANNELS));
+                            errorMessages.push((0, errors_1.invalidEventSubjectsItemErrorMessage)(string_constants_1.CHANNELS));
                             break;
                         }
                         (0, utils_2.validateArgumentTemplateReferences)(value.value, argumentDataByArgumentName, errorMessages);
@@ -1867,7 +1879,7 @@ class NormalizationFactory {
                     }
                     break;
                 }
-                case string_constants_2.PROVIDER_ID: {
+                case string_constants_1.PROVIDER_ID: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
                         errorMessages.push(errors_1.invalidEventProviderIdErrorMessage);
                         continue;
@@ -1883,9 +1895,9 @@ class NormalizationFactory {
         return {
             fieldName,
             providerId,
-            providerType: string_constants_2.PROVIDER_TYPE_REDIS,
+            providerType: string_constants_1.PROVIDER_TYPE_REDIS,
             channels,
-            type: string_constants_2.SUBSCRIBE,
+            type: string_constants_1.SUBSCRIBE,
         };
     }
     validateSubscriptionFilterDirectiveLocation(node) {
@@ -1896,7 +1908,7 @@ class NormalizationFactory {
         const fieldCoords = `${parentTypeName}.${node.name.value}`;
         const isSubscription = this.getOperationTypeNodeForRootTypeName(parentTypeName) === graphql_1.OperationTypeNode.SUBSCRIPTION;
         for (const directiveNode of node.directives) {
-            if (directiveNode.name.value !== string_constants_2.SUBSCRIPTION_FILTER) {
+            if (directiveNode.name.value !== string_constants_1.SUBSCRIPTION_FILTER) {
                 continue;
             }
             if (!isSubscription) {
@@ -1916,29 +1928,29 @@ class NormalizationFactory {
             const errorMessages = [];
             let eventConfiguration;
             switch (directive.name.value) {
-                case string_constants_2.EDFS_KAFKA_PUBLISH:
+                case string_constants_1.EDFS_KAFKA_PUBLISH:
                     eventConfiguration = this.getKafkaPublishConfiguration(directive, argumentDataByArgumentName, fieldName, errorMessages);
                     break;
-                case string_constants_2.EDFS_KAFKA_SUBSCRIBE:
+                case string_constants_1.EDFS_KAFKA_SUBSCRIBE:
                     eventConfiguration = this.getKafkaSubscribeConfiguration(directive, argumentDataByArgumentName, fieldName, errorMessages);
                     break;
-                case string_constants_2.EDFS_NATS_PUBLISH: {
-                    eventConfiguration = this.getNatsPublishAndRequestConfiguration(string_constants_2.PUBLISH, directive, argumentDataByArgumentName, fieldName, errorMessages);
+                case string_constants_1.EDFS_NATS_PUBLISH: {
+                    eventConfiguration = this.getNatsPublishAndRequestConfiguration(string_constants_1.PUBLISH, directive, argumentDataByArgumentName, fieldName, errorMessages);
                     break;
                 }
-                case string_constants_2.EDFS_NATS_REQUEST: {
-                    eventConfiguration = this.getNatsPublishAndRequestConfiguration(string_constants_2.REQUEST, directive, argumentDataByArgumentName, fieldName, errorMessages);
+                case string_constants_1.EDFS_NATS_REQUEST: {
+                    eventConfiguration = this.getNatsPublishAndRequestConfiguration(string_constants_1.REQUEST, directive, argumentDataByArgumentName, fieldName, errorMessages);
                     break;
                 }
-                case string_constants_2.EDFS_NATS_SUBSCRIBE: {
+                case string_constants_1.EDFS_NATS_SUBSCRIBE: {
                     eventConfiguration = this.getNatsSubscribeConfiguration(directive, argumentDataByArgumentName, fieldName, errorMessages);
                     break;
                 }
-                case string_constants_2.EDFS_REDIS_PUBLISH: {
+                case string_constants_1.EDFS_REDIS_PUBLISH: {
                     eventConfiguration = this.getRedisPublishConfiguration(directive, argumentDataByArgumentName, fieldName, errorMessages);
                     break;
                 }
-                case string_constants_2.EDFS_REDIS_SUBSCRIBE: {
+                case string_constants_1.EDFS_REDIS_SUBSCRIBE: {
                     eventConfiguration = this.getRedisSubscribeConfiguration(directive, argumentDataByArgumentName, fieldName, errorMessages);
                     break;
                 }
@@ -1959,11 +1971,11 @@ class NormalizationFactory {
     getValidEventsDirectiveNamesForOperationTypeNode(operationTypeNode) {
         switch (operationTypeNode) {
             case graphql_1.OperationTypeNode.MUTATION:
-                return new Set([string_constants_2.EDFS_KAFKA_PUBLISH, string_constants_2.EDFS_NATS_PUBLISH, string_constants_2.EDFS_NATS_REQUEST, string_constants_2.EDFS_REDIS_PUBLISH]);
+                return new Set([string_constants_1.EDFS_KAFKA_PUBLISH, string_constants_1.EDFS_NATS_PUBLISH, string_constants_1.EDFS_NATS_REQUEST, string_constants_1.EDFS_REDIS_PUBLISH]);
             case graphql_1.OperationTypeNode.QUERY:
-                return new Set([string_constants_2.EDFS_NATS_REQUEST]);
+                return new Set([string_constants_1.EDFS_NATS_REQUEST]);
             case graphql_1.OperationTypeNode.SUBSCRIPTION:
-                return new Set([string_constants_2.EDFS_KAFKA_SUBSCRIBE, string_constants_2.EDFS_NATS_SUBSCRIBE, string_constants_2.EDFS_REDIS_SUBSCRIBE]);
+                return new Set([string_constants_1.EDFS_KAFKA_SUBSCRIBE, string_constants_1.EDFS_NATS_SUBSCRIBE, string_constants_1.EDFS_REDIS_SUBSCRIBE]);
         }
     }
     getOperationTypeNodeForRootTypeName(parentTypeName) {
@@ -1972,11 +1984,11 @@ class NormalizationFactory {
             return operationTypeNode;
         }
         switch (parentTypeName) {
-            case string_constants_2.MUTATION:
+            case string_constants_1.MUTATION:
                 return graphql_1.OperationTypeNode.MUTATION;
-            case string_constants_2.QUERY:
+            case string_constants_1.QUERY:
                 return graphql_1.OperationTypeNode.QUERY;
-            case string_constants_2.SUBSCRIPTION:
+            case string_constants_1.SUBSCRIPTION:
                 return graphql_1.OperationTypeNode.SUBSCRIPTION;
             default:
                 return;
@@ -1993,7 +2005,7 @@ class NormalizationFactory {
         for (const [fieldName, fieldData] of data.fieldDataByName) {
             const fieldCoords = `${fieldData.originalParentTypeName}.${fieldName}`;
             const definedEventsDirectiveNames = new Set();
-            for (const eventsDirectiveName of string_constants_1.EVENT_DIRECTIVE_NAMES) {
+            for (const eventsDirectiveName of strings_1.EVENT_DIRECTIVE_NAMES) {
                 if (fieldData.directivesByDirectiveName.has(eventsDirectiveName)) {
                     definedEventsDirectiveNames.add(eventsDirectiveName);
                 }
@@ -2012,7 +2024,7 @@ class NormalizationFactory {
             }
             if (operationTypeNode === graphql_1.OperationTypeNode.MUTATION) {
                 const typeString = (0, merge_1.printTypeNode)(fieldData.type);
-                if (typeString !== string_constants_2.NON_NULLABLE_EDFS_PUBLISH_EVENT_RESULT) {
+                if (typeString !== string_constants_1.NON_NULLABLE_EDFS_PUBLISH_EVENT_RESULT) {
                     invalidResponseTypeNameByMutationPath.set(fieldCoords, typeString);
                 }
                 continue;
@@ -2058,7 +2070,7 @@ class NormalizationFactory {
         }
     }
     isEdfsPublishResultValid() {
-        const data = this.parentDefinitionDataByTypeName.get(string_constants_2.EDFS_PUBLISH_RESULT);
+        const data = this.parentDefinitionDataByTypeName.get(string_constants_1.EDFS_PUBLISH_RESULT);
         if (!data) {
             return true;
         }
@@ -2072,17 +2084,17 @@ class NormalizationFactory {
             if (fieldData.argumentDataByName.size > 0) {
                 return false;
             }
-            if (fieldName !== string_constants_2.SUCCESS) {
+            if (fieldName !== string_constants_1.SUCCESS) {
                 return false;
             }
-            if ((0, merge_1.printTypeNode)(fieldData.type) !== string_constants_2.NON_NULLABLE_BOOLEAN) {
+            if ((0, merge_1.printTypeNode)(fieldData.type) !== string_constants_1.NON_NULLABLE_BOOLEAN) {
                 return false;
             }
         }
         return true;
     }
     isNatsStreamConfigurationInputObjectValid(streamConfigurationInputData) {
-        if (streamConfigurationInputData.kind !== graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION) {
+        if (!(0, utils_4.isInputObjectDefinitionData)(streamConfigurationInputData)) {
             return false;
         }
         if (streamConfigurationInputData.inputValueDataByName.size != 3) {
@@ -2090,21 +2102,21 @@ class NormalizationFactory {
         }
         for (const [inputValueName, inputValueData] of streamConfigurationInputData.inputValueDataByName) {
             switch (inputValueName) {
-                case string_constants_2.CONSUMER_INACTIVE_THRESHOLD: {
-                    if ((0, merge_1.printTypeNode)(inputValueData.type) !== string_constants_2.NON_NULLABLE_INT) {
+                case string_constants_1.CONSUMER_INACTIVE_THRESHOLD: {
+                    if ((0, merge_1.printTypeNode)(inputValueData.type) !== string_constants_1.NON_NULLABLE_INT) {
                         return false;
                     }
                     if (!inputValueData.defaultValue ||
                         inputValueData.defaultValue.kind !== graphql_1.Kind.INT ||
-                        inputValueData.defaultValue.value !== `${integer_constants_1.DEFAULT_CONSUMER_INACTIVE_THRESHOLD}`) {
+                        inputValueData.defaultValue.value !== `${integers_1.DEFAULT_CONSUMER_INACTIVE_THRESHOLD}`) {
                         return false;
                     }
                     break;
                 }
-                case string_constants_2.CONSUMER_NAME:
+                case string_constants_1.CONSUMER_NAME:
                 // intentional fallthrough
-                case string_constants_2.STREAM_NAME: {
-                    if ((0, merge_1.printTypeNode)(inputValueData.type) !== string_constants_2.NON_NULLABLE_STRING) {
+                case string_constants_1.STREAM_NAME: {
+                    if ((0, merge_1.printTypeNode)(inputValueData.type) !== string_constants_1.NON_NULLABLE_STRING) {
                         return false;
                     }
                     break;
@@ -2116,7 +2128,7 @@ class NormalizationFactory {
         }
         return true;
     }
-    validateEventDrivenSubgraph(definitions) {
+    validateEventDrivenSubgraph() {
         const errorMessages = [];
         const invalidEventsDirectiveDataByRootFieldPath = new Map();
         const invalidResponseTypeStringByRootFieldPath = new Map();
@@ -2128,7 +2140,7 @@ class NormalizationFactory {
         const invalidObjectTypeNames = new Set();
         for (const [typeName, data] of this.parentDefinitionDataByTypeName) {
             // validate edfs__PublishResult and edfs__NatsStreamConfiguration separately
-            if (typeName === string_constants_2.EDFS_PUBLISH_RESULT || typeName === string_constants_2.EDFS_NATS_STREAM_CONFIGURATION) {
+            if (typeName === string_constants_1.EDFS_PUBLISH_RESULT || typeName === string_constants_1.EDFS_NATS_STREAM_CONFIGURATION) {
                 continue;
             }
             if (data.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION) {
@@ -2149,16 +2161,34 @@ class NormalizationFactory {
         if (!this.isEdfsPublishResultValid()) {
             errorMessages.push(errors_1.invalidEdfsPublishResultObjectErrorMessage);
         }
-        if (this.edfsDirectiveReferences.has(string_constants_2.EDFS_NATS_SUBSCRIBE)) {
-            const streamConfigurationInputData = this.parentDefinitionDataByTypeName.get(string_constants_2.EDFS_NATS_STREAM_CONFIGURATION);
+        if (this.edfsDirectiveReferences.has(string_constants_1.EDFS_NATS_SUBSCRIBE)) {
+            const streamConfigurationInputData = this.parentDefinitionDataByTypeName.get(string_constants_1.EDFS_NATS_STREAM_CONFIGURATION);
             if (streamConfigurationInputData &&
                 this.usesEdfsNatsStreamConfiguration &&
                 !this.isNatsStreamConfigurationInputObjectValid(streamConfigurationInputData)) {
                 errorMessages.push(errors_1.invalidNatsStreamConfigurationDefinitionErrorMessage);
             }
-            // always add the correct definition to the schema regardless
-            this.parentDefinitionDataByTypeName.delete(string_constants_2.EDFS_NATS_STREAM_CONFIGURATION);
-            definitions.push(constants_1.EDFS_NATS_STREAM_CONFIGURATION_DEFINITION);
+            // Inject the correct dependency
+            this.parentDefinitionDataByTypeName.delete(string_constants_1.EDFS_NATS_STREAM_CONFIGURATION);
+            const result = this.upsertInputObjectByNode(non_directive_definitions_1.EDFS_NATS_STREAM_CONFIGURATION_DEFINITION);
+            // The result cannot actually be unsuccessful
+            if (result.success) {
+                for (const fieldNode of non_directive_definitions_1.EDFS_NATS_STREAM_CONFIGURATION_DEFINITION.fields) {
+                    this.addInputValueDataByNode({
+                        fieldName: fieldNode.name.value,
+                        isArgument: false,
+                        inputValueDataByName: result.data.inputValueDataByName,
+                        node: fieldNode,
+                        originalParentTypeName: string_constants_1.EDFS_NATS_STREAM_CONFIGURATION,
+                    });
+                }
+            }
+            else {
+                /* Should never happen, but if somehow it did, an error has already been appended from the
+                 * `upsertInputObjectByNode` method.
+                 */
+                return;
+            }
         }
         if (invalidEventsDirectiveDataByRootFieldPath.size > 0) {
             errorMessages.push((0, errors_1.invalidRootTypeFieldEventsDirectivesErrorMessage)(invalidEventsDirectiveDataByRootFieldPath));
@@ -2238,10 +2268,10 @@ class NormalizationFactory {
     getValidFlattenedDirectiveArray(directivesByDirectiveName, directiveCoords, removeInheritedDirectives = false) {
         const flattenedArray = [];
         for (const [directiveName, directiveNodes] of directivesByDirectiveName) {
-            if (removeInheritedDirectives && string_constants_2.INHERITABLE_DIRECTIVE_NAMES.has(directiveName)) {
+            if (removeInheritedDirectives && string_constants_1.INHERITABLE_DIRECTIVE_NAMES.has(directiveName)) {
                 continue;
             }
-            const directiveDefinition = this.directiveDefinitionDataByDirectiveName.get(directiveName);
+            const directiveDefinition = this.directiveDefinitionDataByName.get(directiveName);
             if (!directiveDefinition) {
                 continue;
             }
@@ -2255,7 +2285,7 @@ class NormalizationFactory {
                 }
                 continue;
             }
-            if (directiveName !== string_constants_2.KEY) {
+            if (directiveName !== string_constants_1.KEY) {
                 flattenedArray.push(...directiveNodes);
                 continue;
             }
@@ -2491,7 +2521,7 @@ class NormalizationFactory {
         }
     }
     validateOneOfDirective({ data, 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) {
@@ -2510,72 +2540,39 @@ class NormalizationFactory {
         }
         return true;
     }
+    #addDirectiveDefinitionsToDocument(definitions) {
+        const dependencies = new Set();
+        for (const directiveName of this.referencedDirectiveNames) {
+            const definition = constants_1.DIRECTIVE_DEFINITION_BY_NAME.get(directiveName);
+            if (!definition) {
+                continue;
+            }
+            this.directiveDefinitionByName.set(directiveName, definition);
+            (0, utils_5.addOptionalIterableToSet)({
+                source: strings_1.DEPENDENCIES_BY_DIRECTIVE_NAME.get(directiveName),
+                target: dependencies,
+            });
+            definitions.push(definition);
+        }
+        // Always include custom directive definitions regardless of use.
+        for (const definition of this.customDirectiveDefinitionByName.values()) {
+            definitions.push(definition);
+        }
+        definitions.push(...dependencies);
+    }
     normalize(document) {
-        /* factory.allDirectiveDefinitions is initialized with v1 directive definitions, and v2 definitions are only added
-        after the visitor has visited the entire schema and the subgraph is known to be a V2 graph. Consequently,
-        allDirectiveDefinitions cannot be used to check for duplicate definitions, and another set (below) is required */
         // Collect any renamed root types
         (0, walkers_1.upsertDirectiveSchemaAndEntityDefinitions)(this, document);
         (0, walkers_1.upsertParentsAndChildren)(this, document);
-        this.validateDirectives(this.schemaData, string_constants_2.SCHEMA);
+        const definitions = [];
+        this.#addDirectiveDefinitionsToDocument(definitions);
+        this.validateDirectives(this.schemaData, string_constants_1.SCHEMA);
         for (const [parentTypeName, parentData] of this.parentDefinitionDataByTypeName) {
             this.validateDirectives(parentData, parentTypeName);
         }
         if (this.invalidORScopesCoords.size > 0) {
             this.errors.push((0, errors_1.orScopesLimitError)(constants_1.MAX_OR_SCOPES, [...this.invalidORScopesCoords]));
         }
-        const definitions = [];
-        for (const directiveDefinition of constants_1.BASE_DIRECTIVE_DEFINITIONS) {
-            definitions.push(directiveDefinition);
-        }
-        definitions.push(constants_1.FIELD_SET_SCALAR_DEFINITION);
-        if (this.isSubgraphVersionTwo) {
-            for (const directiveDefinition of constants_1.VERSION_TWO_DIRECTIVE_DEFINITIONS) {
-                definitions.push(directiveDefinition);
-                this.directiveDefinitionByDirectiveName.set(directiveDefinition.name.value, directiveDefinition);
-            }
-            definitions.push(constants_1.SCOPE_SCALAR_DEFINITION);
-        }
-        for (const directiveName of this.edfsDirectiveReferences) {
-            const directiveDefinition = constants_1.EVENT_DRIVEN_DIRECTIVE_DEFINITIONS_BY_DIRECTIVE_NAME.get(directiveName);
-            if (!directiveDefinition) {
-                // should never happen
-                this.errors.push((0, errors_1.invalidEdfsDirectiveName)(directiveName));
-                continue;
-            }
-            definitions.push(directiveDefinition);
-        }
-        // subscriptionFilter is temporarily valid only in an EDG
-        if (this.edfsDirectiveReferences.size > 0 && this.referencedDirectiveNames.has(string_constants_2.SUBSCRIPTION_FILTER)) {
-            definitions.push(constants_1.SUBSCRIPTION_FILTER_DEFINITION);
-            definitions.push(constants_1.SUBSCRIPTION_FILTER_CONDITION_DEFINITION);
-            definitions.push(constants_1.SUBSCRIPTION_FIELD_CONDITION_DEFINITION);
-            definitions.push(constants_1.SUBSCRIPTION_FILTER_VALUE_DEFINITION);
-        }
-        if (this.referencedDirectiveNames.has(string_constants_2.CONFIGURE_DESCRIPTION)) {
-            definitions.push(constants_1.CONFIGURE_DESCRIPTION_DEFINITION);
-        }
-        if (this.referencedDirectiveNames.has(string_constants_2.CONFIGURE_CHILD_DESCRIPTIONS)) {
-            definitions.push(constants_1.CONFIGURE_CHILD_DESCRIPTIONS_DEFINITION);
-        }
-        if (this.referencedDirectiveNames.has(string_constants_2.LINK)) {
-            definitions.push(constants_1.LINK_DEFINITION);
-            definitions.push(constants_1.LINK_IMPORT_DEFINITION);
-            definitions.push(constants_1.LINK_PURPOSE_DEFINITION);
-        }
-        // @oneOf is part of the new base schema, so this definition is/will be unnecessary, but add it as a precaution.
-        if (this.referencedDirectiveNames.has(string_constants_2.ONE_OF)) {
-            definitions.push(constants_1.ONE_OF_DEFINITION);
-        }
-        if (this.referencedDirectiveNames.has(string_constants_2.REQUIRE_FETCH_REASONS)) {
-            definitions.push(constants_1.REQUIRE_FETCH_REASONS_DEFINITION);
-        }
-        if (this.referencedDirectiveNames.has(string_constants_2.SEMANTIC_NON_NULL)) {
-            definitions.push(constants_1.SEMANTIC_NON_NULL_DEFINITION);
-        }
-        for (const directiveDefinition of this.customDirectiveDefinitions.values()) {
-            definitions.push(directiveDefinition);
-        }
         if (this.schemaData.operationTypes.size > 0) {
             definitions.push(this.getSchemaNodeByData(this.schemaData));
         }
@@ -2632,7 +2629,10 @@ class NormalizationFactory {
                     if (!this.validateOneOfDirective({ data: parentData, requiredFieldNames })) {
                         break;
                     }
-                    definitions.push(this.getInputObjectNodeByData(parentData));
+                    // The definition is conditionally pushed elsewhere.
+                    if (parentTypeName !== string_constants_1.EDFS_NATS_STREAM_CONFIGURATION) {
+                        definitions.push(this.getInputObjectNodeByData(parentData));
+                    }
                     break;
                 }
                 case graphql_1.Kind.INTERFACE_TYPE_DEFINITION:
@@ -2646,8 +2646,8 @@ class NormalizationFactory {
                         parentData.extensionType = types_1.ExtensionType.NONE;
                     }
                     if (operationTypeNode) {
-                        parentData.fieldDataByName.delete(string_constants_2.SERVICE_FIELD);
-                        parentData.fieldDataByName.delete(string_constants_2.ENTITIES_FIELD);
+                        parentData.fieldDataByName.delete(string_constants_1.SERVICE_FIELD);
+                        parentData.fieldDataByName.delete(string_constants_1.ENTITIES_FIELD);
                     }
                     const externalInterfaceFieldNames = [];
                     for (const [fieldName, fieldData] of parentData.fieldDataByName) {
@@ -2690,7 +2690,10 @@ class NormalizationFactory {
                         entityInterfaceData.fieldDatas = (0, utils_3.fieldDatasToSimpleFieldDatas)(parentData.fieldDataByName.values());
                         const concreteTypeNames = this.concreteTypeNamesByAbstractTypeName.get(parentTypeName);
                         if (concreteTypeNames) {
-                            (0, utils_5.addIterableValuesToSet)(concreteTypeNames, entityInterfaceData.concreteTypeNames);
+                            (0, utils_5.addIterableToSet)({
+                                source: concreteTypeNames,
+                                target: entityInterfaceData.concreteTypeNames,
+                            });
                         }
                         configurationData.isInterfaceObject = entityInterfaceData.isInterfaceObject;
                         configurationData.entityInterfaceConcreteTypeNames = entityInterfaceData.concreteTypeNames;
@@ -2736,7 +2739,7 @@ class NormalizationFactory {
         // Check that explicitly defined operations types are valid objects and that their fields are also valid
         for (const operationType of Object.values(graphql_1.OperationTypeNode)) {
             const operationTypeNode = this.schemaData.operationTypes.get(operationType);
-            const defaultTypeName = (0, utils_5.getOrThrowError)(utils_1.operationTypeNodeToDefaultType, operationType, string_constants_2.OPERATION_TO_DEFAULT);
+            const defaultTypeName = (0, utils_5.getOrThrowError)(utils_1.operationTypeNodeToDefaultType, operationType, string_constants_1.OPERATION_TO_DEFAULT);
             // If an operation type name was not declared, use the default
             const operationTypeName = operationTypeNode ? (0, ast_1.getTypeNodeNamedTypeName)(operationTypeNode.type) : defaultTypeName;
             // This check is so undefined type errors are not improperly propagated
@@ -2787,7 +2790,7 @@ class NormalizationFactory {
             }
         }
         const persistedDirectiveDefinitionDataByDirectiveName = new Map();
-        for (const directiveDefinitionNode of this.directiveDefinitionByDirectiveName.values()) {
+        for (const directiveDefinitionNode of this.directiveDefinitionByName.values()) {
             // TODO @composeDirective directives would also be handled here
             const executableLocations = (0, utils_1.extractExecutableDirectiveLocations)(directiveDefinitionNode.locations, new Set());
             if (executableLocations.size < 1) {
@@ -2797,7 +2800,7 @@ class NormalizationFactory {
         }
         this.isSubgraphEventDrivenGraph = this.edfsDirectiveReferences.size > 0;
         if (this.isSubgraphEventDrivenGraph) {
-            this.validateEventDrivenSubgraph(definitions);
+            this.validateEventDrivenSubgraph();
         }
         for (const fieldCoords of this.unvalidatedExternalFieldCoords) {
             if (this.isSubgraphVersionTwo) {
@@ -2821,7 +2824,7 @@ class NormalizationFactory {
             concreteTypeNamesByAbstractTypeName: this.concreteTypeNamesByAbstractTypeName,
             conditionalFieldDataByCoordinates: this.conditionalFieldDataByCoords,
             configurationDataByTypeName: this.configurationDataByTypeName,
-            directiveDefinitionByDirectiveName: this.directiveDefinitionByDirectiveName,
+            directiveDefinitionByName: this.directiveDefinitionByName,
             entityDataByTypeName: this.entityDataByTypeName,
             entityInterfaces: this.entityInterfaceDataByTypeName,
             fieldCoordsByNamedTypeName: this.fieldCoordsByNamedTypeName,
@@ -2889,7 +2892,10 @@ function batchNormalize(subgraphs) {
             (0, utils_3.upsertAuthorizationData)(authorizationDataByParentTypeName, authorizationData, invalidORScopesCoords);
         }
         for (const [namedTypeName, fieldCoords] of normalizationResult.fieldCoordsByNamedTypeName) {
-            (0, utils_5.addIterableValuesToSet)(fieldCoords, (0, utils_5.getValueOrDefault)(fieldCoordsByNamedTypeName, namedTypeName, () => new Set()));
+            (0, utils_5.addIterableToSet)({
+                source: fieldCoords,
+                target: (0, utils_5.getValueOrDefault)(fieldCoordsByNamedTypeName, namedTypeName, () => new Set()),
+            });
         }
         for (const [abstractTypeName, incomingConcreteTypeNames,] of normalizationResult.concreteTypeNamesByAbstractTypeName) {
             const existingConcreteTypeNames = concreteTypeNamesByAbstractTypeName.get(abstractTypeName);
@@ -2897,7 +2903,10 @@ function batchNormalize(subgraphs) {
                 concreteTypeNamesByAbstractTypeName.set(abstractTypeName, new Set(incomingConcreteTypeNames));
                 continue;
             }
-            (0, utils_5.addIterableValuesToSet)(incomingConcreteTypeNames, existingConcreteTypeNames);
+            (0, utils_5.addIterableToSet)({
+                source: incomingConcreteTypeNames,
+                target: existingConcreteTypeNames,
+            });
         }
         for (const [typeName, entityData] of normalizationResult.entityDataByTypeName) {
             const keyFieldSetDataByFieldSet = entityData.keyFieldSetDatasBySubgraphName.get(subgraphName);
@@ -2916,7 +2925,7 @@ function batchNormalize(subgraphs) {
                 conditionalFieldDataByCoordinates: normalizationResult.conditionalFieldDataByCoordinates,
                 configurationDataByTypeName: normalizationResult.configurationDataByTypeName,
                 definitions: normalizationResult.subgraphAST,
-                directiveDefinitionByDirectiveName: normalizationResult.directiveDefinitionByDirectiveName,
+                directiveDefinitionByName: normalizationResult.directiveDefinitionByName,
                 entityInterfaces: normalizationResult.entityInterfaces,
                 isVersionTwo: normalizationResult.isVersionTwo,
                 keyFieldNamesByParentTypeName: normalizationResult.keyFieldNamesByParentTypeName,
@@ -2944,7 +2953,10 @@ function batchNormalize(subgraphs) {
                 else {
                     const overridesData = (0, utils_5.getValueOrDefault)(allOverridesByTargetSubgraphName, targetSubgraphName, () => new Map());
                     const existingFieldNames = (0, utils_5.getValueOrDefault)(overridesData, parentTypeName, () => new Set(fieldNames));
-                    (0, utils_5.addIterableValuesToSet)(fieldNames, existingFieldNames);
+                    (0, utils_5.addIterableToSet)({
+                        source: fieldNames,
+                        target: existingFieldNames,
+                    });
                 }
                 for (const fieldName of fieldNames) {
                     const fieldCoords = `${originalParentTypeName}.${fieldName}`;