Merge branch 'graphql:main' into fragment-args-2023

Author: mjmahone

resources/build-docusaurus.ts

@@ -14,6 +14,7 @@ fs.writeFileSync(tmpDirPath('package.json'), JSON.stringify(packageJSON));
 
 copyToTmpDir('package-lock.json');
 copyToTmpDir('tsconfig.json');
+copyToTmpDir('resources/eslint-internal-rules');
 copyToTmpDir('src');
 copyToTmpDir('website');
 

src/execution/__tests__/variables-test.ts

@@ -5,6 +5,8 @@ import { expectJSON } from '../../__testUtils__/expectJSON.js';
 
 import { inspect } from '../../jsutils/inspect.js';
 
+import { GraphQLError } from '../../error/GraphQLError.js';
+
 import { Kind } from '../../language/kinds.js';
 import { parse } from '../../language/parser.js';
 
@@ -26,6 +28,25 @@ import { GraphQLSchema } from '../../type/schema.js';
 import { executeSync } from '../execute.js';
 import { getVariableValues } from '../values.js';
 
+const TestFaultyScalarGraphQLError = new GraphQLError(
+  'FaultyScalarErrorMessage',
+  {
+    extensions: {
+      code: 'FaultyScalarErrorExtensionCode',
+    },
+  },
+);
+
+const TestFaultyScalar = new GraphQLScalarType({
+  name: 'FaultyScalar',
+  parseValue() {
+    throw TestFaultyScalarGraphQLError;
+  },
+  parseLiteral() {
+    throw TestFaultyScalarGraphQLError;
+  },
+});
+
 const TestComplexScalar = new GraphQLScalarType({
   name: 'ComplexScalar',
   parseValue(value) {
@@ -45,6 +66,7 @@ const TestInputObject = new GraphQLInputObjectType({
     b: { type: new GraphQLList(GraphQLString) },
     c: { type: new GraphQLNonNull(GraphQLString) },
     d: { type: TestComplexScalar },
+    e: { type: TestFaultyScalar },
   },
 });
 
@@ -236,6 +258,28 @@ describe('Execute: Handles inputs', () => {
           },
         });
       });
+
+      it('errors on faulty scalar type input', () => {
+        const result = executeQuery(`
+          {
+            fieldWithObjectInput(input: {c: "foo", e: "bar"})
+          }
+        `);
+
+        expectJSON(result).toDeepEqual({
+          data: {
+            fieldWithObjectInput: null,
+          },
+          errors: [
+            {
+              message:
+                'Argument "input" has invalid value { c: "foo", e: "bar" }.',
+              path: ['fieldWithObjectInput'],
+              locations: [{ line: 3, column: 41 }],
+            },
+          ],
+        });
+      });
     });
 
     describe('using variables', () => {
@@ -377,6 +421,22 @@ describe('Execute: Handles inputs', () => {
         });
       });
 
+      it('errors on faulty scalar type input', () => {
+        const params = { input: { c: 'foo', e: 'SerializedValue' } };
+        const result = executeQuery(doc, params);
+
+        expectJSON(result).toDeepEqual({
+          errors: [
+            {
+              message:
+                'Variable "$input" got invalid value "SerializedValue" at "input.e"; FaultyScalarErrorMessage',
+              locations: [{ line: 2, column: 16 }],
+              extensions: { code: 'FaultyScalarErrorExtensionCode' },
+            },
+          ],
+        });
+      });
+
       it('errors on null for nested non-null', () => {
         const params = { input: { a: 'foo', b: 'bar', c: null } };
         const result = executeQuery(doc, params);

src/execution/values.ts

@@ -131,7 +131,7 @@ function coerceVariableValues(
         onError(
           new GraphQLError(prefix + '; ' + error.message, {
             nodes: varDefNode,
-            originalError: error.originalError,
+            originalError: error,
           }),
         );
       },