fix: ensure it's possible to chain accessibleBy after another `acce…

…ssibleBy` and combine with other `Query` methods
stalniy · Nov 4, 2021 · 5632c53 · 5632c53
1 parent a5f1036
commit 5632c53
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git 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
@@ -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>
 }