Merge pull request #6590 from neo4j/fix-validation-context-types

Fix types in Neo4jValidationContext

Author: angrykoala

package.json

@@ -43,7 +43,7 @@
         "prettier-2": "npm:[email protected]",
         "set-tz": "0.2.0",
         "ts-jest": "29.4.0",
-        "typescript": "5.8.3"
+        "typescript": "5.9.2"
     },
     "packageManager": "[email protected]",
     "dependencies": {

packages/graphql/package.json

@@ -71,7 +71,7 @@
         "supertest": "7.1.4",
         "ts-jest": "29.4.0",
         "ts-node": "10.9.2",
-        "typescript": "5.8.3",
+        "typescript": "5.9.2",
         "ws": "8.18.3"
     },
     "dependencies": {

packages/graphql/src/schema/validation/Neo4jValidationContext.ts

@@ -59,13 +59,14 @@ export class Neo4jValidationContext extends SDLValidationContext {
         super(ast, schema, onError);
         this.callbacks = callbacks;
         this.typeMapWithExtensions = buildTypeMapWithExtensions(ast.definitions);
+
         this.interfacesMap = buildInterfacesMap(ast.definitions, this.typeMapWithExtensions);
     }
 }
 
 // build a type map to access specific types and their extensions
 function buildTypeMapWithExtensions(definitions: Readonly<DefinitionNode[]>): TypeMapWithExtensions {
-    return definitions.reduce((acc, def): TypeMapWithExtensions => {
+    return definitions.reduce((acc, def) => {
         if (
             def.kind === Kind.OBJECT_TYPE_DEFINITION ||
             def.kind === Kind.INTERFACE_TYPE_DEFINITION ||
@@ -77,6 +78,7 @@ function buildTypeMapWithExtensions(definitions: Readonly<DefinitionNode[]>): Ty
         ) {
             const typeName = def.name.value;
             if (!acc[typeName]) {
+                // definition is undefined whilst building the TypeMapWithExtensions, but will eventually be populated
                 acc[typeName] = { extensions: [], definition: undefined };
             }
             if (
@@ -101,7 +103,7 @@ function buildInterfacesMap(
     definitions: Readonly<DefinitionNode[]>,
     typeMapWithExtensions: TypeMapWithExtensions
 ): Record<string, Array<ObjectTypeDefinitionNode>> {
-    return definitions.reduce((acc, def): TypeMapWithExtensions => {
+    return definitions.reduce((acc, def): Record<string, Array<ObjectTypeDefinitionNode>> => {
         if (def.kind === Kind.OBJECT_TYPE_DEFINITION || def.kind === Kind.OBJECT_TYPE_EXTENSION) {
             const typeName = def.name.value;
             for (const defInterface of def.interfaces ?? []) {
@@ -111,7 +113,9 @@ function buildInterfacesMap(
                 }
 
                 const concreteDefinition = typeMapWithExtensions[typeName]?.definition;
-                acc[interfaceName].push(concreteDefinition);
+                if (concreteDefinition && concreteDefinition.kind === Kind.OBJECT_TYPE_DEFINITION) {
+                    acc[interfaceName].push(concreteDefinition);
+                }
             }
         }
         return acc;

yarn.lock

@@ -2676,7 +2676,7 @@ __metadata:
     supertest: "npm:7.1.4"
     ts-jest: "npm:29.4.0"
     ts-node: "npm:10.9.2"
-    typescript: "npm:5.8.3"
+    typescript: "npm:5.9.2"
     typescript-memoize: "npm:^1.1.1"
     ws: "npm:8.18.3"
   peerDependencies:
@@ -13466,7 +13466,7 @@ __metadata:
     prettier-2: "npm:[email protected]"
     set-tz: "npm:0.2.0"
     ts-jest: "npm:29.4.0"
-    typescript: "npm:5.8.3"
+    typescript: "npm:5.9.2"
   languageName: unknown
   linkType: soft
 
@@ -17369,6 +17369,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@npm:5.9.2":
+  version: 5.9.2
+  resolution: "typescript@npm:5.9.2"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/cd635d50f02d6cf98ed42de2f76289701c1ec587a363369255f01ed15aaf22be0813226bff3c53e99d971f9b540e0b3cc7583dbe05faded49b1b0bed2f638a18
+  languageName: node
+  linkType: hard
+
 "typescript@patch:typescript@npm%3A5.8.3#optional!builtin<compat/typescript>":
   version: 5.8.3
   resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin<compat/typescript>::version=5.8.3&hash=5786d5"
@@ -17379,6 +17389,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typescript@patch:typescript@npm%3A5.9.2#optional!builtin<compat/typescript>":
+  version: 5.9.2
+  resolution: "typescript@patch:typescript@npm%3A5.9.2#optional!builtin<compat/typescript>::version=5.9.2&hash=5786d5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/34d2a8e23eb8e0d1875072064d5e1d9c102e0bdce56a10a25c0b917b8aa9001a9cf5c225df12497e99da107dc379360bc138163c66b55b95f5b105b50578067e
+  languageName: node
+  linkType: hard
+
 "umd@npm:^3.0.0":
   version: 3.0.3
   resolution: "umd@npm:3.0.3"