@dbml/parse 3.9.7-alpha.0 → 3.10.1

package/dist/dbml-parse.mjs

@@ -1,4 +1,4 @@
-import I, { last as Xe, partition as zt, findLastIndex as Qt } from "lodash";
+import I, { last as $e, partition as zt, findLastIndex as Qt } from "lodash";
 var u = /* @__PURE__ */ ((t) => (t.SPACE = "<space>", t.TAB = "<tab>", t.NEWLINE = "<newline>", t.COMMA = "<comma>", t.LPAREN = "<lparen>", t.RPAREN = "<rparen>", t.LBRACE = "<lbrace>", t.RBRACE = "<rbrace>", t.LBRACKET = "<lbracket>", t.RBRACKET = "<rbracket>", t.LANGLE = "<langle>", t.RANGLE = "<rangle>", t.OP = "<op>", t.EOF = "<eof>", t.NUMERIC_LITERAL = "<number>", t.STRING_LITERAL = "<string>", t.COLOR_LITERAL = "<color>", t.FUNCTION_EXPRESSION = "<function-expression>", t.QUOTED_STRING = "<variable>", t.IDENTIFIER = "<identifier>", t.SEMICOLON = "<semicolon>", t.COLON = "<colon>", t.SINGLE_LINE_COMMENT = "<single-line-comment>", t.MULTILINE_COMMENT = "<multiline-comment>", t))(u || {});
 function qt(t) {
   switch (t.kind) {
@@ -12,7 +12,7 @@ function qt(t) {
       return !1;
   }
 }
-function ot(t) {
+function lt(t) {
   if (!t)
     return !1;
   switch (t) {
@@ -33,31 +33,31 @@ function ot(t) {
       return !1;
   }
 }
-function lt(t) {
+function ct(t) {
   return t !== void 0 && t.kind === "<op>";
 }
-class V {
+class G {
   constructor(e, n, s, i, r) {
     this.kind = e, this.startPos = n, this.endPos = s, this.value = i, this.leadingTrivia = [], this.trailingTrivia = [], this.leadingInvalid = [], this.trailingInvalid = [], this.isInvalid = r, this.start = n.offset, this.end = s.offset;
   }
   static create(e, n, s, i, r) {
-    return new V(e, n, s, i, r);
+    return new G(e, n, s, i, r);
   }
 }
-function Lt(t) {
+function gt(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === u.NEWLINE) !== void 0;
 }
-function ct(t, e) {
-  return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || Lt(t);
+function ut(t, e) {
+  return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || gt(t);
 }
-function $e(t) {
+function We(t) {
   return t.trailingTrivia.find(({ kind: e }) => [u.SPACE, u.TAB].includes(e)) !== void 0;
 }
-function gt(t) {
-  return t.trailingTrivia.length === 0 ? t.end : gt(Xe(t.trailingTrivia));
-}
 function _t(t) {
-  return t.leadingTrivia.length === 0 ? t.start : _t(t.leadingTrivia[0]);
+  return t.trailingTrivia.length === 0 ? t.end : _t($e(t.trailingTrivia));
+}
+function At(t) {
+  return t.leadingTrivia.length === 0 ? t.start : At(t.leadingTrivia[0]);
 }
 function Ht(t) {
   return [u.SINGLE_LINE_COMMENT, u.MULTILINE_COMMENT].includes(
@@ -81,13 +81,13 @@ class k {
   constructor(e, n, s) {
     this.id = e, this.kind = n;
     const i = s.find((a) => a !== void 0 && !Number.isNaN(a.start));
-    i ? (this.startPos = i.startPos, this.fullStart = i instanceof V ? _t(i) : i.fullStart) : (this.startPos = {
+    i ? (this.startPos = i.startPos, this.fullStart = i instanceof G ? At(i) : i.fullStart) : (this.startPos = {
       offset: NaN,
       column: NaN,
       line: NaN
     }, this.fullStart = NaN);
     const r = [...s].reverse().find((a) => a !== void 0 && !Number.isNaN(a.end));
-    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof V ? gt(r) : r.fullEnd) : (this.endPos = {
+    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof G ? _t(r) : r.fullEnd) : (this.endPos = {
       offset: NaN,
       column: NaN,
       line: NaN
@@ -95,7 +95,7 @@ class k {
   }
 }
 var Ne = /* @__PURE__ */ ((t) => (t.PROGRAM = "<program>", t.ELEMENT_DECLARATION = "<element-declaration>", t.ATTRIBUTE = "<attribute>", t.IDENTIFIER_STREAM = "<identifer-stream>", t.LITERAL = "<literal>", t.VARIABLE = "<variable>", t.PREFIX_EXPRESSION = "<prefix-expression>", t.INFIX_EXPRESSION = "<infix-expression>", t.POSTFIX_EXPRESSION = "<postfix-expression>", t.FUNCTION_EXPRESSION = "<function-expression>", t.FUNCTION_APPLICATION = "<function-application>", t.BLOCK_EXPRESSION = "<block-expression>", t.LIST_EXPRESSION = "<list-expression>", t.TUPLE_EXPRESSION = "<tuple-expression>", t.CALL_EXPRESSION = "<call-expression>", t.PRIMARY_EXPRESSION = "<primary-expression>", t.GROUP_EXPRESSION = "<group-expression>", t.DUMMY = "<dummy>", t.ARRAY = "<array>", t))(Ne || {});
-class $ extends k {
+class j extends k {
   constructor({ body: e = [], eof: n }, s) {
     super(s, "<program>", [...e, n]), this.body = e, this.eof = n;
   }
@@ -123,7 +123,7 @@ class A extends k {
     this.type = e, this.name = n, this.as = s, this.alias = i, this.attributeList = r, this.bodyColon = a, this.body = l;
   }
 }
-class z extends k {
+class q extends k {
   constructor({ identifiers: e = [] }, n) {
     super(n, "<identifer-stream>", e || []), this.identifiers = e;
   }
@@ -137,12 +137,12 @@ class ie extends k {
     super(i, "<attribute>", [e, n, s]), this.name = e, this.value = s, this.colon = n;
   }
 }
-class q extends k {
+class H extends k {
   constructor({ op: e, expression: n }, s) {
     super(s, "<prefix-expression>", [e, n]), this.op = e, this.expression = n;
   }
 }
-class H extends k {
+class J extends k {
   constructor({
     op: e,
     leftExpression: n,
@@ -151,7 +151,7 @@ class H extends k {
     super(i, "<infix-expression>", [n, e, s]), this.op = e, this.leftExpression = n, this.rightExpression = s;
   }
 }
-class Ue extends k {
+class Me extends k {
   constructor({ op: e, expression: n }, s) {
     super(s, "<postfix-expression>", [n, e]), this.op = e, this.expression = n;
   }
@@ -166,7 +166,7 @@ class v extends k {
     super(s, "<function-application>", [e, ...n]), this.callee = e, this.args = n;
   }
 }
-class Z extends k {
+class K extends k {
   constructor({
     blockOpenBrace: e,
     body: n = [],
@@ -175,7 +175,7 @@ class Z extends k {
     super(i, "<block-expression>", [e, ...n, s]), this.blockOpenBrace = e, this.body = n, this.blockCloseBrace = s;
   }
 }
-class P extends k {
+class R extends k {
   constructor({
     listOpenBracket: e,
     elementList: n = [],
@@ -184,12 +184,12 @@ class P extends k {
   }, r) {
     super(r, "<list-expression>", [
       e,
-      ...At(n, s),
+      ...vt(n, s),
       i
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
 }
-class K extends k {
+class ee extends k {
   constructor({
     tupleOpenParen: e,
     elementList: n = [],
@@ -198,12 +198,12 @@ class K extends k {
   }, r) {
     super(r, "<tuple-expression>", [
       e,
-      ...At(n, s),
+      ...vt(n, s),
       i
     ]), this.tupleOpenParen = e, this.elementList = n, this.commaList = s, this.tupleCloseParen = i;
   }
 }
-class Ye extends K {
+class ze extends ee {
   constructor({
     groupOpenParen: e,
     expression: n,
@@ -220,7 +220,7 @@ class Ye extends K {
     ), this.kind = "<group-expression>";
   }
 }
-class J extends k {
+class Z extends k {
   constructor({
     callee: e,
     argumentList: n
@@ -233,19 +233,19 @@ class be extends k {
     super(n, "<literal>", [e]), this.literal = e;
   }
 }
-class ee extends k {
+class te extends k {
   constructor({ variable: e }, n) {
     super(n, "<variable>", [e]), this.variable = e;
   }
 }
-class F extends k {
+class M extends k {
   constructor({ expression: e }, n) {
     super(n, "<primary-expression>", [e]), this.expression = e;
   }
 }
-class xe extends k {
+class Se extends k {
   constructor({ pre: e }, n) {
-    const s = V.create(u.SPACE, e.endPos, e.endPos, " ", !1);
+    const s = G.create(u.SPACE, e.endPos, e.endPos, " ", !1);
     super(n, "<dummy>", [s]);
   }
 }
@@ -254,7 +254,7 @@ class he extends k {
     super(s, "<array>", [e, n]), this.array = e, this.indexer = n;
   }
 }
-function At(t, e) {
+function vt(t, e) {
   if (!t || t.length === 0)
     return e || [];
   if (!e || e.length === 0)
@@ -269,7 +269,7 @@ function hs(t, e = !1) {
     t,
     function(n, s) {
       var i;
-      return !(this instanceof $) && n === "symbol" ? s == null ? void 0 : s.id : (
+      return !(this instanceof j) && n === "symbol" ? s == null ? void 0 : s.id : (
         /* this instanceof SyntaxNode && */
         n === "symbol" ? {
           symbolTable: s == null ? void 0 : s.symbolTable,
@@ -335,46 +335,46 @@ class y {
   }
 }
 var T = /* @__PURE__ */ ((t) => (t.Schema = "Schema", t.Table = "Table", t.Column = "Column", t.TableGroup = "TableGroup", t.TableGroupField = "TableGroup field", t.Enum = "Enum", t.EnumField = "Enum field", t.Note = "Note", t))(T || {});
-function ze(t) {
+function Qe(t) {
   return `Schema:${t}`;
 }
-function Oe(t) {
+function De(t) {
   return `Table:${t}`;
 }
-function Qe(t) {
+function qe(t) {
   return `Column:${t}`;
 }
-function qe(t) {
+function He(t) {
   return `Enum:${t}`;
 }
-function He(t) {
+function Je(t) {
   return `Enum field:${t}`;
 }
-function Je(t) {
+function Ze(t) {
   return `TableGroup:${t}`;
 }
-function Ze(t) {
+function Ke(t) {
   return `TableGroup field:${t}`;
 }
 function Zt(t) {
   return `Note:${t}`;
 }
-function Ge(t, e) {
+function Ce(t, e) {
   switch (e) {
     case "Column":
-      return Qe(t);
-    case "Enum":
       return qe(t);
-    case "Enum field":
+    case "Enum":
       return He(t);
+    case "Enum field":
+      return Je(t);
     case "Schema":
-      return ze(t);
+      return Qe(t);
     case "Table":
-      return Oe(t);
+      return De(t);
     case "TableGroup":
-      return Je(t);
-    case "TableGroup field":
       return Ze(t);
+    case "TableGroup field":
+      return Ke(t);
     default:
       throw new Error("Unreachable");
   }
@@ -395,36 +395,36 @@ function Kt(t) {
 }
 function en(t) {
   return [
-    ze,
-    Oe,
-    qe,
-    Je,
     Qe,
+    De,
     He,
-    Ze
+    Ze,
+    qe,
+    Je,
+    Ke
   ].map((e) => e(t));
 }
-function Me(t) {
+function Fe(t) {
   return !!t.match(/(\p{L}|_|\p{M})/gu);
 }
-function De(t) {
+function Re(t) {
   const [e] = t;
   return e >= "0" && e <= "9";
 }
 function tn(t) {
   const [e] = t;
-  return De(e) || Me(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
+  return Re(e) || Fe(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
 function Ee(t) {
-  return Me(t) || De(t);
+  return Fe(t) || Re(t);
 }
-function ut(t, e) {
+function ht(t, e) {
   const n = [], s = Math.min(t.length, e.length);
   for (let i = 0; i < s; i += 1)
     n.push(t[i], e[i]);
   return n.push(...t.slice(s), ...e.slice(s)), n;
 }
-function ge(t, e) {
+function _e(t, e) {
   return t >= e.start && t < e.end;
 }
 class nn {
@@ -438,7 +438,7 @@ class nn {
     return this.id++;
   }
 }
-class vt {
+class wt {
   constructor({ symbolTable: e }, n) {
     this.references = [], this.id = n, this.symbolTable = e;
   }
@@ -453,7 +453,7 @@ class rn {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class wt {
+class yt {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
@@ -479,7 +479,7 @@ class c extends Error {
     super(n), this.code = e, this.diagnostic = n, this.nodeOrToken = s, this.start = s.start, this.end = s.end, this.name = this.constructor.name, Object.setPrototypeOf(this, c.prototype);
   }
 }
-class G {
+class X {
   constructor(e, n) {
     this.value = e, this.errors = n === void 0 ? [] : n;
   }
@@ -491,24 +491,24 @@ class G {
   }
   chain(e) {
     const n = e(this.value), s = [...this.errors, ...n.errors];
-    return new G(n.value, s);
+    return new X(n.value, s);
   }
   map(e) {
-    return new G(e(this.value), this.errors);
+    return new X(e(this.value), this.errors);
   }
 }
 function cn(t, e, n) {
   if (!t || !me(t) || e.length === 0)
     return new y();
-  const s = [...e], i = Ce(t).unwrap(), r = s.pop();
-  if (!(r instanceof Z))
+  const s = [...e], i = Xe(t).unwrap(), r = s.pop();
+  if (!(r instanceof K))
     return new y();
-  const a = I.last(s) instanceof P ? s.pop() : void 0;
-  return s.length === 3 && Ce(s[1]).unwrap().value === "as" ? new x(
+  const a = I.last(s) instanceof R ? s.pop() : void 0;
+  return s.length === 3 && Xe(s[1]).unwrap().value === "as" ? new x(
     n.create(A, {
       type: i,
       name: s[0],
-      as: Ce(s[1]).unwrap(),
+      as: Xe(s[1]).unwrap(),
       alias: s[2],
       attributeList: a,
       body: r
@@ -528,11 +528,11 @@ function cn(t, e, n) {
     })
   ) : new y();
 }
-function ht(t) {
+function ft(t) {
   return t.kind === u.IDENTIFIER && t.value === "as";
 }
 function N(t) {
-  t && (t instanceof V ? un(t) : hn(t));
+  t && (t instanceof G ? un(t) : hn(t));
 }
 function un(t) {
   t.kind !== u.EOF && (t.isInvalid = !0);
@@ -540,45 +540,45 @@ function un(t) {
 function hn(t) {
   if (t instanceof A)
     N(t.type), N(t.name), N(t.as), N(t.alias), N(t.bodyColon), N(t.attributeList), N(t.body);
-  else if (t instanceof z)
+  else if (t instanceof q)
     t.identifiers.forEach(N);
   else if (t instanceof ie)
     N(t.name), N(t.colon), N(t.value);
-  else if (t instanceof q)
-    N(t.op), N(t.expression);
   else if (t instanceof H)
+    N(t.op), N(t.expression);
+  else if (t instanceof J)
     N(t.leftExpression), N(t.op), N(t.rightExpression);
-  else if (t instanceof Ue)
+  else if (t instanceof Me)
     N(t.op), N(t.expression);
-  else if (t instanceof Z)
+  else if (t instanceof K)
     N(t.blockOpenBrace), t.body.forEach(N), N(t.blockCloseBrace);
-  else if (t instanceof P)
+  else if (t instanceof R)
     N(t.listOpenBracket), t.commaList.forEach(N), t.elementList.forEach(N), N(t.listCloseBracket);
-  else if (t instanceof K)
+  else if (t instanceof ee)
     N(t.tupleOpenParen), t.commaList.forEach(N), t.elementList.forEach(N), N(t.tupleCloseParen);
-  else if (t instanceof J)
+  else if (t instanceof Z)
     N(t.callee), N(t.argumentList);
   else if (t instanceof v)
     N(t.callee), t.args.forEach(N);
-  else if (t instanceof F)
+  else if (t instanceof M)
     N(t.expression);
   else if (t instanceof se)
     N(t.value);
-  else if (t instanceof ee)
+  else if (t instanceof te)
     N(t.variable);
   else if (t instanceof be)
     N(t.literal);
   else
-    throw t instanceof Ye ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
+    throw t instanceof ze ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
 }
-function yt(t) {
+function kt(t) {
   return !!(t != null && t.isInvalid);
 }
 function U(...t) {
   return t.filter((e) => e !== void 0);
 }
 function fn(t) {
-  if (t instanceof $)
+  if (t instanceof j)
     return U(...t.body, t.eof);
   if (t instanceof A)
     return U(
@@ -592,64 +592,64 @@ function fn(t) {
     );
   if (t instanceof ie)
     return U(t.name, t.colon, t.value);
-  if (t instanceof z)
+  if (t instanceof q)
     return t.identifiers;
   if (t instanceof be)
     return t.literal ? [t.literal] : [];
-  if (t instanceof ee)
+  if (t instanceof te)
     return U(t.variable);
-  if (t instanceof q)
-    return U(t.op, t.expression);
   if (t instanceof H)
+    return U(t.op, t.expression);
+  if (t instanceof J)
     return U(t.leftExpression, t.op, t.rightExpression);
-  if (t instanceof Ue)
+  if (t instanceof Me)
     return U(t.expression, t.op);
   if (t instanceof se)
     return U(t.value);
   if (t instanceof v)
     return U(t.callee, ...t.args);
-  if (t instanceof Z)
+  if (t instanceof K)
     return U(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
-  if (t instanceof P)
+  if (t instanceof R)
     return U(
       t.listOpenBracket,
-      ...ut(t.elementList, t.commaList),
+      ...ht(t.elementList, t.commaList),
       t.listCloseBracket
     );
-  if (t instanceof K)
+  if (t instanceof ee)
     return U(
       t.tupleOpenParen,
-      ...ut(t.elementList, t.commaList),
+      ...ht(t.elementList, t.commaList),
       t.tupleCloseParen
     );
-  if (t instanceof J)
+  if (t instanceof Z)
     return U(t.callee, t.argumentList);
-  if (t instanceof F)
+  if (t instanceof M)
     return U(t.expression);
   if (t instanceof he)
     return U(
       t.array,
       t.indexer
     );
-  throw t instanceof Ye ? new Error("This case is already handled by TupleExpressionNode") : new Error("Unreachable - no other possible cases");
+  throw t instanceof ze ? new Error("This case is already handled by TupleExpressionNode") : new Error("Unreachable - no other possible cases");
 }
-function Ce(t) {
-  return B(t) ? new x(t.expression.variable) : new y();
+function Xe(t) {
+  return V(t) ? new x(t.expression.variable) : new y();
 }
-function W(t) {
+function Y(t) {
   var e;
-  return t instanceof F && (t.expression instanceof ee && t.expression.variable instanceof V && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof be && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
+  return t instanceof M && (t.expression instanceof te && t.expression.variable instanceof G && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof be && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
 }
-function B(t) {
-  return t instanceof F && t.expression instanceof ee && t.expression.variable instanceof V;
+function V(t) {
+  return t instanceof M && t.expression instanceof te && t.expression.variable instanceof G;
 }
 function me(t) {
   var e;
-  return t instanceof F && t.expression instanceof ee && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
+  return t instanceof M && t.expression instanceof te && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
 }
-function Ke(t) {
+function et(t) {
   var e;
-  return t instanceof H && t.leftExpression instanceof k && t.rightExpression instanceof k && ((e = t.op) == null ? void 0 : e.value) === ".";
+  return t instanceof J && t.leftExpression instanceof k && t.rightExpression instanceof k && ((e = t.op) == null ? void 0 : e.value) === ".";
 }
 function Te(t) {
   if (t === void 0)
@@ -697,7 +697,7 @@ class pn {
     this.tokens.push(this.createToken(e, n));
   }
   createToken(e, n = !1) {
-    return V.create(
+    return G.create(
       e,
       this.start,
       this.current,
@@ -706,7 +706,7 @@ class pn {
     );
   }
   lex() {
-    return this.scanTokens(), this.tokens.push(V.create(u.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new G(this.tokens, this.errors);
+    return this.scanTokens(), this.tokens.push(G.create(u.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new X(this.tokens, this.errors);
   }
   scanTokens() {
     for (; !this.isAtEnd(); ) {
@@ -767,15 +767,15 @@ class pn {
           this.match("/") ? this.singleLineComment() : this.match("*") ? this.multilineComment() : this.operator();
           break;
         default:
-          if (ot(e)) {
+          if (lt(e)) {
             this.operator();
             break;
           }
-          if (Me(e)) {
+          if (Fe(e)) {
             this.identifier();
             break;
           }
-          if (De(e)) {
+          if (Re(e)) {
             this.numericLiteralOrIdentifier();
             break;
           }
@@ -801,7 +801,7 @@ class pn {
   gatherInvalid() {
     let e;
     const n = [], s = [];
-    for (e = 0; e < this.tokens.length && yt(this.tokens[e]); e += 1)
+    for (e = 0; e < this.tokens.length && kt(this.tokens[e]); e += 1)
       s.push(this.tokens[e]);
     let i = this.tokens[e];
     for (i.leadingInvalid = [...s, ...i.leadingInvalid]; e < this.tokens.length; e += 1) {
@@ -843,7 +843,7 @@ class pn {
       );
       return;
     }
-    a && this.match(n), this.tokens.push(V.create(e, this.start, this.current, l, !1));
+    a && this.match(n), this.tokens.push(G.create(e, this.start, this.current, l, !1));
   }
   singleLineStringLiteral() {
     this.consumeUntil(u.STRING_LITERAL, "'", {
@@ -895,7 +895,7 @@ class pn {
     this.addToken(u.IDENTIFIER);
   }
   operator() {
-    for (; ot(this.peek()); )
+    for (; lt(this.peek()); )
       this.advance();
     this.addToken(u.OP);
   }
@@ -912,7 +912,7 @@ class pn {
         return this.advance(), this.addToken(u.NUMERIC_LITERAL);
       if (!n && !Ee(this.peek()))
         return this.addToken(u.NUMERIC_LITERAL);
-      if (!n && !De(this.peek()))
+      if (!n && !Re(this.peek()))
         break;
       this.advance();
     }
@@ -971,7 +971,7 @@ class pn {
         let n = "";
         for (let s = 0; s <= 3; s += 1) {
           if (this.isAtEnd() || !Ee(this.peek()))
-            return this.errors.push(new c(o.INVALID_ESCAPE_SEQUENCE, `Invalid unicode escape sequence '\\u${n}', only unicode escape sequences of the form '\\uHHHH' where H is a hexadecimal number are allowed`, V.create(u.STRING_LITERAL, e, this.current, `\\u${n}`, !0))), `\\u${n}`;
+            return this.errors.push(new c(o.INVALID_ESCAPE_SEQUENCE, `Invalid unicode escape sequence '\\u${n}', only unicode escape sequences of the form '\\uHHHH' where H is a hexadecimal number are allowed`, G.create(u.STRING_LITERAL, e, this.current, `\\u${n}`, !0))), `\\u${n}`;
           n += this.advance();
         }
         return String.fromCharCode(parseInt(n, 16));
@@ -981,7 +981,7 @@ class pn {
     }
   }
 }
-var Se = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(Se || {});
+var Oe = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(Oe || {});
 class dn {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
@@ -1069,7 +1069,7 @@ class Nn {
     }, this.synchronizeElementDeclarationName = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (ht(s) || this.check(u.COLON, u.LBRACE, u.LBRACKET))
+        if (ft(s) || this.check(u.COLON, u.LBRACE, u.LBRACKET))
           break;
         N(s), this.advance();
       }
@@ -1080,8 +1080,8 @@ class Nn {
           break;
         N(s), this.advance();
       }
-    }, this.blockExpression = this.contextStack.withContextDo(Se.BlockExpression, () => {
-      const s = { body: [] }, i = () => this.nodeFactory.create(Z, s);
+    }, this.blockExpression = this.contextStack.withContextDo(Oe.BlockExpression, () => {
+      const s = { body: [] }, i = () => this.nodeFactory.create(K, s);
       try {
         this.consume("Expect an opening brace '{'", u.LBRACE), s.blockOpenBrace = this.previous();
       } catch (r) {
@@ -1115,16 +1115,16 @@ class Nn {
       if (!this.check(u.RBRACE))
         for (N(this.advance()); !this.isAtEnd(); ) {
           const s = this.peek();
-          if (this.check(u.RBRACE) || ct(this.previous(), s))
+          if (this.check(u.RBRACE) || ut(this.previous(), s))
             break;
           N(s), this.advance();
         }
-    }, this.tupleExpression = this.contextStack.withContextDo(Se.GroupExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(Ye, {
+    }, this.tupleExpression = this.contextStack.withContextDo(Oe.GroupExpression, () => {
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(ze, {
         groupOpenParen: s.tupleOpenParen,
         groupCloseParen: s.tupleCloseParen,
         expression: s.elementList[0]
-      }), r = () => this.nodeFactory.create(K, s);
+      }), r = () => this.nodeFactory.create(ee, s);
       try {
         this.consume("Expect an opening parenthesis '('", u.LPAREN), s.tupleOpenParen = this.previous();
       } catch (a) {
@@ -1171,8 +1171,8 @@ class Nn {
           break;
         N(s), this.advance();
       }
-    }, this.listExpression = this.contextStack.withContextDo(Se.ListExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(P, s);
+    }, this.listExpression = this.contextStack.withContextDo(Oe.ListExpression, () => {
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(R, s);
       try {
         this.consume("Expect an opening bracket '['", u.LBRACKET), s.listOpenBracket = this.previous();
       } catch (r) {
@@ -1289,8 +1289,8 @@ class Nn {
     this.tokens = e;
   }
   parse() {
-    const e = this.program(), n = this.advance(), s = this.nodeFactory.create($, { body: e, eof: n });
-    return this.gatherInvalid(), new G({ ast: s, tokens: this.tokens }, this.errors);
+    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(j, { body: e, eof: n });
+    return this.gatherInvalid(), new X({ ast: s, tokens: this.tokens }, this.errors);
   }
   /* Parsing and synchronizing ProgramNode */
   program() {
@@ -1324,7 +1324,7 @@ class Nn {
           throw new d(s.token, n(), s.handlerContext);
         this.synchronizeElementDeclarationName();
       }
-    if (ht(this.peek()))
+    if (ft(this.peek()))
       if (e.as = this.advance(), this.check(u.COLON, u.LBRACE, u.LBRACKET))
         this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect an alias");
       else
@@ -1400,7 +1400,7 @@ class Nn {
       return n();
     let s = e.callee;
     for (; !this.shouldStopExpression(); ) {
-      $e(this.previous()) || this.logError(s, o.MISSING_SPACES, "Expect a following space");
+      We(this.previous()) || this.logError(s, o.MISSING_SPACES, "Expect a following space");
       try {
         s = this.normalExpression(), e.args.push(s);
       } catch (i) {
@@ -1410,7 +1410,7 @@ class Nn {
     return n();
   }
   shouldStopExpression() {
-    if (this.isAtEnd() || Lt(this.previous()))
+    if (this.isAtEnd() || gt(this.previous()))
       return !0;
     const e = this.peek().kind;
     return e === u.RBRACE || e === u.RBRACKET || e === u.RPAREN || e === u.COMMA || e === u.COLON;
@@ -1424,26 +1424,26 @@ class Nn {
     for (; !this.isAtEnd(); ) {
       const s = this.peek();
       if (s.kind === u.LPAREN) {
-        const { left: i } = ft(s);
+        const { left: i } = pt(s);
         if (i < e || // When '(' is encountered,
         // consider it part of another expression if
         // it's at the start of a new line
         // and we're currently not having unmatched '(' or '['
-        ct(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
+        ut(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
           break;
         try {
-          n = this.nodeFactory.create(J, {
+          n = this.nodeFactory.create(Z, {
             callee: n,
             argumentList: this.tupleExpression()
           });
         } catch (r) {
-          throw r instanceof d ? (n = this.nodeFactory.create(J, {
+          throw r instanceof d ? (n = this.nodeFactory.create(Z, {
             callee: n,
             argumentList: r.partialNode
           }), new d(r.token, n, r.handlerContext)) : r;
         }
       } else if (s.kind === u.LBRACKET) {
-        if ($e(this.previous()))
+        if (We(this.previous()))
           break;
         try {
           n = this.nodeFactory.create(he, {
@@ -1456,12 +1456,12 @@ class Nn {
             indexer: i.partialNode
           }), new d(i.token, n, i.handlerContext)) : i;
         }
-      } else if (lt(s)) {
-        const i = s, r = ft(i);
+      } else if (ct(s)) {
+        const i = s, r = pt(i);
         if (r.left !== null) {
           if (r.left <= e)
             break;
-          this.advance(), n = this.nodeFactory.create(Ue, {
+          this.advance(), n = this.nodeFactory.create(Me, {
             expression: n,
             op: i
           });
@@ -1471,13 +1471,13 @@ class Nn {
             break;
           this.advance();
           try {
-            n = this.nodeFactory.create(H, {
+            n = this.nodeFactory.create(J, {
               leftExpression: n,
               op: i,
               rightExpression: i.value === "." ? this.extractOperand() : this.expression_bp(a.right)
             });
           } catch (l) {
-            throw l instanceof d ? (n = this.nodeFactory.create(H, {
+            throw l instanceof d ? (n = this.nodeFactory.create(J, {
               leftExpression: n,
               op: i,
               rightExpression: l.partialNode
@@ -1491,7 +1491,7 @@ class Nn {
   }
   leftExpression_bp() {
     let e;
-    if (lt(this.peek())) {
+    if (ct(this.peek())) {
       const n = {};
       n.op = this.peek();
       const s = In(n.op);
@@ -1502,7 +1502,7 @@ class Nn {
           `Unexpected '${n.op.value}' in an expression`
         ), new d(
           n.op,
-          this.nodeFactory.create(xe, { pre: n.op }),
+          this.nodeFactory.create(Se, { pre: n.op }),
           this.contextStack.findHandlerContext(this.tokens, this.current)
         );
       this.advance();
@@ -1511,15 +1511,15 @@ class Nn {
       } catch (i) {
         throw i instanceof d ? (n.expression = i.partialNode, new d(
           i.token,
-          this.nodeFactory.create(q, n),
+          this.nodeFactory.create(H, n),
           i.handlerContext
         )) : i;
       }
-      e = this.nodeFactory.create(q, n);
-    } else if (e = this.extractOperand(), e instanceof xe)
+      e = this.nodeFactory.create(H, n);
+    } else if (e = this.extractOperand(), e instanceof Se)
       throw new d(
         this.peek(),
-        this.nodeFactory.create(xe, { pre: this.peek() }),
+        this.nodeFactory.create(Se, { pre: this.peek() }),
         this.contextStack.findHandlerContext(this.tokens, this.current)
       );
     return e;
@@ -1543,7 +1543,7 @@ class Nn {
       this.peek(),
       o.INVALID_OPERAND,
       `Invalid start of operand "${this.peek().value}"`
-    ), this.nodeFactory.create(xe, { pre: this.previous() }));
+    ), this.nodeFactory.create(Se, { pre: this.previous() }));
   }
   /* Parsing FunctionExpression */
   functionExpression() {
@@ -1569,12 +1569,12 @@ class Nn {
       u.STRING_LITERAL,
       u.NUMERIC_LITERAL
     ))
-      return this.nodeFactory.create(F, {
+      return this.nodeFactory.create(M, {
         expression: this.nodeFactory.create(be, { literal: this.previous() })
       });
     if (this.match(u.QUOTED_STRING, u.IDENTIFIER))
-      return this.nodeFactory.create(F, {
-        expression: this.nodeFactory.create(ee, { variable: this.previous() })
+      return this.nodeFactory.create(M, {
+        expression: this.nodeFactory.create(te, { variable: this.previous() })
       });
     throw this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect a variable or literal"), new d(
       this.peek(),
@@ -1590,7 +1590,7 @@ class Nn {
         n,
         o.EMPTY_ATTRIBUTE_NAME,
         "Expect a non-empty attribute name"
-      ), e.name = this.nodeFactory.create(z, { identifiers: [] });
+      ), e.name = this.nodeFactory.create(q, { identifiers: [] });
     } else
       try {
         e.name = this.attributeName();
@@ -1628,11 +1628,11 @@ class Nn {
       } catch (n) {
         throw n instanceof d ? new d(
           n.token,
-          this.nodeFactory.create(z, { identifiers: e }),
+          this.nodeFactory.create(q, { identifiers: e }),
           n.handlerContext
         ) : n;
       }
-    return this.nodeFactory.create(z, { identifiers: e });
+    return this.nodeFactory.create(q, { identifiers: e });
   }
   logError(e, n, s) {
     this.errors.push(new c(n, s, e));
@@ -1671,11 +1671,11 @@ function In(t) {
 const Ln = {
   "(": { left: 14, right: null }
 };
-function ft(t) {
+function pt(t) {
   return Ln[t.value] || { left: null, right: null };
 }
 var b = /* @__PURE__ */ ((t) => (t.Table = "table", t.Enum = "enum", t.Ref = "ref", t.Note = "note", t.Project = "project", t.Indexes = "indexes", t.TableGroup = "tablegroup", t))(b || {});
-function ve(t) {
+function we(t) {
   var n;
   const e = (n = t == null ? void 0 : t.type) == null ? void 0 : n.value.toLowerCase();
   switch (e) {
@@ -1692,12 +1692,12 @@ function ve(t) {
   }
 }
 function pe(t) {
-  if (!Ke(t))
+  if (!et(t))
     return new x([t]);
   const e = pe(t.leftExpression).unwrap_or(void 0);
   return e ? (e.push(t.rightExpression), new x(e)) : new y();
 }
-function j(t) {
+function z(t) {
   if (t === void 0)
     return new y();
   const e = pe(t).unwrap_or(void 0);
@@ -1705,14 +1705,14 @@ function j(t) {
     return new y();
   const n = [];
   for (const s of e) {
-    const i = Y(s).unwrap_or(void 0);
+    const i = Q(s).unwrap_or(void 0);
     if (!i)
       return new y();
     n.push(i);
   }
   return new x(n);
 }
-function _e(t) {
+function Ae(t) {
   if (t === void 0)
     return new y();
   const e = pe(t).unwrap_or(void 0);
@@ -1720,17 +1720,17 @@ function _e(t) {
     return new y();
   const n = [];
   let s;
-  if (!B(I.last(e))) {
+  if (!V(I.last(e))) {
     const i = e.pop();
-    if (Ot(i))
+    if (Dt(i))
       s = i.elementList.map(
-        (r) => X(r).unwrap()
+        (r) => W(r).unwrap()
       );
     else
       return new y();
   }
   for (const i of e) {
-    const r = Y(i).unwrap_or(void 0);
+    const r = Q(i).unwrap_or(void 0);
     if (!r)
       return new y();
     n.push(r);
@@ -1740,41 +1740,41 @@ function _e(t) {
     tupleElements: s
   });
 }
-function Y(t) {
-  return B(t) ? new x(t.expression.variable.value) : new y();
+function Q(t) {
+  return V(t) ? new x(t.expression.variable.value) : new y();
 }
-function We(t) {
-  if (pt(t))
+function je(t) {
+  if (dt(t))
     return t instanceof se ? new x({ functional: [t], nonFunctional: [] }) : new x({ functional: [], nonFunctional: [t] });
-  if (t instanceof K && t.elementList.every(pt)) {
+  if (t instanceof ee && t.elementList.every(dt)) {
     const e = t.elementList.filter(
       (s) => s instanceof se
-    ), n = t.elementList.filter(B);
+    ), n = t.elementList.filter(V);
     return new x({ functional: e, nonFunctional: n });
   }
   return new y();
 }
-function X(t) {
+function W(t) {
   var n;
   const e = (n = t == null ? void 0 : t.expression.variable) == null ? void 0 : n.value;
   return e === void 0 ? new y() : new x(e);
 }
-function C(t) {
-  return W(t) ? t.expression instanceof ee ? new x(t.expression.variable.value) : new x(t.expression.literal.value) : new y();
+function $(t) {
+  return Y(t) ? t.expression instanceof te ? new x(t.expression.variable.value) : new x(t.expression.literal.value) : new y();
 }
 function gn(t) {
   var e;
-  return !(t instanceof H) || !St((e = t.op) == null ? void 0 : e.value) ? !1 : _e(t.leftExpression).and_then(() => _e(t.rightExpression)).unwrap_or(void 0) !== void 0;
+  return !(t instanceof J) || !Ot((e = t.op) == null ? void 0 : e.value) ? !1 : Ae(t.leftExpression).and_then(() => Ae(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
 function _n(t) {
-  const e = _e(t.leftExpression), n = _e(t.rightExpression);
+  const e = Ae(t.leftExpression), n = Ae(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 pt(t) {
-  return t instanceof F && t.expression instanceof ee || t instanceof se;
+function dt(t) {
+  return t instanceof M && t.expression instanceof te || t instanceof se;
 }
 function An(t, e) {
   var i, r, a, l;
@@ -1783,9 +1783,9 @@ function An(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 $ && s)
+    if (((l = n.symbol) == null ? void 0 : l.declaration) instanceof j && s)
       return n.symbol;
-    if (n instanceof $)
+    if (n instanceof j)
       return;
     n = n.parent;
   }
@@ -1798,7 +1798,7 @@ class vn {
     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 $ || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new c(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof j || we(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new c(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new c(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
@@ -1812,13 +1812,13 @@ class vn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof Z)
+    if (e instanceof K)
       return [new c(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
     const n = [];
-    return W(e.callee) || n.push(new c(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new c(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
+    return Y(e.callee) || n.push(new c(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new c(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
   }
 }
-class we {
+class ye {
   constructor() {
     this.table = /* @__PURE__ */ new Map();
   }
@@ -1846,17 +1846,17 @@ class wn {
     return this.declarationNode.parent instanceof A ? [new c(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? xt(e) ? [] : [new c(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new c(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
+    return e ? St(e) ? [] : [new c(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new c(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
   }
   validateAlias(e) {
     return e ? [new c(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(sn, { declaration: this.declarationNode, symbolTable: new we() });
-    const { name: n } = this.declarationNode, s = j(n);
+    this.declarationNode.symbol = this.symbolFactory.create(sn, { declaration: this.declarationNode, symbolTable: new ye() });
+    const { name: n } = this.declarationNode, s = z(n);
     if (s.isOk()) {
-      const i = s.unwrap(), r = i.pop(), a = et(i, this.publicSymbolTable, this.symbolFactory), l = qe(r);
+      const i = s.unwrap(), r = i.pop(), a = tt(i, this.publicSymbolTable, this.symbolFactory), l = He(r);
       a.has(l) && e.push(new c(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, n)), a.set(l, this.declarationNode.symbol);
     }
     return e;
@@ -1875,19 +1875,19 @@ class wn {
   validateFields(e) {
     return e.length === 0 ? [new c(o.EMPTY_ENUM, "An Enum must have at least one element", this.declarationNode)] : e.flatMap((n) => {
       const s = [];
-      n.callee && !B(n.callee) && s.push(new c(o.INVALID_ENUM_ELEMENT_NAME, "An enum field must be an identifier or a quoted identifier", n.callee));
+      n.callee && !V(n.callee) && s.push(new c(o.INVALID_ENUM_ELEMENT_NAME, "An enum field must be an identifier or a quoted identifier", n.callee));
       const i = [...n.args];
-      return I.last(i) instanceof P ? (s.push(...this.validateFieldSettings(I.last(i))), i.pop()) : i[0] instanceof P && (s.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && s.push(...i.map((r) => new c(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", r))), s.push(...this.registerField(n)), s;
+      return I.last(i) instanceof R ? (s.push(...this.validateFieldSettings(I.last(i))), i.pop()) : i[0] instanceof R && (s.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && s.push(...i.map((r) => new c(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", r))), s.push(...this.registerField(n)), s;
     });
   }
   validateFieldSettings(e) {
-    const n = M(e), s = n.getErrors(), i = n.getValue();
+    const n = C(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
           a.length > 1 && a.forEach((l) => s.push(new c(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
-            W(l.value) || s.push(new c(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
+            Y(l.value) || s.push(new c(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
           });
           break;
         default:
@@ -1905,8 +1905,8 @@ class wn {
     });
   }
   registerField(e) {
-    if (e.callee && B(e.callee)) {
-      const n = X(e.callee).unwrap(), s = He(n), i = this.symbolFactory.create(rn, { declaration: e });
+    if (e.callee && V(e.callee)) {
+      const n = W(e.callee).unwrap(), s = Je(n), i = this.symbolFactory.create(rn, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
@@ -1929,7 +1929,7 @@ class yn {
     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 $ || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new c(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof j || we(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new c(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new c(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
@@ -1953,22 +1953,22 @@ class yn {
       if (!n.callee)
         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 J; )
-          r.argumentList && !We(r.argumentList).isOk() && s.push(new c(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
-        We(r).isOk() || s.push(new c(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
+      return I.last(i) instanceof R && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
+        for (; r instanceof Z; )
+          r.argumentList && !je(r.argumentList).isOk() && s.push(new c(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
+        je(r).isOk() || s.push(new c(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
       }), s;
     });
   }
   validateFieldSetting(e) {
-    const n = M(e), s = n.getErrors(), i = n.getValue();
+    const n = C(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
         case "name":
           a.length > 1 && a.forEach((l) => s.push(new c(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
-            W(l.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
+            Y(l.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
           });
           break;
         case "unique":
@@ -1979,7 +1979,7 @@ class yn {
           break;
         case "type":
           a.length > 1 && a.forEach((l) => s.push(new c(o.DUPLICATE_INDEX_SETTING, "'type' can only appear once", l))), a.forEach((l) => {
-            B(l.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'type' must be "btree" or "hash"`, l));
+            V(l.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'type' must be "btree" or "hash"`, l));
           });
           break;
         default:
@@ -2011,22 +2011,22 @@ class kn {
     ];
   }
   validateContext() {
-    return !(this.declarationNode.parent instanceof $) && ![
+    return !(this.declarationNode.parent instanceof j) && ![
       b.Table,
       b.TableGroup,
       b.Project
-    ].includes(ve(this.declarationNode.parent).unwrap_or(void 0)) ? [new c(
+    ].includes(we(this.declarationNode.parent).unwrap_or(void 0)) ? [new c(
       o.INVALID_NOTE_CONTEXT,
       "A Note can only appear inside a Table, a Table Group or a Project. Sticky note can only appear at the global scope.",
       this.declarationNode
     )] : [];
   }
   validateName(e) {
-    if (!(this.declarationNode.parent instanceof $))
+    if (!(this.declarationNode.parent instanceof j))
       return e ? [new c(o.UNEXPECTED_NAME, "A Note shouldn't have a name", e)] : [];
     if (!e)
       return [new c(o.INVALID_NAME, "Sticky note must have a name", this.declarationNode)];
-    const n = j(e);
+    const n = z(e);
     if (!n.isOk())
       return [new c(o.INVALID_NAME, "Invalid name for sticky note ", this.declarationNode)];
     const i = n.unwrap().join("."), r = Zt(i);
@@ -2048,7 +2048,7 @@ class kn {
   }
   validateFields(e) {
     const n = [];
-    return e.length === 0 ? [new c(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new c(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), W(e[0].callee) || n.push(new c(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new c(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
+    return e.length === 0 ? [new c(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new c(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), Y(e[0].callee) || n.push(new c(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new c(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
   }
   validateSubElements(e) {
     return e.flatMap((n) => {
@@ -2070,7 +2070,7 @@ class xn {
     return this.declarationNode.parent instanceof A ? [new c(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? ye(e) ? [] : [new c(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? ke(e) ? [] : [new c(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new c(o.UNEXPECTED_ALIAS, "A Project shouldn't have an alias", e)] : [];
@@ -2106,31 +2106,16 @@ class Sn {
     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 c(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
+    return this.declarationNode.parent instanceof j ? [] : [new c(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
   }
   validateName(e) {
-    return e ? ye(e) ? [] : [new c(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? ke(e) ? [] : [new c(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new c(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    if (!e)
-      return [];
-    const n = M(e), s = n.getErrors(), i = n.getValue();
-    for (const r in i) {
-      const a = i[r];
-      switch (r) {
-        case "color":
-          a.length > 1 && s.push(...a.map((l) => new c(o.DUPLICATE_REF_SETTING, "'color' can only appear once", l))), a.forEach((l) => {
-            tt(l.value) || s.push(new c(o.INVALID_TABLE_SETTING, "'color' must be a color literal", l.value || l.name));
-          });
-          break;
-        default:
-          s.push(...a.map((l) => new c(o.INVALID_TABLE_SETTING, `Unknown '${r}' setting`, l)));
-      }
-    }
-    return s;
+    return e ? [new c(o.UNEXPECTED_SETTINGS, "A Ref shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
@@ -2147,11 +2132,16 @@ class Sn {
     return e.length > 1 && n.push(...e.slice(1).map((s) => new c(o.REF_REDEFINED, "A Ref can only contain one binary relationship", s))), e.forEach((s) => {
       s.callee && !gn(s.callee) && n.push(new c(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !_n(s.callee) && n.push(new c(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
       const i = [...s.args];
-      I.last(i) instanceof P ? (this.validateFieldSettings(I.last(i)), i.pop()) : i[0] instanceof P && (n.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && n.push(...i.map((r) => new c(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", r)));
+      if (I.last(i) instanceof R) {
+        const r = this.validateFieldSettings(I.last(i));
+        n.push(...r), i.pop();
+      } else
+        i[0] instanceof R && (n.push(...this.validateFieldSettings(i[0])), i.shift());
+      i.length > 0 && n.push(...i.map((r) => new c(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", r)));
     }), n;
   }
   validateFieldSettings(e) {
-    const n = M(e), s = n.getErrors(), i = n.getValue();
+    const n = C(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
@@ -2161,6 +2151,11 @@ class Sn {
             On(l.value) || s.push(new c(o.INVALID_REF_SETTING_VALUE, `'${r}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, l));
           });
           break;
+        case "color":
+          a.length > 1 && s.push(...a.map((l) => new c(o.DUPLICATE_REF_SETTING, "'color' can only appear once", l))), a.forEach((l) => {
+            nt(l.value) || s.push(new c(o.INVALID_REF_SETTING_VALUE, "'color' must be a color literal", l));
+          });
+          break;
         default:
           a.forEach((l) => s.push(new c(o.UNKNOWN_REF_SETTING, `Unknown ref setting '${r}'`, l)));
       }
@@ -2177,10 +2172,10 @@ class Sn {
   }
 }
 function On(t) {
-  if (!(B(t) && t.expression.variable.kind !== u.QUOTED_STRING) && !(t instanceof z))
+  if (!(V(t) && t.expression.variable.kind !== u.QUOTED_STRING) && !(t instanceof q))
     return !1;
   let e;
-  if (t instanceof z ? e = Te(t).unwrap_or("") : e = t.expression.variable.value, e)
+  if (t instanceof q ? e = Te(t).unwrap_or("") : e = t.expression.variable.value, e)
     switch (e.toLowerCase()) {
       case "cascade":
       case "no action":
@@ -2204,24 +2199,24 @@ class Dn {
     return this.declarationNode.parent instanceof A ? [new c(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? e instanceof he ? [new c(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : xt(e) ? [] : [new c(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new c(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
+    return e ? e instanceof he ? [new c(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : St(e) ? [] : [new c(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new c(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
   }
   validateAlias(e) {
     return e ? Mn(e) ? [] : [new c(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
   }
   validateSettingList(e) {
-    const n = M(e), s = n.getErrors(), i = n.getValue();
+    const n = C(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "headercolor":
           a.length > 1 && s.push(...a.map((l) => new c(o.DUPLICATE_TABLE_SETTING, "'headercolor' can only appear once", l))), a.forEach((l) => {
-            tt(l.value) || s.push(new c(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", l.value || l.name));
+            nt(l.value) || s.push(new c(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", l.value || l.name));
           });
           break;
         case "note":
           a.length > 1 && s.push(...a.map((l) => new c(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
-            W(l.value) || s.push(new c(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
+            Y(l.value) || s.push(new c(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
           });
           break;
         default:
@@ -2232,14 +2227,14 @@ class Dn {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(wt, { declaration: this.declarationNode, symbolTable: new we() });
-    const { name: n, alias: s } = this.declarationNode, i = j(n);
+    this.declarationNode.symbol = this.symbolFactory.create(yt, { declaration: this.declarationNode, symbolTable: new ye() });
+    const { name: n, alias: s } = this.declarationNode, i = z(n);
     if (i.isOk()) {
-      const r = [...i.unwrap()], a = r.pop(), l = et(r, this.publicSymbolTable, this.symbolFactory), p = Oe(a);
+      const r = [...i.unwrap()], a = r.pop(), l = tt(r, this.publicSymbolTable, this.symbolFactory), p = De(a);
       l.has(p) && e.push(new c(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, n)), l.set(p, this.declarationNode.symbol);
     }
-    if (s && ye(s) && !Pn(s.expression.variable.value, i.unwrap_or([]))) {
-      const r = X(s).unwrap(), a = Oe(r);
+    if (s && ke(s) && !Pn(s.expression.variable.value, i.unwrap_or([]))) {
+      const r = W(s).unwrap(), a = De(r);
       this.publicSymbolTable.has(a) && e.push(new c(o.DUPLICATE_NAME, `Table name '${r}' already exists`, n)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
     }
     return e;
@@ -2257,14 +2252,14 @@ class Dn {
       if (!n.callee)
         return [];
       const s = [];
-      n.args.length === 0 && s.push(new c(o.INVALID_COLUMN, "A column must have a type", n.callee)), B(n.callee) || s.push(new c(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), n.args[0] && !Rn(n.args[0]) && s.push(new c(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
+      n.args.length === 0 && s.push(new c(o.INVALID_COLUMN, "A column must have a type", n.callee)), V(n.callee) || s.push(new c(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), n.args[0] && !Rn(n.args[0]) && s.push(new c(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
       const i = n.args.slice(1);
       return s.push(...this.validateFieldSetting(i)), s.push(...this.registerField(n)), s;
     });
   }
   registerField(e) {
-    if (e.callee && B(e.callee)) {
-      const n = X(e.callee).unwrap(), s = Qe(n), i = this.symbolFactory.create(an, { declaration: e });
+    if (e.callee && V(e.callee)) {
+      const n = W(e.callee).unwrap(), s = qe(n), i = this.symbolFactory.create(an, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
@@ -2280,15 +2275,15 @@ class Dn {
   }
   // This is needed to support legacy inline settings
   validateFieldSetting(e) {
-    if (!e.slice(0, -1).every(me) || !e.slice(-1).every((p) => me(p) || p instanceof P))
+    if (!e.slice(0, -1).every(me) || !e.slice(-1).every((p) => me(p) || p instanceof R))
       return [...e.map((p) => new c(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
     if (e.length === 0)
       return [];
     let n;
-    I.last(e) instanceof P && (n = e.pop());
-    const s = M(n), i = s.getErrors(), r = s.getValue();
+    I.last(e) instanceof R && (n = e.pop());
+    const s = C(n), i = s.getErrors(), r = s.getValue();
     for (const p of e) {
-      const f = X(p).unwrap_or("").toLowerCase();
+      const f = W(p).unwrap_or("").toLowerCase();
       if (f !== "pk" && f !== "unique") {
         i.push(new c(o.INVALID_SETTINGS, "Inline column settings can only be `pk` or `unique`", p));
         continue;
@@ -2302,7 +2297,7 @@ class Dn {
       switch (p) {
         case "note":
           f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", h))), f.forEach((h) => {
-            W(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", h.value || h.name));
+            Y(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", h.value || h.name));
           });
           break;
         case "ref":
@@ -2367,10 +2362,10 @@ class Dn {
   }
 }
 function Rn(t) {
-  if (!(t instanceof J || Ke(t) || t instanceof F || t instanceof he))
+  if (!(t instanceof Z || et(t) || t instanceof M || t instanceof he))
     return !1;
-  if (t instanceof J) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => fe(n) || W(n) || me(n)))
+  if (t instanceof Z) {
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => fe(n) || Y(n) || me(n)))
       return !1;
     t = t.callee;
   }
@@ -2379,7 +2374,7 @@ function Rn(t) {
       return !1;
     t = t.array;
   }
-  const e = j(t).unwrap_or(void 0);
+  const e = z(t).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
 function Pn(t, e) {
@@ -2407,7 +2402,7 @@ class Un {
     )] : [];
   }
   validateName(e) {
-    return e ? ye(e) ? [] : [new c(
+    return e ? ke(e) ? [] : [new c(
       o.INVALID_NAME,
       "A TableGroup name must be a single identifier",
       e
@@ -2426,10 +2421,10 @@ class Un {
   }
   registerElement() {
     const { name: e } = this.declarationNode;
-    this.declarationNode.symbol = this.symbolFactory.create(on, { declaration: this.declarationNode, symbolTable: new we() });
-    const n = j(e);
+    this.declarationNode.symbol = this.symbolFactory.create(on, { declaration: this.declarationNode, symbolTable: new ye() });
+    const n = z(e);
     if (n.isOk()) {
-      const s = n.unwrap(), i = s.pop(), r = et(s, this.publicSymbolTable, this.symbolFactory), a = Je(i);
+      const s = n.unwrap(), i = s.pop(), r = tt(s, this.publicSymbolTable, this.symbolFactory), a = Ze(i);
       if (r.has(a))
         return [new c(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists`, e)];
       r.set(a, this.declarationNode.symbol);
@@ -2437,7 +2432,7 @@ class Un {
     return [];
   }
   validateSettingList(e) {
-    const n = M(e), s = n.getErrors(), i = n.getValue();
+    const n = C(e), s = n.getErrors(), i = n.getValue();
     return I.forIn(i, (r, a) => {
       switch (a) {
         case "color":
@@ -2446,7 +2441,7 @@ class Un {
             "'color' can only appear once",
             l
           ))), r.forEach((l) => {
-            tt(l.value) || s.push(new c(
+            nt(l.value) || s.push(new c(
               o.INVALID_TABLE_SETTING,
               "'color' must be a color literal",
               l.value || l.name
@@ -2458,7 +2453,7 @@ class Un {
             o.DUPLICATE_TABLE_SETTING,
             "'note' can only appear once",
             l
-          ))), r.filter((l) => !W(l.value)).forEach((l) => {
+          ))), r.filter((l) => !Y(l.value)).forEach((l) => {
             s.push(new c(
               o.INVALID_TABLE_SETTING,
               "'note' must be a string literal",
@@ -2494,7 +2489,7 @@ class Un {
   validateFields(e) {
     return e.flatMap((n) => {
       const s = [];
-      return n.callee && !j(n.callee).isOk() && s.push(new c(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", n.callee)), this.registerField(n), n.args.length > 0 && s.push(...n.args.map((i) => new c(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
+      return n.callee && !z(n.callee).isOk() && s.push(new c(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", n.callee)), this.registerField(n), n.args.length > 0 && s.push(...n.args.map((i) => new c(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
     });
   }
   validateSubElements(e) {
@@ -2510,8 +2505,8 @@ class Un {
     return s.length > 1 && n.push(...s.map((i) => new c(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n;
   }
   registerField(e) {
-    if (e.callee && B(e.callee)) {
-      const n = X(e.callee).unwrap(), s = Ze(n), i = this.symbolFactory.create(ln, { declaration: e });
+    if (e.callee && V(e.callee)) {
+      const n = W(e.callee).unwrap(), s = Ke(n), i = this.symbolFactory.create(ln, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
@@ -2526,7 +2521,7 @@ class Un {
     return [];
   }
 }
-const kt = ["-", "+"];
+const xt = ["-", "+"];
 function oe(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
@@ -2547,40 +2542,40 @@ function oe(t) {
       return vn;
   }
 }
-function xt(t) {
-  return !!j(t).unwrap_or(!1);
+function St(t) {
+  return !!z(t).unwrap_or(!1);
 }
 function Mn(t) {
-  return ye(t);
+  return ke(t);
 }
-function ye(t) {
-  return t instanceof F && t.expression instanceof ee;
+function ke(t) {
+  return t instanceof M && t.expression instanceof te;
 }
-function et(t, e, n) {
+function tt(t, e, n) {
   var i;
   t[0] === "public" && (t = t.slice(1));
   let s = e;
   for (const r of t) {
     let a;
-    const l = ze(r);
+    const l = Qe(r);
     if (s.has(l)) {
       if (a = (i = s.get(l)) == null ? void 0 : i.symbolTable, !a)
         throw new Error("Expect a symbol table in a schema symbol");
     } else {
-      a = new we();
-      const p = n.create(vt, { symbolTable: a });
+      a = new ye();
+      const p = n.create(wt, { symbolTable: a });
       s.set(l, p);
     }
     s = a;
   }
   return s;
 }
-function St(t) {
+function Ot(t) {
   return t === "-" || t === "<>" || t === ">" || t === "<";
 }
-function tt(t) {
+function nt(t) {
   var n;
-  if (!(t instanceof F) || !(t.expression instanceof be) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
+  if (!(t instanceof M) || !(t.expression instanceof be) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
     return !1;
   const e = t.expression.literal.value;
   if (e.length !== 4 && e.length !== 7 || e[0] !== "#")
@@ -2595,43 +2590,43 @@ function ue(t) {
 }
 function Fn(t) {
   var e;
-  return !!(W(t) || fe(t) || me(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof q && kt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression) || t instanceof se);
+  return !!(Y(t) || fe(t) || me(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof H && xt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression) || t instanceof se);
 }
 function fe(t) {
   var e;
-  return t instanceof F && t.expression instanceof be && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
+  return t instanceof M && t.expression instanceof be && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
 }
 function Bn(t) {
   var n;
-  if (!(t instanceof q) || !St((n = t.op) == null ? void 0 : n.value))
+  if (!(t instanceof H) || !Ot((n = t.op) == null ? void 0 : n.value))
     return !1;
-  const e = j(t.expression).unwrap_or(void 0);
+  const e = z(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
-function Ot(t) {
-  return t instanceof K && t.elementList.every(B);
+function Dt(t) {
+  return t instanceof ee && t.elementList.every(V);
 }
-function M(t) {
+function C(t) {
   var s;
   const e = {}, n = [];
   if (!t)
-    return new G({});
+    return new X({});
   for (const i of t.elementList) {
     if (!i.name)
       continue;
-    if (i.name instanceof F) {
+    if (i.name instanceof M) {
       n.push(new c(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
       continue;
     }
     const r = (s = Te(i.name).unwrap_or(void 0)) == null ? void 0 : s.toLowerCase();
     r && (e[r] === void 0 ? e[r] = [i] : e[r].push(i));
   }
-  return new G(e, n);
+  return new X(e, n);
 }
-class dt {
+class Et {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(vt, {
-      symbolTable: new we()
+    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(wt, {
+      symbolTable: new ye()
     }), this.ast.symbol = this.publicSchemaSymbol, this.ast.symbol.declaration = this.ast;
   }
   validate() {
@@ -2646,8 +2641,8 @@ class dt {
       );
       e.push(...r.validate());
     });
-    const n = this.ast.body.filter((s) => ve(s).unwrap_or(void 0) === b.Project);
-    return n.length > 1 && n.forEach((s) => e.push(new c(o.PROJECT_REDEFINED, "Only one project can exist", s))), new G(this.ast, e);
+    const n = this.ast.body.filter((s) => we(s).unwrap_or(void 0) === b.Project);
+    return n.length > 1 && n.forEach((s) => e.push(new c(o.PROJECT_REDEFINED, "Only one project can exist", s))), new X(this.ast, e);
   }
 }
 class le {
@@ -2660,7 +2655,7 @@ class le {
   bindSettingList(e, n) {
     if (e)
       for (const s of e.elementList) {
-        if (s.name instanceof F)
+        if (s.name instanceof M)
           continue;
         const i = Te(s.name).unwrap_or(void 0);
         if (!i)
@@ -2674,12 +2669,12 @@ class le {
     if (!e.body)
       return;
     const { body: n } = e;
-    if (n instanceof Z)
+    if (n instanceof K)
       for (const s of n.body)
         if (s instanceof A) {
           if (!s.type)
             continue;
-          const i = Dt(s);
+          const i = Rt(s);
           new i(s, this.errors).bind();
         } else
           this.bindSubfield(s);
@@ -2688,7 +2683,7 @@ class le {
   }
   bindSubfield(e) {
     const n = [e.callee, ...e.args], s = I.last(n);
-    s instanceof P && (n.pop(), this.bindSettingList(s, this.subfield.settingList));
+    s instanceof R && (n.pop(), this.bindSettingList(s, this.subfield.settingList));
     const { argBinderRules: i } = this.subfield.arg;
     for (let r = 0; r < Math.min(n.length, i.length); r += 1)
       i[r].shouldBind && this.scanAndBind(n[r], i[r]);
@@ -2697,12 +2692,12 @@ class le {
   scanAndBind(e, n) {
     var s, i;
     if (e)
-      if (e instanceof F) {
-        if (e.expression instanceof ee && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
+      if (e instanceof M) {
+        if (e.expression instanceof te && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
           return;
         this.bindFragments([e], n);
       } else
-        e instanceof H ? Ke(e) ? this.bindFragments(pe(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof q ? this.scanAndBind(e.expression, n) : e instanceof Ue ? this.scanAndBind(e.expression, n) : e instanceof K && e.elementList.forEach((r) => this.scanAndBind(r, n));
+        e instanceof J ? et(e) ? this.bindFragments(pe(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof H ? this.scanAndBind(e.expression, n) : e instanceof Me ? this.scanAndBind(e.expression, n) : e instanceof ee && 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,
@@ -2710,7 +2705,7 @@ class le {
   bindFragments(e, n) {
     if (e.length === 0)
       return;
-    const s = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: i } = n, r = e.findIndex((h) => !B(h)), l = r !== -1 && Ot(e[r]) ? e[r] : void 0, p = r >= 0 ? s.pop() : void 0, f = e.slice(
+    const s = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: i } = n, r = e.findIndex((h) => !V(h)), l = r !== -1 && Dt(e[r]) ? e[r] : void 0, p = r >= 0 ? s.pop() : void 0, f = e.slice(
       0,
       r === -1 ? void 0 : r
     );
@@ -2718,16 +2713,16 @@ class le {
       return;
     const E = [];
     for (; s.length && f.length; ) {
-      const h = s.pop(), m = f.pop(), g = X(m).unwrap();
+      const h = s.pop(), m = f.pop(), g = W(m).unwrap();
       E.unshift({
-        index: Ge(g, h),
+        index: Ce(g, h),
         referrer: m
       });
     }
     for (; f.length; ) {
-      const h = f.pop(), m = X(h).unwrap();
+      const h = f.pop(), m = W(h).unwrap();
       E.unshift({
-        index: Ge(m, i),
+        index: Ce(m, i),
         referrer: h
       });
     }
@@ -2736,8 +2731,8 @@ class le {
         [
           ...E,
           {
-            index: Ge(
-              X(h).unwrap(),
+            index: Ce(
+              W(h).unwrap(),
               p
             ),
             referrer: h
@@ -2916,7 +2911,7 @@ class Yn extends le {
     }, this.settingList = {};
   }
 }
-function Dt(t) {
+function Rt(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
       return Gn;
@@ -2943,10 +2938,10 @@ class zn {
   resolve() {
     for (const e of this.ast.body)
       if (e.type) {
-        const n = Dt(e);
+        const n = Rt(e);
         new n(e, this.errors).bind();
       }
-    return new G(this.ast, this.errors);
+    return new X(this.ast, this.errors);
   }
 }
 class Qn {
@@ -2963,15 +2958,15 @@ class qn {
   }
   // Analyzing: Invoking both the validator and binder
   analyze() {
-    return new dt(this.ast, this.symbolFactory).validate().chain((n) => new zn(n).resolve());
+    return new Et(this.ast, this.symbolFactory).validate().chain((n) => new zn(n).resolve());
   }
   // For invoking the validator only
   validate() {
-    return new dt(this.ast, this.symbolFactory).validate().chain((n) => new G(n, []));
+    return new Et(this.ast, this.symbolFactory).validate().chain((n) => new X(n, []));
   }
 }
-function Et(t, e) {
-  const { variables: n, tupleElements: s } = _e(t).unwrap();
+function Nt(t, e) {
+  const { variables: n, tupleElements: s } = Ae(t).unwrap();
   return s ? n.length === 0 ? {
     schemaName: e.schemaName,
     tableName: e.name,
@@ -2990,7 +2985,7 @@ function Et(t, e) {
     schemaName: n.pop() || null
   };
 }
-function Rt(t) {
+function Pt(t) {
   switch (t) {
     case "<":
       return ["1", "*"];
@@ -3013,22 +3008,22 @@ function _(t) {
     end: { offset: t.endPos.offset, line: t.endPos.line + 1, column: t.endPos.column + 1 }
   };
 }
-function je(t) {
+function Ye(t) {
   var n;
   const e = (n = pe(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
-  return e instanceof K ? e.elementList.map((s) => s.referee) : [e.referee];
+  return e instanceof ee ? e.elementList.map((s) => s.referee) : [e.referee];
 }
 function Ie(t) {
-  const e = j(t).unwrap();
+  const e = z(t).unwrap();
   return {
     name: e.pop(),
     schemaName: e
   };
 }
-function Fe(t) {
+function Be(t) {
   return t.expression.literal.value;
 }
-function Pt(t, e) {
+function Ut(t, e) {
   if (Array.isArray(t)) {
     const i = t.map(({ id: a }) => a).sort().join(","), r = e.map(({ id: a }) => a).sort().join(",");
     return i < r ? `${i}-${r}` : `${r}-${i}`;
@@ -3036,7 +3031,7 @@ function Pt(t, e) {
   const n = t.id.toString(), s = e.id.toString();
   return n < s ? `${n}-${s}` : `${s}-${n}`;
 }
-function Ut(t, e) {
+function Mt(t, e) {
   if (Array.isArray(t)) {
     const i = t.map(({ id: a }) => a).sort(), r = e.map(({ id: a }) => a).sort();
     return I.zip(i, r).every(([a, l]) => a === l);
@@ -3050,7 +3045,7 @@ function ae(t) {
   return n.map((r) => r.slice(i)).join(`
 `);
 }
-class Mt {
+class Ft {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.table = { name: void 0, schemaName: void 0, alias: null, fields: [], token: void 0, indexes: [] }, this.pkColumns = [];
   }
@@ -3080,7 +3075,7 @@ class Mt {
   interpretAlias(e) {
     if (!e)
       return [];
-    const n = X(e).unwrap_or(null);
+    const n = W(e).unwrap_or(null);
     return n && (this.env.aliases.push({
       name: n,
       kind: "table",
@@ -3092,11 +3087,11 @@ class Mt {
   }
   interpretSettingList(e) {
     var i, r, a;
-    const n = M(e).getValue();
-    this.table.headerColor = (i = n.headercolor) != null && i.length ? Fe((a = (r = n.headercolor) == null ? void 0 : r.at(0)) == null ? void 0 : a.value) : void 0;
+    const n = C(e).getValue();
+    this.table.headerColor = (i = n.headercolor) != null && i.length ? Be((a = (r = n.headercolor) == null ? void 0 : r.at(0)) == null ? void 0 : a.value) : void 0;
     const [s] = n.note || [];
     return this.table.note = s && {
-      value: C(s == null ? void 0 : s.value).map(ae).unwrap(),
+      value: $(s == null ? void 0 : s.value).map(ae).unwrap(),
       token: _(s)
     }, [];
   }
@@ -3110,7 +3105,7 @@ class Mt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: C(n.body instanceof Z ? n.body.body[0].callee : n.body.callee).map(ae).unwrap(),
+            value: $(n.body instanceof K ? n.body.body[0].callee : n.body.callee).map(ae).unwrap(),
             token: _(n)
           }, [];
         case "indexes":
@@ -3123,26 +3118,26 @@ class Mt {
     return e.flatMap((n) => this.interpretColumn(n));
   }
   interpretColumn(e) {
-    var a, l, p, f, E, h, m, g, R;
+    var a, l, p, f, E, h, m, g, P;
     const n = [], s = {};
-    s.name = X(e.callee).unwrap();
+    s.name = W(e.callee).unwrap();
     const i = Hn(e.args[0]);
     s.type = i.getValue(), n.push(...i.getErrors()), s.token = _(e), s.inline_refs = [];
     const r = e.args.slice(1);
-    if (I.last(r) instanceof P) {
-      const S = M(r.pop()).getValue();
+    if (I.last(r) instanceof R) {
+      const S = C(r.pop()).getValue();
       s.pk = !!((a = S.pk) != null && a.length) || !!((l = S["primary key"]) != null && l.length), s.increment = !!((p = S.increment) != null && p.length), s.unique = !!((f = S.unique) != null && f.length), s.not_null = (E = S["not null"]) != null && E.length ? !0 : (h = S.null) != null && h.length ? !1 : void 0, s.dbdefault = Jn((g = (m = S.default) == null ? void 0 : m.at(0)) == null ? void 0 : g.value);
-      const te = (R = S.note) == null ? void 0 : R.at(0);
-      s.note = te && {
-        value: C(te.value).map(ae).unwrap(),
-        token: _(te)
+      const F = (P = S.note) == null ? void 0 : P.at(0);
+      s.note = F && {
+        value: $(F.value).map(ae).unwrap(),
+        token: _(F)
       };
-      const Yt = S.ref || [];
-      s.inline_refs = Yt.flatMap((Q) => {
-        const [it] = je(Q.value.expression);
-        if (Ut(it, e.symbol))
-          return n.push(new c(o.SAME_ENDPOINT, "Two endpoints are the same", Q)), [];
-        const ke = Q.value.op, ne = j(Q.value.expression).unwrap();
+      const Le = S.ref || [];
+      s.inline_refs = Le.flatMap((B) => {
+        const [rt] = Ye(B.value.expression);
+        if (Mt(rt, e.symbol))
+          return n.push(new c(o.SAME_ENDPOINT, "Two endpoints are the same", B)), [];
+        const xe = B.value.op, ne = z(B.value.expression).unwrap();
         let de;
         if (ne.length === 1) {
           const [ce] = ne;
@@ -3150,43 +3145,43 @@ class Mt {
             schemaName: this.table.schemaName,
             tableName: this.table.name,
             fieldNames: [ce],
-            relation: ke.value,
-            token: _(Q)
+            relation: xe.value,
+            token: _(B)
           };
         } else if (ne.length === 2) {
-          const [ce, Le] = ne;
+          const [ce, ge] = ne;
           de = {
             schemaName: null,
             tableName: ce,
-            fieldNames: [Le],
-            relation: ke.value,
-            token: _(Q)
+            fieldNames: [ge],
+            relation: xe.value,
+            token: _(B)
           };
         } else if (ne.length === 3) {
-          const [ce, Le, at] = ne;
+          const [ce, ge, ot] = ne;
           de = {
             schemaName: ce,
-            tableName: Le,
-            fieldNames: [at],
-            relation: ke.value,
-            token: _(Q)
+            tableName: ge,
+            fieldNames: [ot],
+            relation: xe.value,
+            token: _(B)
           };
         } else {
-          n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", Q));
-          const ce = ne.pop(), Le = ne.pop();
+          n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", B));
+          const ce = ne.pop(), ge = ne.pop();
           de = {
             schemaName: ne.join("."),
-            tableName: Le,
+            tableName: ge,
             fieldNames: [ce],
-            relation: ke.value,
-            token: _(Q)
+            relation: xe.value,
+            token: _(B)
           };
         }
-        const rt = this.registerInlineRefToEnv(e, it, de, Q);
-        return n.push(...rt), rt.length === 0 ? de : [];
+        const at = this.registerInlineRefToEnv(e, rt, de, B);
+        return n.push(...at), at.length === 0 ? de : [];
       });
     }
-    return s.pk || (s.pk = r.some((S) => Y(S).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((S) => Y(S).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
+    return s.pk || (s.pk = r.some((S) => Q(S).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((S) => Q(S).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
   }
   interpretIndexes(e) {
     return this.table.indexes.push(...e.body.body.map((n) => {
@@ -3194,47 +3189,47 @@ class Mt {
       const s = { columns: [] }, i = n;
       s.token = _(i);
       const r = [i.callee, ...i.args];
-      if (I.last(r) instanceof P) {
-        const g = M(r.pop()).getValue();
-        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((l = g.unique) != null && l.length), s.name = C((f = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : f.value).unwrap_or(void 0);
-        const R = (E = g.note) == null ? void 0 : E.at(0);
-        s.note = R && {
-          value: C(R.value).unwrap(),
-          token: _(R)
-        }, s.type = Y((m = (h = g.type) == null ? void 0 : h.at(0)) == null ? void 0 : m.value).unwrap_or(void 0);
+      if (I.last(r) instanceof R) {
+        const g = C(r.pop()).getValue();
+        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((l = g.unique) != null && l.length), s.name = $((f = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : f.value).unwrap_or(void 0);
+        const P = (E = g.note) == null ? void 0 : E.at(0);
+        s.note = P && {
+          value: $(P.value).unwrap(),
+          token: _(P)
+        }, s.type = Q((m = (h = g.type) == null ? void 0 : h.at(0)) == null ? void 0 : m.value).unwrap_or(void 0);
       }
       return r.flatMap((g) => {
-        if (!(g instanceof J))
+        if (!(g instanceof Z))
           return g;
-        const R = [];
-        for (; g instanceof J; )
-          R.push(g.argumentList), g = g.callee;
-        return R.push(g), R;
+        const P = [];
+        for (; g instanceof Z; )
+          P.push(g.argumentList), g = g.callee;
+        return P.push(g), P;
       }).forEach((g) => {
-        const { functional: R, nonFunctional: S } = We(g).unwrap();
+        const { functional: P, nonFunctional: S } = je(g).unwrap();
         s.columns.push(
-          ...R.map((te) => ({
-            value: te.value.value,
+          ...P.map((F) => ({
+            value: F.value.value,
             type: "expression",
-            token: _(te)
+            token: _(F)
           })),
-          ...S.map((te) => ({
-            value: X(te).unwrap(),
+          ...S.map((F) => ({
+            value: W(F).unwrap(),
             type: "column",
-            token: _(te)
+            token: _(F)
           }))
         );
       }), s;
     })), [];
   }
   registerInlineRefToEnv(e, n, s, i) {
-    const r = Pt(e.symbol, n);
+    const r = Ut(e.symbol, n);
     if (this.env.refIds[r])
       return [
         new c(o.CIRCULAR_REF, "References with same endpoints exist", i),
         new c(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[r])
       ];
-    const a = Rt(s.relation);
+    const a = Pt(s.relation);
     return this.env.refIds[r] = i, this.env.ref.set(i, {
       name: null,
       schemaName: null,
@@ -3247,7 +3242,7 @@ class Mt {
         {
           schemaName: this.table.schemaName,
           tableName: this.table.name,
-          fieldNames: [Y(e.callee).unwrap()],
+          fieldNames: [Q(e.callee).unwrap()],
           token: _(e),
           relation: a[0]
         }
@@ -3257,19 +3252,19 @@ class Mt {
 }
 function Hn(t) {
   let e = null;
-  t instanceof J && (e = t.argumentList.elementList.map((r) => fe(r) ? r.expression.literal.value : W(r) ? C(r).unwrap() : Y(r).unwrap()).join(","), t = t.callee);
+  t instanceof Z && (e = t.argumentList.elementList.map((r) => fe(r) ? r.expression.literal.value : Y(r) ? $(r).unwrap() : Q(r).unwrap()).join(","), t = t.callee);
   let n = "";
   for (; t instanceof he; )
     n = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${n}`, t = t.array;
   const { name: s, schemaName: i } = Ie(t);
-  return i.length > 1 ? new G(
+  return i.length > 1 ? new X(
     {
       schemaName: i.length === 0 ? null : i[0],
       type_name: `${s}${n}${e ? `(${e})` : ""}`,
       args: e
     },
     [new c(o.UNSUPPORTED, "Nested schema is not supported", t)]
-  ) : new G({
+  ) : new X({
     schemaName: i.length === 0 ? null : i[0],
     type_name: `${s}${n}${e ? `(${e})` : ""}`,
     args: e
@@ -3278,9 +3273,9 @@ function Hn(t) {
 function Jn(t) {
   var e, n, s;
   if (t) {
-    if (W(t))
+    if (Y(t))
       return {
-        value: C(t).unwrap(),
+        value: $(t).unwrap(),
         type: "string"
       };
     if (fe(t))
@@ -3293,7 +3288,7 @@ function Jn(t) {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
       };
-    if (t instanceof q && kt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression)) {
+    if (t instanceof H && xt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression)) {
       const i = Number.parseFloat(t.expression.expression.literal.value);
       return {
         value: ((n = t.op) == null ? void 0 : n.value) === "-" ? 0 - i : i,
@@ -3325,8 +3320,8 @@ class Zn {
   }
   interpretSettingList(e) {
     var s, i, r;
-    const n = M(e).getValue();
-    return this.note.headerColor = (s = n.headercolor) != null && s.length ? Fe((r = (i = n.headercolor) == null ? void 0 : i.at(0)) == null ? void 0 : r.value) : void 0, [];
+    const n = C(e).getValue();
+    return this.note.headerColor = (s = n.headercolor) != null && s.length ? Be((r = (i = n.headercolor) == null ? void 0 : i.at(0)) == null ? void 0 : r.value) : void 0, [];
   }
   interpretBody(e) {
     const [n, s] = I.partition(e.body, (i) => i instanceof v);
@@ -3339,62 +3334,56 @@ class Zn {
     return this.note.content = ae(n), [];
   }
 }
-class Ft {
+class Bt {
   constructor(e, n) {
     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 = _(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [
       ...this.interpretName(this.declarationNode.name),
-      ...this.interpretSettingList(this.declarationNode.attributeList),
       ...this.interpretBody(this.declarationNode.body)
     ];
   }
   interpretName(e) {
-    const n = [], s = j(this.declarationNode.name).unwrap_or([]);
+    const n = [], s = z(this.declarationNode.name).unwrap_or([]);
     return this.ref.name = s.pop() || null, s.length > 1 && n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name)), this.ref.schemaName = s.join(".") || null, n;
   }
-  interpretSettingList(e) {
-    var s, i, r;
-    const n = M(e).getValue();
-    return this.ref.color = (s = n.color) != null && s.length ? Fe((r = (i = n.color) == null ? void 0 : i.at(0)) == null ? void 0 : r.value) : void 0, [];
-  }
   interpretBody(e) {
     return e instanceof v ? this.interpretField(e) : this.interpretField(e.body[0]);
   }
   interpretField(e) {
-    var f, E, h, m;
-    const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, r = je(s), a = je(i);
-    if (Ut(r, a))
+    var f, E, h, m, g, P, S;
+    const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, r = Ye(s), a = Ye(i);
+    if (Mt(r, a))
       return [new c(o.SAME_ENDPOINT, "Two endpoints are the same", e)];
-    const l = Pt(r, a);
+    const l = Ut(r, a);
     if (this.env.refIds[l])
       return [
         new c(o.CIRCULAR_REF, "References with same endpoints exist", this.declarationNode),
         new c(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[l])
       ];
     if (e.args[0]) {
-      const g = M(e.args[0]).getValue(), R = (E = (f = g.delete) == null ? void 0 : f.at(0)) == null ? void 0 : E.value;
-      this.ref.onDelete = R instanceof z ? Te(R).unwrap_or(void 0) : Y(R).unwrap_or(void 0);
-      const S = (m = (h = g.update) == null ? void 0 : h.at(0)) == null ? void 0 : m.value;
-      this.ref.onUpdate = S instanceof z ? Te(S).unwrap_or(void 0) : Y(S).unwrap_or(void 0);
+      const F = C(e.args[0]).getValue(), Le = (E = (f = F.delete) == null ? void 0 : f.at(0)) == null ? void 0 : E.value;
+      this.ref.onDelete = Le instanceof q ? Te(Le).unwrap_or(void 0) : Q(Le).unwrap_or(void 0);
+      const B = (m = (h = F.update) == null ? void 0 : h.at(0)) == null ? void 0 : m.value;
+      this.ref.onUpdate = B instanceof q ? Te(B).unwrap_or(void 0) : Q(B).unwrap_or(void 0), this.ref.color = (g = F.color) != null && g.length ? Be((S = (P = F.color) == null ? void 0 : P.at(0)) == null ? void 0 : S.value) : void 0;
     }
-    const p = Rt(n);
+    const p = Pt(n);
     return this.ref.endpoints = [
       {
-        ...Et(s, this.container),
+        ...Nt(s, this.container),
         relation: p[0],
         token: _(s)
       },
       {
-        ...Et(i, this.container),
+        ...Nt(i, this.container),
         relation: p[1],
         token: _(i)
       }
     ], this.env.refIds[l] = this.declarationNode, [];
   }
 }
-class Bt {
+class Vt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.tableGroup = { tables: [] };
   }
@@ -3423,8 +3412,8 @@ class Bt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           this.tableGroup.note = {
-            value: C(
-              n.body instanceof Z ? n.body.body[0].callee : n.body.callee
+            value: $(
+              n.body instanceof K ? n.body.body[0].callee : n.body.callee
             ).map(ae).unwrap(),
             token: _(n)
           };
@@ -3436,7 +3425,7 @@ class Bt {
   interpretFields(e) {
     const n = [];
     return this.tableGroup.tables = e.map((s) => {
-      const i = j(s.callee).unwrap();
+      const i = z(s.callee).unwrap();
       i.length > 2 && n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", s));
       const r = pe(s.callee).unwrap().pop().referee.id;
       if (this.env.groupOfTable[r]) {
@@ -3452,16 +3441,16 @@ class Bt {
   }
   interpretSettingList(e) {
     var i, r, a;
-    const n = M(e).getValue();
-    this.tableGroup.color = (i = n.color) != null && i.length ? Fe((a = (r = n.color) == null ? void 0 : r.at(0)) == null ? void 0 : a.value) : void 0;
+    const n = C(e).getValue();
+    this.tableGroup.color = (i = n.color) != null && i.length ? Be((a = (r = n.color) == null ? void 0 : r.at(0)) == null ? void 0 : a.value) : void 0;
     const [s] = n.note || [];
     return this.tableGroup.note = s && {
-      value: C(s == null ? void 0 : s.value).map(ae).unwrap(),
+      value: $(s == null ? void 0 : s.value).map(ae).unwrap(),
       token: _(s)
     }, [];
   }
 }
-class Vt {
+class Gt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.enum = { values: [] };
   }
@@ -3476,10 +3465,10 @@ class Vt {
     return e.body.flatMap((n) => {
       var l;
       const s = n, i = {};
-      i.token = _(s), i.name = Y(s.callee).unwrap();
-      const a = (l = M(s.args[0]).getValue().note) == null ? void 0 : l.at(0);
+      i.token = _(s), i.name = Q(s.callee).unwrap();
+      const a = (l = C(s.args[0]).getValue().note) == null ? void 0 : l.at(0);
       return i.note = a && {
-        value: C(a.value).map(ae).unwrap(),
+        value: $(a.value).map(ae).unwrap(),
         token: _(a)
       }, this.enum.values.push(i), [];
     });
@@ -3504,28 +3493,28 @@ class Kn {
       const s = n;
       switch ((i = s.type) == null ? void 0 : i.value.toLowerCase()) {
         case "table": {
-          const r = new Mt(s, this.env).interpret();
+          const r = new Ft(s, this.env).interpret();
           return this.project.tables.push(this.env.tables.get(s)), r;
         }
         case "ref": {
-          const r = new Ft(s, this.env).interpret();
+          const r = new Bt(s, this.env).interpret();
           return this.project.refs.push(this.env.ref.get(s)), r;
         }
         case "tablegroup": {
-          const r = new Bt(s, this.env).interpret();
+          const r = new Vt(s, this.env).interpret();
           return this.project.tableGroups.push(this.env.tableGroups.get(s)), r;
         }
         case "enum": {
-          const r = new Vt(s, this.env).interpret();
+          const r = new Gt(s, this.env).interpret();
           return this.project.enums.push(this.env.enums.get(s)), r;
         }
         case "note":
           return this.project.note = {
-            value: C(s.body instanceof Z ? s.body.body[0].callee : s.body.callee).map(ae).unwrap(),
+            value: $(s.body instanceof K ? s.body.body[0].callee : s.body.callee).map(ae).unwrap(),
             token: _(s)
           }, [];
         default:
-          return this.project[s.type.value.toLowerCase()] = C(s.body.callee).unwrap(), [];
+          return this.project[s.type.value.toLowerCase()] = $(s.body.callee).unwrap(), [];
       }
     });
   }
@@ -3547,24 +3536,24 @@ class es {
   }
   interpret() {
     const e = this.ast.body.flatMap((n) => {
-      switch (ve(n).unwrap_or(void 0)) {
+      switch (we(n).unwrap_or(void 0)) {
         case b.Table:
-          return new Mt(n, this.env).interpret();
+          return new Ft(n, this.env).interpret();
         case b.Note:
           return new Zn(n, this.env).interpret();
         case b.Ref:
-          return new Ft(n, this.env).interpret();
-        case b.TableGroup:
           return new Bt(n, this.env).interpret();
-        case b.Enum:
+        case b.TableGroup:
           return new Vt(n, this.env).interpret();
+        case b.Enum:
+          return new Gt(n, this.env).interpret();
         case b.Project:
           return new Kn(n, this.env).interpret();
         default:
           return [];
       }
     });
-    return new G(ts(this.env), e);
+    return new X(ts(this.env), e);
   }
 }
 function ts(t) {
@@ -3580,7 +3569,7 @@ function ts(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 Ae(t) {
+function ve(t) {
   switch (t) {
     case T.Schema:
       return L.Module;
@@ -3600,8 +3589,8 @@ function Ae(t) {
       return L.Text;
   }
 }
-function Re(t, e) {
-  if (!t || $e(t))
+function Pe(t, e) {
+  if (!t || We(t))
     return !1;
   for (const n of t.trailingTrivia) {
     if (n.start > e)
@@ -3616,7 +3605,7 @@ function D() {
     suggestions: []
   };
 }
-function Pe(t) {
+function Ue(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
@@ -3625,65 +3614,65 @@ function Pe(t) {
     }))
   };
 }
-function Be(t) {
+function Ve(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
       ...e,
-      insertText: e.insertText.split("").every(Me) ? e.insertText : `"${e.insertText}"`
+      insertText: e.insertText.split("").every(Fe) ? e.insertText : `"${e.insertText}"`
     }))
   };
 }
-function nt(t, e) {
+function st(t, e) {
   return t.getOffsetAt(e);
 }
-class Gt {
+class Ct {
   constructor(e, n = []) {
     this.compiler = e, this.triggerCharacters = n;
   }
   provideCompletionItems(e, n) {
     var E, h;
-    const s = nt(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), l = a === void 0 ? i[0] : i[a + 1];
+    const s = st(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), l = a === void 0 ? i[0] : i[a + 1];
     if ([
       ...(r == null ? void 0 : r.trailingTrivia) || [],
       ...(r == null ? void 0 : r.leadingTrivia) || [],
       ...(l == null ? void 0 : l.leadingTrivia) || []
-    ].find((m) => Ht(m) && ge(s, m)))
+    ].find((m) => Ht(m) && _e(s, m)))
       return D();
     if (a === void 0)
-      return It();
-    if ([u.STRING_LITERAL, u.QUOTED_STRING].includes(r.kind) && ge(s, r))
+      return Lt();
+    if ([u.STRING_LITERAL, u.QUOTED_STRING].includes(r.kind) && _e(s, r))
       return D();
     const p = this.compiler.container.element(s);
     if (this.compiler.container.scopeKind(s) === O.TOPLEVEL || p instanceof A && p.type && p.type.start <= s && p.type.end >= s)
-      return It();
+      return Lt();
     const f = [...this.compiler.container.stack(s)].reverse();
     for (const m of f)
-      if (m instanceof q)
+      if (m instanceof H)
         switch ((E = m.op) == null ? void 0 : E.value) {
           case ">":
           case "<":
           case "<>":
           case "-":
-            return Nt(
+            return mt(
               this.compiler,
               s,
               m
             );
         }
-      else if (m instanceof H)
+      else if (m instanceof J)
         switch ((h = m.op) == null ? void 0 : h.value) {
           case ">":
           case "<":
           case "<>":
           case "-":
-            return Nt(
+            return mt(
               this.compiler,
               s,
               m
             );
           case ".":
-            return Ct(
+            return Xt(
               this.compiler,
               s,
               m
@@ -3691,32 +3680,32 @@ class Gt {
         }
       else {
         if (m instanceof ie)
-          return mt(this.compiler, s, m);
-        if (m instanceof P)
-          return mt(this.compiler, s, m);
-        if (m instanceof K)
+          return Tt(this.compiler, s, m);
+        if (m instanceof R)
+          return Tt(this.compiler, s, m);
+        if (m instanceof ee)
           return ns(this.compiler, s);
         if (m instanceof v)
-          return bt(this.compiler, s, m);
-        if (m instanceof A && (m.bodyColon && s >= m.bodyColon.end || m.body && ge(s, m.body)))
-          return bt(this.compiler, s, void 0);
+          return It(this.compiler, s, m);
+        if (m instanceof A && (m.bodyColon && s >= m.bodyColon.end || m.body && _e(s, m.body)))
+          return It(this.compiler, s, void 0);
       }
     return D();
   }
 }
-function Nt(t, e, n) {
+function mt(t, e, n) {
   const s = t.container.scopeKind(e);
   if ([O.REF, O.TABLE].includes(s)) {
-    const i = Ve(t, e, t.container.element(e), [
+    const i = Ge(t, e, t.container.element(e), [
       T.Table,
       T.Schema,
       T.Column
     ]);
-    return Re(n.op, e) ? Pe(i) : i;
+    return Pe(n.op, e) ? Ue(i) : i;
   }
   return D();
 }
-function Ve(t, e, n, s) {
+function Ge(t, e, n, s) {
   var a;
   if (n === void 0)
     return D();
@@ -3730,61 +3719,61 @@ function Ve(t, e, n, s) {
           label: p,
           insertText: p,
           insertTextRules: w.KeepWhitespace,
-          kind: Ae(f),
-          sortText: Ae(f).toString().padStart(2, "0"),
+          kind: ve(f),
+          sortText: ve(f).toString().padStart(2, "0"),
           range: void 0
         }))
       );
     }
     i = i instanceof A ? i.parent : void 0;
   }
-  return Be(r);
+  return Ve(r);
 }
 function ns(t, e) {
   var s;
   switch (t.container.scopeKind(e)) {
     case O.INDEXES:
-      return $t(t, e);
+      return Wt(t, e);
     case O.REF:
       {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
           const r = i.pop();
-          if (r instanceof H && ((s = r.op) == null ? void 0 : s.value) === ".")
-            return Ct(
+          if (r instanceof J && ((s = r.op) == null ? void 0 : s.value) === ".")
+            return Xt(
               t,
               e,
               r
             );
         }
       }
-      return Xt(t, e);
+      return $t(t, e);
   }
   return D();
 }
-function mt(t, e, n) {
+function Tt(t, e, n) {
   const { token: s } = t.container.token(e);
   if ([u.COMMA, u.LBRACKET].includes(s == null ? void 0 : s.kind)) {
-    const i = Tt(t, e);
-    return (s == null ? void 0 : s.kind) === u.COMMA && Re(s, e) ? Pe(i) : i;
+    const i = bt(t, e);
+    return (s == null ? void 0 : s.kind) === u.COMMA && Pe(s, e) ? Ue(i) : i;
   }
   if (n.name && n.name.start <= e && n.name.end >= e)
-    return Tt(t, e);
-  if (n.name instanceof z) {
+    return bt(t, e);
+  if (n.name instanceof q) {
     const i = ss(
       t,
       e,
       Te(n.name).unwrap_or("")
     );
-    return (s == null ? void 0 : s.kind) === u.COLON && Re(s, e) ? Pe(i) : i;
+    return (s == null ? void 0 : s.kind) === u.COLON && Pe(s, e) ? Ue(i) : i;
   }
   return D();
 }
-function Tt(t, e) {
+function bt(t, e) {
   const n = t.container.element(e), s = t.container.scopeKind(e);
-  if (n instanceof $)
+  if (n instanceof j)
     return D();
-  if (n.body && !ge(e, n.body))
+  if (n.body && !_e(e, n.body))
     switch (s) {
       case O.TABLE:
         return {
@@ -3906,21 +3895,21 @@ function ss(t, e, n) {
   }
   return D();
 }
-function Ct(t, e, n) {
+function Xt(t, e, n) {
   const s = pe(n).unwrap_or([]);
-  if (s.pop(), s.some((r) => !B(r)))
+  if (s.pop(), s.some((r) => !V(r)))
     return D();
-  const i = s.map((r) => Y(r).unwrap());
-  return Be({
+  const i = s.map((r) => Q(r).unwrap());
+  return Ve({
     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: Ae(r),
+      kind: ve(r),
       range: void 0
     }))
   });
 }
-function bt(t, e, n) {
+function It(t, e, n) {
   var i;
   switch (t.container.scopeKind(e)) {
     case O.TABLE:
@@ -3932,8 +3921,8 @@ function bt(t, e, n) {
     case O.ENUM:
       return is(t, e, n);
     case O.REF: {
-      const r = Xt(t, e);
-      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && Re(t.container.token(e).token, e) ? Pe(r) : r;
+      const r = $t(t, e);
+      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && Pe(t.container.token(e).token, e) ? Ue(r) : r;
     }
     case O.TABLEGROUP:
       return os(t);
@@ -3941,7 +3930,7 @@ function bt(t, e, n) {
       return D();
   }
 }
-function It() {
+function Lt() {
   return {
     suggestions: ["Table", "TableGroup", "Enum", "Project", "Ref"].map((t) => ({
       label: t,
@@ -3953,7 +3942,7 @@ function It() {
   };
 }
 function is(t, e, n) {
-  return n != null && n.callee && st(e, n) === 1 ? Ve(t, e, t.container.element(e), [
+  return n != null && n.callee && it(e, n) === 1 ? Ge(t, e, t.container.element(e), [
     T.Schema,
     T.Table,
     T.Column
@@ -3970,7 +3959,7 @@ function rs(t, e, n) {
         range: void 0
       }))
     };
-  const s = st(e, n);
+  const s = it(e, n);
   return s === 0 ? {
     suggestions: ["Note", "indexes"].map((i) => ({
       label: i,
@@ -3982,7 +3971,7 @@ function rs(t, e, n) {
   } : s === 1 ? cs(t, e) : D();
 }
 function as(t, e, n) {
-  return n != null && n.callee ? st(e, n) === 0 ? {
+  return n != null && n.callee ? it(e, n) === 0 ? {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
@@ -4000,8 +3989,8 @@ function as(t, e, n) {
     }))
   };
 }
-function Xt(t, e) {
-  return Ve(t, e, t.container.element(e), [
+function $t(t, e) {
+  return Ge(t, e, t.container.element(e), [
     T.Schema,
     T.Table,
     T.Column
@@ -4010,7 +3999,7 @@ function Xt(t, e) {
 function os(t) {
   return {
     suggestions: [
-      ...Be({
+      ...Ve({
         suggestions: [...t.parse.publicSymbolTable().entries()].flatMap(([e]) => {
           const n = re(e).unwrap_or(void 0);
           if (n === void 0)
@@ -4020,7 +4009,7 @@ function os(t) {
             label: i,
             insertText: i,
             insertTextRules: w.KeepWhitespace,
-            kind: Ae(s),
+            kind: ve(s),
             range: void 0
           };
         })
@@ -4036,7 +4025,7 @@ function os(t) {
   };
 }
 function ls(t, e) {
-  return $t(t, e);
+  return Wt(t, e);
 }
 function cs(t, e) {
   return {
@@ -4106,19 +4095,19 @@ function cs(t, e) {
         sortText: L.TypeParameter.toString().padStart(2, "0"),
         range: void 0
       })),
-      ...Ve(t, e, t.container.element(e), [
+      ...Ge(t, e, t.container.element(e), [
         T.Enum,
         T.Schema
       ]).suggestions
     ]
   };
 }
-function $t(t, e) {
+function Wt(t, e) {
   const n = t.container.element(e), s = n == null ? void 0 : n.parent;
-  if (!((s == null ? void 0 : s.symbol) instanceof wt))
+  if (!((s == null ? void 0 : s.symbol) instanceof yt))
     return D();
   const { symbolTable: i } = s.symbol;
-  return Be({
+  return Ve({
     suggestions: [...i.entries()].flatMap(([r]) => {
       const a = re(r).unwrap_or(void 0);
       if (a === void 0)
@@ -4128,25 +4117,25 @@ function $t(t, e) {
         label: l,
         insertText: l,
         insertTextRules: w.KeepWhitespace,
-        kind: Ae(T.Column),
+        kind: ve(T.Column),
         range: void 0
       };
     })
   });
 }
-function st(t, e) {
+function it(t, e) {
   if (!e.callee)
     return -1;
   const n = [e.callee, ...e.args], s = n.findIndex((i) => t <= i.end);
   return s === -1 ? n.length : s;
 }
-class Wt {
+class jt {
   constructor(e) {
     this.compiler = e;
   }
   provideDefinition(e, n) {
     var a;
-    const { uri: s } = e, i = nt(e, n), r = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = st(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const l = r.pop();
       if ((a = l == null ? void 0 : l.referee) != null && a.declaration && [Ne.PRIMARY_EXPRESSION, Ne.VARIABLE].includes(l == null ? void 0 : l.kind)) {
@@ -4167,12 +4156,12 @@ class Wt {
     return [];
   }
 }
-class jt {
+class Yt {
   constructor(e) {
     this.compiler = e;
   }
   provideReferences(e, n) {
-    const { uri: s } = e, i = nt(e, n), r = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = st(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const a = r.pop();
       if (a && [
@@ -4200,9 +4189,9 @@ const fs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   CompletionItemInsertTextRule: w,
   CompletionItemKind: L,
-  DBMLCompletionItemProvider: Gt,
-  DBMLDefinitionProvider: Wt,
-  DBMLReferencesProvider: jt
+  DBMLCompletionItemProvider: Ct,
+  DBMLDefinitionProvider: jt,
+  DBMLReferencesProvider: Yt
 }, Symbol.toStringTag, { value: "Module" }));
 var O = /* @__PURE__ */ ((t) => (t[t.TABLE = 0] = "TABLE", t[t.ENUM = 1] = "ENUM", t[t.TABLEGROUP = 2] = "TABLEGROUP", t[t.INDEXES = 3] = "INDEXES", t[t.NOTE = 4] = "NOTE", t[t.REF = 5] = "REF", t[t.PROJECT = 6] = "PROJECT", t[t.CUSTOM = 7] = "CUSTOM", t[t.TOPLEVEL = 8] = "TOPLEVEL", t))(O || {});
 class ps {
@@ -4213,7 +4202,7 @@ class ps {
     ).fill(null), this.nodeIdGenerator = new Jt(), this.symbolIdGenerator = new nn(), this.token = {
       invalidStream: this.createQuery(
         6,
-        () => this.parse.tokens().filter(yt)
+        () => this.parse.tokens().filter(kt)
       ),
       // Valid + Invalid tokens (which are guarenteed to be non-trivials) are included in the stream
       flatStream: this.createQuery(
@@ -4257,8 +4246,8 @@ class ps {
           let l = this.parse.ast();
           const p = [l];
           for (; ; ) {
-            const E = fn(l).find((h) => ge(a, h));
-            if (E === void 0 || E instanceof V)
+            const E = fn(l).find((h) => _e(a, h));
+            if (E === void 0 || E instanceof G)
               break;
             p.push(E), l = E;
           }
@@ -4266,16 +4255,16 @@ class ps {
             return p;
           for (; p.length > 0; ) {
             let f = !1;
-            const E = Xe(p);
+            const E = $e(p);
             if (E instanceof v) {
               const h = this.parse.source();
               for (let m = E.end; m < e; m += 1)
                 h[m] === `
 ` && (p.pop(), f = !0);
             } else
-              E instanceof q || E instanceof H ? this.container.token(e).token !== E.op && (p.pop(), f = !0) : E instanceof P ? E.listCloseBracket && E.end <= e && (p.pop(), f = !0) : E instanceof K ? E.tupleCloseParen && E.end <= e && (p.pop(), f = !0) : E instanceof Z ? E.blockCloseBrace && E.end <= e && (p.pop(), f = !0) : E instanceof z || E.end < e && (p.pop(), f = !0);
+              E instanceof H || E instanceof J ? this.container.token(e).token !== E.op && (p.pop(), f = !0) : E instanceof R ? E.listCloseBracket && E.end <= e && (p.pop(), f = !0) : E instanceof ee ? E.tupleCloseParen && E.end <= e && (p.pop(), f = !0) : E instanceof K ? E.blockCloseBrace && E.end <= e && (p.pop(), f = !0) : E instanceof q || E.end < e && (p.pop(), f = !0);
             if (f) {
-              const h = Xe(p);
+              const h = $e(p);
               h instanceof A && h.end <= e && p.pop();
             }
             if (!f)
@@ -4313,7 +4302,7 @@ class ps {
       ),
       scopeKind: this.createQuery(15, (e) => {
         var s;
-        if (this.container.element(e) instanceof $)
+        if (this.container.element(e) instanceof j)
           return 8;
         switch ((s = this.container.element(e).type) == null ? void 0 : s.value.toLowerCase()) {
           case "table":
@@ -4399,9 +4388,9 @@ class ps {
   }
   initMonacoServices() {
     return {
-      definitionProvider: new Wt(this),
-      referenceProvider: new jt(this),
-      autocompletionProvider: new Gt(this)
+      definitionProvider: new jt(this),
+      referenceProvider: new Yt(this),
+      autocompletionProvider: new Ct(this)
     };
   }
 }