Merge branch 'master' into digits

Author: bmhatfield

ast/argument.go

@@ -43,3 +43,12 @@ func (a ArgumentsDefinition) Get(name string) *InputValueDefinition {
 	}
 	return nil
 }
+
+// Names returns a slice of ArgumentsDefinition names.
+func (a ArgumentsDefinition) Names() []string {
+	names := make([]string, len(a))
+	for i, f := range a {
+		names[i] = f.Name.Name
+	}
+	return names
+}

example/federation/integration/gateway/package-lock.json

@@ -5270,8 +5270,8 @@ func TestCircularFragmentMaxDepth(t *testing.T) {
 	              }
 	          `,
 			ExpectedErrors: []*gqlerrors.QueryError{{
-				Message: `Cannot spread fragment "X" within itself via Y.`,
-				Rule:    "NoFragmentCycles",
+				Message: `Cannot spread fragment "X" within itself via "Y".`,
+				Rule:    "NoFragmentCyclesRule",
 				Locations: []gqlerrors.Location{
 					{Line: 7, Column: 20},
 					{Line: 10, Column: 20},

graphql_test.go

@@ -56,7 +56,7 @@ func ResolveType(t ast.Type, resolver Resolver) (ast.Type, *errors.QueryError) {
 		refT := resolver(t.Name)
 		if refT == nil {
 			err := errors.Errorf("Unknown type %q.", t.Name)
-			err.Rule = "KnownTypeNames"
+			err.Rule = "KnownTypeNamesRule"
 			err.Locations = []errors.Location{t.Loc}
 			return nil, err
 		}

internal/common/types.go

@@ -12,7 +12,7 @@ func makeSuggestion(prefix string, options []string, input string) string {
 	distances := make(map[string]int)
 	for _, opt := range options {
 		distance := levenshteinDistance(input, opt)
-		threshold := max(len(input)/2, max(len(opt)/2, 1))
+		threshold := max(len(input)/2, max(len(opt)/2, 2))
 		if distance < threshold {
 			selected = append(selected, opt)
 			distances[opt] = distance

internal/validation/suggestion.go

@@ -0,0 +1,29 @@
+# graphql-js testdata
+
+Test cases are generated here by extracting them from [graphql-js] into JSON that we can use to drive Go tests.
+
+## Usage
+
+To update the testdata, run the following command within the `testdata` directory:
+
+```sh
+go generate .
+```
+
+## How it works
+
+A Node.js project is used to pull in graphql-js as a dependency, and automatically patch that via `patch-package`. These
+patches replace the `mocha` test functions `describe`, `it`, assertions and the test `harness`. This allows the
+expectations to be captured, and written to a JSON file. These test cases in the JSON file are then used to drive the Go
+tests.
+
+## Updating patches
+
+With changes to [graphql-js], the patches may need to be updated. To do this, update the `graphql` dependency under
+`node_modules`, and sync the patches with the following command:
+
+```sh
+npm run create-patches
+```
+
+[graphql-js]: https://github.com/graphql/graphql-js

internal/validation/testdata/README.md

@@ -0,0 +1,66 @@
+import * as fs from 'node:fs';
+import { createHash } from 'crypto';
+import { printSchema } from 'graphql/src/utilities/printSchema.js';
+import { schemas, testCases } from 'graphql/src/validation/__tests__/harness.js';
+
+// TODO: Fix test failures.
+// require('graphql/src/validation/__tests__/ExecutableDefinitions-test');
+import 'graphql/src/validation/__tests__/FieldsOnCorrectTypeRule-test.js';
+import 'graphql/src/validation/__tests__/FragmentsOnCompositeTypesRule-test.js';
+import 'graphql/src/validation/__tests__/KnownArgumentNamesRule-test.js';
+import 'graphql/src/validation/__tests__/KnownDirectivesRule-test.js';
+import 'graphql/src/validation/__tests__/KnownFragmentNamesRule-test.js';
+import 'graphql/src/validation/__tests__/KnownTypeNamesRule-test.js';
+import 'graphql/src/validation/__tests__/LoneAnonymousOperationRule-test.js';
+import 'graphql/src/validation/__tests__/NoFragmentCyclesRule-test.js';
+import 'graphql/src/validation/__tests__/NoUndefinedVariablesRule-test.js';
+import 'graphql/src/validation/__tests__/NoUnusedFragmentsRule-test.js';
+import 'graphql/src/validation/__tests__/NoUnusedVariablesRule-test.js';
+import 'graphql/src/validation/__tests__/OverlappingFieldsCanBeMergedRule-test.js';
+import 'graphql/src/validation/__tests__/PossibleFragmentSpreadsRule-test.js';
+import 'graphql/src/validation/__tests__/ProvidedRequiredArgumentsRule-test.js';
+import 'graphql/src/validation/__tests__/ScalarLeafsRule-test.js';
+// TODO: Add support for subscriptions.
+// require('graphql/src/validation/__tests__/SingleFieldSubscriptions-test.js');
+import 'graphql/src/validation/__tests__/UniqueArgumentNamesRule-test.js';
+import 'graphql/src/validation/__tests__/UniqueDirectivesPerLocationRule-test.js';
+import 'graphql/src/validation/__tests__/UniqueFragmentNamesRule-test.js';
+import 'graphql/src/validation/__tests__/UniqueInputFieldNamesRule-test.js';
+import 'graphql/src/validation/__tests__/UniqueOperationNamesRule-test.js';
+import 'graphql/src/validation/__tests__/UniqueVariableNamesRule-test.js';
+// TODO: Fix test failures.
+// require('graphql/src/validation/__tests__/ValuesofCorrectType-test');
+import 'graphql/src/validation/__tests__/VariablesAreInputTypesRule-test.js';
+// TODO: Fix test failures.
+// require('graphql/src/validation/__tests__/VariablesDefaultValueAllowed-test');
+import 'graphql/src/validation/__tests__/VariablesInAllowedPositionRule-test.js';
+
+// Schema index in the source array can be unstable, as its dependent on the order they are used in the registered test
+// files. The SHA256 of the schema will change if there are any changes to the content, but is a better reference than
+// the schema indexes all changing when a new schema is inserted.
+let s = schemas().map(s => {
+  const sdl = printSchema(s)
+  const id = createHash('sha256').update(sdl).digest('base64');
+  const v: { id: string; sdl: string; } = {id: id, sdl: sdl};
+  return v;
+});
+
+const tests = testCases().map(c => {
+  const schema = s[c.schema];
+  return {
+    name: c.name,
+	  rule: c.rule,
+	  schema: schema.id,
+	  query: c.query,
+	  errors: c.errors,
+  }
+});
+
+// Order based on the schema string to provide semi-stable ordering
+s = s.sort((a, b) => a.sdl.localeCompare(b.sdl));
+
+let output = JSON.stringify({schemas: s, tests: tests}, null, 2)
+output = output.replace(/ Did you mean to use an inline fragment on [^?]*\?/g, '');
+// Ignore suggested types in errors, which graphql-go does not currently produce.
+output = output.replace(/ Did you mean \\"[A-Z].*\"\?/g, '');
+fs.writeFileSync("tests.json", output);