diff --git a/src/execution/execute.d.ts b/src/execution/execute.d.ts index 572c412e3a..1db6f20b06 100644 --- a/src/execution/execute.d.ts +++ b/src/execution/execute.d.ts @@ -1,4 +1,5 @@ import { Maybe } from '../jsutils/Maybe'; +import { ObjMap } from '../jsutils/ObjMap'; import { PromiseOrValue } from '../jsutils/PromiseOrValue'; import { Path } from '../jsutils/Path'; @@ -50,9 +51,9 @@ import { */ export interface ExecutionContext { schema: GraphQLSchema; - fragments: { [key: string]: FragmentDefinitionNode }; rootValue: unknown; contextValue: unknown; + fragments: ObjMap; operation: OperationDefinitionNode; variableValues: { [key: string]: unknown }; fieldResolver: GraphQLFieldResolver; @@ -162,9 +163,9 @@ export function collectFields( exeContext: ExecutionContext, runtimeType: GraphQLObjectType, selectionSet: SelectionSetNode, - fields: { [key: string]: Array }, - visitedFragmentNames: { [key: string]: boolean }, -): { [key: string]: Array }; + fields: ObjMap>, + visitedFragmentNames: ObjMap, +): ObjMap>; /** * @internal diff --git a/src/execution/values.d.ts b/src/execution/values.d.ts index b2a01dbee5..b88943a04d 100644 --- a/src/execution/values.d.ts +++ b/src/execution/values.d.ts @@ -1,4 +1,5 @@ import { Maybe } from '../jsutils/Maybe'; +import { ObjMap } from '../jsutils/ObjMap'; import { GraphQLError } from '../error/GraphQLError'; import { @@ -42,7 +43,7 @@ export function getVariableValues( export function getArgumentValues( def: GraphQLField | GraphQLDirective, node: FieldNode | DirectiveNode, - variableValues?: Maybe<{ [key: string]: unknown }>, + variableValues?: Maybe>, ): { [key: string]: unknown }; /** @@ -61,5 +62,5 @@ export function getDirectiveValues( node: { readonly directives?: ReadonlyArray; }, - variableValues?: Maybe<{ [key: string]: unknown }>, + variableValues?: Maybe>, ): undefined | { [key: string]: unknown }; diff --git a/src/type/definition.d.ts b/src/type/definition.d.ts index d47eadd138..122f1efec3 100644 --- a/src/type/definition.d.ts +++ b/src/type/definition.d.ts @@ -336,7 +336,7 @@ export type GraphQLScalarValueParser = ( ) => Maybe; export type GraphQLScalarLiteralParser = ( valueNode: ValueNode, - variables: Maybe<{ [key: string]: unknown }>, + variables: Maybe>, ) => Maybe; export interface GraphQLScalarTypeConfig { @@ -479,7 +479,7 @@ export interface GraphQLResolveInfo { readonly parentType: GraphQLObjectType; readonly path: Path; readonly schema: GraphQLSchema; - readonly fragments: { [key: string]: FragmentDefinitionNode }; + readonly fragments: ObjMap; readonly rootValue: unknown; readonly operation: OperationDefinitionNode; readonly variableValues: { [variableName: string]: unknown }; @@ -522,9 +522,7 @@ export interface GraphQLFieldConfig< astNode?: Maybe; } -export interface GraphQLFieldConfigArgumentMap { - [key: string]: GraphQLArgumentConfig; -} +export type GraphQLFieldConfigArgumentMap = ObjMap; /** * Custom extensions @@ -548,9 +546,9 @@ export interface GraphQLArgumentConfig { astNode?: Maybe; } -export interface GraphQLFieldConfigMap { - [key: string]: GraphQLFieldConfig; -} +export type GraphQLFieldConfigMap = ObjMap< + GraphQLFieldConfig +>; export interface GraphQLField< TSource, @@ -580,9 +578,9 @@ export interface GraphQLArgument { export function isRequiredArgument(arg: GraphQLArgument): boolean; -export interface GraphQLFieldMap { - [key: string]: GraphQLField; -} +export type GraphQLFieldMap = ObjMap< + GraphQLField +>; /** * Custom extensions @@ -778,7 +776,7 @@ export class GraphQLEnumType { parseValue(value: unknown): Maybe; parseLiteral( valueNode: ValueNode, - _variables: Maybe<{ [key: string]: unknown }>, + _variables: Maybe>, ): Maybe; toConfig(): GraphQLEnumTypeConfig & { @@ -801,9 +799,7 @@ export interface GraphQLEnumTypeConfig { extensionASTNodes?: Maybe>; } -export interface GraphQLEnumValueConfigMap { - [key: string]: GraphQLEnumValueConfig; -} +export type GraphQLEnumValueConfigMap = ObjMap; /** * Custom extensions @@ -921,9 +917,7 @@ export interface GraphQLInputFieldConfig { astNode?: Maybe; } -export interface GraphQLInputFieldConfigMap { - [key: string]: GraphQLInputFieldConfig; -} +export type GraphQLInputFieldConfigMap = ObjMap; export interface GraphQLInputField { name: string; @@ -937,6 +931,4 @@ export interface GraphQLInputField { export function isRequiredInputField(field: GraphQLInputField): boolean; -export interface GraphQLInputFieldMap { - [key: string]: GraphQLInputField; -} +export type GraphQLInputFieldMap = ObjMap; diff --git a/src/type/schema.d.ts b/src/type/schema.d.ts index f28e6b0847..e96f2da404 100644 --- a/src/type/schema.d.ts +++ b/src/type/schema.d.ts @@ -2,6 +2,7 @@ /* eslint-disable import/no-cycle */ import { Maybe } from '../jsutils/Maybe'; +import { ObjMap } from '../jsutils/ObjMap'; import { SchemaDefinitionNode, SchemaExtensionNode } from '../language/ast'; @@ -97,9 +98,7 @@ export class GraphQLSchema { get [Symbol.toStringTag](): string; } -interface TypeMap { - [key: string]: GraphQLNamedType; -} +type TypeMap = ObjMap; interface InterfaceImplementations { objects: ReadonlyArray; diff --git a/src/utilities/separateOperations.d.ts b/src/utilities/separateOperations.d.ts index 28654fdb1b..21552407d0 100644 --- a/src/utilities/separateOperations.d.ts +++ b/src/utilities/separateOperations.d.ts @@ -1,3 +1,4 @@ +import { ObjMap } from '../jsutils/ObjMap'; import { DocumentNode } from '../language/ast'; /** @@ -8,4 +9,4 @@ import { DocumentNode } from '../language/ast'; */ export function separateOperations( documentAST: DocumentNode, -): { [key: string]: DocumentNode }; +): ObjMap; diff --git a/src/utilities/valueFromAST.d.ts b/src/utilities/valueFromAST.d.ts index 2e5cefd604..6ea38000e1 100644 --- a/src/utilities/valueFromAST.d.ts +++ b/src/utilities/valueFromAST.d.ts @@ -1,4 +1,5 @@ import { Maybe } from '../jsutils/Maybe'; +import { ObjMap } from '../jsutils/ObjMap'; import { ValueNode } from '../language/ast'; import { GraphQLInputType } from '../type/definition'; @@ -26,5 +27,5 @@ import { GraphQLInputType } from '../type/definition'; export function valueFromAST( valueNode: Maybe, type: GraphQLInputType, - variables?: Maybe<{ [key: string]: unknown }>, + variables?: Maybe>, ): unknown; diff --git a/src/utilities/valueFromASTUntyped.d.ts b/src/utilities/valueFromASTUntyped.d.ts index b1c4e5d4b4..495e279723 100644 --- a/src/utilities/valueFromASTUntyped.d.ts +++ b/src/utilities/valueFromASTUntyped.d.ts @@ -1,4 +1,5 @@ import { Maybe } from '../jsutils/Maybe'; +import { ObjMap } from '../jsutils/ObjMap'; import { ValueNode } from '../language/ast'; @@ -20,5 +21,5 @@ import { ValueNode } from '../language/ast'; */ export function valueFromASTUntyped( valueNode: ValueNode, - variables?: Maybe<{ [key: string]: unknown }>, + variables?: Maybe>, ): unknown;