@iushev/react-rbac 1.0.35 → 1.0.37

package/.vscode/settings.json

@@ -1,6 +1,6 @@
 {
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "editor.formatOnSave": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode"

package/eslint.config.mjs

@@ -0,0 +1,57 @@
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import prettier from "eslint-plugin-prettier";
+import globals from "globals";
+import tsParser from "@typescript-eslint/parser";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all,
+});
+
+export default [
+  {
+    ignores: ["**/lib/", "**/node_modules/"],
+  },
+  ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"),
+  {
+    plugins: {
+      "@typescript-eslint": typescriptEslint,
+      prettier,
+    },
+
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        module: false,
+      },
+
+      parser: tsParser,
+      ecmaVersion: 12,
+      sourceType: "module",
+    },
+
+    rules: {
+      "@typescript-eslint/no-namespace": "off",
+      "@typescript-eslint/no-explicit-any": "off",
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        {
+          args: "all",
+          argsIgnorePattern: "^_",
+          caughtErrors: "all",
+          caughtErrorsIgnorePattern: "^_",
+          destructuredArrayIgnorePattern: "^_",
+          varsIgnorePattern: "^_",
+          ignoreRestSiblings: true,
+        },
+      ],
+    },
+  },
+];

package/lib/RbacCheckAccess.d.ts

@@ -5,7 +5,7 @@ export type RbacCheckAccessOptions = BaseCheckAccessOptions & {
     authorization: () => string;
 };
 export default class RbacCheckAccess extends BaseCheckAccess {
-    private axiosInstance;
+    private readonly axiosInstance;
     protected assignments: Map<string, Map<string, Assignment>>;
     constructor(options: RbacCheckAccessOptions);
     checkAccess(username: string, itemName: string, params: RuleParams): Promise<boolean>;

package/lib/RbacCheckAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RbacCheckAccess.d.ts","sourceRoot":"","sources":["../src/RbacCheckAccess.ts"],"names":[],"mappings":"AAAA,OAAc,EAAiB,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAGjE,OAAO,EACL,UAAU,EACV,eAAe,EACf,sBAAsB,EAOtB,UAAU,EACX,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,sBAAsB,GAAG,sBAAsB,GAAG;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,MAAM,CAAC;CAC7B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,eAAe;IAC1D,OAAO,CAAC,aAAa,CAAgB;IAErC,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAa;gBAE5D,OAAO,EAAE,sBAAsB;IAkB9B,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAQrF,IAAI,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7D,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,cAAc;IA4BtB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,kBAAkB;CAa3B"}
+{"version":3,"file":"RbacCheckAccess.d.ts","sourceRoot":"","sources":["../src/RbacCheckAccess.ts"],"names":[],"mappings":"AAAA,OAAc,EAAiB,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAGjE,OAAO,EACL,UAAU,EACV,eAAe,EACf,sBAAsB,EAOtB,UAAU,EACX,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,sBAAsB,GAAG,sBAAsB,GAAG;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,MAAM,CAAC;CAC7B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,eAAe;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAE9C,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAa;gBAE5D,OAAO,EAAE,sBAAsB;IAkB9B,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAQrF,IAAI,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7D,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,cAAc;IA4BtB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,kBAAkB;CAa3B"}

package/lib/RbacCheckAccess.js

@@ -37,8 +37,8 @@ class RbacCheckAccess extends rbac_1.BaseCheckAccess {
         const _super = Object.create(null, {
             checkAccess: { get: () => super.checkAccess }
         });
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (this.items.size === 0) {
                 yield this.load();
             }
@@ -46,8 +46,8 @@ class RbacCheckAccess extends rbac_1.BaseCheckAccess {
         });
     }
     load(config) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             let _rbac;
             try {
                 console.log("Load RBAC");

package/lib/RbacContext.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -43,7 +53,7 @@ const RbacContext = react_1.default.createContext({
     rbac: null,
     checkAccess: () => __awaiter(void 0, void 0, void 0, function* () { return true; }),
 });
-const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClasses, children, }) => {
+const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClasses: _ruleClasses, children, }) => {
     const [rbac, setRbac] = (0, react_1.useState)(null);
     (0, react_1.useEffect)(() => {
         if (!token) {
@@ -91,7 +101,7 @@ const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClas
         }
         return match();
     }, []);
-    const checkAccess = (0, react_1.useCallback)(({ roles, allow = true, match, params = {} }) => __awaiter(void 0, void 0, void 0, function* () {
+    const checkAccess = (0, react_1.useCallback)((_a) => __awaiter(void 0, [_a], void 0, function* ({ roles, allow = true, match, params = {} }) {
         return isSuperuser || ((yield matchRole(roles, params)) && matchCustom(match) && allow);
     }), [isSuperuser, matchCustom, matchRole]);
     const value = (0, react_1.useMemo)(() => {
@@ -100,7 +110,7 @@ const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClas
             checkAccess,
         };
     }, [rbac, checkAccess]);
-    return (0, jsx_runtime_1.jsx)(RbacContext.Provider, Object.assign({ value: value }, { children: children }));
+    return (0, jsx_runtime_1.jsx)(RbacContext.Provider, { value: value, children: children });
 };
 exports.RbacProvider = RbacProvider;
 exports.RbacConsumer = RbacContext.Consumer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iushev/react-rbac",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "private": false,
   "author": "Ivaylo Ushev",
   "description": "",
@@ -14,33 +14,33 @@
     "test": "jest --runInBand",
     "test:watch": "jest --watchAll --runInBand",
     "coverage": "jest --coverage --runInBand",
-    "lint": "eslint --ext .js,.jsx,.ts,.tsx src",
+    "lint": "eslint src",
     "preversion": "rimraf ./lib && npm run build"
   },
   "dependencies": {
-    "http-status-codes": "^2.2.0"
+    "http-status-codes": "^2.3.0"
   },
   "devDependencies": {
-    "@types/react": "^18.0.28",
-    "@types/react-dom": "^18.0.11",
-    "@typescript-eslint/eslint-plugin": "^5.53.0",
-    "@typescript-eslint/parser": "^5.53.0",
-    "eslint": "^8.34.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.32.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "jest": "^29.4.3",
-    "prettier": "^2.8.4",
-    "rimraf": "^4.1.2",
-    "ts-jest": "^29.0.5",
-    "typescript": "^4.9.5"
+    "@types/react": "^19.0.2",
+    "@types/react-dom": "^19.0.2",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.18.1",
+    "eslint": "^9.17.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-react": "^7.37.2",
+    "eslint-plugin-react-hooks": "^5.1.0",
+    "jest": "^29.7.0",
+    "prettier": "^3.4.2",
+    "rimraf": "^6.0.1",
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.7.2"
   },
   "peerDependencies": {
-    "@iushev/rbac": "^1.0.43",
-    "axios": "^1.3.4",
-    "react": "^16.14.0 || ^17.0.2 || ^18.2.0",
-    "react-dom": "^16.14.0 || ^17.0.2 || ^18.2.0"
+    "@iushev/rbac": "^1.0.47",
+    "axios": "^1.7.9",
+    "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0"
   },
   "publishConfig": {
     "access": "public"

package/src/RbacCheckAccess.ts

@@ -20,7 +20,7 @@ export type RbacCheckAccessOptions = BaseCheckAccessOptions & {
 };
 
 export default class RbacCheckAccess extends BaseCheckAccess {
-  private axiosInstance: AxiosInstance;
+  private readonly axiosInstance: AxiosInstance;
 
   protected assignments: Map<string, Map<string, Assignment>> = new Map();
 
@@ -84,7 +84,7 @@ export default class RbacCheckAccess extends BaseCheckAccess {
           name,
           description: item.description ?? null,
           ruleName: item.ruleName ?? null,
-        })
+        }),
       );
       return prevValue;
     }, new Map());

package/src/RbacContext.tsx

@@ -38,7 +38,7 @@ export const RbacProvider: React.FC<RbacProviderProps> = ({
   token,
   isSuperuser,
   isGuest,
-  ruleClasses,
+  ruleClasses: _ruleClasses,
   children,
 }) => {
   const [rbac, setRbac] = useState<RbacCheckAccess | null>(null);
@@ -84,7 +84,7 @@ export const RbacProvider: React.FC<RbacProviderProps> = ({
 
       return false;
     },
-    [isGuest, rbac, username]
+    [isGuest, rbac, username],
   );
 
   const matchCustom = useCallback((match?: MatchFunction) => {
@@ -98,7 +98,7 @@ export const RbacProvider: React.FC<RbacProviderProps> = ({
     async ({ roles, allow = true, match, params = {} }: CheckAccessOptions) => {
       return isSuperuser || ((await matchRole(roles, params)) && matchCustom(match) && allow);
     },
-    [isSuperuser, matchCustom, matchRole]
+    [isSuperuser, matchCustom, matchRole],
   );
 
   const value = useMemo(() => {

package/.eslintignore

@@ -1,2 +0,0 @@
-lib/
-node_modules/

package/.eslintrc.js

@@ -1,20 +0,0 @@
-module.exports = {
-  env: {
-    browser: true,
-    es2021: true,
-  },
-  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended"],
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    ecmaVersion: 12,
-    sourceType: "module",
-  },
-  plugins: ["@typescript-eslint", "prettier"],
-  globals: {
-    module: false,
-  },
-  rules: {
-    "@typescript-eslint/no-namespace": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-  },
-};