@apollo/federation-internals 2.0.0-preview.7 → 2.0.0

package/dist/federation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeInactiveProvidesAndRequires = exports.addSubgraphToError = exports.addSubgraphToASTNode = exports.Subgraph = exports.FEDERATION_OPERATION_FIELDS = exports.entitiesFieldName = exports.serviceFieldName = exports.FEDERATION_OPERATION_TYPES = exports.entityTypeSpec = exports.serviceTypeSpec = exports.anyTypeSpec = exports.Subgraphs = exports.subgraphsFromServiceList = exports.collectTargetFields = exports.parseFieldSetArgument = exports.newEmptyFederation2Schema = exports.buildSubgraph = exports.isEntityType = exports.isFederationField = exports.isFederationSubgraphSchema = exports.federationMetadata = exports.printSubgraphNames = exports.asFed2SubgraphDocument = exports.setSchemaAsFed2Subgraph = exports.FederationBlueprint = exports.FederationMetadata = exports.collectUsedExternalFieldsCoordinates = exports.FEDERATION_RESERVED_SUBGRAPH_NAME = void 0;
+exports.removeInactiveProvidesAndRequires = exports.addSubgraphToError = exports.addSubgraphToASTNode = exports.Subgraph = exports.FEDERATION_OPERATION_FIELDS = exports.entitiesFieldName = exports.serviceFieldName = exports.FEDERATION_OPERATION_TYPES = exports.entityTypeSpec = exports.serviceTypeSpec = exports.anyTypeSpec = exports.Subgraphs = exports.subgraphsFromServiceList = exports.collectTargetFields = exports.parseFieldSetArgument = exports.newEmptyFederation2Schema = exports.buildSubgraph = exports.isEntityType = exports.isFederationField = exports.isFederationSubgraphSchema = exports.federationMetadata = exports.printSubgraphNames = exports.asFed2SubgraphDocument = exports.FEDERATION2_LINK_WTH_FULL_IMPORTS = exports.setSchemaAsFed2Subgraph = exports.FederationBlueprint = exports.FederationMetadata = exports.collectUsedFields = exports.FEDERATION_UNNAMED_SUBGRAPH_NAME = exports.FEDERATION_RESERVED_SUBGRAPH_NAME = void 0;
 const definitions_1 = require("./definitions");
 const utils_1 = require("./utils");
 const specifiedRules_1 = require("graphql/validation/specifiedRules");
@@ -9,16 +9,20 @@ const KnownTypeNamesInFederationRule_1 = require("./validation/KnownTypeNamesInF
 const buildSchema_1 = require("./buildSchema");
 const operations_1 = require("./operations");
 const tagSpec_1 = require("./tagSpec");
+const inaccessibleSpec_1 = require("./inaccessibleSpec");
 const error_1 = require("./error");
-const sharing_1 = require("./sharing");
+const precompute_1 = require("./precompute");
 const coreSpec_1 = require("./coreSpec");
 const federationSpec_1 = require("./federationSpec");
 const print_1 = require("./print");
 const directiveAndTypeSpecification_1 = require("./directiveAndTypeSpecification");
+const suggestions_1 = require("./suggestions");
 const linkSpec = coreSpec_1.LINK_VERSIONS.latest();
 const tagSpec = tagSpec_1.TAG_VERSIONS.latest();
+const inaccessibleSpec = inaccessibleSpec_1.INACCESSIBLE_VERSIONS.latest();
 const federationSpec = federationSpec_1.FEDERATION_VERSIONS.latest();
 exports.FEDERATION_RESERVED_SUBGRAPH_NAME = '_';
+exports.FEDERATION_UNNAMED_SUBGRAPH_NAME = '<unnamed>';
 const FEDERATION_OMITTED_VALIDATION_RULES = [
     graphql_1.PossibleTypeExtensionsRule,
     graphql_1.KnownTypeNamesRule
@@ -148,29 +152,29 @@ function validateAllFieldSet(definition, targetTypeExtractor, errorCollector, fe
         }
     }
 }
-function collectUsedExternalFieldsCoordinates(metadata) {
-    const usedExternalCoordinates = new Set();
-    collectUsedExternaFieldsForDirective(metadata, metadata.keyDirective(), type => type, usedExternalCoordinates);
-    collectUsedExternaFieldsForDirective(metadata, metadata.requiresDirective(), field => field.parent, usedExternalCoordinates);
-    collectUsedExternaFieldsForDirective(metadata, metadata.providesDirective(), field => {
+function collectUsedFields(metadata) {
+    const usedFields = new Set();
+    collectUsedFieldsForDirective(metadata.keyDirective(), type => type, usedFields);
+    collectUsedFieldsForDirective(metadata.requiresDirective(), field => field.parent, usedFields);
+    collectUsedFieldsForDirective(metadata.providesDirective(), field => {
         const type = (0, definitions_1.baseType)(field.type);
         return (0, definitions_1.isCompositeType)(type) ? type : undefined;
-    }, usedExternalCoordinates);
-    for (const itfType of metadata.schema.types('InterfaceType')) {
+    }, usedFields);
+    for (const itfType of metadata.schema.interfaceTypes()) {
         const runtimeTypes = itfType.possibleRuntimeTypes();
         for (const field of itfType.fields()) {
             for (const runtimeType of runtimeTypes) {
                 const implemField = runtimeType.field(field.name);
-                if (implemField && metadata.isFieldExternal(implemField)) {
-                    usedExternalCoordinates.add(implemField.coordinate);
+                if (implemField) {
+                    usedFields.add(implemField);
                 }
             }
         }
     }
-    return usedExternalCoordinates;
+    return usedFields;
 }
-exports.collectUsedExternalFieldsCoordinates = collectUsedExternalFieldsCoordinates;
-function collectUsedExternaFieldsForDirective(metadata, definition, targetTypeExtractor, usedExternalCoordinates) {
+exports.collectUsedFields = collectUsedFields;
+function collectUsedFieldsForDirective(definition, targetTypeExtractor, usedFieldDefs) {
     for (const application of definition.applications()) {
         const type = targetTypeExtractor(application.parent);
         if (!type) {
@@ -181,32 +185,28 @@ function collectUsedExternaFieldsForDirective(metadata, definition, targetTypeEx
             directive: application,
             includeInterfaceFieldsImplementations: true,
             validate: false,
-        }).filter((field) => metadata.isFieldExternal(field))
-            .forEach((field) => usedExternalCoordinates.add(field.coordinate));
+        }).forEach((field) => usedFieldDefs.add(field));
     }
 }
 function validateAllExternalFieldsUsed(metadata, errorCollector) {
-    const allUsedExternals = collectUsedExternalFieldsCoordinates(metadata);
     for (const type of metadata.schema.types()) {
         if (!(0, definitions_1.isObjectType)(type) && !(0, definitions_1.isInterfaceType)(type)) {
             continue;
         }
         for (const field of type.fields()) {
-            if (!metadata.isFieldExternal(field) || allUsedExternals.has(field.coordinate)) {
+            if (!metadata.isFieldExternal(field) || metadata.isFieldUsed(field)) {
                 continue;
             }
-            if (!isFieldSatisfyingInterface(field)) {
-                errorCollector.push(error_1.ERRORS.EXTERNAL_UNUSED.err({
-                    message: `Field "${field.coordinate}" is marked @external but is not used in any federation directive (@key, @provides, @requires) or to satisfy an interface;`
-                        + ' the field declaration has no use and should be removed (or the field should not be @external).',
-                    nodes: field.sourceAST,
-                }));
-            }
+            errorCollector.push(error_1.ERRORS.EXTERNAL_UNUSED.err({
+                message: `Field "${field.coordinate}" is marked @external but is not used in any federation directive (@key, @provides, @requires) or to satisfy an interface;`
+                    + ' the field declaration has no use and should be removed (or the field should not be @external).',
+                nodes: field.sourceAST,
+            }));
         }
     }
 }
 function validateNoExternalOnInterfaceFields(metadata, errorCollector) {
-    for (const itf of metadata.schema.types('InterfaceType')) {
+    for (const itf of metadata.schema.interfaceTypes()) {
         for (const field of itf.fields()) {
             if (metadata.isFieldExternal(field)) {
                 errorCollector.push(error_1.ERRORS.EXTERNAL_ON_INTERFACE.err({
@@ -217,9 +217,6 @@ function validateNoExternalOnInterfaceFields(metadata, errorCollector) {
         }
     }
 }
-function isFieldSatisfyingInterface(field) {
-    return field.parent.interfaces().some(itf => itf.field(field.name));
-}
 function validateInterfaceRuntimeImplementationFieldsTypes(itf, metadata, errorCollector) {
     var _a;
     const requiresDirective = (_a = federationMetadata(itf.schema())) === null || _a === void 0 ? void 0 : _a.requiresDirective();
@@ -255,14 +252,6 @@ const printFieldCoordinate = (f) => `"${f.coordinate}"`;
 function formatFieldsToReturnType([type, implems]) {
     return `${(0, utils_1.joinStrings)(implems.map(printFieldCoordinate))} ${implems.length == 1 ? 'has' : 'have'} type "${type}"`;
 }
-function checkIfFed2Schema(schema) {
-    const core = schema.coreFeatures;
-    if (!core) {
-        return false;
-    }
-    const federationFeature = core.getByIdentity(federationSpec.identity);
-    return !!federationFeature && federationFeature.url.version.satisfies(new coreSpec_1.FeatureVersion(2, 0));
-}
 class FederationMetadata {
     constructor(schema) {
         this.schema = schema;
@@ -271,13 +260,19 @@ class FederationMetadata {
         this._externalTester = undefined;
         this._sharingPredicate = undefined;
         this._isFed2Schema = undefined;
+        this._fieldUsedPredicate = undefined;
     }
     isFed2Schema() {
         if (!this._isFed2Schema) {
-            this._isFed2Schema = checkIfFed2Schema(this.schema);
+            const feature = this.federationFeature();
+            this._isFed2Schema = !!feature && feature.url.version.satisfies(new coreSpec_1.FeatureVersion(2, 0));
         }
         return this._isFed2Schema;
     }
+    federationFeature() {
+        var _a;
+        return (_a = this.schema.coreFeatures) === null || _a === void 0 ? void 0 : _a.getByIdentity(federationSpec.identity);
+    }
     externalTester() {
         if (!this._externalTester) {
             this._externalTester = new ExternalTester(this.schema);
@@ -286,10 +281,20 @@ class FederationMetadata {
     }
     sharingPredicate() {
         if (!this._sharingPredicate) {
-            this._sharingPredicate = (0, sharing_1.computeShareables)(this.schema);
+            this._sharingPredicate = (0, precompute_1.computeShareables)(this.schema);
         }
         return this._sharingPredicate;
     }
+    fieldUsedPredicate() {
+        if (!this._fieldUsedPredicate) {
+            const usedFields = collectUsedFields(this);
+            this._fieldUsedPredicate = (field) => !!usedFields.has(field);
+        }
+        return this._fieldUsedPredicate;
+    }
+    isFieldUsed(field) {
+        return this.fieldUsedPredicate()(field);
+    }
     isFieldExternal(field) {
         return this.externalTester().isExternal(field);
     }
@@ -343,6 +348,9 @@ class FederationMetadata {
     keyDirective() {
         return this.getFederationDirective(federationSpec_1.keyDirectiveSpec.name);
     }
+    overrideDirective() {
+        return this.getFederationDirective(federationSpec_1.overrideDirectiveSpec.name);
+    }
     extendsDirective() {
         return this.getFederationDirective(federationSpec_1.extendsDirectiveSpec.name);
     }
@@ -359,7 +367,10 @@ class FederationMetadata {
         return this.getFederationDirective(federationSpec_1.shareableDirectiveSpec.name);
     }
     tagDirective() {
-        return this.getFederationDirective(federationSpec_1.tagDirectiveSpec.name);
+        return this.getFederationDirective(tagSpec.tagDirectiveSpec.name);
+    }
+    inaccessibleDirective() {
+        return this.getFederationDirective(inaccessibleSpec.inaccessibleDirectiveSpec.name);
     }
     allFederationDirectives() {
         const baseDirectives = [
@@ -371,7 +382,7 @@ class FederationMetadata {
             this.extendsDirective(),
         ];
         return this.isFed2Schema()
-            ? baseDirectives.concat(this.shareableDirective())
+            ? baseDirectives.concat(this.shareableDirective(), this.inaccessibleDirective(), this.overrideDirective())
             : baseDirectives;
     }
     entityType() {
@@ -401,6 +412,10 @@ class FederationMetadata {
 }
 exports.FederationMetadata = FederationMetadata;
 class FederationBlueprint extends definitions_1.SchemaBlueprint {
+    constructor(withRootTypeRenaming) {
+        super();
+        this.withRootTypeRenaming = withRootTypeRenaming;
+    }
     onAddedCoreFeature(schema, feature) {
         super.onAddedCoreFeature(schema, feature);
         if (feature.url.identity === federationSpec_1.federationIdentity) {
@@ -410,12 +425,14 @@ class FederationBlueprint extends definitions_1.SchemaBlueprint {
             }
         }
     }
-    onMissingDirectiveDefinition(schema, name) {
+    onMissingDirectiveDefinition(schema, name, args) {
         if (name === coreSpec_1.linkDirectiveDefaultName) {
-            linkSpec.addToSchema(schema);
-            return schema.directive(name);
+            const url = args && args['url'];
+            const as = url && url.startsWith(linkSpec.identity) ? args['as'] : undefined;
+            const errors = linkSpec.addDefinitionsToSchema(schema, as);
+            return errors.length > 0 ? errors : schema.directive(name);
         }
-        return super.onMissingDirectiveDefinition(schema, name);
+        return super.onMissingDirectiveDefinition(schema, name, args);
     }
     ignoreParsedField(type, fieldName) {
         if (!exports.FEDERATION_OPERATION_FIELDS.includes(fieldName)) {
@@ -431,7 +448,7 @@ class FederationBlueprint extends definitions_1.SchemaBlueprint {
         }
     }
     onDirectiveDefinitionAndSchemaParsed(schema) {
-        completeSubgraphSchema(schema);
+        return completeSubgraphSchema(schema);
     }
     onInvalidation(schema) {
         super.onInvalidation(schema);
@@ -442,20 +459,22 @@ class FederationBlueprint extends definitions_1.SchemaBlueprint {
     onValidation(schema) {
         var _a;
         const errors = super.onValidation(schema);
-        for (const k of definitions_1.allSchemaRootKinds) {
-            const type = (_a = schema.schemaDefinition.root(k)) === null || _a === void 0 ? void 0 : _a.type;
-            const defaultName = (0, definitions_1.defaultRootName)(k);
-            if (type && type.name !== defaultName) {
-                const existing = schema.type(defaultName);
-                if (existing) {
-                    errors.push(error_1.ERROR_CATEGORIES.ROOT_TYPE_USED.get(k).err({
-                        message: `The schema has a type named "${defaultName}" but it is not set as the ${k} root type ("${type.name}" is instead): `
-                            + 'this is not supported by federation. '
-                            + 'If a root type does not use its default name, there should be no other type with that default name.',
-                        nodes: (0, definitions_1.sourceASTs)(type, existing),
-                    }));
+        if (this.withRootTypeRenaming) {
+            for (const k of definitions_1.allSchemaRootKinds) {
+                const type = (_a = schema.schemaDefinition.root(k)) === null || _a === void 0 ? void 0 : _a.type;
+                const defaultName = (0, definitions_1.defaultRootName)(k);
+                if (type && type.name !== defaultName) {
+                    const existing = schema.type(defaultName);
+                    if (existing) {
+                        errors.push(error_1.ERROR_CATEGORIES.ROOT_TYPE_USED.get(k).err({
+                            message: `The schema has a type named "${defaultName}" but it is not set as the ${k} root type ("${type.name}" is instead): `
+                                + 'this is not supported by federation. '
+                                + 'If a root type does not use its default name, there should be no other type with that default name.',
+                            nodes: (0, definitions_1.sourceASTs)(type, existing),
+                        }));
+                    }
+                    type.rename(defaultName);
                 }
-                type.rename(defaultName);
             }
         }
         const metadata = federationMetadata(schema);
@@ -497,7 +516,7 @@ class FederationBlueprint extends definitions_1.SchemaBlueprint {
                 errors.push(error);
             }
         }
-        for (const itf of schema.types('InterfaceType')) {
+        for (const itf of schema.interfaceTypes()) {
             validateInterfaceRuntimeImplementationFieldsTypes(itf, metadata, errors);
         }
         return errors;
@@ -505,9 +524,35 @@ class FederationBlueprint extends definitions_1.SchemaBlueprint {
     validationRules() {
         return FEDERATION_VALIDATION_RULES;
     }
+    onUnknownDirectiveValidationError(schema, unknownDirectiveName, error) {
+        const metadata = federationMetadata(schema);
+        (0, utils_1.assert)(metadata, `This method should only have been called on a subgraph schema`);
+        if (federationSpec_1.ALL_FEDERATION_DIRECTIVES_DEFAULT_NAMES.includes(unknownDirectiveName)) {
+            if (metadata.isFed2Schema()) {
+                const federationFeature = metadata.federationFeature();
+                (0, utils_1.assert)(federationFeature, 'Fed2 subgraph _must_ link to the federation feature');
+                const directiveNameInSchema = federationFeature.directiveNameInSchema(unknownDirectiveName);
+                if (directiveNameInSchema.startsWith(federationFeature.nameInSchema + '__')) {
+                    return (0, error_1.withModifiedErrorMessage)(error, `${error.message} If you meant the "@${unknownDirectiveName}" federation directive, you should use fully-qualified name "@${directiveNameInSchema}" or add "@${unknownDirectiveName}" to the \`import\` argument of the @link to the federation specification.`);
+                }
+                else {
+                    return (0, error_1.withModifiedErrorMessage)(error, `${error.message} If you meant the "@${unknownDirectiveName}" federation directive, you should use "@${directiveNameInSchema}" as it is imported under that name in the @link to the federation specification of this schema.`);
+                }
+            }
+            else {
+                return (0, error_1.withModifiedErrorMessage)(error, `${error.message} If you meant the "@${unknownDirectiveName}" federation 2 directive, note that this schema is a federation 1 schema. To be a federation 2 schema, it needs to @link to the federation specifcation v2.`);
+            }
+        }
+        else if (!metadata.isFed2Schema()) {
+            const suggestions = (0, suggestions_1.suggestionList)(unknownDirectiveName, federationSpec_1.FEDERATION2_ONLY_SPEC_DIRECTIVES.map((spec) => spec.name));
+            if (suggestions.length > 0) {
+                return (0, error_1.withModifiedErrorMessage)(error, `${error.message}${(0, suggestions_1.didYouMean)(suggestions.map((s) => '@' + s))} If so, note that ${suggestions.length === 1 ? 'it is a federation 2 directive' : 'they are federation 2 directives'} but this schema is a federation 1 one. To be a federation 2 schema, it needs to @link to the federation specifcation v2.`);
+            }
+        }
+        return error;
+    }
 }
 exports.FederationBlueprint = FederationBlueprint;
-const federationBlueprint = new FederationBlueprint();
 function findUnusedNamedForLinkDirective(schema) {
     if (!schema.directive(linkSpec.url.name)) {
         return undefined;
@@ -530,7 +575,10 @@ function setSchemaAsFed2Subgraph(schema) {
     }
     else {
         const alias = findUnusedNamedForLinkDirective(schema);
-        linkSpec.addToSchema(schema, alias);
+        const errors = linkSpec.addToSchema(schema, alias);
+        if (errors.length > 0) {
+            throw (0, definitions_1.ErrGraphQLValidationFailed)(errors);
+        }
         spec = linkSpec;
         core = schema.coreFeatures;
         (0, utils_1.assert)(core, 'Schema should now be a core schema');
@@ -540,9 +588,13 @@ function setSchemaAsFed2Subgraph(schema) {
         url: federationSpec.url.toString(),
         import: federationSpec_1.FEDERATION2_SPEC_DIRECTIVES.map((spec) => `@${spec.name}`),
     });
-    completeSubgraphSchema(schema);
+    const errors = completeSubgraphSchema(schema);
+    if (errors.length > 0) {
+        throw (0, definitions_1.ErrGraphQLValidationFailed)(errors);
+    }
 }
 exports.setSchemaAsFed2Subgraph = setSchemaAsFed2Subgraph;
+exports.FEDERATION2_LINK_WTH_FULL_IMPORTS = '@link(url: "https://specs.apollo.dev/federation/v2.0", import: ["@key", "@requires", "@provides", "@external", "@tag", "@extends", "@shareable", "@inaccessible", "@override"])';
 function asFed2SubgraphDocument(document) {
     const fed2LinkExtension = {
         kind: graphql_1.Kind.SCHEMA_EXTENSION,
@@ -599,9 +651,9 @@ function isEntityType(type) {
     return !!metadata && type.hasAppliedDirective(metadata.keyDirective());
 }
 exports.isEntityType = isEntityType;
-function buildSubgraph(name, url, source) {
+function buildSubgraph(name, url, source, withRootTypeRenaming = true) {
     const buildOptions = {
-        blueprint: federationBlueprint,
+        blueprint: new FederationBlueprint(withRootTypeRenaming),
         validate: false,
     };
     let subgraph;
@@ -612,7 +664,7 @@ function buildSubgraph(name, url, source) {
         subgraph = new Subgraph(name, url, schema);
     }
     catch (e) {
-        if (e instanceof graphql_1.GraphQLError) {
+        if (e instanceof graphql_1.GraphQLError && name !== exports.FEDERATION_UNNAMED_SUBGRAPH_NAME) {
             throw addSubgraphToError(e, name, error_1.ERRORS.INVALID_GRAPHQL);
         }
         else {
@@ -623,7 +675,7 @@ function buildSubgraph(name, url, source) {
 }
 exports.buildSubgraph = buildSubgraph;
 function newEmptyFederation2Schema() {
-    const schema = new definitions_1.Schema(federationBlueprint);
+    const schema = new definitions_1.Schema(new FederationBlueprint(true));
     setSchemaAsFed2Subgraph(schema);
     return schema;
 }
@@ -633,20 +685,23 @@ function completeSubgraphSchema(schema) {
     if (coreFeatures) {
         const fedFeature = coreFeatures.getByIdentity(federationSpec_1.federationIdentity);
         if (fedFeature) {
-            completeFed2SubgraphSchema(schema);
+            return completeFed2SubgraphSchema(schema);
         }
         else {
-            completeFed1SubgraphSchema(schema);
+            return completeFed1SubgraphSchema(schema);
         }
     }
     else {
         const fedLink = schema.schemaDefinition.appliedDirectivesOf(coreSpec_1.linkDirectiveDefaultName).find(isFedSpecLinkDirective);
         if (fedLink) {
-            linkSpec.addToSchema(schema);
-            completeFed2SubgraphSchema(schema);
+            const errors = linkSpec.addToSchema(schema);
+            if (errors.length > 0) {
+                return errors;
+            }
+            return completeFed2SubgraphSchema(schema);
         }
         else {
-            completeFed1SubgraphSchema(schema);
+            return completeFed1SubgraphSchema(schema);
         }
     }
 }
@@ -655,13 +710,15 @@ function isFedSpecLinkDirective(directive) {
     return directive.name === coreSpec_1.linkDirectiveDefaultName && args['url'] && args['url'].startsWith(federationSpec_1.federationIdentity);
 }
 function completeFed1SubgraphSchema(schema) {
-    federationSpec_1.fieldSetTypeSpec.checkOrAdd(schema, '_' + federationSpec_1.fieldSetTypeSpec.name);
-    federationSpec_1.keyDirectiveSpec.checkOrAdd(schema);
-    federationSpec_1.requiresDirectiveSpec.checkOrAdd(schema);
-    federationSpec_1.providesDirectiveSpec.checkOrAdd(schema);
-    federationSpec_1.extendsDirectiveSpec.checkOrAdd(schema);
-    federationSpec_1.externalDirectiveSpec.checkOrAdd(schema);
-    federationSpec_1.tagDirectiveSpec.checkOrAdd(schema);
+    return [
+        federationSpec_1.fieldSetTypeSpec.checkOrAdd(schema, '_' + federationSpec_1.fieldSetTypeSpec.name),
+        federationSpec_1.keyDirectiveSpec.checkOrAdd(schema),
+        federationSpec_1.requiresDirectiveSpec.checkOrAdd(schema),
+        federationSpec_1.providesDirectiveSpec.checkOrAdd(schema),
+        federationSpec_1.extendsDirectiveSpec.checkOrAdd(schema),
+        federationSpec_1.externalDirectiveSpec.checkOrAdd(schema),
+        tagSpec.tagDirectiveSpec.checkOrAdd(schema),
+    ].flat();
 }
 function completeFed2SubgraphSchema(schema) {
     const coreFeatures = schema.coreFeatures;
@@ -670,12 +727,12 @@ function completeFed2SubgraphSchema(schema) {
     (0, utils_1.assert)(fedFeature, 'This method should not have been called on a schema with no @link for federation');
     const spec = federationSpec_1.FEDERATION_VERSIONS.find(fedFeature.url.version);
     if (!spec) {
-        throw error_1.ERRORS.UNKNOWN_FEDERATION_LINK_VERSION.err({
-            message: `Invalid version ${fedFeature.url.version} for the federation feature in @link direction on schema`,
-            nodes: fedFeature.directive.sourceAST
-        });
+        return [error_1.ERRORS.UNKNOWN_FEDERATION_LINK_VERSION.err({
+                message: `Invalid version ${fedFeature.url.version} for the federation feature in @link direction on schema`,
+                nodes: fedFeature.directive.sourceAST
+            })];
     }
-    spec.addElementsToSchema(schema);
+    return spec.addElementsToSchema(schema);
 }
 function parseFieldSetArgument({ parentType, directive, fieldAccessor, validate, }) {
     var _a;
@@ -852,7 +909,7 @@ exports.serviceTypeSpec = (0, directiveAndTypeSpecification_1.createObjectTypeSp
 exports.entityTypeSpec = (0, directiveAndTypeSpecification_1.createUnionTypeSpecification)({
     name: '_Entity',
     membersFct: (schema) => {
-        return schema.types("ObjectType").filter(isEntityType).map((t) => t.name);
+        return schema.objectTypes().filter(isEntityType).map((t) => t.name);
     },
 });
 exports.FEDERATION_OPERATION_TYPES = [exports.anyTypeSpec, exports.serviceTypeSpec, exports.entityTypeSpec];
@@ -899,7 +956,7 @@ class Subgraph {
             entityField.remove();
         }
         if (!queryType.field(exports.serviceFieldName)) {
-            queryType.addField(exports.serviceFieldName, metadata.serviceType());
+            queryType.addField(exports.serviceFieldName, new definitions_1.NonNullType(metadata.serviceType()));
         }
     }
     validate() {