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

package/dist/knownCoreFeatures.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"knownCoreFeatures.d.ts","sourceRoot":"","sources":["../src/knownCoreFeatures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAI/E,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,kBAAkB,QAInE;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,UAAU,GAAG,iBAAiB,GAAG,SAAS,CAE3F"}

package/dist/knownCoreFeatures.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.coreFeatureDefinitionIfKnown = exports.registerKnownFeature = void 0;
+const registeredFeatures = new Map();
+function registerKnownFeature(definitions) {
+    if (!registeredFeatures.has(definitions.identity)) {
+        registeredFeatures.set(definitions.identity, definitions);
+    }
+}
+exports.registerKnownFeature = registerKnownFeature;
+function coreFeatureDefinitionIfKnown(url) {
+    var _a;
+    return (_a = registeredFeatures.get(url.identity)) === null || _a === void 0 ? void 0 : _a.find(url.version);
+}
+exports.coreFeatureDefinitionIfKnown = coreFeatureDefinitionIfKnown;
+//# sourceMappingURL=knownCoreFeatures.js.map

package/dist/knownCoreFeatures.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"knownCoreFeatures.js","sourceRoot":"","sources":["../src/knownCoreFeatures.ts"],"names":[],"mappings":";;;AAEA,MAAM,kBAAkB,GAAoC,IAAI,GAAG,EAAE,CAAC;AAEtE,SAAgB,oBAAoB,CAAC,WAA+B;IAClE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;QACjD,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;KAC3D;AACH,CAAC;AAJD,oDAIC;AAED,SAAgB,4BAA4B,CAAC,GAAe;;IAC1D,OAAO,MAAA,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,0CAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACjE,CAAC;AAFD,oEAEC"}

package/dist/tagSpec.d.ts

@@ -10,6 +10,7 @@ export declare class TagSpecDefinition extends FeatureDefinition {
         name: string;
     }>;
     checkCompatibleDirective(definition: DirectiveDefinition): GraphQLError | undefined;
+    allElementNames(): string[];
 }
 export declare const TAG_VERSIONS: FeatureDefinitions<TagSpecDefinition>;
 //# sourceMappingURL=tagSpec.d.ts.map

package/dist/tagSpec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tagSpec.d.ts","sourceRoot":"","sources":["../src/tagSpec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAc,cAAc,EAAE,MAAM,YAAY,CAAC;AAC/F,OAAO,EAAE,mBAAmB,EAAe,MAAM,EAAE,MAAM,eAAe,CAAC;AAIzE,eAAO,MAAM,WAAW,iCAAiC,CAAC;AAE1D,eAAO,MAAM,YAAY,qBAKxB,CAAC;AAIF,qBAAa,iBAAkB,SAAQ,iBAAiB;gBAC1C,OAAO,EAAE,cAAc;IAInC,mBAAmB,CAAC,MAAM,EAAE,MAAM;IAMlC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC;IAIjE,wBAAwB,CAAC,UAAU,EAAE,mBAAmB,GAAG,YAAY,GAAG,SAAS;CAapF;AAED,eAAO,MAAM,YAAY,uCAC8B,CAAC"}
+{"version":3,"file":"tagSpec.d.ts","sourceRoot":"","sources":["../src/tagSpec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAc,cAAc,EAAE,MAAM,YAAY,CAAC;AAC/F,OAAO,EAAE,mBAAmB,EAAe,MAAM,EAAE,MAAM,eAAe,CAAC;AAKzE,eAAO,MAAM,WAAW,iCAAiC,CAAC;AAE1D,eAAO,MAAM,YAAY,qBAKxB,CAAC;AAIF,qBAAa,iBAAkB,SAAQ,iBAAiB;gBAC1C,OAAO,EAAE,cAAc;IAInC,mBAAmB,CAAC,MAAM,EAAE,MAAM;IAMlC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC;IAIjE,wBAAwB,CAAC,UAAU,EAAE,mBAAmB,GAAG,YAAY,GAAG,SAAS;IAcnF,eAAe,IAAI,MAAM,EAAE;CAG5B;AAED,eAAO,MAAM,YAAY,uCAC8B,CAAC"}

package/dist/tagSpec.js

@@ -5,6 +5,7 @@ const graphql_1 = require("graphql");
 const coreSpec_1 = require("./coreSpec");
 const definitions_1 = require("./definitions");
 const error_1 = require("./error");
+const knownCoreFeatures_1 = require("./knownCoreFeatures");
 const types_1 = require("./types");
 exports.tagIdentity = 'https://specs.apollo.dev/tag';
 exports.tagLocations = [
@@ -38,8 +39,12 @@ class TagSpecDefinition extends coreSpec_1.FeatureDefinition {
         }
         return undefined;
     }
+    allElementNames() {
+        return ["@tag"];
+    }
 }
 exports.TagSpecDefinition = TagSpecDefinition;
 exports.TAG_VERSIONS = new coreSpec_1.FeatureDefinitions(exports.tagIdentity)
     .add(new TagSpecDefinition(new coreSpec_1.FeatureVersion(0, 1)));
+(0, knownCoreFeatures_1.registerKnownFeature)(exports.TAG_VERSIONS);
 //# sourceMappingURL=tagSpec.js.map

package/dist/tagSpec.js.map

@@ -1 +1 @@
-{"version":3,"file":"tagSpec.js","sourceRoot":"","sources":["../src/tagSpec.ts"],"names":[],"mappings":";;;AAAA,qCAA0D;AAC1D,yCAA+F;AAC/F,+CAAyE;AACzE,mCAAiC;AACjC,mCAAmC;AAEtB,QAAA,WAAW,GAAG,8BAA8B,CAAC;AAE7C,QAAA,YAAY,GAAG;IAC1B,2BAAiB,CAAC,gBAAgB;IAClC,2BAAiB,CAAC,MAAM;IACxB,2BAAiB,CAAC,SAAS;IAC3B,2BAAiB,CAAC,KAAK;CACxB,CAAC;AAEF,MAAM,oBAAoB,GAAG,2FAA2F,CAAC;AAEzH,MAAa,iBAAkB,SAAQ,4BAAiB;IACtD,YAAY,OAAuB;QACjC,KAAK,CAAC,IAAI,qBAAU,CAAC,mBAAW,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,mBAAmB,CAAC,MAAc;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,YAAY,CAAC,GAAG,oBAAY,CAAC,CAAC;QACjF,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;QAC5B,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,yBAAW,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAE,CAAC;IACxC,CAAC;IAED,wBAAwB,CAAC,UAA+B;QACtD,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAC3E,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,eAAe,GAAG,OAAO,IAAI,IAAA,gBAAQ,EAAC,OAAO,CAAC,IAAK,EAAE,IAAI,yBAAW,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QAC9G,MAAM,iBAAiB,GAAG,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QACxF,IAAI,mBAAmB,IAAI,CAAC,eAAe,IAAI,CAAC,iBAAiB,EAAE;YACjE,OAAO,cAAM,CAAC,4BAA4B,CAAC,GAAG,CAAC;gBAC7C,OAAO,EAAE,0IAA0I,oBAAoB,EAAE;aAC1K,CACA,CAAC;SACH;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA5BD,8CA4BC;AAEY,QAAA,YAAY,GAAG,IAAI,6BAAkB,CAAoB,mBAAW,CAAC;KAC/E,GAAG,CAAC,IAAI,iBAAiB,CAAC,IAAI,yBAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"tagSpec.js","sourceRoot":"","sources":["../src/tagSpec.ts"],"names":[],"mappings":";;;AAAA,qCAA0D;AAC1D,yCAA+F;AAC/F,+CAAyE;AACzE,mCAAiC;AACjC,2DAA2D;AAC3D,mCAAmC;AAEtB,QAAA,WAAW,GAAG,8BAA8B,CAAC;AAE7C,QAAA,YAAY,GAAG;IAC1B,2BAAiB,CAAC,gBAAgB;IAClC,2BAAiB,CAAC,MAAM;IACxB,2BAAiB,CAAC,SAAS;IAC3B,2BAAiB,CAAC,KAAK;CACxB,CAAC;AAEF,MAAM,oBAAoB,GAAG,2FAA2F,CAAC;AAEzH,MAAa,iBAAkB,SAAQ,4BAAiB;IACtD,YAAY,OAAuB;QACjC,KAAK,CAAC,IAAI,qBAAU,CAAC,mBAAW,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,mBAAmB,CAAC,MAAc;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,YAAY,CAAC,GAAG,oBAAY,CAAC,CAAC;QACjF,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;QAC5B,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,yBAAW,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAE,CAAC;IACxC,CAAC;IAED,wBAAwB,CAAC,UAA+B;QACtD,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAC3E,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,eAAe,GAAG,OAAO,IAAI,IAAA,gBAAQ,EAAC,OAAO,CAAC,IAAK,EAAE,IAAI,yBAAW,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QAC9G,MAAM,iBAAiB,GAAG,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QACxF,IAAI,mBAAmB,IAAI,CAAC,eAAe,IAAI,CAAC,iBAAiB,EAAE;YACjE,OAAO,cAAM,CAAC,4BAA4B,CAAC,GAAG,CAAC;gBAC7C,OAAO,EAAE,0IAA0I,oBAAoB,EAAE;aAC1K,CACA,CAAC;SACH;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,eAAe;QACb,OAAO,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;CACF;AAhCD,8CAgCC;AAEY,QAAA,YAAY,GAAG,IAAI,6BAAkB,CAAoB,mBAAW,CAAC;KAC/E,GAAG,CAAC,IAAI,iBAAiB,CAAC,IAAI,yBAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAExD,IAAA,wCAAoB,EAAC,oBAAY,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/federation-internals",
-  "version": "2.0.0-preview.7",
+  "version": "2.0.0-preview.8",
   "description": "Apollo Federation internal utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,5 +33,5 @@
   "peerDependencies": {
     "graphql": "^16.0.0"
   },
-  "gitHead": "8572831c6abf87749ba60dba161ae3ce7fb30ea8"
+  "gitHead": "516a30d879b4bde5945adb55b80d0f64118c322f"
 }

package/src/__tests__/coreSpec.test.ts

@@ -0,0 +1,100 @@
+import { DocumentNode, GraphQLError } from "graphql";
+import gql from "graphql-tag";
+import { buildSubgraph } from "../federation";
+import { errorCauses } from "../definitions";
+import { assert } from "../utils";
+
+function expectErrors(
+  subgraphDefs: DocumentNode,
+  expectedErrorMessages: string[],
+) {
+  let thrownError: Error | undefined = undefined;
+  expect(() => {
+    try {
+      // Note: we use buildSubgraph because currently it's the only one that does auto-magic import of
+      // directive definition, and we don't want to bother with adding the @link definition to every
+      // example.
+      buildSubgraph('S', '', subgraphDefs)
+    } catch (e) {
+      // Kind-of ugly, but if Jest has a better option, I haven't found it.
+      thrownError = e;
+      throw e;
+    }
+  }).toThrow(GraphQLError);
+
+  assert(thrownError, 'Should have thrown');
+  const causes = errorCauses(thrownError);
+  assert(causes, 'Should have some causes');
+  // Note: all the received message with start with "[S] <rest of message>", so the `slice` below
+  // strips the extra prefix. This avoid leaking the subgraph name to leak to the tests themselves.
+  expect(causes.map((e) => e.message.slice(4))).toStrictEqual(expectedErrorMessages);
+}
+
+describe('@link(import:) argument', () => {
+  test('errors on misformed values', () => {
+    const schema = gql`
+      extend schema @link(
+        url: "https://specs.apollo.dev/federation/v2.0",
+        import: [
+          2,
+          { foo: "bar" },
+          { name: "@key", badName: "foo"},
+          { name: 42 },
+          { as: "bar" },
+         ]
+      )
+
+      type Query {
+        q: Int
+      }
+    `;
+
+    expectErrors(schema, [
+      'Invalid sub-value 2 for @link(import:) argument: values should be either strings or input object values of the form { name: "<importedElement>", as: "<alias>" }.',
+      'Unknown field "foo" for sub-value {foo: "bar"} of @link(import:) argument.',
+      'Unknown field "badName" for sub-value {name: "@key", badName: "foo"} of @link(import:) argument.',
+      'Invalid value for the "name" field for sub-value {name: 42} of @link(import:) argument: must be a string.',
+      'Invalid sub-value {as: "bar"} for @link(import:) argument: missing mandatory "name" field.',
+    ]);
+  });
+
+  test('errors on mismatch between name and alias', () => {
+    const schema = gql`
+      extend schema @link(
+        url: "https://specs.apollo.dev/federation/v2.0",
+        import: [
+          { name: "@key", as: "myKey" },
+          { name: "FieldSet", as: "@fieldSet" },
+        ]
+      )
+
+      type Query {
+        q: Int
+      }
+    `;
+
+    expectErrors(schema, [
+      'Invalid @link import renaming: directive "@key" imported name should start with a \'@\' character, but got "myKey".',
+      'Invalid @link import renaming: type "FieldSet" imported name should not start with a \'@\' character, but got "@fieldSet" (or, if @FieldSet is a directive, then it should be referred to with a \'@\').',
+    ]);
+  });
+
+  test('errors on importing unknown elements for known features', () => {
+    const schema = gql`
+      extend schema @link(
+        url: "https://specs.apollo.dev/federation/v2.0",
+        import: [ "@foo", "key", { name: "@sharable" } ]
+      )
+
+      type Query {
+        q: Int
+      }
+    `;
+
+    expectErrors(schema, [
+      'Cannot import unknown element "@foo".',
+      'Cannot import unknown element "key". Did you mean directive "@key"?',
+      'Cannot import unknown element "@sharable\". Did you mean "@shareable"?',
+    ]);
+  });
+});

package/src/__tests__/definitions.test.ts

@@ -7,6 +7,7 @@ import {
   EnumType,
   SchemaElement,
   UnionType,
+  InputObjectType,
 } from '../../dist/definitions';
 import {
   printSchema as printGraphQLjsSchema
@@ -612,3 +613,77 @@ test('correctly convert to a graphQL-js schema', () => {
   const graphqQLSchema = schema.toGraphQLJSSchema();
   expect(printGraphQLjsSchema(graphqQLSchema)).toMatchString(sdl);
 });
+
+test('retrieving elements by coordinate', () => {
+  const sdl = `
+    directive @foo(bar: Int) on FIELD
+
+    type Query {
+      t: T
+    }
+
+    type T {
+      f1(x: Int): String
+      f2: String
+    }
+
+    interface I {
+      i: String
+    }
+
+    input O {
+      x: Int
+    }
+
+    enum E {
+      FOO
+      BAR
+    }
+
+    scalar Date
+  `;
+  const schema = parseSchema(sdl);
+
+  expect(schema.elementByCoordinate('Query')).toBe(schema.schemaDefinition.rootType('query'));
+  expect(schema.elementByCoordinate('Query.t')).toBe(schema.schemaDefinition.rootType('query')?.field('t'));
+
+  const typeT = schema.type('T') as ObjectType;
+  expect(schema.elementByCoordinate('T')).toBe(typeT);
+  expect(schema.elementByCoordinate('T.f1')).toBe(typeT.field('f1'));
+  expect(schema.elementByCoordinate('T.f2')).toBe(typeT.field('f2'));
+  expect(schema.elementByCoordinate('T.f1(x:)')).toBe(typeT.field('f1')?.argument('x'));
+
+  const typeI = schema.type('I') as InterfaceType;
+  expect(schema.elementByCoordinate('I')).toBe(typeI);
+  expect(schema.elementByCoordinate('I.i')).toBe(typeI.field('i'));
+
+  const typeO = schema.type('O') as InputObjectType;
+  expect(schema.elementByCoordinate('O')).toBe(typeO);
+  expect(schema.elementByCoordinate('O.x')).toBe(typeO.field('x'));
+
+  const typeE = schema.type('E') as EnumType;
+  expect(schema.elementByCoordinate('E')).toBe(typeE);
+  expect(schema.elementByCoordinate('E.FOO')).toBe(typeE.value('FOO'));
+
+  expect(schema.elementByCoordinate('Date')).toBe(schema.type('Date'));
+
+  const directiveFoo = schema.directive('foo')!;
+  expect(schema.elementByCoordinate('@foo')).toBe(directiveFoo);
+  expect(schema.elementByCoordinate('@foo(bar:)')).toBe(directiveFoo.argument('bar'));
+
+  expect(schema.elementByCoordinate('SomeType')).toBeUndefined();
+  expect(schema.elementByCoordinate('T.f3')).toBeUndefined();
+  expect(schema.elementByCoordinate('T.f1(y:)')).toBeUndefined();
+  expect(schema.elementByCoordinate('I.j')).toBeUndefined();
+  expect(schema.elementByCoordinate('I.j(x:)')).toBeUndefined();
+  expect(schema.elementByCoordinate('O.z')).toBeUndefined();
+  expect(schema.elementByCoordinate('@bar')).toBeUndefined();
+  expect(schema.elementByCoordinate('@foo(unknown:)')).toBeUndefined();
+
+  expect(() => schema.elementByCoordinate('foo bar')).toThrow();
+  expect(() => schema.elementByCoordinate('@foo.bar')).toThrow();
+  // Note that because 'O' is an input type, it's field can't have args
+  expect(() => schema.elementByCoordinate('O.x(foo:)')).toThrow();
+  // Note that because 'Date' is a scalar, it cannot have fields
+  expect(() => schema.elementByCoordinate('Date.bar')).toThrow();
+})

package/src/__tests__/removeInaccessibleElements.test.ts

@@ -181,7 +181,7 @@ describe('removeInaccessibleElements', () => {
     expect(() => {
       removeInaccessibleElements(schema);
     }).toThrow(
-      `Field Query.fooField returns an @inaccessible type without being marked @inaccessible itself`,
+      `Field "Query.fooField" returns @inaccessible type "Foo" without being marked @inaccessible itself`,
     );
   });
 

package/src/__tests__/schemaUpgrader.test.ts

@@ -1,3 +1,4 @@
+import { FEDERATION2_LINK_WTH_FULL_IMPORTS } from '..';
 import { buildSubgraph, Subgraphs } from '../federation';
 import { UpgradeChangeID, UpgradeResult, upgradeSubgraphsIfNecessary } from '../schemaUpgrader';
 import './matchers';
@@ -91,7 +92,7 @@ test('upgrade complex schema', () => {
   expect(res.subgraphs?.get('s1')?.toString()).toMatchString(`
     schema
       @link(url: "https://specs.apollo.dev/link/v1.0")
-      @link(url: "https://specs.apollo.dev/federation/v2.0", import: ["@key", "@requires", "@provides", "@external", "@shareable", "@tag", "@extends"])
+      ${FEDERATION2_LINK_WTH_FULL_IMPORTS}
     {
       query: Query
     }
@@ -148,7 +149,7 @@ test('update federation directive non-string arguments', () => {
   expect(res.subgraphs?.get('s')?.toString()).toMatchString(`
     schema
       @link(url: "https://specs.apollo.dev/link/v1.0")
-      @link(url: "https://specs.apollo.dev/federation/v2.0", import: ["@key", "@requires", "@provides", "@external", "@shareable", "@tag", "@extends"])
+      ${FEDERATION2_LINK_WTH_FULL_IMPORTS}
     {
       query: Query
     }

package/src/__tests__/subgraphValidation.test.ts

@@ -6,10 +6,17 @@ import { asFed2SubgraphDocument, buildSubgraph } from "../federation"
 // Builds the provided subgraph (using name 'S' for the subgraph) and, if the
 // subgraph is invalid/has errors, return those errors as a list of [code, message].
 // If the subgraph is valid, return undefined.
-function buildForErrors(subgraphDefs: DocumentNode, subgraphName: string = 'S'): [string, string][] | undefined {
+function buildForErrors(
+  subgraphDefs: DocumentNode,
+  options?: {
+    subgraphName?: string,
+    asFed2?: boolean,
+  }
+): [string, string][] | undefined {
   try {
-    const doc = asFed2SubgraphDocument(subgraphDefs);
-    buildSubgraph(subgraphName, `http://${subgraphName}`, doc).validate();
+    const doc = (options?.asFed2 ?? true) ? asFed2SubgraphDocument(subgraphDefs) : subgraphDefs;
+    const name = options?.subgraphName ?? 'S';
+    buildSubgraph(name, `http://${name}`, doc).validate();
     return undefined;
   } catch (e) {
     const causes = errorCauses(e);
@@ -436,7 +443,6 @@ describe('root types', () => {
   });
 });
 
-
 it('validates all implementations of interface field have same type if any has @external', () => {
   const subgraph = gql`
     type Query {
@@ -464,3 +470,56 @@ it('validates all implementations of interface field have same type if any has @
       ['INTERFACE_FIELD_IMPLEM_TYPE_MISMATCH', '[S] Some of the runtime implementations of interface field "I.f" are marked @external or have a @require ("T3.f") so all the implementations should use the same type (a current limitation of federation; see https://github.com/apollographql/federation/issues/1257), but "T1.f" and "T3.f" have type "Int" while "T2.f" has type "Int!".'],
     ]);
 })
+
+describe('custom error message for misnamed directives', () => {
+  it.each([
+    { name: 'fed1', extraMsg: ' If so, note that it is a federation 2 directive but this schema is a federation 1 one. To be a federation 2 schema, it needs to @link to the federation specifcation v2.' },
+    { name: 'fed2', extraMsg: '' },
+
+  ])('has suggestions if a federation directive name is mispelled in $name', ({name, extraMsg}) => {
+    const subgraph = gql`
+      type T @keys(fields: "id") {
+        id: Int @foo
+        foo: String @sharable
+      }
+    `;
+
+    expect(buildForErrors(subgraph, { asFed2 : name === 'fed2' })).toStrictEqual([
+      ['INVALID_GRAPHQL', `[S] Unknown directive "@foo".`],
+      ['INVALID_GRAPHQL', `[S] Unknown directive "@sharable". Did you mean "@shareable"?${extraMsg}`],
+      ['INVALID_GRAPHQL', `[S] Unknown directive "@keys". Did you mean "@key"?`],
+    ]);
+  });
+
+  it('has suggestions if a fed2 directive is used in fed1', () => {
+    const subgraph = gql`
+      type T @key(fields: "id") {
+        id: Int
+        foo: String @shareable
+      }
+    `;
+
+    expect(buildForErrors(subgraph, { asFed2 : false })).toStrictEqual([
+      ['INVALID_GRAPHQL', `[S] Unknown directive "@shareable". If you meant the \"@shareable\" 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.`],
+    ]);
+  });
+
+  it('has suggestions if a fed2 directive is used under the wrong name (for the schema)', () => {
+    const subgraph = gql`
+      extend schema
+        @link(url: "https://specs.apollo.dev/federation/v2.0",
+              import: [ { name: "@key", as: "@myKey"} ])
+
+      type T @key(fields: "id") {
+        id: Int
+        foo: String @shareable
+      }
+    `;
+
+    // Note: it's a fed2 schema, but we manually add the @link, so we pass `asFed2: false` to avoid having added twice.
+    expect(buildForErrors(subgraph, { asFed2 : false })).toStrictEqual([
+      ['INVALID_GRAPHQL', `[S] Unknown directive "@shareable". If you meant the \"@shareable\" federation directive, you should use fully-qualified name "@federation__shareable" or add "@shareable" to the \`import\` argument of the @link to the federation specification.`],
+      ['INVALID_GRAPHQL', `[S] Unknown directive "@key". If you meant the "@key" federation directive, you should use "@myKey" as it is imported under that name in the @link to the federation specification of this schema.`],
+    ]);
+  });
+});