casbin 5.47.0 → 5.49.0

package/lib/esm/internalEnforcer.js

@@ -24,12 +24,13 @@ export class InternalEnforcer extends CoreEnforcer {
         if (this.model.hasPolicy(sec, ptype, rule)) {
             return false;
         }
+        // Persist when an adapter is configured and autoSave is enabled.
         if (this.adapter && this.autoSave) {
             try {
                 await this.adapter.addPolicy(sec, ptype, rule);
             }
             catch (e) {
-                if (e.message !== 'not implemented') {
+                if (e instanceof Error && e.message !== 'not implemented') {
                     throw e;
                 }
             }
@@ -59,13 +60,14 @@ export class InternalEnforcer extends CoreEnforcer {
                 return false;
             }
         }
-        if (this.autoSave) {
+        // Persist when an adapter is configured and autoSave is enabled.
+        if (this.adapter && this.autoSave) {
             if ('addPolicies' in this.adapter) {
                 try {
                     await this.adapter.addPolicies(sec, ptype, rules);
                 }
                 catch (e) {
-                    if (e.message !== 'not implemented') {
+                    if (e instanceof Error && e.message !== 'not implemented') {
                         throw e;
                     }
                 }
@@ -103,13 +105,14 @@ export class InternalEnforcer extends CoreEnforcer {
         if (newRules.length === 0) {
             return false;
         }
-        if (this.autoSave) {
+        // Persist when an adapter is configured and autoSave is enabled.
+        if (this.adapter && this.autoSave) {
             if ('addPolicies' in this.adapter) {
                 try {
                     await this.adapter.addPolicies(sec, ptype, newRules);
                 }
                 catch (e) {
-                    if (e.message !== 'not implemented') {
+                    if (e instanceof Error && e.message !== 'not implemented') {
                         throw e;
                     }
                 }
@@ -142,13 +145,14 @@ export class InternalEnforcer extends CoreEnforcer {
         if (!this.model.hasPolicy(sec, ptype, oldRule)) {
             return false;
         }
-        if (this.autoSave) {
+        // Persist when an adapter is configured and autoSave is enabled.
+        if (this.adapter && this.autoSave) {
             if ('updatePolicy' in this.adapter) {
                 try {
                     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;
                     }
                 }
@@ -180,12 +184,13 @@ export class InternalEnforcer extends CoreEnforcer {
         if (!this.model.hasPolicy(sec, ptype, rule)) {
             return false;
         }
+        // Persist when an adapter is configured and autoSave is enabled.
         if (this.adapter && this.autoSave) {
             try {
                 await this.adapter.removePolicy(sec, ptype, rule);
             }
             catch (e) {
-                if (e.message !== 'not implemented') {
+                if (e instanceof Error && e.message !== 'not implemented') {
                     throw e;
                 }
             }
@@ -214,13 +219,14 @@ export class InternalEnforcer extends CoreEnforcer {
                 return false;
             }
         }
-        if (this.autoSave) {
+        // Persist when an adapter is configured and autoSave is enabled.
+        if (this.adapter && this.autoSave) {
             if ('removePolicies' in this.adapter) {
                 try {
                     await this.adapter.removePolicies(sec, ptype, rules);
                 }
                 catch (e) {
-                    if (e.message !== 'not implemented') {
+                    if (e instanceof Error && e.message !== 'not implemented') {
                         throw e;
                     }
                 }
@@ -250,12 +256,13 @@ export class InternalEnforcer extends CoreEnforcer {
      * removeFilteredPolicyInternal removes rules based on field filters from the current policy.
      */
     async removeFilteredPolicyInternal(sec, ptype, fieldIndex, fieldValues, useWatcher) {
+        // Persist when an adapter is configured and autoSave is enabled.
         if (this.adapter && this.autoSave) {
             try {
                 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;
                 }
             }
@@ -291,4 +298,91 @@ export class InternalEnforcer extends CoreEnforcer {
         const assertion = (_a = this.model.model.get('p')) === null || _a === void 0 ? void 0 : _a.get(ptype);
         assertion === null || assertion === void 0 ? void 0 : assertion.fieldIndexMap.set(field, index);
     }
+    async addPolicyWithoutNotify(sec, ptype, rule) {
+        if (this.model.hasPolicy(sec, ptype, rule)) {
+            return false;
+        }
+        const ok = this.model.addPolicy(sec, ptype, rule);
+        if (sec === 'g' && ok) {
+            await this.buildIncrementalRoleLinks(PolicyOp.PolicyAdd, ptype, [rule]);
+        }
+        return ok;
+    }
+    async addPoliciesWithoutNotify(sec, ptype, rules) {
+        for (const rule of rules) {
+            if (this.model.hasPolicy(sec, ptype, rule)) {
+                return false;
+            }
+        }
+        const [ok, effects] = await this.model.addPolicies(sec, ptype, rules);
+        if (sec === 'g' && ok && (effects === null || effects === void 0 ? void 0 : effects.length)) {
+            await this.buildIncrementalRoleLinks(PolicyOp.PolicyAdd, ptype, effects);
+        }
+        return ok;
+    }
+    async addPoliciesWithoutNotifyEx(sec, ptype, rules) {
+        const newRules = rules.filter((rule) => !this.model.hasPolicy(sec, ptype, rule));
+        if (newRules.length === 0) {
+            return false;
+        }
+        const [ok, effects] = await this.model.addPolicies(sec, ptype, newRules);
+        if (sec === 'g' && ok && (effects === null || effects === void 0 ? void 0 : effects.length)) {
+            await this.buildIncrementalRoleLinks(PolicyOp.PolicyAdd, ptype, effects);
+        }
+        return ok;
+    }
+    async updatePolicyWithoutNotify(sec, ptype, oldRule, newRule) {
+        if (!this.model.hasPolicy(sec, ptype, oldRule)) {
+            return false;
+        }
+        const ok = this.model.updatePolicy(sec, ptype, oldRule, newRule);
+        if (sec === 'g' && ok) {
+            await this.buildIncrementalRoleLinks(PolicyOp.PolicyRemove, ptype, [oldRule]);
+            await this.buildIncrementalRoleLinks(PolicyOp.PolicyAdd, ptype, [newRule]);
+        }
+        return ok;
+    }
+    async removePolicyWithoutNotify(sec, ptype, rule) {
+        if (!this.model.hasPolicy(sec, ptype, rule)) {
+            return false;
+        }
+        const ok = await this.model.removePolicy(sec, ptype, rule);
+        if (sec === 'g' && ok) {
+            await this.buildIncrementalRoleLinks(PolicyOp.PolicyRemove, ptype, [rule]);
+        }
+        return ok;
+    }
+    async removePoliciesWithoutNotify(sec, ptype, rules) {
+        for (const rule of rules) {
+            if (!this.model.hasPolicy(sec, ptype, rule)) {
+                return false;
+            }
+        }
+        const [ok, effects] = this.model.removePolicies(sec, ptype, rules);
+        if (sec === 'g' && ok && (effects === null || effects === void 0 ? void 0 : effects.length)) {
+            await this.buildIncrementalRoleLinks(PolicyOp.PolicyRemove, ptype, effects);
+        }
+        return ok;
+    }
+    async removeFilteredPolicyWithoutNotify(sec, ptype, fieldIndex, fieldValues) {
+        const [ok, effects] = this.model.removeFilteredPolicy(sec, ptype, fieldIndex, ...fieldValues);
+        if (sec === 'g' && ok && (effects === null || effects === void 0 ? void 0 : effects.length)) {
+            await this.buildIncrementalRoleLinks(PolicyOp.PolicyRemove, ptype, effects);
+        }
+        return ok;
+    }
+    async updatePoliciesWithoutNotify(sec, ptype, oldRules, newRules) {
+        // Mirror the Go updatePoliciesWithoutNotify; reuse the existing internal flow.
+        // Because updatePoliciesInternal isn't implemented yet, fall back to per-item updates.
+        if (oldRules.length !== newRules.length) {
+            throw new Error('the length of oldRules should be equal to the length of newRules');
+        }
+        for (let i = 0; i < oldRules.length; i++) {
+            const ok = await this.updatePolicyWithoutNotify(sec, ptype, oldRules[i], newRules[i]);
+            if (!ok) {
+                return false;
+            }
+        }
+        return true;
+    }
 }

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/managementEnforcer.d.ts

@@ -429,9 +429,10 @@ export declare class ManagementEnforcer extends InternalEnforcer {
      */
     addFunction(name: string, func: MatchingFunction): Promise<void>;
     selfAddPolicy(sec: string, ptype: string, rule: string[]): Promise<boolean>;
+    selfAddPolicies(sec: string, ptype: string, rules: string[][]): Promise<boolean>;
     selfRemovePolicy(sec: string, ptype: string, rule: string[]): Promise<boolean>;
-    selfRemoveFilteredPolicy(sec: string, ptype: string, fieldIndex: number, fieldValues: string[]): Promise<boolean>;
+    selfRemovePolicies(sec: string, ptype: string, rules: string[][]): Promise<boolean>;
+    selfRemoveFilteredPolicy(sec: string, ptype: string, fieldIndex: number, ...fieldValues: string[]): Promise<boolean>;
     selfUpdatePolicy(sec: string, ptype: string, oldRule: string[], newRule: string[]): Promise<boolean>;
-    selfAddPolicies(sec: string, ptype: string, rule: string[][]): Promise<boolean>;
-    selfRemovePolicies(sec: string, ptype: string, rule: string[][]): Promise<boolean>;
+    selfUpdatePolicies(sec: string, ptype: string, oldRules: string[][], newRules: string[][]): Promise<boolean>;
 }

package/lib/esm/managementEnforcer.js

@@ -539,21 +539,24 @@ export class ManagementEnforcer extends InternalEnforcer {
         this.fm.addFunction(name, func);
     }
     async selfAddPolicy(sec, ptype, rule) {
-        return this.addPolicyInternal(sec, ptype, rule, false);
+        return this.addPolicyWithoutNotify(sec, ptype, rule);
+    }
+    async selfAddPolicies(sec, ptype, rules) {
+        return this.addPoliciesWithoutNotify(sec, ptype, rules);
     }
     async selfRemovePolicy(sec, ptype, rule) {
-        return this.removePolicyInternal(sec, ptype, rule, false);
+        return this.removePolicyWithoutNotify(sec, ptype, rule);
     }
-    async selfRemoveFilteredPolicy(sec, ptype, fieldIndex, fieldValues) {
-        return this.removeFilteredPolicyInternal(sec, ptype, fieldIndex, fieldValues, false);
+    async selfRemovePolicies(sec, ptype, rules) {
+        return this.removePoliciesWithoutNotify(sec, ptype, rules);
     }
-    async selfUpdatePolicy(sec, ptype, oldRule, newRule) {
-        return this.updatePolicyInternal(sec, ptype, oldRule, newRule, false);
+    async selfRemoveFilteredPolicy(sec, ptype, fieldIndex, ...fieldValues) {
+        return this.removeFilteredPolicyWithoutNotify(sec, ptype, fieldIndex, fieldValues);
     }
-    async selfAddPolicies(sec, ptype, rule) {
-        return this.addPoliciesInternal(sec, ptype, rule, false);
+    async selfUpdatePolicy(sec, ptype, oldRule, newRule) {
+        return this.updatePolicyWithoutNotify(sec, ptype, oldRule, newRule);
     }
-    async selfRemovePolicies(sec, ptype, rule) {
-        return this.removePoliciesInternal(sec, ptype, rule, false);
+    async selfUpdatePolicies(sec, ptype, oldRules, newRules) {
+        return this.updatePoliciesWithoutNotify(sec, ptype, oldRules, newRules);
     }
 }

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;
     /**

package/lib/esm/model/model.js

@@ -447,12 +447,12 @@ export 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) => {
@@ -478,9 +478,9 @@ export 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/esm/persist/adapter.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/persist/batchAdapter.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/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/esm/persist/filteredAdapter.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/persist/updatableAdapter.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/persist/watcher.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/persist/watcherEx.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/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/esm/rbac/roleManager.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/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/esm/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/esm/util/util.js

@@ -80,8 +80,8 @@ function readFile(path, encoding) {
     const fs = 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casbin",
-  "version": "5.47.0",
+  "version": "5.49.0",
   "description": "An authorization library that supports access control models like ACL, RBAC, ABAC in Node.JS",
   "main": "lib/cjs/index.js",
   "typings": "lib/cjs/index.d.ts",
@@ -44,14 +44,14 @@
     "semantic-release": "^17.4.4",
     "ts-jest": "^26.5.3",
     "tslint": "^5.11.0",
-    "typescript": "^3.7.2"
+    "typescript": "^4.9.5"
   },
   "dependencies": {
     "@casbin/expression-eval": "^5.3.0",
     "await-lock": "^2.0.1",
     "buffer": "^6.0.3",
     "csv-parse": "^5.5.6",
-    "minimatch": "^7.4.2"
+    "minimatch": "^10.2.1"
   },
   "files": [
     "lib",