@wundergraph/composition 0.36.0 → 0.37.0

package/dist/{normalization → v1/normalization}/normalization-factory.js

@@ -5,26 +5,29 @@ exports.normalizeSubgraphFromString = normalizeSubgraphFromString;
 exports.normalizeSubgraph = normalizeSubgraph;
 exports.batchNormalize = batchNormalize;
 const graphql_1 = require("graphql");
-const utils_1 = require("../ast/utils");
+const utils_1 = require("../../ast/utils");
 const utils_2 = require("./utils");
 const constants_1 = require("../utils/constants");
 const utils_3 = require("../utils/utils");
-const errors_1 = require("../errors/errors");
+const errors_1 = require("../../errors/errors");
 const string_constants_1 = require("../utils/string-constants");
-const buildASTSchema_1 = require("../buildASTSchema/buildASTSchema");
+const buildASTSchema_1 = require("../../buildASTSchema/buildASTSchema");
 const merge_1 = require("@graphql-tools/merge");
 const subgraph_1 = require("../subgraph/subgraph");
 const warnings_1 = require("../warnings/warnings");
 const walkers_1 = require("./walkers");
-const type_definition_data_1 = require("../schema-building/type-definition-data");
-const utils_4 = require("../schema-building/utils");
-const ast_1 = require("../schema-building/ast");
-const graph_1 = require("../resolvability-graph/graph");
+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 utils_5 = require("../../utils/utils");
 function normalizeSubgraphFromString(subgraphSDL, noLocation = true) {
     const { error, documentNode } = (0, utils_1.safeParse)(subgraphSDL, noLocation);
     if (error || !documentNode) {
-        return { errors: [(0, errors_1.subgraphInvalidSyntaxError)(error)], warnings: [] };
+        return { errors: [(0, errors_1.subgraphInvalidSyntaxError)(error)], success: false, warnings: [] };
     }
     const normalizationFactory = new NormalizationFactory(new graph_1.Graph());
     return normalizationFactory.normalize(documentNode);
@@ -84,13 +87,13 @@ class NormalizationFactory {
         for (const [baseDirectiveName, baseDirectiveDefinition] of constants_1.BASE_DIRECTIVE_DEFINITION_BY_DIRECTIVE_NAME) {
             this.directiveDefinitionByDirectiveName.set(baseDirectiveName, baseDirectiveDefinition);
         }
-        this.subgraphName = subgraphName || string_constants_1.NOT_APPLICABLE;
+        this.subgraphName = subgraphName || string_constants_2.NOT_APPLICABLE;
         this.internalGraph = internalGraph;
         this.internalGraph.setSubgraphName(this.subgraphName);
         this.schemaData = {
             directivesByDirectiveName: new Map(),
             kind: graphql_1.Kind.SCHEMA_DEFINITION,
-            name: string_constants_1.SCHEMA,
+            name: string_constants_2.SCHEMA,
             operationTypes: new Map(),
         };
     }
@@ -109,7 +112,7 @@ class NormalizationFactory {
             case graphql_1.Kind.SCALAR_TYPE_DEFINITION:
                 return { hasUnhandledError: false, typeString: '' };
             default:
-                return { hasUnhandledError: true, typeString: (0, utils_3.kindToTypeString)(parentData.kind) };
+                return { hasUnhandledError: true, typeString: (0, utils_5.kindToTypeString)(parentData.kind) };
         }
     }
     validateArguments(fieldData, fieldPath) {
@@ -142,7 +145,7 @@ class NormalizationFactory {
         const requiresScopes = [];
         for (const directiveNode of node.directives) {
             const directiveName = directiveNode.name.value;
-            if (directiveName === string_constants_1.AUTHENTICATED) {
+            if (directiveName === string_constants_2.AUTHENTICATED) {
                 // @authenticated is not repeatable
                 if (requiresAuthentication) {
                     return;
@@ -150,7 +153,7 @@ class NormalizationFactory {
                 requiresAuthentication = true;
                 continue;
             }
-            if (directiveName !== string_constants_1.REQUIRES_SCOPES) {
+            if (directiveName !== string_constants_2.REQUIRES_SCOPES) {
                 continue;
             }
             // @requiresScopes is not repeatable
@@ -178,7 +181,7 @@ class NormalizationFactory {
             return;
         }
         const scopesArgument = directiveNode.arguments[0];
-        if (scopesArgument.name.value !== string_constants_1.SCOPES || scopesArgument.value.kind !== graphql_1.Kind.LIST) {
+        if (scopesArgument.name.value !== string_constants_2.SCOPES || scopesArgument.value.kind !== graphql_1.Kind.LIST) {
             return;
         }
         const orScopes = scopesArgument.value.values;
@@ -207,7 +210,7 @@ class NormalizationFactory {
         return authorizationData;
     }
     isTypeNameRootType(typeName) {
-        return string_constants_1.ROOT_TYPE_NAMES.has(typeName) || this.operationTypeNodeByTypeName.has(typeName);
+        return string_constants_2.ROOT_TYPE_NAMES.has(typeName) || this.operationTypeNodeByTypeName.has(typeName);
     }
     isArgumentValueValid(typeNode, argumentValue) {
         if (argumentValue.kind === graphql_1.Kind.NULL) {
@@ -228,37 +231,37 @@ class NormalizationFactory {
             }
             case graphql_1.Kind.NAMED_TYPE: {
                 switch (typeNode.name.value) {
-                    case string_constants_1.BOOLEAN_SCALAR: {
+                    case string_constants_2.BOOLEAN_SCALAR: {
                         return argumentValue.kind === graphql_1.Kind.BOOLEAN;
                     }
-                    case string_constants_1.FLOAT_SCALAR: {
-                        return argumentValue.kind === graphql_1.Kind.FLOAT;
+                    case string_constants_2.FLOAT_SCALAR: {
+                        return argumentValue.kind === graphql_1.Kind.FLOAT || argumentValue.kind === graphql_1.Kind.INT;
                     }
-                    case string_constants_1.ID_SCALAR: {
+                    case string_constants_2.ID_SCALAR: {
                         return argumentValue.kind === graphql_1.Kind.STRING || argumentValue.kind === graphql_1.Kind.INT;
                     }
-                    case string_constants_1.INT_SCALAR: {
+                    case string_constants_2.INT_SCALAR: {
                         return argumentValue.kind === graphql_1.Kind.INT;
                     }
-                    case string_constants_1.FIELD_SET_SCALAR:
+                    case string_constants_2.FIELD_SET_SCALAR:
                     // intentional fallthrough
-                    case string_constants_1.SCOPE_SCALAR:
+                    case string_constants_2.SCOPE_SCALAR:
                     // intentional fallthrough
-                    case string_constants_1.STRING_SCALAR: {
+                    case string_constants_2.STRING_SCALAR: {
                         return argumentValue.kind === graphql_1.Kind.STRING;
                     }
-                    case string_constants_1.LINK_IMPORT: {
+                    case string_constants_2.LINK_IMPORT: {
                         return true;
                     }
-                    case string_constants_1.LINK_PURPOSE: {
+                    case string_constants_2.LINK_PURPOSE: {
                         if (argumentValue.kind !== graphql_1.Kind.ENUM) {
                             return false;
                         }
-                        return argumentValue.value === string_constants_1.SECURITY || argumentValue.value === string_constants_1.EXECUTION;
+                        return argumentValue.value === string_constants_2.SECURITY || argumentValue.value === string_constants_2.EXECUTION;
                     }
-                    case string_constants_1.SUBSCRIPTION_FIELD_CONDITION:
+                    case string_constants_2.SUBSCRIPTION_FIELD_CONDITION:
                     // intentional fallthrough
-                    case string_constants_1.SUBSCRIPTION_FILTER_CONDITION:
+                    case string_constants_2.SUBSCRIPTION_FILTER_CONDITION:
                         return argumentValue.kind === graphql_1.Kind.OBJECT;
                     default: {
                         const parentData = this.parentDefinitionDataByTypeName.get(typeNode.name.value);
@@ -277,7 +280,7 @@ class NormalizationFactory {
                             if (!enumValue) {
                                 return false;
                             }
-                            return !enumValue.directivesByDirectiveName.has(string_constants_1.INACCESSIBLE);
+                            return !enumValue.directivesByDirectiveName.has(string_constants_2.INACCESSIBLE);
                         }
                         if (parentData.kind !== graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION) {
                             return false;
@@ -294,10 +297,10 @@ class NormalizationFactory {
     }
     addInheritedDirectivesToFieldData(fieldDirectivesByDirectiveName) {
         if (this.isParentObjectShareable) {
-            (0, utils_3.getValueOrDefault)(fieldDirectivesByDirectiveName, string_constants_1.SHAREABLE, () => [(0, utils_3.generateSimpleDirective)(string_constants_1.SHAREABLE)]);
+            (0, utils_5.getValueOrDefault)(fieldDirectivesByDirectiveName, string_constants_2.SHAREABLE, () => [(0, utils_5.generateSimpleDirective)(string_constants_2.SHAREABLE)]);
         }
         if (this.isParentObjectExternal) {
-            (0, utils_3.getValueOrDefault)(fieldDirectivesByDirectiveName, string_constants_1.EXTERNAL, () => [(0, utils_3.generateSimpleDirective)(string_constants_1.EXTERNAL)]);
+            (0, utils_5.getValueOrDefault)(fieldDirectivesByDirectiveName, string_constants_2.EXTERNAL, () => [(0, utils_5.generateSimpleDirective)(string_constants_2.EXTERNAL)]);
         }
         return fieldDirectivesByDirectiveName;
     }
@@ -308,26 +311,26 @@ class NormalizationFactory {
         for (const directiveNode of node.directives) {
             const directiveName = directiveNode.name.value;
             // Don't create pointless repetitions of @shareable
-            if (directiveName === string_constants_1.SHAREABLE) {
-                (0, utils_3.getValueOrDefault)(directivesByDirectiveName, directiveName, () => [directiveNode]);
+            if (directiveName === string_constants_2.SHAREABLE) {
+                (0, utils_5.getValueOrDefault)(directivesByDirectiveName, directiveName, () => [directiveNode]);
             }
             else {
-                (0, utils_3.getValueOrDefault)(directivesByDirectiveName, directiveName, () => []).push(directiveNode);
+                (0, utils_5.getValueOrDefault)(directivesByDirectiveName, directiveName, () => []).push(directiveNode);
             }
             if (!(0, utils_3.isNodeKindObject)(node.kind)) {
                 continue;
             }
-            this.isParentObjectExternal ||= directiveName === string_constants_1.EXTERNAL;
-            this.isParentObjectShareable ||= directiveName === string_constants_1.SHAREABLE;
+            this.isParentObjectExternal ||= directiveName === string_constants_2.EXTERNAL;
+            this.isParentObjectShareable ||= directiveName === string_constants_2.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_1.AUTHENTICATED;
-        const isOverride = directiveName === string_constants_1.OVERRIDE;
-        const isRequiresScopes = directiveName === string_constants_1.REQUIRES_SCOPES;
+        const isAuthenticated = directiveName === string_constants_2.AUTHENTICATED;
+        const isOverride = directiveName === string_constants_2.OVERRIDE;
+        const isRequiresScopes = directiveName === string_constants_2.REQUIRES_SCOPES;
         if (!directiveNode.arguments || directiveNode.arguments.length < 1) {
             if (definitionData.requiredArgumentNames.size > 0) {
                 errorMessages.push((0, errors_1.undefinedRequiredArgumentsErrorMessage)(directiveName, requiredArgumentNames, []));
@@ -367,7 +370,7 @@ class NormalizationFactory {
                 });
                 continue;
             }
-            if (!isRequiresScopes || argumentName !== string_constants_1.SCOPES) {
+            if (!isRequiresScopes || argumentName !== string_constants_2.SCOPES) {
                 continue;
             }
             this.handleRequiresScopesDirective({
@@ -383,7 +386,7 @@ class NormalizationFactory {
         if (unexpectedArgumentNames.size > 0) {
             errorMessages.push((0, errors_1.unexpectedDirectiveArgumentErrorMessage)(directiveName, [...unexpectedArgumentNames]));
         }
-        const undefinedArgumentNames = (0, utils_3.getEntriesNotInHashSet)(requiredArgumentNames, definedArgumentNames);
+        const undefinedArgumentNames = (0, utils_5.getEntriesNotInHashSet)(requiredArgumentNames, definedArgumentNames);
         if (undefinedArgumentNames.length > 0) {
             errorMessages.push((0, errors_1.undefinedRequiredArgumentsErrorMessage)(directiveName, requiredArgumentNames, undefinedArgumentNames));
         }
@@ -398,7 +401,7 @@ class NormalizationFactory {
         if (data.kind !== graphql_1.Kind.FIELD_DEFINITION) {
             this.leafTypeNamesWithAuthorizationDirectives.add(parentTypeName);
         }
-        const parentAuthorizationData = (0, utils_3.getValueOrDefault)(this.authorizationDataByParentTypeName, parentTypeName, () => (0, utils_3.newAuthorizationData)(parentTypeName));
+        const parentAuthorizationData = (0, utils_5.getValueOrDefault)(this.authorizationDataByParentTypeName, parentTypeName, () => (0, utils_3.newAuthorizationData)(parentTypeName));
         const authorizationData = (0, utils_3.getAuthorizationDataToUpdate)(parentAuthorizationData, data.node);
         authorizationData.requiredScopes.push(...requiredScopes);
         return errorMessages;
@@ -420,7 +423,7 @@ class NormalizationFactory {
                 definitionErrorMessages.push((0, errors_1.invalidDirectiveLocationErrorMessage)(directiveName, directiveLocation));
             }
             if (directiveNodes.length > 1 && !definitionData.isRepeatable) {
-                const handledDirectiveNames = (0, utils_3.getValueOrDefault)(this.invalidRepeatedDirectiveNameByCoords, directiveCoords, () => new Set());
+                const handledDirectiveNames = (0, utils_5.getValueOrDefault)(this.invalidRepeatedDirectiveNameByCoords, directiveCoords, () => new Set());
                 if (!handledDirectiveNames.has(directiveName)) {
                     handledDirectiveNames.add(directiveName);
                     definitionErrorMessages.push((0, errors_1.invalidRepeatedDirectiveErrorMessage)(directiveName));
@@ -437,7 +440,7 @@ class NormalizationFactory {
                     requiredArgumentNames,
                 });
                 if (errorMessages.length > 0) {
-                    this.errors.push((0, errors_1.invalidDirectiveError)(directiveName, directiveCoords, (0, utils_3.numberToOrdinal)(i + 1), errorMessages));
+                    this.errors.push((0, errors_1.invalidDirectiveError)(directiveName, directiveCoords, (0, utils_5.numberToOrdinal)(i + 1), errorMessages));
                 }
             }
         }
@@ -480,7 +483,7 @@ class NormalizationFactory {
     getNodeExtensionType(isRealExtension, directivesByDirectiveName, isRootType = false) {
         // If the extend keyword is present, it's simply an extension
         if (isRealExtension) {
-            return type_definition_data_1.ExtensionType.REAL;
+            return types_1.ExtensionType.REAL;
         }
         /*
          * @extends is not interpreted as an extension under the following circumstances:
@@ -488,21 +491,21 @@ class NormalizationFactory {
          * 2. It's a V2 subgraph
          * 3. And (of course) if @extends isn't defined at all
          */
-        if (isRootType || this.isSubgraphVersionTwo || !directivesByDirectiveName.has(string_constants_1.EXTENDS)) {
-            return type_definition_data_1.ExtensionType.NONE;
+        if (isRootType || this.isSubgraphVersionTwo || !directivesByDirectiveName.has(string_constants_2.EXTENDS)) {
+            return types_1.ExtensionType.NONE;
         }
         // If it's a V1 subgraph and defines @extends, it is considered an extension across subgraphs
-        return type_definition_data_1.ExtensionType.EXTENDS;
+        return types_1.ExtensionType.EXTENDS;
     }
     setParentDataExtensionType(parentData, incomingExtensionType) {
         switch (parentData.extensionType) {
-            case type_definition_data_1.ExtensionType.EXTENDS:
+            case types_1.ExtensionType.EXTENDS:
             // intentional fallthrough
-            case type_definition_data_1.ExtensionType.NONE: {
-                if (incomingExtensionType === type_definition_data_1.ExtensionType.REAL) {
+            case types_1.ExtensionType.NONE: {
+                if (incomingExtensionType === types_1.ExtensionType.REAL) {
                     return;
                 }
-                this.errors.push((0, errors_1.duplicateTypeDefinitionError)((0, utils_3.kindToTypeString)(parentData.kind), parentData.name));
+                this.errors.push((0, errors_1.duplicateTypeDefinitionError)((0, utils_5.kindToTypeString)(parentData.kind), parentData.name));
                 return;
             }
             default: {
@@ -527,14 +530,14 @@ class NormalizationFactory {
         };
         for (const argument of directiveNode.arguments) {
             switch (argument.name.value) {
-                case string_constants_1.PROPAGATE: {
+                case string_constants_2.PROPAGATE: {
                     if (argument.value.kind != graphql_1.Kind.BOOLEAN) {
                         return;
                     }
                     configureDescriptionData.propagate = argument.value.value;
                     break;
                 }
-                case string_constants_1.DESCRIPTION_OVERRIDE: {
+                case string_constants_2.DESCRIPTION_OVERRIDE: {
                     if (argument.value.kind != graphql_1.Kind.STRING) {
                         return;
                     }
@@ -552,7 +555,7 @@ class NormalizationFactory {
         data.configureDescriptionDataBySubgraphName.set(this.subgraphName, configureDescriptionData);
     }
     extractConfigureDescriptionsData(data) {
-        const configureDescriptionNodes = data.directivesByDirectiveName.get(string_constants_1.CONFIGURE_DESCRIPTION);
+        const configureDescriptionNodes = data.directivesByDirectiveName.get(string_constants_2.CONFIGURE_DESCRIPTION);
         if (configureDescriptionNodes && configureDescriptionNodes.length == 1) {
             this.extractConfigureDescriptionData(data, configureDescriptionNodes[0]);
         }
@@ -581,13 +584,13 @@ 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_1.KEY);
-        data.isInaccessible ||= data.directivesByDirectiveName.has(string_constants_1.INACCESSIBLE);
+        data.isEntity ||= data.directivesByDirectiveName.has(string_constants_2.KEY);
+        data.isInaccessible ||= data.directivesByDirectiveName.has(string_constants_2.INACCESSIBLE);
         data.subgraphNames.add(this.subgraphName);
     }
     addConcreteTypeNamesForImplementedInterfaces(interfaceTypeNames, concreteTypeName) {
         for (const interfaceName of interfaceTypeNames) {
-            (0, utils_3.getValueOrDefault)(this.concreteTypeNamesByAbstractTypeName, interfaceName, () => new Set()).add(concreteTypeName);
+            (0, utils_5.getValueOrDefault)(this.concreteTypeNamesByAbstractTypeName, interfaceName, () => new Set()).add(concreteTypeName);
             this.internalGraph.addEdge(this.internalGraph.addOrUpdateNode(interfaceName, { isAbstract: true }), this.internalGraph.addOrUpdateNode(concreteTypeName), concreteTypeName, true);
         }
     }
@@ -637,7 +640,7 @@ class NormalizationFactory {
             if (handledLocations.has(locationName)) {
                 continue;
             }
-            if (!string_constants_1.EXECUTABLE_DIRECTIVE_LOCATIONS.has(locationName) && !string_constants_1.TYPE_SYSTEM_DIRECTIVE_LOCATIONS.has(locationName)) {
+            if (!string_constants_2.EXECUTABLE_DIRECTIVE_LOCATIONS.has(locationName) && !string_constants_1.TYPE_SYSTEM_DIRECTIVE_LOCATIONS.has(locationName)) {
                 errorMessages.push((0, errors_1.invalidDirectiveDefinitionLocationErrorMessage)(locationName));
                 handledLocations.add(locationName);
                 continue;
@@ -730,7 +733,7 @@ class NormalizationFactory {
             isExternalBySubgraphName: new Map([
                 [this.subgraphName, isNodeExternalOrShareableResult.isExternal],
             ]),
-            isInaccessible: directivesByDirectiveName.has(string_constants_1.INACCESSIBLE),
+            isInaccessible: directivesByDirectiveName.has(string_constants_2.INACCESSIBLE),
             isShareableBySubgraphName: new Map([
                 [this.subgraphName, isNodeExternalOrShareableResult.isShareable],
             ]),
@@ -755,7 +758,7 @@ class NormalizationFactory {
         // Only arguments have renamed paths
         const isArgument = !!renamedPath;
         if (node.defaultValue && !(0, utils_4.areDefaultValuesCompatible)(node.type, node.defaultValue)) {
-            this.errors.push((0, errors_1.incompatibleInputValueDefaultValueTypeError)((isArgument ? string_constants_1.ARGUMENT : string_constants_1.INPUT_FIELD) + ` "${name}"`, originalPath, (0, merge_1.printTypeNode)(node.type), (0, graphql_1.print)(node.defaultValue)));
+            this.errors.push((0, errors_1.incompatibleInputValueDefaultValueTypeError)((isArgument ? string_constants_2.ARGUMENT : string_constants_2.INPUT_FIELD) + ` "${name}"`, originalPath, (0, merge_1.printTypeNode)(node.type), (0, graphql_1.print)(node.defaultValue)));
         }
         const inputValueData = {
             configureDescriptionDataBySubgraphName: new Map(),
@@ -790,7 +793,7 @@ class NormalizationFactory {
         }
         if (parentData) {
             if (parentData.kind !== graphql_1.Kind.INTERFACE_TYPE_DEFINITION) {
-                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_3.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
+                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
                 return;
             }
             this.updateCompositeOutputDataByNode(node, parentData, extensionType);
@@ -802,8 +805,8 @@ class NormalizationFactory {
             extensionType,
             fieldDataByFieldName: new Map(),
             implementedInterfaceTypeNames: this.extractImplementedInterfaceTypeNames(node, new Set()),
-            isEntity: directivesByDirectiveName.has(string_constants_1.KEY),
-            isInaccessible: directivesByDirectiveName.has(string_constants_1.INACCESSIBLE),
+            isEntity: directivesByDirectiveName.has(string_constants_2.KEY),
+            isInaccessible: directivesByDirectiveName.has(string_constants_2.INACCESSIBLE),
             kind: graphql_1.Kind.INTERFACE_TYPE_DEFINITION,
             name: typeName,
             node: (0, ast_1.getMutableInterfaceNode)(node.name),
@@ -821,11 +824,11 @@ class NormalizationFactory {
         }
         switch (operationTypeNode) {
             case graphql_1.OperationTypeNode.MUTATION:
-                return string_constants_1.MUTATION;
+                return string_constants_2.MUTATION;
             case graphql_1.OperationTypeNode.SUBSCRIPTION:
-                return string_constants_1.SUBSCRIPTION;
+                return string_constants_2.SUBSCRIPTION;
             default:
-                return string_constants_1.QUERY;
+                return string_constants_2.QUERY;
         }
     }
     addInterfaceObjectFieldsByNode(node) {
@@ -847,7 +850,7 @@ class NormalizationFactory {
         this.addInterfaceObjectFieldsByNode(node);
         if (parentData) {
             if (parentData.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION) {
-                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_3.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
+                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
                 return;
             }
             this.updateCompositeOutputDataByNode(node, parentData, extensionType);
@@ -862,8 +865,8 @@ class NormalizationFactory {
             extensionType,
             fieldDataByFieldName: new Map(),
             implementedInterfaceTypeNames,
-            isEntity: directivesByDirectiveName.has(string_constants_1.KEY),
-            isInaccessible: directivesByDirectiveName.has(string_constants_1.INACCESSIBLE),
+            isEntity: directivesByDirectiveName.has(string_constants_2.KEY),
+            isInaccessible: directivesByDirectiveName.has(string_constants_2.INACCESSIBLE),
             isRootType,
             kind: graphql_1.Kind.OBJECT_TYPE_DEFINITION,
             name: typeName,
@@ -884,7 +887,7 @@ class NormalizationFactory {
         const extensionType = this.getNodeExtensionType(isRealExtension, directivesByDirectiveName);
         if (parentData) {
             if (parentData.kind !== graphql_1.Kind.ENUM_TYPE_DEFINITION) {
-                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_3.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
+                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
                 return;
             }
             this.setParentDataExtensionType(parentData, extensionType);
@@ -916,11 +919,11 @@ class NormalizationFactory {
         const extensionType = this.getNodeExtensionType(isRealExtension, directivesByDirectiveName);
         if (parentData) {
             if (parentData.kind !== graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION) {
-                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_3.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
+                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
                 return;
             }
             this.setParentDataExtensionType(parentData, extensionType);
-            parentData.isInaccessible ||= directivesByDirectiveName.has(string_constants_1.INACCESSIBLE);
+            parentData.isInaccessible ||= directivesByDirectiveName.has(string_constants_2.INACCESSIBLE);
             parentData.subgraphNames.add(this.subgraphName);
             parentData.description ||= (0, utils_1.formatDescription)('description' in node ? node.description : undefined);
             this.extractConfigureDescriptionsData(parentData);
@@ -931,7 +934,7 @@ class NormalizationFactory {
             directivesByDirectiveName,
             extensionType,
             inputValueDataByValueName: new Map(),
-            isInaccessible: directivesByDirectiveName.has(string_constants_1.INACCESSIBLE),
+            isInaccessible: directivesByDirectiveName.has(string_constants_2.INACCESSIBLE),
             kind: graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION,
             name: typeName,
             node: (0, ast_1.getMutableInputObjectNode)(node.name),
@@ -950,7 +953,7 @@ class NormalizationFactory {
         const extensionType = this.getNodeExtensionType(isRealExtension, directivesByDirectiveName);
         if (parentData) {
             if (parentData.kind !== graphql_1.Kind.SCALAR_TYPE_DEFINITION) {
-                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_3.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
+                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
                 return;
             }
             this.setParentDataExtensionType(parentData, extensionType);
@@ -982,7 +985,7 @@ class NormalizationFactory {
                 this.errors.push((0, errors_1.duplicateUnionMemberDefinitionError)(unionTypeName, memberTypeName));
                 continue;
             }
-            (0, utils_3.getValueOrDefault)(this.concreteTypeNamesByAbstractTypeName, unionTypeName, () => new Set()).add(memberTypeName);
+            (0, utils_5.getValueOrDefault)(this.concreteTypeNamesByAbstractTypeName, unionTypeName, () => new Set()).add(memberTypeName);
             /*
              * Scalars are never valid Union member types.
              * However, base scalars are not upserted to the type definition data.
@@ -1005,7 +1008,7 @@ class NormalizationFactory {
         this.addConcreteTypeNamesForUnion(node);
         if (parentData) {
             if (parentData.kind !== graphql_1.Kind.UNION_TYPE_DEFINITION) {
-                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_3.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
+                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
                 return;
             }
             this.setParentDataExtensionType(parentData, extensionType);
@@ -1038,7 +1041,7 @@ class NormalizationFactory {
         }
         // validation happens elsewhere
         for (const directive of node.directives) {
-            if (directive.name.value !== string_constants_1.KEY) {
+            if (directive.name.value !== string_constants_2.KEY) {
                 continue;
             }
             if (!directive.arguments || directive.arguments.length < 1) {
@@ -1047,13 +1050,13 @@ class NormalizationFactory {
             let keyFieldSet;
             let isUnresolvable = false;
             for (const arg of directive.arguments) {
-                if (arg.name.value === string_constants_1.RESOLVABLE) {
+                if (arg.name.value === string_constants_2.RESOLVABLE) {
                     if (arg.value.kind === graphql_1.Kind.BOOLEAN && !arg.value.value) {
                         isUnresolvable = true;
                     }
                     continue;
                 }
-                if (arg.name.value !== string_constants_1.FIELDS) {
+                if (arg.name.value !== string_constants_2.FIELDS) {
                     keyFieldSet = undefined;
                     break;
                 }
@@ -1072,7 +1075,7 @@ class NormalizationFactory {
         if (data.implementedInterfaceTypeNames.size < 1) {
             return;
         }
-        const isParentInaccessible = data.directivesByDirectiveName.has(string_constants_1.INACCESSIBLE);
+        const isParentInaccessible = data.directivesByDirectiveName.has(string_constants_2.INACCESSIBLE);
         const implementationErrorsMap = new Map();
         const invalidImplementationTypeStringByTypeName = new Map();
         let doesInterfaceImplementItself = false;
@@ -1083,7 +1086,7 @@ class NormalizationFactory {
                 continue;
             }
             if (interfaceData.kind !== graphql_1.Kind.INTERFACE_TYPE_DEFINITION) {
-                invalidImplementationTypeStringByTypeName.set(interfaceData.name, (0, utils_3.kindToTypeString)(interfaceData.kind));
+                invalidImplementationTypeStringByTypeName.set(interfaceData.name, (0, utils_5.kindToTypeString)(interfaceData.kind));
                 continue;
             }
             if (data.name === interfaceData.name) {
@@ -1169,7 +1172,7 @@ class NormalizationFactory {
             this.errors.push((0, errors_1.selfImplementationError)(data.name));
         }
         if (implementationErrorsMap.size > 0) {
-            this.errors.push((0, errors_1.invalidInterfaceImplementationError)(data.name, (0, utils_3.kindToTypeString)(data.kind), implementationErrorsMap));
+            this.errors.push((0, errors_1.invalidInterfaceImplementationError)(data.name, (0, utils_5.kindToTypeString)(data.kind), implementationErrorsMap));
         }
     }
     handleAuthenticatedDirective(data, parentTypeName) {
@@ -1181,7 +1184,7 @@ class NormalizationFactory {
         if (data.kind !== graphql_1.Kind.FIELD_DEFINITION) {
             this.leafTypeNamesWithAuthorizationDirectives.add(parentTypeName);
         }
-        const parentAuthorizationData = (0, utils_3.getValueOrDefault)(this.authorizationDataByParentTypeName, parentTypeName, () => (0, utils_3.newAuthorizationData)(parentTypeName));
+        const parentAuthorizationData = (0, utils_5.getValueOrDefault)(this.authorizationDataByParentTypeName, parentTypeName, () => (0, utils_3.newAuthorizationData)(parentTypeName));
         (0, utils_3.getAuthorizationDataToUpdate)(parentAuthorizationData, data.node).requiresAuthentication = true;
     }
     handleOverrideDirective({ data, directiveCoords, errorMessages, targetSubgraphName }) {
@@ -1189,8 +1192,8 @@ class NormalizationFactory {
             errorMessages.push((0, errors_1.equivalentSourceAndTargetOverrideErrorMessage)(targetSubgraphName, directiveCoords));
             return;
         }
-        const overrideDataForSubgraph = (0, utils_3.getValueOrDefault)(this.overridesByTargetSubgraphName, targetSubgraphName, () => new Map());
-        (0, utils_3.getValueOrDefault)(overrideDataForSubgraph, data.renamedParentTypeName || data.originalParentTypeName, () => new Set()).add(data.name);
+        const overrideDataForSubgraph = (0, utils_5.getValueOrDefault)(this.overridesByTargetSubgraphName, targetSubgraphName, () => new Map());
+        (0, utils_5.getValueOrDefault)(overrideDataForSubgraph, data.renamedParentTypeName || data.originalParentTypeName, () => new Set()).add(data.name);
     }
     handleRequiresScopesDirective({ directiveCoords, orScopes, requiredScopes }) {
         if (orScopes.length > utils_3.maxOrScopes) {
@@ -1209,19 +1212,19 @@ class NormalizationFactory {
     }
     getKafkaPublishConfiguration(directive, argumentDataByArgumentName, errorMessages) {
         const topics = [];
-        let providerId = string_constants_1.DEFAULT_EDFS_PROVIDER_ID;
+        let providerId = string_constants_2.DEFAULT_EDFS_PROVIDER_ID;
         for (const argumentNode of directive.arguments || []) {
             switch (argumentNode.name.value) {
-                case string_constants_1.TOPIC: {
+                case string_constants_2.TOPIC: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
-                        errorMessages.push((0, errors_1.invalidEventSubjectErrorMessage)(string_constants_1.TOPIC));
+                        errorMessages.push((0, errors_1.invalidEventSubjectErrorMessage)(string_constants_2.TOPIC));
                         continue;
                     }
                     (0, utils_2.validateArgumentTemplateReferences)(argumentNode.value.value, argumentDataByArgumentName, errorMessages);
                     topics.push(argumentNode.value.value);
                     break;
                 }
-                case string_constants_1.PROVIDER_ID: {
+                case string_constants_2.PROVIDER_ID: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
                         errorMessages.push(errors_1.invalidEventProviderIdErrorMessage);
                         continue;
@@ -1234,21 +1237,21 @@ class NormalizationFactory {
         if (errorMessages.length > 0) {
             return;
         }
-        return { fieldName: this.childName, providerId, providerType: string_constants_1.PROVIDER_TYPE_KAFKA, topics, type: string_constants_1.PUBLISH };
+        return { fieldName: this.childName, providerId, providerType: string_constants_2.PROVIDER_TYPE_KAFKA, topics, type: string_constants_2.PUBLISH };
     }
     getKafkaSubscribeConfiguration(directive, argumentDataByArgumentName, errorMessages) {
         const topics = [];
-        let providerId = string_constants_1.DEFAULT_EDFS_PROVIDER_ID;
+        let providerId = string_constants_2.DEFAULT_EDFS_PROVIDER_ID;
         for (const argumentNode of directive.arguments || []) {
             switch (argumentNode.name.value) {
-                case string_constants_1.TOPICS: {
+                case string_constants_2.TOPICS: {
                     if (argumentNode.value.kind !== graphql_1.Kind.LIST) {
-                        errorMessages.push((0, errors_1.invalidEventSubjectsErrorMessage)(string_constants_1.TOPICS));
+                        errorMessages.push((0, errors_1.invalidEventSubjectsErrorMessage)(string_constants_2.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_1.TOPICS));
+                            errorMessages.push((0, errors_1.invalidEventSubjectsItemErrorMessage)(string_constants_2.TOPICS));
                             break;
                         }
                         (0, utils_2.validateArgumentTemplateReferences)(value.value, argumentDataByArgumentName, errorMessages);
@@ -1256,7 +1259,7 @@ class NormalizationFactory {
                     }
                     break;
                 }
-                case string_constants_1.PROVIDER_ID: {
+                case string_constants_2.PROVIDER_ID: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
                         errorMessages.push(errors_1.invalidEventProviderIdErrorMessage);
                         continue;
@@ -1272,26 +1275,26 @@ class NormalizationFactory {
         return {
             fieldName: this.childName,
             providerId,
-            providerType: string_constants_1.PROVIDER_TYPE_KAFKA,
+            providerType: string_constants_2.PROVIDER_TYPE_KAFKA,
             topics: topics,
-            type: string_constants_1.SUBSCRIBE,
+            type: string_constants_2.SUBSCRIBE,
         };
     }
     getNatsPublishAndRequestConfiguration(eventType, directive, argumentDataByArgumentName, errorMessages) {
         const subjects = [];
-        let providerId = string_constants_1.DEFAULT_EDFS_PROVIDER_ID;
+        let providerId = string_constants_2.DEFAULT_EDFS_PROVIDER_ID;
         for (const argumentNode of directive.arguments || []) {
             switch (argumentNode.name.value) {
-                case string_constants_1.SUBJECT: {
+                case string_constants_2.SUBJECT: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
-                        errorMessages.push((0, errors_1.invalidEventSubjectErrorMessage)(string_constants_1.SUBJECT));
+                        errorMessages.push((0, errors_1.invalidEventSubjectErrorMessage)(string_constants_2.SUBJECT));
                         continue;
                     }
                     (0, utils_2.validateArgumentTemplateReferences)(argumentNode.value.value, argumentDataByArgumentName, errorMessages);
                     subjects.push(argumentNode.value.value);
                     break;
                 }
-                case string_constants_1.PROVIDER_ID: {
+                case string_constants_2.PROVIDER_ID: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
                         errorMessages.push(errors_1.invalidEventProviderIdErrorMessage);
                         continue;
@@ -1304,24 +1307,24 @@ class NormalizationFactory {
         if (errorMessages.length > 0) {
             return;
         }
-        return { fieldName: this.childName, providerId, providerType: string_constants_1.PROVIDER_TYPE_NATS, subjects, type: eventType };
+        return { fieldName: this.childName, providerId, providerType: string_constants_2.PROVIDER_TYPE_NATS, subjects, type: eventType };
     }
     getNatsSubscribeConfiguration(directive, argumentDataByArgumentName, errorMessages) {
         const subjects = [];
-        let providerId = string_constants_1.DEFAULT_EDFS_PROVIDER_ID;
+        let providerId = string_constants_2.DEFAULT_EDFS_PROVIDER_ID;
         let consumerInactiveThreshold = integer_constants_1.DEFAULT_CONSUMER_INACTIVE_THRESHOLD;
         let consumerName = '';
         let streamName = '';
         for (const argumentNode of directive.arguments || []) {
             switch (argumentNode.name.value) {
-                case string_constants_1.SUBJECTS: {
+                case string_constants_2.SUBJECTS: {
                     if (argumentNode.value.kind !== graphql_1.Kind.LIST) {
                         // errorMessages.push(invalidEventSubjectsErrorMessage(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_1.SUBJECTS));
+                            errorMessages.push((0, errors_1.invalidEventSubjectsItemErrorMessage)(string_constants_2.SUBJECTS));
                             break;
                         }
                         (0, utils_2.validateArgumentTemplateReferences)(value.value, argumentDataByArgumentName, errorMessages);
@@ -1329,7 +1332,7 @@ class NormalizationFactory {
                     }
                     break;
                 }
-                case string_constants_1.PROVIDER_ID: {
+                case string_constants_2.PROVIDER_ID: {
                     if (argumentNode.value.kind !== graphql_1.Kind.STRING || argumentNode.value.value.length < 1) {
                         errorMessages.push(errors_1.invalidEventProviderIdErrorMessage);
                         continue;
@@ -1337,7 +1340,7 @@ class NormalizationFactory {
                     providerId = argumentNode.value.value;
                     break;
                 }
-                case string_constants_1.STREAM_CONFIGURATION: {
+                case string_constants_2.STREAM_CONFIGURATION: {
                     this.usesEdfsNatsStreamConfiguration = true;
                     if (argumentNode.value.kind !== graphql_1.Kind.OBJECT || argumentNode.value.fields.length < 1) {
                         errorMessages.push(errors_1.invalidNatsStreamInputErrorMessage);
@@ -1346,7 +1349,7 @@ 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_1.CONSUMER_NAME, string_constants_1.STREAM_NAME]);
+                    const missingRequiredFieldNames = new Set([string_constants_2.CONSUMER_NAME, string_constants_2.STREAM_NAME]);
                     const duplicateFieldNames = new Set();
                     const invalidRequiredFieldNames = new Set();
                     for (const field of argumentNode.value.fields) {
@@ -1368,7 +1371,7 @@ class NormalizationFactory {
                             missingRequiredFieldNames.delete(fieldName);
                         }
                         switch (fieldName) {
-                            case string_constants_1.CONSUMER_NAME:
+                            case string_constants_2.CONSUMER_NAME:
                                 if (field.value.kind != graphql_1.Kind.STRING || field.value.value.length < 1) {
                                     invalidRequiredFieldNames.add(fieldName);
                                     isValid = false;
@@ -1376,7 +1379,7 @@ class NormalizationFactory {
                                 }
                                 consumerName = field.value.value;
                                 break;
-                            case string_constants_1.STREAM_NAME:
+                            case string_constants_2.STREAM_NAME:
                                 if (field.value.kind != graphql_1.Kind.STRING || field.value.value.length < 1) {
                                     invalidRequiredFieldNames.add(fieldName);
                                     isValid = false;
@@ -1384,9 +1387,9 @@ class NormalizationFactory {
                                 }
                                 streamName = field.value.value;
                                 break;
-                            case string_constants_1.CONSUMER_INACTIVE_THRESHOLD:
+                            case string_constants_2.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_1.INT_SCALAR));
+                                    errorMessages.push((0, errors_1.invalidArgumentValueErrorMessage)((0, graphql_1.print)(field.value), 'edfs__NatsStreamConfiguration', `consumerInactiveThreshold`, string_constants_2.INT_SCALAR));
                                     isValid = false;
                                     continue;
                                 }
@@ -1395,7 +1398,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_1.INT_SCALAR));
+                                    errorMessages.push((0, errors_1.invalidArgumentValueErrorMessage)((0, graphql_1.print)(field.value), 'edfs__NatsStreamConfiguration', `consumerInactiveThreshold`, string_constants_2.INT_SCALAR));
                                     isValid = false;
                                 }
                                 break;
@@ -1414,16 +1417,16 @@ class NormalizationFactory {
             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}.`));
         }
-        else if (consumerInactiveThreshold > integer_constants_1.MAX_INT32) {
+        else if (consumerInactiveThreshold > integer_constants_2.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: this.childName,
             providerId,
-            providerType: string_constants_1.PROVIDER_TYPE_NATS,
+            providerType: string_constants_2.PROVIDER_TYPE_NATS,
             subjects,
-            type: string_constants_1.SUBSCRIBE,
+            type: string_constants_2.SUBSCRIBE,
             ...(consumerName && streamName
                 ? {
                     streamConfiguration: {
@@ -1443,7 +1446,7 @@ class NormalizationFactory {
         const fieldPath = `${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_1.SUBSCRIPTION_FILTER) {
+            if (directiveNode.name.value !== string_constants_2.SUBSCRIPTION_FILTER) {
                 continue;
             }
             if (!isSubscription) {
@@ -1462,21 +1465,21 @@ class NormalizationFactory {
             const errorMessages = [];
             let eventConfiguration;
             switch (directive.name.value) {
-                case string_constants_1.EDFS_KAFKA_PUBLISH:
+                case string_constants_2.EDFS_KAFKA_PUBLISH:
                     eventConfiguration = this.getKafkaPublishConfiguration(directive, argumentDataByArgumentName, errorMessages);
                     break;
-                case string_constants_1.EDFS_KAFKA_SUBSCRIBE:
+                case string_constants_2.EDFS_KAFKA_SUBSCRIBE:
                     eventConfiguration = this.getKafkaSubscribeConfiguration(directive, argumentDataByArgumentName, errorMessages);
                     break;
-                case string_constants_1.EDFS_NATS_PUBLISH: {
-                    eventConfiguration = this.getNatsPublishAndRequestConfiguration(string_constants_1.PUBLISH, directive, argumentDataByArgumentName, errorMessages);
+                case string_constants_2.EDFS_NATS_PUBLISH: {
+                    eventConfiguration = this.getNatsPublishAndRequestConfiguration(string_constants_2.PUBLISH, directive, argumentDataByArgumentName, errorMessages);
                     break;
                 }
-                case string_constants_1.EDFS_NATS_REQUEST: {
-                    eventConfiguration = this.getNatsPublishAndRequestConfiguration(string_constants_1.REQUEST, directive, argumentDataByArgumentName, errorMessages);
+                case string_constants_2.EDFS_NATS_REQUEST: {
+                    eventConfiguration = this.getNatsPublishAndRequestConfiguration(string_constants_2.REQUEST, directive, argumentDataByArgumentName, errorMessages);
                     break;
                 }
-                case string_constants_1.EDFS_NATS_SUBSCRIBE: {
+                case string_constants_2.EDFS_NATS_SUBSCRIBE: {
                     eventConfiguration = this.getNatsSubscribeConfiguration(directive, argumentDataByArgumentName, errorMessages);
                     break;
                 }
@@ -1491,17 +1494,17 @@ class NormalizationFactory {
             if (!eventConfiguration) {
                 continue;
             }
-            (0, utils_3.getValueOrDefault)(this.eventsConfigurations, this.renamedParentTypeName || this.originalParentTypeName, () => []).push(eventConfiguration);
+            (0, utils_5.getValueOrDefault)(this.eventsConfigurations, this.renamedParentTypeName || this.originalParentTypeName, () => []).push(eventConfiguration);
         }
     }
     getValidEventsDirectiveNamesForOperationTypeNode(operationTypeNode) {
         switch (operationTypeNode) {
             case graphql_1.OperationTypeNode.MUTATION:
-                return new Set([string_constants_1.EDFS_KAFKA_PUBLISH, string_constants_1.EDFS_NATS_PUBLISH, string_constants_1.EDFS_NATS_REQUEST]);
+                return new Set([string_constants_2.EDFS_KAFKA_PUBLISH, string_constants_2.EDFS_NATS_PUBLISH, string_constants_2.EDFS_NATS_REQUEST]);
             case graphql_1.OperationTypeNode.QUERY:
-                return new Set([string_constants_1.EDFS_NATS_REQUEST]);
+                return new Set([string_constants_2.EDFS_NATS_REQUEST]);
             case graphql_1.OperationTypeNode.SUBSCRIPTION:
-                return new Set([string_constants_1.EDFS_KAFKA_SUBSCRIBE, string_constants_1.EDFS_NATS_SUBSCRIBE]);
+                return new Set([string_constants_2.EDFS_KAFKA_SUBSCRIBE, string_constants_2.EDFS_NATS_SUBSCRIBE]);
         }
     }
     getOperationTypeNodeForRootTypeName(parentTypeName) {
@@ -1510,11 +1513,11 @@ class NormalizationFactory {
             return operationTypeNode;
         }
         switch (parentTypeName) {
-            case string_constants_1.MUTATION:
+            case string_constants_2.MUTATION:
                 return graphql_1.OperationTypeNode.MUTATION;
-            case string_constants_1.QUERY:
+            case string_constants_2.QUERY:
                 return graphql_1.OperationTypeNode.QUERY;
-            case string_constants_1.SUBSCRIPTION:
+            case string_constants_2.SUBSCRIPTION:
                 return graphql_1.OperationTypeNode.SUBSCRIPTION;
             default:
                 return;
@@ -1550,7 +1553,7 @@ class NormalizationFactory {
             }
             if (operationTypeNode === graphql_1.OperationTypeNode.MUTATION) {
                 const typeString = (0, merge_1.printTypeNode)(fieldData.type);
-                if (typeString !== string_constants_1.NON_NULLABLE_EDFS_PUBLISH_EVENT_RESULT) {
+                if (typeString !== string_constants_2.NON_NULLABLE_EDFS_PUBLISH_EVENT_RESULT) {
                     invalidResponseTypeNameByMutationPath.set(fieldPath, typeString);
                 }
                 continue;
@@ -1580,7 +1583,7 @@ class NormalizationFactory {
             if (isUnresolvable) {
                 continue;
             }
-            (0, utils_3.getValueOrDefault)(invalidKeyFieldSetsByEntityTypeName, typeName, () => []).push(keyFieldSet);
+            (0, utils_5.getValueOrDefault)(invalidKeyFieldSetsByEntityTypeName, typeName, () => []).push(keyFieldSet);
         }
     }
     validateEventDrivenObjectFields(fieldDataByFieldName, keyFieldNames, nonExternalKeyFieldNameByFieldPath, nonKeyFieldNameByFieldPath) {
@@ -1596,7 +1599,7 @@ class NormalizationFactory {
         }
     }
     isEdfsPublishResultValid() {
-        const data = this.parentDefinitionDataByTypeName.get(string_constants_1.EDFS_PUBLISH_RESULT);
+        const data = this.parentDefinitionDataByTypeName.get(string_constants_2.EDFS_PUBLISH_RESULT);
         if (!data) {
             return true;
         }
@@ -1610,10 +1613,10 @@ class NormalizationFactory {
             if (fieldData.argumentDataByArgumentName.size > 0) {
                 return false;
             }
-            if (fieldName !== string_constants_1.SUCCESS) {
+            if (fieldName !== string_constants_2.SUCCESS) {
                 return false;
             }
-            if ((0, merge_1.printTypeNode)(fieldData.type) !== string_constants_1.NON_NULLABLE_BOOLEAN) {
+            if ((0, merge_1.printTypeNode)(fieldData.type) !== string_constants_2.NON_NULLABLE_BOOLEAN) {
                 return false;
             }
         }
@@ -1628,8 +1631,8 @@ class NormalizationFactory {
         }
         for (const [inputValueName, inputValueData] of streamConfigurationInputData.inputValueDataByValueName) {
             switch (inputValueName) {
-                case string_constants_1.CONSUMER_INACTIVE_THRESHOLD: {
-                    if ((0, merge_1.printTypeNode)(inputValueData.type) !== string_constants_1.NON_NULLABLE_INT) {
+                case string_constants_2.CONSUMER_INACTIVE_THRESHOLD: {
+                    if ((0, merge_1.printTypeNode)(inputValueData.type) !== string_constants_2.NON_NULLABLE_INT) {
                         return false;
                     }
                     if (!inputValueData.defaultValue ||
@@ -1639,10 +1642,10 @@ class NormalizationFactory {
                     }
                     break;
                 }
-                case string_constants_1.CONSUMER_NAME:
+                case string_constants_2.CONSUMER_NAME:
                 // intentional fallthrough
-                case string_constants_1.STREAM_NAME: {
-                    if ((0, merge_1.printTypeNode)(inputValueData.type) !== string_constants_1.NON_NULLABLE_STRING) {
+                case string_constants_2.STREAM_NAME: {
+                    if ((0, merge_1.printTypeNode)(inputValueData.type) !== string_constants_2.NON_NULLABLE_STRING) {
                         return false;
                     }
                     break;
@@ -1666,7 +1669,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_1.EDFS_PUBLISH_RESULT || typeName === string_constants_1.EDFS_NATS_STREAM_CONFIGURATION) {
+            if (typeName === string_constants_2.EDFS_PUBLISH_RESULT || typeName === string_constants_2.EDFS_NATS_STREAM_CONFIGURATION) {
                 continue;
             }
             if (data.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION) {
@@ -1687,18 +1690,18 @@ class NormalizationFactory {
         if (!this.isEdfsPublishResultValid()) {
             errorMessages.push(errors_1.invalidEdfsPublishResultObjectErrorMessage);
         }
-        if (this.edfsDirectiveReferences.has(string_constants_1.EDFS_NATS_SUBSCRIBE)) {
-            const streamConfigurationInputData = this.parentDefinitionDataByTypeName.get(string_constants_1.EDFS_NATS_STREAM_CONFIGURATION);
+        if (this.edfsDirectiveReferences.has(string_constants_2.EDFS_NATS_SUBSCRIBE)) {
+            const streamConfigurationInputData = this.parentDefinitionDataByTypeName.get(string_constants_2.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_1.EDFS_NATS_STREAM_CONFIGURATION);
+            this.parentDefinitionDataByTypeName.delete(string_constants_2.EDFS_NATS_STREAM_CONFIGURATION);
             definitions.push(constants_1.EDFS_NATS_STREAM_CONFIGURATION_DEFINITION);
         }
-        if (this.referencedDirectiveNames.has(string_constants_1.LINK)) {
+        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);
@@ -1744,7 +1747,7 @@ class NormalizationFactory {
                 continue;
             }
             if (memberData.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION) {
-                invalidMembers.push(`"${memberName}", which is type "${(0, utils_3.kindToTypeString)(memberData.kind)}"`);
+                invalidMembers.push(`"${memberName}", which is type "${(0, utils_5.kindToTypeString)(memberData.kind)}"`);
             }
         }
         if (invalidMembers.length > 0) {
@@ -1758,12 +1761,12 @@ class NormalizationFactory {
         const unionTypeName = node.name.value;
         for (const member of node.types) {
             const memberTypeName = member.name.value;
-            (0, utils_3.getValueOrDefault)(this.concreteTypeNamesByAbstractTypeName, unionTypeName, () => new Set()).add(memberTypeName);
+            (0, utils_5.getValueOrDefault)(this.concreteTypeNamesByAbstractTypeName, unionTypeName, () => new Set()).add(memberTypeName);
             this.internalGraph.addEdge(this.internalGraph.addOrUpdateNode(unionTypeName, { isAbstract: true }), this.internalGraph.addOrUpdateNode(memberTypeName), memberTypeName, true);
         }
     }
     validateAndAddKeyToConfiguration(parentData, keyFieldSetData) {
-        const configurationData = (0, utils_3.getOrThrowError)(this.configurationDataByParentTypeName, (0, utils_4.getParentTypeName)(parentData), 'configurationDataByParentTypeName');
+        const configurationData = (0, utils_5.getOrThrowError)(this.configurationDataByParentTypeName, (0, utils_4.getParentTypeName)(parentData), 'configurationDataByParentTypeName');
         const keys = (0, utils_2.validateKeyFieldSets)(this, parentData, keyFieldSetData.isUnresolvableByKeyFieldSet, configurationData.fieldNames);
         if (keys) {
             configurationData.keys = keys;
@@ -1788,7 +1791,7 @@ class NormalizationFactory {
                 continue;
             }
             if (!directiveDefinition.isRepeatable && directiveNodes.length > 1) {
-                const handledDirectiveNames = (0, utils_3.getValueOrDefault)(this.invalidRepeatedDirectiveNameByCoords, directiveCoords, () => new Set());
+                const handledDirectiveNames = (0, utils_5.getValueOrDefault)(this.invalidRepeatedDirectiveNameByCoords, directiveCoords, () => new Set());
                 if (!handledDirectiveNames.has(directiveName)) {
                     handledDirectiveNames.add(directiveName);
                     this.errors.push((0, errors_1.invalidDirectiveError)(directiveName, directiveCoords, '1st', [
@@ -1797,7 +1800,7 @@ class NormalizationFactory {
                 }
                 continue;
             }
-            if (directiveName !== string_constants_1.KEY) {
+            if (directiveName !== string_constants_2.KEY) {
                 flattenedArray.push(...directiveNodes);
                 continue;
             }
@@ -1866,7 +1869,7 @@ class NormalizationFactory {
         // Collect any renamed root types
         (0, walkers_1.upsertDirectiveSchemaAndEntityDefinitions)(this, document);
         (0, walkers_1.upsertParentsAndChildren)(this, document);
-        this.validateDirectives(this.schemaData, string_constants_1.SCHEMA);
+        this.validateDirectives(this.schemaData, string_constants_2.SCHEMA);
         for (const [parentTypeName, parentData] of this.parentDefinitionDataByTypeName) {
             this.validateDirectives(parentData, parentTypeName);
         }
@@ -1878,7 +1881,7 @@ class NormalizationFactory {
             }
             const concreteTypeNames = this.concreteTypeNamesByAbstractTypeName.get(interfaceTypeName);
             for (const concreteTypeName of concreteTypeNames || []) {
-                const concreteAuthorizationData = (0, utils_3.getValueOrDefault)(this.authorizationDataByParentTypeName, concreteTypeName, () => (0, utils_3.newAuthorizationData)(concreteTypeName));
+                const concreteAuthorizationData = (0, utils_5.getValueOrDefault)(this.authorizationDataByParentTypeName, concreteTypeName, () => (0, utils_3.newAuthorizationData)(concreteTypeName));
                 for (const [fieldName, interfaceFieldAuthorizationData,] of interfaceAuthorizationData.fieldAuthorizationDataByFieldName) {
                     if (!(0, utils_3.upsertFieldAuthorizationData)(concreteAuthorizationData.fieldAuthorizationDataByFieldName, interfaceFieldAuthorizationData)) {
                         this.invalidOrScopesHostPaths.add(`${concreteTypeName}.${fieldName}`);
@@ -1923,16 +1926,16 @@ class NormalizationFactory {
             definitions.push(directiveDefinition);
         }
         // subscriptionFilter is temporarily valid only in an EDG
-        if (this.edfsDirectiveReferences.size > 0 && this.referencedDirectiveNames.has(string_constants_1.SUBSCRIPTION_FILTER)) {
+        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_1.CONFIGURE_DESCRIPTION)) {
+        if (this.referencedDirectiveNames.has(string_constants_2.CONFIGURE_DESCRIPTION)) {
             definitions.push(constants_1.CONFIGURE_DESCRIPTION_DEFINITION);
         }
-        if (this.referencedDirectiveNames.has(string_constants_1.CONFIGURE_CHILD_DESCRIPTIONS)) {
+        if (this.referencedDirectiveNames.has(string_constants_2.CONFIGURE_CHILD_DESCRIPTIONS)) {
             definitions.push(constants_1.CONFIGURE_CHILD_DESCRIPTIONS_DEFINITION);
         }
         for (const directiveDefinition of this.customDirectiveDefinitions.values()) {
@@ -1947,7 +1950,7 @@ class NormalizationFactory {
          * */
         for (const data of this.invalidConfigureDescriptionNodeDatas) {
             if (!data.description) {
-                this.errors.push((0, errors_1.configureDescriptionNoDescriptionError)((0, utils_3.kindToTypeString)(data.kind), data.name));
+                this.errors.push((0, errors_1.configureDescriptionNoDescriptionError)((0, utils_5.kindToTypeString)(data.kind), data.name));
             }
         }
         for (const [parentTypeName, parentDefinitionData] of this.parentDefinitionDataByTypeName) {
@@ -1974,8 +1977,8 @@ class NormalizationFactory {
                     const operationTypeNode = this.operationTypeNodeByTypeName.get(parentTypeName);
                     const isObject = parentDefinitionData.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION;
                     if (operationTypeNode) {
-                        parentDefinitionData.fieldDataByFieldName.delete(string_constants_1.SERVICE_FIELD);
-                        parentDefinitionData.fieldDataByFieldName.delete(string_constants_1.ENTITIES_FIELD);
+                        parentDefinitionData.fieldDataByFieldName.delete(string_constants_2.SERVICE_FIELD);
+                        parentDefinitionData.fieldDataByFieldName.delete(string_constants_2.ENTITIES_FIELD);
                     }
                     (0, utils_4.removeIgnoredDirectives)(parentDefinitionData);
                     (0, utils_4.removeInheritableDirectivesFromObjectParent)(parentDefinitionData);
@@ -2006,7 +2009,7 @@ class NormalizationFactory {
                     const entityInterfaceData = this.entityInterfaceDataByTypeName.get(parentTypeName);
                     if (entityInterfaceData) {
                         entityInterfaceData.fieldDatas = (0, utils_3.fieldDatasToSimpleFieldDatas)(parentDefinitionData.fieldDataByFieldName.values());
-                        entityInterfaceData.concreteTypeNames = (0, utils_3.getValueOrDefault)(this.concreteTypeNamesByAbstractTypeName, parentTypeName, () => new Set());
+                        entityInterfaceData.concreteTypeNames = (0, utils_5.getValueOrDefault)(this.concreteTypeNamesByAbstractTypeName, parentTypeName, () => new Set());
                         configurationData.isInterfaceObject = entityInterfaceData.isInterfaceObject;
                         configurationData.entityInterfaceConcreteTypeNames = entityInterfaceData.concreteTypeNames;
                     }
@@ -2020,11 +2023,11 @@ class NormalizationFactory {
                     definitions.push(this.getCompositeOutputNodeByData(parentDefinitionData));
                     // interfaces and objects must define at least one field
                     if (parentDefinitionData.fieldDataByFieldName.size < 1 && !(0, utils_2.isNodeQuery)(parentTypeName, operationTypeNode)) {
-                        this.errors.push((0, errors_1.noFieldDefinitionsError)((0, utils_3.kindToTypeString)(parentDefinitionData.kind), parentTypeName));
+                        this.errors.push((0, errors_1.noFieldDefinitionsError)((0, utils_5.kindToTypeString)(parentDefinitionData.kind), parentTypeName));
                     }
                     break;
                 case graphql_1.Kind.SCALAR_TYPE_DEFINITION:
-                    if (parentDefinitionData.extensionType === type_definition_data_1.ExtensionType.REAL) {
+                    if (parentDefinitionData.extensionType === types_1.ExtensionType.REAL) {
                         this.errors.push((0, errors_1.noBaseScalarDefinitionError)(parentTypeName));
                         break;
                     }
@@ -2042,7 +2045,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_3.getOrThrowError)(utils_1.operationTypeNodeToDefaultType, operationType, string_constants_1.OPERATION_TO_DEFAULT);
+            const defaultTypeName = (0, utils_5.getOrThrowError)(utils_1.operationTypeNodeToDefaultType, operationType, string_constants_2.OPERATION_TO_DEFAULT);
             // If an operation type name was not declared, use the default
             const operationTypeName = operationTypeNode ? (0, ast_1.getTypeNodeNamedTypeName)(operationTypeNode.type) : defaultTypeName;
             // If a custom type is used, the default type should not be defined
@@ -2131,34 +2134,33 @@ class NormalizationFactory {
             }
         }
         if (this.errors.length > 0) {
-            return { errors: this.errors, warnings: this.warnings };
+            return { success: false, errors: this.errors, warnings: this.warnings };
         }
         const newAST = {
             kind: graphql_1.Kind.DOCUMENT,
             definitions,
         };
         return {
-            normalizationResult: {
-                authorizationDataByParentTypeName: this.authorizationDataByParentTypeName,
-                // configurationDataMap is map of ConfigurationData per type name.
-                // It is an Intermediate configuration object that will be converted to an engine configuration in the router
-                concreteTypeNamesByAbstractTypeName: this.concreteTypeNamesByAbstractTypeName,
-                conditionalFieldDataByCoordinates: this.conditionalFieldDataByCoordinates,
-                configurationDataByTypeName: this.configurationDataByParentTypeName,
-                entityDataByTypeName: this.entityDataByTypeName,
-                entityInterfaces: this.entityInterfaceDataByTypeName,
-                isEventDrivenGraph: this.isSubgraphEventDrivenGraph,
-                isVersionTwo: this.isSubgraphVersionTwo,
-                keyFieldNamesByParentTypeName: this.keyFieldNamesByParentTypeName,
-                operationTypes: this.operationTypeNodeByTypeName,
-                originalTypeNameByRenamedTypeName: this.originalTypeNameByRenamedTypeName,
-                overridesByTargetSubgraphName: this.overridesByTargetSubgraphName,
-                parentDefinitionDataByTypeName: this.parentDefinitionDataByTypeName,
-                persistedDirectiveDefinitionDataByDirectiveName,
-                subgraphAST: newAST,
-                subgraphString: (0, graphql_1.print)(newAST),
-                schema: (0, buildASTSchema_1.buildASTSchema)(newAST, { assumeValid: true, assumeValidSDL: true }),
-            },
+            authorizationDataByParentTypeName: this.authorizationDataByParentTypeName,
+            // configurationDataMap is map of ConfigurationData per type name.
+            // It is an Intermediate configuration object that will be converted to an engine configuration in the router
+            concreteTypeNamesByAbstractTypeName: this.concreteTypeNamesByAbstractTypeName,
+            conditionalFieldDataByCoordinates: this.conditionalFieldDataByCoordinates,
+            configurationDataByTypeName: this.configurationDataByParentTypeName,
+            entityDataByTypeName: this.entityDataByTypeName,
+            entityInterfaces: this.entityInterfaceDataByTypeName,
+            isEventDrivenGraph: this.isSubgraphEventDrivenGraph,
+            isVersionTwo: this.isSubgraphVersionTwo,
+            keyFieldNamesByParentTypeName: this.keyFieldNamesByParentTypeName,
+            operationTypes: this.operationTypeNodeByTypeName,
+            originalTypeNameByRenamedTypeName: this.originalTypeNameByRenamedTypeName,
+            overridesByTargetSubgraphName: this.overridesByTargetSubgraphName,
+            parentDefinitionDataByTypeName: this.parentDefinitionDataByTypeName,
+            persistedDirectiveDefinitionDataByDirectiveName,
+            subgraphAST: newAST,
+            subgraphString: (0, graphql_1.print)(newAST),
+            schema: (0, buildASTSchema_1.buildASTSchema)(newAST, { assumeValid: true, assumeValidSDL: true }),
+            success: true,
             warnings: this.warnings,
         };
     }
@@ -2192,12 +2194,12 @@ function batchNormalize(subgraphs) {
         if (!subgraph.name) {
             invalidNameErrorMessages.push((0, errors_1.invalidSubgraphNameErrorMessage)(i, subgraphName));
         }
-        const { errors, normalizationResult, warnings: normalizationWarnings, } = normalizeSubgraph(subgraph.definitions, subgraph.name, internalGraph);
-        if (normalizationWarnings.length > 0) {
-            warnings.push(...normalizationWarnings);
+        const normalizationResult = normalizeSubgraph(subgraph.definitions, subgraph.name, internalGraph);
+        if (normalizationResult.warnings.length > 0) {
+            warnings.push(...normalizationResult.warnings);
         }
-        if (errors) {
-            validationErrors.push((0, errors_1.subgraphValidationError)(subgraphName, errors));
+        if (!normalizationResult.success) {
+            validationErrors.push((0, errors_1.subgraphValidationError)(subgraphName, normalizationResult.errors));
             continue;
         }
         if (!normalizationResult) {
@@ -2214,7 +2216,7 @@ function batchNormalize(subgraphs) {
                 concreteTypeNamesByAbstractTypeName.set(abstractTypeName, new Set(incomingConcreteTypeNames));
                 continue;
             }
-            (0, utils_3.addIterableValuesToSet)(incomingConcreteTypeNames, existingConcreteTypeNames);
+            (0, utils_5.addIterableValuesToSet)(incomingConcreteTypeNames, existingConcreteTypeNames);
         }
         for (const entityData of normalizationResult.entityDataByTypeName.values()) {
             (0, utils_3.upsertEntityData)(entityDataByTypeName, entityData);
@@ -2249,9 +2251,9 @@ function batchNormalize(subgraphs) {
                     warnings.push((0, warnings_1.invalidOverrideTargetSubgraphNameWarning)(targetSubgraphName, originalParentTypeName, [...fieldNames], subgraph.name));
                 }
                 else {
-                    const overridesData = (0, utils_3.getValueOrDefault)(allOverridesByTargetSubgraphName, targetSubgraphName, () => new Map());
-                    const existingFieldNames = (0, utils_3.getValueOrDefault)(overridesData, parentTypeName, () => new Set(fieldNames));
-                    (0, utils_3.addIterableValuesToSet)(fieldNames, existingFieldNames);
+                    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);
                 }
                 for (const fieldName of fieldNames) {
                     const fieldPath = `${originalParentTypeName}.${fieldName}`;
@@ -2276,7 +2278,7 @@ function batchNormalize(subgraphs) {
     if (duplicateOverriddenFieldPaths.size > 0) {
         const duplicateOverriddenFieldErrorMessages = [];
         for (const fieldPath of duplicateOverriddenFieldPaths) {
-            const sourceSubgraphNames = (0, utils_3.getOrThrowError)(overrideSourceSubgraphNamesByFieldPath, fieldPath, 'overrideSourceSubgraphNamesByFieldPath');
+            const sourceSubgraphNames = (0, utils_5.getOrThrowError)(overrideSourceSubgraphNamesByFieldPath, fieldPath, 'overrideSourceSubgraphNamesByFieldPath');
             duplicateOverriddenFieldErrorMessages.push((0, errors_1.duplicateOverriddenFieldErrorMessage)(fieldPath, sourceSubgraphNames));
         }
         allErrors.push((0, errors_1.duplicateOverriddenFieldsError)(duplicateOverriddenFieldErrorMessages));
@@ -2284,17 +2286,13 @@ function batchNormalize(subgraphs) {
     allErrors.push(...validationErrors);
     if (allErrors.length > 0) {
         return {
-            authorizationDataByParentTypeName,
-            concreteTypeNamesByAbstractTypeName,
-            entityDataByTypeName,
             errors: allErrors,
-            internalSubgraphBySubgraphName,
-            internalGraph,
+            success: false,
             warnings,
         };
     }
     for (const [targetSubgraphName, overridesData] of allOverridesByTargetSubgraphName) {
-        const internalSubgraph = (0, utils_3.getOrThrowError)(internalSubgraphBySubgraphName, targetSubgraphName, 'internalSubgraphBySubgraphName');
+        const internalSubgraph = (0, utils_5.getOrThrowError)(internalSubgraphBySubgraphName, targetSubgraphName, 'internalSubgraphBySubgraphName');
         internalSubgraph.overriddenFieldNamesByParentTypeName = overridesData;
         for (const [parentTypeName, fieldNames] of overridesData) {
             const configurationData = internalSubgraph.configurationDataByTypeName.get(parentTypeName);
@@ -2313,6 +2311,7 @@ function batchNormalize(subgraphs) {
         entityDataByTypeName,
         internalSubgraphBySubgraphName: internalSubgraphBySubgraphName,
         internalGraph,
+        success: true,
         warnings,
     };
 }