Backport v16 commits

README.md

@@ -1,4 +1,4 @@
-[![GraphQLConf 2024 Banner: September 10-12, San Francisco. Hosted by the GraphQL Foundation](https://github.com/user-attachments/assets/2d048502-e5b2-4e9d-a02a-50b841824de6)](https://graphql.org/conf/2024/?utm_source=github&utm_medium=graphql_js&utm_campaign=readme)
+[![GraphQLConf 2025 Banner: September 08-10, Amsterdam. Hosted by the GraphQL Foundation](./assets/graphql-conf-2025.png)](https://graphql.org/conf/2025/?utm_source=github&utm_medium=graphql_js&utm_campaign=readme)
 
 # GraphQL.js
 

benchmark/fixtures.js

@@ -8,3 +8,8 @@ export const bigSchemaSDL = fs.readFileSync(
 export const bigSchemaIntrospectionResult = JSON.parse(
   fs.readFileSync(new URL('github-schema.json', import.meta.url), 'utf8'),
 );
+
+export const bigDocumentSDL = fs.readFileSync(
+  new URL('kitchen-sink.graphql', import.meta.url),
+  'utf8',
+);

benchmark/kitchen-sink.graphql

@@ -0,0 +1,65 @@
+query queryName($foo: ComplexType, $site: Site = MOBILE) @onQuery {
+  whoever123is: node(id: [123, 456]) {
+    id
+    ... on User @onInlineFragment {
+      field2 {
+        id
+        alias: field1(first: 10, after: $foo) @include(if: $foo) {
+          id
+          ...frag @onFragmentSpread
+        }
+      }
+    }
+    ... @skip(unless: $foo) {
+      id
+    }
+    ... {
+      id
+    }
+  }
+}
+
+mutation likeStory @onMutation {
+  like(story: 123) @onField {
+    story {
+      id @onField
+    }
+  }
+}
+
+subscription StoryLikeSubscription(
+  $input: StoryLikeSubscribeInput @onVariableDefinition
+) @onSubscription {
+  storyLikeSubscribe(input: $input) {
+    story {
+      likers {
+        count
+      }
+      likeSentence {
+        text
+      }
+    }
+  }
+}
+
+fragment frag on Friend @onFragmentDefinition {
+  foo(
+    size: $size
+    bar: $b
+    obj: {
+      key: "value"
+      block: """
+      block string uses \"""
+      """
+    }
+  )
+}
+
+{
+  unnamed(truthy: true, falsy: false, nullish: null)
+  query
+}
+
+query {
+  __typename
+}

benchmark/printer-benchmark.js

@@ -0,0 +1,14 @@
+import { parse } from 'graphql/language/parser.js';
+import { print } from 'graphql/language/printer.js';
+
+import { bigDocumentSDL } from './fixtures.js';
+
+const document = parse(bigDocumentSDL);
+
+export const benchmark = {
+  name: 'Print kitchen sink document',
+  count: 1000,
+  measure() {
+    print(document);
+  },
+};

cspell.yml

@@ -114,6 +114,7 @@ words:
   - svgr
   - ruru
   - oneof
+  - vercel
 
   # used as href anchors
   - graphqlerror

src/execution/__tests__/executor-test.ts

@@ -10,6 +10,7 @@ import { Kind } from '../../language/kinds.js';
 import { parse } from '../../language/parser.js';
 
 import {
+  GraphQLInputObjectType,
   GraphQLInterfaceType,
   GraphQLList,
   GraphQLNonNull,
@@ -1380,4 +1381,74 @@ describe('Execute: Handles basic execution tasks', () => {
     expect(result).to.deep.equal({ data: { foo: { bar: 'bar' } } });
     expect(possibleTypes).to.deep.equal([fooObject]);
   });
+
+  it('uses a different number of max coercion errors', () => {
+    const schema = new GraphQLSchema({
+      query: new GraphQLObjectType({
+        name: 'Query',
+        fields: {
+          dummy: { type: GraphQLString },
+        },
+      }),
+      mutation: new GraphQLObjectType({
+        name: 'Mutation',
+        fields: {
+          updateUser: {
+            type: GraphQLString,
+            args: {
+              data: {
+                type: new GraphQLInputObjectType({
+                  name: 'User',
+                  fields: {
+                    email: { type: new GraphQLNonNull(GraphQLString) },
+                  },
+                }),
+              },
+            },
+          },
+        },
+      }),
+    });
+
+    const document = parse(`
+      mutation ($data: User) {
+        updateUser(data: $data)
+      }
+    `);
+
+    const options = {
+      maxCoercionErrors: 1,
+    };
+
+    const result = executeSync({
+      schema,
+      document,
+      variableValues: {
+        data: {
+          email: '',
+          wrongArg: 'wrong',
+          wrongArg2: 'wrong',
+          wrongArg3: 'wrong',
+        },
+      },
+      options,
+    });
+
+    // Returns at least 2 errors, one for the first 'wrongArg', and one for coercion limit
+    expect(result.errors).to.have.lengthOf(options.maxCoercionErrors + 1);
+
+    expectJSON(result).toDeepEqual({
+      errors: [
+        {
+          message:
+            'Variable "$data" has invalid value: Expected value of type "User" not to include unknown field "wrongArg", found: { email: "", wrongArg: "wrong", wrongArg2: "wrong", wrongArg3: "wrong" }.',
+          locations: [{ line: 2, column: 17 }],
+        },
+        {
+          message:
+            'Too many errors processing variables, error limit reached. Execution aborted.',
+        },
+      ],
+    });
+  });
 });

src/execution/execute.ts

@@ -200,6 +200,11 @@ export interface ExecutionArgs {
   enableEarlyExecution?: Maybe<boolean>;
   hideSuggestions?: Maybe<boolean>;
   abortSignal?: Maybe<AbortSignal>;
+  /** Additional execution options. */
+  options?: {
+    /** Set the maximum number of errors allowed for coercing (defaults to 50). */
+    maxCoercionErrors?: number;
+  };
 }
 
 export interface StreamUsage {
@@ -473,6 +478,7 @@ export function validateExecutionArgs(
     perEventExecutor,
     enableEarlyExecution,
     abortSignal,
+    options,
   } = args;
 
   if (abortSignal?.aborted) {
@@ -534,10 +540,7 @@ export function validateExecutionArgs(
     schema,
     variableDefinitions,
     rawVariableValues ?? {},
-    {
-      maxErrors: 50,
-      hideSuggestions,
-    },
+    { maxErrors: options?.maxCoercionErrors ?? 50, hideSuggestions },
   );
 
   if (variableValuesOrErrors.errors) {

src/language/visitor.ts

@@ -220,10 +220,7 @@ export function visit(
             }
           }
         } else {
-          node = Object.defineProperties(
-            {},
-            Object.getOwnPropertyDescriptors(node),
-          );
+          node = { ...node };
           for (const [editKey, editValue] of edits) {
             node[editKey] = editValue;
           }

src/utilities/__tests__/coerceInputValue-test.ts

@@ -122,11 +122,19 @@ describe('coerceInputValue', () => {
   });
 
   describe('for GraphQLInputObject', () => {
+    const DeepObject = new GraphQLInputObjectType({
+      name: 'DeepObject',
+      fields: {
+        foo: { type: new GraphQLNonNull(GraphQLInt) },
+        bar: { type: GraphQLInt },
+      },
+    });
     const TestInputObject = new GraphQLInputObjectType({
       name: 'TestInputObject',
       fields: {
         foo: { type: new GraphQLNonNull(GraphQLInt) },
         bar: { type: GraphQLInt },
+        deepObject: { type: DeepObject },
       },
     });
 
@@ -153,6 +161,14 @@ describe('coerceInputValue', () => {
     it('invalid for an unknown field', () => {
       test({ foo: 123, unknownField: 123 }, TestInputObject, undefined);
     });
+
+    it('invalid for an array type', () => {
+      test([{ foo: 1 }, { bar: 1 }], TestInputObject, undefined);
+    });
+
+    it('invalid for an array type on a nested field', () => {
+      test({ foo: 1, deepObject: [1, 2, 3] }, TestInputObject, undefined);
+    });
   });
 
   describe('for GraphQLInputObject that isOneOf', () => {

src/utilities/coerceInputValue.ts

@@ -64,8 +64,8 @@ export function coerceInputValue(
   }
 
   if (isInputObjectType(type)) {
-    if (!isObjectLike(inputValue)) {
-      return; // Invalid: intentionally return no value.
+    if (!isObjectLike(inputValue) || Array.isArray(inputValue)) {
+      return;
     }
 
     const coercedValue: any = {};

website/next.config.js

@@ -1,5 +1,9 @@
 /* eslint-disable camelcase */
 import path from 'node:path';
+import fs from 'node:fs';
+
+const fileContents = fs.readFileSync('./vercel.json', 'utf-8');
+const vercel = JSON.parse(fileContents);
 
 import nextra from 'nextra';
 
@@ -29,6 +33,7 @@ export default withNextra({
     });
     return config;
   },
+  redirects: async () => vercel.redirects,
   output: 'export',
   images: {
     loader: 'custom',

website/pages/_meta.ts

@@ -1,29 +1,18 @@
 const meta = {
-  index: '',
-  '-- 1': {
-    type: 'separator',
-    title: 'GraphQL.JS Tutorial',
+  docs: {
+    type: 'page',
+    title: 'Documentation',
   },
-  'getting-started': '',
-  'running-an-express-graphql-server': '',
-  'graphql-clients': '',
-  'basic-types': '',
-  'passing-arguments': '',
-  'object-types': '',
-  'mutations-and-input-types': '',
-  'authentication-and-express-middleware': '',
-  '-- 2': {
-    type: 'separator',
-    title: 'Advanced Guides',
-  },
-  'constructing-types': '',
-  'oneof-input-objects': 'OneOf input objects',
-  'defer-stream': '',
-  '-- 3': {
-    type: 'separator',
-    title: 'FAQ',
+  'upgrade-guides': {
+    type: 'menu',
+    title: 'Upgrade Guides',
+    items: {
+      'v16-v17': {
+        title: 'v16 to v17',
+        href: '/upgrade-guides/v16-v17',
+      },
+    },
   },
-  'going-to-production': '',
   'api-v16': {
     type: 'menu',
     title: 'API',

website/pages/api-v16/error.mdx

@@ -56,7 +56,7 @@ class GraphQLError extends Error {
     source?: Source,
     positions?: number[],
     originalError?: Error,
-    extensions?: { [key: string]: mixed },
+    extensions?: Record<string, unknown>,
   );
 }
 ```