From 4e7972ca5cb47e3bddb71bcd7e5ed8cdf6bd4682 Mon Sep 17 00:00:00 2001 From: Tobe O Date: Wed, 14 Aug 2019 11:58:19 -0400 Subject: [PATCH] coerce variable values the same as other values --- graphql_server/CHANGELOG.md | 6 ++++++ graphql_server/lib/graphql_server.dart | 17 +---------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/graphql_server/CHANGELOG.md b/graphql_server/CHANGELOG.md index 25c38458..f6a1d166 100644 --- a/graphql_server/CHANGELOG.md +++ b/graphql_server/CHANGELOG.md @@ -1,3 +1,9 @@ +# 1.1.0 +* Updates for `package:graphql_parser@1.2.0`. +* Now that variables are `InputValueContext` descendants, handle them the +same way as other values in `coerceArgumentValues`. TLDR - Removed +now-obsolete, variable-specific logic in `coerceArgumentValues`. + # 1.0.1 * Fix a bug where `globalVariables` were not being properly passed to field resolvers. diff --git a/graphql_server/lib/graphql_server.dart b/graphql_server/lib/graphql_server.dart index 6966bd47..2ff007ff 100644 --- a/graphql_server/lib/graphql_server.dart +++ b/graphql_server/lib/graphql_server.dart @@ -404,22 +404,7 @@ class GraphQL { var argumentValue = argumentValues .firstWhere((a) => a.name == argumentName, orElse: () => null); - if (argumentValue?.value is VariableContext) { - var variableName = (argumentValue.value as VariableContext).name; - var variableValue = variableValues[variableName]; - - if (variableValues.containsKey(variableName)) { - coercedValues[argumentName] = variableValue; - } else if (defaultValue != null || argumentDefinition.defaultsToNull) { - coercedValues[argumentName] = defaultValue; - } else if (argumentType is GraphQLNonNullableType) { - throw GraphQLException.fromSourceSpan( - 'Missing value for argument "$argumentName" of field "$fieldName".', - argumentValue.value.span); - } else { - continue; - } - } else if (argumentValue == null) { + if (argumentValue == null) { if (defaultValue != null || argumentDefinition.defaultsToNull) { coercedValues[argumentName] = defaultValue; } else if (argumentType is GraphQLNonNullableType) {