introduces mapSchema function

extracting this from lexicographicallySortSchema similar functionality can be extracted from extendSchemaImpl used to enhance extendSchema/buildASTSchema/buildSchema to take resolvers, etc, and to expose a generic safe mapSchema utility TO DO: test coverage
graphql · Nov 19, 2024 · e747264 · e747264
1 parent 1d98a6a
commit e747264
Show file tree

Hide file tree

Showing 5 changed files with 1,026 additions and 632 deletions.
diff --git a/src/type/definition.ts b/src/type/definition.ts
@@ -738,7 +738,7 @@ export interface GraphQLScalarTypeConfig<TInternal, TExternal> {
   extensionASTNodes?: Maybe<ReadonlyArray<ScalarTypeExtensionNode>>;
 }
 
-interface GraphQLScalarTypeNormalizedConfig<TInternal, TExternal>
+export interface GraphQLScalarTypeNormalizedConfig<TInternal, TExternal>
   extends GraphQLScalarTypeConfig<TInternal, TExternal> {
   serialize: GraphQLScalarSerializer<TExternal>;
   parseValue: GraphQLScalarValueParser<TInternal>;
@@ -914,7 +914,7 @@ export function defineArguments(
 
 function fieldsToFieldsConfig<TSource, TContext>(
   fields: GraphQLFieldMap<TSource, TContext>,
-): GraphQLFieldConfigMap<TSource, TContext> {
+): GraphQLFieldNormalizedConfigMap<TSource, TContext> {
   return mapValue(fields, (field) => ({
     description: field.description,
     type: field.type,
@@ -932,7 +932,7 @@ function fieldsToFieldsConfig<TSource, TContext>(
  */
 export function argsToArgsConfig(
   args: ReadonlyArray<GraphQLArgument>,
-): GraphQLFieldConfigArgumentMap {
+): GraphQLFieldNormalizedConfigArgumentMap {
   return keyValMap(
     args,
     (arg) => arg.name,
@@ -959,10 +959,10 @@ export interface GraphQLObjectTypeConfig<TSource, TContext> {
   extensionASTNodes?: Maybe<ReadonlyArray<ObjectTypeExtensionNode>>;
 }
 
-interface GraphQLObjectTypeNormalizedConfig<TSource, TContext>
+export interface GraphQLObjectTypeNormalizedConfig<TSource, TContext>
   extends GraphQLObjectTypeConfig<any, any> {
   interfaces: ReadonlyArray<GraphQLInterfaceType>;
-  fields: GraphQLFieldConfigMap<any, any>;
+  fields: GraphQLFieldNormalizedConfigMap<any, any>;
   extensions: Readonly<GraphQLObjectTypeExtensions<TSource, TContext>>;
   extensionASTNodes: ReadonlyArray<ObjectTypeExtensionNode>;
 }
@@ -1035,8 +1035,17 @@ export interface GraphQLFieldConfig<TSource, TContext, TArgs = any> {
   astNode?: Maybe<FieldDefinitionNode>;
 }
 
+export interface GraphQLFieldNormalizedConfig<TSource, TContext, TArgs = any>
+  extends GraphQLFieldConfig<TSource, TContext, TArgs> {
+  args: GraphQLFieldNormalizedConfigArgumentMap;
+  extensions: Readonly<GraphQLFieldExtensions<TSource, TContext, TArgs>>;
+}
+
 export type GraphQLFieldConfigArgumentMap = ObjMap<GraphQLArgumentConfig>;
 
+export type GraphQLFieldNormalizedConfigArgumentMap =
+  ObjMap<GraphQLArgumentNormalizedConfig>;
+
 /**
  * Custom extensions
  *
@@ -1060,10 +1069,18 @@ export interface GraphQLArgumentConfig {
   astNode?: Maybe<InputValueDefinitionNode>;
 }
 
+export interface GraphQLArgumentNormalizedConfig extends GraphQLArgumentConfig {
+  extensions: Readonly<GraphQLArgumentExtensions>;
+}
+
 export type GraphQLFieldConfigMap<TSource, TContext> = ObjMap<
   GraphQLFieldConfig<TSource, TContext>
 >;
 
+export type GraphQLFieldNormalizedConfigMap<TSource, TContext> = ObjMap<
+  GraphQLFieldNormalizedConfig<TSource, TContext>
+>;
+
 export interface GraphQLField<TSource, TContext, TArgs = any> {
   name: string;
   description: Maybe<string>;
@@ -1229,10 +1246,10 @@ export interface GraphQLInterfaceTypeConfig<TSource, TContext> {
   extensionASTNodes?: Maybe<ReadonlyArray<InterfaceTypeExtensionNode>>;
 }
 
-interface GraphQLInterfaceTypeNormalizedConfig<TSource, TContext>
+export interface GraphQLInterfaceTypeNormalizedConfig<TSource, TContext>
   extends GraphQLInterfaceTypeConfig<any, any> {
   interfaces: ReadonlyArray<GraphQLInterfaceType>;
-  fields: GraphQLFieldConfigMap<TSource, TContext>;
+  fields: GraphQLFieldNormalizedConfigMap<TSource, TContext>;
   extensions: Readonly<GraphQLInterfaceTypeExtensions>;
   extensionASTNodes: ReadonlyArray<InterfaceTypeExtensionNode>;
 }
@@ -1348,7 +1365,7 @@ export interface GraphQLUnionTypeConfig<TSource, TContext> {
   extensionASTNodes?: Maybe<ReadonlyArray<UnionTypeExtensionNode>>;
 }
 
-interface GraphQLUnionTypeNormalizedConfig
+export interface GraphQLUnionTypeNormalizedConfig
   extends GraphQLUnionTypeConfig<any, any> {
   types: ReadonlyArray<GraphQLObjectType>;
   extensions: Readonly<GraphQLUnionTypeExtensions>;
@@ -1594,15 +1611,18 @@ export interface GraphQLEnumTypeConfig {
   extensionASTNodes?: Maybe<ReadonlyArray<EnumTypeExtensionNode>>;
 }
 
-interface GraphQLEnumTypeNormalizedConfig extends GraphQLEnumTypeConfig {
-  values: ObjMap<GraphQLEnumValueConfig /* <T> */>;
+export interface GraphQLEnumTypeNormalizedConfig extends GraphQLEnumTypeConfig {
+  values: GraphQLEnumValueNormalizedConfigMap;
   extensions: Readonly<GraphQLEnumTypeExtensions>;
   extensionASTNodes: ReadonlyArray<EnumTypeExtensionNode>;
 }
 
 export type GraphQLEnumValueConfigMap /* <T> */ =
   ObjMap<GraphQLEnumValueConfig /* <T> */>;
 
+export type GraphQLEnumValueNormalizedConfigMap /* <T> */ =
+  ObjMap<GraphQLEnumValueNormalizedConfig /* <T> */>;
+
 /**
  * Custom extensions
  *
@@ -1624,6 +1644,11 @@ export interface GraphQLEnumValueConfig {
   astNode?: Maybe<EnumValueDefinitionNode>;
 }
 
+export interface GraphQLEnumValueNormalizedConfig
+  extends GraphQLEnumValueConfig {
+  extensions: Readonly<GraphQLEnumValueExtensions>;
+}
+
 export interface GraphQLEnumValue {
   name: string;
   description: Maybe<string>;
@@ -1755,9 +1780,9 @@ export interface GraphQLInputObjectTypeConfig {
   isOneOf?: boolean;
 }
 
-interface GraphQLInputObjectTypeNormalizedConfig
+export interface GraphQLInputObjectTypeNormalizedConfig
   extends GraphQLInputObjectTypeConfig {
-  fields: GraphQLInputFieldConfigMap;
+  fields: GraphQLInputFieldNormalizedConfigMap;
   extensions: Readonly<GraphQLInputObjectTypeExtensions>;
   extensionASTNodes: ReadonlyArray<InputObjectTypeExtensionNode>;
 }
@@ -1787,6 +1812,14 @@ export interface GraphQLInputFieldConfig {
 
 export type GraphQLInputFieldConfigMap = ObjMap<GraphQLInputFieldConfig>;
 
+export interface GraphQLInputFieldNormalizedConfig
+  extends GraphQLInputFieldConfig {
+  extensions: Readonly<GraphQLInputFieldExtensions>;
+}
+
+export type GraphQLInputFieldNormalizedConfigMap =
+  ObjMap<GraphQLInputFieldNormalizedConfig>;
+
 export interface GraphQLInputField {
   name: string;
   description: Maybe<string>;

diff --git a/src/type/directives.ts b/src/type/directives.ts
@@ -10,6 +10,7 @@ import { assertName } from './assertName.js';
 import type {
   GraphQLArgument,
   GraphQLFieldConfigArgumentMap,
+  GraphQLFieldNormalizedConfigArgumentMap,
 } from './definition.js';
 import {
   argsToArgsConfig,
@@ -107,8 +108,9 @@ export interface GraphQLDirectiveConfig {
   astNode?: Maybe<DirectiveDefinitionNode>;
 }
 
-interface GraphQLDirectiveNormalizedConfig extends GraphQLDirectiveConfig {
-  args: GraphQLFieldConfigArgumentMap;
+export interface GraphQLDirectiveNormalizedConfig
+  extends GraphQLDirectiveConfig {
+  args: GraphQLFieldNormalizedConfigArgumentMap;
   isRepeatable: boolean;
   extensions: Readonly<GraphQLDirectiveExtensions>;
 }