Skip to content

Commit

Permalink
link deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@enisdenjo
enisdenjo committed Feb 22, 2024
1 parent 588a0a7 commit e8fd678
Show file tree
Hide file tree
Showing 34 changed files with 108 additions and 86 deletions.
6 changes: 3 additions & 3 deletions packages/batch-delegate/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@
},
"dependencies": {
"@graphql-tools/delegate": "^10.0.3",
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/utils": "^10.0.13",
"dataloader": "2.2.2",
"tslib": "^2.4.0",
"value-or-promise": "^1.0.12"
},
"devDependencies": {
"@graphql-tools/schema": "^10.0.0",
"@graphql-tools/stitch": "9.0.4"
"@graphql-tools/schema": "^10.0.2",
"@graphql-tools/stitch": "^9.0.4"
},
"publishConfig": {
"directory": "dist",
Expand Down
2 changes: 1 addition & 1 deletion packages/batch-execute/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^10.0.5",
"@graphql-tools/utils": "^10.0.13",
"dataloader": "^2.2.2",
"tslib": "^2.4.0",
"value-or-promise": "^1.0.12"
Expand Down
4 changes: 2 additions & 2 deletions packages/delegate/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
"dependencies": {
"@graphql-tools/batch-execute": "^9.0.1",
"@graphql-tools/executor": "^1.0.0",
"@graphql-tools/schema": "^10.0.0",
"@graphql-tools/utils": "^10.0.5",
"@graphql-tools/schema": "^10.0.2",
"@graphql-tools/utils": "^10.0.13",
"dataloader": "^2.2.2",
"tslib": "^2.5.0"
},
Expand Down
1 change: 1 addition & 0 deletions packages/delegate/src/prepareGatewayDocument.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ function wrapConcreteTypes(
[Kind.FIELD]: (node: FieldNode) => {
let type = typeInfo.getType();
type = isNonNullType(type) ? type.ofType : type;
console.trace();
if (
type != null &&
isAbstractType(getNamedType(type)) &&
Expand Down
2 changes: 1 addition & 1 deletion packages/executor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^10.0.8",
"@graphql-tools/utils": "^10.0.13",
"@graphql-typed-document-node/core": "3.2.0",
"@repeaterjs/repeater": "^3.0.4",
"tslib": "^2.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/executors/apollo-link/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"graphql": "^15.2.0 || ^16.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/utils": "^10.0.13",
"tslib": "^2.3.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/executors/envelop/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"@envelop/core": "^3.0.4 || ^4.0.0 || ^5.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/wrap": "^10.0.0",
"@graphql-tools/utils": "^10.0.13",
"@graphql-tools/wrap": "^10.0.1",
"tslib": "^2.3.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/executors/graphql-ws/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^10.0.2",
"@graphql-tools/utils": "^10.0.13",
"@types/ws": "^8.0.0",
"graphql-ws": "^5.14.0",
"isomorphic-ws": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/executors/http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^10.0.2",
"@graphql-tools/utils": "^10.0.13",
"@repeaterjs/repeater": "^3.0.4",
"@whatwg-node/fetch": "^0.9.0",
"extract-files": "^11.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/executors/legacy-ws/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/utils": "^10.0.13",
"@types/ws": "^8.0.0",
"isomorphic-ws": "^5.0.0",
"tslib": "^2.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/executors/urql-exchange/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"wonka": "^6.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/utils": "^10.0.13",
"tslib": "^2.4.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/executors/yoga/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
},
"dependencies": {
"@graphql-tools/executor-envelop": "^2.0.3",
"@graphql-tools/utils": "^10.0.1",
"@graphql-tools/utils": "^10.0.13",
"tslib": "^2.3.1"
},
"devDependencies": {
Expand Down
12 changes: 6 additions & 6 deletions packages/federation/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
},
"dependencies": {
"@graphql-tools/delegate": "^10.0.3",
"@graphql-tools/executor-http": "^1.0.6",
"@graphql-tools/merge": "^9.0.0",
"@graphql-tools/schema": "^10.0.0",
"@graphql-tools/stitch": "^9.0.2",
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/wrap": "^10.0.0",
"@graphql-tools/executor-http": "^1.0.8",
"@graphql-tools/merge": "^9.0.1",
"@graphql-tools/schema": "^10.0.2",
"@graphql-tools/stitch": "^9.0.4",
"@graphql-tools/utils": "^10.0.13",
"@graphql-tools/wrap": "^10.0.1",
"tslib": "^2.4.0",
"value-or-promise": "^1.0.12"
},
Expand Down
93 changes: 57 additions & 36 deletions packages/federation/test/gateway.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,12 @@ describe('Federation', () => {
errors,
};
}

if (subgraphName === 'inventory') {
console.log(print(executionRequest.document));
} else {
}

return executor(executionRequest);
};
},
Expand Down Expand Up @@ -330,46 +336,46 @@ describe('Federation', () => {
};
};
const scenarios: TestScenario[] = [
{
name: 'Tools Gateway vs. Tools Subgraph',
buildSubgraphSchema: buildToolsSubgraphSchema,
buildGateway: buildStitchingGateway,
},
{
name: 'Tools Gateway vs. Apollo Subgraph',
buildSubgraphSchema: buildSubgraphWithApollo,
buildGateway: buildStitchingGateway,
},
{
name: 'Apollo Gateway vs. Tools Subgraph',
buildSubgraphSchema: buildToolsSubgraphSchema,
buildGateway: buildApolloGateway,
},
{
name: 'Apollo Gateway with Supergraph vs. Tools Subgraph',
buildSubgraphSchema: buildToolsSubgraphSchema,
buildGateway: buildApolloGatewayWithSupergraph,
},
{
name: 'Tools Gateway with Supergraph vs. Apollo Subgraph',
buildSubgraphSchema: buildSubgraphWithApollo,
buildGateway: buildStitchingGatewayWithSupergraph,
},
// {
// name: 'Tools Gateway vs. Tools Subgraph',
// buildSubgraphSchema: buildToolsSubgraphSchema,
// buildGateway: buildStitchingGateway,
// },
// {
// name: 'Tools Gateway vs. Apollo Subgraph',
// buildSubgraphSchema: buildSubgraphWithApollo,
// buildGateway: buildStitchingGateway,
// },
// {
// name: 'Apollo Gateway vs. Tools Subgraph',
// buildSubgraphSchema: buildToolsSubgraphSchema,
// buildGateway: buildApolloGateway,
// },
// {
// name: 'Apollo Gateway with Supergraph vs. Tools Subgraph',
// buildSubgraphSchema: buildToolsSubgraphSchema,
// buildGateway: buildApolloGatewayWithSupergraph,
// },
// {
// name: 'Tools Gateway with Supergraph vs. Apollo Subgraph',
// buildSubgraphSchema: buildSubgraphWithApollo,
// buildGateway: buildStitchingGatewayWithSupergraph,
// },
{
name: 'Tools Gateway with Supergraph vs. Tools Subgraph',
buildSubgraphSchema: buildToolsSubgraphSchema,
buildGateway: buildStitchingGatewayWithSupergraph,
},
{
name: 'Tools Gateway by converting Federation to Stitching SDL vs. Tools Subgraph',
buildSubgraphSchema: buildToolsSubgraphSchema,
buildGateway: buildStitchingGatewayByConversion,
},
{
name: 'Tools Gateway by converting Federation to Stitching SDL vs. Apollo Subgraph',
buildSubgraphSchema: buildSubgraphWithApollo,
buildGateway: buildStitchingGatewayByConversion,
},
// {
// name: 'Tools Gateway by converting Federation to Stitching SDL vs. Tools Subgraph',
// buildSubgraphSchema: buildToolsSubgraphSchema,
// buildGateway: buildStitchingGatewayByConversion,
// },
// {
// name: 'Tools Gateway by converting Federation to Stitching SDL vs. Apollo Subgraph',
// buildSubgraphSchema: buildSubgraphWithApollo,
// buildGateway: buildStitchingGatewayByConversion,
// },
];
for (const { name, buildSubgraphSchema, buildGateway } of scenarios) {
describe(name, () => {
Expand Down Expand Up @@ -423,7 +429,7 @@ describe('Federation', () => {
}
`);
});
it('should give the correct result', async () => {
it.only('should give the correct result', async () => {
const result = await builtGateway.executor(exampleQuery);
expect(result).toEqual({
data: {
Expand Down Expand Up @@ -895,3 +901,18 @@ describe('Federation', () => {
});
}
});

/*
query TestQuery($_0__v0_representations: [_Any!]!, $_1__v0_representations: [_Any!]!) {
_0___typename: __typename
_0__entities: _entities(representations: $_0__v0_representations) {
__typename
}
_1___typename: __typename
_1__entities: _entities(representations: $_1__v0_representations) {
__typename
}
}
*/
2 changes: 1 addition & 1 deletion packages/graphql-tools/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
},
"dependencies": {
"@graphql-tools/schema": "^10.0.0",
"@graphql-tools/schema": "^10.0.2",
"tslib": "^2.4.0"
},
"optionalDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/import/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/utils": "^10.0.13",
"resolve-from": "5.0.0",
"tslib": "^2.4.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/links/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"dependencies": {
"@graphql-tools/delegate": "^10.0.3",
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/utils": "^10.0.13",
"apollo-upload-client": "17.0.0",
"form-data": "^4.0.0",
"node-fetch": "^2.6.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/load/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
},
"dependencies": {
"@graphql-tools/schema": "^10.0.0",
"@graphql-tools/utils": "^10.0.11",
"@graphql-tools/schema": "^10.0.2",
"@graphql-tools/utils": "^10.0.13",
"p-limit": "3.1.0",
"tslib": "^2.4.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/loaders/apollo-engine/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"dependencies": {
"@ardatan/sync-fetch": "^0.0.1",
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/utils": "^10.0.13",
"@whatwg-node/fetch": "^0.9.0",
"tslib": "^2.4.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/loaders/github/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
},
"dependencies": {
"@ardatan/sync-fetch": "^0.0.1",
"@graphql-tools/executor-http": "^1.0.0",
"@graphql-tools/executor-http": "^1.0.8",
"@graphql-tools/graphql-tag-pluck": "^8.0.0",
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/utils": "^10.0.13",
"@whatwg-node/fetch": "^0.9.0",
"tslib": "^2.4.0",
"value-or-promise": "^1.0.12"
Expand Down
2 changes: 1 addition & 1 deletion packages/loaders/graphql-file/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"dependencies": {
"@graphql-tools/import": "7.0.0",
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/utils": "^10.0.13",
"globby": "^11.0.3",
"tslib": "^2.4.0",
"unixify": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/loaders/json-file/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/utils": "^10.0.13",
"globby": "^11.0.3",
"tslib": "^2.4.0",
"unixify": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/loaders/module/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/utils": "^10.0.13",
"tslib": "^2.4.0"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/loaders/prisma/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"dependencies": {
"@graphql-tools/url-loader": "^8.0.0",
"@graphql-tools/utils": "^10.0.8",
"@graphql-tools/utils": "^10.0.13",
"@types/js-yaml": "^4.0.0",
"@types/json-stable-stringify": "^1.0.32",
"@whatwg-node/fetch": "^0.9.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/loaders/url/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@
"@ardatan/sync-fetch": "^0.0.1",
"@graphql-tools/delegate": "^10.0.3",
"@graphql-tools/executor-graphql-ws": "^1.0.0",
"@graphql-tools/executor-http": "^1.0.5",
"@graphql-tools/executor-http": "^1.0.8",
"@graphql-tools/executor-legacy-ws": "^1.0.0",
"@graphql-tools/utils": "^10.0.0",
"@graphql-tools/wrap": "^10.0.0",
"@graphql-tools/utils": "^10.0.13",
"@graphql-tools/wrap": "^10.0.1",
"@types/ws": "^8.0.0",
"@whatwg-node/fetch": "^0.9.0",
"isomorphic-ws": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/merge/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
},
"dependencies": {
"@graphql-tools/utils": "^10.0.10",
"@graphql-tools/utils": "^10.0.13",
"tslib": "^2.4.0"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/mock/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
},
"dependencies": {
"@graphql-tools/schema": "^10.0.0",
"@graphql-tools/schema": "^10.0.2",
"@graphql-tools/utils": "^10.0.13",
"fast-json-stable-stringify": "^2.1.0",
"tslib": "^2.4.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/node-require/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"dependencies": {
"@graphql-tools/graphql-file-loader": "8.0.0",
"@graphql-tools/load": "8.0.1",
"@graphql-tools/utils": "^10.0.11",
"@graphql-tools/utils": "^10.0.13",
"tslib": "^2.4.0"
},
"publishConfig": {
Expand Down

0 comments on commit e8fd678

Please sign in to comment.