match .d.ts definition

aprilrd · May 28, 2021 · 8cfe3e3 · 8cfe3e3
1 parent 1482884
commit 8cfe3e3
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/src/execution/execute.ts b/src/execution/execute.ts
@@ -126,6 +126,7 @@ export type ExecutionContext = {
  *   - `data` is the result of a successful execution of the query.
  *   - `extensions` is reserved for adding non-standard properties.
  */
+<<<<<<< HEAD
 <<<<<<< HEAD:src/execution/execute.ts
 export interface ExecutionResult<
   TData = ObjMap<unknown>,
@@ -157,16 +158,27 @@ export interface ExecutionArgs {
 }
 =======
 export type ExecutionResult = {
+=======
+export interface ExecutionResult<
+  TData = { [key: string]: any },
+  TExtensions = { [key: string]: any },
+> {
+>>>>>>> match `.d.ts` definition
   errors?: ReadonlyArray<GraphQLError>;
-  data?: ObjMap<unknown> | null;
-  extensions?: ObjMap<unknown>;
-};
+  // TS_SPECIFIC: TData. Motivation: https://github.com/graphql/graphql-js/pull/2490#issuecomment-639154229
+  data?: TData | null;
+  extensions?: TExtensions;
+}
 
-export type FormattedExecutionResult = {
+export interface FormattedExecutionResult<
+  TData = { [key: string]: any },
+  TExtensions = { [key: string]: any },
+> {
   errors?: ReadonlyArray<GraphQLFormattedError>;
-  data?: ObjMap<unknown> | null;
-  extensions?: ObjMap<unknown>;
-};
+  // TS_SPECIFIC: TData. Motivation: https://github.com/graphql/graphql-js/pull/2490#issuecomment-639154229
+  data?: TData | null;
+  extensions?: TExtensions;
+}
 
 export type ExecutionArgs = {
   schema: GraphQLSchema;