Skip to content

Commit ad6ecdb

Browse files
committed
feat: switch to Record utility type
1 parent 9531486 commit ad6ecdb

File tree

6 files changed

+20
-24
lines changed

6 files changed

+20
-24
lines changed

src/error/GraphQLError.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class GraphQLError extends Error {
1818
positions?: Maybe<ReadonlyArray<number>>,
1919
path?: Maybe<ReadonlyArray<string | number>>,
2020
originalError?: Maybe<Error>,
21-
extensions?: Maybe<{ [key: string]: unknown }>,
21+
extensions?: Maybe<Record<string, unknown>>,
2222
);
2323

2424
/**
@@ -77,7 +77,7 @@ export class GraphQLError extends Error {
7777
/**
7878
* Extension fields to add to the formatted error.
7979
*/
80-
readonly extensions: { [key: string]: unknown } | undefined;
80+
readonly extensions: Record<string, unknown> | undefined;
8181
}
8282

8383
/**

src/execution/execute.d.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export interface ExecutionContext {
5555
contextValue: unknown;
5656
fragments: ObjMap<FragmentDefinitionNode>;
5757
operation: OperationDefinitionNode;
58-
variableValues: { [key: string]: unknown };
58+
variableValues: Record<string, unknown>;
5959
fieldResolver: GraphQLFieldResolver<any, any>;
6060
typeResolver: GraphQLTypeResolver<any, any>;
6161
errors: Array<GraphQLError>;
@@ -69,8 +69,8 @@ export interface ExecutionContext {
6969
* - `extensions` is reserved for adding non-standard properties.
7070
*/
7171
export interface ExecutionResult<
72-
TData = { [key: string]: any },
73-
TExtensions = { [key: string]: any }
72+
TData = Record<string, any>,
73+
TExtensions = Record<string, any>
7474
> {
7575
errors?: ReadonlyArray<GraphQLError>;
7676
// TS_SPECIFIC: TData. Motivation: https://github.com/graphql/graphql-js/pull/2490#issuecomment-639154229
@@ -79,8 +79,8 @@ export interface ExecutionResult<
7979
}
8080

8181
export interface FormattedExecutionResult<
82-
TData = { [key: string]: any },
83-
TExtensions = { [key: string]: any }
82+
TData = Record<string, any>,
83+
TExtensions = Record<string, any>
8484
> {
8585
errors?: ReadonlyArray<GraphQLFormattedError>;
8686
// TS_SPECIFIC: TData. Motivation: https://github.com/graphql/graphql-js/pull/2490#issuecomment-639154229
@@ -93,7 +93,7 @@ export interface ExecutionArgs {
9393
document: DocumentNode;
9494
rootValue?: unknown;
9595
contextValue?: unknown;
96-
variableValues?: Maybe<{ [key: string]: unknown }>;
96+
variableValues?: Maybe<Record<string, unknown>>;
9797
operationName?: Maybe<string>;
9898
fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>;
9999
typeResolver?: Maybe<GraphQLTypeResolver<any, any>>;
@@ -127,7 +127,7 @@ export function executeSync(args: ExecutionArgs): ExecutionResult;
127127
export function assertValidExecutionArguments(
128128
schema: GraphQLSchema,
129129
document: DocumentNode,
130-
rawVariableValues: Maybe<{ [key: string]: unknown }>,
130+
rawVariableValues: Maybe<Record<string, unknown>>,
131131
): void;
132132

133133
/**
@@ -143,7 +143,7 @@ export function buildExecutionContext(
143143
document: DocumentNode,
144144
rootValue: unknown,
145145
contextValue: unknown,
146-
rawVariableValues: Maybe<{ [key: string]: unknown }>,
146+
rawVariableValues: Maybe<Record<string, unknown>>,
147147
operationName: Maybe<string>,
148148
fieldResolver: Maybe<GraphQLFieldResolver<unknown, unknown>>,
149149
typeResolver?: Maybe<GraphQLTypeResolver<unknown, unknown>>,

src/execution/values.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { GraphQLField } from '../type/definition';
1414

1515
type CoercedVariableValues =
1616
| { errors: ReadonlyArray<GraphQLError>; coerced?: never }
17-
| { errors?: never; coerced: { [key: string]: unknown } };
17+
| { errors?: never; coerced: Record<string, unknown> };
1818

1919
/**
2020
* Prepares an object map of variableValues of the correct type based on the
@@ -28,7 +28,7 @@ type CoercedVariableValues =
2828
export function getVariableValues(
2929
schema: GraphQLSchema,
3030
varDefNodes: ReadonlyArray<VariableDefinitionNode>,
31-
inputs: { [key: string]: unknown },
31+
inputs: Record<string, unknown>,
3232
options?: { maxErrors?: number },
3333
): CoercedVariableValues;
3434

@@ -44,7 +44,7 @@ export function getArgumentValues(
4444
def: GraphQLField<unknown, unknown> | GraphQLDirective,
4545
node: FieldNode | DirectiveNode,
4646
variableValues?: Maybe<ObjMap<unknown>>,
47-
): { [key: string]: unknown };
47+
): Record<string, unknown>;
4848

4949
/**
5050
* Prepares an object map of argument values given a directive definition
@@ -63,4 +63,4 @@ export function getDirectiveValues(
6363
readonly directives?: ReadonlyArray<DirectiveNode>;
6464
},
6565
variableValues?: Maybe<ObjMap<unknown>>,
66-
): undefined | { [key: string]: unknown };
66+
): undefined | Record<string, unknown>;

src/graphql.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export interface GraphQLArgs {
4949
source: string | Source;
5050
rootValue?: unknown;
5151
contextValue?: unknown;
52-
variableValues?: Maybe<{ [key: string]: unknown }>;
52+
variableValues?: Maybe<Record<string, unknown>>;
5353
operationName?: Maybe<string>;
5454
fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>;
5555
typeResolver?: Maybe<GraphQLTypeResolver<any, any>>;

src/subscription/subscribe.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export function createSourceEventStream(
7474
document: DocumentNode,
7575
rootValue?: unknown,
7676
contextValue?: unknown,
77-
variableValues?: { [key: string]: unknown },
77+
variableValues?: Record<string, unknown>,
7878
operationName?: Maybe<string>,
7979
fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
8080
): Promise<AsyncIterable<unknown> | ExecutionResult>;

src/type/definition.d.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ export type GraphQLIsTypeOfFn<TSource, TContext> = (
464464
export type GraphQLFieldResolver<
465465
TSource,
466466
TContext,
467-
TArgs = { [argName: string]: any }
467+
TArgs = Record<string, any>
468468
> = (
469469
source: TSource,
470470
args: TArgs,
@@ -482,7 +482,7 @@ export interface GraphQLResolveInfo {
482482
readonly fragments: ObjMap<FragmentDefinitionNode>;
483483
readonly rootValue: unknown;
484484
readonly operation: OperationDefinitionNode;
485-
readonly variableValues: { [variableName: string]: unknown };
485+
readonly variableValues: Record<string, unknown>;
486486
}
487487

488488
/**
@@ -508,7 +508,7 @@ export interface GraphQLFieldExtensions<
508508
export interface GraphQLFieldConfig<
509509
TSource,
510510
TContext,
511-
TArgs = { [argName: string]: any }
511+
TArgs = Record<string, any>
512512
> {
513513
description?: Maybe<string>;
514514
type: GraphQLOutputType;
@@ -550,11 +550,7 @@ export type GraphQLFieldConfigMap<TSource, TContext> = ObjMap<
550550
GraphQLFieldConfig<TSource, TContext>
551551
>;
552552

553-
export interface GraphQLField<
554-
TSource,
555-
TContext,
556-
TArgs = { [key: string]: any }
557-
> {
553+
export interface GraphQLField<TSource, TContext, TArgs = Record<string, any>> {
558554
name: string;
559555
description: Maybe<string>;
560556
type: GraphQLOutputType;

0 commit comments

Comments
 (0)