integrate logic from graphql#4519

Author: yaacovCR

src/validation/rules/ValuesOfCorrectTypeRule.ts

@@ -116,7 +116,12 @@ export function ValuesOfCorrectTypeRule(
     EnumValue: (node) => isValidValueNode(context, node),
     IntValue: (node) => isValidValueNode(context, node),
     FloatValue: (node) => isValidValueNode(context, node),
-    StringValue: (node, key) => key !== 'description' && isValidValueNode(context, node),
+    // Descriptions are string values that would not validate according
+    // to the below logic, but since (per the specification) descriptions must
+    // not affect validation, they are ignored entirely when visiting the AST
+    // and do not require special handling.
+    // See https://spec.graphql.org/draft/#sec-Descriptions
+    StringValue: (node) => isValidValueNode(context, node),
     BooleanValue: (node) => isValidValueNode(context, node),
   };
 }

src/validation/validate.ts

@@ -1,9 +1,10 @@
 import { devAssert } from '../jsutils/devAssert';
+import { mapValue } from '../jsutils/mapValue';
 import type { Maybe } from '../jsutils/Maybe';
 
 import { GraphQLError } from '../error/GraphQLError';
 
-import type { DocumentNode } from '../language/ast';
+import { type DocumentNode, QueryDocumentKeys } from '../language/ast';
 import { visit, visitInParallel } from '../language/visitor';
 
 import type { GraphQLSchema } from '../type/schema';
@@ -15,6 +16,13 @@ import { specifiedRules, specifiedSDLRules } from './specifiedRules';
 import type { SDLValidationRule, ValidationRule } from './ValidationContext';
 import { SDLValidationContext, ValidationContext } from './ValidationContext';
 
+// Per the specification, descriptions must not affect validation.
+// See https://spec.graphql.org/draft/#sec-Descriptions
+const QueryDocumentKeysToValidate = mapValue(
+  QueryDocumentKeys,
+  (keys: ReadonlyArray<string>) => keys.filter((key) => key !== 'description'),
+);
+
 /**
  * Implements the "Validation" section of the spec.
  *
@@ -76,7 +84,11 @@ export function validate(
 
   // Visit the whole document with each instance of all provided rules.
   try {
-    visit(documentAST, visitWithTypeInfo(typeInfo, visitor));
+    visit(
+      documentAST,
+      visitWithTypeInfo(typeInfo, visitor),
+      QueryDocumentKeysToValidate,
+    );
   } catch (e) {
     if (e !== abortObj) {
       throw e;