graphql 16.13.1 → 16.14.0

package/utilities/valueFromAST.js

@@ -45,7 +45,11 @@ function valueFromAST(valueNode, type, variables) {
   if (valueNode.kind === _kinds.Kind.VARIABLE) {
     const variableName = valueNode.name.value;
 
-    if (variables == null || variables[variableName] === undefined) {
+    if (
+      variables == null ||
+      variables[variableName] === undefined ||
+      !hasOwnProperty(variables, variableName)
+    ) {
       // No valid return value.
       return;
     }
@@ -192,6 +196,12 @@ function valueFromAST(valueNode, type, variables) {
 function isMissingVariable(valueNode, variables) {
   return (
     valueNode.kind === _kinds.Kind.VARIABLE &&
-    (variables == null || variables[valueNode.name.value] === undefined)
+    (variables == null ||
+      variables[valueNode.name.value] === undefined ||
+      !hasOwnProperty(variables, valueNode.name.value))
   );
 }
+
+function hasOwnProperty(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+}

package/utilities/valueFromAST.mjs

@@ -39,7 +39,11 @@ export function valueFromAST(valueNode, type, variables) {
   if (valueNode.kind === Kind.VARIABLE) {
     const variableName = valueNode.name.value;
 
-    if (variables == null || variables[variableName] === undefined) {
+    if (
+      variables == null ||
+      variables[variableName] === undefined ||
+      !hasOwnProperty(variables, variableName)
+    ) {
       // No valid return value.
       return;
     }
@@ -179,6 +183,12 @@ export function valueFromAST(valueNode, type, variables) {
 function isMissingVariable(valueNode, variables) {
   return (
     valueNode.kind === Kind.VARIABLE &&
-    (variables == null || variables[valueNode.name.value] === undefined)
+    (variables == null ||
+      variables[valueNode.name.value] === undefined ||
+      !hasOwnProperty(variables, valueNode.name.value))
   );
 }
+
+function hasOwnProperty(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+}

package/validation/rules/KnownDirectivesRule.js

@@ -140,6 +140,10 @@ function getDirectiveLocationForASTPath(ancestors) {
         ? _directiveLocation.DirectiveLocation.INPUT_FIELD_DEFINITION
         : _directiveLocation.DirectiveLocation.ARGUMENT_DEFINITION;
     }
+
+    case _kinds.Kind.DIRECTIVE_DEFINITION:
+    case _kinds.Kind.DIRECTIVE_EXTENSION:
+      return _directiveLocation.DirectiveLocation.DIRECTIVE_DEFINITION;
     // Not reachable, all possible types have been considered.
 
     /* c8 ignore next */

package/validation/rules/KnownDirectivesRule.mjs

@@ -127,6 +127,10 @@ function getDirectiveLocationForASTPath(ancestors) {
         ? DirectiveLocation.INPUT_FIELD_DEFINITION
         : DirectiveLocation.ARGUMENT_DEFINITION;
     }
+
+    case Kind.DIRECTIVE_DEFINITION:
+    case Kind.DIRECTIVE_EXTENSION:
+      return DirectiveLocation.DIRECTIVE_DEFINITION;
     // Not reachable, all possible types have been considered.
 
     /* c8 ignore next */

package/validation/rules/UniqueDirectivesPerLocationRule.js

@@ -42,6 +42,7 @@ function UniqueDirectivesPerLocationRule(context) {
 
   const schemaDirectives = Object.create(null);
   const typeDirectivesMap = Object.create(null);
+  const directiveDirectivesMap = Object.create(null);
   return {
     // Many different AST nodes may contain directives. Rather than listing
     // them all, just listen for entering any node, and check to see if it
@@ -68,6 +69,17 @@ function UniqueDirectivesPerLocationRule(context) {
         if (seenDirectives === undefined) {
           typeDirectivesMap[typeName] = seenDirectives = Object.create(null);
         }
+      } else if (
+        node.kind === _kinds.Kind.DIRECTIVE_DEFINITION ||
+        node.kind === _kinds.Kind.DIRECTIVE_EXTENSION
+      ) {
+        const directiveName = node.name.value;
+        seenDirectives = directiveDirectivesMap[directiveName];
+
+        if (seenDirectives === undefined) {
+          directiveDirectivesMap[directiveName] = seenDirectives =
+            Object.create(null);
+        }
       } else {
         seenDirectives = Object.create(null);
       }

package/validation/rules/UniqueDirectivesPerLocationRule.mjs

@@ -35,6 +35,7 @@ export function UniqueDirectivesPerLocationRule(context) {
 
   const schemaDirectives = Object.create(null);
   const typeDirectivesMap = Object.create(null);
+  const directiveDirectivesMap = Object.create(null);
   return {
     // Many different AST nodes may contain directives. Rather than listing
     // them all, just listen for entering any node, and check to see if it
@@ -58,6 +59,17 @@ export function UniqueDirectivesPerLocationRule(context) {
         if (seenDirectives === undefined) {
           typeDirectivesMap[typeName] = seenDirectives = Object.create(null);
         }
+      } else if (
+        node.kind === Kind.DIRECTIVE_DEFINITION ||
+        node.kind === Kind.DIRECTIVE_EXTENSION
+      ) {
+        const directiveName = node.name.value;
+        seenDirectives = directiveDirectivesMap[directiveName];
+
+        if (seenDirectives === undefined) {
+          directiveDirectivesMap[directiveName] = seenDirectives =
+            Object.create(null);
+        }
       } else {
         seenDirectives = Object.create(null);
       }

package/validation/rules/ValuesOfCorrectTypeRule.js

@@ -30,18 +30,7 @@ var _definition = require('../../type/definition.js');
  * See https://spec.graphql.org/draft/#sec-Values-of-Correct-Type
  */
 function ValuesOfCorrectTypeRule(context) {
-  let variableDefinitions = {};
   return {
-    OperationDefinition: {
-      enter() {
-        variableDefinitions = {};
-      },
-    },
-
-    VariableDefinition(definition) {
-      variableDefinitions[definition.variable.name.value] = definition;
-    },
-
     ListValue(node) {
       // Note: TypeInfo will traverse into a list's item type, so look to the
       // parent input type to check if it is a list.

package/validation/rules/ValuesOfCorrectTypeRule.mjs

@@ -24,18 +24,7 @@ import {
  * See https://spec.graphql.org/draft/#sec-Values-of-Correct-Type
  */
 export function ValuesOfCorrectTypeRule(context) {
-  let variableDefinitions = {};
   return {
-    OperationDefinition: {
-      enter() {
-        variableDefinitions = {};
-      },
-    },
-
-    VariableDefinition(definition) {
-      variableDefinitions[definition.variable.name.value] = definition;
-    },
-
     ListValue(node) {
       // Note: TypeInfo will traverse into a list's item type, so look to the
       // parent input type to check if it is a list.

package/version.js

@@ -10,7 +10,7 @@ exports.versionInfo = exports.version = void 0;
 /**
  * A string containing the version of the GraphQL.js library
  */
-const version = '16.13.1';
+const version = '16.14.0';
 /**
  * An object containing the components of the GraphQL.js version string
  */
@@ -18,8 +18,8 @@ const version = '16.13.1';
 exports.version = version;
 const versionInfo = Object.freeze({
   major: 16,
-  minor: 13,
-  patch: 1,
+  minor: 14,
+  patch: 0,
   preReleaseTag: null,
 });
 exports.versionInfo = versionInfo;

package/version.mjs

@@ -4,14 +4,14 @@
 /**
  * A string containing the version of the GraphQL.js library
  */
-export const version = '16.13.1';
+export const version = '16.14.0';
 /**
  * An object containing the components of the GraphQL.js version string
  */
 
 export const versionInfo = Object.freeze({
   major: 16,
-  minor: 13,
-  patch: 1,
+  minor: 14,
+  patch: 0,
   preReleaseTag: null,
 });