Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency upgrades #367

Merged
merged 3 commits into from
Jul 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,16 @@
"typescript": "3.9.7"
},
"dependencies": {
"@graphql-tools/merge": "^6.2.13",
"@graphql-tools/schema": "^7.1.3",
"@graphql-tools/merge": "6.2.14",
"@graphql-tools/schema": "^7.1.5",
"@graphql-tools/utils": "^7.10.0",
"camelcase": "^6.2.0",
"debug": "^4.3.1",
"debug": "^4.3.2",
"deep-equal": "^2.0.5",
"dot-prop": "^6.0.1",
"graphql-compose": "^7.25.1",
"graphql-parse-resolve-info": "^4.11.0",
"graphql-relay": "^0.7.0",
"graphql-compose": "^9.0.2",
"graphql-parse-resolve-info": "^4.12.0",
"graphql-relay": "^0.8.0",
"jsonwebtoken": "^8.5.1",
"pluralize": "^8.0.0"
},
Expand Down
8 changes: 2 additions & 6 deletions packages/graphql/src/schema/make-augmented-schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,7 @@ function makeAugmentedSchema(
name: node.name,
fields: nodeFields,
description: node.description,
extensions: {
directives: graphqlDirectivesToCompose(node.otherDirectives),
},
directives: graphqlDirectivesToCompose(node.otherDirectives),
interfaces: node.interfaces.map((x) => x.name.value),
});

Expand Down Expand Up @@ -1254,9 +1252,7 @@ function makeAugmentedSchema(
name: inter.name.value,
description: inter.description?.value,
fields: objectComposeFields,
extensions: {
directives: graphqlDirectivesToCompose((inter.directives || []).filter((x) => x.name.value !== "auth")),
},
directives: graphqlDirectivesToCompose((inter.directives || []).filter((x) => x.name.value !== "auth")),
});
});

Expand Down
8 changes: 3 additions & 5 deletions packages/graphql/src/schema/to-compose.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

import { InputValueDefinitionNode, DirectiveNode } from "graphql";
import { ExtensionsDirective, DirectiveArgs, ObjectTypeComposerFieldConfigAsObjectDefinition } from "graphql-compose";
import { DirectiveArgs, ObjectTypeComposerFieldConfigAsObjectDefinition, Directive } from "graphql-compose";
import { isInt, Integer } from "neo4j-driver";
import getFieldTypeMeta from "./get-field-type-meta";
import parseValueNode from "./parse-value-node";
Expand All @@ -39,7 +39,7 @@ export function graphqlArgsToCompose(args: InputValueDefinitionNode[]) {
}, {});
}

export function graphqlDirectivesToCompose(directives: DirectiveNode[]): ExtensionsDirective[] {
export function graphqlDirectivesToCompose(directives: DirectiveNode[]): Directive[] {
return directives.map((directive) => ({
args: (directive.arguments || [])?.reduce(
(r: DirectiveArgs, d) => ({ ...r, [d.name.value]: parseValueNode(d.value) }),
Expand All @@ -64,9 +64,7 @@ export function objectFieldsToComposeFields(
} as ObjectTypeComposerFieldConfigAsObjectDefinition<any, any>;

if (field.otherDirectives.length) {
newField.extensions = {
directives: graphqlDirectivesToCompose(field.otherDirectives),
};
newField.directives = graphqlDirectivesToCompose(field.otherDirectives);
}

if (["Int", "Float"].includes(field.typeMeta.name)) {
Expand Down
2 changes: 1 addition & 1 deletion packages/ogm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"author": "Neo4j Inc.",
"dependencies": {
"@graphql-tools/merge": "^6.2.13",
"@graphql-tools/merge": "6.2.14",
"@neo4j/graphql": "^2.0.0-alpha.4",
"camelcase": "^6.2.0",
"pluralize": "^8.0.0"
Expand Down
82 changes: 55 additions & 27 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -599,20 +599,20 @@ __metadata:
languageName: node
linkType: hard

"@graphql-tools/merge@npm:^6.2.13":
version: 6.2.13
resolution: "@graphql-tools/merge@npm:6.2.13"
"@graphql-tools/merge@npm:6.2.14":
version: 6.2.14
resolution: "@graphql-tools/merge@npm:6.2.14"
dependencies:
"@graphql-tools/schema": ^7.0.0
"@graphql-tools/utils": ^7.7.0
tslib: ~2.2.0
peerDependencies:
graphql: ^14.0.0 || ^15.0.0
checksum: 19c977ebd6f918ec9ccdeb9cfd7cd4e818767c9f7fd19bd3d7d17888d9f98a977e63a9c111b254eb14ac420453fec84d2b336cc4d7a6a3c8a2e61f25af2f6b85
checksum: 98ee1c70394a881ca784577fbfbdc5253b291e6df4af77da70f9f6d9e01ad5831c57344a454136abd9eaeff4b513d0d9ab5d9e92e6fe80f9c07873a5ce0dc1d6
languageName: node
linkType: hard

"@graphql-tools/schema@npm:^7.0.0, @graphql-tools/schema@npm:^7.1.3":
"@graphql-tools/schema@npm:^7.0.0":
version: 7.1.3
resolution: "@graphql-tools/schema@npm:7.1.3"
dependencies:
Expand All @@ -624,6 +624,19 @@ __metadata:
languageName: node
linkType: hard

"@graphql-tools/schema@npm:^7.1.5":
version: 7.1.5
resolution: "@graphql-tools/schema@npm:7.1.5"
dependencies:
"@graphql-tools/utils": ^7.1.2
tslib: ~2.2.0
value-or-promise: 1.0.6
peerDependencies:
graphql: ^14.0.0 || ^15.0.0
checksum: 23b1e5443919a2d9abff535bfa9cd935e3ee3f0b2e3938d396af40ffcbf8d90bacf74fd3faf895845b1b0bf7cada5f7e0d1fd67f667ec02752884f25b1e19ac4
languageName: node
linkType: hard

"@graphql-tools/utils@npm:^7.1.2, @graphql-tools/utils@npm:^7.7.0":
version: 7.8.0
resolution: "@graphql-tools/utils@npm:7.8.0"
Expand Down Expand Up @@ -916,7 +929,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@neo4j/graphql-ogm@workspace:packages/ogm"
dependencies:
"@graphql-tools/merge": ^6.2.13
"@graphql-tools/merge": 6.2.14
"@neo4j/graphql": ^2.0.0-alpha.4
"@types/jest": 26.0.8
"@types/node": 14.0.27
Expand All @@ -940,8 +953,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@neo4j/graphql@workspace:packages/graphql"
dependencies:
"@graphql-tools/merge": ^6.2.13
"@graphql-tools/schema": ^7.1.3
"@graphql-tools/merge": 6.2.14
"@graphql-tools/schema": ^7.1.5
"@graphql-tools/utils": ^7.10.0
"@types/deep-equal": 1.0.1
"@types/faker": 5.1.7
Expand All @@ -953,14 +966,14 @@ __metadata:
"@types/randomstring": 1.1.6
apollo-server: 2.21.0
camelcase: ^6.2.0
debug: ^4.3.1
debug: ^4.3.2
dedent: ^0.7.0
deep-equal: ^2.0.5
dot-prop: ^6.0.1
faker: 5.2.0
graphql-compose: ^7.25.1
graphql-parse-resolve-info: ^4.11.0
graphql-relay: ^0.7.0
graphql-compose: ^9.0.2
graphql-parse-resolve-info: ^4.12.0
graphql-relay: ^0.8.0
graphql-tag: 2.11.0
is-uuid: 1.0.2
jest: 26.2.2
Expand Down Expand Up @@ -1753,6 +1766,13 @@ __metadata:
languageName: node
linkType: hard

"@types/object-path@npm:^0.11.0":
version: 0.11.1
resolution: "@types/object-path@npm:0.11.1"
checksum: d0bdb453cb99e741fc99918889b0262e6ba0848b04c5c686f895de2cc22fde99414971adec6f33467a1c6150fcd624f6cc99eccdd47bffee3909f3883ad557d7
languageName: node
linkType: hard

"@types/parse-json@npm:^4.0.0":
version: 4.0.0
resolution: "@types/parse-json@npm:4.0.0"
Expand Down Expand Up @@ -4661,7 +4681,7 @@ __metadata:
languageName: node
linkType: hard

"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1":
"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2":
version: 4.3.2
resolution: "debug@npm:4.3.2"
dependencies:
Expand Down Expand Up @@ -6623,15 +6643,16 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"graphql-compose@npm:^7.25.1":
version: 7.25.1
resolution: "graphql-compose@npm:7.25.1"
"graphql-compose@npm:^9.0.2":
version: 9.0.2
resolution: "graphql-compose@npm:9.0.2"
dependencies:
"@types/object-path": ^0.11.0
graphql-type-json: 0.3.2
object-path: 0.11.5
peerDependencies:
graphql: ^14.2.0 || ^15.0.0
checksum: 96aa8a6ab9f2c3b2c97747bb2706aeaa4a88d90c10246d0d40caf8936aeea04e61267fb60db2651e59a6665e58a4a52c911259297c005a63900095dd3881e44f
graphql: ^14.2.0 || ^15.0.0 || ^16.0.0
checksum: 0c5c7967c1e8e6ea4fd7f65fb08212d65ddda980a9321a089599dd7e000b9d53a71be317abe6d16fb4079e6687b95470b383f6670a288322e7d1d16fdfcd2132
languageName: node
linkType: hard

Expand All @@ -6648,24 +6669,24 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"graphql-parse-resolve-info@npm:^4.11.0":
version: 4.11.0
resolution: "graphql-parse-resolve-info@npm:4.11.0"
"graphql-parse-resolve-info@npm:^4.12.0":
version: 4.12.0
resolution: "graphql-parse-resolve-info@npm:4.12.0"
dependencies:
debug: ^4.1.1
tslib: ^2.0.1
peerDependencies:
graphql: ">=0.9 <0.14 || ^14.0.2 || ^15.4.0"
checksum: ef41c34e647abbfeb720398012c559c4d3e4d3f78f6e5e994e55940bcfa5c48ad65274609bc22f1e8837c7b1027a897ef9c2334ec2152d3b52f1ba9f22dbc817
checksum: 995f76c99ef02116a802ccc02c64da848ef3facd55d894782a5a93097cf3074dc60bdeca932fa0de2b35b6788b93de504a18def5f5a236a6769ad3435eb6fe4e
languageName: node
linkType: hard

"graphql-relay@npm:^0.7.0":
version: 0.7.0
resolution: "graphql-relay@npm:0.7.0"
"graphql-relay@npm:^0.8.0":
version: 0.8.0
resolution: "graphql-relay@npm:0.8.0"
peerDependencies:
graphql: ^15.5.0
checksum: 07a01d7325fddffd65fe3ff1c72d188af5f4b73e42268b7781e37725768489435b9e82bdaa6d4ef6af9da8b9ef7a02e0046b3e5039e5ef52422fabb8f55d028e
graphql: 15.5.1
checksum: 3986b64ca5126e2ad8cbfaf2c7c64161ce00a8f9832c70e226d096dcb47121a7adc652022a746706527661663537d6f721b313d0ad3ff651c8babe339b5b2469
languageName: node
linkType: hard

Expand Down Expand Up @@ -13768,6 +13789,13 @@ typescript@4.1.3:
languageName: node
linkType: hard

"value-or-promise@npm:1.0.6":
version: 1.0.6
resolution: "value-or-promise@npm:1.0.6"
checksum: ea5fa311aad0c6f63feccb6891e162f847e9bb2b257813eef8fc945f9e48b3df5fe7402227309171f0b096b6c2d17e163d6384ec3de819f49743537bde078699
languageName: node
linkType: hard

"vary@npm:^1, vary@npm:~1.1.2":
version: 1.1.2
resolution: "vary@npm:1.1.2"
Expand Down