Merge pull request #5320 from neo4j/improve-schema-builder

Remove unused types in schema builder
neo4j · Jul 5, 2024 · 6ac2ff2 · 6ac2ff2
2 parents 17c55f9 + f2f7449
commit 6ac2ff2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/packages/graphql/src/api-v6/schema-generation/SchemaBuilder.ts b/packages/graphql/src/api-v6/schema-generation/SchemaBuilder.ts
@@ -17,14 +17,7 @@
  * limitations under the License.
  */
 
-import type {
-    GraphQLInputType,
-    GraphQLList,
-    GraphQLNonNull,
-    GraphQLObjectType,
-    GraphQLScalarType,
-    GraphQLSchema,
-} from "graphql";
+import type { GraphQLInputType, GraphQLNonNull, GraphQLObjectType, GraphQLScalarType, GraphQLSchema } from "graphql";
 import type {
     EnumTypeComposer,
     InputTypeComposer,
@@ -79,7 +72,7 @@ export class SchemaBuilder {
     public getOrCreateObjectType(
         name: string,
         onCreate: () => {
-            fields: Record<string, FieldDefinition | string | WrappedComposer<ObjectTypeComposer | ScalarTypeComposer>>;
+            fields: Record<string, FieldDefinition | WrappedComposer<ObjectTypeComposer | ScalarTypeComposer>>;
             description?: string;
             iface?: InterfaceTypeComposer;
         }
@@ -101,7 +94,7 @@ export class SchemaBuilder {
     public getOrCreateInterfaceType(
         name: string,
         onCreate: () => {
-            fields: Record<string, FieldDefinition | string | WrappedComposer<ObjectTypeComposer | ScalarTypeComposer>>;
+            fields: Record<string, FieldDefinition | WrappedComposer<ObjectTypeComposer | ScalarTypeComposer>>;
             description?: string;
         }
     ): InterfaceTypeComposer {
@@ -128,9 +121,7 @@ export class SchemaBuilder {
             fields: Record<
                 string,
                 | EnumTypeComposer
-                | string
                 | GraphQLInputType
-                | GraphQLList<any>
                 | GraphQLNonNull<any>
                 | WrappedComposer<InputTypeComposer | ScalarTypeComposer>
             >;
@@ -150,7 +141,7 @@ export class SchemaBuilder {
 
     public createInputObjectType(
         name: string,
-        fields: Record<string, EnumTypeComposer | string | WrappedComposer<InputTypeComposer>>,
+        fields: Record<string, EnumTypeComposer | WrappedComposer<InputTypeComposer>>,
         description?: string
     ): InputTypeComposer {
         return this.composer.createInputTC({
@@ -181,7 +172,7 @@ export class SchemaBuilder {
     }: {
         name: string;
         type: ObjectTypeComposer | InterfaceTypeComposer;
-        args: Record<string, InputTypeComposer | string | WrappedComposer<ScalarTypeComposer>>;
+        args: Record<string, InputTypeComposer | WrappedComposer<ScalarTypeComposer>>;
         resolver: (...args: any[]) => any;
         description?: string;
     }): void {

diff --git a/packages/graphql/src/api-v6/schema-generation/schema-types/RelatedEntitySchemaTypes.ts b/packages/graphql/src/api-v6/schema-generation/schema-types/RelatedEntitySchemaTypes.ts
@@ -133,9 +133,9 @@ export class RelatedEntitySchemaTypes extends EntitySchemaTypes<RelatedEntityTyp
         }
     }
 
-    private getRelationshipFieldsDefinition(): Record<string, string> {
+    private getRelationshipFieldsDefinition(): Record<string, any> {
         const entityAttributes = this.getRelationshipFields().map((attribute) => new AttributeAdapter(attribute));
-        return attributeAdapterToComposeFields(entityAttributes, new Map()) as Record<string, any>;
+        return attributeAdapterToComposeFields(entityAttributes, new Map());
     }
 
     private getRelationshipSortFields(): Record<string, EnumTypeComposer> {
@@ -151,9 +151,9 @@ export class RelatedEntitySchemaTypes extends EntitySchemaTypes<RelatedEntityTyp
     private getRelationshipSortableFields(): Attribute[] {
         return this.getRelationshipFields().filter(
             (field) =>
-                field.type.name === GraphQLBuiltInScalarType[GraphQLBuiltInScalarType[field.type.name]] ||
-                field.type.name === Neo4jGraphQLNumberType[Neo4jGraphQLNumberType[field.type.name]] ||
-                field.type.name === Neo4jGraphQLTemporalType[Neo4jGraphQLTemporalType[field.type.name]]
+                field.type.name === GraphQLBuiltInScalarType[field.type.name] ||
+                field.type.name === Neo4jGraphQLNumberType[field.type.name] ||
+                field.type.name === Neo4jGraphQLTemporalType[field.type.name]
         );
     }