@wundergraph/composition 0.28.4 → 0.28.5

package/dist/federation/federation-factory.d.ts

@@ -4,7 +4,7 @@ import { ChildTagData, FederationFactoryOptions, FederationResultContainer, Fede
 import { InternalSubgraph, Subgraph } from '../subgraph/subgraph';
 import { AuthorizationData, EntityData, EntityInterfaceFederationData, GraphFieldData } from '../utils/utils';
 import { FieldConfiguration, SubscriptionCondition, SubscriptionFieldCondition } from '../router-configuration/router-configuration';
-import { ChildData, DefinitionWithFieldsData, EnumValueData, FieldData, InputObjectDefinitionData, InputValueData, InterfaceDefinitionData, NodeData, ObjectDefinitionData, ParentDefinitionData, PersistedDirectiveDefinitionData, UnionDefinitionData } from '../schema-building/type-definition-data';
+import { ChildData, CompositeOutputData, EnumValueData, FieldData, InputObjectDefinitionData, InputValueData, InterfaceDefinitionData, NodeData, ObjectDefinitionData, ParentDefinitionData, PersistedDirectiveDefinitionData, UnionDefinitionData } from '../schema-building/type-definition-data';
 import { MergeMethod } from '../schema-building/utils';
 import { ObjectExtensionData } from '../schema-building/type-extension-data';
 import { ConstDirectiveNode, ConstObjectValueNode } from 'graphql/index';
@@ -29,7 +29,6 @@ export declare class FederationFactory {
     isVersionTwo: boolean;
     namedInputValueTypeNames: Set<string>;
     namedOutputTypeNames: Set<string>;
-    objectExtensionDataByTypeName: Map<string, ObjectExtensionData>;
     parentDefinitionDataByTypeName: Map<string, ParentDefinitionData>;
     parentTagDataByTypeName: Map<string, ParentTagData>;
     pathsByNamedTypeName: Map<string, Set<string>>;
@@ -43,7 +42,7 @@ export declare class FederationFactory {
     tagNamesByPath: Map<string, Set<string>>;
     warnings: Warning[];
     constructor(options: FederationFactoryOptions);
-    getValidImplementedInterfaces(data: DefinitionWithFieldsData): NamedTypeNode[];
+    getValidImplementedInterfaces(data: CompositeOutputData): NamedTypeNode[];
     addValidPrimaryKeyTargetsToEntityData(typeName: string): void;
     addValidPrimaryKeyTargetsFromInterfaceObject(internalSubgraph: InternalSubgraph, interfaceObjectTypeName: string, entityData: EntityData, graphNode: GraphNode): void;
     getEnumValueMergeMethod(enumTypeName: string): MergeMethod;
@@ -56,9 +55,7 @@ export declare class FederationFactory {
     getClientSchemaUnionMembers(unionData: UnionDefinitionData): NamedTypeNode[];
     recordTagNamesByPath(data: NodeData | ObjectExtensionData, nodePath?: string): void;
     upsertParentDefinitionData(incomingData: ParentDefinitionData, subgraphName: string): void;
-    upsertObjectExtensionData(incomingData: ObjectExtensionData): void;
     propagateInaccessibilityToExistingChildren(data: InputObjectDefinitionData | InterfaceDefinitionData | ObjectDefinitionData | ObjectExtensionData): void;
-    upsertValidObjectExtensionData(incomingData: ObjectExtensionData): void;
     upsertPersistedDirectiveDefinitionData(incomingData: PersistedDirectiveDefinitionData, subgraphNumber: number): void;
     federateInternalSubgraphData(): void;
     handleInterfaceObjectForInternalGraph({ entityData, internalSubgraph, interfaceObjectData, interfaceObjectNode, resolvableKeyFieldSets, subgraphName, }: InterfaceObjectForInternalGraphOptions): void;

package/dist/federation/federation-factory.js

@@ -15,6 +15,7 @@ const merge_1 = require("@graphql-tools/merge");
 const constants_1 = require("../utils/constants");
 const normalization_factory_1 = require("../normalization/normalization-factory");
 const utils_4 = require("../normalization/utils");
+const type_definition_data_1 = require("../schema-building/type-definition-data");
 const utils_5 = require("../schema-building/utils");
 const walkers_1 = require("./walkers");
 const lodash_1 = require("lodash");
@@ -38,7 +39,6 @@ class FederationFactory {
     isVersionTwo = false;
     namedInputValueTypeNames = new Set();
     namedOutputTypeNames = new Set();
-    objectExtensionDataByTypeName = new Map();
     parentDefinitionDataByTypeName = new Map();
     parentTagDataByTypeName = new Map();
     pathsByNamedTypeName = new Map();
@@ -169,10 +169,8 @@ class FederationFactory {
         }
         const internalSubgraph = (0, utils_3.getOrThrowError)(this.internalSubgraphBySubgraphName, this.currentSubgraphName, 'internalSubgraphBySubgraphName');
         const parentDefinitionDataByTypeName = internalSubgraph.parentDefinitionDataByTypeName;
-        const parentExtensionDataByTypeName = internalSubgraph.parentExtensionDataByTypeName;
-        const objectData = parentDefinitionDataByTypeName.get(entityData.typeName) || parentExtensionDataByTypeName.get(entityData.typeName);
-        if (!objectData ||
-            (objectData.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION && objectData.kind !== graphql_1.Kind.OBJECT_TYPE_EXTENSION)) {
+        const objectData = parentDefinitionDataByTypeName.get(entityData.typeName);
+        if (!objectData || objectData.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION) {
             throw (0, errors_1.incompatibleParentKindFatalError)(entityData.typeName, graphql_1.Kind.OBJECT_TYPE_DEFINITION, objectData?.kind || graphql_1.Kind.NULL);
         }
         const configurationData = (0, utils_3.getOrThrowError)(internalSubgraph.configurationDataByTypeName, entityData.typeName, 'internalSubgraph.configurationDataByParentTypeName');
@@ -187,7 +185,6 @@ class FederationFactory {
             implicitKeys,
             objectData,
             parentDefinitionDataByTypeName,
-            parentExtensionDataByTypeName,
         });
         for (const [typeName, entityInterfaceFederationData] of this.entityInterfaceFederationDataByTypeName) {
             if (!entityInterfaceFederationData.concreteTypeNames?.has(entityData.typeName)) {
@@ -204,7 +201,6 @@ class FederationFactory {
                 implicitKeys,
                 objectData,
                 parentDefinitionDataByTypeName,
-                parentExtensionDataByTypeName,
                 graphNode,
             });
         }
@@ -227,7 +223,6 @@ class FederationFactory {
     }
     addValidPrimaryKeyTargetsFromInterfaceObject(internalSubgraph, interfaceObjectTypeName, entityData, graphNode) {
         const parentDefinitionDataByTypeName = internalSubgraph.parentDefinitionDataByTypeName;
-        const parentExtensionDataByTypeName = internalSubgraph.parentExtensionDataByTypeName;
         const interfaceObjectData = parentDefinitionDataByTypeName.get(interfaceObjectTypeName);
         if (!interfaceObjectData || interfaceObjectData.kind !== graphql_1.Kind.INTERFACE_TYPE_DEFINITION) {
             throw (0, errors_1.incompatibleParentKindFatalError)(interfaceObjectTypeName, graphql_1.Kind.INTERFACE_TYPE_DEFINITION, interfaceObjectData?.kind || graphql_1.Kind.NULL);
@@ -242,7 +237,6 @@ class FederationFactory {
             implicitKeys,
             objectData: interfaceObjectData,
             parentDefinitionDataByTypeName,
-            parentExtensionDataByTypeName,
             graphNode,
         });
         if (implicitKeys.length < 1) {
@@ -537,6 +531,9 @@ class FederationFactory {
                 case graphql_1.Kind.INTERFACE_TYPE_DEFINITION:
                 // intentional fallthrough
                 case graphql_1.Kind.OBJECT_TYPE_DEFINITION:
+                    if ((0, utils_5.isParentDataRootType)(incomingData)) {
+                        incomingData.extensionType = type_definition_data_1.ExtensionType.NONE;
+                    }
                     for (const fieldData of incomingData.fieldDataByFieldName.values()) {
                         fieldData.node = {
                             arguments: [],
@@ -579,7 +576,6 @@ class FederationFactory {
                     return;
             }
         }
-        (0, utils_5.setLongestDescription)(existingData, incomingData);
         if (existingData.kind !== incomingData.kind) {
             if (!entityInterfaceData ||
                 !entityInterfaceData.interfaceObjectSubgraphs.has(subgraphName) ||
@@ -589,6 +585,8 @@ class FederationFactory {
                 return;
             }
         }
+        (0, utils_5.setLongestDescription)(existingData, incomingData);
+        (0, utils_5.setParentDataExtensionType)(existingData, incomingData);
         switch (existingData.kind) {
             case graphql_1.Kind.ENUM_TYPE_DEFINITION:
                 existingData.appearances += 1;
@@ -620,10 +618,10 @@ class FederationFactory {
                 if (isParentInaccessible && !existingData.isInaccessible) {
                     this.propagateInaccessibilityToExistingChildren(existingData);
                 }
-                const definitionWithFieldsData = incomingData;
-                (0, utils_3.addIterableValuesToSet)(definitionWithFieldsData.implementedInterfaceTypeNames, existingData.implementedInterfaceTypeNames);
-                (0, utils_3.addIterableValuesToSet)(definitionWithFieldsData.subgraphNames, existingData.subgraphNames);
-                for (const fieldData of definitionWithFieldsData.fieldDataByFieldName.values()) {
+                const compositeOutputData = incomingData;
+                (0, utils_3.addIterableValuesToSet)(compositeOutputData.implementedInterfaceTypeNames, existingData.implementedInterfaceTypeNames);
+                (0, utils_3.addIterableValuesToSet)(compositeOutputData.subgraphNames, existingData.subgraphNames);
+                for (const fieldData of compositeOutputData.fieldDataByFieldName.values()) {
                     this.upsertFieldData(existingData.fieldDataByFieldName, fieldData, isParentInaccessible || existingData.isInaccessible);
                 }
                 return;
@@ -635,64 +633,6 @@ class FederationFactory {
                 return;
         }
     }
-    upsertObjectExtensionData(incomingData) {
-        const existingData = this.objectExtensionDataByTypeName.get(incomingData.name);
-        const baseData = existingData || incomingData;
-        (0, utils_5.extractPersistedDirectives)(baseData.persistedDirectivesData, incomingData.directivesByDirectiveName, this.persistedDirectiveDefinitionByDirectiveName);
-        this.recordTagNamesByPath(baseData);
-        const isParentInaccessible = (0, utils_5.isNodeDataInaccessible)(baseData);
-        if (isParentInaccessible) {
-            this.inaccessiblePaths.add(incomingData.name);
-        }
-        if (!existingData) {
-            incomingData.node = {
-                kind: incomingData.kind,
-                name: (0, utils_1.stringToNameNode)(incomingData.name),
-            };
-            for (const fieldData of incomingData.fieldDataByFieldName.values()) {
-                fieldData.node = {
-                    arguments: [],
-                    directives: [],
-                    kind: fieldData.node.kind,
-                    name: (0, utils_1.stringToNameNode)(fieldData.name),
-                    type: fieldData.type,
-                };
-                const fieldPath = `${fieldData.renamedParentTypeName}.${fieldData.name}`;
-                (0, utils_3.getValueOrDefault)(this.pathsByNamedTypeName, fieldData.namedTypeName, () => new Set()).add(fieldPath);
-                this.namedOutputTypeNames.add(fieldData.namedTypeName);
-                (0, utils_5.extractPersistedDirectives)(fieldData.persistedDirectivesData, fieldData.directivesByDirectiveName, this.persistedDirectiveDefinitionByDirectiveName);
-                this.recordTagNamesByPath(fieldData, fieldPath);
-                const isFieldInaccessible = (0, utils_5.isNodeDataInaccessible)(fieldData);
-                if (isParentInaccessible || isFieldInaccessible) {
-                    this.inaccessiblePaths.add(fieldPath);
-                }
-                for (const [argumentName, inputValueData] of fieldData.argumentDataByArgumentName) {
-                    inputValueData.node = {
-                        directives: [],
-                        kind: inputValueData.node.kind,
-                        name: (0, utils_1.stringToNameNode)(inputValueData.name),
-                        type: inputValueData.type,
-                    };
-                    const namedArgumentTypeName = (0, ast_1.getTypeNodeNamedTypeName)(inputValueData.type);
-                    (0, utils_3.getValueOrDefault)(this.pathsByNamedTypeName, namedArgumentTypeName, () => new Set()).add(inputValueData.renamedPath);
-                    this.namedInputValueTypeNames.add(namedArgumentTypeName);
-                    (0, utils_5.extractPersistedDirectives)(inputValueData.persistedDirectivesData, inputValueData.directivesByDirectiveName, this.persistedDirectiveDefinitionByDirectiveName);
-                    this.recordTagNamesByPath(inputValueData, `${incomingData.name}.${argumentName}`);
-                    this.handleArgumentInaccessibility(isParentInaccessible || isFieldInaccessible, inputValueData, inputValueData.renamedPath, fieldPath);
-                }
-            }
-            this.objectExtensionDataByTypeName.set(incomingData.name, incomingData);
-            return;
-        }
-        if (isParentInaccessible && !existingData.isInaccessible) {
-            this.propagateInaccessibilityToExistingChildren(existingData);
-        }
-        (0, utils_3.addIterableValuesToSet)(incomingData.implementedInterfaceTypeNames, existingData.implementedInterfaceTypeNames);
-        (0, utils_3.addIterableValuesToSet)(incomingData.subgraphNames, existingData.subgraphNames);
-        for (const fieldData of incomingData.fieldDataByFieldName.values()) {
-            this.upsertFieldData(existingData.fieldDataByFieldName, fieldData, isParentInaccessible);
-        }
-    }
     propagateInaccessibilityToExistingChildren(data) {
         data.isInaccessible = true;
         switch (data.kind) {
@@ -711,54 +651,6 @@ class FederationFactory {
                 }
         }
     }
-    upsertValidObjectExtensionData(incomingData) {
-        const isParentInaccessible = (0, utils_5.isNodeDataInaccessible)(incomingData);
-        const existingData = this.parentDefinitionDataByTypeName.get(incomingData.name);
-        if (!existingData) {
-            if (incomingData.isRootType) {
-                const authorizationData = this.authorizationDataByParentTypeName.get(incomingData.name);
-                for (const fieldData of incomingData.fieldDataByFieldName.values()) {
-                    (0, utils_5.pushAuthorizationDirectives)(fieldData, authorizationData);
-                }
-                this.parentDefinitionDataByTypeName.set(incomingData.name, {
-                    directivesByDirectiveName: incomingData.directivesByDirectiveName,
-                    fieldDataByFieldName: incomingData.fieldDataByFieldName,
-                    implementedInterfaceTypeNames: incomingData.implementedInterfaceTypeNames,
-                    isRootType: true,
-                    isInaccessible: isParentInaccessible,
-                    isEntity: false,
-                    kind: graphql_1.Kind.OBJECT_TYPE_DEFINITION,
-                    name: incomingData.name,
-                    node: {
-                        kind: graphql_1.Kind.OBJECT_TYPE_DEFINITION,
-                        name: (0, utils_1.stringToNameNode)(incomingData.name),
-                    },
-                    persistedDirectivesData: incomingData.persistedDirectivesData,
-                    renamedTypeName: incomingData.renamedTypeName,
-                    subgraphNames: incomingData.subgraphNames,
-                });
-                return;
-            }
-            this.errors.push((0, errors_1.noBaseTypeExtensionError)(incomingData.name));
-            return;
-        }
-        if (existingData.kind !== graphql_1.Kind.OBJECT_TYPE_DEFINITION) {
-            this.errors.push((0, errors_1.incompatibleObjectExtensionOrphanBaseTypeError)(existingData.name, (0, utils_3.kindToTypeString)(existingData.kind)));
-            return;
-        }
-        (0, utils_5.upsertPersistedDirectivesData)(existingData.persistedDirectivesData, incomingData.persistedDirectivesData);
-        if (isParentInaccessible) {
-            this.inaccessiblePaths.add(incomingData.name);
-            // If the type was not previously known to be inaccessible, the existing children and arguments must be updated
-            if (!existingData.isInaccessible) {
-                this.propagateInaccessibilityToExistingChildren(existingData);
-            }
-        }
-        (0, utils_3.addIterableValuesToSet)(incomingData.implementedInterfaceTypeNames, existingData.implementedInterfaceTypeNames);
-        for (const fieldData of incomingData.fieldDataByFieldName.values()) {
-            this.upsertFieldData(existingData.fieldDataByFieldName, fieldData, isParentInaccessible);
-        }
-    }
     upsertPersistedDirectiveDefinitionData(incomingData, subgraphNumber) {
         const name = incomingData.name;
         const existingData = this.potentialPersistedDirectiveDefinitionDataByDirectiveName.get(name);
@@ -815,9 +707,6 @@ class FederationFactory {
             for (const parentDefinitionData of internalSubgraph.parentDefinitionDataByTypeName.values()) {
                 this.upsertParentDefinitionData(parentDefinitionData, internalSubgraph.name);
             }
-            for (const objectExtensionData of internalSubgraph.parentExtensionDataByTypeName.values()) {
-                this.upsertObjectExtensionData(objectExtensionData);
-            }
             if (shouldSkipPersistedExecutableDirectives) {
                 continue;
             }
@@ -941,6 +830,9 @@ class FederationFactory {
     }
     pushParentDefinitionDataToDocumentDefinitions(interfaceImplementations) {
         for (const [parentTypeName, parentDefinitionData] of this.parentDefinitionDataByTypeName) {
+            if (parentDefinitionData.extensionType !== type_definition_data_1.ExtensionType.NONE) {
+                this.errors.push((0, errors_1.noBaseDefinitionForExtensionError)((0, utils_3.kindToTypeString)(parentDefinitionData.kind), parentTypeName));
+            }
             switch (parentDefinitionData.kind) {
                 case graphql_1.Kind.ENUM_TYPE_DEFINITION:
                     const enumValueNodes = [];
@@ -987,7 +879,7 @@ class FederationFactory {
                         break;
                     }
                     if (clientEnumValueNodes.length < 1) {
-                        this.errors.push((0, errors_1.allChildDefinitionsAreInaccessibleError)((0, utils_3.kindToTypeString)(parentDefinitionData.kind), parentTypeName, 'enum value'));
+                        this.errors.push((0, errors_1.allChildDefinitionsAreInaccessibleError)((0, utils_3.kindToTypeString)(parentDefinitionData.kind), parentTypeName, string_constants_1.ENUM_VALUE));
                         break;
                     }
                     this.clientDefinitions.push({
@@ -1065,7 +957,7 @@ class FederationFactory {
                             this.errors.push((0, errors_1.invalidFieldShareabilityError)(parentDefinitionData, invalidFieldNames.byShareable));
                         }
                         if (invalidFieldNames.subgraphNamesByExternalFieldName.size > 0) {
-                            this.errors.push((0, errors_1.allExternalFieldsError)(parentTypeName, invalidFieldNames.subgraphNamesByExternalFieldName));
+                            this.errors.push((0, errors_1.allExternalFieldInstancesError)(parentTypeName, invalidFieldNames.subgraphNamesByExternalFieldName));
                         }
                     }
                     parentDefinitionData.node.fields = fieldNodes;
@@ -1139,9 +1031,6 @@ class FederationFactory {
     federateSubgraphData() {
         this.federateInternalSubgraphData();
         this.handleEntityInterfaces();
-        for (const objectExtensionData of this.objectExtensionDataByTypeName.values()) {
-            this.upsertValidObjectExtensionData(objectExtensionData);
-        }
         // generate the map of tag data that is used by contracts
         this.generateTagData();
         this.pushVersionTwoDirectiveDefinitionsToDocumentDefinitions();
@@ -1449,7 +1338,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_1.CONDITION, 'object', (0, utils_3.kindToTypeString)(argumentNode.value.kind)),
+                (0, errors_1.subscriptionFilterConditionInvalidInputFieldTypeErrorMessage)(string_constants_1.CONDITION, string_constants_1.OBJECT, (0, utils_3.kindToTypeString)(argumentNode.value.kind)),
             ]));
             return;
         }
@@ -1471,8 +1360,7 @@ class FederationFactory {
             if (this.inaccessiblePaths.has(fieldPath)) {
                 continue;
             }
-            const namedTypeData = this.parentDefinitionDataByTypeName.get(data.fieldData.namedTypeName) ||
-                this.objectExtensionDataByTypeName.get(data.fieldData.namedTypeName);
+            const namedTypeData = this.parentDefinitionDataByTypeName.get(data.fieldData.namedTypeName);
             /* An undefined namedTypeData should be impossible.
              * If the type were unknown, it would have resulted in an earlier normalization error.
              */