Merge pull request #5 from theplant/genx

chain middlewares

middleware.go

@@ -83,3 +83,21 @@ func AppendCursorMiddleware[T any](cursorMiddlewares ...CursorMiddleware[T]) Pag
 		})
 	}
 }
+
+func chainCursorMiddlewares[T any](mws []CursorMiddleware[T]) CursorMiddleware[T] {
+	return func(next ApplyCursorsFunc[T]) ApplyCursorsFunc[T] {
+		for i := len(mws); i > 0; i-- {
+			next = mws[i-1](next)
+		}
+		return next
+	}
+}
+
+func chainPaginationMiddlewares[T any](mws []PaginationMiddleware[T]) PaginationMiddleware[T] {
+	return func(next Pagination[T]) Pagination[T] {
+		for i := len(mws); i > 0; i-- {
+			next = mws[i-1](next)
+		}
+		return next
+	}
+}

paginaition.go → pagination.go

@@ -220,15 +220,8 @@ func New[T any](applyCursorsFunc ApplyCursorsFunc[T], middlewares ...PaginationM
 	}
 
 	var p Pagination[T] = PaginationFunc[T](func(ctx context.Context, req *PaginateRequest[T]) (*Connection[T], error) {
-		applyCursorsFunc := applyCursorsFunc
 		cursorMiddlewares := CursorMiddlewaresFromContext[T](ctx)
-		for _, cursorMiddleware := range cursorMiddlewares {
-			applyCursorsFunc = cursorMiddleware(applyCursorsFunc)
-		}
-		return paginate(ctx, req, applyCursorsFunc)
+		return paginate(ctx, req, chainCursorMiddlewares(cursorMiddlewares)(applyCursorsFunc))
 	})
-	for _, middleware := range middlewares {
-		p = middleware(p)
-	}
-	return p
+	return chainPaginationMiddlewares(middlewares)(p)
 }