From 4fe3d9c037e9c138bd8a9b04b3977d74eba32c97 Mon Sep 17 00:00:00 2001
From: Thodoris Greasidis <thgreasi@gmail.com>
Date: Fri, 26 Aug 2022 15:17:30 +0300
Subject: [PATCH] Type fixes for TypeScript 4.8 (#4673)

* Rerun prettier

* Fix typings for TypeScript 4.8
---
 ...@graphql-tools_apollo-engine-loader-4665-dependencies.md | 4 ++--
 .../@graphql-tools_github-loader-4665-dependencies.md       | 4 ++--
 .../@graphql-tools_jest-transform-4671-dependencies.md      | 4 ++--
 .changeset/@graphql-tools_url-loader-4665-dependencies.md   | 4 ++--
 .changeset/nasty-owls-compare.md                            | 6 ++++++
 packages/utils/src/Interfaces.ts                            | 2 +-
 packages/wrap/src/transforms/HoistField.ts                  | 2 +-
 7 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/nasty-owls-compare.md

diff --git a/.changeset/@graphql-tools_apollo-engine-loader-4665-dependencies.md b/.changeset/@graphql-tools_apollo-engine-loader-4665-dependencies.md
index 75ff9e2c96e..f1f69cae373 100644
--- a/.changeset/@graphql-tools_apollo-engine-loader-4665-dependencies.md
+++ b/.changeset/@graphql-tools_apollo-engine-loader-4665-dependencies.md
@@ -1,7 +1,7 @@
 ---
-"@graphql-tools/apollo-engine-loader": patch
+'@graphql-tools/apollo-engine-loader': patch
 ---
 
-dependencies updates: 
+dependencies updates:
 
 - Updated dependency [`@whatwg-node/fetch@^0.3.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/fetch/v/null) (from `^0.2.9`, in `dependencies`)
diff --git a/.changeset/@graphql-tools_github-loader-4665-dependencies.md b/.changeset/@graphql-tools_github-loader-4665-dependencies.md
index 7db7e404f30..0f7d1db83d0 100644
--- a/.changeset/@graphql-tools_github-loader-4665-dependencies.md
+++ b/.changeset/@graphql-tools_github-loader-4665-dependencies.md
@@ -1,7 +1,7 @@
 ---
-"@graphql-tools/github-loader": patch
+'@graphql-tools/github-loader': patch
 ---
 
-dependencies updates: 
+dependencies updates:
 
 - Updated dependency [`@whatwg-node/fetch@^0.3.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/fetch/v/null) (from `^0.2.9`, in `dependencies`)
diff --git a/.changeset/@graphql-tools_jest-transform-4671-dependencies.md b/.changeset/@graphql-tools_jest-transform-4671-dependencies.md
index 97b01d17cb8..f936cb94597 100644
--- a/.changeset/@graphql-tools_jest-transform-4671-dependencies.md
+++ b/.changeset/@graphql-tools_jest-transform-4671-dependencies.md
@@ -1,8 +1,8 @@
 ---
-"@graphql-tools/jest-transform": patch
+'@graphql-tools/jest-transform': patch
 ---
 
-dependencies updates: 
+dependencies updates:
 
 - Updated dependency [`@jest/transform@^29.0.0` ↗︎](https://www.npmjs.com/package/@jest/transform/v/null) (from `^28.0.0`, in `dependencies`)
 - Updated dependency [`@jest/types@^29.0.0` ↗︎](https://www.npmjs.com/package/@jest/types/v/null) (from `^28.0.0`, in `dependencies`)
diff --git a/.changeset/@graphql-tools_url-loader-4665-dependencies.md b/.changeset/@graphql-tools_url-loader-4665-dependencies.md
index 27b9b1d58df..2f1c7aaa77f 100644
--- a/.changeset/@graphql-tools_url-loader-4665-dependencies.md
+++ b/.changeset/@graphql-tools_url-loader-4665-dependencies.md
@@ -1,7 +1,7 @@
 ---
-"@graphql-tools/url-loader": patch
+'@graphql-tools/url-loader': patch
 ---
 
-dependencies updates: 
+dependencies updates:
 
 - Updated dependency [`@whatwg-node/fetch@^0.3.0` ↗︎](https://www.npmjs.com/package/@whatwg-node/fetch/v/null) (from `^0.2.9`, in `dependencies`)
diff --git a/.changeset/nasty-owls-compare.md b/.changeset/nasty-owls-compare.md
new file mode 100644
index 00000000000..08ab2064299
--- /dev/null
+++ b/.changeset/nasty-owls-compare.md
@@ -0,0 +1,6 @@
+---
+'@graphql-tools/utils': patch
+'@graphql-tools/wrap': patch
+---
+
+Fix typings for TypeScript 4.8
diff --git a/packages/utils/src/Interfaces.ts b/packages/utils/src/Interfaces.ts
index 42f78278b2e..46c42613fa7 100644
--- a/packages/utils/src/Interfaces.ts
+++ b/packages/utils/src/Interfaces.ts
@@ -51,7 +51,7 @@ import {
 // graphql-js < v15 backwards compatible ExecutionResult
 // See: https://github.com/graphql/graphql-js/pull/2490
 
-export type ExecutionResult<TData = Record<string, any>> = GraphQLExecutionResult & {
+export type ExecutionResult<TData = Record<string, any>> = GraphQLExecutionResult<TData> & {
   data?: TData | null;
   extensions?: Record<string, any>;
 };
diff --git a/packages/wrap/src/transforms/HoistField.ts b/packages/wrap/src/transforms/HoistField.ts
index 9e9a6578696..a7ac1f6f475 100644
--- a/packages/wrap/src/transforms/HoistField.ts
+++ b/packages/wrap/src/transforms/HoistField.ts
@@ -26,7 +26,7 @@ import MapFields from './MapFields.js';
 
 interface HoistFieldTransformationContext extends Record<string, any> {}
 
-export default class HoistField<TContext = Record<string, any>>
+export default class HoistField<TContext extends Record<string, any> = Record<string, any>>
   implements Transform<HoistFieldTransformationContext, TContext>
 {
   private readonly typeName: string;