@graphql-tools/utils 7.2.4-alpha-08ab8c06.0 → 7.2.5

package/index.esm.js

@@ -1,4 +1,4 @@
-import { parse, isNonNullType, GraphQLError, Kind, valueFromAST, print, isObjectType, isListType, isSpecifiedScalarType, isIntrospectionType, astFromValue, isInterfaceType, isUnionType, isInputObjectType, isEnumType, isScalarType, isSpecifiedDirective, GraphQLDeprecatedDirective, specifiedRules, validate, buildSchema, Source, TokenKind, visit, isTypeSystemDefinitionNode, buildClientSchema, getNamedType, GraphQLString, GraphQLNonNull, GraphQLList, GraphQLID, GraphQLBoolean, GraphQLFloat, GraphQLInt, GraphQLObjectType, GraphQLInterfaceType, GraphQLInputObjectType, GraphQLDirective, GraphQLUnionType, GraphQLEnumType, GraphQLScalarType, isNamedType, getNullableType, isLeafType, GraphQLSchema, isSchema, isInputType, valueFromASTUntyped, isDirective, getDirectiveValues as getDirectiveValues$1, GraphQLSkipDirective, GraphQLIncludeDirective, typeFromAST, isAbstractType, isCompositeType, doTypesOverlap, getOperationAST, getOperationRootType } from 'graphql';
+import { parse, isNonNullType, GraphQLError, Kind, valueFromAST, print, isObjectType, isListType, isSpecifiedScalarType, isIntrospectionType, astFromValue, isInterfaceType, isUnionType, isInputObjectType, isEnumType, isScalarType, isSpecifiedDirective, GraphQLDeprecatedDirective, specifiedRules, validate, buildSchema, Source, TokenKind, visit, isTypeSystemDefinitionNode, buildClientSchema, getNamedType, GraphQLString, GraphQLNonNull, GraphQLList, GraphQLID, GraphQLBoolean, GraphQLFloat, GraphQLInt, GraphQLObjectType, GraphQLInterfaceType, GraphQLInputObjectType, GraphQLDirective, GraphQLUnionType, GraphQLEnumType, GraphQLScalarType, isNamedType, getNullableType, isLeafType, GraphQLSchema, isSchema, isInputType, valueFromASTUntyped, isDirective, getDirectiveValues, GraphQLSkipDirective, GraphQLIncludeDirective, typeFromAST, isAbstractType, isCompositeType, doTypesOverlap, getOperationAST, getOperationRootType } from 'graphql';
 import AggregateError from '@ardatan/aggregate-error';
 import { camelCase } from 'camel-case';
 
@@ -262,20 +262,16 @@ function getDirectives(schema, node, pathToDirectivesInExtensions = ['directives
     const result = {};
     astNodes.forEach(astNode => {
         if (astNode.directives) {
-            astNode.directives.forEach(directive => {
-                const schemaDirective = schemaDirectiveMap[directive.name.value];
+            astNode.directives.forEach(directiveNode => {
+                var _a;
+                const schemaDirective = schemaDirectiveMap[directiveNode.name.value];
                 if (schemaDirective) {
-                    const directiveValue = getDirectiveValues(schemaDirective, astNode);
                     if (schemaDirective.isRepeatable) {
-                        if (result[schemaDirective.name]) {
-                            result[schemaDirective.name] = result[schemaDirective.name].concat([directiveValue]);
-                        }
-                        else {
-                            result[schemaDirective.name] = [directiveValue];
-                        }
+                        result[schemaDirective.name] = (_a = result[schemaDirective.name]) !== null && _a !== void 0 ? _a : [];
+                        result[schemaDirective.name].push(getArgumentValues(schemaDirective, directiveNode));
                     }
                     else {
-                        result[schemaDirective.name] = directiveValue;
+                        result[schemaDirective.name] = getArgumentValues(schemaDirective, directiveNode);
                     }
                 }
             });
@@ -283,17 +279,6 @@ function getDirectives(schema, node, pathToDirectivesInExtensions = ['directives
     });
     return result;
 }
-// graphql-js getDirectiveValues does not handle repeatable directives
-function getDirectiveValues(directiveDef, node) {
-    if (node.directives) {
-        if (directiveDef.isRepeatable) {
-            const directiveNodes = node.directives.filter(directive => directive.name.value === directiveDef.name);
-            return directiveNodes.map(directiveNode => getArgumentValues(directiveDef, directiveNode));
-        }
-        const directiveNode = node.directives.find(directive => directive.name.value === directiveDef.name);
-        return getArgumentValues(directiveDef, directiveNode);
-    }
-}
 
 function parseDirectiveValue(value) {
     switch (value.kind) {
@@ -3767,11 +3752,11 @@ function collectFields(exeContext, runtimeType, selectionSet, fields, visitedFra
  * directives, where @skip has higher precedence than @include.
  */
 function shouldIncludeNode(exeContext, node) {
-    const skip = getDirectiveValues$1(GraphQLSkipDirective, node, exeContext.variableValues);
+    const skip = getDirectiveValues(GraphQLSkipDirective, node, exeContext.variableValues);
     if ((skip === null || skip === void 0 ? void 0 : skip.if) === true) {
         return false;
     }
-    const include = getDirectiveValues$1(GraphQLIncludeDirective, node, exeContext.variableValues);
+    const include = getDirectiveValues(GraphQLIncludeDirective, node, exeContext.variableValues);
     if ((include === null || include === void 0 ? void 0 : include.if) === false) {
         return false;
     }