Speedup sorting & building/extending schema (#3939)

Author: IvanGoncharov

src/utilities/extendSchema.ts

@@ -1,7 +1,6 @@
 import { AccumulatorMap } from '../jsutils/AccumulatorMap.js';
 import { inspect } from '../jsutils/inspect.js';
 import { invariant } from '../jsutils/invariant.js';
-import { keyMap } from '../jsutils/keyMap.js';
 import { mapValue } from '../jsutils/mapValue.js';
 import type { Maybe } from '../jsutils/Maybe.js';
 
@@ -217,14 +216,13 @@ export function extendSchemaImpl(
     return schemaConfig;
   }
 
-  const typeMap = Object.create(null);
-  for (const existingType of schemaConfig.types) {
-    typeMap[existingType.name] = extendNamedType(existingType);
-  }
+  const typeMap = new Map<string, GraphQLNamedType>(
+    schemaConfig.types.map((type) => [type.name, extendNamedType(type)]),
+  );
 
   for (const typeNode of typeDefs) {
     const name = typeNode.name.value;
-    typeMap[name] = stdTypeMap[name] ?? buildType(typeNode);
+    typeMap.set(name, stdTypeMap.get(name) ?? buildType(typeNode));
   }
 
   const operationTypes = {
@@ -242,7 +240,7 @@ export function extendSchemaImpl(
   return {
     description: schemaDef?.description?.value ?? schemaConfig.description,
     ...operationTypes,
-    types: Object.values(typeMap),
+    types: Array.from(typeMap.values()),
     directives: [
       ...schemaConfig.directives.map(replaceDirective),
       ...directiveDefs.map(buildDirective),
@@ -273,7 +271,7 @@ export function extendSchemaImpl(
     // Note: While this could make early assertions to get the correctly
     // typed values, that would throw immediately while type system
     // validation with validateSchema() will produce more actionable results.
-    return typeMap[type.name];
+    return typeMap.get(type.name) as T;
   }
 
   function replaceDirective(directive: GraphQLDirective): GraphQLDirective {
@@ -462,7 +460,7 @@ export function extendSchemaImpl(
 
   function getNamedType(node: NamedTypeNode): GraphQLNamedType {
     const name = node.name.value;
-    const type = stdTypeMap[name] ?? typeMap[name];
+    const type = stdTypeMap.get(name) ?? typeMap.get(name);
 
     if (type === undefined) {
       throw new Error(`Unknown type: "${name}".`);
@@ -704,9 +702,11 @@ export function extendSchemaImpl(
   }
 }
 
-const stdTypeMap = keyMap(
-  [...specifiedScalarTypes, ...introspectionTypes],
-  (type) => type.name,
+const stdTypeMap = new Map(
+  [...specifiedScalarTypes, ...introspectionTypes].map((type) => [
+    type.name,
+    type,
+  ]),
 );
 
 /**

src/utilities/lexicographicSortSchema.ts

@@ -1,6 +1,5 @@
 import { inspect } from '../jsutils/inspect.js';
 import { invariant } from '../jsutils/invariant.js';
-import { keyValMap } from '../jsutils/keyValMap.js';
 import type { Maybe } from '../jsutils/Maybe.js';
 import { naturalCompare } from '../jsutils/naturalCompare.js';
 import type { ObjMap } from '../jsutils/ObjMap.js';
@@ -40,15 +39,16 @@ import { GraphQLSchema } from '../type/schema.js';
  */
 export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
   const schemaConfig = schema.toConfig();
-  const typeMap = keyValMap(
-    sortByName(schemaConfig.types),
-    (type) => type.name,
-    sortNamedType,
+  const typeMap = new Map<string, GraphQLNamedType>(
+    sortByName(schemaConfig.types).map((type) => [
+      type.name,
+      sortNamedType(type),
+    ]),
   );
 
   return new GraphQLSchema({
     ...schemaConfig,
-    types: Object.values(typeMap),
+    types: Array.from(typeMap.values()),
     directives: sortByName(schemaConfig.directives).map(sortDirective),
     query: replaceMaybeType(schemaConfig.query),
     mutation: replaceMaybeType(schemaConfig.mutation),
@@ -68,7 +68,7 @@ export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema {
   }
 
   function replaceNamedType<T extends GraphQLNamedType>(type: T): T {
-    return typeMap[type.name] as T;
+    return typeMap.get(type.name) as T;
   }
 
   function replaceMaybeType<T extends GraphQLNamedType>(