Upgrade @apollo libraries and fix usage of fed-internals

package.json

@@ -19,16 +19,16 @@
     "dev": "node bin/index.js",
     "dev:customer": "node bin/index.js audit --account <account-name>",
     "check:lint": "yarn eslint",
-    "check:tcs": "yarn tsc"
+    "check:tsc": "yarn tsc"
   },
   "dependencies": {
-    "@apollo/composition": "^2.2.1",
+    "@apollo/composition": "^2.5.7",
     "@apollo/federation-1": "npm:@apollo/[email protected]",
-    "@apollo/federation-internals": "^2.2.1",
-    "@apollo/gateway": "^2.2.1",
-    "@apollo/query-planner": "^2.2.1",
+    "@apollo/federation-internals": "^2.5.7",
+    "@apollo/gateway": "^2.5.7",
+    "@apollo/query-planner": "^2.5.7",
     "@apollo/query-planner-1": "npm:@apollo/[email protected]",
-    "@apollo/subgraph": "^2.2.1",
+    "@apollo/subgraph": "^2.5.7",
     "@urql/core": "^2.6.0",
     "cli-progress": "^3.11.2",
     "clipanion": "^3.2.0-rc.11",

src/federation/normalize-2.js

@@ -4,6 +4,7 @@ import { parse, print, visit } from 'graphql';
  * @typedef {import('@apollo/query-planner').QueryPlanSelectionNode} QueryPlanSelectionNode
  * @typedef {import('@apollo/query-planner').QueryPlan} QueryPlan
  * @typedef {import('@apollo/query-planner').PlanNode} PlanNode
+ * @typedef {import('@apollo/query-planner').SubscriptionNode} SubscriptionNode
  * @typedef {import('../typings').QueryPlanVisitor2} QueryPlanVisitor
  */
 
@@ -14,7 +15,7 @@ import { parse, print, visit } from 'graphql';
 function visitQueryPlan(plan, visitor) {
   const newPlan = { ...plan };
   /**
-   * @param {PlanNode} node
+   * @param {PlanNode | SubscriptionNode} node
    */
   function recurse(node) {
     const newNode = { ...node };

src/federation/queryPlanToMermaid.js

@@ -7,7 +7,7 @@ function hash() {
  * sharable package
  *
  * https://github.com/mdg-private/studio-ui/blob/f4341fd691794e68901b5122403b038749d15a82/src/app/graph/explorerPage/resultsPane/queryPlan/queryPlanToMermaid.ts#L137
- * @param {import("@apollo/query-planner-1").PlanNode|import("@apollo/query-planner").PlanNode} currentNode
+ * @param {import("@apollo/query-planner-1").PlanNode|import("@apollo/query-planner").PlanNode|import("@apollo/query-planner").SubscriptionNode} currentNode
  * @return {{nodeText: string, startHash: string, endHash: string}}
  */
 function process(currentNode) {
@@ -28,28 +28,27 @@ function process(currentNode) {
             return `
               ${link}
               ${processedChild.nodeText}
-            `;
+`;
           })
           .join(''),
       };
     }
     case 'Parallel': {
       const nodeHash = hash();
+      const children = currentNode.nodes.map((childNode) => {
+        const processedChild = process(childNode);
+        return `
+             ${nodeHash} --> ${processedChild.startHash}
+             ${processedChild.nodeText}
+`;
+      });
       return {
         startHash: nodeHash,
         endHash: nodeHash,
         nodeText: `
           ${nodeHash}("Parallel")
 
-          ${currentNode.nodes
-    .map((node) => {
-      const processedChild = process(node);
-      return `
-                ${nodeHash} --> ${processedChild.startHash}
-                ${processedChild.nodeText}
-              `;
-    })
-    .join('')}
+          ${children.join('')}
         `,
       };
     }
@@ -71,18 +70,17 @@ function process(currentNode) {
     case 'Flatten': {
       const nodeHash = hash();
       const processedChild = process(currentNode.node);
+      const nodePath = currentNode.path.join(',').replaceAll('@', '[]');
 
       return {
         startHash: processedChild.startHash,
         endHash: nodeHash,
         nodeText: `
-          ${nodeHash}("Flatten (${currentNode.path
-          .join(',')
-          .replaceAll('@', '[]')})")
+          ${nodeHash}("Flatten (${nodePath})")
 
           ${processedChild.endHash} --> ${nodeHash}
           ${processedChild.nodeText}
-        `,
+`,
       };
     }
     case 'Condition': {
@@ -101,6 +99,29 @@ function process(currentNode) {
         nodeText: `${nodeHash}("Defer")`,
       };
     }
+    case 'Subscription': {
+      const nodeHash = hash();
+      const processedPrimary = process(currentNode.primary);
+      const processedRest = currentNode.rest ? process(currentNode.rest) : null;
+      const restNodeText = processedRest
+        ? `
+          ${nodeHash} --> ("Rest ${processedRest.startHash}")
+          ${processedRest.nodeText}
+`
+        : '';
+
+      return {
+        startHash: nodeHash,
+        endHash: nodeHash,
+        nodeText: `
+          ${nodeHash}("Subscription")
+
+          ${nodeHash} --> ("Primary ${processedPrimary.startHash}")
+          ${processedPrimary.nodeText}
+          ${restNodeText}
+`,
+      };
+    }
     default:
       return currentNode;
   }

src/federation/two.js

@@ -1,10 +1,10 @@
 import { compose } from '@apollo/composition';
 import {
   buildSubgraph,
-  buildSupergraphSchema,
   errorCauses,
   operationFromDocument,
   Subgraphs,
+  Supergraph,
 } from '@apollo/federation-internals';
 import { QueryPlanner } from '@apollo/query-planner';
 import { GraphQLError, parse } from 'graphql';
@@ -58,7 +58,8 @@ export function queryPlan(schema, operationDoc, operationName) {
   const operation = operationFromDocument(schema, documentNode, {
     operationName,
   });
-  const queryPlanner = new QueryPlanner(schema);
+  const supergraph = new Supergraph(schema, null, false);
+  const queryPlanner = new QueryPlanner(supergraph);
   return queryPlanner.buildQueryPlan(operation);
 }
 
@@ -73,10 +74,12 @@ export function queryPlanWithFed1Schema(
   operationName,
 ) {
   const documentNode = parse(operationDoc);
-  const [schema] = buildSupergraphSchema(supergraphSdl);
-  const operation = operationFromDocument(schema, documentNode, {
+  const supergraph = Supergraph.build(supergraphSdl, {
+    validateSupergraph: true,
+  });
+  const operation = operationFromDocument(supergraph.schema, documentNode, {
     operationName,
   });
-  const queryPlanner = new QueryPlanner(schema);
+  const queryPlanner = new QueryPlanner(supergraph);
   return queryPlanner.buildQueryPlan(operation);
 }

src/federation/two.test.js

@@ -72,11 +72,13 @@ Object {
     "nodes": Array [
       Object {
         "id": undefined,
+        "inputRewrites": undefined,
         "kind": "Fetch",
         "operation": "query Search__products__0($search:[String!]){products(search:$search){__typename id name}}",
         "operationDocumentNode": undefined,
         "operationKind": "query",
         "operationName": "Search__products__0",
+        "outputRewrites": undefined,
         "requires": undefined,
         "serviceName": "products",
         "variableUsages": Array [
@@ -87,11 +89,13 @@ Object {
         "kind": "Flatten",
         "node": Object {
           "id": undefined,
+          "inputRewrites": undefined,
           "kind": "Fetch",
           "operation": "query Search__reviews__1($representations:[_Any!]!){_entities(representations:$representations){...on Product{reviews{rating}}}}",
           "operationDocumentNode": undefined,
           "operationKind": "query",
           "operationName": "Search__reviews__1",
+          "outputRewrites": undefined,
           "requires": Array [
             Object {
               "kind": "InlineFragment",