Skip to content

Commit

Permalink
New take based on Fusion (#6541)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
ardatan and github-actions[bot] committed Feb 7, 2024
1 parent e54dceb commit a7984e5
Show file tree
Hide file tree
Showing 462 changed files with 198,868 additions and 148,893 deletions.
5 changes: 5 additions & 0 deletions .changeset/@graphql-mesh_graphql-6540-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@graphql-mesh/graphql": patch
---
dependencies updates:
- 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`)
5 changes: 5 additions & 0 deletions .changeset/@graphql-mesh_http-6540-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@graphql-mesh/http": patch
---
dependencies updates:
- Updated dependency [`graphql-yoga@^5.1.1` ↗︎](https://www.npmjs.com/package/graphql-yoga/v/5.1.1) (from `^5.0.0`, in `dependencies`)
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@graphql-mesh/plugin-live-query": patch
---
dependencies updates:
- Added dependency [`@graphql-mesh/utils@^0.96.2` ↗︎](https://www.npmjs.com/package/@graphql-mesh/utils/v/0.96.2) (to `peerDependencies`)

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/@graphql-mesh_supergraph-6540-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@graphql-mesh/supergraph": patch
---
dependencies updates:
- 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`)

This file was deleted.

8 changes: 8 additions & 0 deletions .changeset/@omnigraph_json-schema-6540-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@omnigraph/json-schema": patch
---
dependencies updates:
- Added dependency [`@graphql-mesh/transport-common@^0.0.0` ↗︎](https://www.npmjs.com/package/@graphql-mesh/transport-common/v/0.0.0) (to `dependencies`)
- Added dependency [`@graphql-mesh/transport-rest@^0.0.0` ↗︎](https://www.npmjs.com/package/@graphql-mesh/transport-rest/v/0.0.0) (to `dependencies`)
- Added dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (to `dependencies`)
- Added dependency [`graphql-fields@^2.0.3` ↗︎](https://www.npmjs.com/package/graphql-fields/v/2.0.3) (to `dependencies`)
5 changes: 5 additions & 0 deletions .changeset/@omnigraph_openapi-6540-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@omnigraph/openapi": patch
---
dependencies updates:
- Added dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (to `dependencies`)
6 changes: 6 additions & 0 deletions .changeset/@omnigraph_raml-6540-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@omnigraph/raml": patch
---
dependencies updates:
- Added dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (to `dependencies`)
- Added dependency [`@graphql-mesh/types@^0.96.2` ↗︎](https://www.npmjs.com/package/@graphql-mesh/types/v/0.96.2) (to `peerDependencies`)
5 changes: 0 additions & 5 deletions .changeset/@omnigraph_soap-6517-dependencies.md

This file was deleted.

8 changes: 8 additions & 0 deletions .changeset/@omnigraph_soap-6540-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@omnigraph/soap": patch
---
dependencies updates:
- 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`)
- Updated dependency [`graphql-compose@^9.0.10` ↗︎](https://www.npmjs.com/package/graphql-compose/v/9.0.10) (from `9.0.10`, in `dependencies`)
- Added dependency [`@graphql-mesh/transport-soap@^0.0.0` ↗︎](https://www.npmjs.com/package/@graphql-mesh/transport-soap/v/0.0.0) (to `dependencies`)
- Added dependency [`@whatwg-node/fetch@^0.9.15` ↗︎](https://www.npmjs.com/package/@whatwg-node/fetch/v/0.9.15) (to `dependencies`)
5 changes: 5 additions & 0 deletions .changeset/@omnigraph_thrift-6540-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@omnigraph/thrift": patch
---
dependencies updates:
- Added dependency [`@graphql-tools/delegate@^10.0.3` ↗︎](https://www.npmjs.com/package/@graphql-tools/delegate/v/10.0.3) (to `dependencies`)
7 changes: 7 additions & 0 deletions .changeset/odd-planets-retire.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@omnigraph/json-schema': minor
'@omnigraph/openapi': minor
---

BREAKING: Now getComposerFromSchema, addExecutionDirectivesToComposer, getUnionTypeComposers and
getContainerTC needs \`subgraphName\` argument
14 changes: 14 additions & 0 deletions .changeset/polite-bats-run.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
'@graphql-mesh/compose-cli': patch
'@graphql-mesh/fusion-composition': patch
'@graphql-mesh/fusion-execution': patch
'@graphql-mesh/fusion-federation': patch
'@graphql-mesh/fusion-runtime': patch
'@graphql-mesh/serve-cli': patch
'@graphql-mesh/transport-common': patch
'@graphql-mesh/transport-http': patch
'@graphql-mesh/transport-rest': patch
'@graphql-mesh/transport-soap': patch
---

New Fusion packages
2 changes: 1 addition & 1 deletion examples/graphql-file-upload-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@graphql-mesh/graphql": "0.96.3",
"concurrently": "8.2.2",
"graphql": "16.8.1",
"graphql-yoga": "5.1.1",
"graphql-yoga": "^5.1.1",
"sharp": "0.33.2"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Hello World should generate correct schema 1`] = `
"schema {
"schema @transport(subgraph: "Hello World", kind: "rest") {
query: Query
}
directive @globalOptions(sourceName: String, endpoint: String, operationHeaders: ObjMap, queryStringOptions: ObjMap, queryParams: ObjMap) on OBJECT
directive @httpOperation(subgraph: String, path: String, operationSpecificHeaders: ObjMap, httpMethod: HTTPMethod, isBinary: Boolean, requestBaseBody: ObjMap, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap, jsonApiFields: Boolean) on FIELD_DEFINITION
directive @httpOperation(path: String, operationSpecificHeaders: ObjMap, httpMethod: HTTPMethod, isBinary: Boolean, requestBaseBody: ObjMap, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap) on FIELD_DEFINITION
directive @transport(subgraph: String, kind: String, location: String, headers: ObjMap, queryStringOptions: ObjMap, queryParams: ObjMap) on OBJECT
type Query @globalOptions(sourceName: "Hello World") {
greeting: String @httpOperation(path: "/", httpMethod: GET)
type Query {
greeting: String @httpOperation(subgraph: "Hello World", path: "/", httpMethod: GET)
}
scalar ObjMap
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Hello World should generate correct schema 1`] = `
"schema {
"schema @transport(subgraph: "Hello World", kind: "rest") {
query: Query
}
directive @globalOptions(sourceName: String, endpoint: String, operationHeaders: ObjMap, queryStringOptions: ObjMap, queryParams: ObjMap) on OBJECT
directive @httpOperation(subgraph: String, path: String, operationSpecificHeaders: ObjMap, httpMethod: HTTPMethod, isBinary: Boolean, requestBaseBody: ObjMap, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap, jsonApiFields: Boolean) on FIELD_DEFINITION
directive @httpOperation(path: String, operationSpecificHeaders: ObjMap, httpMethod: HTTPMethod, isBinary: Boolean, requestBaseBody: ObjMap, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap) on FIELD_DEFINITION
directive @transport(subgraph: String, kind: String, location: String, headers: ObjMap, queryStringOptions: ObjMap, queryParams: ObjMap) on OBJECT
type Query @globalOptions(sourceName: "Hello World") {
greeting: String @httpOperation(path: "/", httpMethod: GET)
type Query {
greeting: String @httpOperation(subgraph: "Hello World", path: "/", httpMethod: GET)
}
scalar ObjMap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ exports[`JSON Schema Covid should generate correct schema: json-schema-covid-sch
"""""""
directive @cacheControl(maxAge: Int, scope: CacheControlScope) on FIELD_DEFINITION | INTERFACE | OBJECT
directive @globalOptions(endpoint: String, operationHeaders: ObjMap, queryParams: ObjMap, queryStringOptions: ObjMap, sourceName: String) on OBJECT
directive @httpOperation(httpMethod: HTTPMethod, isBinary: Boolean, operationSpecificHeaders: ObjMap, path: String, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap, requestBaseBody: ObjMap) on FIELD_DEFINITION
directive @httpOperation(httpMethod: HTTPMethod, isBinary: Boolean, jsonApiFields: Boolean, operationSpecificHeaders: ObjMap, path: String, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap, requestBaseBody: ObjMap, subgraph: 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 @responseMetadata on FIELD_DEFINITION
directive @responseMetadata(subgraph: String) on FIELD_DEFINITION
directive @transport(headers: ObjMap, kind: String, location: String, queryParams: ObjMap, queryStringOptions: ObjMap, subgraph: String) on OBJECT
"""Desc Api Population"""
type ApiPopulation {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ exports[`JSON Schema Example should generate correct schema 1`] = `
mutation: Mutation
}
directive @enum(value: String) on ENUM_VALUE
directive @enum(subgraph: String, value: String) on ENUM_VALUE
directive @example(value: ObjMap) repeatable on FIELD_DEFINITION | OBJECT | INPUT_OBJECT | ENUM | SCALAR
directive @example(subgraph: String, value: ObjMap) repeatable on FIELD_DEFINITION | OBJECT | INPUT_OBJECT | ENUM | SCALAR
directive @globalOptions(sourceName: String, endpoint: String, operationHeaders: ObjMap, queryStringOptions: ObjMap, queryParams: ObjMap) on OBJECT
directive @httpOperation(subgraph: String, path: String, operationSpecificHeaders: ObjMap, httpMethod: HttpMethod, isBinary: Boolean, requestBaseBody: ObjMap, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap, jsonApiFields: Boolean) on FIELD_DEFINITION
directive @httpOperation(path: String, operationSpecificHeaders: ObjMap, httpMethod: HttpMethod, isBinary: Boolean, requestBaseBody: ObjMap, queryParamArgMap: ObjMap, queryStringOptionsByParam: ObjMap) on FIELD_DEFINITION
directive @transport(subgraph: String, kind: String, location: String, headers: ObjMap, queryStringOptions: ObjMap, queryParams: ObjMap) on OBJECT
type Query @globalOptions(sourceName: "FakeAPI", endpoint: "https://not-existing-api.com/API") {
me: User @httpOperation(path: "/me", httpMethod: GET)
company(id: String!): Company @httpOperation(path: "/company/{args.id}", httpMethod: GET)
type Query {
me: User @httpOperation(subgraph: "FakeAPI", path: "/me", httpMethod: GET)
company(id: String!): Company @httpOperation(subgraph: "FakeAPI", path: "/company/{args.id}", httpMethod: GET)
}
"""Fake User Object"""
Expand Down Expand Up @@ -45,18 +45,18 @@ type Company {
}
enum CompanyType {
Public_Limited @enum(value: "\\"Public Limited\\"")
Private_Limited @enum(value: "\\"Private Limited\\"")
One_Person @enum(value: "\\"One Person\\"")
Public_Limited @enum(subgraph: "FakeAPI", value: "\\"Public Limited\\"")
Private_Limited @enum(subgraph: "FakeAPI", value: "\\"Private Limited\\"")
One_Person @enum(subgraph: "FakeAPI", value: "\\"One Person\\"")
}
type Mutation {
createUser(input: CreateUpdateUserInput): User @httpOperation(path: "/user", httpMethod: PUT)
updateUser(id: String!, input: CreateUpdateUserInput): User @httpOperation(path: "/user/{args.id}", httpMethod: POST)
deleteUser(id: String!): JSON @httpOperation(path: "/user/{args.id}", httpMethod: DELETE)
createUser(input: CreateUpdateUserInput): User @httpOperation(subgraph: "FakeAPI", path: "/user", httpMethod: PUT)
updateUser(id: String!, input: CreateUpdateUserInput): User @httpOperation(subgraph: "FakeAPI", path: "/user/{args.id}", httpMethod: POST)
deleteUser(id: String!): JSON @httpOperation(subgraph: "FakeAPI", path: "/user/{args.id}", httpMethod: DELETE)
}
input CreateUpdateUserInput @example(value: "{\\"firstName\\":\\"John\\",\\"lastName\\":\\"Doe\\",\\"jobTitle\\":\\"Software Developer\\"}") {
input CreateUpdateUserInput @example(subgraph: "FakeAPI", value: "{\\"firstName\\":\\"John\\",\\"lastName\\":\\"Doe\\",\\"jobTitle\\":\\"Software Developer\\"}") {
firstName: String
lastName: String
jobTitle: String
Expand Down
Loading

0 comments on commit a7984e5

Please sign in to comment.