casbin 5.48.0 → 5.50.0

package/lib/cjs/model/functionMap.js

@@ -14,7 +14,11 @@
 // limitations under the License.
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -27,7 +31,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };

package/lib/cjs/model/index.js

@@ -14,13 +14,17 @@
 // limitations under the License.
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./assertion"), exports);

package/lib/cjs/model/model.js

@@ -14,7 +14,11 @@
 // limitations under the License.
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -27,7 +31,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };
@@ -169,10 +173,10 @@ class Model {
     }
     // printModel prints the model to the log.
     printModel() {
-        log_1.logPrint('Model:');
+        (0, log_1.logPrint)('Model:');
         this.model.forEach((value, key) => {
             value.forEach((ast, astKey) => {
-                log_1.logPrint(`${key}.${astKey}: ${ast.value}`);
+                (0, log_1.logPrint)(`${key}.${astKey}: ${ast.value}`);
             });
         });
     }
@@ -425,14 +429,14 @@ class Model {
     }
     // printPolicy prints the policy to log.
     printPolicy() {
-        if (!log_1.getLogger().isEnable()) {
+        if (!(0, log_1.getLogger)().isEnable()) {
             return;
         }
-        log_1.logPrint('Policy:');
+        (0, log_1.logPrint)('Policy:');
         this.model.forEach((map, key) => {
             if (key === 'p' || key === 'g') {
                 map.forEach((ast) => {
-                    log_1.logPrint(`key, : ${ast.value}, : , ${ast.policy}`);
+                    (0, log_1.logPrint)(`key, : ${ast.value}, : , ${ast.policy}`);
                 });
             }
         });
@@ -469,12 +473,12 @@ class Model {
      */
     sortPoliciesBySubjectHierarchy() {
         var _a, _b, _c;
-        if (((_b = (_a = this.model.get('e')) === null || _a === void 0 ? void 0 : _a.get('e')) === null || _b === void 0 ? void 0 : _b.value) !== "subjectPriority(p_eft) || deny" /* SUBJECT_PRIORITY */) {
+        if (((_b = (_a = this.model.get('e')) === null || _a === void 0 ? void 0 : _a.get('e')) === null || _b === void 0 ? void 0 : _b.value) !== "subjectPriority(p_eft) || deny" /* EffectExpress.SUBJECT_PRIORITY */) {
             return;
         }
         (_c = this.model.get('p')) === null || _c === void 0 ? void 0 : _c.forEach((assertion, ptype) => {
-            const domainIndex = this.getFieldIndex(ptype, "dom" /* Domain */);
-            const subIndex = this.getFieldIndex(ptype, "sub" /* Subject */);
+            const domainIndex = this.getFieldIndex(ptype, "dom" /* FieldIndex.Domain */);
+            const subIndex = this.getFieldIndex(ptype, "sub" /* FieldIndex.Subject */);
             // eslint-disable-next-line
             const subjectHierarchyMap = this.getSubjectHierarchyMap(this.model.get('g').get('g').policy);
             assertion.policy.sort((policyA, policyB) => {
@@ -500,9 +504,9 @@ class Model {
         let domain = defaultDomain;
         groupPolicies.forEach((policy) => {
             if (policy.length !== 2)
-                domain = policy[this.getFieldIndex('p', "dom" /* Domain */)];
-            const child = this.getNameWithDomain(domain, policy[this.getFieldIndex('p', "sub" /* Subject */)]);
-            const parent = this.getNameWithDomain(domain, policy[this.getFieldIndex('p', "obj" /* Object */)]);
+                domain = policy[this.getFieldIndex('p', "dom" /* FieldIndex.Domain */)];
+            const child = this.getNameWithDomain(domain, policy[this.getFieldIndex('p', "sub" /* FieldIndex.Subject */)]);
+            const parent = this.getNameWithDomain(domain, policy[this.getFieldIndex('p', "obj" /* FieldIndex.Object */)]);
             policyMap.set(child, parent);
             if (!subjectHierarchyMap.has(child)) {
                 subjectHierarchyMap.set(child, 0);

package/lib/cjs/persist/defaultFilteredAdapter.js

@@ -33,7 +33,7 @@ class DefaultFilteredAdapter extends fileAdapter_1.FileAdapter {
         this.filtered = true;
     }
     async loadFilteredPolicyFile(model, filter, handler) {
-        const bodyBuf = await util_1.readFile(this.filePath);
+        const bodyBuf = await (0, util_1.readFile)(this.filePath);
         const lines = bodyBuf.toString().split('\n');
         lines.forEach((n, index) => {
             const line = n;
@@ -50,8 +50,7 @@ class DefaultFilteredAdapter extends fileAdapter_1.FileAdapter {
         if (this.filtered) {
             throw new Error('cannot save a filtered policy');
         }
-        await super.savePolicy(model);
-        return true;
+        return super.savePolicy(model);
     }
     static filterLine(line, filter) {
         if (!filter) {

package/lib/cjs/persist/fileAdapter.js

@@ -27,7 +27,7 @@ class FileAdapter {
         await this.loadPolicyFile(model, helper_1.Helper.loadPolicyLine);
     }
     async loadPolicyFile(model, handler) {
-        const bodyBuf = await (this.fs ? this.fs : fileSystem_1.mustGetDefaultFileSystem()).readFileSync(this.filePath);
+        const bodyBuf = await (this.fs ? this.fs : (0, fileSystem_1.mustGetDefaultFileSystem)()).readFileSync(this.filePath);
         const lines = bodyBuf.toString().split('\n');
         lines.forEach((line) => {
             if (!line || line.trim().startsWith('#')) {
@@ -46,27 +46,25 @@ class FileAdapter {
         }
         let result = '';
         const pList = model.model.get('p');
-        if (!pList) {
-            return false;
-        }
-        pList.forEach((n) => {
-            n.policy.forEach((m) => {
-                result += n.key + ', ';
-                result += util_1.arrayToString(m);
-                result += '\n';
+        if (pList) {
+            pList.forEach((n) => {
+                n.policy.forEach((m) => {
+                    result += n.key + ', ';
+                    result += (0, util_1.arrayToString)(m);
+                    result += '\n';
+                });
             });
-        });
-        const gList = model.model.get('g');
-        if (!gList) {
-            return false;
         }
-        gList.forEach((n) => {
-            n.policy.forEach((m) => {
-                result += n.key + ', ';
-                result += util_1.arrayToString(m.map((element) => this.escapeCsv(element)));
-                result += '\n';
+        const gList = model.model.get('g');
+        if (gList) {
+            gList.forEach((n) => {
+                n.policy.forEach((m) => {
+                    result += n.key + ', ';
+                    result += (0, util_1.arrayToString)(m.map((element) => this.escapeCsv(element)));
+                    result += '\n';
+                });
             });
-        });
+        }
         await this.savePolicyFile(result.trim());
         return true;
     }
@@ -78,7 +76,7 @@ class FileAdapter {
         return value;
     }
     async savePolicyFile(text) {
-        (this.fs ? this.fs : fileSystem_1.mustGetDefaultFileSystem()).writeFileSync(this.filePath, text);
+        (this.fs ? this.fs : (0, fileSystem_1.mustGetDefaultFileSystem)()).writeFileSync(this.filePath, text);
     }
     /**
      * addPolicy adds a policy rule to the storage.

package/lib/cjs/persist/fileSystem.d.ts

@@ -3,6 +3,6 @@ export interface FileSystem {
     readFileSync(path: string, encoding?: string): Buffer | string;
     writeFileSync(path: string, text: string, encoding?: string): void;
 }
-export declare const setDefaultFileSystem: (fs?: FileSystem | undefined) => void;
+export declare const setDefaultFileSystem: (fs?: FileSystem) => void;
 export declare const getDefaultFileSystem: () => FileSystem | undefined;
 export declare const mustGetDefaultFileSystem: () => FileSystem;

package/lib/cjs/persist/fileSystem.js

@@ -3,13 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mustGetDefaultFileSystem = exports.getDefaultFileSystem = exports.setDefaultFileSystem = void 0;
 let defaultFileSystem = undefined;
 const ErrorNoFileSystem = new Error('please set the default FileSystem by call the setDefaultFileSystem');
-exports.setDefaultFileSystem = (fs) => {
+const setDefaultFileSystem = (fs) => {
     defaultFileSystem = fs;
 };
-exports.getDefaultFileSystem = () => defaultFileSystem;
-exports.mustGetDefaultFileSystem = () => {
+exports.setDefaultFileSystem = setDefaultFileSystem;
+const getDefaultFileSystem = () => defaultFileSystem;
+exports.getDefaultFileSystem = getDefaultFileSystem;
+const mustGetDefaultFileSystem = () => {
     if (defaultFileSystem) {
         return defaultFileSystem;
     }
     throw ErrorNoFileSystem;
 };
+exports.mustGetDefaultFileSystem = mustGetDefaultFileSystem;

package/lib/cjs/persist/helper.js

@@ -7,7 +7,7 @@ class BasicCsvParser {
         if (!line || line.trimStart().charAt(0) === '#') {
             return null;
         }
-        return sync_1.parse(line, {
+        return (0, sync_1.parse)(line, {
             delimiter: ',',
             skip_empty_lines: true,
             trim: true,

package/lib/cjs/persist/index.js

@@ -1,13 +1,17 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./adapter"), exports);

package/lib/cjs/rbac/defaultRoleManager.d.ts

@@ -1,5 +1,5 @@
 import { RoleManager } from './roleManager';
-export declare type MatchingFunc = (arg1: string, arg2: string) => boolean;
+export type MatchingFunc = (arg1: string, arg2: string) => boolean;
 export declare class DefaultRoleManager implements RoleManager {
     private allDomains;
     private maxHierarchyLevel;

package/lib/cjs/rbac/defaultRoleManager.js

@@ -289,9 +289,9 @@ class DefaultRoleManager {
      * printRoles prints all the roles to log.
      */
     async printRoles() {
-        if (log_1.getLogger().isEnable()) {
+        if ((0, log_1.getLogger)().isEnable()) {
             [...this.allDomains.values()].forEach((n) => {
-                log_1.logPrint(n.toString());
+                (0, log_1.logPrint)(n.toString());
             });
         }
     }

package/lib/cjs/rbac/index.js

@@ -14,13 +14,17 @@
 // limitations under the License.
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./defaultRoleManager"), exports);

package/lib/cjs/syncedEnforcer.js

@@ -488,6 +488,6 @@ class SyncedEnforcer extends enforcer_1.Enforcer {
 exports.SyncedEnforcer = SyncedEnforcer;
 // newSyncedEnforcer creates a synchronized enforcer via file or DB.
 async function newSyncedEnforcer(...params) {
-    return enforcer_1.newEnforcerWithClass(SyncedEnforcer, ...params);
+    return (0, enforcer_1.newEnforcerWithClass)(SyncedEnforcer, ...params);
 }
 exports.newSyncedEnforcer = newSyncedEnforcer;

package/lib/cjs/util/builtinOperators.js

@@ -284,7 +284,7 @@ function globMatch(string, pattern) {
     if (pattern[0] === '*' && pattern[1] === '/') {
         pattern = pattern.substring(1);
     }
-    return minimatch_1.minimatch(string, pattern);
+    return (0, minimatch_1.minimatch)(string, pattern);
 }
 exports.globMatch = globMatch;
 // generateGFunction is the factory method of the g(_, _) function.

package/lib/cjs/util/index.js

@@ -14,13 +14,17 @@
 // limitations under the License.
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./builtinOperators"), exports);

package/lib/cjs/util/ip.d.ts

@@ -1,10 +1,10 @@
 import { Buffer } from 'buffer/';
 export declare const ip: {
-    toBuffer: (ip: string, buff?: Buffer | undefined, offset?: number | undefined) => Buffer;
-    toString: (buff: Buffer, offset?: number | undefined, length?: number | undefined) => string;
+    toBuffer: (ip: string, buff?: Buffer, offset?: number) => Buffer;
+    toString: (buff: Buffer, offset?: number, length?: number) => string;
     isV4Format: (ip: string) => boolean;
     isV6Format: (ip: string) => boolean;
-    fromPrefixLen: (prefixlen: number, family?: string | undefined) => string;
+    fromPrefixLen: (prefixlen: number, family?: string) => string;
     mask: (addr: string, mask: string) => string;
     subnet: (addr: string, mask: string) => any;
     cidrSubnet: (cidrString: string) => any;

package/lib/cjs/util/ip.js

@@ -29,7 +29,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ip = void 0;
 const buffer_1 = require("buffer/");
-const ipv4Regex = /^(\d{1,3}\.){3,3}\d{1,3}$/;
+const ipv4Regex = /^(25[0-5]|2[0-4]\d|1\d\d|\d?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|\d?\d)){3}$/;
 const ipv6Regex = /^(::)?(((\d{1,3}\.){3}(\d{1,3}){1})?([0-9a-f]){0,4}:{0,2}){1,8}(::)?$/i;
 exports.ip = {
     toBuffer: function (ip, buff, offset) {
@@ -125,15 +125,13 @@ exports.ip = {
         return ipv4Regex.test(ip);
     },
     isV6Format: function (ip) {
-        return ipv6Regex.test(ip);
+        return ip.includes(':') && ipv6Regex.test(ip);
     },
     fromPrefixLen: function (prefixlen, family) {
+        family = _normalizeFamily(typeof family === 'string' ? family : 'ipv4');
         if (prefixlen > 32) {
             family = 'ipv6';
         }
-        else {
-            family = _normalizeFamily(typeof family === 'string' ? family : '');
-        }
         let len = 4;
         if (family === 'ipv6') {
             len = 16;
@@ -185,7 +183,7 @@ exports.ip = {
         return exports.ip.toString(result);
     },
     subnet: function (addr, mask) {
-        const networkAddress = exports.ip.toLong(exports.ip.mask(addr, mask));
+        const networkBuffer = exports.ip.toBuffer(exports.ip.mask(addr, mask));
         // Calculate the mask's length.
         const maskBuffer = exports.ip.toBuffer(mask);
         let maskLength = 0;
@@ -203,7 +201,20 @@ exports.ip = {
         }
         return {
             contains: function (other) {
-                return networkAddress === exports.ip.toLong(exports.ip.mask(other, mask));
+                let otherBuffer;
+                try {
+                    otherBuffer = exports.ip.toBuffer(exports.ip.mask(other, mask));
+                }
+                catch (_a) {
+                    return false;
+                }
+                if (networkBuffer.length !== otherBuffer.length)
+                    return false;
+                for (let i = 0; i < networkBuffer.length; i++) {
+                    if (networkBuffer[i] !== otherBuffer[i])
+                        return false;
+                }
+                return true;
             },
         };
     },
@@ -212,7 +223,8 @@ exports.ip = {
         const addr = cidrParts[0];
         if (cidrParts.length !== 2)
             throw new Error('invalid CIDR subnet: ' + addr);
-        const mask = exports.ip.fromPrefixLen(parseInt(cidrParts[1], 10));
+        const family = exports.ip.isV6Format(addr) ? 'ipv6' : 'ipv4';
+        const mask = exports.ip.fromPrefixLen(parseInt(cidrParts[1], 10), family);
         return exports.ip.subnet(addr, mask);
     },
     isEqual: function (a, b) {

package/lib/cjs/util/util.d.ts

@@ -6,8 +6,8 @@ declare function arrayRemoveDuplicates(s: string[]): string[];
 declare function arrayToString(a: string[]): string;
 declare function paramsToString(...v: string[]): string;
 declare function setEquals(a: string[], b: string[]): boolean;
-declare function readFile(path: string, encoding?: string): any;
-declare function writeFile(path: string, file: string, encoding?: string): any;
+declare function readFile(path: string, encoding?: string): Promise<string>;
+declare function writeFile(path: string, file: string, encoding?: string): Promise<void>;
 declare function hasEval(s: string): boolean;
 declare function replaceEval(s: string, ruleName: string, rule: string): string;
 declare function getEvalValue(s: string): string[];

package/lib/cjs/util/util.js

@@ -88,11 +88,11 @@ function setEquals(a, b) {
 exports.setEquals = setEquals;
 // readFile return a promise for readFile.
 function readFile(path, encoding) {
-    const fs = persist_1.mustGetDefaultFileSystem();
+    const fs = (0, persist_1.mustGetDefaultFileSystem)();
     return new Promise((resolve, reject) => {
         try {
-            fs.readFileSync(path, encoding || 'utf8');
-            resolve();
+            const content = fs.readFileSync(path, encoding || 'utf8');
+            resolve(content);
         }
         catch (e) {
             reject(e);
@@ -102,7 +102,7 @@ function readFile(path, encoding) {
 exports.readFile = readFile;
 // writeFile return a promise for writeFile.
 function writeFile(path, file, encoding) {
-    const fs = persist_1.mustGetDefaultFileSystem();
+    const fs = (0, persist_1.mustGetDefaultFileSystem)();
     return new Promise((resolve, reject) => {
         try {
             fs.writeFileSync(path, file, encoding || 'utf-8');

package/lib/esm/constants.js

@@ -11,3 +11,4 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+export {};

package/lib/esm/effect/defaultEffectorStream.js

@@ -27,14 +27,14 @@ export class DefaultEffectorStream {
     }
     pushEffect(eft) {
         switch (this.expr) {
-            case "some(where (p_eft == allow))" /* ALLOW */:
+            case "some(where (p_eft == allow))" /* EffectExpress.ALLOW */:
                 if (eft === Effect.Allow) {
                     this.res = true;
                     this.done = true;
                     this.rec = true;
                 }
                 break;
-            case "!some(where (p_eft == deny))" /* DENY */:
+            case "!some(where (p_eft == deny))" /* EffectExpress.DENY */:
                 this.res = true;
                 if (eft === Effect.Deny) {
                     this.res = false;
@@ -42,7 +42,7 @@ export class DefaultEffectorStream {
                     this.rec = true;
                 }
                 break;
-            case "some(where (p_eft == allow)) && !some(where (p_eft == deny))" /* ALLOW_AND_DENY */:
+            case "some(where (p_eft == allow)) && !some(where (p_eft == deny))" /* EffectExpress.ALLOW_AND_DENY */:
                 if (eft === Effect.Allow) {
                     this.res = true;
                     this.rec = true;
@@ -56,8 +56,8 @@ export class DefaultEffectorStream {
                     this.rec = false;
                 }
                 break;
-            case "priority(p_eft) || deny" /* PRIORITY */:
-            case "subjectPriority(p_eft) || deny" /* SUBJECT_PRIORITY */:
+            case "priority(p_eft) || deny" /* EffectExpress.PRIORITY */:
+            case "subjectPriority(p_eft) || deny" /* EffectExpress.SUBJECT_PRIORITY */:
                 if (eft !== Effect.Indeterminate) {
                     this.res = eft === Effect.Allow;
                     this.done = true;

package/lib/esm/effect/effectorStream.js

@@ -11,3 +11,4 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+export {};

package/lib/esm/enforcer.js

@@ -178,7 +178,7 @@ export class Enforcer extends ManagementEnforcer {
             throw new Error('user must not be empty');
         }
         if (domain === undefined) {
-            const subIndex = this.getFieldIndex('p', "sub" /* Subject */);
+            const subIndex = this.getFieldIndex('p', "sub" /* FieldIndex.Subject */);
             return this.removeFilteredGroupingPolicy(subIndex, user);
         }
         else {
@@ -196,7 +196,7 @@ export class Enforcer extends ManagementEnforcer {
         if (!user) {
             throw new Error('user must not be empty');
         }
-        const subIndex = this.getFieldIndex('p', "sub" /* Subject */);
+        const subIndex = this.getFieldIndex('p', "sub" /* FieldIndex.Subject */);
         const res1 = await this.removeFilteredGroupingPolicy(subIndex, user);
         const res2 = await this.removeFilteredPolicy(subIndex, user);
         return res1 || res2;
@@ -212,7 +212,7 @@ export class Enforcer extends ManagementEnforcer {
         if (!role) {
             throw new Error('role must not be empty');
         }
-        const subIndex = this.getFieldIndex('p', "sub" /* Subject */);
+        const subIndex = this.getFieldIndex('p', "sub" /* FieldIndex.Subject */);
         const res1 = await this.removeFilteredGroupingPolicy(subIndex, role);
         const res2 = await this.removeFilteredPolicy(subIndex, role);
         return res1 || res2;
@@ -268,7 +268,7 @@ export class Enforcer extends ManagementEnforcer {
         if (!user) {
             throw new Error('user must not be empty');
         }
-        const subIndex = this.getFieldIndex('p', "sub" /* Subject */);
+        const subIndex = this.getFieldIndex('p', "sub" /* FieldIndex.Subject */);
         return this.removeFilteredPolicy(subIndex, user);
     }
     /**
@@ -278,7 +278,7 @@ export class Enforcer extends ManagementEnforcer {
      * @return the permissions, a permission is usually like (obj, act). It is actually the rule without the subject.
      */
     async getPermissionsForUser(user) {
-        const subIndex = this.getFieldIndex('p', "sub" /* Subject */);
+        const subIndex = this.getFieldIndex('p', "sub" /* FieldIndex.Subject */);
         return this.getFilteredPolicy(subIndex, user);
     }
     /**

package/lib/esm/internalEnforcer.js

@@ -30,7 +30,7 @@ export class InternalEnforcer extends CoreEnforcer {
                 await this.adapter.addPolicy(sec, ptype, rule);
             }
             catch (e) {
-                if (e.message !== 'not implemented') {
+                if (e instanceof Error && e.message !== 'not implemented') {
                     throw e;
                 }
             }
@@ -67,7 +67,7 @@ export class InternalEnforcer extends CoreEnforcer {
                     await this.adapter.addPolicies(sec, ptype, rules);
                 }
                 catch (e) {
-                    if (e.message !== 'not implemented') {
+                    if (e instanceof Error && e.message !== 'not implemented') {
                         throw e;
                     }
                 }
@@ -112,7 +112,7 @@ export class InternalEnforcer extends CoreEnforcer {
                     await this.adapter.addPolicies(sec, ptype, newRules);
                 }
                 catch (e) {
-                    if (e.message !== 'not implemented') {
+                    if (e instanceof Error && e.message !== 'not implemented') {
                         throw e;
                     }
                 }
@@ -152,7 +152,7 @@ export class InternalEnforcer extends CoreEnforcer {
                     await this.adapter.updatePolicy(sec, ptype, oldRule, newRule);
                 }
                 catch (e) {
-                    if (e.message !== 'not implemented') {
+                    if (e instanceof Error && e.message !== 'not implemented') {
                         throw e;
                     }
                 }
@@ -190,7 +190,7 @@ export class InternalEnforcer extends CoreEnforcer {
                 await this.adapter.removePolicy(sec, ptype, rule);
             }
             catch (e) {
-                if (e.message !== 'not implemented') {
+                if (e instanceof Error && e.message !== 'not implemented') {
                     throw e;
                 }
             }
@@ -226,7 +226,7 @@ export class InternalEnforcer extends CoreEnforcer {
                     await this.adapter.removePolicies(sec, ptype, rules);
                 }
                 catch (e) {
-                    if (e.message !== 'not implemented') {
+                    if (e instanceof Error && e.message !== 'not implemented') {
                         throw e;
                     }
                 }
@@ -262,7 +262,7 @@ export class InternalEnforcer extends CoreEnforcer {
                 await this.adapter.removeFilteredPolicy(sec, ptype, fieldIndex, ...fieldValues);
             }
             catch (e) {
-                if (e.message !== 'not implemented') {
+                if (e instanceof Error && e.message !== 'not implemented') {
                     throw e;
                 }
             }

package/lib/esm/log/logger.js

@@ -11,3 +11,4 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+export {};

package/lib/esm/model/functionMap.d.ts

@@ -1,4 +1,4 @@
-export declare type MatchingFunction = (...arg: any[]) => boolean | number | string | Promise<boolean> | Promise<number> | Promise<string>;
+export type MatchingFunction = (...arg: any[]) => boolean | number | string | Promise<boolean> | Promise<number> | Promise<string>;
 export declare class FunctionMap {
     private functions;
     /**