@dbml/parse 3.1.7 → 3.1.8

package/dist/dbml-parse.mjs

@@ -94,13 +94,13 @@ class y {
     }, this.fullEnd = NaN), this.start = this.startPos.offset, this.end = this.endPos.offset;
   }
 }
-var pe = /* @__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))(pe || {});
-class C extends y {
+var de = /* @__PURE__ */ ((t) => (t.PROGRAM = "<program>", t.ELEMENT_DECLARATION = "<element-declaration>", t.ATTRIBUTE = "<attribute>", t.IDENTIFIER_STREAM = "<identifer-stream>", t.LITERAL = "<literal>", t.VARIABLE = "<variable>", t.PREFIX_EXPRESSION = "<prefix-expression>", t.INFIX_EXPRESSION = "<infix-expression>", t.POSTFIX_EXPRESSION = "<postfix-expression>", t.FUNCTION_EXPRESSION = "<function-expression>", t.FUNCTION_APPLICATION = "<function-application>", t.BLOCK_EXPRESSION = "<block-expression>", t.LIST_EXPRESSION = "<list-expression>", t.TUPLE_EXPRESSION = "<tuple-expression>", t.CALL_EXPRESSION = "<call-expression>", t.PRIMARY_EXPRESSION = "<primary-expression>", t.GROUP_EXPRESSION = "<group-expression>", t.DUMMY = "<dummy>", t.ARRAY = "<array>", t))(de || {});
+class X extends y {
   constructor({ body: e = [], eof: n }, s) {
     super(s, "<program>", [...e, n]), this.body = e, this.eof = n;
   }
 }
-class _ extends y {
+class A extends y {
   constructor({
     type: e,
     name: n,
@@ -118,17 +118,17 @@ class _ extends y {
       r,
       a,
       l
-    ]), l && a && !(l instanceof k || l instanceof _))
+    ]), l && a && !(l instanceof k || l instanceof A))
       throw new Error("If an element has a simple body, it must be a function application node");
     this.type = e, this.name = n, this.as = s, this.alias = i, this.attributeList = r, this.bodyColon = a, this.body = l;
   }
 }
-class K extends y {
+class C extends y {
   constructor({ identifiers: e = [] }, n) {
     super(n, "<identifer-stream>", e || []), this.identifiers = e;
   }
 }
-class ne extends y {
+class se extends y {
   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 y {
   constructor({ op: e, expression: n }, s) {
     super(s, "<prefix-expression>", [e, n]), this.op = e, this.expression = n;
   }
 }
-class q extends y {
+class H extends y {
   constructor({
     op: e,
     leftExpression: n,
@@ -151,12 +151,12 @@ class q extends y {
     super(i, "<infix-expression>", [n, e, s]), this.op = e, this.leftExpression = n, this.rightExpression = s;
   }
 }
-class Re extends y {
+class De extends y {
   constructor({ op: e, expression: n }, s) {
     super(s, "<postfix-expression>", [n, e]), this.op = e, this.expression = n;
   }
 }
-class ee extends y {
+class te extends y {
   constructor({ value: e }, n) {
     super(n, "<function-expression>", [e]), this.value = e;
   }
@@ -166,7 +166,7 @@ class k extends y {
     super(s, "<function-application>", [e, ...n]), this.callee = e, this.args = n;
   }
 }
-class te extends y {
+class ne extends y {
   constructor({
     blockOpenBrace: e,
     body: n = [],
@@ -189,7 +189,7 @@ class P extends y {
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
 }
-class J extends y {
+class Z extends y {
   constructor({
     tupleOpenParen: e,
     elementList: n = [],
@@ -203,7 +203,7 @@ class J extends y {
     ]), this.tupleOpenParen = e, this.elementList = n, this.commaList = s, this.tupleCloseParen = i;
   }
 }
-class Xe extends J {
+class Xe extends Z {
   constructor({
     groupOpenParen: e,
     expression: n,
@@ -220,7 +220,7 @@ class Xe extends J {
     ), this.kind = "<group-expression>";
   }
 }
-class H extends y {
+class J extends y {
   constructor({
     callee: e,
     argumentList: n
@@ -228,12 +228,12 @@ class H extends y {
     super(s, "<call-expression>", [e, n]), this.callee = e, this.argumentList = n;
   }
 }
-class Ee extends y {
+class me extends y {
   constructor({ literal: e }, n) {
     super(n, "<literal>", [e]), this.literal = e;
   }
 }
-class X extends y {
+class $ extends y {
   constructor({ variable: e }, n) {
     super(n, "<variable>", [e]), this.variable = e;
   }
@@ -243,13 +243,13 @@ class D extends y {
     super(n, "<primary-expression>", [e]), this.expression = e;
   }
 }
-class we extends y {
+class ye extends y {
   constructor({ pre: e }, n) {
     const s = B.create(c.SPACE, e.endPos, e.endPos, " ", !1);
     super(n, "<dummy>", [s]);
   }
 }
-class le extends y {
+class ce extends y {
   constructor({ expression: e, indexer: n }, s) {
     super(s, "<array>", [e, n]), this.array = e, this.indexer = n;
   }
@@ -269,7 +269,7 @@ function is(t, e = !1) {
     t,
     function(n, s) {
       var i;
-      return !(this instanceof C) && n === "symbol" ? s == null ? void 0 : s.id : (
+      return !(this instanceof X) && n === "symbol" ? s == null ? void 0 : s.id : (
         /* this instanceof SyntaxNode && */
         n === "symbol" ? {
           symbolTable: s == null ? void 0 : s.symbolTable,
@@ -312,7 +312,7 @@ class O {
     return !0;
   }
 }
-class A {
+class v {
   // eslint-disable-next-line class-methods-use-this
   unwrap() {
     throw new Error("Trying to unwrap a None value");
@@ -323,11 +323,11 @@ class A {
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
   and_then(e) {
-    return new A();
+    return new v();
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
   map(e) {
-    return new A();
+    return new v();
   }
   // 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 ke(t) {
+function xe(t) {
   return `Table:${t}`;
 }
 function We(t) {
@@ -367,7 +367,7 @@ function Fe(t, e) {
     case "Schema":
       return $e(t);
     case "Table":
-      return ke(t);
+      return xe(t);
     case "TableGroup":
       return ze(t);
     case "TableGroup field":
@@ -376,15 +376,15 @@ function Fe(t, e) {
       throw new Error("Unreachable");
   }
 }
-function se(t) {
+function ie(t) {
   const [e, n] = t.split(":");
   return Object.values(m).includes(e) ? new O({
     name: n,
     kind: e
-  }) : new A();
+  }) : new v();
 }
 function jt(t) {
-  const e = se(t).unwrap_or(void 0);
+  const e = ie(t).unwrap_or(void 0);
   if (!e)
     return !1;
   const { kind: n, name: s } = e;
@@ -393,7 +393,7 @@ function jt(t) {
 function Yt(t) {
   return [
     $e,
-    ke,
+    xe,
     je,
     ze,
     We,
@@ -405,16 +405,16 @@ function qe(t) {
   const [e] = t;
   return e >= "a" && e <= "z" || e >= "A" && e <= "Z" || e === "_";
 }
-function xe(t) {
+function Oe(t) {
   const [e] = t;
   return e >= "0" && e <= "9";
 }
 function zt(t) {
   const [e] = t;
-  return xe(e) || qe(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
+  return Oe(e) || qe(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
-function fe(t) {
-  return qe(t) || xe(t);
+function pe(t) {
+  return qe(t) || Oe(t);
 }
 function ot(t, e) {
   const n = [], s = Math.min(t.length, e.length);
@@ -422,7 +422,7 @@ function ot(t, e) {
     n.push(t[i], e[i]);
   return n.push(...t.slice(s), ...e.slice(s)), n;
 }
-function be(t, e) {
+function Ie(t, e) {
   return t >= e.start && t < e.end;
 }
 class Qt {
@@ -496,14 +496,14 @@ class F {
   }
 }
 function en(t, e, n) {
-  if (!t || !de(t) || e.length === 0)
-    return new A();
+  if (!t || !Ee(t) || e.length === 0)
+    return new v();
   const s = [...e], i = Be(t).unwrap(), r = s.pop();
-  if (!(r instanceof te))
-    return new A();
+  if (!(r instanceof ne))
+    return new v();
   const a = I.last(s) instanceof P ? s.pop() : void 0;
   return s.length === 3 && Be(s[1]).unwrap().value === "as" ? new O(
-    n.create(_, {
+    n.create(A, {
       type: i,
       name: s[0],
       as: Be(s[1]).unwrap(),
@@ -512,19 +512,19 @@ function en(t, e, n) {
       body: r
     })
   ) : s.length === 1 ? new O(
-    n.create(_, {
+    n.create(A, {
       type: i,
       name: s[0],
       attributeList: a,
       body: r
     })
   ) : s.length === 0 ? new O(
-    n.create(_, {
+    n.create(A, {
       type: i,
       attributeList: a,
       body: r
     })
-  ) : new A();
+  ) : new v();
 }
 function lt(t) {
   return t.kind === c.IDENTIFIER && t.value === "as";
@@ -536,35 +536,35 @@ function tn(t) {
   t.kind !== c.EOF && (t.isInvalid = !0);
 }
 function nn(t) {
-  if (t instanceof _)
+  if (t instanceof A)
     E(t.type), E(t.name), E(t.as), E(t.alias), E(t.bodyColon), E(t.attributeList), E(t.body);
-  else if (t instanceof K)
+  else if (t instanceof C)
     t.identifiers.forEach(E);
-  else if (t instanceof ne)
+  else if (t instanceof se)
     E(t.name), E(t.colon), E(t.value);
-  else if (t instanceof Q)
-    E(t.op), E(t.expression);
   else if (t instanceof q)
+    E(t.op), E(t.expression);
+  else if (t instanceof H)
     E(t.leftExpression), E(t.op), E(t.rightExpression);
-  else if (t instanceof Re)
+  else if (t instanceof De)
     E(t.op), E(t.expression);
-  else if (t instanceof te)
+  else if (t instanceof ne)
     E(t.blockOpenBrace), t.body.forEach(E), E(t.blockCloseBrace);
   else if (t instanceof P)
     E(t.listOpenBracket), t.commaList.forEach(E), t.elementList.forEach(E), E(t.listCloseBracket);
-  else if (t instanceof J)
+  else if (t instanceof Z)
     E(t.tupleOpenParen), t.commaList.forEach(E), t.elementList.forEach(E), E(t.tupleCloseParen);
-  else if (t instanceof H)
+  else if (t instanceof J)
     E(t.callee), E(t.argumentList);
   else if (t instanceof k)
     E(t.callee), t.args.forEach(E);
   else if (t instanceof D)
     E(t.expression);
-  else if (t instanceof ee)
+  else if (t instanceof te)
     E(t.value);
-  else if (t instanceof X)
+  else if (t instanceof $)
     E(t.variable);
-  else if (t instanceof Ee)
+  else if (t instanceof me)
     E(t.literal);
   else
     throw t instanceof Xe ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
@@ -576,9 +576,9 @@ function U(...t) {
   return t.filter((e) => e !== void 0);
 }
 function sn(t) {
-  if (t instanceof C)
+  if (t instanceof X)
     return U(...t.body, t.eof);
-  if (t instanceof _)
+  if (t instanceof A)
     return U(
       t.type,
       t.name,
@@ -588,25 +588,25 @@ function sn(t) {
       t.bodyColon,
       t.body
     );
-  if (t instanceof ne)
+  if (t instanceof se)
     return U(t.name, t.colon, t.value);
-  if (t instanceof K)
+  if (t instanceof C)
     return t.identifiers;
-  if (t instanceof Ee)
+  if (t instanceof me)
     return t.literal ? [t.literal] : [];
-  if (t instanceof X)
+  if (t instanceof $)
     return U(t.variable);
-  if (t instanceof Q)
-    return U(t.op, t.expression);
   if (t instanceof q)
+    return U(t.op, t.expression);
+  if (t instanceof H)
     return U(t.leftExpression, t.op, t.rightExpression);
-  if (t instanceof Re)
+  if (t instanceof De)
     return U(t.expression, t.op);
-  if (t instanceof ee)
+  if (t instanceof te)
     return U(t.value);
   if (t instanceof k)
     return U(t.callee, ...t.args);
-  if (t instanceof te)
+  if (t instanceof ne)
     return U(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
   if (t instanceof P)
     return U(
@@ -614,17 +614,17 @@ function sn(t) {
       ...ot(t.elementList, t.commaList),
       t.listCloseBracket
     );
-  if (t instanceof J)
+  if (t instanceof Z)
     return U(
       t.tupleOpenParen,
       ...ot(t.elementList, t.commaList),
       t.tupleCloseParen
     );
-  if (t instanceof H)
+  if (t instanceof J)
     return U(t.callee, t.argumentList);
   if (t instanceof D)
     return U(t.expression);
-  if (t instanceof le)
+  if (t instanceof ce)
     return U(
       t.array,
       t.indexer
@@ -632,28 +632,28 @@ function sn(t) {
   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 O(t.expression.variable) : new A();
+  return M(t) ? new O(t.expression.variable) : new v();
 }
-function $(t) {
+function W(t) {
   var e;
-  return t instanceof D && (t.expression instanceof X && t.expression.variable instanceof B && t.expression.variable.kind === c.QUOTED_STRING || t.expression instanceof Ee && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.STRING_LITERAL);
+  return t instanceof D && (t.expression instanceof $ && t.expression.variable instanceof B && t.expression.variable.kind === c.QUOTED_STRING || t.expression instanceof me && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.STRING_LITERAL);
 }
 function M(t) {
-  return t instanceof D && t.expression instanceof X && t.expression.variable instanceof B;
+  return t instanceof D && t.expression instanceof $ && t.expression.variable instanceof B;
 }
-function de(t) {
+function Ee(t) {
   var e;
-  return t instanceof D && t.expression instanceof X && ((e = t.expression.variable) == null ? void 0 : e.kind) === c.IDENTIFIER;
+  return t instanceof D && t.expression instanceof $ && ((e = t.expression.variable) == null ? void 0 : e.kind) === c.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 H && t.leftExpression instanceof y && t.rightExpression instanceof y && ((e = t.op) == null ? void 0 : e.value) === ".";
 }
-function De(t) {
+function Ne(t) {
   if (t === void 0)
-    return new A();
+    return new v();
   const e = t.identifiers.map((n) => n.value).join(" ");
-  return e === "" ? new A() : new O(e);
+  return e === "" ? new v() : new O(e);
 }
 class rn {
   // list of errors during lexing
@@ -773,7 +773,7 @@ class rn {
             this.identifier();
             break;
           }
-          if (xe(e)) {
+          if (Oe(e)) {
             this.numericLiteralOrIdentifier();
             break;
           }
@@ -888,7 +888,7 @@ class rn {
     });
   }
   identifier() {
-    for (; !this.isAtEnd() && fe(this.peek()); )
+    for (; !this.isAtEnd() && pe(this.peek()); )
       this.advance();
     this.addToken(c.IDENTIFIER);
   }
@@ -908,26 +908,26 @@ class rn {
         break;
       if (!n && this.current.offset === this.text.length - 1)
         return this.advance(), this.addToken(c.NUMERIC_LITERAL);
-      if (!n && !fe(this.peek()))
+      if (!n && !pe(this.peek()))
         return this.addToken(c.NUMERIC_LITERAL);
-      if (!n && !xe(this.peek()))
+      if (!n && !Oe(this.peek()))
         break;
       this.advance();
     }
     if (e > 0) {
-      for (; !this.isAtEnd() && (this.check(".") || fe(this.peek())); )
+      for (; !this.isAtEnd() && (this.check(".") || pe(this.peek())); )
         this.advance();
       const n = this.createToken(c.NUMERIC_LITERAL, !0);
       this.tokens.push(n), this.errors.push(new u(o.UNKNOWN_TOKEN, "Invalid number", n));
     } else {
-      for (; !this.isAtEnd() && fe(this.peek()); )
+      for (; !this.isAtEnd() && pe(this.peek()); )
         this.advance();
       const n = this.createToken(c.IDENTIFIER, !1);
       this.tokens.push(n);
     }
   }
   colorLiteral() {
-    for (; !this.isAtEnd() && fe(this.peek()); )
+    for (; !this.isAtEnd() && pe(this.peek()); )
       this.advance();
     this.addToken(c.COLOR_LITERAL);
   }
@@ -959,7 +959,7 @@ class rn {
       case "u": {
         let e = "";
         for (let n = 0; n <= 3; n += 1) {
-          if (this.isAtEnd() || !fe(this.peek()))
+          if (this.isAtEnd() || !pe(this.peek()))
             return `\\u${e}`;
           e += this.advance();
         }
@@ -970,7 +970,7 @@ class rn {
     }
   }
 }
-var ye = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(ye || {});
+var ke = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(ke || {});
 class an {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
@@ -1069,8 +1069,8 @@ class ln {
           break;
         E(s), this.advance();
       }
-    }, this.blockExpression = this.contextStack.withContextDo(ye.BlockExpression, () => {
-      const s = { body: [] }, i = () => this.nodeFactory.create(te, s);
+    }, this.blockExpression = this.contextStack.withContextDo(ke.BlockExpression, () => {
+      const s = { body: [] }, i = () => this.nodeFactory.create(ne, s);
       try {
         this.consume("Expect an opening brace '{'", c.LBRACE), s.blockOpenBrace = this.previous();
       } catch (r) {
@@ -1108,12 +1108,12 @@ class ln {
             break;
           E(s), this.advance();
         }
-    }, this.tupleExpression = this.contextStack.withContextDo(ye.GroupExpression, () => {
+    }, this.tupleExpression = this.contextStack.withContextDo(ke.GroupExpression, () => {
       const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(Xe, {
         groupOpenParen: s.tupleOpenParen,
         groupCloseParen: s.tupleCloseParen,
         expression: s.elementList[0]
-      }), r = () => this.nodeFactory.create(J, s);
+      }), r = () => this.nodeFactory.create(Z, s);
       try {
         this.consume("Expect an opening parenthesis '('", c.LPAREN), s.tupleOpenParen = this.previous();
       } catch (a) {
@@ -1160,7 +1160,7 @@ class ln {
           break;
         E(s), this.advance();
       }
-    }, this.listExpression = this.contextStack.withContextDo(ye.ListExpression, () => {
+    }, this.listExpression = this.contextStack.withContextDo(ke.ListExpression, () => {
       const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(P, s);
       try {
         this.consume("Expect an opening bracket '['", c.LBRACKET), s.listOpenBracket = this.previous();
@@ -1278,7 +1278,7 @@ class ln {
     this.tokens = e;
   }
   parse() {
-    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(C, { body: e, eof: n });
+    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(X, { body: e, eof: n });
     return this.gatherInvalid(), new F({ ast: s, tokens: this.tokens }, this.errors);
   }
   /* Parsing and synchronizing ProgramNode */
@@ -1297,7 +1297,7 @@ class ln {
   }
   /* Parsing and synchronizing top-level ElementDeclarationNode */
   elementDeclaration() {
-    const e = {}, n = () => this.nodeFactory.create(_, e);
+    const e = {}, n = () => this.nodeFactory.create(A, e);
     try {
       this.consume("Expect an identifier", c.IDENTIFIER), e.type = this.previous();
     } catch (s) {
@@ -1341,13 +1341,13 @@ class ln {
       if (this.match(c.COLON)) {
         e.bodyColon = this.previous();
         const s = this.expression();
-        s instanceof _ ? (E(s), this.logError(s, o.UNEXPECTED_ELEMENT_DECLARATION, "An element's simple body must not be an element declaration")) : e.body = s;
+        s instanceof A ? (E(s), this.logError(s, o.UNEXPECTED_ELEMENT_DECLARATION, "An element's simple body must not be an element declaration")) : e.body = s;
       } else
         e.body = this.blockExpression();
     } catch (s) {
       throw s instanceof d ? (e.body = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
-    return this.nodeFactory.create(_, e);
+    return this.nodeFactory.create(A, e);
   }
   /* Parsing nested element declarations with simple body */
   // e.g
@@ -1356,7 +1356,7 @@ class ln {
   //    Note: 'This is a note'  // fieldDeclaration() handles this
   //  }
   fieldDeclaration() {
-    const e = {}, n = () => this.nodeFactory.create(_, e);
+    const e = {}, n = () => this.nodeFactory.create(A, e);
     try {
       this.consume("Expect an identifier", c.IDENTIFIER), e.type = this.previous();
     } catch (s) {
@@ -1369,11 +1369,11 @@ class ln {
     }
     try {
       const s = this.expression();
-      s instanceof _ ? this.errors.push(new u(o.INVALID_ELEMENT_IN_SIMPLE_BODY, "Simple body cannot be an element declaration", s)) : e.body = s;
+      s instanceof A ? this.errors.push(new u(o.INVALID_ELEMENT_IN_SIMPLE_BODY, "Simple body cannot be an element declaration", s)) : e.body = s;
     } catch (s) {
       throw s instanceof d ? (e.body = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
-    return this.nodeFactory.create(_, e);
+    return this.nodeFactory.create(A, e);
   }
   /* Parsing any ExpressionNode, including non-NormalExpression */
   expression() {
@@ -1421,12 +1421,12 @@ class ln {
         at(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
           break;
         try {
-          n = this.nodeFactory.create(H, {
+          n = this.nodeFactory.create(J, {
             callee: n,
             argumentList: this.tupleExpression()
           });
         } catch (r) {
-          throw r instanceof d ? (n = this.nodeFactory.create(H, {
+          throw r instanceof d ? (n = this.nodeFactory.create(J, {
             callee: n,
             argumentList: r.partialNode
           }), new d(r.token, n, r.handlerContext)) : r;
@@ -1435,12 +1435,12 @@ class ln {
         if (Ve(this.previous()))
           break;
         try {
-          n = this.nodeFactory.create(le, {
+          n = this.nodeFactory.create(ce, {
             expression: n,
             indexer: this.listExpression()
           });
         } catch (i) {
-          throw i instanceof d ? (n = this.nodeFactory.create(le, {
+          throw i instanceof d ? (n = this.nodeFactory.create(ce, {
             expression: n,
             indexer: i.partialNode
           }), new d(i.token, n, i.handlerContext)) : i;
@@ -1450,7 +1450,7 @@ class ln {
         if (r.left !== null) {
           if (r.left <= e)
             break;
-          this.advance(), n = this.nodeFactory.create(Re, {
+          this.advance(), n = this.nodeFactory.create(De, {
             expression: n,
             op: i
           });
@@ -1460,13 +1460,13 @@ class ln {
             break;
           this.advance();
           try {
-            n = this.nodeFactory.create(q, {
+            n = this.nodeFactory.create(H, {
               leftExpression: n,
               op: i,
               rightExpression: i.value === "." ? this.extractOperand() : this.expression_bp(a.right)
             });
           } catch (l) {
-            throw l instanceof d ? (n = this.nodeFactory.create(q, {
+            throw l instanceof d ? (n = this.nodeFactory.create(H, {
               leftExpression: n,
               op: i,
               rightExpression: l.partialNode
@@ -1491,7 +1491,7 @@ class ln {
           `Unexpected '${n.op.value}' in an expression`
         ), new d(
           n.op,
-          this.nodeFactory.create(we, { pre: n.op }),
+          this.nodeFactory.create(ye, { pre: n.op }),
           this.contextStack.findHandlerContext(this.tokens, this.current)
         );
       this.advance();
@@ -1500,15 +1500,15 @@ class ln {
       } catch (i) {
         throw i instanceof d ? (n.expression = i.partialNode, new d(
           i.token,
-          this.nodeFactory.create(Q, n),
+          this.nodeFactory.create(q, n),
           i.handlerContext
         )) : i;
       }
-      e = this.nodeFactory.create(Q, n);
-    } else if (e = this.extractOperand(), e instanceof we)
+      e = this.nodeFactory.create(q, n);
+    } else if (e = this.extractOperand(), e instanceof ye)
       throw new d(
         this.peek(),
-        this.nodeFactory.create(we, { pre: this.peek() }),
+        this.nodeFactory.create(ye, { pre: this.peek() }),
         this.contextStack.findHandlerContext(this.tokens, this.current)
       );
     return e;
@@ -1532,7 +1532,7 @@ class ln {
       this.peek(),
       o.INVALID_OPERAND,
       `Invalid start of operand "${this.peek().value}"`
-    ), this.nodeFactory.create(we, { pre: this.previous() }));
+    ), this.nodeFactory.create(ye, { pre: this.previous() }));
   }
   /* Parsing FunctionExpression */
   functionExpression() {
@@ -1542,11 +1542,11 @@ class ln {
     } catch (n) {
       throw n instanceof d ? (e.value = n.partialNode, new d(
         n.token,
-        this.nodeFactory.create(ee, e),
+        this.nodeFactory.create(te, e),
         n.handlerContext
       )) : n;
     }
-    return this.nodeFactory.create(ee, e);
+    return this.nodeFactory.create(te, e);
   }
   canBeField() {
     return this.peek().kind === c.IDENTIFIER && this.peek(1).kind === c.COLON;
@@ -1559,16 +1559,16 @@ class ln {
       c.NUMERIC_LITERAL
     ))
       return this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create(Ee, { literal: this.previous() })
+        expression: this.nodeFactory.create(me, { literal: this.previous() })
       });
     if (this.match(c.QUOTED_STRING, c.IDENTIFIER))
       return this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create(X, { variable: this.previous() })
+        expression: this.nodeFactory.create($, { 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(X, {})
+        expression: this.nodeFactory.create($, {})
       }),
       this.contextStack.findHandlerContext(this.tokens, this.current)
     );
@@ -1581,7 +1581,7 @@ class ln {
         n,
         o.EMPTY_ATTRIBUTE_NAME,
         "Expect a non-empty attribute name"
-      ), e.name = this.nodeFactory.create(K, { identifiers: [] });
+      ), e.name = this.nodeFactory.create(C, { identifiers: [] });
     } else
       try {
         e.name = this.attributeName();
@@ -1591,12 +1591,12 @@ class ln {
         if (e.name = n.partialNode, !this.canHandle(n))
           throw new d(
             n.token,
-            this.nodeFactory.create(ne, e),
+            this.nodeFactory.create(se, e),
             n.handlerContext
           );
         this.synchronizeAttributeName();
       }
-    return this.match(c.COLON) && (e.colon = this.previous(), e.value = this.attributeValue()), this.nodeFactory.create(ne, e);
+    return this.match(c.COLON) && (e.colon = this.previous(), e.value = this.attributeValue()), this.nodeFactory.create(se, e);
   }
   attributeValue() {
     let e;
@@ -1619,11 +1619,11 @@ class ln {
       } catch (n) {
         throw n instanceof d ? new d(
           n.token,
-          this.nodeFactory.create(K, { identifiers: e }),
+          this.nodeFactory.create(C, { identifiers: e }),
           n.handlerContext
         ) : n;
       }
-    return this.nodeFactory.create(K, { identifiers: e });
+    return this.nodeFactory.create(C, { identifiers: e });
   }
   logError(e, n, s) {
     this.errors.push(new u(n, s, e));
@@ -1666,7 +1666,7 @@ function ct(t) {
   return pn[t.value] || { left: null, right: null };
 }
 var b = /* @__PURE__ */ ((t) => (t.Table = "table", t.Enum = "enum", t.Ref = "ref", t.Note = "note", t.Project = "project", t.Indexes = "indexes", t.TableGroup = "tablegroup", t))(b || {});
-function ge(t) {
+function _e(t) {
   var n;
   const e = (n = t == null ? void 0 : t.type) == null ? void 0 : n.value.toLowerCase();
   switch (e) {
@@ -1679,36 +1679,36 @@ function ge(t) {
     case b.TableGroup:
       return new O(e);
     default:
-      return new A();
+      return new v();
   }
 }
-function ue(t) {
+function he(t) {
   if (!He(t))
     return new O([t]);
-  const e = ue(t.leftExpression).unwrap_or(void 0);
-  return e ? (e.push(t.rightExpression), new O(e)) : new A();
+  const e = he(t.leftExpression).unwrap_or(void 0);
+  return e ? (e.push(t.rightExpression), new O(e)) : new v();
 }
-function W(t) {
+function j(t) {
   if (t === void 0)
-    return new A();
-  const e = ue(t).unwrap_or(void 0);
+    return new v();
+  const e = he(t).unwrap_or(void 0);
   if (!e)
-    return new A();
+    return new v();
   const n = [];
   for (const s of e) {
     const i = G(s).unwrap_or(void 0);
     if (!i)
-      return new A();
+      return new v();
     n.push(i);
   }
   return new O(n);
 }
-function Ie(t) {
+function Le(t) {
   if (t === void 0)
-    return new A();
-  const e = ue(t).unwrap_or(void 0);
+    return new v();
+  const e = he(t).unwrap_or(void 0);
   if (!e || e.length === 0)
-    return new A();
+    return new v();
   const n = [];
   let s;
   if (!M(I.last(e))) {
@@ -1718,12 +1718,12 @@ function Ie(t) {
         (r) => V(r).unwrap()
       );
     else
-      return new A();
+      return new v();
   }
   for (const i of e) {
     const r = G(i).unwrap_or(void 0);
     if (!r)
-      return new A();
+      return new v();
     n.push(r);
   }
   return new O({
@@ -1732,40 +1732,40 @@ function Ie(t) {
   });
 }
 function G(t) {
-  return M(t) ? new O(t.expression.variable.value) : new A();
+  return M(t) ? new O(t.expression.variable.value) : new v();
 }
 function Ge(t) {
   if (ut(t))
-    return t instanceof ee ? new O({ functional: [t], nonFunctional: [] }) : new O({ functional: [], nonFunctional: [t] });
-  if (t instanceof J && t.elementList.every(ut)) {
+    return t instanceof te ? new O({ functional: [t], nonFunctional: [] }) : new O({ functional: [], nonFunctional: [t] });
+  if (t instanceof Z && t.elementList.every(ut)) {
     const e = t.elementList.filter(
-      (s) => s instanceof ee
+      (s) => s instanceof te
     ), n = t.elementList.filter(M);
     return new O({ functional: e, nonFunctional: n });
   }
-  return new A();
+  return new v();
 }
 function V(t) {
   var n;
   const e = (n = t == null ? void 0 : t.expression.variable) == null ? void 0 : n.value;
-  return e === void 0 ? new A() : new O(e);
+  return e === void 0 ? new v() : new O(e);
 }
-function Y(t) {
-  return $(t) ? t.expression instanceof X ? new O(t.expression.variable.value) : new O(t.expression.literal.value) : new A();
+function z(t) {
+  return W(t) ? t.expression instanceof $ ? new O(t.expression.variable.value) : new O(t.expression.literal.value) : new v();
 }
 function dn(t) {
   var e;
-  return !(t instanceof q) || !wt((e = t.op) == null ? void 0 : e.value) ? !1 : Ie(t.leftExpression).and_then(() => Ie(t.rightExpression)).unwrap_or(void 0) !== void 0;
+  return !(t instanceof H) || !wt((e = t.op) == null ? void 0 : e.value) ? !1 : Le(t.leftExpression).and_then(() => Le(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
 function En(t) {
-  const e = Ie(t.leftExpression), n = Ie(t.rightExpression);
+  const e = Le(t.leftExpression), n = Le(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 ut(t) {
-  return t instanceof D && t.expression instanceof X || t instanceof ee;
+  return t instanceof D && t.expression instanceof $ || t instanceof te;
 }
 function Nn(t, e) {
   var i, r, a, l;
@@ -1774,9 +1774,9 @@ function Nn(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 (((l = n.symbol) == null ? void 0 : l.declaration) instanceof C && s)
+    if (((l = n.symbol) == null ? void 0 : l.declaration) instanceof X && s)
       return n.symbol;
-    if (n instanceof C)
+    if (n instanceof X)
       return;
     n = n.parent;
   }
@@ -1789,7 +1789,7 @@ class mn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof C || ge(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new u(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof X || _e(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new u(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new u(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
@@ -1803,13 +1803,13 @@ class mn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof te)
+    if (e instanceof ne)
       return [new u(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
     const n = [];
-    return $(e.callee) || n.push(new u(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 u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
+    return W(e.callee) || n.push(new u(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 u(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,7 +1834,7 @@ class Tn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.registerElement(), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof _ ? [new u(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof A ? [new u(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? Je(e) ? [] : [new u(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new u(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
@@ -1844,8 +1844,8 @@ class Tn {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(qt, { declaration: this.declarationNode, symbolTable: new _e() });
-    const { name: n } = this.declarationNode, s = W(n);
+    this.declarationNode.symbol = this.symbolFactory.create(qt, { declaration: this.declarationNode, symbolTable: new Ae() });
+    const { name: n } = this.declarationNode, s = j(n);
     if (s.isOk()) {
       const i = s.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), l = je(r);
       a.has(l) && e.push(new u(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, n)), a.set(l, this.declarationNode.symbol);
@@ -1872,13 +1872,13 @@ class Tn {
     });
   }
   validateFieldSettings(e) {
-    const n = z(e), s = n.getErrors(), i = n.getValue();
+    const n = Q(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
           a.length > 1 && a.forEach((l) => s.push(new u(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
-            $(l.value) || s.push(new u(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
+            W(l.value) || s.push(new u(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
           });
           break;
         default:
@@ -1891,7 +1891,7 @@ class Tn {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = ie(n);
+      const s = re(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
@@ -1920,7 +1920,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 C || ge(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new u(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof X || _e(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new u(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new u(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
@@ -1945,27 +1945,27 @@ class bn {
         return [];
       const s = [], i = [n.callee, ...n.args];
       return I.last(i) instanceof P && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
-        for (; r instanceof H; )
+        for (; r instanceof J; )
           r.argumentList && !Ge(r.argumentList).isOk() && s.push(new u(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
         Ge(r).isOk() || s.push(new u(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
       }), s;
     });
   }
   validateFieldSetting(e) {
-    const n = z(e), s = n.getErrors(), i = n.getValue();
+    const n = Q(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
         case "name":
           a.length > 1 && a.forEach((l) => s.push(new u(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
-            $(l.value) || s.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
+            W(l.value) || s.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
           });
           break;
         case "unique":
         case "pk":
           a.length > 1 && a.forEach((l) => s.push(new u(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
-            oe(l.value) || s.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must not have a value`, l));
+            le(l.value) || s.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must not have a value`, l));
           });
           break;
         case "type":
@@ -1983,7 +1983,7 @@ class bn {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = ie(n);
+      const s = re(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
@@ -1996,7 +1996,7 @@ class In {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof C || ![b.Table, b.Project].includes(ge(this.declarationNode.parent).unwrap_or(void 0)) ? [new u(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof X || ![b.Table, b.Project].includes(_e(this.declarationNode.parent).unwrap_or(void 0)) ? [new u(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new u(o.UNEXPECTED_NAME, "A Note shouldn't have a name", e)] : [];
@@ -2017,13 +2017,13 @@ class In {
   }
   validateFields(e) {
     const n = [];
-    return e.length === 0 ? [new u(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new u(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), $(e[0].callee) || n.push(new u(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 u(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
+    return e.length === 0 ? [new u(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new u(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), W(e[0].callee) || n.push(new u(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 u(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
   }
   validateSubElements(e) {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = ie(n);
+      const s = re(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
@@ -2036,7 +2036,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 _ ? [new u(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof A ? [new u(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? Pe(e) ? [] : [new u(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
@@ -2062,7 +2062,7 @@ class Ln {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = ie(n);
+      const s = re(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
@@ -2075,7 +2075,7 @@ 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 C ? [] : [new u(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
+    return this.declarationNode.parent instanceof X ? [] : [new u(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
   }
   validateName(e) {
     return e ? Pe(e) ? [] : [new u(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
@@ -2105,7 +2105,7 @@ class gn {
     }), n;
   }
   validateFieldSettings(e) {
-    const n = z(e), s = n.getErrors(), i = n.getValue();
+    const n = Q(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
@@ -2125,16 +2125,16 @@ class gn {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = ie(n);
+      const s = re(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
 function _n(t) {
-  if (!(M(t) && t.expression.variable.kind !== c.QUOTED_STRING) && !(t instanceof K))
+  if (!(M(t) && t.expression.variable.kind !== c.QUOTED_STRING) && !(t instanceof C))
     return !1;
   let e;
-  if (t instanceof K ? e = De(t).unwrap_or("") : e = t.expression.variable.value, e)
+  if (t instanceof C ? e = Ne(t).unwrap_or("") : e = t.expression.variable.value, e)
     switch (e.toLowerCase()) {
       case "cascade":
       case "no action":
@@ -2155,16 +2155,16 @@ class An {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.registerElement(), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof _ ? [new u(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof A ? [new u(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? e instanceof le ? [new u(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Je(e) ? [] : [new u(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new u(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
+    return e ? e instanceof ce ? [new u(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Je(e) ? [] : [new u(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new u(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
   }
   validateAlias(e) {
     return e ? kn(e) ? [] : [new u(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
   }
   validateSettingList(e) {
-    const n = z(e), s = n.getErrors(), i = n.getValue();
+    const n = Q(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
@@ -2175,7 +2175,7 @@ class An {
           break;
         case "note":
           a.length > 1 && s.push(...a.map((l) => new u(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
-            $(l.value) || s.push(new u(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
+            W(l.value) || s.push(new u(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
           });
           break;
         default:
@@ -2186,14 +2186,14 @@ class An {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(_t, { declaration: this.declarationNode, symbolTable: new _e() });
-    const { name: n, alias: s } = this.declarationNode, i = W(n);
+    this.declarationNode.symbol = this.symbolFactory.create(_t, { declaration: this.declarationNode, symbolTable: new Ae() });
+    const { name: n, alias: s } = this.declarationNode, i = j(n);
     if (i.isOk()) {
-      const r = [...i.unwrap()], a = r.pop(), l = Ze(r, this.publicSymbolTable, this.symbolFactory), p = ke(a);
+      const r = [...i.unwrap()], a = r.pop(), l = Ze(r, this.publicSymbolTable, this.symbolFactory), p = xe(a);
       l.has(p) && e.push(new u(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, n)), l.set(p, this.declarationNode.symbol);
     }
     if (s && Pe(s) && !wn(s.expression.variable.value, i.unwrap_or([]))) {
-      const r = V(s).unwrap(), a = ke(r);
+      const r = V(s).unwrap(), a = xe(r);
       this.publicSymbolTable.has(a) && e.push(new u(o.DUPLICATE_NAME, `Table name '${r}' already exists`, n)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
     }
     return e;
@@ -2234,13 +2234,13 @@ class An {
   }
   // This is needed to support legacy inline settings
   validateFieldSetting(e) {
-    if (!e.slice(0, -1).every(de) || !e.slice(-1).every((p) => de(p) || p instanceof P))
+    if (!e.slice(0, -1).every(Ee) || !e.slice(-1).every((p) => Ee(p) || p instanceof P))
       return [...e.map((p) => new u(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
     if (e.length === 0)
       return [];
     let n;
     I.last(e) instanceof P && (n = e.pop());
-    const s = z(n), i = s.getErrors(), r = s.getValue();
+    const s = Q(n), i = s.getErrors(), r = s.getValue();
     for (const p of e) {
       const h = V(p).unwrap_or("").toLowerCase();
       if (h !== "pk" && h !== "unique") {
@@ -2256,7 +2256,7 @@ class An {
       switch (p) {
         case "note":
           h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", f))), h.forEach((f) => {
-            $(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
+            W(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
           });
           break;
         case "ref":
@@ -2266,34 +2266,34 @@ class An {
           break;
         case "primary key":
           h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "primary key can only appear once", f))), h.forEach((f) => {
-            oe(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'primary key' must not have a value", f.value || f.name));
+            le(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'primary key' must not have a value", f.value || f.name));
           });
           break;
         case "pk":
           h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "'pk' can only appear once", f))), h.forEach((f) => {
-            f instanceof ne && !oe(f.value) && i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", f.value || f.name));
+            f instanceof se && !le(f.value) && i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", f.value || f.name));
           });
           break;
         case "not null":
           h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "'not null' can only appear once", f)));
           const T = r.null || [];
           h.length >= 1 && T.length >= 1 && i.push(...[...h, ...T].map((f) => new u(o.CONFLICTING_SETTING, "'not null' and 'null' can not be set at the same time", f))), h.forEach((f) => {
-            oe(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'not null' must not have a value", f.value || f.name));
+            le(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'not null' must not have a value", f.value || f.name));
           });
           break;
         case "null":
           h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "'null' can only appear once", f))), h.forEach((f) => {
-            oe(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'null' must not have a value", f.value || f.name));
+            le(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'null' must not have a value", f.value || f.name));
           });
           break;
         case "unique":
           h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "'unique' can only appear once", f))), h.forEach((f) => {
-            f instanceof ne && !oe(f.value) && i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", f.value || f.name));
+            f instanceof se && !le(f.value) && i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", f.value || f.name));
           });
           break;
         case "increment":
           h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "'increment' can only appear once", f))), h.forEach((f) => {
-            f instanceof ne && !oe(f.value) && i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", f.value || f.name));
+            f instanceof se && !le(f.value) && i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", f.value || f.name));
           });
           break;
         case "default":
@@ -2311,7 +2311,7 @@ class An {
     const n = e.flatMap((i) => {
       if (i.parent = this.declarationNode, !i.type)
         return [];
-      const r = ie(i);
+      const r = re(i);
       return new r(i, this.publicSymbolTable, this.symbolFactory).validate();
     }), s = e.filter((i) => {
       var r;
@@ -2321,19 +2321,19 @@ class An {
   }
 }
 function vn(t) {
-  if (!(t instanceof H || He(t) || t instanceof D || t instanceof le))
+  if (!(t instanceof J || He(t) || t instanceof D || t instanceof ce))
     return !1;
-  if (t instanceof H) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ce(n) || $(n) || de(n)))
+  if (t instanceof J) {
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ue(n) || W(n) || Ee(n)))
       return !1;
     t = t.callee;
   }
-  for (; t instanceof le; ) {
-    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && ce(n.name)))
+  for (; t instanceof ce; ) {
+    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && ue(n.name)))
       return !1;
     t = t.array;
   }
-  const e = W(t).unwrap_or(void 0);
+  const e = j(t).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
 function wn(t, e) {
@@ -2347,7 +2347,7 @@ class yn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.registerElement(), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof _ ? [new u(o.INVALID_TABLEGROUP_CONTEXT, "TableGroup must appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof A ? [new u(o.INVALID_TABLEGROUP_CONTEXT, "TableGroup must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? Je(e) ? [] : [new u(o.INVALID_NAME, "A TableGroup name must be of the form <tablegroup> or <schema>.<tablegroup>", e)] : [new u(o.NAME_NOT_FOUND, "A TableGroup must have a name", this.declarationNode)];
@@ -2357,8 +2357,8 @@ class yn {
   }
   registerElement() {
     const { name: e } = this.declarationNode;
-    this.declarationNode.symbol = this.symbolFactory.create(Zt, { declaration: this.declarationNode, symbolTable: new _e() });
-    const n = W(e);
+    this.declarationNode.symbol = this.symbolFactory.create(Zt, { declaration: this.declarationNode, symbolTable: new Ae() });
+    const n = j(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))
@@ -2381,14 +2381,14 @@ class yn {
   validateFields(e) {
     return e.flatMap((n) => {
       const s = [];
-      return n.callee && !W(n.callee).isOk() && s.push(new u(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 u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
+      return n.callee && !j(n.callee).isOk() && s.push(new u(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 u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
     });
   }
   validateSubElements(e) {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = ie(n);
+      const s = re(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
@@ -2410,7 +2410,7 @@ class yn {
   }
 }
 const vt = ["-", "+"];
-function ie(t) {
+function re(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
       return Tn;
@@ -2431,13 +2431,13 @@ function ie(t) {
   }
 }
 function Je(t) {
-  return !!W(t).unwrap_or(!1);
+  return !!j(t).unwrap_or(!1);
 }
 function kn(t) {
   return Pe(t);
 }
 function Pe(t) {
-  return t instanceof D && t.expression instanceof X;
+  return t instanceof D && t.expression instanceof $;
 }
 function Ze(t, e, n) {
   var i;
@@ -2450,7 +2450,7 @@ function Ze(t, e, n) {
       if (a = (i = s.get(l)) == 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(gt, { symbolTable: a });
       s.set(l, p);
     }
@@ -2463,7 +2463,7 @@ function wt(t) {
 }
 function xn(t) {
   var n;
-  if (!(t instanceof D) || !(t.expression instanceof Ee) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== c.COLOR_LITERAL)
+  if (!(t instanceof D) || !(t.expression instanceof me) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== c.COLOR_LITERAL)
     return !1;
   const e = t.expression.literal.value;
   if (e.length !== 4 && e.length !== 7 || e[0] !== "#")
@@ -2473,28 +2473,28 @@ function xn(t) {
       return !1;
   return !0;
 }
-function oe(t) {
+function le(t) {
   return t === void 0;
 }
 function On(t) {
   var e;
-  return !!($(t) || ce(t) || de(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && vt.includes((e = t.op) == null ? void 0 : e.value) && ce(t.expression) || t instanceof ee);
+  return !!(W(t) || ue(t) || Ee(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof q && vt.includes((e = t.op) == null ? void 0 : e.value) && ue(t.expression) || t instanceof te);
 }
-function ce(t) {
+function ue(t) {
   var e;
-  return t instanceof D && t.expression instanceof Ee && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.NUMERIC_LITERAL;
+  return t instanceof D && t.expression instanceof me && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.NUMERIC_LITERAL;
 }
 function Sn(t) {
   var n;
-  if (!(t instanceof Q) || !wt((n = t.op) == null ? void 0 : n.value))
+  if (!(t instanceof q) || !wt((n = t.op) == null ? void 0 : n.value))
     return !1;
-  const e = W(t.expression).unwrap_or(void 0);
+  const e = j(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
 function yt(t) {
-  return t instanceof J && t.elementList.every(M);
+  return t instanceof Z && t.elementList.every(M);
 }
-function z(t) {
+function Q(t) {
   var s;
   const e = {}, n = [];
   if (!t)
@@ -2506,7 +2506,7 @@ function z(t) {
       n.push(new u(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 = Ne(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 F(e, n);
@@ -2514,7 +2514,7 @@ function z(t) {
 class ht {
   constructor(e, n) {
     this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(gt, {
-      symbolTable: new _e()
+      symbolTable: new Ae()
     }), this.ast.symbol = this.publicSchemaSymbol, this.ast.symbol.declaration = this.ast;
   }
   validate() {
@@ -2522,18 +2522,18 @@ class ht {
     this.ast.body.forEach((s) => {
       if (s.parent = this.ast, s.type === void 0)
         return;
-      const i = ie(s), r = new i(
+      const i = re(s), r = new i(
         s,
         this.publicSchemaSymbol.symbolTable,
         this.symbolFactory
       );
       e.push(...r.validate());
     });
-    const n = this.ast.body.filter((s) => ge(s).unwrap_or(void 0) === b.Project);
+    const n = this.ast.body.filter((s) => _e(s).unwrap_or(void 0) === b.Project);
     return n.length > 1 && n.forEach((s) => e.push(new u(o.PROJECT_REDEFINED, "Only one project can exist", s))), new F(this.ast, e);
   }
 }
-class re {
+class ae {
   constructor(e, n) {
     this.declarationNode = e, this.errors = n;
   }
@@ -2545,7 +2545,7 @@ class re {
       for (const s of e.elementList) {
         if (s.name instanceof D)
           continue;
-        const i = De(s.name).unwrap_or(void 0);
+        const i = Ne(s.name).unwrap_or(void 0);
         if (!i)
           continue;
         const r = n[i.toLowerCase()];
@@ -2557,9 +2557,9 @@ class re {
     if (!e.body)
       return;
     const { body: n } = e;
-    if (n instanceof te)
+    if (n instanceof ne)
       for (const s of n.body)
-        if (s instanceof _) {
+        if (s instanceof A) {
           if (!s.type)
             continue;
           const i = kt(s);
@@ -2581,11 +2581,11 @@ class re {
     var s, i;
     if (e)
       if (e instanceof D) {
-        if (e.expression instanceof X && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
+        if (e.expression instanceof $ && ((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(ue(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof Q ? this.scanAndBind(e.expression, n) : e instanceof Re ? this.scanAndBind(e.expression, n) : e instanceof J && e.elementList.forEach((r) => this.scanAndBind(r, n));
+        e instanceof H ? He(e) ? this.bindFragments(he(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof q ? this.scanAndBind(e.expression, n) : e instanceof De ? this.scanAndBind(e.expression, n) : e instanceof Z && 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,
@@ -2637,14 +2637,14 @@ class re {
       throw new Error("Unreachable - An unresolved name must have at least one name component");
     const [s, ...i] = e, r = Nn(s.index, this.declarationNode);
     if (r === void 0) {
-      const { kind: h, name: T } = se(s.index).unwrap();
+      const { kind: h, name: T } = ie(s.index).unwrap();
       this.logError(s.referrer, `Can not find ${h} '${T}'`, n);
       return;
     }
     r.references.push(s.referrer), s.referrer.referee = r;
-    let a = r.symbolTable, { kind: l, name: p } = se(s.index).unwrap();
+    let a = r.symbolTable, { kind: l, name: p } = ie(s.index).unwrap();
     for (const h of i) {
-      const { kind: T, name: f } = se(h.index).unwrap(), N = a.get(h.index);
+      const { kind: T, name: f } = ie(h.index).unwrap(), N = a.get(h.index);
       if (!N) {
         this.logError(
           h.referrer,
@@ -2662,7 +2662,7 @@ class re {
     s || this.errors.push(new u(o.BINDING_ERROR, n, e));
   }
 }
-class Rn extends re {
+class Rn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2672,7 +2672,7 @@ class Rn extends re {
     }, this.settingList = {};
   }
 }
-class Dn extends re {
+class Dn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2682,7 +2682,7 @@ class Dn extends re {
     }, this.settingList = {};
   }
 }
-class Pn extends re {
+class Pn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2717,7 +2717,7 @@ class Pn extends re {
     }, this.settingList = {};
   }
 }
-class Un extends re {
+class Un extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2727,7 +2727,7 @@ class Un extends re {
     }, this.settingList = {};
   }
 }
-class Mn extends re {
+class Mn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2737,7 +2737,7 @@ class Mn extends re {
     }, this.settingList = {};
   }
 }
-class Fn extends re {
+class Fn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2754,7 +2754,7 @@ class Fn extends re {
     }, this.settingList = {};
   }
 }
-class Bn extends re {
+class Bn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2782,7 +2782,7 @@ class Bn extends re {
     }, this.settingList = {};
   }
 }
-class Vn extends re {
+class Vn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2854,7 +2854,7 @@ class Xn {
   }
 }
 function ft(t, e) {
-  const { variables: n, tupleElements: s } = Ie(t).unwrap();
+  const { variables: n, tupleElements: s } = Le(t).unwrap();
   return s ? n.length === 0 ? {
     schemaName: e.schemaName,
     tableName: e.name,
@@ -2898,11 +2898,11 @@ function x(t) {
 }
 function Ce(t) {
   var n;
-  const e = (n = ue(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
-  return e instanceof J ? e.elementList.map((s) => s.referee) : [e.referee];
+  const e = (n = he(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
+  return e instanceof Z ? e.elementList.map((s) => s.referee) : [e.referee];
 }
-function Ae(t) {
-  const e = W(t).unwrap();
+function ve(t) {
+  const e = j(t).unwrap();
   return {
     name: e.pop(),
     schemaName: e
@@ -2951,7 +2951,7 @@ class Rt {
     }), this.pkColumns.forEach((n) => n.pk = !1)), e;
   }
   interpretName(e) {
-    const { name: n, schemaName: s } = Ae(e);
+    const { name: n, schemaName: s } = ve(e);
     return s.length > 1 ? (this.table.name = n, this.table.schemaName = s.join("."), [new u(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.table.name = n, this.table.schemaName = s.length ? s[0] : null, []);
   }
   interpretAlias(e) {
@@ -2969,9 +2969,9 @@ class Rt {
   }
   interpretSettingList(e) {
     var r, a, l;
-    const n = z(e).getValue();
+    const n = Q(e).getValue();
     this.table.headerColor = (r = n.headercolor) != null && r.length ? $n((l = (a = n.headercolor) == null ? void 0 : a.at(0)) == null ? void 0 : l.value) : void 0;
-    const [s] = n.note || [], i = Y(s == null ? void 0 : s.value).unwrap_or(void 0);
+    const [s] = n.note || [], i = z(s == null ? void 0 : s.value).unwrap_or(void 0);
     return this.table.note = s && {
       value: i,
       token: x(s)
@@ -2987,7 +2987,7 @@ class Rt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: Y(n.body instanceof te ? n.body.body[0].callee : n.body.callee).unwrap(),
+            value: z(n.body instanceof ne ? n.body.body[0].callee : n.body.callee).unwrap(),
             token: x(n)
           }, [];
         case "indexes":
@@ -3007,63 +3007,63 @@ class Rt {
     s.type = i.getValue(), n.push(...i.getErrors()), s.token = x(e), s.inline_refs = [];
     const r = e.args.slice(1);
     if (I.last(r) instanceof P) {
-      const v = z(r.pop()).getValue();
-      s.pk = !!((a = v.pk) != null && a.length) || !!((l = v["primary key"]) != null && l.length), s.increment = !!((p = v.increment) != null && p.length), s.unique = !!((h = v.unique) != null && h.length), s.not_null = !!((T = v["not null"]) != null && T.length) && !0, s.dbdefault = jn((N = (f = v.default) == null ? void 0 : f.at(0)) == null ? void 0 : N.value);
-      const Ne = (g = v.note) == null ? void 0 : g.at(0);
-      s.note = Ne && {
-        value: Y(Ne.value).unwrap(),
-        token: x(Ne)
+      const _ = Q(r.pop()).getValue();
+      s.pk = !!((a = _.pk) != null && a.length) || !!((l = _["primary key"]) != null && l.length), s.increment = !!((p = _.increment) != null && p.length), s.unique = !!((h = _.unique) != null && h.length), s.not_null = !!((T = _["not null"]) != null && T.length) && !0, s.dbdefault = jn((N = (f = _.default) == null ? void 0 : f.at(0)) == null ? void 0 : N.value);
+      const K = (g = _.note) == null ? void 0 : g.at(0);
+      s.note = K && {
+        value: z(K.value).unwrap(),
+        token: x(K)
       };
-      const me = v.ref || [];
-      s.inline_refs = me.flatMap((j) => {
-        const [tt] = Ce(j.value.expression);
+      const Te = _.ref || [];
+      s.inline_refs = Te.flatMap((Y) => {
+        const [tt] = Ce(Y.value.expression);
         if (St(tt, e.symbol))
-          return n.push(new u(o.SAME_ENDPOINT, "Two endpoints are the same", j)), [];
-        const ve = j.value.op, Z = W(j.value.expression).unwrap();
-        let he;
-        if (Z.length === 1) {
-          const [ae] = Z;
-          he = {
+          return n.push(new u(o.SAME_ENDPOINT, "Two endpoints are the same", Y)), [];
+        const we = Y.value.op, ee = j(Y.value.expression).unwrap();
+        let fe;
+        if (ee.length === 1) {
+          const [oe] = ee;
+          fe = {
             schemaName: this.table.schemaName,
             tableName: this.table.name,
-            fieldNames: [ae],
-            relation: ve.value,
-            token: x(j)
+            fieldNames: [oe],
+            relation: we.value,
+            token: x(Y)
           };
-        } else if (Z.length === 2) {
-          const [ae, Te] = Z;
-          he = {
+        } else if (ee.length === 2) {
+          const [oe, be] = ee;
+          fe = {
             schemaName: null,
-            tableName: ae,
-            fieldNames: [Te],
-            relation: ve.value,
-            token: x(j)
+            tableName: oe,
+            fieldNames: [be],
+            relation: we.value,
+            token: x(Y)
           };
-        } else if (Z.length === 3) {
-          const [ae, Te, st] = Z;
-          he = {
-            schemaName: ae,
-            tableName: Te,
+        } else if (ee.length === 3) {
+          const [oe, be, st] = ee;
+          fe = {
+            schemaName: oe,
+            tableName: be,
             fieldNames: [st],
-            relation: ve.value,
-            token: x(j)
+            relation: we.value,
+            token: x(Y)
           };
         } else {
-          n.push(new u(o.UNSUPPORTED, "Nested schema is not supported", j));
-          const ae = Z.pop(), Te = Z.pop();
-          he = {
-            schemaName: Z.join("."),
-            tableName: Te,
-            fieldNames: [ae],
-            relation: ve.value,
-            token: x(j)
+          n.push(new u(o.UNSUPPORTED, "Nested schema is not supported", Y));
+          const oe = ee.pop(), be = ee.pop();
+          fe = {
+            schemaName: ee.join("."),
+            tableName: be,
+            fieldNames: [oe],
+            relation: we.value,
+            token: x(Y)
           };
         }
-        const nt = this.registerInlineRefToEnv(e, tt, he, j);
-        return n.push(...nt), nt.length === 0 ? he : [];
+        const nt = this.registerInlineRefToEnv(e, tt, fe, Y);
+        return n.push(...nt), nt.length === 0 ? fe : [];
       });
     }
-    return s.pk || (s.pk = r.some((v) => G(v).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((v) => G(v).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
+    return s.pk || (s.pk = r.some((_) => G(_).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((_) => G(_).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) => {
@@ -3072,30 +3072,30 @@ class Rt {
       s.token = x(e);
       const r = [i.callee, ...i.args];
       if (I.last(r) instanceof P) {
-        const g = z(r.pop()).getValue();
-        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((l = g.unique) != null && l.length), s.name = Y((h = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
-        const v = (T = g.note) == null ? void 0 : T.at(0);
-        s.note = v && {
-          value: Y(v.value).unwrap(),
-          token: x(v)
+        const g = Q(r.pop()).getValue();
+        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((l = g.unique) != null && l.length), s.name = z((h = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
+        const _ = (T = g.note) == null ? void 0 : T.at(0);
+        s.note = _ && {
+          value: z(_.value).unwrap(),
+          token: x(_)
         }, s.type = G((N = (f = g.type) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
       }
       return r.flatMap((g) => {
-        if (!(g instanceof H))
+        if (!(g instanceof J))
           return g;
-        const v = [];
-        for (; g instanceof H; )
-          v.push(g.argumentList), g = g.callee;
-        return v.push(g), v;
+        const _ = [];
+        for (; g instanceof J; )
+          _.push(g.argumentList), g = g.callee;
+        return _.push(g), _;
       }).forEach((g) => {
-        const { functional: v, nonFunctional: Ne } = Ge(g).unwrap();
+        const { functional: _, nonFunctional: K } = Ge(g).unwrap();
         s.columns.push(
-          ...v.map((me) => ({
-            value: me.value.value,
+          ..._.map((Te) => ({
+            value: Te.value.value,
             type: "expression"
           })),
-          ...Ne.map((me) => ({
-            value: V(me).unwrap(),
+          ...K.map((Te) => ({
+            value: V(Te).unwrap(),
             type: "column"
           }))
         );
@@ -3132,11 +3132,11 @@ class Rt {
 }
 function Wn(t) {
   let e = null;
-  t instanceof H && (e = t.argumentList.elementList.map((r) => ce(r) ? r.expression.literal.value : $(r) ? Y(r).unwrap() : G(r).unwrap()).join(","), t = t.callee);
+  t instanceof J && (e = t.argumentList.elementList.map((r) => ue(r) ? r.expression.literal.value : W(r) ? z(r).unwrap() : G(r).unwrap()).join(","), t = t.callee);
   let n = "";
-  for (; t instanceof le; )
+  for (; t instanceof ce; )
     n = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${n}`, t = t.array;
-  const { name: s, schemaName: i } = Ae(t);
+  const { name: s, schemaName: i } = ve(t);
   return i.length > 1 ? new F(
     {
       schemaName: i.length === 0 ? null : i[0],
@@ -3153,29 +3153,29 @@ function Wn(t) {
 function jn(t) {
   var e, n, s;
   if (t) {
-    if ($(t))
+    if (W(t))
       return {
-        value: Y(t).unwrap(),
+        value: z(t).unwrap(),
         type: "string"
       };
-    if (ce(t))
+    if (ue(t))
       return {
         type: "number",
         value: Number.parseFloat(t.expression.literal.value)
       };
-    if (de(t))
+    if (Ee(t))
       return {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
       };
-    if (t instanceof Q && vt.includes((e = t.op) == null ? void 0 : e.value) && ce(t.expression)) {
+    if (t instanceof q && vt.includes((e = t.op) == null ? void 0 : e.value) && ue(t.expression)) {
       const i = Number.parseFloat(t.expression.expression.literal.value);
       return {
         value: ((n = t.op) == null ? void 0 : n.value) === "-" ? 0 - i : i,
         type: "number"
       };
     }
-    if (t instanceof ee)
+    if (t instanceof te)
       return {
         value: (s = t.value) == null ? void 0 : s.value,
         type: "expression"
@@ -3185,13 +3185,13 @@ function jn(t) {
 }
 class Dt {
   constructor(e, n) {
-    this.declarationNode = e, this.env = n, this.container = this.declarationNode.parent instanceof _ ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
+    this.declarationNode = e, this.env = n, this.container = this.declarationNode.parent instanceof A ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
   }
   interpret() {
     return this.ref.token = x(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
-    const n = [], s = W(this.declarationNode.name).unwrap_or([]);
+    const n = [], s = j(this.declarationNode.name).unwrap_or([]);
     return this.ref.name = s.pop() || null, s.length > 1 && n.push(new u(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name)), this.ref.schemaName = s.join(".") || null, n;
   }
   interpretBody(e) {
@@ -3209,8 +3209,10 @@ class Dt {
         new u(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[l])
       ];
     if (e.args[0]) {
-      const g = z(e.args[0]).getValue();
-      this.ref.onDelete = G((T = (h = g.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value).unwrap_or(void 0), this.ref.onUpdate = G((N = (f = g.update) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
+      const g = Q(e.args[0]).getValue(), _ = (T = (h = g.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value;
+      this.ref.onDelete = _ instanceof C ? Ne(_).unwrap_or(void 0) : G(_).unwrap_or(void 0);
+      const K = (N = (f = g.update) == null ? void 0 : f.at(0)) == null ? void 0 : N.value;
+      this.ref.onUpdate = K instanceof C ? Ne(K).unwrap_or(void 0) : G(K).unwrap_or(void 0);
     }
     const p = xt(n);
     return this.ref.endpoints = [
@@ -3239,15 +3241,15 @@ class Pt {
     ), e;
   }
   interpretName(e) {
-    const n = [], { name: s, schemaName: i } = Ae(e);
+    const n = [], { name: s, schemaName: i } = ve(e);
     return i.length >= 2 && (this.tableGroup.name = s, this.tableGroup.schemaName = i.join("."), n.push(new u(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = s, this.tableGroup.schemaName = i[0] || null, n;
   }
   interpretBody(e) {
     const n = [];
     return this.tableGroup.tables = this.declarationNode.body.body.map((s) => {
-      const i = W(s.callee).unwrap();
+      const i = j(s.callee).unwrap();
       i.length > 2 && n.push(new u(o.UNSUPPORTED, "Nested schema is not supported", s));
-      const r = ue(s.callee).unwrap().pop().referee.id;
+      const r = he(s.callee).unwrap().pop().referee.id;
       if (this.env.groupOfTable[r]) {
         const a = this.env.groupOfTable[r], { schemaName: l, name: p } = this.env.tableGroups.get(a), h = l ? `${l}.${p}` : p;
         n.push(new u(o.TABLE_REAPPEAR_IN_TABLEGROUP, `Table "${i.join(".")}" already appears in group "${h}"`, s));
@@ -3268,7 +3270,7 @@ class Ut {
     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)];
   }
   interpretName(e) {
-    const { name: n, schemaName: s } = Ae(e);
+    const { name: n, schemaName: s } = ve(e);
     return s.length > 1 ? (this.enum.name = n, this.enum.schemaName = s.join("."), [new u(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.enum.name = n, this.enum.schemaName = s.length ? s[0] : null, []);
   }
   interpretBody(e) {
@@ -3276,9 +3278,9 @@ class Ut {
       var l;
       const s = n, i = {};
       i.token = x(s), i.name = G(s.callee).unwrap();
-      const a = (l = z(s.args[0]).getValue().note) == null ? void 0 : l.at(0);
+      const a = (l = Q(s.args[0]).getValue().note) == null ? void 0 : l.at(0);
       return i.note = a && {
-        value: Y(a.value).unwrap(),
+        value: z(a.value).unwrap(),
         token: x(a)
       }, this.enum.values.push(i), [];
     });
@@ -3294,7 +3296,7 @@ class Yn {
   interpretName(e) {
     if (!e)
       return this.project.name = null, [];
-    const { name: n } = Ae(e);
+    const { name: n } = ve(e);
     return this.project.name = n, [];
   }
   interpretBody(e) {
@@ -3320,11 +3322,11 @@ class Yn {
         }
         case "note":
           return this.project.note = {
-            value: Y(s.body instanceof te ? s.body.body[0].callee : s.body.callee).unwrap(),
+            value: z(s.body instanceof ne ? s.body.body[0].callee : s.body.callee).unwrap(),
             token: x(s)
           }, [];
         default:
-          return this.project[s.type.value.toLowerCase()] = Y(s.body.callee).unwrap(), [];
+          return this.project[s.type.value.toLowerCase()] = z(s.body.callee).unwrap(), [];
       }
     });
   }
@@ -3345,7 +3347,7 @@ class zn {
   }
   interpret() {
     const e = this.ast.body.flatMap((n) => {
-      switch (ge(n).unwrap_or(void 0)) {
+      switch (_e(n).unwrap_or(void 0)) {
         case b.Table:
           return new Rt(n, this.env).interpret();
         case b.Ref:
@@ -3375,7 +3377,7 @@ function Qn(t) {
   };
 }
 var L = /* @__PURE__ */ ((t) => (t[t.Function = 1] = "Function", t[t.Constructor = 2] = "Constructor", t[t.Field = 3] = "Field", t[t.Variable = 4] = "Variable", t[t.Class = 5] = "Class", t[t.Struct = 6] = "Struct", t[t.Interface = 7] = "Interface", t[t.Module = 8] = "Module", t[t.Property = 9] = "Property", t[t.Event = 10] = "Event", t[t.Operator = 11] = "Operator", t[t.Unit = 12] = "Unit", t[t.Value = 13] = "Value", t[t.Constant = 14] = "Constant", t[t.Enum = 15] = "Enum", t[t.EnumMember = 16] = "EnumMember", t[t.Keyword = 17] = "Keyword", t[t.Text = 18] = "Text", t[t.Color = 19] = "Color", t[t.File = 20] = "File", t[t.Reference = 21] = "Reference", t[t.Customcolor = 22] = "Customcolor", t[t.Folder = 23] = "Folder", t[t.TypeParameter = 24] = "TypeParameter", t[t.User = 25] = "User", t[t.Issue = 26] = "Issue", t[t.Snippet = 27] = "Snippet", t))(L || {}), w = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(w || {});
-function Le(t) {
+function ge(t) {
   switch (t) {
     case m.Schema:
       return L.Module;
@@ -3395,7 +3397,7 @@ function Le(t) {
       return L.Text;
   }
 }
-function Oe(t, e) {
+function Se(t, e) {
   if (!t || Ve(t))
     return !1;
   for (const n of t.trailingTrivia) {
@@ -3411,7 +3413,7 @@ function S() {
     suggestions: []
   };
 }
-function Se(t) {
+function Re(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
@@ -3443,18 +3445,18 @@ class Mt {
       ...(r == null ? void 0 : r.trailingTrivia) || [],
       ...(r == null ? void 0 : r.leadingTrivia) || [],
       ...(l == null ? void 0 : l.leadingTrivia) || []
-    ].find((N) => $t(N) && be(s, N)))
+    ].find((N) => $t(N) && Ie(s, N)))
       return S();
     if (a === void 0)
       return mt();
-    if ([c.STRING_LITERAL, c.QUOTED_STRING].includes(r.kind) && be(s, r))
+    if ([c.STRING_LITERAL, c.QUOTED_STRING].includes(r.kind) && Ie(s, r))
       return S();
     const p = this.compiler.container.element(s);
-    if (this.compiler.container.scopeKind(s) === R.TOPLEVEL || p instanceof _ && p.type && p.type.start <= s && p.type.end >= s)
+    if (this.compiler.container.scopeKind(s) === R.TOPLEVEL || p instanceof A && p.type && p.type.start <= s && p.type.end >= s)
       return mt();
     const h = [...this.compiler.container.stack(s)].reverse();
     for (const N of h)
-      if (N instanceof Q)
+      if (N instanceof q)
         switch ((T = N.op) == null ? void 0 : T.value) {
           case ">":
           case "<":
@@ -3466,7 +3468,7 @@ class Mt {
               N
             );
         }
-      else if (N instanceof q)
+      else if (N instanceof H)
         switch ((f = N.op) == null ? void 0 : f.value) {
           case ">":
           case "<":
@@ -3485,15 +3487,15 @@ class Mt {
             );
         }
       else {
-        if (N instanceof ne)
+        if (N instanceof se)
           return dt(this.compiler, s, N);
         if (N instanceof P)
           return dt(this.compiler, s, N);
-        if (N instanceof J)
+        if (N instanceof Z)
           return qn(this.compiler, s);
         if (N instanceof k)
           return Nt(this.compiler, s, N);
-        if (N instanceof _ && (N.bodyColon && s >= N.bodyColon.end || N.body && be(s, N.body)))
+        if (N instanceof A && (N.bodyColon && s >= N.bodyColon.end || N.body && Ie(s, N.body)))
           return Nt(this.compiler, s, void 0);
       }
     return S();
@@ -3507,7 +3509,7 @@ function pt(t, e, n) {
       m.Schema,
       m.Column
     ]);
-    return Oe(n.op, e) ? Se(i) : i;
+    return Se(n.op, e) ? Re(i) : i;
   }
   return S();
 }
@@ -3525,13 +3527,13 @@ function Me(t, e, n, s) {
           label: p,
           insertText: p,
           insertTextRules: w.KeepWhitespace,
-          kind: Le(h),
-          sortText: Le(h).toString().padStart(2, "0"),
+          kind: ge(h),
+          sortText: ge(h).toString().padStart(2, "0"),
           range: void 0
         }))
       );
     }
-    i = i instanceof _ ? i.parent : void 0;
+    i = i instanceof A ? i.parent : void 0;
   }
   return Ue(r);
 }
@@ -3545,7 +3547,7 @@ function qn(t, e) {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
           const r = i.pop();
-          if (r instanceof q && ((s = r.op) == null ? void 0 : s.value) === ".")
+          if (r instanceof H && ((s = r.op) == null ? void 0 : s.value) === ".")
             return Ft(
               t,
               e,
@@ -3561,25 +3563,25 @@ function dt(t, e, n) {
   const { token: s } = t.container.token(e);
   if ([c.COMMA, c.LBRACKET].includes(s == null ? void 0 : s.kind)) {
     const i = Et(t, e);
-    return (s == null ? void 0 : s.kind) === c.COMMA && Oe(s, e) ? Se(i) : i;
+    return (s == null ? void 0 : s.kind) === c.COMMA && Se(s, e) ? Re(i) : i;
   }
   if (n.name && n.name.start <= e && n.name.end >= e)
     return Et(t, e);
-  if (n.name instanceof K) {
+  if (n.name instanceof C) {
     const i = Hn(
       t,
       e,
-      De(n.name).unwrap()
+      Ne(n.name).unwrap()
     );
-    return (s == null ? void 0 : s.kind) === c.COLON && Oe(s, e) ? Se(i) : i;
+    return (s == null ? void 0 : s.kind) === c.COLON && Se(s, e) ? Re(i) : i;
   }
   return S();
 }
 function Et(t, e) {
   const n = t.container.element(e), s = t.container.scopeKind(e);
-  if (n instanceof C)
+  if (n instanceof X)
     return S();
-  if (n.body && !be(e, n.body))
+  if (n.body && !Ie(e, n.body))
     switch (s) {
       case R.TABLE:
         return {
@@ -3701,7 +3703,7 @@ function Hn(t, e, n) {
   return S();
 }
 function Ft(t, e, n) {
-  const s = ue(n).unwrap_or([]);
+  const s = he(n).unwrap_or([]);
   if (s.pop(), s.some((r) => !M(r)))
     return S();
   const i = s.map((r) => G(r).unwrap());
@@ -3709,7 +3711,7 @@ function Ft(t, e, n) {
     suggestions: t.symbol.ofName({ nameStack: i, owner: t.container.element(e) }).flatMap(({ symbol: r }) => t.symbol.members(r)).map(({ kind: r, name: a }) => ({
       label: a,
       insertText: a,
-      kind: Le(r),
+      kind: ge(r),
       range: void 0
     }))
   });
@@ -3727,7 +3729,7 @@ function Nt(t, e, n) {
       return Jn(t, e, n);
     case R.REF: {
       const r = Bt(t, e);
-      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === c.COLON && Oe(t.container.token(e).token, e) ? Se(r) : r;
+      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === c.COLON && Se(t.container.token(e).token, e) ? Re(r) : r;
     }
     case R.TABLEGROUP:
       return es(t);
@@ -3804,7 +3806,7 @@ function Bt(t, e) {
 function es(t) {
   return Ue({
     suggestions: [...t.parse.publicSymbolTable().entries()].flatMap(([e]) => {
-      const n = se(e).unwrap_or(void 0);
+      const n = ie(e).unwrap_or(void 0);
       if (n === void 0)
         return [];
       const { kind: s, name: i } = n;
@@ -3812,7 +3814,7 @@ function es(t) {
         label: i,
         insertText: i,
         insertTextRules: w.KeepWhitespace,
-        kind: Le(s),
+        kind: ge(s),
         range: void 0
       };
     })
@@ -3903,7 +3905,7 @@ function Vt(t, e) {
   const { symbolTable: i } = s.symbol;
   return Ue({
     suggestions: [...i.entries()].flatMap(([r]) => {
-      const a = se(r).unwrap_or(void 0);
+      const a = ie(r).unwrap_or(void 0);
       if (a === void 0)
         return [];
       const { name: l } = a;
@@ -3911,7 +3913,7 @@ function Vt(t, e) {
         label: l,
         insertText: l,
         insertTextRules: w.KeepWhitespace,
-        kind: Le(m.Column),
+        kind: ge(m.Column),
         range: void 0
       };
     })
@@ -3932,7 +3934,7 @@ class Gt {
     const { uri: s } = e, i = Ke(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const l = r.pop();
-      if ((a = l == null ? void 0 : l.referee) != null && a.declaration && [pe.PRIMARY_EXPRESSION, pe.VARIABLE].includes(l == null ? void 0 : l.kind)) {
+      if ((a = l == null ? void 0 : l.referee) != null && a.declaration && [de.PRIMARY_EXPRESSION, de.VARIABLE].includes(l == null ? void 0 : l.kind)) {
         const { startPos: p, endPos: h } = l.referee.declaration;
         return [
           {
@@ -3959,9 +3961,9 @@ class Ct {
     for (; r.length !== 0; ) {
       const a = r.pop();
       if (a && [
-        pe.ELEMENT_DECLARATION,
-        pe.FUNCTION_APPLICATION,
-        pe.PRIMARY_EXPRESSION
+        de.ELEMENT_DECLARATION,
+        de.FUNCTION_APPLICATION,
+        de.PRIMARY_EXPRESSION
       ].includes(a == null ? void 0 : a.kind)) {
         const { symbol: l } = a;
         if (l != null && l.references.length)
@@ -4046,7 +4048,7 @@ class as {
           let a = this.parse.ast();
           const l = [a];
           for (; ; ) {
-            const h = sn(a).find((T) => be(r, T));
+            const h = sn(a).find((T) => Ie(r, T));
             if (h === void 0 || h instanceof B)
               break;
             l.push(h), a = h;
@@ -4062,10 +4064,10 @@ class as {
                 T[f] === `
 ` && (l.pop(), p = !0);
             } else
-              h instanceof Q || h instanceof q ? this.container.token(e).token !== h.op && (l.pop(), p = !0) : h instanceof P ? h.listCloseBracket && h.end <= e && (l.pop(), p = !0) : h instanceof J ? h.tupleCloseParen && h.end <= e && (l.pop(), p = !0) : h instanceof te ? h.blockCloseBrace && h.end <= e && (l.pop(), p = !0) : h instanceof K || h.end < e && (l.pop(), p = !0);
+              h instanceof q || h instanceof H ? this.container.token(e).token !== h.op && (l.pop(), p = !0) : h instanceof P ? h.listCloseBracket && h.end <= e && (l.pop(), p = !0) : h instanceof Z ? h.tupleCloseParen && h.end <= e && (l.pop(), p = !0) : h instanceof ne ? h.blockCloseBrace && h.end <= e && (l.pop(), p = !0) : h instanceof C || h.end < e && (l.pop(), p = !0);
             if (p) {
               const T = I.last(l);
-              T instanceof _ && T.end <= e && l.pop();
+              T instanceof A && T.end <= e && l.pop();
             }
             if (!p)
               break;
@@ -4088,7 +4090,7 @@ class as {
         (e) => {
           const n = this.container.stack(e);
           for (let s = n.length - 1; s >= 0; s -= 1)
-            if (n[s] instanceof _)
+            if (n[s] instanceof A)
               return n[s];
           return this.parse.ast();
         }
@@ -4102,7 +4104,7 @@ class as {
       ),
       scopeKind: this.createQuery(15, (e) => {
         var s;
-        if (this.container.element(e) instanceof C)
+        if (this.container.element(e) instanceof X)
           return 8;
         switch ((s = this.container.element(e).type) == null ? void 0 : s.value.toLowerCase()) {
           case "table":
@@ -4138,7 +4140,7 @@ class as {
           if (e.length === 0)
             return [];
           const s = [];
-          for (let r = n; r; r = r instanceof _ ? r.parent : void 0) {
+          for (let r = n; r; r = r instanceof A ? r.parent : void 0) {
             if (!((i = r.symbol) != null && i.symbolTable))
               continue;
             const { symbolTable: a } = r.symbol;
@@ -4146,7 +4148,7 @@ class as {
             for (const h of e)
               p = l.flatMap(
                 (T) => Yt(h).flatMap((f) => {
-                  const N = T.get(f), g = se(f).unwrap_or(void 0);
+                  const N = T.get(f), g = ie(f).unwrap_or(void 0);
                   return !N || !g ? [] : { ...g, symbol: N };
                 })
               ), l = p.flatMap(
@@ -4161,7 +4163,7 @@ class as {
       members: this.createQuery(
         9,
         (e) => e.symbolTable ? [...e.symbolTable.entries()].map(([n, s]) => ({
-          ...se(n).unwrap(),
+          ...ie(n).unwrap(),
           symbol: s
         })) : []
       )