Fix bug in JOIN_VERSIONS definition and update tests

Author: trevor-scheer

composition-js/src/__tests__/__snapshots__/compose.composeDirective.test.ts.snap

@@ -3,7 +3,7 @@
 exports[`composing custom core directives custom tag directive works when federation tag is renamed 1`] = `
 "schema
   @link(url: \\"https://specs.apollo.dev/link/v1.0\\")
-  @link(url: \\"https://specs.apollo.dev/join/v0.3\\", for: EXECUTION)
+  @link(url: \\"https://specs.apollo.dev/join/v0.2\\", for: EXECUTION)
   @link(url: \\"https://specs.apollo.dev/tag/v0.3\\", as: \\"mytag\\")
   @link(url: \\"https://custom.dev/tag/v1.0\\", import: [\\"@tag\\"])
 {
@@ -14,16 +14,12 @@ directive @link(url: String, as: String, for: link__Purpose, import: [link__Impo
 
 directive @join__graph(name: String!, url: String!) on ENUM_VALUE
 
-directive @join__type(graph: join__Graph!, key: join__FieldSet, extension: Boolean! = false, resolvable: Boolean! = true, isInterfaceObject: Boolean! = false) repeatable on OBJECT | INTERFACE | UNION | ENUM | INPUT_OBJECT | SCALAR
+directive @join__type(graph: join__Graph!, key: join__FieldSet, extension: Boolean! = false, resolvable: Boolean! = true) repeatable on OBJECT | INTERFACE | UNION | ENUM | INPUT_OBJECT | SCALAR
 
-directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
+directive @join__field(graph: join__Graph!, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
 
 directive @join__implements(graph: join__Graph!, interface: String!) repeatable on OBJECT | INTERFACE
 
-directive @join__unionMember(graph: join__Graph!, member: String!) repeatable on UNION
-
-directive @join__enumValue(graph: join__Graph!) repeatable on ENUM_VALUE
-
 directive @mytag(name: String!) repeatable on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION | SCHEMA
 
 directive @tag(name: String!, prop: String!) on FIELD_DEFINITION | OBJECT

composition-js/src/__tests__/compose.test.ts

@@ -2448,7 +2448,7 @@ describe('composition', () => {
     const subgraphA = {
       typeDefs: gql`
         extend schema @link(
-          url: "https://specs.apollo.dev/federation/v2.0",
+          url: "https://specs.apollo.dev/federation/v2.3",
           import: [{ name: "@key", as: "@identity"}, {name: "@requires", as: "@gimme"}, {name: "@external", as: "@notInThisSubgraph"}]
         )
 
@@ -2469,7 +2469,7 @@ describe('composition', () => {
     const subgraphB = {
       typeDefs: gql`
         extend schema @link(
-          url: "https://specs.apollo.dev/federation/v2.0",
+          url: "https://specs.apollo.dev/federation/v2.3",
           import: [{ name: "@key", as: "@myKey"}]
         )
 
@@ -4676,10 +4676,14 @@ describe('composition', () => {
     }
 
     it.each([
-      { subgraphFedVersion: "2.4", expectedJoinVersion: "0.3"},
-      { subgraphFedVersion: "2.5", expectedJoinVersion: "0.3"},
-      { subgraphFedVersion: "2.6", expectedJoinVersion: "0.3"},
-      { subgraphFedVersion: "2.7", expectedJoinVersion: "0.4"},
+      { subgraphFedVersion: "2.0", expectedJoinVersion: "0.2" },
+      { subgraphFedVersion: "2.1", expectedJoinVersion: "0.2" },
+      { subgraphFedVersion: "2.2", expectedJoinVersion: "0.2" },
+      { subgraphFedVersion: "2.3", expectedJoinVersion: "0.3" },
+      { subgraphFedVersion: "2.4", expectedJoinVersion: "0.3" },
+      { subgraphFedVersion: "2.5", expectedJoinVersion: "0.3" },
+      { subgraphFedVersion: "2.6", expectedJoinVersion: "0.3" },
+      { subgraphFedVersion: "2.7", expectedJoinVersion: "0.4" },
       { subgraphFedVersion: "2.8", expectedJoinVersion: "0.5" },
     ])("federation -> join versions", ({ subgraphFedVersion, expectedJoinVersion }) => {
       const subgraph = subgraphWithFederationSpecVersion(subgraphFedVersion);

internals-js/src/specs/joinSpec.ts

@@ -286,8 +286,8 @@ export class JoinSpecDefinition extends FeatureDefinition {
 //  - 0.5: adds the `contextArguments` argument to `@join_field` for setting context.
 export const JOIN_VERSIONS = new FeatureDefinitions<JoinSpecDefinition>(joinIdentity)
   .add(new JoinSpecDefinition(new FeatureVersion(0, 1)))
-  .add(new JoinSpecDefinition(new FeatureVersion(0, 2)))
-  .add(new JoinSpecDefinition(new FeatureVersion(0, 3), new FeatureVersion(2, 0)))
+  .add(new JoinSpecDefinition(new FeatureVersion(0, 2), new FeatureVersion(2, 0)))
+  .add(new JoinSpecDefinition(new FeatureVersion(0, 3), new FeatureVersion(2, 3)))
   .add(new JoinSpecDefinition(new FeatureVersion(0, 4), new FeatureVersion(2, 7)))
   .add(new JoinSpecDefinition(new FeatureVersion(0, 5), new FeatureVersion(2, 8)));