fix stringfy (thomaspoignant#92)

* add two test cases

* fix stringfy

* optimize stringfy

* add same test cases to parse

Author: shaneshen-okta

src/stringify.ts

@@ -1,6 +1,6 @@
 import { Filter } from ".";
 
-export function stringify(f: Filter, trimParens = true): string {
+export function stringify(f: Filter, wrapOr = false): string {
   let returnValue = '';
   switch (f.op) {
     case "eq":
@@ -18,21 +18,19 @@ export function stringify(f: Filter, trimParens = true): string {
       returnValue = `${f.attrPath} ${f.op}`;
       break;
     case "or":
-      const filtersAsString = f.filters.map(filter => stringify(filter, false)).join(` ${f.op} `);
-      returnValue = `(${filtersAsString})`;
+      const filtersAsString = f.filters.map(filter => stringify(filter)).join(` ${f.op} `);
+      returnValue = wrapOr ? `(${filtersAsString})` : filtersAsString;
       break;
     case "and":
-      returnValue = f.filters.map(filter => stringify(filter, false)).join(` ${f.op} `);
+      returnValue = f.filters.map(filter => stringify(filter, true)).join(` ${f.op} `);
       break;
     case "not":
-      returnValue = `${f.op} (${stringify(f.filter, true)})`;
+      returnValue = `${f.op} (${stringify(f.filter)})`;
       break;
     case "[]":
       returnValue = `${f.attrPath}[${stringify(f.valFilter)}]`;
       break;
   }
-  if (trimParens) {
-    returnValue = returnValue.replace(/(^\()(.*)(\)$)/, '$2');
-  }
+
   return returnValue;
 }

test/parse.test.ts

@@ -158,25 +158,10 @@ describe('parse', () => {
         op("ne", "userType", "Employee")
       )
     );
-  test(
-    `userType eq "Employee" and not (emails co "example.com" or emails co "example.org") and userType ne "Employee"`,
-    and(
-      op("eq", "userType", "Employee"),
-      {
-        op: "not",
-        filter: or(
-          op("co", "emails", "example.com"),
-          op("co", "emails", "example.org")
-        )
-      },
-      op("ne", "userType", "Employee")
-    )
-  );
-  test(
-    `userType eq "Employee" or not (emails co "example.com" or emails co "example.org") and userType ne "Employee"`,
-    or(
-      op("eq", "userType", "Employee"),
+    test(
+      `userType eq "Employee" and not (emails co "example.com" or emails co "example.org") and userType ne "Employee"`,
       and(
+        op("eq", "userType", "Employee"),
         {
           op: "not",
           filter: or(
@@ -186,8 +171,56 @@ describe('parse', () => {
         },
         op("ne", "userType", "Employee")
       )
-    )
-  );
+    );
+    test(
+      `userType eq "Employee" or not (emails co "example.com" or emails co "example.org") and userType ne "Employee"`,
+      or(
+        op("eq", "userType", "Employee"),
+        and(
+          {
+            op: "not",
+            filter: or(
+              op("co", "emails", "example.com"),
+              op("co", "emails", "example.org")
+            )
+          },
+          op("ne", "userType", "Employee")
+        )
+      )
+    );
+    test(
+      `(userType eq "Employee" or userType eq "Employer") and emails sw "foo" and not (emails co "example.com" or emails co "example.org")`,
+      and(
+        or(
+          op("eq", "userType", "Employee"),
+          op("eq", "userType", "Employer"),
+        ),
+        op("sw", "emails", "foo"),
+        {
+          op: "not",
+          filter: or(
+            op("co", "emails", "example.com"),
+            op("co", "emails", "example.org")
+          )
+        },
+      )
+    );
+    test(
+      `userType eq "Employee" and (emails sw "foo" or not (emails co "example.com" or emails co "example.org"))`,
+      and(
+        op("eq", "userType", "Employee"),
+        or(
+          op("sw", "emails", "foo"),
+          {
+            op: "not",
+            filter: or(
+              op("co", "emails", "example.com"),
+              op("co", "emails", "example.org")
+            )
+          },
+        ),
+      )
+    );
     test(
       `userType eq "Employee" and (emails.type eq "work")`,
       and(eq("userType", "Employee"), eq("emails.type", "work"))

test/stringify.test.ts

@@ -219,5 +219,38 @@ describe('stringify', () => {
         )
       )
     );
+    test(
+      `(userType eq "Employee" or userType eq "Employer") and emails sw "foo" and not (emails co "example.com" or emails co "example.org")`,
+      and(
+        or(
+          op("eq", "userType", "Employee"),
+          op("eq", "userType", "Employer"),
+        ),
+        op("sw", "emails", "foo"),
+        {
+          op: "not",
+          filter: or(
+            op("co", "emails", "example.com"),
+            op("co", "emails", "example.org")
+          )
+        },
+      )
+    );
+    test(
+      `userType eq "Employee" and (emails sw "foo" or not (emails co "example.com" or emails co "example.org"))`,
+      and(
+        op("eq", "userType", "Employee"),
+        or(
+          op("sw", "emails", "foo"),
+          {
+            op: "not",
+            filter: or(
+              op("co", "emails", "example.com"),
+              op("co", "emails", "example.org")
+            )
+          },
+        ),
+      )
+    );
   });
 });