Merge branch 'main' into geal/plan-count

apollographql · Aug 29, 2024 · c3f896a · c3f896a
2 parents 2883d18 + 81f1ca7
commit c3f896a
Show file tree

Hide file tree

Showing 20 changed files with 651 additions and 163 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/harmonizer/Cargo.toml b/harmonizer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "harmonizer"
-version = "2.8.4"
+version = "2.9.0"
 authors = ["Apollo <[email protected]>"]
 edition = "2018"
 description = "Apollo Federation utility to compose a supergraph from subgraphs"

diff --git a/harmonizer/package-lock.json b/harmonizer/package-lock.json
diff --git a/harmonizer/package.json b/harmonizer/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@apollo/harmonizer-2",
   "private": true,
-  "version": "2.8.4",
+  "version": "2.9.0",
   "description": "Apollo Federation Harmonizer JS Entrypoint",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
     "npm": ">=7 <11"
   },
   "dependencies": {
-    "@apollo/composition": "2.8.4"
+    "@apollo/composition": "2.9.0"
   },
   "peerDependencies": {
     "graphql": "^15.7.0 || ^16.0.0"

diff --git a/router-bridge/Cargo.toml b/router-bridge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "router-bridge"
-version = "0.5.30+v2.8.3"
+version = "0.6.0+v2.9.0"
 authors = ["Apollo <[email protected]>"]
 edition = "2018"
 description = "JavaScript bridge for the Apollo Router"

diff --git a/router-bridge/js-src/plan.ts b/router-bridge/js-src/plan.ts
@@ -18,6 +18,7 @@ import {
 import {
   Operation,
   operationFromDocument,
+  printSchema as printSchemaWithDirectives,
   Supergraph,
 } from "@apollo/federation-internals";
 import {
@@ -284,7 +285,7 @@ export class BridgeQueryPlanner {
     let result = new Map<string, string>();
 
     subgraphs.names().forEach((name) => {
-      let sdl = printSchema(subgraphs.get(name).schema.toGraphQLJSSchema({}));
+      let sdl = printSchemaWithDirectives(subgraphs.get(name).schema);
       result.set(name, sdl);
     });
 

diff --git a/router-bridge/js-src/supported_features.ts b/router-bridge/js-src/supported_features.ts
@@ -7,6 +7,7 @@ import {
   REQUIRES_SCOPES_VERSIONS,
   SOURCE_VERSIONS,
   CONTEXT_VERSIONS,
+  COST_VERSIONS,
 } from "@apollo/federation-internals";
 
 export const ROUTER_SUPPORTED_SUPERGRAPH_FEATURES: Set<string> = new Set(
@@ -32,3 +33,4 @@ addToRouterFeatures(REQUIRES_SCOPES_VERSIONS);
 addToRouterFeatures(POLICY_VERSIONS);
 addToRouterFeatures(SOURCE_VERSIONS);
 addToRouterFeatures(CONTEXT_VERSIONS);
+addToRouterFeatures(COST_VERSIONS);
diff --git a/router-bridge/package-lock.json b/router-bridge/package-lock.json
diff --git a/router-bridge/package.json b/router-bridge/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@apollo/router-bridge",
   "private": true,
-  "version": "2.8.3",
+  "version": "2.9.0",
   "description": "Apollo Router JS Bridge Entrypoint",
   "scripts": {
     "build": "make-dir bundled js-dist && rm -f tsconfig.tsbuildinfo && tsc --build --verbose && node esbuild/bundler.js && cp js-dist/runtime.js js-dist/do_api_schema.js js-dist/do_introspect.js js-dist/plan_worker.js js-dist/test_logger_worker.js js-dist/test_get_random_values.js js-dist/test_url.js bundled/",
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@apollo/core-schema": "^0.3.0",
-    "@apollo/federation-internals": "^2.8.3",
-    "@apollo/query-planner": "^2.8.3",
+    "@apollo/federation-internals": "^2.9.0",
+    "@apollo/query-planner": "^2.9.0",
     "@apollo/usage-reporting-protobuf": "^4.0.0",
     "@apollo/utils.usagereporting": "^3.0.0",
     "graphql": "16.6.0"

diff --git a/router-bridge/src/planner.rs b/router-bridge/src/planner.rs
@@ -2466,4 +2466,17 @@ feature https://specs.apollo.dev/unsupported-feature/v0.1 is for: SECURITY but i
         )
         .unwrap());
     }
+
+    #[tokio::test]
+    async fn extracts_cost_directives() {
+        let schema = include_str!("testdata/custom_cost_schema.graphql");
+        let planner = Planner::<serde_json::Value>::new(schema.to_string(), Default::default())
+            .await
+            .expect("can create planner");
+        let subgraphs = planner.subgraphs().await.expect("can extract subgraphs");
+
+        for (name, schema) in subgraphs {
+            insta::assert_snapshot!(name, schema);
+        }
+    }
 }