@wundergraph/composition 0.39.2 → 0.41.0

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

@@ -81,7 +81,7 @@ class FederationFactory {
             interfaces.push((0, utils_1.stringToNamedTypeNode)(interfaceName));
             const implementationData = (0, utils_6.getOrThrowError)(this.parentDefinitionDataByTypeName, interfaceName, string_constants_2.PARENT_DEFINITION_DATA);
             if (implementationData.kind !== graphql_1.Kind.INTERFACE_TYPE_DEFINITION) {
-                invalidImplementationTypeStringByTypeName.set(implementationData.name, (0, utils_6.kindToTypeString)(implementationData.kind));
+                invalidImplementationTypeStringByTypeName.set(implementationData.name, (0, utils_6.kindToNodeType)(implementationData.kind));
                 continue;
             }
             const implementationErrors = {
@@ -89,9 +89,9 @@ class FederationFactory {
                 unimplementedFields: [],
             };
             let hasErrors = false;
-            for (const [fieldName, interfaceField] of implementationData.fieldDataByFieldName) {
+            for (const [fieldName, interfaceField] of implementationData.fieldDataByName) {
                 let hasNestedErrors = false;
-                const fieldData = data.fieldDataByFieldName.get(fieldName);
+                const fieldData = data.fieldDataByName.get(fieldName);
                 if (!fieldData) {
                     hasErrors = true;
                     implementationErrors.unimplementedFields.push(fieldName);
@@ -111,10 +111,10 @@ class FederationFactory {
                     invalidFieldImplementation.implementedResponseType = (0, merge_1.printTypeNode)(fieldData.node.type);
                 }
                 const handledArguments = new Set();
-                for (const [argumentName, inputValueData] of interfaceField.argumentDataByArgumentName) {
+                for (const [argumentName, inputValueData] of interfaceField.argumentDataByName) {
                     const interfaceArgument = inputValueData.node;
                     handledArguments.add(argumentName);
-                    const argumentNode = fieldData.argumentDataByArgumentName.get(argumentName)?.node;
+                    const argumentNode = fieldData.argumentDataByName.get(argumentName)?.node;
                     // The type implementing the interface must include all arguments with no variation for that argument
                     if (!argumentNode) {
                         hasErrors = true;
@@ -132,7 +132,7 @@ class FederationFactory {
                     }
                 }
                 // Additional arguments must be optional (nullable)
-                for (const [argumentName, inputValueContainer] of fieldData.argumentDataByArgumentName) {
+                for (const [argumentName, inputValueContainer] of fieldData.argumentDataByName) {
                     const argumentNode = inputValueContainer.node;
                     if (handledArguments.has(argumentName)) {
                         continue;
@@ -161,7 +161,7 @@ class FederationFactory {
             this.errors.push((0, errors_1.invalidImplementedTypeError)(data.name, invalidImplementationTypeStringByTypeName));
         }
         if (implementationErrorsByInterfaceName.size > 0) {
-            this.errors.push((0, errors_1.invalidInterfaceImplementationError)(data.node.name.value, (0, utils_6.kindToTypeString)(data.kind), implementationErrorsByInterfaceName));
+            this.errors.push((0, errors_1.invalidInterfaceImplementationError)(data.node.name.value, (0, utils_6.kindToNodeType)(data.kind), implementationErrorsByInterfaceName));
         }
         return interfaces;
     }
@@ -338,17 +338,17 @@ class FederationFactory {
         (0, utils_6.addIterableValuesToSet)(incomingData.subgraphNames, targetData.subgraphNames);
         this.handleInputValueInaccessibility(isParentInaccessible, targetData, parentCoords);
         // TODO refactor type merging
-        const { typeErrors, typeNode } = (0, type_merging_1.getMostRestrictiveMergedTypeNode)(targetData.type, incomingData.type, targetData.originalCoords, this.errors);
-        if (typeNode) {
-            targetData.type = typeNode;
+        const mergeResult = (0, type_merging_1.getMostRestrictiveMergedTypeNode)(targetData.type, incomingData.type, targetData.originalCoords, this.errors);
+        if (mergeResult.success) {
+            targetData.type = mergeResult.typeNode;
         }
         else {
-            if (!typeErrors || typeErrors.length < 2) {
-                throw (0, errors_1.fieldTypeMergeFatalError)(targetData.name);
-            }
-            existingData.isArgument
-                ? this.errors.push((0, errors_1.incompatibleArgumentTypesError)(targetData.name, targetData.federatedCoords, typeErrors[0], typeErrors[1]))
-                : this.errors.push((0, errors_1.incompatibleChildTypesError)(targetData.federatedCoords, typeErrors[0], typeErrors[1]));
+            this.errors.push((0, errors_1.incompatibleMergedTypesError)({
+                actualType: mergeResult.actualType,
+                isArgument: existingData.isArgument,
+                coords: existingData.federatedCoords,
+                expectedType: mergeResult.expectedType,
+            }));
         }
         (0, utils_5.compareAndValidateInputValueDefaultValues)(targetData, incomingData, this.errors);
     }
@@ -392,7 +392,7 @@ class FederationFactory {
     federateOutputType({ current, other, coords, mostRestrictive }) {
         other = (0, ast_1.getMutableTypeNode)(other, coords, this.errors); // current is already a deep copy
         // The first type of the pair to diverge in restriction takes precedence in all future differences.
-        // If the other type of the pair also diverges, it's a src error.
+        // If the other type of the pair also diverges, it's an error.
         // To keep the output link intact, it is not possible to spread assign "lastTypeNode".
         const federatedTypeNode = { kind: current.kind };
         let divergentType = type_merging_1.DivergentType.NONE;
@@ -422,7 +422,7 @@ class FederationFactory {
             }
             if (current.kind === graphql_1.Kind.NON_NULL_TYPE) {
                 if (divergentType === type_merging_1.DivergentType.OTHER) {
-                    this.errors.push((0, errors_1.incompatibleChildTypesError)(coords, current.kind, other.kind));
+                    this.errors.push((0, errors_1.incompatibleMergedTypesError)({ actualType: other.kind, coords, expectedType: current.kind }));
                     return { success: false };
                 }
                 else {
@@ -438,7 +438,7 @@ class FederationFactory {
             }
             if (other.kind === graphql_1.Kind.NON_NULL_TYPE) {
                 if (divergentType === type_merging_1.DivergentType.CURRENT) {
-                    this.errors.push((0, errors_1.incompatibleChildTypesError)(coords, current.kind, other.kind));
+                    this.errors.push((0, errors_1.incompatibleMergedTypesError)({ actualType: other.kind, coords, expectedType: current.kind }));
                     return { success: false };
                 }
                 else {
@@ -453,7 +453,7 @@ class FederationFactory {
                 continue;
             }
             // At least one of the types must be a non-null wrapper, or the types are inconsistent
-            this.errors.push((0, errors_1.incompatibleChildTypesError)(coords, current.kind, other.kind));
+            this.errors.push((0, errors_1.incompatibleMergedTypesError)({ actualType: other.kind, coords, expectedType: current.kind }));
             return { success: false };
         }
         this.errors.push((0, errors_1.maximumTypeNestingExceededError)(coords));
@@ -513,8 +513,8 @@ class FederationFactory {
                 this.addSubgraphNameToExistingFieldNamedTypeDisparity(incomingData);
             }
         }
-        for (const inputValueData of incomingData.argumentDataByArgumentName.values()) {
-            this.upsertInputValueData(targetData.argumentDataByArgumentName, inputValueData, targetData.federatedCoords, isFieldInaccessible);
+        for (const inputValueData of incomingData.argumentDataByName.values()) {
+            this.upsertInputValueData(targetData.argumentDataByName, inputValueData, targetData.federatedCoords, isFieldInaccessible);
         }
         (0, utils_6.addNewObjectValueMapEntries)(incomingData.configureDescriptionDataBySubgraphName, existingData.configureDescriptionDataBySubgraphName);
         (0, utils_5.setLongestDescription)(targetData, incomingData);
@@ -581,6 +581,7 @@ class FederationFactory {
             isArgument: sourceData.isArgument,
             kind: sourceData.kind,
             name: sourceData.name,
+            namedTypeKind: sourceData.namedTypeKind,
             namedTypeName: sourceData.namedTypeName,
             node: {
                 directives: [],
@@ -613,7 +614,7 @@ class FederationFactory {
     }
     copyFieldData(sourceData, isInaccessible) {
         return {
-            argumentDataByArgumentName: this.copyInputValueDataByValueName(sourceData.argumentDataByArgumentName, isInaccessible, sourceData.federatedCoords),
+            argumentDataByName: this.copyInputValueDataByValueName(sourceData.argumentDataByName, isInaccessible, sourceData.federatedCoords),
             configureDescriptionDataBySubgraphName: (0, utils_6.copyObjectValueMap)(sourceData.configureDescriptionDataBySubgraphName),
             directivesByDirectiveName: (0, utils_6.copyArrayValueMap)(sourceData.directivesByDirectiveName),
             externalFieldDataBySubgraphName: (0, utils_6.copyObjectValueMap)(sourceData.externalFieldDataBySubgraphName),
@@ -622,6 +623,7 @@ class FederationFactory {
             isShareableBySubgraphName: new Map(sourceData.isShareableBySubgraphName),
             kind: sourceData.kind,
             name: sourceData.name,
+            namedTypeKind: sourceData.namedTypeKind,
             namedTypeName: sourceData.namedTypeName,
             node: {
                 arguments: [],
@@ -650,7 +652,7 @@ class FederationFactory {
         }
         return output;
     }
-    copyFieldDataByFieldName(source, isParentInaccessible) {
+    copyFieldDataByName(source, isParentInaccessible) {
         const fieldDataByFieldName = new Map();
         for (const [fieldName, sourceData] of source) {
             const isFieldInaccessible = isParentInaccessible || (0, utils_5.isNodeDataInaccessible)(sourceData);
@@ -686,7 +688,7 @@ class FederationFactory {
             case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION: {
                 return {
                     ...data,
-                    inputValueDataByValueName: this.copyInputValueDataByValueName(sourceData.inputValueDataByValueName, sourceData.isInaccessible, sourceData.name),
+                    inputValueDataByName: this.copyInputValueDataByValueName(sourceData.inputValueDataByName, sourceData.isInaccessible, sourceData.name),
                     isInaccessible: sourceData.isInaccessible,
                     kind: sourceData.kind,
                     node: {
@@ -699,7 +701,7 @@ class FederationFactory {
             case graphql_1.Kind.INTERFACE_TYPE_DEFINITION: {
                 return {
                     ...data,
-                    fieldDataByFieldName: this.copyFieldDataByFieldName(sourceData.fieldDataByFieldName, sourceData.isInaccessible),
+                    fieldDataByName: this.copyFieldDataByName(sourceData.fieldDataByName, sourceData.isInaccessible),
                     implementedInterfaceTypeNames: new Set(sourceData.implementedInterfaceTypeNames),
                     isEntity: sourceData.isEntity,
                     isInaccessible: sourceData.isInaccessible,
@@ -714,7 +716,7 @@ class FederationFactory {
             case graphql_1.Kind.OBJECT_TYPE_DEFINITION: {
                 return {
                     ...data,
-                    fieldDataByFieldName: this.copyFieldDataByFieldName(sourceData.fieldDataByFieldName, sourceData.isInaccessible),
+                    fieldDataByName: this.copyFieldDataByName(sourceData.fieldDataByName, sourceData.isInaccessible),
                     implementedInterfaceTypeNames: new Set(sourceData.implementedInterfaceTypeNames),
                     isEntity: sourceData.isEntity,
                     isInaccessible: sourceData.isInaccessible,
@@ -786,7 +788,7 @@ class FederationFactory {
                 !entityInterfaceData.interfaceObjectSubgraphs.has(subgraphName) ||
                 targetData.kind !== graphql_1.Kind.INTERFACE_TYPE_DEFINITION ||
                 incomingData.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION) {
-                this.errors.push((0, errors_1.incompatibleParentKindMergeError)(targetData.name, (0, utils_6.kindToTypeString)(targetData.kind), (0, utils_6.kindToTypeString)(incomingData.kind)));
+                this.errors.push((0, errors_1.incompatibleParentKindMergeError)(targetData.name, (0, utils_6.kindToNodeType)(targetData.kind), (0, utils_6.kindToNodeType)(incomingData.kind)));
                 return;
             }
         }
@@ -815,8 +817,8 @@ class FederationFactory {
                 }
                 targetData.isInaccessible ||= isParentInaccessible;
                 (0, utils_6.addIterableValuesToSet)(incomingData.subgraphNames, targetData.subgraphNames);
-                for (const inputValueData of incomingData.inputValueDataByValueName.values()) {
-                    this.upsertInputValueData(targetData.inputValueDataByValueName, inputValueData, targetData.name, targetData.isInaccessible);
+                for (const inputValueData of incomingData.inputValueDataByName.values()) {
+                    this.upsertInputValueData(targetData.inputValueDataByName, inputValueData, targetData.name, targetData.isInaccessible);
                 }
                 return;
             case graphql_1.Kind.INTERFACE_TYPE_DEFINITION:
@@ -831,8 +833,8 @@ class FederationFactory {
                 targetData.isInaccessible ||= isParentInaccessible;
                 (0, utils_6.addIterableValuesToSet)(compositeOutputData.implementedInterfaceTypeNames, targetData.implementedInterfaceTypeNames);
                 (0, utils_6.addIterableValuesToSet)(compositeOutputData.subgraphNames, targetData.subgraphNames);
-                for (const fieldData of compositeOutputData.fieldDataByFieldName.values()) {
-                    this.upsertFieldData(targetData.fieldDataByFieldName, fieldData, targetData.isInaccessible);
+                for (const fieldData of compositeOutputData.fieldDataByName.values()) {
+                    this.upsertFieldData(targetData.fieldDataByName, fieldData, targetData.isInaccessible);
                 }
                 return;
             case graphql_1.Kind.UNION_TYPE_DEFINITION:
@@ -851,14 +853,14 @@ class FederationFactory {
     propagateInaccessibilityToExistingChildren(data) {
         switch (data.kind) {
             case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION:
-                for (const inputFieldData of data.inputValueDataByValueName.values()) {
+                for (const inputFieldData of data.inputValueDataByName.values()) {
                     this.inaccessibleCoords.add(inputFieldData.federatedCoords);
                 }
                 break;
             default:
-                for (const fieldData of data.fieldDataByFieldName.values()) {
+                for (const fieldData of data.fieldDataByName.values()) {
                     this.inaccessibleCoords.add(fieldData.federatedCoords);
-                    for (const inputValueData of fieldData.argumentDataByArgumentName.values()) {
+                    for (const inputValueData of fieldData.argumentDataByName.values()) {
                         this.inaccessibleCoords.add(inputValueData.federatedCoords);
                     }
                 }
@@ -945,10 +947,10 @@ class FederationFactory {
             // This error should never happen
             if (compositeOutputData.kind !== graphql_1.Kind.INTERFACE_TYPE_DEFINITION &&
                 compositeOutputData.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION) {
-                this.errors.push((0, errors_1.unexpectedNonCompositeOutputTypeError)(coordinates[0], (0, utils_6.kindToTypeString)(compositeOutputData.kind)));
+                this.errors.push((0, errors_1.unexpectedNonCompositeOutputTypeError)(coordinates[0], (0, utils_6.kindToNodeType)(compositeOutputData.kind)));
                 continue;
             }
-            const fieldData = compositeOutputData.fieldDataByFieldName.get(coordinates[1]);
+            const fieldData = compositeOutputData.fieldDataByName.get(coordinates[1]);
             // This error should never happen
             if (!fieldData) {
                 this.errors.push((0, errors_1.unknownFieldDataError)(fieldCoordinates));
@@ -1161,7 +1163,7 @@ class FederationFactory {
                     const interfaceAuthData = this.authorizationDataByParentTypeName.get(entityInterfaceTypeName);
                     for (const fieldName of entityInterfaceData.interfaceObjectFieldNames) {
                         const fieldCoords = `${concreteTypeName}.${fieldName}`;
-                        const interfaceFieldData = (0, utils_6.getOrThrowError)(entityInterface.fieldDataByFieldName, fieldName, `${entityInterfaceTypeName}.fieldDataByFieldName`);
+                        const interfaceFieldData = (0, utils_6.getOrThrowError)(entityInterface.fieldDataByName, fieldName, `${entityInterfaceTypeName}.fieldDataByFieldName`);
                         (0, utils_6.getValueOrDefault)(this.fieldCoordsByNamedTypeName, interfaceFieldData.namedTypeName, () => new Set()).add(fieldCoords);
                         const interfaceFieldAuthData = interfaceAuthData?.fieldAuthDataByFieldName.get(fieldName);
                         if (interfaceFieldAuthData) {
@@ -1170,13 +1172,13 @@ class FederationFactory {
                                 this.invalidORScopesCoords.add(fieldCoords);
                             }
                         }
-                        const existingFieldData = concreteTypeData.fieldDataByFieldName.get(fieldName);
+                        const existingFieldData = concreteTypeData.fieldDataByName.get(fieldName);
                         if (existingFieldData) {
                             // TODO handle shareability
                             continue;
                         }
                         const isInaccessible = entityInterface.isInaccessible || concreteTypeData.isInaccessible || interfaceFieldData.isInaccessible;
-                        concreteTypeData.fieldDataByFieldName.set(fieldName, this.copyFieldData(interfaceFieldData, isInaccessible));
+                        concreteTypeData.fieldDataByName.set(fieldName, this.copyFieldData(interfaceFieldData, isInaccessible));
                     }
                     this.handleInterfaceObjectForInternalGraph({
                         internalSubgraph,
@@ -1268,7 +1270,7 @@ class FederationFactory {
         const argumentNames = [];
         const invalidRequiredArguments = [];
         const fieldPath = `${fieldData.renamedParentTypeName}.${fieldData.name}`;
-        for (const [argumentName, inputValueData] of fieldData.argumentDataByArgumentName) {
+        for (const [argumentName, inputValueData] of fieldData.argumentDataByName) {
             if (fieldData.subgraphNames.size === inputValueData.subgraphNames.size) {
                 argumentNames.push(argumentName);
                 argumentNodes.push(this.getNodeWithPersistedDirectivesByInputValueData(inputValueData));
@@ -1305,7 +1307,7 @@ class FederationFactory {
     pushParentDefinitionDataToDocumentDefinitions(interfaceImplementations) {
         for (const [parentTypeName, parentDefinitionData] of this.parentDefinitionDataByTypeName) {
             if (parentDefinitionData.extensionType !== types_1.ExtensionType.NONE) {
-                this.errors.push((0, errors_1.noBaseDefinitionForExtensionError)((0, utils_6.kindToTypeString)(parentDefinitionData.kind), parentTypeName));
+                this.errors.push((0, errors_1.noBaseDefinitionForExtensionError)((0, utils_6.kindToNodeType)(parentDefinitionData.kind), parentTypeName));
             }
             switch (parentDefinitionData.kind) {
                 case graphql_1.Kind.ENUM_TYPE_DEFINITION:
@@ -1354,7 +1356,7 @@ class FederationFactory {
                         break;
                     }
                     if (clientEnumValueNodes.length < 1) {
-                        this.errors.push((0, errors_1.allChildDefinitionsAreInaccessibleError)((0, utils_6.kindToTypeString)(parentDefinitionData.kind), parentTypeName, string_constants_2.ENUM_VALUE));
+                        this.errors.push((0, errors_1.allChildDefinitionsAreInaccessibleError)((0, utils_6.kindToNodeType)(parentDefinitionData.kind), parentTypeName, string_constants_2.ENUM_VALUE));
                         break;
                     }
                     this.clientDefinitions.push({
@@ -1367,7 +1369,7 @@ class FederationFactory {
                     const invalidRequiredInputs = [];
                     const inputValueNodes = [];
                     const clientInputValueNodes = [];
-                    for (const [inputValueName, inputValueData] of parentDefinitionData.inputValueDataByValueName) {
+                    for (const [inputValueName, inputValueData] of parentDefinitionData.inputValueDataByName) {
                         if (parentDefinitionData.subgraphNames.size === inputValueData.subgraphNames.size) {
                             inputValueNodes.push(this.getNodeWithPersistedDirectivesByInputValueData(inputValueData));
                             if ((0, utils_5.isNodeDataInaccessible)(inputValueData)) {
@@ -1397,7 +1399,7 @@ class FederationFactory {
                         break;
                     }
                     if (clientInputValueNodes.length < 1) {
-                        this.errors.push((0, errors_1.allChildDefinitionsAreInaccessibleError)((0, utils_6.kindToTypeString)(parentDefinitionData.kind), parentTypeName, 'input field'));
+                        this.errors.push((0, errors_1.allChildDefinitionsAreInaccessibleError)((0, utils_6.kindToNodeType)(parentDefinitionData.kind), parentTypeName, 'input field'));
                         break;
                     }
                     this.clientDefinitions.push({
@@ -1416,7 +1418,7 @@ class FederationFactory {
                     const isObject = parentDefinitionData.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION;
                     const authData = this.authorizationDataByParentTypeName.get(parentTypeName);
                     (0, utils_5.propagateAuthDirectives)(parentDefinitionData, authData);
-                    for (const [fieldName, fieldData] of parentDefinitionData.fieldDataByFieldName) {
+                    for (const [fieldName, fieldData] of parentDefinitionData.fieldDataByName) {
                         (0, utils_5.propagateFieldAuthDirectives)(fieldData, authData);
                         const argumentNodes = this.getValidFieldArgumentNodes(fieldData);
                         if (isObject) {
@@ -1458,7 +1460,7 @@ class FederationFactory {
                     if (clientSchemaFieldNodes.length < 1) {
                         const error = isQuery
                             ? (0, errors_1.noQueryRootTypeError)(false)
-                            : (0, errors_1.allChildDefinitionsAreInaccessibleError)((0, utils_6.kindToTypeString)(parentDefinitionData.kind), parentTypeName, string_constants_2.FIELD);
+                            : (0, errors_1.allChildDefinitionsAreInaccessibleError)((0, utils_6.kindToNodeType)(parentDefinitionData.kind), parentTypeName, string_constants_2.FIELD);
                         this.errors.push(error);
                         break;
                     }
@@ -1619,16 +1621,16 @@ class FederationFactory {
             }
         }
         if (invalidCoords.length > 0) {
-            this.errors.push((0, errors_1.invalidReferencesOfInaccessibleTypeError)((0, utils_6.kindToTypeString)(data.kind), data.name, invalidCoords));
+            this.errors.push((0, errors_1.invalidReferencesOfInaccessibleTypeError)((0, utils_6.kindToNodeType)(data.kind), data.name, invalidCoords));
         }
     }
     validateQueryRootType() {
         const query = this.parentDefinitionDataByTypeName.get(string_constants_2.QUERY);
-        if (!query || query.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION || query.fieldDataByFieldName.size < 1) {
+        if (!query || query.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION || query.fieldDataByName.size < 1) {
             this.errors.push((0, errors_1.noQueryRootTypeError)());
             return;
         }
-        for (const fieldData of query.fieldDataByFieldName.values()) {
+        for (const fieldData of query.fieldDataByName.values()) {
             if (!(0, utils_5.isNodeDataInaccessible)(fieldData)) {
                 return;
             }
@@ -1654,7 +1656,7 @@ class FederationFactory {
                 fieldErrorMessages.push((0, errors_1.invalidSubscriptionFieldConditionFieldPathParentErrorMessage)(inputFieldPath, conditionFieldPath, partialConditionFieldPath));
                 return [];
             }
-            const fieldData = lastData.fieldDataByFieldName.get(fieldName);
+            const fieldData = lastData.fieldDataByName.get(fieldName);
             if (!fieldData) {
                 fieldErrorMessages.push((0, errors_1.undefinedSubscriptionFieldConditionFieldPathFieldErrorMessage)(inputFieldPath, conditionFieldPath, partialConditionFieldPath, fieldName, lastData.renamedTypeName));
                 return [];
@@ -1675,7 +1677,7 @@ class FederationFactory {
             lastData = (0, utils_6.getOrThrowError)(this.parentDefinitionDataByTypeName, fieldData.namedTypeName, string_constants_2.PARENT_DEFINITION_DATA);
         }
         if (!(0, utils_5.isLeafKind)(lastData.kind)) {
-            fieldErrorMessages.push((0, errors_1.nonLeafSubscriptionFieldConditionFieldPathFinalFieldErrorMessage)(inputFieldPath, conditionFieldPath, paths[paths.length - 1], (0, utils_6.kindToTypeString)(lastData.kind), lastData.name));
+            fieldErrorMessages.push((0, errors_1.nonLeafSubscriptionFieldConditionFieldPathFinalFieldErrorMessage)(inputFieldPath, conditionFieldPath, paths[paths.length - 1], (0, utils_6.kindToNodeType)(lastData.kind), lastData.name));
             return [];
         }
         return paths;
@@ -1705,7 +1707,7 @@ class FederationFactory {
                         break;
                     }
                     if (objectFieldNode.value.kind !== graphql_1.Kind.STRING) {
-                        fieldErrorMessages.push((0, errors_1.invalidInputFieldTypeErrorMessage)(inputFieldPath, string_constants_2.STRING, (0, utils_6.kindToTypeString)(objectFieldNode.value.kind)));
+                        fieldErrorMessages.push((0, errors_1.invalidInputFieldTypeErrorMessage)(inputFieldPath, string_constants_2.STRING, (0, utils_6.kindToNodeType)(objectFieldNode.value.kind)));
                         hasErrors = true;
                         break;
                     }
@@ -1728,7 +1730,7 @@ class FederationFactory {
                     }
                     const objectFieldValueKind = objectFieldNode.value.kind;
                     if (objectFieldValueKind == graphql_1.Kind.NULL || objectFieldValueKind == graphql_1.Kind.OBJECT) {
-                        fieldErrorMessages.push((0, errors_1.invalidInputFieldTypeErrorMessage)(inputFieldPath, string_constants_2.LIST, (0, utils_6.kindToTypeString)(objectFieldNode.value.kind)));
+                        fieldErrorMessages.push((0, errors_1.invalidInputFieldTypeErrorMessage)(inputFieldPath, string_constants_2.LIST, (0, utils_6.kindToNodeType)(objectFieldNode.value.kind)));
                         hasErrors = true;
                         break;
                     }
@@ -1852,7 +1854,7 @@ class FederationFactory {
             }
             default: {
                 const expectedTypeString = string_constants_1.SUBSCRIPTION_FILTER_LIST_INPUT_NAMES.has(fieldName) ? string_constants_2.LIST : string_constants_2.OBJECT;
-                errorMessages.push((0, errors_1.subscriptionFilterConditionInvalidInputFieldTypeErrorMessage)(inputFieldPath, expectedTypeString, (0, utils_6.kindToTypeString)(objectFieldNode.value.kind)));
+                errorMessages.push((0, errors_1.subscriptionFilterConditionInvalidInputFieldTypeErrorMessage)(inputFieldPath, expectedTypeString, (0, utils_6.kindToNodeType)(objectFieldNode.value.kind)));
                 return false;
             }
         }
@@ -1865,7 +1867,7 @@ class FederationFactory {
         const argumentNode = directiveNode.arguments[0];
         if (argumentNode.value.kind !== graphql_1.Kind.OBJECT) {
             this.errors.push((0, errors_1.invalidSubscriptionFilterDirectiveError)(fieldPath, [
-                (0, errors_1.subscriptionFilterConditionInvalidInputFieldTypeErrorMessage)(string_constants_2.CONDITION, string_constants_2.OBJECT, (0, utils_6.kindToTypeString)(argumentNode.value.kind)),
+                (0, errors_1.subscriptionFilterConditionInvalidInputFieldTypeErrorMessage)(string_constants_2.CONDITION, string_constants_2.OBJECT, (0, utils_6.kindToNodeType)(argumentNode.value.kind)),
             ]));
             return;
         }
@@ -2063,12 +2065,12 @@ class FederationFactory {
                         this.handleChildTagExclusions(parentDefinitionData, parentDefinitionData.enumValueDataByValueName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToExclude);
                         break;
                     case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION:
-                        this.handleChildTagExclusions(parentDefinitionData, parentDefinitionData.inputValueDataByValueName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToExclude);
+                        this.handleChildTagExclusions(parentDefinitionData, parentDefinitionData.inputValueDataByName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToExclude);
                         break;
                     default:
-                        let accessibleFields = parentDefinitionData.fieldDataByFieldName.size;
+                        let accessibleFields = parentDefinitionData.fieldDataByName.size;
                         for (const [fieldName, childTagData] of parentTagData.childTagDataByChildName) {
-                            const fieldData = (0, utils_6.getOrThrowError)(parentDefinitionData.fieldDataByFieldName, fieldName, `${parentTypeName}.fieldDataByFieldName`);
+                            const fieldData = (0, utils_6.getOrThrowError)(parentDefinitionData.fieldDataByName, fieldName, `${parentTypeName}.fieldDataByFieldName`);
                             if ((0, utils_5.isNodeDataInaccessible)(fieldData)) {
                                 accessibleFields -= 1;
                                 continue;
@@ -2082,7 +2084,7 @@ class FederationFactory {
                                 continue;
                             }
                             for (const [argumentName, tagNames] of childTagData.tagNamesByArgumentName) {
-                                const inputValueData = (0, utils_6.getOrThrowError)(fieldData.argumentDataByArgumentName, argumentName, `${fieldName}.argumentDataByArgumentName`);
+                                const inputValueData = (0, utils_6.getOrThrowError)(fieldData.argumentDataByName, argumentName, `${fieldName}.argumentDataByArgumentName`);
                                 if ((0, utils_5.isNodeDataInaccessible)(inputValueData)) {
                                     continue;
                                 }
@@ -2135,11 +2137,11 @@ class FederationFactory {
                         this.handleChildTagInclusions(parentDefinitionData, parentDefinitionData.enumValueDataByValueName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToInclude);
                         break;
                     case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION:
-                        this.handleChildTagInclusions(parentDefinitionData, parentDefinitionData.inputValueDataByValueName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToInclude);
+                        this.handleChildTagInclusions(parentDefinitionData, parentDefinitionData.inputValueDataByName, parentTagData.childTagDataByChildName, contractTagOptions.tagNamesToInclude);
                         break;
                     default:
-                        let accessibleFields = parentDefinitionData.fieldDataByFieldName.size;
-                        for (const [fieldName, fieldData] of parentDefinitionData.fieldDataByFieldName) {
+                        let accessibleFields = parentDefinitionData.fieldDataByName.size;
+                        for (const [fieldName, fieldData] of parentDefinitionData.fieldDataByName) {
                             if ((0, utils_5.isNodeDataInaccessible)(fieldData)) {
                                 accessibleFields -= 1;
                                 continue;