graphql 14.0.2 → 14.1.0

package/utilities/coerceValue.js.flow

@@ -8,6 +8,7 @@
  */
 
 import { forEach, isCollection } from 'iterall';
+import objectValues from '../polyfills/objectValues';
 import inspect from '../jsutils/inspect';
 import isInvalid from '../jsutils/isInvalid';
 import orList from '../jsutils/orList';
@@ -147,58 +148,53 @@ export function coerceValue(
     const fields = type.getFields();
 
     // Ensure every defined field is valid.
-    for (const fieldName in fields) {
-      if (hasOwnProperty.call(fields, fieldName)) {
-        const field = fields[fieldName];
-        const fieldValue = value[fieldName];
-        if (isInvalid(fieldValue)) {
-          if (!isInvalid(field.defaultValue)) {
-            coercedValue[fieldName] = field.defaultValue;
-          } else if (isNonNullType(field.type)) {
-            errors = add(
-              errors,
-              coercionError(
-                `Field ${printPath(atPath(path, fieldName))} of required ` +
-                  `type ${inspect(field.type)} was not provided`,
-                blameNode,
-              ),
-            );
-          }
-        } else {
-          const coercedField = coerceValue(
-            fieldValue,
-            field.type,
-            blameNode,
-            atPath(path, fieldName),
-          );
-          if (coercedField.errors) {
-            errors = add(errors, coercedField.errors);
-          } else if (!errors) {
-            coercedValue[fieldName] = coercedField.value;
-          }
-        }
-      }
-    }
-
-    // Ensure every provided field is defined.
-    for (const fieldName in value) {
-      if (hasOwnProperty.call(value, fieldName)) {
-        if (!fields[fieldName]) {
-          const suggestions = suggestionList(fieldName, Object.keys(fields));
-          const didYouMean =
-            suggestions.length !== 0
-              ? `did you mean ${orList(suggestions)}?`
-              : undefined;
+    for (const field of objectValues(fields)) {
+      const fieldValue = value[field.name];
+      if (isInvalid(fieldValue)) {
+        if (!isInvalid(field.defaultValue)) {
+          coercedValue[field.name] = field.defaultValue;
+        } else if (isNonNullType(field.type)) {
           errors = add(
             errors,
             coercionError(
-              `Field "${fieldName}" is not defined by type ${type.name}`,
+              `Field ${printPath(atPath(path, field.name))} of required ` +
+                `type ${inspect(field.type)} was not provided`,
               blameNode,
-              path,
-              didYouMean,
             ),
           );
         }
+      } else {
+        const coercedField = coerceValue(
+          fieldValue,
+          field.type,
+          blameNode,
+          atPath(path, field.name),
+        );
+        if (coercedField.errors) {
+          errors = add(errors, coercedField.errors);
+        } else if (!errors) {
+          coercedValue[field.name] = coercedField.value;
+        }
+      }
+    }
+
+    // Ensure every provided field is defined.
+    for (const fieldName of Object.keys(value)) {
+      if (!fields[fieldName]) {
+        const suggestions = suggestionList(fieldName, Object.keys(fields));
+        const didYouMean =
+          suggestions.length !== 0
+            ? `did you mean ${orList(suggestions)}?`
+            : undefined;
+        errors = add(
+          errors,
+          coercionError(
+            `Field "${fieldName}" is not defined by type ${type.name}`,
+            blameNode,
+            path,
+            didYouMean,
+          ),
+        );
       }
     }
 
@@ -253,5 +249,3 @@ function printPath(path) {
   }
   return pathStr ? 'value' + pathStr : '';
 }
-
-const hasOwnProperty = Object.prototype.hasOwnProperty;

package/utilities/coerceValue.mjs

@@ -6,9 +6,10 @@ function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterat
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 import { forEach, isCollection } from 'iterall';
+import objectValues from '../polyfills/objectValues';
 import inspect from '../jsutils/inspect';
 import isInvalid from '../jsutils/isInvalid';
 import orList from '../jsutils/orList';
@@ -104,39 +105,58 @@ export function coerceValue(value, type, blameNode, path) {
     var _coercedValue = {};
     var fields = type.getFields(); // Ensure every defined field is valid.
 
-    for (var fieldName in fields) {
-      if (hasOwnProperty.call(fields, fieldName)) {
-        var field = fields[fieldName];
-        var fieldValue = value[fieldName];
+    var _iteratorNormalCompletion = true;
+    var _didIteratorError = false;
+    var _iteratorError = undefined;
+
+    try {
+      for (var _iterator = objectValues(fields)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var field = _step.value;
+        var fieldValue = value[field.name];
 
         if (isInvalid(fieldValue)) {
           if (!isInvalid(field.defaultValue)) {
-            _coercedValue[fieldName] = field.defaultValue;
+            _coercedValue[field.name] = field.defaultValue;
           } else if (isNonNullType(field.type)) {
-            _errors = add(_errors, coercionError("Field ".concat(printPath(atPath(path, fieldName)), " of required ") + "type ".concat(inspect(field.type), " was not provided"), blameNode));
+            _errors = add(_errors, coercionError("Field ".concat(printPath(atPath(path, field.name)), " of required ") + "type ".concat(inspect(field.type), " was not provided"), blameNode));
           }
         } else {
-          var coercedField = coerceValue(fieldValue, field.type, blameNode, atPath(path, fieldName));
+          var coercedField = coerceValue(fieldValue, field.type, blameNode, atPath(path, field.name));
 
           if (coercedField.errors) {
             _errors = add(_errors, coercedField.errors);
           } else if (!_errors) {
-            _coercedValue[fieldName] = coercedField.value;
+            _coercedValue[field.name] = coercedField.value;
           }
         }
+      } // Ensure every provided field is defined.
+
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
+          _iterator.return();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
       }
-    } // Ensure every provided field is defined.
+    }
 
+    var _arr = Object.keys(value);
 
-    for (var _fieldName in value) {
-      if (hasOwnProperty.call(value, _fieldName)) {
-        if (!fields[_fieldName]) {
-          var _suggestions = suggestionList(_fieldName, Object.keys(fields));
+    for (var _i = 0; _i < _arr.length; _i++) {
+      var fieldName = _arr[_i];
 
-          var _didYouMean = _suggestions.length !== 0 ? "did you mean ".concat(orList(_suggestions), "?") : undefined;
+      if (!fields[fieldName]) {
+        var _suggestions = suggestionList(fieldName, Object.keys(fields));
 
-          _errors = add(_errors, coercionError("Field \"".concat(_fieldName, "\" is not defined by type ").concat(type.name), blameNode, path, _didYouMean));
-        }
+        var _didYouMean = _suggestions.length !== 0 ? "did you mean ".concat(orList(_suggestions), "?") : undefined;
+
+        _errors = add(_errors, coercionError("Field \"".concat(fieldName, "\" is not defined by type ").concat(type.name), blameNode, path, _didYouMean));
       }
     }
 
@@ -190,6 +210,4 @@ function printPath(path) {
   }
 
   return pathStr ? 'value' + pathStr : '';
-}
-
-var hasOwnProperty = Object.prototype.hasOwnProperty;
+}

package/utilities/concatAST.js

@@ -11,7 +11,7 @@ exports.concatAST = concatAST;
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 
 /**

package/utilities/concatAST.mjs

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  */
 
 /**