@dbml/parse 3.9.5 → 3.9.6

package/dist/dbml-parse.mjs

@@ -1,6 +1,6 @@
-import I, { partition as Yt, findLastIndex as zt, last as rt } from "lodash";
+import I, { last as Ce, partition as zt, findLastIndex as Qt } 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 Qt(t) {
+function qt(t) {
   switch (t.kind) {
     case "<newline>":
     case "<space>":
@@ -36,12 +36,12 @@ function at(t) {
 function ot(t) {
   return t !== void 0 && t.kind === "<op>";
 }
-class F {
+class B {
   constructor(e, n, s, i, r) {
     this.kind = e, this.startPos = n, this.endPos = s, this.value = i, this.leadingTrivia = [], this.trailingTrivia = [], this.leadingInvalid = [], this.trailingInvalid = [], this.isInvalid = r, this.start = n.offset, this.end = s.offset;
   }
   static create(e, n, s, i, r) {
-    return new F(e, n, s, i, r);
+    return new B(e, n, s, i, r);
   }
 }
 function It(t) {
@@ -50,21 +50,21 @@ function It(t) {
 function lt(t, e) {
   return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || It(t);
 }
-function Ce(t) {
-  return t.trailingTrivia.find(({ kind: e }) => e === u.SPACE) !== void 0;
+function Xe(t) {
+  return t.trailingTrivia.find(({ kind: e }) => [u.SPACE, u.TAB].includes(e)) !== void 0;
 }
 function Lt(t) {
-  return t.trailingTrivia.length === 0 ? t.end : Lt(I.last(t.trailingTrivia));
+  return t.trailingTrivia.length === 0 ? t.end : Lt(Ce(t.trailingTrivia));
 }
 function gt(t) {
   return t.leadingTrivia.length === 0 ? t.start : gt(t.leadingTrivia[0]);
 }
-function qt(t) {
+function Ht(t) {
   return [u.SINGLE_LINE_COMMENT, u.MULTILINE_COMMENT].includes(
     t.kind
   );
 }
-class Ht {
+class Jt {
   constructor() {
     this.id = 0;
   }
@@ -75,19 +75,19 @@ class Ht {
     return this.id++;
   }
 }
-class x {
+class k {
   // The symbol that this syntax node refers to
   // args must be passed in order of appearance in the node
   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 ? gt(i) : i.fullStart) : (this.startPos = {
+    i ? (this.startPos = i.startPos, this.fullStart = i instanceof B ? gt(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 ? Lt(r) : r.fullEnd) : (this.endPos = {
+    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof B ? Lt(r) : r.fullEnd) : (this.endPos = {
       offset: NaN,
       column: NaN,
       line: NaN
@@ -95,12 +95,12 @@ class x {
   }
 }
 var Ne = /* @__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))(Ne || {});
-class X extends x {
+class $ extends k {
   constructor({ body: e = [], eof: n }, s) {
     super(s, "<program>", [...e, n]), this.body = e, this.eof = n;
   }
 }
-class v extends x {
+class A extends k {
   constructor({
     type: e,
     name: n,
@@ -118,17 +118,17 @@ class v extends x {
       r,
       a,
       l
-    ]), l && a && !(l instanceof w || l instanceof v))
+    ]), l && a && !(l instanceof v || l 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 = l;
   }
 }
-class Y extends x {
+class z extends k {
   constructor({ identifiers: e = [] }, n) {
     super(n, "<identifer-stream>", e || []), this.identifiers = e;
   }
 }
-class se extends x {
+class ie extends k {
   constructor({
     name: e,
     colon: n,
@@ -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 k {
   constructor({ op: e, expression: n }, s) {
     super(s, "<prefix-expression>", [e, n]), this.op = e, this.expression = n;
   }
 }
-class q extends x {
+class H extends k {
   constructor({
     op: e,
     leftExpression: n,
@@ -151,22 +151,22 @@ class q extends x {
     super(i, "<infix-expression>", [n, e, s]), this.op = e, this.leftExpression = n, this.rightExpression = s;
   }
 }
-class Ue extends x {
+class Ue extends k {
   constructor({ op: e, expression: n }, s) {
     super(s, "<postfix-expression>", [n, e]), this.op = e, this.expression = n;
   }
 }
-class ne extends x {
+class se extends k {
   constructor({ value: e }, n) {
     super(n, "<function-expression>", [e]), this.value = e;
   }
 }
-class w extends x {
+class v extends k {
   constructor({ callee: e, args: n = [] }, s) {
     super(s, "<function-application>", [e, ...n]), this.callee = e, this.args = n;
   }
 }
-class J extends x {
+class Z extends k {
   constructor({
     blockOpenBrace: e,
     body: n = [],
@@ -175,7 +175,7 @@ class J extends x {
     super(i, "<block-expression>", [e, ...n, s]), this.blockOpenBrace = e, this.body = n, this.blockCloseBrace = s;
   }
 }
-class R extends x {
+class P extends k {
   constructor({
     listOpenBracket: e,
     elementList: n = [],
@@ -189,7 +189,7 @@ class R extends x {
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
 }
-class Z extends x {
+class K extends k {
   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 We extends Z {
+class je extends K {
   constructor({
     groupOpenParen: e,
     expression: n,
@@ -220,7 +220,7 @@ class We extends Z {
     ), this.kind = "<group-expression>";
   }
 }
-class H extends x {
+class J extends k {
   constructor({
     callee: e,
     argumentList: n
@@ -228,28 +228,28 @@ class H extends x {
     super(s, "<call-expression>", [e, n]), this.callee = e, this.argumentList = n;
   }
 }
-class be extends x {
+class be extends k {
   constructor({ literal: e }, n) {
     super(n, "<literal>", [e]), this.literal = e;
   }
 }
-class K extends x {
+class ee extends k {
   constructor({ variable: e }, n) {
     super(n, "<variable>", [e]), this.variable = e;
   }
 }
-class U extends x {
+class M extends k {
   constructor({ expression: e }, n) {
     super(n, "<primary-expression>", [e]), this.expression = e;
   }
 }
-class xe extends x {
+class xe extends k {
   constructor({ pre: e }, n) {
-    const s = F.create(u.SPACE, e.endPos, e.endPos, " ", !1);
+    const s = B.create(u.SPACE, e.endPos, e.endPos, " ", !1);
     super(n, "<dummy>", [s]);
   }
 }
-class he extends x {
+class he extends k {
   constructor({ expression: e, indexer: n }, s) {
     super(s, "<array>", [e, n]), this.array = e, this.indexer = n;
   }
@@ -264,12 +264,12 @@ function _t(t, e) {
     (i) => i !== null
   );
 }
-function us(t, e = !1) {
+function hs(t, e = !1) {
   return JSON.stringify(
     t,
     function(n, s) {
       var i;
-      return !(this instanceof X) && n === "symbol" ? s == null ? void 0 : s.id : (
+      return !(this instanceof $) && n === "symbol" ? s == null ? void 0 : s.id : (
         /* this instanceof SyntaxNode && */
         n === "symbol" ? {
           symbolTable: s == null ? void 0 : s.symbolTable,
@@ -290,7 +290,7 @@ function us(t, e = !1) {
     e ? 2 : 0
   );
 }
-class S {
+class x {
   constructor(e) {
     this.value = e;
   }
@@ -305,14 +305,14 @@ class S {
     return e(this.value);
   }
   map(e) {
-    return new S(e(this.value));
+    return new x(e(this.value));
   }
   // eslint-disable-next-line class-methods-use-this
   isOk() {
     return !0;
   }
 }
-class k {
+class y {
   // eslint-disable-next-line class-methods-use-this
   unwrap() {
     throw new Error("Trying to unwrap a None value");
@@ -323,11 +323,11 @@ class k {
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
   and_then(e) {
-    return new k();
+    return new y();
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
   map(e) {
-    return new k();
+    return new y();
   }
   // eslint-disable-next-line class-methods-use-this
   isOk() {
@@ -335,73 +335,73 @@ class k {
   }
 }
 var T = /* @__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))(T || {});
-function je(t) {
+function Ye(t) {
   return `Schema:${t}`;
 }
 function Oe(t) {
   return `Table:${t}`;
 }
-function Ye(t) {
+function ze(t) {
   return `Column:${t}`;
 }
-function ze(t) {
+function Qe(t) {
   return `Enum:${t}`;
 }
-function Qe(t) {
+function qe(t) {
   return `Enum field:${t}`;
 }
-function qe(t) {
+function He(t) {
   return `TableGroup:${t}`;
 }
-function He(t) {
+function Je(t) {
   return `TableGroup field:${t}`;
 }
-function Jt(t) {
+function Zt(t) {
   return `Note:${t}`;
 }
 function Ve(t, e) {
   switch (e) {
     case "Column":
-      return Ye(t);
-    case "Enum":
       return ze(t);
-    case "Enum field":
+    case "Enum":
       return Qe(t);
+    case "Enum field":
+      return qe(t);
     case "Schema":
-      return je(t);
+      return Ye(t);
     case "Table":
       return Oe(t);
     case "TableGroup":
-      return qe(t);
-    case "TableGroup field":
       return He(t);
+    case "TableGroup field":
+      return Je(t);
     default:
       throw new Error("Unreachable");
   }
 }
-function ie(t) {
+function re(t) {
   const [e, n] = t.split(":");
-  return Object.values(T).includes(e) ? new S({
+  return Object.values(T).includes(e) ? new x({
     name: n,
     kind: e
-  }) : new k();
+  }) : new y();
 }
-function Zt(t) {
-  const e = ie(t).unwrap_or(void 0);
+function Kt(t) {
+  const e = re(t).unwrap_or(void 0);
   if (!e)
     return !1;
   const { kind: n, name: s } = e;
   return n === "Schema" && s === "public";
 }
-function Kt(t) {
+function en(t) {
   return [
-    je,
+    Ye,
     Oe,
+    Qe,
+    He,
     ze,
     qe,
-    Ye,
-    Qe,
-    He
+    Je
   ].map((e) => e(t));
 }
 function Me(t) {
@@ -411,7 +411,7 @@ function De(t) {
   const [e] = t;
   return e >= "0" && e <= "9";
 }
-function en(t) {
+function tn(t) {
   const [e] = t;
   return De(e) || Me(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
@@ -427,7 +427,7 @@ function ct(t, e) {
 function ge(t, e) {
   return t >= e.start && t < e.end;
 }
-class tn {
+class nn {
   constructor() {
     this.id = 0;
   }
@@ -443,12 +443,12 @@ class At {
     this.references = [], this.id = n, this.symbolTable = e;
   }
 }
-class nn {
+class sn {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class sn {
+class rn {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
@@ -458,17 +458,17 @@ class vt {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class rn {
+class an {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class an {
+class on {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class on {
+class ln {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
@@ -479,7 +479,7 @@ class c extends Error {
     super(n), this.code = e, this.diagnostic = n, this.nodeOrToken = s, this.start = s.start, this.end = s.end, this.name = this.constructor.name, Object.setPrototypeOf(this, c.prototype);
   }
 }
-class V {
+class G {
   constructor(e, n) {
     this.value = e, this.errors = n === void 0 ? [] : n;
   }
@@ -491,21 +491,21 @@ class V {
   }
   chain(e) {
     const n = e(this.value), s = [...this.errors, ...n.errors];
-    return new V(n.value, s);
+    return new G(n.value, s);
   }
   map(e) {
-    return new V(e(this.value), this.errors);
+    return new G(e(this.value), this.errors);
   }
 }
-function ln(t, e, n) {
+function cn(t, e, n) {
   if (!t || !me(t) || e.length === 0)
-    return new k();
+    return new y();
   const s = [...e], i = Ge(t).unwrap(), r = s.pop();
-  if (!(r instanceof J))
-    return new k();
-  const a = I.last(s) instanceof R ? s.pop() : void 0;
-  return s.length === 3 && Ge(s[1]).unwrap().value === "as" ? new S(
-    n.create(v, {
+  if (!(r instanceof Z))
+    return new y();
+  const a = I.last(s) instanceof P ? s.pop() : void 0;
+  return s.length === 3 && Ge(s[1]).unwrap().value === "as" ? new x(
+    n.create(A, {
       type: i,
       name: s[0],
       as: Ge(s[1]).unwrap(),
@@ -513,75 +513,75 @@ function ln(t, e, n) {
       attributeList: a,
       body: r
     })
-  ) : s.length === 1 ? new S(
-    n.create(v, {
+  ) : s.length === 1 ? new x(
+    n.create(A, {
       type: i,
       name: s[0],
       attributeList: a,
       body: r
     })
-  ) : s.length === 0 ? new S(
-    n.create(v, {
+  ) : s.length === 0 ? new x(
+    n.create(A, {
       type: i,
       attributeList: a,
       body: r
     })
-  ) : new k();
+  ) : new y();
 }
 function ut(t) {
   return t.kind === u.IDENTIFIER && t.value === "as";
 }
 function N(t) {
-  t && (t instanceof F ? cn(t) : un(t));
+  t && (t instanceof B ? un(t) : hn(t));
 }
-function cn(t) {
+function un(t) {
   t.kind !== u.EOF && (t.isInvalid = !0);
 }
-function un(t) {
-  if (t instanceof v)
+function hn(t) {
+  if (t instanceof A)
     N(t.type), N(t.name), N(t.as), N(t.alias), N(t.bodyColon), N(t.attributeList), N(t.body);
-  else if (t instanceof Y)
+  else if (t instanceof z)
     t.identifiers.forEach(N);
-  else if (t instanceof se)
+  else if (t instanceof ie)
     N(t.name), N(t.colon), N(t.value);
-  else if (t instanceof Q)
-    N(t.op), N(t.expression);
   else if (t instanceof q)
+    N(t.op), N(t.expression);
+  else if (t instanceof H)
     N(t.leftExpression), N(t.op), N(t.rightExpression);
   else if (t instanceof Ue)
     N(t.op), N(t.expression);
-  else if (t instanceof J)
+  else if (t instanceof Z)
     N(t.blockOpenBrace), t.body.forEach(N), N(t.blockCloseBrace);
-  else if (t instanceof R)
+  else if (t instanceof P)
     N(t.listOpenBracket), t.commaList.forEach(N), t.elementList.forEach(N), N(t.listCloseBracket);
-  else if (t instanceof Z)
+  else if (t instanceof K)
     N(t.tupleOpenParen), t.commaList.forEach(N), t.elementList.forEach(N), N(t.tupleCloseParen);
-  else if (t instanceof H)
+  else if (t instanceof J)
     N(t.callee), N(t.argumentList);
-  else if (t instanceof w)
+  else if (t instanceof v)
     N(t.callee), t.args.forEach(N);
-  else if (t instanceof U)
+  else if (t instanceof M)
     N(t.expression);
-  else if (t instanceof ne)
+  else if (t instanceof se)
     N(t.value);
-  else if (t instanceof K)
+  else if (t instanceof ee)
     N(t.variable);
   else if (t instanceof be)
     N(t.literal);
   else
-    throw t instanceof We ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
+    throw t instanceof je ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
 }
 function wt(t) {
   return !!(t != null && t.isInvalid);
 }
-function P(...t) {
+function U(...t) {
   return t.filter((e) => e !== void 0);
 }
-function hn(t) {
-  if (t instanceof X)
-    return P(...t.body, t.eof);
-  if (t instanceof v)
-    return P(
+function fn(t) {
+  if (t instanceof $)
+    return U(...t.body, t.eof);
+  if (t instanceof A)
+    return U(
       t.type,
       t.name,
       t.as,
@@ -590,74 +590,74 @@ function hn(t) {
       t.bodyColon,
       t.body
     );
-  if (t instanceof se)
-    return P(t.name, t.colon, t.value);
-  if (t instanceof Y)
+  if (t instanceof ie)
+    return U(t.name, t.colon, t.value);
+  if (t instanceof z)
     return t.identifiers;
   if (t instanceof be)
     return t.literal ? [t.literal] : [];
-  if (t instanceof K)
-    return P(t.variable);
-  if (t instanceof Q)
-    return P(t.op, t.expression);
+  if (t instanceof ee)
+    return U(t.variable);
   if (t instanceof q)
-    return P(t.leftExpression, t.op, t.rightExpression);
+    return U(t.op, t.expression);
+  if (t instanceof H)
+    return U(t.leftExpression, t.op, t.rightExpression);
   if (t instanceof Ue)
-    return P(t.expression, t.op);
-  if (t instanceof ne)
-    return P(t.value);
-  if (t instanceof w)
-    return P(t.callee, ...t.args);
-  if (t instanceof J)
-    return P(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
-  if (t instanceof R)
-    return P(
+    return U(t.expression, t.op);
+  if (t instanceof se)
+    return U(t.value);
+  if (t instanceof v)
+    return U(t.callee, ...t.args);
+  if (t instanceof Z)
+    return U(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
+  if (t instanceof P)
+    return U(
       t.listOpenBracket,
       ...ct(t.elementList, t.commaList),
       t.listCloseBracket
     );
-  if (t instanceof Z)
-    return P(
+  if (t instanceof K)
+    return U(
       t.tupleOpenParen,
       ...ct(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 J)
+    return U(t.callee, t.argumentList);
+  if (t instanceof M)
+    return U(t.expression);
   if (t instanceof he)
-    return P(
+    return U(
       t.array,
       t.indexer
     );
-  throw t instanceof We ? new Error("This case is already handled by TupleExpressionNode") : new Error("Unreachable - no other possible cases");
+  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 k();
+  return F(t) ? new x(t.expression.variable) : new y();
 }
-function $(t) {
+function W(t) {
   var e;
-  return t instanceof U && (t.expression instanceof K && 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);
+  return t instanceof M && (t.expression instanceof ee && t.expression.variable instanceof B && 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 K && t.expression.variable instanceof F;
+function F(t) {
+  return t instanceof M && t.expression instanceof ee && t.expression.variable instanceof B;
 }
 function me(t) {
   var e;
-  return t instanceof U && t.expression instanceof K && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
+  return t instanceof M && t.expression instanceof ee && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
 }
-function Je(t) {
+function Ze(t) {
   var e;
-  return t instanceof q && t.leftExpression instanceof x && t.rightExpression instanceof x && ((e = t.op) == null ? void 0 : e.value) === ".";
+  return t instanceof H && t.leftExpression instanceof k && t.rightExpression instanceof k && ((e = t.op) == null ? void 0 : e.value) === ".";
 }
 function Te(t) {
   if (t === void 0)
-    return new k();
+    return new y();
   const e = t.identifiers.map((n) => n.value).join(" ");
-  return e === "" ? new k() : new S(e);
+  return e === "" ? new y() : new x(e);
 }
-class fn {
+class pn {
   // list of errors during lexing
   constructor(e) {
     this.start = {
@@ -697,7 +697,7 @@ class fn {
     this.tokens.push(this.createToken(e, n));
   }
   createToken(e, n = !1) {
-    return F.create(
+    return B.create(
       e,
       this.start,
       this.current,
@@ -706,7 +706,7 @@ class fn {
     );
   }
   lex() {
-    return this.scanTokens(), this.tokens.push(F.create(u.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new V(this.tokens, this.errors);
+    return this.scanTokens(), this.tokens.push(B.create(u.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new G(this.tokens, this.errors);
   }
   scanTokens() {
     for (; !this.isAtEnd(); ) {
@@ -795,7 +795,7 @@ class fn {
     let e = !0, n = [], s;
     const i = [];
     for (const r of this.tokens)
-      Qt(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);
+      qt(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() {
@@ -843,7 +843,7 @@ class fn {
       );
       return;
     }
-    a && this.match(n), this.tokens.push(F.create(e, this.start, this.current, l, !1));
+    a && this.match(n), this.tokens.push(B.create(e, this.start, this.current, l, !1));
   }
   singleLineStringLiteral() {
     this.consumeUntil(u.STRING_LITERAL, "'", {
@@ -971,7 +971,7 @@ class fn {
         let n = "";
         for (let s = 0; s <= 3; s += 1) {
           if (this.isAtEnd() || !Ee(this.peek()))
-            return this.errors.push(new c(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}`;
+            return this.errors.push(new c(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`, B.create(u.STRING_LITERAL, e, this.current, `\\u${n}`, !0))), `\\u${n}`;
           n += this.advance();
         }
         return String.fromCharCode(parseInt(n, 16));
@@ -982,7 +982,7 @@ class fn {
   }
 }
 var Se = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(Se || {});
-class pn {
+class dn {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
   }
@@ -1048,7 +1048,7 @@ class pn {
         }
   }
 }
-class dn {
+class En {
   constructor(e) {
     this.generator = e;
   }
@@ -1061,9 +1061,9 @@ class d {
     this.token = e, this.partialNode = n, this.handlerContext = s;
   }
 }
-class En {
+class Nn {
   constructor(e, n) {
-    this.current = 0, this.errors = [], this.contextStack = new pn(), this.synchronizeProgram = () => {
+    this.current = 0, this.errors = [], this.contextStack = new dn(), this.synchronizeProgram = () => {
       const s = this.peek();
       s.kind !== u.EOF ? N(this.advance()) : (N(this.peek()), this.logError(s, o.UNEXPECTED_EOF, "Unexpected EOF"));
     }, this.synchronizeElementDeclarationName = () => {
@@ -1081,7 +1081,7 @@ class En {
         N(s), this.advance();
       }
     }, this.blockExpression = this.contextStack.withContextDo(Se.BlockExpression, () => {
-      const s = { body: [] }, i = () => this.nodeFactory.create(J, s);
+      const s = { body: [] }, i = () => this.nodeFactory.create(Z, s);
       try {
         this.consume("Expect an opening brace '{'", u.LBRACE), s.blockOpenBrace = this.previous();
       } catch (r) {
@@ -1120,11 +1120,11 @@ class En {
           N(s), this.advance();
         }
     }, this.tupleExpression = this.contextStack.withContextDo(Se.GroupExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(We, {
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(je, {
         groupOpenParen: s.tupleOpenParen,
         groupCloseParen: s.tupleCloseParen,
         expression: s.elementList[0]
-      }), r = () => this.nodeFactory.create(Z, s);
+      }), r = () => this.nodeFactory.create(K, s);
       try {
         this.consume("Expect an opening parenthesis '('", u.LPAREN), s.tupleOpenParen = this.previous();
       } catch (a) {
@@ -1150,7 +1150,7 @@ class En {
         } catch (a) {
           if (!(a instanceof d))
             throw a;
-          if (a.partialNode instanceof x && s.elementList.push(a.partialNode), !this.canHandle(a))
+          if (a.partialNode instanceof k && s.elementList.push(a.partialNode), !this.canHandle(a))
             throw new d(a.token, r(), a.handlerContext);
           this.synchronizeTuple();
         }
@@ -1172,7 +1172,7 @@ class En {
         N(s), this.advance();
       }
     }, this.listExpression = this.contextStack.withContextDo(Se.ListExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(R, s);
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(P, s);
       try {
         this.consume("Expect an opening bracket '['", u.LBRACKET), s.listOpenBracket = this.previous();
       } catch (r) {
@@ -1198,7 +1198,7 @@ class En {
         } catch (r) {
           if (!(r instanceof d))
             throw r;
-          if (r.partialNode instanceof x && s.elementList.push(r.partialNode), !this.canHandle(r))
+          if (r.partialNode instanceof k && s.elementList.push(r.partialNode), !this.canHandle(r))
             throw new d(r.token, i(), r.handlerContext);
           this.synchronizeList();
         }
@@ -1233,7 +1233,7 @@ class En {
           break;
         N(s), this.advance();
       }
-    }, this.tokens = e, this.nodeFactory = new dn(n);
+    }, this.tokens = e, this.nodeFactory = new En(n);
   }
   isAtEnd() {
     return this.current >= this.tokens.length || this.tokens[this.current].kind === u.EOF;
@@ -1289,8 +1289,8 @@ class En {
     this.tokens = e;
   }
   parse() {
-    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(X, { body: e, eof: n });
-    return this.gatherInvalid(), new V({ ast: s, tokens: this.tokens }, this.errors);
+    const e = this.program(), n = this.advance(), s = this.nodeFactory.create($, { body: e, eof: n });
+    return this.gatherInvalid(), new G({ ast: s, tokens: this.tokens }, this.errors);
   }
   /* Parsing and synchronizing ProgramNode */
   program() {
@@ -1308,7 +1308,7 @@ class En {
   }
   /* Parsing and synchronizing top-level ElementDeclarationNode */
   elementDeclaration() {
-    const e = {}, n = () => this.nodeFactory.create(v, e);
+    const e = {}, n = () => this.nodeFactory.create(A, e);
     try {
       this.consume("Expect an identifier", u.IDENTIFIER), e.type = this.previous();
     } catch (s) {
@@ -1352,13 +1352,13 @@ class En {
       if (this.match(u.COLON)) {
         e.bodyColon = this.previous();
         const s = this.expression();
-        s instanceof v ? (N(s), this.logError(s, o.UNEXPECTED_ELEMENT_DECLARATION, "An element's simple body must not be an element declaration")) : e.body = s;
+        s instanceof A ? (N(s), this.logError(s, o.UNEXPECTED_ELEMENT_DECLARATION, "An element's simple body must not be an element declaration")) : e.body = s;
       } else
         e.body = this.blockExpression();
     } catch (s) {
       throw s instanceof d ? (e.body = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
-    return this.nodeFactory.create(v, e);
+    return this.nodeFactory.create(A, e);
   }
   /* Parsing nested element declarations with simple body */
   // e.g
@@ -1367,7 +1367,7 @@ class En {
   //    Note: 'This is a note'  // fieldDeclaration() handles this
   //  }
   fieldDeclaration() {
-    const e = {}, n = () => this.nodeFactory.create(v, e);
+    const e = {}, n = () => this.nodeFactory.create(A, e);
     try {
       this.consume("Expect an identifier", u.IDENTIFIER), e.type = this.previous();
     } catch (s) {
@@ -1380,16 +1380,16 @@ class En {
     }
     try {
       const s = this.expression();
-      s instanceof v ? this.errors.push(new c(o.INVALID_ELEMENT_IN_SIMPLE_BODY, "Simple body cannot be an element declaration", s)) : e.body = s;
+      s instanceof A ? this.errors.push(new c(o.INVALID_ELEMENT_IN_SIMPLE_BODY, "Simple body cannot be an element declaration", s)) : e.body = s;
     } catch (s) {
       throw s instanceof d ? (e.body = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
-    return this.nodeFactory.create(v, e);
+    return this.nodeFactory.create(A, e);
   }
   /* Parsing any ExpressionNode, including non-NormalExpression */
   expression() {
-    const e = { args: [] }, n = () => ln(e.callee, e.args, this.nodeFactory).unwrap_or(
-      this.nodeFactory.create(w, e)
+    const e = { args: [] }, n = () => cn(e.callee, e.args, this.nodeFactory).unwrap_or(
+      this.nodeFactory.create(v, e)
     );
     try {
       e.callee = this.normalExpression();
@@ -1400,7 +1400,7 @@ class En {
       return n();
     let s = e.callee;
     for (; !this.shouldStopExpression(); ) {
-      Ce(this.previous()) || this.logError(s, o.MISSING_SPACES, "Expect a following space");
+      Xe(this.previous()) || this.logError(s, o.MISSING_SPACES, "Expect a following space");
       try {
         s = this.normalExpression(), e.args.push(s);
       } catch (i) {
@@ -1432,18 +1432,18 @@ class En {
         lt(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
           break;
         try {
-          n = this.nodeFactory.create(H, {
+          n = this.nodeFactory.create(J, {
             callee: n,
             argumentList: this.tupleExpression()
           });
         } catch (r) {
-          throw r instanceof d ? (n = this.nodeFactory.create(H, {
+          throw r instanceof d ? (n = this.nodeFactory.create(J, {
             callee: n,
             argumentList: r.partialNode
           }), new d(r.token, n, r.handlerContext)) : r;
         }
       } else if (s.kind === u.LBRACKET) {
-        if (Ce(this.previous()))
+        if (Xe(this.previous()))
           break;
         try {
           n = this.nodeFactory.create(he, {
@@ -1466,18 +1466,18 @@ class En {
             op: i
           });
         } else {
-          const a = mn(i);
+          const a = Tn(i);
           if (a.left === null || a.left <= e)
             break;
           this.advance();
           try {
-            n = this.nodeFactory.create(q, {
+            n = this.nodeFactory.create(H, {
               leftExpression: n,
               op: i,
               rightExpression: i.value === "." ? this.extractOperand() : this.expression_bp(a.right)
             });
           } catch (l) {
-            throw l instanceof d ? (n = this.nodeFactory.create(q, {
+            throw l instanceof d ? (n = this.nodeFactory.create(H, {
               leftExpression: n,
               op: i,
               rightExpression: l.partialNode
@@ -1494,7 +1494,7 @@ class En {
     if (ot(this.peek())) {
       const n = {};
       n.op = this.peek();
-      const s = bn(n.op);
+      const s = In(n.op);
       if (s.right === null)
         throw this.logError(
           n.op,
@@ -1511,11 +1511,11 @@ class En {
       } 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 xe)
       throw new d(
         this.peek(),
@@ -1553,11 +1553,11 @@ class En {
     } catch (n) {
       throw n instanceof d ? (e.value = n.partialNode, new d(
         n.token,
-        this.nodeFactory.create(ne, e),
+        this.nodeFactory.create(se, e),
         n.handlerContext
       )) : n;
     }
-    return this.nodeFactory.create(ne, e);
+    return this.nodeFactory.create(se, e);
   }
   canBeField() {
     return this.peek().kind === u.IDENTIFIER && this.peek(1).kind === u.COLON;
@@ -1569,12 +1569,12 @@ class En {
       u.STRING_LITERAL,
       u.NUMERIC_LITERAL
     ))
-      return this.nodeFactory.create(U, {
+      return this.nodeFactory.create(M, {
         expression: this.nodeFactory.create(be, { literal: this.previous() })
       });
     if (this.match(u.QUOTED_STRING, u.IDENTIFIER))
-      return this.nodeFactory.create(U, {
-        expression: this.nodeFactory.create(K, { variable: this.previous() })
+      return this.nodeFactory.create(M, {
+        expression: this.nodeFactory.create(ee, { variable: this.previous() })
       });
     throw this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect a variable or literal"), new d(
       this.peek(),
@@ -1590,7 +1590,7 @@ class En {
         n,
         o.EMPTY_ATTRIBUTE_NAME,
         "Expect a non-empty attribute name"
-      ), e.name = this.nodeFactory.create(Y, { identifiers: [] });
+      ), e.name = this.nodeFactory.create(z, { identifiers: [] });
     } else
       try {
         e.name = this.attributeName();
@@ -1600,12 +1600,12 @@ class En {
         if (e.name = n.partialNode, !this.canHandle(n))
           throw new d(
             n.token,
-            this.nodeFactory.create(se, e),
+            this.nodeFactory.create(ie, e),
             n.handlerContext
           );
         this.synchronizeAttributeName();
       }
-    return this.match(u.COLON) && (e.colon = this.previous(), e.value = this.attributeValue()), this.nodeFactory.create(se, e);
+    return this.match(u.COLON) && (e.colon = this.previous(), e.value = this.attributeValue()), this.nodeFactory.create(ie, e);
   }
   attributeValue() {
     let e;
@@ -1628,17 +1628,17 @@ class En {
       } catch (n) {
         throw n instanceof d ? new d(
           n.token,
-          this.nodeFactory.create(Y, { identifiers: e }),
+          this.nodeFactory.create(z, { identifiers: e }),
           n.handlerContext
         ) : n;
       }
-    return this.nodeFactory.create(Y, { identifiers: e });
+    return this.nodeFactory.create(z, { identifiers: e });
   }
   logError(e, n, s) {
     this.errors.push(new c(n, s, e));
   }
 }
-const Nn = {
+const mn = {
   "+": { left: 9, right: 10 },
   "*": { left: 11, right: 12 },
   "-": { left: 9, right: 10 },
@@ -1654,10 +1654,10 @@ const Nn = {
   "!=": { left: 4, right: 5 },
   ".": { left: 16, right: 17 }
 };
-function mn(t) {
-  return Nn[t.value] || { left: null, right: null };
+function Tn(t) {
+  return mn[t.value] || { left: null, right: null };
 }
-const Tn = {
+const bn = {
   "+": { left: null, right: 15 },
   "-": { left: null, right: 15 },
   "<": { left: null, right: 15 },
@@ -1665,14 +1665,14 @@ const Tn = {
   "<>": { left: null, right: 15 },
   "!": { left: null, right: 15 }
 };
-function bn(t) {
-  return Tn[t.value] || { left: null, right: null };
+function In(t) {
+  return bn[t.value] || { left: null, right: null };
 }
-const In = {
+const Ln = {
   "(": { left: 14, right: null }
 };
 function ht(t) {
-  return In[t.value] || { left: null, right: null };
+  return Ln[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 || {});
 function ve(t) {
@@ -1686,87 +1686,87 @@ function ve(t) {
     case b.Project:
     case b.Ref:
     case b.TableGroup:
-      return new S(e);
+      return new x(e);
     default:
-      return new k();
+      return new y();
   }
 }
 function pe(t) {
-  if (!Je(t))
-    return new S([t]);
+  if (!Ze(t))
+    return new x([t]);
   const e = pe(t.leftExpression).unwrap_or(void 0);
-  return e ? (e.push(t.rightExpression), new S(e)) : new k();
+  return e ? (e.push(t.rightExpression), new x(e)) : new y();
 }
-function W(t) {
+function j(t) {
   if (t === void 0)
-    return new k();
+    return new y();
   const e = pe(t).unwrap_or(void 0);
   if (!e)
-    return new k();
+    return new y();
   const n = [];
   for (const s of e) {
-    const i = j(s).unwrap_or(void 0);
+    const i = Y(s).unwrap_or(void 0);
     if (!i)
-      return new k();
+      return new y();
     n.push(i);
   }
-  return new S(n);
+  return new x(n);
 }
 function _e(t) {
   if (t === void 0)
-    return new k();
+    return new y();
   const e = pe(t).unwrap_or(void 0);
   if (!e || e.length === 0)
-    return new k();
+    return new y();
   const n = [];
   let s;
-  if (!M(I.last(e))) {
+  if (!F(I.last(e))) {
     const i = e.pop();
     if (Ot(i))
       s = i.elementList.map(
-        (r) => C(r).unwrap()
+        (r) => X(r).unwrap()
       );
     else
-      return new k();
+      return new y();
   }
   for (const i of e) {
-    const r = j(i).unwrap_or(void 0);
+    const r = Y(i).unwrap_or(void 0);
     if (!r)
-      return new k();
+      return new y();
     n.push(r);
   }
-  return new S({
+  return new x({
     variables: n,
     tupleElements: s
   });
 }
-function j(t) {
-  return M(t) ? new S(t.expression.variable.value) : new k();
+function Y(t) {
+  return F(t) ? new x(t.expression.variable.value) : new y();
 }
-function Xe(t) {
+function $e(t) {
   if (ft(t))
-    return t instanceof ne ? new S({ functional: [t], nonFunctional: [] }) : new S({ functional: [], nonFunctional: [t] });
-  if (t instanceof Z && t.elementList.every(ft)) {
+    return t instanceof se ? new x({ functional: [t], nonFunctional: [] }) : new x({ functional: [], nonFunctional: [t] });
+  if (t instanceof K && t.elementList.every(ft)) {
     const e = t.elementList.filter(
-      (s) => s instanceof ne
-    ), n = t.elementList.filter(M);
-    return new S({ functional: e, nonFunctional: n });
+      (s) => s instanceof se
+    ), n = t.elementList.filter(F);
+    return new x({ functional: e, nonFunctional: n });
   }
-  return new k();
+  return new y();
 }
-function C(t) {
+function X(t) {
   var n;
   const e = (n = t == null ? void 0 : t.expression.variable) == null ? void 0 : n.value;
-  return e === void 0 ? new k() : new S(e);
+  return e === void 0 ? new y() : new x(e);
 }
-function G(t) {
-  return $(t) ? t.expression instanceof K ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new k();
+function C(t) {
+  return W(t) ? t.expression instanceof ee ? new x(t.expression.variable.value) : new x(t.expression.literal.value) : new y();
 }
-function Ln(t) {
+function gn(t) {
   var e;
-  return !(t instanceof q) || !xt((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 H) || !xt((e = t.op) == null ? void 0 : e.value) ? !1 : _e(t.leftExpression).and_then(() => _e(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
-function gn(t) {
+function _n(t) {
   const e = _e(t.leftExpression), n = _e(t.rightExpression);
   if (!e.isOk() || !n.isOk())
     return !1;
@@ -1774,23 +1774,23 @@ function gn(t) {
   return (s == null ? void 0 : s.length) === (i == null ? void 0 : i.length);
 }
 function ft(t) {
-  return t instanceof U && t.expression instanceof K || t instanceof ne;
+  return t instanceof M && t.expression instanceof ee || t instanceof se;
 }
-function _n(t, e) {
+function An(t, e) {
   var i, r, a, l;
   let n = e;
-  const s = Zt(t);
+  const s = Kt(t);
   for (; n; ) {
     if ((r = (i = n.symbol) == null ? void 0 : i.symbolTable) != null && r.has(t))
       return (a = n.symbol.symbolTable) == null ? void 0 : a.get(t);
-    if (((l = n.symbol) == null ? void 0 : l.declaration) instanceof X && s)
+    if (((l = n.symbol) == null ? void 0 : l.declaration) instanceof $ && s)
       return n.symbol;
-    if (n instanceof X)
+    if (n instanceof $)
       return;
     n = n.parent;
   }
 }
-class An {
+class vn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1798,7 +1798,7 @@ class An {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof X || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new c(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof $ || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new c(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new c(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
@@ -1812,10 +1812,10 @@ class An {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof J)
+    if (e instanceof Z)
       return [new c(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
     const n = [];
-    return $(e.callee) || n.push(new c(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 c(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
+    return W(e.callee) || n.push(new c(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 c(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
   }
 }
 class we {
@@ -1835,7 +1835,7 @@ class we {
     return this.table.entries();
   }
 }
-class vn {
+class wn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1843,7 +1843,7 @@ class vn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.registerElement(), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof v ? [new c(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof A ? [new c(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? kt(e) ? [] : [new c(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new c(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
@@ -1853,10 +1853,10 @@ class vn {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(nn, { declaration: this.declarationNode, symbolTable: new we() });
-    const { name: n } = this.declarationNode, s = W(n);
+    this.declarationNode.symbol = this.symbolFactory.create(sn, { declaration: this.declarationNode, symbolTable: new we() });
+    const { name: n } = this.declarationNode, s = j(n);
     if (s.isOk()) {
-      const i = s.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), l = ze(r);
+      const i = s.unwrap(), r = i.pop(), a = Ke(i, this.publicSymbolTable, this.symbolFactory), l = Qe(r);
       a.has(l) && e.push(new c(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, n)), a.set(l, this.declarationNode.symbol);
     }
     return e;
@@ -1867,27 +1867,27 @@ class vn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       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 v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
     return e.length === 0 ? [new c(o.EMPTY_ENUM, "An Enum must have at least one element", this.declarationNode)] : e.flatMap((n) => {
       const s = [];
-      n.callee && !M(n.callee) && s.push(new c(o.INVALID_ENUM_ELEMENT_NAME, "An enum field must be an identifier or a quoted identifier", n.callee));
+      n.callee && !F(n.callee) && s.push(new c(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 R ? (s.push(...this.validateFieldSettings(I.last(i))), i.pop()) : i[0] instanceof R && (s.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && s.push(...i.map((r) => new c(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 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 c(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) {
-    const n = B(e), s = n.getErrors(), i = n.getValue();
+    const n = V(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((l) => s.push(new c(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
-            $(l.value) || s.push(new c(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
+            W(l.value) || s.push(new c(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
           });
           break;
         default:
@@ -1900,13 +1900,13 @@ class vn {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = ae(n);
+      const s = oe(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
   registerField(e) {
-    if (e.callee && M(e.callee)) {
-      const n = C(e.callee).unwrap(), s = Qe(n), i = this.symbolFactory.create(sn, { declaration: e });
+    if (e.callee && F(e.callee)) {
+      const n = X(e.callee).unwrap(), s = qe(n), i = this.symbolFactory.create(rn, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
@@ -1921,7 +1921,7 @@ class vn {
     return [];
   }
 }
-class wn {
+class yn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1929,7 +1929,7 @@ class wn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof X || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new c(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof $ || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new c(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new c(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
@@ -1943,9 +1943,9 @@ class wn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       return [new c(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 v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -1953,22 +1953,22 @@ class wn {
       if (!n.callee)
         return [];
       const s = [], i = [n.callee, ...n.args];
-      return I.last(i) instanceof R && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
-        for (; r instanceof H; )
-          r.argumentList && !Xe(r.argumentList).isOk() && s.push(new c(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 c(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
+      return I.last(i) instanceof P && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
+        for (; r instanceof J; )
+          r.argumentList && !$e(r.argumentList).isOk() && s.push(new c(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;
+        $e(r).isOk() || s.push(new c(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
       }), s;
     });
   }
   validateFieldSetting(e) {
-    const n = B(e), s = n.getErrors(), i = n.getValue();
+    const n = V(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((l) => s.push(new c(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
-            $(l.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
+            W(l.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
           });
           break;
         case "unique":
@@ -1979,7 +1979,7 @@ class wn {
           break;
         case "type":
           a.length > 1 && a.forEach((l) => s.push(new c(o.DUPLICATE_INDEX_SETTING, "'type' can only appear once", l))), a.forEach((l) => {
-            M(l.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'type' must be "btree" or "hash"`, l));
+            F(l.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'type' must be "btree" or "hash"`, l));
           });
           break;
         default:
@@ -1992,12 +1992,12 @@ class wn {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = ae(n);
+      const s = oe(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
-class yn {
+class kn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2011,7 +2011,7 @@ class yn {
     ];
   }
   validateContext() {
-    return !(this.declarationNode.parent instanceof X) && ![
+    return !(this.declarationNode.parent instanceof $) && ![
       b.Table,
       b.TableGroup,
       b.Project
@@ -2022,14 +2022,14 @@ class yn {
     )] : [];
   }
   validateName(e) {
-    if (!(this.declarationNode.parent instanceof X))
+    if (!(this.declarationNode.parent instanceof $))
       return e ? [new c(o.UNEXPECTED_NAME, "A Note shouldn't have a name", e)] : [];
     if (!e)
       return [new c(o.INVALID_NAME, "Sticky note must have a name", this.declarationNode)];
-    const n = W(e);
+    const n = j(e);
     if (!n.isOk())
       return [new c(o.INVALID_NAME, "Invalid name for sticky note ", this.declarationNode)];
-    const i = n.unwrap().join("."), r = Jt(i);
+    const i = n.unwrap().join("."), r = Zt(i);
     return this.publicSymbolTable.has(r) ? [new c(o.DUPLICATE_NAME, `Sticky note "${i}" has already been defined`, e)] : (this.publicSymbolTable.set(r, this.declarationNode.symbol), []);
   }
   validateAlias(e) {
@@ -2041,25 +2041,25 @@ class yn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       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 v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
     const n = [];
-    return e.length === 0 ? [new c(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new c(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), $(e[0].callee) || n.push(new c(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 c(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
+    return e.length === 0 ? [new c(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new c(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), W(e[0].callee) || n.push(new c(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 c(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
   }
   validateSubElements(e) {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = ae(n);
+      const s = oe(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
-class kn {
+class xn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2067,7 +2067,7 @@ class kn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof v ? [new c(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof A ? [new c(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? ye(e) ? [] : [new c(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
@@ -2081,9 +2081,9 @@ class kn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       return [new c(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 v);
     return [
       ...n.map((i) => new c(o.INVALID_PROJECT_FIELD, "A Project can not have inline fields", i)),
       ...this.validateSubElements(s)
@@ -2093,12 +2093,12 @@ class kn {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = ae(n);
+      const s = oe(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
-class xn {
+class Sn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2106,7 +2106,7 @@ class xn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof X ? [] : [new c(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
+    return this.declarationNode.parent instanceof $ ? [] : [new c(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
   }
   validateName(e) {
     return e ? ye(e) ? [] : [new c(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
@@ -2120,9 +2120,9 @@ class xn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       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 v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -2130,20 +2130,20 @@ class xn {
       return [new c(o.EMPTY_REF, "A Ref must have at least one field", this.declarationNode)];
     const n = [];
     return e.length > 1 && n.push(...e.slice(1).map((s) => new c(o.REF_REDEFINED, "A Ref can only contain one binary relationship", s))), e.forEach((s) => {
-      s.callee && !Ln(s.callee) && n.push(new c(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !gn(s.callee) && n.push(new c(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
+      s.callee && !gn(s.callee) && n.push(new c(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !_n(s.callee) && n.push(new c(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
       const i = [...s.args];
-      I.last(i) instanceof R ? (this.validateFieldSettings(I.last(i)), i.pop()) : i[0] instanceof R && (n.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && n.push(...i.map((r) => new c(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", r)));
+      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 c(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", r)));
     }), n;
   }
   validateFieldSettings(e) {
-    const n = B(e), s = n.getErrors(), i = n.getValue();
+    const n = V(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "delete":
         case "update":
           a.length > 1 && a.forEach((l) => s.push(new c(o.DUPLICATE_REF_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
-            Sn(l.value) || s.push(new c(o.INVALID_REF_SETTING_VALUE, `'${r}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, l));
+            On(l.value) || s.push(new c(o.INVALID_REF_SETTING_VALUE, `'${r}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, l));
           });
           break;
         default:
@@ -2156,16 +2156,16 @@ class xn {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = ae(n);
+      const s = oe(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
-function Sn(t) {
-  if (!(M(t) && t.expression.variable.kind !== u.QUOTED_STRING) && !(t instanceof Y))
+function On(t) {
+  if (!(F(t) && t.expression.variable.kind !== u.QUOTED_STRING) && !(t instanceof z))
     return !1;
   let e;
-  if (t instanceof Y ? e = Te(t).unwrap_or("") : e = t.expression.variable.value, e)
+  if (t instanceof z ? e = Te(t).unwrap_or("") : e = t.expression.variable.value, e)
     switch (e.toLowerCase()) {
       case "cascade":
       case "no action":
@@ -2178,7 +2178,7 @@ function Sn(t) {
     }
   return !1;
 }
-class On {
+class Dn {
   constructor(e, n, s) {
     this.declarationNode = e, this.symbolFactory = s, this.publicSymbolTable = n;
   }
@@ -2186,16 +2186,16 @@ class On {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.registerElement(), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof v ? [new c(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof A ? [new c(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? e instanceof he ? [new c(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : kt(e) ? [] : [new c(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new c(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
   }
   validateAlias(e) {
-    return e ? Un(e) ? [] : [new c(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
+    return e ? Mn(e) ? [] : [new c(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
   }
   validateSettingList(e) {
-    const n = B(e), s = n.getErrors(), i = n.getValue();
+    const n = V(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
@@ -2206,7 +2206,7 @@ class On {
           break;
         case "note":
           a.length > 1 && s.push(...a.map((l) => new c(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
-            $(l.value) || s.push(new c(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
+            W(l.value) || s.push(new c(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
           });
           break;
         default:
@@ -2218,13 +2218,13 @@ class On {
   registerElement() {
     const e = [];
     this.declarationNode.symbol = this.symbolFactory.create(vt, { declaration: this.declarationNode, symbolTable: new we() });
-    const { name: n, alias: s } = this.declarationNode, i = W(n);
+    const { name: n, alias: s } = this.declarationNode, i = j(n);
     if (i.isOk()) {
-      const r = [...i.unwrap()], a = r.pop(), l = Ze(r, this.publicSymbolTable, this.symbolFactory), p = Oe(a);
+      const r = [...i.unwrap()], a = r.pop(), l = Ke(r, this.publicSymbolTable, this.symbolFactory), p = Oe(a);
       l.has(p) && e.push(new c(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, n)), l.set(p, this.declarationNode.symbol);
     }
-    if (s && ye(s) && !Rn(s.expression.variable.value, i.unwrap_or([]))) {
-      const r = C(s).unwrap(), a = Oe(r);
+    if (s && ye(s) && !Pn(s.expression.variable.value, i.unwrap_or([]))) {
+      const r = X(s).unwrap(), a = Oe(r);
       this.publicSymbolTable.has(a) && e.push(new c(o.DUPLICATE_NAME, `Table name '${r}' already exists`, n)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
     }
     return e;
@@ -2232,9 +2232,9 @@ class On {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       return [new c(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 v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -2242,14 +2242,14 @@ class On {
       if (!n.callee)
         return [];
       const s = [];
-      n.args.length === 0 && s.push(new c(o.INVALID_COLUMN, "A column must have a type", n.callee)), M(n.callee) || s.push(new c(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), n.args[0] && !Dn(n.args[0]) && s.push(new c(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
+      n.args.length === 0 && s.push(new c(o.INVALID_COLUMN, "A column must have a type", n.callee)), F(n.callee) || s.push(new c(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), n.args[0] && !Rn(n.args[0]) && s.push(new c(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
       const i = n.args.slice(1);
       return s.push(...this.validateFieldSetting(i)), s.push(...this.registerField(n)), s;
     });
   }
   registerField(e) {
-    if (e.callee && M(e.callee)) {
-      const n = C(e.callee).unwrap(), s = Ye(n), i = this.symbolFactory.create(rn, { declaration: e });
+    if (e.callee && F(e.callee)) {
+      const n = X(e.callee).unwrap(), s = ze(n), i = this.symbolFactory.create(an, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
@@ -2265,15 +2265,15 @@ class On {
   }
   // This is needed to support legacy inline settings
   validateFieldSetting(e) {
-    if (!e.slice(0, -1).every(me) || !e.slice(-1).every((p) => me(p) || p instanceof R))
+    if (!e.slice(0, -1).every(me) || !e.slice(-1).every((p) => me(p) || p instanceof P))
       return [...e.map((p) => new c(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 R && (n = e.pop());
-    const s = B(n), i = s.getErrors(), r = s.getValue();
+    I.last(e) instanceof P && (n = e.pop());
+    const s = V(n), i = s.getErrors(), r = s.getValue();
     for (const p of e) {
-      const f = C(p).unwrap_or("").toLowerCase();
+      const f = X(p).unwrap_or("").toLowerCase();
       if (f !== "pk" && f !== "unique") {
         i.push(new c(o.INVALID_SETTINGS, "Inline column settings can only be `pk` or `unique`", p));
         continue;
@@ -2287,12 +2287,12 @@ class On {
       switch (p) {
         case "note":
           f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", h))), f.forEach((h) => {
-            $(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", h.value || h.name));
+            W(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", h.value || h.name));
           });
           break;
         case "ref":
           f.forEach((h) => {
-            Fn(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", h.value || h.name));
+            Bn(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", h.value || h.name));
           });
           break;
         case "primary key":
@@ -2302,7 +2302,7 @@ class On {
           break;
         case "pk":
           f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "'pk' can only appear once", h))), f.forEach((h) => {
-            h instanceof se && !ue(h.value) && i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", h.value || h.name));
+            h instanceof ie && !ue(h.value) && i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", h.value || h.name));
           });
           break;
         case "not null":
@@ -2319,17 +2319,17 @@ class On {
           break;
         case "unique":
           f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "'unique' can only appear once", h))), f.forEach((h) => {
-            h instanceof se && !ue(h.value) && i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", h.value || h.name));
+            h instanceof ie && !ue(h.value) && i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", h.value || h.name));
           });
           break;
         case "increment":
           f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "'increment' can only appear once", h))), f.forEach((h) => {
-            h instanceof se && !ue(h.value) && i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", h.value || h.name));
+            h instanceof ie && !ue(h.value) && i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", h.value || h.name));
           });
           break;
         case "default":
           f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_TABLE_SETTING, "'default' can only appear once", h))), f.forEach((h) => {
-            Mn(h.value) || i.push(new c(o.INVALID_TABLE_SETTING, "'default' must be a string literal, number literal, function expression, true, false or null", h.value || h.name));
+            Fn(h.value) || i.push(new c(o.INVALID_TABLE_SETTING, "'default' must be a string literal, number literal, function expression, true, false or null", h.value || h.name));
           });
           break;
         default:
@@ -2342,7 +2342,7 @@ class On {
     const n = e.flatMap((i) => {
       if (i.parent = this.declarationNode, !i.type)
         return [];
-      const r = ae(i);
+      const r = oe(i);
       return new r(i, this.publicSymbolTable, this.symbolFactory).validate();
     }), s = e.filter((i) => {
       var r;
@@ -2351,11 +2351,11 @@ class On {
     return s.length > 1 && n.push(...s.map((i) => new c(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n;
   }
 }
-function Dn(t) {
-  if (!(t instanceof H || Je(t) || t instanceof U || t instanceof he))
+function Rn(t) {
+  if (!(t instanceof J || Ze(t) || t instanceof M || t instanceof he))
     return !1;
-  if (t instanceof H) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => fe(n) || $(n) || me(n)))
+  if (t instanceof J) {
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => fe(n) || W(n) || me(n)))
       return !1;
     t = t.callee;
   }
@@ -2364,13 +2364,13 @@ function Dn(t) {
       return !1;
     t = t.array;
   }
-  const e = W(t).unwrap_or(void 0);
+  const e = j(t).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
-function Rn(t, e) {
+function Pn(t, e) {
   return e.length === 1 && t === e[0];
 }
-class Pn {
+class Un {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2385,7 +2385,7 @@ class Pn {
     ];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof v ? [new c(
+    return this.declarationNode.parent instanceof A ? [new c(
       o.INVALID_TABLEGROUP_CONTEXT,
       "TableGroup must appear top-level",
       this.declarationNode
@@ -2411,10 +2411,10 @@ class Pn {
   }
   registerElement() {
     const { name: e } = this.declarationNode;
-    this.declarationNode.symbol = this.symbolFactory.create(an, { declaration: this.declarationNode, symbolTable: new we() });
-    const n = W(e);
+    this.declarationNode.symbol = this.symbolFactory.create(on, { declaration: this.declarationNode, symbolTable: new we() });
+    const n = j(e);
     if (n.isOk()) {
-      const s = n.unwrap(), i = s.pop(), r = Ze(s, this.publicSymbolTable, this.symbolFactory), a = qe(i);
+      const s = n.unwrap(), i = s.pop(), r = Ke(s, this.publicSymbolTable, this.symbolFactory), a = He(i);
       if (r.has(a))
         return [new c(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists`, e)];
       r.set(a, this.declarationNode.symbol);
@@ -2422,7 +2422,7 @@ class Pn {
     return [];
   }
   validateSettingList(e) {
-    const n = B(e), s = n.getErrors(), i = n.getValue();
+    const n = V(e), s = n.getErrors(), i = n.getValue();
     return I.forIn(i, (r, a) => {
       switch (a) {
         case "color":
@@ -2443,7 +2443,7 @@ class Pn {
             o.DUPLICATE_TABLE_SETTING,
             "'note' can only appear once",
             l
-          ))), r.filter((l) => !$(l.value)).forEach((l) => {
+          ))), r.filter((l) => !W(l.value)).forEach((l) => {
             s.push(new c(
               o.INVALID_TABLE_SETTING,
               "'note' must be a string literal",
@@ -2464,13 +2464,13 @@ class Pn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       return [new c(
         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 v);
     return [
       ...this.validateFields(n),
       ...this.validateSubElements(s)
@@ -2479,14 +2479,14 @@ class Pn {
   validateFields(e) {
     return e.flatMap((n) => {
       const s = [];
-      return n.callee && !W(n.callee).isOk() && s.push(new c(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", n.callee)), this.registerField(n), n.args.length > 0 && s.push(...n.args.map((i) => new c(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
+      return n.callee && !j(n.callee).isOk() && s.push(new c(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", n.callee)), this.registerField(n), n.args.length > 0 && s.push(...n.args.map((i) => new c(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
     });
   }
   validateSubElements(e) {
     const n = e.flatMap((i) => {
       if (i.parent = this.declarationNode, !i.type)
         return [];
-      const r = ae(i);
+      const r = oe(i);
       return new r(i, this.publicSymbolTable, this.symbolFactory).validate();
     }), s = e.filter((i) => {
       var r;
@@ -2495,8 +2495,8 @@ class Pn {
     return s.length > 1 && n.push(...s.map((i) => new c(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n;
   }
   registerField(e) {
-    if (e.callee && M(e.callee)) {
-      const n = C(e.callee).unwrap(), s = He(n), i = this.symbolFactory.create(on, { declaration: e });
+    if (e.callee && F(e.callee)) {
+      const n = X(e.callee).unwrap(), s = Je(n), i = this.symbolFactory.create(ln, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
@@ -2512,42 +2512,42 @@ class Pn {
   }
 }
 const yt = ["-", "+"];
-function ae(t) {
+function oe(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
-      return vn;
+      return wn;
     case b.Table:
-      return On;
+      return Dn;
     case b.TableGroup:
-      return Pn;
+      return Un;
     case b.Project:
-      return kn;
-    case b.Ref:
       return xn;
+    case b.Ref:
+      return Sn;
     case b.Note:
-      return yn;
+      return kn;
     case b.Indexes:
-      return wn;
+      return yn;
     default:
-      return An;
+      return vn;
   }
 }
 function kt(t) {
-  return !!W(t).unwrap_or(!1);
+  return !!j(t).unwrap_or(!1);
 }
-function Un(t) {
+function Mn(t) {
   return ye(t);
 }
 function ye(t) {
-  return t instanceof U && t.expression instanceof K;
+  return t instanceof M && t.expression instanceof ee;
 }
-function Ze(t, e, n) {
+function Ke(t, e, n) {
   var i;
   t[0] === "public" && (t = t.slice(1));
   let s = e;
   for (const r of t) {
     let a;
-    const l = je(r);
+    const l = Ye(r);
     if (s.has(l)) {
       if (a = (i = s.get(l)) == null ? void 0 : i.symbolTable, !a)
         throw new Error("Expect a symbol table in a schema symbol");
@@ -2565,53 +2565,53 @@ function xt(t) {
 }
 function St(t) {
   var n;
-  if (!(t instanceof U) || !(t.expression instanceof be) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
+  if (!(t instanceof M) || !(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] !== "#")
     return !1;
   for (let s = 1; s < e.length; s += 1)
-    if (!en(e[s]))
+    if (!tn(e[s]))
       return !1;
   return !0;
 }
 function ue(t) {
   return t === void 0;
 }
-function Mn(t) {
+function Fn(t) {
   var e;
-  return !!($(t) || fe(t) || me(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && yt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression) || t instanceof ne);
+  return !!(W(t) || fe(t) || me(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof q && yt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression) || t instanceof se);
 }
 function fe(t) {
   var e;
-  return t instanceof U && t.expression instanceof be && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
+  return t instanceof M && t.expression instanceof be && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
 }
-function Fn(t) {
+function Bn(t) {
   var n;
-  if (!(t instanceof Q) || !xt((n = t.op) == null ? void 0 : n.value))
+  if (!(t instanceof q) || !xt((n = t.op) == null ? void 0 : n.value))
     return !1;
-  const e = W(t.expression).unwrap_or(void 0);
+  const e = j(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
 function Ot(t) {
-  return t instanceof Z && t.elementList.every(M);
+  return t instanceof K && t.elementList.every(F);
 }
-function B(t) {
+function V(t) {
   var s;
   const e = {}, n = [];
   if (!t)
-    return new V({});
+    return new G({});
   for (const i of t.elementList) {
     if (!i.name)
       continue;
-    if (i.name instanceof U) {
+    if (i.name instanceof M) {
       n.push(new c(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
       continue;
     }
     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 V(e, n);
+  return new G(e, n);
 }
 class pt {
   constructor(e, n) {
@@ -2624,7 +2624,7 @@ class pt {
     this.ast.body.forEach((s) => {
       if (s.parent = this.ast, s.type === void 0)
         return;
-      const i = ae(s), r = new i(
+      const i = oe(s), r = new i(
         s,
         this.publicSchemaSymbol.symbolTable,
         this.symbolFactory
@@ -2632,10 +2632,10 @@ class pt {
       e.push(...r.validate());
     });
     const n = this.ast.body.filter((s) => ve(s).unwrap_or(void 0) === b.Project);
-    return n.length > 1 && n.forEach((s) => e.push(new c(o.PROJECT_REDEFINED, "Only one project can exist", s))), new V(this.ast, e);
+    return n.length > 1 && n.forEach((s) => e.push(new c(o.PROJECT_REDEFINED, "Only one project can exist", s))), new G(this.ast, e);
   }
 }
-class oe {
+class le {
   constructor(e, n) {
     this.declarationNode = e, this.errors = n;
   }
@@ -2645,7 +2645,7 @@ class oe {
   bindSettingList(e, n) {
     if (e)
       for (const s of e.elementList) {
-        if (s.name instanceof U)
+        if (s.name instanceof M)
           continue;
         const i = Te(s.name).unwrap_or(void 0);
         if (!i)
@@ -2659,9 +2659,9 @@ class oe {
     if (!e.body)
       return;
     const { body: n } = e;
-    if (n instanceof J)
+    if (n instanceof Z)
       for (const s of n.body)
-        if (s instanceof v) {
+        if (s instanceof A) {
           if (!s.type)
             continue;
           const i = Dt(s);
@@ -2673,7 +2673,7 @@ class oe {
   }
   bindSubfield(e) {
     const n = [e.callee, ...e.args], s = I.last(n);
-    s instanceof R && (n.pop(), this.bindSettingList(s, this.subfield.settingList));
+    s instanceof P && (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]);
@@ -2682,12 +2682,12 @@ class oe {
   scanAndBind(e, n) {
     var s, i;
     if (e)
-      if (e instanceof U) {
-        if (e.expression instanceof K && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
+      if (e instanceof M) {
+        if (e.expression instanceof ee && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
           return;
         this.bindFragments([e], n);
       } else
-        e instanceof q ? Je(e) ? this.bindFragments(pe(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 Z && e.elementList.forEach((r) => this.scanAndBind(r, n));
+        e instanceof H ? Ze(e) ? this.bindFragments(pe(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 K && 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,
@@ -2695,7 +2695,7 @@ class oe {
   bindFragments(e, n) {
     if (e.length === 0)
       return;
-    const s = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: i } = n, r = e.findIndex((h) => !M(h)), l = r !== -1 && Ot(e[r]) ? e[r] : void 0, p = r >= 0 ? s.pop() : void 0, f = e.slice(
+    const s = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: i } = n, r = e.findIndex((h) => !F(h)), l = r !== -1 && Ot(e[r]) ? e[r] : void 0, p = r >= 0 ? s.pop() : void 0, f = e.slice(
       0,
       r === -1 ? void 0 : r
     );
@@ -2703,14 +2703,14 @@ class oe {
       return;
     const E = [];
     for (; s.length && f.length; ) {
-      const h = s.pop(), m = f.pop(), g = C(m).unwrap();
+      const h = s.pop(), m = f.pop(), g = X(m).unwrap();
       E.unshift({
         index: Ve(g, h),
         referrer: m
       });
     }
     for (; f.length; ) {
-      const h = f.pop(), m = C(h).unwrap();
+      const h = f.pop(), m = X(h).unwrap();
       E.unshift({
         index: Ve(m, i),
         referrer: h
@@ -2722,7 +2722,7 @@ class oe {
           ...E,
           {
             index: Ve(
-              C(h).unwrap(),
+              X(h).unwrap(),
               p
             ),
             referrer: h
@@ -2737,16 +2737,16 @@ class oe {
   resolveIndexStack(e, n) {
     if (e.length === 0)
       throw new Error("Unreachable - An unresolved name must have at least one name component");
-    const [s, ...i] = e, r = _n(s.index, this.declarationNode);
+    const [s, ...i] = e, r = An(s.index, this.declarationNode);
     if (r === void 0) {
-      const { kind: f, name: E } = ie(s.index).unwrap();
+      const { kind: f, name: E } = re(s.index).unwrap();
       this.logError(s.referrer, `Can not find ${f} '${E}'`, n);
       return;
     }
     r.references.push(s.referrer), s.referrer.referee = r;
-    let a = r.symbolTable, { kind: l, name: p } = ie(s.index).unwrap();
+    let a = r.symbolTable, { kind: l, name: p } = re(s.index).unwrap();
     for (const f of i) {
-      const { kind: E, name: h } = ie(f.index).unwrap(), m = a.get(f.index);
+      const { kind: E, name: h } = re(f.index).unwrap(), m = a.get(f.index);
       if (!m) {
         this.logError(
           f.referrer,
@@ -2764,7 +2764,7 @@ class oe {
     s || this.errors.push(new c(o.BINDING_ERROR, n, e));
   }
 }
-class Bn extends oe {
+class Vn extends le {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2774,7 +2774,7 @@ class Bn extends oe {
     }, this.settingList = {};
   }
 }
-class Vn extends oe {
+class Gn extends le {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2784,7 +2784,7 @@ class Vn extends oe {
     }, this.settingList = {};
   }
 }
-class Gn extends oe {
+class Cn extends le {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2819,7 +2819,7 @@ class Gn extends oe {
     }, this.settingList = {};
   }
 }
-class Cn extends oe {
+class Xn extends le {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2829,7 +2829,7 @@ class Cn extends oe {
     }, this.settingList = {};
   }
 }
-class Xn extends oe {
+class $n extends le {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2839,7 +2839,7 @@ class Xn extends oe {
     }, this.settingList = {};
   }
 }
-class $n extends oe {
+class Wn extends le {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2856,7 +2856,7 @@ class $n extends oe {
     }, this.settingList = {};
   }
 }
-class Wn extends oe {
+class jn extends le {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2884,7 +2884,7 @@ class Wn extends oe {
     }, this.settingList = {};
   }
 }
-class jn extends oe {
+class Yn extends le {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2904,24 +2904,24 @@ class jn extends oe {
 function Dt(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
-      return Vn;
+      return Gn;
     case b.Table:
-      return Wn;
-    case b.TableGroup:
       return jn;
+    case b.TableGroup:
+      return Yn;
     case b.Project:
-      return Xn;
-    case b.Ref:
       return $n;
+    case b.Ref:
+      return Wn;
     case b.Note:
-      return Cn;
+      return Xn;
     case b.Indexes:
-      return Gn;
+      return Cn;
     default:
-      return Bn;
+      return Vn;
   }
 }
-class Yn {
+class zn {
   constructor(e) {
     this.ast = e, this.errors = [];
   }
@@ -2931,10 +2931,10 @@ class Yn {
         const n = Dt(e);
         new n(e, this.errors).bind();
       }
-    return new V(this.ast, this.errors);
+    return new G(this.ast, this.errors);
   }
 }
-class zn {
+class Qn {
   constructor(e) {
     this.generator = e;
   }
@@ -2942,17 +2942,17 @@ class zn {
     return new e(n, this.generator.nextId());
   }
 }
-class Qn {
+class qn {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = new zn(n);
+    this.ast = e, this.symbolFactory = new Qn(n);
   }
   // Analyzing: Invoking both the validator and binder
   analyze() {
-    return new pt(this.ast, this.symbolFactory).validate().chain((n) => new Yn(n).resolve());
+    return new pt(this.ast, this.symbolFactory).validate().chain((n) => new zn(n).resolve());
   }
   // For invoking the validator only
   validate() {
-    return new pt(this.ast, this.symbolFactory).validate().chain((n) => new V(n, []));
+    return new pt(this.ast, this.symbolFactory).validate().chain((n) => new G(n, []));
   }
 }
 function dt(t, e) {
@@ -2988,7 +2988,7 @@ function Rt(t) {
   }
   throw new Error("Invalid relation op");
 }
-function A(t) {
+function _(t) {
   return {
     start: {
       offset: t.startPos.offset,
@@ -2998,19 +2998,19 @@ function A(t) {
     end: { offset: t.endPos.offset, line: t.endPos.line + 1, column: t.endPos.column + 1 }
   };
 }
-function $e(t) {
+function We(t) {
   var n;
   const e = (n = pe(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
-  return e instanceof Z ? e.elementList.map((s) => s.referee) : [e.referee];
+  return e instanceof K ? e.elementList.map((s) => s.referee) : [e.referee];
 }
 function Ie(t) {
-  const e = W(t).unwrap();
+  const e = j(t).unwrap();
   return {
     name: e.pop(),
     schemaName: e
   };
 }
-function Ke(t) {
+function et(t) {
   return t.expression.literal.value;
 }
 function Pt(t, e) {
@@ -3029,7 +3029,7 @@ function Ut(t, e) {
   const n = t.id, s = e.id;
   return n === s;
 }
-function re(t) {
+function ae(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(`
@@ -3040,7 +3040,7 @@ class Mt {
     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 = A(this.declarationNode), this.env.tables.set(this.declarationNode, this.table);
+    this.table.token = _(this.declarationNode), this.env.tables.set(this.declarationNode, this.table);
     const e = [
       ...this.interpretName(this.declarationNode.name),
       ...this.interpretAlias(this.declarationNode.alias),
@@ -3065,7 +3065,7 @@ class Mt {
   interpretAlias(e) {
     if (!e)
       return [];
-    const n = C(e).unwrap_or(null);
+    const n = X(e).unwrap_or(null);
     return n && (this.env.aliases.push({
       name: n,
       kind: "table",
@@ -3077,16 +3077,16 @@ class Mt {
   }
   interpretSettingList(e) {
     var i, r, a;
-    const n = B(e).getValue();
-    this.table.headerColor = (i = n.headercolor) != null && i.length ? Ke((a = (r = n.headercolor) == null ? void 0 : r.at(0)) == null ? void 0 : a.value) : void 0;
+    const n = V(e).getValue();
+    this.table.headerColor = (i = n.headercolor) != null && i.length ? et((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: G(s == null ? void 0 : s.value).map(re).unwrap(),
-      token: A(s)
+      value: C(s == null ? void 0 : s.value).map(ae).unwrap(),
+      token: _(s)
     }, [];
   }
   interpretBody(e) {
-    const [n, s] = I.partition(e.body, (i) => i instanceof w);
+    const [n, s] = I.partition(e.body, (i) => i instanceof v);
     return [...this.interpretFields(n), ...this.interpretSubElements(s)];
   }
   interpretSubElements(e) {
@@ -3095,8 +3095,8 @@ class Mt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: G(n.body instanceof J ? n.body.body[0].callee : n.body.callee).map(re).unwrap(),
-            token: A(n)
+            value: C(n.body instanceof Z ? n.body.body[0].callee : n.body.callee).map(ae).unwrap(),
+            token: _(n)
           }, [];
         case "indexes":
           return this.interpretIndexes(n);
@@ -3108,105 +3108,105 @@ class Mt {
     return e.flatMap((n) => this.interpretColumn(n));
   }
   interpretColumn(e) {
-    var a, l, p, f, E, h, m, g;
+    var a, l, p, f, E, h, m, g, R;
     const n = [], s = {};
-    s.name = C(e.callee).unwrap();
-    const i = qn(e.args[0]);
-    s.type = i.getValue(), n.push(...i.getErrors()), s.token = A(e), s.inline_refs = [];
+    s.name = X(e.callee).unwrap();
+    const i = Hn(e.args[0]);
+    s.type = i.getValue(), n.push(...i.getErrors()), s.token = _(e), s.inline_refs = [];
     const r = e.args.slice(1);
-    if (I.last(r) instanceof R) {
-      const _ = B(r.pop()).getValue();
-      s.pk = !!((a = _.pk) != null && a.length) || !!((l = _["primary key"]) != null && l.length), s.increment = !!((p = _.increment) != null && p.length), s.unique = !!((f = _.unique) != null && f.length), s.not_null = !!((E = _["not null"]) != null && E.length) && !0, s.dbdefault = Hn((m = (h = _.default) == null ? void 0 : h.at(0)) == null ? void 0 : m.value);
-      const ee = (g = _.note) == null ? void 0 : g.at(0);
-      s.note = ee && {
-        value: G(ee.value).map(re).unwrap(),
-        token: A(ee)
+    if (I.last(r) instanceof P) {
+      const S = V(r.pop()).getValue();
+      s.pk = !!((a = S.pk) != null && a.length) || !!((l = S["primary key"]) != null && l.length), s.increment = !!((p = S.increment) != null && p.length), s.unique = !!((f = S.unique) != null && f.length), s.not_null = (E = S["not null"]) != null && E.length ? !0 : (h = S.null) != null && h.length ? !1 : void 0, s.dbdefault = Jn((g = (m = S.default) == null ? void 0 : m.at(0)) == null ? void 0 : g.value);
+      const te = (R = S.note) == null ? void 0 : R.at(0);
+      s.note = te && {
+        value: C(te.value).map(ae).unwrap(),
+        token: _(te)
       };
-      const le = _.ref || [];
-      s.inline_refs = le.flatMap((z) => {
-        const [nt] = $e(z.value.expression);
-        if (Ut(nt, e.symbol))
-          return n.push(new c(o.SAME_ENDPOINT, "Two endpoints are the same", z)), [];
-        const ke = z.value.op, te = W(z.value.expression).unwrap();
+      const Yt = S.ref || [];
+      s.inline_refs = Yt.flatMap((Q) => {
+        const [st] = We(Q.value.expression);
+        if (Ut(st, e.symbol))
+          return n.push(new c(o.SAME_ENDPOINT, "Two endpoints are the same", Q)), [];
+        const ke = Q.value.op, ne = j(Q.value.expression).unwrap();
         let de;
-        if (te.length === 1) {
-          const [ce] = te;
+        if (ne.length === 1) {
+          const [ce] = ne;
           de = {
             schemaName: this.table.schemaName,
             tableName: this.table.name,
             fieldNames: [ce],
             relation: ke.value,
-            token: A(z)
+            token: _(Q)
           };
-        } else if (te.length === 2) {
-          const [ce, Le] = te;
+        } else if (ne.length === 2) {
+          const [ce, Le] = ne;
           de = {
             schemaName: null,
             tableName: ce,
             fieldNames: [Le],
             relation: ke.value,
-            token: A(z)
+            token: _(Q)
           };
-        } else if (te.length === 3) {
-          const [ce, Le, it] = te;
+        } else if (ne.length === 3) {
+          const [ce, Le, rt] = ne;
           de = {
             schemaName: ce,
             tableName: Le,
-            fieldNames: [it],
+            fieldNames: [rt],
             relation: ke.value,
-            token: A(z)
+            token: _(Q)
           };
         } else {
-          n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", z));
-          const ce = te.pop(), Le = te.pop();
+          n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", Q));
+          const ce = ne.pop(), Le = ne.pop();
           de = {
-            schemaName: te.join("."),
+            schemaName: ne.join("."),
             tableName: Le,
             fieldNames: [ce],
             relation: ke.value,
-            token: A(z)
+            token: _(Q)
           };
         }
-        const st = this.registerInlineRefToEnv(e, nt, de, z);
-        return n.push(...st), st.length === 0 ? de : [];
+        const it = this.registerInlineRefToEnv(e, st, de, Q);
+        return n.push(...it), it.length === 0 ? de : [];
       });
     }
-    return s.pk || (s.pk = r.some((_) => j(_).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((_) => j(_).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
+    return s.pk || (s.pk = r.some((S) => Y(S).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((S) => Y(S).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
   }
   interpretIndexes(e) {
     return this.table.indexes.push(...e.body.body.map((n) => {
       var a, l, p, f, E, h, m;
       const s = { columns: [] }, i = n;
-      s.token = A(i);
+      s.token = _(i);
       const r = [i.callee, ...i.args];
-      if (I.last(r) instanceof R) {
-        const g = B(r.pop()).getValue();
-        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((l = g.unique) != null && l.length), s.name = G((f = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : f.value).unwrap_or(void 0);
-        const _ = (E = g.note) == null ? void 0 : E.at(0);
-        s.note = _ && {
-          value: G(_.value).unwrap(),
-          token: A(_)
-        }, s.type = j((m = (h = g.type) == null ? void 0 : h.at(0)) == null ? void 0 : m.value).unwrap_or(void 0);
+      if (I.last(r) instanceof P) {
+        const g = V(r.pop()).getValue();
+        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((l = g.unique) != null && l.length), s.name = C((f = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : f.value).unwrap_or(void 0);
+        const R = (E = g.note) == null ? void 0 : E.at(0);
+        s.note = R && {
+          value: C(R.value).unwrap(),
+          token: _(R)
+        }, s.type = Y((m = (h = g.type) == null ? void 0 : h.at(0)) == null ? void 0 : m.value).unwrap_or(void 0);
       }
       return r.flatMap((g) => {
-        if (!(g instanceof H))
+        if (!(g instanceof J))
           return g;
-        const _ = [];
-        for (; g instanceof H; )
-          _.push(g.argumentList), g = g.callee;
-        return _.push(g), _;
+        const R = [];
+        for (; g instanceof J; )
+          R.push(g.argumentList), g = g.callee;
+        return R.push(g), R;
       }).forEach((g) => {
-        const { functional: _, nonFunctional: ee } = Xe(g).unwrap();
+        const { functional: R, nonFunctional: S } = $e(g).unwrap();
         s.columns.push(
-          ..._.map((le) => ({
-            value: le.value.value,
+          ...R.map((te) => ({
+            value: te.value.value,
             type: "expression",
-            token: A(le)
+            token: _(te)
           })),
-          ...ee.map((le) => ({
-            value: C(le).unwrap(),
+          ...S.map((te) => ({
+            value: X(te).unwrap(),
             type: "column",
-            token: A(le)
+            token: _(te)
           }))
         );
       }), s;
@@ -3232,40 +3232,40 @@ class Mt {
         {
           schemaName: this.table.schemaName,
           tableName: this.table.name,
-          fieldNames: [j(e.callee).unwrap()],
-          token: A(e),
+          fieldNames: [Y(e.callee).unwrap()],
+          token: _(e),
           relation: a[0]
         }
       ]
     }), [];
   }
 }
-function qn(t) {
+function Hn(t) {
   let e = null;
-  t instanceof H && (e = t.argumentList.elementList.map((r) => fe(r) ? r.expression.literal.value : $(r) ? G(r).unwrap() : j(r).unwrap()).join(","), t = t.callee);
+  t instanceof J && (e = t.argumentList.elementList.map((r) => fe(r) ? r.expression.literal.value : W(r) ? C(r).unwrap() : Y(r).unwrap()).join(","), t = t.callee);
   let n = "";
   for (; t instanceof he; )
     n = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${n}`, t = t.array;
   const { name: s, schemaName: i } = Ie(t);
-  return i.length > 1 ? new V(
+  return i.length > 1 ? new G(
     {
       schemaName: i.length === 0 ? null : i[0],
       type_name: `${s}${n}${e ? `(${e})` : ""}`,
       args: e
     },
     [new c(o.UNSUPPORTED, "Nested schema is not supported", t)]
-  ) : new V({
+  ) : new G({
     schemaName: i.length === 0 ? null : i[0],
     type_name: `${s}${n}${e ? `(${e})` : ""}`,
     args: e
   });
 }
-function Hn(t) {
+function Jn(t) {
   var e, n, s;
   if (t) {
-    if ($(t))
+    if (W(t))
       return {
-        value: G(t).unwrap(),
+        value: C(t).unwrap(),
         type: "string"
       };
     if (fe(t))
@@ -3278,14 +3278,14 @@ function Hn(t) {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
       };
-    if (t instanceof Q && yt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression)) {
+    if (t instanceof q && yt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression)) {
       const i = Number.parseFloat(t.expression.expression.literal.value);
       return {
         value: ((n = t.op) == null ? void 0 : n.value) === "-" ? 0 - i : i,
         type: "number"
       };
     }
-    if (t instanceof ne)
+    if (t instanceof se)
       return {
         value: (s = t.value) == null ? void 0 : s.value,
         type: "expression"
@@ -3293,12 +3293,12 @@ function Hn(t) {
     throw new Error("Unreachable");
   }
 }
-class Jn {
+class Zn {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.note = { name: void 0, content: void 0, token: void 0 };
   }
   interpret() {
-    return this.note.token = A(this.declarationNode), this.env.notes.set(this.declarationNode, this.note), [
+    return this.note.token = _(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)
@@ -3310,37 +3310,37 @@ class Jn {
   }
   interpretSettingList(e) {
     var s, i, r;
-    const n = B(e).getValue();
-    return this.note.headerColor = (s = n.headercolor) != null && s.length ? Ke((r = (i = n.headercolor) == null ? void 0 : i.at(0)) == null ? void 0 : r.value) : void 0, [];
+    const n = V(e).getValue();
+    return this.note.headerColor = (s = n.headercolor) != null && s.length ? et((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 v);
     return n.length !== 1 || s.length > 0 ? [
       new c(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 = re(n), [];
+    return this.note.content = ae(n), [];
   }
 }
 class Ft {
   constructor(e, n) {
-    this.declarationNode = e, this.env = n, this.container = this.declarationNode.parent instanceof v ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
+    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 = A(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.ref.token = _(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 = W(this.declarationNode.name).unwrap_or([]);
+    const n = [], s = j(this.declarationNode.name).unwrap_or([]);
     return this.ref.name = s.pop() || null, s.length > 1 && n.push(new c(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 v ? this.interpretField(e) : this.interpretField(e.body[0]);
   }
   interpretField(e) {
     var f, E, h, m;
-    const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, r = $e(s), a = $e(i);
+    const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, r = We(s), a = We(i);
     if (Ut(r, a))
       return [new c(o.SAME_ENDPOINT, "Two endpoints are the same", e)];
     const l = Pt(r, a);
@@ -3350,22 +3350,22 @@ class Ft {
         new c(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[l])
       ];
     if (e.args[0]) {
-      const g = B(e.args[0]).getValue(), _ = (E = (f = g.delete) == null ? void 0 : f.at(0)) == null ? void 0 : E.value;
-      this.ref.onDelete = _ instanceof Y ? Te(_).unwrap_or(void 0) : j(_).unwrap_or(void 0);
-      const ee = (m = (h = g.update) == null ? void 0 : h.at(0)) == null ? void 0 : m.value;
-      this.ref.onUpdate = ee instanceof Y ? Te(ee).unwrap_or(void 0) : j(ee).unwrap_or(void 0);
+      const g = V(e.args[0]).getValue(), R = (E = (f = g.delete) == null ? void 0 : f.at(0)) == null ? void 0 : E.value;
+      this.ref.onDelete = R instanceof z ? Te(R).unwrap_or(void 0) : Y(R).unwrap_or(void 0);
+      const S = (m = (h = g.update) == null ? void 0 : h.at(0)) == null ? void 0 : m.value;
+      this.ref.onUpdate = S instanceof z ? Te(S).unwrap_or(void 0) : Y(S).unwrap_or(void 0);
     }
     const p = Rt(n);
     return this.ref.endpoints = [
       {
         ...dt(s, this.container),
         relation: p[0],
-        token: A(s)
+        token: _(s)
       },
       {
         ...dt(i, this.container),
         relation: p[1],
-        token: A(i)
+        token: _(i)
       }
     ], this.env.refIds[l] = this.declarationNode, [];
   }
@@ -3376,7 +3376,7 @@ class Bt {
   }
   interpret() {
     const e = [];
-    return this.tableGroup.token = A(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup), e.push(
+    return this.tableGroup.token = _(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup), e.push(
       ...this.interpretName(this.declarationNode.name),
       ...this.interpretSettingList(this.declarationNode.attributeList),
       ...this.interpretBody(this.declarationNode.body)
@@ -3387,7 +3387,7 @@ class Bt {
     return i.length >= 2 && (this.tableGroup.name = s, this.tableGroup.schemaName = i.join("."), n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = s, this.tableGroup.schemaName = i[0] || null, n;
   }
   interpretBody(e) {
-    const [n, s] = Yt(e.body, (i) => i instanceof w);
+    const [n, s] = zt(e.body, (i) => i instanceof v);
     return [
       ...this.interpretFields(n),
       ...this.interpretSubElements(s)
@@ -3399,10 +3399,10 @@ class Bt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           this.tableGroup.note = {
-            value: G(
-              n.body instanceof J ? n.body.body[0].callee : n.body.callee
-            ).map(re).unwrap(),
-            token: A(n)
+            value: C(
+              n.body instanceof Z ? n.body.body[0].callee : n.body.callee
+            ).map(ae).unwrap(),
+            token: _(n)
           };
           break;
       }
@@ -3412,7 +3412,7 @@ class Bt {
   interpretFields(e) {
     const n = [];
     return this.tableGroup.tables = e.map((s) => {
-      const i = W(s.callee).unwrap();
+      const i = j(s.callee).unwrap();
       i.length > 2 && n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", s));
       const r = pe(s.callee).unwrap().pop().referee.id;
       if (this.env.groupOfTable[r]) {
@@ -3428,12 +3428,12 @@ class Bt {
   }
   interpretSettingList(e) {
     var i, r, a;
-    const n = B(e).getValue();
-    this.tableGroup.color = (i = n.color) != null && i.length ? Ke((a = (r = n.color) == null ? void 0 : r.at(0)) == null ? void 0 : a.value) : void 0;
+    const n = V(e).getValue();
+    this.tableGroup.color = (i = n.color) != null && i.length ? et((a = (r = n.color) == null ? void 0 : r.at(0)) == null ? void 0 : a.value) : void 0;
     const [s] = n.note || [];
     return this.tableGroup.note = s && {
-      value: G(s == null ? void 0 : s.value).map(re).unwrap(),
-      token: A(s)
+      value: C(s == null ? void 0 : s.value).map(ae).unwrap(),
+      token: _(s)
     }, [];
   }
 }
@@ -3442,7 +3442,7 @@ class Vt {
     this.declarationNode = e, this.env = n, this.enum = { values: [] };
   }
   interpret() {
-    return this.enum.token = A(this.declarationNode), this.env.enums.set(this.declarationNode, this.enum), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.enum.token = _(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 } = Ie(e);
@@ -3452,21 +3452,21 @@ class Vt {
     return e.body.flatMap((n) => {
       var l;
       const s = n, i = {};
-      i.token = A(s), i.name = j(s.callee).unwrap();
-      const a = (l = B(s.args[0]).getValue().note) == null ? void 0 : l.at(0);
+      i.token = _(s), i.name = Y(s.callee).unwrap();
+      const a = (l = V(s.args[0]).getValue().note) == null ? void 0 : l.at(0);
       return i.note = a && {
-        value: G(a.value).map(re).unwrap(),
-        token: A(a)
+        value: C(a.value).map(ae).unwrap(),
+        token: _(a)
       }, this.enum.values.push(i), [];
     });
   }
 }
-class Zn {
+class Kn {
   constructor(e, n) {
     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 = A(this.declarationNode), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.env.project.set(this.declarationNode, this.project), this.project.token = _(this.declarationNode), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
     if (!e)
@@ -3497,16 +3497,16 @@ class Zn {
         }
         case "note":
           return this.project.note = {
-            value: G(s.body instanceof J ? s.body.body[0].callee : s.body.callee).map(re).unwrap(),
-            token: A(s)
+            value: C(s.body instanceof Z ? s.body.body[0].callee : s.body.callee).map(ae).unwrap(),
+            token: _(s)
           }, [];
         default:
-          return this.project[s.type.value.toLowerCase()] = G(s.body.callee).unwrap(), [];
+          return this.project[s.type.value.toLowerCase()] = C(s.body.callee).unwrap(), [];
       }
     });
   }
 }
-class Kn {
+class es {
   constructor(e) {
     this.ast = e, this.env = {
       schema: [],
@@ -3527,7 +3527,7 @@ class Kn {
         case b.Table:
           return new Mt(n, this.env).interpret();
         case b.Note:
-          return new Jn(n, this.env).interpret();
+          return new Zn(n, this.env).interpret();
         case b.Ref:
           return new Ft(n, this.env).interpret();
         case b.TableGroup:
@@ -3535,15 +3535,15 @@ class Kn {
         case b.Enum:
           return new Vt(n, this.env).interpret();
         case b.Project:
-          return new Zn(n, this.env).interpret();
+          return new Kn(n, this.env).interpret();
         default:
           return [];
       }
     });
-    return new V(es(this.env), e);
+    return new G(ts(this.env), e);
   }
 }
-function es(t) {
+function ts(t) {
   return {
     schemas: [],
     tables: Array.from(t.tables.values()),
@@ -3555,7 +3555,7 @@ function es(t) {
     project: Array.from(t.project.values())[0] || {}
   };
 }
-var L = /* @__PURE__ */ ((t) => (t[t.Function = 1] = "Function", t[t.Constructor = 2] = "Constructor", t[t.Field = 3] = "Field", t[t.Variable = 4] = "Variable", t[t.Class = 5] = "Class", t[t.Struct = 6] = "Struct", t[t.Interface = 7] = "Interface", t[t.Module = 8] = "Module", t[t.Property = 9] = "Property", t[t.Event = 10] = "Event", t[t.Operator = 11] = "Operator", t[t.Unit = 12] = "Unit", t[t.Value = 13] = "Value", t[t.Constant = 14] = "Constant", t[t.Enum = 15] = "Enum", t[t.EnumMember = 16] = "EnumMember", t[t.Keyword = 17] = "Keyword", t[t.Text = 18] = "Text", t[t.Color = 19] = "Color", t[t.File = 20] = "File", t[t.Reference = 21] = "Reference", t[t.Customcolor = 22] = "Customcolor", t[t.Folder = 23] = "Folder", t[t.TypeParameter = 24] = "TypeParameter", t[t.User = 25] = "User", t[t.Issue = 26] = "Issue", t[t.Snippet = 27] = "Snippet", t))(L || {}), y = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(y || {});
+var L = /* @__PURE__ */ ((t) => (t[t.Function = 1] = "Function", t[t.Constructor = 2] = "Constructor", t[t.Field = 3] = "Field", t[t.Variable = 4] = "Variable", t[t.Class = 5] = "Class", t[t.Struct = 6] = "Struct", t[t.Interface = 7] = "Interface", t[t.Module = 8] = "Module", t[t.Property = 9] = "Property", t[t.Event = 10] = "Event", t[t.Operator = 11] = "Operator", t[t.Unit = 12] = "Unit", t[t.Value = 13] = "Value", t[t.Constant = 14] = "Constant", t[t.Enum = 15] = "Enum", t[t.EnumMember = 16] = "EnumMember", t[t.Keyword = 17] = "Keyword", t[t.Text = 18] = "Text", t[t.Color = 19] = "Color", t[t.File = 20] = "File", t[t.Reference = 21] = "Reference", t[t.Customcolor = 22] = "Customcolor", t[t.Folder = 23] = "Folder", t[t.TypeParameter = 24] = "TypeParameter", t[t.User = 25] = "User", t[t.Issue = 26] = "Issue", t[t.Snippet = 27] = "Snippet", t))(L || {}), w = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(w || {});
 function Ae(t) {
   switch (t) {
     case T.Schema:
@@ -3577,7 +3577,7 @@ function Ae(t) {
   }
 }
 function Re(t, e) {
-  if (!t || Ce(t))
+  if (!t || Xe(t))
     return !1;
   for (const n of t.trailingTrivia) {
     if (n.start > e)
@@ -3610,7 +3610,7 @@ function Fe(t) {
     }))
   };
 }
-function et(t, e) {
+function tt(t, e) {
   return t.getOffsetAt(e);
 }
 class Gt {
@@ -3619,23 +3619,23 @@ class Gt {
   }
   provideCompletionItems(e, n) {
     var E, h;
-    const s = et(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), l = a === void 0 ? i[0] : i[a + 1];
+    const s = tt(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), l = a === void 0 ? i[0] : i[a + 1];
     if ([
       ...(r == null ? void 0 : r.trailingTrivia) || [],
       ...(r == null ? void 0 : r.leadingTrivia) || [],
       ...(l == null ? void 0 : l.leadingTrivia) || []
-    ].find((m) => qt(m) && ge(s, m)))
+    ].find((m) => Ht(m) && ge(s, m)))
       return D();
     if (a === void 0)
       return bt();
     if ([u.STRING_LITERAL, u.QUOTED_STRING].includes(r.kind) && ge(s, r))
       return D();
     const p = this.compiler.container.element(s);
-    if (this.compiler.container.scopeKind(s) === O.TOPLEVEL || p instanceof v && p.type && p.type.start <= s && p.type.end >= s)
+    if (this.compiler.container.scopeKind(s) === O.TOPLEVEL || p instanceof A && p.type && p.type.start <= s && p.type.end >= s)
       return bt();
     const f = [...this.compiler.container.stack(s)].reverse();
     for (const m of f)
-      if (m instanceof Q)
+      if (m instanceof q)
         switch ((E = m.op) == null ? void 0 : E.value) {
           case ">":
           case "<":
@@ -3647,7 +3647,7 @@ class Gt {
               m
             );
         }
-      else if (m instanceof q)
+      else if (m instanceof H)
         switch ((h = m.op) == null ? void 0 : h.value) {
           case ">":
           case "<":
@@ -3666,15 +3666,15 @@ class Gt {
             );
         }
       else {
-        if (m instanceof se)
+        if (m instanceof ie)
           return Nt(this.compiler, s, m);
-        if (m instanceof R)
+        if (m instanceof P)
           return Nt(this.compiler, s, m);
-        if (m instanceof Z)
-          return ts(this.compiler, s);
-        if (m instanceof w)
+        if (m instanceof K)
+          return ns(this.compiler, s);
+        if (m instanceof v)
           return Tt(this.compiler, s, m);
-        if (m instanceof v && (m.bodyColon && s >= m.bodyColon.end || m.body && ge(s, m.body)))
+        if (m instanceof A && (m.bodyColon && s >= m.bodyColon.end || m.body && ge(s, m.body)))
           return Tt(this.compiler, s, void 0);
       }
     return D();
@@ -3705,18 +3705,18 @@ function Be(t, e, n, s) {
         ...t.symbol.members(l).filter(({ kind: p }) => s.includes(p)).map(({ name: p, kind: f }) => ({
           label: p,
           insertText: p,
-          insertTextRules: y.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           kind: Ae(f),
           sortText: Ae(f).toString().padStart(2, "0"),
           range: void 0
         }))
       );
     }
-    i = i instanceof v ? i.parent : void 0;
+    i = i instanceof A ? i.parent : void 0;
   }
   return Fe(r);
 }
-function ts(t, e) {
+function ns(t, e) {
   var s;
   switch (t.container.scopeKind(e)) {
     case O.INDEXES:
@@ -3726,7 +3726,7 @@ function ts(t, e) {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
           const r = i.pop();
-          if (r instanceof q && ((s = r.op) == null ? void 0 : s.value) === ".")
+          if (r instanceof H && ((s = r.op) == null ? void 0 : s.value) === ".")
             return Ct(
               t,
               e,
@@ -3746,8 +3746,8 @@ function Nt(t, e, n) {
   }
   if (n.name && n.name.start <= e && n.name.end >= e)
     return mt(t, e);
-  if (n.name instanceof Y) {
-    const i = ns(
+  if (n.name instanceof z) {
+    const i = ss(
       t,
       e,
       Te(n.name).unwrap_or("")
@@ -3758,7 +3758,7 @@ function Nt(t, e, n) {
 }
 function mt(t, e) {
   const n = t.container.element(e), s = t.container.scopeKind(e);
-  if (n instanceof X)
+  if (n instanceof $)
     return D();
   if (n.body && !ge(e, n.body))
     switch (s) {
@@ -3768,7 +3768,7 @@ function mt(t, e) {
             label: i,
             insertText: `${i}: `,
             kind: L.Field,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }))
         };
@@ -3778,7 +3778,7 @@ function mt(t, e) {
             label: i,
             insertText: `${i}: `,
             kind: L.Field,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }))
         };
@@ -3793,21 +3793,21 @@ function mt(t, e) {
             label: i,
             insertText: i,
             kind: L.Property,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           })),
           ...["ref", "default"].map((i) => ({
             label: i,
             insertText: `${i}: `,
             kind: L.Property,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           })),
           {
             label: "note",
             insertText: "note: ",
             kind: L.Property,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }
         ]
@@ -3819,7 +3819,7 @@ function mt(t, e) {
             label: "note",
             insertText: "note: ",
             kind: L.Property,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }
         ]
@@ -3830,7 +3830,7 @@ function mt(t, e) {
           ...["unique", "pk"].map((i) => ({
             label: i,
             insertText: i,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             kind: L.Property,
             range: void 0
           })),
@@ -3838,7 +3838,7 @@ function mt(t, e) {
             label: i,
             insertText: `${i}: `,
             kind: L.Property,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }))
         ]
@@ -3849,14 +3849,14 @@ function mt(t, e) {
           label: i,
           insertText: `${i}: `,
           kind: L.Property,
-          insertTextRules: y.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
   }
   return D();
 }
-function ns(t, e, n) {
+function ss(t, e, n) {
   switch (n == null ? void 0 : n.toLowerCase()) {
     case "update":
     case "delete":
@@ -3865,7 +3865,7 @@ function ns(t, e, n) {
           label: s,
           insertText: s,
           kind: L.Value,
-          insertTextRules: y.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
@@ -3875,7 +3875,7 @@ function ns(t, e, n) {
           label: s,
           insertText: `${s}`,
           kind: L.Value,
-          insertTextRules: y.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
@@ -3884,9 +3884,9 @@ function ns(t, e, n) {
 }
 function Ct(t, e, n) {
   const s = pe(n).unwrap_or([]);
-  if (s.pop(), s.some((r) => !M(r)))
+  if (s.pop(), s.some((r) => !F(r)))
     return D();
-  const i = s.map((r) => j(r).unwrap());
+  const i = s.map((r) => Y(r).unwrap());
   return Fe({
     suggestions: t.symbol.ofName({ nameStack: i, owner: t.container.element(e) }).flatMap(({ symbol: r }) => t.symbol.members(r)).map(({ kind: r, name: a }) => ({
       label: a,
@@ -3900,19 +3900,19 @@ function Tt(t, e, n) {
   var i;
   switch (t.container.scopeKind(e)) {
     case O.TABLE:
-      return is(t, e, n);
-    case O.PROJECT:
       return rs(t, e, n);
+    case O.PROJECT:
+      return as(t, e, n);
     case O.INDEXES:
-      return os(t, e);
+      return ls(t, e);
     case O.ENUM:
-      return ss(t, e, n);
+      return is(t, e, n);
     case O.REF: {
       const r = Xt(t, e);
       return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && Re(t.container.token(e).token, e) ? Pe(r) : r;
     }
     case O.TABLEGROUP:
-      return as(t);
+      return os(t);
     default:
       return D();
   }
@@ -3922,47 +3922,47 @@ function bt() {
     suggestions: ["Table", "TableGroup", "Enum", "Project", "Ref"].map((t) => ({
       label: t,
       insertText: t,
-      insertTextRules: y.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
   };
 }
-function ss(t, e, n) {
-  return n != null && n.callee && tt(e, n) === 1 ? Be(t, e, t.container.element(e), [
+function is(t, e, n) {
+  return n != null && n.callee && nt(e, n) === 1 ? Be(t, e, t.container.element(e), [
     T.Schema,
     T.Table,
     T.Column
   ]) : D();
 }
-function is(t, e, n) {
+function rs(t, e, n) {
   if (!(n != null && n.callee))
     return {
       suggestions: ["Note", "indexes"].map((i) => ({
         label: i,
         insertText: i,
-        insertTextRules: y.KeepWhitespace,
+        insertTextRules: w.KeepWhitespace,
         kind: L.Keyword,
         range: void 0
       }))
     };
-  const s = tt(e, n);
+  const s = nt(e, n);
   return s === 0 ? {
     suggestions: ["Note", "indexes"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: y.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
-  } : s === 1 ? ls(t, e) : D();
+  } : s === 1 ? cs(t, e) : D();
 }
-function rs(t, e, n) {
-  return n != null && n.callee ? tt(e, n) === 0 ? {
+function as(t, e, n) {
+  return n != null && n.callee ? nt(e, n) === 0 ? {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: y.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
@@ -3970,7 +3970,7 @@ function rs(t, e, n) {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: y.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
@@ -3983,19 +3983,19 @@ function Xt(t, e) {
     T.Column
   ]);
 }
-function as(t) {
+function os(t) {
   return {
     suggestions: [
       ...Fe({
         suggestions: [...t.parse.publicSymbolTable().entries()].flatMap(([e]) => {
-          const n = ie(e).unwrap_or(void 0);
+          const n = re(e).unwrap_or(void 0);
           if (n === void 0)
             return [];
           const { kind: s, name: i } = n;
           return s !== T.Table && s !== T.Schema ? [] : {
             label: i,
             insertText: i,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             kind: Ae(s),
             range: void 0
           };
@@ -4004,17 +4004,17 @@ function as(t) {
       ...["Note"].map((e) => ({
         label: e,
         insertText: e,
-        insertTextRules: y.KeepWhitespace,
+        insertTextRules: w.KeepWhitespace,
         kind: L.Keyword,
         range: void 0
       }))
     ]
   };
 }
-function os(t, e) {
+function ls(t, e) {
   return $t(t, e);
 }
-function ls(t, e) {
+function cs(t, e) {
   return {
     suggestions: [
       ...[
@@ -4077,7 +4077,7 @@ function ls(t, e) {
       ].map((n) => ({
         label: n,
         insertText: n,
-        insertTextRules: y.KeepWhitespace,
+        insertTextRules: w.KeepWhitespace,
         kind: L.TypeParameter,
         sortText: L.TypeParameter.toString().padStart(2, "0"),
         range: void 0
@@ -4096,21 +4096,21 @@ function $t(t, e) {
   const { symbolTable: i } = s.symbol;
   return Fe({
     suggestions: [...i.entries()].flatMap(([r]) => {
-      const a = ie(r).unwrap_or(void 0);
+      const a = re(r).unwrap_or(void 0);
       if (a === void 0)
         return [];
       const { name: l } = a;
       return {
         label: l,
         insertText: l,
-        insertTextRules: y.KeepWhitespace,
+        insertTextRules: w.KeepWhitespace,
         kind: Ae(T.Column),
         range: void 0
       };
     })
   });
 }
-function tt(t, e) {
+function nt(t, e) {
   if (!e.callee)
     return -1;
   const n = [e.callee, ...e.args], s = n.findIndex((i) => t <= i.end);
@@ -4122,7 +4122,7 @@ class Wt {
   }
   provideDefinition(e, n) {
     var a;
-    const { uri: s } = e, i = et(e, n), r = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = tt(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const l = r.pop();
       if ((a = l == null ? void 0 : l.referee) != null && a.declaration && [Ne.PRIMARY_EXPRESSION, Ne.VARIABLE].includes(l == null ? void 0 : l.kind)) {
@@ -4148,7 +4148,7 @@ class jt {
     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 = tt(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const a = r.pop();
       if (a && [
@@ -4172,21 +4172,21 @@ class jt {
     return [];
   }
 }
-const hs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const fs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  CompletionItemInsertTextRule: y,
+  CompletionItemInsertTextRule: w,
   CompletionItemKind: L,
   DBMLCompletionItemProvider: Gt,
   DBMLDefinitionProvider: Wt,
   DBMLReferencesProvider: jt
 }, Symbol.toStringTag, { value: "Module" }));
 var O = /* @__PURE__ */ ((t) => (t[t.TABLE = 0] = "TABLE", t[t.ENUM = 1] = "ENUM", t[t.TABLEGROUP = 2] = "TABLEGROUP", t[t.INDEXES = 3] = "INDEXES", t[t.NOTE = 4] = "NOTE", t[t.REF = 5] = "REF", t[t.PROJECT = 6] = "PROJECT", t[t.CUSTOM = 7] = "CUSTOM", t[t.TOPLEVEL = 8] = "TOPLEVEL", t))(O || {});
-class fs {
+class ps {
   constructor() {
     this.source = "", this.cache = new Array(
       16
       /* TOTAL_QUERY_COUNT */
-    ).fill(null), this.nodeIdGenerator = new Ht(), this.symbolIdGenerator = new tn(), this.token = {
+    ).fill(null), this.nodeIdGenerator = new Jt(), this.symbolIdGenerator = new nn(), this.token = {
       invalidStream: this.createQuery(
         6,
         () => this.parse.tokens().filter(wt)
@@ -4201,8 +4201,8 @@ class fs {
       _: this.createQuery(
         0,
         () => {
-          const e = new fn(this.source).lex().chain((n) => new En(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new Qn(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
-          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new Kn(n).interpret().map((r) => ({ ast: n, tokens: s, rawDb: r })));
+          const e = new pn(this.source).lex().chain((n) => new Nn(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new qn(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
+          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new es(n).interpret().map((r) => ({ ast: n, tokens: s, rawDb: r })));
         }
       ),
       ast: this.createQuery(
@@ -4226,15 +4226,15 @@ class fs {
       stack: this.createQuery(
         10,
         (e) => {
-          const n = this.token.flatStream(), { index: s, token: i } = this.container.token(e), r = s === void 0 ? -1 : zt(n, (f) => !f.isInvalid, s);
+          const n = this.token.flatStream(), { index: s, token: i } = this.container.token(e), r = s === void 0 ? -1 : Qt(n, (f) => !f.isInvalid, s);
           if (r === -1)
             return [this.parse.ast()];
           const a = n[r].start;
           let l = this.parse.ast();
           const p = [l];
           for (; ; ) {
-            const E = hn(l).find((h) => ge(a, h));
-            if (E === void 0 || E instanceof F)
+            const E = fn(l).find((h) => ge(a, h));
+            if (E === void 0 || E instanceof B)
               break;
             p.push(E), l = E;
           }
@@ -4242,17 +4242,17 @@ class fs {
             return p;
           for (; p.length > 0; ) {
             let f = !1;
-            const E = rt(p);
-            if (E instanceof w) {
+            const E = Ce(p);
+            if (E instanceof v) {
               const h = this.parse.source();
               for (let m = E.end; m < e; m += 1)
                 h[m] === `
 ` && (p.pop(), f = !0);
             } else
-              E instanceof Q || E instanceof q ? this.container.token(e).token !== E.op && (p.pop(), f = !0) : E instanceof R ? E.listCloseBracket && E.end <= e && (p.pop(), f = !0) : E instanceof Z ? E.tupleCloseParen && E.end <= e && (p.pop(), f = !0) : E instanceof J ? E.blockCloseBrace && E.end <= e && (p.pop(), f = !0) : E instanceof Y || E.end < e && (p.pop(), f = !0);
+              E instanceof q || E instanceof H ? this.container.token(e).token !== E.op && (p.pop(), f = !0) : E instanceof P ? E.listCloseBracket && E.end <= e && (p.pop(), f = !0) : E instanceof K ? E.tupleCloseParen && E.end <= e && (p.pop(), f = !0) : E instanceof Z ? E.blockCloseBrace && E.end <= e && (p.pop(), f = !0) : E instanceof z || E.end < e && (p.pop(), f = !0);
             if (f) {
-              const h = rt(p);
-              h instanceof v && h.end <= e && p.pop();
+              const h = Ce(p);
+              h instanceof A && h.end <= e && p.pop();
             }
             if (!f)
               break;
@@ -4275,7 +4275,7 @@ class fs {
         (e) => {
           const n = this.container.stack(e);
           for (let s = n.length - 1; s >= 0; s -= 1)
-            if (n[s] instanceof v)
+            if (n[s] instanceof A)
               return n[s];
           return this.parse.ast();
         }
@@ -4289,7 +4289,7 @@ class fs {
       ),
       scopeKind: this.createQuery(15, (e) => {
         var s;
-        if (this.container.element(e) instanceof X)
+        if (this.container.element(e) instanceof $)
           return 8;
         switch ((s = this.container.element(e).type) == null ? void 0 : s.value.toLowerCase()) {
           case "table":
@@ -4325,15 +4325,15 @@ class fs {
           if (e.length === 0)
             return [];
           const s = [];
-          for (let r = n; r; r = r instanceof v ? r.parent : void 0) {
+          for (let r = n; r; r = r instanceof A ? r.parent : void 0) {
             if (!((i = r.symbol) != null && i.symbolTable))
               continue;
             const { symbolTable: a } = r.symbol;
             let l = [a], p = [];
             for (const f of e)
               p = l.flatMap(
-                (E) => Kt(f).flatMap((h) => {
-                  const m = E.get(h), g = ie(h).unwrap_or(void 0);
+                (E) => en(f).flatMap((h) => {
+                  const m = E.get(h), g = re(h).unwrap_or(void 0);
                   return !m || !g ? [] : { ...g, symbol: m };
                 })
               ), l = p.flatMap(
@@ -4348,7 +4348,7 @@ class fs {
       members: this.createQuery(
         9,
         (e) => e.symbolTable ? [...e.symbolTable.entries()].map(([n, s]) => ({
-          ...ie(n).unwrap(),
+          ...re(n).unwrap(),
           symbol: s
         })) : []
       )
@@ -4382,7 +4382,7 @@ class fs {
   }
 }
 export {
-  fs as Compiler,
-  us as serialize,
-  hs as services
+  ps as Compiler,
+  hs as serialize,
+  fs as services
 };