Skip to content

Commit 7d4b2d6

Browse files
ardatangithub-actions[bot]
ardatan
and
github-actions[bot]
authored
New PR for Fusion impl (ardatan#6540)
* New impl * chore(dependencies): updated changesets for modified dependencies * More * More * More * Reset auto changesets * chore(dependencies): updated changesets for modified dependencies * Go * Go * Changeset * Go * chore(dependencies): updated changesets for modified dependencies * Go * Disable location weather * Fix leak tests --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent e54dceb commit 7d4b2d6

File tree

462 files changed

+198868
-148893
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

462 files changed

+198868
-148893
lines changed

‎.changeset/@graphql-mesh_graphql-6540-dependencies.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@graphql-mesh/graphql": patch
3+
---
4+
dependencies updates:
5+
- Updated dependency [`@graphql-tools/federation@^1.1.12` ↗︎](https://www.npmjs.com/package/@graphql-tools/federation/v/1.1.12) (from `^1.1.0`, in `dependencies`)

‎.changeset/@graphql-mesh_http-6540-dependencies.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@graphql-mesh/http": patch
3+
---
4+
dependencies updates:
5+
- Updated dependency [`graphql-yoga@^5.1.1` ↗︎](https://www.npmjs.com/package/graphql-yoga/v/5.1.1) (from `^5.0.0`, in `dependencies`)

‎.changeset/@graphql-mesh_plugin-live-query-6540-dependencies.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@graphql-mesh/plugin-live-query": patch
3+
---
4+
dependencies updates:
5+
- Added dependency [`@graphql-mesh/utils@^0.96.2` ↗︎](https://www.npmjs.com/package/@graphql-mesh/utils/v/0.96.2) (to `peerDependencies`)

‎.changeset/@graphql-mesh_plugin-prometheus-6526-dependencies.md

-5
This file was deleted.

‎.changeset/@graphql-mesh_supergraph-6540-dependencies.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@graphql-mesh/supergraph": patch
3+
---
4+
dependencies updates:
5+
- Updated dependency [`@graphql-tools/federation@^1.1.12` ↗︎](https://www.npmjs.com/package/@graphql-tools/federation/v/1.1.12) (from `^1.1.1`, in `dependencies`)

‎.changeset/@graphql-mesh_transform-extend-6488-dependencies.md

-5
This file was deleted.

‎.changeset/@omnigraph_json-schema-6540-dependencies.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"@omnigraph/json-schema": patch
3+
---
4+
dependencies updates:
5+
- Added dependency [`@graphql-mesh/transport-common@^0.0.0` ↗︎](https://www.npmjs.com/package/@graphql-mesh/transport-common/v/0.0.0) (to `dependencies`)
6+
- Added dependency [`@graphql-mesh/transport-rest@^0.0.0` ↗︎](https://www.npmjs.com/package/@graphql-mesh/transport-rest/v/0.0.0) (to `dependencies`)
7+
- Added dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (to `dependencies`)
8+
- Added dependency [`graphql-fields@^2.0.3` ↗︎](https://www.npmjs.com/package/graphql-fields/v/2.0.3) (to `dependencies`)

‎.changeset/@omnigraph_openapi-6540-dependencies.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@omnigraph/openapi": patch
3+
---
4+
dependencies updates:
5+
- Added dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (to `dependencies`)

‎.changeset/@omnigraph_raml-6540-dependencies.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@omnigraph/raml": patch
3+
---
4+
dependencies updates:
5+
- Added dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (to `dependencies`)
6+
- Added dependency [`@graphql-mesh/types@^0.96.2` ↗︎](https://www.npmjs.com/package/@graphql-mesh/types/v/0.96.2) (to `peerDependencies`)

‎.changeset/@omnigraph_soap-6517-dependencies.md

-5
This file was deleted.

‎.changeset/@omnigraph_soap-6540-dependencies.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"@omnigraph/soap": patch
3+
---
4+
dependencies updates:
5+
- Updated dependency [`fast-xml-parser@^4.3.4` ↗︎](https://www.npmjs.com/package/fast-xml-parser/v/4.3.4) (from `4.3.4`, in `dependencies`)
6+
- Updated dependency [`graphql-compose@^9.0.10` ↗︎](https://www.npmjs.com/package/graphql-compose/v/9.0.10) (from `9.0.10`, in `dependencies`)
7+
- Added dependency [`@graphql-mesh/transport-soap@^0.0.0` ↗︎](https://www.npmjs.com/package/@graphql-mesh/transport-soap/v/0.0.0) (to `dependencies`)
8+
- Added dependency [`@whatwg-node/fetch@^0.9.15` ↗︎](https://www.npmjs.com/package/@whatwg-node/fetch/v/0.9.15) (to `dependencies`)

‎.changeset/@omnigraph_thrift-6540-dependencies.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@omnigraph/thrift": patch
3+
---
4+
dependencies updates:
5+
- Added dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (to `dependencies`)

‎.changeset/odd-planets-retire.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@omnigraph/json-schema': minor
3+
'@omnigraph/openapi': minor
4+
---
5+
6+
BREAKING: Now getComposerFromSchema, addExecutionDirectivesToComposer, getUnionTypeComposers and
7+
getContainerTC needs \`subgraphName\` argument

‎.changeset/polite-bats-run.md

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
'@graphql-mesh/compose-cli': patch
3+
'@graphql-mesh/fusion-composition': patch
4+
'@graphql-mesh/fusion-execution': patch
5+
'@graphql-mesh/fusion-federation': patch
6+
'@graphql-mesh/fusion-runtime': patch
7+
'@graphql-mesh/serve-cli': patch
8+
'@graphql-mesh/transport-common': patch
9+
'@graphql-mesh/transport-http': patch
10+
'@graphql-mesh/transport-rest': patch
11+
'@graphql-mesh/transport-soap': patch
12+
---
13+
14+
New Fusion packages

‎examples/graphql-file-upload-example/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@graphql-mesh/graphql": "0.96.3",
1414
"concurrently": "8.2.2",
1515
"graphql": "16.8.1",
16-
"graphql-yoga": "5.1.1",
16+
"graphql-yoga": "^5.1.1",
1717
"sharp": "0.33.2"
1818
},
1919
"devDependencies": {

‎examples/hello-world-esm/tests/__snapshots__/hello-world.test.ts.snap

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`Hello World should generate correct schema 1`] = `
4-
"schema {
4+
"schema @transport(subgraph: "Hello World", kind: "rest") {
55
query: Query
66
}
77
8-
directive @globalOptions(sourceName: String, endpoint: String, operationHeaders: ObjMap, queryStringOptions: ObjMap, queryParams: ObjMap) on OBJECT
8+
directive @httpOperation(subgraph: String, path: String, operationSpecificHeaders: ObjMap, httpMethod: HTTPMethod, isBinary: Boolean, requestBaseBody: ObjMap, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap, jsonApiFields: Boolean) on FIELD_DEFINITION
99
10-
directive @httpOperation(path: String, operationSpecificHeaders: ObjMap, httpMethod: HTTPMethod, isBinary: Boolean, requestBaseBody: ObjMap, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap) on FIELD_DEFINITION
10+
directive @transport(subgraph: String, kind: String, location: String, headers: ObjMap, queryStringOptions: ObjMap, queryParams: ObjMap) on OBJECT
1111
12-
type Query @globalOptions(sourceName: "Hello World") {
13-
greeting: String @httpOperation(path: "/", httpMethod: GET)
12+
type Query {
13+
greeting: String @httpOperation(subgraph: "Hello World", path: "/", httpMethod: GET)
1414
}
1515
1616
scalar ObjMap

‎examples/hello-world/tests/__snapshots__/hello-world.test.ts.snap

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`Hello World should generate correct schema 1`] = `
4-
"schema {
4+
"schema @transport(subgraph: "Hello World", kind: "rest") {
55
query: Query
66
}
77
8-
directive @globalOptions(sourceName: String, endpoint: String, operationHeaders: ObjMap, queryStringOptions: ObjMap, queryParams: ObjMap) on OBJECT
8+
directive @httpOperation(subgraph: String, path: String, operationSpecificHeaders: ObjMap, httpMethod: HTTPMethod, isBinary: Boolean, requestBaseBody: ObjMap, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap, jsonApiFields: Boolean) on FIELD_DEFINITION
99
10-
directive @httpOperation(path: String, operationSpecificHeaders: ObjMap, httpMethod: HTTPMethod, isBinary: Boolean, requestBaseBody: ObjMap, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap) on FIELD_DEFINITION
10+
directive @transport(subgraph: String, kind: String, location: String, headers: ObjMap, queryStringOptions: ObjMap, queryParams: ObjMap) on OBJECT
1111
12-
type Query @globalOptions(sourceName: "Hello World") {
13-
greeting: String @httpOperation(path: "/", httpMethod: GET)
12+
type Query {
13+
greeting: String @httpOperation(subgraph: "Hello World", path: "/", httpMethod: GET)
1414
}
1515
1616
scalar ObjMap

‎examples/json-schema-covid/tests/__snapshots__/json-schema-covid.test.ts.snap

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ exports[`JSON Schema Covid should generate correct schema: json-schema-covid-sch
44
"""""""
55
directive @cacheControl(maxAge: Int, scope: CacheControlScope) on FIELD_DEFINITION | INTERFACE | OBJECT
66
7-
directive @globalOptions(endpoint: String, operationHeaders: ObjMap, queryParams: ObjMap, queryStringOptions: ObjMap, sourceName: String) on OBJECT
8-
9-
directive @httpOperation(httpMethod: HTTPMethod, isBinary: Boolean, operationSpecificHeaders: ObjMap, path: String, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap, requestBaseBody: ObjMap) on FIELD_DEFINITION
7+
directive @httpOperation(httpMethod: HTTPMethod, isBinary: Boolean, jsonApiFields: Boolean, operationSpecificHeaders: ObjMap, path: String, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap, requestBaseBody: ObjMap, subgraph: String) on FIELD_DEFINITION
108
119
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
1210
13-
directive @responseMetadata on FIELD_DEFINITION
11+
directive @responseMetadata(subgraph: String) on FIELD_DEFINITION
12+
13+
directive @transport(headers: ObjMap, kind: String, location: String, queryParams: ObjMap, queryStringOptions: ObjMap, subgraph: String) on OBJECT
1414
1515
"""Desc Api Population"""
1616
type ApiPopulation {

‎examples/json-schema-example/tests/__snapshots__/json-schema-example.test.js.snap

+14-14
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ exports[`JSON Schema Example should generate correct schema 1`] = `
66
mutation: Mutation
77
}
88
9-
directive @enum(value: String) on ENUM_VALUE
9+
directive @enum(subgraph: String, value: String) on ENUM_VALUE
1010
11-
directive @example(value: ObjMap) repeatable on FIELD_DEFINITION | OBJECT | INPUT_OBJECT | ENUM | SCALAR
11+
directive @example(subgraph: String, value: ObjMap) repeatable on FIELD_DEFINITION | OBJECT | INPUT_OBJECT | ENUM | SCALAR
1212
13-
directive @globalOptions(sourceName: String, endpoint: String, operationHeaders: ObjMap, queryStringOptions: ObjMap, queryParams: ObjMap) on OBJECT
13+
directive @httpOperation(subgraph: String, path: String, operationSpecificHeaders: ObjMap, httpMethod: HttpMethod, isBinary: Boolean, requestBaseBody: ObjMap, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap, jsonApiFields: Boolean) on FIELD_DEFINITION
1414
15-
directive @httpOperation(path: String, operationSpecificHeaders: ObjMap, httpMethod: HttpMethod, isBinary: Boolean, requestBaseBody: ObjMap, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap) on FIELD_DEFINITION
15+
directive @transport(subgraph: String, kind: String, location: String, headers: ObjMap, queryStringOptions: ObjMap, queryParams: ObjMap) on OBJECT
1616
17-
type Query @globalOptions(sourceName: "FakeAPI", endpoint: "https://not-existing-api.com/API") {
18-
me: User @httpOperation(path: "/me", httpMethod: GET)
19-
company(id: String!): Company @httpOperation(path: "/company/{args.id}", httpMethod: GET)
17+
type Query {
18+
me: User @httpOperation(subgraph: "FakeAPI", path: "/me", httpMethod: GET)
19+
company(id: String!): Company @httpOperation(subgraph: "FakeAPI", path: "/company/{args.id}", httpMethod: GET)
2020
}
2121
2222
"""Fake User Object"""
@@ -45,18 +45,18 @@ type Company {
4545
}
4646
4747
enum CompanyType {
48-
Public_Limited @enum(value: "\\"Public Limited\\"")
49-
Private_Limited @enum(value: "\\"Private Limited\\"")
50-
One_Person @enum(value: "\\"One Person\\"")
48+
Public_Limited @enum(subgraph: "FakeAPI", value: "\\"Public Limited\\"")
49+
Private_Limited @enum(subgraph: "FakeAPI", value: "\\"Private Limited\\"")
50+
One_Person @enum(subgraph: "FakeAPI", value: "\\"One Person\\"")
5151
}
5252
5353
type Mutation {
54-
createUser(input: CreateUpdateUserInput): User @httpOperation(path: "/user", httpMethod: PUT)
55-
updateUser(id: String!, input: CreateUpdateUserInput): User @httpOperation(path: "/user/{args.id}", httpMethod: POST)
56-
deleteUser(id: String!): JSON @httpOperation(path: "/user/{args.id}", httpMethod: DELETE)
54+
createUser(input: CreateUpdateUserInput): User @httpOperation(subgraph: "FakeAPI", path: "/user", httpMethod: PUT)
55+
updateUser(id: String!, input: CreateUpdateUserInput): User @httpOperation(subgraph: "FakeAPI", path: "/user/{args.id}", httpMethod: POST)
56+
deleteUser(id: String!): JSON @httpOperation(subgraph: "FakeAPI", path: "/user/{args.id}", httpMethod: DELETE)
5757
}
5858
59-
input CreateUpdateUserInput @example(value: "{\\"firstName\\":\\"John\\",\\"lastName\\":\\"Doe\\",\\"jobTitle\\":\\"Software Developer\\"}") {
59+
input CreateUpdateUserInput @example(subgraph: "FakeAPI", value: "{\\"firstName\\":\\"John\\",\\"lastName\\":\\"Doe\\",\\"jobTitle\\":\\"Software Developer\\"}") {
6060
firstName: String
6161
lastName: String
6262
jobTitle: String

0 commit comments

Comments
 (0)