casbin 5.24.3 → 5.25.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [5.25.0](https://github.com/casbin/node-casbin/compare/v5.24.4...v5.25.0) (2023-03-20)
+
+
+### Features
+
+* replace picomatch with minimatch ([#440](https://github.com/casbin/node-casbin/issues/440)) ([4e977b3](https://github.com/casbin/node-casbin/commit/4e977b33fdece9b8934693d05a1da9a7f10cfa05))
+
+## [5.24.4](https://github.com/casbin/node-casbin/compare/v5.24.3...v5.24.4) (2023-03-12)
+
+
+### Bug Fixes
+
+* **./src/util/util.ts:** fixed unwanted replacement of .r in evals according to issue [#438](https://github.com/casbin/node-casbin/issues/438) ([#439](https://github.com/casbin/node-casbin/issues/439)) ([39878be](https://github.com/casbin/node-casbin/commit/39878be7e22ff9f18c0898c5828328bc1cc95aba))
+
 ## [5.24.3](https://github.com/casbin/node-casbin/compare/v5.24.2...v5.24.3) (2023-02-27)
 
 

package/README.md

@@ -22,7 +22,7 @@
 
 ![casbin Logo](casbin-logo.png)
 
-`node-casbin` is a powerful and efficient open-source access control library for Node.JS projects. It provides support for enforcing authorization based on various [access control models](https:/.wikipedia.org/wiki/Computer_security_model).
+`node-casbin` is a powerful and efficient open-source access control library for Node.JS projects. It provides support for enforcing authorization based on various [access control models](https://wikipedia.org/wiki/Computer_security_model).
 
 ## All the languages supported by Casbin:
 

package/lib/cjs/util/builtinOperators.js

@@ -15,7 +15,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.globMatch = exports.keyMatch5Func = exports.keyMatch4Func = exports.generateGFunction = exports.generateSyncedGFunction = exports.ipMatchFunc = exports.regexMatchFunc = exports.keyMatch3Func = exports.keyGet2Func = exports.keyMatch2Func = exports.keyGetFunc = exports.keyMatchFunc = void 0;
 const ip_1 = require("./ip");
-const picomatch_1 = require("picomatch");
+const minimatch_1 = require("minimatch");
 // regexMatch determines whether key1 matches the pattern of key2 in regular expression.
 function regexMatch(key1, key2) {
     return new RegExp(key2).test(key1);
@@ -271,7 +271,12 @@ exports.ipMatchFunc = ipMatchFunc;
  * ```
  */
 function globMatch(string, pattern) {
-    return picomatch_1.isMatch(string, pattern);
+    // The minimatch doesn't support the pattern starts with *
+    // See https://github.com/isaacs/minimatch/issues/195
+    if (pattern[0] === '*' && pattern[1] === '/') {
+        pattern = pattern.substring(1);
+    }
+    return minimatch_1.minimatch(string, pattern);
 }
 exports.globMatch = globMatch;
 // generateGFunction is the factory method of the g(_, _) function.

package/lib/cjs/util/util.js

@@ -18,8 +18,8 @@ exports.bracketCompatible = exports.customIn = exports.deepCopy = exports.genera
 // because the expression evaluation doesn't support such variable names.
 const persist_1 = require("../persist");
 function escapeAssertion(s) {
-    s = s.replace(/r\./g, 'r_');
-    s = s.replace(/p\./g, 'p_');
+    s = s.replace(/(?<!\w)r\./g, 'r_');
+    s = s.replace(/(?<!\w)p\./g, 'p_');
     return s;
 }
 exports.escapeAssertion = escapeAssertion;

package/lib/esm/util/builtinOperators.js

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { ip } from './ip';
-import { isMatch } from 'picomatch';
+import { minimatch } from 'minimatch';
 // regexMatch determines whether key1 matches the pattern of key2 in regular expression.
 function regexMatch(key1, key2) {
     return new RegExp(key2).test(key1);
@@ -259,7 +259,12 @@ function ipMatchFunc(...args) {
  * ```
  */
 function globMatch(string, pattern) {
-    return isMatch(string, pattern);
+    // The minimatch doesn't support the pattern starts with *
+    // See https://github.com/isaacs/minimatch/issues/195
+    if (pattern[0] === '*' && pattern[1] === '/') {
+        pattern = pattern.substring(1);
+    }
+    return minimatch(string, pattern);
 }
 // generateGFunction is the factory method of the g(_, _) function.
 function generateGFunction(rm) {

package/lib/esm/util/util.js

@@ -15,8 +15,8 @@
 // because the expression evaluation doesn't support such variable names.
 import { mustGetDefaultFileSystem } from '../persist';
 function escapeAssertion(s) {
-    s = s.replace(/r\./g, 'r_');
-    s = s.replace(/p\./g, 'p_');
+    s = s.replace(/(?<!\w)r\./g, 'r_');
+    s = s.replace(/(?<!\w)p\./g, 'p_');
     return s;
 }
 // removeComments removes the comments starting with # in the text.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "casbin",
-  "version": "5.24.3",
+  "version": "5.25.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",
@@ -53,7 +53,7 @@
     "buffer": "^6.0.3",
     "csv-parse": "^5.3.5",
     "expression-eval": "^5.0.0",
-    "picomatch": "^2.2.3"
+    "minimatch": "^7.4.2"
   },
   "files": [
     "lib",