@dbml/parse 3.1.3-alpha.0 → 3.1.4-alpha.0

package/dist/dbml-parse.mjs

@@ -1,4 +1,4 @@
-import L from "lodash";
+import I from "lodash";
 var u = /* @__PURE__ */ ((t) => (t.SPACE = "<space>", t.TAB = "<tab>", t.NEWLINE = "<newline>", t.COMMA = "<comma>", t.LPAREN = "<lparen>", t.RPAREN = "<rparen>", t.LBRACE = "<lbrace>", t.RBRACE = "<rbrace>", t.LBRACKET = "<lbracket>", t.RBRACKET = "<rbracket>", t.LANGLE = "<langle>", t.RANGLE = "<rangle>", t.OP = "<op>", t.EOF = "<eof>", t.NUMERIC_LITERAL = "<number>", t.STRING_LITERAL = "<string>", t.COLOR_LITERAL = "<color>", t.FUNCTION_EXPRESSION = "<function-expression>", t.QUOTED_STRING = "<variable>", t.IDENTIFIER = "<identifier>", t.SEMICOLON = "<semicolon>", t.COLON = "<colon>", t.SINGLE_LINE_COMMENT = "<single-line-comment>", t.MULTILINE_COMMENT = "<multiline-comment>", t))(u || {});
 function $t(t) {
   switch (t.kind) {
@@ -36,12 +36,12 @@ function rt(t) {
 function at(t) {
   return t !== void 0 && t.kind === "<op>";
 }
-class G {
+class V {
   constructor(e, n, s, i, r) {
     this.kind = e, this.startPos = n, this.endPos = s, this.value = i, this.leadingTrivia = [], this.trailingTrivia = [], this.leadingInvalid = [], this.trailingInvalid = [], this.isInvalid = r, this.start = n.offset, this.end = s.offset;
   }
   static create(e, n, s, i, r) {
-    return new G(e, n, s, i, r);
+    return new V(e, n, s, i, r);
   }
 }
 function bt(t) {
@@ -54,7 +54,7 @@ function Ve(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === u.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 jt {
     return this.id++;
   }
 }
-class y {
+class x {
   // The symbol that this syntax node refers to
   // args must be passed in order of appearance in the node
   constructor(e, n, s) {
     this.id = e, this.kind = n;
     const i = s.find((a) => a !== void 0 && !Number.isNaN(a.start));
-    i ? (this.startPos = i.startPos, this.fullStart = i instanceof G ? Lt(i) : i.fullStart) : (this.startPos = {
+    i ? (this.startPos = i.startPos, this.fullStart = i instanceof V ? Lt(i) : i.fullStart) : (this.startPos = {
       offset: NaN,
       column: NaN,
       line: NaN
     }, this.fullStart = NaN);
     const r = [...s].reverse().find((a) => a !== void 0 && !Number.isNaN(a.end));
-    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof G ? It(r) : r.fullEnd) : (this.endPos = {
+    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof V ? 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 B extends y {
+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 F extends x {
   constructor({ body: e = [], eof: n }, s) {
     super(s, "<program>", [...e, n]), this.body = e, this.eof = n;
   }
 }
-class _ extends y {
+class _ extends x {
   constructor({
     type: e,
     name: n,
@@ -123,12 +123,12 @@ class _ extends y {
     this.type = e, this.name = n, this.as = s, this.alias = i, this.attributeList = r, this.bodyColon = a, this.body = c;
   }
 }
-class te extends y {
+class te extends x {
   constructor({ identifiers: e = [] }, n) {
     super(n, "<identifer-stream>", e || []), this.identifiers = e;
   }
 }
-class ne extends y {
+class ne extends x {
   constructor({
     name: e,
     colon: n,
@@ -137,12 +137,12 @@ class ne extends y {
     super(i, "<attribute>", [e, n, s]), this.name = e, this.value = s, this.colon = n;
   }
 }
-class Q extends y {
+class Q extends x {
   constructor({ op: e, expression: n }, s) {
     super(s, "<prefix-expression>", [e, n]), this.op = e, this.expression = n;
   }
 }
-class q extends y {
+class q extends x {
   constructor({
     op: e,
     leftExpression: n,
@@ -151,22 +151,22 @@ class q extends y {
     super(i, "<infix-expression>", [n, e, s]), this.op = e, this.leftExpression = n, this.rightExpression = s;
   }
 }
-class Oe extends y {
+class De extends x {
   constructor({ op: e, expression: n }, s) {
     super(s, "<postfix-expression>", [n, e]), this.op = e, this.expression = n;
   }
 }
-class K extends y {
+class K extends x {
   constructor({ value: e }, n) {
     super(n, "<function-expression>", [e]), this.value = e;
   }
 }
-class v extends y {
+class v extends x {
   constructor({ callee: e, args: n = [] }, s) {
     super(s, "<function-application>", [e, ...n]), this.callee = e, this.args = n;
   }
 }
-class ee extends y {
+class ee extends x {
   constructor({
     blockOpenBrace: e,
     body: n = [],
@@ -175,7 +175,7 @@ class ee extends y {
     super(i, "<block-expression>", [e, ...n, s]), this.blockOpenBrace = e, this.body = n, this.blockCloseBrace = s;
   }
 }
-class U extends y {
+class U extends x {
   constructor({
     listOpenBracket: e,
     elementList: n = [],
@@ -189,7 +189,7 @@ class U extends y {
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
 }
-class J extends y {
+class J extends x {
   constructor({
     tupleOpenParen: e,
     elementList: n = [],
@@ -220,7 +220,7 @@ class Xe extends J {
     ), this.kind = "<group-expression>";
   }
 }
-class H extends y {
+class H extends x {
   constructor({
     callee: e,
     argumentList: n
@@ -228,28 +228,28 @@ class H extends y {
     super(s, "<call-expression>", [e, n]), this.callee = e, this.argumentList = n;
   }
 }
-class de extends y {
+class pe extends x {
   constructor({ literal: e }, n) {
     super(n, "<literal>", [e]), this.literal = e;
   }
 }
-class j extends y {
+class W extends x {
   constructor({ variable: e }, n) {
     super(n, "<variable>", [e]), this.variable = e;
   }
 }
-class D extends y {
+class R extends x {
   constructor({ expression: e }, n) {
     super(n, "<primary-expression>", [e]), this.expression = e;
   }
 }
-class ve extends y {
+class we extends x {
   constructor({ pre: e }, n) {
-    const s = G.create(u.SPACE, e.endPos, e.endPos, " ", !1);
+    const s = V.create(u.SPACE, e.endPos, e.endPos, " ", !1);
     super(n, "<dummy>", [s]);
   }
 }
-class fe extends y {
+class he extends x {
   constructor({ expression: e, indexer: n }, s) {
     super(s, "<array>", [e, n]), this.array = e, this.indexer = n;
   }
@@ -260,16 +260,16 @@ function gt(t, e) {
   if (!e || e.length === 0)
     return t || [];
   const [n] = t, [s] = e;
-  return (n.start < s.start ? L.flatten(L.zip(t, e)) : L.flatten(L.zip(e, t))).filter(
+  return (n.start < s.start ? I.flatten(I.zip(t, e)) : I.flatten(I.zip(e, t))).filter(
     (i) => i !== null
   );
 }
-function rs(t, e = !1) {
+function as(t, e = !1) {
   return JSON.stringify(
     t,
     function(n, s) {
       var i;
-      return !(this instanceof B) && n === "symbol" ? s == null ? void 0 : s.id : (
+      return !(this instanceof F) && n === "symbol" ? s == null ? void 0 : s.id : (
         /* this instanceof SyntaxNode && */
         n === "symbol" ? {
           symbolTable: s == null ? void 0 : s.symbolTable,
@@ -290,7 +290,7 @@ function rs(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) {
@@ -370,7 +370,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":
@@ -381,7 +381,7 @@ function Fe(t, e) {
 }
 function se(t) {
   const [e, n] = t.split(":");
-  return Object.values(m).includes(e) ? new k({
+  return Object.values(m).includes(e) ? new S({
     name: n,
     kind: e
   }) : new A();
@@ -396,7 +396,7 @@ function zt(t) {
 function Qt(t) {
   return [
     $e,
-    ye,
+    xe,
     je,
     ze,
     We,
@@ -408,16 +408,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 qt(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 be(t) {
-  return qe(t) || xe(t);
+function Ie(t) {
+  return qe(t) || ke(t);
 }
 function ct(t, e) {
   const n = [], s = Math.min(t.length, e.length);
@@ -425,7 +425,7 @@ function ct(t, e) {
     n.push(t[i], e[i]);
   return n.push(...t.slice(s), ...e.slice(s)), n;
 }
-function Ie(t, e) {
+function Le(t, e) {
   return t >= e.start && t < e.end;
 }
 class Ht {
@@ -480,7 +480,7 @@ class l extends Error {
     super(n), this.code = e, this.diagnostic = n, this.nodeOrToken = s, this.start = s.start, this.end = s.end, this.name = this.constructor.name, Object.setPrototypeOf(this, l.prototype);
   }
 }
-class V {
+class B {
   constructor(e, n) {
     this.value = e, this.errors = n === void 0 ? [] : n;
   }
@@ -492,20 +492,20 @@ class V {
   }
   chain(e) {
     const n = e(this.value), s = [...this.errors, ...n.errors];
-    return new V(n.value, s);
+    return new B(n.value, s);
   }
   map(e) {
-    return new V(e(this.value), this.errors);
+    return new B(e(this.value), this.errors);
   }
 }
 function nn(t, e, n) {
-  if (!t || !pe(t) || e.length === 0)
+  if (!t || !fe(t) || e.length === 0)
     return new A();
   const s = [...e], i = Be(t).unwrap(), r = s.pop();
   if (!(r instanceof ee))
     return new A();
-  const a = L.last(s) instanceof U ? s.pop() : void 0;
-  return s.length === 3 && Be(s[1]).unwrap().value === "as" ? new k(
+  const a = I.last(s) instanceof U ? s.pop() : void 0;
+  return s.length === 3 && Be(s[1]).unwrap().value === "as" ? new S(
     n.create(_, {
       type: i,
       name: s[0],
@@ -514,14 +514,14 @@ function nn(t, e, n) {
       attributeList: a,
       body: r
     })
-  ) : s.length === 1 ? new k(
+  ) : s.length === 1 ? new S(
     n.create(_, {
       type: i,
       name: s[0],
       attributeList: a,
       body: r
     })
-  ) : s.length === 0 ? new k(
+  ) : s.length === 0 ? new S(
     n.create(_, {
       type: i,
       attributeList: a,
@@ -533,7 +533,7 @@ function lt(t) {
   return t.kind === u.IDENTIFIER && t.value === "as";
 }
 function E(t) {
-  t && (t instanceof G ? sn(t) : rn(t));
+  t && (t instanceof V ? sn(t) : rn(t));
 }
 function sn(t) {
   t.kind !== u.EOF && (t.isInvalid = !0);
@@ -549,7 +549,7 @@ function rn(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);
@@ -561,13 +561,13 @@ function rn(t) {
     E(t.callee), E(t.argumentList);
   else if (t instanceof v)
     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 j)
+  else if (t instanceof W)
     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");
@@ -579,7 +579,7 @@ function P(...t) {
   return t.filter((e) => e !== void 0);
 }
 function an(t) {
-  if (t instanceof B)
+  if (t instanceof F)
     return P(...t.body, t.eof);
   if (t instanceof _)
     return P(
@@ -595,15 +595,15 @@ function an(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 j)
+  if (t instanceof W)
     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);
@@ -625,33 +625,33 @@ function an(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 Y(t) {
+function j(t) {
   var e;
-  return t instanceof D && (t.expression instanceof j && t.expression.variable instanceof G && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof de && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
+  return t instanceof R && (t.expression instanceof W && t.expression.variable instanceof V && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof pe && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
 }
 function M(t) {
-  return t instanceof D && t.expression instanceof j && t.expression.variable instanceof G;
+  return t instanceof R && t.expression instanceof W && t.expression.variable instanceof V;
 }
-function pe(t) {
+function fe(t) {
   var e;
-  return t instanceof D && t.expression instanceof j && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
+  return t instanceof R && t.expression instanceof W && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
 }
 function He(t) {
   var e;
-  return t instanceof q && t.leftExpression instanceof y && t.rightExpression instanceof y && ((e = t.op) == null ? void 0 : e.value) === ".";
+  return t instanceof q && t.leftExpression instanceof x && t.rightExpression instanceof x && ((e = t.op) == null ? void 0 : e.value) === ".";
 }
-function De(t) {
+function Re(t) {
   if (t === void 0)
     return new A();
   const e = t.identifiers.map((n) => n.value).join(" ");
-  return e === "" ? new A() : new k(e);
+  return e === "" ? new A() : new S(e);
 }
 class on {
   // list of errors during lexing
@@ -693,7 +693,7 @@ class on {
     this.tokens.push(this.createToken(e, n));
   }
   createToken(e, n = !1) {
-    return G.create(
+    return V.create(
       e,
       this.start,
       this.current,
@@ -702,7 +702,7 @@ class on {
     );
   }
   lex() {
-    return this.scanTokens(), this.tokens.push(G.create(u.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new V(this.tokens, this.errors);
+    return this.scanTokens(), this.tokens.push(V.create(u.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new B(this.tokens, this.errors);
   }
   scanTokens() {
     for (; !this.isAtEnd(); ) {
@@ -771,7 +771,7 @@ class on {
             this.identifier();
             break;
           }
-          if (xe(e)) {
+          if (ke(e)) {
             this.numericLiteral();
             break;
           }
@@ -839,7 +839,7 @@ class on {
       );
       return;
     }
-    a && this.match(n), this.tokens.push(G.create(e, this.start, this.current, c, !1));
+    a && this.match(n), this.tokens.push(V.create(e, this.start, this.current, c, !1));
   }
   singleLineStringLiteral() {
     this.consumeUntil(u.STRING_LITERAL, "'", {
@@ -886,7 +886,7 @@ class on {
     });
   }
   identifier() {
-    for (; !this.isAtEnd() && be(this.peek()); )
+    for (; !this.isAtEnd() && Ie(this.peek()); )
       this.advance();
     this.addToken(u.IDENTIFIER);
   }
@@ -905,19 +905,19 @@ class on {
         break;
       if (!s && this.current.offset === this.text.length - 1)
         return this.advance(), this.addToken(u.NUMERIC_LITERAL);
-      if (!s && !be(this.peek()))
+      if (!s && !Ie(this.peek()))
         return this.addToken(u.NUMERIC_LITERAL);
-      if (!s && !xe(this.peek()))
+      if (!s && !ke(this.peek()))
         break;
       this.advance();
     }
-    for (; !this.isAtEnd() && (this.check(".") || be(this.peek())); )
+    for (; !this.isAtEnd() && (this.check(".") || Ie(this.peek())); )
       this.advance();
     const n = this.createToken(u.NUMERIC_LITERAL, !0);
     this.tokens.push(n), this.errors.push(new l(o.UNKNOWN_TOKEN, "Invalid number", n));
   }
   colorLiteral() {
-    for (; !this.isAtEnd() && be(this.peek()); )
+    for (; !this.isAtEnd() && Ie(this.peek()); )
       this.advance();
     this.addToken(u.COLOR_LITERAL);
   }
@@ -949,7 +949,7 @@ class on {
       case "u": {
         let e = "";
         for (let n = 0; n <= 3; n += 1) {
-          if (this.isAtEnd() || !be(this.peek()))
+          if (this.isAtEnd() || !Ie(this.peek()))
             return `\\u${e}`;
           e += this.advance();
         }
@@ -960,7 +960,7 @@ class on {
     }
   }
 }
-var we = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(we || {});
+var ye = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(ye || {});
 class cn {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
@@ -973,7 +973,7 @@ class cn {
     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;
@@ -1059,7 +1059,7 @@ class un {
           break;
         E(s), this.advance();
       }
-    }, this.blockExpression = this.contextStack.withContextDo(we.BlockExpression, () => {
+    }, this.blockExpression = this.contextStack.withContextDo(ye.BlockExpression, () => {
       const s = { body: [] }, i = () => this.nodeFactory.create(ee, s);
       try {
         this.consume("Expect an opening brace '{'", u.LBRACE), s.blockOpenBrace = this.previous();
@@ -1098,7 +1098,7 @@ class un {
             break;
           E(s), this.advance();
         }
-    }, this.tupleExpression = this.contextStack.withContextDo(we.GroupExpression, () => {
+    }, this.tupleExpression = this.contextStack.withContextDo(ye.GroupExpression, () => {
       const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(Xe, {
         groupOpenParen: s.tupleOpenParen,
         groupCloseParen: s.tupleCloseParen,
@@ -1129,7 +1129,7 @@ class un {
         } catch (a) {
           if (!(a instanceof d))
             throw a;
-          if (a.partialNode instanceof y && s.elementList.push(a.partialNode), !this.canHandle(a))
+          if (a.partialNode instanceof x && s.elementList.push(a.partialNode), !this.canHandle(a))
             throw new d(a.token, r(), a.handlerContext);
           this.synchronizeTuple();
         }
@@ -1150,7 +1150,7 @@ class un {
           break;
         E(s), this.advance();
       }
-    }, this.listExpression = this.contextStack.withContextDo(we.ListExpression, () => {
+    }, this.listExpression = this.contextStack.withContextDo(ye.ListExpression, () => {
       const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(U, s);
       try {
         this.consume("Expect an opening bracket '['", u.LBRACKET), s.listOpenBracket = this.previous();
@@ -1177,7 +1177,7 @@ class un {
         } catch (r) {
           if (!(r instanceof d))
             throw r;
-          if (r.partialNode instanceof y && s.elementList.push(r.partialNode), !this.canHandle(r))
+          if (r.partialNode instanceof x && s.elementList.push(r.partialNode), !this.canHandle(r))
             throw new d(r.token, i(), r.handlerContext);
           this.synchronizeList();
         }
@@ -1218,10 +1218,10 @@ class un {
     return this.current >= this.tokens.length || this.tokens[this.current].kind === u.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 n = this.check(...e);
@@ -1268,8 +1268,8 @@ class un {
     this.tokens = e;
   }
   parse() {
-    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(B, { body: e, eof: n });
-    return this.gatherInvalid(), new V({ ast: s, tokens: this.tokens }, this.errors);
+    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(F, { body: e, eof: n });
+    return this.gatherInvalid(), new B({ ast: s, tokens: this.tokens }, this.errors);
   }
   /* Parsing and synchronizing ProgramNode */
   program() {
@@ -1425,12 +1425,12 @@ class un {
         if (Ve(this.previous()))
           break;
         try {
-          n = this.nodeFactory.create(fe, {
+          n = this.nodeFactory.create(he, {
             expression: n,
             indexer: this.listExpression()
           });
         } catch (i) {
-          throw i instanceof d ? (n = this.nodeFactory.create(fe, {
+          throw i instanceof d ? (n = this.nodeFactory.create(he, {
             expression: n,
             indexer: i.partialNode
           }), new d(i.token, n, i.handlerContext)) : i;
@@ -1440,7 +1440,7 @@ class un {
         if (r.left !== null) {
           if (r.left <= e)
             break;
-          this.advance(), n = this.nodeFactory.create(Oe, {
+          this.advance(), n = this.nodeFactory.create(De, {
             expression: n,
             op: i
           });
@@ -1481,7 +1481,7 @@ class un {
           `Unexpected '${n.op.value}' in an expression`
         ), new d(
           n.op,
-          this.nodeFactory.create(ve, { pre: n.op }),
+          this.nodeFactory.create(we, { pre: n.op }),
           this.contextStack.findHandlerContext(this.tokens, this.current)
         );
       this.advance();
@@ -1495,10 +1495,10 @@ class un {
         )) : i;
       }
       e = this.nodeFactory.create(Q, n);
-    } else if (e = this.extractOperand(), e instanceof ve)
+    } else if (e = this.extractOperand(), e instanceof we)
       throw new d(
         this.peek(),
-        this.nodeFactory.create(ve, { pre: this.peek() }),
+        this.nodeFactory.create(we, { pre: this.peek() }),
         this.contextStack.findHandlerContext(this.tokens, this.current)
       );
     return e;
@@ -1522,7 +1522,7 @@ class un {
       this.peek(),
       o.INVALID_OPERAND,
       `Invalid start of operand "${this.peek().value}"`
-    ), this.nodeFactory.create(ve, { pre: this.previous() }));
+    ), this.nodeFactory.create(we, { pre: this.previous() }));
   }
   /* Parsing FunctionExpression */
   functionExpression() {
@@ -1548,17 +1548,17 @@ class un {
       u.STRING_LITERAL,
       u.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(u.QUOTED_STRING, u.IDENTIFIER))
-      return this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create(j, { variable: this.previous() })
+      return this.nodeFactory.create(R, {
+        expression: this.nodeFactory.create(W, { 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(j, {})
+      this.nodeFactory.create(R, {
+        expression: this.nodeFactory.create(W, {})
       }),
       this.contextStack.findHandlerContext(this.tokens, this.current)
     );
@@ -1655,107 +1655,107 @@ const En = {
 function ut(t) {
   return En[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 n;
   const e = (n = t == null ? void 0 : t.type) == null ? void 0 : n.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 X(t) {
+function C(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 n = [];
   for (const s of e) {
-    const i = $(s).unwrap_or(void 0);
+    const i = X(s).unwrap_or(void 0);
     if (!i)
       return new A();
     n.push(i);
   }
-  return new k(n);
+  return new S(n);
 }
-function Le(t) {
+function ge(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 n = [];
   let s;
-  if (!M(L.last(e))) {
+  if (!M(I.last(e))) {
     const i = e.pop();
     if (xt(i))
       s = i.elementList.map(
-        (r) => C(r).unwrap()
+        (r) => G(r).unwrap()
       );
     else
       return new A();
   }
   for (const i of e) {
-    const r = $(i).unwrap_or(void 0);
+    const r = X(i).unwrap_or(void 0);
     if (!r)
       return new A();
     n.push(r);
   }
-  return new k({
+  return new S({
     variables: n,
     tupleElements: s
   });
 }
-function $(t) {
-  return M(t) ? new k(t.expression.variable.value) : new A();
+function X(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(
       (s) => s instanceof K
     ), n = t.elementList.filter(M);
-    return new k({ functional: e, nonFunctional: n });
+    return new S({ functional: e, nonFunctional: n });
   }
   return new A();
 }
-function C(t) {
+function G(t) {
   var n;
   const e = (n = t == null ? void 0 : t.expression.variable) == null ? void 0 : n.value;
-  return e === void 0 ? new A() : new k(e);
+  return e === void 0 ? new A() : new S(e);
 }
 function z(t) {
-  return Y(t) ? t.expression instanceof j ? new k(t.expression.variable.value) : new k(t.expression.literal.value) : new A();
+  return j(t) ? t.expression instanceof W ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new A();
 }
 function Nn(t) {
   var e;
-  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;
+  return !(t instanceof q) || !yt((e = t.op) == null ? void 0 : e.value) ? !1 : ge(t.leftExpression).and_then(() => ge(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
 function mn(t) {
-  const e = Le(t.leftExpression), n = Le(t.rightExpression);
+  const e = ge(t.leftExpression), n = ge(t.rightExpression);
   if (!e.isOk() || !n.isOk())
     return !1;
   const { tupleElements: s } = e.unwrap(), { tupleElements: i } = n.unwrap();
   return (s == null ? void 0 : s.length) === (i == null ? void 0 : i.length);
 }
 function ht(t) {
-  return t instanceof D && t.expression instanceof j || t instanceof K;
+  return t instanceof R && t.expression instanceof W || t instanceof K;
 }
 function Tn(t, e) {
   var i, r, a, c;
@@ -1764,9 +1764,9 @@ function Tn(t, e) {
   for (; n; ) {
     if ((r = (i = n.symbol) == null ? void 0 : i.symbolTable) != null && r.has(t))
       return (a = n.symbol.symbolTable) == null ? void 0 : a.get(t);
-    if (((c = n.symbol) == null ? void 0 : c.declaration) instanceof B && s)
+    if (((c = n.symbol) == null ? void 0 : c.declaration) instanceof F && s)
       return n.symbol;
-    if (n instanceof B)
+    if (n instanceof F)
       return;
     n = n.parent;
   }
@@ -1779,7 +1779,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 B || Ee(this.declarationNode.parent).unwrap_or(void 0) !== I.Project ? [new l(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof F || de(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new l(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new l(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
@@ -1796,10 +1796,10 @@ class bn {
     if (e instanceof ee)
       return [new l(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
     const n = [];
-    return Y(e.callee) || n.push(new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
+    return j(e.callee) || n.push(new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
   }
 }
-class _e {
+class Ae {
   constructor() {
     this.table = /* @__PURE__ */ new Map();
   }
@@ -1834,8 +1834,8 @@ class In {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(Jt, { declaration: this.declarationNode, symbolTable: new _e() });
-    const { name: n } = this.declarationNode, s = X(n);
+    this.declarationNode.symbol = this.symbolFactory.create(Jt, { declaration: this.declarationNode, symbolTable: new Ae() });
+    const { name: n } = this.declarationNode, s = C(n);
     if (s.isOk()) {
       const i = s.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), c = je(r);
       a.has(c) && e.push(new l(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, n)), a.set(c, this.declarationNode.symbol);
@@ -1850,23 +1850,23 @@ class In {
       return [];
     if (e instanceof v)
       return this.validateFields([e]);
-    const [n, s] = L.partition(e.body, (i) => i instanceof v);
+    const [n, s] = I.partition(e.body, (i) => i instanceof v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
     return e.length === 0 ? [new l(o.EMPTY_ENUM, "An Enum must have at least one element", this.declarationNode)] : e.flatMap((n) => {
       const s = [];
-      return n.callee && !M(n.callee) && s.push(new l(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), L.last(n.args) instanceof U && s.push(...this.validateFieldSetting(L.last(n.args))), n.args.length > 1 && s.push(...n.args.map((i) => new l(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", i))), s.push(...this.registerField(n)), s;
+      return n.callee && !M(n.callee) && s.push(new l(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), I.last(n.args) instanceof U && s.push(...this.validateFieldSetting(I.last(n.args))), n.args.length > 1 && s.push(...n.args.map((i) => new l(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", i))), s.push(...this.registerField(n)), s;
     });
   }
   validateFieldSetting(e) {
-    const n = W(e), s = n.getErrors(), i = n.getValue();
+    const n = $(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
           a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", c))), a.forEach((c) => {
-            Y(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
+            j(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
           });
           break;
         default:
@@ -1885,7 +1885,7 @@ class In {
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const n = C(e.callee).unwrap(), s = Ye(n), i = this.symbolFactory.create(Zt, { declaration: e });
+      const n = G(e.callee).unwrap(), s = Ye(n), i = this.symbolFactory.create(Zt, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
@@ -1908,7 +1908,7 @@ class Ln {
     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 B || Ee(this.declarationNode.parent).unwrap_or(void 0) !== I.Table ? [new l(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof F || de(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new l(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new l(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
@@ -1924,7 +1924,7 @@ class Ln {
       return [];
     if (e instanceof v)
       return [new l(o.UNEXPECTED_SIMPLE_BODY, "An Indexes must have a complex body", e)];
-    const [n, s] = L.partition(e.body, (i) => i instanceof v);
+    const [n, s] = I.partition(e.body, (i) => i instanceof v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -1932,7 +1932,7 @@ class Ln {
       if (!n.callee)
         return [];
       const s = [], i = [n.callee, ...n.args];
-      return L.last(i) instanceof U && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
+      return I.last(i) instanceof U && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
         for (; r instanceof H; )
           r.argumentList && !Ge(r.argumentList).isOk() && s.push(new l(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
         Ge(r).isOk() || s.push(new l(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
@@ -1940,14 +1940,14 @@ class Ln {
     });
   }
   validateFieldSetting(e) {
-    const n = W(e), s = n.getErrors(), i = n.getValue();
+    const n = $(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
         case "name":
           a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, c))), a.forEach((c) => {
-            Y(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, c));
+            j(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, c));
           });
           break;
         case "unique":
@@ -1984,14 +1984,14 @@ 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 B) && ![I.Table, I.Project].includes(Ee(this.declarationNode.parent).unwrap_or(void 0)) ? [new l(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project. Sticky note can only appear at the global scope.", this.declarationNode)] : [];
+    return !(this.declarationNode.parent instanceof F) && ![b.Table, b.Project].includes(de(this.declarationNode.parent).unwrap_or(void 0)) ? [new l(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project. Sticky note can only appear at the global scope.", this.declarationNode)] : [];
   }
   validateName(e) {
-    if (!(this.declarationNode.parent instanceof B))
+    if (!(this.declarationNode.parent instanceof F))
       return e ? [new l(o.UNEXPECTED_NAME, "A Note shouldn't have a name", e)] : [];
     if (!e)
       return [new l(o.INVALID_NAME, "Sticky note must have a name", this.declarationNode)];
-    const n = X(e);
+    const n = C(e);
     if (!n.isOk())
       return [];
     const i = n.unwrap().join("."), r = Yt(i);
@@ -2001,19 +2001,19 @@ class gn {
     return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e && !(this.declarationNode.parent instanceof B) ? [new l(o.UNEXPECTED_SETTINGS, "A Note shouldn't have a setting list", e)] : [];
+    return e && !(this.declarationNode.parent instanceof F) ? [new l(o.UNEXPECTED_SETTINGS, "A Note shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
     if (e instanceof v)
       return this.validateFields([e]);
-    const [n, s] = L.partition(e.body, (i) => i instanceof v);
+    const [n, s] = I.partition(e.body, (i) => i instanceof v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
     const n = [];
-    return e.length === 0 ? [new l(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new l(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), Y(e[0].callee) || n.push(new l(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new l(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
+    return e.length === 0 ? [new l(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new l(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), j(e[0].callee) || n.push(new l(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new l(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
   }
   validateSubElements(e) {
     return e.flatMap((n) => {
@@ -2035,7 +2035,7 @@ class _n {
     return this.declarationNode.parent instanceof _ ? [new l(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Re(e) ? [] : [new l(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? Pe(e) ? [] : [new l(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new l(o.UNEXPECTED_ALIAS, "A Project shouldn't have an alias", e)] : [];
@@ -2048,7 +2048,7 @@ class _n {
       return [];
     if (e instanceof v)
       return [new l(o.UNEXPECTED_SIMPLE_BODY, "A Project's body must be a block", e)];
-    const [n, s] = L.partition(e.body, (i) => i instanceof v);
+    const [n, s] = I.partition(e.body, (i) => i instanceof v);
     return [
       ...n.map((i) => new l(o.INVALID_PROJECT_FIELD, "A Project can not have inline fields", i)),
       ...this.validateSubElements(s)
@@ -2071,10 +2071,10 @@ class An {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof B || Ee(this.declarationNode.parent).unwrap_or(void 0) === I.Table ? [] : [new l(o.INVALID_REF_CONTEXT, "A Ref must appear top-level or inside a table", this.declarationNode)];
+    return this.declarationNode.parent instanceof F || de(this.declarationNode.parent).unwrap_or(void 0) === b.Table ? [] : [new l(o.INVALID_REF_CONTEXT, "A Ref must appear top-level or inside a table", this.declarationNode)];
   }
   validateName(e) {
-    return e ? Re(e) ? [] : [new l(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? Pe(e) ? [] : [new l(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
@@ -2087,7 +2087,7 @@ class An {
       return [];
     if (e instanceof v)
       return this.validateFields([e]);
-    const [n, s] = L.partition(e.body, (i) => i instanceof v);
+    const [n, s] = I.partition(e.body, (i) => i instanceof v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -2095,11 +2095,11 @@ class An {
       return [new l(o.EMPTY_REF, "A Ref must have at least one field", this.declarationNode)];
     const n = [];
     return e.length > 1 && n.push(...e.slice(1).map((s) => new l(o.REF_REDEFINED, "A Ref can only contain one binary relationship", s))), e.forEach((s) => {
-      s.callee && !Nn(s.callee) && n.push(new l(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !mn(s.callee) && n.push(new l(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee)), L.last(s.args) instanceof U && this.validateFieldSettings(L.last(s.args)), s.args.length > 1 && n.push(...s.args.map((i) => new l(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", i)));
+      s.callee && !Nn(s.callee) && n.push(new l(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !mn(s.callee) && n.push(new l(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee)), I.last(s.args) instanceof U && this.validateFieldSettings(I.last(s.args)), s.args.length > 1 && n.push(...s.args.map((i) => new l(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", i)));
     }), n;
   }
   validateFieldSettings(e) {
-    const n = W(e), s = n.getErrors(), i = n.getValue();
+    const n = $(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
@@ -2128,7 +2128,7 @@ function vn(t) {
   if (!(M(t) && t.expression.variable.kind !== u.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":
@@ -2152,24 +2152,24 @@ class wn {
     return this.declarationNode.parent instanceof _ ? [new l(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? e instanceof fe ? [new l(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Je(e) ? [] : [new l(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new l(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
+    return e ? e instanceof he ? [new l(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Je(e) ? [] : [new l(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new l(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
   }
   validateAlias(e) {
-    return e ? kn(e) ? [] : [new l(o.INVALID_ALIAS, "A Table alias must be of the form <alias>", e)] : [];
+    return e ? Sn(e) ? [] : [new l(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
   }
   validateSettingList(e) {
-    const n = W(e), s = n.getErrors(), i = n.getValue();
+    const n = $(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "headercolor":
           a.length > 1 && s.push(...a.map((c) => new l(o.DUPLICATE_TABLE_SETTING, "'headercolor' can only appear once", c))), a.forEach((c) => {
-            Sn(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", c.value || c.name));
+            On(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", c.value || c.name));
           });
           break;
         case "note":
           a.length > 1 && s.push(...a.map((c) => new l(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", c))), a.forEach((c) => {
-            Y(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
+            j(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
           });
           break;
         default:
@@ -2180,15 +2180,15 @@ class wn {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(At, { declaration: this.declarationNode, symbolTable: new _e() });
-    const { name: n, alias: s } = this.declarationNode, i = X(n);
+    this.declarationNode.symbol = this.symbolFactory.create(At, { declaration: this.declarationNode, symbolTable: new Ae() });
+    const { name: n, alias: s } = this.declarationNode, i = C(n);
     if (i.isOk()) {
-      const r = i.unwrap(), a = r.pop(), c = Ze(r, this.publicSymbolTable, this.symbolFactory), p = ye(a);
+      const r = [...i.unwrap()], a = r.pop(), c = Ze(r, this.publicSymbolTable, this.symbolFactory), p = xe(a);
       c.has(p) && e.push(new l(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, n)), c.set(p, this.declarationNode.symbol);
     }
-    if (s && Re(s)) {
-      const r = ye(C(s).unwrap());
-      this.publicSymbolTable.has(r) && e.push(new l(o.DUPLICATE_NAME, `Table name '${s}' already exists`, n)), this.publicSymbolTable.set(r, this.declarationNode.symbol);
+    if (s && Pe(s) && !xn(s.expression.variable.value, i.unwrap_or([]))) {
+      const r = G(s).unwrap(), a = xe(r);
+      this.publicSymbolTable.has(a) && e.push(new l(o.DUPLICATE_NAME, `Table name '${r}' already exists`, n)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
     }
     return e;
   }
@@ -2197,7 +2197,7 @@ class wn {
       return [];
     if (e instanceof v)
       return [new l(o.UNEXPECTED_SIMPLE_BODY, "A Table's body must be a block", e)];
-    const [n, s] = L.partition(e.body, (i) => i instanceof v);
+    const [n, s] = I.partition(e.body, (i) => i instanceof v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -2212,7 +2212,7 @@ class wn {
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const n = C(e.callee).unwrap(), s = We(n), i = this.symbolFactory.create(Kt, { declaration: e });
+      const n = G(e.callee).unwrap(), s = We(n), i = this.symbolFactory.create(Kt, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
@@ -2228,15 +2228,15 @@ class wn {
   }
   // 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 l(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
     if (e.length === 0)
       return [];
     let n;
-    L.last(e) instanceof U && (n = e.pop());
-    const s = W(n), i = s.getErrors(), r = s.getValue();
+    I.last(e) instanceof U && (n = e.pop());
+    const s = $(n), i = s.getErrors(), r = s.getValue();
     for (const p of e) {
-      const h = C(p).unwrap_or("").toLowerCase();
+      const h = G(p).unwrap_or("").toLowerCase();
       if (h !== "pk" && h !== "unique") {
         i.push(new l(o.INVALID_SETTINGS, "Inline column settings can only be `pk` or `unique`", p));
         continue;
@@ -2250,12 +2250,12 @@ class wn {
       switch (p) {
         case "note":
           h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", f))), h.forEach((f) => {
-            Y(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
+            j(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
           });
           break;
         case "ref":
           h.forEach((f) => {
-            Dn(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", f.value || f.name));
+            Rn(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", f.value || f.name));
           });
           break;
         case "primary key":
@@ -2292,7 +2292,7 @@ class wn {
           break;
         case "default":
           h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_TABLE_SETTING, "'default' can only appear once", f))), h.forEach((f) => {
-            On(f.value) || i.push(new l(o.INVALID_TABLE_SETTING, "'default' must be a string literal, number literal, function expression, true, false or null", f.value || f.name));
+            Dn(f.value) || i.push(new l(o.INVALID_TABLE_SETTING, "'default' must be a string literal, number literal, function expression, true, false or null", f.value || f.name));
           });
           break;
         default:
@@ -2315,22 +2315,25 @@ class wn {
   }
 }
 function yn(t) {
-  if (!(t instanceof H || He(t) || t instanceof D || t instanceof fe))
+  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((n) => ce(n) || Y(n) || pe(n)))
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ce(n) || j(n) || fe(n)))
       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((n) => !n.colon && !n.value && ce(n.name)))
       return !1;
     t = t.array;
   }
-  const e = X(t).unwrap_or(void 0);
+  const e = C(t).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
-class xn {
+function xn(t, e) {
+  return e.length === 1 && t === e[0];
+}
+class kn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2348,8 +2351,8 @@ class xn {
   }
   registerElement() {
     const { name: e } = this.declarationNode;
-    this.declarationNode.symbol = this.symbolFactory.create(en, { declaration: this.declarationNode, symbolTable: new _e() });
-    const n = X(e);
+    this.declarationNode.symbol = this.symbolFactory.create(en, { declaration: this.declarationNode, symbolTable: new Ae() });
+    const n = C(e);
     if (n.isOk()) {
       const s = n.unwrap(), i = s.pop(), r = Ze(s, this.publicSymbolTable, this.symbolFactory), a = ze(i);
       if (r.has(a))
@@ -2366,13 +2369,13 @@ class xn {
       return [];
     if (e instanceof v)
       return [new l(o.UNEXPECTED_SIMPLE_BODY, "A TableGroup's body must be a block", e)];
-    const [n, s] = L.partition(e.body, (i) => i instanceof v);
+    const [n, s] = I.partition(e.body, (i) => i instanceof v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
     return e.flatMap((n) => {
       const s = [];
-      return n.callee && !X(n.callee).isOk() && s.push(new l(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", n.callee)), this.registerField(n), n.args.length > 0 && s.push(...n.args.map((i) => new l(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
+      return n.callee && !C(n.callee).isOk() && s.push(new l(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", n.callee)), this.registerField(n), n.args.length > 0 && s.push(...n.args.map((i) => new l(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
     });
   }
   validateSubElements(e) {
@@ -2385,7 +2388,7 @@ class xn {
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const n = C(e.callee).unwrap(), s = Qe(n), i = this.symbolFactory.create(tn, { declaration: e });
+      const n = G(e.callee).unwrap(), s = Qe(n), i = this.symbolFactory.create(tn, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
@@ -2403,32 +2406,32 @@ class xn {
 const wt = ["-", "+"];
 function ie(t) {
   switch (t.type.value.toLowerCase()) {
-    case I.Enum:
+    case b.Enum:
       return In;
-    case I.Table:
+    case b.Table:
       return wn;
-    case I.TableGroup:
-      return xn;
-    case I.Project:
+    case b.TableGroup:
+      return kn;
+    case b.Project:
       return _n;
-    case I.Ref:
+    case b.Ref:
       return An;
-    case I.Note:
+    case b.Note:
       return gn;
-    case I.Indexes:
+    case b.Indexes:
       return Ln;
     default:
       return bn;
   }
 }
 function Je(t) {
-  return !!X(t).unwrap_or(!1);
+  return !!C(t).unwrap_or(!1);
 }
-function kn(t) {
-  return Re(t);
+function Sn(t) {
+  return Pe(t);
 }
-function Re(t) {
-  return t instanceof D && t.expression instanceof j;
+function Pe(t) {
+  return t instanceof R && t.expression instanceof W;
 }
 function Ze(t, e, n) {
   var i;
@@ -2441,7 +2444,7 @@ function Ze(t, e, n) {
       if (a = (i = s.get(c)) == null ? void 0 : i.symbolTable, !a)
         throw new Error("Expect a symbol table in a schema symbol");
     } else {
-      a = new _e();
+      a = new Ae();
       const p = n.create(_t, { symbolTable: a });
       s.set(c, p);
     }
@@ -2452,9 +2455,9 @@ function Ze(t, e, n) {
 function yt(t) {
   return t === "-" || t === "<>" || t === ">" || t === "<";
 }
-function Sn(t) {
+function On(t) {
   var n;
-  if (!(t instanceof D) || !(t.expression instanceof de) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
+  if (!(t instanceof R) || !(t.expression instanceof pe) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
     return !1;
   const e = t.expression.literal.value;
   if (e.length !== 4 && e.length !== 7 || e[0] !== "#")
@@ -2467,45 +2470,45 @@ function Sn(t) {
 function oe(t) {
   return t === void 0;
 }
-function On(t) {
+function Dn(t) {
   var e;
-  return !!(Y(t) || ce(t) || pe(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && ce(t.expression) || t instanceof K);
+  return !!(j(t) || ce(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) && ce(t.expression) || t instanceof K);
 }
 function ce(t) {
   var e;
-  return t instanceof D && t.expression instanceof de && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
+  return t instanceof R && t.expression instanceof pe && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
 }
-function Dn(t) {
+function Rn(t) {
   var n;
   if (!(t instanceof Q) || !yt((n = t.op) == null ? void 0 : n.value))
     return !1;
-  const e = X(t.expression).unwrap_or(void 0);
+  const e = C(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
 function xt(t) {
   return t instanceof J && t.elementList.every(M);
 }
-function W(t) {
+function $(t) {
   var s;
   const e = {}, n = [];
   if (!t)
-    return new V({});
+    return new B({});
   for (const i of t.elementList) {
     if (!i.name)
       continue;
-    if (i.name instanceof D) {
+    if (i.name instanceof R) {
       n.push(new l(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
       continue;
     }
-    const r = (s = De(i.name).unwrap_or(void 0)) == null ? void 0 : s.toLowerCase();
+    const r = (s = Re(i.name).unwrap_or(void 0)) == null ? void 0 : s.toLowerCase();
     r && (e[r] === void 0 ? e[r] = [i] : e[r].push(i));
   }
-  return new V(e, n);
+  return new B(e, n);
 }
 class ft {
   constructor(e, n) {
     this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(_t, {
-      symbolTable: new _e()
+      symbolTable: new Ae()
     }), this.ast.symbol = this.publicSchemaSymbol, this.ast.symbol.declaration = this.ast;
   }
   validate() {
@@ -2520,8 +2523,8 @@ class ft {
       );
       e.push(...r.validate());
     });
-    const n = this.ast.body.filter((s) => Ee(s).unwrap_or(void 0) === I.Project);
-    return n.length > 1 && n.forEach((s) => e.push(new l(o.PROJECT_REDEFINED, "Only one project can exist", s))), new V(this.ast, e);
+    const n = this.ast.body.filter((s) => de(s).unwrap_or(void 0) === b.Project);
+    return n.length > 1 && n.forEach((s) => e.push(new l(o.PROJECT_REDEFINED, "Only one project can exist", s))), new B(this.ast, e);
   }
 }
 class re {
@@ -2534,9 +2537,9 @@ class re {
   bindSettingList(e, n) {
     if (e)
       for (const s of e.elementList) {
-        if (s.name instanceof D)
+        if (s.name instanceof R)
           continue;
-        const i = De(s.name).unwrap_or(void 0);
+        const i = Re(s.name).unwrap_or(void 0);
         if (!i)
           continue;
         const r = n[i.toLowerCase()];
@@ -2561,7 +2564,7 @@ class re {
       this.bindSubfield(n);
   }
   bindSubfield(e) {
-    const n = [e.callee, ...e.args], s = L.last(n);
+    const n = [e.callee, ...e.args], s = I.last(n);
     s instanceof U && (n.pop(), this.bindSettingList(s, this.subfield.settingList));
     const { argBinderRules: i } = this.subfield.arg;
     for (let r = 0; r < Math.min(n.length, i.length); r += 1)
@@ -2571,12 +2574,12 @@ class re {
   scanAndBind(e, n) {
     var s, i;
     if (e)
-      if (e instanceof D) {
-        if (e.expression instanceof j && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
+      if (e instanceof R) {
+        if (e.expression instanceof W && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
           return;
         this.bindFragments([e], n);
       } else
-        e instanceof q ? He(e) ? this.bindFragments(Ne(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof Q ? this.scanAndBind(e.expression, n) : e instanceof Oe ? this.scanAndBind(e.expression, n) : e instanceof J && e.elementList.forEach((r) => this.scanAndBind(r, n));
+        e instanceof q ? He(e) ? this.bindFragments(Ee(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof Q ? this.scanAndBind(e.expression, n) : e instanceof De ? this.scanAndBind(e.expression, n) : e instanceof J && e.elementList.forEach((r) => this.scanAndBind(r, n));
   }
   // Bind the fragments of a member access expression
   // which can be a simple expression like v1.User,
@@ -2592,14 +2595,14 @@ class re {
       return;
     const T = [];
     for (; s.length && h.length; ) {
-      const f = s.pop(), N = h.pop(), b = C(N).unwrap();
+      const f = s.pop(), N = h.pop(), g = G(N).unwrap();
       T.unshift({
-        index: Fe(b, f),
+        index: Fe(g, f),
         referrer: N
       });
     }
     for (; h.length; ) {
-      const f = h.pop(), N = C(f).unwrap();
+      const f = h.pop(), N = G(f).unwrap();
       T.unshift({
         index: Fe(N, i),
         referrer: f
@@ -2611,7 +2614,7 @@ class re {
           ...T,
           {
             index: Fe(
-              C(f).unwrap(),
+              G(f).unwrap(),
               p
             ),
             referrer: f
@@ -2653,7 +2656,7 @@ class re {
     s || this.errors.push(new l(o.BINDING_ERROR, n, e));
   }
 }
-class Rn extends re {
+class Pn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2663,7 +2666,7 @@ class Rn extends re {
     }, this.settingList = {};
   }
 }
-class Pn extends re {
+class Un extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2673,7 +2676,7 @@ class Pn extends re {
     }, this.settingList = {};
   }
 }
-class Un extends re {
+class Mn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2708,7 +2711,7 @@ class Un extends re {
     }, this.settingList = {};
   }
 }
-class Mn extends re {
+class Fn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2718,7 +2721,7 @@ class Mn extends re {
     }, this.settingList = {};
   }
 }
-class Fn extends re {
+class Bn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2728,7 +2731,7 @@ class Fn extends re {
     }, this.settingList = {};
   }
 }
-class Bn extends re {
+class Vn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2745,7 +2748,7 @@ class Bn extends re {
     }, this.settingList = {};
   }
 }
-class Vn extends re {
+class Gn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2773,7 +2776,7 @@ class Vn extends re {
     }, this.settingList = {};
   }
 }
-class Gn extends re {
+class Cn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2792,25 +2795,25 @@ class Gn extends re {
 }
 function kt(t) {
   switch (t.type.value.toLowerCase()) {
-    case I.Enum:
-      return Pn;
-    case I.Table:
-      return Vn;
-    case I.TableGroup:
+    case b.Enum:
+      return Un;
+    case b.Table:
       return Gn;
-    case I.Project:
-      return Fn;
-    case I.Ref:
+    case b.TableGroup:
+      return Cn;
+    case b.Project:
       return Bn;
-    case I.Note:
+    case b.Ref:
+      return Vn;
+    case b.Note:
+      return Fn;
+    case b.Indexes:
       return Mn;
-    case I.Indexes:
-      return Un;
     default:
-      return Rn;
+      return Pn;
   }
 }
-class Cn {
+class Xn {
   constructor(e) {
     this.ast = e, this.errors = [];
   }
@@ -2820,10 +2823,10 @@ class Cn {
         const n = kt(e);
         new n(e, this.errors).bind();
       }
-    return new V(this.ast, this.errors);
+    return new B(this.ast, this.errors);
   }
 }
-class Xn {
+class $n {
   constructor(e) {
     this.generator = e;
   }
@@ -2831,21 +2834,21 @@ class Xn {
     return new e(n, this.generator.nextId());
   }
 }
-class $n {
+class Wn {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = new Xn(n);
+    this.ast = e, this.symbolFactory = new $n(n);
   }
   // Analyzing: Invoking both the validator and binder
   analyze() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new Cn(n).resolve());
+    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new Xn(n).resolve());
   }
   // For invoking the validator only
   validate() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new V(n, []));
+    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new B(n, []));
   }
 }
 function pt(t, e) {
-  const { variables: n, tupleElements: s } = Le(t).unwrap();
+  const { variables: n, tupleElements: s } = ge(t).unwrap();
   return s ? n.length === 0 ? {
     schemaName: e.schemaName,
     tableName: e.name,
@@ -2877,7 +2880,7 @@ function St(t) {
   }
   throw new Error("Invalid relation op");
 }
-function x(t) {
+function k(t) {
   return {
     start: {
       offset: t.startPos.offset,
@@ -2889,16 +2892,11 @@ function x(t) {
 }
 function Ce(t) {
   var n;
-  const e = (n = Ne(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
+  const e = (n = Ee(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
   return e instanceof J ? e.elementList.map((s) => s.referee) : [e.referee];
 }
-function ue(t) {
-  return t.split(`
-`).map((e) => e.trim()).join(`
-`);
-}
-function me(t) {
-  const e = X(t).unwrap();
+function Ne(t) {
+  const e = C(t).unwrap();
   return {
     name: e.pop(),
     schemaName: e
@@ -2918,7 +2916,7 @@ function Dt(t, e) {
 function Rt(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, c]) => a === c);
+    return I.zip(i, r).every(([a, c]) => a === c);
   }
   const n = t.id, s = e.id;
   return n === s;
@@ -2928,10 +2926,10 @@ class Ke {
     this.declarationNode = e, this.env = n, 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 n = [], s = X(this.declarationNode.name).unwrap_or([]);
+    const n = [], s = C(this.declarationNode.name).unwrap_or([]);
     return this.ref.name = s.pop() || null, s.length > 1 && n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name)), this.ref.schemaName = s.join(".") || null, n;
   }
   interpretBody(e) {
@@ -2949,20 +2947,20 @@ class Ke {
         new l(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[c])
       ];
     if (e.args[0]) {
-      const b = W(e.args[0]).getValue();
-      this.ref.onDelete = $((T = (h = b.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value).unwrap_or(void 0), this.ref.onDelete = $((N = (f = b.delete) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
+      const g = $(e.args[0]).getValue();
+      this.ref.onDelete = X((T = (h = g.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value).unwrap_or(void 0), this.ref.onDelete = X((N = (f = g.delete) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
     }
     const p = St(n);
     return this.ref.endpoints = [
       {
         ...pt(s, this.container),
         relation: p[0],
-        token: x(s)
+        token: k(s)
       },
       {
         ...pt(i, this.container),
         relation: p[1],
-        token: x(i)
+        token: k(i)
       }
     ], this.env.refIds[c] = this.declarationNode, [];
   }
@@ -2972,7 +2970,7 @@ class Pt {
     this.declarationNode = e, this.env = n, this.table = { name: void 0, schemaName: void 0, alias: null, fields: [], token: void 0, indexes: [] }, this.pkColumns = [];
   }
   interpret() {
-    this.table.token = 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),
@@ -2991,13 +2989,13 @@ class Pt {
     }), this.pkColumns.forEach((n) => n.pk = !1)), e;
   }
   interpretName(e) {
-    const { name: n, schemaName: s } = me(e);
+    const { name: n, schemaName: s } = Ne(e);
     return s.length > 1 ? (this.table.name = n, this.table.schemaName = s.join("."), [new l(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.table.name = n, this.table.schemaName = s.length ? s[0] : null, []);
   }
   interpretAlias(e) {
     if (!e)
       return [];
-    const n = C(e).unwrap_or(null);
+    const n = G(e).unwrap_or(null);
     return n && (this.env.aliases.push({
       name: n,
       kind: "table",
@@ -3009,16 +3007,16 @@ class Pt {
   }
   interpretSettingList(e) {
     var r, a, c;
-    const n = W(e).getValue();
+    const n = $(e).getValue();
     this.table.headerColor = (r = n.headercolor) != null && r.length ? Ot((c = (a = n.headercolor) == null ? void 0 : a.at(0)) == null ? void 0 : c.value) : void 0;
     const [s] = n.note || [], i = z(s == null ? void 0 : s.value).unwrap_or(void 0);
     return this.table.note = s && {
-      value: ue(i),
-      token: x(s)
+      value: i,
+      token: k(s)
     }, [];
   }
   interpretBody(e) {
-    const [n, s] = L.partition(e.body, (i) => i instanceof v);
+    const [n, s] = I.partition(e.body, (i) => i instanceof v);
     return [...this.interpretFields(n), ...this.interpretSubElements(s)];
   }
   interpretSubElements(e) {
@@ -3027,8 +3025,8 @@ class Pt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: ue(z(n.body instanceof ee ? n.body.body[0].callee : n.body.callee).unwrap()),
-            token: x(n)
+            value: z(n.body instanceof ee ? n.body.body[0].callee : n.body.callee).unwrap(),
+            token: k(n)
           }, [];
         case "indexes":
           return this.interpretIndexes(n);
@@ -3042,26 +3040,26 @@ class Pt {
     return e.flatMap((n) => this.interpretColumn(n));
   }
   interpretColumn(e) {
-    var a, c, p, h, T, f, N;
+    var a, c, p, h, T, f, N, g;
     const n = [], s = {};
-    s.name = C(e.callee).unwrap();
-    const i = Wn(e.args[0]);
-    s.type = i.getValue(), n.push(...i.getErrors()), s.token = x(e), s.inline_refs = [];
+    s.name = G(e.callee).unwrap();
+    const i = jn(e.args[0]);
+    s.type = i.getValue(), n.push(...i.getErrors()), s.token = k(e), s.inline_refs = [];
     const r = e.args.slice(1);
-    if (L.last(r) instanceof U) {
-      const b = W(r.pop()).getValue();
-      s.pk = !!((a = b.pk) != null && a.length), s.increment = !!((c = b.increment) != null && c.length), s.unique = !!((p = b.unique) != null && p.length), s.not_null = !!((h = b["not null"]) != null && h.length) && !0, s.dbdefault = jn((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);
-      s.note = F && {
-        value: ue(z(F.value).unwrap()),
-        token: x(F)
+    if (I.last(r) instanceof U) {
+      const w = $(r.pop()).getValue();
+      s.pk = !!((a = w.pk) != null && a.length) || !!((c = w["primary key"]) != null && c.length), s.increment = !!((p = w.increment) != null && p.length), s.unique = !!((h = w.unique) != null && h.length), s.not_null = !!((T = w["not null"]) != null && T.length) && !0, s.dbdefault = Yn((N = (f = w.default) == null ? void 0 : f.at(0)) == null ? void 0 : N.value);
+      const me = (g = w.note) == null ? void 0 : g.at(0);
+      s.note = me && {
+        value: z(me.value).unwrap(),
+        token: k(me)
       };
-      const Me = b.ref || [];
-      s.inline_refs = Me.flatMap((R) => {
-        const [nt] = Ce(R.value.expression);
+      const Te = w.ref || [];
+      s.inline_refs = Te.flatMap((Y) => {
+        const [nt] = Ce(Y.value.expression);
         if (Rt(nt, e.symbol))
-          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", R)), [];
-        const Ae = R.value.op, Z = X(R.value.expression).unwrap();
+          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", Y)), [];
+        const ve = Y.value.op, Z = C(Y.value.expression).unwrap();
         let le;
         if (Z.length === 1) {
           const [ae] = Z;
@@ -3069,75 +3067,75 @@ class Pt {
             schemaName: this.table.schemaName,
             tableName: this.table.name,
             fieldNames: [ae],
-            relation: Ae.value,
-            token: x(R)
+            relation: ve.value,
+            token: k(Y)
           };
         } else if (Z.length === 2) {
-          const [ae, Te] = Z;
+          const [ae, be] = Z;
           le = {
             schemaName: null,
             tableName: ae,
-            fieldNames: [Te],
-            relation: Ae.value,
-            token: x(R)
+            fieldNames: [be],
+            relation: ve.value,
+            token: k(Y)
           };
         } else if (Z.length === 3) {
-          const [ae, Te, it] = Z;
+          const [ae, be, it] = Z;
           le = {
             schemaName: ae,
-            tableName: Te,
+            tableName: be,
             fieldNames: [it],
-            relation: Ae.value,
-            token: x(R)
+            relation: ve.value,
+            token: k(Y)
           };
         } else {
-          n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", R));
-          const ae = Z.pop(), Te = Z.pop();
+          n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", Y));
+          const ae = Z.pop(), be = Z.pop();
           le = {
             schemaName: Z.join("."),
-            tableName: Te,
+            tableName: be,
             fieldNames: [ae],
-            relation: Ae.value,
-            token: x(R)
+            relation: ve.value,
+            token: k(Y)
           };
         }
-        const st = this.registerInlineRefToEnv(e, nt, le, R);
+        const st = this.registerInlineRefToEnv(e, nt, le, Y);
         return n.push(...st), st.length === 0 ? le : [];
       });
     }
-    return s.pk || (s.pk = r.some((b) => $(b).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((b) => $(b).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
+    return s.pk || (s.pk = r.some((w) => X(w).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((w) => X(w).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
   }
   interpretIndexes(e) {
     return this.table.indexes.push(...e.body.body.map((n) => {
       var a, c, p, h, T, f, N;
       const s = { columns: [] }, i = n;
-      s.token = x(e);
+      s.token = k(e);
       const r = [i.callee, ...i.args];
-      if (L.last(r) instanceof U) {
-        const b = W(r.pop()).getValue();
-        s.pk = !!((a = b.pk) != null && a.length), s.unique = !!((c = b.unique) != null && c.length), s.name = z((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);
-        s.note = F && {
-          value: ue(z(F.value).unwrap()),
-          token: x(F)
-        }, s.type = $((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 = $(r.pop()).getValue();
+        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((c = g.unique) != null && c.length), s.name = z((h = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
+        const w = (T = g.note) == null ? void 0 : T.at(0);
+        s.note = w && {
+          value: z(w.value).unwrap(),
+          token: k(w)
+        }, s.type = X((N = (f = g.type) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
       }
-      return r.flatMap((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 w = [];
+        for (; g instanceof H; )
+          w.push(g.argumentList), g = g.callee;
+        return w.push(g), w;
+      }).forEach((g) => {
+        const { functional: w, nonFunctional: me } = Ge(g).unwrap();
         s.columns.push(
-          ...F.map((R) => ({
-            value: R.value.value,
+          ...w.map((Te) => ({
+            value: Te.value.value,
             type: "expression"
           })),
-          ...Me.map((R) => ({
-            value: C(R).unwrap(),
+          ...me.map((Te) => ({
+            value: G(Te).unwrap(),
             type: "column"
           }))
         );
@@ -3160,8 +3158,8 @@ class Pt {
         {
           schemaName: this.table.schemaName,
           tableName: this.table.name,
-          fieldNames: [$(e.callee).unwrap()],
-          token: x(e),
+          fieldNames: [X(e.callee).unwrap()],
+          token: k(e),
           relation: a[0]
         },
         {
@@ -3172,30 +3170,30 @@ class Pt {
     }), [];
   }
 }
-function Wn(t) {
+function jn(t) {
   let e = null;
-  t instanceof H && (e = t.argumentList.elementList.map((r) => ce(r) ? r.expression.literal.value : Y(r) ? z(r).unwrap() : $(r).unwrap()).join(","), t = t.callee);
+  t instanceof H && (e = t.argumentList.elementList.map((r) => ce(r) ? r.expression.literal.value : j(r) ? z(r).unwrap() : X(r).unwrap()).join(","), t = t.callee);
   let n = "";
-  for (; t instanceof fe; )
+  for (; t instanceof he; )
     n = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${n}`, t = t.array;
-  const { name: s, schemaName: i } = me(t);
-  return i.length > 1 && new V(
+  const { name: s, schemaName: i } = Ne(t);
+  return i.length > 1 && new B(
     {
       schemaName: i.length === 0 ? null : i[0],
       type_name: `${s}${n}${e ? `(${e})` : ""}`,
       args: e
     },
     [new l(o.UNSUPPORTED, "Nested schema is not supported", t)]
-  ), new V({
+  ), new B({
     schemaName: i.length === 0 ? null : i[0],
     type_name: `${s}${n}${e ? `(${e})` : ""}`,
     args: e
   });
 }
-function jn(t) {
+function Yn(t) {
   var e, n, s;
   if (t) {
-    if (Y(t))
+    if (j(t))
       return {
         value: z(t).unwrap(),
         type: "string"
@@ -3205,7 +3203,7 @@ function jn(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"
@@ -3225,34 +3223,34 @@ function jn(t) {
     throw new Error("Unreachable");
   }
 }
-class Yn {
+class zn {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.note = { name: void 0, content: void 0, token: void 0 };
   }
   interpret() {
-    return this.note.token = x(this.declarationNode), this.env.notes.set(this.declarationNode, this.note), [
+    return this.note.token = k(this.declarationNode), this.env.notes.set(this.declarationNode, this.note), [
       ...this.interpretName(this.declarationNode.name),
       ...this.interpretSettingList(this.declarationNode.attributeList),
       ...this.interpretBody(this.declarationNode.body)
     ];
   }
   interpretName(e) {
-    const { name: n } = me(e);
+    const { name: n } = Ne(e);
     return this.note.name = n, [];
   }
   interpretSettingList(e) {
     var s, i, r;
-    const n = W(e).getValue();
+    const n = $(e).getValue();
     return this.note.headerColor = (s = n.headercolor) != null && s.length ? Ot((r = (i = n.headercolor) == null ? void 0 : i.at(0)) == null ? void 0 : r.value) : void 0, [];
   }
   interpretBody(e) {
-    const [n, s] = L.partition(e.body, (i) => i instanceof v);
+    const [n, s] = I.partition(e.body, (i) => i instanceof v);
     return n.length !== 1 || s.length > 0 ? [
       new l(o.INVALID_NOTE, "Invalid note syntax", e)
     ] : [...this.interpretNote(n[0])];
   }
   interpretNote(e) {
-    const n = L.get(e, "callee.expression.literal.value", "");
+    const n = I.get(e, "callee.expression.literal.value", "");
     return this.note.content = n, [];
   }
 }
@@ -3262,10 +3260,10 @@ class Ut {
   }
   interpret() {
     const e = [];
-    this.tableGroup.token = x(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup);
-    const { name: n, schemaName: s } = me(this.declarationNode.name);
+    this.tableGroup.token = k(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup);
+    const { name: n, schemaName: s } = Ne(this.declarationNode.name);
     return s.length >= 2 && (this.tableGroup.name = n, this.tableGroup.schemaName = s.join("."), e.push(new l(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = n, this.tableGroup.schemaName = s[0] || null, this.tableGroup.tables = this.declarationNode.body.body.map((i) => {
-      const r = X(i.callee).unwrap();
+      const r = C(i.callee).unwrap();
       return r.length > 2 && e.push(new l(o.UNSUPPORTED, "Nested schema is not supported", i)), {
         name: r.pop(),
         schemaName: r.join(".")
@@ -3278,26 +3276,26 @@ class Mt {
     this.declarationNode = e, this.env = n, 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: n, schemaName: s } = me(e);
+    const { name: n, schemaName: s } = Ne(e);
     return s.length > 1 ? (this.enum.name = n, this.enum.schemaName = s.join("."), [new l(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.enum.name = n, this.enum.schemaName = s.length ? s[0] : null, []);
   }
   interpretBody(e) {
     return e.body.flatMap((n) => {
       var c;
       const s = n, i = {};
-      i.token = x(s), i.name = $(s.callee).unwrap();
-      const a = (c = W(s.args[0]).getValue().note) == null ? void 0 : c.at(0);
+      i.token = k(s), i.name = X(s.callee).unwrap();
+      const a = (c = $(s.args[0]).getValue().note) == null ? void 0 : c.at(0);
       return i.note = a && {
-        value: ue(z(a.value).unwrap()),
-        token: x(a)
+        value: z(a.value).unwrap(),
+        token: k(a)
       }, this.enum.values.push(i), [];
     });
   }
 }
-class zn {
+class Qn {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.project = { enums: [], refs: [], tableGroups: [], tables: [] };
   }
@@ -3307,7 +3305,7 @@ class zn {
   interpretName(e) {
     if (!e)
       return this.project.name = null, [];
-    const { name: n } = me(e);
+    const { name: n } = Ne(e);
     return this.project.name = n, [];
   }
   interpretBody(e) {
@@ -3333,8 +3331,8 @@ class zn {
         }
         case "note":
           return this.project.note = {
-            value: ue(z(s.body instanceof ee ? s.body.body[0].callee : s.body.callee).unwrap()),
-            token: x(s)
+            value: z(s.body instanceof ee ? s.body.body[0].callee : s.body.callee).unwrap(),
+            token: k(s)
           }, [];
         default:
           return this.project[s.type.value.toLowerCase()] = z(s.body.callee).unwrap(), [];
@@ -3342,7 +3340,7 @@ class zn {
     });
   }
 }
-class Qn {
+class qn {
   constructor(e) {
     this.ast = e, this.env = {
       schema: [],
@@ -3358,27 +3356,27 @@ class Qn {
   }
   interpret() {
     const e = this.ast.body.flatMap((n) => {
-      switch (Ee(n).unwrap_or(void 0)) {
-        case I.Table:
+      switch (de(n).unwrap_or(void 0)) {
+        case b.Table:
           return new Pt(n, this.env).interpret();
-        case I.Note:
-          return new Yn(n, this.env).interpret();
-        case I.Ref:
+        case b.Note:
+          return new zn(n, this.env).interpret();
+        case b.Ref:
           return new Ke(n, this.env).interpret();
-        case I.TableGroup:
+        case b.TableGroup:
           return new Ut(n, this.env).interpret();
-        case I.Enum:
+        case b.Enum:
           return new Mt(n, this.env).interpret();
-        case I.Project:
-          return new zn(n, this.env).interpret();
+        case b.Project:
+          return new Qn(n, this.env).interpret();
         default:
           return [];
       }
     });
-    return new V(qn(this.env), e);
+    return new B(Hn(this.env), e);
   }
 }
-function qn(t) {
+function Hn(t) {
   return {
     schemas: [],
     tables: Array.from(t.tables.values()),
@@ -3390,28 +3388,28 @@ function qn(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 ge(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 || {}), y = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(y || {});
+function _e(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 n of t.trailingTrivia) {
@@ -3422,12 +3420,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) => ({
@@ -3436,7 +3434,7 @@ function Se(t) {
     }))
   };
 }
-function Pe(t) {
+function Ue(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
@@ -3459,14 +3457,14 @@ class Ft {
       ...(r == null ? void 0 : r.trailingTrivia) || [],
       ...(r == null ? void 0 : r.leadingTrivia) || [],
       ...(c == null ? void 0 : c.leadingTrivia) || []
-    ].find((N) => Wt(N) && Ie(s, N)))
-      return S();
+    ].find((N) => Wt(N) && Le(s, N)))
+      return O();
     if (a === void 0)
       return Tt();
-    if ([u.STRING_LITERAL, u.QUOTED_STRING].includes(r.kind) && Ie(s, r))
-      return S();
+    if ([u.STRING_LITERAL, u.QUOTED_STRING].includes(r.kind) && Le(s, r))
+      return O();
     const p = this.compiler.container.element(s);
-    if (this.compiler.container.scopeKind(s) === O.TOPLEVEL || p instanceof _ && p.type && p.type.start <= s && p.type.end >= s)
+    if (this.compiler.container.scopeKind(s) === D.TOPLEVEL || p instanceof _ && p.type && p.type.start <= s && p.type.end >= s)
       return Tt();
     const h = [...this.compiler.container.stack(s)].reverse();
     for (const N of h)
@@ -3506,31 +3504,31 @@ class Ft {
         if (N instanceof U)
           return Et(this.compiler, s, N);
         if (N instanceof J)
-          return Hn(this.compiler, s);
+          return Jn(this.compiler, s);
         if (N instanceof v)
           return mt(this.compiler, s, N);
-        if (N instanceof _ && (N.bodyColon && s >= N.bodyColon.end || N.body && Ie(s, N.body)))
+        if (N instanceof _ && (N.bodyColon && s >= N.bodyColon.end || N.body && Le(s, N.body)))
           return mt(this.compiler, s, void 0);
       }
-    return S();
+    return O();
   }
 }
 function dt(t, e, n) {
   const s = t.container.scopeKind(e);
-  if ([O.REF, O.TABLE].includes(s)) {
-    const i = Ue(t, e, t.container.element(e), [
+  if ([D.REF, D.TABLE].includes(s)) {
+    const i = Me(t, e, t.container.element(e), [
       m.Table,
       m.Schema,
       m.Column
     ]);
-    return ke(n.op, e) ? Se(i) : i;
+    return Se(n.op, e) ? Oe(i) : i;
   }
-  return S();
+  return O();
 }
-function Ue(t, e, n, s) {
+function Me(t, e, n, s) {
   var a;
   if (n === void 0)
-    return S();
+    return O();
   let i = n;
   const r = { suggestions: [] };
   for (; i; ) {
@@ -3540,23 +3538,23 @@ function Ue(t, e, n, s) {
         ...t.symbol.members(c).filter(({ kind: p }) => s.includes(p)).map(({ name: p, kind: h }) => ({
           label: p,
           insertText: p,
-          insertTextRules: w.KeepWhitespace,
-          kind: ge(h),
-          sortText: ge(h).toString().padStart(2, "0"),
+          insertTextRules: y.KeepWhitespace,
+          kind: _e(h),
+          sortText: _e(h).toString().padStart(2, "0"),
           range: void 0
         }))
       );
     }
     i = i instanceof _ ? i.parent : void 0;
   }
-  return Pe(r);
+  return Ue(r);
 }
-function Hn(t, e) {
+function Jn(t, e) {
   var s;
   switch (t.container.scopeKind(e)) {
-    case O.INDEXES:
+    case D.INDEXES:
       return Gt(t, e);
-    case O.REF:
+    case D.REF:
       {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
@@ -3571,126 +3569,126 @@ function Hn(t, e) {
       }
       return Vt(t, e);
   }
-  return S();
+  return O();
 }
 function Et(t, e, n) {
   const { token: s } = t.container.token(e);
   if ([u.COMMA, u.LBRACKET].includes(s == null ? void 0 : s.kind)) {
     const i = Nt(t, e);
-    return (s == null ? void 0 : s.kind) === u.COMMA && ke(s, e) ? Se(i) : i;
+    return (s == null ? void 0 : s.kind) === u.COMMA && Se(s, e) ? Oe(i) : i;
   }
   if (n.name && n.name.start <= e && n.name.end >= e)
     return Nt(t, e);
   if (n.name) {
-    const i = Jn(
+    const i = Zn(
       t,
       e,
-      De(n.name).unwrap()
+      Re(n.name).unwrap()
     );
-    return (s == null ? void 0 : s.kind) === u.COLON && ke(s, e) ? Se(i) : i;
+    return (s == null ? void 0 : s.kind) === u.COLON && Se(s, e) ? Oe(i) : i;
   }
-  return S();
+  return O();
 }
 function Nt(t, e) {
   const n = t.container.element(e), s = t.container.scopeKind(e);
-  if (n instanceof B)
-    return S();
-  if (n.body && !Ie(e, n.body))
+  if (n instanceof F)
+    return O();
+  if (n.body && !Le(e, n.body))
     switch (s) {
-      case O.TABLE:
+      case D.TABLE:
         return {
           suggestions: [
             {
               label: "headercolor",
               insertText: "headercolor: ",
-              kind: g.Field,
-              insertTextRules: w.KeepWhitespace,
+              kind: L.Field,
+              insertTextRules: y.KeepWhitespace,
               range: void 0
             },
             {
               label: "note",
               insertText: "note: ",
-              kind: g.Field,
-              insertTextRules: w.KeepWhitespace,
+              kind: L.Field,
+              insertTextRules: y.KeepWhitespace,
               range: void 0
             }
           ]
         };
       default:
-        return S();
+        return O();
     }
   switch (s) {
-    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,
-            insertTextRules: w.KeepWhitespace,
+            kind: L.Property,
+            insertTextRules: y.KeepWhitespace,
             range: void 0
           })),
           ...["ref", "default"].map((i) => ({
             label: i,
             insertText: `${i}: `,
-            kind: g.Property,
-            insertTextRules: w.KeepWhitespace,
+            kind: L.Property,
+            insertTextRules: y.KeepWhitespace,
             range: void 0
           })),
           {
             label: "note",
             insertText: "note: ",
-            kind: g.Property,
-            insertTextRules: w.KeepWhitespace,
+            kind: L.Property,
+            insertTextRules: y.KeepWhitespace,
             range: void 0
           }
         ]
       };
-    case O.ENUM:
+    case D.ENUM:
       return {
         suggestions: [
           {
             label: "note",
             insertText: "note: ",
-            kind: g.Property,
-            insertTextRules: w.KeepWhitespace,
+            kind: L.Property,
+            insertTextRules: y.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,
+            insertTextRules: y.KeepWhitespace,
+            kind: L.Property,
             range: void 0
           })),
           ...["note", "name", "type"].map((i) => ({
             label: i,
             insertText: `${i}: `,
-            kind: g.Property,
-            insertTextRules: w.KeepWhitespace,
+            kind: L.Property,
+            insertTextRules: y.KeepWhitespace,
             range: void 0
           }))
         ]
       };
-    case O.REF:
+    case D.REF:
       return {
         suggestions: ["update", "delete"].map((i) => ({
           label: i,
           insertText: `${i}: `,
-          kind: g.Property,
-          insertTextRules: w.KeepWhitespace,
+          kind: L.Property,
+          insertTextRules: y.KeepWhitespace,
           range: void 0
         }))
       };
   }
-  return S();
+  return O();
 }
-function Jn(t, e, n) {
+function Zn(t, e, n) {
   switch (n == null ? void 0 : n.toLowerCase()) {
     case "update":
     case "delete":
@@ -3698,8 +3696,8 @@ function Jn(t, e, n) {
         suggestions: ["cascade", "set default", "set null", "restrict"].map((s) => ({
           label: s,
           insertText: s,
-          kind: g.Value,
-          insertTextRules: w.KeepWhitespace,
+          kind: L.Value,
+          insertTextRules: y.KeepWhitespace,
           range: void 0
         }))
       };
@@ -3708,24 +3706,24 @@ function Jn(t, e, n) {
         suggestions: ["btree", "hash"].map((s) => ({
           label: s,
           insertText: `${s}`,
-          kind: g.Value,
-          insertTextRules: w.KeepWhitespace,
+          kind: L.Value,
+          insertTextRules: y.KeepWhitespace,
           range: void 0
         }))
       };
   }
-  return S();
+  return O();
 }
 function Bt(t, e, n) {
-  const s = Ne(n).unwrap_or([]);
+  const s = Ee(n).unwrap_or([]);
   if (s.pop(), s.some((r) => !M(r)))
-    return S();
-  const i = s.map((r) => $(r).unwrap());
-  return Pe({
+    return O();
+  const i = s.map((r) => X(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: ge(r),
+      kind: _e(r),
       range: void 0
     }))
   });
@@ -3733,22 +3731,22 @@ function Bt(t, e, n) {
 function mt(t, e, n) {
   var i;
   switch (t.container.scopeKind(e)) {
-    case O.TABLE:
-      return Kn(t, e, n);
-    case O.PROJECT:
+    case D.TABLE:
       return es(t, e, n);
-    case O.INDEXES:
-      return ns(t, e);
-    case O.ENUM:
-      return Zn(t, e, n);
-    case O.REF: {
+    case D.PROJECT:
+      return ts(t, e, n);
+    case D.INDEXES:
+      return ss(t, e);
+    case D.ENUM:
+      return Kn(t, e, n);
+    case D.REF: {
       const r = Vt(t, e);
-      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && ke(t.container.token(e).token, e) ? Se(r) : r;
+      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && Se(t.container.token(e).token, e) ? Oe(r) : r;
     }
-    case O.TABLEGROUP:
-      return ts(t);
+    case D.TABLEGROUP:
+      return ns(t);
     default:
-      return S();
+      return O();
   }
 }
 function Tt() {
@@ -3756,27 +3754,27 @@ function Tt() {
     suggestions: ["Table", "TableGroup", "Enum", "Project", "Ref"].map((t) => ({
       label: t,
       insertText: t,
-      insertTextRules: w.KeepWhitespace,
-      kind: g.Keyword,
+      insertTextRules: y.KeepWhitespace,
+      kind: L.Keyword,
       range: void 0
     }))
   };
 }
-function Zn(t, e, n) {
-  return n != null && n.callee && tt(e, n) === 1 ? Ue(t, e, t.container.element(e), [
+function Kn(t, e, n) {
+  return n != null && n.callee && tt(e, n) === 1 ? Me(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
-  ]) : S();
+  ]) : O();
 }
-function Kn(t, e, n) {
+function es(t, e, n) {
   if (!(n != null && n.callee))
     return {
       suggestions: ["Ref", "Note", "indexes"].map((i) => ({
         label: i,
         insertText: i,
-        insertTextRules: w.KeepWhitespace,
-        kind: g.Keyword,
+        insertTextRules: y.KeepWhitespace,
+        kind: L.Keyword,
         range: void 0
       }))
     };
@@ -3785,40 +3783,40 @@ function Kn(t, e, n) {
     suggestions: ["Ref", "Note", "indexes"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: w.KeepWhitespace,
-      kind: g.Keyword,
+      insertTextRules: y.KeepWhitespace,
+      kind: L.Keyword,
       range: void 0
     }))
-  } : s === 1 ? ss(t, e) : S();
+  } : s === 1 ? is(t, e) : O();
 }
-function es(t, e, n) {
+function ts(t, e, n) {
   return n != null && n.callee ? tt(e, n) === 0 ? {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: w.KeepWhitespace,
-      kind: g.Keyword,
+      insertTextRules: y.KeepWhitespace,
+      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,
+      insertTextRules: y.KeepWhitespace,
+      kind: L.Keyword,
       range: void 0
     }))
   };
 }
 function Vt(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 ts(t) {
-  return Pe({
+function ns(t) {
+  return Ue({
     suggestions: [...t.parse.publicSymbolTable().entries()].flatMap(([e]) => {
       const n = se(e).unwrap_or(void 0);
       if (n === void 0)
@@ -3827,17 +3825,17 @@ function ts(t) {
       return s !== m.Table && s !== m.Schema ? [] : {
         label: i,
         insertText: i,
-        insertTextRules: w.KeepWhitespace,
-        kind: ge(s),
+        insertTextRules: y.KeepWhitespace,
+        kind: _e(s),
         range: void 0
       };
     })
   });
 }
-function ns(t, e) {
+function ss(t, e) {
   return Gt(t, e);
 }
-function ss(t, e) {
+function is(t, e) {
   return {
     suggestions: [
       ...[
@@ -3900,12 +3898,12 @@ function ss(t, e) {
       ].map((n) => ({
         label: n,
         insertText: n,
-        insertTextRules: w.KeepWhitespace,
-        kind: g.TypeParameter,
-        sortText: g.TypeParameter.toString().padStart(2, "0"),
+        insertTextRules: y.KeepWhitespace,
+        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
@@ -3915,9 +3913,9 @@ function ss(t, e) {
 function Gt(t, e) {
   const s = t.container.element(e).parent;
   if (!((s == null ? void 0 : s.symbol) instanceof At))
-    return S();
+    return O();
   const { symbolTable: i } = s.symbol;
-  return Pe({
+  return Ue({
     suggestions: [...i.entries()].flatMap(([r]) => {
       const a = se(r).unwrap_or(void 0);
       if (a === void 0)
@@ -3926,8 +3924,8 @@ function Gt(t, e) {
       return {
         label: c,
         insertText: c,
-        insertTextRules: w.KeepWhitespace,
-        kind: ge(m.Column),
+        insertTextRules: y.KeepWhitespace,
+        kind: _e(m.Column),
         range: void 0
       };
     })
@@ -3948,7 +3946,7 @@ class Ct {
     const { uri: s } = e, i = et(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const c = r.pop();
-      if ((a = c == null ? void 0 : c.referee) != null && a.declaration && [he.PRIMARY_EXPRESSION, he.VARIABLE].includes(c == null ? void 0 : c.kind)) {
+      if ((a = c == null ? void 0 : c.referee) != null && a.declaration && [ue.PRIMARY_EXPRESSION, ue.VARIABLE].includes(c == null ? void 0 : c.kind)) {
         const { startPos: p, endPos: h } = c.referee.declaration;
         return [
           {
@@ -3975,9 +3973,9 @@ class Xt {
     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: c } = a;
         if (c != null && c.references.length)
@@ -3995,16 +3993,16 @@ class Xt {
     return [];
   }
 }
-const as = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const os = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  CompletionItemInsertTextRule: w,
-  CompletionItemKind: g,
+  CompletionItemInsertTextRule: y,
+  CompletionItemKind: L,
   DBMLCompletionItemProvider: Ft,
   DBMLDefinitionProvider: Ct,
   DBMLReferencesProvider: Xt
 }, 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 os {
+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 cs {
   constructor() {
     this.source = "", this.cache = new Array(
       16
@@ -4024,8 +4022,8 @@ class os {
       _: this.createQuery(
         0,
         () => {
-          const e = new on(this.source).lex().chain((n) => new un(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new $n(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
-          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new Qn(n).interpret().map((r) => ({ ast: n, tokens: s, rawDb: r })));
+          const e = new on(this.source).lex().chain((n) => new un(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new Wn(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
+          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new qn(n).interpret().map((r) => ({ ast: n, tokens: s, rawDb: r })));
         }
       ),
       ast: this.createQuery(
@@ -4062,8 +4060,8 @@ class os {
           let a = this.parse.ast();
           const c = [a];
           for (; ; ) {
-            const h = an(a).find((T) => Ie(r, T));
-            if (h === void 0 || h instanceof G)
+            const h = an(a).find((T) => Le(r, T));
+            if (h === void 0 || h instanceof V)
               break;
             c.push(h), a = h;
           }
@@ -4071,7 +4069,7 @@ class os {
             return c;
           for (; c.length > 0; ) {
             let p = !1;
-            const h = L.last(c);
+            const h = I.last(c);
             if (h instanceof v) {
               const T = this.parse.source();
               for (let f = h.end; f < e; f += 1)
@@ -4080,7 +4078,7 @@ class os {
             } else
               h instanceof Q || h instanceof q ? this.container.token(e).token !== h.op && (c.pop(), p = !0) : h instanceof U ? h.listCloseBracket && h.end <= e && (c.pop(), p = !0) : h instanceof J ? h.tupleCloseParen && h.end <= e && (c.pop(), p = !0) : h instanceof ee ? h.blockCloseBrace && h.end <= e && (c.pop(), p = !0) : h instanceof te || h.end < e && (c.pop(), p = !0);
             if (p) {
-              const T = L.last(c);
+              const T = I.last(c);
               T instanceof _ && T.end <= e && c.pop();
             }
             if (!p)
@@ -4118,7 +4116,7 @@ class os {
       ),
       scopeKind: this.createQuery(15, (e) => {
         var s;
-        if (this.container.element(e) instanceof B)
+        if (this.container.element(e) instanceof F)
           return 8;
         switch ((s = this.container.element(e).type) == null ? void 0 : s.value.toLowerCase()) {
           case "table":
@@ -4162,8 +4160,8 @@ class os {
             for (const h of e)
               p = c.flatMap(
                 (T) => Qt(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 };
                 })
               ), c = p.flatMap(
                 (T) => T.symbol.symbolTable ? T.symbol.symbolTable : []
@@ -4211,7 +4209,7 @@ class os {
   }
 }
 export {
-  os as Compiler,
-  rs as serialize,
-  as as services
+  cs as Compiler,
+  as as serialize,
+  os as services
 };