graphql-compose to 9.x and fix results of breaking changes

neo4j · Jul 29, 2021 · 7a33746 · 7a33746
1 parent fb89e20
commit 7a33746
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/packages/graphql/package.json b/packages/graphql/package.json
@@ -67,7 +67,7 @@
         "debug": "^4.3.2",
         "deep-equal": "^2.0.5",
         "dot-prop": "^6.0.1",
-        "graphql-compose": "^8.1.0",
+        "graphql-compose": "^9.0.2",
         "graphql-parse-resolve-info": "^4.12.0",
         "graphql-relay": "^0.8.0",
         "jsonwebtoken": "^8.5.1",

diff --git a/packages/graphql/src/schema/make-augmented-schema.ts b/packages/graphql/src/schema/make-augmented-schema.ts
@@ -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),
         });
 
@@ -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")),
         });
     });
 

diff --git a/packages/graphql/src/schema/to-compose.ts b/packages/graphql/src/schema/to-compose.ts
@@ -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";
@@ -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) }),
@@ -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)) {

diff --git a/yarn.lock b/yarn.lock
@@ -971,7 +971,7 @@ __metadata:
     deep-equal: ^2.0.5
     dot-prop: ^6.0.1
     faker: 5.2.0
-    graphql-compose: ^8.1.0
+    graphql-compose: ^9.0.2
     graphql-parse-resolve-info: ^4.12.0
     graphql-relay: ^0.8.0
     graphql-tag: 2.11.0
@@ -6643,16 +6643,16 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"graphql-compose@npm:^8.1.0":
-  version: 8.1.0
-  resolution: "graphql-compose@npm:8.1.0"
+"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: 9c660ed7c6500e4ff7d1e815884c5e197afb49b3a11d18f95f2d211e6744c54cbe9a2ba1b07c0aebc8cbbca1d6d03a7658c10809f61849f7b4e7459e583e28d5
+    graphql: ^14.2.0 || ^15.0.0 || ^16.0.0
+  checksum: 0c5c7967c1e8e6ea4fd7f65fb08212d65ddda980a9321a089599dd7e000b9d53a71be317abe6d16fb4079e6687b95470b383f6670a288322e7d1d16fdfcd2132
   languageName: node
   linkType: hard