refactor: internal StitchingInfo properties

to never be undefined
ardatan · Jul 6, 2021 · c3489b0 · c3489b0
1 parent 8f519da
commit c3489b0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/packages/delegate/src/delegationBindings.ts b/packages/delegate/src/delegationBindings.ts
@@ -1,4 +1,4 @@
-import { assertSome, Maybe } from '@graphql-tools/utils';
+import { Maybe } from '@graphql-tools/utils';
 import { Transform, StitchingInfo, DelegationContext } from './types';
 
 import AddSelectionSets from './transforms/AddSelectionSets';
@@ -18,8 +18,6 @@ export function defaultDelegationBinding<TContext>(
   const stitchingInfo: Maybe<StitchingInfo> = info?.schema.extensions?.['stitchingInfo'];
 
   if (stitchingInfo != null) {
-    assertSome(stitchingInfo.selectionSetsByType);
-    assertSome(stitchingInfo.dynamicSelectionSetsByField);
     delegationTransforms = delegationTransforms.concat([
       new ExpandAbstractTypes(),
       new AddSelectionSets(

diff --git a/packages/delegate/src/types.ts b/packages/delegate/src/types.ts
@@ -188,9 +188,9 @@ export type MergedTypeResolver<TContext = Record<string, any>> = (
 
 export interface StitchingInfo<TContext = Record<string, any>> {
   subschemaMap: Map<GraphQLSchema | SubschemaConfig<any, any, any, TContext>, Subschema<any, any, any, TContext>>;
-  selectionSetsByType: Record<string, SelectionSetNode> | undefined;
+  selectionSetsByType: Record<string, SelectionSetNode>;
   selectionSetsByField: Record<string, Record<string, SelectionSetNode>>;
-  dynamicSelectionSetsByField: Record<string, Record<string, Array<(node: FieldNode) => SelectionSetNode>>> | undefined;
+  dynamicSelectionSetsByField: Record<string, Record<string, Array<(node: FieldNode) => SelectionSetNode>>>;
   mergedTypes: Record<string, MergedTypeInfo<TContext>>;
 }
 

diff --git a/packages/stitch/src/stitchingInfo.ts b/packages/stitch/src/stitchingInfo.ts
@@ -76,9 +76,9 @@ export function createStitchingInfo<TContext = Record<string, any>>(
 
   return {
     subschemaMap,
-    selectionSetsByType: undefined,
+    selectionSetsByType: Object.create(null),
     selectionSetsByField,
-    dynamicSelectionSetsByField: undefined,
+    dynamicSelectionSetsByField: Object.create(null),
     mergedTypes,
   };
 }
@@ -227,17 +227,15 @@ export function completeStitchingInfo<TContext = Record<string, any>>(
   resolvers: IResolvers,
   schema: GraphQLSchema
 ): StitchingInfo<TContext> {
-  const selectionSetsByType = Object.create(null);
+  const { selectionSetsByType, selectionSetsByField, dynamicSelectionSetsByField } = stitchingInfo;
+
   const rootTypes = [schema.getQueryType(), schema.getMutationType()];
   for (const rootType of rootTypes) {
     if (rootType) {
       selectionSetsByType[rootType.name] = parseSelectionSet('{ __typename }', { noLocation: true });
     }
   }
 
-  const selectionSetsByField = stitchingInfo.selectionSetsByField;
-  const dynamicSelectionSetsByField = Object.create(null);
-
   for (const typeName in resolvers) {
     const type = resolvers[typeName];
     if (isScalarType(type)) {
@@ -288,10 +286,6 @@ export function completeStitchingInfo<TContext = Record<string, any>>(
     }
   }
 
-  stitchingInfo.selectionSetsByType = selectionSetsByType;
-  stitchingInfo.selectionSetsByField = selectionSetsByField;
-  stitchingInfo.dynamicSelectionSetsByField = dynamicSelectionSetsByField;
-
   return stitchingInfo;
 }