feat: expose type data and record subgraphs for enums

admission-server/Dockerfile

@@ -23,7 +23,7 @@ FROM --platform=${BUILDPLATFORM} node:lts-slim
 
 WORKDIR /app
 
-ENV NODE_ENV production
+ENV NODE_ENV=production
 
 # Fetch built artifacts
 COPY --from=builder /app/pruned .

cdn-server/Dockerfile

@@ -24,7 +24,7 @@ FROM --platform=${BUILDPLATFORM} node:lts-slim
 
 WORKDIR /app
 
-ENV NODE_ENV production
+ENV NODE_ENV=production
 
 # Fetch built artifacts
 COPY --from=builder /app/pruned .

composition/src/federation/federation-factory.ts

@@ -566,6 +566,7 @@ export class FederationFactory {
     }
     existingData.appearances += 1;
     setLongestDescription(existingData, incomingData);
+    addIterableValuesToSet(incomingData.subgraphNames, existingData.subgraphNames);
   }
 
   // To facilitate the splitting of tag paths, field arguments do not use the renamedPath property for tagNamesByPath
@@ -1043,6 +1044,7 @@ export class FederationFactory {
     switch (existingData.kind) {
       case Kind.ENUM_TYPE_DEFINITION:
         existingData.appearances += 1;
+        addIterableValuesToSet((incomingData as EnumDefinitionData).subgraphNames, existingData.subgraphNames);
         for (const data of (incomingData as EnumDefinitionData).enumValueDataByValueName.values()) {
           this.upsertEnumValueData(existingData.enumValueDataByValueName, data, isParentInaccessible);
         }
@@ -2388,6 +2390,7 @@ export class FederationFactory {
         federatedGraphAST: newRouterAST,
         federatedGraphSchema: buildASTSchema(newRouterAST, { assumeValid: true, assumeValidSDL: true }),
         federatedGraphClientSchema: newClientSchema,
+        parentDefinitionDataByTypeName: this.parentDefinitionDataByTypeName,
         ...this.getClientSchemaObjectBoolean(),
       },
       warnings: this.warnings,
@@ -2671,6 +2674,7 @@ export class FederationFactory {
         federatedGraphAST: newRouterAST,
         federatedGraphSchema: buildASTSchema(newRouterAST, { assumeValid: true, assumeValidSDL: true }),
         federatedGraphClientSchema: newClientSchema,
+        parentDefinitionDataByTypeName: this.parentDefinitionDataByTypeName,
         ...this.getClientSchemaObjectBoolean(),
       },
       warnings: this.warnings,

composition/src/federation/utils.ts

@@ -45,6 +45,7 @@ export type FederationResult = {
   federatedGraphAST: DocumentNode;
   federatedGraphClientSchema: GraphQLSchema;
   federatedGraphSchema: GraphQLSchema;
+  parentDefinitionDataByTypeName: Map<string, ParentDefinitionData>;
   subgraphConfigBySubgraphName: Map<string, SubgraphConfig>;
   shouldIncludeClientSchema?: boolean;
 };

composition/src/normalization/normalization-factory.ts

@@ -848,6 +848,7 @@ export class NormalizationFactory {
         return;
       }
       this.setParentDataExtensionType(parentData, extensionType);
+      parentData.subgraphNames.add(this.subgraphName);
       parentData.description ||= formatDescription('description' in node ? node.description : undefined);
       return;
     }
@@ -860,6 +861,7 @@ export class NormalizationFactory {
       name: typeName,
       node: getMutableEnumNode(node.name),
       persistedDirectivesData: newPersistedDirectivesData(),
+      subgraphNames: new Set([this.subgraphName]),
       description: formatDescription('description' in node ? node.description : undefined),
     });
   }

composition/src/normalization/walkers.ts

@@ -313,6 +313,7 @@ export function upsertParentsAndChildren(nf: NormalizationFactory, document: Doc
           nf.directiveDefinitionByDirectiveName,
           nf.handledRepeatedDirectivesByHostPath,
           nf.originalParentTypeName,
+          nf.subgraphName,
         );
       },
       leave() {

composition/src/schema-building/type-definition-data.ts

@@ -35,6 +35,7 @@ export type EnumDefinitionData = {
   name: string;
   node: MutableEnumNode;
   persistedDirectivesData: PersistedDirectivesData;
+  subgraphNames: Set<string>;
   description?: StringValueNode;
 };
 
@@ -45,6 +46,7 @@ export type EnumValueData = {
   node: MutableEnumValueNode;
   parentTypeName: string;
   persistedDirectivesData: PersistedDirectivesData;
+  subgraphNames: Set<string>;
   description?: StringValueNode;
 };
 

composition/src/schema-building/utils.ts

@@ -439,6 +439,7 @@ export function addEnumValueDataByNode(
   directiveDefinitionByDirectiveName: Map<string, DirectiveDefinitionNode>,
   handledRepeatedDirectivesByHostPath: Map<string, Set<string>>,
   parentTypeName: string,
+  subgraphName: string,
 ) {
   const name = node.name.value;
   enumValueDataByValueName.set(name, {
@@ -455,6 +456,7 @@ export function addEnumValueDataByNode(
     node: getMutableEnumValueNode(node),
     parentTypeName,
     persistedDirectivesData: newPersistedDirectivesData(),
+    subgraphNames: new Set([subgraphName]),
     description: formatDescription(node.description),
   });
 }

composition/tests/enums.test.ts

@@ -1,6 +1,7 @@
 import {
   duplicateEnumValueDefinitionError,
   ENUM,
+  EnumDefinitionData,
   federateSubgraphs,
   incompatibleSharedEnumError,
   noBaseDefinitionForExtensionError,
@@ -521,6 +522,31 @@ describe('Enum tests', () => {
         ),
       );
     });
+
+    test('that an Enum has subgraphs data', () => {
+      const { errors, federationResult } = federateSubgraphs([subgraphA, subgraphC]);
+      expect(errors).toBeUndefined();
+
+      const enumDef = federationResult?.parentDefinitionDataByTypeName.get('Instruction') as EnumDefinitionData;
+
+      expect(enumDef.subgraphNames.size).toBe(2);
+      expect(enumDef.subgraphNames).toContain(subgraphA.name);
+      expect(enumDef.subgraphNames).toContain(subgraphC.name);
+
+      const fightEnumVal = enumDef.enumValueDataByValueName.get('FIGHT');
+      expect(fightEnumVal?.subgraphNames.size).toBe(2);
+      expect(fightEnumVal?.subgraphNames).toContain(subgraphA.name);
+      expect(fightEnumVal?.subgraphNames).toContain(subgraphC.name);
+
+      const pokemonEnumVal = enumDef.enumValueDataByValueName.get('POKEMON');
+      expect(pokemonEnumVal?.subgraphNames.size).toBe(2);
+      expect(pokemonEnumVal?.subgraphNames).toContain(subgraphA.name);
+      expect(pokemonEnumVal?.subgraphNames).toContain(subgraphC.name);
+
+      const itemEnumVal = enumDef.enumValueDataByValueName.get('ITEM');
+      expect(itemEnumVal?.subgraphNames.size).toBe(1);
+      expect(itemEnumVal?.subgraphNames).toContain(subgraphC.name);
+    });
   });
 });
 

controlplane/Dockerfile

@@ -34,7 +34,7 @@ FROM --platform=${BUILDPLATFORM} node:lts-alpine
 
 WORKDIR /app
 
-ENV NODE_ENV production
+ENV NODE_ENV=production
 
 # Fetch built artifacts
 COPY --from=builder /app/pruned .

studio/Dockerfile

@@ -29,14 +29,14 @@ ARG SENTRY_PROJECT
 ARG SENTRY_SERVER_SAMPLE_RATE
 ARG SENTRY_EDGE_SAMPLE_RATE
 
-ENV NEXT_PUBLIC_SENTRY_ENABLED $NEXT_PUBLIC_SENTRY_ENABLED
-ENV NEXT_PUBLIC_SENTRY_REPLAY_ENABLED $NEXT_PUBLIC_SENTRY_REPLAY_ENABLED
-ENV SENTRY_DEBUG $SENTRY_DEBUG
-ENV SENTRY_AUTH_TOKEN $SENTRY_AUTH_TOKEN
-ENV SENTRY_ORG $SENTRY_ORG
-ENV SENTRY_PROJECT $SENTRY_PROJECT
-ENV SENTRY_SERVER_SAMPLE_RATE $SENTRY_SERVER_SAMPLE_RATE
-ENV SENTRY_EDGE_SAMPLE_RATE $SENTRY_EDGE_SAMPLE_RATE
+ENV NEXT_PUBLIC_SENTRY_ENABLED=$NEXT_PUBLIC_SENTRY_ENABLED
+ENV NEXT_PUBLIC_SENTRY_REPLAY_ENABLED=$NEXT_PUBLIC_SENTRY_REPLAY_ENABLED
+ENV SENTRY_DEBUG=$SENTRY_DEBUG
+ENV SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN
+ENV SENTRY_ORG=$SENTRY_ORG
+ENV SENTRY_PROJECT=$SENTRY_PROJECT
+ENV SENTRY_SERVER_SAMPLE_RATE=$SENTRY_SERVER_SAMPLE_RATE
+ENV SENTRY_EDGE_SAMPLE_RATE=$SENTRY_EDGE_SAMPLE_RATE
 
 COPY . /app/
 
@@ -48,8 +48,8 @@ FROM --platform=${BUILDPLATFORM} node:lts-alpine
 
 WORKDIR /app
 
-ENV NODE_ENV production
-ENV NEXT_TELEMETRY_DISABLED 1
+ENV NODE_ENV=production
+ENV NEXT_TELEMETRY_DISABLED=1
 
 # Fetch built artifacts
 COPY --from=builder /app/studio/.next/standalone ./
@@ -64,7 +64,7 @@ ENTRYPOINT ["./entrypoint.sh"]
 
 EXPOSE 3000
 
-ENV PORT 3000
-ENV HOSTNAME localhost
+ENV PORT=3000
+ENV HOSTNAME=localhost
 
 CMD ["node", "./studio/server.js"]