Adjust export.sh script and commit to graphql-js v16.13.2

Signed-off-by: Steve Coffman <steve@khanacademy.org>

Author: StevenACoffman

readme.md

@@ -3,7 +3,7 @@ gqlparser [![CircleCI](https://badgen.net/circleci/github/vektah/gqlparser/maste
 
 This is a parser for graphql, written to mirror the graphql-js reference implementation as closely while remaining idiomatic and easy to use.
 
-spec target: [October 2021](https://spec.graphql.org/October2021/) and [select portions of the Draft](https://spec.graphql.org/draft/), based on the graphql-js reference implementation [graphql-js v16.10.0](https://github.com/graphql/graphql-js/releases/tag/v16.10.0). This includes Schema definition language, block strings as descriptions, error paths & extension, etc. If there is a spec update or [new release](https://github.com/graphql/graphql-spec/releases), please follow [this process to update](./validator/imported/readme.md) and submit a PR.
+spec target: [September 2025](https://spec.graphql.org/October2021/) and [select portions of the Draft](https://spec.graphql.org/draft/), based on the graphql-js reference implementation [graphql-js v16.13.2](https://github.com/graphql/graphql-js/releases/tag/v16.13.2). This includes Schema definition language, block strings as descriptions, error paths & extension, etc. If there is a spec update or [new release](https://github.com/graphql/graphql-spec/releases), please follow [this process to update](./validator/imported/readme.md) and submit a PR.
 
 This parser is used by [gqlgen](https://github.com/99designs/gqlgen), and it should be reasonably stable.
 

validator/imported/export.js

@@ -131,7 +131,10 @@ function exportSpecDefinitions() {
     expectSDLValidationErrors(schema, rule, sdlStr) {
       return resultProxy("expectSDLValidationErrors", {
         toDeepEqual(expected) {
-          // ignore now...
+          // ignore now...  pluggable named-rule system here is for
+          // query/operation validation only.
+          // SDL Validation happens imperatively in ValidateSchemaDocument in
+          // schema.go, at schema load time so error messages will diverge.
           // console.warn(rule.name, sdlStr, JSON.stringify(expected, null, 2));
         },
       });
@@ -209,7 +212,7 @@ function exportSpecDefinitions() {
   let schemaList = schemas.map((s) => printSchema(s));
 
   schemaList[0] += `
-# injected becuase upstream spec is missing some types
+# injected because upstream spec is missing some types
 extend type QueryRoot {
     field: T
     f1: Type

validator/imported/export.sh

@@ -4,8 +4,9 @@ REPO_DIR=./graphql-js
 EXPORTER_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 cd "$EXPORTER_ROOT" || exit
-
-GIT_REF=origin/main
+# graphql-js default branch is not main anymore
+MAIN="16.x.x"
+GIT_REF="origin/${MAIN}"
 
 if [[ -f "$EXPORTER_ROOT/graphql-js-commit.log" ]] ; then
   GIT_REF=$(cat "$EXPORTER_ROOT/graphql-js-commit.log")
@@ -15,7 +16,7 @@ echo "$GIT_REF"
 if [[ -d "$REPO_DIR" ]] ; then
     echo "fetching graphql-js with ${GIT_REF}"
     cd "$REPO_DIR" || exit
-    git fetch origin main
+    git fetch origin "${MAIN}"
     git checkout "$GIT_REF"
     git reset --hard
 else

validator/imported/graphql-js-commit.log

@@ -1 +1 @@
-e2457b33e928f4ec8b22e96a6dc6cb2808c03dfa
+123e958de1362eef098c30e917b51981c484729e

validator/imported/readme.md

@@ -8,7 +8,7 @@ Direct modifications should not be made to most of this directory, instead take
 # update to latest
 $ rm graphql-js-commit.log && ./export.sh
 
-# re-generate with known revision
+# re-generate with known revision set in graphql-js-commit.log
 $ ./export.sh
 ```
 

validator/rules/values_of_correct_type.go

@@ -153,16 +153,8 @@ func ruleFuncValuesOfCorrectType(observers *Events, addError AddErrFunc, disable
 							return
 						}
 
-						isVariable := fieldValue.Kind == ast.Variable
-						if isVariable {
-							variableName := fieldValue.VariableDefinition.Variable
-							isNullableVariable := !fieldValue.VariableDefinition.Type.NonNull
-							if isNullableVariable {
-								addError(
-									Message(`Variable "%s" must be non-nullable to be used for OneOf Input Object "%s".`, variableName, value.Definition.Name),
-									At(fieldValue.Position),
-								)
-							}
+						if fieldValue.Kind == ast.Variable {
+							return
 						}
 					}()
 				}

validator/rules/variables_in_allowed_position.go

@@ -42,5 +42,33 @@ var VariablesInAllowedPositionRule = Rule{
 				)
 			}
 		})
+
+		observers.OnValue(func(walker *Walker, value *ast.Value) {
+			if value.Kind != ast.ObjectValue || value.Definition == nil {
+				return
+			}
+			if value.Definition.Directives.ForName("oneOf") == nil {
+				return
+			}
+
+			for _, child := range value.Children {
+				fieldValue := child.Value
+				if fieldValue == nil || fieldValue.Kind != ast.Variable || fieldValue.VariableDefinition == nil {
+					continue
+				}
+				if !fieldValue.VariableDefinition.Type.NonNull {
+					addError(
+						Message(
+							`Variable "%s" is of type "%s" but must be non-nullable to be used for OneOf Input Object "%s".`,
+							fieldValue,
+							fieldValue.VariableDefinition.Type.String(),
+							value.Definition.Name,
+						),
+						At(fieldValue.VariableDefinition.Position),
+						At(fieldValue.Position),
+					)
+				}
+			}
+		})
 	},
 }