fix(count): Fix where and includes not initialized in the count hook like the list one.

Author: vincentdesmares

lib/queryResolvers/count.js

@@ -106,6 +106,12 @@ function countResolver(model, schemaDeclaration, globalPreCallback) {
                     return [7 /*endfinally*/];
                 case 8:
                     findOptions = graphql_sequelize_1.argsToFindOptions["default"](args, Object.keys(model.getAttributes()));
+                    if (!findOptions.where) {
+                        findOptions.where = {};
+                    }
+                    if (typeof findOptions.include === 'undefined') {
+                        findOptions.include = [];
+                    }
                     if (!countBefore) return [3 /*break*/, 10];
                     handle = globalPreCallback('countBefore');
                     return [4 /*yield*/, countBefore({

src/queryResolvers/count.ts

@@ -6,7 +6,7 @@ import {
   ModelDeclarationType,
 } from '../types/types'
 
-export default function countResolver<M extends Model<any>>(
+export default function countResolver<M extends Model<any>, TContext = any>(
   model: ModelStatic<M>,
   schemaDeclaration: ModelDeclarationType<M>,
   globalPreCallback: GlobalPreCallback
@@ -31,7 +31,7 @@ export default function countResolver<M extends Model<any>>(
       ? schemaDeclaration.count.before
       : listBefore
 
-  return async (source: any, args: any, context: any, info: any) => {
+  return async (source: any, args: any, context: TContext, info: any) => {
     if (schemaDeclaration.before) {
       const beforeList: GlobalBeforeHook[] =
         schemaDeclaration.before &&
@@ -53,6 +53,14 @@ export default function countResolver<M extends Model<any>>(
       Object.keys(model.getAttributes())
     )
 
+    if (!findOptions.where) {
+      findOptions.where = {}
+    }
+
+    if (typeof findOptions.include === 'undefined') {
+      findOptions.include = []
+    }
+
     if (countBefore) {
       const handle = globalPreCallback('countBefore')
 

src/queryResolvers/createListResolver.ts

@@ -288,14 +288,17 @@ async function trimAndOptimizeFindOptions<M extends Model<any>>({
   return trimedFindOptions
 }
 
-export default function createListResolver<M extends Model<any>>(
-  graphqlTypeDeclaration: ModelDeclarationType<M>,
+export default function createListResolver<
+  M extends Model<any>,
+  TContext = any
+>(
+  graphqlTypeDeclaration: ModelDeclarationType<M, TContext>,
   models: SequelizeModels,
   globalPreCallback: any,
   relation: ModelStatic<M> | null = null
 ) {
   if (graphqlTypeDeclaration?.list?.resolver) {
-    return async (source: any, args: any, context: any, info: any) => {
+    return async (source: any, args: any, context: TContext, info: any) => {
       const customResolverHandle = globalPreCallback('customListBefore')
       if (graphqlTypeDeclaration?.list?.resolver) {
         const customResult = await graphqlTypeDeclaration.list.resolver(
@@ -328,7 +331,7 @@ export default function createListResolver<M extends Model<any>>(
     before: async (
       findOptions: FindOptions<M>,
       args: any,
-      context: any,
+      context: TContext,
       info: any
     ) => {
       if (!findOptions.where) {
@@ -370,7 +373,7 @@ export default function createListResolver<M extends Model<any>>(
 
       // Global hooks, cannot impact the findOptions
       if (graphqlTypeDeclaration.before) {
-        const beforeList: GlobalBeforeHook[] =
+        const beforeList: GlobalBeforeHook<TContext>[] =
           typeof graphqlTypeDeclaration.before.length !== 'undefined'
             ? (graphqlTypeDeclaration.before as GlobalBeforeHook[])
             : ([
@@ -418,7 +421,7 @@ export default function createListResolver<M extends Model<any>>(
         args,
       })
     },
-    after: async (result: M | M[], args: any, context: any, info: any) => {
+    after: async (result: M | M[], args: any, context: TContext, info: any) => {
       if (listAfter) {
         const handle = globalPreCallback('listAfter')
         const modifiedResult = await listAfter({

src/root/query.ts

@@ -67,7 +67,7 @@ function getModelsFields(
                   ? schemaDeclaration.list.extraArg
                   : {}),
               },
-              resolve: generateCountResolver(
+              resolve: generateCountResolver<any, any>(
                 schemaDeclaration.model,
                 schemaDeclaration,
                 globalPreCallback