feat: add policyArrayToString and policyStringToArray to util

nodece · Zxilly · commit e71b40fc1917 · 2021-08-07T17:52:28.000+08:00
Signed-off-by: Zixuan Liu &lt;nodeces@gmail.com&gt;
diff --git a/src/persist/helper.ts b/src/persist/helper.ts
@@ -1,24 +1,13 @@
 import { Model } from '../model';
+import { policyStringToArray } from '../util';
 
 export class Helper {
   public static loadPolicyLine(line: string, model: Model): void {
     if (!line || line.trimStart().charAt(0) === '#') {
       return;
     }
 
-    let tokens: any = undefined;
-
-    try {
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const parse = require('csv-parse/lib/sync');
-      tokens = parse(line, {
-        delimiter: ',',
-        skip_empty_lines: true,
-        trim: true,
-      });
-    } catch {
-      throw new Error('Please add csv-parse to your dependency.');
-    }
+    const tokens = policyStringToArray(line);
 
     if (!tokens || !tokens[0]) {
       return;
diff --git a/src/util/util.ts b/src/util/util.ts
@@ -14,6 +14,9 @@
 
 // escapeAssertion escapes the dots in the assertion,
 // because the expression evaluation doesn't support such variable names.
+
+import parse from 'csv-parse/lib/sync';
+
 function escapeAssertion(s: string): string {
   s = s.replace(/r\./g, 'r_');
   s = s.replace(/p\./g, 'p_');
@@ -144,6 +147,22 @@ function deepCopy(obj: Array<any> | any): any {
   return newObj;
 }
 
+function policyArrayToString(policy: string[]): string {
+  return policy
+    .map((n) => {
+      return `"${(n === null ? '' : n.toString()).replace(/"/g, '""')}"`;
+    })
+    .join(',');
+}
+
+function policyStringToArray(policy: string): string[][] {
+  return parse(policy, {
+    delimiter: ',',
+    skip_empty_lines: true,
+    trim: true,
+  });
+}
+
 export {
   escapeAssertion,
   removeComments,
@@ -159,4 +178,6 @@ export {
   generatorRunSync,
   generatorRunAsync,
   deepCopy,
+  policyArrayToString,
+  policyStringToArray,
 };
diff --git a/test/util.test.ts b/test/util.test.ts
@@ -155,3 +155,18 @@ test('test getEvalValue', () => {
   expect(util.arrayEquals(util.getEvalValue('eval(a) && eval(b) && a && b && c'), ['a', 'b']));
   expect(util.arrayEquals(util.getEvalValue('a && eval(a) && eval(b) && b && c'), ['a', 'b']));
 });
+
+test('test policyStringToArray', () => {
+  expect(util.policyStringToArray('p,alice,data1,read')).toEqual([['p', 'alice', 'data1', 'read']]);
+  expect(util.policyStringToArray(`"p","alice","data1","read"`)).toEqual([['p', 'alice', 'data1', 'read']]);
+  expect(util.policyStringToArray(`"p"," alice","data1 ","read"`)).toEqual([['p', ' alice', 'data1 ', 'read']]);
+  expect(util.policyStringToArray(`p,alice,data1,read\np,bob,data1,write`)).toEqual([
+    ['p', 'alice', 'data1', 'read'],
+    ['p', 'bob', 'data1', 'write'],
+  ]);
+});
+
+test('test policyArrayToString', () => {
+  expect(util.policyArrayToString(['p', 'alice', 'data1', 'read'])).toEqual(`"p","alice","data1","read"`);
+  expect(util.policyArrayToString(['p', 'alice ', ' data1', 'read'])).toEqual(`"p","alice "," data1","read"`);
+});
diff --git a/tsconfig.json b/tsconfig.json
@@ -7,7 +7,8 @@
     "strictPropertyInitialization": false,
     "declaration": true,
     "downlevelIteration": true,
-    "allowSyntheticDefaultImports": true
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true
   },
   "include": ["src/**/*", "test/utils.ts"]
 }
