@wundergraph/composition 0.38.0 → 0.39.0

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

@@ -54,8 +54,6 @@ class NormalizationFactory {
     entityInterfaceDataByTypeName = new Map();
     eventsConfigurations = new Map();
     fieldSetDataByTypeName = new Map();
-    heirFieldAuthorizationDataByTypeName = new Map();
-    interfaceTypeNamesWithAuthorizationDirectives = new Set();
     internalGraph;
     invalidConfigureDescriptionNodeDatas = [];
     invalidRepeatedDirectiveNameByCoords = new Map();
@@ -67,17 +65,18 @@ class NormalizationFactory {
     keyFieldSetDatasByTypeName = new Map();
     lastParentNodeKind = graphql_1.Kind.NULL;
     lastChildNodeKind = graphql_1.Kind.NULL;
-    leafTypeNamesWithAuthorizationDirectives = new Set();
+    parentTypeNamesWithAuthDirectives = new Set();
     keyFieldSetDataByTypeName = new Map();
     keyFieldSetsByEntityTypeNameByFieldCoords = new Map();
     keyFieldNamesByParentTypeName = new Map();
+    fieldCoordsByNamedTypeName = new Map();
     operationTypeNodeByTypeName = new Map();
     originalParentTypeName = '';
     originalTypeNameByRenamedTypeName = new Map();
     parentDefinitionDataByTypeName = new Map();
     parentsWithChildArguments = new Set();
     overridesByTargetSubgraphName = new Map();
-    invalidOrScopesHostPaths = new Set();
+    invalidORScopesCoords = new Set();
     schemaData;
     referencedDirectiveNames = new Set();
     referencedTypeNames = new Set();
@@ -138,83 +137,6 @@ class NormalizationFactory {
             this.errors.push((0, errors_1.invalidArgumentsError)(fieldPath, invalidArguments));
         }
     }
-    // Note that directive validation errors are handled elsewhere
-    getAuthorizationData(node) {
-        const parentTypeName = this.renamedParentTypeName || this.originalParentTypeName;
-        let authorizationData = this.authorizationDataByParentTypeName.get(parentTypeName);
-        (0, utils_3.resetAuthorizationData)(authorizationData);
-        if (!node.directives) {
-            return authorizationData;
-        }
-        let requiresAuthentication = false;
-        const requiresScopes = [];
-        for (const directiveNode of node.directives) {
-            const directiveName = directiveNode.name.value;
-            if (directiveName === string_constants_2.AUTHENTICATED) {
-                // @authenticated is not repeatable
-                if (requiresAuthentication) {
-                    return;
-                }
-                requiresAuthentication = true;
-                continue;
-            }
-            if (directiveName !== string_constants_2.REQUIRES_SCOPES) {
-                continue;
-            }
-            // @requiresScopes is not repeatable
-            if (requiresScopes.length > 0) {
-                return;
-            }
-            requiresScopes.push(directiveNode);
-        }
-        if (!requiresAuthentication && requiresScopes.length < 1) {
-            return authorizationData;
-        }
-        if ((0, utils_3.isNodeKindInterface)(node.kind)) {
-            this.interfaceTypeNamesWithAuthorizationDirectives.add(parentTypeName);
-        }
-        if (!authorizationData) {
-            authorizationData = (0, utils_3.setAndGetValue)(this.authorizationDataByParentTypeName, this.renamedParentTypeName || this.originalParentTypeName, (0, utils_3.newAuthorizationData)(parentTypeName));
-        }
-        authorizationData.hasParentLevelAuthorization = true;
-        authorizationData.requiresAuthentication = requiresAuthentication;
-        if (requiresScopes.length !== 1) {
-            return authorizationData;
-        }
-        const directiveNode = requiresScopes[0];
-        if (!directiveNode.arguments || directiveNode.arguments.length !== 1) {
-            return;
-        }
-        const scopesArgument = directiveNode.arguments[0];
-        // @TODO list coercion
-        if (scopesArgument.name.value !== string_constants_2.SCOPES || scopesArgument.value.kind !== graphql_1.Kind.LIST) {
-            return;
-        }
-        const orScopes = scopesArgument.value.values;
-        if (orScopes.length < 1) {
-            return authorizationData;
-        }
-        if (orScopes.length > utils_3.maxOrScopes) {
-            this.invalidOrScopesHostPaths.add(this.originalParentTypeName);
-            return;
-        }
-        for (const scopes of orScopes) {
-            if (scopes.kind !== graphql_1.Kind.LIST) {
-                return;
-            }
-            const andScopes = new Set();
-            for (const scope of scopes.values) {
-                if (scope.kind !== graphql_1.Kind.STRING) {
-                    return;
-                }
-                andScopes.add(scope.value);
-            }
-            if (andScopes.size) {
-                authorizationData.requiredScopes.push(andScopes);
-            }
-        }
-        return authorizationData;
-    }
     isTypeNameRootType(typeName) {
         return string_constants_2.ROOT_TYPE_NAMES.has(typeName) || this.operationTypeNodeByTypeName.has(typeName);
     }
@@ -379,7 +301,7 @@ class NormalizationFactory {
             if (!isRequiresScopes || argumentName !== string_constants_2.SCOPES) {
                 continue;
             }
-            this.handleRequiresScopesDirective({
+            this.extractRequiredScopes({
                 directiveCoords,
                 // Casts are safe because invalid arguments would short circuit
                 orScopes: argumentNode.value.values,
@@ -399,17 +321,16 @@ class NormalizationFactory {
         if (errorMessages.length > 0 || !isRequiresScopes) {
             return errorMessages;
         }
-        if (data.kind !== graphql_1.Kind.ENUM_TYPE_DEFINITION &&
-            data.kind !== graphql_1.Kind.FIELD_DEFINITION &&
-            data.kind !== graphql_1.Kind.SCALAR_TYPE_DEFINITION) {
-            return errorMessages;
-        }
+        const parentAuthorizationData = (0, utils_5.getValueOrDefault)(this.authorizationDataByParentTypeName, parentTypeName, () => (0, utils_3.newAuthorizationData)(parentTypeName));
         if (data.kind !== graphql_1.Kind.FIELD_DEFINITION) {
-            this.leafTypeNamesWithAuthorizationDirectives.add(parentTypeName);
+            this.parentTypeNamesWithAuthDirectives.add(parentTypeName);
+            parentAuthorizationData.requiredScopes.push(...requiredScopes);
+        }
+        else {
+            const fieldAuthData = (0, utils_5.getValueOrDefault)(parentAuthorizationData.fieldAuthDataByFieldName, data.name, () => (0, utils_3.newFieldAuthorizationData)(data.name));
+            fieldAuthData.inheritedData.requiredScopes.push(...requiredScopes);
+            fieldAuthData.originalData.requiredScopes.push(...requiredScopes);
         }
-        const parentAuthorizationData = (0, utils_5.getValueOrDefault)(this.authorizationDataByParentTypeName, parentTypeName, () => (0, utils_3.newAuthorizationData)(parentTypeName));
-        const authorizationData = (0, utils_3.getAuthorizationDataToUpdate)(parentAuthorizationData, data.node);
-        authorizationData.requiredScopes.push(...requiredScopes);
         return errorMessages;
     }
     validateDirectives(data, directiveCoords) {
@@ -970,6 +891,7 @@ class NormalizationFactory {
             }
             this.setParentDataExtensionType(parentData, extensionType);
             parentData.description ||= (0, utils_1.formatDescription)('description' in node ? node.description : undefined);
+            parentData.subgraphNames.add(this.subgraphName);
             this.extractConfigureDescriptionsData(parentData);
             return;
         }
@@ -981,6 +903,7 @@ class NormalizationFactory {
             name: typeName,
             node: (0, ast_1.getMutableScalarNode)(node.name),
             persistedDirectivesData: (0, utils_4.newPersistedDirectivesData)(),
+            subgraphNames: new Set([this.subgraphName]),
             description: (0, utils_1.formatDescription)('description' in node ? node.description : undefined),
         };
         this.extractConfigureDescriptionsData(newParentData);
@@ -1026,6 +949,7 @@ class NormalizationFactory {
             this.setParentDataExtensionType(parentData, extensionType);
             this.extractUnionMembers(node, parentData.memberByMemberTypeName);
             parentData.description ||= (0, utils_1.formatDescription)('description' in node ? node.description : undefined);
+            parentData.subgraphNames.add(this.subgraphName);
             this.extractConfigureDescriptionsData(parentData);
             return;
         }
@@ -1038,6 +962,7 @@ class NormalizationFactory {
             name: typeName,
             node: (0, ast_1.getMutableUnionNode)(node.name),
             persistedDirectivesData: (0, utils_4.newPersistedDirectivesData)(),
+            subgraphNames: new Set([this.subgraphName]),
             description: (0, utils_1.formatDescription)('description' in node ? node.description : undefined),
         };
         this.extractConfigureDescriptionsData(newParentData);
@@ -1513,16 +1438,16 @@ class NormalizationFactory {
         }
     }
     handleAuthenticatedDirective(data, parentTypeName) {
-        if (data.kind !== graphql_1.Kind.ENUM_TYPE_DEFINITION &&
-            data.kind !== graphql_1.Kind.FIELD_DEFINITION &&
-            data.kind !== graphql_1.Kind.SCALAR_TYPE_DEFINITION) {
-            return;
+        const parentAuthData = (0, utils_5.getValueOrDefault)(this.authorizationDataByParentTypeName, parentTypeName, () => (0, utils_3.newAuthorizationData)(parentTypeName));
+        if (data.kind === graphql_1.Kind.FIELD_DEFINITION) {
+            const fieldAuthData = (0, utils_5.getValueOrDefault)(parentAuthData.fieldAuthDataByFieldName, data.name, () => (0, utils_3.newFieldAuthorizationData)(data.name));
+            fieldAuthData.inheritedData.requiresAuthentication = true;
+            fieldAuthData.originalData.requiresAuthentication = true;
         }
-        if (data.kind !== graphql_1.Kind.FIELD_DEFINITION) {
-            this.leafTypeNamesWithAuthorizationDirectives.add(parentTypeName);
+        else {
+            parentAuthData.requiresAuthentication = true;
+            this.parentTypeNamesWithAuthDirectives.add(parentTypeName);
         }
-        const parentAuthorizationData = (0, utils_5.getValueOrDefault)(this.authorizationDataByParentTypeName, parentTypeName, () => (0, utils_3.newAuthorizationData)(parentTypeName));
-        (0, utils_3.getAuthorizationDataToUpdate)(parentAuthorizationData, data.node).requiresAuthentication = true;
     }
     handleOverrideDirective({ data, directiveCoords, errorMessages, targetSubgraphName }) {
         if (targetSubgraphName === this.subgraphName) {
@@ -1532,19 +1457,20 @@ class NormalizationFactory {
         const overrideDataForSubgraph = (0, utils_5.getValueOrDefault)(this.overridesByTargetSubgraphName, targetSubgraphName, () => new Map());
         (0, utils_5.getValueOrDefault)(overrideDataForSubgraph, data.renamedParentTypeName, () => new Set()).add(data.name);
     }
-    handleRequiresScopesDirective({ directiveCoords, orScopes, requiredScopes }) {
-        if (orScopes.length > utils_3.maxOrScopes) {
-            this.invalidOrScopesHostPaths.add(directiveCoords);
+    extractRequiredScopes({ directiveCoords, orScopes, requiredScopes }) {
+        if (orScopes.length > constants_1.MAX_OR_SCOPES) {
+            this.invalidORScopesCoords.add(directiveCoords);
             return;
         }
         for (const scopes of orScopes) {
-            const andScopes = new Set();
+            const newANDScopes = new Set();
             for (const scope of scopes.values) {
-                andScopes.add(scope.value);
+                newANDScopes.add(scope.value);
             }
-            if (andScopes.size > 0) {
-                requiredScopes.push(andScopes);
+            if (newANDScopes.size < 1) {
+                continue;
             }
+            (0, utils_3.addScopes)(requiredScopes, newANDScopes);
         }
     }
     getKafkaPublishConfiguration(directive, argumentDataByArgumentName, fieldName, errorMessages) {
@@ -2165,19 +2091,19 @@ class NormalizationFactory {
     getEnumNodeByData(enumDefinitionData) {
         enumDefinitionData.node.description = enumDefinitionData.description;
         enumDefinitionData.node.directives = this.getValidFlattenedDirectiveArray(enumDefinitionData.directivesByDirectiveName, enumDefinitionData.name);
-        enumDefinitionData.node.values = (0, utils_4.childMapToValueArray)(enumDefinitionData.enumValueDataByValueName, this.authorizationDataByParentTypeName);
+        enumDefinitionData.node.values = (0, utils_4.childMapToValueArray)(enumDefinitionData.enumValueDataByValueName);
         return enumDefinitionData.node;
     }
     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, this.authorizationDataByParentTypeName);
+        inputObjectDefinitionData.node.fields = (0, utils_4.childMapToValueArray)(inputObjectDefinitionData.inputValueDataByValueName);
         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, this.authorizationDataByParentTypeName);
+        compositeOutputData.node.fields = (0, utils_4.childMapToValueArray)(compositeOutputData.fieldDataByFieldName);
         compositeOutputData.node.interfaces = (0, utils_1.setToNamedTypeNodeArray)(compositeOutputData.implementedInterfaceTypeNames);
         return compositeOutputData.node;
     }
@@ -2384,36 +2310,8 @@ class NormalizationFactory {
         for (const [parentTypeName, parentData] of this.parentDefinitionDataByTypeName) {
             this.validateDirectives(parentData, parentTypeName);
         }
-        (0, walkers_1.consolidateAuthorizationDirectives)(this, document);
-        for (const interfaceTypeName of this.interfaceTypeNamesWithAuthorizationDirectives) {
-            const interfaceAuthorizationData = this.authorizationDataByParentTypeName.get(interfaceTypeName);
-            if (!interfaceAuthorizationData) {
-                continue;
-            }
-            const concreteTypeNames = this.concreteTypeNamesByAbstractTypeName.get(interfaceTypeName);
-            for (const concreteTypeName of concreteTypeNames || []) {
-                const concreteAuthorizationData = (0, utils_5.getValueOrDefault)(this.authorizationDataByParentTypeName, concreteTypeName, () => (0, utils_3.newAuthorizationData)(concreteTypeName));
-                for (const [fieldName, interfaceFieldAuthorizationData,] of interfaceAuthorizationData.fieldAuthorizationDataByFieldName) {
-                    if (!(0, utils_3.upsertFieldAuthorizationData)(concreteAuthorizationData.fieldAuthorizationDataByFieldName, interfaceFieldAuthorizationData)) {
-                        this.invalidOrScopesHostPaths.add(`${concreteTypeName}.${fieldName}`);
-                    }
-                }
-            }
-        }
-        // Apply inherited leaf authorization that was not applied to interface fields of that type earlier
-        for (const [typeName, fieldAuthorizationDatas] of this.heirFieldAuthorizationDataByTypeName) {
-            const authorizationData = this.authorizationDataByParentTypeName.get(typeName);
-            if (!authorizationData) {
-                continue;
-            }
-            for (const fieldAuthorizationData of fieldAuthorizationDatas) {
-                if (!(0, utils_3.mergeAuthorizationDataByAND)(authorizationData, fieldAuthorizationData)) {
-                    this.invalidOrScopesHostPaths.add(`${typeName}.${fieldAuthorizationData.fieldName}`);
-                }
-            }
-        }
-        if (this.invalidOrScopesHostPaths.size > 0) {
-            this.errors.push((0, errors_1.orScopesLimitError)(utils_3.maxOrScopes, [...this.invalidOrScopesHostPaths]));
+        if (this.invalidORScopesCoords.size > 0) {
+            this.errors.push((0, errors_1.orScopesLimitError)(constants_1.MAX_OR_SCOPES, [...this.invalidORScopesCoords]));
         }
         const definitions = [];
         for (const directiveDefinition of constants_1.BASE_DIRECTIVE_DEFINITIONS) {
@@ -2473,7 +2371,6 @@ class NormalizationFactory {
                         this.errors.push((0, errors_1.noDefinedEnumValuesError)(parentTypeName));
                         break;
                     }
-                    (0, utils_4.removeIgnoredDirectives)(parentDefinitionData);
                     definitions.push(this.getEnumNodeByData(parentDefinitionData));
                     break;
                 case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION:
@@ -2497,7 +2394,6 @@ class NormalizationFactory {
                         parentDefinitionData.fieldDataByFieldName.delete(string_constants_2.SERVICE_FIELD);
                         parentDefinitionData.fieldDataByFieldName.delete(string_constants_2.ENTITIES_FIELD);
                     }
-                    (0, utils_4.removeIgnoredDirectives)(parentDefinitionData);
                     (0, utils_4.removeInheritableDirectivesFromObjectParent)(parentDefinitionData);
                     if (this.parentsWithChildArguments.has(parentTypeName) || !isObject) {
                         const externalInterfaceFieldNames = [];
@@ -2544,7 +2440,6 @@ class NormalizationFactory {
                         this.errors.push((0, errors_1.noBaseScalarDefinitionError)(parentTypeName));
                         break;
                     }
-                    (0, utils_4.removeIgnoredDirectives)(parentDefinitionData);
                     definitions.push(this.getScalarNodeByData(parentDefinitionData));
                     break;
                 case graphql_1.Kind.UNION_TYPE_DEFINITION:
@@ -2651,6 +2546,7 @@ class NormalizationFactory {
             configurationDataByTypeName: this.configurationDataByTypeName,
             entityDataByTypeName: this.entityDataByTypeName,
             entityInterfaces: this.entityInterfaceDataByTypeName,
+            fieldCoordsByNamedTypeName: this.fieldCoordsByNamedTypeName,
             isEventDrivenGraph: this.isSubgraphEventDrivenGraph,
             isVersionTwo: this.isSubgraphVersionTwo,
             keyFieldNamesByParentTypeName: this.keyFieldNamesByParentTypeName,
@@ -2681,7 +2577,8 @@ function batchNormalize(subgraphs) {
     const subgraphNames = new Set();
     const nonUniqueSubgraphNames = new Set();
     const invalidNameErrorMessages = [];
-    const invalidOrScopesHostPaths = new Set();
+    const invalidORScopesCoords = new Set();
+    const fieldCoordsByNamedTypeName = new Map();
     const warnings = [];
     const validationErrors = [];
     // Record the subgraph names first, so that subgraph references can be validated
@@ -2711,7 +2608,10 @@ function batchNormalize(subgraphs) {
         }
         parentDefinitionDataMapsBySubgraphName.set(subgraphName, normalizationResult.parentDefinitionDataByTypeName);
         for (const authorizationData of normalizationResult.authorizationDataByParentTypeName.values()) {
-            (0, utils_3.upsertAuthorizationData)(authorizationDataByParentTypeName, authorizationData, invalidOrScopesHostPaths);
+            (0, utils_3.upsertAuthorizationData)(authorizationDataByParentTypeName, authorizationData, invalidORScopesCoords);
+        }
+        for (const [namedTypeName, fieldCoords] of normalizationResult.fieldCoordsByNamedTypeName) {
+            (0, utils_5.addIterableValuesToSet)(fieldCoords, (0, utils_5.getValueOrDefault)(fieldCoordsByNamedTypeName, namedTypeName, () => new Set()));
         }
         for (const [abstractTypeName, incomingConcreteTypeNames,] of normalizationResult.concreteTypeNamesByAbstractTypeName) {
             const existingConcreteTypeNames = concreteTypeNamesByAbstractTypeName.get(abstractTypeName);
@@ -2781,8 +2681,8 @@ function batchNormalize(subgraphs) {
         }
     }
     const allErrors = [];
-    if (invalidOrScopesHostPaths.size > 0) {
-        allErrors.push((0, errors_1.orScopesLimitError)(utils_3.maxOrScopes, [...invalidOrScopesHostPaths]));
+    if (invalidORScopesCoords.size > 0) {
+        allErrors.push((0, errors_1.orScopesLimitError)(constants_1.MAX_OR_SCOPES, [...invalidORScopesCoords]));
     }
     if (invalidNameErrorMessages.length > 0 || nonUniqueSubgraphNames.size > 0) {
         allErrors.push((0, errors_1.invalidSubgraphNamesError)([...nonUniqueSubgraphNames], invalidNameErrorMessages));
@@ -2811,7 +2711,7 @@ function batchNormalize(subgraphs) {
             if (!configurationData) {
                 continue;
             }
-            (0, utils_3.subtractSourceSetFromTargetSet)(fieldNames, configurationData.fieldNames);
+            (0, utils_3.subtractSet)(fieldNames, configurationData.fieldNames);
             if (configurationData.fieldNames.size < 1) {
                 internalSubgraph.configurationDataByTypeName.delete(parentTypeName);
             }
@@ -2821,6 +2721,7 @@ function batchNormalize(subgraphs) {
         authorizationDataByParentTypeName,
         concreteTypeNamesByAbstractTypeName,
         entityDataByTypeName,
+        fieldCoordsByNamedTypeName,
         internalSubgraphBySubgraphName: internalSubgraphBySubgraphName,
         internalGraph,
         success: true,