From fb183b8bfff6e1a13c6fa3f47d632d43bb588d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9verin?= <severin@appchoose.io>
Date: Wed, 2 Jul 2025 14:21:47 +0200
Subject: [PATCH 1/2] fix(types): FilterFn source should be ResolverFn resolved
 value

---
 src/with-filter.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/with-filter.ts b/src/with-filter.ts
index c881533..459e759 100644
--- a/src/with-filter.ts
+++ b/src/with-filter.ts
@@ -1,20 +1,20 @@
 export type FilterFn<TSource = any, TArgs = any, TContext = any> = (rootValue?: TSource, args?: TArgs, context?: TContext, info?: any) => boolean | Promise<boolean>;
-export type ResolverFn<TSource = any, TArgs = any, TContext = any> = (rootValue?: TSource, args?: TArgs, context?: TContext, info?: any) => AsyncIterator<any> | Promise<AsyncIterator<any>>;
+export type ResolverFn<TSource = any, TArgs = any, TContext = any, TResolve = any> = (rootValue?: TSource, args?: TArgs, context?: TContext, info?: any) => AsyncIterator<TResolve> | Promise<AsyncIterator<TResolve>>;
 export type IterableResolverFn<TSource = any, TArgs = any, TContext = any> = (rootValue?: TSource, args?: TArgs, context?: TContext, info?: any) => AsyncIterableIterator<any> | Promise<AsyncIterableIterator<any>>;
 
 interface IterallAsyncIterator<T> extends AsyncIterableIterator<T> {
   [Symbol.asyncIterator](): IterallAsyncIterator<T>;
 }
 
-export type WithFilter<TSource = any, TArgs = any, TContext = any> = (
-  asyncIteratorFn: ResolverFn<TSource, TArgs, TContext>,
-  filterFn: FilterFn<TSource, TArgs, TContext>
+export type WithFilter<TSource = any, TArgs = any, TContext = any, TResolve = any> = (
+  asyncIteratorFn: ResolverFn<TSource, TArgs, TContext, TResolve>,
+  filterFn: FilterFn<TResolve, TArgs, TContext>
 ) => IterableResolverFn<TSource, TArgs, TContext>;
 
-export function withFilter<TSource = any, TArgs = any, TContext = any>(
-  asyncIteratorFn: ResolverFn<TSource, TArgs, TContext>,
-  filterFn: FilterFn<TSource, TArgs, TContext>
-): IterableResolverFn<TSource, TArgs, TContext> {
+  export function withFilter<TSource = any, TArgs = any, TContext = any, TResolve = any>(
+    asyncIteratorFn: ResolverFn<TSource, TArgs, TContext, TResolve>,
+    filterFn: FilterFn<TResolve, TArgs, TContext>
+  ): IterableResolverFn<TSource, TArgs, TContext> {
   return async (rootValue: TSource, args: TArgs, context: TContext, info: any): Promise<IterallAsyncIterator<any>> => {
     const asyncIterator = await asyncIteratorFn(rootValue, args, context, info);
 

From 1a7ee0729192e24b8e6423d55e97402a162ce34e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9verin?= <severin@appchoose.io>
Date: Wed, 2 Jul 2025 14:29:26 +0200
Subject: [PATCH 2/2] fix: remove optionnal in types

---
 src/with-filter.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/with-filter.ts b/src/with-filter.ts
index 459e759..dc5af0c 100644
--- a/src/with-filter.ts
+++ b/src/with-filter.ts
@@ -1,6 +1,6 @@
-export type FilterFn<TSource = any, TArgs = any, TContext = any> = (rootValue?: TSource, args?: TArgs, context?: TContext, info?: any) => boolean | Promise<boolean>;
-export type ResolverFn<TSource = any, TArgs = any, TContext = any, TResolve = any> = (rootValue?: TSource, args?: TArgs, context?: TContext, info?: any) => AsyncIterator<TResolve> | Promise<AsyncIterator<TResolve>>;
-export type IterableResolverFn<TSource = any, TArgs = any, TContext = any> = (rootValue?: TSource, args?: TArgs, context?: TContext, info?: any) => AsyncIterableIterator<any> | Promise<AsyncIterableIterator<any>>;
+export type FilterFn<TSource = any, TArgs = any, TContext = any> = (rootValue: TSource, args: TArgs, context: TContext, info?: any) => boolean | Promise<boolean>;
+export type ResolverFn<TSource = any, TArgs = any, TContext = any, TResolve = any> = (rootValue: TSource, args: TArgs, context: TContext, info?: any) => AsyncIterator<TResolve> | Promise<AsyncIterator<TResolve>>;
+export type IterableResolverFn<TSource = any, TArgs = any, TContext = any> = (rootValue: TSource, args: TArgs, context: TContext, info?: any) => AsyncIterableIterator<any> | Promise<AsyncIterableIterator<any>>;
 
 interface IterallAsyncIterator<T> extends AsyncIterableIterator<T> {
   [Symbol.asyncIterator](): IterallAsyncIterator<T>;