@wundergraph/composition 0.18.4 → 0.18.5

package/dist/normalization/walkers.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.consolidateAuthorizationDirectives = exports.upsertParentsAndChildren = exports.upsertDirectiveAndSchemaDefinitions = void 0;
 const graphql_1 = require("graphql");
-const type_merging_1 = require("../schema-building/type-merging");
 const errors_1 = require("../errors/errors");
 const constants_1 = require("../utils/constants");
 const utils_1 = require("../utils/utils");
@@ -10,11 +9,25 @@ const utils_2 = require("../ast/utils");
 const utils_3 = require("./utils");
 const string_constants_1 = require("../utils/string-constants");
 const utils_4 = require("../schema-building/utils");
+const ast_1 = require("../schema-building/ast");
 // Walker to collect schema definition and directive definitions
 function upsertDirectiveAndSchemaDefinitions(nf, document) {
     const definedDirectives = new Set();
     const schemaNodes = [];
     (0, graphql_1.visit)(document, {
+        Directive: {
+            enter(node) {
+                const name = node.name.value;
+                if (constants_1.V2_DIRECTIVE_DEFINITION_BY_DIRECTIVE_NAME.has(name)) {
+                    nf.isSubgraphVersionTwo = true;
+                    return false;
+                }
+                if (constants_1.BASE_DIRECTIVE_DEFINITION_BY_DIRECTIVE_NAME.has(name)) {
+                    return false;
+                }
+                nf.referencedDirectiveNames.add(name);
+            },
+        },
         DirectiveDefinition: {
             enter(node) {
                 const name = node.name.value;
@@ -40,19 +53,18 @@ function upsertDirectiveAndSchemaDefinitions(nf, document) {
         OperationTypeDefinition: {
             enter(node) {
                 const operationType = node.operation;
-                const operationPath = `${nf.parentTypeName}.${operationType}`;
                 const definitionNode = nf.schemaDefinition.operationTypes.get(operationType);
-                const newTypeName = (0, type_merging_1.getNamedTypeForChild)(operationPath, node.type);
+                const namedTypeName = (0, ast_1.getTypeNodeNamedTypeName)(node.type);
                 if (definitionNode) {
-                    (0, errors_1.duplicateOperationTypeDefinitionError)(operationType, newTypeName, (0, type_merging_1.getNamedTypeForChild)(operationPath, definitionNode.type));
+                    (0, errors_1.duplicateOperationTypeDefinitionError)(operationType, namedTypeName, (0, ast_1.getTypeNodeNamedTypeName)(definitionNode.type));
                     return false;
                 }
-                const existingOperationType = nf.operationTypeNames.get(newTypeName);
+                const existingOperationType = nf.operationTypeNodeByTypeName.get(namedTypeName);
                 if (existingOperationType) {
-                    nf.errors.push((0, errors_1.invalidOperationTypeDefinitionError)(existingOperationType, newTypeName, operationType));
+                    nf.errors.push((0, errors_1.invalidOperationTypeDefinitionError)(existingOperationType, namedTypeName, operationType));
                     return false;
                 }
-                nf.operationTypeNames.set(newTypeName, operationType);
+                nf.operationTypeNodeByTypeName.set(namedTypeName, operationType);
                 nf.schemaDefinition.operationTypes.set(operationType, node);
                 return false;
             },
@@ -80,41 +92,28 @@ exports.upsertDirectiveAndSchemaDefinitions = upsertDirectiveAndSchemaDefinition
 function upsertParentsAndChildren(nf, document) {
     let isParentRootType = false;
     (0, graphql_1.visit)(document, {
-        Directive: {
-            enter(node) {
-                const name = node.name.value;
-                if (constants_1.V2_DIRECTIVE_DEFINITION_BY_DIRECTIVE_NAME.has(name)) {
-                    nf.isSubgraphVersionTwo = true;
-                    return false;
-                }
-                if (constants_1.BASE_DIRECTIVE_DEFINITION_BY_DIRECTIVE_NAME.has(name)) {
-                    return false;
-                }
-                nf.referencedDirectiveNames.add(name);
-            },
-        },
         EnumTypeDefinition: {
             enter(node) {
-                nf.parentTypeName = node.name.value;
-                if (nf.parentDefinitionDataByTypeName.has(nf.parentTypeName)) {
-                    nf.errors.push((0, errors_1.duplicateTypeDefinitionError)((0, utils_1.kindToTypeString)(node.kind), nf.parentTypeName));
+                nf.originalParentTypeName = node.name.value;
+                if (nf.parentDefinitionDataByTypeName.has(nf.originalParentTypeName)) {
+                    nf.errors.push((0, errors_1.duplicateTypeDefinitionError)((0, utils_1.kindToTypeString)(node.kind), nf.originalParentTypeName));
                     return false;
                 }
                 nf.lastParentNodeKind = node.kind;
                 const directivesByDirectiveName = nf.extractDirectivesAndAuthorization(node, new Map());
-                (0, utils_4.upsertEnumDefinitionDataByNode)(nf.parentDefinitionDataByTypeName, node, directivesByDirectiveName);
+                (0, utils_4.addEnumDefinitionDataByNode)(nf.parentDefinitionDataByTypeName, node, directivesByDirectiveName);
             },
             leave() {
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
                 nf.lastParentNodeKind = graphql_1.Kind.NULL;
             },
         },
         EnumTypeExtension: {
             enter(node) {
-                nf.parentTypeName = node.name.value;
+                nf.originalParentTypeName = node.name.value;
                 nf.lastParentNodeKind = node.kind;
                 nf.isCurrentParentExtension = true;
-                const extension = nf.parentExtensionDataByTypeName.get(nf.parentTypeName);
+                const extension = nf.parentExtensionDataByTypeName.get(nf.originalParentTypeName);
                 if (extension) {
                     if (extension.kind !== graphql_1.Kind.ENUM_TYPE_EXTENSION) {
                         nf.errors.push((0, errors_1.incompatibleExtensionKindsError)(node, extension.kind));
@@ -124,10 +123,10 @@ function upsertParentsAndChildren(nf, document) {
                     return;
                 }
                 const directivesByDirectiveName = nf.extractDirectivesAndAuthorization(node, new Map());
-                (0, utils_4.upsertEnumExtensionDataByNode)(nf.parentExtensionDataByTypeName, node, directivesByDirectiveName);
+                (0, utils_4.addEnumExtensionDataByNode)(nf.parentExtensionDataByTypeName, node, directivesByDirectiveName);
             },
             leave() {
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
                 nf.lastParentNodeKind = graphql_1.Kind.NULL;
                 nf.isCurrentParentExtension = false;
             },
@@ -137,19 +136,19 @@ function upsertParentsAndChildren(nf, document) {
                 nf.childName = node.name.value;
                 nf.lastChildNodeKind = node.kind;
                 const parent = nf.isCurrentParentExtension
-                    ? (0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.parentTypeName, string_constants_1.EXTENSIONS)
-                    : (0, utils_1.getOrThrowError)(nf.parentDefinitionDataByTypeName, nf.parentTypeName, string_constants_1.PARENTS);
+                    ? (0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.originalParentTypeName, string_constants_1.EXTENSIONS)
+                    : (0, utils_1.getOrThrowError)(nf.parentDefinitionDataByTypeName, nf.originalParentTypeName, string_constants_1.PARENTS);
                 if (parent.kind !== graphql_1.Kind.ENUM_TYPE_DEFINITION && parent.kind !== graphql_1.Kind.ENUM_TYPE_EXTENSION) {
                     throw (0, errors_1.unexpectedKindFatalError)(nf.childName);
                 }
                 if (parent.enumValueDataByValueName.has(nf.childName)) {
                     const error = nf.isCurrentParentExtension
-                        ? (0, errors_1.duplicateValueExtensionError)('enum', nf.parentTypeName, nf.childName)
-                        : (0, errors_1.duplicateEnumValueDefinitionError)(nf.childName, nf.parentTypeName);
+                        ? (0, errors_1.duplicateValueExtensionError)('enum', nf.originalParentTypeName, nf.childName)
+                        : (0, errors_1.duplicateEnumValueDefinitionError)(nf.childName, nf.originalParentTypeName);
                     nf.errors.push(error);
                     return;
                 }
-                (0, utils_4.upsertEnumValueDataByNode)(parent.enumValueDataByValueName, node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.parentTypeName);
+                (0, utils_4.addEnumValueDataByNode)(parent.enumValueDataByValueName, node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.originalParentTypeName);
             },
             leave() {
                 nf.childName = '';
@@ -166,33 +165,32 @@ function upsertParentsAndChildren(nf, document) {
                     }
                 }
                 nf.lastChildNodeKind = node.kind;
-                const fieldPath = `${nf.parentTypeName}.${nf.childName}`;
                 nf.lastChildNodeKind = node.kind;
-                const fieldNamedTypeName = (0, type_merging_1.getNamedTypeForChild)(fieldPath, node.type);
+                const fieldNamedTypeName = (0, ast_1.getTypeNodeNamedTypeName)(node.type);
                 if (!constants_1.BASE_SCALARS.has(fieldNamedTypeName)) {
                     nf.referencedTypeNames.add(fieldNamedTypeName);
                 }
                 const parentData = nf.isCurrentParentExtension
-                    ? (0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.parentTypeName, string_constants_1.EXTENSIONS)
-                    : (0, utils_1.getOrThrowError)(nf.parentDefinitionDataByTypeName, nf.parentTypeName, string_constants_1.PARENTS);
+                    ? (0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.originalParentTypeName, string_constants_1.EXTENSIONS)
+                    : (0, utils_1.getOrThrowError)(nf.parentDefinitionDataByTypeName, nf.originalParentTypeName, string_constants_1.PARENTS);
                 if (parentData.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION &&
                     parentData.kind !== graphql_1.Kind.OBJECT_TYPE_EXTENSION &&
                     parentData.kind !== graphql_1.Kind.INTERFACE_TYPE_DEFINITION &&
                     parentData.kind !== graphql_1.Kind.INTERFACE_TYPE_EXTENSION) {
-                    throw (0, errors_1.unexpectedKindFatalError)(nf.parentTypeName);
+                    throw (0, errors_1.unexpectedKindFatalError)(nf.originalParentTypeName);
                 }
                 if (parentData.fieldDataByFieldName.has(nf.childName)) {
-                    nf.errors.push((0, errors_1.duplicateFieldDefinitionError)(nf.childName, nf.parentTypeName));
+                    nf.errors.push((0, errors_1.duplicateFieldDefinitionError)(nf.childName, nf.originalParentTypeName));
                     return;
                 }
-                const argumentDataByArgumentName = (0, utils_4.extractArguments)(new Map(), node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.parentsWithChildArguments, nf.parentTypeName, nf.subgraphName || string_constants_1.N_A);
+                const argumentDataByArgumentName = (0, utils_4.extractArguments)(new Map(), node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.parentsWithChildArguments, nf.originalParentTypeName, nf.renamedParentTypeName || nf.originalParentTypeName, nf.subgraphName);
                 const directivesByDirectiveName = nf.extractDirectivesAndAuthorization(node, (0, utils_4.addInheritedDirectivesToFieldData)(parentData.directivesByDirectiveName, new Map()));
-                const fieldData = (0, utils_4.upsertFieldDataByNode)(parentData.fieldDataByFieldName, node, nf.errors, argumentDataByArgumentName, directivesByDirectiveName, nf.parentTypeName, nf.subgraphName || string_constants_1.N_A, nf.isSubgraphVersionTwo);
-                const entityContainer = nf.entityContainerByTypeName.get(nf.parentTypeName);
+                const fieldData = (0, utils_4.addFieldDataByNode)(parentData.fieldDataByFieldName, node, nf.errors, argumentDataByArgumentName, directivesByDirectiveName, nf.originalParentTypeName, nf.renamedParentTypeName || nf.originalParentTypeName, nf.subgraphName, nf.isSubgraphVersionTwo);
+                const entityContainer = nf.entityContainerByTypeName.get(nf.originalParentTypeName);
                 if (entityContainer) {
                     entityContainer.fieldNames.add(nf.childName);
                     // Only entities will have an existing FieldSet
-                    const existingFieldSet = nf.fieldSetContainerByTypeName.get(nf.parentTypeName);
+                    const existingFieldSet = nf.fieldSetContainerByTypeName.get(nf.originalParentTypeName);
                     if (existingFieldSet) {
                         // @requires should only be defined on a field whose parent is an entity
                         // If there is existingFieldSet, it's an entity
@@ -208,7 +206,7 @@ function upsertParentsAndChildren(nf, document) {
                 if (!providesDirectives) {
                     return;
                 }
-                const fieldSetContainer = (0, utils_1.getValueOrDefault)(nf.fieldSetContainerByTypeName, nf.parentTypeName, utils_3.newFieldSetContainer);
+                const fieldSetContainer = (0, utils_1.getValueOrDefault)(nf.fieldSetContainerByTypeName, nf.originalParentTypeName, utils_3.newFieldSetContainer);
                 // @provides only makes sense on entities, but the field can be encountered before the type definition
                 // When the FieldSet is evaluated, it will be checked whether the field is an entity.
                 (0, utils_3.extractFieldSetValue)(nf.childName, fieldSetContainer.provides, providesDirectives);
@@ -220,37 +218,37 @@ function upsertParentsAndChildren(nf, document) {
         },
         InputObjectTypeDefinition: {
             enter(node) {
-                nf.parentTypeName = node.name.value;
-                if (nf.parentDefinitionDataByTypeName.has(nf.parentTypeName)) {
-                    nf.errors.push((0, errors_1.duplicateTypeDefinitionError)((0, utils_1.kindToTypeString)(node.kind), nf.parentTypeName));
+                nf.originalParentTypeName = node.name.value;
+                if (nf.parentDefinitionDataByTypeName.has(nf.originalParentTypeName)) {
+                    nf.errors.push((0, errors_1.duplicateTypeDefinitionError)((0, utils_1.kindToTypeString)(node.kind), nf.originalParentTypeName));
                     return false;
                 }
                 nf.lastParentNodeKind = node.kind;
-                (0, utils_4.upsertInputObjectDefinitionDataByNode)(nf.parentDefinitionDataByTypeName, node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath);
+                (0, utils_4.addInputObjectDefinitionDataByNode)(nf.parentDefinitionDataByTypeName, node, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.subgraphName, nf.errors);
             },
             leave() {
                 nf.lastParentNodeKind = graphql_1.Kind.NULL;
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
             },
         },
         InputObjectTypeExtension: {
             enter(node) {
-                nf.parentTypeName = node.name.value;
+                nf.originalParentTypeName = node.name.value;
                 nf.lastParentNodeKind = node.kind;
                 nf.isCurrentParentExtension = true;
-                const extension = nf.parentExtensionDataByTypeName.get(nf.parentTypeName);
+                const extension = nf.parentExtensionDataByTypeName.get(nf.originalParentTypeName);
                 if (extension) {
                     if (extension.kind !== graphql_1.Kind.INPUT_OBJECT_TYPE_EXTENSION) {
                         nf.errors.push((0, errors_1.incompatibleExtensionKindsError)(node, extension.kind));
                         return false;
                     }
-                    (0, utils_4.extractDirectives)(node, extension.directivesByDirectiveName, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.parentTypeName);
+                    (0, utils_4.extractDirectives)(node, extension.directivesByDirectiveName, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.originalParentTypeName);
                     return;
                 }
-                (0, utils_4.upsertInputObjectExtensionDataByNode)(nf.parentExtensionDataByTypeName, node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath);
+                (0, utils_4.addInputObjectExtensionDataByNode)(nf.parentExtensionDataByTypeName, node, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.errors);
             },
             leave() {
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
                 nf.lastParentNodeKind = graphql_1.Kind.NULL;
                 nf.isCurrentParentExtension = false;
             },
@@ -266,21 +264,22 @@ function upsertParentsAndChildren(nf, document) {
                 }
                 nf.childName = name;
                 nf.lastChildNodeKind = node.kind;
-                const valueRootTypeName = (0, type_merging_1.getNamedTypeForChild)(`${nf.parentTypeName}.${name}`, node.type);
-                if (!constants_1.BASE_SCALARS.has(valueRootTypeName)) {
-                    nf.referencedTypeNames.add(valueRootTypeName);
+                const valuePath = `${nf.originalParentTypeName}.${name}`;
+                const namedInputValueTypeName = (0, ast_1.getTypeNodeNamedTypeName)(node.type);
+                if (!constants_1.BASE_SCALARS.has(namedInputValueTypeName)) {
+                    nf.referencedTypeNames.add(namedInputValueTypeName);
                 }
                 const parent = nf.isCurrentParentExtension
-                    ? (0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.parentTypeName, string_constants_1.EXTENSIONS)
-                    : (0, utils_1.getOrThrowError)(nf.parentDefinitionDataByTypeName, nf.parentTypeName, string_constants_1.PARENTS);
+                    ? (0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.originalParentTypeName, string_constants_1.EXTENSIONS)
+                    : (0, utils_1.getOrThrowError)(nf.parentDefinitionDataByTypeName, nf.originalParentTypeName, string_constants_1.PARENTS);
                 if (parent.kind !== graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION && parent.kind !== graphql_1.Kind.INPUT_OBJECT_TYPE_EXTENSION) {
-                    throw (0, errors_1.unexpectedKindFatalError)(nf.parentTypeName);
+                    throw (0, errors_1.unexpectedKindFatalError)(nf.originalParentTypeName);
                 }
                 if (parent.inputValueDataByValueName.has(name)) {
-                    nf.errors.push((0, errors_1.duplicateValueExtensionError)('input', nf.parentTypeName, name));
+                    nf.errors.push((0, errors_1.duplicateValueExtensionError)('input', nf.originalParentTypeName, name));
                     return;
                 }
-                (0, utils_4.upsertInputValueDataByNode)(parent.inputValueDataByValueName, node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.parentTypeName);
+                (0, utils_4.addInputValueDataByNode)(parent.inputValueDataByValueName, node, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, valuePath, nf.subgraphName, nf.errors);
             },
             leave() {
                 nf.argumentName = '';
@@ -294,7 +293,7 @@ function upsertParentsAndChildren(nf, document) {
         InterfaceTypeDefinition: {
             enter(node) {
                 const typeName = node.name.value;
-                nf.parentTypeName = typeName;
+                nf.originalParentTypeName = typeName;
                 nf.lastParentNodeKind = node.kind;
                 if ((0, utils_2.isNodeExtension)(node)) {
                     return nf.handleExtensionWithFields(node);
@@ -304,7 +303,10 @@ function upsertParentsAndChildren(nf, document) {
                     return false;
                 }
                 const isEntity = (0, utils_2.isObjectLikeNodeEntity)(node);
-                (0, utils_4.upsertInterfaceDefinitionDataByNode)(nf.parentDefinitionDataByTypeName, node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, isEntity, nf.subgraphName || string_constants_1.N_A);
+                if (isEntity && !nf.graph.hasNode(typeName)) {
+                    nf.graph.addNode(typeName);
+                }
+                (0, utils_4.addInterfaceDefinitionDataByNode)(nf.parentDefinitionDataByTypeName, node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, isEntity, nf.subgraphName);
                 if (!isEntity) {
                     return;
                 }
@@ -316,7 +318,7 @@ function upsertParentsAndChildren(nf, document) {
                     typeName: typeName,
                 });
                 (0, utils_1.upsertEntityContainerProperties)(nf.entityContainerByTypeName, {
-                    typeName: nf.parentTypeName,
+                    typeName: nf.originalParentTypeName,
                     ...(nf.subgraphName ? { subgraphNames: [nf.subgraphName] } : {}),
                 });
                 const fieldSetContainer = (0, utils_1.getValueOrDefault)(nf.fieldSetContainerByTypeName, typeName, utils_3.newFieldSetContainer);
@@ -325,55 +327,59 @@ function upsertParentsAndChildren(nf, document) {
             leave() {
                 // @extends treats the node as an extension, so fetch the correct data
                 const parentData = nf.isCurrentParentExtension
-                    ? (0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.parentTypeName, string_constants_1.PARENT_EXTENSION_DATA_MAP)
-                    : (0, utils_1.getOrThrowError)(nf.parentDefinitionDataByTypeName, nf.parentTypeName, string_constants_1.PARENT_DEFINITION_DATA_MAP);
+                    ? (0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.originalParentTypeName, string_constants_1.PARENT_EXTENSION_DATA_MAP)
+                    : (0, utils_1.getOrThrowError)(nf.parentDefinitionDataByTypeName, nf.originalParentTypeName, string_constants_1.PARENT_DEFINITION_DATA_MAP);
                 (0, utils_4.removeInheritableDirectivesFromParentWithFieldsData)(parentData);
                 nf.isCurrentParentExtension = false;
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
                 nf.lastParentNodeKind = graphql_1.Kind.NULL;
             },
         },
         InterfaceTypeExtension: {
             enter(node) {
-                nf.parentTypeName = node.name.value;
+                nf.originalParentTypeName = node.name.value;
                 nf.lastParentNodeKind = node.kind;
                 return nf.handleExtensionWithFields(node);
             },
             leave() {
-                (0, utils_4.removeInheritableDirectivesFromParentWithFieldsData)((0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.parentTypeName, string_constants_1.PARENT_EXTENSION_DATA_MAP));
+                (0, utils_4.removeInheritableDirectivesFromParentWithFieldsData)((0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.originalParentTypeName, string_constants_1.PARENT_EXTENSION_DATA_MAP));
                 nf.isCurrentParentExtension = false;
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
                 nf.lastParentNodeKind = graphql_1.Kind.NULL;
             },
         },
         ObjectTypeDefinition: {
             enter(node) {
-                const typeName = node.name.value;
-                if (typeName === string_constants_1.SERVICE_OBJECT) {
+                nf.originalParentTypeName = node.name.value;
+                if (nf.originalParentTypeName === string_constants_1.SERVICE_OBJECT) {
                     return false;
                 }
-                isParentRootType = (0, utils_4.isTypeNameRootType)(typeName, nf.operationTypeNames);
-                nf.parentTypeName = typeName;
+                isParentRootType = (0, utils_4.isTypeNameRootType)(nf.originalParentTypeName, nf.operationTypeNodeByTypeName);
+                nf.renamedParentTypeName = (0, utils_4.getRenamedRootTypeName)(nf.originalParentTypeName, nf.operationTypeNodeByTypeName);
+                nf.originalTypeNameByRenamedTypeName.set(nf.renamedParentTypeName, nf.originalParentTypeName);
+                if (!nf.graph.hasNode(nf.renamedParentTypeName)) {
+                    nf.graph.addNode(nf.renamedParentTypeName);
+                }
                 nf.lastParentNodeKind = node.kind;
-                (0, utils_2.addConcreteTypesForImplementedInterfaces)(node, nf.abstractToConcreteTypeNames);
+                (0, utils_2.addConcreteTypesForImplementedInterfaces)(node, nf.concreteTypeNamesByAbstractTypeName);
                 nf.handleInterfaceObject(node);
                 // handling for @extends directive
                 if ((0, utils_2.isNodeExtension)(node)) {
-                    return nf.handleExtensionWithFields(node);
+                    return nf.handleExtensionWithFields(node, isParentRootType);
                 }
-                if (nf.parentDefinitionDataByTypeName.has(typeName)) {
-                    nf.errors.push((0, errors_1.duplicateTypeDefinitionError)((0, utils_1.kindToTypeString)(node.kind), typeName));
+                if (nf.parentDefinitionDataByTypeName.has(nf.originalParentTypeName)) {
+                    nf.errors.push((0, errors_1.duplicateTypeDefinitionError)((0, utils_1.kindToTypeString)(node.kind), nf.originalParentTypeName));
                     return false;
                 }
                 const isEntity = (0, utils_2.isObjectLikeNodeEntity)(node);
-                (0, utils_4.upsertObjectDefinitionDataByNode)(nf.parentDefinitionDataByTypeName, node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, isEntity, isParentRootType, nf.subgraphName || 'N/A');
+                (0, utils_4.addObjectDefinitionDataByNode)(nf.parentDefinitionDataByTypeName, node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, isEntity, isParentRootType, nf.subgraphName || 'N/A', nf.renamedParentTypeName);
                 if (!isEntity) {
                     return;
                 }
-                const fieldSetContainer = (0, utils_1.getValueOrDefault)(nf.fieldSetContainerByTypeName, typeName, utils_3.newFieldSetContainer);
+                const fieldSetContainer = (0, utils_1.getValueOrDefault)(nf.fieldSetContainerByTypeName, nf.originalParentTypeName, utils_3.newFieldSetContainer);
                 nf.extractKeyFieldSets(node, fieldSetContainer);
                 (0, utils_1.upsertEntityContainerProperties)(nf.entityContainerByTypeName, {
-                    typeName: nf.parentTypeName,
+                    typeName: nf.originalParentTypeName,
                     keyFieldSets: fieldSetContainer.keys,
                     ...(nf.subgraphName ? { subgraphNames: [nf.subgraphName] } : {}),
                 });
@@ -381,31 +387,38 @@ function upsertParentsAndChildren(nf, document) {
             leave() {
                 // @extends treats the node as an extension, so fetch the correct data
                 const parentData = nf.isCurrentParentExtension
-                    ? (0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.parentTypeName, string_constants_1.PARENT_EXTENSION_DATA_MAP)
-                    : (0, utils_1.getOrThrowError)(nf.parentDefinitionDataByTypeName, nf.parentTypeName, string_constants_1.PARENT_DEFINITION_DATA_MAP);
+                    ? (0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.originalParentTypeName, string_constants_1.PARENT_EXTENSION_DATA_MAP)
+                    : (0, utils_1.getOrThrowError)(nf.parentDefinitionDataByTypeName, nf.originalParentTypeName, string_constants_1.PARENT_DEFINITION_DATA_MAP);
                 (0, utils_4.removeInheritableDirectivesFromParentWithFieldsData)(parentData);
                 isParentRootType = false;
                 nf.isCurrentParentExtension = false;
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
+                nf.renamedParentTypeName = '';
                 nf.lastParentNodeKind = graphql_1.Kind.NULL;
             },
         },
         ObjectTypeExtension: {
             enter(node) {
-                nf.parentTypeName = node.name.value;
-                if (nf.parentTypeName === string_constants_1.SERVICE_OBJECT) {
+                nf.originalParentTypeName = node.name.value;
+                if (nf.originalParentTypeName === string_constants_1.SERVICE_OBJECT) {
                     return false;
                 }
-                isParentRootType = (0, utils_4.isTypeNameRootType)(nf.parentTypeName, nf.operationTypeNames);
+                isParentRootType = (0, utils_4.isTypeNameRootType)(nf.originalParentTypeName, nf.operationTypeNodeByTypeName);
+                nf.renamedParentTypeName = (0, utils_4.getRenamedRootTypeName)(nf.originalParentTypeName, nf.operationTypeNodeByTypeName);
+                nf.originalTypeNameByRenamedTypeName.set(nf.renamedParentTypeName, nf.originalParentTypeName);
+                if (!nf.graph.hasNode(nf.renamedParentTypeName)) {
+                    nf.graph.addNode(nf.renamedParentTypeName);
+                }
                 nf.lastParentNodeKind = node.kind;
-                (0, utils_2.addConcreteTypesForImplementedInterfaces)(node, nf.abstractToConcreteTypeNames);
-                return nf.handleExtensionWithFields(node);
+                (0, utils_2.addConcreteTypesForImplementedInterfaces)(node, nf.concreteTypeNamesByAbstractTypeName);
+                return nf.handleExtensionWithFields(node, isParentRootType);
             },
             leave() {
-                (0, utils_4.removeInheritableDirectivesFromParentWithFieldsData)((0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.parentTypeName, string_constants_1.PARENT_EXTENSION_DATA_MAP));
+                (0, utils_4.removeInheritableDirectivesFromParentWithFieldsData)((0, utils_1.getOrThrowError)(nf.parentExtensionDataByTypeName, nf.originalParentTypeName, string_constants_1.PARENT_EXTENSION_DATA_MAP));
                 isParentRootType = false;
                 nf.isCurrentParentExtension = false;
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
+                nf.renamedParentTypeName = '';
                 nf.lastParentNodeKind = graphql_1.Kind.NULL;
             },
         },
@@ -420,24 +433,24 @@ function upsertParentsAndChildren(nf, document) {
                     nf.errors.push((0, errors_1.duplicateTypeDefinitionError)((0, utils_1.kindToTypeString)(node.kind), name));
                     return false;
                 }
-                nf.parentTypeName = name;
+                nf.originalParentTypeName = name;
                 nf.lastParentNodeKind = node.kind;
                 const directivesByDirectiveName = nf.extractDirectivesAndAuthorization(node, new Map());
-                (0, utils_4.upsertScalarDefinitionDataByNode)(nf.parentDefinitionDataByTypeName, node, directivesByDirectiveName);
+                (0, utils_4.addScalarDefinitionDataByNode)(nf.parentDefinitionDataByTypeName, node, directivesByDirectiveName);
             },
             leave() {
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
                 nf.lastParentNodeKind = graphql_1.Kind.NULL;
             },
         },
         ScalarTypeExtension: {
             enter(node) {
-                nf.parentTypeName = node.name.value;
-                if (nf.parentTypeName === string_constants_1.ANY_SCALAR) {
+                nf.originalParentTypeName = node.name.value;
+                if (nf.originalParentTypeName === string_constants_1.ANY_SCALAR) {
                     return false;
                 }
                 nf.lastParentNodeKind = node.kind;
-                const extension = nf.parentExtensionDataByTypeName.get(nf.parentTypeName);
+                const extension = nf.parentExtensionDataByTypeName.get(nf.originalParentTypeName);
                 if (extension) {
                     if (extension.kind !== graphql_1.Kind.SCALAR_TYPE_EXTENSION) {
                         nf.errors.push((0, errors_1.incompatibleExtensionKindsError)(node, extension.kind));
@@ -447,60 +460,60 @@ function upsertParentsAndChildren(nf, document) {
                     return false;
                 }
                 const directivesByDirectiveName = nf.extractDirectivesAndAuthorization(node, new Map());
-                (0, utils_4.upsertScalarExtensionDataByNode)(nf.parentExtensionDataByTypeName, node, directivesByDirectiveName);
+                (0, utils_4.addScalarExtensionDataByNode)(nf.parentExtensionDataByTypeName, node, directivesByDirectiveName);
                 return false;
             },
             leave() {
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
                 nf.lastParentNodeKind = graphql_1.Kind.NULL;
             },
         },
         UnionTypeDefinition: {
             enter(node) {
-                nf.parentTypeName = node.name.value;
-                if (nf.parentTypeName === string_constants_1.ENTITY_UNION) {
+                nf.originalParentTypeName = node.name.value;
+                if (nf.originalParentTypeName === string_constants_1.ENTITY_UNION) {
                     return false;
                 }
-                const parent = nf.parentDefinitionDataByTypeName.get(nf.parentTypeName);
+                const parent = nf.parentDefinitionDataByTypeName.get(nf.originalParentTypeName);
                 if (parent) {
-                    nf.errors.push((0, errors_1.duplicateTypeDefinitionError)((0, utils_1.kindToTypeString)(node.kind), nf.parentTypeName));
+                    nf.errors.push((0, errors_1.duplicateTypeDefinitionError)((0, utils_1.kindToTypeString)(node.kind), nf.originalParentTypeName));
                     return false;
                 }
                 nf.lastParentNodeKind = node.kind;
-                (0, utils_4.upsertUnionDefinitionDataByNode)(nf.parentDefinitionDataByTypeName, node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.abstractToConcreteTypeNames, nf.referencedTypeNames);
+                (0, utils_4.addUnionDefinitionDataByNode)(nf.parentDefinitionDataByTypeName, node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.concreteTypeNamesByAbstractTypeName, nf.referencedTypeNames);
             },
             leave() {
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
                 nf.lastParentNodeKind = graphql_1.Kind.NULL;
             },
         },
         UnionTypeExtension: {
             enter(node) {
-                nf.parentTypeName = node.name.value;
-                if (nf.parentTypeName === string_constants_1.ENTITY_UNION) {
+                nf.originalParentTypeName = node.name.value;
+                if (nf.originalParentTypeName === string_constants_1.ENTITY_UNION) {
                     return false;
                 }
-                const extension = nf.parentExtensionDataByTypeName.get(nf.parentTypeName);
+                const extension = nf.parentExtensionDataByTypeName.get(nf.originalParentTypeName);
                 if (!node.types?.length) {
-                    nf.errors.push((0, errors_1.noDefinedUnionMembersError)(nf.parentTypeName, true));
+                    nf.errors.push((0, errors_1.noDefinedUnionMembersError)(nf.originalParentTypeName, true));
                     return false;
                 }
                 nf.lastParentNodeKind = node.kind;
-                (0, utils_2.addConcreteTypesForUnion)(node, nf.abstractToConcreteTypeNames);
+                (0, utils_2.addConcreteTypesForUnion)(node, nf.concreteTypeNamesByAbstractTypeName);
                 if (extension) {
                     if (extension.kind !== graphql_1.Kind.UNION_TYPE_EXTENSION) {
                         nf.errors.push((0, errors_1.incompatibleExtensionKindsError)(node, extension.kind));
                         return false;
                     }
-                    (0, utils_4.extractDirectives)(node, extension.directivesByDirectiveName, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.parentTypeName);
-                    (0, utils_4.extractUniqueUnionMembers)(node.types, extension.memberByMemberTypeName, nf.errors, nf.parentTypeName, nf.abstractToConcreteTypeNames, nf.referencedTypeNames);
+                    (0, utils_4.extractDirectives)(node, extension.directivesByDirectiveName, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.originalParentTypeName);
+                    (0, utils_4.extractUniqueUnionMembers)(node.types, extension.memberByMemberTypeName, nf.errors, nf.originalParentTypeName, nf.concreteTypeNamesByAbstractTypeName, nf.referencedTypeNames);
                     return false;
                 }
-                (0, utils_4.upsertUnionExtensionDataByNode)(nf.parentExtensionDataByTypeName, node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.abstractToConcreteTypeNames, nf.referencedTypeNames);
+                (0, utils_4.addUnionExtensionDataByNode)(nf.parentExtensionDataByTypeName, node, nf.errors, nf.directiveDefinitionByDirectiveName, nf.handledRepeatedDirectivesByHostPath, nf.concreteTypeNamesByAbstractTypeName, nf.referencedTypeNames);
                 return false;
             },
             leave() {
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
                 nf.lastParentNodeKind = graphql_1.Kind.NULL;
             },
         },
@@ -515,18 +528,19 @@ function consolidateAuthorizationDirectives(nf, definitions) {
         FieldDefinition: {
             enter(node) {
                 nf.childName = node.name.value;
-                const typeName = (0, type_merging_1.getNamedTypeForChild)(`${nf.parentTypeName}.${nf.childName}`, node.type);
+                const typeName = (0, ast_1.getTypeNodeNamedTypeName)(node.type);
                 const inheritsAuthorization = nf.leafTypeNamesWithAuthorizationDirectives.has(typeName);
                 if ((!parentAuthorizationData || !parentAuthorizationData.hasParentLevelAuthorization) &&
                     !inheritsAuthorization) {
                     return false;
                 }
+                const parentTypeName = nf.renamedParentTypeName || nf.originalParentTypeName;
                 if (!parentAuthorizationData) {
-                    parentAuthorizationData = (0, utils_1.setAndGetValue)(nf.authorizationDataByParentTypeName, nf.parentTypeName, (0, utils_1.newAuthorizationData)(nf.parentTypeName));
+                    parentAuthorizationData = (0, utils_1.setAndGetValue)(nf.authorizationDataByParentTypeName, parentTypeName, (0, utils_1.newAuthorizationData)(parentTypeName));
                 }
                 const fieldAuthorizationData = (0, utils_1.getValueOrDefault)(parentAuthorizationData.fieldAuthorizationDataByFieldName, nf.childName, () => (0, utils_1.newFieldAuthorizationData)(nf.childName));
                 if (!(0, utils_1.mergeAuthorizationDataByAND)(parentAuthorizationData, fieldAuthorizationData)) {
-                    nf.invalidOrScopesHostPaths.add(`${nf.parentTypeName}.${nf.childName}`);
+                    nf.invalidOrScopesHostPaths.add(`${nf.originalParentTypeName}.${nf.childName}`);
                     return false;
                 }
                 if (!inheritsAuthorization) {
@@ -542,7 +556,7 @@ function consolidateAuthorizationDirectives(nf, definitions) {
                 if (definitionAuthorizationData &&
                     definitionAuthorizationData.hasParentLevelAuthorization &&
                     !(0, utils_1.mergeAuthorizationDataByAND)(definitionAuthorizationData, fieldAuthorizationData)) {
-                    nf.invalidOrScopesHostPaths.add(`${nf.parentTypeName}.${nf.childName}`);
+                    nf.invalidOrScopesHostPaths.add(`${nf.originalParentTypeName}.${nf.childName}`);
                 }
                 return false;
             },
@@ -552,45 +566,59 @@ function consolidateAuthorizationDirectives(nf, definitions) {
         },
         InterfaceTypeDefinition: {
             enter(node) {
-                nf.parentTypeName = node.name.value;
+                nf.originalParentTypeName = node.name.value;
                 parentAuthorizationData = nf.getAuthorizationData(node);
                 isInterfaceKind = true;
             },
             leave() {
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
                 parentAuthorizationData = undefined;
                 isInterfaceKind = false;
             },
         },
         InterfaceTypeExtension: {
             enter(node) {
-                nf.parentTypeName = node.name.value;
+                nf.originalParentTypeName = node.name.value;
                 parentAuthorizationData = nf.getAuthorizationData(node);
                 isInterfaceKind = true;
             },
             leave() {
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
                 parentAuthorizationData = undefined;
                 isInterfaceKind = false;
             },
         },
         ObjectTypeDefinition: {
             enter(node) {
-                nf.parentTypeName = node.name.value;
+                const parentData = nf.parentDefinitionDataByTypeName.get(node.name.value) ||
+                    nf.parentExtensionDataByTypeName.get(node.name.value);
+                if (!parentData) {
+                    return false;
+                }
+                nf.originalParentTypeName = parentData.name;
+                nf.renamedParentTypeName = parentData.renamedTypeName;
                 parentAuthorizationData = nf.getAuthorizationData(node);
             },
             leave() {
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
+                nf.renamedParentTypeName = '';
                 parentAuthorizationData = undefined;
             },
         },
         ObjectTypeExtension: {
             enter(node) {
-                nf.parentTypeName = node.name.value;
+                const parentData = nf.parentDefinitionDataByTypeName.get(node.name.value) ||
+                    nf.parentExtensionDataByTypeName.get(node.name.value);
+                if (!parentData) {
+                    return false;
+                }
+                nf.originalParentTypeName = parentData.name;
+                nf.renamedParentTypeName = parentData.renamedTypeName;
                 parentAuthorizationData = nf.getAuthorizationData(node);
             },
             leave() {
-                nf.parentTypeName = '';
+                nf.originalParentTypeName = '';
+                nf.renamedParentTypeName = '';
                 parentAuthorizationData = undefined;
             },
         },