@iushev/react-rbac 1.0.17 → 1.0.20

package/.eslintignore

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

package/.eslintrc.js

@@ -0,0 +1,20 @@
+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",
+  },
+};

package/.prettierrc

@@ -0,0 +1,3 @@
+{
+  "printWidth": 120
+}

package/.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  },
+  "editor.formatOnSave": true
+}

package/jest.config.js

@@ -0,0 +1,188 @@
+// For a detailed explanation regarding each configuration property, visit:
+// https://jestjs.io/docs/en/configuration.html
+
+module.exports = {
+  // All imported modules in your tests should be mocked automatically
+  // automock: false,
+
+  // Stop running tests after `n` failures
+  // bail: 0,
+
+  // Respect "browser" field in package.json when resolving modules
+  // browser: false,
+
+  // The directory where Jest should store its cached dependency information
+  // cacheDirectory: "/tmp/jest_rs",
+
+  // Automatically clear mock calls and instances between every test
+  // clearMocks: false,
+
+  // Indicates whether the coverage information should be collected while executing the test
+  // collectCoverage: false,
+
+  // An array of glob patterns indicating a set of files for which coverage information should be collected
+  // collectCoverageFrom: undefined,
+
+  // The directory where Jest should output its coverage files
+  // coverageDirectory: undefined,
+
+  // An array of regexp pattern strings used to skip coverage collection
+  // coveragePathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // A list of reporter names that Jest uses when writing coverage reports
+  // coverageReporters: [
+  //   "json",
+  //   "text",
+  //   "lcov",
+  //   "clover"
+  // ],
+
+  // An object that configures minimum threshold enforcement for coverage results
+  // coverageThreshold: undefined,
+
+  // A path to a custom dependency extractor
+  // dependencyExtractor: undefined,
+
+  // Make calling deprecated APIs throw helpful error messages
+  // errorOnDeprecated: false,
+
+  // Force coverage collection from ignored files using an array of glob patterns
+  // forceCoverageMatch: [],
+
+  // A path to a module which exports an async function that is triggered once before all test suites
+  // globalSetup: undefined,
+
+  // A path to a module which exports an async function that is triggered once after all test suites
+  // globalTeardown: undefined,
+
+  // A set of global variables that need to be available in all test environments
+  // globals: {},
+
+  // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
+  // maxWorkers: "50%",
+
+  // An array of directory names to be searched recursively up from the requiring module's location
+  // moduleDirectories: [
+  //   "node_modules"
+  // ],
+
+  // An array of file extensions your modules use
+  // moduleFileExtensions: [
+  //   "js",
+  //   "json",
+  //   "jsx",
+  //   "ts",
+  //   "tsx",
+  //   "node"
+  // ],
+
+  // A map from regular expressions to module names that allow to stub out resources with a single module
+  // moduleNameMapper: {
+  //   "^@iushev/rbac$": "<rootDir>/src",
+  // },
+
+  // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
+  // modulePathIgnorePatterns: [],
+
+  // Activates notifications for test results
+  // notify: false,
+
+  // An enum that specifies notification mode. Requires { notify: true }
+  // notifyMode: "failure-change",
+
+  // A preset that is used as a base for Jest's configuration
+  preset: "ts-jest",
+
+  // Run tests from one or more projects
+  // projects: undefined,
+
+  // Use this configuration option to add custom reporters to Jest
+  // reporters: undefined,
+
+  // Automatically reset mock state between every test
+  // resetMocks: false,
+
+  // Reset the module registry before running each individual test
+  // resetModules: false,
+
+  // A path to a custom resolver
+  // resolver: undefined,
+
+  // Automatically restore mock state between every test
+  // restoreMocks: false,
+
+  // The root directory that Jest should scan for tests and modules within
+  rootDir: "./src",
+
+  // A list of paths to directories that Jest should use to search for files in
+  // roots: [
+  //   "./src",
+  //   "./tests"
+  // ],
+
+  // Allows you to use a custom runner instead of Jest's default test runner
+  // runner: "jest-runner",
+
+  // The paths to modules that run some code to configure or set up the testing environment before each test
+  // setupFiles: [],
+
+  // A list of paths to modules that run some code to configure or set up the testing framework before each test
+  // setupFilesAfterEnv: [],
+
+  // A list of paths to snapshot serializer modules Jest should use for snapshot testing
+  // snapshotSerializers: [],
+
+  // The test environment that will be used for testing
+  testEnvironment: "node",
+
+  // Options that will be passed to the testEnvironment
+  // testEnvironmentOptions: {},
+
+  // Adds a location field to test results
+  // testLocationInResults: false,
+
+  // The glob patterns Jest uses to detect test files
+  testMatch: ["**/__tests__/**/?(*.)+(spec|test).[jt]s?(x)"],
+
+  // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
+  // testPathIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // The regexp pattern or array of patterns that Jest uses to detect test files
+  // testRegex: [],
+
+  // This option allows the use of a custom results processor
+  // testResultsProcessor: undefined,
+
+  // This option allows use of a custom test runner
+  // testRunner: "jasmine2",
+
+  // This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
+  // testURL: "http://localhost",
+
+  // Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
+  // timers: "real",
+
+  // A map from regular expressions to paths to transformers
+  // transform: undefined,
+
+  // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
+  // transformIgnorePatterns: [
+  //   "/node_modules/"
+  // ],
+
+  // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
+  // unmockedModulePathPatterns: undefined,
+
+  // Indicates whether each individual test should be reported during the run
+  // verbose: undefined,
+
+  // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
+  // watchPathIgnorePatterns: [],
+
+  // Whether to use watchman for file crawling
+  // watchman: true,
+};

package/{build → lib}/CheckAccess.d.ts

@@ -6,3 +6,4 @@ export declare type CheckAccessProps = CheckAccessOptions & {
 };
 declare const CheckAccess: React.FC<CheckAccessProps>;
 export default CheckAccess;
+//# sourceMappingURL=CheckAccess.d.ts.map

package/lib/CheckAccess.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CheckAccess.d.ts","sourceRoot":"","sources":["../src/CheckAccess.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAInD,oBAAY,gBAAgB,GAAG,kBAAkB,GAAG;IAClD,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CAChC,CAAC;AAEF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAgB3C,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/{build → lib}/NoAccess.d.ts

@@ -1,3 +1,4 @@
 import React from "react";
 declare const NoAccess: React.FC;
 export default NoAccess;
+//# sourceMappingURL=NoAccess.d.ts.map

package/lib/NoAccess.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NoAccess.d.ts","sourceRoot":"","sources":["../src/NoAccess.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,QAAA,MAAM,QAAQ,EAAE,KAAK,CAAC,EAOrB,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/{build → lib}/RbacCheckAccess.d.ts

@@ -14,3 +14,4 @@ export default class RbacCheckAccess extends BaseCheckAccess {
     private getRbacRules;
     private getRbacAssignments;
 }
+//# sourceMappingURL=RbacCheckAccess.d.ts.map

package/lib/RbacCheckAccess.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RbacCheckAccess.d.ts","sourceRoot":"","sources":["../src/RbacCheckAccess.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,EACV,eAAe,EACf,sBAAsB,EAOtB,UAAU,EACX,MAAM,cAAc,CAAC;AAEtB,oBAAY,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;IAsB9B,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAQrF,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBlC,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,cAAc;IAsBtB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,kBAAkB;CAa3B"}

package/{build → lib}/RbacCheckAccess.js

@@ -65,7 +65,9 @@ class RbacCheckAccess extends rbac_1.BaseCheckAccess {
                         rules: {},
                     };
                 }
-                throw err;
+                else {
+                    throw err;
+                }
             }
             this.items = this.getRbacItems(_rbac);
             this.parents = this.getRbacParents(_rbac);
@@ -80,7 +82,6 @@ class RbacCheckAccess extends rbac_1.BaseCheckAccess {
             const ItemClass = item.type === rbac_1.ItemType.permission ? rbac_1.Permission : rbac_1.Role;
             prevValue.set(name, new ItemClass({
                 name,
-                type: item.type,
                 description: (_a = item.description) !== null && _a !== void 0 ? _a : null,
                 ruleName: (_b = item.ruleName) !== null && _b !== void 0 ? _b : null,
             }));
@@ -121,21 +122,10 @@ class RbacCheckAccess extends rbac_1.BaseCheckAccess {
             _assignments.forEach((itemName) => {
                 var _a;
                 if (prevValue.has(username)) {
-                    (_a = prevValue.get(username)) === null || _a === void 0 ? void 0 : _a.set(itemName, new rbac_1.Assignment({
-                        itemName,
-                        username,
-                    }));
+                    (_a = prevValue.get(username)) === null || _a === void 0 ? void 0 : _a.set(itemName, new rbac_1.Assignment(username, itemName));
                 }
                 else {
-                    prevValue.set(username, new Map([
-                        [
-                            itemName,
-                            new rbac_1.Assignment({
-                                itemName,
-                                username,
-                            }),
-                        ],
-                    ]));
+                    prevValue.set(username, new Map([[itemName, new rbac_1.Assignment(username, itemName)]]));
                 }
             });
             return prevValue;

package/{build → lib}/RbacContext.d.ts

@@ -22,4 +22,6 @@ export declare type RbacProviderProps = {
 };
 export declare const RbacProvider: React.FC<RbacProviderProps>;
 export declare const RbacConsumer: React.Consumer<RbacContextProps>;
+export declare const useRbac: () => RbacContextProps;
 export default RbacContext;
+//# sourceMappingURL=RbacContext.d.ts.map

package/lib/RbacContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RbacContext.d.ts","sourceRoot":"","sources":["../src/RbacContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAgE,MAAM,OAAO,CAAC;AAErF,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAG1D,oBAAY,kBAAkB,GAAG,MAAM,UAAU,CAAC;AAClD,oBAAY,aAAa,GAAG,MAAM,OAAO,CAAC;AAC1C,oBAAY,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,GAAG,kBAAkB,CAAC;IACzC,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC7B,WAAW,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChE,CAAC;AAEF,QAAA,MAAM,WAAW,iCAEf,CAAC;AAEH,oBAAY,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;CAC1C,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAkEpD,CAAC;AAEF,eAAO,MAAM,YAAY,kCAAuB,CAAC;AAEjD,eAAO,MAAM,OAAO,QAAO,gBAM1B,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/{build → lib}/RbacContext.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RbacConsumer = exports.RbacProvider = void 0;
+exports.useRbac = exports.RbacConsumer = exports.RbacProvider = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = __importStar(require("react"));
 const RbacCheckAccess_1 = __importDefault(require("./RbacCheckAccess"));
@@ -58,46 +58,39 @@ const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClas
             _rbac.load().then(() => setRbac(_rbac));
         }
     }, [rbacUrl, token]);
-    const value = (0, react_1.useMemo)(() => {
-        const checkAccess = ({ roles, allow = true, match, params = {} }) => __awaiter(void 0, void 0, void 0, function* () {
-            const matchRole = () => __awaiter(void 0, void 0, void 0, function* () {
-                if (!roles || roles.length === 0) {
-                    return true;
-                }
-                let _params = params;
-                if (typeof params === "function") {
-                    _params = params();
-                }
-                for (const role of roles) {
-                    if (role === "?") {
-                        if (isGuest) {
-                            return true;
-                        }
-                    }
-                    else if (role === "@") {
-                        if (!isGuest) {
-                            return true;
-                        }
-                    }
-                    else {
-                        if (yield (rbac === null || rbac === void 0 ? void 0 : rbac.checkAccess(username, role, _params))) {
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            });
-            const matchCustom = () => {
-                if (!match) {
-                    return true;
-                }
-                return match();
-            };
-            if (isSuperuser || ((yield matchRole()) && matchCustom() && allow)) {
+    const matchRole = (0, react_1.useCallback)((roles, params) => __awaiter(void 0, void 0, void 0, function* () {
+        if (!roles || roles.length === 0) {
+            return true;
+        }
+        for (const role of roles) {
+            if (role === "?" && isGuest) {
+                // only guest users
+                return true;
+            }
+            else if (role === "@" && !isGuest) {
+                // only authenticated users
+                return true;
+            }
+            else if (yield (rbac === null || rbac === void 0 ? void 0 : rbac.checkAccess(username, role, typeof params === "function" ? params() : params))) {
+                // only authenticated users that has permission
                 return true;
             }
-            return false;
-        });
+            else {
+                continue;
+            }
+        }
+        return false;
+    }), []);
+    const matchCustom = (0, react_1.useCallback)((match) => {
+        if (!match) {
+            return true;
+        }
+        return match();
+    }, []);
+    const checkAccess = (0, react_1.useCallback)(({ roles, allow = true, match, params = {} }) => __awaiter(void 0, void 0, void 0, function* () {
+        return isSuperuser || ((yield matchRole(roles, params)) && matchCustom(match) && allow);
+    }), []);
+    const value = (0, react_1.useMemo)(() => {
         return {
             checkAccess,
         };
@@ -106,4 +99,12 @@ const RbacProvider = ({ username, rbacUrl, token, isSuperuser, isGuest, ruleClas
 };
 exports.RbacProvider = RbacProvider;
 exports.RbacConsumer = RbacContext.Consumer;
+const useRbac = () => {
+    const ctx = (0, react_1.useContext)(RbacContext);
+    if (!ctx) {
+        throw new Error("useRbac must be rendered under RbacProvider");
+    }
+    return ctx;
+};
+exports.useRbac = useRbac;
 exports.default = RbacContext;

package/{build → lib}/index.d.ts

@@ -2,3 +2,4 @@ export { default as RbacContext, RbacConsumer, RbacProvider } from "./RbacContex
 export { default as CheckAccess, CheckAccessProps } from "./CheckAccess";
 export { default as NoAccess } from "./NoAccess";
 export { default as useCheckAccess } from "./useCheckAccess";
+//# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACnF,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC"}

package/{build → lib}/useCheckAccess.d.ts

@@ -5,3 +5,4 @@ export declare type CheckAssessState = {
 };
 declare function useCheckAccess({ roles, allow, params, match }: CheckAccessOptions): CheckAssessState;
 export default useCheckAccess;
+//# sourceMappingURL=useCheckAccess.d.ts.map

package/lib/useCheckAccess.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useCheckAccess.d.ts","sourceRoot":"","sources":["../src/useCheckAccess.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAW,MAAM,eAAe,CAAC;AAE5D,oBAAY,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,iBAAS,cAAc,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,kBAAkB,oBAyC1E;AAED,eAAe,cAAc,CAAC"}

package/{build → lib}/useCheckAccess.js

@@ -1,12 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = require("react");
-const RbacContext_1 = __importDefault(require("./RbacContext"));
+const RbacContext_1 = require("./RbacContext");
 function useCheckAccess({ roles, allow, params, match }) {
-    const rbac = (0, react_1.useContext)(RbacContext_1.default);
+    const rbac = (0, RbacContext_1.useRbac)();
     const [state, setState] = (0, react_1.useState)({
         checking: true,
         hasAccess: false,

package/package.json

@@ -1,31 +1,44 @@
 {
   "name": "@iushev/react-rbac",
-  "version": "1.0.17",
+  "version": "1.0.20",
   "private": false,
   "author": "Ivaylo Ushev",
   "description": "",
   "license": "ISC",
   "main": "./build",
   "scripts": {
-    "build": "tsc -p ./src",
-    "watch": "tsc -w -p ./src",
-    "test": "jest"
+    "build": "tsc",
+    "watch": "tsc -w --preserveWatchOutput",
+    "test": "jest --runInBand",
+    "test:watch": "jest ----watchAll --runInBand",
+    "coverage": "jest --coverage --runInBand",
+    "lint": "eslint --ext .js,.jsx,.ts,.tsx src",
+    "preversion": "rimraf ./lib && npm run build"
   },
-  "devDependencies": {
-    "typescript": "^4.6.2"
+  "dependencies": {
+    "http-status-codes": "^2.2.0"
   },
-  "peerDependencies": {
-    "@iushev/rbac": "^1.0.22",
+  "devDependencies": {
     "@types/react": "^16.14.5 || ^17.0.40",
     "@types/react-dom": "^17.0.13",
-    "axios": ">= 0.26.1",
+    "@typescript-eslint/eslint-plugin": "^5.21.0",
+    "@typescript-eslint/parser": "^5.21.0",
+    "eslint": "^8.14.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "jest": "^27.5.1",
+    "prettier": "^2.6.2",
+    "rimraf": "^3.0.2",
+    "ts-jest": "^27.1.4",
+    "typescript": "^4.6.3"
+  },
+  "peerDependencies": {
+    "@iushev/rbac": "^1.0.31",
+    "axios": "0.27.2",
     "react": "^16.14.0 || ^17.0.2",
     "react-dom": "^16.14.0 || ^17.0.2"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "dependencies": {
-    "http-status-codes": "^2.2.0"
   }
 }

package/src/RbacCheckAccess.ts

@@ -5,7 +5,7 @@ import {
   Assignment,
   BaseCheckAccess,
   BaseCheckAccessOptions,
-  Item,
+  IItem,
   ItemType,
   Permission,
   RBACResponse,
@@ -67,8 +67,9 @@ export default class RbacCheckAccess extends BaseCheckAccess {
           items: {},
           rules: {},
         };
+      } else {
+        throw err;
       }
-      throw err;
     }
 
     this.items = this.getRbacItems(_rbac);
@@ -78,14 +79,13 @@ export default class RbacCheckAccess extends BaseCheckAccess {
   }
 
   private getRbacItems({ items }: RBACResponse) {
-    return Object.keys(items).reduce<Map<string, Item>>((prevValue, name) => {
+    return Object.keys(items).reduce<Map<string, IItem>>((prevValue, name) => {
       const item = items[name];
       const ItemClass = item.type === ItemType.permission ? Permission : Role;
       prevValue.set(
         name,
         new ItemClass({
           name,
-          type: item.type,
           description: item.description ?? null,
           ruleName: item.ruleName ?? null,
         })
@@ -95,7 +95,7 @@ export default class RbacCheckAccess extends BaseCheckAccess {
   }
 
   private getRbacParents({ items }: RBACResponse) {
-    return Object.keys(items).reduce<Map<string, Map<string, Item>>>((prevValue, name) => {
+    return Object.keys(items).reduce<Map<string, Map<string, IItem>>>((prevValue, name) => {
       const item = items[name];
       if (!item.children || item.children.length === 0) {
         return prevValue;
@@ -131,26 +131,9 @@ export default class RbacCheckAccess extends BaseCheckAccess {
       const _assignments = assignments[username];
       _assignments.forEach((itemName) => {
         if (prevValue.has(username)) {
-          prevValue.get(username)?.set(
-            itemName,
-            new Assignment({
-              itemName,
-              username,
-            })
-          );
+          prevValue.get(username)?.set(itemName, new Assignment(username, itemName));
         } else {
-          prevValue.set(
-            username,
-            new Map([
-              [
-                itemName,
-                new Assignment({
-                  itemName,
-                  username,
-                }),
-              ],
-            ])
-          );
+          prevValue.set(username, new Map([[itemName, new Assignment(username, itemName)]]));
         }
       });
       return prevValue;

package/src/RbacContext.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useCallback, useContext, useEffect, useMemo, useState } from "react";
 
 import { RuleParams, Rule, RuleCtor } from "@iushev/rbac";
 import RbacCheckAccess from "./RbacCheckAccess";
@@ -54,51 +54,41 @@ export const RbacProvider: React.FC<RbacProviderProps> = ({
     }
   }, [rbacUrl, token]);
 
-  const value = useMemo(() => {
-    const checkAccess = async ({ roles, allow = true, match, params = {} }: CheckAccessOptions) => {
-      const matchRole = async () => {
-        if (!roles || roles.length === 0) {
-          return true;
-        }
-
-        let _params = params;
-        if (typeof params === "function") {
-          _params = params();
-        }
-
-        for (const role of roles) {
-          if (role === "?") {
-            if (isGuest) {
-              return true;
-            }
-          } else if (role === "@") {
-            if (!isGuest) {
-              return true;
-            }
-          } else {
-            if (await rbac?.checkAccess(username, role, _params)) {
-              return true;
-            }
-          }
-        }
-
-        return false;
-      };
-
-      const matchCustom = () => {
-        if (!match) {
-          return true;
-        }
-        return match();
-      };
-
-      if (isSuperuser || ((await matchRole()) && matchCustom() && allow)) {
+  const matchRole = useCallback(async (roles, params) => {
+    if (!roles || roles.length === 0) {
+      return true;
+    }
+
+    for (const role of roles) {
+      if (role === "?" && isGuest) {
+        // only guest users
+        return true;
+      } else if (role === "@" && !isGuest) {
+        // only authenticated users
         return true;
+      } else if (await rbac?.checkAccess(username, role, typeof params === "function" ? params() : params)) {
+        // only authenticated users that has permission
+        return true;
+      } else {
+        continue;
       }
+    }
 
-      return false;
-    };
+    return false;
+  }, []);
 
+  const matchCustom = useCallback((match) => {
+    if (!match) {
+      return true;
+    }
+    return match();
+  }, []);
+
+  const checkAccess = useCallback(async ({ roles, allow = true, match, params = {} }: CheckAccessOptions) => {
+    return isSuperuser || ((await matchRole(roles, params)) && matchCustom(match) && allow);
+  }, []);
+
+  const value = useMemo(() => {
     return {
       checkAccess,
     };
@@ -108,4 +98,13 @@ export const RbacProvider: React.FC<RbacProviderProps> = ({
 };
 
 export const RbacConsumer = RbacContext.Consumer;
+
+export const useRbac = (): RbacContextProps => {
+  const ctx = useContext(RbacContext);
+  if (!ctx) {
+    throw new Error("useRbac must be rendered under RbacProvider");
+  }
+  return ctx;
+};
+
 export default RbacContext;

package/src/useCheckAccess.ts

@@ -1,5 +1,5 @@
-import { useContext, useEffect, useRef, useState } from "react";
-import RbacContext, { CheckAccessOptions } from "./RbacContext";
+import { useEffect, useState } from "react";
+import { CheckAccessOptions, useRbac } from "./RbacContext";
 
 export type CheckAssessState = {
   checking: boolean;
@@ -7,7 +7,7 @@ export type CheckAssessState = {
 };
 
 function useCheckAccess({ roles, allow, params, match }: CheckAccessOptions) {
-  const rbac = useContext(RbacContext);
+  const rbac = useRbac();
 
   const [state, setState] = useState<CheckAssessState>({
     checking: true,

package/tsconfig.json

@@ -2,71 +2,102 @@
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
 
-    /* Basic Options */
-    // "incremental": true,                         /* Enable incremental compilation */
-    "target": "es6"                                 /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
-    "module": "commonjs"                            /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
-    // "lib": [],                                   /* Specify library files to be included in the compilation. */
-    // "allowJs": true,                             /* Allow javascript files to be compiled. */
-    // "checkJs": true,                             /* Report errors in .js files. */
-    "jsx": "react-jsx",                             /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
-    "declaration": true,                            /* Generates corresponding '.d.ts' file. */
-    // "declarationMap": true,                      /* Generates a sourcemap for each corresponding '.d.ts' file. */
-    // "sourceMap": true,                           /* Generates corresponding '.map' file. */
-    // "outFile": "./",                             /* Concatenate and emit output to single file. */
-    "outDir": "./build"                             /* Redirect output structure to the directory. */,
-    // "rootDir": "./src"                              /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
-    // "composite": true,                           /* Enable project compilation */
-    // "tsBuildInfoFile": "./",                     /* Specify file to store incremental compilation information */
-    // "removeComments": true,                      /* Do not emit comments to output. */
-    // "noEmit": true,                              /* Do not emit outputs. */
-    // "importHelpers": true,                       /* Import emit helpers from 'tslib'. */
-    // "downlevelIteration": true,                  /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-    // "isolatedModules": true,                     /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+    /* Projects */
+    // "incremental": true,                              /* Enable incremental compilation */
+    // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
+    // "tsBuildInfoFile": "./",                          /* Specify the folder for .tsbuildinfo incremental compilation files. */
+    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects */
+    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
+    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
-    /* Strict Type-Checking Options */
-    "strict": true                                  /* Enable all strict type-checking options. */,
-    // "noImplicitAny": true,                       /* Raise error on expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,                    /* Enable strict null checks. */
-    // "strictFunctionTypes": true,                 /* Enable strict checking of function types. */
-    // "strictBindCallApply": true,                 /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-    // "strictPropertyInitialization": true,        /* Enable strict checking of property initialization in classes. */
-    // "noImplicitThis": true,                      /* Raise error on 'this' expressions with an implied 'any' type. */
-    // "alwaysStrict": true,                        /* Parse in strict mode and emit "use strict" for each source file. */
+    /* Language and Environment */
+    "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    "jsx": "react-jsx" /* Specify what JSX code is generated. */,
+    // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
+    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
+    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */
+    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
+    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */
+    // "reactNamespace": "",                             /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */
+    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
+    // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
 
-    /* Additional Checks */
-    // "noUnusedLocals": true,                      /* Report errors on unused locals. */
-    // "noUnusedParameters": true,                  /* Report errors on unused parameters. */
-    // "noImplicitReturns": true,                   /* Report error when not all code paths in function return a value. */
-    // "noFallthroughCasesInSwitch": true,          /* Report errors for fallthrough cases in switch statement. */
-    // "noUncheckedIndexedAccess": true,            /* Include 'undefined' in index signature results */
-    // "noPropertyAccessFromIndexSignature": true,  /* Require undeclared properties from index signatures to use element accesses. */
+    /* Modules */
+    "module": "commonjs" /* Specify what module code is generated. */,
+    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
+    // "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
+    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
+    // "typeRoots": [],                                  /* Specify multiple folders that act like `./node_modules/@types`. */
+    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
+    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
+    // "resolveJsonModule": true,                        /* Enable importing .json files */
+    // "noResolve": true,                                /* Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project. */
 
-    /* Module Resolution Options */
-    "moduleResolution": "node"                      /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
-    "baseUrl": "./",                                /* Base directory to resolve non-absolute module names. */
-    // "paths": {},                                 /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-    // "rootDirs": [],                              /* List of root folders whose combined content represents the structure of the project at runtime. */
-    // "typeRoots": [],                             /* List of folders to include type definitions from. */
-    // "types": [],                                 /* Type declaration files to be included in compilation. */
-    // "allowSyntheticDefaultImports": true,        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true                         /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
-    // "preserveSymlinks": true,                    /* Do not resolve the real path of symlinks. */
-    // "allowUmdGlobalAccess": true,                /* Allow accessing UMD globals from modules. */
+    /* JavaScript Support */
+    // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
+    // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
+    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */
 
-    /* Source Map Options */
-    // "sourceRoot": "",                            /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-    // "mapRoot": "",                               /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,                     /* Emit a single file with source maps instead of having a separate file. */
-    // "inlineSources": true,                       /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+    /* Emit */
+    "declaration": true /* Generate .d.ts files from TypeScript and JavaScript files in your project. */,
+    "declarationMap": true /* Create sourcemaps for d.ts files. */,
+    // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
+    // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
+    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
+    "outDir": "./lib" /* Specify an output folder for all emitted files. */,
+    // "removeComments": true,                           /* Disable emitting comments. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
+    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
+    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
+    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
+    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
+    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
+    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
+    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
+    // "newLine": "crlf",                                /* Set the newline character for emitting files. */
+    // "stripInternal": true,                            /* Disable emitting declarations that have `@internal` in their JSDoc comments. */
+    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like `__extends` in compiled output. */
+    // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
+    // "preserveConstEnums": true,                       /* Disable erasing `const enum` declarations in generated code. */
+    // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
+    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
-    /* Experimental Options */
-    // "experimentalDecorators": true,              /* Enables experimental support for ES7 decorators. */
-    // "emitDecoratorMetadata": true,               /* Enables experimental support for emitting type metadata for decorators. */
+    /* Interop Constraints */
+    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
+    // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
+    "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
+    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
+    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
 
-    /* Advanced Options */
-    "skipLibCheck": true                            /* Skip type checking of declaration files. */,
-    "forceConsistentCasingInFileNames": true        /* Disallow inconsistently-cased references to the same file. */
+    /* Type Checking */
+    "strict": true /* Enable all strict type-checking options. */,
+    // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied `any` type.. */
+    // "strictNullChecks": true,                         /* When type checking, take into account `null` and `undefined`. */
+    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
+    // "strictBindCallApply": true,                      /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */
+    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
+    // "noImplicitThis": true,                           /* Enable error reporting when `this` is given the type `any`. */
+    // "useUnknownInCatchVariables": true,               /* Type catch clause variables as 'unknown' instead of 'any'. */
+    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
+    // "noUnusedLocals": true,                           /* Enable error reporting when a local variables aren't read. */
+    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read */
+    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
+    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
+    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
+    // "noUncheckedIndexedAccess": true,                 /* Include 'undefined' in index signature results */
+    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
+    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type */
+    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
+    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
+
+    /* Completeness */
+    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */
   },
-  "exclude": ["build", "node_modules"],
+  "include": ["src"],
+  "exclude": ["lib", "node_modules", "src/__tests__"]
 }

package/src/tsconfig.json

@@ -1,3 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-}