@dbml/parse 3.4.2 → 3.5.0

package/dist/dbml-parse.mjs

@@ -1,6 +1,6 @@
 import I from "lodash";
 var u = /* @__PURE__ */ ((t) => (t.SPACE = "<space>", t.TAB = "<tab>", t.NEWLINE = "<newline>", t.COMMA = "<comma>", t.LPAREN = "<lparen>", t.RPAREN = "<rparen>", t.LBRACE = "<lbrace>", t.RBRACE = "<rbrace>", t.LBRACKET = "<lbracket>", t.RBRACKET = "<rbracket>", t.LANGLE = "<langle>", t.RANGLE = "<rangle>", t.OP = "<op>", t.EOF = "<eof>", t.NUMERIC_LITERAL = "<number>", t.STRING_LITERAL = "<string>", t.COLOR_LITERAL = "<color>", t.FUNCTION_EXPRESSION = "<function-expression>", t.QUOTED_STRING = "<variable>", t.IDENTIFIER = "<identifier>", t.SEMICOLON = "<semicolon>", t.COLON = "<colon>", t.SINGLE_LINE_COMMENT = "<single-line-comment>", t.MULTILINE_COMMENT = "<multiline-comment>", t))(u || {});
-function jt(t) {
+function Wt(t) {
   switch (t.kind) {
     case "<newline>":
     case "<space>":
@@ -12,7 +12,7 @@ function jt(t) {
       return !1;
   }
 }
-function rt(t) {
+function it(t) {
   if (!t)
     return !1;
   switch (t) {
@@ -33,7 +33,7 @@ function rt(t) {
       return !1;
   }
 }
-function at(t) {
+function rt(t) {
   return t !== void 0 && t.kind === "<op>";
 }
 class F {
@@ -44,22 +44,22 @@ class F {
     return new F(e, n, s, i, r);
   }
 }
-function bt(t) {
+function Tt(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === u.NEWLINE) !== void 0;
 }
-function ot(t, e) {
-  return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || bt(t);
+function at(t, e) {
+  return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || Tt(t);
 }
 function Ce(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === u.SPACE) !== void 0;
 }
-function It(t) {
-  return t.trailingTrivia.length === 0 ? t.end : It(I.last(t.trailingTrivia));
+function bt(t) {
+  return t.trailingTrivia.length === 0 ? t.end : bt(I.last(t.trailingTrivia));
 }
-function Lt(t) {
-  return t.leadingTrivia.length === 0 ? t.start : Lt(t.leadingTrivia[0]);
+function It(t) {
+  return t.leadingTrivia.length === 0 ? t.start : It(t.leadingTrivia[0]);
 }
-function Wt(t) {
+function jt(t) {
   return [u.SINGLE_LINE_COMMENT, u.MULTILINE_COMMENT].includes(
     t.kind
   );
@@ -81,20 +81,20 @@ class x {
   constructor(e, n, s) {
     this.id = e, this.kind = n;
     const i = s.find((a) => a !== void 0 && !Number.isNaN(a.start));
-    i ? (this.startPos = i.startPos, this.fullStart = i instanceof F ? Lt(i) : i.fullStart) : (this.startPos = {
+    i ? (this.startPos = i.startPos, this.fullStart = i instanceof F ? It(i) : i.fullStart) : (this.startPos = {
       offset: NaN,
       column: NaN,
       line: NaN
     }, this.fullStart = NaN);
     const r = [...s].reverse().find((a) => a !== void 0 && !Number.isNaN(a.end));
-    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof F ? It(r) : r.fullEnd) : (this.endPos = {
+    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof F ? bt(r) : r.fullEnd) : (this.endPos = {
       offset: NaN,
       column: NaN,
       line: NaN
     }, 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;
   }
@@ -151,7 +151,7 @@ class q extends x {
     super(i, "<infix-expression>", [n, e, s]), this.op = e, this.leftExpression = n, this.rightExpression = s;
   }
 }
-class Pe extends x {
+class Ue extends x {
   constructor({ op: e, expression: n }, s) {
     super(s, "<postfix-expression>", [n, e]), this.op = e, this.expression = 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;
   }
@@ -184,7 +184,7 @@ class D extends x {
   }, r) {
     super(r, "<list-expression>", [
       e,
-      ...gt(n, s),
+      ...Lt(n, s),
       i
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
@@ -198,12 +198,12 @@ class J extends x {
   }, r) {
     super(r, "<tuple-expression>", [
       e,
-      ...gt(n, s),
+      ...Lt(n, s),
       i
     ]), this.tupleOpenParen = e, this.elementList = n, this.commaList = s, this.tupleCloseParen = i;
   }
 }
-class je extends J {
+class We extends J {
   constructor({
     groupOpenParen: e,
     expression: n,
@@ -228,7 +228,7 @@ class H 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;
   }
@@ -243,18 +243,18 @@ class U extends x {
     super(n, "<primary-expression>", [e]), this.expression = e;
   }
 }
-class ke extends x {
+class xe extends x {
   constructor({ pre: e }, n) {
     const s = F.create(u.SPACE, e.endPos, e.endPos, " ", !1);
     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;
   }
 }
-function gt(t, e) {
+function Lt(t, e) {
   if (!t || t.length === 0)
     return e || [];
   if (!e || e.length === 0)
@@ -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() {
@@ -335,10 +335,10 @@ class v {
   }
 }
 var m = /* @__PURE__ */ ((t) => (t.Schema = "Schema", t.Table = "Table", t.Column = "Column", t.TableGroup = "TableGroup", t.TableGroupField = "TableGroup field", t.Enum = "Enum", t.EnumField = "Enum field", t.Note = "Note", t))(m || {});
-function We(t) {
+function je(t) {
   return `Schema:${t}`;
 }
-function Se(t) {
+function Oe(t) {
   return `Table:${t}`;
 }
 function Ye(t) {
@@ -368,9 +368,9 @@ function Ve(t, e) {
     case "Enum field":
       return Qe(t);
     case "Schema":
-      return We(t);
+      return je(t);
     case "Table":
-      return Se(t);
+      return Oe(t);
     case "TableGroup":
       return qe(t);
     case "TableGroup field":
@@ -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);
@@ -395,8 +395,8 @@ function Qt(t) {
 }
 function qt(t) {
   return [
-    We,
-    Se,
+    je,
+    Oe,
     ze,
     qe,
     Ye,
@@ -404,21 +404,21 @@ function qt(t) {
     He
   ].map((e) => e(t));
 }
-function Ue(t) {
+function Me(t) {
   return !!t.match(/(\p{L}|_|\p{M})/gu);
 }
-function Oe(t) {
+function Re(t) {
   const [e] = t;
   return e >= "0" && e <= "9";
 }
 function Ht(t) {
   const [e] = t;
-  return Oe(e) || Ue(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
+  return Re(e) || Me(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
-function pe(t) {
-  return Ue(t) || Oe(t);
+function de(t) {
+  return Me(t) || Re(t);
 }
-function ct(t, e) {
+function ot(t, e) {
   const n = [], s = Math.min(t.length, e.length);
   for (let i = 0; i < s; i += 1)
     n.push(t[i], e[i]);
@@ -438,7 +438,7 @@ class Jt {
     return this.id++;
   }
 }
-class _t {
+class gt {
   constructor({ symbolTable: e }, n) {
     this.references = [], this.id = n, this.symbolTable = e;
   }
@@ -453,7 +453,7 @@ class Kt {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class At {
+class _t {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
@@ -498,11 +498,11 @@ 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();
+    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, {
@@ -526,9 +526,9 @@ function sn(t, e, n) {
       attributeList: a,
       body: r
     })
-  ) : new v();
+  ) : new w();
 }
-function lt(t) {
+function ct(t) {
   return t.kind === u.IDENTIFIER && t.value === "as";
 }
 function E(t) {
@@ -548,7 +548,7 @@ function an(t) {
     E(t.op), E(t.expression);
   else if (t instanceof q)
     E(t.leftExpression), E(t.op), E(t.rightExpression);
-  else if (t instanceof Pe)
+  else if (t instanceof Ue)
     E(t.op), E(t.expression);
   else if (t instanceof ne)
     E(t.blockOpenBrace), t.body.forEach(E), E(t.blockCloseBrace);
@@ -558,7 +558,7 @@ function an(t) {
     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 U)
     E(t.expression);
@@ -566,12 +566,12 @@ function an(t) {
     E(t.value);
   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");
+    throw t instanceof We ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
 }
-function vt(t) {
+function At(t) {
   return !!(t != null && t.isInvalid);
 }
 function P(...t) {
@@ -594,7 +594,7 @@ function on(t) {
     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 Z)
     return P(t.variable);
@@ -602,48 +602,48 @@ function on(t) {
     return P(t.op, t.expression);
   if (t instanceof q)
     return P(t.leftExpression, t.op, t.rightExpression);
-  if (t instanceof Pe)
+  if (t instanceof Ue)
     return P(t.expression, t.op);
   if (t instanceof te)
     return P(t.value);
-  if (t instanceof w)
+  if (t instanceof y)
     return P(t.callee, ...t.args);
   if (t instanceof ne)
     return P(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
   if (t instanceof D)
     return P(
       t.listOpenBracket,
-      ...ct(t.elementList, t.commaList),
+      ...ot(t.elementList, t.commaList),
       t.listCloseBracket
     );
   if (t instanceof J)
     return P(
       t.tupleOpenParen,
-      ...ct(t.elementList, t.commaList),
+      ...ot(t.elementList, t.commaList),
       t.tupleCloseParen
     );
   if (t instanceof H)
     return P(t.callee, t.argumentList);
   if (t instanceof U)
     return P(t.expression);
-  if (t instanceof le)
+  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");
+  throw t instanceof We ? 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 W(t) {
+function j(t) {
   var e;
-  return t instanceof U && (t.expression instanceof Z && 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 U && t.expression instanceof Z && t.expression.variable instanceof F;
 }
-function Ne(t) {
+function me(t) {
   var e;
   return t instanceof U && t.expression instanceof Z && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
 }
@@ -651,11 +651,11 @@ function Je(t) {
   var e;
   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
@@ -767,15 +767,15 @@ class cn {
           this.match("/") ? this.singleLineComment() : this.match("*") ? this.multilineComment() : this.operator();
           break;
         default:
-          if (rt(e)) {
+          if (it(e)) {
             this.operator();
             break;
           }
-          if (Ue(e)) {
+          if (Me(e)) {
             this.identifier();
             break;
           }
-          if (Oe(e)) {
+          if (Re(e)) {
             this.numericLiteralOrIdentifier();
             break;
           }
@@ -795,13 +795,13 @@ class cn {
     let e = !0, n = [], s;
     const i = [];
     for (const r of this.tokens)
-      jt(r) ? (n.push(r), r.kind === u.NEWLINE && s && (s.trailingTrivia = n, e = !0, s = void 0, n = [])) : (e ? r.leadingTrivia = n : s.trailingTrivia = n, i.push(r), n = [], s = r, e = !1);
+      Wt(r) ? (n.push(r), r.kind === u.NEWLINE && s && (s.trailingTrivia = n, e = !0, s = void 0, n = [])) : (e ? r.leadingTrivia = n : s.trailingTrivia = n, i.push(r), n = [], s = r, e = !1);
     this.tokens = i;
   }
   gatherInvalid() {
     let e;
     const n = [], s = [];
-    for (e = 0; e < this.tokens.length && vt(this.tokens[e]); e += 1)
+    for (e = 0; e < this.tokens.length && At(this.tokens[e]); e += 1)
       s.push(this.tokens[e]);
     let i = this.tokens[e];
     for (i.leadingInvalid = [...s, ...i.leadingInvalid]; e < this.tokens.length; e += 1) {
@@ -890,12 +890,12 @@ class cn {
     });
   }
   identifier() {
-    for (; !this.isAtEnd() && pe(this.peek()); )
+    for (; !this.isAtEnd() && de(this.peek()); )
       this.advance();
     this.addToken(u.IDENTIFIER);
   }
   operator() {
-    for (; rt(this.peek()); )
+    for (; it(this.peek()); )
       this.advance();
     this.addToken(u.OP);
   }
@@ -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()))
+      if (!n && !Re(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();
         }
@@ -981,7 +981,7 @@ class cn {
     }
   }
 }
-var xe = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(xe || {});
+var Se = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(Se || {});
 class ln {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
@@ -1069,7 +1069,7 @@ class hn {
     }, this.synchronizeElementDeclarationName = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (lt(s) || this.check(u.COLON, u.LBRACE, u.LBRACKET))
+        if (ct(s) || this.check(u.COLON, u.LBRACE, u.LBRACKET))
           break;
         E(s), this.advance();
       }
@@ -1080,7 +1080,7 @@ class hn {
           break;
         E(s), this.advance();
       }
-    }, this.blockExpression = this.contextStack.withContextDo(xe.BlockExpression, () => {
+    }, this.blockExpression = this.contextStack.withContextDo(Se.BlockExpression, () => {
       const s = { body: [] }, i = () => this.nodeFactory.create(ne, s);
       try {
         this.consume("Expect an opening brace '{'", u.LBRACE), s.blockOpenBrace = this.previous();
@@ -1115,12 +1115,12 @@ class hn {
       if (!this.check(u.RBRACE))
         for (E(this.advance()); !this.isAtEnd(); ) {
           const s = this.peek();
-          if (this.check(u.RBRACE) || ot(this.previous(), s))
+          if (this.check(u.RBRACE) || at(this.previous(), s))
             break;
           E(s), this.advance();
         }
-    }, this.tupleExpression = this.contextStack.withContextDo(xe.GroupExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(je, {
+    }, this.tupleExpression = this.contextStack.withContextDo(Se.GroupExpression, () => {
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(We, {
         groupOpenParen: s.tupleOpenParen,
         groupCloseParen: s.tupleCloseParen,
         expression: s.elementList[0]
@@ -1171,7 +1171,7 @@ class hn {
           break;
         E(s), this.advance();
       }
-    }, this.listExpression = this.contextStack.withContextDo(xe.ListExpression, () => {
+    }, this.listExpression = this.contextStack.withContextDo(Se.ListExpression, () => {
       const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(D, s);
       try {
         this.consume("Expect an opening bracket '['", u.LBRACKET), s.listOpenBracket = this.previous();
@@ -1324,7 +1324,7 @@ class hn {
           throw new d(s.token, n(), s.handlerContext);
         this.synchronizeElementDeclarationName();
       }
-    if (lt(this.peek()))
+    if (ct(this.peek()))
       if (e.as = this.advance(), this.check(u.COLON, u.LBRACE, u.LBRACKET))
         this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect an alias");
       else
@@ -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();
@@ -1410,7 +1410,7 @@ class hn {
     return n();
   }
   shouldStopExpression() {
-    if (this.isAtEnd() || bt(this.previous()))
+    if (this.isAtEnd() || Tt(this.previous()))
       return !0;
     const e = this.peek().kind;
     return e === u.RBRACE || e === u.RBRACKET || e === u.RPAREN || e === u.COMMA || e === u.COLON;
@@ -1424,12 +1424,12 @@ class hn {
     for (; !this.isAtEnd(); ) {
       const s = this.peek();
       if (s.kind === u.LPAREN) {
-        const { left: i } = ut(s);
+        const { left: i } = lt(s);
         if (i < e || // When '(' is encountered,
         // consider it part of another expression if
         // it's at the start of a new line
         // and we're currently not having unmatched '(' or '['
-        ot(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
+        at(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
           break;
         try {
           n = this.nodeFactory.create(H, {
@@ -1446,22 +1446,22 @@ 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;
         }
-      } else if (at(s)) {
-        const i = s, r = ut(i);
+      } else if (rt(s)) {
+        const i = s, r = lt(i);
         if (r.left !== null) {
           if (r.left <= e)
             break;
-          this.advance(), n = this.nodeFactory.create(Pe, {
+          this.advance(), n = this.nodeFactory.create(Ue, {
             expression: n,
             op: i
           });
@@ -1491,7 +1491,7 @@ class hn {
   }
   leftExpression_bp() {
     let e;
-    if (at(this.peek())) {
+    if (rt(this.peek())) {
       const n = {};
       n.op = this.peek();
       const s = En(n.op);
@@ -1502,7 +1502,7 @@ class hn {
           `Unexpected '${n.op.value}' in an expression`
         ), new d(
           n.op,
-          this.nodeFactory.create(ke, { pre: n.op }),
+          this.nodeFactory.create(xe, { pre: n.op }),
           this.contextStack.findHandlerContext(this.tokens, this.current)
         );
       this.advance();
@@ -1516,10 +1516,10 @@ class hn {
         )) : i;
       }
       e = this.nodeFactory.create(Q, n);
-    } else if (e = this.extractOperand(), e instanceof ke)
+    } else if (e = this.extractOperand(), e instanceof xe)
       throw new d(
         this.peek(),
-        this.nodeFactory.create(ke, { pre: this.peek() }),
+        this.nodeFactory.create(xe, { pre: this.peek() }),
         this.contextStack.findHandlerContext(this.tokens, this.current)
       );
     return e;
@@ -1543,7 +1543,7 @@ class hn {
       this.peek(),
       o.INVALID_OPERAND,
       `Invalid start of operand "${this.peek().value}"`
-    ), this.nodeFactory.create(ke, { pre: this.previous() }));
+    ), this.nodeFactory.create(xe, { pre: this.previous() }));
   }
   /* Parsing FunctionExpression */
   functionExpression() {
@@ -1570,7 +1570,7 @@ class hn {
       u.NUMERIC_LITERAL
     ))
       return this.nodeFactory.create(U, {
-        expression: this.nodeFactory.create(Te, { literal: this.previous() })
+        expression: this.nodeFactory.create(be, { literal: this.previous() })
       });
     if (this.match(u.QUOTED_STRING, u.IDENTIFIER))
       return this.nodeFactory.create(U, {
@@ -1671,7 +1671,7 @@ function En(t) {
 const Nn = {
   "(": { left: 14, right: null }
 };
-function ut(t) {
+function lt(t) {
   return Nn[t.value] || { left: null, right: null };
 }
 var b = /* @__PURE__ */ ((t) => (t.Table = "table", t.Enum = "enum", t.Ref = "ref", t.Note = "note", t.Project = "project", t.Indexes = "indexes", t.TableGroup = "tablegroup", t))(b || {});
@@ -1688,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))) {
@@ -1727,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({
@@ -1741,26 +1741,26 @@ 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))
+  if (ut(t))
     return t instanceof te ? new S({ functional: [t], nonFunctional: [] }) : new S({ functional: [], nonFunctional: [t] });
-  if (t instanceof J && t.elementList.every(ht)) {
+  if (t instanceof J && t.elementList.every(ut)) {
     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 z(t) {
-  return W(t) ? t.expression instanceof Z ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new v();
+  return j(t) ? t.expression instanceof Z ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new w();
 }
 function mn(t) {
   var e;
@@ -1773,7 +1773,7 @@ function Tn(t) {
   const { tupleElements: s } = e.unwrap(), { tupleElements: i } = n.unwrap();
   return (s == null ? void 0 : s.length) === (i == null ? void 0 : i.length);
 }
-function ht(t) {
+function ut(t) {
   return t instanceof U && t.expression instanceof Z || t instanceof te;
 }
 function bn(t, e) {
@@ -1815,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 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;
+    return j(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 {
@@ -1846,7 +1846,7 @@ class Ln {
     return this.declarationNode.parent instanceof A ? [new l(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Ze(e) ? [] : [new l(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new l(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
+    return e ? wt(e) ? [] : [new l(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new l(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
   }
   validateAlias(e) {
     return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
@@ -1856,7 +1856,7 @@ class Ln {
     this.declarationNode.symbol = this.symbolFactory.create(Zt, { declaration: this.declarationNode, symbolTable: new we() });
     const { name: n } = this.declarationNode, s = C(n);
     if (s.isOk()) {
-      const i = s.unwrap(), r = i.pop(), a = Ke(i, this.publicSymbolTable, this.symbolFactory), c = ze(r);
+      const i = s.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), c = ze(r);
       a.has(c) && e.push(new l(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, n)), a.set(c, this.declarationNode.symbol);
     }
     return e;
@@ -1867,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) {
@@ -1881,13 +1881,13 @@ class Ln {
     });
   }
   validateFieldSettings(e) {
-    const n = j(e), s = n.getErrors(), i = n.getValue();
+    const n = W(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       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) => {
-            W(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
+            j(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
           });
           break;
         default:
@@ -1943,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) {
@@ -1961,20 +1961,20 @@ class gn {
     });
   }
   validateFieldSetting(e) {
-    const n = j(e), s = n.getErrors(), i = n.getValue();
+    const n = W(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         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) => {
-            W(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, c));
+            j(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":
@@ -2027,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))), 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);
+    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))), j(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) => {
@@ -2056,7 +2056,7 @@ class An {
     return this.declarationNode.parent instanceof A ? [new l(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Me(e) ? [] : [new l(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? ye(e) ? [] : [new l(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new l(o.UNEXPECTED_ALIAS, "A Project shouldn't have an alias", e)] : [];
@@ -2067,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)
@@ -2095,7 +2095,7 @@ class vn {
     return this.declarationNode.parent instanceof G ? [] : [new l(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
   }
   validateName(e) {
-    return e ? Me(e) ? [] : [new l(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? ye(e) ? [] : [new l(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
@@ -2106,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) {
@@ -2122,7 +2122,7 @@ class vn {
     }), n;
   }
   validateFieldSettings(e) {
-    const n = j(e), s = n.getErrors(), i = n.getValue();
+    const n = W(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
@@ -2151,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":
@@ -2175,13 +2175,13 @@ 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)] : wt(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)] : [];
   }
   validateSettingList(e) {
-    const n = j(e), s = n.getErrors(), i = n.getValue();
+    const n = W(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
@@ -2192,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) => {
-            W(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
+            j(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
           });
           break;
         default:
@@ -2203,14 +2203,14 @@ class yn {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(At, { declaration: this.declarationNode, symbolTable: new we() });
+    this.declarationNode.symbol = this.symbolFactory.create(_t, { declaration: this.declarationNode, symbolTable: new we() });
     const { name: n, alias: s } = this.declarationNode, i = C(n);
     if (i.isOk()) {
-      const r = [...i.unwrap()], a = r.pop(), c = Ke(r, this.publicSymbolTable, this.symbolFactory), p = Se(a);
+      const r = [...i.unwrap()], a = r.pop(), c = Ze(r, this.publicSymbolTable, this.symbolFactory), p = Oe(a);
       c.has(p) && e.push(new l(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, n)), c.set(p, this.declarationNode.symbol);
     }
-    if (s && Me(s) && !xn(s.expression.variable.value, i.unwrap_or([]))) {
-      const r = V(s).unwrap(), a = Se(r);
+    if (s && ye(s) && !xn(s.expression.variable.value, i.unwrap_or([]))) {
+      const r = V(s).unwrap(), a = Oe(r);
       this.publicSymbolTable.has(a) && e.push(new l(o.DUPLICATE_NAME, `Table name '${r}' already exists`, n)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
     }
     return e;
@@ -2218,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) {
@@ -2251,13 +2251,13 @@ 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 D))
+    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 D && (n = e.pop());
-    const s = j(n), i = s.getErrors(), r = s.getValue();
+    const s = W(n), i = s.getErrors(), r = s.getValue();
     for (const p of e) {
       const h = V(p).unwrap_or("").toLowerCase();
       if (h !== "pk" && h !== "unique") {
@@ -2273,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) => {
-            W(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
+            j(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
           });
           break;
         case "ref":
@@ -2283,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":
@@ -2338,15 +2338,15 @@ class yn {
   }
 }
 function kn(t) {
-  if (!(t instanceof H || Je(t) || t instanceof U || t instanceof le))
+  if (!(t instanceof H || Je(t) || t instanceof U || t instanceof ue))
     return !1;
   if (t instanceof H) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ue(n) || W(n) || Ne(n)))
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => he(n) || j(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;
   }
@@ -2367,7 +2367,7 @@ class Sn {
     return this.declarationNode.parent instanceof A ? [new l(o.INVALID_TABLEGROUP_CONTEXT, "TableGroup must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Ze(e) ? [] : [new l(o.INVALID_NAME, "A TableGroup name must be of the form <tablegroup> or <schema>.<tablegroup>", e)] : [new l(o.NAME_NOT_FOUND, "A TableGroup must have a name", this.declarationNode)];
+    return e ? ye(e) ? [] : [new l(o.INVALID_NAME, "A TableGroup name must be a single identifier", e)] : [new l(o.NAME_NOT_FOUND, "A TableGroup must have a name", this.declarationNode)];
   }
   validateAlias(e) {
     return e ? [new l(o.UNEXPECTED_ALIAS, "A TableGroup shouldn't have an alias", e)] : [];
@@ -2377,9 +2377,9 @@ class Sn {
     this.declarationNode.symbol = this.symbolFactory.create(tn, { declaration: this.declarationNode, symbolTable: new we() });
     const n = C(e);
     if (n.isOk()) {
-      const s = n.unwrap(), i = s.pop(), r = Ke(s, this.publicSymbolTable, this.symbolFactory), a = qe(i);
+      const s = n.unwrap(), i = s.pop(), r = Ze(s, this.publicSymbolTable, this.symbolFactory), a = qe(i);
       if (r.has(a))
-        return [new l(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists in schema '${s.join(".") || "public"}'`, e)];
+        return [new l(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists`, e)];
       r.set(a, this.declarationNode.symbol);
     }
     return [];
@@ -2390,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) {
@@ -2426,7 +2426,7 @@ class Sn {
     return [];
   }
 }
-const wt = ["-", "+"];
+const vt = ["-", "+"];
 function re(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
@@ -2447,28 +2447,28 @@ function re(t) {
       return In;
   }
 }
-function Ze(t) {
+function wt(t) {
   return !!C(t).unwrap_or(!1);
 }
 function On(t) {
-  return Me(t);
+  return ye(t);
 }
-function Me(t) {
+function ye(t) {
   return t instanceof U && t.expression instanceof Z;
 }
-function Ke(t, e, n) {
+function Ze(t, e, n) {
   var i;
   t[0] === "public" && (t = t.slice(1));
   let s = e;
   for (const r of t) {
     let a;
-    const c = We(r);
+    const c = je(r);
     if (s.has(c)) {
       if (a = (i = s.get(c)) == null ? void 0 : i.symbolTable, !a)
         throw new Error("Expect a symbol table in a schema symbol");
     } else {
       a = new we();
-      const p = n.create(_t, { symbolTable: a });
+      const p = n.create(gt, { symbolTable: a });
       s.set(c, p);
     }
     s = a;
@@ -2480,7 +2480,7 @@ function yt(t) {
 }
 function Rn(t) {
   var n;
-  if (!(t instanceof U) || !(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] !== "#")
@@ -2490,16 +2490,16 @@ function Rn(t) {
       return !1;
   return !0;
 }
-function ce(t) {
+function le(t) {
   return t === void 0;
 }
 function Dn(t) {
   var e;
-  return !!(W(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 !!(j(t) || he(t) || me(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && vt.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 U && 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;
@@ -2511,7 +2511,7 @@ function Pn(t) {
 function kt(t) {
   return t instanceof J && t.elementList.every(M);
 }
-function j(t) {
+function W(t) {
   var s;
   const e = {}, n = [];
   if (!t)
@@ -2523,14 +2523,14 @@ function j(t) {
       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);
 }
-class ft {
+class ht {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(_t, {
+    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(gt, {
       symbolTable: new we()
     }), this.ast.symbol = this.publicSchemaSymbol, this.ast.symbol.declaration = this.ast;
   }
@@ -2562,7 +2562,7 @@ class ae {
       for (const s of e.elementList) {
         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()];
@@ -2602,7 +2602,7 @@ class ae {
           return;
         this.bindFragments([e], n);
       } else
-        e instanceof q ? 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 J && 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 Ue ? 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,
@@ -2849,7 +2849,7 @@ class $n {
     return new B(this.ast, this.errors);
   }
 }
-class jn {
+class Wn {
   constructor(e) {
     this.generator = e;
   }
@@ -2857,20 +2857,20 @@ class jn {
     return new e(n, this.generator.nextId());
   }
 }
-class Wn {
+class jn {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = new jn(n);
+    this.ast = e, this.symbolFactory = new Wn(n);
   }
   // Analyzing: Invoking both the validator and binder
   analyze() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new $n(n).resolve());
+    return new ht(this.ast, this.symbolFactory).validate().chain((n) => new $n(n).resolve());
   }
   // For invoking the validator only
   validate() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new B(n, []));
+    return new ht(this.ast, this.symbolFactory).validate().chain((n) => new B(n, []));
   }
 }
-function pt(t, e) {
+function ft(t, e) {
   const { variables: n, tupleElements: s } = _e(t).unwrap();
   return s ? n.length === 0 ? {
     schemaName: e.schemaName,
@@ -2903,7 +2903,7 @@ function St(t) {
   }
   throw new Error("Invalid relation op");
 }
-function y(t) {
+function v(t) {
   return {
     start: {
       offset: t.startPos.offset,
@@ -2915,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();
+  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(),
@@ -2944,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(`
@@ -2955,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),
@@ -2974,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) {
@@ -2992,16 +2992,16 @@ class Pt {
   }
   interpretSettingList(e) {
     var i, r, a;
-    const n = j(e).getValue();
+    const n = W(e).getValue();
     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: z(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) {
@@ -3010,8 +3010,8 @@ class Pt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: z(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);
@@ -3027,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 D) {
-      const _ = j(r.pop()).getValue();
+      const _ = W(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: z(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((Y) => {
-        const [nt] = $e(Y.value.expression);
-        if (Dt(nt, e.symbol))
+      const oe = _.ref || [];
+      s.inline_refs = oe.flatMap((Y) => {
+        const [tt] = $e(Y.value.expression);
+        if (Dt(tt, e.symbol))
           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 fe;
+        const ke = 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],
-            relation: ye.value,
-            token: y(Y)
+            fieldNames: [ce],
+            relation: ke.value,
+            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(Y)
+            relation: ke.value,
+            token: v(Y)
           };
         } else if (ee.length === 3) {
-          const [oe, Le, it] = ee;
-          fe = {
-            schemaName: oe,
+          const [ce, Le, st] = ee;
+          pe = {
+            schemaName: ce,
             tableName: Le,
-            fieldNames: [it],
-            relation: ye.value,
-            token: y(Y)
+            fieldNames: [st],
+            relation: ke.value,
+            token: v(Y)
           };
         } else {
           n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", Y));
-          const oe = ee.pop(), Le = ee.pop();
-          fe = {
+          const ce = ee.pop(), Le = ee.pop();
+          pe = {
             schemaName: ee.join("."),
             tableName: Le,
-            fieldNames: [oe],
-            relation: ye.value,
-            token: y(Y)
+            fieldNames: [ce],
+            relation: ke.value,
+            token: v(Y)
           };
         }
-        const st = this.registerInlineRefToEnv(e, nt, fe, Y);
-        return n.push(...st), st.length === 0 ? fe : [];
+        const nt = this.registerInlineRefToEnv(e, tt, pe, Y);
+        return n.push(...nt), nt.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;
@@ -3092,15 +3092,15 @@ 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 D) {
-        const g = j(r.pop()).getValue();
+        const g = W(r.pop()).getValue();
         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: z(_.value).unwrap(),
-          token: y(_)
+          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) => {
@@ -3113,13 +3113,15 @@ class Pt {
       }).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;
@@ -3146,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]
         }
       ]
@@ -3155,11 +3157,11 @@ class Pt {
 }
 function Yn(t) {
   let e = null;
-  t instanceof H && (e = t.argumentList.elementList.map((r) => ue(r) ? r.expression.literal.value : W(r) ? z(r).unwrap() : X(r).unwrap()).join(","), t = t.callee);
+  t instanceof H && (e = t.argumentList.elementList.map((r) => he(r) ? r.expression.literal.value : j(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],
@@ -3176,22 +3178,22 @@ function Yn(t) {
 function zn(t) {
   var e, n, s;
   if (t) {
-    if (W(t))
+    if (j(t))
       return {
         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 && vt.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,
@@ -3211,30 +3213,30 @@ 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) {
     var s, i, r;
-    const n = j(e).getValue();
+    const n = W(e).getValue();
     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 {
@@ -3242,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;
@@ -3263,22 +3265,22 @@ class Ut {
         new l(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[c])
       ];
     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);
+      const g = W(e.args[0]).getValue(), _ = (T = (h = g.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value;
+      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),
+        ...ft(s, this.container),
         relation: p[0],
-        token: y(s)
+        token: v(s)
       },
       {
-        ...pt(i, this.container),
+        ...ft(i, this.container),
         relation: p[1],
-        token: y(i)
+        token: v(i)
       }
     ], this.env.refIds[c] = this.declarationNode, [];
   }
@@ -3289,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) {
@@ -3303,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));
@@ -3321,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();
-      const a = (c = j(s.args[0]).getValue().note) == null ? void 0 : c.at(0);
+      i.token = v(s), i.name = X(s.callee).unwrap();
+      const a = (c = W(s.args[0]).getValue().note) == null ? void 0 : c.at(0);
       return i.note = a && {
-        value: z(a.value).map(Ee).unwrap(),
-        token: y(a)
+        value: z(a.value).map(Ne).unwrap(),
+        token: v(a)
       }, this.enum.values.push(i), [];
     });
   }
@@ -3345,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) {
@@ -3376,8 +3378,8 @@ class qn {
         }
         case "note":
           return this.project.note = {
-            value: z(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()] = z(s.body.callee).unwrap(), [];
@@ -3455,7 +3457,7 @@ function Ae(t) {
       return L.Text;
   }
 }
-function Re(t, e) {
+function De(t, e) {
   if (!t || Ce(t))
     return !1;
   for (const n of t.trailingTrivia) {
@@ -3471,7 +3473,7 @@ function O() {
     suggestions: []
   };
 }
-function De(t) {
+function Pe(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
@@ -3485,11 +3487,11 @@ function Fe(t) {
     ...t,
     suggestions: t.suggestions.map((e) => ({
       ...e,
-      insertText: e.insertText.split("").every(Ue) ? e.insertText : `"${e.insertText}"`
+      insertText: e.insertText.split("").every(Me) ? e.insertText : `"${e.insertText}"`
     }))
   };
 }
-function et(t, e) {
+function Ke(t, e) {
   return t.getOffsetAt(e);
 }
 class Bt {
@@ -3498,20 +3500,20 @@ class Bt {
   }
   provideCompletionItems(e, n) {
     var T, f;
-    const s = et(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), c = a === void 0 ? i[0] : i[a + 1];
+    const s = Ke(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), c = a === void 0 ? i[0] : i[a + 1];
     if ([
       ...(r == null ? void 0 : r.trailingTrivia) || [],
       ...(r == null ? void 0 : r.leadingTrivia) || [],
       ...(c == null ? void 0 : c.leadingTrivia) || []
-    ].find((N) => Wt(N) && ge(s, N)))
+    ].find((N) => jt(N) && ge(s, N)))
       return O();
     if (a === void 0)
-      return Tt();
+      return mt();
     if ([u.STRING_LITERAL, u.QUOTED_STRING].includes(r.kind) && ge(s, r))
       return O();
     const p = this.compiler.container.element(s);
     if (this.compiler.container.scopeKind(s) === R.TOPLEVEL || p instanceof A && p.type && p.type.start <= s && p.type.end >= s)
-      return Tt();
+      return mt();
     const h = [...this.compiler.container.stack(s)].reverse();
     for (const N of h)
       if (N instanceof Q)
@@ -3520,7 +3522,7 @@ class Bt {
           case "<":
           case "<>":
           case "-":
-            return dt(
+            return pt(
               this.compiler,
               s,
               N
@@ -3532,7 +3534,7 @@ class Bt {
           case "<":
           case "<>":
           case "-":
-            return dt(
+            return pt(
               this.compiler,
               s,
               N
@@ -3546,20 +3548,20 @@ class Bt {
         }
       else {
         if (N instanceof se)
-          return Et(this.compiler, s, N);
+          return dt(this.compiler, s, N);
         if (N instanceof D)
-          return Et(this.compiler, s, N);
+          return dt(this.compiler, s, N);
         if (N instanceof J)
           return Zn(this.compiler, s);
-        if (N instanceof w)
-          return mt(this.compiler, s, N);
+        if (N instanceof y)
+          return Nt(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);
+          return Nt(this.compiler, s, void 0);
       }
     return O();
   }
 }
-function dt(t, e, n) {
+function pt(t, e, n) {
   const s = t.container.scopeKind(e);
   if ([R.REF, R.TABLE].includes(s)) {
     const i = Be(t, e, t.container.element(e), [
@@ -3567,7 +3569,7 @@ function dt(t, e, n) {
       m.Schema,
       m.Column
     ]);
-    return Re(n.op, e) ? De(i) : i;
+    return De(n.op, e) ? Pe(i) : i;
   }
   return O();
 }
@@ -3617,25 +3619,25 @@ function Zn(t, e) {
   }
   return O();
 }
-function Et(t, e, n) {
+function dt(t, e, n) {
   const { token: s } = t.container.token(e);
   if ([u.COMMA, u.LBRACKET].includes(s == null ? void 0 : s.kind)) {
-    const i = Nt(t, e);
-    return (s == null ? void 0 : s.kind) === u.COMMA && Re(s, e) ? De(i) : i;
+    const i = Et(t, e);
+    return (s == null ? void 0 : s.kind) === u.COMMA && De(s, e) ? Pe(i) : i;
   }
   if (n.name && n.name.start <= e && n.name.end >= e)
-    return Nt(t, e);
+    return Et(t, e);
   if (n.name instanceof $) {
     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;
+    return (s == null ? void 0 : s.kind) === u.COLON && De(s, e) ? Pe(i) : i;
   }
   return O();
 }
-function Nt(t, e) {
+function Et(t, e) {
   const n = t.container.element(e), s = t.container.scopeKind(e);
   if (n instanceof G)
     return O();
@@ -3761,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());
@@ -3774,7 +3776,7 @@ function Vt(t, e, n) {
     }))
   });
 }
-function mt(t, e, n) {
+function Nt(t, e, n) {
   var i;
   switch (t.container.scopeKind(e)) {
     case R.TABLE:
@@ -3787,7 +3789,7 @@ function mt(t, e, n) {
       return es(t, e, n);
     case R.REF: {
       const r = Gt(t, e);
-      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && Re(t.container.token(e).token, e) ? De(r) : r;
+      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && De(t.container.token(e).token, e) ? Pe(r) : r;
     }
     case R.TABLEGROUP:
       return ss(t);
@@ -3795,7 +3797,7 @@ function mt(t, e, n) {
       return O();
   }
 }
-function Tt() {
+function mt() {
   return {
     suggestions: ["Table", "TableGroup", "Enum", "Project", "Ref"].map((t) => ({
       label: t,
@@ -3807,7 +3809,7 @@ function Tt() {
   };
 }
 function es(t, e, n) {
-  return n != null && n.callee && tt(e, n) === 1 ? Be(t, e, t.container.element(e), [
+  return n != null && n.callee && et(e, n) === 1 ? Be(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
@@ -3824,7 +3826,7 @@ function ts(t, e, n) {
         range: void 0
       }))
     };
-  const s = tt(e, n);
+  const s = et(e, n);
   return s === 0 ? {
     suggestions: ["Note", "indexes"].map((i) => ({
       label: i,
@@ -3836,7 +3838,7 @@ function ts(t, e, n) {
   } : s === 1 ? rs(t, e) : O();
 }
 function ns(t, e, n) {
-  return n != null && n.callee ? tt(e, n) === 0 ? {
+  return n != null && n.callee ? et(e, n) === 0 ? {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
@@ -3958,7 +3960,7 @@ function rs(t, e) {
 }
 function Ct(t, e) {
   const n = t.container.element(e), s = n == null ? void 0 : n.parent;
-  if (!((s == null ? void 0 : s.symbol) instanceof At))
+  if (!((s == null ? void 0 : s.symbol) instanceof _t))
     return O();
   const { symbolTable: i } = s.symbol;
   return Fe({
@@ -3977,7 +3979,7 @@ function Ct(t, e) {
     })
   });
 }
-function tt(t, e) {
+function et(t, e) {
   if (!e.callee)
     return -1;
   const n = [e.callee, ...e.args], s = n.findIndex((i) => t <= i.end);
@@ -3989,10 +3991,10 @@ class Xt {
   }
   provideDefinition(e, n) {
     var a;
-    const { uri: s } = e, i = et(e, n), r = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = Ke(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 [
           {
@@ -4015,13 +4017,13 @@ class $t {
     this.compiler = e;
   }
   provideReferences(e, n) {
-    const { uri: s } = e, i = et(e, n), r = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = Ke(e, n), r = [...this.compiler.container.stack(i)];
     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)
@@ -4056,7 +4058,7 @@ class ls {
     ).fill(null), this.nodeIdGenerator = new Yt(), this.symbolIdGenerator = new Jt(), this.token = {
       invalidStream: this.createQuery(
         6,
-        () => this.parse.tokens().filter(vt)
+        () => this.parse.tokens().filter(At)
       ),
       // Valid + Invalid tokens (which are guarenteed to be non-trivials) are included in the stream
       flatStream: this.createQuery(
@@ -4068,7 +4070,7 @@ class ls {
       _: this.createQuery(
         0,
         () => {
-          const e = new cn(this.source).lex().chain((n) => new hn(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new Wn(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
+          const e = new cn(this.source).lex().chain((n) => new hn(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new jn(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
           return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new Hn(n).interpret().map((r) => ({ ast: n, tokens: s, rawDb: r })));
         }
       ),
@@ -4116,7 +4118,7 @@ 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] === `