@theguild/federation-composition 0.9.0 → 0.10.0

package/esm/supergraph/validation/validate-supergraph.js

@@ -27,7 +27,7 @@ import { createSupergraphValidationContext } from './validation-context.js';
 export function validateSupergraph(subgraphStates, state, __internal) {
     const context = createSupergraphValidationContext(subgraphStates);
     for (const subgraphState of subgraphStates.values()) {
-        state.addGraph(subgraphState.graph);
+        state.addSubgraph(subgraphState);
     }
     const preSupergraphRules = [RequiredQueryRule, TypesOfTheSameKindRule];
     const rulesToSkip = __internal?.disableValidationRules ?? [];

package/esm/utils/logger.js

@@ -0,0 +1,119 @@
+import debug from 'debug';
+const originalFormatArgs = debug.formatArgs;
+debug.formatArgs = function (args) {
+    originalFormatArgs.call(this, args);
+    const line = args[0];
+    const noColorsPrefix = ` ${this.namespace} `;
+    const colorsPrefix = `${this.namespace}`;
+    const noColorsStartsAt = line.indexOf(noColorsPrefix);
+    if (noColorsStartsAt > -1) {
+        args[0] = line.slice(noColorsStartsAt + noColorsPrefix.length);
+    }
+    else {
+        const colorsStartsAt = line.indexOf(colorsPrefix);
+        args[0] = line.slice(colorsStartsAt + colorsPrefix.length);
+    }
+};
+export class LoggerContext {
+    indent = {
+        level: 0,
+        str: '',
+        times: [],
+    };
+    maxIdLength = 0;
+    idUpdateFns = [];
+    logger = debug('composition');
+    firstLoggerAt = 0;
+    down(time) {
+        this.updateIndent(+1, time);
+    }
+    up(time) {
+        if (this.indent.level > 0) {
+            this.updateIndent(-1, time);
+            return this.indent.times.pop();
+        }
+    }
+    getTime() {
+        if (!this.firstLoggerAt) {
+            this.firstLoggerAt = Date.now();
+            return 0;
+        }
+        return Date.now() - this.firstLoggerAt;
+    }
+    getIndent() {
+        return this.indent;
+    }
+    register(id, idUpdateFn) {
+        idUpdateFn(this.maxIdLength);
+        this.idUpdateFns.push(idUpdateFn);
+        const newMaxIdLength = Math.max(this.maxIdLength, id.length);
+        if (newMaxIdLength > this.maxIdLength) {
+            this.maxIdLength = newMaxIdLength;
+            this.idUpdateFns.forEach(fn => fn(newMaxIdLength));
+        }
+        return this.logger.extend(id);
+    }
+    updateIndent(delta, time) {
+        if (this.indent.level + delta < 0) {
+            return;
+        }
+        if (delta > 0) {
+            this.indent.times.push(time);
+        }
+        this.indent.level += delta;
+        this.indent.str = '│ '.repeat(this.indent.level);
+    }
+}
+export class Logger {
+    id;
+    context;
+    isEnabled;
+    debug;
+    idPrefix;
+    constructor(id, context) {
+        this.id = id;
+        this.context = context;
+        this.id = id;
+        this.context = context;
+        this.idPrefix = `${id}`;
+        this.debug = this.context.register(this.id, this._updateIdPrefix.bind(this));
+        this.isEnabled = this.debug.enabled;
+        this.debug.log = console.log;
+    }
+    log(msg, prefix = '- ') {
+        if (this.isEnabled) {
+            this._log(prefix, msg);
+        }
+    }
+    group(msg) {
+        if (this.isEnabled) {
+            this.log(msg, '┌ ');
+            this.context.down(Date.now());
+        }
+    }
+    groupEnd(msg) {
+        if (this.isEnabled) {
+            const time = this.context.up(Date.now());
+            let message = msg ? (typeof msg === 'string' ? msg : msg()) : '';
+            if (time) {
+                message += ` (${Date.now() - time}ms)`;
+            }
+            this.log(message, '└ ');
+        }
+    }
+    create(id) {
+        return new Logger(id, this.context);
+    }
+    _log(prefix, msg) {
+        const indent = this.context.getIndent().str;
+        const message = typeof msg === 'string' ? msg : msg();
+        if (this.isEnabled) {
+            const sinceStart = this.context.getTime();
+            const text = this.idPrefix + ' ' + indent + prefix + message + ` +${sinceStart}ms`;
+            this.debug(text);
+        }
+    }
+    _updateIdPrefix(maxLength) {
+        this.idPrefix = this.id.padEnd(maxLength, ' ');
+    }
+}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@theguild/federation-composition",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Open Source Composition library for Apollo Federation",
   "peerDependencies": {
     "graphql": "^16.0.0"
   },
   "dependencies": {
     "constant-case": "^3.0.0",
+    "debug": "4.3.4",
     "json5": "^2.2.0",
     "lodash.sortby": "^4.7.0"
   },

package/typings/subgraph/state.d.cts

@@ -123,6 +123,7 @@ export interface Field {
     override: string | null;
     provides: string | null;
     requires: string | null;
+    extension: boolean;
     required: boolean;
     provided: boolean;
     shareable: boolean;
@@ -243,6 +244,7 @@ export declare function createSubgraphStateBuilder(graph: {
         setDirective(typeName: string, directive: DirectiveNode): void;
         field: {
             setType(typeName: string, fieldName: string, fieldType: string): void;
+            setExtension(typeName: string, fieldName: string): void;
             setDirective(typeName: string, fieldName: string, directive: DirectiveNode): void;
             setDescription(typeName: string, fieldName: string, description: Description): void;
             setDeprecated(typeName: string, fieldName: string, reason?: string | undefined): void;

package/typings/subgraph/state.d.ts

@@ -123,6 +123,7 @@ export interface Field {
     override: string | null;
     provides: string | null;
     requires: string | null;
+    extension: boolean;
     required: boolean;
     provided: boolean;
     shareable: boolean;
@@ -243,6 +244,7 @@ export declare function createSubgraphStateBuilder(graph: {
         setDirective(typeName: string, directive: DirectiveNode): void;
         field: {
             setType(typeName: string, fieldName: string, fieldType: string): void;
+            setExtension(typeName: string, fieldName: string): void;
             setDirective(typeName: string, fieldName: string, directive: DirectiveNode): void;
             setDescription(typeName: string, fieldName: string, description: Description): void;
             setDeprecated(typeName: string, fieldName: string, reason?: string | undefined): void;

package/typings/subgraph/validation/validate-state.d.cts

@@ -1,6 +1,7 @@
 import { GraphQLError } from 'graphql';
 import { Directive, EnumType, InputObjectType, InterfaceType, ObjectType, ScalarType, SubgraphState, SubgraphType, UnionType } from '../state.cjs';
-export declare function validateSubgraphState(state: SubgraphState): GraphQLError[];
+import { SubgraphValidationContext } from './validation-context.cjs';
+export declare function validateSubgraphState(state: SubgraphState, context: SubgraphValidationContext): GraphQLError[];
 export declare function isTypeSubTypeOf(state: SubgraphState, implementationsMap: Map<string, Set<string>>, maybeSubTypeName: string, superTypeName: string): boolean;
 export declare function isInputType(state: SubgraphState, typeName: string): boolean;
 export declare function typeExists(state: SubgraphState, typeName: string): boolean;

package/typings/subgraph/validation/validate-state.d.ts

@@ -1,6 +1,7 @@
 import { GraphQLError } from 'graphql';
 import { Directive, EnumType, InputObjectType, InterfaceType, ObjectType, ScalarType, SubgraphState, SubgraphType, UnionType } from '../state.js';
-export declare function validateSubgraphState(state: SubgraphState): GraphQLError[];
+import { SubgraphValidationContext } from './validation-context.js';
+export declare function validateSubgraphState(state: SubgraphState, context: SubgraphValidationContext): GraphQLError[];
 export declare function isTypeSubTypeOf(state: SubgraphState, implementationsMap: Map<string, Set<string>>, maybeSubTypeName: string, superTypeName: string): boolean;
 export declare function isInputType(state: SubgraphState, typeName: string): boolean;
 export declare function typeExists(state: SubgraphState, typeName: string): boolean;

package/typings/subgraph/validation/validation-context.d.cts

@@ -61,6 +61,7 @@ export declare function createSubgraphValidationContext(subgraph: {
             setDirective(typeName: string, directive: import("graphql").DirectiveNode): void;
             field: {
                 setType(typeName: string, fieldName: string, fieldType: string): void;
+                setExtension(typeName: string, fieldName: string): void;
                 setDirective(typeName: string, fieldName: string, directive: import("graphql").DirectiveNode): void;
                 setDescription(typeName: string, fieldName: string, description: import("../state.js").Description): void;
                 setDeprecated(typeName: string, fieldName: string, reason?: string | undefined): void;
@@ -171,6 +172,8 @@ export declare function createSubgraphValidationContext(subgraph: {
         markSpecAsUsed(specName: "link" | "tag" | "inaccessible" | "policy" | "requiresScopes" | "authenticated"): void;
         visitor(typeNodeInfo: TypeNodeInfo): import("graphql").ASTVisitor;
     };
+    isLinkSpecDirective(name: string): boolean;
+    isLinkSpecType(name: string): boolean;
     isAvailableFederationType(name: string): boolean;
     isAvailableFederationDirective(specDirectiveName: string, directiveNode: {
         name: {

package/typings/subgraph/validation/validation-context.d.ts

@@ -61,6 +61,7 @@ export declare function createSubgraphValidationContext(subgraph: {
             setDirective(typeName: string, directive: import("graphql").DirectiveNode): void;
             field: {
                 setType(typeName: string, fieldName: string, fieldType: string): void;
+                setExtension(typeName: string, fieldName: string): void;
                 setDirective(typeName: string, fieldName: string, directive: import("graphql").DirectiveNode): void;
                 setDescription(typeName: string, fieldName: string, description: import("../state.js").Description): void;
                 setDeprecated(typeName: string, fieldName: string, reason?: string | undefined): void;
@@ -171,6 +172,8 @@ export declare function createSubgraphValidationContext(subgraph: {
         markSpecAsUsed(specName: "link" | "tag" | "inaccessible" | "policy" | "requiresScopes" | "authenticated"): void;
         visitor(typeNodeInfo: TypeNodeInfo): import("graphql").ASTVisitor;
     };
+    isLinkSpecDirective(name: string): boolean;
+    isLinkSpecType(name: string): boolean;
     isAvailableFederationType(name: string): boolean;
     isAvailableFederationDirective(specDirectiveName: string, directiveNode: {
         name: {

package/typings/supergraph/composition/common.d.cts

@@ -1,5 +1,6 @@
 import type { ConstDirectiveNode, DirectiveDefinitionNode, DirectiveNode, TypeDefinitionNode } from 'graphql';
 import type { FederationVersion } from '../../specifications/federation.cjs';
+import { SubgraphState } from '../../subgraph/state.cjs';
 import type { SupergraphState } from '../state.cjs';
 export type MapByGraph<T> = Map<string, T>;
 export interface Key {
@@ -14,7 +15,7 @@ export interface Graph {
 }
 export interface TypeBuilder<T, S> {
     visitSubgraphState(graph: Graph, state: Map<string, S>, typeName: string, type: T): void;
-    composeSupergraphNode(type: S, graphMap: Map<string, Graph>, helpers: {
+    composeSupergraphNode(type: S, graphMap: Map<string, SubgraphState>, helpers: {
         graphNameToId(graphName: string): string | null;
         supergraphState: SupergraphState;
     }): TypeDefinitionNode | DirectiveDefinitionNode;

package/typings/supergraph/composition/common.d.ts

@@ -1,5 +1,6 @@
 import type { ConstDirectiveNode, DirectiveDefinitionNode, DirectiveNode, TypeDefinitionNode } from 'graphql';
 import type { FederationVersion } from '../../specifications/federation.js';
+import { SubgraphState } from '../../subgraph/state.js';
 import type { SupergraphState } from '../state.js';
 export type MapByGraph<T> = Map<string, T>;
 export interface Key {
@@ -14,7 +15,7 @@ export interface Graph {
 }
 export interface TypeBuilder<T, S> {
     visitSubgraphState(graph: Graph, state: Map<string, S>, typeName: string, type: T): void;
-    composeSupergraphNode(type: S, graphMap: Map<string, Graph>, helpers: {
+    composeSupergraphNode(type: S, graphMap: Map<string, SubgraphState>, helpers: {
         graphNameToId(graphName: string): string | null;
         supergraphState: SupergraphState;
     }): TypeDefinitionNode | DirectiveDefinitionNode;

package/typings/supergraph/composition/directive.d.cts

@@ -1,8 +1,10 @@
 import { DirectiveNode } from 'graphql';
+import { FederationVersion } from '../../specifications/federation.cjs';
 import type { Directive } from '../../subgraph/state.cjs';
 import { MapByGraph, TypeBuilder } from './common.cjs';
 export declare function directiveBuilder(): TypeBuilder<Directive, DirectiveState>;
 export type DirectiveState = {
+    kind: 'directive';
     name: string;
     byGraph: MapByGraph<DirectiveStateInGraph>;
     locations: Set<string>;
@@ -12,6 +14,7 @@ export type DirectiveState = {
 type DirectiveStateInGraph = {
     locations: Set<string>;
     repeatable: boolean;
+    version: FederationVersion;
 };
 export type DirectiveArgState = {
     name: string;
@@ -27,6 +30,7 @@ export type DirectiveArgState = {
 type ArgStateInGraph = {
     type: string;
     defaultValue?: string;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=directive.d.ts.map

package/typings/supergraph/composition/directive.d.ts

@@ -1,8 +1,10 @@
 import { DirectiveNode } from 'graphql';
+import { FederationVersion } from '../../specifications/federation.js';
 import type { Directive } from '../../subgraph/state.js';
 import { MapByGraph, TypeBuilder } from './common.js';
 export declare function directiveBuilder(): TypeBuilder<Directive, DirectiveState>;
 export type DirectiveState = {
+    kind: 'directive';
     name: string;
     byGraph: MapByGraph<DirectiveStateInGraph>;
     locations: Set<string>;
@@ -12,6 +14,7 @@ export type DirectiveState = {
 type DirectiveStateInGraph = {
     locations: Set<string>;
     repeatable: boolean;
+    version: FederationVersion;
 };
 export type DirectiveArgState = {
     name: string;
@@ -27,6 +30,7 @@ export type DirectiveArgState = {
 type ArgStateInGraph = {
     type: string;
     defaultValue?: string;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=directive.d.ts.map

package/typings/supergraph/composition/enum-type.d.cts

@@ -1,7 +1,9 @@
+import { FederationVersion } from '../../specifications/federation.cjs';
 import { Deprecated, Description, EnumType } from '../../subgraph/state.cjs';
 import type { MapByGraph, TypeBuilder } from './common.cjs';
 export declare function enumTypeBuilder(): TypeBuilder<EnumType, EnumTypeState>;
 export type EnumTypeState = {
+    kind: 'enum';
     name: string;
     tags: Set<string>;
     inaccessible: boolean;
@@ -27,9 +29,11 @@ type EnumValueState = {
 };
 type EnumTypeStateInGraph = {
     inaccessible: boolean;
+    version: FederationVersion;
 };
 type EnumValueStateInGraph = {
     inaccessible: boolean;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=enum-type.d.ts.map

package/typings/supergraph/composition/enum-type.d.ts

@@ -1,7 +1,9 @@
+import { FederationVersion } from '../../specifications/federation.js';
 import { Deprecated, Description, EnumType } from '../../subgraph/state.js';
 import type { MapByGraph, TypeBuilder } from './common.js';
 export declare function enumTypeBuilder(): TypeBuilder<EnumType, EnumTypeState>;
 export type EnumTypeState = {
+    kind: 'enum';
     name: string;
     tags: Set<string>;
     inaccessible: boolean;
@@ -27,9 +29,11 @@ type EnumValueState = {
 };
 type EnumTypeStateInGraph = {
     inaccessible: boolean;
+    version: FederationVersion;
 };
 type EnumValueStateInGraph = {
     inaccessible: boolean;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=enum-type.d.ts.map

package/typings/supergraph/composition/input-object-type.d.cts

@@ -1,7 +1,9 @@
+import { FederationVersion } from '../../specifications/federation.cjs';
 import { Deprecated, Description, InputObjectType } from '../../subgraph/state.cjs';
 import type { MapByGraph, TypeBuilder } from './common.cjs';
 export declare function inputObjectTypeBuilder(): TypeBuilder<InputObjectType, InputObjectTypeState>;
 export interface InputObjectTypeState {
+    kind: 'input';
     name: string;
     tags: Set<string>;
     inaccessible: boolean;
@@ -22,11 +24,13 @@ export type InputObjectTypeFieldState = {
 };
 type InputObjectTypeStateInGraph = {
     inaccessible: boolean;
+    version: FederationVersion;
 };
 type InputObjectFieldStateInGraph = {
     type: string;
     inaccessible: boolean;
     defaultValue?: string;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=input-object-type.d.ts.map

package/typings/supergraph/composition/input-object-type.d.ts

@@ -1,7 +1,9 @@
+import { FederationVersion } from '../../specifications/federation.js';
 import { Deprecated, Description, InputObjectType } from '../../subgraph/state.js';
 import type { MapByGraph, TypeBuilder } from './common.js';
 export declare function inputObjectTypeBuilder(): TypeBuilder<InputObjectType, InputObjectTypeState>;
 export interface InputObjectTypeState {
+    kind: 'input';
     name: string;
     tags: Set<string>;
     inaccessible: boolean;
@@ -22,11 +24,13 @@ export type InputObjectTypeFieldState = {
 };
 type InputObjectTypeStateInGraph = {
     inaccessible: boolean;
+    version: FederationVersion;
 };
 type InputObjectFieldStateInGraph = {
     type: string;
     inaccessible: boolean;
     defaultValue?: string;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=input-object-type.d.ts.map

package/typings/supergraph/composition/interface-type.d.cts

@@ -1,8 +1,10 @@
 import { DirectiveNode } from 'graphql';
+import { FederationVersion } from '../../specifications/federation.cjs';
 import { Deprecated, Description, InterfaceType } from '../../subgraph/state.cjs';
 import type { Key, MapByGraph, TypeBuilder } from './common.cjs';
 export declare function interfaceTypeBuilder(): TypeBuilder<InterfaceType, InterfaceTypeState>;
 export type InterfaceTypeState = {
+    kind: 'interface';
     name: string;
     tags: Set<string>;
     inaccessible: boolean;
@@ -52,16 +54,19 @@ type InterfaceTypeInGraph = {
     keys: Key[];
     interfaces: Set<string>;
     implementedBy: Set<string>;
+    version: FederationVersion;
 };
 type FieldStateInGraph = {
     type: string;
     override: string | null;
     provides: string | null;
     requires: string | null;
+    version: FederationVersion;
 };
 type ArgStateInGraph = {
     type: string;
     defaultValue?: string;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=interface-type.d.ts.map

package/typings/supergraph/composition/interface-type.d.ts

@@ -1,8 +1,10 @@
 import { DirectiveNode } from 'graphql';
+import { FederationVersion } from '../../specifications/federation.js';
 import { Deprecated, Description, InterfaceType } from '../../subgraph/state.js';
 import type { Key, MapByGraph, TypeBuilder } from './common.js';
 export declare function interfaceTypeBuilder(): TypeBuilder<InterfaceType, InterfaceTypeState>;
 export type InterfaceTypeState = {
+    kind: 'interface';
     name: string;
     tags: Set<string>;
     inaccessible: boolean;
@@ -52,16 +54,19 @@ type InterfaceTypeInGraph = {
     keys: Key[];
     interfaces: Set<string>;
     implementedBy: Set<string>;
+    version: FederationVersion;
 };
 type FieldStateInGraph = {
     type: string;
     override: string | null;
     provides: string | null;
     requires: string | null;
+    version: FederationVersion;
 };
 type ArgStateInGraph = {
     type: string;
     defaultValue?: string;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=interface-type.d.ts.map

package/typings/supergraph/composition/object-type.d.cts

@@ -5,6 +5,7 @@ import type { Key, MapByGraph, TypeBuilder } from './common.cjs';
 export declare function isRealExtension(meta: ObjectTypeStateInGraph, version: FederationVersion): boolean;
 export declare function objectTypeBuilder(): TypeBuilder<ObjectType, ObjectTypeState>;
 export type ObjectTypeState = {
+    kind: 'object';
     name: string;
     tags: Set<string>;
     inaccessible: boolean;
@@ -64,6 +65,7 @@ export type ObjectTypeStateInGraph = {
     interfaces: Set<string>;
     inaccessible: boolean;
     shareable: boolean;
+    version: FederationVersion;
 };
 type FieldStateInGraph = {
     type: string;
@@ -78,11 +80,14 @@ type FieldStateInGraph = {
     required: boolean;
     shareable: boolean;
     usedAsKey: boolean;
+    extension: boolean;
+    version: FederationVersion;
 };
 type ArgStateInGraph = {
     type: string;
     inaccessible: boolean;
     defaultValue?: string;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=object-type.d.ts.map

package/typings/supergraph/composition/object-type.d.ts

@@ -5,6 +5,7 @@ import type { Key, MapByGraph, TypeBuilder } from './common.js';
 export declare function isRealExtension(meta: ObjectTypeStateInGraph, version: FederationVersion): boolean;
 export declare function objectTypeBuilder(): TypeBuilder<ObjectType, ObjectTypeState>;
 export type ObjectTypeState = {
+    kind: 'object';
     name: string;
     tags: Set<string>;
     inaccessible: boolean;
@@ -64,6 +65,7 @@ export type ObjectTypeStateInGraph = {
     interfaces: Set<string>;
     inaccessible: boolean;
     shareable: boolean;
+    version: FederationVersion;
 };
 type FieldStateInGraph = {
     type: string;
@@ -78,11 +80,14 @@ type FieldStateInGraph = {
     required: boolean;
     shareable: boolean;
     usedAsKey: boolean;
+    extension: boolean;
+    version: FederationVersion;
 };
 type ArgStateInGraph = {
     type: string;
     inaccessible: boolean;
     defaultValue?: string;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=object-type.d.ts.map

package/typings/supergraph/composition/scalar-type.d.cts

@@ -1,8 +1,10 @@
 import { DirectiveNode } from 'graphql';
+import { FederationVersion } from '../../specifications/federation.cjs';
 import { Description, ScalarType } from '../../subgraph/state.cjs';
 import { MapByGraph, TypeBuilder } from './common.cjs';
 export declare function scalarTypeBuilder(): TypeBuilder<ScalarType, ScalarTypeState>;
 export type ScalarTypeState = {
+    kind: 'scalar';
     name: string;
     tags: Set<string>;
     inaccessible: boolean;
@@ -18,6 +20,7 @@ export type ScalarTypeState = {
 };
 type ScalarTypeStateInGraph = {
     inaccessible: boolean;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=scalar-type.d.ts.map

package/typings/supergraph/composition/scalar-type.d.ts

@@ -1,8 +1,10 @@
 import { DirectiveNode } from 'graphql';
+import { FederationVersion } from '../../specifications/federation.js';
 import { Description, ScalarType } from '../../subgraph/state.js';
 import { MapByGraph, TypeBuilder } from './common.js';
 export declare function scalarTypeBuilder(): TypeBuilder<ScalarType, ScalarTypeState>;
 export type ScalarTypeState = {
+    kind: 'scalar';
     name: string;
     tags: Set<string>;
     inaccessible: boolean;
@@ -18,6 +20,7 @@ export type ScalarTypeState = {
 };
 type ScalarTypeStateInGraph = {
     inaccessible: boolean;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=scalar-type.d.ts.map

package/typings/supergraph/composition/union-type.d.cts

@@ -1,7 +1,9 @@
+import { FederationVersion } from '../../specifications/federation.cjs';
 import { Description, UnionType } from '../../subgraph/state.cjs';
 import type { MapByGraph, TypeBuilder } from './common.cjs';
 export declare function unionTypeBuilder(): TypeBuilder<UnionType, UnionTypeState>;
 export type UnionTypeState = {
+    kind: 'union';
     name: string;
     tags: Set<string>;
     hasDefinition: boolean;
@@ -12,6 +14,7 @@ export type UnionTypeState = {
 };
 type UnionTypeInGraph = {
     members: Set<string>;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=union-type.d.ts.map

package/typings/supergraph/composition/union-type.d.ts

@@ -1,7 +1,9 @@
+import { FederationVersion } from '../../specifications/federation.js';
 import { Description, UnionType } from '../../subgraph/state.js';
 import type { MapByGraph, TypeBuilder } from './common.js';
 export declare function unionTypeBuilder(): TypeBuilder<UnionType, UnionTypeState>;
 export type UnionTypeState = {
+    kind: 'union';
     name: string;
     tags: Set<string>;
     hasDefinition: boolean;
@@ -12,6 +14,7 @@ export type UnionTypeState = {
 };
 type UnionTypeInGraph = {
     members: Set<string>;
+    version: FederationVersion;
 };
 export {};
 //# sourceMappingURL=union-type.d.ts.map

package/typings/supergraph/state.d.cts

@@ -1,7 +1,6 @@
 import { DirectiveDefinitionNode, TypeDefinitionNode } from 'graphql';
 import { Link } from '../specifications/link.cjs';
 import { SubgraphState } from '../subgraph/state.cjs';
-import { Graph } from './composition/common.cjs';
 import { DirectiveState } from './composition/directive.cjs';
 import { EnumTypeState } from './composition/enum-type.cjs';
 import { InputObjectTypeState } from './composition/input-object-type.cjs';
@@ -10,7 +9,7 @@ import { ObjectTypeState } from './composition/object-type.cjs';
 import { ScalarTypeState } from './composition/scalar-type.cjs';
 import { UnionTypeState } from './composition/union-type.cjs';
 export type SupergraphState = {
-    graphs: Map<string, Graph>;
+    subgraphs: Map<string, SubgraphState>;
     scalarTypes: Map<string, ScalarTypeState>;
     objectTypes: Map<string, ObjectTypeState>;
     interfaceTypes: Map<string, InterfaceTypeState>;
@@ -31,10 +30,11 @@ export type SupergraphState = {
 };
 export type SupergraphStateBuilder = ReturnType<typeof createSupergraphStateBuilder>;
 export declare function createSupergraphStateBuilder(): {
-    addGraph(graph: Graph): void;
-    getGraph(id: string): Graph | undefined;
+    addSubgraph(subgraph: SubgraphState): void;
+    getGraph(id: string): SubgraphState | undefined;
     visitSubgraphState(subgraphState: SubgraphState): void;
     getSupergraphState(): SupergraphState;
+    getSubgraphState(graphId: string): SubgraphState | undefined;
     links(): readonly {
         name: string | null;
         version: string | null;