fix: Added util functions and util tests.

divy9881 · divy9881 · commit 72918bc677e8 · 2020-05-06T12:20:17.000+05:30
Fix: Added util functions and util tests.

fix: Changed regex.

fix: tests.
diff --git a/src/util/util.ts b/src/util/util.ts
@@ -83,6 +83,29 @@ function writeFile(path: string, file: string, encoding?: string): any {
   });
 }
 
+const evalReg = new RegExp(/\beval\(([^),]*)\)/g);
+
+// hasEval determine whether matcher contains function eval
+function hasEval(s: string): boolean {
+  return evalReg.test(s);
+}
+
+// replaceEval replace function eval with the value of its parameters
+function replaceEval(s: string, rule: string): string {
+  return s.replace(evalReg, '(' + rule + ')');
+}
+
+// getEvalValue returns the parameters of function eval
+function getEvalValue(s: string): string[] {
+  const subMatch: any = s.match(evalReg);
+  const rules: string[] = [];
+  for (const rule of subMatch) {
+    const index: number = rule.search('(');
+    rules.push(rule.slice(index + 1, -1));
+  }
+  return rules;
+}
+
 export {
   escapeAssertion,
   removeComments,
@@ -93,5 +116,8 @@ export {
   paramsToString,
   setEquals,
   readFile,
-  writeFile
+  writeFile,
+  hasEval,
+  replaceEval,
+  getEvalValue
 };
diff --git a/test/util.test.ts b/test/util.test.ts
@@ -133,3 +133,23 @@ test('test globMatch', () => {
   expect(util.globMatch('/prefix/subprefix/foobar', '*/foo*')).toEqual(false);
   expect(util.globMatch('/prefix/subprefix/foobar', '*/foo/*')).toEqual(false);
 });
+
+test('test hasEval', () => {
+  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);
+  expect(util.hasEval('xeval() && a && b && c')).toEqual(false);
+  expect(util.hasEval('eval(c * (a + b)) && a && b && c')).toEqual(true);
+});
+
+test('test replaceEval', () => {
+  expect(util.replaceEval('eval() && a && b && c', 'a')).toEqual('(a) && a && b && c');
+  expect(util.replaceEval('eval() && a && b && c', '(a)')).toEqual('((a)) && a && b && c');
+});
+
+test('test getEvalValue', () => {
+  expect(util.getEvalValue('eval(a) && a && b && c')).isEqual(['a']);
+  expect(util.getEvalValue('a && eval(a) && b && c')).isEqual(['a']);
+  expect(util.getEvalValue('eval(a) && eval(b) && a && b && c')).isEqual(['a', 'b']);
+  expect(util.getEvalValue('a && eval(a) && eval(b) && b && c')).isEqual(['a', 'b']);
+});
