Fixes unincluded args to use default values

Author: NeedleInAJayStack

Sources/GraphQL/Execution/Execute.swift

@@ -594,7 +594,7 @@ func shouldIncludeNode(exeContext: ExecutionContext, directives: [Directive] = [
         let skip = try getArgumentValues(
             argDefs: GraphQLSkipDirective.args,
             argASTs: skipAST.arguments,
-            variableValues: exeContext.variableValues
+            variables: exeContext.variableValues
         )
 
         if skip["if"] == .bool(true) {
@@ -606,7 +606,7 @@ func shouldIncludeNode(exeContext: ExecutionContext, directives: [Directive] = [
         let include = try getArgumentValues(
             argDefs: GraphQLIncludeDirective.args,
             argASTs: includeAST.arguments,
-            variableValues: exeContext.variableValues
+            variables: exeContext.variableValues
         )
 
         if include["if"] == .bool(false) {
@@ -685,7 +685,7 @@ public func resolveField(
     let args = try getArgumentValues(
         argDefs: fieldDef.args,
         argASTs: fieldAST.arguments,
-        variableValues: exeContext.variableValues
+        variables: exeContext.variableValues
     )
 
     // The resolve func's optional third argument is a context value that

Sources/GraphQL/Execution/Values.swift

@@ -26,34 +26,32 @@ func getVariableValues(schema: GraphQLSchema, definitionASTs: [VariableDefinitio
  * Prepares an object map of argument values given a list of argument
  * definitions and list of argument AST nodes.
  */
-func getArgumentValues(argDefs: [GraphQLArgumentDefinition], argASTs: [Argument]?, variableValues: [String: Map] = [:]) throws -> Map {
+func getArgumentValues(argDefs: [GraphQLArgumentDefinition], argASTs: [Argument]?, variables: [String: Map] = [:]) throws -> Map {
     guard let argASTs = argASTs else {
         return [:]
     }
 
     let argASTMap = argASTs.keyMap({ $0.name.value })
-
-    return try argDefs.reduce([:]) { result, argDef in
-        var result = result
-        let name = argDef.name
-        let argAST = argASTMap[name]
-        
-        if let argAST = argAST {
-            let valueAST = argAST.value
-
-            let value = try valueFromAST(
-                valueAST: valueAST,
+    
+    var args = OrderedDictionary<String, Map>()
+    for argDef in argDefs {
+        let argName = argDef.name
+        if let argAST = argASTMap[argName] {
+            args[argName] = try valueFromAST(
+                valueAST: argAST.value,
                 type: argDef.type,
-                variables: variableValues
+                variables: variables
             )
-
-            result[name] = value
         } else {
-            result[name] = .null
+            // If AST doesn't contain field, it is undefined
+            if let defaultValue = argDef.defaultValue {
+                args[argName] = defaultValue
+            } else {
+                args[argName] = .undefined
+            }
         }
-
-        return result
     }
+    return .dictionary(args)
 }
 
 

Sources/GraphQL/Subscription/Subscribe.swift

@@ -195,7 +195,7 @@ func executeSubscription(
 
     // Build a map of arguments from the field.arguments AST, using the
     // variables scope to fulfill any variable references.
-    let args = try getArgumentValues(argDefs: fieldDef.args, argASTs: fieldNode.arguments, variableValues: context.variableValues)
+    let args = try getArgumentValues(argDefs: fieldDef.args, argASTs: fieldNode.arguments, variables: context.variableValues)
 
     // The resolve function's optional third argument is a context value that
     // is provided to every resolve function within an execution. It is commonly