From 5632c53de5dc62c10b19864686c82e87d17b6147 Mon Sep 17 00:00:00 2001
From: Serhii Stotskyi <serhii.stotskiy@printify.com>
Date: Thu, 4 Nov 2021 17:29:27 +0200
Subject: [PATCH] fix: ensure it's possible to chain `accessibleBy` after
 another `accessibleBy` and combine with other `Query` methods

---
 .../spec/accessible_records.spec.ts             |  5 +++++
 .../casl-mongoose/src/accessible_records.ts     | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/casl-mongoose/spec/accessible_records.spec.ts b/packages/casl-mongoose/spec/accessible_records.spec.ts
index b0ff7264b..4bd64a56c 100644
--- a/packages/casl-mongoose/spec/accessible_records.spec.ts
+++ b/packages/casl-mongoose/spec/accessible_records.spec.ts
@@ -74,6 +74,11 @@ describe('Accessible Records Plugin', () => {
       ])
     })
 
+    it('allows to chain `accessibleBy` method', () => {
+      Post.find().accessibleBy(ability).accessibleBy(ability, 'update')
+      Post.accessibleBy(ability).where({ title: /test/ }).accessibleBy(ability, 'delete')
+    })
+
     describe('when ability disallow to perform an action', () => {
       let query: mongoose.QueryWithHelpers<Post, Post>
 
diff --git a/packages/casl-mongoose/src/accessible_records.ts b/packages/casl-mongoose/src/accessible_records.ts
index 8ffdb7f07..bb93ca364 100644
--- a/packages/casl-mongoose/src/accessible_records.ts
+++ b/packages/casl-mongoose/src/accessible_records.ts
@@ -25,11 +25,6 @@ function failedQuery(
   return query;
 }
 
-type GetAccessibleRecords<T extends Document> = <U extends AnyMongoAbility>(
-  ability: U,
-  action?: Normalize<Generics<U>['abilities']>[0]
-) => QueryWithHelpers<T, T>;
-
 function accessibleBy<T extends AnyMongoAbility>(
   this: any,
   ability: T,
@@ -54,9 +49,17 @@ function accessibleBy<T extends AnyMongoAbility>(
   return this instanceof mongoose.Query ? this.and([query]) : this.where({ $and: [query] });
 }
 
-export interface AccessibleRecordModel<T extends Document, K = {}> extends Model<T, K & {
+type GetAccessibleRecords<T extends Document> = <U extends AnyMongoAbility>(
+  ability: U,
+  action?: Normalize<Generics<U>['abilities']>[0]
+) => QueryWithHelpers<T, T, QueryHelpers<T>>;
+
+type QueryHelpers<T extends Document> = {
   accessibleBy: GetAccessibleRecords<T>
-}> {
+};
+export interface AccessibleRecordModel<
+  T extends Document, K = unknown
+> extends Model<T, K & QueryHelpers<T>> {
   accessibleBy: GetAccessibleRecords<T>
 }