@holoyan/adonisjs-permissions 2.0.0-beta.1 → 2.0.1

package/README.md

@@ -1,4 +1,9 @@
-# Role permissions system for AdonisJS V6+
+# Role permissions system for AdonisJS
+
+| Package version | AdonisJS version |
+|----------------|-----------------|
+| v1.x           | v6              |
+| v2.x           | v7              |
 
 Checkout other AdonisJS packages
 
@@ -14,8 +19,11 @@ Checkout other AdonisJS packages
 
 ## Release Notes
 
-Version: >= v1.3.1
-* Added [canPartially](#checking-partial-permissions) method
+Version: v2.0.0
+* Added support for AdonisJS v7
+
+Version: >= v1.3.2
+* Fixed `permissionQueryHelpers()` mixin leaking internal relations (`_roles`, `_permissions`, `_model_roles`) into the public `related()` API, which caused incorrect IDE type inference on user-defined relations
 
 ## Table of Contents
 
@@ -89,9 +97,15 @@ await user.allow('delete', post)
 To be able to use the full power of Acl, you should have a clear understanding of how it is structured and how it works. That's why the documentation will be divided into two parts: [Basic usage](#basic-usage) and [Advanced usage](#digging-deeper). For most applications, Basic Usage will be enough.
 
 ## Installation
-    
+
+For AdonisJS v7 (latest):
+
     npm i @holoyan/adonisjs-permissions
 
+For AdonisJS v6:
+
+    npm i @holoyan/adonisjs-permissions@v1-latest
+
 
 Next publish config files
 
@@ -1364,8 +1378,6 @@ await Acl.permission(myPermission).detachFromRole(role_slug)
 |------------------------|-----------------|
 | v20.x                  | 0.10.x          |
 | v21.x                  | 1.x             |
-| v22.x                  | 2.x             |
-
 
 
 

package/build/src/mixins/has_permissions.d.ts

@@ -1,10 +1,8 @@
 import type { NormalizeConstructor } from '@adonisjs/core/types/helpers';
 import { BaseModel } from '@adonisjs/lucid/orm';
 import { AclModel, ModelIdType } from '../types.js';
-import type { ManyToMany, HasMany } from '@adonisjs/lucid/types/relations';
 import Role from '../models/role.js';
 import { LucidModel, LucidRow, ModelQueryBuilderContract } from '@adonisjs/lucid/types/model';
-import { ModelRole, Permission } from '../../index.js';
 import ModelPermission from '../models/model_permission.js';
 export declare function hasPermissions(): <Model extends NormalizeConstructor<typeof BaseModel>>(superclass: Model) => {
     new (...args: any[]): {
@@ -362,11 +360,11 @@ export declare function hasPermissions(): <Model extends NormalizeConstructor<ty
 } & Model;
 export declare function permissionQueryHelpers(): <Model extends NormalizeConstructor<typeof BaseModel>>(superclass: Model) => {
     new (...args: any[]): {
-        _roles: ManyToMany<typeof Role>;
+        _roles: undefined;
         _whereRoles<TargetClass extends Model>(query: ModelQueryBuilderContract<LucidModel, LucidRow>, targetClass: TargetClass, ...roles: string[]): ModelQueryBuilderContract<LucidModel, LucidRow>;
-        _permissions: ManyToMany<typeof Permission>;
+        _permissions: undefined;
         _whereDirectPermissions<TargetClass extends Model>(query: ModelQueryBuilderContract<LucidModel, LucidRow>, targetClass: TargetClass, permissions: string[], target?: AclModel | Function): ModelQueryBuilderContract<LucidModel, LucidRow>;
-        _model_roles: HasMany<typeof ModelRole>;
+        _model_roles: undefined;
         _whereRolePermissions<TargetClass extends Model>(query: ModelQueryBuilderContract<LucidModel, LucidRow>, targetClass: TargetClass, permissions: string[], target?: AclModel | Function): ModelQueryBuilderContract<LucidModel, LucidRow>;
         _wherePermissions<TargetClass extends Model>(query: ModelQueryBuilderContract<LucidModel, LucidRow>, targetClass: TargetClass, permissions: string[], target?: AclModel | Function): void;
         $attributes: import("@adonisjs/lucid/types/model").ModelObject;
@@ -401,7 +399,7 @@ export declare function permissionQueryHelpers(): <Model extends NormalizeConstr
         $hydrateOriginals(): void;
         fill(value: Partial<import("@adonisjs/lucid/types/model").ModelAttributes</*elided*/ any>>, allowExtraProperties?: boolean): /*elided*/ any;
         merge(value: Partial<import("@adonisjs/lucid/types/model").ModelAttributes</*elided*/ any>>, allowExtraProperties?: boolean): /*elided*/ any;
-        isDirty(fields?: undefined[] | undefined): boolean;
+        isDirty(fields?: "_roles" | "_permissions" | "_model_roles" | ("_roles" | "_permissions" | "_model_roles" | undefined)[] | undefined): boolean;
         enableForceUpdate(): /*elided*/ any;
         save(): Promise</*elided*/ any>;
         saveQuietly(): Promise</*elided*/ any>;
@@ -425,7 +423,7 @@ export declare function permissionQueryHelpers(): <Model extends NormalizeConstr
         toObject(): import("@adonisjs/lucid/types/model").ModelObject;
         toJSON(): import("@adonisjs/lucid/types/model").ModelObject;
         toAttributes(): Record<string, any>;
-        related<Name_2 extends import("@adonisjs/lucid/types/relations").ExtractModelRelations</*elided*/ any>>(relation: Name_2): NonNullable</*elided*/ any[Name_2]> extends import("@adonisjs/lucid/types/relations").ModelRelations<LucidModel, LucidModel> ? (import("@adonisjs/lucid/types/relations").ModelRelations<LucidModel, LucidModel> & /*elided*/ any[Name_2] & {})["client"] : never;
+        related<Name_2 extends undefined>(relation: Name_2): NonNullable</*elided*/ any[Name_2]> extends import("@adonisjs/lucid/types/relations").ModelRelations<LucidModel, LucidModel> ? (import("@adonisjs/lucid/types/relations").ModelRelations<LucidModel, LucidModel> & /*elided*/ any[Name_2] & {})["client"] : never;
     };
     connection?: string | undefined;
     after: {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@holoyan/adonisjs-permissions",
   "description": "AdonisJs roles and permissions system",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.1",
   "engines": {
-    "node": ">=24.0.0"
+    "node": ">=18.16.0"
   },
   "type": "module",
   "files": [
@@ -41,12 +41,12 @@
   "author": "holoyan",
   "license": "MIT",
   "devDependencies": {
-    "@adonisjs/assembler": "^8.0.0-next.0",
-    "@adonisjs/core": "^7.0.0-next.0",
+    "@adonisjs/assembler": "^8.0.1",
+    "@adonisjs/core": "^7.0.1",
     "@adonisjs/eslint-config": "^1.2.1",
-    "@adonisjs/lucid": "^22.0.0-next.0",
+    "@adonisjs/lucid": "^22.1.1",
     "@adonisjs/prettier-config": "^1.2.1",
-    "@adonisjs/tsconfig": "^2.0.0-next.3",
+    "@adonisjs/tsconfig": "^2.0.0",
     "@japa/assert": "^4.2.0",
     "@japa/runner": "^5.3.0",
     "@swc/core": "^1.3.102",
@@ -71,20 +71,20 @@
     "uuid": "^10.0.0"
   },
   "peerDependencies": {
-    "@adonisjs/core": "^7.0.0-next.0",
-    "@adonisjs/lucid": "^22.0.0-next.0",
+    "@adonisjs/core": "^7.0.1",
+    "@adonisjs/lucid": "^22.1.1",
     "@types/uuid": "^10.0.0",
-    "luxon": "^3.4.4",
+    "luxon": "^3.7.2",
     "uuid": "^10.0.0"
   },
   "publishConfig": {
     "access": "public",
-    "tag": "beta"
+    "tag": "latest"
   },
   "np": {
     "message": "chore(release): %s",
-    "tag": "beta",
-    "branch": "2.0.0-beta.1",
+    "tag": "latest",
+    "branch": "master",
     "anyBranch": false
   },
   "c8": {
@@ -101,7 +101,7 @@
   },
   "prettier": "@adonisjs/prettier-config",
   "dependencies": {
-    "@holoyan/morph-map-js": "^0.1.2",
+    "@holoyan/morph-map-js": "^0.1.1",
     "@poppinss/hooks": "7.3.0"
   }
 }