fix: ensure that 6.0.13 is compatible with the changes

stalniy · Jul 29, 2022 · d9855b8 · d9855b8
1 parent 26cb44f
commit d9855b8
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 39 deletions.
diff --git a/packages/casl-mongoose/src/accessible_fields.ts b/packages/casl-mongoose/src/accessible_fields.ts
@@ -63,7 +63,7 @@ function modelFieldsGetter() {
 export function accessibleFieldsPlugin(
   schema: Schema<any>,
   rawOptions?: Partial<AccessibleFieldsOptions>
-) {
+): void {
   const options = { getFields: getSchemaPaths, ...rawOptions };
   const fieldsFrom = modelFieldsGetter();
   type ModelOrDoc = Model<AccessibleFieldsDocument> | AccessibleFieldsDocument;

diff --git a/packages/casl-mongoose/src/accessible_records.ts b/packages/casl-mongoose/src/accessible_records.ts
@@ -83,7 +83,7 @@ export interface AccessibleRecordModel<
   >
 }
 
-export function accessibleRecordsPlugin(schema: Schema<any, any, any, any>) {
-  schema.query.accessibleBy = accessibleBy;
+export function accessibleRecordsPlugin(schema: Schema<any>): void {
+  (schema.query as Record<string, unknown>).accessibleBy = accessibleBy;
   schema.statics.accessibleBy = accessibleBy;
 }
diff --git a/packages/casl-mongoose/src/mongo.ts b/packages/casl-mongoose/src/mongo.ts
@@ -1,5 +1,5 @@
 import { AnyMongoAbility } from '@casl/ability';
-import { rulesToQuery } from '@casl/ability/extra';
+import { AbilityQuery, rulesToQuery } from '@casl/ability/extra';
 
 function convertToMongoQuery(rule: AnyMongoAbility['rules'][number]) {
   const conditions = rule.conditions!;
@@ -10,6 +10,6 @@ export function toMongoQuery<T extends AnyMongoAbility>(
   ability: T,
   subjectType: Parameters<T['rulesFor']>[1],
   action: Parameters<T['rulesFor']>[0] = 'read'
-) {
+): AbilityQuery | null {
   return rulesToQuery(ability, action, subjectType, convertToMongoQuery);
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml