fix: created two regex expressions

casbin · Feb 22, 2022 · de5f2f4 · de5f2f4
1 parent 86e2add
commit de5f2f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/util/util.ts b/src/util/util.ts
@@ -104,13 +104,12 @@ function writeFile(path: string, file: string, encoding?: string): any {
   });
 }
 
-const evalReg = new RegExp(/\beval\(([^),]*)\)/g);
+const evalRegG = new RegExp(/\beval\(([^),]*)\)/g);
+const evalReg = new RegExp(/\beval\(([^),]*)\)/);
 
 // hasEval determine whether matcher contains function eval
 function hasEval(s: string): boolean {
-  const res: boolean = evalReg.test(s);
-  evalReg.lastIndex = 0;
-  return res;
+  return evalReg.test(s);
 }
 
 // replaceEval replace function eval with the value of its parameters
@@ -120,7 +119,7 @@ function replaceEval(s: string, ruleName: string, rule: string): string {
 
 // getEvalValue returns the parameters of function eval
 function getEvalValue(s: string): string[] {
-  const subMatch = s.match(evalReg);
+  const subMatch = s.match(evalRegG);
   const rules: string[] = [];
   if (!subMatch) {
     return [];

diff --git a/test/util.test.ts b/test/util.test.ts
@@ -150,6 +150,7 @@ test('test globMatch', () => {
 });
 
 test('test hasEval', () => {
+  expect(util.hasEval('eval() && a && b && c')).toEqual(true);
   expect(util.hasEval('eval() && a && b && c')).toEqual(true);
   expect(util.hasEval('eval) && a && b && c')).toEqual(false);
   expect(util.hasEval('eval)( && a && b && c')).toEqual(false);