@dbml/parse 3.4.1 → 3.4.3

package/dist/dbml-parse.mjs

@@ -94,7 +94,7 @@ class x {
     }, this.fullEnd = NaN), this.start = this.startPos.offset, this.end = this.endPos.offset;
   }
 }
-var de = /* @__PURE__ */ ((t) => (t.PROGRAM = "<program>", t.ELEMENT_DECLARATION = "<element-declaration>", t.ATTRIBUTE = "<attribute>", t.IDENTIFIER_STREAM = "<identifer-stream>", t.LITERAL = "<literal>", t.VARIABLE = "<variable>", t.PREFIX_EXPRESSION = "<prefix-expression>", t.INFIX_EXPRESSION = "<infix-expression>", t.POSTFIX_EXPRESSION = "<postfix-expression>", t.FUNCTION_EXPRESSION = "<function-expression>", t.FUNCTION_APPLICATION = "<function-application>", t.BLOCK_EXPRESSION = "<block-expression>", t.LIST_EXPRESSION = "<list-expression>", t.TUPLE_EXPRESSION = "<tuple-expression>", t.CALL_EXPRESSION = "<call-expression>", t.PRIMARY_EXPRESSION = "<primary-expression>", t.GROUP_EXPRESSION = "<group-expression>", t.DUMMY = "<dummy>", t.ARRAY = "<array>", t))(de || {});
+var Ee = /* @__PURE__ */ ((t) => (t.PROGRAM = "<program>", t.ELEMENT_DECLARATION = "<element-declaration>", t.ATTRIBUTE = "<attribute>", t.IDENTIFIER_STREAM = "<identifer-stream>", t.LITERAL = "<literal>", t.VARIABLE = "<variable>", t.PREFIX_EXPRESSION = "<prefix-expression>", t.INFIX_EXPRESSION = "<infix-expression>", t.POSTFIX_EXPRESSION = "<postfix-expression>", t.FUNCTION_EXPRESSION = "<function-expression>", t.FUNCTION_APPLICATION = "<function-application>", t.BLOCK_EXPRESSION = "<block-expression>", t.LIST_EXPRESSION = "<list-expression>", t.TUPLE_EXPRESSION = "<tuple-expression>", t.CALL_EXPRESSION = "<call-expression>", t.PRIMARY_EXPRESSION = "<primary-expression>", t.GROUP_EXPRESSION = "<group-expression>", t.DUMMY = "<dummy>", t.ARRAY = "<array>", t))(Ee || {});
 class G extends x {
   constructor({ body: e = [], eof: n }, s) {
     super(s, "<program>", [...e, n]), this.body = e, this.eof = n;
@@ -118,7 +118,7 @@ class A extends x {
       r,
       a,
       c
-    ]), c && a && !(c instanceof w || c instanceof A))
+    ]), c && a && !(c instanceof y || c instanceof A))
       throw new Error("If an element has a simple body, it must be a function application node");
     this.type = e, this.name = n, this.as = s, this.alias = i, this.attributeList = r, this.bodyColon = a, this.body = c;
   }
@@ -137,12 +137,12 @@ class se extends x {
     super(i, "<attribute>", [e, n, s]), this.name = e, this.value = s, this.colon = n;
   }
 }
-class q extends x {
+class Q extends x {
   constructor({ op: e, expression: n }, s) {
     super(s, "<prefix-expression>", [e, n]), this.op = e, this.expression = n;
   }
 }
-class H extends x {
+class q extends x {
   constructor({
     op: e,
     leftExpression: n,
@@ -161,7 +161,7 @@ class te extends x {
     super(n, "<function-expression>", [e]), this.value = e;
   }
 }
-class w extends x {
+class y extends x {
   constructor({ callee: e, args: n = [] }, s) {
     super(s, "<function-application>", [e, ...n]), this.callee = e, this.args = n;
   }
@@ -175,7 +175,7 @@ class ne extends x {
     super(i, "<block-expression>", [e, ...n, s]), this.blockOpenBrace = e, this.body = n, this.blockCloseBrace = s;
   }
 }
-class P extends x {
+class D extends x {
   constructor({
     listOpenBracket: e,
     elementList: n = [],
@@ -189,7 +189,7 @@ class P extends x {
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
 }
-class Z extends x {
+class J extends x {
   constructor({
     tupleOpenParen: e,
     elementList: n = [],
@@ -203,7 +203,7 @@ class Z extends x {
     ]), this.tupleOpenParen = e, this.elementList = n, this.commaList = s, this.tupleCloseParen = i;
   }
 }
-class je extends Z {
+class je extends J {
   constructor({
     groupOpenParen: e,
     expression: n,
@@ -220,7 +220,7 @@ class je extends Z {
     ), this.kind = "<group-expression>";
   }
 }
-class J extends x {
+class H extends x {
   constructor({
     callee: e,
     argumentList: n
@@ -228,17 +228,17 @@ class J extends x {
     super(s, "<call-expression>", [e, n]), this.callee = e, this.argumentList = n;
   }
 }
-class Te extends x {
+class be extends x {
   constructor({ literal: e }, n) {
     super(n, "<literal>", [e]), this.literal = e;
   }
 }
-class W extends x {
+class Z extends x {
   constructor({ variable: e }, n) {
     super(n, "<variable>", [e]), this.variable = e;
   }
 }
-class D extends x {
+class U extends x {
   constructor({ expression: e }, n) {
     super(n, "<primary-expression>", [e]), this.expression = e;
   }
@@ -249,7 +249,7 @@ class ke extends x {
     super(n, "<dummy>", [s]);
   }
 }
-class le extends x {
+class ue extends x {
   constructor({ expression: e, indexer: n }, s) {
     super(s, "<array>", [e, n]), this.array = e, this.indexer = n;
   }
@@ -312,7 +312,7 @@ class S {
     return !0;
   }
 }
-class v {
+class w {
   // eslint-disable-next-line class-methods-use-this
   unwrap() {
     throw new Error("Trying to unwrap a None value");
@@ -323,11 +323,11 @@ class v {
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
   and_then(e) {
-    return new v();
+    return new w();
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
   map(e) {
-    return new v();
+    return new w();
   }
   // eslint-disable-next-line class-methods-use-this
   isOk() {
@@ -384,7 +384,7 @@ function ie(t) {
   return Object.values(m).includes(e) ? new S({
     name: n,
     kind: e
-  }) : new v();
+  }) : new w();
 }
 function Qt(t) {
   const e = ie(t).unwrap_or(void 0);
@@ -415,7 +415,7 @@ function Ht(t) {
   const [e] = t;
   return Oe(e) || Ue(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
-function pe(t) {
+function de(t) {
   return Ue(t) || Oe(t);
 }
 function ct(t, e) {
@@ -498,12 +498,12 @@ class B {
   }
 }
 function sn(t, e, n) {
-  if (!t || !Ne(t) || e.length === 0)
-    return new v();
+  if (!t || !me(t) || e.length === 0)
+    return new w();
   const s = [...e], i = Ge(t).unwrap(), r = s.pop();
   if (!(r instanceof ne))
-    return new v();
-  const a = I.last(s) instanceof P ? s.pop() : void 0;
+    return new w();
+  const a = I.last(s) instanceof D ? s.pop() : void 0;
   return s.length === 3 && Ge(s[1]).unwrap().value === "as" ? new S(
     n.create(A, {
       type: i,
@@ -526,7 +526,7 @@ function sn(t, e, n) {
       attributeList: a,
       body: r
     })
-  ) : new v();
+  ) : new w();
 }
 function lt(t) {
   return t.kind === u.IDENTIFIER && t.value === "as";
@@ -544,29 +544,29 @@ function an(t) {
     t.identifiers.forEach(E);
   else if (t instanceof se)
     E(t.name), E(t.colon), E(t.value);
-  else if (t instanceof q)
+  else if (t instanceof Q)
     E(t.op), E(t.expression);
-  else if (t instanceof H)
+  else if (t instanceof q)
     E(t.leftExpression), E(t.op), E(t.rightExpression);
   else if (t instanceof Pe)
     E(t.op), E(t.expression);
   else if (t instanceof ne)
     E(t.blockOpenBrace), t.body.forEach(E), E(t.blockCloseBrace);
-  else if (t instanceof P)
+  else if (t instanceof D)
     E(t.listOpenBracket), t.commaList.forEach(E), t.elementList.forEach(E), E(t.listCloseBracket);
-  else if (t instanceof Z)
-    E(t.tupleOpenParen), t.commaList.forEach(E), t.elementList.forEach(E), E(t.tupleCloseParen);
   else if (t instanceof J)
+    E(t.tupleOpenParen), t.commaList.forEach(E), t.elementList.forEach(E), E(t.tupleCloseParen);
+  else if (t instanceof H)
     E(t.callee), E(t.argumentList);
-  else if (t instanceof w)
+  else if (t instanceof y)
     E(t.callee), t.args.forEach(E);
-  else if (t instanceof D)
+  else if (t instanceof U)
     E(t.expression);
   else if (t instanceof te)
     E(t.value);
-  else if (t instanceof W)
+  else if (t instanceof Z)
     E(t.variable);
-  else if (t instanceof Te)
+  else if (t instanceof be)
     E(t.literal);
   else
     throw t instanceof je ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
@@ -574,14 +574,14 @@ function an(t) {
 function vt(t) {
   return !!(t != null && t.isInvalid);
 }
-function U(...t) {
+function P(...t) {
   return t.filter((e) => e !== void 0);
 }
 function on(t) {
   if (t instanceof G)
-    return U(...t.body, t.eof);
+    return P(...t.body, t.eof);
   if (t instanceof A)
-    return U(
+    return P(
       t.type,
       t.name,
       t.as,
@@ -591,71 +591,71 @@ function on(t) {
       t.body
     );
   if (t instanceof se)
-    return U(t.name, t.colon, t.value);
+    return P(t.name, t.colon, t.value);
   if (t instanceof $)
     return t.identifiers;
-  if (t instanceof Te)
+  if (t instanceof be)
     return t.literal ? [t.literal] : [];
-  if (t instanceof W)
-    return U(t.variable);
+  if (t instanceof Z)
+    return P(t.variable);
+  if (t instanceof Q)
+    return P(t.op, t.expression);
   if (t instanceof q)
-    return U(t.op, t.expression);
-  if (t instanceof H)
-    return U(t.leftExpression, t.op, t.rightExpression);
+    return P(t.leftExpression, t.op, t.rightExpression);
   if (t instanceof Pe)
-    return U(t.expression, t.op);
+    return P(t.expression, t.op);
   if (t instanceof te)
-    return U(t.value);
-  if (t instanceof w)
-    return U(t.callee, ...t.args);
+    return P(t.value);
+  if (t instanceof y)
+    return P(t.callee, ...t.args);
   if (t instanceof ne)
-    return U(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
-  if (t instanceof P)
-    return U(
+    return P(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
+  if (t instanceof D)
+    return P(
       t.listOpenBracket,
       ...ct(t.elementList, t.commaList),
       t.listCloseBracket
     );
-  if (t instanceof Z)
-    return U(
+  if (t instanceof J)
+    return P(
       t.tupleOpenParen,
       ...ct(t.elementList, t.commaList),
       t.tupleCloseParen
     );
-  if (t instanceof J)
-    return U(t.callee, t.argumentList);
-  if (t instanceof D)
-    return U(t.expression);
-  if (t instanceof le)
-    return U(
+  if (t instanceof H)
+    return P(t.callee, t.argumentList);
+  if (t instanceof U)
+    return P(t.expression);
+  if (t instanceof ue)
+    return P(
       t.array,
       t.indexer
     );
   throw t instanceof je ? new Error("This case is already handled by TupleExpressionNode") : new Error("Unreachable - no other possible cases");
 }
 function Ge(t) {
-  return M(t) ? new S(t.expression.variable) : new v();
+  return M(t) ? new S(t.expression.variable) : new w();
 }
-function Y(t) {
+function W(t) {
   var e;
-  return t instanceof D && (t.expression instanceof W && t.expression.variable instanceof F && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof Te && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
+  return t instanceof U && (t.expression instanceof Z && t.expression.variable instanceof F && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof be && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
 }
 function M(t) {
-  return t instanceof D && t.expression instanceof W && t.expression.variable instanceof F;
+  return t instanceof U && t.expression instanceof Z && t.expression.variable instanceof F;
 }
-function Ne(t) {
+function me(t) {
   var e;
-  return t instanceof D && t.expression instanceof W && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
+  return t instanceof U && t.expression instanceof Z && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
 }
 function Je(t) {
   var e;
-  return t instanceof H && t.leftExpression instanceof x && t.rightExpression instanceof x && ((e = t.op) == null ? void 0 : e.value) === ".";
+  return t instanceof q && t.leftExpression instanceof x && t.rightExpression instanceof x && ((e = t.op) == null ? void 0 : e.value) === ".";
 }
-function me(t) {
+function Te(t) {
   if (t === void 0)
-    return new v();
+    return new w();
   const e = t.identifiers.map((n) => n.value).join(" ");
-  return e === "" ? new v() : new S(e);
+  return e === "" ? new w() : new S(e);
 }
 class cn {
   // list of errors during lexing
@@ -890,7 +890,7 @@ class cn {
     });
   }
   identifier() {
-    for (; !this.isAtEnd() && pe(this.peek()); )
+    for (; !this.isAtEnd() && de(this.peek()); )
       this.advance();
     this.addToken(u.IDENTIFIER);
   }
@@ -910,26 +910,26 @@ class cn {
         break;
       if (!n && this.current.offset === this.text.length - 1)
         return this.advance(), this.addToken(u.NUMERIC_LITERAL);
-      if (!n && !pe(this.peek()))
+      if (!n && !de(this.peek()))
         return this.addToken(u.NUMERIC_LITERAL);
       if (!n && !Oe(this.peek()))
         break;
       this.advance();
     }
     if (e > 0) {
-      for (; !this.isAtEnd() && (this.check(".") || pe(this.peek())); )
+      for (; !this.isAtEnd() && (this.check(".") || de(this.peek())); )
         this.advance();
       const n = this.createToken(u.NUMERIC_LITERAL, !0);
       this.tokens.push(n), this.errors.push(new l(o.UNKNOWN_TOKEN, "Invalid number", n));
     } else {
-      for (; !this.isAtEnd() && pe(this.peek()); )
+      for (; !this.isAtEnd() && de(this.peek()); )
         this.advance();
       const n = this.createToken(u.IDENTIFIER, !1);
       this.tokens.push(n);
     }
   }
   colorLiteral() {
-    for (; !this.isAtEnd() && pe(this.peek()); )
+    for (; !this.isAtEnd() && de(this.peek()); )
       this.advance();
     this.addToken(u.COLOR_LITERAL);
   }
@@ -970,7 +970,7 @@ class cn {
       case "u": {
         let n = "";
         for (let s = 0; s <= 3; s += 1) {
-          if (this.isAtEnd() || !pe(this.peek()))
+          if (this.isAtEnd() || !de(this.peek()))
             return this.errors.push(new l(o.INVALID_ESCAPE_SEQUENCE, `Invalid unicode escape sequence '\\u${n}', only unicode escape sequences of the form '\\uHHHH' where H is a hexadecimal number are allowed`, F.create(u.STRING_LITERAL, e, this.current, `\\u${n}`, !0))), `\\u${n}`;
           n += this.advance();
         }
@@ -1124,7 +1124,7 @@ class hn {
         groupOpenParen: s.tupleOpenParen,
         groupCloseParen: s.tupleCloseParen,
         expression: s.elementList[0]
-      }), r = () => this.nodeFactory.create(Z, s);
+      }), r = () => this.nodeFactory.create(J, s);
       try {
         this.consume("Expect an opening parenthesis '('", u.LPAREN), s.tupleOpenParen = this.previous();
       } catch (a) {
@@ -1172,7 +1172,7 @@ class hn {
         E(s), this.advance();
       }
     }, this.listExpression = this.contextStack.withContextDo(xe.ListExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(P, s);
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(D, s);
       try {
         this.consume("Expect an opening bracket '['", u.LBRACKET), s.listOpenBracket = this.previous();
       } catch (r) {
@@ -1389,7 +1389,7 @@ class hn {
   /* Parsing any ExpressionNode, including non-NormalExpression */
   expression() {
     const e = { args: [] }, n = () => sn(e.callee, e.args, this.nodeFactory).unwrap_or(
-      this.nodeFactory.create(w, e)
+      this.nodeFactory.create(y, e)
     );
     try {
       e.callee = this.normalExpression();
@@ -1432,12 +1432,12 @@ class hn {
         ot(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
           break;
         try {
-          n = this.nodeFactory.create(J, {
+          n = this.nodeFactory.create(H, {
             callee: n,
             argumentList: this.tupleExpression()
           });
         } catch (r) {
-          throw r instanceof d ? (n = this.nodeFactory.create(J, {
+          throw r instanceof d ? (n = this.nodeFactory.create(H, {
             callee: n,
             argumentList: r.partialNode
           }), new d(r.token, n, r.handlerContext)) : r;
@@ -1446,12 +1446,12 @@ class hn {
         if (Ce(this.previous()))
           break;
         try {
-          n = this.nodeFactory.create(le, {
+          n = this.nodeFactory.create(ue, {
             expression: n,
             indexer: this.listExpression()
           });
         } catch (i) {
-          throw i instanceof d ? (n = this.nodeFactory.create(le, {
+          throw i instanceof d ? (n = this.nodeFactory.create(ue, {
             expression: n,
             indexer: i.partialNode
           }), new d(i.token, n, i.handlerContext)) : i;
@@ -1471,13 +1471,13 @@ class hn {
             break;
           this.advance();
           try {
-            n = this.nodeFactory.create(H, {
+            n = this.nodeFactory.create(q, {
               leftExpression: n,
               op: i,
               rightExpression: i.value === "." ? this.extractOperand() : this.expression_bp(a.right)
             });
           } catch (c) {
-            throw c instanceof d ? (n = this.nodeFactory.create(H, {
+            throw c instanceof d ? (n = this.nodeFactory.create(q, {
               leftExpression: n,
               op: i,
               rightExpression: c.partialNode
@@ -1511,11 +1511,11 @@ class hn {
       } catch (i) {
         throw i instanceof d ? (n.expression = i.partialNode, new d(
           i.token,
-          this.nodeFactory.create(q, n),
+          this.nodeFactory.create(Q, n),
           i.handlerContext
         )) : i;
       }
-      e = this.nodeFactory.create(q, n);
+      e = this.nodeFactory.create(Q, n);
     } else if (e = this.extractOperand(), e instanceof ke)
       throw new d(
         this.peek(),
@@ -1569,18 +1569,16 @@ class hn {
       u.STRING_LITERAL,
       u.NUMERIC_LITERAL
     ))
-      return this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create(Te, { literal: this.previous() })
+      return this.nodeFactory.create(U, {
+        expression: this.nodeFactory.create(be, { literal: this.previous() })
       });
     if (this.match(u.QUOTED_STRING, u.IDENTIFIER))
-      return this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create(W, { variable: this.previous() })
+      return this.nodeFactory.create(U, {
+        expression: this.nodeFactory.create(Z, { variable: this.previous() })
       });
     throw this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect a variable or literal"), new d(
       this.peek(),
-      this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create(W, {})
-      }),
+      void 0,
       this.contextStack.findHandlerContext(this.tokens, this.current)
     );
   }
@@ -1690,36 +1688,36 @@ function ve(t) {
     case b.TableGroup:
       return new S(e);
     default:
-      return new v();
+      return new w();
   }
 }
-function he(t) {
+function fe(t) {
   if (!Je(t))
     return new S([t]);
-  const e = he(t.leftExpression).unwrap_or(void 0);
-  return e ? (e.push(t.rightExpression), new S(e)) : new v();
+  const e = fe(t.leftExpression).unwrap_or(void 0);
+  return e ? (e.push(t.rightExpression), new S(e)) : new w();
 }
 function C(t) {
   if (t === void 0)
-    return new v();
-  const e = he(t).unwrap_or(void 0);
+    return new w();
+  const e = fe(t).unwrap_or(void 0);
   if (!e)
-    return new v();
+    return new w();
   const n = [];
   for (const s of e) {
     const i = X(s).unwrap_or(void 0);
     if (!i)
-      return new v();
+      return new w();
     n.push(i);
   }
   return new S(n);
 }
 function _e(t) {
   if (t === void 0)
-    return new v();
-  const e = he(t).unwrap_or(void 0);
+    return new w();
+  const e = fe(t).unwrap_or(void 0);
   if (!e || e.length === 0)
-    return new v();
+    return new w();
   const n = [];
   let s;
   if (!M(I.last(e))) {
@@ -1729,12 +1727,12 @@ function _e(t) {
         (r) => V(r).unwrap()
       );
     else
-      return new v();
+      return new w();
   }
   for (const i of e) {
     const r = X(i).unwrap_or(void 0);
     if (!r)
-      return new v();
+      return new w();
     n.push(r);
   }
   return new S({
@@ -1743,30 +1741,30 @@ function _e(t) {
   });
 }
 function X(t) {
-  return M(t) ? new S(t.expression.variable.value) : new v();
+  return M(t) ? new S(t.expression.variable.value) : new w();
 }
 function Xe(t) {
   if (ht(t))
     return t instanceof te ? new S({ functional: [t], nonFunctional: [] }) : new S({ functional: [], nonFunctional: [t] });
-  if (t instanceof Z && t.elementList.every(ht)) {
+  if (t instanceof J && t.elementList.every(ht)) {
     const e = t.elementList.filter(
       (s) => s instanceof te
     ), n = t.elementList.filter(M);
     return new S({ functional: e, nonFunctional: n });
   }
-  return new v();
+  return new w();
 }
 function V(t) {
   var n;
   const e = (n = t == null ? void 0 : t.expression.variable) == null ? void 0 : n.value;
-  return e === void 0 ? new v() : new S(e);
+  return e === void 0 ? new w() : new S(e);
 }
-function Q(t) {
-  return Y(t) ? t.expression instanceof W ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new v();
+function z(t) {
+  return W(t) ? t.expression instanceof Z ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new w();
 }
 function mn(t) {
   var e;
-  return !(t instanceof H) || !yt((e = t.op) == null ? void 0 : e.value) ? !1 : _e(t.leftExpression).and_then(() => _e(t.rightExpression)).unwrap_or(void 0) !== void 0;
+  return !(t instanceof q) || !yt((e = t.op) == null ? void 0 : e.value) ? !1 : _e(t.leftExpression).and_then(() => _e(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
 function Tn(t) {
   const e = _e(t.leftExpression), n = _e(t.rightExpression);
@@ -1776,7 +1774,7 @@ function Tn(t) {
   return (s == null ? void 0 : s.length) === (i == null ? void 0 : i.length);
 }
 function ht(t) {
-  return t instanceof D && t.expression instanceof W || t instanceof te;
+  return t instanceof U && t.expression instanceof Z || t instanceof te;
 }
 function bn(t, e) {
   var i, r, a, c;
@@ -1817,7 +1815,7 @@ class In {
     if (e instanceof ne)
       return [new l(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
     const n = [];
-    return Y(e.callee) || n.push(new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
+    return W(e.callee) || n.push(new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
   }
 }
 class we {
@@ -1869,9 +1867,9 @@ class Ln {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof y)
       return this.validateFields([e]);
-    const [n, s] = I.partition(e.body, (i) => i instanceof w);
+    const [n, s] = I.partition(e.body, (i) => i instanceof y);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -1879,7 +1877,7 @@ class Ln {
       const s = [];
       n.callee && !M(n.callee) && s.push(new l(o.INVALID_ENUM_ELEMENT_NAME, "An enum field must be an identifier or a quoted identifier", n.callee));
       const i = [...n.args];
-      return I.last(i) instanceof P ? (s.push(...this.validateFieldSettings(I.last(i))), i.pop()) : i[0] instanceof P && (s.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && s.push(...i.map((r) => new l(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", r))), s.push(...this.registerField(n)), s;
+      return I.last(i) instanceof D ? (s.push(...this.validateFieldSettings(I.last(i))), i.pop()) : i[0] instanceof D && (s.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && s.push(...i.map((r) => new l(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", r))), s.push(...this.registerField(n)), s;
     });
   }
   validateFieldSettings(e) {
@@ -1889,7 +1887,7 @@ class Ln {
       switch (r) {
         case "note":
           a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", c))), a.forEach((c) => {
-            Y(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
+            W(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
           });
           break;
         default:
@@ -1945,9 +1943,9 @@ class gn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof y)
       return [new l(o.UNEXPECTED_SIMPLE_BODY, "An Indexes must have a complex body", e)];
-    const [n, s] = I.partition(e.body, (i) => i instanceof w);
+    const [n, s] = I.partition(e.body, (i) => i instanceof y);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -1955,8 +1953,8 @@ class gn {
       if (!n.callee)
         return [];
       const s = [], i = [n.callee, ...n.args];
-      return I.last(i) instanceof P && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
-        for (; r instanceof J; )
+      return I.last(i) instanceof D && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
+        for (; r instanceof H; )
           r.argumentList && !Xe(r.argumentList).isOk() && s.push(new l(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
         Xe(r).isOk() || s.push(new l(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
       }), s;
@@ -1970,13 +1968,13 @@ class gn {
         case "note":
         case "name":
           a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, c))), a.forEach((c) => {
-            Y(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, c));
+            W(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, c));
           });
           break;
         case "unique":
         case "pk":
           a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, c))), a.forEach((c) => {
-            ce(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must not have a value`, c));
+            le(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must not have a value`, c));
           });
           break;
         case "type":
@@ -2029,14 +2027,14 @@ class _n {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof y)
       return this.validateFields([e]);
-    const [n, s] = I.partition(e.body, (i) => i instanceof w);
+    const [n, s] = I.partition(e.body, (i) => i instanceof y);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
     const n = [];
-    return e.length === 0 ? [new l(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new l(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), Y(e[0].callee) || n.push(new l(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new l(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
+    return e.length === 0 ? [new l(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new l(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), W(e[0].callee) || n.push(new l(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new l(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
   }
   validateSubElements(e) {
     return e.flatMap((n) => {
@@ -2069,9 +2067,9 @@ class An {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof y)
       return [new l(o.UNEXPECTED_SIMPLE_BODY, "A Project's body must be a block", e)];
-    const [n, s] = I.partition(e.body, (i) => i instanceof w);
+    const [n, s] = I.partition(e.body, (i) => i instanceof y);
     return [
       ...n.map((i) => new l(o.INVALID_PROJECT_FIELD, "A Project can not have inline fields", i)),
       ...this.validateSubElements(s)
@@ -2108,9 +2106,9 @@ class vn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof y)
       return this.validateFields([e]);
-    const [n, s] = I.partition(e.body, (i) => i instanceof w);
+    const [n, s] = I.partition(e.body, (i) => i instanceof y);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -2120,7 +2118,7 @@ class vn {
     return e.length > 1 && n.push(...e.slice(1).map((s) => new l(o.REF_REDEFINED, "A Ref can only contain one binary relationship", s))), e.forEach((s) => {
       s.callee && !mn(s.callee) && n.push(new l(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !Tn(s.callee) && n.push(new l(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
       const i = [...s.args];
-      I.last(i) instanceof P ? (this.validateFieldSettings(I.last(i)), i.pop()) : i[0] instanceof P && (n.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && n.push(...i.map((r) => new l(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", r)));
+      I.last(i) instanceof D ? (this.validateFieldSettings(I.last(i)), i.pop()) : i[0] instanceof D && (n.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && n.push(...i.map((r) => new l(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", r)));
     }), n;
   }
   validateFieldSettings(e) {
@@ -2153,7 +2151,7 @@ function wn(t) {
   if (!(M(t) && t.expression.variable.kind !== u.QUOTED_STRING) && !(t instanceof $))
     return !1;
   let e;
-  if (t instanceof $ ? e = me(t).unwrap_or("") : e = t.expression.variable.value, e)
+  if (t instanceof $ ? e = Te(t).unwrap_or("") : e = t.expression.variable.value, e)
     switch (e.toLowerCase()) {
       case "cascade":
       case "no action":
@@ -2177,7 +2175,7 @@ class yn {
     return this.declarationNode.parent instanceof A ? [new l(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? e instanceof le ? [new l(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Ze(e) ? [] : [new l(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new l(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
+    return e ? e instanceof ue ? [new l(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Ze(e) ? [] : [new l(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new l(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
   }
   validateAlias(e) {
     return e ? On(e) ? [] : [new l(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
@@ -2194,7 +2192,7 @@ class yn {
           break;
         case "note":
           a.length > 1 && s.push(...a.map((c) => new l(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", c))), a.forEach((c) => {
-            Y(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
+            W(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
           });
           break;
         default:
@@ -2220,9 +2218,9 @@ class yn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof y)
       return [new l(o.UNEXPECTED_SIMPLE_BODY, "A Table's body must be a block", e)];
-    const [n, s] = I.partition(e.body, (i) => i instanceof w);
+    const [n, s] = I.partition(e.body, (i) => i instanceof y);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -2253,12 +2251,12 @@ class yn {
   }
   // This is needed to support legacy inline settings
   validateFieldSetting(e) {
-    if (!e.slice(0, -1).every(Ne) || !e.slice(-1).every((p) => Ne(p) || p instanceof P))
+    if (!e.slice(0, -1).every(me) || !e.slice(-1).every((p) => me(p) || p instanceof D))
       return [...e.map((p) => new l(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
     if (e.length === 0)
       return [];
     let n;
-    I.last(e) instanceof P && (n = e.pop());
+    I.last(e) instanceof D && (n = e.pop());
     const s = j(n), i = s.getErrors(), r = s.getValue();
     for (const p of e) {
       const h = V(p).unwrap_or("").toLowerCase();
@@ -2275,7 +2273,7 @@ class yn {
       switch (p) {
         case "note":
           h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", f))), h.forEach((f) => {
-            Y(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
+            W(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
           });
           break;
         case "ref":
@@ -2285,34 +2283,34 @@ class yn {
           break;
         case "primary key":
           h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "primary key can only appear once", f))), h.forEach((f) => {
-            ce(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'primary key' must not have a value", f.value || f.name));
+            le(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'primary key' must not have a value", f.value || f.name));
           });
           break;
         case "pk":
           h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "'pk' can only appear once", f))), h.forEach((f) => {
-            f instanceof se && !ce(f.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", f.value || f.name));
+            f instanceof se && !le(f.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", f.value || f.name));
           });
           break;
         case "not null":
           h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "'not null' can only appear once", f)));
           const T = r.null || [];
           h.length >= 1 && T.length >= 1 && i.push(...[...h, ...T].map((f) => new l(o.CONFLICTING_SETTING, "'not null' and 'null' can not be set at the same time", f))), h.forEach((f) => {
-            ce(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'not null' must not have a value", f.value || f.name));
+            le(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'not null' must not have a value", f.value || f.name));
           });
           break;
         case "null":
           h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "'null' can only appear once", f))), h.forEach((f) => {
-            ce(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'null' must not have a value", f.value || f.name));
+            le(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'null' must not have a value", f.value || f.name));
           });
           break;
         case "unique":
           h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "'unique' can only appear once", f))), h.forEach((f) => {
-            f instanceof se && !ce(f.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", f.value || f.name));
+            f instanceof se && !le(f.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", f.value || f.name));
           });
           break;
         case "increment":
           h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "'increment' can only appear once", f))), h.forEach((f) => {
-            f instanceof se && !ce(f.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", f.value || f.name));
+            f instanceof se && !le(f.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", f.value || f.name));
           });
           break;
         case "default":
@@ -2340,15 +2338,15 @@ class yn {
   }
 }
 function kn(t) {
-  if (!(t instanceof J || Je(t) || t instanceof D || t instanceof le))
+  if (!(t instanceof H || Je(t) || t instanceof U || t instanceof ue))
     return !1;
-  if (t instanceof J) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ue(n) || Y(n) || Ne(n)))
+  if (t instanceof H) {
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => he(n) || W(n) || me(n)))
       return !1;
     t = t.callee;
   }
-  for (; t instanceof le; ) {
-    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && ue(n.name)))
+  for (; t instanceof ue; ) {
+    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && he(n.name)))
       return !1;
     t = t.array;
   }
@@ -2392,9 +2390,9 @@ class Sn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof y)
       return [new l(o.UNEXPECTED_SIMPLE_BODY, "A TableGroup's body must be a block", e)];
-    const [n, s] = I.partition(e.body, (i) => i instanceof w);
+    const [n, s] = I.partition(e.body, (i) => i instanceof y);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -2456,7 +2454,7 @@ function On(t) {
   return Me(t);
 }
 function Me(t) {
-  return t instanceof D && t.expression instanceof W;
+  return t instanceof U && t.expression instanceof Z;
 }
 function Ke(t, e, n) {
   var i;
@@ -2482,7 +2480,7 @@ function yt(t) {
 }
 function Rn(t) {
   var n;
-  if (!(t instanceof D) || !(t.expression instanceof Te) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
+  if (!(t instanceof U) || !(t.expression instanceof be) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
     return !1;
   const e = t.expression.literal.value;
   if (e.length !== 4 && e.length !== 7 || e[0] !== "#")
@@ -2492,26 +2490,26 @@ function Rn(t) {
       return !1;
   return !0;
 }
-function ce(t) {
+function le(t) {
   return t === void 0;
 }
 function Dn(t) {
   var e;
-  return !!(Y(t) || ue(t) || Ne(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof q && wt.includes((e = t.op) == null ? void 0 : e.value) && ue(t.expression) || t instanceof te);
+  return !!(W(t) || he(t) || me(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && he(t.expression) || t instanceof te);
 }
-function ue(t) {
+function he(t) {
   var e;
-  return t instanceof D && t.expression instanceof Te && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
+  return t instanceof U && t.expression instanceof be && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
 }
 function Pn(t) {
   var n;
-  if (!(t instanceof q) || !yt((n = t.op) == null ? void 0 : n.value))
+  if (!(t instanceof Q) || !yt((n = t.op) == null ? void 0 : n.value))
     return !1;
   const e = C(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
 function kt(t) {
-  return t instanceof Z && t.elementList.every(M);
+  return t instanceof J && t.elementList.every(M);
 }
 function j(t) {
   var s;
@@ -2521,11 +2519,11 @@ function j(t) {
   for (const i of t.elementList) {
     if (!i.name)
       continue;
-    if (i.name instanceof D) {
+    if (i.name instanceof U) {
       n.push(new l(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
       continue;
     }
-    const r = (s = me(i.name).unwrap_or(void 0)) == null ? void 0 : s.toLowerCase();
+    const r = (s = Te(i.name).unwrap_or(void 0)) == null ? void 0 : s.toLowerCase();
     r && (e[r] === void 0 ? e[r] = [i] : e[r].push(i));
   }
   return new B(e, n);
@@ -2562,9 +2560,9 @@ class ae {
   bindSettingList(e, n) {
     if (e)
       for (const s of e.elementList) {
-        if (s.name instanceof D)
+        if (s.name instanceof U)
           continue;
-        const i = me(s.name).unwrap_or(void 0);
+        const i = Te(s.name).unwrap_or(void 0);
         if (!i)
           continue;
         const r = n[i.toLowerCase()];
@@ -2590,7 +2588,7 @@ class ae {
   }
   bindSubfield(e) {
     const n = [e.callee, ...e.args], s = I.last(n);
-    s instanceof P && (n.pop(), this.bindSettingList(s, this.subfield.settingList));
+    s instanceof D && (n.pop(), this.bindSettingList(s, this.subfield.settingList));
     const { argBinderRules: i } = this.subfield.arg;
     for (let r = 0; r < Math.min(n.length, i.length); r += 1)
       i[r].shouldBind && this.scanAndBind(n[r], i[r]);
@@ -2599,12 +2597,12 @@ class ae {
   scanAndBind(e, n) {
     var s, i;
     if (e)
-      if (e instanceof D) {
-        if (e.expression instanceof W && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
+      if (e instanceof U) {
+        if (e.expression instanceof Z && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
           return;
         this.bindFragments([e], n);
       } else
-        e instanceof H ? Je(e) ? this.bindFragments(he(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof q ? this.scanAndBind(e.expression, n) : e instanceof Pe ? this.scanAndBind(e.expression, n) : e instanceof Z && e.elementList.forEach((r) => this.scanAndBind(r, n));
+        e instanceof q ? Je(e) ? this.bindFragments(fe(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof Q ? this.scanAndBind(e.expression, n) : e instanceof Pe ? this.scanAndBind(e.expression, n) : e instanceof J && e.elementList.forEach((r) => this.scanAndBind(r, n));
   }
   // Bind the fragments of a member access expression
   // which can be a simple expression like v1.User,
@@ -2905,7 +2903,7 @@ function St(t) {
   }
   throw new Error("Invalid relation op");
 }
-function y(t) {
+function v(t) {
   return {
     start: {
       offset: t.startPos.offset,
@@ -2917,10 +2915,10 @@ function y(t) {
 }
 function $e(t) {
   var n;
-  const e = (n = he(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
-  return e instanceof Z ? e.elementList.map((s) => s.referee) : [e.referee];
+  const e = (n = fe(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
+  return e instanceof J ? e.elementList.map((s) => s.referee) : [e.referee];
 }
-function be(t) {
+function Ie(t) {
   const e = C(t).unwrap();
   return {
     name: e.pop(),
@@ -2946,7 +2944,7 @@ function Dt(t, e) {
   const n = t.id, s = e.id;
   return n === s;
 }
-function Ee(t) {
+function Ne(t) {
   const e = t.split(`
 `), n = e.slice(e.findIndex((r) => r.trimStart() !== "")), s = n.filter((r) => r.trimStart()), i = Math.min(...s.map((r) => r.length - r.trimStart().length));
   return n.map((r) => r.slice(i)).join(`
@@ -2957,7 +2955,7 @@ class Pt {
     this.declarationNode = e, this.env = n, this.table = { name: void 0, schemaName: void 0, alias: null, fields: [], token: void 0, indexes: [] }, this.pkColumns = [];
   }
   interpret() {
-    this.table.token = y(this.declarationNode), this.env.tables.set(this.declarationNode, this.table);
+    this.table.token = v(this.declarationNode), this.env.tables.set(this.declarationNode, this.table);
     const e = [
       ...this.interpretName(this.declarationNode.name),
       ...this.interpretAlias(this.declarationNode.alias),
@@ -2976,7 +2974,7 @@ class Pt {
     }), this.pkColumns.forEach((n) => n.pk = !1)), e;
   }
   interpretName(e) {
-    const { name: n, schemaName: s } = be(e);
+    const { name: n, schemaName: s } = Ie(e);
     return s.length > 1 ? (this.table.name = n, this.table.schemaName = s.join("."), [new l(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.table.name = n, this.table.schemaName = s.length ? s[0] : null, []);
   }
   interpretAlias(e) {
@@ -2998,12 +2996,12 @@ class Pt {
     this.table.headerColor = (i = n.headercolor) != null && i.length ? Ot((a = (r = n.headercolor) == null ? void 0 : r.at(0)) == null ? void 0 : a.value) : void 0;
     const [s] = n.note || [];
     return this.table.note = s && {
-      value: Q(s == null ? void 0 : s.value).map(Ee).unwrap(),
-      token: y(s)
+      value: z(s == null ? void 0 : s.value).map(Ne).unwrap(),
+      token: v(s)
     }, [];
   }
   interpretBody(e) {
-    const [n, s] = I.partition(e.body, (i) => i instanceof w);
+    const [n, s] = I.partition(e.body, (i) => i instanceof y);
     return [...this.interpretFields(n), ...this.interpretSubElements(s)];
   }
   interpretSubElements(e) {
@@ -3012,8 +3010,8 @@ class Pt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: Q(n.body instanceof ne ? n.body.body[0].callee : n.body.callee).map(Ee).unwrap(),
-            token: y(n)
+            value: z(n.body instanceof ne ? n.body.body[0].callee : n.body.callee).map(Ne).unwrap(),
+            token: v(n)
           }, [];
         case "indexes":
           return this.interpretIndexes(n);
@@ -3029,63 +3027,63 @@ class Pt {
     const n = [], s = {};
     s.name = V(e.callee).unwrap();
     const i = Yn(e.args[0]);
-    s.type = i.getValue(), n.push(...i.getErrors()), s.token = y(e), s.inline_refs = [];
+    s.type = i.getValue(), n.push(...i.getErrors()), s.token = v(e), s.inline_refs = [];
     const r = e.args.slice(1);
-    if (I.last(r) instanceof P) {
+    if (I.last(r) instanceof D) {
       const _ = j(r.pop()).getValue();
       s.pk = !!((a = _.pk) != null && a.length) || !!((c = _["primary key"]) != null && c.length), s.increment = !!((p = _.increment) != null && p.length), s.unique = !!((h = _.unique) != null && h.length), s.not_null = !!((T = _["not null"]) != null && T.length) && !0, s.dbdefault = zn((N = (f = _.default) == null ? void 0 : f.at(0)) == null ? void 0 : N.value);
       const K = (g = _.note) == null ? void 0 : g.at(0);
       s.note = K && {
-        value: Q(K.value).map(Ee).unwrap(),
-        token: y(K)
+        value: z(K.value).map(Ne).unwrap(),
+        token: v(K)
       };
-      const Ie = _.ref || [];
-      s.inline_refs = Ie.flatMap((z) => {
-        const [nt] = $e(z.value.expression);
+      const oe = _.ref || [];
+      s.inline_refs = oe.flatMap((Y) => {
+        const [nt] = $e(Y.value.expression);
         if (Dt(nt, e.symbol))
-          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", z)), [];
-        const ye = z.value.op, ee = C(z.value.expression).unwrap();
-        let fe;
+          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", Y)), [];
+        const ye = Y.value.op, ee = C(Y.value.expression).unwrap();
+        let pe;
         if (ee.length === 1) {
-          const [oe] = ee;
-          fe = {
+          const [ce] = ee;
+          pe = {
             schemaName: this.table.schemaName,
             tableName: this.table.name,
-            fieldNames: [oe],
+            fieldNames: [ce],
             relation: ye.value,
-            token: y(z)
+            token: v(Y)
           };
         } else if (ee.length === 2) {
-          const [oe, Le] = ee;
-          fe = {
+          const [ce, Le] = ee;
+          pe = {
             schemaName: null,
-            tableName: oe,
+            tableName: ce,
             fieldNames: [Le],
             relation: ye.value,
-            token: y(z)
+            token: v(Y)
           };
         } else if (ee.length === 3) {
-          const [oe, Le, it] = ee;
-          fe = {
-            schemaName: oe,
+          const [ce, Le, it] = ee;
+          pe = {
+            schemaName: ce,
             tableName: Le,
             fieldNames: [it],
             relation: ye.value,
-            token: y(z)
+            token: v(Y)
           };
         } else {
-          n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", z));
-          const oe = ee.pop(), Le = ee.pop();
-          fe = {
+          n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", Y));
+          const ce = ee.pop(), Le = ee.pop();
+          pe = {
             schemaName: ee.join("."),
             tableName: Le,
-            fieldNames: [oe],
+            fieldNames: [ce],
             relation: ye.value,
-            token: y(z)
+            token: v(Y)
           };
         }
-        const st = this.registerInlineRefToEnv(e, nt, fe, z);
-        return n.push(...st), st.length === 0 ? fe : [];
+        const st = this.registerInlineRefToEnv(e, nt, pe, Y);
+        return n.push(...st), st.length === 0 ? pe : [];
       });
     }
     return s.pk || (s.pk = r.some((_) => X(_).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((_) => X(_).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
@@ -3094,34 +3092,36 @@ class Pt {
     return this.table.indexes.push(...e.body.body.map((n) => {
       var a, c, p, h, T, f, N;
       const s = { columns: [] }, i = n;
-      s.token = y(e);
+      s.token = v(e);
       const r = [i.callee, ...i.args];
-      if (I.last(r) instanceof P) {
+      if (I.last(r) instanceof D) {
         const g = j(r.pop()).getValue();
-        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((c = g.unique) != null && c.length), s.name = Q((h = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
+        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((c = g.unique) != null && c.length), s.name = z((h = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
         const _ = (T = g.note) == null ? void 0 : T.at(0);
         s.note = _ && {
-          value: Q(_.value).unwrap(),
-          token: y(_)
+          value: z(_.value).unwrap(),
+          token: v(_)
         }, s.type = X((N = (f = g.type) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
       }
       return r.flatMap((g) => {
-        if (!(g instanceof J))
+        if (!(g instanceof H))
           return g;
         const _ = [];
-        for (; g instanceof J; )
+        for (; g instanceof H; )
           _.push(g.argumentList), g = g.callee;
         return _.push(g), _;
       }).forEach((g) => {
         const { functional: _, nonFunctional: K } = Xe(g).unwrap();
         s.columns.push(
-          ..._.map((Ie) => ({
-            value: Ie.value.value,
-            type: "expression"
+          ..._.map((oe) => ({
+            value: oe.value.value,
+            type: "expression",
+            token: v(oe)
           })),
-          ...K.map((Ie) => ({
-            value: V(Ie).unwrap(),
-            type: "column"
+          ...K.map((oe) => ({
+            value: V(oe).unwrap(),
+            type: "column",
+            token: v(oe)
           }))
         );
       }), s;
@@ -3148,7 +3148,7 @@ class Pt {
           schemaName: this.table.schemaName,
           tableName: this.table.name,
           fieldNames: [X(e.callee).unwrap()],
-          token: y(e),
+          token: v(e),
           relation: a[0]
         }
       ]
@@ -3157,11 +3157,11 @@ class Pt {
 }
 function Yn(t) {
   let e = null;
-  t instanceof J && (e = t.argumentList.elementList.map((r) => ue(r) ? r.expression.literal.value : Y(r) ? Q(r).unwrap() : X(r).unwrap()).join(","), t = t.callee);
+  t instanceof H && (e = t.argumentList.elementList.map((r) => he(r) ? r.expression.literal.value : W(r) ? z(r).unwrap() : X(r).unwrap()).join(","), t = t.callee);
   let n = "";
-  for (; t instanceof le; )
+  for (; t instanceof ue; )
     n = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${n}`, t = t.array;
-  const { name: s, schemaName: i } = be(t);
+  const { name: s, schemaName: i } = Ie(t);
   return i.length > 1 ? new B(
     {
       schemaName: i.length === 0 ? null : i[0],
@@ -3178,22 +3178,22 @@ function Yn(t) {
 function zn(t) {
   var e, n, s;
   if (t) {
-    if (Y(t))
+    if (W(t))
       return {
-        value: Q(t).unwrap(),
+        value: z(t).unwrap(),
         type: "string"
       };
-    if (ue(t))
+    if (he(t))
       return {
         type: "number",
         value: Number.parseFloat(t.expression.literal.value)
       };
-    if (Ne(t))
+    if (me(t))
       return {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
       };
-    if (t instanceof q && wt.includes((e = t.op) == null ? void 0 : e.value) && ue(t.expression)) {
+    if (t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && he(t.expression)) {
       const i = Number.parseFloat(t.expression.expression.literal.value);
       return {
         value: ((n = t.op) == null ? void 0 : n.value) === "-" ? 0 - i : i,
@@ -3213,14 +3213,14 @@ class Qn {
     this.declarationNode = e, this.env = n, this.note = { name: void 0, content: void 0, token: void 0 };
   }
   interpret() {
-    return this.note.token = y(this.declarationNode), this.env.notes.set(this.declarationNode, this.note), [
+    return this.note.token = v(this.declarationNode), this.env.notes.set(this.declarationNode, this.note), [
       ...this.interpretName(this.declarationNode.name),
       ...this.interpretSettingList(this.declarationNode.attributeList),
       ...this.interpretBody(this.declarationNode.body)
     ];
   }
   interpretName(e) {
-    const { name: n } = be(e);
+    const { name: n } = Ie(e);
     return this.note.name = n, [];
   }
   interpretSettingList(e) {
@@ -3229,14 +3229,14 @@ class Qn {
     return this.note.headerColor = (s = n.headercolor) != null && s.length ? Ot((r = (i = n.headercolor) == null ? void 0 : i.at(0)) == null ? void 0 : r.value) : void 0, [];
   }
   interpretBody(e) {
-    const [n, s] = I.partition(e.body, (i) => i instanceof w);
+    const [n, s] = I.partition(e.body, (i) => i instanceof y);
     return n.length !== 1 || s.length > 0 ? [
       new l(o.INVALID_NOTE, "Invalid note syntax", e)
     ] : [...this.interpretNote(n[0])];
   }
   interpretNote(e) {
     const n = I.get(e, "callee.expression.literal.value", "");
-    return this.note.content = Ee(n), [];
+    return this.note.content = Ne(n), [];
   }
 }
 class Ut {
@@ -3244,14 +3244,14 @@ class Ut {
     this.declarationNode = e, this.env = n, this.container = this.declarationNode.parent instanceof A ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
   }
   interpret() {
-    return this.ref.token = y(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.ref.token = v(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
     const n = [], s = C(this.declarationNode.name).unwrap_or([]);
     return this.ref.name = s.pop() || null, s.length > 1 && n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name)), this.ref.schemaName = s.join(".") || null, n;
   }
   interpretBody(e) {
-    return e instanceof w ? this.interpretField(e) : this.interpretField(e.body[0]);
+    return e instanceof y ? this.interpretField(e) : this.interpretField(e.body[0]);
   }
   interpretField(e) {
     var h, T, f, N;
@@ -3266,21 +3266,21 @@ class Ut {
       ];
     if (e.args[0]) {
       const g = j(e.args[0]).getValue(), _ = (T = (h = g.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value;
-      this.ref.onDelete = _ instanceof $ ? me(_).unwrap_or(void 0) : X(_).unwrap_or(void 0);
+      this.ref.onDelete = _ instanceof $ ? Te(_).unwrap_or(void 0) : X(_).unwrap_or(void 0);
       const K = (N = (f = g.update) == null ? void 0 : f.at(0)) == null ? void 0 : N.value;
-      this.ref.onUpdate = K instanceof $ ? me(K).unwrap_or(void 0) : X(K).unwrap_or(void 0);
+      this.ref.onUpdate = K instanceof $ ? Te(K).unwrap_or(void 0) : X(K).unwrap_or(void 0);
     }
     const p = St(n);
     return this.ref.endpoints = [
       {
         ...pt(s, this.container),
         relation: p[0],
-        token: y(s)
+        token: v(s)
       },
       {
         ...pt(i, this.container),
         relation: p[1],
-        token: y(i)
+        token: v(i)
       }
     ], this.env.refIds[c] = this.declarationNode, [];
   }
@@ -3291,13 +3291,13 @@ class Mt {
   }
   interpret() {
     const e = [];
-    return this.tableGroup.token = y(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup), e.push(
+    return this.tableGroup.token = v(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup), e.push(
       ...this.interpretName(this.declarationNode.name),
       ...this.interpretBody(this.declarationNode.body)
     ), e;
   }
   interpretName(e) {
-    const n = [], { name: s, schemaName: i } = be(e);
+    const n = [], { name: s, schemaName: i } = Ie(e);
     return i.length >= 2 && (this.tableGroup.name = s, this.tableGroup.schemaName = i.join("."), n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = s, this.tableGroup.schemaName = i[0] || null, n;
   }
   interpretBody(e) {
@@ -3305,7 +3305,7 @@ class Mt {
     return this.tableGroup.tables = this.declarationNode.body.body.map((s) => {
       const i = C(s.callee).unwrap();
       i.length > 2 && n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", s));
-      const r = he(s.callee).unwrap().pop().referee.id;
+      const r = fe(s.callee).unwrap().pop().referee.id;
       if (this.env.groupOfTable[r]) {
         const a = this.env.groupOfTable[r], { schemaName: c, name: p } = this.env.tableGroups.get(a), h = c ? `${c}.${p}` : p;
         n.push(new l(o.TABLE_REAPPEAR_IN_TABLEGROUP, `Table "${i.join(".")}" already appears in group "${h}"`, s));
@@ -3323,21 +3323,21 @@ class Ft {
     this.declarationNode = e, this.env = n, this.enum = { values: [] };
   }
   interpret() {
-    return this.enum.token = y(this.declarationNode), this.env.enums.set(this.declarationNode, this.enum), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.enum.token = v(this.declarationNode), this.env.enums.set(this.declarationNode, this.enum), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
-    const { name: n, schemaName: s } = be(e);
+    const { name: n, schemaName: s } = Ie(e);
     return s.length > 1 ? (this.enum.name = n, this.enum.schemaName = s.join("."), [new l(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.enum.name = n, this.enum.schemaName = s.length ? s[0] : null, []);
   }
   interpretBody(e) {
     return e.body.flatMap((n) => {
       var c;
       const s = n, i = {};
-      i.token = y(s), i.name = X(s.callee).unwrap();
+      i.token = v(s), i.name = X(s.callee).unwrap();
       const a = (c = j(s.args[0]).getValue().note) == null ? void 0 : c.at(0);
       return i.note = a && {
-        value: Q(a.value).map(Ee).unwrap(),
-        token: y(a)
+        value: z(a.value).map(Ne).unwrap(),
+        token: v(a)
       }, this.enum.values.push(i), [];
     });
   }
@@ -3347,12 +3347,12 @@ class qn {
     this.declarationNode = e, this.env = n, this.project = { enums: [], refs: [], tableGroups: [], tables: [] };
   }
   interpret() {
-    return this.env.project.set(this.declarationNode, this.project), this.project.token = y(this.declarationNode), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.env.project.set(this.declarationNode, this.project), this.project.token = v(this.declarationNode), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
     if (!e)
       return this.project.name = null, [];
-    const { name: n } = be(e);
+    const { name: n } = Ie(e);
     return this.project.name = n, [];
   }
   interpretBody(e) {
@@ -3378,11 +3378,11 @@ class qn {
         }
         case "note":
           return this.project.note = {
-            value: Q(s.body instanceof ne ? s.body.body[0].callee : s.body.callee).map(Ee).unwrap(),
-            token: y(s)
+            value: z(s.body instanceof ne ? s.body.body[0].callee : s.body.callee).map(Ne).unwrap(),
+            token: v(s)
           }, [];
         default:
-          return this.project[s.type.value.toLowerCase()] = Q(s.body.callee).unwrap(), [];
+          return this.project[s.type.value.toLowerCase()] = z(s.body.callee).unwrap(), [];
       }
     });
   }
@@ -3516,7 +3516,7 @@ class Bt {
       return Tt();
     const h = [...this.compiler.container.stack(s)].reverse();
     for (const N of h)
-      if (N instanceof q)
+      if (N instanceof Q)
         switch ((T = N.op) == null ? void 0 : T.value) {
           case ">":
           case "<":
@@ -3528,7 +3528,7 @@ class Bt {
               N
             );
         }
-      else if (N instanceof H)
+      else if (N instanceof q)
         switch ((f = N.op) == null ? void 0 : f.value) {
           case ">":
           case "<":
@@ -3549,11 +3549,11 @@ class Bt {
       else {
         if (N instanceof se)
           return Et(this.compiler, s, N);
-        if (N instanceof P)
+        if (N instanceof D)
           return Et(this.compiler, s, N);
-        if (N instanceof Z)
+        if (N instanceof J)
           return Zn(this.compiler, s);
-        if (N instanceof w)
+        if (N instanceof y)
           return mt(this.compiler, s, N);
         if (N instanceof A && (N.bodyColon && s >= N.bodyColon.end || N.body && ge(s, N.body)))
           return mt(this.compiler, s, void 0);
@@ -3607,7 +3607,7 @@ function Zn(t, e) {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
           const r = i.pop();
-          if (r instanceof H && ((s = r.op) == null ? void 0 : s.value) === ".")
+          if (r instanceof q && ((s = r.op) == null ? void 0 : s.value) === ".")
             return Vt(
               t,
               e,
@@ -3631,7 +3631,7 @@ function Et(t, e, n) {
     const i = Kn(
       t,
       e,
-      me(n.name).unwrap()
+      Te(n.name).unwrap()
     );
     return (s == null ? void 0 : s.kind) === u.COLON && Re(s, e) ? De(i) : i;
   }
@@ -3763,7 +3763,7 @@ function Kn(t, e, n) {
   return O();
 }
 function Vt(t, e, n) {
-  const s = he(n).unwrap_or([]);
+  const s = fe(n).unwrap_or([]);
   if (s.pop(), s.some((r) => !M(r)))
     return O();
   const i = s.map((r) => X(r).unwrap());
@@ -3994,7 +3994,7 @@ class Xt {
     const { uri: s } = e, i = et(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const c = r.pop();
-      if ((a = c == null ? void 0 : c.referee) != null && a.declaration && [de.PRIMARY_EXPRESSION, de.VARIABLE].includes(c == null ? void 0 : c.kind)) {
+      if ((a = c == null ? void 0 : c.referee) != null && a.declaration && [Ee.PRIMARY_EXPRESSION, Ee.VARIABLE].includes(c == null ? void 0 : c.kind)) {
         const { startPos: p, endPos: h } = c.referee.declaration;
         return [
           {
@@ -4021,9 +4021,9 @@ class $t {
     for (; r.length !== 0; ) {
       const a = r.pop();
       if (a && [
-        de.ELEMENT_DECLARATION,
-        de.FUNCTION_APPLICATION,
-        de.PRIMARY_EXPRESSION
+        Ee.ELEMENT_DECLARATION,
+        Ee.FUNCTION_APPLICATION,
+        Ee.PRIMARY_EXPRESSION
       ].includes(a == null ? void 0 : a.kind)) {
         const { symbol: c } = a;
         if (c != null && c.references.length)
@@ -4118,13 +4118,13 @@ class ls {
           for (; c.length > 0; ) {
             let p = !1;
             const h = I.last(c);
-            if (h instanceof w) {
+            if (h instanceof y) {
               const T = this.parse.source();
               for (let f = h.end; f < e; f += 1)
                 T[f] === `
 ` && (c.pop(), p = !0);
             } else
-              h instanceof q || h instanceof H ? this.container.token(e).token !== h.op && (c.pop(), p = !0) : h instanceof P ? h.listCloseBracket && h.end <= e && (c.pop(), p = !0) : h instanceof Z ? h.tupleCloseParen && h.end <= e && (c.pop(), p = !0) : h instanceof ne ? h.blockCloseBrace && h.end <= e && (c.pop(), p = !0) : h instanceof $ || h.end < e && (c.pop(), p = !0);
+              h instanceof Q || h instanceof q ? this.container.token(e).token !== h.op && (c.pop(), p = !0) : h instanceof D ? h.listCloseBracket && h.end <= e && (c.pop(), p = !0) : h instanceof J ? h.tupleCloseParen && h.end <= e && (c.pop(), p = !0) : h instanceof ne ? h.blockCloseBrace && h.end <= e && (c.pop(), p = !0) : h instanceof $ || h.end < e && (c.pop(), p = !0);
             if (p) {
               const T = I.last(c);
               T instanceof A && T.end <= e && c.pop();