Skip to content

Commit

Permalink
fix(deps): update gateway dependencies (#8237)
Browse files Browse the repository at this point in the history 
* fix(deps): update gateway dependencies

* F

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Arda TANRIKULU <[email protected]>
  • Loading branch information
@renovate @ardatan
renovate[bot] and ardatan authored Jan 8, 2025
1 parent fd6c35b commit ba63a9a
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 29 deletions.
6 changes: 6 additions & 0 deletions packages/fusion/composition/tests/transforms/__snapshots__/encapsulate.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ exports[`encapsulate works with federation transform 1`] = `
query: Query
}
directive @merge(subgraph: String!, argsExpr: String, keyArg: String, keyField: String, key: [String], additionalArgs: String) on FIELD_DEFINITION
directive @resolveTo(additionalArgs: ResolveToSourceArgs, filterBy: String, keyField: String, keysArg: String, pubsubTopic: String, requiredSelectionSet: String, result: String, resultType: String, sourceArgs: ResolveToSourceArgs, sourceFieldName: String, sourceName: String, sourceSelectionSet: String, sourceTypeName: String) on FIELD_DEFINITION
directive @source(name: String!, type: String, subgraph: String!) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
type Query {
TEST: TESTQuery!
}
Expand Down
13 changes: 7 additions & 6 deletions packages/fusion/composition/tests/transforms/filter-schema.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,13 +365,14 @@ type Query {
transforms: [filterTransform, createPruneTransform()],
},
]);
expect(printSchema(schema).trim()).toBe(
expectTheSchemaSDLToBe(
schema,
/* GraphQL */ `
type Query {
foo: String
bar: String
}
`.trim(),
type Query {
foo: String
bar: String
}
`,
);
});

Expand Down
60 changes: 54 additions & 6 deletions packages/fusion/composition/tests/transforms/hoist-field.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,21 @@ describe('Hoist Field', () => {
expect(fields.users).toBeDefined();

expect(printSchema(newSchema)).toMatchInlineSnapshot(`
"type Query {
"directive @hoist(subgraph: String, pathConfig: _HoistConfig) on FIELD_DEFINITION
directive @source(name: String!, type: String, subgraph: String!) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
type Query {
users(limit: Int!, page: Int): [User!]!
}
type User {
id: ID!
name: String!
}
input _HoistConfig {
_fake: String
}"
`);
});
Expand Down Expand Up @@ -103,13 +111,21 @@ type User {
expect(fields.users).toBeDefined();

expect(printSchema(newSchema)).toMatchInlineSnapshot(`
"type Query {
"directive @hoist(subgraph: String, pathConfig: _HoistConfig) on FIELD_DEFINITION
directive @source(name: String!, type: String, subgraph: String!) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
type Query {
users(limit: Int!, page: Int): [User!]!
}
type User {
id: ID!
name: String!
}
input _HoistConfig {
_fake: String
}"
`);
});
Expand Down Expand Up @@ -141,13 +157,21 @@ type User {
expect(args.length).toEqual(0);

expect(printSchema(newSchema)).toMatchInlineSnapshot(`
"type Query {
"directive @hoist(subgraph: String, pathConfig: _HoistConfig) on FIELD_DEFINITION
directive @source(name: String!, type: String, subgraph: String!) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
type Query {
users: [User!]!
}
type User {
id: ID!
name: String!
}
input _HoistConfig {
_fake: String
}"
`);
});
Expand Down Expand Up @@ -185,13 +209,21 @@ type User {
expect(args[0].name).toEqual('page');

expect(printSchema(newSchema)).toMatchInlineSnapshot(`
"type Query {
"directive @hoist(subgraph: String, pathConfig: _HoistConfig) on FIELD_DEFINITION
directive @source(name: String!, type: String, subgraph: String!) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
type Query {
users(page: Int): [User!]!
}
type User {
id: ID!
name: String!
}
input _HoistConfig {
_fake: String
}"
`);
});
Expand Down Expand Up @@ -232,13 +264,21 @@ type User {
expect(args[0].name).toEqual('page');

expect(printSchema(newSchema)).toMatchInlineSnapshot(`
"type Query {
"directive @hoist(subgraph: String, pathConfig: _HoistConfig) on FIELD_DEFINITION
directive @source(name: String!, type: String, subgraph: String!) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
type Query {
users(page: Int): [User!]!
}
type User {
id: ID!
name: String!
}
input _HoistConfig {
_fake: String
}"
`);
});
Expand Down Expand Up @@ -307,7 +347,11 @@ type User {
expect(fields.users).toBeDefined();

expect(printSchema(newSchema)).toMatchInlineSnapshot(`
"type Query {
"directive @hoist(subgraph: String, pathConfig: _HoistConfig) on FIELD_DEFINITION
directive @source(name: String!, type: String, subgraph: String!) on SCALAR | OBJECT | FIELD_DEFINITION | ARGUMENT_DEFINITION | INTERFACE | UNION | ENUM | ENUM_VALUE | INPUT_OBJECT | INPUT_FIELD_DEFINITION
type Query {
users(limit: Int!, page: Int): UserSearchResult
usersResults(limit: Int!, page: Int): [User!]!
}
Expand All @@ -319,6 +363,10 @@ type UserSearchResult {
type User {
id: ID!
name: String!
}
input _HoistConfig {
_fake: String
}"
`);
});
Expand Down
20 changes: 17 additions & 3 deletions packages/fusion/composition/tests/transforms/utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,24 @@ import {
buildSchema,
getIntrospectionQuery,
GraphQLSchema,
Kind,
lexicographicSortSchema,
parse,
print,
printSchema,
validate,
visit,
} from 'graphql';
import { getUnifiedGraphGracefully, type SubgraphConfig } from '@graphql-mesh/fusion-composition';
import { UnifiedGraphManager } from '@graphql-mesh/fusion-runtime';
import { createDefaultExecutor } from '@graphql-tools/delegate';
import { normalizedExecutor } from '@graphql-tools/executor';
import { isAsyncIterable, mapMaybePromise } from '@graphql-tools/utils';
import {
getDocumentNodeFromSchema,
isAsyncIterable,
mapMaybePromise,
printSchemaWithDirectives,
} from '@graphql-tools/utils';

export function composeAndGetPublicSchema(subgraphs: SubgraphConfig[]) {
const executor = composeAndGetExecutor(subgraphs);
Expand Down Expand Up @@ -84,7 +92,13 @@ export function expectTheSchemaSDLToBe(schema: GraphQLSchema, sdl: string) {
assumeValid: true,
assumeValidSDL: true,
});
const sortedSchemaFromSdl = printSchema(lexicographicSortSchema(schemaFromSdl));
const sortedGivenSchema = printSchema(lexicographicSortSchema(schema));
const sortedSchemaFromSdl = printSchemaWithDirectives(lexicographicSortSchema(schemaFromSdl));
let astFromGivenSchema = getDocumentNodeFromSchema(lexicographicSortSchema(schema));
astFromGivenSchema = visit(astFromGivenSchema, {
[Kind.DIRECTIVE_DEFINITION]() {
return null;
},
});
const sortedGivenSchema = print(astFromGivenSchema);
expect(sortedGivenSchema).toBe(sortedSchemaFromSdl);
}
28 changes: 14 additions & 14 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5899,16 +5899,16 @@ __metadata:
linkType: hard

"@graphql-hive/gateway-runtime@npm:^1.3.3, @graphql-hive/gateway-runtime@npm:^1.3.5, @graphql-hive/gateway-runtime@npm:^1.4.6":
version: 1.4.6
resolution: "@graphql-hive/gateway-runtime@npm:1.4.6"
version: 1.4.7
resolution: "@graphql-hive/gateway-runtime@npm:1.4.7"
dependencies:
"@envelop/core": "npm:^5.0.0"
"@envelop/disable-introspection": "npm:^6.0.0"
"@envelop/generic-auth": "npm:^8.0.0"
"@graphql-hive/core": "npm:^0.8.1"
"@graphql-hive/gateway-abort-signal-any": "npm:^0.0.3"
"@graphql-mesh/cross-helpers": "npm:^0.4.9"
"@graphql-mesh/fusion-runtime": "npm:^0.10.27"
"@graphql-mesh/fusion-runtime": "npm:^0.10.28"
"@graphql-mesh/hmac-upstream-signature": "npm:^1.2.19"
"@graphql-mesh/plugin-hive": "npm:^0.103.0"
"@graphql-mesh/plugin-response-cache": "npm:^0.103.0"
Expand All @@ -5918,7 +5918,7 @@ __metadata:
"@graphql-tools/batch-delegate": "npm:^9.0.27"
"@graphql-tools/delegate": "npm:^10.2.9"
"@graphql-tools/executor-http": "npm:^1.2.4"
"@graphql-tools/federation": "npm:^3.0.7"
"@graphql-tools/federation": "npm:^3.0.8"
"@graphql-tools/stitch": "npm:^9.4.13"
"@graphql-tools/utils": "npm:^10.7.0"
"@graphql-tools/wrap": "npm:^10.0.27"
Expand All @@ -5937,7 +5937,7 @@ __metadata:
peerDependenciesMeta:
"@parcel/watcher":
optional: true
checksum: 10c0/001cdd2d0dc6ebff681a4cc639ef69d1c662125ed4b131f14b4f2f8c370e647f88e03a14afcd4b35aa84a5cbaed9bb46aa7520f179c679a7733735b8322ae11a
checksum: 10c0/46046f6b13dc17513c702ed43fe6ff99cc9340397836cdc6c848d399333d9dd833df7f9bb09023089a8d23dd77b37fb0a3e5f58224e60317810a1df6c3c89738
languageName: node
linkType: hard

Expand Down Expand Up @@ -6255,9 +6255,9 @@ __metadata:
languageName: unknown
linkType: soft

"@graphql-mesh/fusion-runtime@npm:^0.10.11, @graphql-mesh/fusion-runtime@npm:^0.10.27":
version: 0.10.27
resolution: "@graphql-mesh/fusion-runtime@npm:0.10.27"
"@graphql-mesh/fusion-runtime@npm:^0.10.11, @graphql-mesh/fusion-runtime@npm:^0.10.28":
version: 0.10.28
resolution: "@graphql-mesh/fusion-runtime@npm:0.10.28"
dependencies:
"@envelop/core": "npm:^5.0.1"
"@graphql-mesh/cross-helpers": "npm:^0.4.9"
Expand All @@ -6266,7 +6266,7 @@ __metadata:
"@graphql-mesh/utils": "npm:^0.103.6"
"@graphql-tools/delegate": "npm:^10.2.9"
"@graphql-tools/executor": "npm:^1.3.10"
"@graphql-tools/federation": "npm:^3.0.7"
"@graphql-tools/federation": "npm:^3.0.8"
"@graphql-tools/merge": "npm:^9.0.12"
"@graphql-tools/stitch": "npm:^9.4.13"
"@graphql-tools/stitching-directives": "npm:^3.1.24"
Expand All @@ -6278,7 +6278,7 @@ __metadata:
tslib: "npm:^2.8.1"
peerDependencies:
graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
checksum: 10c0/aa64d1e4dc706bee65ac4a5f1908608e9dcf3dab3ba449546caafe45ee9816102a20db7c1138c93055a1c113afa192783010f0123a19b93b9eecf9473e4080c7
checksum: 10c0/d031ebb36c152e08d3c0cbc2847832bbf30aee7eeea6cec0e0c3ecd55d8b9492fb1925953c49f78fd0637b4d10c56c033525ac792f5ed28a4c712d60c30af37c
languageName: node
linkType: hard

Expand Down Expand Up @@ -7722,9 +7722,9 @@ __metadata:
languageName: node
linkType: hard

"@graphql-tools/federation@npm:^3.0.0, @graphql-tools/federation@npm:^3.0.7":
version: 3.0.7
resolution: "@graphql-tools/federation@npm:3.0.7"
"@graphql-tools/federation@npm:^3.0.0, @graphql-tools/federation@npm:^3.0.8":
version: 3.0.8
resolution: "@graphql-tools/federation@npm:3.0.8"
dependencies:
"@graphql-tools/delegate": "npm:^10.2.9"
"@graphql-tools/executor-http": "npm:^1.2.4"
Expand All @@ -7740,7 +7740,7 @@ __metadata:
tslib: "npm:^2.8.1"
peerDependencies:
graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
checksum: 10c0/dafe198652a2c42f956e1c1306b758519be126aa90f5e56bf0fed3a0d42c09f341ed3e93ea13461c06a8d11be70c3291bea96f67fb157ab1793b8bdb54f38d1b
checksum: 10c0/b70367ebf35095e7a165948039d74557470cce42b7dbe728f10f93d7b80ab62d272e0fa645970e848f9861c16d971f66e17bc9783f2897bda37d67946ff7721c
languageName: node
linkType: hard

Expand Down

0 comments on commit ba63a9a

Please sign in to comment.