Ensure null values are not provided in input objects

graphql · Aug 11, 2015 · 44c9daf · 44c9daf
1 parent 7bb34be
commit 44c9daf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/execution/values.js b/src/execution/values.js
@@ -132,7 +132,12 @@ function coerceValue(type: GraphQLInputType, value: any): any {
     return Object.keys(fields).reduce((obj, fieldName) => {
       var field = fields[fieldName];
       var fieldValue = coerceValue(field.type, value[fieldName]);
-      obj[fieldName] = fieldValue === null ? field.defaultValue : fieldValue;
+      if (fieldValue === null && field.defaultValue !== undefined) {
+        fieldValue = field.defaultValue;
+      }
+      if (fieldValue !== null) {
+        obj[fieldName] = fieldValue;
+      }
       return obj;
     }, {});
   }

diff --git a/src/utilities/valueFromAST.js b/src/utilities/valueFromAST.js
@@ -95,7 +95,12 @@ export function valueFromAST(
       var fieldAST = fieldASTs[fieldName];
       var fieldValue =
         valueFromAST(fieldAST && fieldAST.value, field.type, variables);
-      obj[fieldName] = fieldValue === null ? field.defaultValue : fieldValue;
+      if (fieldValue === null && field.defaultValue !== undefined) {
+        fieldValue = field.defaultValue;
+      }
+      if (fieldValue !== null) {
+        obj[fieldName] = fieldValue;
+      }
       return obj;
     }, {});
   }