@dbml/parse 3.1.2 → 3.1.3

package/dist/dbml-parse.mjs

@@ -1,4 +1,4 @@
-import L from "lodash";
+import I from "lodash";
 var c = /* @__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))(c || {});
 function Xt(t) {
   switch (t.kind) {
@@ -36,12 +36,12 @@ function rt(t) {
 function at(t) {
   return t !== void 0 && t.kind === "<op>";
 }
-class V {
+class B {
   constructor(e, s, n, i, r) {
     this.kind = e, this.startPos = s, this.endPos = n, this.value = i, this.leadingTrivia = [], this.trailingTrivia = [], this.leadingInvalid = [], this.trailingInvalid = [], this.isInvalid = r, this.start = s.offset, this.end = n.offset;
   }
   static create(e, s, n, i, r) {
-    return new V(e, s, n, i, r);
+    return new B(e, s, n, i, r);
   }
 }
 function bt(t) {
@@ -54,7 +54,7 @@ function Ve(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === c.SPACE) !== void 0;
 }
 function It(t) {
-  return t.trailingTrivia.length === 0 ? t.end : It(L.last(t.trailingTrivia));
+  return t.trailingTrivia.length === 0 ? t.end : It(I.last(t.trailingTrivia));
 }
 function Lt(t) {
   return t.leadingTrivia.length === 0 ? t.start : Lt(t.leadingTrivia[0]);
@@ -75,32 +75,32 @@ class Wt {
     return this.id++;
   }
 }
-class v {
+class y {
   // The symbol that this syntax node refers to
   // args must be passed in order of appearance in the node
   constructor(e, s, n) {
     this.id = e, this.kind = s;
     const i = n.find((a) => a !== void 0 && !Number.isNaN(a.start));
-    i ? (this.startPos = i.startPos, this.fullStart = i instanceof V ? Lt(i) : i.fullStart) : (this.startPos = {
+    i ? (this.startPos = i.startPos, this.fullStart = i instanceof B ? Lt(i) : i.fullStart) : (this.startPos = {
       offset: NaN,
       column: NaN,
       line: NaN
     }, this.fullStart = NaN);
     const r = [...n].reverse().find((a) => a !== void 0 && !Number.isNaN(a.end));
-    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof V ? It(r) : r.fullEnd) : (this.endPos = {
+    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof B ? It(r) : r.fullEnd) : (this.endPos = {
       offset: NaN,
       column: NaN,
       line: NaN
     }, this.fullEnd = NaN), this.start = this.startPos.offset, this.end = this.endPos.offset;
   }
 }
-var he = /* @__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))(he || {});
-class X extends v {
+var ue = /* @__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))(ue || {});
+class C extends y {
   constructor({ body: e = [], eof: s }, n) {
     super(n, "<program>", [...e, s]), this.body = e, this.eof = s;
   }
 }
-class _ extends v {
+class _ extends y {
   constructor({
     type: e,
     name: s,
@@ -118,17 +118,17 @@ class _ extends v {
       r,
       a,
       l
-    ]), l && a && !(l instanceof y || l instanceof _))
+    ]), l && a && !(l instanceof x || l instanceof _))
       throw new Error("If an element has a simple body, it must be a function application node");
     this.type = e, this.name = s, this.as = n, this.alias = i, this.attributeList = r, this.bodyColon = a, this.body = l;
   }
 }
-class te extends v {
+class te extends y {
   constructor({ identifiers: e = [] }, s) {
     super(s, "<identifer-stream>", e || []), this.identifiers = e;
   }
 }
-class ne extends v {
+class ne extends y {
   constructor({
     name: e,
     colon: s,
@@ -137,12 +137,12 @@ class ne extends v {
     super(i, "<attribute>", [e, s, n]), this.name = e, this.value = n, this.colon = s;
   }
 }
-class Q extends v {
+class Q extends y {
   constructor({ op: e, expression: s }, n) {
     super(n, "<prefix-expression>", [e, s]), this.op = e, this.expression = s;
   }
 }
-class q extends v {
+class q extends y {
   constructor({
     op: e,
     leftExpression: s,
@@ -151,22 +151,22 @@ class q extends v {
     super(i, "<infix-expression>", [s, e, n]), this.op = e, this.leftExpression = s, this.rightExpression = n;
   }
 }
-class Oe extends v {
+class De extends y {
   constructor({ op: e, expression: s }, n) {
     super(n, "<postfix-expression>", [s, e]), this.op = e, this.expression = s;
   }
 }
-class K extends v {
+class K extends y {
   constructor({ value: e }, s) {
     super(s, "<function-expression>", [e]), this.value = e;
   }
 }
-class y extends v {
+class x extends y {
   constructor({ callee: e, args: s = [] }, n) {
     super(n, "<function-application>", [e, ...s]), this.callee = e, this.args = s;
   }
 }
-class ee extends v {
+class ee extends y {
   constructor({
     blockOpenBrace: e,
     body: s = [],
@@ -175,7 +175,7 @@ class ee extends v {
     super(i, "<block-expression>", [e, ...s, n]), this.blockOpenBrace = e, this.body = s, this.blockCloseBrace = n;
   }
 }
-class U extends v {
+class U extends y {
   constructor({
     listOpenBracket: e,
     elementList: s = [],
@@ -189,7 +189,7 @@ class U extends v {
     ]), this.listOpenBracket = e, this.elementList = s, this.commaList = n, this.listCloseBracket = i;
   }
 }
-class J extends v {
+class J extends y {
   constructor({
     tupleOpenParen: e,
     elementList: s = [],
@@ -220,7 +220,7 @@ class Xe extends J {
     ), this.kind = "<group-expression>";
   }
 }
-class H extends v {
+class H extends y {
   constructor({
     callee: e,
     argumentList: s
@@ -228,28 +228,28 @@ class H extends v {
     super(n, "<call-expression>", [e, s]), this.callee = e, this.argumentList = s;
   }
 }
-class de extends v {
+class pe extends y {
   constructor({ literal: e }, s) {
     super(s, "<literal>", [e]), this.literal = e;
   }
 }
-class $ extends v {
+class X extends y {
   constructor({ variable: e }, s) {
     super(s, "<variable>", [e]), this.variable = e;
   }
 }
-class D extends v {
+class R extends y {
   constructor({ expression: e }, s) {
     super(s, "<primary-expression>", [e]), this.expression = e;
   }
 }
-class we extends v {
+class we extends y {
   constructor({ pre: e }, s) {
-    const n = V.create(c.SPACE, e.endPos, e.endPos, " ", !1);
+    const n = B.create(c.SPACE, e.endPos, e.endPos, " ", !1);
     super(s, "<dummy>", [n]);
   }
 }
-class fe extends v {
+class he extends y {
   constructor({ expression: e, indexer: s }, n) {
     super(n, "<array>", [e, s]), this.array = e, this.indexer = s;
   }
@@ -260,16 +260,16 @@ function gt(t, e) {
   if (!e || e.length === 0)
     return t || [];
   const [s] = t, [n] = e;
-  return (s.start < n.start ? L.flatten(L.zip(t, e)) : L.flatten(L.zip(e, t))).filter(
+  return (s.start < n.start ? I.flatten(I.zip(t, e)) : I.flatten(I.zip(e, t))).filter(
     (i) => i !== null
   );
 }
-function ss(t, e = !1) {
+function is(t, e = !1) {
   return JSON.stringify(
     t,
     function(s, n) {
       var i;
-      return !(this instanceof X) && s === "symbol" ? n == null ? void 0 : n.id : (
+      return !(this instanceof C) && s === "symbol" ? n == null ? void 0 : n.id : (
         /* this instanceof SyntaxNode && */
         s === "symbol" ? {
           symbolTable: n == null ? void 0 : n.symbolTable,
@@ -290,7 +290,7 @@ function ss(t, e = !1) {
     e ? 2 : 0
   );
 }
-class k {
+class S {
   constructor(e) {
     this.value = e;
   }
@@ -305,7 +305,7 @@ class k {
     return e(this.value);
   }
   map(e) {
-    return new k(e(this.value));
+    return new S(e(this.value));
   }
   // eslint-disable-next-line class-methods-use-this
   isOk() {
@@ -338,7 +338,7 @@ var m = /* @__PURE__ */ ((t) => (t.Schema = "Schema", t.Table = "Table", t.Colum
 function $e(t) {
   return `Schema:${t}`;
 }
-function ye(t) {
+function xe(t) {
   return `Table:${t}`;
 }
 function We(t) {
@@ -367,7 +367,7 @@ function Fe(t, e) {
     case "Schema":
       return $e(t);
     case "Table":
-      return ye(t);
+      return xe(t);
     case "TableGroup":
       return ze(t);
     case "TableGroup field":
@@ -378,7 +378,7 @@ function Fe(t, e) {
 }
 function se(t) {
   const [e, s] = t.split(":");
-  return Object.values(m).includes(e) ? new k({
+  return Object.values(m).includes(e) ? new S({
     name: s,
     kind: e
   }) : new A();
@@ -393,7 +393,7 @@ function jt(t) {
 function Yt(t) {
   return [
     $e,
-    ye,
+    xe,
     je,
     ze,
     We,
@@ -405,16 +405,16 @@ function qe(t) {
   const [e] = t;
   return e >= "a" && e <= "z" || e >= "A" && e <= "Z" || e === "_";
 }
-function xe(t) {
+function ke(t) {
   const [e] = t;
   return e >= "0" && e <= "9";
 }
 function zt(t) {
   const [e] = t;
-  return xe(e) || qe(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
+  return ke(e) || qe(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
-function Te(t) {
-  return qe(t) || xe(t);
+function be(t) {
+  return qe(t) || ke(t);
 }
 function lt(t, e) {
   const s = [], n = Math.min(t.length, e.length);
@@ -422,7 +422,7 @@ function lt(t, e) {
     s.push(t[i], e[i]);
   return s.push(...t.slice(n), ...e.slice(n)), s;
 }
-function be(t, e) {
+function Ie(t, e) {
   return t >= e.start && t < e.end;
 }
 class Qt {
@@ -477,7 +477,7 @@ class u extends Error {
     super(s), this.code = e, this.diagnostic = s, this.nodeOrToken = n, this.start = n.start, this.end = n.end, this.name = this.constructor.name, Object.setPrototypeOf(this, u.prototype);
   }
 }
-class B {
+class F {
   constructor(e, s) {
     this.value = e, this.errors = s === void 0 ? [] : s;
   }
@@ -489,20 +489,20 @@ class B {
   }
   chain(e) {
     const s = e(this.value), n = [...this.errors, ...s.errors];
-    return new B(s.value, n);
+    return new F(s.value, n);
   }
   map(e) {
-    return new B(e(this.value), this.errors);
+    return new F(e(this.value), this.errors);
   }
 }
 function en(t, e, s) {
-  if (!t || !pe(t) || e.length === 0)
+  if (!t || !fe(t) || e.length === 0)
     return new A();
   const n = [...e], i = Be(t).unwrap(), r = n.pop();
   if (!(r instanceof ee))
     return new A();
-  const a = L.last(n) instanceof U ? n.pop() : void 0;
-  return n.length === 3 && Be(n[1]).unwrap().value === "as" ? new k(
+  const a = I.last(n) instanceof U ? n.pop() : void 0;
+  return n.length === 3 && Be(n[1]).unwrap().value === "as" ? new S(
     s.create(_, {
       type: i,
       name: n[0],
@@ -511,14 +511,14 @@ function en(t, e, s) {
       attributeList: a,
       body: r
     })
-  ) : n.length === 1 ? new k(
+  ) : n.length === 1 ? new S(
     s.create(_, {
       type: i,
       name: n[0],
       attributeList: a,
       body: r
     })
-  ) : n.length === 0 ? new k(
+  ) : n.length === 0 ? new S(
     s.create(_, {
       type: i,
       attributeList: a,
@@ -530,7 +530,7 @@ function ct(t) {
   return t.kind === c.IDENTIFIER && t.value === "as";
 }
 function E(t) {
-  t && (t instanceof V ? tn(t) : nn(t));
+  t && (t instanceof B ? tn(t) : nn(t));
 }
 function tn(t) {
   t.kind !== c.EOF && (t.isInvalid = !0);
@@ -546,7 +546,7 @@ function nn(t) {
     E(t.op), E(t.expression);
   else if (t instanceof q)
     E(t.leftExpression), E(t.op), E(t.rightExpression);
-  else if (t instanceof Oe)
+  else if (t instanceof De)
     E(t.op), E(t.expression);
   else if (t instanceof ee)
     E(t.blockOpenBrace), t.body.forEach(E), E(t.blockCloseBrace);
@@ -556,27 +556,27 @@ function nn(t) {
     E(t.tupleOpenParen), t.commaList.forEach(E), t.elementList.forEach(E), E(t.tupleCloseParen);
   else if (t instanceof H)
     E(t.callee), E(t.argumentList);
-  else if (t instanceof y)
+  else if (t instanceof x)
     E(t.callee), t.args.forEach(E);
-  else if (t instanceof D)
+  else if (t instanceof R)
     E(t.expression);
   else if (t instanceof K)
     E(t.value);
-  else if (t instanceof $)
+  else if (t instanceof X)
     E(t.variable);
-  else if (t instanceof de)
+  else if (t instanceof pe)
     E(t.literal);
   else
     throw t instanceof Xe ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
 }
-function wt(t) {
+function vt(t) {
   return !!(t != null && t.isInvalid);
 }
 function P(...t) {
   return t.filter((e) => e !== void 0);
 }
 function sn(t) {
-  if (t instanceof X)
+  if (t instanceof C)
     return P(...t.body, t.eof);
   if (t instanceof _)
     return P(
@@ -592,19 +592,19 @@ function sn(t) {
     return P(t.name, t.colon, t.value);
   if (t instanceof te)
     return t.identifiers;
-  if (t instanceof de)
+  if (t instanceof pe)
     return t.literal ? [t.literal] : [];
-  if (t instanceof $)
+  if (t instanceof X)
     return P(t.variable);
   if (t instanceof Q)
     return P(t.op, t.expression);
   if (t instanceof q)
     return P(t.leftExpression, t.op, t.rightExpression);
-  if (t instanceof Oe)
+  if (t instanceof De)
     return P(t.expression, t.op);
   if (t instanceof K)
     return P(t.value);
-  if (t instanceof y)
+  if (t instanceof x)
     return P(t.callee, ...t.args);
   if (t instanceof ee)
     return P(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
@@ -622,33 +622,33 @@ function sn(t) {
     );
   if (t instanceof H)
     return P(t.callee, t.argumentList);
-  if (t instanceof D)
+  if (t instanceof R)
     return P(t.expression);
   throw t instanceof Xe ? new Error("This case is already handled by TupleExpressionNode") : new Error("Unreachable - no other possible cases");
 }
 function Be(t) {
-  return M(t) ? new k(t.expression.variable) : new A();
+  return M(t) ? new S(t.expression.variable) : new A();
 }
-function W(t) {
+function $(t) {
   var e;
-  return t instanceof D && (t.expression instanceof $ && t.expression.variable instanceof V && t.expression.variable.kind === c.QUOTED_STRING || t.expression instanceof de && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.STRING_LITERAL);
+  return t instanceof R && (t.expression instanceof X && t.expression.variable instanceof B && t.expression.variable.kind === c.QUOTED_STRING || t.expression instanceof pe && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.STRING_LITERAL);
 }
 function M(t) {
-  return t instanceof D && t.expression instanceof $ && t.expression.variable instanceof V;
+  return t instanceof R && t.expression instanceof X && t.expression.variable instanceof B;
 }
-function pe(t) {
+function fe(t) {
   var e;
-  return t instanceof D && t.expression instanceof $ && ((e = t.expression.variable) == null ? void 0 : e.kind) === c.IDENTIFIER;
+  return t instanceof R && t.expression instanceof X && ((e = t.expression.variable) == null ? void 0 : e.kind) === c.IDENTIFIER;
 }
 function He(t) {
   var e;
-  return t instanceof q && t.leftExpression instanceof v && t.rightExpression instanceof v && ((e = t.op) == null ? void 0 : e.value) === ".";
+  return t instanceof q && t.leftExpression instanceof y && t.rightExpression instanceof y && ((e = t.op) == null ? void 0 : e.value) === ".";
 }
-function De(t) {
+function Re(t) {
   if (t === void 0)
     return new A();
   const e = t.identifiers.map((s) => s.value).join(" ");
-  return e === "" ? new A() : new k(e);
+  return e === "" ? new A() : new S(e);
 }
 class rn {
   // list of errors during lexing
@@ -690,7 +690,7 @@ class rn {
     this.tokens.push(this.createToken(e, s));
   }
   createToken(e, s = !1) {
-    return V.create(
+    return B.create(
       e,
       this.start,
       this.current,
@@ -699,7 +699,7 @@ class rn {
     );
   }
   lex() {
-    return this.scanTokens(), this.tokens.push(V.create(c.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new B(this.tokens, this.errors);
+    return this.scanTokens(), this.tokens.push(B.create(c.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new F(this.tokens, this.errors);
   }
   scanTokens() {
     for (; !this.isAtEnd(); ) {
@@ -768,7 +768,7 @@ class rn {
             this.identifier();
             break;
           }
-          if (xe(e)) {
+          if (ke(e)) {
             this.numericLiteral();
             break;
           }
@@ -794,7 +794,7 @@ class rn {
   gatherInvalid() {
     let e;
     const s = [], n = [];
-    for (e = 0; e < this.tokens.length && wt(this.tokens[e]); e += 1)
+    for (e = 0; e < this.tokens.length && vt(this.tokens[e]); e += 1)
       n.push(this.tokens[e]);
     let i = this.tokens[e];
     for (i.leadingInvalid = [...n, ...i.leadingInvalid]; e < this.tokens.length; e += 1) {
@@ -836,7 +836,7 @@ class rn {
       );
       return;
     }
-    a && this.match(s), this.tokens.push(V.create(e, this.start, this.current, l, !1));
+    a && this.match(s), this.tokens.push(B.create(e, this.start, this.current, l, !1));
   }
   singleLineStringLiteral() {
     this.consumeUntil(c.STRING_LITERAL, "'", {
@@ -883,7 +883,7 @@ class rn {
     });
   }
   identifier() {
-    for (; !this.isAtEnd() && Te(this.peek()); )
+    for (; !this.isAtEnd() && be(this.peek()); )
       this.advance();
     this.addToken(c.IDENTIFIER);
   }
@@ -902,19 +902,19 @@ class rn {
         break;
       if (!n && this.current.offset === this.text.length - 1)
         return this.advance(), this.addToken(c.NUMERIC_LITERAL);
-      if (!n && !Te(this.peek()))
+      if (!n && !be(this.peek()))
         return this.addToken(c.NUMERIC_LITERAL);
-      if (!n && !xe(this.peek()))
+      if (!n && !ke(this.peek()))
         break;
       this.advance();
     }
-    for (; !this.isAtEnd() && (this.check(".") || Te(this.peek())); )
+    for (; !this.isAtEnd() && (this.check(".") || be(this.peek())); )
       this.advance();
     const s = this.createToken(c.NUMERIC_LITERAL, !0);
     this.tokens.push(s), this.errors.push(new u(o.UNKNOWN_TOKEN, "Invalid number", s));
   }
   colorLiteral() {
-    for (; !this.isAtEnd() && Te(this.peek()); )
+    for (; !this.isAtEnd() && be(this.peek()); )
       this.advance();
     this.addToken(c.COLOR_LITERAL);
   }
@@ -946,7 +946,7 @@ class rn {
       case "u": {
         let e = "";
         for (let s = 0; s <= 3; s += 1) {
-          if (this.isAtEnd() || !Te(this.peek()))
+          if (this.isAtEnd() || !be(this.peek()))
             return `\\u${e}`;
           e += this.advance();
         }
@@ -957,7 +957,7 @@ class rn {
     }
   }
 }
-var ve = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(ve || {});
+var ye = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(ye || {});
 class an {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
@@ -970,7 +970,7 @@ class an {
     return e === 0 && (this.numberOfNestedLBrackets -= 1), e === 1 && (this.numberOfNestedLParens -= 1), e === 2 && (this.numberOfNestedLBraces -= 1), e;
   }
   top() {
-    return L.last(this.stack);
+    return I.last(this.stack);
   }
   isWithinGroupExpressionContext() {
     return this.numberOfNestedLParens > 0;
@@ -1056,7 +1056,7 @@ class ln {
           break;
         E(n), this.advance();
       }
-    }, this.blockExpression = this.contextStack.withContextDo(ve.BlockExpression, () => {
+    }, this.blockExpression = this.contextStack.withContextDo(ye.BlockExpression, () => {
       const n = { body: [] }, i = () => this.nodeFactory.create(ee, n);
       try {
         this.consume("Expect an opening brace '{'", c.LBRACE), n.blockOpenBrace = this.previous();
@@ -1095,7 +1095,7 @@ class ln {
             break;
           E(n), this.advance();
         }
-    }, this.tupleExpression = this.contextStack.withContextDo(ve.GroupExpression, () => {
+    }, this.tupleExpression = this.contextStack.withContextDo(ye.GroupExpression, () => {
       const n = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(Xe, {
         groupOpenParen: n.tupleOpenParen,
         groupCloseParen: n.tupleCloseParen,
@@ -1126,7 +1126,7 @@ class ln {
         } catch (a) {
           if (!(a instanceof d))
             throw a;
-          if (a.partialNode instanceof v && n.elementList.push(a.partialNode), !this.canHandle(a))
+          if (a.partialNode instanceof y && n.elementList.push(a.partialNode), !this.canHandle(a))
             throw new d(a.token, r(), a.handlerContext);
           this.synchronizeTuple();
         }
@@ -1147,7 +1147,7 @@ class ln {
           break;
         E(n), this.advance();
       }
-    }, this.listExpression = this.contextStack.withContextDo(ve.ListExpression, () => {
+    }, this.listExpression = this.contextStack.withContextDo(ye.ListExpression, () => {
       const n = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(U, n);
       try {
         this.consume("Expect an opening bracket '['", c.LBRACKET), n.listOpenBracket = this.previous();
@@ -1174,7 +1174,7 @@ class ln {
         } catch (r) {
           if (!(r instanceof d))
             throw r;
-          if (r.partialNode instanceof v && n.elementList.push(r.partialNode), !this.canHandle(r))
+          if (r.partialNode instanceof y && n.elementList.push(r.partialNode), !this.canHandle(r))
             throw new d(r.token, i(), r.handlerContext);
           this.synchronizeList();
         }
@@ -1215,10 +1215,10 @@ class ln {
     return this.current >= this.tokens.length || this.tokens[this.current].kind === c.EOF;
   }
   advance() {
-    return this.isAtEnd() ? L.last(this.tokens) : this.tokens[this.current++];
+    return this.isAtEnd() ? I.last(this.tokens) : this.tokens[this.current++];
   }
   peek(e = 0) {
-    return e + this.current >= this.tokens.length ? L.last(this.tokens) : this.tokens[this.current + e];
+    return e + this.current >= this.tokens.length ? I.last(this.tokens) : this.tokens[this.current + e];
   }
   match(...e) {
     const s = this.check(...e);
@@ -1265,8 +1265,8 @@ class ln {
     this.tokens = e;
   }
   parse() {
-    const e = this.program(), s = this.advance(), n = this.nodeFactory.create(X, { body: e, eof: s });
-    return this.gatherInvalid(), new B({ ast: n, tokens: this.tokens }, this.errors);
+    const e = this.program(), s = this.advance(), n = this.nodeFactory.create(C, { body: e, eof: s });
+    return this.gatherInvalid(), new F({ ast: n, tokens: this.tokens }, this.errors);
   }
   /* Parsing and synchronizing ProgramNode */
   program() {
@@ -1365,7 +1365,7 @@ class ln {
   /* Parsing any ExpressionNode, including non-NormalExpression */
   expression() {
     const e = { args: [] }, s = () => en(e.callee, e.args, this.nodeFactory).unwrap_or(
-      this.nodeFactory.create(y, e)
+      this.nodeFactory.create(x, e)
     );
     try {
       e.callee = this.normalExpression();
@@ -1422,12 +1422,12 @@ class ln {
         if (Ve(this.previous()))
           break;
         try {
-          s = this.nodeFactory.create(fe, {
+          s = this.nodeFactory.create(he, {
             expression: s,
             indexer: this.listExpression()
           });
         } catch (i) {
-          throw i instanceof d ? (s = this.nodeFactory.create(fe, {
+          throw i instanceof d ? (s = this.nodeFactory.create(he, {
             expression: s,
             indexer: i.partialNode
           }), new d(i.token, s, i.handlerContext)) : i;
@@ -1437,7 +1437,7 @@ class ln {
         if (r.left !== null) {
           if (r.left <= e)
             break;
-          this.advance(), s = this.nodeFactory.create(Oe, {
+          this.advance(), s = this.nodeFactory.create(De, {
             expression: s,
             op: i
           });
@@ -1545,17 +1545,17 @@ class ln {
       c.STRING_LITERAL,
       c.NUMERIC_LITERAL
     ))
-      return this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create(de, { literal: this.previous() })
+      return this.nodeFactory.create(R, {
+        expression: this.nodeFactory.create(pe, { literal: this.previous() })
       });
     if (this.match(c.QUOTED_STRING, c.IDENTIFIER))
-      return this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create($, { variable: this.previous() })
+      return this.nodeFactory.create(R, {
+        expression: this.nodeFactory.create(X, { variable: this.previous() })
       });
     throw this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect a variable or literal"), new d(
       this.peek(),
-      this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create($, {})
+      this.nodeFactory.create(R, {
+        expression: this.nodeFactory.create(X, {})
       }),
       this.contextStack.findHandlerContext(this.tokens, this.current)
     );
@@ -1652,107 +1652,107 @@ const pn = {
 function ut(t) {
   return pn[t.value] || { left: null, right: null };
 }
-var I = /* @__PURE__ */ ((t) => (t.Table = "table", t.Enum = "enum", t.Ref = "ref", t.Note = "note", t.Project = "project", t.Indexes = "indexes", t.TableGroup = "tablegroup", t))(I || {});
-function Ee(t) {
+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 de(t) {
   var s;
   const e = (s = t == null ? void 0 : t.type) == null ? void 0 : s.value.toLowerCase();
   switch (e) {
-    case I.Enum:
-    case I.Table:
-    case I.Indexes:
-    case I.Note:
-    case I.Project:
-    case I.Ref:
-    case I.TableGroup:
-      return new k(e);
+    case b.Enum:
+    case b.Table:
+    case b.Indexes:
+    case b.Note:
+    case b.Project:
+    case b.Ref:
+    case b.TableGroup:
+      return new S(e);
     default:
       return new A();
   }
 }
-function Ne(t) {
+function Ee(t) {
   if (!He(t))
-    return new k([t]);
-  const e = Ne(t.leftExpression).unwrap_or(void 0);
-  return e ? (e.push(t.rightExpression), new k(e)) : new A();
+    return new S([t]);
+  const e = Ee(t.leftExpression).unwrap_or(void 0);
+  return e ? (e.push(t.rightExpression), new S(e)) : new A();
 }
-function j(t) {
+function W(t) {
   if (t === void 0)
     return new A();
-  const e = Ne(t).unwrap_or(void 0);
+  const e = Ee(t).unwrap_or(void 0);
   if (!e)
     return new A();
   const s = [];
   for (const n of e) {
-    const i = C(n).unwrap_or(void 0);
+    const i = G(n).unwrap_or(void 0);
     if (!i)
       return new A();
     s.push(i);
   }
-  return new k(s);
+  return new S(s);
 }
-function Ie(t) {
+function Le(t) {
   if (t === void 0)
     return new A();
-  const e = Ne(t).unwrap_or(void 0);
+  const e = Ee(t).unwrap_or(void 0);
   if (!e || e.length === 0)
     return new A();
   const s = [];
   let n;
-  if (!M(L.last(e))) {
+  if (!M(I.last(e))) {
     const i = e.pop();
     if (xt(i))
       n = i.elementList.map(
-        (r) => G(r).unwrap()
+        (r) => V(r).unwrap()
       );
     else
       return new A();
   }
   for (const i of e) {
-    const r = C(i).unwrap_or(void 0);
+    const r = G(i).unwrap_or(void 0);
     if (!r)
       return new A();
     s.push(r);
   }
-  return new k({
+  return new S({
     variables: s,
     tupleElements: n
   });
 }
-function C(t) {
-  return M(t) ? new k(t.expression.variable.value) : new A();
+function G(t) {
+  return M(t) ? new S(t.expression.variable.value) : new A();
 }
 function Ge(t) {
   if (ht(t))
-    return t instanceof K ? new k({ functional: [t], nonFunctional: [] }) : new k({ functional: [], nonFunctional: [t] });
+    return t instanceof K ? new S({ functional: [t], nonFunctional: [] }) : new S({ functional: [], nonFunctional: [t] });
   if (t instanceof J && t.elementList.every(ht)) {
     const e = t.elementList.filter(
       (n) => n instanceof K
     ), s = t.elementList.filter(M);
-    return new k({ functional: e, nonFunctional: s });
+    return new S({ functional: e, nonFunctional: s });
   }
   return new A();
 }
-function G(t) {
+function V(t) {
   var s;
   const e = (s = t == null ? void 0 : t.expression.variable) == null ? void 0 : s.value;
-  return e === void 0 ? new A() : new k(e);
+  return e === void 0 ? new A() : new S(e);
 }
 function Y(t) {
-  return W(t) ? t.expression instanceof $ ? new k(t.expression.variable.value) : new k(t.expression.literal.value) : new A();
+  return $(t) ? t.expression instanceof X ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new A();
 }
 function dn(t) {
   var e;
-  return !(t instanceof q) || !yt((e = t.op) == null ? void 0 : e.value) ? !1 : Ie(t.leftExpression).and_then(() => Ie(t.rightExpression)).unwrap_or(void 0) !== void 0;
+  return !(t instanceof q) || !yt((e = t.op) == null ? void 0 : e.value) ? !1 : Le(t.leftExpression).and_then(() => Le(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
 function En(t) {
-  const e = Ie(t.leftExpression), s = Ie(t.rightExpression);
+  const e = Le(t.leftExpression), s = Le(t.rightExpression);
   if (!e.isOk() || !s.isOk())
     return !1;
   const { tupleElements: n } = e.unwrap(), { tupleElements: i } = s.unwrap();
   return (n == null ? void 0 : n.length) === (i == null ? void 0 : i.length);
 }
 function ht(t) {
-  return t instanceof D && t.expression instanceof $ || t instanceof K;
+  return t instanceof R && t.expression instanceof X || t instanceof K;
 }
 function Nn(t, e) {
   var i, r, a, l;
@@ -1761,9 +1761,9 @@ function Nn(t, e) {
   for (; s; ) {
     if ((r = (i = s.symbol) == null ? void 0 : i.symbolTable) != null && r.has(t))
       return (a = s.symbol.symbolTable) == null ? void 0 : a.get(t);
-    if (((l = s.symbol) == null ? void 0 : l.declaration) instanceof X && n)
+    if (((l = s.symbol) == null ? void 0 : l.declaration) instanceof C && n)
       return s.symbol;
-    if (s instanceof X)
+    if (s instanceof C)
       return;
     s = s.parent;
   }
@@ -1776,7 +1776,7 @@ class mn {
     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 || Ee(this.declarationNode.parent).unwrap_or(void 0) !== I.Project ? [new u(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof C || de(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new u(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new u(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
@@ -1793,10 +1793,10 @@ class mn {
     if (e instanceof ee)
       return [new u(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
     const s = [];
-    return W(e.callee) || s.push(new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && s.push(...e.args.map((n) => new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", n))), s;
+    return $(e.callee) || s.push(new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && s.push(...e.args.map((n) => new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", n))), s;
   }
 }
-class ge {
+class _e {
   constructor() {
     this.table = /* @__PURE__ */ new Map();
   }
@@ -1831,8 +1831,8 @@ class Tn {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(qt, { declaration: this.declarationNode, symbolTable: new ge() });
-    const { name: s } = this.declarationNode, n = j(s);
+    this.declarationNode.symbol = this.symbolFactory.create(qt, { declaration: this.declarationNode, symbolTable: new _e() });
+    const { name: s } = this.declarationNode, n = W(s);
     if (n.isOk()) {
       const i = n.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), l = je(r);
       a.has(l) && e.push(new u(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, s)), a.set(l, this.declarationNode.symbol);
@@ -1845,15 +1845,15 @@ class Tn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
+    if (e instanceof x)
       return this.validateFields([e]);
-    const [s, n] = L.partition(e.body, (i) => i instanceof y);
+    const [s, n] = I.partition(e.body, (i) => i instanceof x);
     return [...this.validateFields(s), ...this.validateSubElements(n)];
   }
   validateFields(e) {
     return e.length === 0 ? [new u(o.EMPTY_ENUM, "An Enum must have at least one element", this.declarationNode)] : e.flatMap((s) => {
       const n = [];
-      return s.callee && !M(s.callee) && n.push(new u(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", s.callee)), L.last(s.args) instanceof U && n.push(...this.validateFieldSetting(L.last(s.args))), s.args.length > 1 && n.push(...s.args.map((i) => new u(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", i))), n.push(...this.registerField(s)), n;
+      return s.callee && !M(s.callee) && n.push(new u(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", s.callee)), I.last(s.args) instanceof U && n.push(...this.validateFieldSetting(I.last(s.args))), s.args.length > 1 && n.push(...s.args.map((i) => new u(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", i))), n.push(...this.registerField(s)), n;
     });
   }
   validateFieldSetting(e) {
@@ -1863,7 +1863,7 @@ class Tn {
       switch (r) {
         case "note":
           a.length > 1 && a.forEach((l) => n.push(new u(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
-            W(l.value) || n.push(new u(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
+            $(l.value) || n.push(new u(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
           });
           break;
         default:
@@ -1882,7 +1882,7 @@ class Tn {
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const s = G(e.callee).unwrap(), n = Ye(s), i = this.symbolFactory.create(Ht, { declaration: e });
+      const s = V(e.callee).unwrap(), n = Ye(s), i = this.symbolFactory.create(Ht, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(n)) {
@@ -1905,7 +1905,7 @@ class bn {
     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 || Ee(this.declarationNode.parent).unwrap_or(void 0) !== I.Table ? [new u(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof C || de(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new u(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new u(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
@@ -1919,9 +1919,9 @@ class bn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
+    if (e instanceof x)
       return [new u(o.UNEXPECTED_SIMPLE_BODY, "An Indexes must have a complex body", e)];
-    const [s, n] = L.partition(e.body, (i) => i instanceof y);
+    const [s, n] = I.partition(e.body, (i) => i instanceof x);
     return [...this.validateFields(s), ...this.validateSubElements(n)];
   }
   validateFields(e) {
@@ -1929,7 +1929,7 @@ class bn {
       if (!s.callee)
         return [];
       const n = [], i = [s.callee, ...s.args];
-      return L.last(i) instanceof U && n.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
+      return I.last(i) instanceof U && n.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
         for (; r instanceof H; )
           r.argumentList && !Ge(r.argumentList).isOk() && n.push(new u(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;
         Ge(r).isOk() || n.push(new u(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
@@ -1944,7 +1944,7 @@ class bn {
         case "note":
         case "name":
           a.length > 1 && a.forEach((l) => n.push(new u(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
-            W(l.value) || n.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
+            $(l.value) || n.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
           });
           break;
         case "unique":
@@ -1981,7 +1981,7 @@ class In {
     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 || ![I.Table, I.Project].includes(Ee(this.declarationNode.parent).unwrap_or(void 0)) ? [new u(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof C || ![b.Table, b.Project].includes(de(this.declarationNode.parent).unwrap_or(void 0)) ? [new u(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new u(o.UNEXPECTED_NAME, "A Note shouldn't have a name", e)] : [];
@@ -1995,14 +1995,14 @@ class In {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
+    if (e instanceof x)
       return this.validateFields([e]);
-    const [s, n] = L.partition(e.body, (i) => i instanceof y);
+    const [s, n] = I.partition(e.body, (i) => i instanceof x);
     return [...this.validateFields(s), ...this.validateSubElements(n)];
   }
   validateFields(e) {
     const s = [];
-    return e.length === 0 ? [new u(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((n) => s.push(new u(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", n))), W(e[0].callee) || s.push(new u(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && s.push(...e[0].args.map((n) => new u(o.INVALID_NOTE, "A Note can only contain one quoted string", n))), s);
+    return e.length === 0 ? [new u(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((n) => s.push(new u(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", n))), $(e[0].callee) || s.push(new u(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && s.push(...e[0].args.map((n) => new u(o.INVALID_NOTE, "A Note can only contain one quoted string", n))), s);
   }
   validateSubElements(e) {
     return e.flatMap((s) => {
@@ -2024,7 +2024,7 @@ class Ln {
     return this.declarationNode.parent instanceof _ ? [new u(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Re(e) ? [] : [new u(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? Pe(e) ? [] : [new u(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new u(o.UNEXPECTED_ALIAS, "A Project shouldn't have an alias", e)] : [];
@@ -2035,9 +2035,9 @@ class Ln {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
+    if (e instanceof x)
       return [new u(o.UNEXPECTED_SIMPLE_BODY, "A Project's body must be a block", e)];
-    const [s, n] = L.partition(e.body, (i) => i instanceof y);
+    const [s, n] = I.partition(e.body, (i) => i instanceof x);
     return [
       ...s.map((i) => new u(o.INVALID_PROJECT_FIELD, "A Project can not have inline fields", i)),
       ...this.validateSubElements(n)
@@ -2060,10 +2060,10 @@ class gn {
     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 || Ee(this.declarationNode.parent).unwrap_or(void 0) === I.Table ? [] : [new u(o.INVALID_REF_CONTEXT, "A Ref must appear top-level or inside a table", this.declarationNode)];
+    return this.declarationNode.parent instanceof C || de(this.declarationNode.parent).unwrap_or(void 0) === b.Table ? [] : [new u(o.INVALID_REF_CONTEXT, "A Ref must appear top-level or inside a table", this.declarationNode)];
   }
   validateName(e) {
-    return e ? Re(e) ? [] : [new u(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? Pe(e) ? [] : [new u(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new u(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
@@ -2074,9 +2074,9 @@ class gn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
+    if (e instanceof x)
       return this.validateFields([e]);
-    const [s, n] = L.partition(e.body, (i) => i instanceof y);
+    const [s, n] = I.partition(e.body, (i) => i instanceof x);
     return [...this.validateFields(s), ...this.validateSubElements(n)];
   }
   validateFields(e) {
@@ -2084,7 +2084,7 @@ class gn {
       return [new u(o.EMPTY_REF, "A Ref must have at least one field", this.declarationNode)];
     const s = [];
     return e.length > 1 && s.push(...e.slice(1).map((n) => new u(o.REF_REDEFINED, "A Ref can only contain one binary relationship", n))), e.forEach((n) => {
-      n.callee && !dn(n.callee) && s.push(new u(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", n.callee)), n.callee && !En(n.callee) && s.push(new u(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", n.callee)), L.last(n.args) instanceof U && this.validateFieldSettings(L.last(n.args)), n.args.length > 1 && s.push(...n.args.map((i) => new u(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", i)));
+      n.callee && !dn(n.callee) && s.push(new u(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", n.callee)), n.callee && !En(n.callee) && s.push(new u(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", n.callee)), I.last(n.args) instanceof U && this.validateFieldSettings(I.last(n.args)), n.args.length > 1 && s.push(...n.args.map((i) => new u(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", i)));
     }), s;
   }
   validateFieldSettings(e) {
@@ -2117,7 +2117,7 @@ function _n(t) {
   if (!(M(t) && t.expression.variable.kind !== c.QUOTED_STRING) && !(t instanceof te))
     return !1;
   let e;
-  if (t instanceof te ? e = De(t).unwrap_or("") : e = t.expression.variable.value, e)
+  if (t instanceof te ? e = Re(t).unwrap_or("") : e = t.expression.variable.value, e)
     switch (e.toLowerCase()) {
       case "cascade":
       case "no action":
@@ -2141,10 +2141,10 @@ class An {
     return this.declarationNode.parent instanceof _ ? [new u(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? e instanceof fe ? [new u(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Je(e) ? [] : [new u(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new u(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
+    return e ? e instanceof he ? [new u(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Je(e) ? [] : [new u(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new u(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
   }
   validateAlias(e) {
-    return e ? yn(e) ? [] : [new u(o.INVALID_ALIAS, "A Table alias must be of the form <alias>", e)] : [];
+    return e ? xn(e) ? [] : [new u(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
   }
   validateSettingList(e) {
     const s = z(e), n = s.getErrors(), i = s.getValue();
@@ -2153,12 +2153,12 @@ class An {
       switch (r) {
         case "headercolor":
           a.length > 1 && n.push(...a.map((l) => new u(o.DUPLICATE_TABLE_SETTING, "'headercolor' can only appear once", l))), a.forEach((l) => {
-            xn(l.value) || n.push(new u(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", l.value || l.name));
+            kn(l.value) || n.push(new u(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", l.value || l.name));
           });
           break;
         case "note":
           a.length > 1 && n.push(...a.map((l) => new u(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
-            W(l.value) || n.push(new u(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
+            $(l.value) || n.push(new u(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
           });
           break;
         default:
@@ -2169,24 +2169,24 @@ class An {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(At, { declaration: this.declarationNode, symbolTable: new ge() });
-    const { name: s, alias: n } = this.declarationNode, i = j(s);
+    this.declarationNode.symbol = this.symbolFactory.create(At, { declaration: this.declarationNode, symbolTable: new _e() });
+    const { name: s, alias: n } = this.declarationNode, i = W(s);
     if (i.isOk()) {
-      const r = i.unwrap(), a = r.pop(), l = Ze(r, this.publicSymbolTable, this.symbolFactory), p = ye(a);
+      const r = [...i.unwrap()], a = r.pop(), l = Ze(r, this.publicSymbolTable, this.symbolFactory), p = xe(a);
       l.has(p) && e.push(new u(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, s)), l.set(p, this.declarationNode.symbol);
     }
-    if (n && Re(n)) {
-      const r = ye(G(n).unwrap());
-      this.publicSymbolTable.has(r) && e.push(new u(o.DUPLICATE_NAME, `Table name '${n}' already exists`, s)), this.publicSymbolTable.set(r, this.declarationNode.symbol);
+    if (n && Pe(n) && !wn(n.expression.variable.value, i.unwrap_or([]))) {
+      const r = V(n).unwrap(), a = xe(r);
+      this.publicSymbolTable.has(a) && e.push(new u(o.DUPLICATE_NAME, `Table name '${r}' already exists`, s)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
     }
     return e;
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
+    if (e instanceof x)
       return [new u(o.UNEXPECTED_SIMPLE_BODY, "A Table's body must be a block", e)];
-    const [s, n] = L.partition(e.body, (i) => i instanceof y);
+    const [s, n] = I.partition(e.body, (i) => i instanceof x);
     return [...this.validateFields(s), ...this.validateSubElements(n)];
   }
   validateFields(e) {
@@ -2194,14 +2194,14 @@ class An {
       if (!s.callee)
         return [];
       const n = [];
-      s.args.length === 0 && n.push(new u(o.INVALID_COLUMN, "A column must have a type", s.callee)), M(s.callee) || n.push(new u(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", s.callee)), s.args[0] && !wn(s.args[0]) && n.push(new u(o.INVALID_COLUMN_TYPE, "Invalid column type", s.args[0]));
+      s.args.length === 0 && n.push(new u(o.INVALID_COLUMN, "A column must have a type", s.callee)), M(s.callee) || n.push(new u(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", s.callee)), s.args[0] && !vn(s.args[0]) && n.push(new u(o.INVALID_COLUMN_TYPE, "Invalid column type", s.args[0]));
       const i = s.args.slice(1);
       return n.push(...this.validateFieldSetting(i)), n.push(...this.registerField(s)), n;
     });
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const s = G(e.callee).unwrap(), n = We(s), i = this.symbolFactory.create(Jt, { declaration: e });
+      const s = V(e.callee).unwrap(), n = We(s), i = this.symbolFactory.create(Jt, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(n)) {
@@ -2217,15 +2217,15 @@ class An {
   }
   // This is needed to support legacy inline settings
   validateFieldSetting(e) {
-    if (!e.slice(0, -1).every(pe) || !e.slice(-1).every((p) => pe(p) || p instanceof U))
+    if (!e.slice(0, -1).every(fe) || !e.slice(-1).every((p) => fe(p) || p instanceof U))
       return [...e.map((p) => new u(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
     if (e.length === 0)
       return [];
     let s;
-    L.last(e) instanceof U && (s = e.pop());
+    I.last(e) instanceof U && (s = e.pop());
     const n = z(s), i = n.getErrors(), r = n.getValue();
     for (const p of e) {
-      const h = G(p).unwrap_or("").toLowerCase();
+      const h = V(p).unwrap_or("").toLowerCase();
       if (h !== "pk" && h !== "unique") {
         i.push(new u(o.INVALID_SETTINGS, "Inline column settings can only be `pk` or `unique`", p));
         continue;
@@ -2239,12 +2239,12 @@ class An {
       switch (p) {
         case "note":
           h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", f))), h.forEach((f) => {
-            W(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
+            $(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
           });
           break;
         case "ref":
           h.forEach((f) => {
-            Sn(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", f.value || f.name));
+            On(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", f.value || f.name));
           });
           break;
         case "primary key":
@@ -2281,7 +2281,7 @@ class An {
           break;
         case "default":
           h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_TABLE_SETTING, "'default' can only appear once", f))), h.forEach((f) => {
-            kn(f.value) || i.push(new u(o.INVALID_TABLE_SETTING, "'default' must be a string literal, number literal, function expression, true, false or null", f.value || f.name));
+            Sn(f.value) || i.push(new u(o.INVALID_TABLE_SETTING, "'default' must be a string literal, number literal, function expression, true, false or null", f.value || f.name));
           });
           break;
         default:
@@ -2303,23 +2303,26 @@ class An {
     return n.length > 1 && (s.push(...n.map((i) => new u(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), s.push()), s;
   }
 }
-function wn(t) {
-  if (!(t instanceof H || He(t) || t instanceof D || t instanceof fe))
+function vn(t) {
+  if (!(t instanceof H || He(t) || t instanceof R || t instanceof he))
     return !1;
   if (t instanceof H) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((s) => le(s) || W(s) || pe(s)))
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((s) => le(s) || $(s) || fe(s)))
       return !1;
     t = t.callee;
   }
-  for (; t instanceof fe; ) {
+  for (; t instanceof he; ) {
     if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((s) => !s.colon && !s.value && le(s.name)))
       return !1;
     t = t.array;
   }
-  const e = j(t).unwrap_or(void 0);
+  const e = W(t).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
-class vn {
+function wn(t, e) {
+  return e.length === 1 && t === e[0];
+}
+class yn {
   constructor(e, s, n) {
     this.declarationNode = e, this.publicSymbolTable = s, this.symbolFactory = n;
   }
@@ -2337,8 +2340,8 @@ class vn {
   }
   registerElement() {
     const { name: e } = this.declarationNode;
-    this.declarationNode.symbol = this.symbolFactory.create(Zt, { declaration: this.declarationNode, symbolTable: new ge() });
-    const s = j(e);
+    this.declarationNode.symbol = this.symbolFactory.create(Zt, { declaration: this.declarationNode, symbolTable: new _e() });
+    const s = W(e);
     if (s.isOk()) {
       const n = s.unwrap(), i = n.pop(), r = Ze(n, this.publicSymbolTable, this.symbolFactory), a = ze(i);
       if (r.has(a))
@@ -2353,15 +2356,15 @@ class vn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
+    if (e instanceof x)
       return [new u(o.UNEXPECTED_SIMPLE_BODY, "A TableGroup's body must be a block", e)];
-    const [s, n] = L.partition(e.body, (i) => i instanceof y);
+    const [s, n] = I.partition(e.body, (i) => i instanceof x);
     return [...this.validateFields(s), ...this.validateSubElements(n)];
   }
   validateFields(e) {
     return e.flatMap((s) => {
       const n = [];
-      return s.callee && !j(s.callee).isOk() && n.push(new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", s.callee)), this.registerField(s), s.args.length > 0 && n.push(...s.args.map((i) => new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), n;
+      return s.callee && !W(s.callee).isOk() && n.push(new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", s.callee)), this.registerField(s), s.args.length > 0 && n.push(...s.args.map((i) => new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), n;
     });
   }
   validateSubElements(e) {
@@ -2374,7 +2377,7 @@ class vn {
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const s = G(e.callee).unwrap(), n = Qe(s), i = this.symbolFactory.create(Kt, { declaration: e });
+      const s = V(e.callee).unwrap(), n = Qe(s), i = this.symbolFactory.create(Kt, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(n)) {
@@ -2389,35 +2392,35 @@ class vn {
     return [];
   }
 }
-const vt = ["-", "+"];
+const wt = ["-", "+"];
 function ie(t) {
   switch (t.type.value.toLowerCase()) {
-    case I.Enum:
+    case b.Enum:
       return Tn;
-    case I.Table:
+    case b.Table:
       return An;
-    case I.TableGroup:
-      return vn;
-    case I.Project:
+    case b.TableGroup:
+      return yn;
+    case b.Project:
       return Ln;
-    case I.Ref:
+    case b.Ref:
       return gn;
-    case I.Note:
+    case b.Note:
       return In;
-    case I.Indexes:
+    case b.Indexes:
       return bn;
     default:
       return mn;
   }
 }
 function Je(t) {
-  return !!j(t).unwrap_or(!1);
+  return !!W(t).unwrap_or(!1);
 }
-function yn(t) {
-  return Re(t);
+function xn(t) {
+  return Pe(t);
 }
-function Re(t) {
-  return t instanceof D && t.expression instanceof $;
+function Pe(t) {
+  return t instanceof R && t.expression instanceof X;
 }
 function Ze(t, e, s) {
   var i;
@@ -2430,7 +2433,7 @@ function Ze(t, e, s) {
       if (a = (i = n.get(l)) == null ? void 0 : i.symbolTable, !a)
         throw new Error("Expect a symbol table in a schema symbol");
     } else {
-      a = new ge();
+      a = new _e();
       const p = s.create(_t, { symbolTable: a });
       n.set(l, p);
     }
@@ -2441,9 +2444,9 @@ function Ze(t, e, s) {
 function yt(t) {
   return t === "-" || t === "<>" || t === ">" || t === "<";
 }
-function xn(t) {
+function kn(t) {
   var s;
-  if (!(t instanceof D) || !(t.expression instanceof de) || ((s = t.expression.literal) == null ? void 0 : s.kind) !== c.COLOR_LITERAL)
+  if (!(t instanceof R) || !(t.expression instanceof pe) || ((s = t.expression.literal) == null ? void 0 : s.kind) !== c.COLOR_LITERAL)
     return !1;
   const e = t.expression.literal.value;
   if (e.length !== 4 && e.length !== 7 || e[0] !== "#")
@@ -2456,19 +2459,19 @@ function xn(t) {
 function oe(t) {
   return t === void 0;
 }
-function kn(t) {
+function Sn(t) {
   var e;
-  return !!(W(t) || le(t) || pe(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && vt.includes((e = t.op) == null ? void 0 : e.value) && le(t.expression) || t instanceof K);
+  return !!($(t) || le(t) || fe(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && le(t.expression) || t instanceof K);
 }
 function le(t) {
   var e;
-  return t instanceof D && t.expression instanceof de && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.NUMERIC_LITERAL;
+  return t instanceof R && t.expression instanceof pe && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.NUMERIC_LITERAL;
 }
-function Sn(t) {
+function On(t) {
   var s;
   if (!(t instanceof Q) || !yt((s = t.op) == null ? void 0 : s.value))
     return !1;
-  const e = j(t.expression).unwrap_or(void 0);
+  const e = W(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
 function xt(t) {
@@ -2478,23 +2481,23 @@ function z(t) {
   var n;
   const e = {}, s = [];
   if (!t)
-    return new B({});
+    return new F({});
   for (const i of t.elementList) {
     if (!i.name)
       continue;
-    if (i.name instanceof D) {
+    if (i.name instanceof R) {
       s.push(new u(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
       continue;
     }
-    const r = (n = De(i.name).unwrap_or(void 0)) == null ? void 0 : n.toLowerCase();
+    const r = (n = Re(i.name).unwrap_or(void 0)) == null ? void 0 : n.toLowerCase();
     r && (e[r] === void 0 ? e[r] = [i] : e[r].push(i));
   }
-  return new B(e, s);
+  return new F(e, s);
 }
 class ft {
   constructor(e, s) {
     this.ast = e, this.symbolFactory = s, this.publicSchemaSymbol = this.symbolFactory.create(_t, {
-      symbolTable: new ge()
+      symbolTable: new _e()
     }), this.ast.symbol = this.publicSchemaSymbol, this.ast.symbol.declaration = this.ast;
   }
   validate() {
@@ -2509,8 +2512,8 @@ class ft {
       );
       e.push(...r.validate());
     });
-    const s = this.ast.body.filter((n) => Ee(n).unwrap_or(void 0) === I.Project);
-    return s.length > 1 && s.forEach((n) => e.push(new u(o.PROJECT_REDEFINED, "Only one project can exist", n))), new B(this.ast, e);
+    const s = this.ast.body.filter((n) => de(n).unwrap_or(void 0) === b.Project);
+    return s.length > 1 && s.forEach((n) => e.push(new u(o.PROJECT_REDEFINED, "Only one project can exist", n))), new F(this.ast, e);
   }
 }
 class re {
@@ -2523,9 +2526,9 @@ class re {
   bindSettingList(e, s) {
     if (e)
       for (const n of e.elementList) {
-        if (n.name instanceof D)
+        if (n.name instanceof R)
           continue;
-        const i = De(n.name).unwrap_or(void 0);
+        const i = Re(n.name).unwrap_or(void 0);
         if (!i)
           continue;
         const r = s[i.toLowerCase()];
@@ -2550,7 +2553,7 @@ class re {
       this.bindSubfield(s);
   }
   bindSubfield(e) {
-    const s = [e.callee, ...e.args], n = L.last(s);
+    const s = [e.callee, ...e.args], n = I.last(s);
     n instanceof U && (s.pop(), this.bindSettingList(n, this.subfield.settingList));
     const { argBinderRules: i } = this.subfield.arg;
     for (let r = 0; r < Math.min(s.length, i.length); r += 1)
@@ -2560,12 +2563,12 @@ class re {
   scanAndBind(e, s) {
     var n, i;
     if (e)
-      if (e instanceof D) {
-        if (e.expression instanceof $ && ((i = s.keywords) != null && i.includes((n = e.expression.variable) == null ? void 0 : n.value.toLowerCase())))
+      if (e instanceof R) {
+        if (e.expression instanceof X && ((i = s.keywords) != null && i.includes((n = e.expression.variable) == null ? void 0 : n.value.toLowerCase())))
           return;
         this.bindFragments([e], s);
       } else
-        e instanceof q ? He(e) ? this.bindFragments(Ne(e).unwrap_or([]), s) : (this.scanAndBind(e.leftExpression, s), this.scanAndBind(e.rightExpression, s)) : e instanceof Q ? this.scanAndBind(e.expression, s) : e instanceof Oe ? this.scanAndBind(e.expression, s) : e instanceof J && e.elementList.forEach((r) => this.scanAndBind(r, s));
+        e instanceof q ? He(e) ? this.bindFragments(Ee(e).unwrap_or([]), s) : (this.scanAndBind(e.leftExpression, s), this.scanAndBind(e.rightExpression, s)) : e instanceof Q ? this.scanAndBind(e.expression, s) : e instanceof De ? this.scanAndBind(e.expression, s) : e instanceof J && e.elementList.forEach((r) => this.scanAndBind(r, s));
   }
   // Bind the fragments of a member access expression
   // which can be a simple expression like v1.User,
@@ -2581,14 +2584,14 @@ class re {
       return;
     const T = [];
     for (; n.length && h.length; ) {
-      const f = n.pop(), N = h.pop(), b = G(N).unwrap();
+      const f = n.pop(), N = h.pop(), g = V(N).unwrap();
       T.unshift({
-        index: Fe(b, f),
+        index: Fe(g, f),
         referrer: N
       });
     }
     for (; h.length; ) {
-      const f = h.pop(), N = G(f).unwrap();
+      const f = h.pop(), N = V(f).unwrap();
       T.unshift({
         index: Fe(N, i),
         referrer: f
@@ -2600,7 +2603,7 @@ class re {
           ...T,
           {
             index: Fe(
-              G(f).unwrap(),
+              V(f).unwrap(),
               p
             ),
             referrer: f
@@ -2642,7 +2645,7 @@ class re {
     n || this.errors.push(new u(o.BINDING_ERROR, s, e));
   }
 }
-class On extends re {
+class Dn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2652,7 +2655,7 @@ class On extends re {
     }, this.settingList = {};
   }
 }
-class Dn extends re {
+class Rn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2662,7 +2665,7 @@ class Dn extends re {
     }, this.settingList = {};
   }
 }
-class Rn extends re {
+class Pn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2697,7 +2700,7 @@ class Rn extends re {
     }, this.settingList = {};
   }
 }
-class Pn extends re {
+class Un extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2707,7 +2710,7 @@ class Pn extends re {
     }, this.settingList = {};
   }
 }
-class Un extends re {
+class Mn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2717,7 +2720,7 @@ class Un extends re {
     }, this.settingList = {};
   }
 }
-class Mn extends re {
+class Fn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2734,7 +2737,7 @@ class Mn extends re {
     }, this.settingList = {};
   }
 }
-class Fn extends re {
+class Bn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2762,7 +2765,7 @@ class Fn extends re {
     }, this.settingList = {};
   }
 }
-class Bn extends re {
+class Vn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2781,25 +2784,25 @@ class Bn extends re {
 }
 function kt(t) {
   switch (t.type.value.toLowerCase()) {
-    case I.Enum:
-      return Dn;
-    case I.Table:
-      return Fn;
-    case I.TableGroup:
+    case b.Enum:
+      return Rn;
+    case b.Table:
       return Bn;
-    case I.Project:
-      return Un;
-    case I.Ref:
+    case b.TableGroup:
+      return Vn;
+    case b.Project:
       return Mn;
-    case I.Note:
+    case b.Ref:
+      return Fn;
+    case b.Note:
+      return Un;
+    case b.Indexes:
       return Pn;
-    case I.Indexes:
-      return Rn;
     default:
-      return On;
+      return Dn;
   }
 }
-class Vn {
+class Gn {
   constructor(e) {
     this.ast = e, this.errors = [];
   }
@@ -2809,10 +2812,10 @@ class Vn {
         const s = kt(e);
         new s(e, this.errors).bind();
       }
-    return new B(this.ast, this.errors);
+    return new F(this.ast, this.errors);
   }
 }
-class Gn {
+class Cn {
   constructor(e) {
     this.generator = e;
   }
@@ -2820,21 +2823,21 @@ class Gn {
     return new e(s, this.generator.nextId());
   }
 }
-class Cn {
+class Xn {
   constructor(e, s) {
-    this.ast = e, this.symbolFactory = new Gn(s);
+    this.ast = e, this.symbolFactory = new Cn(s);
   }
   // Analyzing: Invoking both the validator and binder
   analyze() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((s) => new Vn(s).resolve());
+    return new ft(this.ast, this.symbolFactory).validate().chain((s) => new Gn(s).resolve());
   }
   // For invoking the validator only
   validate() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((s) => new B(s, []));
+    return new ft(this.ast, this.symbolFactory).validate().chain((s) => new F(s, []));
   }
 }
 function pt(t, e) {
-  const { variables: s, tupleElements: n } = Ie(t).unwrap();
+  const { variables: s, tupleElements: n } = Le(t).unwrap();
   return n ? s.length === 0 ? {
     schemaName: e.schemaName,
     tableName: e.name,
@@ -2866,7 +2869,7 @@ function St(t) {
   }
   throw new Error("Invalid relation op");
 }
-function x(t) {
+function k(t) {
   return {
     start: {
       offset: t.startPos.offset,
@@ -2878,22 +2881,17 @@ function x(t) {
 }
 function Ce(t) {
   var s;
-  const e = (s = Ne(t).unwrap_or(void 0)) == null ? void 0 : s.pop();
+  const e = (s = Ee(t).unwrap_or(void 0)) == null ? void 0 : s.pop();
   return e instanceof J ? e.elementList.map((n) => n.referee) : [e.referee];
 }
-function ue(t) {
-  return t.split(`
-`).map((e) => e.trim()).join(`
-`);
-}
-function _e(t) {
-  const e = j(t).unwrap();
+function Ae(t) {
+  const e = W(t).unwrap();
   return {
     name: e.pop(),
     schemaName: e
   };
 }
-function Xn(t) {
+function $n(t) {
   return t.expression.literal.value;
 }
 function Ot(t, e) {
@@ -2907,7 +2905,7 @@ function Ot(t, e) {
 function Dt(t, e) {
   if (Array.isArray(t)) {
     const i = t.map(({ id: a }) => a).sort(), r = e.map(({ id: a }) => a).sort();
-    return L.zip(i, r).every(([a, l]) => a === l);
+    return I.zip(i, r).every(([a, l]) => a === l);
   }
   const s = t.id, n = e.id;
   return s === n;
@@ -2917,14 +2915,14 @@ class Ke {
     this.declarationNode = e, this.env = s, this.container = this.declarationNode.parent instanceof _ ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
   }
   interpret() {
-    return this.ref.token = x(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.ref.token = k(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
-    const s = [], n = j(this.declarationNode.name).unwrap_or([]);
+    const s = [], n = W(this.declarationNode.name).unwrap_or([]);
     return this.ref.name = n.pop() || null, n.length > 1 && s.push(new u(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name)), this.ref.schemaName = n.join(".") || null, s;
   }
   interpretBody(e) {
-    return e instanceof y ? this.interpretField(e) : this.interpretField(e.body[0]);
+    return e instanceof x ? this.interpretField(e) : this.interpretField(e.body[0]);
   }
   interpretField(e) {
     var h, T, f, N;
@@ -2938,20 +2936,20 @@ class Ke {
         new u(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[l])
       ];
     if (e.args[0]) {
-      const b = z(e.args[0]).getValue();
-      this.ref.onDelete = C((T = (h = b.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value).unwrap_or(void 0), this.ref.onDelete = C((N = (f = b.delete) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
+      const g = z(e.args[0]).getValue();
+      this.ref.onDelete = G((T = (h = g.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value).unwrap_or(void 0), this.ref.onDelete = G((N = (f = g.delete) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
     }
     const p = St(s);
     return this.ref.endpoints = [
       {
         ...pt(n, this.container),
         relation: p[0],
-        token: x(n)
+        token: k(n)
       },
       {
         ...pt(i, this.container),
         relation: p[1],
-        token: x(i)
+        token: k(i)
       }
     ], this.env.refIds[l] = this.declarationNode, [];
   }
@@ -2961,7 +2959,7 @@ class Rt {
     this.declarationNode = e, this.env = s, this.table = { name: void 0, schemaName: void 0, alias: null, fields: [], token: void 0, indexes: [] }, this.pkColumns = [];
   }
   interpret() {
-    this.table.token = x(this.declarationNode), this.env.tables.set(this.declarationNode, this.table);
+    this.table.token = k(this.declarationNode), this.env.tables.set(this.declarationNode, this.table);
     const e = [
       ...this.interpretName(this.declarationNode.name),
       ...this.interpretAlias(this.declarationNode.alias),
@@ -2980,13 +2978,13 @@ class Rt {
     }), this.pkColumns.forEach((s) => s.pk = !1)), e;
   }
   interpretName(e) {
-    const { name: s, schemaName: n } = _e(e);
+    const { name: s, schemaName: n } = Ae(e);
     return n.length > 1 ? (this.table.name = s, this.table.schemaName = n.join("."), [new u(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.table.name = s, this.table.schemaName = n.length ? n[0] : null, []);
   }
   interpretAlias(e) {
     if (!e)
       return [];
-    const s = G(e).unwrap_or(null);
+    const s = V(e).unwrap_or(null);
     return s && (this.env.aliases.push({
       name: s,
       kind: "table",
@@ -2999,15 +2997,15 @@ class Rt {
   interpretSettingList(e) {
     var r, a, l;
     const s = z(e).getValue();
-    this.table.headerColor = (r = s.headercolor) != null && r.length ? Xn((l = (a = s.headercolor) == null ? void 0 : a.at(0)) == null ? void 0 : l.value) : void 0;
+    this.table.headerColor = (r = s.headercolor) != null && r.length ? $n((l = (a = s.headercolor) == null ? void 0 : a.at(0)) == null ? void 0 : l.value) : void 0;
     const [n] = s.note || [], i = Y(n == null ? void 0 : n.value).unwrap_or(void 0);
     return this.table.note = n && {
-      value: ue(i),
-      token: x(n)
+      value: i,
+      token: k(n)
     }, [];
   }
   interpretBody(e) {
-    const [s, n] = L.partition(e.body, (i) => i instanceof y);
+    const [s, n] = I.partition(e.body, (i) => i instanceof x);
     return [...this.interpretFields(s), ...this.interpretSubElements(n)];
   }
   interpretSubElements(e) {
@@ -3016,8 +3014,8 @@ class Rt {
       switch ((n = s.type) == null ? void 0 : n.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: ue(Y(s.body instanceof ee ? s.body.body[0].callee : s.body.callee).unwrap()),
-            token: x(s)
+            value: Y(s.body instanceof ee ? s.body.body[0].callee : s.body.callee).unwrap(),
+            token: k(s)
           }, [];
         case "indexes":
           return this.interpretIndexes(s);
@@ -3031,26 +3029,26 @@ class Rt {
     return e.flatMap((s) => this.interpretColumn(s));
   }
   interpretColumn(e) {
-    var a, l, p, h, T, f, N;
+    var a, l, p, h, T, f, N, g;
     const s = [], n = {};
-    n.name = G(e.callee).unwrap();
-    const i = $n(e.args[0]);
-    n.type = i.getValue(), s.push(...i.getErrors()), n.token = x(e), n.inline_refs = [];
+    n.name = V(e.callee).unwrap();
+    const i = Wn(e.args[0]);
+    n.type = i.getValue(), s.push(...i.getErrors()), n.token = k(e), n.inline_refs = [];
     const r = e.args.slice(1);
-    if (L.last(r) instanceof U) {
-      const b = z(r.pop()).getValue();
-      n.pk = !!((a = b.pk) != null && a.length), n.increment = !!((l = b.increment) != null && l.length), n.unique = !!((p = b.unique) != null && p.length), n.not_null = !!((h = b["not null"]) != null && h.length) && !0, n.dbdefault = Wn((f = (T = b.default) == null ? void 0 : T.at(0)) == null ? void 0 : f.value);
-      const F = (N = b.note) == null ? void 0 : N.at(0);
-      n.note = F && {
-        value: ue(Y(F.value).unwrap()),
-        token: x(F)
+    if (I.last(r) instanceof U) {
+      const v = z(r.pop()).getValue();
+      n.pk = !!((a = v.pk) != null && a.length) || !!((l = v["primary key"]) != null && l.length), n.increment = !!((p = v.increment) != null && p.length), n.unique = !!((h = v.unique) != null && h.length), n.not_null = !!((T = v["not null"]) != null && T.length) && !0, n.dbdefault = jn((N = (f = v.default) == null ? void 0 : f.at(0)) == null ? void 0 : N.value);
+      const Ne = (g = v.note) == null ? void 0 : g.at(0);
+      n.note = Ne && {
+        value: Y(Ne.value).unwrap(),
+        token: k(Ne)
       };
-      const Me = b.ref || [];
-      n.inline_refs = Me.flatMap((R) => {
-        const [nt] = Ce(R.value.expression);
+      const me = v.ref || [];
+      n.inline_refs = me.flatMap((j) => {
+        const [nt] = Ce(j.value.expression);
         if (Dt(nt, e.symbol))
-          return s.push(new u(o.SAME_ENDPOINT, "Two endpoints are the same", R)), [];
-        const Ae = R.value.op, Z = j(R.value.expression).unwrap();
+          return s.push(new u(o.SAME_ENDPOINT, "Two endpoints are the same", j)), [];
+        const ve = j.value.op, Z = W(j.value.expression).unwrap();
         let ce;
         if (Z.length === 1) {
           const [ae] = Z;
@@ -3058,75 +3056,75 @@ class Rt {
             schemaName: this.table.schemaName,
             tableName: this.table.name,
             fieldNames: [ae],
-            relation: Ae.value,
-            token: x(R)
+            relation: ve.value,
+            token: k(j)
           };
         } else if (Z.length === 2) {
-          const [ae, me] = Z;
+          const [ae, Te] = Z;
           ce = {
             schemaName: null,
             tableName: ae,
-            fieldNames: [me],
-            relation: Ae.value,
-            token: x(R)
+            fieldNames: [Te],
+            relation: ve.value,
+            token: k(j)
           };
         } else if (Z.length === 3) {
-          const [ae, me, it] = Z;
+          const [ae, Te, it] = Z;
           ce = {
             schemaName: ae,
-            tableName: me,
+            tableName: Te,
             fieldNames: [it],
-            relation: Ae.value,
-            token: x(R)
+            relation: ve.value,
+            token: k(j)
           };
         } else {
-          s.push(new u(o.UNSUPPORTED, "Nested schema is not supported", R));
-          const ae = Z.pop(), me = Z.pop();
+          s.push(new u(o.UNSUPPORTED, "Nested schema is not supported", j));
+          const ae = Z.pop(), Te = Z.pop();
           ce = {
             schemaName: Z.join("."),
-            tableName: me,
+            tableName: Te,
             fieldNames: [ae],
-            relation: Ae.value,
-            token: x(R)
+            relation: ve.value,
+            token: k(j)
           };
         }
-        const st = this.registerInlineRefToEnv(e, nt, ce, R);
+        const st = this.registerInlineRefToEnv(e, nt, ce, j);
         return s.push(...st), st.length === 0 ? ce : [];
       });
     }
-    return n.pk || (n.pk = r.some((b) => C(b).unwrap().toLowerCase() === "pk")), n.unique || (n.unique = r.some((b) => C(b).unwrap().toLowerCase() === "unique")), this.table.fields.push(n), n.pk && this.pkColumns.push(n), s;
+    return n.pk || (n.pk = r.some((v) => G(v).unwrap().toLowerCase() === "pk")), n.unique || (n.unique = r.some((v) => G(v).unwrap().toLowerCase() === "unique")), this.table.fields.push(n), n.pk && this.pkColumns.push(n), s;
   }
   interpretIndexes(e) {
     return this.table.indexes.push(...e.body.body.map((s) => {
       var a, l, p, h, T, f, N;
       const n = { columns: [] }, i = s;
-      n.token = x(e);
+      n.token = k(e);
       const r = [i.callee, ...i.args];
-      if (L.last(r) instanceof U) {
-        const b = z(r.pop()).getValue();
-        n.pk = !!((a = b.pk) != null && a.length), n.unique = !!((l = b.unique) != null && l.length), n.name = Y((h = (p = b.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
-        const F = (T = b.note) == null ? void 0 : T.at(0);
-        n.note = F && {
-          value: ue(Y(F.value).unwrap()),
-          token: x(F)
-        }, n.type = C((N = (f = b.type) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
+      if (I.last(r) instanceof U) {
+        const g = z(r.pop()).getValue();
+        n.pk = !!((a = g.pk) != null && a.length), n.unique = !!((l = g.unique) != null && l.length), n.name = Y((h = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
+        const v = (T = g.note) == null ? void 0 : T.at(0);
+        n.note = v && {
+          value: Y(v.value).unwrap(),
+          token: k(v)
+        }, n.type = G((N = (f = g.type) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
       }
-      return r.flatMap((b) => {
-        if (!(b instanceof H))
-          return b;
-        const F = [];
-        for (; b instanceof H; )
-          F.push(b.argumentList), b = b.callee;
-        return F.push(b), F;
-      }).forEach((b) => {
-        const { functional: F, nonFunctional: Me } = Ge(b).unwrap();
+      return r.flatMap((g) => {
+        if (!(g instanceof H))
+          return g;
+        const v = [];
+        for (; g instanceof H; )
+          v.push(g.argumentList), g = g.callee;
+        return v.push(g), v;
+      }).forEach((g) => {
+        const { functional: v, nonFunctional: Ne } = Ge(g).unwrap();
         n.columns.push(
-          ...F.map((R) => ({
-            value: R.value.value,
+          ...v.map((me) => ({
+            value: me.value.value,
             type: "expression"
           })),
-          ...Me.map((R) => ({
-            value: G(R).unwrap(),
+          ...Ne.map((me) => ({
+            value: V(me).unwrap(),
             type: "column"
           }))
         );
@@ -3149,8 +3147,8 @@ class Rt {
         {
           schemaName: this.table.schemaName,
           tableName: this.table.name,
-          fieldNames: [C(e.callee).unwrap()],
-          token: x(e),
+          fieldNames: [G(e.callee).unwrap()],
+          token: k(e),
           relation: a[0]
         },
         {
@@ -3161,30 +3159,30 @@ class Rt {
     }), [];
   }
 }
-function $n(t) {
+function Wn(t) {
   let e = null;
-  t instanceof H && (e = t.argumentList.elementList.map((r) => le(r) ? r.expression.literal.value : W(r) ? Y(r).unwrap() : C(r).unwrap()).join(","), t = t.callee);
+  t instanceof H && (e = t.argumentList.elementList.map((r) => le(r) ? r.expression.literal.value : $(r) ? Y(r).unwrap() : G(r).unwrap()).join(","), t = t.callee);
   let s = "";
-  for (; t instanceof fe; )
+  for (; t instanceof he; )
     s = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${s}`, t = t.array;
-  const { name: n, schemaName: i } = _e(t);
-  return i.length > 1 && new B(
+  const { name: n, schemaName: i } = Ae(t);
+  return i.length > 1 && new F(
     {
       schemaName: i.length === 0 ? null : i[0],
       type_name: `${n}${s}${e ? `(${e})` : ""}`,
       args: e
     },
     [new u(o.UNSUPPORTED, "Nested schema is not supported", t)]
-  ), new B({
+  ), new F({
     schemaName: i.length === 0 ? null : i[0],
     type_name: `${n}${s}${e ? `(${e})` : ""}`,
     args: e
   });
 }
-function Wn(t) {
+function jn(t) {
   var e, s, n;
   if (t) {
-    if (W(t))
+    if ($(t))
       return {
         value: Y(t).unwrap(),
         type: "string"
@@ -3194,12 +3192,12 @@ function Wn(t) {
         type: "number",
         value: Number.parseFloat(t.expression.literal.value)
       };
-    if (pe(t))
+    if (fe(t))
       return {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
       };
-    if (t instanceof Q && vt.includes((e = t.op) == null ? void 0 : e.value) && le(t.expression)) {
+    if (t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && le(t.expression)) {
       const i = Number.parseFloat(t.expression.expression.literal.value);
       return {
         value: ((s = t.op) == null ? void 0 : s.value) === "-" ? 0 - i : i,
@@ -3220,10 +3218,10 @@ class Pt {
   }
   interpret() {
     const e = [];
-    this.tableGroup.token = x(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup);
-    const { name: s, schemaName: n } = _e(this.declarationNode.name);
+    this.tableGroup.token = k(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup);
+    const { name: s, schemaName: n } = Ae(this.declarationNode.name);
     return n.length >= 2 && (this.tableGroup.name = s, this.tableGroup.schemaName = n.join("."), e.push(new u(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = s, this.tableGroup.schemaName = n[0] || null, this.tableGroup.tables = this.declarationNode.body.body.map((i) => {
-      const r = j(i.callee).unwrap();
+      const r = W(i.callee).unwrap();
       return r.length > 2 && e.push(new u(o.UNSUPPORTED, "Nested schema is not supported", i)), {
         name: r.pop(),
         schemaName: r.join(".")
@@ -3236,26 +3234,26 @@ class Ut {
     this.declarationNode = e, this.env = s, this.enum = { values: [] };
   }
   interpret() {
-    return this.enum.token = x(this.declarationNode), this.env.enums.set(this.declarationNode, this.enum), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.enum.token = k(this.declarationNode), this.env.enums.set(this.declarationNode, this.enum), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
-    const { name: s, schemaName: n } = _e(e);
+    const { name: s, schemaName: n } = Ae(e);
     return n.length > 1 ? (this.enum.name = s, this.enum.schemaName = n.join("."), [new u(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.enum.name = s, this.enum.schemaName = n.length ? n[0] : null, []);
   }
   interpretBody(e) {
     return e.body.flatMap((s) => {
       var l;
       const n = s, i = {};
-      i.token = x(n), i.name = C(n.callee).unwrap();
+      i.token = k(n), i.name = G(n.callee).unwrap();
       const a = (l = z(n.args[0]).getValue().note) == null ? void 0 : l.at(0);
       return i.note = a && {
-        value: ue(Y(a.value).unwrap()),
-        token: x(a)
+        value: Y(a.value).unwrap(),
+        token: k(a)
       }, this.enum.values.push(i), [];
     });
   }
 }
-class jn {
+class Yn {
   constructor(e, s) {
     this.declarationNode = e, this.env = s, this.project = { enums: [], refs: [], tableGroups: [], tables: [] };
   }
@@ -3265,7 +3263,7 @@ class jn {
   interpretName(e) {
     if (!e)
       return this.project.name = null, [];
-    const { name: s } = _e(e);
+    const { name: s } = Ae(e);
     return this.project.name = s, [];
   }
   interpretBody(e) {
@@ -3291,8 +3289,8 @@ class jn {
         }
         case "note":
           return this.project.note = {
-            value: ue(Y(n.body instanceof ee ? n.body.body[0].callee : n.body.callee).unwrap()),
-            token: x(n)
+            value: Y(n.body instanceof ee ? n.body.body[0].callee : n.body.callee).unwrap(),
+            token: k(n)
           }, [];
         default:
           return this.project[n.type.value.toLowerCase()] = Y(n.body.callee).unwrap(), [];
@@ -3300,7 +3298,7 @@ class jn {
     });
   }
 }
-class Yn {
+class zn {
   constructor(e) {
     this.ast = e, this.env = {
       schema: [],
@@ -3315,25 +3313,25 @@ class Yn {
   }
   interpret() {
     const e = this.ast.body.flatMap((s) => {
-      switch (Ee(s).unwrap_or(void 0)) {
-        case I.Table:
+      switch (de(s).unwrap_or(void 0)) {
+        case b.Table:
           return new Rt(s, this.env).interpret();
-        case I.Ref:
+        case b.Ref:
           return new Ke(s, this.env).interpret();
-        case I.TableGroup:
+        case b.TableGroup:
           return new Pt(s, this.env).interpret();
-        case I.Enum:
+        case b.Enum:
           return new Ut(s, this.env).interpret();
-        case I.Project:
-          return new jn(s, this.env).interpret();
+        case b.Project:
+          return new Yn(s, this.env).interpret();
         default:
           return [];
       }
     });
-    return new B(zn(this.env), e);
+    return new F(Qn(this.env), e);
   }
 }
-function zn(t) {
+function Qn(t) {
   return {
     schemas: [],
     tables: Array.from(t.tables.values()),
@@ -3344,28 +3342,28 @@ function zn(t) {
     project: Array.from(t.project.values())[0] || {}
   };
 }
-var g = /* @__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))(g || {}), w = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(w || {});
-function Le(t) {
+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 ge(t) {
   switch (t) {
     case m.Schema:
-      return g.Module;
+      return L.Module;
     case m.Table:
-      return g.Class;
+      return L.Class;
     case m.Column:
-      return g.Field;
+      return L.Field;
     case m.Enum:
-      return g.Enum;
+      return L.Enum;
     case m.EnumField:
-      return g.EnumMember;
+      return L.EnumMember;
     case m.TableGroup:
-      return g.Struct;
+      return L.Struct;
     case m.TableGroupField:
-      return g.Field;
+      return L.Field;
     default:
-      return g.Text;
+      return L.Text;
   }
 }
-function ke(t, e) {
+function Se(t, e) {
   if (!t || Ve(t))
     return !1;
   for (const s of t.trailingTrivia) {
@@ -3376,12 +3374,12 @@ function ke(t, e) {
   }
   return !0;
 }
-function S() {
+function O() {
   return {
     suggestions: []
   };
 }
-function Se(t) {
+function Oe(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
@@ -3390,7 +3388,7 @@ function Se(t) {
     }))
   };
 }
-function Pe(t) {
+function Ue(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
@@ -3413,14 +3411,14 @@ class Mt {
       ...(r == null ? void 0 : r.trailingTrivia) || [],
       ...(r == null ? void 0 : r.leadingTrivia) || [],
       ...(l == null ? void 0 : l.leadingTrivia) || []
-    ].find((N) => $t(N) && be(n, N)))
-      return S();
+    ].find((N) => $t(N) && Ie(n, N)))
+      return O();
     if (a === void 0)
       return Tt();
-    if ([c.STRING_LITERAL, c.QUOTED_STRING].includes(r.kind) && be(n, r))
-      return S();
+    if ([c.STRING_LITERAL, c.QUOTED_STRING].includes(r.kind) && Ie(n, r))
+      return O();
     const p = this.compiler.container.element(n);
-    if (this.compiler.container.scopeKind(n) === O.TOPLEVEL || p instanceof _ && p.type && p.type.start <= n && p.type.end >= n)
+    if (this.compiler.container.scopeKind(n) === D.TOPLEVEL || p instanceof _ && p.type && p.type.start <= n && p.type.end >= n)
       return Tt();
     const h = [...this.compiler.container.stack(n)].reverse();
     for (const N of h)
@@ -3460,31 +3458,31 @@ class Mt {
         if (N instanceof U)
           return Et(this.compiler, n, N);
         if (N instanceof J)
-          return Qn(this.compiler, n);
-        if (N instanceof y)
+          return qn(this.compiler, n);
+        if (N instanceof x)
           return mt(this.compiler, n, N);
-        if (N instanceof _ && (N.bodyColon && n >= N.bodyColon.end || N.body && be(n, N.body)))
+        if (N instanceof _ && (N.bodyColon && n >= N.bodyColon.end || N.body && Ie(n, N.body)))
           return mt(this.compiler, n, void 0);
       }
-    return S();
+    return O();
   }
 }
 function dt(t, e, s) {
   const n = t.container.scopeKind(e);
-  if ([O.REF, O.TABLE].includes(n)) {
-    const i = Ue(t, e, t.container.element(e), [
+  if ([D.REF, D.TABLE].includes(n)) {
+    const i = Me(t, e, t.container.element(e), [
       m.Table,
       m.Schema,
       m.Column
     ]);
-    return ke(s.op, e) ? Se(i) : i;
+    return Se(s.op, e) ? Oe(i) : i;
   }
-  return S();
+  return O();
 }
-function Ue(t, e, s, n) {
+function Me(t, e, s, n) {
   var a;
   if (s === void 0)
-    return S();
+    return O();
   let i = s;
   const r = { suggestions: [] };
   for (; i; ) {
@@ -3495,22 +3493,22 @@ function Ue(t, e, s, n) {
           label: p,
           insertText: p,
           insertTextRules: w.KeepWhitespace,
-          kind: Le(h),
-          sortText: Le(h).toString().padStart(2, "0"),
+          kind: ge(h),
+          sortText: ge(h).toString().padStart(2, "0"),
           range: void 0
         }))
       );
     }
     i = i instanceof _ ? i.parent : void 0;
   }
-  return Pe(r);
+  return Ue(r);
 }
-function Qn(t, e) {
+function qn(t, e) {
   var n;
   switch (t.container.scopeKind(e)) {
-    case O.INDEXES:
+    case D.INDEXES:
       return Vt(t, e);
-    case O.REF:
+    case D.REF:
       {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
@@ -3525,126 +3523,126 @@ function Qn(t, e) {
       }
       return Bt(t, e);
   }
-  return S();
+  return O();
 }
 function Et(t, e, s) {
   const { token: n } = t.container.token(e);
   if ([c.COMMA, c.LBRACKET].includes(n == null ? void 0 : n.kind)) {
     const i = Nt(t, e);
-    return (n == null ? void 0 : n.kind) === c.COMMA && ke(n, e) ? Se(i) : i;
+    return (n == null ? void 0 : n.kind) === c.COMMA && Se(n, e) ? Oe(i) : i;
   }
   if (s.name && s.name.start <= e && s.name.end >= e)
     return Nt(t, e);
   if (s.name) {
-    const i = qn(
+    const i = Hn(
       t,
       e,
-      De(s.name).unwrap()
+      Re(s.name).unwrap()
     );
-    return (n == null ? void 0 : n.kind) === c.COLON && ke(n, e) ? Se(i) : i;
+    return (n == null ? void 0 : n.kind) === c.COLON && Se(n, e) ? Oe(i) : i;
   }
-  return S();
+  return O();
 }
 function Nt(t, e) {
   const s = t.container.element(e), n = t.container.scopeKind(e);
-  if (s instanceof X)
-    return S();
-  if (s.body && !be(e, s.body))
+  if (s instanceof C)
+    return O();
+  if (s.body && !Ie(e, s.body))
     switch (n) {
-      case O.TABLE:
+      case D.TABLE:
         return {
           suggestions: [
             {
               label: "headercolor",
               insertText: "headercolor: ",
-              kind: g.Field,
+              kind: L.Field,
               insertTextRules: w.KeepWhitespace,
               range: void 0
             },
             {
               label: "note",
               insertText: "note: ",
-              kind: g.Field,
+              kind: L.Field,
               insertTextRules: w.KeepWhitespace,
               range: void 0
             }
           ]
         };
       default:
-        return S();
+        return O();
     }
   switch (n) {
-    case O.TABLE:
+    case D.TABLE:
       return {
         suggestions: [
           ...["primary key", "null", "not null", "increment", "pk", "unique"].map((i) => ({
             label: i,
             insertText: i,
-            kind: g.Property,
+            kind: L.Property,
             insertTextRules: w.KeepWhitespace,
             range: void 0
           })),
           ...["ref", "default"].map((i) => ({
             label: i,
             insertText: `${i}: `,
-            kind: g.Property,
+            kind: L.Property,
             insertTextRules: w.KeepWhitespace,
             range: void 0
           })),
           {
             label: "note",
             insertText: "note: ",
-            kind: g.Property,
+            kind: L.Property,
             insertTextRules: w.KeepWhitespace,
             range: void 0
           }
         ]
       };
-    case O.ENUM:
+    case D.ENUM:
       return {
         suggestions: [
           {
             label: "note",
             insertText: "note: ",
-            kind: g.Property,
+            kind: L.Property,
             insertTextRules: w.KeepWhitespace,
             range: void 0
           }
         ]
       };
-    case O.INDEXES:
+    case D.INDEXES:
       return {
         suggestions: [
           ...["unique", "pk"].map((i) => ({
             label: i,
             insertText: i,
             insertTextRules: w.KeepWhitespace,
-            kind: g.Property,
+            kind: L.Property,
             range: void 0
           })),
           ...["note", "name", "type"].map((i) => ({
             label: i,
             insertText: `${i}: `,
-            kind: g.Property,
+            kind: L.Property,
             insertTextRules: w.KeepWhitespace,
             range: void 0
           }))
         ]
       };
-    case O.REF:
+    case D.REF:
       return {
         suggestions: ["update", "delete"].map((i) => ({
           label: i,
           insertText: `${i}: `,
-          kind: g.Property,
+          kind: L.Property,
           insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
   }
-  return S();
+  return O();
 }
-function qn(t, e, s) {
+function Hn(t, e, s) {
   switch (s == null ? void 0 : s.toLowerCase()) {
     case "update":
     case "delete":
@@ -3652,7 +3650,7 @@ function qn(t, e, s) {
         suggestions: ["cascade", "set default", "set null", "restrict"].map((n) => ({
           label: n,
           insertText: n,
-          kind: g.Value,
+          kind: L.Value,
           insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
@@ -3662,24 +3660,24 @@ function qn(t, e, s) {
         suggestions: ["btree", "hash"].map((n) => ({
           label: n,
           insertText: `${n}`,
-          kind: g.Value,
+          kind: L.Value,
           insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
   }
-  return S();
+  return O();
 }
 function Ft(t, e, s) {
-  const n = Ne(s).unwrap_or([]);
+  const n = Ee(s).unwrap_or([]);
   if (n.pop(), n.some((r) => !M(r)))
-    return S();
-  const i = n.map((r) => C(r).unwrap());
-  return Pe({
+    return O();
+  const i = n.map((r) => G(r).unwrap());
+  return Ue({
     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,
       insertText: a,
-      kind: Le(r),
+      kind: ge(r),
       range: void 0
     }))
   });
@@ -3687,22 +3685,22 @@ function Ft(t, e, s) {
 function mt(t, e, s) {
   var i;
   switch (t.container.scopeKind(e)) {
-    case O.TABLE:
-      return Jn(t, e, s);
-    case O.PROJECT:
+    case D.TABLE:
       return Zn(t, e, s);
-    case O.INDEXES:
-      return es(t, e);
-    case O.ENUM:
-      return Hn(t, e, s);
-    case O.REF: {
+    case D.PROJECT:
+      return Kn(t, e, s);
+    case D.INDEXES:
+      return ts(t, e);
+    case D.ENUM:
+      return Jn(t, e, s);
+    case D.REF: {
       const r = Bt(t, e);
-      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === c.COLON && ke(t.container.token(e).token, e) ? Se(r) : r;
+      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === c.COLON && Se(t.container.token(e).token, e) ? Oe(r) : r;
     }
-    case O.TABLEGROUP:
-      return Kn(t);
+    case D.TABLEGROUP:
+      return es(t);
     default:
-      return S();
+      return O();
   }
 }
 function Tt() {
@@ -3711,26 +3709,26 @@ function Tt() {
       label: t,
       insertText: t,
       insertTextRules: w.KeepWhitespace,
-      kind: g.Keyword,
+      kind: L.Keyword,
       range: void 0
     }))
   };
 }
-function Hn(t, e, s) {
-  return s != null && s.callee && tt(e, s) === 1 ? Ue(t, e, t.container.element(e), [
+function Jn(t, e, s) {
+  return s != null && s.callee && tt(e, s) === 1 ? Me(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
-  ]) : S();
+  ]) : O();
 }
-function Jn(t, e, s) {
+function Zn(t, e, s) {
   if (!(s != null && s.callee))
     return {
       suggestions: ["Ref", "Note", "indexes"].map((i) => ({
         label: i,
         insertText: i,
         insertTextRules: w.KeepWhitespace,
-        kind: g.Keyword,
+        kind: L.Keyword,
         range: void 0
       }))
     };
@@ -3740,39 +3738,39 @@ function Jn(t, e, s) {
       label: i,
       insertText: i,
       insertTextRules: w.KeepWhitespace,
-      kind: g.Keyword,
+      kind: L.Keyword,
       range: void 0
     }))
-  } : n === 1 ? ts(t, e) : S();
+  } : n === 1 ? ns(t, e) : O();
 }
-function Zn(t, e, s) {
+function Kn(t, e, s) {
   return s != null && s.callee ? tt(e, s) === 0 ? {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
       insertTextRules: w.KeepWhitespace,
-      kind: g.Keyword,
+      kind: L.Keyword,
       range: void 0
     }))
-  } : S() : {
+  } : O() : {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
       insertTextRules: w.KeepWhitespace,
-      kind: g.Keyword,
+      kind: L.Keyword,
       range: void 0
     }))
   };
 }
 function Bt(t, e) {
-  return Ue(t, e, t.container.element(e), [
+  return Me(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
   ]);
 }
-function Kn(t) {
-  return Pe({
+function es(t) {
+  return Ue({
     suggestions: [...t.parse.publicSymbolTable().entries()].flatMap(([e]) => {
       const s = se(e).unwrap_or(void 0);
       if (s === void 0)
@@ -3782,16 +3780,16 @@ function Kn(t) {
         label: i,
         insertText: i,
         insertTextRules: w.KeepWhitespace,
-        kind: Le(n),
+        kind: ge(n),
         range: void 0
       };
     })
   });
 }
-function es(t, e) {
+function ts(t, e) {
   return Vt(t, e);
 }
-function ts(t, e) {
+function ns(t, e) {
   return {
     suggestions: [
       ...[
@@ -3855,11 +3853,11 @@ function ts(t, e) {
         label: s,
         insertText: s,
         insertTextRules: w.KeepWhitespace,
-        kind: g.TypeParameter,
-        sortText: g.TypeParameter.toString().padStart(2, "0"),
+        kind: L.TypeParameter,
+        sortText: L.TypeParameter.toString().padStart(2, "0"),
         range: void 0
       })),
-      ...Ue(t, e, t.container.element(e), [
+      ...Me(t, e, t.container.element(e), [
         m.Enum,
         m.Schema
       ]).suggestions
@@ -3869,9 +3867,9 @@ function ts(t, e) {
 function Vt(t, e) {
   const n = t.container.element(e).parent;
   if (!((n == null ? void 0 : n.symbol) instanceof At))
-    return S();
+    return O();
   const { symbolTable: i } = n.symbol;
-  return Pe({
+  return Ue({
     suggestions: [...i.entries()].flatMap(([r]) => {
       const a = se(r).unwrap_or(void 0);
       if (a === void 0)
@@ -3881,7 +3879,7 @@ function Vt(t, e) {
         label: l,
         insertText: l,
         insertTextRules: w.KeepWhitespace,
-        kind: Le(m.Column),
+        kind: ge(m.Column),
         range: void 0
       };
     })
@@ -3902,7 +3900,7 @@ class Gt {
     const { uri: n } = e, i = et(e, s), 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 && [he.PRIMARY_EXPRESSION, he.VARIABLE].includes(l == null ? void 0 : l.kind)) {
+      if ((a = l == null ? void 0 : l.referee) != null && a.declaration && [ue.PRIMARY_EXPRESSION, ue.VARIABLE].includes(l == null ? void 0 : l.kind)) {
         const { startPos: p, endPos: h } = l.referee.declaration;
         return [
           {
@@ -3929,9 +3927,9 @@ class Ct {
     for (; r.length !== 0; ) {
       const a = r.pop();
       if (a && [
-        he.ELEMENT_DECLARATION,
-        he.FUNCTION_APPLICATION,
-        he.PRIMARY_EXPRESSION
+        ue.ELEMENT_DECLARATION,
+        ue.FUNCTION_APPLICATION,
+        ue.PRIMARY_EXPRESSION
       ].includes(a == null ? void 0 : a.kind)) {
         const { symbol: l } = a;
         if (l != null && l.references.length)
@@ -3949,16 +3947,16 @@ class Ct {
     return [];
   }
 }
-const is = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const rs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   CompletionItemInsertTextRule: w,
-  CompletionItemKind: g,
+  CompletionItemKind: L,
   DBMLCompletionItemProvider: Mt,
   DBMLDefinitionProvider: Gt,
   DBMLReferencesProvider: Ct
 }, 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 rs {
+var D = /* @__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))(D || {});
+class as {
   constructor() {
     this.source = "", this.cache = new Array(
       16
@@ -3966,7 +3964,7 @@ class rs {
     ).fill(null), this.nodeIdGenerator = new Wt(), this.symbolIdGenerator = new Qt(), this.token = {
       invalidStream: this.createQuery(
         6,
-        () => this.parse.tokens().filter(wt)
+        () => this.parse.tokens().filter(vt)
       ),
       // Valid + Invalid tokens (which are guarenteed to be non-trivials) are included in the stream
       flatStream: this.createQuery(
@@ -3978,8 +3976,8 @@ class rs {
       _: this.createQuery(
         0,
         () => {
-          const e = new rn(this.source).lex().chain((s) => new ln(s, this.nodeIdGenerator).parse()).chain(({ ast: s, tokens: n }) => new Cn(s, this.symbolIdGenerator).analyze().map(() => ({ ast: s, tokens: n })));
-          return e.getErrors().length > 0 ? e : e.chain(({ ast: s, tokens: n }) => new Yn(s).interpret().map((r) => ({ ast: s, tokens: n, rawDb: r })));
+          const e = new rn(this.source).lex().chain((s) => new ln(s, this.nodeIdGenerator).parse()).chain(({ ast: s, tokens: n }) => new Xn(s, this.symbolIdGenerator).analyze().map(() => ({ ast: s, tokens: n })));
+          return e.getErrors().length > 0 ? e : e.chain(({ ast: s, tokens: n }) => new zn(s).interpret().map((r) => ({ ast: s, tokens: n, rawDb: r })));
         }
       ),
       ast: this.createQuery(
@@ -4016,8 +4014,8 @@ class rs {
           let a = this.parse.ast();
           const l = [a];
           for (; ; ) {
-            const h = sn(a).find((T) => be(r, T));
-            if (h === void 0 || h instanceof V)
+            const h = sn(a).find((T) => Ie(r, T));
+            if (h === void 0 || h instanceof B)
               break;
             l.push(h), a = h;
           }
@@ -4025,8 +4023,8 @@ class rs {
             return l;
           for (; l.length > 0; ) {
             let p = !1;
-            const h = L.last(l);
-            if (h instanceof y) {
+            const h = I.last(l);
+            if (h instanceof x) {
               const T = this.parse.source();
               for (let f = h.end; f < e; f += 1)
                 T[f] === `
@@ -4034,7 +4032,7 @@ class rs {
             } else
               h instanceof Q || h instanceof q ? this.container.token(e).token !== h.op && (l.pop(), p = !0) : h instanceof U ? h.listCloseBracket && h.end <= e && (l.pop(), p = !0) : h instanceof J ? h.tupleCloseParen && h.end <= e && (l.pop(), p = !0) : h instanceof ee ? h.blockCloseBrace && h.end <= e && (l.pop(), p = !0) : h instanceof te || h.end < e && (l.pop(), p = !0);
             if (p) {
-              const T = L.last(l);
+              const T = I.last(l);
               T instanceof _ && T.end <= e && l.pop();
             }
             if (!p)
@@ -4072,7 +4070,7 @@ class rs {
       ),
       scopeKind: this.createQuery(15, (e) => {
         var n;
-        if (this.container.element(e) instanceof X)
+        if (this.container.element(e) instanceof C)
           return 8;
         switch ((n = this.container.element(e).type) == null ? void 0 : n.value.toLowerCase()) {
           case "table":
@@ -4116,8 +4114,8 @@ class rs {
             for (const h of e)
               p = l.flatMap(
                 (T) => Yt(h).flatMap((f) => {
-                  const N = T.get(f), b = se(f).unwrap_or(void 0);
-                  return !N || !b ? [] : { ...b, symbol: N };
+                  const N = T.get(f), g = se(f).unwrap_or(void 0);
+                  return !N || !g ? [] : { ...g, symbol: N };
                 })
               ), l = p.flatMap(
                 (T) => T.symbol.symbolTable ? T.symbol.symbolTable : []
@@ -4165,7 +4163,7 @@ class rs {
   }
 }
 export {
-  rs as Compiler,
-  ss as serialize,
-  is as services
+  as as Compiler,
+  is as serialize,
+  rs as services
 };