@theguild/federation-composition 0.7.0 → 0.7.1-rc-20240104160136-52edd83

package/cjs/subgraph/helpers.js

@@ -138,7 +138,8 @@ function visitFields({ context, selectionSet, typeDefinition, interceptField, in
             }
             break;
         }
-        if (interceptDirective && selection.directives?.length) {
+        const isTypename = selection.name.value === '__typename';
+        if (!isTypename && interceptDirective && selection.directives?.length) {
             for (const directive of selection.directives) {
                 interceptDirective({
                     directiveName: directive.name.value,
@@ -146,21 +147,23 @@ function visitFields({ context, selectionSet, typeDefinition, interceptField, in
                 });
             }
         }
-        context.markAsUsed('fields', typeDefinition.kind, typeDefinition.name.value, selectionFieldDef.name.value);
-        if (interceptField) {
+        if (!isTypename) {
+            context.markAsUsed('fields', typeDefinition.kind, typeDefinition.name.value, selectionFieldDef.name.value);
+        }
+        if (!isTypename && interceptField) {
             interceptField({
                 typeDefinition,
                 fieldName: selection.name.value,
             });
         }
-        if (selectionFieldDef.arguments?.length && interceptArguments) {
+        if (!isTypename && selectionFieldDef.arguments?.length && interceptArguments) {
             interceptArguments({
                 typeDefinition,
                 fieldName: selection.name.value,
             });
             continue;
         }
-        if (interceptNonExternalField || interceptExternalField) {
+        if (!isTypename && (interceptNonExternalField || interceptExternalField)) {
             const isExternal = selectionFieldDef.directives?.some(d => context.isAvailableFederationDirective('external', d));
             const fieldName = selection.name.value;
             const fieldDef = typeDefinition.fields?.find(field => field.name.value === fieldName);
@@ -189,7 +192,8 @@ function visitFields({ context, selectionSet, typeDefinition, interceptField, in
         if (!innerTypeDef) {
             continue;
         }
-        if (interceptInterfaceType &&
+        if (!isTypename &&
+            interceptInterfaceType &&
             (innerTypeDef.kind === graphql_1.Kind.INTERFACE_TYPE_DEFINITION ||
                 innerTypeDef.kind === graphql_1.Kind.INTERFACE_TYPE_EXTENSION)) {
             interceptInterfaceType({
@@ -212,9 +216,13 @@ function visitFields({ context, selectionSet, typeDefinition, interceptField, in
             context,
             selectionSet: innerSelection,
             typeDefinition: innerTypeDef,
+            interceptField,
             interceptArguments,
             interceptUnknownField,
             interceptInterfaceType,
+            interceptDirective,
+            interceptExternalField,
+            interceptFieldWithMissingSelectionSet,
         });
     }
 }

package/cjs/subgraph/validation/rules/elements/provides.js

@@ -154,7 +154,9 @@ function ProvidesRules(context) {
                                         }
                                         if (info.typeDefinition.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION ||
                                             info.typeDefinition.kind === graphql_1.Kind.OBJECT_TYPE_EXTENSION) {
-                                            context.stateBuilder.objectType.field.markAsProvided(info.typeDefinition.name.value, info.fieldName);
+                                            if (info.fieldName !== '__typename') {
+                                                context.stateBuilder.objectType.field.markAsProvided(info.typeDefinition.name.value, info.fieldName);
+                                            }
                                         }
                                     },
                                 });

package/cjs/subgraph/validation/rules/elements/requires.js

@@ -81,7 +81,9 @@ function RequiresRules(context) {
                 interceptField(info) {
                     if (info.typeDefinition.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION ||
                         info.typeDefinition.kind === graphql_1.Kind.OBJECT_TYPE_EXTENSION) {
-                        context.stateBuilder.objectType.field.markedAsRequired(info.typeDefinition.name.value, info.fieldName);
+                        if (info.fieldName !== '__typename') {
+                            context.stateBuilder.objectType.field.markedAsRequired(info.typeDefinition.name.value, info.fieldName);
+                        }
                     }
                 },
                 interceptUnknownField(info) {

package/cjs/subgraph/validation/validate-subgraph.js

@@ -62,6 +62,33 @@ function validateSubgraphCore(subgraph) {
 exports.validateSubgraphCore = validateSubgraphCore;
 function validateSubgraph(subgraph, stateBuilder, federation, __internal) {
     subgraph.typeDefs = cleanSubgraphTypeDefsFromSubgraphSpec(subgraph.typeDefs);
+    const linkSpecDefinitions = (0, graphql_1.parse)(`
+    enum Purpose {
+      EXECUTION
+      SECURITY
+    }
+
+    directive @link(
+      url: String
+      as: String
+      for: link__Purpose
+      import: [link__Import]
+    ) repeatable on SCHEMA
+
+    scalar link__Import
+
+    enum link__Purpose {
+      """
+      \`SECURITY\` features provide metadata necessary to securely resolve fields.
+      """
+      SECURITY
+
+      """
+      \`EXECUTION\` features provide metadata necessary for operation execution.
+      """
+      EXECUTION
+    }
+  `).definitions;
     const rulesToSkip = __internal?.disableValidationRules ?? [];
     const typeNodeInfo = new type_node_info_js_1.TypeNodeInfo();
     const validationContext = (0, validation_context_js_1.createSubgraphValidationContext)(subgraph, federation, typeNodeInfo, stateBuilder);
@@ -111,6 +138,12 @@ function validateSubgraph(subgraph, stateBuilder, federation, __internal) {
         return rule(validationContext);
     })))));
     const federationDefinitionReplacements = validationContext.collectFederationDefinitionReplacements();
+    const linkSpecDefinitionsToInclude = linkSpecDefinitions.filter(def => {
+        if ('name' in def && typeof def.name?.value === 'string') {
+            return !stateBuilder.state.types.has(def.name.value);
+        }
+        return true;
+    });
     const fullTypeDefs = (0, graphql_1.concatAST)([
         {
             kind: graphql_1.Kind.DOCUMENT,
@@ -120,33 +153,12 @@ function validateSubgraph(subgraph, stateBuilder, federation, __internal) {
         },
         validationContext.satisfiesVersionRange('> v1.0') && !stateBuilder.state.specs.link
             ?
-                (0, graphql_1.parse)(`
-            enum Purpose {
-              EXECUTION
-              SECURITY
-            }
-
-            directive @link(
-              url: String
-              as: String
-              for: link__Purpose
-              import: [link__Import]
-            ) repeatable on SCHEMA
-
-            scalar link__Import
-
-            enum link__Purpose {
-              """
-              \`SECURITY\` features provide metadata necessary to securely resolve fields.
-              """
-              SECURITY
-
-              """
-              \`EXECUTION\` features provide metadata necessary for operation execution.
-              """
-              EXECUTION
-            }
-          `)
+                linkSpecDefinitionsToInclude.length > 0
+                    ? {
+                        kind: graphql_1.Kind.DOCUMENT,
+                        definitions: linkSpecDefinitionsToInclude,
+                    }
+                    : null
             : null,
         subgraph.typeDefs,
     ].filter(onlyDocumentNode));

package/cjs/supergraph/composition/ast.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stripFederation = exports.schemaCoordinate = exports.createJoinGraphEnumTypeNode = exports.createScalarTypeNode = exports.createEnumTypeNode = exports.createUnionTypeNode = exports.createInputObjectTypeNode = exports.createInterfaceTypeNode = exports.createObjectTypeNode = exports.createDirectiveNode = exports.createSchemaNode = void 0;
 const graphql_1 = require("graphql");
+const printer_js_1 = require("../../graphql/printer.js");
 function createSchemaNode(schema) {
     return {
         kind: graphql_1.Kind.SCHEMA_DEFINITION,
@@ -740,7 +741,16 @@ function createNamedTypeNode(name) {
     };
 }
 function applyDirectives(common) {
-    return [].concat(common.ast?.directives ?? [], common.join?.type?.map(createJoinTypeDirectiveNode) ?? [], common.join?.implements?.map(createJoinImplementsDirectiveNode) ?? [], common.join?.field?.map(createJoinFieldDirectiveNode) ?? [], common.join?.unionMember?.map(createJoinUnionMemberDirectiveNode) ?? [], common.join?.enumValue?.map(createJoinEnumValueDirectiveNode) ?? [], common.tags?.map(createTagDirectiveNode) ?? [], common.inaccessible ? [createInaccessibleDirectiveNode()] : [], common.authenticated ? [createAuthenticatedDirectiveNode()] : [], common.policies?.length ? [createPolicyDirectiveNode(common.policies)] : [], common.scopes?.length ? [createRequiresScopesDirectiveNode(common.scopes)] : [], common.deprecated ? [createDeprecatedDirectiveNode(common.deprecated)] : [], common.specifiedBy ? [createSpecifiedByDirectiveNode(common.specifiedBy)] : []);
+    const deduplicatedDirectives = (common.ast?.directives ?? [])
+        .map(directive => {
+        return {
+            ast: directive,
+            string: (0, printer_js_1.print)(directive),
+        };
+    })
+        .filter((directive, index, all) => all.findIndex(d => d.string === directive.string) === index)
+        .map(d => d.ast);
+    return [].concat(deduplicatedDirectives, common.join?.type?.map(createJoinTypeDirectiveNode) ?? [], common.join?.implements?.map(createJoinImplementsDirectiveNode) ?? [], common.join?.field?.map(createJoinFieldDirectiveNode) ?? [], common.join?.unionMember?.map(createJoinUnionMemberDirectiveNode) ?? [], common.join?.enumValue?.map(createJoinEnumValueDirectiveNode) ?? [], common.tags?.map(createTagDirectiveNode) ?? [], common.inaccessible ? [createInaccessibleDirectiveNode()] : [], common.authenticated ? [createAuthenticatedDirectiveNode()] : [], common.policies?.length ? [createPolicyDirectiveNode(common.policies)] : [], common.scopes?.length ? [createRequiresScopesDirectiveNode(common.scopes)] : [], common.deprecated ? [createDeprecatedDirectiveNode(common.deprecated)] : [], common.specifiedBy ? [createSpecifiedByDirectiveNode(common.specifiedBy)] : []);
 }
 function nonEmpty(value) {
     return value != null;

package/cjs/supergraph/composition/object-type.js

@@ -255,7 +255,8 @@ function objectTypeBuilder() {
                     directives: (0, common_js_1.convertToConst)(objectType.ast.directives),
                 },
                 description: objectType.description,
-                fields: Array.from(objectType.fields.values()).map(field => {
+                fields: Array.from(objectType.fields.values())
+                    .map(field => {
                     const fieldInGraphs = Array.from(field.byGraph.entries());
                     const hasDifferentOutputType = fieldInGraphs.some(([_, meta]) => meta.type !== field.type);
                     const isDefinedEverywhere = field.byGraph.size === (isQuery ? graphs.size : objectType.byGraph.size);
@@ -291,9 +292,26 @@ function objectTypeBuilder() {
                             differencesBetweenGraphs.type = true;
                         }
                     }
+                    if (!isQuery && field.byGraph.size === 1) {
+                        const graphId = field.byGraph.keys().next().value;
+                        const fieldInGraph = field.byGraph.get(graphId);
+                        if (fieldInGraph.external &&
+                            !fieldInGraph.usedAsKey &&
+                            !fieldInGraph.required &&
+                            !fieldInGraph.provided &&
+                            !provideUsedOverriddenValue(field.name, overridesMap, fieldNamesOfImplementedInterfaces, graphId) &&
+                            graphs.get(graphId).version === 'v1.0') {
+                            return null;
+                        }
+                    }
                     if (isQuery) {
                         if (differencesBetweenGraphs.override) {
-                            const graphsWithOverride = fieldInGraphs.filter(([_, meta]) => meta.override !== null);
+                            const graphsWithOverride = fieldInGraphs.filter(([_, meta]) => meta.override !== null &&
+                                (objectType.byGraph.size > 1
+                                    ?
+                                        true
+                                    :
+                                        typeof graphNameToId(meta.override) === 'string'));
                             joinFields = graphsWithOverride.map(([graphId, meta]) => ({
                                 graph: graphId,
                                 override: meta.override ?? undefined,
@@ -423,7 +441,8 @@ function objectTypeBuilder() {
                             };
                         }),
                     };
-                }),
+                })
+                    .filter(helpers_js_1.isDefined),
                 interfaces: Array.from(objectType.interfaces),
                 tags: Array.from(objectType.tags),
                 inaccessible: objectType.inaccessible,

package/esm/subgraph/helpers.js

@@ -134,7 +134,8 @@ export function visitFields({ context, selectionSet, typeDefinition, interceptFi
             }
             break;
         }
-        if (interceptDirective && selection.directives?.length) {
+        const isTypename = selection.name.value === '__typename';
+        if (!isTypename && interceptDirective && selection.directives?.length) {
             for (const directive of selection.directives) {
                 interceptDirective({
                     directiveName: directive.name.value,
@@ -142,21 +143,23 @@ export function visitFields({ context, selectionSet, typeDefinition, interceptFi
                 });
             }
         }
-        context.markAsUsed('fields', typeDefinition.kind, typeDefinition.name.value, selectionFieldDef.name.value);
-        if (interceptField) {
+        if (!isTypename) {
+            context.markAsUsed('fields', typeDefinition.kind, typeDefinition.name.value, selectionFieldDef.name.value);
+        }
+        if (!isTypename && interceptField) {
             interceptField({
                 typeDefinition,
                 fieldName: selection.name.value,
             });
         }
-        if (selectionFieldDef.arguments?.length && interceptArguments) {
+        if (!isTypename && selectionFieldDef.arguments?.length && interceptArguments) {
             interceptArguments({
                 typeDefinition,
                 fieldName: selection.name.value,
             });
             continue;
         }
-        if (interceptNonExternalField || interceptExternalField) {
+        if (!isTypename && (interceptNonExternalField || interceptExternalField)) {
             const isExternal = selectionFieldDef.directives?.some(d => context.isAvailableFederationDirective('external', d));
             const fieldName = selection.name.value;
             const fieldDef = typeDefinition.fields?.find(field => field.name.value === fieldName);
@@ -185,7 +188,8 @@ export function visitFields({ context, selectionSet, typeDefinition, interceptFi
         if (!innerTypeDef) {
             continue;
         }
-        if (interceptInterfaceType &&
+        if (!isTypename &&
+            interceptInterfaceType &&
             (innerTypeDef.kind === Kind.INTERFACE_TYPE_DEFINITION ||
                 innerTypeDef.kind === Kind.INTERFACE_TYPE_EXTENSION)) {
             interceptInterfaceType({
@@ -208,9 +212,13 @@ export function visitFields({ context, selectionSet, typeDefinition, interceptFi
             context,
             selectionSet: innerSelection,
             typeDefinition: innerTypeDef,
+            interceptField,
             interceptArguments,
             interceptUnknownField,
             interceptInterfaceType,
+            interceptDirective,
+            interceptExternalField,
+            interceptFieldWithMissingSelectionSet,
         });
     }
 }

package/esm/subgraph/validation/rules/elements/provides.js

@@ -151,7 +151,9 @@ export function ProvidesRules(context) {
                                         }
                                         if (info.typeDefinition.kind === Kind.OBJECT_TYPE_DEFINITION ||
                                             info.typeDefinition.kind === Kind.OBJECT_TYPE_EXTENSION) {
-                                            context.stateBuilder.objectType.field.markAsProvided(info.typeDefinition.name.value, info.fieldName);
+                                            if (info.fieldName !== '__typename') {
+                                                context.stateBuilder.objectType.field.markAsProvided(info.typeDefinition.name.value, info.fieldName);
+                                            }
                                         }
                                     },
                                 });

package/esm/subgraph/validation/rules/elements/requires.js

@@ -78,7 +78,9 @@ export function RequiresRules(context) {
                 interceptField(info) {
                     if (info.typeDefinition.kind === Kind.OBJECT_TYPE_DEFINITION ||
                         info.typeDefinition.kind === Kind.OBJECT_TYPE_EXTENSION) {
-                        context.stateBuilder.objectType.field.markedAsRequired(info.typeDefinition.name.value, info.fieldName);
+                        if (info.fieldName !== '__typename') {
+                            context.stateBuilder.objectType.field.markedAsRequired(info.typeDefinition.name.value, info.fieldName);
+                        }
                     }
                 },
                 interceptUnknownField(info) {

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

@@ -57,6 +57,33 @@ export function validateSubgraphCore(subgraph) {
 }
 export function validateSubgraph(subgraph, stateBuilder, federation, __internal) {
     subgraph.typeDefs = cleanSubgraphTypeDefsFromSubgraphSpec(subgraph.typeDefs);
+    const linkSpecDefinitions = parse(`
+    enum Purpose {
+      EXECUTION
+      SECURITY
+    }
+
+    directive @link(
+      url: String
+      as: String
+      for: link__Purpose
+      import: [link__Import]
+    ) repeatable on SCHEMA
+
+    scalar link__Import
+
+    enum link__Purpose {
+      """
+      \`SECURITY\` features provide metadata necessary to securely resolve fields.
+      """
+      SECURITY
+
+      """
+      \`EXECUTION\` features provide metadata necessary for operation execution.
+      """
+      EXECUTION
+    }
+  `).definitions;
     const rulesToSkip = __internal?.disableValidationRules ?? [];
     const typeNodeInfo = new TypeNodeInfo();
     const validationContext = createSubgraphValidationContext(subgraph, federation, typeNodeInfo, stateBuilder);
@@ -106,6 +133,12 @@ export function validateSubgraph(subgraph, stateBuilder, federation, __internal)
         return rule(validationContext);
     })))));
     const federationDefinitionReplacements = validationContext.collectFederationDefinitionReplacements();
+    const linkSpecDefinitionsToInclude = linkSpecDefinitions.filter(def => {
+        if ('name' in def && typeof def.name?.value === 'string') {
+            return !stateBuilder.state.types.has(def.name.value);
+        }
+        return true;
+    });
     const fullTypeDefs = concatAST([
         {
             kind: Kind.DOCUMENT,
@@ -115,33 +148,12 @@ export function validateSubgraph(subgraph, stateBuilder, federation, __internal)
         },
         validationContext.satisfiesVersionRange('> v1.0') && !stateBuilder.state.specs.link
             ?
-                parse(`
-            enum Purpose {
-              EXECUTION
-              SECURITY
-            }
-
-            directive @link(
-              url: String
-              as: String
-              for: link__Purpose
-              import: [link__Import]
-            ) repeatable on SCHEMA
-
-            scalar link__Import
-
-            enum link__Purpose {
-              """
-              \`SECURITY\` features provide metadata necessary to securely resolve fields.
-              """
-              SECURITY
-
-              """
-              \`EXECUTION\` features provide metadata necessary for operation execution.
-              """
-              EXECUTION
-            }
-          `)
+                linkSpecDefinitionsToInclude.length > 0
+                    ? {
+                        kind: Kind.DOCUMENT,
+                        definitions: linkSpecDefinitionsToInclude,
+                    }
+                    : null
             : null,
         subgraph.typeDefs,
     ].filter(onlyDocumentNode));

package/esm/supergraph/composition/ast.js

@@ -1,4 +1,5 @@
 import { Kind, OperationTypeNode, parseConstValue, parseType, specifiedDirectives, visit, visitInParallel, } from 'graphql';
+import { print } from '../../graphql/printer.js';
 export function createSchemaNode(schema) {
     return {
         kind: Kind.SCHEMA_DEFINITION,
@@ -728,7 +729,16 @@ function createNamedTypeNode(name) {
     };
 }
 function applyDirectives(common) {
-    return [].concat(common.ast?.directives ?? [], common.join?.type?.map(createJoinTypeDirectiveNode) ?? [], common.join?.implements?.map(createJoinImplementsDirectiveNode) ?? [], common.join?.field?.map(createJoinFieldDirectiveNode) ?? [], common.join?.unionMember?.map(createJoinUnionMemberDirectiveNode) ?? [], common.join?.enumValue?.map(createJoinEnumValueDirectiveNode) ?? [], common.tags?.map(createTagDirectiveNode) ?? [], common.inaccessible ? [createInaccessibleDirectiveNode()] : [], common.authenticated ? [createAuthenticatedDirectiveNode()] : [], common.policies?.length ? [createPolicyDirectiveNode(common.policies)] : [], common.scopes?.length ? [createRequiresScopesDirectiveNode(common.scopes)] : [], common.deprecated ? [createDeprecatedDirectiveNode(common.deprecated)] : [], common.specifiedBy ? [createSpecifiedByDirectiveNode(common.specifiedBy)] : []);
+    const deduplicatedDirectives = (common.ast?.directives ?? [])
+        .map(directive => {
+        return {
+            ast: directive,
+            string: print(directive),
+        };
+    })
+        .filter((directive, index, all) => all.findIndex(d => d.string === directive.string) === index)
+        .map(d => d.ast);
+    return [].concat(deduplicatedDirectives, common.join?.type?.map(createJoinTypeDirectiveNode) ?? [], common.join?.implements?.map(createJoinImplementsDirectiveNode) ?? [], common.join?.field?.map(createJoinFieldDirectiveNode) ?? [], common.join?.unionMember?.map(createJoinUnionMemberDirectiveNode) ?? [], common.join?.enumValue?.map(createJoinEnumValueDirectiveNode) ?? [], common.tags?.map(createTagDirectiveNode) ?? [], common.inaccessible ? [createInaccessibleDirectiveNode()] : [], common.authenticated ? [createAuthenticatedDirectiveNode()] : [], common.policies?.length ? [createPolicyDirectiveNode(common.policies)] : [], common.scopes?.length ? [createRequiresScopesDirectiveNode(common.scopes)] : [], common.deprecated ? [createDeprecatedDirectiveNode(common.deprecated)] : [], common.specifiedBy ? [createSpecifiedByDirectiveNode(common.specifiedBy)] : []);
 }
 function nonEmpty(value) {
     return value != null;

package/esm/supergraph/composition/object-type.js

@@ -251,7 +251,8 @@ export function objectTypeBuilder() {
                     directives: convertToConst(objectType.ast.directives),
                 },
                 description: objectType.description,
-                fields: Array.from(objectType.fields.values()).map(field => {
+                fields: Array.from(objectType.fields.values())
+                    .map(field => {
                     const fieldInGraphs = Array.from(field.byGraph.entries());
                     const hasDifferentOutputType = fieldInGraphs.some(([_, meta]) => meta.type !== field.type);
                     const isDefinedEverywhere = field.byGraph.size === (isQuery ? graphs.size : objectType.byGraph.size);
@@ -287,9 +288,26 @@ export function objectTypeBuilder() {
                             differencesBetweenGraphs.type = true;
                         }
                     }
+                    if (!isQuery && field.byGraph.size === 1) {
+                        const graphId = field.byGraph.keys().next().value;
+                        const fieldInGraph = field.byGraph.get(graphId);
+                        if (fieldInGraph.external &&
+                            !fieldInGraph.usedAsKey &&
+                            !fieldInGraph.required &&
+                            !fieldInGraph.provided &&
+                            !provideUsedOverriddenValue(field.name, overridesMap, fieldNamesOfImplementedInterfaces, graphId) &&
+                            graphs.get(graphId).version === 'v1.0') {
+                            return null;
+                        }
+                    }
                     if (isQuery) {
                         if (differencesBetweenGraphs.override) {
-                            const graphsWithOverride = fieldInGraphs.filter(([_, meta]) => meta.override !== null);
+                            const graphsWithOverride = fieldInGraphs.filter(([_, meta]) => meta.override !== null &&
+                                (objectType.byGraph.size > 1
+                                    ?
+                                        true
+                                    :
+                                        typeof graphNameToId(meta.override) === 'string'));
                             joinFields = graphsWithOverride.map(([graphId, meta]) => ({
                                 graph: graphId,
                                 override: meta.override ?? undefined,
@@ -419,7 +437,8 @@ export function objectTypeBuilder() {
                             };
                         }),
                     };
-                }),
+                })
+                    .filter(isDefined),
                 interfaces: Array.from(objectType.interfaces),
                 tags: Array.from(objectType.tags),
                 inaccessible: objectType.inaccessible,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theguild/federation-composition",
-  "version": "0.7.0",
+  "version": "0.7.1-rc-20240104160136-52edd83",
   "description": "Open Source Composition library for Apollo Federation",
   "peerDependencies": {
     "graphql": "^16.0.0"