Update composition to v0.16.0 (#6665)

Author: kamilkisiela

.changeset/stale-humans-camp.md

@@ -0,0 +1,9 @@
+---
+'hive': minor
+---
+
+Update `@theguild/federation-composition` to `v0.16.0`.
+
+- Support Apollo Federation `v2.7`, but without the progressive `@override`.
+- Support Apollo Federation `v2.8`, but without the `@context` and `@fromContext` directives.
+- Support Apollo Federation `v2.9`, including `@cost` and `@listSize` directives.

integration-tests/package.json

@@ -21,6 +21,7 @@
     "@hive/schema": "workspace:*",
     "@hive/server": "workspace:*",
     "@hive/storage": "workspace:*",
+    "@theguild/federation-composition": "0.16.0",
     "@trpc/client": "10.45.2",
     "@trpc/server": "10.45.2",
     "@types/async-retry": "1.4.8",

integration-tests/testkit/graphql.ts

@@ -1,7 +1,18 @@
-import { ExecutionResult, print } from 'graphql';
+import { ExecutionResult, parse, print } from 'graphql';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
+import { sortSDL } from '@theguild/federation-composition';
 import { getServiceHost } from './utils';
 
+/**
+ * Sorts the SDL of a supergraph schema and removes any extra whitespace.
+ * Helps with schema assertions, especially the snapshot tests.
+ * @param sdl The SDL of a supergraph schema.
+ * @returns The normalized SDL.
+ */
+export function normalizeSupergraph(sdl: string): string {
+  return print(sortSDL(parse(sdl, { noLocation: true })));
+}
+
 export async function execute<TResult, TVariables>(
   params: {
     document: TypedDocumentNode<TResult, TVariables>;

integration-tests/tests/schema/metadata.spec.ts

@@ -1,3 +1,4 @@
+import { normalizeSupergraph } from 'testkit/graphql';
 import { getServiceHost } from 'testkit/utils';
 import type { SchemaBuilderApi } from '@hive/schema';
 import { createTRPCProxyClient, httpLink } from '@trpc/client';
@@ -71,96 +72,55 @@ describe('schema service can process metadata', async () => {
   });
 
   test('@meta does not need to be in supergraph', () => {
-    expect(result.supergraph).toMatchInlineSnapshot(`
-      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.graphql-hive.com/hive/v1.0", import: ["@meta"]) 
-      {
-        query: Query
-        
-        
-      }
-
-
-        directive @join__enumValue(graph: join__Graph!) repeatable on ENUM_VALUE
-
-        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__graph(name: String!, url: String!) on ENUM_VALUE
-
-        directive @join__implements(
-          graph: join__Graph!
-          interface: String!
-        ) repeatable on OBJECT | INTERFACE
-
-        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__unionMember(graph: join__Graph!, member: String!) repeatable on UNION
-
-        scalar join__FieldSet
-
-
-        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
-        }
+    expect(result.supergraph).toBeDefined();
+    expect(normalizeSupergraph(result.supergraph!)).toMatchInlineSnapshot(`
+      directive @join__enumValue(graph: join__Graph!) repeatable on ENUM_VALUE
 
+      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__graph(name: String!, url: String!) on ENUM_VALUE
 
+      directive @join__implements(graph: join__Graph!, interface: String!) repeatable on INTERFACE | OBJECT
 
+      directive @join__type(graph: join__Graph!, key: join__FieldSet, extension: Boolean! = false, resolvable: Boolean! = true, isInterfaceObject: Boolean! = false) repeatable on ENUM | INPUT_OBJECT | INTERFACE | OBJECT | SCALAR | UNION
 
+      directive @join__unionMember(graph: join__Graph!, member: String!) repeatable on UNION
 
+      directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA
 
       enum join__Graph {
-        FOO_GRAPHQL @join__graph(name: "foo.graphql", url: "") 
-        USER_GRAPHQL @join__graph(name: "user.graphql", url: "") 
+        FOO_GRAPHQL @join__graph(name: "foo.graphql", url: "")
+        USER_GRAPHQL @join__graph(name: "user.graphql", url: "")
+      }
+
+      enum link__Purpose {
+        """
+        \`EXECUTION\` features provide metadata necessary for operation execution.
+        """
+        EXECUTION
+        """
+        \`SECURITY\` features provide metadata necessary to securely resolve fields.
+        """
+        SECURITY
       }
 
-      type Query @join__type(graph: FOO_GRAPHQL)  @join__type(graph: USER_GRAPHQL)  {
-        foo: String @join__field(graph: FOO_GRAPHQL) 
-        user: User @join__field(graph: USER_GRAPHQL) 
+      type Query @join__type(graph: FOO_GRAPHQL) @join__type(graph: USER_GRAPHQL) {
+        foo: String @join__field(graph: FOO_GRAPHQL)
+        user: User @join__field(graph: USER_GRAPHQL)
       }
 
-      type User @join__type(graph: USER_GRAPHQL)  {
+      type User @join__type(graph: USER_GRAPHQL) {
         id: ID!
         name: String
       }
+
+      scalar join__FieldSet
+
+      scalar link__Import
+
+      schema @link(for: EXECUTION, url: "https://specs.apollo.dev/join/v0.3") @link(import: ["@meta"], url: "https://specs.graphql-hive.com/hive/v1.0") @link(url: "https://specs.apollo.dev/link/v1.0") {
+        query: Query
+      }
     `);
   });
 

packages/libraries/cli/package.json

@@ -59,7 +59,7 @@
     "@oclif/core": "^3.26.6",
     "@oclif/plugin-help": "6.0.22",
     "@oclif/plugin-update": "4.2.13",
-    "@theguild/federation-composition": "0.15.0",
+    "@theguild/federation-composition": "0.16.0",
     "colors": "1.4.0",
     "env-ci": "7.3.0",
     "graphql": "^16.8.1",