diff --git a/src/index.js b/src/index.js index a7b9f744be..8e2d9f4dd4 100644 --- a/src/index.js +++ b/src/index.js @@ -140,44 +140,32 @@ export type { GraphQLNamedType, Thunk, GraphQLSchemaConfig, - GraphQLSchemaExtensions, GraphQLDirectiveConfig, - GraphQLDirectiveExtensions, GraphQLArgument, GraphQLArgumentConfig, - GraphQLArgumentExtensions, GraphQLEnumTypeConfig, - GraphQLEnumTypeExtensions, GraphQLEnumValue, GraphQLEnumValueConfig, - GraphQLEnumValueExtensions, GraphQLEnumValueConfigMap, GraphQLField, GraphQLFieldConfig, - GraphQLFieldExtensions, GraphQLFieldConfigArgumentMap, GraphQLFieldConfigMap, GraphQLFieldMap, GraphQLFieldResolver, GraphQLInputField, GraphQLInputFieldConfig, - GraphQLInputFieldExtensions, GraphQLInputFieldConfigMap, GraphQLInputFieldMap, GraphQLInputObjectTypeConfig, - GraphQLInputObjectTypeExtensions, GraphQLInterfaceTypeConfig, - GraphQLInterfaceTypeExtensions, GraphQLIsTypeOfFn, GraphQLObjectTypeConfig, - GraphQLObjectTypeExtensions, GraphQLResolveInfo, ResponsePath, GraphQLScalarTypeConfig, - GraphQLScalarTypeExtensions, GraphQLTypeResolver, GraphQLUnionTypeConfig, - GraphQLUnionTypeExtensions, GraphQLScalarSerializer, GraphQLScalarValueParser, GraphQLScalarLiteralParser, diff --git a/src/type/definition.js b/src/type/definition.js index d2a0c0d98c..ab94313263 100644 --- a/src/type/definition.js +++ b/src/type/definition.js @@ -548,8 +548,6 @@ function undefineIfEmpty(arr: ?$ReadOnlyArray): ?$ReadOnlyArray { return arr && arr.length > 0 ? arr : undefined; } -export type GraphQLScalarTypeExtensions = ReadOnlyObjMap; - /** * Scalar Type Definition * @@ -581,7 +579,7 @@ export class GraphQLScalarType { serialize: GraphQLScalarSerializer; parseValue: GraphQLScalarValueParser; parseLiteral: GraphQLScalarLiteralParser; - extensions: ?GraphQLScalarTypeExtensions; + extensions: ?ReadOnlyObjMap; astNode: ?ScalarTypeDefinitionNode; extensionASTNodes: ?$ReadOnlyArray; @@ -626,7 +624,7 @@ export class GraphQLScalarType { serialize: GraphQLScalarSerializer, parseValue: GraphQLScalarValueParser, parseLiteral: GraphQLScalarLiteralParser, - extensions: ?GraphQLScalarTypeExtensions, + extensions: ?ReadOnlyObjMap, extensionASTNodes: $ReadOnlyArray, |} { return { @@ -682,13 +680,11 @@ export type GraphQLScalarTypeConfig = {| parseValue?: GraphQLScalarValueParser, // Parses an externally provided literal value to use as an input. parseLiteral?: GraphQLScalarLiteralParser, - extensions?: ?GraphQLScalarTypeExtensions, + extensions?: ?ReadOnlyObjMapLike, astNode?: ?ScalarTypeDefinitionNode, extensionASTNodes?: ?$ReadOnlyArray, |}; -export type GraphQLObjectTypeExtensions = ReadOnlyObjMap; - /** * Object Type Definition * @@ -730,7 +726,7 @@ export class GraphQLObjectType { name: string; description: ?string; isTypeOf: ?GraphQLIsTypeOfFn; - extensions: ?GraphQLObjectTypeExtensions; + extensions: ?ReadOnlyObjMap; astNode: ?ObjectTypeDefinitionNode; extensionASTNodes: ?$ReadOnlyArray; @@ -773,7 +769,7 @@ export class GraphQLObjectType { ...GraphQLObjectTypeConfig, interfaces: Array, fields: GraphQLFieldConfigMap, - extensions: ?GraphQLObjectTypeExtensions, + extensions: ?ReadOnlyObjMap, extensionASTNodes: $ReadOnlyArray, |} { return { @@ -918,7 +914,7 @@ export type GraphQLObjectTypeConfig = {| interfaces?: Thunk>, fields: Thunk>, isTypeOf?: ?GraphQLIsTypeOfFn, - extensions?: ?GraphQLObjectTypeExtensions, + extensions?: ?ReadOnlyObjMapLike, astNode?: ?ObjectTypeDefinitionNode, extensionASTNodes?: ?$ReadOnlyArray, |}; @@ -971,7 +967,7 @@ export type GraphQLFieldConfig< resolve?: GraphQLFieldResolver, subscribe?: GraphQLFieldResolver, deprecationReason?: ?string, - extensions?: ?GraphQLFieldExtensions, + extensions?: ?ReadOnlyObjMapLike, astNode?: ?FieldDefinitionNode, |}; @@ -981,7 +977,7 @@ export type GraphQLArgumentConfig = {| description?: ?string, type: GraphQLInputType, defaultValue?: mixed, - extensions?: ?GraphQLArgumentExtensions, + extensions?: ?ReadOnlyObjMapLike, astNode?: ?InputValueDefinitionNode, |}; @@ -989,8 +985,6 @@ export type GraphQLFieldConfigMap = ObjMap< GraphQLFieldConfig, >; -export type GraphQLFieldExtensions = ReadOnlyObjMap; - export type GraphQLField< TSource, TContext, @@ -1004,18 +998,16 @@ export type GraphQLField< subscribe?: GraphQLFieldResolver, isDeprecated: boolean, deprecationReason: ?string, - extensions: ?GraphQLFieldExtensions, + extensions: ?ReadOnlyObjMap, astNode: ?FieldDefinitionNode, |}; -export type GraphQLArgumentExtensions = ReadOnlyObjMap; - export type GraphQLArgument = {| name: string, description: ?string, type: GraphQLInputType, defaultValue: mixed, - extensions: ?GraphQLArgumentExtensions, + extensions: ?ReadOnlyObjMap, astNode: ?InputValueDefinitionNode, |}; @@ -1027,8 +1019,6 @@ export type GraphQLFieldMap = ObjMap< GraphQLField, >; -export type GraphQLInterfaceTypeExtensions = ReadOnlyObjMap; - /** * Interface Type Definition * @@ -1051,7 +1041,7 @@ export class GraphQLInterfaceType { name: string; description: ?string; resolveType: ?GraphQLTypeResolver; - extensions: ?GraphQLInterfaceTypeExtensions; + extensions: ?ReadOnlyObjMap; astNode: ?InterfaceTypeDefinitionNode; extensionASTNodes: ?$ReadOnlyArray; @@ -1094,7 +1084,7 @@ export class GraphQLInterfaceType { ...GraphQLInterfaceTypeConfig, interfaces: Array, fields: GraphQLFieldConfigMap, - extensions: ?GraphQLInterfaceTypeExtensions, + extensions: ?ReadOnlyObjMap, extensionASTNodes: $ReadOnlyArray, |} { return { @@ -1137,13 +1127,11 @@ export type GraphQLInterfaceTypeConfig = {| * Object type. */ resolveType?: ?GraphQLTypeResolver, - extensions?: ?GraphQLInterfaceTypeExtensions, + extensions?: ?ReadOnlyObjMapLike, astNode?: ?InterfaceTypeDefinitionNode, extensionASTNodes?: ?$ReadOnlyArray, |}; -export type GraphQLUnionTypeExtensions = ReadOnlyObjMap; - /** * Union Type Definition * @@ -1171,7 +1159,7 @@ export class GraphQLUnionType { name: string; description: ?string; resolveType: ?GraphQLTypeResolver; - extensions: ?GraphQLUnionTypeExtensions; + extensions: ?ReadOnlyObjMap; astNode: ?UnionTypeDefinitionNode; extensionASTNodes: ?$ReadOnlyArray; @@ -1204,7 +1192,7 @@ export class GraphQLUnionType { toConfig(): {| ...GraphQLUnionTypeConfig, types: Array, - extensions: ?GraphQLUnionTypeExtensions, + extensions: ?ReadOnlyObjMap, extensionASTNodes: $ReadOnlyArray, |} { return { @@ -1256,13 +1244,11 @@ export type GraphQLUnionTypeConfig = {| * Object type. */ resolveType?: ?GraphQLTypeResolver, - extensions?: ?GraphQLUnionTypeExtensions, + extensions?: ?ReadOnlyObjMapLike, astNode?: ?UnionTypeDefinitionNode, extensionASTNodes?: ?$ReadOnlyArray, |}; -export type GraphQLEnumTypeExtensions = ReadOnlyObjMap; - /** * Enum Type Definition * @@ -1287,7 +1273,7 @@ export type GraphQLEnumTypeExtensions = ReadOnlyObjMap; export class GraphQLEnumType /* */ { name: string; description: ?string; - extensions: ?GraphQLEnumTypeExtensions; + extensions: ?ReadOnlyObjMap; astNode: ?EnumTypeDefinitionNode; extensionASTNodes: ?$ReadOnlyArray; @@ -1373,7 +1359,7 @@ export class GraphQLEnumType /* */ { toConfig(): {| ...GraphQLEnumTypeConfig, - extensions: ?GraphQLEnumTypeExtensions, + extensions: ?ReadOnlyObjMap, extensionASTNodes: $ReadOnlyArray, |} { const values = keyValMap( @@ -1459,7 +1445,7 @@ export type GraphQLEnumTypeConfig /* */ = {| name: string, description?: ?string, values: GraphQLEnumValueConfigMap /* */, - extensions?: ?GraphQLEnumTypeExtensions, + extensions?: ?ReadOnlyObjMapLike, astNode?: ?EnumTypeDefinitionNode, extensionASTNodes?: ?$ReadOnlyArray, |}; @@ -1470,24 +1456,20 @@ export type GraphQLEnumValueConfig /* */ = {| description?: ?string, value?: any /* T */, deprecationReason?: ?string, - extensions?: ?GraphQLEnumValueExtensions, + extensions?: ?ReadOnlyObjMapLike, astNode?: ?EnumValueDefinitionNode, |}; -export type GraphQLEnumValueExtensions = ReadOnlyObjMap; - export type GraphQLEnumValue /* */ = {| name: string, description: ?string, value: any /* T */, isDeprecated: boolean, deprecationReason: ?string, - extensions: ?GraphQLEnumValueExtensions, + extensions: ?ReadOnlyObjMap, astNode: ?EnumValueDefinitionNode, |}; -export type GraphQLInputObjectTypeExtensions = ReadOnlyObjMap; - /** * Input Object Type Definition * @@ -1511,7 +1493,7 @@ export type GraphQLInputObjectTypeExtensions = ReadOnlyObjMap; export class GraphQLInputObjectType { name: string; description: ?string; - extensions: ?GraphQLInputObjectTypeExtensions; + extensions: ?ReadOnlyObjMap; astNode: ?InputObjectTypeDefinitionNode; extensionASTNodes: ?$ReadOnlyArray; @@ -1538,7 +1520,7 @@ export class GraphQLInputObjectType { toConfig(): {| ...GraphQLInputObjectTypeConfig, fields: GraphQLInputFieldConfigMap, - extensions: ?GraphQLInputObjectTypeExtensions, + extensions: ?ReadOnlyObjMap, extensionASTNodes: $ReadOnlyArray, |} { const fields = mapValue(this.getFields(), (field) => ({ @@ -1605,7 +1587,7 @@ export type GraphQLInputObjectTypeConfig = {| name: string, description?: ?string, fields: Thunk, - extensions?: ?GraphQLInputObjectTypeExtensions, + extensions?: ?ReadOnlyObjMapLike, astNode?: ?InputObjectTypeDefinitionNode, extensionASTNodes?: ?$ReadOnlyArray, |}; @@ -1614,20 +1596,18 @@ export type GraphQLInputFieldConfig = {| description?: ?string, type: GraphQLInputType, defaultValue?: mixed, - extensions?: ?GraphQLInputFieldExtensions, + extensions?: ?ReadOnlyObjMapLike, astNode?: ?InputValueDefinitionNode, |}; export type GraphQLInputFieldConfigMap = ObjMap; -export type GraphQLInputFieldExtensions = ReadOnlyObjMap; - export type GraphQLInputField = {| name: string, description: ?string, type: GraphQLInputType, defaultValue: mixed, - extensions: ?GraphQLInputFieldExtensions, + extensions: ?ReadOnlyObjMap, astNode: ?InputValueDefinitionNode, |}; diff --git a/src/type/directives.js b/src/type/directives.js index ee17b1b4fe..b5074b8266 100644 --- a/src/type/directives.js +++ b/src/type/directives.js @@ -42,8 +42,6 @@ export function assertDirective(directive: mixed): GraphQLDirective { return directive; } -export type GraphQLDirectiveExtensions = ReadOnlyObjMap; - /** * Directives are used by the GraphQL runtime as a way of modifying execution * behavior. Type system creators will usually not create these directly. @@ -54,7 +52,7 @@ export class GraphQLDirective { locations: Array; args: Array; isRepeatable: boolean; - extensions: ?GraphQLDirectiveExtensions; + extensions: ?ReadOnlyObjMap; astNode: ?DirectiveDefinitionNode; constructor(config: $ReadOnly): void { @@ -91,7 +89,7 @@ export class GraphQLDirective { ...GraphQLDirectiveConfig, args: GraphQLFieldConfigArgumentMap, isRepeatable: boolean, - extensions: ?GraphQLDirectiveExtensions, + extensions: ?ReadOnlyObjMap, |} { return { name: this.name, @@ -127,7 +125,7 @@ export type GraphQLDirectiveConfig = {| locations: Array, args?: ?GraphQLFieldConfigArgumentMap, isRepeatable?: ?boolean, - extensions?: ?GraphQLDirectiveExtensions, + extensions?: ?ReadOnlyObjMapLike, astNode?: ?DirectiveDefinitionNode, |}; diff --git a/src/type/index.js b/src/type/index.js index 1199f96cfe..d15378b6cc 100644 --- a/src/type/index.js +++ b/src/type/index.js @@ -10,7 +10,7 @@ export { // GraphQL Schema definition GraphQLSchema, } from './schema'; -export type { GraphQLSchemaConfig, GraphQLSchemaExtensions } from './schema'; +export type { GraphQLSchemaConfig } from './schema'; export { // Predicates @@ -84,10 +84,7 @@ export { DEFAULT_DEPRECATION_REASON, } from './directives'; -export type { - GraphQLDirectiveConfig, - GraphQLDirectiveExtensions, -} from './directives'; +export type { GraphQLDirectiveConfig } from './directives'; // Common built-in scalar instances. export { @@ -136,38 +133,28 @@ export type { Thunk, GraphQLArgument, GraphQLArgumentConfig, - GraphQLArgumentExtensions, GraphQLEnumTypeConfig, - GraphQLEnumTypeExtensions, GraphQLEnumValue, GraphQLEnumValueConfig, - GraphQLEnumValueExtensions, GraphQLEnumValueConfigMap, GraphQLField, GraphQLFieldConfig, - GraphQLFieldExtensions, GraphQLFieldConfigArgumentMap, GraphQLFieldConfigMap, GraphQLFieldMap, GraphQLFieldResolver, GraphQLInputField, GraphQLInputFieldConfig, - GraphQLInputFieldExtensions, GraphQLInputFieldConfigMap, GraphQLInputFieldMap, GraphQLInputObjectTypeConfig, - GraphQLInputObjectTypeExtensions, GraphQLInterfaceTypeConfig, - GraphQLInterfaceTypeExtensions, GraphQLIsTypeOfFn, GraphQLObjectTypeConfig, - GraphQLObjectTypeExtensions, GraphQLResolveInfo, GraphQLScalarTypeConfig, - GraphQLScalarTypeExtensions, GraphQLTypeResolver, GraphQLUnionTypeConfig, - GraphQLUnionTypeExtensions, GraphQLScalarSerializer, GraphQLScalarValueParser, GraphQLScalarLiteralParser, diff --git a/src/type/schema.js b/src/type/schema.js index 0ee1e7cdc5..44d8c77262 100644 --- a/src/type/schema.js +++ b/src/type/schema.js @@ -61,8 +61,6 @@ export function assertSchema(schema: mixed): GraphQLSchema { return schema; } -export type GraphQLSchemaExtensions = ReadOnlyObjMap; - /** * Schema Definition * @@ -128,7 +126,7 @@ export type GraphQLSchemaExtensions = ReadOnlyObjMap; */ export class GraphQLSchema { description: ?string; - extensions: ?GraphQLSchemaExtensions; + extensions: ?ReadOnlyObjMap; astNode: ?SchemaDefinitionNode; extensionASTNodes: ?$ReadOnlyArray; @@ -385,7 +383,7 @@ export type GraphQLSchemaConfig = {| subscription?: ?GraphQLObjectType, types?: ?Array, directives?: ?Array, - extensions?: ?GraphQLSchemaExtensions, + extensions?: ?ReadOnlyObjMapLike, astNode?: ?SchemaDefinitionNode, extensionASTNodes?: ?$ReadOnlyArray, ...GraphQLSchemaValidationOptions, @@ -399,7 +397,7 @@ export type GraphQLSchemaNormalizedConfig = {| description: ?string, types: Array, directives: Array, - extensions: ?GraphQLSchemaExtensions, + extensions: ?ReadOnlyObjMap, extensionASTNodes: $ReadOnlyArray, assumeValid: boolean, |};