fix: formula parse for formula begins with ( (#226)

* fix: formula parse brackets

* chore: reduce API changes

* Rerun tests

Author: yhx-12243

packages/core/src/Formula.ts

@@ -180,28 +180,18 @@ export function evaluate<T, V extends boolean | null = boolean>(
 }
 
 export function parse(q?: string): Formula<string, null> | undefined {
-  if (!q) {
-    return
-  }
-
-  let parsed
   try {
-    // eslint-disable-next-line
-    parsed = _parse(q)
-  } catch {
-    if (q && q.startsWith('(')) {
-      return
-    } else {
-      return parse('(' + q + ')')
+    if (q) {
+      // eslint-disable-next-line
+      return fromJSON(_parse(`(${q})`) as Serialized)
     }
-  }
-
-  return fromJSON(parsed as any)
+  } catch {}
 }
 
 type Serialized<X = never> =
   | { and: Serialized[] }
   | { or: Serialized[] }
+  | { inner: Serialized }
   | { property: string; value: boolean | X }
   | Record<string, boolean | X>
 
@@ -210,6 +200,8 @@ export function fromJSON(json: Serialized): Formula<string, null> {
     return and<string, null>(...json.and.map(fromJSON))
   } else if ('or' in json && typeof json.or === 'object') {
     return or<string, null>(...json.or.map(fromJSON))
+  } else if ('inner' in json && typeof json.inner === 'object') {
+    return fromJSON(json.inner)
   } else if ('property' in json && typeof json.property === 'string') {
     return atom<string, null>(json.property, json.value)
   }

packages/core/src/Formula/Grammar.pegjs

@@ -1,4 +1,4 @@
-Formula "formula" = And / Or / Atom
+Formula "formula" = And / Or / Wrapped / Atom
 
 _ "whitespace" = [ \t\n\r]*
 
@@ -10,6 +10,10 @@ Or = _ "(" _ head:Formula tail:(_ Disjunction _ Formula)+ _ ")" _ {
   return { or: [head].concat(tail.map((item: unknown[]) => item[3])) }
 }
 
+Wrapped = _ "(" _ inner:Formula _ ")" _ {
+  return { inner }
+}
+
 Atom = mod:Modifier? _ prop:Property {
   let value;
   if (mod === '?') {

packages/core/test/Formula.test.ts

@@ -190,6 +190,12 @@ describe('parsing', () => {
     expect(parse()).toBeUndefined()
     expect(parse('')).toBeUndefined()
   })
+
+  it('resolves #226', () => {
+    expect(parse('(T1 | T2) & T3')).toEqual(
+      and(or(atom('T1'), atom('T2')), atom('T3')),
+    )
+  })
 })
 
 describe('serialization', () => {