Parsed Maps include null/undefined values

Author: NeedleInAJayStack

Sources/GraphQL/Execution/Values.swift

@@ -35,16 +35,20 @@ func getArgumentValues(argDefs: [GraphQLArgumentDefinition], argASTs: [Argument]
     return try argDefs.reduce([:]) { result, argDef in
         var result = result
         let name = argDef.name
-        let valueAST = argASTMap[name]?.value
+        let argAST = argASTMap[name]
+        
+        if let argAST = argAST {
+            let valueAST = argAST.value
 
-        let value = try valueFromAST(
-            valueAST: valueAST,
-            type: argDef.type,
-            variables: variableValues
-        ) ?? argDef.defaultValue
+            let value = try valueFromAST(
+                valueAST: valueAST,
+                type: argDef.type,
+                variables: variableValues
+            )
 
-        if let value = value {
             result[name] = value
+        } else {
+            result[name] = .null
         }
 
         return result
@@ -75,7 +79,7 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
     if errors.isEmpty {
         if input == .null {
             if let defaultValue = definitionAST.defaultValue {
-                return try valueFromAST(valueAST: defaultValue, type: inputType)!
+                return try valueFromAST(valueAST: defaultValue, type: inputType)
             }
             else if !(inputType is GraphQLNonNull) {
                 return .null

Sources/GraphQL/Map/Map.swift

@@ -915,12 +915,12 @@ extension Map {
             if debug {
                 indentLevel += 1
             }
+            
+            let filtered = dictionary.filter({ item in
+                !item.value.isUndefined
+            })
 
-            for (key, value) in dictionary.sorted(by: {$0.0 < $1.0}) {
-                guard !value.isUndefined else {
-                    continue // Do not serialize undefined values
-                }
-                
+            for (key, value) in filtered.sorted(by: {$0.0 < $1.0}) {
                 if debug {
                     string += "\n"
                     string += indent()
@@ -929,7 +929,7 @@ extension Map {
                     string += escape(key) + ":" + serialize(map: value)
                 }
 
-                if index != dictionary.count - 1 {
+                if index != filtered.count - 1 {
                     if debug {
                         string += ", "
                     } else {

Sources/GraphQL/Utilities/ValueFromAST.swift

@@ -17,18 +17,14 @@ import OrderedCollections
  * | Enum Value           | .string       |
  *
  */
-func valueFromAST(valueAST: Value?, type: GraphQLInputType, variables: [String: Map] = [:]) throws -> Map? {
+func valueFromAST(valueAST: Value, type: GraphQLInputType, variables: [String: Map] = [:]) throws -> Map {
     if let nonNullType = type as? GraphQLNonNull {
         // Note: we're not checking that the result of valueFromAST is non-null.
         // We're assuming that this query has been validated and the value used
         // here is of the correct type.
         return try valueFromAST(valueAST: valueAST, type: nonNullType.ofType as! GraphQLInputType, variables: variables)
     }
 
-    guard let valueAST = valueAST else {
-        return nil
-    }
-
     if let variable = valueAST as? Variable {
         let variableName = variable.name.value
 
@@ -38,7 +34,11 @@ func valueFromAST(valueAST: Value?, type: GraphQLInputType, variables: [String:
         // Note: we're not doing any checking that this variable is correct. We're
         // assuming that this query has been validated and the variable usage here
         // is of the correct type.
-        return variables[variableName]
+        if let variable = variables[variableName] {
+            return variable
+        } else {
+            return .null
+        }
     }
 
     if let list = type as? GraphQLList {
@@ -50,41 +50,43 @@ func valueFromAST(valueAST: Value?, type: GraphQLInputType, variables: [String:
                     valueAST: $0,
                     type: itemType as! GraphQLInputType,
                     variables: variables
-                )!
+                )
             }))
         }
 
-        return try [valueFromAST(valueAST: valueAST, type: itemType as! GraphQLInputType, variables: variables)!]
+        return try [valueFromAST(valueAST: valueAST, type: itemType as! GraphQLInputType, variables: variables)]
     }
 
     if let objectType = type as? GraphQLInputObjectType {
         guard let objectValue = valueAST as? ObjectValue else {
-            return nil
+            throw GraphQLError(message: "Must be object type")
         }
 
         let fields = objectType.fields
-
         let fieldASTs = objectValue.fields.keyMap({ $0.name.value })
 
-        return try .dictionary(fields.keys.reduce([:] as OrderedDictionary<String, Map>) { obj, fieldName in
+        return try .dictionary(fields.keys.reduce(OrderedDictionary<String, Map>()) { obj, fieldName in
             var obj = obj
-            let field = fields[fieldName]
+            let field = fields[fieldName]!
             let fieldAST = fieldASTs[fieldName]
-            guard fieldAST != nil else {
-                obj[fieldName] = .undefined
-                return obj
-            }
-            
-            var fieldValue = try valueFromAST(
-                valueAST: fieldAST?.value,
-                type: field!.type,
-                variables: variables
-            )
+            if let fieldAST = fieldAST {
+                let fieldValue = try valueFromAST(
+                    valueAST: fieldAST.value,
+                    type: field.type,
+                    variables: variables
+                )
 
-            if fieldValue == .null {
-                fieldValue = field.flatMap({ $0.defaultValue.map({ .string($0) }) })
+                if fieldValue == .null {
+                    if let defaultValue = field.defaultValue {
+                        obj[fieldName] = .string(defaultValue)
+                    } else {
+                        obj[fieldName] = .null
+                    }
+                } else {
+                    obj[fieldName] = fieldValue
+                }
             } else {
-                obj[fieldName] = fieldValue
+                obj[fieldName] = .undefined
             }
 
             return obj
@@ -97,9 +99,5 @@ func valueFromAST(valueAST: Value?, type: GraphQLInputType, variables: [String:
 
     let parsed = try type.parseLiteral(valueAST: valueAST)
 
-    guard parsed != .null else {
-        return nil
-    }
-    
     return parsed
 }