diff --git a/federation-2/Cargo.lock b/federation-2/Cargo.lock index a4978f7c5..70fa9e629 100644 --- a/federation-2/Cargo.lock +++ b/federation-2/Cargo.lock @@ -1881,7 +1881,7 @@ dependencies = [ [[package]] name = "router-bridge" -version = "0.5.14+v2.6.3" +version = "0.5.15+v2.7.0" dependencies = [ "anyhow", "async-channel", diff --git a/federation-2/router-bridge/Cargo.toml b/federation-2/router-bridge/Cargo.toml index 050ef528d..c3297a1c1 100644 --- a/federation-2/router-bridge/Cargo.toml +++ b/federation-2/router-bridge/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "router-bridge" -version = "0.5.14+v2.6.3" +version = "0.5.15+v2.7.0" authors = ["Apollo "] edition = "2018" description = "JavaScript bridge for the Apollo Router" diff --git a/federation-2/router-bridge/package-lock.json b/federation-2/router-bridge/package-lock.json index aa0d6c7e2..85b7a98a6 100644 --- a/federation-2/router-bridge/package-lock.json +++ b/federation-2/router-bridge/package-lock.json @@ -1,17 +1,17 @@ { "name": "@apollo/router-bridge", - "version": "2.6.3", + "version": "2.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@apollo/router-bridge", - "version": "2.6.3", + "version": "2.7.0", "license": "Elastic-2.0", "dependencies": { "@apollo/core-schema": "^0.3.0", - "@apollo/federation-internals": "^2.6.3", - "@apollo/query-planner": "^2.6.3", + "@apollo/federation-internals": "^2.7.0", + "@apollo/query-planner": "^2.7.0", "@apollo/usage-reporting-protobuf": "^4.0.0", "@apollo/utils.usagereporting": "^3.0.0", "graphql": "16.6.0" @@ -47,9 +47,9 @@ } }, "node_modules/@apollo/federation-internals": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.6.3.tgz", - "integrity": "sha512-Motm6p4C4t1lUXOq9kIVyP6jANSymiUgfwc0TYjeSehKRFq6qxv9L2gPSVFvyfm/gI+gLlDscDN63YtxpUzqhQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.7.0.tgz", + "integrity": "sha512-NiTYMJQ3XnEH8HJxv3rEUGOdGrUr0ZUJcVOyzc3YJ5M9Lxx/AGgQe7mCsaFQOfofYyy9hoh2sHUDhB7ngsnh3Q==", "dependencies": { "@types/uuid": "^9.0.0", "chalk": "^4.1.0", @@ -88,11 +88,11 @@ } }, "node_modules/@apollo/query-graphs": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.6.3.tgz", - "integrity": "sha512-h+39kWnVq8GzhSyE2HGg4CKpzTDj1480EcLFuSk11QSN99uXjqwwciY5J83tlaSBONni0TvJ6Efctvp6ag0Xpw==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.7.0.tgz", + "integrity": "sha512-9UeJ1bVlKspzQXtgvdWPTc8SI8O+firzG44gRpx1E44U/yK2TseQvR4vHvMONl6u28bYT/KVa/jxLZTEEQ1H/g==", "dependencies": { - "@apollo/federation-internals": "2.6.3", + "@apollo/federation-internals": "2.7.0", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" @@ -105,12 +105,12 @@ } }, "node_modules/@apollo/query-planner": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.6.3.tgz", - "integrity": "sha512-wH7VaIDPhbSs7/UrihvMHWBvfooIoH4WKpyBj50Syf7TOFWmrWWihB+Gf5pdR2Q14pKxM0QihIxGdXK3XABBag==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.7.0.tgz", + "integrity": "sha512-ki9dOE6FwSI3ZyH6g1kvvTf8V0C+rvKHuoIOhjaZQmrASPVVgYjF3gm6vXCgjDzz3joFI6iA05kwCkBxNESNPg==", "dependencies": { - "@apollo/federation-internals": "2.6.3", - "@apollo/query-graphs": "2.6.3", + "@apollo/federation-internals": "2.7.0", + "@apollo/query-graphs": "2.7.0", "@apollo/utils.keyvaluecache": "^2.1.0", "chalk": "^4.1.0", "deep-equal": "^2.0.5", diff --git a/federation-2/router-bridge/package.json b/federation-2/router-bridge/package.json index e3d6f40ea..9552d4f3f 100644 --- a/federation-2/router-bridge/package.json +++ b/federation-2/router-bridge/package.json @@ -1,7 +1,7 @@ { "name": "@apollo/router-bridge", "private": true, - "version": "2.6.3", + "version": "2.7.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 bundled/", @@ -28,8 +28,8 @@ }, "dependencies": { "@apollo/core-schema": "^0.3.0", - "@apollo/federation-internals": "^2.6.3", - "@apollo/query-planner": "^2.6.3", + "@apollo/federation-internals": "^2.7.0", + "@apollo/query-planner": "^2.7.0", "@apollo/usage-reporting-protobuf": "^4.0.0", "@apollo/utils.usagereporting": "^3.0.0", "graphql": "16.6.0" diff --git a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-2.snap b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-2.snap index da68360f5..ccc4705e9 100644 --- a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-2.snap +++ b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-2.snap @@ -1,5 +1,6 @@ --- source: router-bridge/src/planner.rs +assertion_line: 1696 expression: schema --- directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA @@ -20,7 +21,7 @@ directive @shareable repeatable on OBJECT | FIELD_DEFINITION directive @inaccessible on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION -directive @override(from: String!) on FIELD_DEFINITION +directive @override(from: String!, label: String) on FIELD_DEFINITION directive @composeDirective(name: String) repeatable on SCHEMA @@ -32,6 +33,12 @@ directive @federation__requiresScopes(scopes: [[federation__Scope!]!]!) on FIELD directive @federation__policy(policies: [[federation__Policy!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM +directive @federation__sourceAPI repeatable on SCHEMA + +directive @federation__sourceType repeatable on OBJECT | INTERFACE + +directive @federation__sourceField repeatable on FIELD_DEFINITION + directive @stream on FIELD directive @transform(from: String!) on FIELD diff --git a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-3.snap b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-3.snap index d3612c4ea..02c4b7ac2 100644 --- a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-3.snap +++ b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-3.snap @@ -1,5 +1,6 @@ --- source: router-bridge/src/planner.rs +assertion_line: 1696 expression: schema --- directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA @@ -20,7 +21,7 @@ directive @shareable repeatable on OBJECT | FIELD_DEFINITION directive @inaccessible on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION -directive @override(from: String!) on FIELD_DEFINITION +directive @override(from: String!, label: String) on FIELD_DEFINITION directive @composeDirective(name: String) repeatable on SCHEMA @@ -32,6 +33,12 @@ directive @federation__requiresScopes(scopes: [[federation__Scope!]!]!) on FIELD directive @federation__policy(policies: [[federation__Policy!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM +directive @federation__sourceAPI repeatable on SCHEMA + +directive @federation__sourceType repeatable on OBJECT | INTERFACE + +directive @federation__sourceField repeatable on FIELD_DEFINITION + directive @stream on FIELD directive @transform(from: String!) on FIELD diff --git a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-4.snap b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-4.snap index e1fa73c61..f650f97fc 100644 --- a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-4.snap +++ b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-4.snap @@ -1,5 +1,6 @@ --- source: router-bridge/src/planner.rs +assertion_line: 1696 expression: schema --- directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA @@ -20,7 +21,7 @@ directive @shareable repeatable on OBJECT | FIELD_DEFINITION directive @inaccessible on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION -directive @override(from: String!) on FIELD_DEFINITION +directive @override(from: String!, label: String) on FIELD_DEFINITION directive @composeDirective(name: String) repeatable on SCHEMA @@ -32,6 +33,12 @@ directive @federation__requiresScopes(scopes: [[federation__Scope!]!]!) on FIELD directive @federation__policy(policies: [[federation__Policy!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM +directive @federation__sourceAPI repeatable on SCHEMA + +directive @federation__sourceType repeatable on OBJECT | INTERFACE + +directive @federation__sourceField repeatable on FIELD_DEFINITION + directive @stream on FIELD directive @transform(from: String!) on FIELD diff --git a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-5.snap b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-5.snap index 704d9269d..21cfce7ba 100644 --- a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-5.snap +++ b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-5.snap @@ -20,7 +20,7 @@ directive @shareable repeatable on OBJECT | FIELD_DEFINITION directive @inaccessible on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION -directive @override(from: String!) on FIELD_DEFINITION +directive @override(from: String!, label: String) on FIELD_DEFINITION directive @composeDirective(name: String) repeatable on SCHEMA @@ -32,6 +32,12 @@ directive @federation__requiresScopes(scopes: [[federation__Scope!]!]!) on FIELD directive @federation__policy(policies: [[federation__Policy!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM +directive @federation__sourceAPI repeatable on SCHEMA + +directive @federation__sourceType repeatable on OBJECT | INTERFACE + +directive @federation__sourceField repeatable on FIELD_DEFINITION + directive @stream on FIELD directive @transform(from: String!) on FIELD diff --git a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-6.snap b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-6.snap index 2ac3c11bb..8e4e60769 100644 --- a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-6.snap +++ b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-6.snap @@ -20,7 +20,7 @@ directive @shareable repeatable on OBJECT | FIELD_DEFINITION directive @inaccessible on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION -directive @override(from: String!) on FIELD_DEFINITION +directive @override(from: String!, label: String) on FIELD_DEFINITION directive @composeDirective(name: String) repeatable on SCHEMA @@ -32,6 +32,12 @@ directive @federation__requiresScopes(scopes: [[federation__Scope!]!]!) on FIELD directive @federation__policy(policies: [[federation__Policy!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM +directive @federation__sourceAPI repeatable on SCHEMA + +directive @federation__sourceType repeatable on OBJECT | INTERFACE + +directive @federation__sourceField repeatable on FIELD_DEFINITION + directive @stream on FIELD directive @transform(from: String!) on FIELD diff --git a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs.snap b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs.snap index 8a20617e0..07ea2c62a 100644 --- a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs.snap +++ b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs.snap @@ -1,5 +1,6 @@ --- source: router-bridge/src/planner.rs +assertion_line: 1696 expression: schema --- directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA @@ -20,7 +21,7 @@ directive @shareable repeatable on OBJECT | FIELD_DEFINITION directive @inaccessible on FIELD_DEFINITION | OBJECT | INTERFACE | UNION | ARGUMENT_DEFINITION | SCALAR | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION -directive @override(from: String!) on FIELD_DEFINITION +directive @override(from: String!, label: String) on FIELD_DEFINITION directive @composeDirective(name: String) repeatable on SCHEMA @@ -32,6 +33,12 @@ directive @federation__requiresScopes(scopes: [[federation__Scope!]!]!) on FIELD directive @federation__policy(policies: [[federation__Policy!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM +directive @federation__sourceAPI repeatable on SCHEMA + +directive @federation__sourceType repeatable on OBJECT | INTERFACE + +directive @federation__sourceField repeatable on FIELD_DEFINITION + directive @stream on FIELD directive @transform(from: String!) on FIELD