Merge pull request #14 from getcronit/fix-empty-graphql-query

fix: remove empty resolvers in graphql-handler.ts and add validation …
getcronit · Sep 18, 2024 · de8e828 · de8e828
2 parents 798089a + 01a6149
commit de8e828
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/packages/pylon/src/app/handler/graphql-handler.ts b/packages/pylon/src/app/handler/graphql-handler.ts
@@ -16,13 +16,6 @@ export interface SchemaOptions {
 export const graphqlHandler =
   (c: Context) =>
   ({typeDefs, resolvers}: SchemaOptions) => {
-    // Remove empty resolvers
-    for (const key in resolvers) {
-      if (Object.keys(resolvers[key]).length === 0) {
-        delete resolvers[key]
-      }
-    }
-
     resolvers = resolversToGraphQLResolvers(resolvers)
 
     const schema = createSchema({

diff --git a/packages/pylon/src/define-pylon.ts b/packages/pylon/src/define-pylon.ts
@@ -249,7 +249,7 @@ export const resolversToGraphQLResolvers = (
     }
   }
 
-  if (resolvers.Query) {
+  if (resolvers.Query && Object.keys(resolvers.Query).length > 0) {
     for (const [key, value] of Object.entries(resolvers.Query)) {
       if (!graphqlResolvers.Query) {
         graphqlResolvers.Query = {}
@@ -261,7 +261,7 @@ export const resolversToGraphQLResolvers = (
     }
   }
 
-  if (resolvers.Mutation) {
+  if (resolvers.Mutation && Object.keys(resolvers.Mutation).length > 0) {
     if (!graphqlResolvers.Mutation) {
       graphqlResolvers.Mutation = {}
     }
@@ -273,6 +273,23 @@ export const resolversToGraphQLResolvers = (
     }
   }
 
+  // Query root type must be provided.
+  if (!graphqlResolvers.Query) {
+    // Custom Error for Query root type must be provided.
+
+    throw new Error(`At least one 'Query' resolver must be provided.
+
+Example:
+
+export const graphql = {
+  Query: {
+    // Define at least one query resolver here
+    hello: () => 'world'
+  }
+}
+`)
+  }
+
   return graphqlResolvers
 }