@wundergraph/composition 0.39.2 → 0.40.0

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

@@ -24,7 +24,6 @@ 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");
-const index_1 = require("graphql/index");
 const utils_6 = require("../../router-configuration/utils");
 function normalizeSubgraphFromString(subgraphSDL, noLocation = true) {
     const { error, documentNode } = (0, utils_1.safeParse)(subgraphSDL, noLocation);
@@ -76,7 +75,6 @@ class NormalizationFactory {
     originalTypeNameByRenamedTypeName = new Map();
     overridesByTargetSubgraphName = new Map();
     parentDefinitionDataByTypeName = new Map();
-    parentsWithChildArguments = new Set();
     schemaData;
     referencedDirectiveNames = new Set();
     referencedTypeNames = new Set();
@@ -99,42 +97,27 @@ class NormalizationFactory {
             operationTypes: new Map(),
         };
     }
-    validateInputNamedType(namedTypeName) {
-        if (constants_1.BASE_SCALARS.has(namedTypeName)) {
-            return { hasUnhandledError: false, typeString: '' };
-        }
-        const parentData = this.parentDefinitionDataByTypeName.get(namedTypeName);
-        if (!parentData) {
-            return { hasUnhandledError: false, typeString: '' };
-        }
-        switch (parentData.kind) {
-            case graphql_1.Kind.ENUM_TYPE_DEFINITION:
-            case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION:
-            case graphql_1.Kind.SCALAR_TYPE_DEFINITION:
-                return { hasUnhandledError: false, typeString: '' };
-            default:
-                return { hasUnhandledError: true, typeString: (0, utils_5.kindToTypeString)(parentData.kind) };
-        }
-    }
-    validateArguments(fieldData, fieldPath) {
-        const invalidArguments = [];
-        for (const [argumentName, argumentNode] of fieldData.argumentDataByArgumentName) {
-            const namedTypeName = (0, ast_1.getTypeNodeNamedTypeName)(argumentNode.type);
-            if (!constants_1.BASE_SCALARS.has(namedTypeName)) {
-                this.referencedTypeNames.add(namedTypeName);
-            }
-            const { hasUnhandledError, typeString } = this.validateInputNamedType(namedTypeName);
-            if (hasUnhandledError) {
-                invalidArguments.push({
-                    argumentName,
-                    namedType: namedTypeName,
-                    typeString,
-                    typeName: (0, merge_1.printTypeNode)(argumentNode.type),
-                });
+    validateArguments(fieldData, parentKind) {
+        for (const argumentData of fieldData.argumentDataByName.values()) {
+            const namedTypeName = (0, ast_1.getTypeNodeNamedTypeName)(argumentData.type);
+            if (constants_1.BASE_SCALARS.has(namedTypeName)) {
+                argumentData.namedTypeKind = graphql_1.Kind.SCALAR_TYPE_DEFINITION;
+                continue;
             }
-        }
-        if (invalidArguments.length > 0) {
-            this.errors.push((0, errors_1.invalidArgumentsError)(fieldPath, invalidArguments));
+            const namedTypeData = this.parentDefinitionDataByTypeName.get(namedTypeName);
+            if (!namedTypeData) {
+                // undefined types are handled elsewhere
+                continue;
+            }
+            if ((0, utils_4.isInputNodeKind)(namedTypeData.kind)) {
+                argumentData.namedTypeKind = namedTypeData.kind;
+                continue;
+            }
+            this.errors.push((0, errors_1.invalidNamedTypeError)({
+                data: argumentData,
+                namedTypeData,
+                nodeType: `${(0, utils_5.kindToNodeType)(parentKind)} field argument`,
+            }));
         }
     }
     isTypeNameRootType(typeName) {
@@ -379,13 +362,13 @@ class NormalizationFactory {
                 return;
             }
             case graphql_1.Kind.FIELD_DEFINITION: {
-                for (const [argumentName, argumentData] of data.argumentDataByArgumentName) {
+                for (const [argumentName, argumentData] of data.argumentDataByName) {
                     this.validateDirectives(argumentData, `${data.originalParentTypeName}.${data.name}(${argumentName}: ...)`);
                 }
                 return;
             }
             case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION: {
-                for (const [inputValueName, inputValueData] of data.inputValueDataByValueName) {
+                for (const [inputValueName, inputValueData] of data.inputValueDataByName) {
                     this.validateDirectives(inputValueData, `${data.name}.${inputValueName}`);
                 }
                 return;
@@ -393,7 +376,7 @@ class NormalizationFactory {
             case graphql_1.Kind.INTERFACE_TYPE_DEFINITION:
             // intentional fallthrough
             case graphql_1.Kind.OBJECT_TYPE_DEFINITION: {
-                for (const [fieldName, fieldData] of data.fieldDataByFieldName) {
+                for (const [fieldName, fieldData] of data.fieldDataByName) {
                     this.validateDirectives(fieldData, `${data.name}.${fieldName}`);
                 }
                 return;
@@ -432,7 +415,7 @@ class NormalizationFactory {
                 if (incomingExtensionType === types_1.ExtensionType.REAL) {
                     return;
                 }
-                this.errors.push((0, errors_1.duplicateTypeDefinitionError)((0, utils_5.kindToTypeString)(parentData.kind), parentData.name));
+                this.errors.push((0, errors_1.duplicateTypeDefinitionError)((0, utils_5.kindToNodeType)(parentData.kind), parentData.name));
                 return;
             }
             default: {
@@ -527,7 +510,6 @@ class NormalizationFactory {
         }
         const fieldName = node.name.value;
         const originalFieldPath = `${this.originalParentTypeName}.${fieldName}`;
-        this.parentsWithChildArguments.add(this.originalParentTypeName);
         const duplicatedArguments = new Set();
         for (const argumentNode of node.arguments) {
             const argumentName = argumentNode.name.value;
@@ -666,8 +648,9 @@ class NormalizationFactory {
         const parentTypeName = this.renamedParentTypeName || this.originalParentTypeName;
         const fieldCoords = `${this.originalParentTypeName}.${name}`;
         const { isExternal, isShareable } = (0, utils_4.isNodeExternalOrShareable)(node, !this.isSubgraphVersionTwo, directivesByDirectiveName);
+        const namedTypeName = (0, ast_1.getTypeNodeNamedTypeName)(node.type);
         const fieldData = {
-            argumentDataByArgumentName: argumentDataByArgumentName,
+            argumentDataByName: argumentDataByArgumentName,
             configureDescriptionDataBySubgraphName: new Map(),
             externalFieldDataBySubgraphName: new Map([
                 [this.subgraphName, (0, utils_4.newExternalFieldData)(isExternal)],
@@ -677,7 +660,8 @@ class NormalizationFactory {
             isShareableBySubgraphName: new Map([[this.subgraphName, isShareable]]),
             kind: graphql_1.Kind.FIELD_DEFINITION,
             name,
-            namedTypeName: (0, ast_1.getTypeNodeNamedTypeName)(node.type),
+            namedTypeKind: constants_1.BASE_SCALARS.has(namedTypeName) ? graphql_1.Kind.SCALAR_TYPE_DEFINITION : graphql_1.Kind.NULL,
+            namedTypeName,
             node: (0, ast_1.getMutableFieldNode)(node, fieldCoords, this.errors),
             originalParentTypeName: this.originalParentTypeName,
             persistedDirectivesData: (0, utils_4.newPersistedDirectivesData)(),
@@ -707,6 +691,7 @@ class NormalizationFactory {
         const federatedCoords = isArgument
             ? `${federatedParentTypeName}${fieldName ? `.${fieldName}` : ''}(${name}: ...)`
             : `${federatedParentTypeName}.${name}`;
+        const namedTypeName = (0, ast_1.getTypeNodeNamedTypeName)(node.type);
         const inputValueData = {
             configureDescriptionDataBySubgraphName: new Map(),
             directivesByDirectiveName: this.extractDirectives(node, new Map()),
@@ -716,7 +701,8 @@ class NormalizationFactory {
             isArgument,
             kind: isArgument ? graphql_1.Kind.ARGUMENT : graphql_1.Kind.INPUT_VALUE_DEFINITION,
             name,
-            namedTypeName: (0, ast_1.getTypeNodeNamedTypeName)(node.type),
+            namedTypeKind: constants_1.BASE_SCALARS.has(namedTypeName) ? graphql_1.Kind.SCALAR_TYPE_DEFINITION : graphql_1.Kind.NULL,
+            namedTypeName,
             node: (0, ast_1.getMutableInputValueNode)(node, originalParentTypeName, this.errors),
             originalCoords,
             originalParentTypeName: originalParentTypeName,
@@ -744,7 +730,7 @@ class NormalizationFactory {
         }
         if (parentData) {
             if (parentData.kind !== graphql_1.Kind.INTERFACE_TYPE_DEFINITION) {
-                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
+                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToNodeType)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
                 return;
             }
             this.updateCompositeOutputDataByNode(node, parentData, extensionType);
@@ -754,7 +740,7 @@ class NormalizationFactory {
             configureDescriptionDataBySubgraphName: new Map(),
             directivesByDirectiveName,
             extensionType,
-            fieldDataByFieldName: new Map(),
+            fieldDataByName: new Map(),
             implementedInterfaceTypeNames: this.extractImplementedInterfaceTypeNames(node, new Set()),
             isEntity: directivesByDirectiveName.has(string_constants_2.KEY),
             isInaccessible: directivesByDirectiveName.has(string_constants_2.INACCESSIBLE),
@@ -801,7 +787,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_5.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
+                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToNodeType)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
                 return;
             }
             this.updateCompositeOutputDataByNode(node, parentData, extensionType);
@@ -814,7 +800,7 @@ class NormalizationFactory {
             configureDescriptionDataBySubgraphName: new Map(),
             directivesByDirectiveName,
             extensionType,
-            fieldDataByFieldName: new Map(),
+            fieldDataByName: new Map(),
             implementedInterfaceTypeNames,
             isEntity: directivesByDirectiveName.has(string_constants_2.KEY),
             isInaccessible: directivesByDirectiveName.has(string_constants_2.INACCESSIBLE),
@@ -838,7 +824,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_5.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
+                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToNodeType)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
                 return;
             }
             this.setParentDataExtensionType(parentData, extensionType);
@@ -872,7 +858,7 @@ 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_5.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
+                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToNodeType)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
                 return;
             }
             this.setParentDataExtensionType(parentData, extensionType);
@@ -886,7 +872,7 @@ class NormalizationFactory {
             configureDescriptionDataBySubgraphName: new Map(),
             directivesByDirectiveName,
             extensionType,
-            inputValueDataByValueName: new Map(),
+            inputValueDataByName: new Map(),
             isInaccessible: directivesByDirectiveName.has(string_constants_2.INACCESSIBLE),
             kind: graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION,
             name: typeName,
@@ -906,7 +892,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_5.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
+                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToNodeType)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
                 return;
             }
             this.setParentDataExtensionType(parentData, extensionType);
@@ -963,7 +949,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_5.kindToTypeString)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
+                this.errors.push((0, errors_1.multipleNamedTypeDefinitionError)(typeName, (0, utils_5.kindToNodeType)(parentData.kind), (0, utils_3.kindToConvertedTypeString)(node.kind)));
                 return;
             }
             this.setParentDataExtensionType(parentData, extensionType);
@@ -1054,7 +1040,7 @@ class NormalizationFactory {
         if (!isProvides) {
             return { fieldSetParentData: parentData };
         }
-        const fieldData = (0, utils_5.getOrThrowError)(parentData.fieldDataByFieldName, fieldName, `${parentTypeName}.fieldDataByFieldName`);
+        const fieldData = (0, utils_5.getOrThrowError)(parentData.fieldDataByName, fieldName, `${parentTypeName}.fieldDataByFieldName`);
         const fieldNamedTypeName = (0, ast_1.getTypeNodeNamedTypeName)(fieldData.node.type);
         const namedTypeData = this.parentDefinitionDataByTypeName.get(fieldNamedTypeName);
         // This error should never happen
@@ -1089,7 +1075,7 @@ class NormalizationFactory {
         let shouldDefineSelectionSet = true;
         let lastFieldName = directiveFieldName;
         let hasConditionalField = false;
-        (0, index_1.visit)(documentNode, {
+        (0, graphql_1.visit)(documentNode, {
             Argument: {
                 enter() {
                     return false;
@@ -1101,28 +1087,28 @@ class NormalizationFactory {
                     const parentTypeName = parentData.name;
                     if (parentData.kind === graphql_1.Kind.UNION_TYPE_DEFINITION) {
                         errorMessages.push((0, errors_1.invalidSelectionOnUnionErrorMessage)(fieldSet, fieldCoordsPath, parentTypeName));
-                        return index_1.BREAK;
+                        return graphql_1.BREAK;
                     }
                     const fieldName = node.name.value;
                     const currentFieldCoords = `${parentTypeName}.${fieldName}`;
                     nf.unvalidatedExternalFieldCoords.delete(currentFieldCoords);
                     // If an object-like was just visited, a selection set should have been entered
                     if (shouldDefineSelectionSet) {
-                        errorMessages.push((0, errors_1.invalidSelectionSetErrorMessage)(fieldSet, fieldCoordsPath, parentTypeName, (0, utils_5.kindToTypeString)(parentData.kind)));
-                        return index_1.BREAK;
+                        errorMessages.push((0, errors_1.invalidSelectionSetErrorMessage)(fieldSet, fieldCoordsPath, parentTypeName, (0, utils_5.kindToNodeType)(parentData.kind)));
+                        return graphql_1.BREAK;
                     }
                     fieldCoordsPath.push(currentFieldCoords);
                     fieldPath.push(fieldName);
                     lastFieldName = fieldName;
-                    const fieldData = parentData.fieldDataByFieldName.get(fieldName);
+                    const fieldData = parentData.fieldDataByName.get(fieldName);
                     // undefined if the field does not exist on the parent
                     if (!fieldData) {
                         errorMessages.push((0, errors_1.undefinedFieldInFieldSetErrorMessage)(fieldSet, parentTypeName, fieldName));
-                        return index_1.BREAK;
+                        return graphql_1.BREAK;
                     }
                     if (definedFields[currentDepth].has(fieldName)) {
                         errorMessages.push((0, errors_1.duplicateFieldInFieldSetErrorMessage)(fieldSet, currentFieldCoords));
-                        return index_1.BREAK;
+                        return graphql_1.BREAK;
                     }
                     definedFields[currentDepth].add(fieldName);
                     const { isDefinedExternal, isUnconditionallyProvided } = (0, utils_5.getOrThrowError)(fieldData.externalFieldDataBySubgraphName, nf.subgraphName, `${currentFieldCoords}.externalFieldDataBySubgraphName`);
@@ -1176,7 +1162,7 @@ class NormalizationFactory {
                     if (!namedTypeData) {
                         // Should not be possible to receive this error
                         errorMessages.push((0, errors_1.unknownTypeInFieldSetErrorMessage)(fieldSet, currentFieldCoords, namedTypeName));
-                        return index_1.BREAK;
+                        return graphql_1.BREAK;
                     }
                     // TODO isFieldConditional
                     if (isDefinedExternal) {
@@ -1208,7 +1194,7 @@ class NormalizationFactory {
                     const fieldCoordinates = fieldCoordsPath.length < 1 ? selectionSetParentData.name : fieldCoordsPath[fieldCoordsPath.length - 1];
                     if (!node.typeCondition) {
                         errorMessages.push((0, errors_1.inlineFragmentWithoutTypeConditionErrorMessage)(fieldSet, fieldCoordinates));
-                        return index_1.BREAK;
+                        return graphql_1.BREAK;
                     }
                     const typeConditionName = node.typeCondition.name.value;
                     // It's possible to infinitely define fragments
@@ -1219,12 +1205,12 @@ class NormalizationFactory {
                     }
                     if (!(0, utils_1.isKindAbstract)(parentData.kind)) {
                         errorMessages.push((0, errors_1.invalidInlineFragmentTypeErrorMessage)(fieldSet, fieldCoordsPath, typeConditionName, parentTypeName));
-                        return index_1.BREAK;
+                        return graphql_1.BREAK;
                     }
                     const fragmentNamedTypeData = nf.parentDefinitionDataByTypeName.get(typeConditionName);
                     if (!fragmentNamedTypeData) {
                         errorMessages.push((0, errors_1.unknownInlineFragmentTypeConditionErrorMessage)(fieldSet, fieldCoordsPath, parentTypeName, typeConditionName));
-                        return index_1.BREAK;
+                        return graphql_1.BREAK;
                     }
                     shouldDefineSelectionSet = true;
                     switch (fragmentNamedTypeData.kind) {
@@ -1248,12 +1234,12 @@ class NormalizationFactory {
                             return;
                         }
                         default: {
-                            errorMessages.push((0, errors_1.invalidInlineFragmentTypeConditionTypeErrorMessage)(fieldSet, fieldCoordsPath, parentTypeName, typeConditionName, (0, utils_5.kindToTypeString)(fragmentNamedTypeData.kind)));
-                            return index_1.BREAK;
+                            errorMessages.push((0, errors_1.invalidInlineFragmentTypeConditionTypeErrorMessage)(fieldSet, fieldCoordsPath, parentTypeName, typeConditionName, (0, utils_5.kindToNodeType)(fragmentNamedTypeData.kind)));
+                            return graphql_1.BREAK;
                         }
                     }
-                    errorMessages.push((0, errors_1.invalidInlineFragmentTypeConditionErrorMessage)(fieldSet, fieldCoordsPath, typeConditionName, (0, utils_5.kindToTypeString)(parentData.kind), parentTypeName));
-                    return index_1.BREAK;
+                    errorMessages.push((0, errors_1.invalidInlineFragmentTypeConditionErrorMessage)(fieldSet, fieldCoordsPath, typeConditionName, (0, utils_5.kindToNodeType)(parentData.kind), parentTypeName));
+                    return graphql_1.BREAK;
                 },
             },
             SelectionSet: {
@@ -1263,32 +1249,32 @@ class NormalizationFactory {
                         if (parentData.kind === graphql_1.Kind.UNION_TYPE_DEFINITION) {
                             // Should never happen
                             errorMessages.push((0, errors_1.unparsableFieldSetSelectionErrorMessage)(fieldSet, lastFieldName));
-                            return index_1.BREAK;
+                            return graphql_1.BREAK;
                         }
-                        const fieldData = parentData.fieldDataByFieldName.get(lastFieldName);
+                        const fieldData = parentData.fieldDataByName.get(lastFieldName);
                         if (!fieldData) {
                             errorMessages.push((0, errors_1.undefinedFieldInFieldSetErrorMessage)(fieldSet, parentData.name, lastFieldName));
-                            return index_1.BREAK;
+                            return graphql_1.BREAK;
                         }
                         const fieldNamedTypeName = (0, ast_1.getTypeNodeNamedTypeName)(fieldData.node.type);
                         // If the child is not found, it's a base scalar. Undefined types would have already been handled.
                         const namedTypeData = nf.parentDefinitionDataByTypeName.get(fieldNamedTypeName);
                         const childKind = namedTypeData ? namedTypeData.kind : graphql_1.Kind.SCALAR_TYPE_DEFINITION;
-                        errorMessages.push((0, errors_1.invalidSelectionSetDefinitionErrorMessage)(fieldSet, fieldCoordsPath, fieldNamedTypeName, (0, utils_5.kindToTypeString)(childKind)));
-                        return index_1.BREAK;
+                        errorMessages.push((0, errors_1.invalidSelectionSetDefinitionErrorMessage)(fieldSet, fieldCoordsPath, fieldNamedTypeName, (0, utils_5.kindToNodeType)(childKind)));
+                        return graphql_1.BREAK;
                     }
                     currentDepth += 1;
                     shouldDefineSelectionSet = false;
                     if (currentDepth < 0 || currentDepth >= parentDatas.length) {
                         errorMessages.push((0, errors_1.unparsableFieldSetSelectionErrorMessage)(fieldSet, lastFieldName));
-                        return index_1.BREAK;
+                        return graphql_1.BREAK;
                     }
                     definedFields.push(new Set());
                 },
                 leave() {
                     if (shouldDefineSelectionSet) {
                         const parentData = parentDatas[currentDepth + 1];
-                        errorMessages.push((0, errors_1.invalidSelectionSetErrorMessage)(fieldSet, fieldCoordsPath, parentData.name, (0, utils_5.kindToTypeString)(parentData.kind)));
+                        errorMessages.push((0, errors_1.invalidSelectionSetErrorMessage)(fieldSet, fieldCoordsPath, parentData.name, (0, utils_5.kindToNodeType)(parentData.kind)));
                         shouldDefineSelectionSet = false;
                     }
                     // Empty selection sets would be a parse error, so it is unnecessary to handle them
@@ -1368,7 +1354,7 @@ class NormalizationFactory {
                 continue;
             }
             if (interfaceData.kind !== graphql_1.Kind.INTERFACE_TYPE_DEFINITION) {
-                invalidImplementationTypeStringByTypeName.set(interfaceData.name, (0, utils_5.kindToTypeString)(interfaceData.kind));
+                invalidImplementationTypeStringByTypeName.set(interfaceData.name, (0, utils_5.kindToNodeType)(interfaceData.kind));
                 continue;
             }
             if (data.name === interfaceData.name) {
@@ -1380,10 +1366,10 @@ class NormalizationFactory {
                 unimplementedFields: [],
             };
             let hasErrors = false;
-            for (const [fieldName, interfaceField] of interfaceData.fieldDataByFieldName) {
+            for (const [fieldName, interfaceField] of interfaceData.fieldDataByName) {
                 this.unvalidatedExternalFieldCoords.delete(`${data.name}.${fieldName}`);
                 let hasNestedErrors = false;
-                const fieldData = data.fieldDataByFieldName.get(fieldName);
+                const fieldData = data.fieldDataByName.get(fieldName);
                 if (!fieldData) {
                     hasErrors = true;
                     implementationErrors.unimplementedFields.push(fieldName);
@@ -1403,9 +1389,9 @@ class NormalizationFactory {
                     invalidFieldImplementation.implementedResponseType = (0, merge_1.printTypeNode)(fieldData.node.type);
                 }
                 const handledArguments = new Set();
-                for (const [argumentName, interfaceArgument] of interfaceField.argumentDataByArgumentName) {
+                for (const [argumentName, interfaceArgument] of interfaceField.argumentDataByName) {
                     handledArguments.add(argumentName);
-                    const containerArgument = fieldData.argumentDataByArgumentName.get(argumentName);
+                    const containerArgument = fieldData.argumentDataByName.get(argumentName);
                     // The type implementing the interface must include all arguments with no variation for that argument
                     if (!containerArgument) {
                         hasErrors = true;
@@ -1423,7 +1409,7 @@ class NormalizationFactory {
                     }
                 }
                 // Additional arguments must be optional (nullable)
-                for (const [argumentName, argumentData] of fieldData.argumentDataByArgumentName) {
+                for (const [argumentName, argumentData] of fieldData.argumentDataByName) {
                     if (handledArguments.has(argumentName)) {
                         continue;
                     }
@@ -1454,7 +1440,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_5.kindToTypeString)(data.kind), implementationErrorsMap));
+            this.errors.push((0, errors_1.invalidInterfaceImplementationError)(data.name, (0, utils_5.kindToNodeType)(data.kind), implementationErrorsMap));
         }
     }
     handleAuthenticatedDirective(data, parentTypeName) {
@@ -1817,7 +1803,7 @@ class NormalizationFactory {
             return;
         }
         const validEventDirectiveNames = this.getValidEventsDirectiveNamesForOperationTypeNode(operationTypeNode);
-        for (const [fieldName, fieldData] of data.fieldDataByFieldName) {
+        for (const [fieldName, fieldData] of data.fieldDataByName) {
             const fieldCoords = `${fieldData.originalParentTypeName}.${fieldName}`;
             const definedEventsDirectiveNames = new Set();
             for (const eventsDirectiveName of string_constants_1.EVENT_DIRECTIVE_NAMES) {
@@ -1892,11 +1878,11 @@ class NormalizationFactory {
         if (data.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION) {
             return false;
         }
-        if (data.fieldDataByFieldName.size != 1) {
+        if (data.fieldDataByName.size != 1) {
             return false;
         }
-        for (const [fieldName, fieldData] of data.fieldDataByFieldName) {
-            if (fieldData.argumentDataByArgumentName.size > 0) {
+        for (const [fieldName, fieldData] of data.fieldDataByName) {
+            if (fieldData.argumentDataByName.size > 0) {
                 return false;
             }
             if (fieldName !== string_constants_2.SUCCESS) {
@@ -1912,10 +1898,10 @@ class NormalizationFactory {
         if (streamConfigurationInputData.kind !== graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION) {
             return false;
         }
-        if (streamConfigurationInputData.inputValueDataByValueName.size != 3) {
+        if (streamConfigurationInputData.inputValueDataByName.size != 3) {
             return false;
         }
-        for (const [inputValueName, inputValueData] of streamConfigurationInputData.inputValueDataByValueName) {
+        for (const [inputValueName, inputValueData] of streamConfigurationInputData.inputValueDataByName) {
             switch (inputValueName) {
                 case string_constants_2.CONSUMER_INACTIVE_THRESHOLD: {
                     if ((0, merge_1.printTypeNode)(inputValueData.type) !== string_constants_2.NON_NULLABLE_INT) {
@@ -1971,7 +1957,7 @@ class NormalizationFactory {
                 continue;
             }
             this.validateEventDrivenKeyDefinition(typeName, invalidKeyFieldSetsByEntityTypeName);
-            this.validateEventDrivenObjectFields(data.fieldDataByFieldName, keyFieldNames, nonExternalKeyFieldNameByFieldPath, nonKeyFieldNameByFieldPath);
+            this.validateEventDrivenObjectFields(data.fieldDataByName, keyFieldNames, nonExternalKeyFieldNameByFieldPath, nonKeyFieldNameByFieldPath);
         }
         if (!this.isEdfsPublishResultValid()) {
             errorMessages.push(errors_1.invalidEdfsPublishResultObjectErrorMessage);
@@ -2033,7 +2019,7 @@ class NormalizationFactory {
                 continue;
             }
             if (memberData.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION) {
-                invalidMembers.push(`"${memberName}", which is type "${(0, utils_5.kindToTypeString)(memberData.kind)}"`);
+                invalidMembers.push(`"${memberName}", which is type "${(0, utils_5.kindToNodeType)(memberData.kind)}"`);
             }
         }
         if (invalidMembers.length > 0) {
@@ -2117,13 +2103,13 @@ class NormalizationFactory {
     getInputObjectNodeByData(inputObjectDefinitionData) {
         inputObjectDefinitionData.node.description = inputObjectDefinitionData.description;
         inputObjectDefinitionData.node.directives = this.getValidFlattenedDirectiveArray(inputObjectDefinitionData.directivesByDirectiveName, inputObjectDefinitionData.name);
-        inputObjectDefinitionData.node.fields = (0, utils_4.childMapToValueArray)(inputObjectDefinitionData.inputValueDataByValueName);
+        inputObjectDefinitionData.node.fields = (0, utils_4.childMapToValueArray)(inputObjectDefinitionData.inputValueDataByName);
         return inputObjectDefinitionData.node;
     }
     getCompositeOutputNodeByData(compositeOutputData) {
         compositeOutputData.node.description = compositeOutputData.description;
         compositeOutputData.node.directives = this.getValidFlattenedDirectiveArray(compositeOutputData.directivesByDirectiveName, compositeOutputData.name);
-        compositeOutputData.node.fields = (0, utils_4.childMapToValueArray)(compositeOutputData.fieldDataByFieldName);
+        compositeOutputData.node.fields = (0, utils_4.childMapToValueArray)(compositeOutputData.fieldDataByName);
         compositeOutputData.node.interfaces = (0, utils_1.setToNamedTypeNodeArray)(compositeOutputData.implementedInterfaceTypeNames);
         return compositeOutputData.node;
     }
@@ -2166,10 +2152,10 @@ class NormalizationFactory {
                 const externalExtensionFieldCoordsByRawFieldSet = new Map();
                 let currentDepth = -1;
                 let shouldDefineSelectionSet = true;
-                (0, index_1.visit)(keyFieldSetData.documentNode, {
+                (0, graphql_1.visit)(keyFieldSetData.documentNode, {
                     Argument: {
                         enter() {
-                            return index_1.BREAK;
+                            return graphql_1.BREAK;
                         },
                     },
                     Field: {
@@ -2178,16 +2164,16 @@ class NormalizationFactory {
                             const parentTypeName = parentData.name;
                             // If a composite type was just visited, a selection set should have been entered
                             if (shouldDefineSelectionSet) {
-                                return index_1.BREAK;
+                                return graphql_1.BREAK;
                             }
                             const fieldName = node.name.value;
                             const fieldCoords = `${parentTypeName}.${fieldName}`;
                             // If a field declared @external is a key field, it is valid use of @external.
                             nf.unvalidatedExternalFieldCoords.delete(fieldCoords);
-                            const fieldData = parentData.fieldDataByFieldName.get(fieldName);
+                            const fieldData = parentData.fieldDataByName.get(fieldName);
                             // undefined if the field does not exist on the parent
-                            if (!fieldData || fieldData.argumentDataByArgumentName.size) {
-                                return index_1.BREAK;
+                            if (!fieldData || fieldData.argumentDataByName.size) {
+                                return graphql_1.BREAK;
                             }
                             // Fields that form part of an entity key are intrinsically shareable
                             fieldData.isShareableBySubgraphName.set(nf.subgraphName, true);
@@ -2231,7 +2217,7 @@ class NormalizationFactory {
                             // The child could itself be a parent
                             const namedTypeData = nf.parentDefinitionDataByTypeName.get(namedTypeName);
                             if (!namedTypeData) {
-                                return index_1.BREAK;
+                                return graphql_1.BREAK;
                             }
                             if (namedTypeData.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION) {
                                 shouldDefineSelectionSet = true;
@@ -2240,24 +2226,24 @@ class NormalizationFactory {
                             }
                             // interfaces and unions are invalid in a key directive
                             if ((0, utils_1.isKindAbstract)(namedTypeData.kind)) {
-                                return index_1.BREAK;
+                                return graphql_1.BREAK;
                             }
                         },
                     },
                     InlineFragment: {
                         enter() {
-                            return index_1.BREAK;
+                            return graphql_1.BREAK;
                         },
                     },
                     SelectionSet: {
                         enter() {
                             if (!shouldDefineSelectionSet) {
-                                return index_1.BREAK;
+                                return graphql_1.BREAK;
                             }
                             currentDepth += 1;
                             shouldDefineSelectionSet = false;
                             if (currentDepth < 0 || currentDepth >= parentDatas.length) {
-                                return index_1.BREAK;
+                                return graphql_1.BREAK;
                             }
                         },
                         leave() {
@@ -2379,63 +2365,101 @@ class NormalizationFactory {
          * */
         for (const data of this.invalidConfigureDescriptionNodeDatas) {
             if (!data.description) {
-                this.errors.push((0, errors_1.configureDescriptionNoDescriptionError)((0, utils_5.kindToTypeString)(data.kind), data.name));
+                this.errors.push((0, errors_1.configureDescriptionNoDescriptionError)((0, utils_5.kindToNodeType)(data.kind), data.name));
             }
         }
         // Check all key field sets for @external fields to assess whether they are conditional
         this.evaluateExternalKeyFields();
-        for (const [parentTypeName, parentDefinitionData] of this.parentDefinitionDataByTypeName) {
-            switch (parentDefinitionData.kind) {
+        for (const [parentTypeName, parentData] of this.parentDefinitionDataByTypeName) {
+            switch (parentData.kind) {
                 case graphql_1.Kind.ENUM_TYPE_DEFINITION:
-                    if (parentDefinitionData.enumValueDataByValueName.size < 1) {
+                    if (parentData.enumValueDataByValueName.size < 1) {
                         this.errors.push((0, errors_1.noDefinedEnumValuesError)(parentTypeName));
                         break;
                     }
-                    definitions.push(this.getEnumNodeByData(parentDefinitionData));
+                    definitions.push(this.getEnumNodeByData(parentData));
                     break;
                 case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION:
-                    if (parentDefinitionData.inputValueDataByValueName.size < 1) {
+                    if (parentData.inputValueDataByName.size < 1) {
                         this.errors.push((0, errors_1.noInputValueDefinitionsError)(parentTypeName));
                         break;
                     }
-                    definitions.push(this.getInputObjectNodeByData(parentDefinitionData));
+                    for (const valueData of parentData.inputValueDataByName.values()) {
+                        // Base Scalars have already been set
+                        if (valueData.namedTypeKind !== graphql_1.Kind.NULL) {
+                            continue;
+                        }
+                        const namedTypeData = this.parentDefinitionDataByTypeName.get(valueData.namedTypeName);
+                        if (!namedTypeData) {
+                            // undefined types are handled elsewhere
+                            continue;
+                        }
+                        if (!(0, utils_4.isInputNodeKind)(namedTypeData.kind)) {
+                            this.errors.push((0, errors_1.invalidNamedTypeError)({
+                                data: valueData,
+                                namedTypeData,
+                                nodeType: `${(0, utils_5.kindToNodeType)(parentData.kind)} field`,
+                            }));
+                            continue;
+                        }
+                        valueData.namedTypeKind = namedTypeData.kind;
+                    }
+                    definitions.push(this.getInputObjectNodeByData(parentData));
                     break;
                 case graphql_1.Kind.INTERFACE_TYPE_DEFINITION:
                 // intentional fallthrough
                 case graphql_1.Kind.OBJECT_TYPE_DEFINITION:
                     const isEntity = this.entityDataByTypeName.has(parentTypeName);
                     const operationTypeNode = this.operationTypeNodeByTypeName.get(parentTypeName);
-                    const isObject = parentDefinitionData.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION;
-                    if (this.isSubgraphVersionTwo && parentDefinitionData.extensionType === types_1.ExtensionType.EXTENDS) {
+                    const isObject = parentData.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION;
+                    if (this.isSubgraphVersionTwo && parentData.extensionType === types_1.ExtensionType.EXTENDS) {
                         // @extends is essentially ignored in V2. It was only propagated to handle @external key fields.
-                        parentDefinitionData.extensionType = types_1.ExtensionType.NONE;
+                        parentData.extensionType = types_1.ExtensionType.NONE;
                     }
                     if (operationTypeNode) {
-                        parentDefinitionData.fieldDataByFieldName.delete(string_constants_2.SERVICE_FIELD);
-                        parentDefinitionData.fieldDataByFieldName.delete(string_constants_2.ENTITIES_FIELD);
+                        parentData.fieldDataByName.delete(string_constants_2.SERVICE_FIELD);
+                        parentData.fieldDataByName.delete(string_constants_2.ENTITIES_FIELD);
                     }
-                    (0, utils_4.removeInheritableDirectivesFromObjectParent)(parentDefinitionData);
-                    if (this.parentsWithChildArguments.has(parentTypeName) || !isObject) {
-                        const externalInterfaceFieldNames = [];
-                        for (const [fieldName, fieldData] of parentDefinitionData.fieldDataByFieldName) {
-                            if (!isObject && fieldData.externalFieldDataBySubgraphName.get(this.subgraphName)?.isDefinedExternal) {
-                                externalInterfaceFieldNames.push(fieldName);
-                            }
-                            // Arguments can only be fully validated once all parents types are known
-                            this.validateArguments(fieldData, `${parentTypeName}.${fieldName}`);
+                    (0, utils_4.removeInheritableDirectivesFromObjectParent)(parentData);
+                    const externalInterfaceFieldNames = [];
+                    for (const [fieldName, fieldData] of parentData.fieldDataByName) {
+                        if (!isObject && fieldData.externalFieldDataBySubgraphName.get(this.subgraphName)?.isDefinedExternal) {
+                            externalInterfaceFieldNames.push(fieldName);
                         }
-                        // @external interface fields fails composition in V2; only propagate as a warning for V1.
-                        if (externalInterfaceFieldNames.length > 0) {
-                            this.isSubgraphVersionTwo
-                                ? this.errors.push((0, errors_1.externalInterfaceFieldsError)(parentTypeName, externalInterfaceFieldNames))
-                                : this.warnings.push((0, warnings_1.externalInterfaceFieldsWarning)(this.subgraphName, parentTypeName, externalInterfaceFieldNames));
+                        // Arguments can only be fully validated once all parents types are known
+                        this.validateArguments(fieldData, parentData.kind);
+                        // Base Scalars have already been set
+                        if (fieldData.namedTypeKind !== graphql_1.Kind.NULL) {
+                            continue;
+                        }
+                        const namedTypeData = this.parentDefinitionDataByTypeName.get(fieldData.namedTypeName);
+                        if (!namedTypeData) {
+                            // undefined types are handled elsewhere
+                            continue;
                         }
+                        if (!(0, utils_4.isOutputNodeKind)(namedTypeData.kind)) {
+                            this.errors.push((0, errors_1.invalidNamedTypeError)({
+                                data: fieldData,
+                                namedTypeData,
+                                nodeType: `${(0, utils_5.kindToNodeType)(parentData.kind)} field`,
+                            }));
+                            continue;
+                        }
+                        fieldData.namedTypeKind = this.entityInterfaceDataByTypeName.get(namedTypeData.name)
+                            ? graphql_1.Kind.INTERFACE_TYPE_DEFINITION
+                            : namedTypeData.kind;
+                    }
+                    // @external interface fields fails composition in V2; only propagate as a warning for V1.
+                    if (externalInterfaceFieldNames.length > 0) {
+                        this.isSubgraphVersionTwo
+                            ? this.errors.push((0, errors_1.externalInterfaceFieldsError)(parentTypeName, externalInterfaceFieldNames))
+                            : this.warnings.push((0, warnings_1.externalInterfaceFieldsWarning)(this.subgraphName, parentTypeName, externalInterfaceFieldNames));
                     }
-                    const newParentTypeName = (0, utils_4.getParentTypeName)(parentDefinitionData);
+                    const newParentTypeName = (0, utils_4.getParentTypeName)(parentData);
                     const configurationData = (0, utils_5.getValueOrDefault)(this.configurationDataByTypeName, newParentTypeName, () => (0, utils_6.newConfigurationData)(isEntity, parentTypeName));
                     const entityInterfaceData = this.entityInterfaceDataByTypeName.get(parentTypeName);
                     if (entityInterfaceData) {
-                        entityInterfaceData.fieldDatas = (0, utils_3.fieldDatasToSimpleFieldDatas)(parentDefinitionData.fieldDataByFieldName.values());
+                        entityInterfaceData.fieldDatas = (0, utils_3.fieldDatasToSimpleFieldDatas)(parentData.fieldDataByName.values());
                         const concreteTypeNames = this.concreteTypeNamesByAbstractTypeName.get(parentTypeName);
                         if (concreteTypeNames) {
                             (0, utils_5.addIterableValuesToSet)(concreteTypeNames, entityInterfaceData.concreteTypeNames);
@@ -2447,24 +2471,24 @@ class NormalizationFactory {
                     if (events) {
                         configurationData.events = events;
                     }
-                    this.addFieldNamesToConfigurationData(parentDefinitionData.fieldDataByFieldName, configurationData);
-                    this.validateInterfaceImplementations(parentDefinitionData);
-                    definitions.push(this.getCompositeOutputNodeByData(parentDefinitionData));
+                    this.addFieldNamesToConfigurationData(parentData.fieldDataByName, configurationData);
+                    this.validateInterfaceImplementations(parentData);
+                    definitions.push(this.getCompositeOutputNodeByData(parentData));
                     // 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_5.kindToTypeString)(parentDefinitionData.kind), parentTypeName));
+                    if (parentData.fieldDataByName.size < 1 && !(0, utils_2.isNodeQuery)(parentTypeName, operationTypeNode)) {
+                        this.errors.push((0, errors_1.noFieldDefinitionsError)((0, utils_5.kindToNodeType)(parentData.kind), parentTypeName));
                     }
                     break;
                 case graphql_1.Kind.SCALAR_TYPE_DEFINITION:
-                    if (parentDefinitionData.extensionType === types_1.ExtensionType.REAL) {
+                    if (parentData.extensionType === types_1.ExtensionType.REAL) {
                         this.errors.push((0, errors_1.noBaseScalarDefinitionError)(parentTypeName));
                         break;
                     }
-                    definitions.push(this.getScalarNodeByData(parentDefinitionData));
+                    definitions.push(this.getScalarNodeByData(parentData));
                     break;
                 case graphql_1.Kind.UNION_TYPE_DEFINITION:
-                    definitions.push(this.getUnionNodeByData(parentDefinitionData));
-                    this.validateUnionMembers(parentDefinitionData);
+                    definitions.push(this.getUnionNodeByData(parentData));
+                    this.validateUnionMembers(parentData);
                     break;
                 default:
                     throw (0, errors_1.unexpectedKindFatalError)(parentTypeName);
@@ -2513,20 +2537,18 @@ class NormalizationFactory {
         }
         for (const referencedTypeName of this.referencedTypeNames) {
             const parentData = this.parentDefinitionDataByTypeName.get(referencedTypeName);
-            if (parentData) {
-                if (parentData.kind !== graphql_1.Kind.INTERFACE_TYPE_DEFINITION) {
-                    continue;
-                }
-                // There will be a run time error if a Field can return an interface without any Object implementations.
-                const implementationTypeNames = this.concreteTypeNamesByAbstractTypeName.get(referencedTypeName);
-                if (!implementationTypeNames || implementationTypeNames.size < 0) {
-                    // Temporarily propagate as a warning until @inaccessible, entity interfaces and other such considerations are handled
-                    this.warnings.push((0, warnings_1.unimplementedInterfaceOutputTypeWarning)(this.subgraphName, referencedTypeName));
-                }
+            if (!parentData) {
+                this.errors.push((0, errors_1.undefinedTypeError)(referencedTypeName));
                 continue;
             }
-            if (!this.entityDataByTypeName.has(referencedTypeName)) {
-                this.errors.push((0, errors_1.undefinedTypeError)(referencedTypeName));
+            if (parentData.kind !== graphql_1.Kind.INTERFACE_TYPE_DEFINITION) {
+                continue;
+            }
+            // There will be a run time error if a field can return an Interface without any Object implementations.
+            const implementationTypeNames = this.concreteTypeNamesByAbstractTypeName.get(referencedTypeName);
+            if (!implementationTypeNames || implementationTypeNames.size < 0) {
+                // Temporarily propagate as a warning until @inaccessible, entity interfaces and other such considerations are handled
+                this.warnings.push((0, warnings_1.unimplementedInterfaceOutputTypeWarning)(this.subgraphName, referencedTypeName));
             }
         }
         const persistedDirectiveDefinitionDataByDirectiveName = new Map();