chore: change how schema node is propagated

composition/src/federation/types.ts

@@ -60,10 +60,10 @@ export type ContractTagOptions = {
 };
 
 export type MutualParentDefinitionData = {
-  configureDescriptionDataBySubgraphName: Map<string, ConfigureDescriptionData>;
-  directivesByDirectiveName: Map<string, ConstDirectiveNode[]>;
+  configureDescriptionDataBySubgraphName: Map<SubgraphName, ConfigureDescriptionData>;
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>;
   extensionType: ExtensionType;
-  name: string;
+  name: TypeName;
   persistedDirectivesData: PersistedDirectivesData;
   description?: StringValueNode;
 };

composition/src/schema-building/types.ts

@@ -58,7 +58,7 @@ export enum ExtensionType {
 export type EnumDefinitionData = {
   appearances: number;
   configureDescriptionDataBySubgraphName: Map<SubgraphName, ConfigureDescriptionData>;
-  directivesByDirectiveName: Map<DirectiveName, Array<ConstDirectiveNode>>;
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>;
   enumValueDataByName: Map<string, EnumValueData>;
   extensionType: ExtensionType;
   isInaccessible: boolean;
@@ -73,7 +73,7 @@ export type EnumDefinitionData = {
 export type EnumValueData = {
   appearances: number;
   configureDescriptionDataBySubgraphName: Map<SubgraphName, ConfigureDescriptionData>;
-  directivesByDirectiveName: Map<DirectiveName, Array<ConstDirectiveNode>>;
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>;
   federatedCoords: string;
   kind: Kind.ENUM_VALUE_DEFINITION;
   name: string;
@@ -97,7 +97,7 @@ export type ExternalFieldData = {
 export type FieldData = {
   argumentDataByName: Map<string, InputValueData>;
   configureDescriptionDataBySubgraphName: Map<SubgraphName, ConfigureDescriptionData>;
-  directivesByDirectiveName: Map<DirectiveName, Array<ConstDirectiveNode>>;
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>;
   externalFieldDataBySubgraphName: Map<SubgraphName, ExternalFieldData>;
   federatedCoords: string;
   inheritedDirectiveNames: Set<DirectiveName>;
@@ -119,7 +119,7 @@ export type FieldData = {
 
 export type InputObjectDefinitionData = {
   configureDescriptionDataBySubgraphName: Map<SubgraphName, ConfigureDescriptionData>;
-  directivesByDirectiveName: Map<DirectiveName, Array<ConstDirectiveNode>>;
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>;
   extensionType: ExtensionType;
   inputValueDataByName: Map<FieldName, InputValueData>;
   isInaccessible: boolean;
@@ -133,7 +133,7 @@ export type InputObjectDefinitionData = {
 
 export type InputValueData = {
   configureDescriptionDataBySubgraphName: Map<SubgraphName, ConfigureDescriptionData>;
-  directivesByDirectiveName: Map<DirectiveName, Array<ConstDirectiveNode>>;
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>;
   federatedCoords: string;
   includeDefaultValue: boolean;
   isArgument: boolean;
@@ -156,7 +156,7 @@ export type InputValueData = {
 
 export type InterfaceDefinitionData = {
   configureDescriptionDataBySubgraphName: Map<SubgraphName, ConfigureDescriptionData>;
-  directivesByDirectiveName: Map<DirectiveName, Array<ConstDirectiveNode>>;
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>;
   extensionType: ExtensionType;
   fieldDataByName: Map<FieldName, FieldData>;
   implementedInterfaceTypeNames: Set<TypeName>;
@@ -173,7 +173,7 @@ export type InterfaceDefinitionData = {
 
 export type ObjectDefinitionData = {
   configureDescriptionDataBySubgraphName: Map<SubgraphName, ConfigureDescriptionData>;
-  directivesByDirectiveName: Map<DirectiveName, Array<ConstDirectiveNode>>;
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>;
   extensionType: ExtensionType;
   fieldDataByName: Map<FieldName, FieldData>;
   implementedInterfaceTypeNames: Set<TypeName>;
@@ -201,14 +201,14 @@ export type PersistedDirectiveDefinitionData = {
 
 export type PersistedDirectivesData = {
   deprecatedReason: string;
-  directivesByDirectiveName: Map<DirectiveName, Array<ConstDirectiveNode>>;
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>;
   isDeprecated: boolean;
   tagDirectiveByName: Map<string, ConstDirectiveNode>;
 };
 
 export type ScalarDefinitionData = {
   configureDescriptionDataBySubgraphName: Map<SubgraphName, ConfigureDescriptionData>;
-  directivesByDirectiveName: Map<DirectiveName, Array<ConstDirectiveNode>>;
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>;
   extensionType: ExtensionType;
   kind: Kind.SCALAR_TYPE_DEFINITION;
   name: TypeName;
@@ -219,7 +219,7 @@ export type ScalarDefinitionData = {
 };
 
 export type SchemaData = {
-  directivesByDirectiveName: Map<DirectiveName, Array<ConstDirectiveNode>>;
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>;
   kind: Kind.SCHEMA_DEFINITION;
   name: string;
   operationTypes: Map<OperationTypeNode, OperationTypeDefinitionNode>;
@@ -228,7 +228,7 @@ export type SchemaData = {
 
 export type UnionDefinitionData = {
   configureDescriptionDataBySubgraphName: Map<SubgraphName, ConfigureDescriptionData>;
-  directivesByDirectiveName: Map<DirectiveName, Array<ConstDirectiveNode>>;
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>;
   extensionType: ExtensionType;
   kind: Kind.UNION_TYPE_DEFINITION;
   name: TypeName;

composition/src/schema-building/utils.ts

@@ -86,7 +86,7 @@ import { DEFAULT_DEPRECATION_REASON } from 'graphql';
 export function newPersistedDirectivesData(): PersistedDirectivesData {
   return {
     deprecatedReason: '',
-    directivesByDirectiveName: new Map<DirectiveName, ConstDirectiveNode[]>(),
+    directivesByName: new Map<DirectiveName, Array<ConstDirectiveNode>>(),
     isDeprecated: false,
     tagDirectiveByName: new Map<string, ConstDirectiveNode>(),
   };
@@ -100,11 +100,11 @@ type IsNodeExternalOrShareableResult = {
 export function isNodeExternalOrShareable(
   node: ObjectTypeNode | FieldDefinitionNode,
   areAllFieldsShareable: boolean,
-  directivesByDirectiveName: Map<DirectiveName, ConstDirectiveNode[]>,
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>,
 ): IsNodeExternalOrShareableResult {
   const result: IsNodeExternalOrShareableResult = {
-    isExternal: directivesByDirectiveName.has(EXTERNAL),
-    isShareable: areAllFieldsShareable || directivesByDirectiveName.has(SHAREABLE),
+    isExternal: directivesByName.has(EXTERNAL),
+    isShareable: areAllFieldsShareable || directivesByName.has(SHAREABLE),
   };
   if (!node.directives?.length) {
     return result;
@@ -224,7 +224,7 @@ type ChildDefinitionNode = EnumValueDefinitionNode | FieldDefinitionNode | Input
 function propagateFieldDataArguments(fieldData: FieldData) {
   for (const argumentData of fieldData.argumentDataByName.values()) {
     // First propagate the argument's directives
-    for (const directiveNodes of argumentData.directivesByDirectiveName.values()) {
+    for (const directiveNodes of argumentData.directivesByName.values()) {
       argumentData.node.directives.push(...directiveNodes);
     }
     fieldData.node.arguments.push(argumentData.node);
@@ -239,7 +239,7 @@ export function childMapToValueArray<T extends ChildData, U extends ChildDefinit
     if (isFieldData(childData)) {
       propagateFieldDataArguments(childData);
     }
-    for (const [directiveName, directiveNodes] of childData.directivesByDirectiveName) {
+    for (const [directiveName, directiveNodes] of childData.directivesByName) {
       if (directiveName === DEPRECATED) {
         // @deprecated is non-repeatable
         const directiveNode = directiveNodes[0];
@@ -341,12 +341,10 @@ export function propagateAuthDirectives(parentData: ParentDefinitionData, authDa
     return;
   }
   if (authData.requiresAuthentication) {
-    parentData.persistedDirectivesData.directivesByDirectiveName.set(AUTHENTICATED, [
-      generateSimpleDirective(AUTHENTICATED),
-    ]);
+    parentData.persistedDirectivesData.directivesByName.set(AUTHENTICATED, [generateSimpleDirective(AUTHENTICATED)]);
   }
   if (authData.requiredScopes.length > 0) {
-    parentData.persistedDirectivesData.directivesByDirectiveName.set(REQUIRES_SCOPES, [
+    parentData.persistedDirectivesData.directivesByName.set(REQUIRES_SCOPES, [
       generateRequiresScopesDirective(authData.requiredScopes),
     ]);
   }
@@ -361,12 +359,10 @@ export function propagateFieldAuthDirectives(fieldData: FieldData, authData?: Au
     return;
   }
   if (fieldAuthData.originalData.requiresAuthentication) {
-    fieldData.persistedDirectivesData.directivesByDirectiveName.set(AUTHENTICATED, [
-      generateSimpleDirective(AUTHENTICATED),
-    ]);
+    fieldData.persistedDirectivesData.directivesByName.set(AUTHENTICATED, [generateSimpleDirective(AUTHENTICATED)]);
   }
   if (fieldAuthData.originalData.requiredScopes.length > 0) {
-    fieldData.persistedDirectivesData.directivesByDirectiveName.set(REQUIRES_SCOPES, [
+    fieldData.persistedDirectivesData.directivesByName.set(REQUIRES_SCOPES, [
       generateRequiresScopesDirective(fieldAuthData.originalData.requiredScopes),
     ]);
   }
@@ -390,14 +386,14 @@ export function generateDeprecatedDirective(reason: string): ConstDirectiveNode
 }
 
 function getValidFlattenedPersistedDirectiveNodeArray(
-  directivesByDirectiveName: Map<DirectiveName, ConstDirectiveNode[]>,
-  persistedDirectiveDefinitionByDirectiveName: Map<DirectiveName, DirectiveDefinitionNode>,
+  directivesByName: Map<DirectiveName, Array<ConstDirectiveNode>>,
+  persistedDirectiveDefinitionByName: Map<DirectiveName, DirectiveDefinitionNode>,
   directiveCoords: string,
   errors: Error[],
 ): ConstDirectiveNode[] {
-  const persistedDirectiveNodes: ConstDirectiveNode[] = [];
-  for (const [directiveName, directiveNodes] of directivesByDirectiveName) {
-    const persistedDirectiveDefinition = persistedDirectiveDefinitionByDirectiveName.get(directiveName);
+  const persistedDirectiveNodes: Array<ConstDirectiveNode> = [];
+  for (const [directiveName, directiveNodes] of directivesByName) {
+    const persistedDirectiveDefinition = persistedDirectiveDefinitionByName.get(directiveName);
     if (!persistedDirectiveDefinition) {
       continue;
     }
@@ -416,7 +412,7 @@ function getValidFlattenedPersistedDirectiveNodeArray(
 
 function getRouterPersistedDirectiveNodes<T extends NodeData>(
   nodeData: T,
-  persistedDirectiveDefinitionByDirectiveName: Map<string, DirectiveDefinitionNode>,
+  persistedDirectiveDefinitionByName: Map<DirectiveName, DirectiveDefinitionNode>,
   errors: Error[],
 ): ConstDirectiveNode[] {
   const persistedDirectiveNodes = [...nodeData.persistedDirectivesData.tagDirectiveByName.values()];
@@ -425,8 +421,8 @@ function getRouterPersistedDirectiveNodes<T extends NodeData>(
   }
   persistedDirectiveNodes.push(
     ...getValidFlattenedPersistedDirectiveNodeArray(
-      nodeData.persistedDirectivesData.directivesByDirectiveName,
-      persistedDirectiveDefinitionByDirectiveName,
+      nodeData.persistedDirectivesData.directivesByName,
+      persistedDirectiveDefinitionByName,
       nodeData.name,
       errors,
     ),
@@ -435,11 +431,11 @@ function getRouterPersistedDirectiveNodes<T extends NodeData>(
 }
 
 export function getClientPersistedDirectiveNodes<T extends NodeData>(nodeData: T): ConstDirectiveNode[] {
-  const persistedDirectiveNodes: ConstDirectiveNode[] = [];
+  const persistedDirectiveNodes: Array<ConstDirectiveNode> = [];
   if (nodeData.persistedDirectivesData.isDeprecated) {
     persistedDirectiveNodes.push(generateDeprecatedDirective(nodeData.persistedDirectivesData.deprecatedReason));
   }
-  for (const [directiveName, directiveNodes] of nodeData.persistedDirectivesData.directivesByDirectiveName) {
+  for (const [directiveName, directiveNodes] of nodeData.persistedDirectivesData.directivesByName) {
     if (directiveName === SEMANTIC_NON_NULL && isFieldData(nodeData)) {
       persistedDirectiveNodes.push(
         generateSemanticNonNullDirective(getFirstEntry(nodeData.nullLevelsBySubgraphName) ?? new Set<number>([0])),
@@ -657,10 +653,7 @@ export function isTypeValidImplementation(
 }
 
 export function isNodeDataInaccessible(data: NodeData): boolean {
-  return (
-    data.persistedDirectivesData.directivesByDirectiveName.has(INACCESSIBLE) ||
-    data.directivesByDirectiveName.has(INACCESSIBLE)
-  );
+  return data.persistedDirectivesData.directivesByName.has(INACCESSIBLE) || data.directivesByName.has(INACCESSIBLE);
 }
 
 export function isLeafKind(kind: Kind): boolean {

composition/src/subgraph/types.ts

@@ -1,4 +1,11 @@
-import { DirectiveDefinitionNode, DocumentNode, GraphQLSchema, OperationTypeNode } from 'graphql';
+import {
+  DirectiveDefinitionNode,
+  DocumentNode,
+  GraphQLSchema,
+  OperationTypeNode,
+  SchemaDefinitionNode,
+  SchemaExtensionNode,
+} from 'graphql';
 import { ConfigurationData } from '../router-configuration/types';
 import {
   ConditionalFieldData,
@@ -7,7 +14,6 @@ import {
   PersistedDirectiveDefinitionData,
 } from '../schema-building/types';
 import { DirectiveName, FieldName, SubgraphName, TypeName } from '../types/types';
-import { SchemaDefinitionNode, SchemaExtensionNode } from 'graphql/index';
 
 export type Subgraph = {
   definitions: DocumentNode;
@@ -31,11 +37,11 @@ export type InternalSubgraph = {
   directiveDefinitionByName: Map<DirectiveName, DirectiveDefinitionNode>;
   entityInterfaces: Map<string, EntityInterfaceSubgraphData>;
   isVersionTwo: boolean;
-  keyFieldNamesByParentTypeName: Map<TypeName, Set<string>>;
-  name: string;
+  keyFieldNamesByParentTypeName: Map<TypeName, Set<FieldName>>;
+  name: SubgraphName;
   operationTypes: Map<string, OperationTypeNode>;
   overriddenFieldNamesByParentTypeName: Map<TypeName, Set<FieldName>>;
-  parentDefinitionDataByTypeName: Map<string, ParentDefinitionData>;
+  parentDefinitionDataByTypeName: Map<TypeName, ParentDefinitionData>;
   persistedDirectiveDefinitionDataByDirectiveName: Map<DirectiveName, PersistedDirectiveDefinitionData>;
   schema: GraphQLSchema;
   schemaNode?: SchemaDefinitionNode | SchemaExtensionNode;