@theguild/federation-composition 0.21.3-alpha-20260113121415-bf20f64cd15d5043b10d499b094f1064eae2ea2f → 0.21.3

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

@@ -47,7 +47,6 @@ const unique_field_definition_names_rule_js_1 = require("./rules/unique-field-de
 const unique_input_field_names_rule_js_1 = require("./rules/unique-input-field-names-rule.js");
 const unique_operation_types_rule_js_1 = require("./rules/unique-operation-types-rule.js");
 const unique_type_names_rule_js_1 = require("./rules/unique-type-names-rule.js");
-const link_spec_reserved_type_names_rule_js_1 = require("./rules/link-spec-reserved-type-names-rule.js");
 const validate_state_js_1 = require("./validate-state.js");
 const validation_context_js_1 = require("./validation-context.js");
 function assertUniqueSubgraphNames(subgraphs) {
@@ -100,7 +99,6 @@ function validateSubgraph(subgraph, stateBuilder, federation, __internal) {
     const validationContext = (0, validation_context_js_1.createSubgraphValidationContext)(subgraph, federation, typeNodeInfo, stateBuilder);
     const federationRules = [
         reserved_subgraph_name_rule_js_1.ReservedSubgraphNameRule,
-        link_spec_reserved_type_names_rule_js_1.LinkSpecReservedTypeNamesRule,
         known_federation_directive_rule_js_1.KnownFederationDirectivesRule,
         field_set_js_1.FieldSetRules,
         inaccessible_js_1.InaccessibleRules,

package/cjs/supergraph/validation/rules/auth-on-requires-rule.js

@@ -30,7 +30,16 @@ function ensureAccessToSelectionSet(supergraph, currentType, selectionSet, provi
         switch (selection.kind) {
             case graphql_1.Kind.FIELD: {
                 if (currentType.kind === "union") {
-                    throw new Error("Cannot select fields directly on union types.");
+                    if (selection.name.value !== "__typename") {
+                        throw new Error("Cannot select fields directly on union types.");
+                    }
+                    for (const memberTypeName of currentType.members) {
+                        const memberType = supergraph.objectTypes.get(memberTypeName);
+                        if (memberType && !provisionedAccess.canAccess(memberType)) {
+                            return memberTypeName;
+                        }
+                    }
+                    return;
                 }
                 const fieldLackingAccess = ensureAccessToField(supergraph, currentType, selection, provisionedAccess);
                 if (fieldLackingAccess) {

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

@@ -42,7 +42,6 @@ import { UniqueFieldDefinitionNamesRule } from "./rules/unique-field-definition-
 import { UniqueInputFieldNamesRule } from "./rules/unique-input-field-names-rule.js";
 import { UniqueOperationTypesRule } from "./rules/unique-operation-types-rule.js";
 import { UniqueTypeNamesRule } from "./rules/unique-type-names-rule.js";
-import { LinkSpecReservedTypeNamesRule } from "./rules/link-spec-reserved-type-names-rule.js";
 import { validateSubgraphState } from "./validate-state.js";
 import { createSimpleValidationContext, createSubgraphValidationContext, } from "./validation-context.js";
 export function assertUniqueSubgraphNames(subgraphs) {
@@ -95,7 +94,6 @@ export function validateSubgraph(subgraph, stateBuilder, federation, __internal)
     const validationContext = createSubgraphValidationContext(subgraph, federation, typeNodeInfo, stateBuilder);
     const federationRules = [
         ReservedSubgraphNameRule,
-        LinkSpecReservedTypeNamesRule,
         KnownFederationDirectivesRule,
         FieldSetRules,
         InaccessibleRules,

package/esm/supergraph/validation/rules/auth-on-requires-rule.js

@@ -27,7 +27,16 @@ function ensureAccessToSelectionSet(supergraph, currentType, selectionSet, provi
         switch (selection.kind) {
             case Kind.FIELD: {
                 if (currentType.kind === "union") {
-                    throw new Error("Cannot select fields directly on union types.");
+                    if (selection.name.value !== "__typename") {
+                        throw new Error("Cannot select fields directly on union types.");
+                    }
+                    for (const memberTypeName of currentType.members) {
+                        const memberType = supergraph.objectTypes.get(memberTypeName);
+                        if (memberType && !provisionedAccess.canAccess(memberType)) {
+                            return memberTypeName;
+                        }
+                    }
+                    return;
                 }
                 const fieldLackingAccess = ensureAccessToField(supergraph, currentType, selection, provisionedAccess);
                 if (fieldLackingAccess) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theguild/federation-composition",
-  "version": "0.21.3-alpha-20260113121415-bf20f64cd15d5043b10d499b094f1064eae2ea2f",
+  "version": "0.21.3",
   "description": "Open Source Composition library for Apollo Federation",
   "peerDependencies": {
     "graphql": "^16.0.0"

package/cjs/subgraph/validation/rules/link-spec-reserved-type-names-rule.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LinkSpecReservedTypeNamesRule = LinkSpecReservedTypeNamesRule;
-const graphql_1 = require("graphql");
-const LINK_SPEC_RESERVED_TYPE_NAMES = new Set(["Purpose", "Import"]);
-function LinkSpecReservedTypeNamesRule(context) {
-    if (!context.satisfiesVersionRange("> v1.0")) {
-        return {};
-    }
-    function checkTypeName(node) {
-        const typeName = node.name.value;
-        if (LINK_SPEC_RESERVED_TYPE_NAMES.has(typeName)) {
-            context.reportError(new graphql_1.GraphQLError(`Type "${typeName}" is reserved by the Apollo Link spec (https://specs.apollo.dev/link/v1.0/). Please rename your type.`, {
-                nodes: node,
-                extensions: {
-                    code: "LINK_SPEC_RESERVED_TYPE_NAME",
-                },
-            }));
-        }
-    }
-    return {
-        ScalarTypeDefinition: checkTypeName,
-        ScalarTypeExtension: checkTypeName,
-        ObjectTypeDefinition: checkTypeName,
-        ObjectTypeExtension: checkTypeName,
-        InterfaceTypeDefinition: checkTypeName,
-        InterfaceTypeExtension: checkTypeName,
-        UnionTypeDefinition: checkTypeName,
-        UnionTypeExtension: checkTypeName,
-        EnumTypeDefinition: checkTypeName,
-        EnumTypeExtension: checkTypeName,
-        InputObjectTypeDefinition: checkTypeName,
-        InputObjectTypeExtension: checkTypeName,
-    };
-}

package/esm/subgraph/validation/rules/link-spec-reserved-type-names-rule.js

@@ -1,32 +0,0 @@
-import { GraphQLError, } from "graphql";
-const LINK_SPEC_RESERVED_TYPE_NAMES = new Set(["Purpose", "Import"]);
-export function LinkSpecReservedTypeNamesRule(context) {
-    if (!context.satisfiesVersionRange("> v1.0")) {
-        return {};
-    }
-    function checkTypeName(node) {
-        const typeName = node.name.value;
-        if (LINK_SPEC_RESERVED_TYPE_NAMES.has(typeName)) {
-            context.reportError(new GraphQLError(`Type "${typeName}" is reserved by the Apollo Link spec (https://specs.apollo.dev/link/v1.0/). Please rename your type.`, {
-                nodes: node,
-                extensions: {
-                    code: "LINK_SPEC_RESERVED_TYPE_NAME",
-                },
-            }));
-        }
-    }
-    return {
-        ScalarTypeDefinition: checkTypeName,
-        ScalarTypeExtension: checkTypeName,
-        ObjectTypeDefinition: checkTypeName,
-        ObjectTypeExtension: checkTypeName,
-        InterfaceTypeDefinition: checkTypeName,
-        InterfaceTypeExtension: checkTypeName,
-        UnionTypeDefinition: checkTypeName,
-        UnionTypeExtension: checkTypeName,
-        EnumTypeDefinition: checkTypeName,
-        EnumTypeExtension: checkTypeName,
-        InputObjectTypeDefinition: checkTypeName,
-        InputObjectTypeExtension: checkTypeName,
-    };
-}

package/typings/subgraph/validation/rules/link-spec-reserved-type-names-rule.d.cts

@@ -1,4 +0,0 @@
-import { ASTVisitor } from "graphql";
-import type { SubgraphValidationContext } from "../validation-context.cjs";
-export declare function LinkSpecReservedTypeNamesRule(context: SubgraphValidationContext): ASTVisitor;
-//# sourceMappingURL=link-spec-reserved-type-names-rule.d.ts.map

package/typings/subgraph/validation/rules/link-spec-reserved-type-names-rule.d.ts

@@ -1,4 +0,0 @@
-import { ASTVisitor } from "graphql";
-import type { SubgraphValidationContext } from "../validation-context.js";
-export declare function LinkSpecReservedTypeNamesRule(context: SubgraphValidationContext): ASTVisitor;
-//# sourceMappingURL=link-spec-reserved-type-names-rule.d.ts.map