@dbml/parse 3.7.3 → 3.8.0

package/dist/dbml-parse.mjs

@@ -1,6 +1,6 @@
-import I, { partition as jt, findLastIndex as Yt, last as it } from "lodash";
+import I, { partition as Yt, findLastIndex as zt, last as rt } 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 zt(t) {
+function Qt(t) {
   switch (t.kind) {
     case "<newline>":
     case "<space>":
@@ -12,7 +12,7 @@ function zt(t) {
       return !1;
   }
 }
-function rt(t) {
+function at(t) {
   if (!t)
     return !1;
   switch (t) {
@@ -33,7 +33,7 @@ function rt(t) {
       return !1;
   }
 }
-function at(t) {
+function ot(t) {
   return t !== void 0 && t.kind === "<op>";
 }
 class F {
@@ -44,27 +44,27 @@ class F {
     return new F(e, n, s, i, r);
   }
 }
-function bt(t) {
+function It(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === u.NEWLINE) !== void 0;
 }
-function ot(t, e) {
-  return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || bt(t);
+function lt(t, e) {
+  return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || It(t);
 }
 function Ce(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === u.SPACE) !== void 0;
 }
-function It(t) {
-  return t.trailingTrivia.length === 0 ? t.end : It(I.last(t.trailingTrivia));
-}
 function Lt(t) {
-  return t.leadingTrivia.length === 0 ? t.start : Lt(t.leadingTrivia[0]);
+  return t.trailingTrivia.length === 0 ? t.end : Lt(I.last(t.trailingTrivia));
 }
-function Qt(t) {
+function gt(t) {
+  return t.leadingTrivia.length === 0 ? t.start : gt(t.leadingTrivia[0]);
+}
+function qt(t) {
   return [u.SINGLE_LINE_COMMENT, u.MULTILINE_COMMENT].includes(
     t.kind
   );
 }
-class qt {
+class Ht {
   constructor() {
     this.id = 0;
   }
@@ -81,13 +81,13 @@ class x {
   constructor(e, n, s) {
     this.id = e, this.kind = n;
     const i = s.find((a) => a !== void 0 && !Number.isNaN(a.start));
-    i ? (this.startPos = i.startPos, this.fullStart = i instanceof F ? Lt(i) : i.fullStart) : (this.startPos = {
+    i ? (this.startPos = i.startPos, this.fullStart = i instanceof F ? gt(i) : i.fullStart) : (this.startPos = {
       offset: NaN,
       column: NaN,
       line: NaN
     }, this.fullStart = NaN);
     const r = [...s].reverse().find((a) => a !== void 0 && !Number.isNaN(a.end));
-    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof F ? It(r) : r.fullEnd) : (this.endPos = {
+    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof F ? Lt(r) : r.fullEnd) : (this.endPos = {
       offset: NaN,
       column: NaN,
       line: NaN
@@ -108,7 +108,7 @@ class v extends x {
     alias: i,
     attributeList: r,
     bodyColon: a,
-    body: c
+    body: l
   }, p) {
     if (super(p, "<element-declaration>", [
       e,
@@ -117,10 +117,10 @@ class v extends x {
       i,
       r,
       a,
-      c
-    ]), c && a && !(c instanceof y || c instanceof v))
+      l
+    ]), l && a && !(l instanceof w || l instanceof v))
       throw new Error("If an element has a simple body, it must be a function application node");
-    this.type = e, this.name = n, this.as = s, this.alias = i, this.attributeList = r, this.bodyColon = a, this.body = c;
+    this.type = e, this.name = n, this.as = s, this.alias = i, this.attributeList = r, this.bodyColon = a, this.body = l;
   }
 }
 class Y extends x {
@@ -161,7 +161,7 @@ class ne extends x {
     super(n, "<function-expression>", [e]), this.value = e;
   }
 }
-class y extends x {
+class w extends x {
   constructor({ callee: e, args: n = [] }, s) {
     super(s, "<function-application>", [e, ...n]), this.callee = e, this.args = n;
   }
@@ -175,7 +175,7 @@ class J extends x {
     super(i, "<block-expression>", [e, ...n, s]), this.blockOpenBrace = e, this.body = n, this.blockCloseBrace = s;
   }
 }
-class D extends x {
+class R extends x {
   constructor({
     listOpenBracket: e,
     elementList: n = [],
@@ -184,7 +184,7 @@ class D extends x {
   }, r) {
     super(r, "<list-expression>", [
       e,
-      ...gt(n, s),
+      ..._t(n, s),
       i
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
@@ -198,7 +198,7 @@ class Z extends x {
   }, r) {
     super(r, "<tuple-expression>", [
       e,
-      ...gt(n, s),
+      ..._t(n, s),
       i
     ]), this.tupleOpenParen = e, this.elementList = n, this.commaList = s, this.tupleCloseParen = i;
   }
@@ -254,7 +254,7 @@ class he extends x {
     super(s, "<array>", [e, n]), this.array = e, this.indexer = n;
   }
 }
-function gt(t, e) {
+function _t(t, e) {
   if (!t || t.length === 0)
     return e || [];
   if (!e || e.length === 0)
@@ -356,7 +356,7 @@ function qe(t) {
 function He(t) {
   return `TableGroup field:${t}`;
 }
-function Ht(t) {
+function Jt(t) {
   return `Note:${t}`;
 }
 function Ve(t, e) {
@@ -386,14 +386,14 @@ function ie(t) {
     kind: e
   }) : new k();
 }
-function Jt(t) {
+function Zt(t) {
   const e = ie(t).unwrap_or(void 0);
   if (!e)
     return !1;
   const { kind: n, name: s } = e;
   return n === "Schema" && s === "public";
 }
-function Zt(t) {
+function Kt(t) {
   return [
     je,
     Oe,
@@ -407,18 +407,18 @@ function Zt(t) {
 function Me(t) {
   return !!t.match(/(\p{L}|_|\p{M})/gu);
 }
-function Re(t) {
+function De(t) {
   const [e] = t;
   return e >= "0" && e <= "9";
 }
-function Kt(t) {
+function en(t) {
   const [e] = t;
-  return Re(e) || Me(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
+  return De(e) || Me(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
 function Ee(t) {
-  return Me(t) || Re(t);
+  return Me(t) || De(t);
 }
-function lt(t, e) {
+function ct(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]);
@@ -427,7 +427,7 @@ function lt(t, e) {
 function ge(t, e) {
   return t >= e.start && t < e.end;
 }
-class en {
+class tn {
   constructor() {
     this.id = 0;
   }
@@ -438,45 +438,45 @@ class en {
     return this.id++;
   }
 }
-class _t {
+class At {
   constructor({ symbolTable: e }, n) {
     this.references = [], this.id = n, this.symbolTable = e;
   }
 }
-class tn {
+class nn {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class nn {
+class sn {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class At {
+class vt {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class sn {
+class rn {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class rn {
+class an {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class an {
+class on {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
 var o = /* @__PURE__ */ ((t) => (t[t.UNKNOWN_SYMBOL = 1e3] = "UNKNOWN_SYMBOL", t[t.UNEXPECTED_SYMBOL = 1001] = "UNEXPECTED_SYMBOL", t[t.UNEXPECTED_EOF = 1002] = "UNEXPECTED_EOF", t[t.UNEXPECTED_NEWLINE = 1003] = "UNEXPECTED_NEWLINE", t[t.UNKNOWN_TOKEN = 1004] = "UNKNOWN_TOKEN", t[t.UNEXPECTED_TOKEN = 1005] = "UNEXPECTED_TOKEN", t[t.UNEXPECTED_ELEMENT_DECLARATION = 1006] = "UNEXPECTED_ELEMENT_DECLARATION", t[t.MISSING_SPACES = 1007] = "MISSING_SPACES", t[t.UNKNOWN_PREFIX_OP = 1008] = "UNKNOWN_PREFIX_OP", t[t.INVALID_OPERAND = 1009] = "INVALID_OPERAND", t[t.EMPTY_ATTRIBUTE_NAME = 1010] = "EMPTY_ATTRIBUTE_NAME", t[t.INVALID_ESCAPE_SEQUENCE = 1011] = "INVALID_ESCAPE_SEQUENCE", t[t.INVALID_NAME = 3e3] = "INVALID_NAME", t[t.UNEXPECTED_NAME = 3001] = "UNEXPECTED_NAME", t[t.NAME_NOT_FOUND = 3002] = "NAME_NOT_FOUND", t[t.DUPLICATE_NAME = 3003] = "DUPLICATE_NAME", t[t.INVALID_ALIAS = 3004] = "INVALID_ALIAS", t[t.UNEXPECTED_ALIAS = 3005] = "UNEXPECTED_ALIAS", t[t.UNEXPECTED_SETTINGS = 3006] = "UNEXPECTED_SETTINGS", t[t.INVALID_SETTINGS = 3007] = "INVALID_SETTINGS", t[t.UNEXPECTED_SIMPLE_BODY = 3008] = "UNEXPECTED_SIMPLE_BODY", t[t.UNEXPECTED_COMPLEX_BODY = 3009] = "UNEXPECTED_COMPLEX_BODY", t[t.INVALID_TABLE_CONTEXT = 3010] = "INVALID_TABLE_CONTEXT", t[t.INVALID_TABLE_SETTING = 3011] = "INVALID_TABLE_SETTING", t[t.DUPLICATE_TABLE_SETTING = 3012] = "DUPLICATE_TABLE_SETTING", t[t.INVALID_TABLEGROUP_CONTEXT = 3013] = "INVALID_TABLEGROUP_CONTEXT", t[t.INVALID_TABLEGROUP_ELEMENT_NAME = 3014] = "INVALID_TABLEGROUP_ELEMENT_NAME", t[t.DUPLICATE_TABLEGROUP_ELEMENT_NAME = 3015] = "DUPLICATE_TABLEGROUP_ELEMENT_NAME", t[t.DUPLICATE_TABLEGROUP_FIELD_NAME = 3016] = "DUPLICATE_TABLEGROUP_FIELD_NAME", t[t.INVALID_TABLEGROUP_FIELD = 3017] = "INVALID_TABLEGROUP_FIELD", t[t.EMPTY_TABLE = 3018] = "EMPTY_TABLE", t[t.INVALID_COLUMN = 3019] = "INVALID_COLUMN", t[t.INVALID_COLUMN_NAME = 3020] = "INVALID_COLUMN_NAME", t[t.UNKNOWN_COLUMN_SETTING = 3021] = "UNKNOWN_COLUMN_SETTING", t[t.INVALID_COLUMN_TYPE = 3022] = "INVALID_COLUMN_TYPE", t[t.DUPLICATE_COLUMN_NAME = 3023] = "DUPLICATE_COLUMN_NAME", t[t.DUPLICATE_COLUMN_SETTING = 3024] = "DUPLICATE_COLUMN_SETTING", t[t.INVALID_COLUMN_SETTING_VALUE = 3025] = "INVALID_COLUMN_SETTING_VALUE", t[t.INVALID_ENUM_CONTEXT = 3026] = "INVALID_ENUM_CONTEXT", t[t.INVALID_ENUM_ELEMENT_NAME = 3027] = "INVALID_ENUM_ELEMENT_NAME", t[t.INVALID_ENUM_ELEMENT = 3028] = "INVALID_ENUM_ELEMENT", t[t.DUPLICATE_ENUM_ELEMENT_NAME = 3029] = "DUPLICATE_ENUM_ELEMENT_NAME", t[t.UNKNOWN_ENUM_ELEMENT_SETTING = 3030] = "UNKNOWN_ENUM_ELEMENT_SETTING", t[t.DUPLICATE_ENUM_ELEMENT_SETTING = 3031] = "DUPLICATE_ENUM_ELEMENT_SETTING", t[t.INVALID_ENUM_ELEMENT_SETTING = 3032] = "INVALID_ENUM_ELEMENT_SETTING", t[t.EMPTY_ENUM = 3033] = "EMPTY_ENUM", t[t.INVALID_REF_CONTEXT = 3034] = "INVALID_REF_CONTEXT", t[t.UNKNOWN_REF_SETTING = 3035] = "UNKNOWN_REF_SETTING", t[t.DUPLICATE_REF_SETTING = 3036] = "DUPLICATE_REF_SETTING", t[t.INVALID_REF_SETTING_VALUE = 3037] = "INVALID_REF_SETTING_VALUE", t[t.INVALID_REF_RELATIONSHIP = 3038] = "INVALID_REF_RELATIONSHIP", t[t.INVALID_REF_FIELD = 3039] = "INVALID_REF_FIELD", t[t.EMPTY_REF = 3040] = "EMPTY_REF", t[t.REF_REDEFINED = 3041] = "REF_REDEFINED", t[t.INVALID_NOTE_CONTEXT = 3042] = "INVALID_NOTE_CONTEXT", t[t.INVALID_NOTE = 3043] = "INVALID_NOTE", t[t.NOTE_REDEFINED = 3044] = "NOTE_REDEFINED", t[t.NOTE_CONTENT_REDEFINED = 3045] = "NOTE_CONTENT_REDEFINED", t[t.EMPTY_NOTE = 3046] = "EMPTY_NOTE", t[t.INVALID_INDEXES_CONTEXT = 3047] = "INVALID_INDEXES_CONTEXT", t[t.INVALID_INDEXES_FIELD = 3048] = "INVALID_INDEXES_FIELD", t[t.INVALID_INDEX = 3049] = "INVALID_INDEX", t[t.UNKNOWN_INDEX_SETTING = 3050] = "UNKNOWN_INDEX_SETTING", t[t.DUPLICATE_INDEX_SETTING = 3051] = "DUPLICATE_INDEX_SETTING", t[t.UNEXPECTED_INDEX_SETTING_VALUE = 3052] = "UNEXPECTED_INDEX_SETTING_VALUE", t[t.INVALID_INDEX_SETTING_VALUE = 3053] = "INVALID_INDEX_SETTING_VALUE", t[t.INVALID_PROJECT_CONTEXT = 3054] = "INVALID_PROJECT_CONTEXT", t[t.PROJECT_REDEFINED = 3055] = "PROJECT_REDEFINED", t[t.INVALID_PROJECT_FIELD = 3056] = "INVALID_PROJECT_FIELD", t[t.INVALID_CUSTOM_CONTEXT = 3057] = "INVALID_CUSTOM_CONTEXT", t[t.INVALID_CUSTOM_ELEMENT_VALUE = 3058] = "INVALID_CUSTOM_ELEMENT_VALUE", t[t.INVALID_ELEMENT_IN_SIMPLE_BODY = 3059] = "INVALID_ELEMENT_IN_SIMPLE_BODY", t[t.BINDING_ERROR = 4e3] = "BINDING_ERROR", t[t.UNSUPPORTED = 5e3] = "UNSUPPORTED", t[t.CIRCULAR_REF = 5001] = "CIRCULAR_REF", t[t.SAME_ENDPOINT = 5002] = "SAME_ENDPOINT", t[t.UNEQUAL_FIELDS_BINARY_REF = 5003] = "UNEQUAL_FIELDS_BINARY_REF", t[t.CONFLICTING_SETTING = 5004] = "CONFLICTING_SETTING", t[t.TABLE_REAPPEAR_IN_TABLEGROUP = 5005] = "TABLE_REAPPEAR_IN_TABLEGROUP", t))(o || {});
-class l extends Error {
+class c extends Error {
   constructor(e, n, s) {
-    super(n), this.code = e, this.diagnostic = n, this.nodeOrToken = s, this.start = s.start, this.end = s.end, this.name = this.constructor.name, Object.setPrototypeOf(this, l.prototype);
+    super(n), this.code = e, this.diagnostic = n, this.nodeOrToken = s, this.start = s.start, this.end = s.end, this.name = this.constructor.name, Object.setPrototypeOf(this, c.prototype);
   }
 }
 class V {
@@ -497,13 +497,13 @@ class V {
     return new V(e(this.value), this.errors);
   }
 }
-function on(t, e, n) {
+function ln(t, e, n) {
   if (!t || !me(t) || e.length === 0)
     return new k();
   const s = [...e], i = Ge(t).unwrap(), r = s.pop();
   if (!(r instanceof J))
     return new k();
-  const a = I.last(s) instanceof D ? s.pop() : void 0;
+  const a = I.last(s) instanceof R ? s.pop() : void 0;
   return s.length === 3 && Ge(s[1]).unwrap().value === "as" ? new S(
     n.create(v, {
       type: i,
@@ -528,16 +528,16 @@ function on(t, e, n) {
     })
   ) : new k();
 }
-function ct(t) {
+function ut(t) {
   return t.kind === u.IDENTIFIER && t.value === "as";
 }
 function N(t) {
-  t && (t instanceof F ? ln(t) : cn(t));
+  t && (t instanceof F ? cn(t) : un(t));
 }
-function ln(t) {
+function cn(t) {
   t.kind !== u.EOF && (t.isInvalid = !0);
 }
-function cn(t) {
+function un(t) {
   if (t instanceof v)
     N(t.type), N(t.name), N(t.as), N(t.alias), N(t.bodyColon), N(t.attributeList), N(t.body);
   else if (t instanceof Y)
@@ -552,13 +552,13 @@ function cn(t) {
     N(t.op), N(t.expression);
   else if (t instanceof J)
     N(t.blockOpenBrace), t.body.forEach(N), N(t.blockCloseBrace);
-  else if (t instanceof D)
+  else if (t instanceof R)
     N(t.listOpenBracket), t.commaList.forEach(N), t.elementList.forEach(N), N(t.listCloseBracket);
   else if (t instanceof Z)
     N(t.tupleOpenParen), t.commaList.forEach(N), t.elementList.forEach(N), N(t.tupleCloseParen);
   else if (t instanceof H)
     N(t.callee), N(t.argumentList);
-  else if (t instanceof y)
+  else if (t instanceof w)
     N(t.callee), t.args.forEach(N);
   else if (t instanceof U)
     N(t.expression);
@@ -571,13 +571,13 @@ function cn(t) {
   else
     throw t instanceof We ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
 }
-function vt(t) {
+function wt(t) {
   return !!(t != null && t.isInvalid);
 }
 function P(...t) {
   return t.filter((e) => e !== void 0);
 }
-function un(t) {
+function hn(t) {
   if (t instanceof X)
     return P(...t.body, t.eof);
   if (t instanceof v)
@@ -606,20 +606,20 @@ function un(t) {
     return P(t.expression, t.op);
   if (t instanceof ne)
     return P(t.value);
-  if (t instanceof y)
+  if (t instanceof w)
     return P(t.callee, ...t.args);
   if (t instanceof J)
     return P(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
-  if (t instanceof D)
+  if (t instanceof R)
     return P(
       t.listOpenBracket,
-      ...lt(t.elementList, t.commaList),
+      ...ct(t.elementList, t.commaList),
       t.listCloseBracket
     );
   if (t instanceof Z)
     return P(
       t.tupleOpenParen,
-      ...lt(t.elementList, t.commaList),
+      ...ct(t.elementList, t.commaList),
       t.tupleCloseParen
     );
   if (t instanceof H)
@@ -657,7 +657,7 @@ function Te(t) {
   const e = t.identifiers.map((n) => n.value).join(" ");
   return e === "" ? new k() : new S(e);
 }
-class hn {
+class fn {
   // list of errors during lexing
   constructor(e) {
     this.start = {
@@ -767,7 +767,7 @@ class hn {
           this.match("/") ? this.singleLineComment() : this.match("*") ? this.multilineComment() : this.operator();
           break;
         default:
-          if (rt(e)) {
+          if (at(e)) {
             this.operator();
             break;
           }
@@ -775,12 +775,12 @@ class hn {
             this.identifier();
             break;
           }
-          if (Re(e)) {
+          if (De(e)) {
             this.numericLiteralOrIdentifier();
             break;
           }
           this.addToken(u.OP, !0), this.errors.push(
-            new l(
+            new c(
               o.UNKNOWN_SYMBOL,
               `Unexpected token '${e}'`,
               this.createToken(u.OP, !0)
@@ -795,13 +795,13 @@ class hn {
     let e = !0, n = [], s;
     const i = [];
     for (const r of this.tokens)
-      zt(r) ? (n.push(r), r.kind === u.NEWLINE && s && (s.trailingTrivia = n, e = !0, s = void 0, n = [])) : (e ? r.leadingTrivia = n : s.trailingTrivia = n, i.push(r), n = [], s = r, e = !1);
+      Qt(r) ? (n.push(r), r.kind === u.NEWLINE && s && (s.trailingTrivia = n, e = !0, s = void 0, n = [])) : (e ? r.leadingTrivia = n : s.trailingTrivia = n, i.push(r), n = [], s = r, e = !1);
     this.tokens = i;
   }
   gatherInvalid() {
     let e;
     const n = [], s = [];
-    for (e = 0; e < this.tokens.length && vt(this.tokens[e]); e += 1)
+    for (e = 0; e < this.tokens.length && wt(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) {
@@ -820,14 +820,14 @@ class hn {
     // Whether to interpret '\' as a backlash
     consumeStopSequence: a = !0
   }) {
-    let c = "";
+    let l = "";
     for (; !this.isAtEnd() && (s || !this.check(`
 `)) && !this.check(n); )
-      this.peek() === "\\" && !r ? (this.advance(), c += this.escapedString()) : c += this.advance();
+      this.peek() === "\\" && !r ? (this.advance(), l += this.escapedString()) : l += this.advance();
     if (this.isAtEnd() && !i) {
       const p = this.createToken(e, !0);
       this.tokens.push(p), this.errors.push(
-        new l(o.UNEXPECTED_EOF, "EOF reached while parsing", p)
+        new c(o.UNEXPECTED_EOF, "EOF reached while parsing", p)
       );
       return;
     }
@@ -835,7 +835,7 @@ class hn {
 `) && !s) {
       const p = this.createToken(e, !0);
       this.tokens.push(p), this.errors.push(
-        new l(
+        new c(
           o.UNEXPECTED_NEWLINE,
           "Invalid newline encountered while parsing",
           p
@@ -843,7 +843,7 @@ class hn {
       );
       return;
     }
-    a && this.match(n), this.tokens.push(F.create(e, this.start, this.current, c, !1));
+    a && this.match(n), this.tokens.push(F.create(e, this.start, this.current, l, !1));
   }
   singleLineStringLiteral() {
     this.consumeUntil(u.STRING_LITERAL, "'", {
@@ -895,7 +895,7 @@ class hn {
     this.addToken(u.IDENTIFIER);
   }
   operator() {
-    for (; rt(this.peek()); )
+    for (; at(this.peek()); )
       this.advance();
     this.addToken(u.OP);
   }
@@ -912,7 +912,7 @@ class hn {
         return this.advance(), this.addToken(u.NUMERIC_LITERAL);
       if (!n && !Ee(this.peek()))
         return this.addToken(u.NUMERIC_LITERAL);
-      if (!n && !Re(this.peek()))
+      if (!n && !De(this.peek()))
         break;
       this.advance();
     }
@@ -920,7 +920,7 @@ class hn {
       for (; !this.isAtEnd() && (this.check(".") || Ee(this.peek())); )
         this.advance();
       const n = this.createToken(u.NUMERIC_LITERAL, !0);
-      this.tokens.push(n), this.errors.push(new l(o.UNKNOWN_TOKEN, "Invalid number", n));
+      this.tokens.push(n), this.errors.push(new c(o.UNKNOWN_TOKEN, "Invalid number", n));
     } else {
       for (; !this.isAtEnd() && Ee(this.peek()); )
         this.advance();
@@ -971,7 +971,7 @@ class hn {
         let n = "";
         for (let s = 0; s <= 3; s += 1) {
           if (this.isAtEnd() || !Ee(this.peek()))
-            return this.errors.push(new l(o.INVALID_ESCAPE_SEQUENCE, `Invalid unicode escape sequence '\\u${n}', only unicode escape sequences of the form '\\uHHHH' where H is a hexadecimal number are allowed`, F.create(u.STRING_LITERAL, e, this.current, `\\u${n}`, !0))), `\\u${n}`;
+            return this.errors.push(new c(o.INVALID_ESCAPE_SEQUENCE, `Invalid unicode escape sequence '\\u${n}', only unicode escape sequences of the form '\\uHHHH' where H is a hexadecimal number are allowed`, F.create(u.STRING_LITERAL, e, this.current, `\\u${n}`, !0))), `\\u${n}`;
           n += this.advance();
         }
         return String.fromCharCode(parseInt(n, 16));
@@ -982,7 +982,7 @@ class hn {
   }
 }
 var Se = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(Se || {});
-class fn {
+class pn {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
   }
@@ -1048,7 +1048,7 @@ class fn {
         }
   }
 }
-class pn {
+class dn {
   constructor(e) {
     this.generator = e;
   }
@@ -1061,15 +1061,15 @@ class d {
     this.token = e, this.partialNode = n, this.handlerContext = s;
   }
 }
-class dn {
+class En {
   constructor(e, n) {
-    this.current = 0, this.errors = [], this.contextStack = new fn(), this.synchronizeProgram = () => {
+    this.current = 0, this.errors = [], this.contextStack = new pn(), this.synchronizeProgram = () => {
       const s = this.peek();
       s.kind !== u.EOF ? N(this.advance()) : (N(this.peek()), this.logError(s, o.UNEXPECTED_EOF, "Unexpected EOF"));
     }, this.synchronizeElementDeclarationName = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (ct(s) || this.check(u.COLON, u.LBRACE, u.LBRACKET))
+        if (ut(s) || this.check(u.COLON, u.LBRACE, u.LBRACKET))
           break;
         N(s), this.advance();
       }
@@ -1115,7 +1115,7 @@ class dn {
       if (!this.check(u.RBRACE))
         for (N(this.advance()); !this.isAtEnd(); ) {
           const s = this.peek();
-          if (this.check(u.RBRACE) || ot(this.previous(), s))
+          if (this.check(u.RBRACE) || lt(this.previous(), s))
             break;
           N(s), this.advance();
         }
@@ -1172,7 +1172,7 @@ class dn {
         N(s), this.advance();
       }
     }, this.listExpression = this.contextStack.withContextDo(Se.ListExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(D, s);
+      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) {
@@ -1233,7 +1233,7 @@ class dn {
           break;
         N(s), this.advance();
       }
-    }, this.tokens = e, this.nodeFactory = new pn(n);
+    }, this.tokens = e, this.nodeFactory = new dn(n);
   }
   isAtEnd() {
     return this.current >= this.tokens.length || this.tokens[this.current].kind === u.EOF;
@@ -1324,7 +1324,7 @@ class dn {
           throw new d(s.token, n(), s.handlerContext);
         this.synchronizeElementDeclarationName();
       }
-    if (ct(this.peek()))
+    if (ut(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
@@ -1380,7 +1380,7 @@ class dn {
     }
     try {
       const s = this.expression();
-      s instanceof v ? this.errors.push(new l(o.INVALID_ELEMENT_IN_SIMPLE_BODY, "Simple body cannot be an element declaration", s)) : e.body = s;
+      s instanceof v ? this.errors.push(new c(o.INVALID_ELEMENT_IN_SIMPLE_BODY, "Simple body cannot be an element declaration", s)) : e.body = s;
     } catch (s) {
       throw s instanceof d ? (e.body = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
@@ -1388,8 +1388,8 @@ class dn {
   }
   /* Parsing any ExpressionNode, including non-NormalExpression */
   expression() {
-    const e = { args: [] }, n = () => on(e.callee, e.args, this.nodeFactory).unwrap_or(
-      this.nodeFactory.create(y, e)
+    const e = { args: [] }, n = () => ln(e.callee, e.args, this.nodeFactory).unwrap_or(
+      this.nodeFactory.create(w, e)
     );
     try {
       e.callee = this.normalExpression();
@@ -1410,7 +1410,7 @@ class dn {
     return n();
   }
   shouldStopExpression() {
-    if (this.isAtEnd() || bt(this.previous()))
+    if (this.isAtEnd() || It(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,12 +1424,12 @@ class dn {
     for (; !this.isAtEnd(); ) {
       const s = this.peek();
       if (s.kind === u.LPAREN) {
-        const { left: i } = ut(s);
+        const { left: i } = ht(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 '['
-        ot(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
+        lt(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
           break;
         try {
           n = this.nodeFactory.create(H, {
@@ -1456,8 +1456,8 @@ class dn {
             indexer: i.partialNode
           }), new d(i.token, n, i.handlerContext)) : i;
         }
-      } else if (at(s)) {
-        const i = s, r = ut(i);
+      } else if (ot(s)) {
+        const i = s, r = ht(i);
         if (r.left !== null) {
           if (r.left <= e)
             break;
@@ -1466,7 +1466,7 @@ class dn {
             op: i
           });
         } else {
-          const a = Nn(i);
+          const a = mn(i);
           if (a.left === null || a.left <= e)
             break;
           this.advance();
@@ -1476,12 +1476,12 @@ class dn {
               op: i,
               rightExpression: i.value === "." ? this.extractOperand() : this.expression_bp(a.right)
             });
-          } catch (c) {
-            throw c instanceof d ? (n = this.nodeFactory.create(q, {
+          } catch (l) {
+            throw l instanceof d ? (n = this.nodeFactory.create(q, {
               leftExpression: n,
               op: i,
-              rightExpression: c.partialNode
-            }), new d(c.token, n, c.handlerContext)) : c;
+              rightExpression: l.partialNode
+            }), new d(l.token, n, l.handlerContext)) : l;
           }
         }
       } else
@@ -1491,10 +1491,10 @@ class dn {
   }
   leftExpression_bp() {
     let e;
-    if (at(this.peek())) {
+    if (ot(this.peek())) {
       const n = {};
       n.op = this.peek();
-      const s = Tn(n.op);
+      const s = bn(n.op);
       if (s.right === null)
         throw this.logError(
           n.op,
@@ -1635,10 +1635,10 @@ class dn {
     return this.nodeFactory.create(Y, { identifiers: e });
   }
   logError(e, n, s) {
-    this.errors.push(new l(n, s, e));
+    this.errors.push(new c(n, s, e));
   }
 }
-const En = {
+const Nn = {
   "+": { left: 9, right: 10 },
   "*": { left: 11, right: 12 },
   "-": { left: 9, right: 10 },
@@ -1654,10 +1654,10 @@ const En = {
   "!=": { left: 4, right: 5 },
   ".": { left: 16, right: 17 }
 };
-function Nn(t) {
-  return En[t.value] || { left: null, right: null };
+function mn(t) {
+  return Nn[t.value] || { left: null, right: null };
 }
-const mn = {
+const Tn = {
   "+": { left: null, right: 15 },
   "-": { left: null, right: 15 },
   "<": { left: null, right: 15 },
@@ -1665,14 +1665,14 @@ const mn = {
   "<>": { left: null, right: 15 },
   "!": { left: null, right: 15 }
 };
-function Tn(t) {
-  return mn[t.value] || { left: null, right: null };
+function bn(t) {
+  return Tn[t.value] || { left: null, right: null };
 }
-const bn = {
+const In = {
   "(": { left: 14, right: null }
 };
-function ut(t) {
-  return bn[t.value] || { left: null, right: null };
+function ht(t) {
+  return In[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) {
@@ -1722,7 +1722,7 @@ function _e(t) {
   let s;
   if (!M(I.last(e))) {
     const i = e.pop();
-    if (xt(i))
+    if (Ot(i))
       s = i.elementList.map(
         (r) => C(r).unwrap()
       );
@@ -1744,9 +1744,9 @@ function j(t) {
   return M(t) ? new S(t.expression.variable.value) : new k();
 }
 function Xe(t) {
-  if (ht(t))
+  if (ft(t))
     return t instanceof ne ? new S({ functional: [t], nonFunctional: [] }) : new S({ functional: [], nonFunctional: [t] });
-  if (t instanceof Z && t.elementList.every(ht)) {
+  if (t instanceof Z && t.elementList.every(ft)) {
     const e = t.elementList.filter(
       (s) => s instanceof ne
     ), n = t.elementList.filter(M);
@@ -1762,35 +1762,35 @@ function C(t) {
 function G(t) {
   return $(t) ? t.expression instanceof K ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new k();
 }
-function In(t) {
+function Ln(t) {
   var e;
-  return !(t instanceof q) || !kt((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 q) || !xt((e = t.op) == null ? void 0 : e.value) ? !1 : _e(t.leftExpression).and_then(() => _e(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
-function Ln(t) {
+function gn(t) {
   const e = _e(t.leftExpression), n = _e(t.rightExpression);
   if (!e.isOk() || !n.isOk())
     return !1;
   const { tupleElements: s } = e.unwrap(), { tupleElements: i } = n.unwrap();
   return (s == null ? void 0 : s.length) === (i == null ? void 0 : i.length);
 }
-function ht(t) {
+function ft(t) {
   return t instanceof U && t.expression instanceof K || t instanceof ne;
 }
-function gn(t, e) {
-  var i, r, a, c;
+function _n(t, e) {
+  var i, r, a, l;
   let n = e;
-  const s = Jt(t);
+  const s = Zt(t);
   for (; n; ) {
     if ((r = (i = n.symbol) == null ? void 0 : i.symbolTable) != null && r.has(t))
       return (a = n.symbol.symbolTable) == null ? void 0 : a.get(t);
-    if (((c = n.symbol) == null ? void 0 : c.declaration) instanceof X && s)
+    if (((l = n.symbol) == null ? void 0 : l.declaration) instanceof X && s)
       return n.symbol;
     if (n instanceof X)
       return;
     n = n.parent;
   }
 }
-class _n {
+class An {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1798,24 +1798,24 @@ class _n {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof X || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new l(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof X || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new c(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? [new l(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
+    return e ? [new c(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
   }
   validateAlias(e) {
-    return e ? [new l(o.UNEXPECTED_NAME, "A Custom element shouldn't have an alias", e)] : [];
+    return e ? [new c(o.UNEXPECTED_NAME, "A Custom element shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new l(o.UNEXPECTED_SETTINGS, "A Custom element shouldn't have a setting list", e)] : [];
+    return e ? [new c(o.UNEXPECTED_SETTINGS, "A Custom element shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
     if (e instanceof J)
-      return [new l(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
+      return [new c(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
     const n = [];
-    return $(e.callee) || n.push(new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
+    return $(e.callee) || n.push(new c(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new c(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
   }
 }
 class we {
@@ -1835,7 +1835,7 @@ class we {
     return this.table.entries();
   }
 }
-class An {
+class vn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1843,41 +1843,41 @@ class An {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.registerElement(), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof v ? [new l(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof v ? [new c(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? yt(e) ? [] : [new l(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new l(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
+    return e ? kt(e) ? [] : [new c(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new c(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
   }
   validateAlias(e) {
-    return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", 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(tn, { declaration: this.declarationNode, symbolTable: new we() });
+    this.declarationNode.symbol = this.symbolFactory.create(nn, { declaration: this.declarationNode, symbolTable: new we() });
     const { name: n } = this.declarationNode, s = W(n);
     if (s.isOk()) {
-      const i = s.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), c = ze(r);
-      a.has(c) && e.push(new l(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, n)), a.set(c, this.declarationNode.symbol);
+      const i = s.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), l = ze(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;
   }
   validateSettingList(e) {
-    return e ? [new l(o.UNEXPECTED_SETTINGS, "An Enum shouldn't have a setting list", e)] : [];
+    return e ? [new c(o.UNEXPECTED_SETTINGS, "An Enum shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
+    if (e instanceof w)
       return this.validateFields([e]);
-    const [n, s] = I.partition(e.body, (i) => i instanceof y);
+    const [n, s] = I.partition(e.body, (i) => i instanceof w);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
-    return e.length === 0 ? [new l(o.EMPTY_ENUM, "An Enum must have at least one element", this.declarationNode)] : e.flatMap((n) => {
+    return e.length === 0 ? [new c(o.EMPTY_ENUM, "An Enum must have at least one element", this.declarationNode)] : e.flatMap((n) => {
       const s = [];
-      n.callee && !M(n.callee) && s.push(new l(o.INVALID_ENUM_ELEMENT_NAME, "An enum field must be an identifier or a quoted identifier", n.callee));
+      n.callee && !M(n.callee) && s.push(new c(o.INVALID_ENUM_ELEMENT_NAME, "An enum field must be an identifier or a quoted identifier", n.callee));
       const i = [...n.args];
-      return I.last(i) instanceof D ? (s.push(...this.validateFieldSettings(I.last(i))), i.pop()) : i[0] instanceof D && (s.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && s.push(...i.map((r) => new l(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) {
@@ -1886,12 +1886,12 @@ class An {
       const a = i[r];
       switch (r) {
         case "note":
-          a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", c))), a.forEach((c) => {
-            $(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
+          a.length > 1 && a.forEach((l) => s.push(new c(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
+            $(l.value) || s.push(new c(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
           });
           break;
         default:
-          a.forEach((c) => s.push(new l(o.UNKNOWN_ENUM_ELEMENT_SETTING, `Unknown enum field setting '${r}'`, c)));
+          a.forEach((l) => s.push(new c(o.UNKNOWN_ENUM_ELEMENT_SETTING, `Unknown enum field setting '${r}'`, l)));
       }
     }
     return s;
@@ -1906,14 +1906,14 @@ class An {
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const n = C(e.callee).unwrap(), s = Qe(n), i = this.symbolFactory.create(nn, { declaration: e });
+      const n = C(e.callee).unwrap(), s = Qe(n), i = this.symbolFactory.create(sn, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
         const a = r.get(s);
         return [
-          new l(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, e),
-          new l(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, a.declaration)
+          new c(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, e),
+          new c(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, a.declaration)
         ];
       }
       r.set(s, i);
@@ -1921,7 +1921,7 @@ class An {
     return [];
   }
 }
-class vn {
+class wn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1929,23 +1929,23 @@ 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 X || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new l(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof X || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new c(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? [new l(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
+    return e ? [new c(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
   }
   validateAlias(e) {
-    return e ? [new l(o.UNEXPECTED_ALIAS, "An Indexes shouldn't have an alias", e)] : [];
+    return e ? [new c(o.UNEXPECTED_ALIAS, "An Indexes shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new l(o.UNEXPECTED_SETTINGS, "An Indexes shouldn't have a setting list", e)] : [];
+    return e ? [new c(o.UNEXPECTED_SETTINGS, "An Indexes shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
-      return [new l(o.UNEXPECTED_SIMPLE_BODY, "An Indexes must have a complex body", e)];
-    const [n, s] = I.partition(e.body, (i) => i instanceof y);
+    if (e instanceof w)
+      return [new c(o.UNEXPECTED_SIMPLE_BODY, "An Indexes must have a complex body", e)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof w);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -1953,10 +1953,10 @@ class vn {
       if (!n.callee)
         return [];
       const s = [], i = [n.callee, ...n.args];
-      return I.last(i) instanceof D && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
+      return I.last(i) instanceof R && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
         for (; r instanceof H; )
-          r.argumentList && !Xe(r.argumentList).isOk() && s.push(new l(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
-        Xe(r).isOk() || s.push(new l(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
+          r.argumentList && !Xe(r.argumentList).isOk() && s.push(new c(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
+        Xe(r).isOk() || s.push(new c(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
       }), s;
     });
   }
@@ -1967,23 +1967,23 @@ class vn {
       switch (r) {
         case "note":
         case "name":
-          a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, c))), a.forEach((c) => {
-            $(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, c));
+          a.length > 1 && a.forEach((l) => s.push(new c(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
+            $(l.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
           });
           break;
         case "unique":
         case "pk":
-          a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, c))), a.forEach((c) => {
-            ue(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must not have a value`, c));
+          a.length > 1 && a.forEach((l) => s.push(new c(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
+            ue(l.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must not have a value`, l));
           });
           break;
         case "type":
-          a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_INDEX_SETTING, "'type' can only appear once", c))), a.forEach((c) => {
-            M(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'type' must be "btree" or "hash"`, c));
+          a.length > 1 && a.forEach((l) => s.push(new c(o.DUPLICATE_INDEX_SETTING, "'type' can only appear once", l))), a.forEach((l) => {
+            M(l.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'type' must be "btree" or "hash"`, l));
           });
           break;
         default:
-          a.forEach((c) => s.push(new l(o.UNKNOWN_INDEX_SETTING, `Unknown index setting '${r}'`, c)));
+          a.forEach((l) => s.push(new c(o.UNKNOWN_INDEX_SETTING, `Unknown index setting '${r}'`, l)));
       }
     }
     return s;
@@ -1997,7 +1997,7 @@ class vn {
     });
   }
 }
-class wn {
+class yn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2015,7 +2015,7 @@ class wn {
       b.Table,
       b.TableGroup,
       b.Project
-    ].includes(ve(this.declarationNode.parent).unwrap_or(void 0)) ? [new l(
+    ].includes(ve(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
@@ -2023,32 +2023,32 @@ class wn {
   }
   validateName(e) {
     if (!(this.declarationNode.parent instanceof X))
-      return e ? [new l(o.UNEXPECTED_NAME, "A Note shouldn't have a name", e)] : [];
+      return e ? [new c(o.UNEXPECTED_NAME, "A Note shouldn't have a name", e)] : [];
     if (!e)
-      return [new l(o.INVALID_NAME, "Sticky note must have a name", this.declarationNode)];
+      return [new c(o.INVALID_NAME, "Sticky note must have a name", this.declarationNode)];
     const n = W(e);
     if (!n.isOk())
-      return [new l(o.INVALID_NAME, "Invalid name for sticky note ", this.declarationNode)];
-    const i = n.unwrap().join("."), r = Ht(i);
-    return this.publicSymbolTable.has(r) ? [new l(o.DUPLICATE_NAME, `Sticky note "${i}" has already been defined`, e)] : (this.publicSymbolTable.set(r, this.declarationNode.symbol), []);
+      return [new c(o.INVALID_NAME, "Invalid name for sticky note ", this.declarationNode)];
+    const i = n.unwrap().join("."), r = Jt(i);
+    return this.publicSymbolTable.has(r) ? [new c(o.DUPLICATE_NAME, `Sticky note "${i}" has already been defined`, e)] : (this.publicSymbolTable.set(r, this.declarationNode.symbol), []);
   }
   validateAlias(e) {
-    return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
+    return e ? [new c(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new l(o.UNEXPECTED_SETTINGS, "A Note shouldn't have a setting list", e)] : [];
+    return e ? [new c(o.UNEXPECTED_SETTINGS, "A Note shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
+    if (e instanceof w)
       return this.validateFields([e]);
-    const [n, s] = I.partition(e.body, (i) => i instanceof y);
+    const [n, s] = I.partition(e.body, (i) => i instanceof w);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
     const n = [];
-    return e.length === 0 ? [new l(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new l(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), $(e[0].callee) || n.push(new l(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new l(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
+    return e.length === 0 ? [new c(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new c(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), $(e[0].callee) || n.push(new c(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new c(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
   }
   validateSubElements(e) {
     return e.flatMap((n) => {
@@ -2059,7 +2059,7 @@ class wn {
     });
   }
 }
-class yn {
+class kn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2067,25 +2067,25 @@ 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 v ? [new l(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof v ? [new c(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? ye(e) ? [] : [new l(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", 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)] : [];
   }
   validateAlias(e) {
-    return e ? [new l(o.UNEXPECTED_ALIAS, "A Project shouldn't have an alias", e)] : [];
+    return e ? [new c(o.UNEXPECTED_ALIAS, "A Project shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new l(o.UNEXPECTED_SETTINGS, "A Project shouldn't have a setting list", e)] : [];
+    return e ? [new c(o.UNEXPECTED_SETTINGS, "A Project shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
-      return [new l(o.UNEXPECTED_SIMPLE_BODY, "A Project's body must be a block", e)];
-    const [n, s] = I.partition(e.body, (i) => i instanceof y);
+    if (e instanceof w)
+      return [new c(o.UNEXPECTED_SIMPLE_BODY, "A Project's body must be a block", e)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof w);
     return [
-      ...n.map((i) => new l(o.INVALID_PROJECT_FIELD, "A Project can not have inline fields", i)),
+      ...n.map((i) => new c(o.INVALID_PROJECT_FIELD, "A Project can not have inline fields", i)),
       ...this.validateSubElements(s)
     ];
   }
@@ -2098,7 +2098,7 @@ class yn {
     });
   }
 }
-class kn {
+class xn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2106,33 +2106,33 @@ class kn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof X ? [] : [new l(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
+    return this.declarationNode.parent instanceof X ? [] : [new c(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
   }
   validateName(e) {
-    return e ? ye(e) ? [] : [new l(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", 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)] : [];
   }
   validateAlias(e) {
-    return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
+    return e ? [new c(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new l(o.UNEXPECTED_SETTINGS, "A Ref shouldn't have a setting list", e)] : [];
+    return e ? [new c(o.UNEXPECTED_SETTINGS, "A Ref shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
+    if (e instanceof w)
       return this.validateFields([e]);
-    const [n, s] = I.partition(e.body, (i) => i instanceof y);
+    const [n, s] = I.partition(e.body, (i) => i instanceof w);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
     if (e.length === 0)
-      return [new l(o.EMPTY_REF, "A Ref must have at least one field", this.declarationNode)];
+      return [new c(o.EMPTY_REF, "A Ref must have at least one field", this.declarationNode)];
     const n = [];
-    return e.length > 1 && n.push(...e.slice(1).map((s) => new l(o.REF_REDEFINED, "A Ref can only contain one binary relationship", s))), e.forEach((s) => {
-      s.callee && !In(s.callee) && n.push(new l(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !Ln(s.callee) && n.push(new l(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
+    return e.length > 1 && n.push(...e.slice(1).map((s) => new c(o.REF_REDEFINED, "A Ref can only contain one binary relationship", s))), e.forEach((s) => {
+      s.callee && !Ln(s.callee) && n.push(new c(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !gn(s.callee) && n.push(new c(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
       const i = [...s.args];
-      I.last(i) instanceof D ? (this.validateFieldSettings(I.last(i)), i.pop()) : i[0] instanceof D && (n.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && n.push(...i.map((r) => new l(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", r)));
+      I.last(i) instanceof R ? (this.validateFieldSettings(I.last(i)), i.pop()) : i[0] instanceof R && (n.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && n.push(...i.map((r) => new c(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", r)));
     }), n;
   }
   validateFieldSettings(e) {
@@ -2142,12 +2142,12 @@ class kn {
       switch (r) {
         case "delete":
         case "update":
-          a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_REF_SETTING, `'${r}' can only appear once`, c))), a.forEach((c) => {
-            xn(c.value) || s.push(new l(o.INVALID_REF_SETTING_VALUE, `'${r}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, c));
+          a.length > 1 && a.forEach((l) => s.push(new c(o.DUPLICATE_REF_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
+            Sn(l.value) || s.push(new c(o.INVALID_REF_SETTING_VALUE, `'${r}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, l));
           });
           break;
         default:
-          a.forEach((c) => s.push(new l(o.UNKNOWN_REF_SETTING, `Unknown ref setting '${r}'`, c)));
+          a.forEach((l) => s.push(new c(o.UNKNOWN_REF_SETTING, `Unknown ref setting '${r}'`, l)));
       }
     }
     return s;
@@ -2161,7 +2161,7 @@ class kn {
     });
   }
 }
-function xn(t) {
+function Sn(t) {
   if (!(M(t) && t.expression.variable.kind !== u.QUOTED_STRING) && !(t instanceof Y))
     return !1;
   let e;
@@ -2178,7 +2178,7 @@ function xn(t) {
     }
   return !1;
 }
-class Sn {
+class On {
   constructor(e, n, s) {
     this.declarationNode = e, this.symbolFactory = s, this.publicSymbolTable = n;
   }
@@ -2186,13 +2186,13 @@ class Sn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.registerElement(), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof v ? [new l(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof v ? [new c(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? e instanceof he ? [new l(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : yt(e) ? [] : [new l(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new l(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
+    return e ? e instanceof he ? [new c(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : kt(e) ? [] : [new c(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new c(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
   }
   validateAlias(e) {
-    return e ? Pn(e) ? [] : [new l(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
+    return e ? Un(e) ? [] : [new c(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
   }
   validateSettingList(e) {
     const n = B(e), s = n.getErrors(), i = n.getValue();
@@ -2200,63 +2200,63 @@ class Sn {
       const a = i[r];
       switch (r) {
         case "headercolor":
-          a.length > 1 && s.push(...a.map((c) => new l(o.DUPLICATE_TABLE_SETTING, "'headercolor' can only appear once", c))), a.forEach((c) => {
-            Un(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", c.value || c.name));
+          a.length > 1 && s.push(...a.map((l) => new c(o.DUPLICATE_TABLE_SETTING, "'headercolor' can only appear once", l))), a.forEach((l) => {
+            St(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((c) => new l(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", c))), a.forEach((c) => {
-            $(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
+          a.length > 1 && s.push(...a.map((l) => new c(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
+            $(l.value) || s.push(new c(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
           });
           break;
         default:
-          s.push(...a.map((c) => new l(o.INVALID_TABLE_SETTING, `Unknown '${r}' setting`, c)));
+          s.push(...a.map((l) => new c(o.INVALID_TABLE_SETTING, `Unknown '${r}' setting`, l)));
       }
     }
     return s;
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(At, { declaration: this.declarationNode, symbolTable: new we() });
+    this.declarationNode.symbol = this.symbolFactory.create(vt, { declaration: this.declarationNode, symbolTable: new we() });
     const { name: n, alias: s } = this.declarationNode, i = W(n);
     if (i.isOk()) {
-      const r = [...i.unwrap()], a = r.pop(), c = Ze(r, this.publicSymbolTable, this.symbolFactory), p = Oe(a);
-      c.has(p) && e.push(new l(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, n)), c.set(p, this.declarationNode.symbol);
+      const r = [...i.unwrap()], a = r.pop(), l = Ze(r, this.publicSymbolTable, this.symbolFactory), p = Oe(a);
+      l.has(p) && e.push(new c(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, n)), l.set(p, this.declarationNode.symbol);
     }
     if (s && ye(s) && !Rn(s.expression.variable.value, i.unwrap_or([]))) {
       const r = C(s).unwrap(), a = Oe(r);
-      this.publicSymbolTable.has(a) && e.push(new l(o.DUPLICATE_NAME, `Table name '${r}' already exists`, n)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
+      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;
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
-      return [new l(o.UNEXPECTED_SIMPLE_BODY, "A Table's body must be a block", e)];
-    const [n, s] = I.partition(e.body, (i) => i instanceof y);
+    if (e instanceof w)
+      return [new c(o.UNEXPECTED_SIMPLE_BODY, "A Table's body must be a block", e)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof w);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
-    return e.length === 0 ? [new l(o.EMPTY_TABLE, "A Table must have at least one column", this.declarationNode)] : e.flatMap((n) => {
+    return e.length === 0 ? [new c(o.EMPTY_TABLE, "A Table must have at least one column", this.declarationNode)] : e.flatMap((n) => {
       if (!n.callee)
         return [];
       const s = [];
-      n.args.length === 0 && s.push(new l(o.INVALID_COLUMN, "A column must have a type", n.callee)), M(n.callee) || s.push(new l(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), n.args[0] && !On(n.args[0]) && s.push(new l(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)), M(n.callee) || s.push(new c(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), n.args[0] && !Dn(n.args[0]) && s.push(new c(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
       const i = n.args.slice(1);
       return s.push(...this.validateFieldSetting(i)), s.push(...this.registerField(n)), s;
     });
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const n = C(e.callee).unwrap(), s = Ye(n), i = this.symbolFactory.create(sn, { declaration: e });
+      const n = C(e.callee).unwrap(), s = Ye(n), i = this.symbolFactory.create(rn, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
         const a = r.get(s);
         return [
-          new l(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, e),
-          new l(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, a.declaration)
+          new c(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, e),
+          new c(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, a.declaration)
         ];
       }
       r.set(s, i);
@@ -2265,75 +2265,75 @@ class Sn {
   }
   // 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 D))
-      return [...e.map((p) => new l(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
+    if (!e.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 D && (n = e.pop());
+    I.last(e) instanceof R && (n = e.pop());
     const s = B(n), i = s.getErrors(), r = s.getValue();
     for (const p of e) {
       const f = C(p).unwrap_or("").toLowerCase();
       if (f !== "pk" && f !== "unique") {
-        i.push(new l(o.INVALID_SETTINGS, "Inline column settings can only be `pk` or `unique`", p));
+        i.push(new c(o.INVALID_SETTINGS, "Inline column settings can only be `pk` or `unique`", p));
         continue;
       }
       r[f] === void 0 ? r[f] = [p] : r[f].push(p);
     }
-    const a = r.pk || [], c = r["primary key"] || [];
-    a.length >= 1 && c.length >= 1 && i.push(...[...a, ...c].map((p) => new l(o.DUPLICATE_COLUMN_SETTING, "Either one of 'primary key' and 'pk' can appear", p)));
+    const a = r.pk || [], l = r["primary key"] || [];
+    a.length >= 1 && l.length >= 1 && i.push(...[...a, ...l].map((p) => new c(o.DUPLICATE_COLUMN_SETTING, "Either one of 'primary key' and 'pk' can appear", p)));
     for (const p in r) {
       const f = r[p];
       switch (p) {
         case "note":
-          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", h))), f.forEach((h) => {
-            $(h.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", h.value || h.name));
+          f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", h))), f.forEach((h) => {
+            $(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", h.value || h.name));
           });
           break;
         case "ref":
           f.forEach((h) => {
-            Fn(h.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", h.value || h.name));
+            Fn(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", h.value || h.name));
           });
           break;
         case "primary key":
-          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_COLUMN_SETTING, "primary key can only appear once", h))), f.forEach((h) => {
-            ue(h.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'primary key' must not have a value", h.value || h.name));
+          f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "primary key can only appear once", h))), f.forEach((h) => {
+            ue(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'primary key' must not have a value", h.value || h.name));
           });
           break;
         case "pk":
-          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_COLUMN_SETTING, "'pk' can only appear once", h))), f.forEach((h) => {
-            h instanceof se && !ue(h.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", h.value || h.name));
+          f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "'pk' can only appear once", h))), f.forEach((h) => {
+            h instanceof se && !ue(h.value) && i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", h.value || h.name));
           });
           break;
         case "not null":
-          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_COLUMN_SETTING, "'not null' can only appear once", h)));
+          f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "'not null' can only appear once", h)));
           const E = r.null || [];
-          f.length >= 1 && E.length >= 1 && i.push(...[...f, ...E].map((h) => new l(o.CONFLICTING_SETTING, "'not null' and 'null' can not be set at the same time", h))), f.forEach((h) => {
-            ue(h.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'not null' must not have a value", h.value || h.name));
+          f.length >= 1 && E.length >= 1 && i.push(...[...f, ...E].map((h) => new c(o.CONFLICTING_SETTING, "'not null' and 'null' can not be set at the same time", h))), f.forEach((h) => {
+            ue(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'not null' must not have a value", h.value || h.name));
           });
           break;
         case "null":
-          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_COLUMN_SETTING, "'null' can only appear once", h))), f.forEach((h) => {
-            ue(h.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'null' must not have a value", h.value || h.name));
+          f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "'null' can only appear once", h))), f.forEach((h) => {
+            ue(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'null' must not have a value", h.value || h.name));
           });
           break;
         case "unique":
-          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_COLUMN_SETTING, "'unique' can only appear once", h))), f.forEach((h) => {
-            h instanceof se && !ue(h.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", h.value || h.name));
+          f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "'unique' can only appear once", h))), f.forEach((h) => {
+            h instanceof se && !ue(h.value) && i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", h.value || h.name));
           });
           break;
         case "increment":
-          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_COLUMN_SETTING, "'increment' can only appear once", h))), f.forEach((h) => {
-            h instanceof se && !ue(h.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", h.value || h.name));
+          f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "'increment' can only appear once", h))), f.forEach((h) => {
+            h instanceof se && !ue(h.value) && i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", h.value || h.name));
           });
           break;
         case "default":
-          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_TABLE_SETTING, "'default' can only appear once", h))), f.forEach((h) => {
-            Mn(h.value) || i.push(new l(o.INVALID_TABLE_SETTING, "'default' must be a string literal, number literal, function expression, true, false or null", h.value || h.name));
+          f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_TABLE_SETTING, "'default' can only appear once", h))), f.forEach((h) => {
+            Mn(h.value) || i.push(new c(o.INVALID_TABLE_SETTING, "'default' must be a string literal, number literal, function expression, true, false or null", h.value || h.name));
           });
           break;
         default:
-          f.forEach((h) => i.push(new l(o.UNKNOWN_COLUMN_SETTING, `Unknown column setting '${p}'`, h)));
+          f.forEach((h) => i.push(new c(o.UNKNOWN_COLUMN_SETTING, `Unknown column setting '${p}'`, h)));
       }
     }
     return i;
@@ -2348,10 +2348,10 @@ class Sn {
       var r;
       return ((r = i.type) == null ? void 0 : r.value.toLowerCase()) === "note";
     });
-    return s.length > 1 && n.push(...s.map((i) => new l(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n;
+    return s.length > 1 && n.push(...s.map((i) => new c(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n;
   }
 }
-function On(t) {
+function Dn(t) {
   if (!(t instanceof H || Je(t) || t instanceof U || t instanceof he))
     return !1;
   if (t instanceof H) {
@@ -2370,7 +2370,7 @@ function On(t) {
 function Rn(t, e) {
   return e.length === 1 && t === e[0];
 }
-class Dn {
+class Pn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2385,25 +2385,25 @@ class Dn {
     ];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof v ? [new l(
+    return this.declarationNode.parent instanceof v ? [new c(
       o.INVALID_TABLEGROUP_CONTEXT,
       "TableGroup must appear top-level",
       this.declarationNode
     )] : [];
   }
   validateName(e) {
-    return e ? ye(e) ? [] : [new l(
+    return e ? ye(e) ? [] : [new c(
       o.INVALID_NAME,
       "A TableGroup name must be a single identifier",
       e
-    )] : [new l(
+    )] : [new c(
       o.NAME_NOT_FOUND,
       "A TableGroup must have a name",
       this.declarationNode
     )];
   }
   validateAlias(e) {
-    return e ? [new l(
+    return e ? [new c(
       o.UNEXPECTED_ALIAS,
       "A TableGroup shouldn't have an alias",
       e
@@ -2411,12 +2411,12 @@ class Dn {
   }
   registerElement() {
     const { name: e } = this.declarationNode;
-    this.declarationNode.symbol = this.symbolFactory.create(rn, { declaration: this.declarationNode, symbolTable: new we() });
+    this.declarationNode.symbol = this.symbolFactory.create(an, { declaration: this.declarationNode, symbolTable: new we() });
     const n = W(e);
     if (n.isOk()) {
       const s = n.unwrap(), i = s.pop(), r = Ze(s, this.publicSymbolTable, this.symbolFactory), a = qe(i);
       if (r.has(a))
-        return [new l(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists`, e)];
+        return [new c(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists`, e)];
       r.set(a, this.declarationNode.symbol);
     }
     return [];
@@ -2425,31 +2425,37 @@ class Dn {
     const n = B(e), s = n.getErrors(), i = n.getValue();
     return I.forIn(i, (r, a) => {
       switch (a) {
-        case "headercolor":
-          s.push(...r.map((c) => new l(
-            o.INVALID_TABLE_SETTING,
-            "'headercolor' is not supported",
-            c
-          )));
+        case "color":
+          r.length > 1 && s.push(...r.map((l) => new c(
+            o.DUPLICATE_TABLE_SETTING,
+            "'color' can only appear once",
+            l
+          ))), r.forEach((l) => {
+            St(l.value) || s.push(new c(
+              o.INVALID_TABLE_SETTING,
+              "'color' must be a color literal",
+              l.value || l.name
+            ));
+          });
           break;
         case "note":
-          r.length > 1 && s.push(...r.map((c) => new l(
+          r.length > 1 && s.push(...r.map((l) => new c(
             o.DUPLICATE_TABLE_SETTING,
             "'note' can only appear once",
-            c
-          ))), r.filter((c) => !$(c.value)).forEach((c) => {
-            s.push(new l(
+            l
+          ))), r.filter((l) => !$(l.value)).forEach((l) => {
+            s.push(new c(
               o.INVALID_TABLE_SETTING,
               "'note' must be a string literal",
-              c.value || c.name
+              l.value || l.name
             ));
           });
           break;
         default:
-          s.push(...r.map((c) => new l(
+          s.push(...r.map((l) => new c(
             o.INVALID_TABLE_SETTING,
             `Unknown '${a}' setting`,
-            c
+            l
           )));
           break;
       }
@@ -2458,13 +2464,13 @@ class Dn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof y)
-      return [new l(
+    if (e instanceof w)
+      return [new c(
         o.UNEXPECTED_SIMPLE_BODY,
         "A TableGroup's body must be a block",
         e
       )];
-    const [n, s] = I.partition(e.body, (i) => i instanceof y);
+    const [n, s] = I.partition(e.body, (i) => i instanceof w);
     return [
       ...this.validateFields(n),
       ...this.validateSubElements(s)
@@ -2473,7 +2479,7 @@ class Dn {
   validateFields(e) {
     return e.flatMap((n) => {
       const s = [];
-      return n.callee && !W(n.callee).isOk() && s.push(new l(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", n.callee)), this.registerField(n), n.args.length > 0 && s.push(...n.args.map((i) => new l(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
+      return n.callee && !W(n.callee).isOk() && s.push(new c(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", n.callee)), this.registerField(n), n.args.length > 0 && s.push(...n.args.map((i) => new c(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
     });
   }
   validateSubElements(e) {
@@ -2486,18 +2492,18 @@ class Dn {
       var r;
       return ((r = i.type) == null ? void 0 : r.value.toLowerCase()) === "note";
     });
-    return s.length > 1 && n.push(...s.map((i) => new l(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n;
+    return s.length > 1 && n.push(...s.map((i) => new c(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n;
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const n = C(e.callee).unwrap(), s = He(n), i = this.symbolFactory.create(an, { declaration: e });
+      const n = C(e.callee).unwrap(), s = He(n), i = this.symbolFactory.create(on, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
         const a = r.get(s);
         return [
-          new l(o.DUPLICATE_TABLEGROUP_FIELD_NAME, `${n} already exists in the group`, e),
-          new l(o.DUPLICATE_TABLEGROUP_FIELD_NAME, `${n} already exists in the group`, a.declaration)
+          new c(o.DUPLICATE_TABLEGROUP_FIELD_NAME, `${n} already exists in the group`, e),
+          new c(o.DUPLICATE_TABLEGROUP_FIELD_NAME, `${n} already exists in the group`, a.declaration)
         ];
       }
       r.set(s, i);
@@ -2505,31 +2511,31 @@ class Dn {
     return [];
   }
 }
-const wt = ["-", "+"];
+const yt = ["-", "+"];
 function ae(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
-      return An;
+      return vn;
     case b.Table:
-      return Sn;
+      return On;
     case b.TableGroup:
-      return Dn;
+      return Pn;
     case b.Project:
-      return yn;
-    case b.Ref:
       return kn;
+    case b.Ref:
+      return xn;
     case b.Note:
-      return wn;
+      return yn;
     case b.Indexes:
-      return vn;
+      return wn;
     default:
-      return _n;
+      return An;
   }
 }
-function yt(t) {
+function kt(t) {
   return !!W(t).unwrap_or(!1);
 }
-function Pn(t) {
+function Un(t) {
   return ye(t);
 }
 function ye(t) {
@@ -2541,23 +2547,23 @@ function Ze(t, e, n) {
   let s = e;
   for (const r of t) {
     let a;
-    const c = je(r);
-    if (s.has(c)) {
-      if (a = (i = s.get(c)) == null ? void 0 : i.symbolTable, !a)
+    const l = je(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(_t, { symbolTable: a });
-      s.set(c, p);
+      const p = n.create(At, { symbolTable: a });
+      s.set(l, p);
     }
     s = a;
   }
   return s;
 }
-function kt(t) {
+function xt(t) {
   return t === "-" || t === "<>" || t === ">" || t === "<";
 }
-function Un(t) {
+function St(t) {
   var n;
   if (!(t instanceof U) || !(t.expression instanceof be) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
     return !1;
@@ -2565,7 +2571,7 @@ function Un(t) {
   if (e.length !== 4 && e.length !== 7 || e[0] !== "#")
     return !1;
   for (let s = 1; s < e.length; s += 1)
-    if (!Kt(e[s]))
+    if (!en(e[s]))
       return !1;
   return !0;
 }
@@ -2574,7 +2580,7 @@ function ue(t) {
 }
 function Mn(t) {
   var e;
-  return !!($(t) || fe(t) || me(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression) || t instanceof ne);
+  return !!($(t) || fe(t) || me(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && yt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression) || t instanceof ne);
 }
 function fe(t) {
   var e;
@@ -2582,12 +2588,12 @@ function fe(t) {
 }
 function Fn(t) {
   var n;
-  if (!(t instanceof Q) || !kt((n = t.op) == null ? void 0 : n.value))
+  if (!(t instanceof Q) || !xt((n = t.op) == null ? void 0 : n.value))
     return !1;
   const e = W(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
-function xt(t) {
+function Ot(t) {
   return t instanceof Z && t.elementList.every(M);
 }
 function B(t) {
@@ -2599,7 +2605,7 @@ function B(t) {
     if (!i.name)
       continue;
     if (i.name instanceof U) {
-      n.push(new l(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
+      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();
@@ -2607,9 +2613,9 @@ function B(t) {
   }
   return new V(e, n);
 }
-class ft {
+class pt {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(_t, {
+    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(At, {
       symbolTable: new we()
     }), this.ast.symbol = this.publicSchemaSymbol, this.ast.symbol.declaration = this.ast;
   }
@@ -2626,7 +2632,7 @@ class ft {
       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 l(o.PROJECT_REDEFINED, "Only one project can exist", s))), new V(this.ast, e);
+    return n.length > 1 && n.forEach((s) => e.push(new c(o.PROJECT_REDEFINED, "Only one project can exist", s))), new V(this.ast, e);
   }
 }
 class oe {
@@ -2658,7 +2664,7 @@ class oe {
         if (s instanceof v) {
           if (!s.type)
             continue;
-          const i = St(s);
+          const i = Dt(s);
           new i(s, this.errors).bind();
         } else
           this.bindSubfield(s);
@@ -2667,7 +2673,7 @@ class oe {
   }
   bindSubfield(e) {
     const n = [e.callee, ...e.args], s = I.last(n);
-    s instanceof D && (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]);
@@ -2689,7 +2695,7 @@ class oe {
   bindFragments(e, n) {
     if (e.length === 0)
       return;
-    const s = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: i } = n, r = e.findIndex((h) => !M(h)), c = r !== -1 && xt(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) => !M(h)), l = r !== -1 && Ot(e[r]) ? e[r] : void 0, p = r >= 0 ? s.pop() : void 0, f = e.slice(
       0,
       r === -1 ? void 0 : r
     );
@@ -2710,7 +2716,7 @@ class oe {
         referrer: h
       });
     }
-    return c ? c.elementList.forEach(
+    return l ? l.elementList.forEach(
       (h) => this.resolveIndexStack(
         [
           ...E,
@@ -2731,31 +2737,31 @@ class oe {
   resolveIndexStack(e, n) {
     if (e.length === 0)
       throw new Error("Unreachable - An unresolved name must have at least one name component");
-    const [s, ...i] = e, r = gn(s.index, this.declarationNode);
+    const [s, ...i] = e, r = _n(s.index, this.declarationNode);
     if (r === void 0) {
       const { kind: f, name: E } = ie(s.index).unwrap();
       this.logError(s.referrer, `Can not find ${f} '${E}'`, n);
       return;
     }
     r.references.push(s.referrer), s.referrer.referee = r;
-    let a = r.symbolTable, { kind: c, name: p } = ie(s.index).unwrap();
+    let a = r.symbolTable, { kind: l, name: p } = ie(s.index).unwrap();
     for (const f of i) {
       const { kind: E, name: h } = ie(f.index).unwrap(), m = a.get(f.index);
       if (!m) {
         this.logError(
           f.referrer,
-          `${c} '${p}' does not have ${E} '${h}'`,
+          `${l} '${p}' does not have ${E} '${h}'`,
           n
         );
         return;
       }
-      if (c = E, p = h, f.referrer.referee = m, m.references.push(f.referrer), !m.symbolTable)
+      if (l = E, p = h, f.referrer.referee = m, m.references.push(f.referrer), !m.symbolTable)
         break;
       a = m.symbolTable;
     }
   }
   logError(e, n, s) {
-    s || this.errors.push(new l(o.BINDING_ERROR, n, e));
+    s || this.errors.push(new c(o.BINDING_ERROR, n, e));
   }
 }
 class Bn extends oe {
@@ -2895,7 +2901,7 @@ class jn extends oe {
     }, this.settingList = {};
   }
 }
-function St(t) {
+function Dt(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
       return Vn;
@@ -2922,7 +2928,7 @@ class Yn {
   resolve() {
     for (const e of this.ast.body)
       if (e.type) {
-        const n = St(e);
+        const n = Dt(e);
         new n(e, this.errors).bind();
       }
     return new V(this.ast, this.errors);
@@ -2942,14 +2948,14 @@ class Qn {
   }
   // Analyzing: Invoking both the validator and binder
   analyze() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new Yn(n).resolve());
+    return new pt(this.ast, this.symbolFactory).validate().chain((n) => new Yn(n).resolve());
   }
   // For invoking the validator only
   validate() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new V(n, []));
+    return new pt(this.ast, this.symbolFactory).validate().chain((n) => new V(n, []));
   }
 }
-function pt(t, e) {
+function dt(t, e) {
   const { variables: n, tupleElements: s } = _e(t).unwrap();
   return s ? n.length === 0 ? {
     schemaName: e.schemaName,
@@ -2969,7 +2975,7 @@ function pt(t, e) {
     schemaName: n.pop() || null
   };
 }
-function Ot(t) {
+function Rt(t) {
   switch (t) {
     case "<":
       return ["1", "*"];
@@ -3004,10 +3010,10 @@ function Ie(t) {
     schemaName: e
   };
 }
-function Rt(t) {
+function Ke(t) {
   return t.expression.literal.value;
 }
-function Dt(t, e) {
+function Pt(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}`;
@@ -3015,10 +3021,10 @@ function Dt(t, e) {
   const n = t.id.toString(), s = e.id.toString();
   return n < s ? `${n}-${s}` : `${s}-${n}`;
 }
-function Pt(t, e) {
+function Ut(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, c]) => a === c);
+    return I.zip(i, r).every(([a, l]) => a === l);
   }
   const n = t.id, s = e.id;
   return n === s;
@@ -3029,7 +3035,7 @@ function re(t) {
   return n.map((r) => r.slice(i)).join(`
 `);
 }
-class Ut {
+class Mt {
   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 = [];
   }
@@ -3054,7 +3060,7 @@ class Ut {
   }
   interpretName(e) {
     const { name: n, schemaName: s } = Ie(e);
-    return s.length > 1 ? (this.table.name = n, this.table.schemaName = s.join("."), [new l(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.table.name = n, this.table.schemaName = s.length ? s[0] : null, []);
+    return s.length > 1 ? (this.table.name = n, this.table.schemaName = s.join("."), [new c(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.table.name = n, this.table.schemaName = s.length ? s[0] : null, []);
   }
   interpretAlias(e) {
     if (!e)
@@ -3072,7 +3078,7 @@ class Ut {
   interpretSettingList(e) {
     var i, r, a;
     const n = B(e).getValue();
-    this.table.headerColor = (i = n.headercolor) != null && i.length ? Rt((a = (r = n.headercolor) == null ? void 0 : r.at(0)) == null ? void 0 : a.value) : void 0;
+    this.table.headerColor = (i = n.headercolor) != null && i.length ? Ke((a = (r = n.headercolor) == null ? void 0 : r.at(0)) == null ? void 0 : a.value) : void 0;
     const [s] = n.note || [];
     return this.table.note = s && {
       value: G(s == null ? void 0 : s.value).map(re).unwrap(),
@@ -3080,7 +3086,7 @@ class Ut {
     }, [];
   }
   interpretBody(e) {
-    const [n, s] = I.partition(e.body, (i) => i instanceof y);
+    const [n, s] = I.partition(e.body, (i) => i instanceof w);
     return [...this.interpretFields(n), ...this.interpretSubElements(s)];
   }
   interpretSubElements(e) {
@@ -3102,15 +3108,15 @@ class Ut {
     return e.flatMap((n) => this.interpretColumn(n));
   }
   interpretColumn(e) {
-    var a, c, p, f, E, h, m, g;
+    var a, l, p, f, E, h, m, g;
     const n = [], s = {};
     s.name = C(e.callee).unwrap();
     const i = qn(e.args[0]);
     s.type = i.getValue(), n.push(...i.getErrors()), s.token = A(e), s.inline_refs = [];
     const r = e.args.slice(1);
-    if (I.last(r) instanceof D) {
+    if (I.last(r) instanceof R) {
       const _ = B(r.pop()).getValue();
-      s.pk = !!((a = _.pk) != null && a.length) || !!((c = _["primary key"]) != null && c.length), s.increment = !!((p = _.increment) != null && p.length), s.unique = !!((f = _.unique) != null && f.length), s.not_null = !!((E = _["not null"]) != null && E.length) && !0, s.dbdefault = Hn((m = (h = _.default) == null ? void 0 : h.at(0)) == null ? void 0 : m.value);
+      s.pk = !!((a = _.pk) != null && a.length) || !!((l = _["primary key"]) != null && l.length), s.increment = !!((p = _.increment) != null && p.length), s.unique = !!((f = _.unique) != null && f.length), s.not_null = !!((E = _["not null"]) != null && E.length) && !0, s.dbdefault = Hn((m = (h = _.default) == null ? void 0 : h.at(0)) == null ? void 0 : m.value);
       const ee = (g = _.note) == null ? void 0 : g.at(0);
       s.note = ee && {
         value: G(ee.value).map(re).unwrap(),
@@ -3118,9 +3124,9 @@ class Ut {
       };
       const le = _.ref || [];
       s.inline_refs = le.flatMap((z) => {
-        const [tt] = $e(z.value.expression);
-        if (Pt(tt, e.symbol))
-          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", z)), [];
+        const [nt] = $e(z.value.expression);
+        if (Ut(nt, e.symbol))
+          return n.push(new c(o.SAME_ENDPOINT, "Two endpoints are the same", z)), [];
         const ke = z.value.op, te = W(z.value.expression).unwrap();
         let de;
         if (te.length === 1) {
@@ -3142,16 +3148,16 @@ class Ut {
             token: A(z)
           };
         } else if (te.length === 3) {
-          const [ce, Le, st] = te;
+          const [ce, Le, it] = te;
           de = {
             schemaName: ce,
             tableName: Le,
-            fieldNames: [st],
+            fieldNames: [it],
             relation: ke.value,
             token: A(z)
           };
         } else {
-          n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", z));
+          n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", z));
           const ce = te.pop(), Le = te.pop();
           de = {
             schemaName: te.join("."),
@@ -3161,21 +3167,21 @@ class Ut {
             token: A(z)
           };
         }
-        const nt = this.registerInlineRefToEnv(e, tt, de, z);
-        return n.push(...nt), nt.length === 0 ? de : [];
+        const st = this.registerInlineRefToEnv(e, nt, de, z);
+        return n.push(...st), st.length === 0 ? de : [];
       });
     }
     return s.pk || (s.pk = r.some((_) => j(_).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((_) => j(_).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
   }
   interpretIndexes(e) {
     return this.table.indexes.push(...e.body.body.map((n) => {
-      var a, c, p, f, E, h, m;
+      var a, l, p, f, E, h, m;
       const s = { columns: [] }, i = n;
       s.token = A(i);
       const r = [i.callee, ...i.args];
-      if (I.last(r) instanceof D) {
+      if (I.last(r) instanceof R) {
         const g = B(r.pop()).getValue();
-        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((c = g.unique) != null && c.length), s.name = G((f = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : f.value).unwrap_or(void 0);
+        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((l = g.unique) != null && l.length), s.name = G((f = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : f.value).unwrap_or(void 0);
         const _ = (E = g.note) == null ? void 0 : E.at(0);
         s.note = _ && {
           value: G(_.value).unwrap(),
@@ -3207,13 +3213,13 @@ class Ut {
     })), [];
   }
   registerInlineRefToEnv(e, n, s, i) {
-    const r = Dt(e.symbol, n);
+    const r = Pt(e.symbol, n);
     if (this.env.refIds[r])
       return [
-        new l(o.CIRCULAR_REF, "References with same endpoints exist", i),
-        new l(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[r])
+        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 = Ot(s.relation);
+    const a = Rt(s.relation);
     return this.env.refIds[r] = i, this.env.ref.set(i, {
       name: null,
       schemaName: null,
@@ -3247,7 +3253,7 @@ function qn(t) {
       type_name: `${s}${n}${e ? `(${e})` : ""}`,
       args: e
     },
-    [new l(o.UNSUPPORTED, "Nested schema is not supported", t)]
+    [new c(o.UNSUPPORTED, "Nested schema is not supported", t)]
   ) : new V({
     schemaName: i.length === 0 ? null : i[0],
     type_name: `${s}${n}${e ? `(${e})` : ""}`,
@@ -3272,7 +3278,7 @@ function Hn(t) {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
       };
-    if (t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression)) {
+    if (t instanceof Q && yt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression)) {
       const i = Number.parseFloat(t.expression.expression.literal.value);
       return {
         value: ((n = t.op) == null ? void 0 : n.value) === "-" ? 0 - i : i,
@@ -3305,12 +3311,12 @@ class Jn {
   interpretSettingList(e) {
     var s, i, r;
     const n = B(e).getValue();
-    return this.note.headerColor = (s = n.headercolor) != null && s.length ? Rt((r = (i = n.headercolor) == null ? void 0 : i.at(0)) == null ? void 0 : r.value) : void 0, [];
+    return this.note.headerColor = (s = n.headercolor) != null && s.length ? Ke((r = (i = n.headercolor) == null ? void 0 : i.at(0)) == null ? void 0 : r.value) : void 0, [];
   }
   interpretBody(e) {
-    const [n, s] = I.partition(e.body, (i) => i instanceof y);
+    const [n, s] = I.partition(e.body, (i) => i instanceof w);
     return n.length !== 1 || s.length > 0 ? [
-      new l(o.INVALID_NOTE, "Invalid note syntax", e)
+      new c(o.INVALID_NOTE, "Invalid note syntax", e)
     ] : [...this.interpretNote(n[0])];
   }
   interpretNote(e) {
@@ -3318,7 +3324,7 @@ class Jn {
     return this.note.content = re(n), [];
   }
 }
-class Mt {
+class Ft {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.container = this.declarationNode.parent instanceof v ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
   }
@@ -3327,21 +3333,21 @@ class Mt {
   }
   interpretName(e) {
     const n = [], s = W(this.declarationNode.name).unwrap_or([]);
-    return this.ref.name = s.pop() || null, s.length > 1 && n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name)), this.ref.schemaName = s.join(".") || null, n;
+    return this.ref.name = s.pop() || null, s.length > 1 && n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name)), this.ref.schemaName = s.join(".") || null, n;
   }
   interpretBody(e) {
-    return e instanceof y ? this.interpretField(e) : this.interpretField(e.body[0]);
+    return e instanceof w ? this.interpretField(e) : this.interpretField(e.body[0]);
   }
   interpretField(e) {
     var f, E, h, m;
     const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, r = $e(s), a = $e(i);
-    if (Pt(r, a))
-      return [new l(o.SAME_ENDPOINT, "Two endpoints are the same", e)];
-    const c = Dt(r, a);
-    if (this.env.refIds[c])
+    if (Ut(r, a))
+      return [new c(o.SAME_ENDPOINT, "Two endpoints are the same", e)];
+    const l = Pt(r, a);
+    if (this.env.refIds[l])
       return [
-        new l(o.CIRCULAR_REF, "References with same endpoints exist", this.declarationNode),
-        new l(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[c])
+        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 = B(e.args[0]).getValue(), _ = (E = (f = g.delete) == null ? void 0 : f.at(0)) == null ? void 0 : E.value;
@@ -3349,22 +3355,22 @@ class Mt {
       const ee = (m = (h = g.update) == null ? void 0 : h.at(0)) == null ? void 0 : m.value;
       this.ref.onUpdate = ee instanceof Y ? Te(ee).unwrap_or(void 0) : j(ee).unwrap_or(void 0);
     }
-    const p = Ot(n);
+    const p = Rt(n);
     return this.ref.endpoints = [
       {
-        ...pt(s, this.container),
+        ...dt(s, this.container),
         relation: p[0],
         token: A(s)
       },
       {
-        ...pt(i, this.container),
+        ...dt(i, this.container),
         relation: p[1],
         token: A(i)
       }
-    ], this.env.refIds[c] = this.declarationNode, [];
+    ], this.env.refIds[l] = this.declarationNode, [];
   }
 }
-class Ft {
+class Bt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.tableGroup = { tables: [] };
   }
@@ -3378,10 +3384,10 @@ class Ft {
   }
   interpretName(e) {
     const n = [], { name: s, schemaName: i } = Ie(e);
-    return i.length >= 2 && (this.tableGroup.name = s, this.tableGroup.schemaName = i.join("."), n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = s, this.tableGroup.schemaName = i[0] || null, n;
+    return i.length >= 2 && (this.tableGroup.name = s, this.tableGroup.schemaName = i.join("."), n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = s, this.tableGroup.schemaName = i[0] || null, n;
   }
   interpretBody(e) {
-    const [n, s] = jt(e.body, (i) => i instanceof y);
+    const [n, s] = Yt(e.body, (i) => i instanceof w);
     return [
       ...this.interpretFields(n),
       ...this.interpretSubElements(s)
@@ -3407,11 +3413,11 @@ class Ft {
     const n = [];
     return this.tableGroup.tables = e.map((s) => {
       const i = W(s.callee).unwrap();
-      i.length > 2 && n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", s));
+      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]) {
-        const a = this.env.groupOfTable[r], { schemaName: c, name: p } = this.env.tableGroups.get(a), f = c ? `${c}.${p}` : p;
-        n.push(new l(o.TABLE_REAPPEAR_IN_TABLEGROUP, `Table "${i.join(".")}" already appears in group "${f}"`, s));
+        const a = this.env.groupOfTable[r], { schemaName: l, name: p } = this.env.tableGroups.get(a), f = l ? `${l}.${p}` : p;
+        n.push(new c(o.TABLE_REAPPEAR_IN_TABLEGROUP, `Table "${i.join(".")}" already appears in group "${f}"`, s));
       } else
         this.env.groupOfTable[r] = this.declarationNode;
       return {
@@ -3421,14 +3427,17 @@ class Ft {
     }), n;
   }
   interpretSettingList(e) {
-    const n = B(e).getValue(), [s] = n.note || [];
+    var i, r, a;
+    const n = B(e).getValue();
+    this.tableGroup.color = (i = n.color) != null && i.length ? Ke((a = (r = n.color) == null ? void 0 : r.at(0)) == null ? void 0 : a.value) : void 0;
+    const [s] = n.note || [];
     return this.tableGroup.note = s && {
       value: G(s == null ? void 0 : s.value).map(re).unwrap(),
       token: A(s)
     }, [];
   }
 }
-class Bt {
+class Vt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.enum = { values: [] };
   }
@@ -3437,14 +3446,14 @@ class Bt {
   }
   interpretName(e) {
     const { name: n, schemaName: s } = Ie(e);
-    return s.length > 1 ? (this.enum.name = n, this.enum.schemaName = s.join("."), [new l(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.enum.name = n, this.enum.schemaName = s.length ? s[0] : null, []);
+    return s.length > 1 ? (this.enum.name = n, this.enum.schemaName = s.join("."), [new c(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.enum.name = n, this.enum.schemaName = s.length ? s[0] : null, []);
   }
   interpretBody(e) {
     return e.body.flatMap((n) => {
-      var c;
+      var l;
       const s = n, i = {};
       i.token = A(s), i.name = j(s.callee).unwrap();
-      const a = (c = B(s.args[0]).getValue().note) == null ? void 0 : c.at(0);
+      const a = (l = B(s.args[0]).getValue().note) == null ? void 0 : l.at(0);
       return i.note = a && {
         value: G(a.value).map(re).unwrap(),
         token: A(a)
@@ -3471,19 +3480,19 @@ class Zn {
       const s = n;
       switch ((i = s.type) == null ? void 0 : i.value.toLowerCase()) {
         case "table": {
-          const r = new Ut(s, this.env).interpret();
+          const r = new Mt(s, this.env).interpret();
           return this.project.tables.push(this.env.tables.get(s)), r;
         }
         case "ref": {
-          const r = new Mt(s, this.env).interpret();
+          const r = new Ft(s, this.env).interpret();
           return this.project.refs.push(this.env.ref.get(s)), r;
         }
         case "tablegroup": {
-          const r = new Ft(s, this.env).interpret();
+          const r = new Bt(s, this.env).interpret();
           return this.project.tableGroups.push(this.env.tableGroups.get(s)), r;
         }
         case "enum": {
-          const r = new Bt(s, this.env).interpret();
+          const r = new Vt(s, this.env).interpret();
           return this.project.enums.push(this.env.enums.get(s)), r;
         }
         case "note":
@@ -3516,15 +3525,15 @@ class Kn {
     const e = this.ast.body.flatMap((n) => {
       switch (ve(n).unwrap_or(void 0)) {
         case b.Table:
-          return new Ut(n, this.env).interpret();
+          return new Mt(n, this.env).interpret();
         case b.Note:
           return new Jn(n, this.env).interpret();
         case b.Ref:
-          return new Mt(n, this.env).interpret();
-        case b.TableGroup:
           return new Ft(n, this.env).interpret();
-        case b.Enum:
+        case b.TableGroup:
           return new Bt(n, this.env).interpret();
+        case b.Enum:
+          return new Vt(n, this.env).interpret();
         case b.Project:
           return new Zn(n, this.env).interpret();
         default:
@@ -3546,7 +3555,7 @@ function es(t) {
     project: Array.from(t.project.values())[0] || {}
   };
 }
-var L = /* @__PURE__ */ ((t) => (t[t.Function = 1] = "Function", t[t.Constructor = 2] = "Constructor", t[t.Field = 3] = "Field", t[t.Variable = 4] = "Variable", t[t.Class = 5] = "Class", t[t.Struct = 6] = "Struct", t[t.Interface = 7] = "Interface", t[t.Module = 8] = "Module", t[t.Property = 9] = "Property", t[t.Event = 10] = "Event", t[t.Operator = 11] = "Operator", t[t.Unit = 12] = "Unit", t[t.Value = 13] = "Value", t[t.Constant = 14] = "Constant", t[t.Enum = 15] = "Enum", t[t.EnumMember = 16] = "EnumMember", t[t.Keyword = 17] = "Keyword", t[t.Text = 18] = "Text", t[t.Color = 19] = "Color", t[t.File = 20] = "File", t[t.Reference = 21] = "Reference", t[t.Customcolor = 22] = "Customcolor", t[t.Folder = 23] = "Folder", t[t.TypeParameter = 24] = "TypeParameter", t[t.User = 25] = "User", t[t.Issue = 26] = "Issue", t[t.Snippet = 27] = "Snippet", t))(L || {}), w = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(w || {});
+var L = /* @__PURE__ */ ((t) => (t[t.Function = 1] = "Function", t[t.Constructor = 2] = "Constructor", t[t.Field = 3] = "Field", t[t.Variable = 4] = "Variable", t[t.Class = 5] = "Class", t[t.Struct = 6] = "Struct", t[t.Interface = 7] = "Interface", t[t.Module = 8] = "Module", t[t.Property = 9] = "Property", t[t.Event = 10] = "Event", t[t.Operator = 11] = "Operator", t[t.Unit = 12] = "Unit", t[t.Value = 13] = "Value", t[t.Constant = 14] = "Constant", t[t.Enum = 15] = "Enum", t[t.EnumMember = 16] = "EnumMember", t[t.Keyword = 17] = "Keyword", t[t.Text = 18] = "Text", t[t.Color = 19] = "Color", t[t.File = 20] = "File", t[t.Reference = 21] = "Reference", t[t.Customcolor = 22] = "Customcolor", t[t.Folder = 23] = "Folder", t[t.TypeParameter = 24] = "TypeParameter", t[t.User = 25] = "User", t[t.Issue = 26] = "Issue", t[t.Snippet = 27] = "Snippet", t))(L || {}), y = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(y || {});
 function Ae(t) {
   switch (t) {
     case T.Schema:
@@ -3567,7 +3576,7 @@ function Ae(t) {
       return L.Text;
   }
 }
-function De(t, e) {
+function Re(t, e) {
   if (!t || Ce(t))
     return !1;
   for (const n of t.trailingTrivia) {
@@ -3578,7 +3587,7 @@ function De(t, e) {
   }
   return !0;
 }
-function R() {
+function D() {
   return {
     suggestions: []
   };
@@ -3601,29 +3610,29 @@ function Fe(t) {
     }))
   };
 }
-function Ke(t, e) {
+function et(t, e) {
   return t.getOffsetAt(e);
 }
-class Vt {
+class Gt {
   constructor(e, n = []) {
     this.compiler = e, this.triggerCharacters = n;
   }
   provideCompletionItems(e, n) {
     var E, h;
-    const s = Ke(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), c = a === void 0 ? i[0] : i[a + 1];
+    const s = et(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), l = a === void 0 ? i[0] : i[a + 1];
     if ([
       ...(r == null ? void 0 : r.trailingTrivia) || [],
       ...(r == null ? void 0 : r.leadingTrivia) || [],
-      ...(c == null ? void 0 : c.leadingTrivia) || []
-    ].find((m) => Qt(m) && ge(s, m)))
-      return R();
+      ...(l == null ? void 0 : l.leadingTrivia) || []
+    ].find((m) => qt(m) && ge(s, m)))
+      return D();
     if (a === void 0)
-      return Tt();
+      return bt();
     if ([u.STRING_LITERAL, u.QUOTED_STRING].includes(r.kind) && ge(s, r))
-      return R();
+      return D();
     const p = this.compiler.container.element(s);
     if (this.compiler.container.scopeKind(s) === O.TOPLEVEL || p instanceof v && p.type && p.type.start <= s && p.type.end >= s)
-      return Tt();
+      return bt();
     const f = [...this.compiler.container.stack(s)].reverse();
     for (const m of f)
       if (m instanceof Q)
@@ -3632,7 +3641,7 @@ class Vt {
           case "<":
           case "<>":
           case "-":
-            return dt(
+            return Et(
               this.compiler,
               s,
               m
@@ -3644,13 +3653,13 @@ class Vt {
           case "<":
           case "<>":
           case "-":
-            return dt(
+            return Et(
               this.compiler,
               s,
               m
             );
           case ".":
-            return Gt(
+            return Ct(
               this.compiler,
               s,
               m
@@ -3658,20 +3667,20 @@ class Vt {
         }
       else {
         if (m instanceof se)
-          return Et(this.compiler, s, m);
-        if (m instanceof D)
-          return Et(this.compiler, s, m);
+          return Nt(this.compiler, s, m);
+        if (m instanceof R)
+          return Nt(this.compiler, s, m);
         if (m instanceof Z)
           return ts(this.compiler, s);
-        if (m instanceof y)
-          return mt(this.compiler, s, m);
+        if (m instanceof w)
+          return Tt(this.compiler, s, m);
         if (m instanceof v && (m.bodyColon && s >= m.bodyColon.end || m.body && ge(s, m.body)))
-          return mt(this.compiler, s, void 0);
+          return Tt(this.compiler, s, void 0);
       }
-    return R();
+    return D();
   }
 }
-function dt(t, e, n) {
+function Et(t, e, n) {
   const s = t.container.scopeKind(e);
   if ([O.REF, O.TABLE].includes(s)) {
     const i = Be(t, e, t.container.element(e), [
@@ -3679,24 +3688,24 @@ function dt(t, e, n) {
       T.Schema,
       T.Column
     ]);
-    return De(n.op, e) ? Pe(i) : i;
+    return Re(n.op, e) ? Pe(i) : i;
   }
-  return R();
+  return D();
 }
 function Be(t, e, n, s) {
   var a;
   if (n === void 0)
-    return R();
+    return D();
   let i = n;
   const r = { suggestions: [] };
   for (; i; ) {
     if ((a = i == null ? void 0 : i.symbol) != null && a.symbolTable) {
-      const { symbol: c } = i;
+      const { symbol: l } = i;
       r.suggestions.push(
-        ...t.symbol.members(c).filter(({ kind: p }) => s.includes(p)).map(({ name: p, kind: f }) => ({
+        ...t.symbol.members(l).filter(({ kind: p }) => s.includes(p)).map(({ name: p, kind: f }) => ({
           label: p,
           insertText: p,
-          insertTextRules: w.KeepWhitespace,
+          insertTextRules: y.KeepWhitespace,
           kind: Ae(f),
           sortText: Ae(f).toString().padStart(2, "0"),
           range: void 0
@@ -3711,81 +3720,70 @@ function ts(t, e) {
   var s;
   switch (t.container.scopeKind(e)) {
     case O.INDEXES:
-      return Xt(t, e);
+      return $t(t, e);
     case O.REF:
       {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
           const r = i.pop();
           if (r instanceof q && ((s = r.op) == null ? void 0 : s.value) === ".")
-            return Gt(
+            return Ct(
               t,
               e,
               r
             );
         }
       }
-      return Ct(t, e);
+      return Xt(t, e);
   }
-  return R();
+  return D();
 }
-function Et(t, e, n) {
+function Nt(t, e, n) {
   const { token: s } = t.container.token(e);
   if ([u.COMMA, u.LBRACKET].includes(s == null ? void 0 : s.kind)) {
-    const i = Nt(t, e);
-    return (s == null ? void 0 : s.kind) === u.COMMA && De(s, e) ? Pe(i) : i;
+    const i = mt(t, e);
+    return (s == null ? void 0 : s.kind) === u.COMMA && Re(s, e) ? Pe(i) : i;
   }
   if (n.name && n.name.start <= e && n.name.end >= e)
-    return Nt(t, e);
+    return mt(t, e);
   if (n.name instanceof Y) {
     const i = ns(
       t,
       e,
       Te(n.name).unwrap_or("")
     );
-    return (s == null ? void 0 : s.kind) === u.COLON && De(s, e) ? Pe(i) : i;
+    return (s == null ? void 0 : s.kind) === u.COLON && Re(s, e) ? Pe(i) : i;
   }
-  return R();
+  return D();
 }
-function Nt(t, e) {
+function mt(t, e) {
   const n = t.container.element(e), s = t.container.scopeKind(e);
   if (n instanceof X)
-    return R();
+    return D();
   if (n.body && !ge(e, n.body))
     switch (s) {
       case O.TABLE:
         return {
-          suggestions: [
-            {
-              label: "headercolor",
-              insertText: "headercolor: ",
-              kind: L.Field,
-              insertTextRules: w.KeepWhitespace,
-              range: void 0
-            },
-            {
-              label: "note",
-              insertText: "note: ",
-              kind: L.Field,
-              insertTextRules: w.KeepWhitespace,
-              range: void 0
-            }
-          ]
+          suggestions: ["headercolor", "note"].map((i) => ({
+            label: i,
+            insertText: `${i}: `,
+            kind: L.Field,
+            insertTextRules: y.KeepWhitespace,
+            range: void 0
+          }))
         };
       case O.TABLEGROUP:
         return {
-          suggestions: [
-            {
-              label: "note",
-              insertText: "note: ",
-              kind: L.Field,
-              insertTextRules: w.KeepWhitespace,
-              range: void 0
-            }
-          ]
+          suggestions: ["color", "note"].map((i) => ({
+            label: i,
+            insertText: `${i}: `,
+            kind: L.Field,
+            insertTextRules: y.KeepWhitespace,
+            range: void 0
+          }))
         };
       default:
-        return R();
+        return D();
     }
   switch (s) {
     case O.TABLE:
@@ -3795,21 +3793,21 @@ function Nt(t, e) {
             label: i,
             insertText: i,
             kind: L.Property,
-            insertTextRules: w.KeepWhitespace,
+            insertTextRules: y.KeepWhitespace,
             range: void 0
           })),
           ...["ref", "default"].map((i) => ({
             label: i,
             insertText: `${i}: `,
             kind: L.Property,
-            insertTextRules: w.KeepWhitespace,
+            insertTextRules: y.KeepWhitespace,
             range: void 0
           })),
           {
             label: "note",
             insertText: "note: ",
             kind: L.Property,
-            insertTextRules: w.KeepWhitespace,
+            insertTextRules: y.KeepWhitespace,
             range: void 0
           }
         ]
@@ -3821,7 +3819,7 @@ function Nt(t, e) {
             label: "note",
             insertText: "note: ",
             kind: L.Property,
-            insertTextRules: w.KeepWhitespace,
+            insertTextRules: y.KeepWhitespace,
             range: void 0
           }
         ]
@@ -3832,7 +3830,7 @@ function Nt(t, e) {
           ...["unique", "pk"].map((i) => ({
             label: i,
             insertText: i,
-            insertTextRules: w.KeepWhitespace,
+            insertTextRules: y.KeepWhitespace,
             kind: L.Property,
             range: void 0
           })),
@@ -3840,7 +3838,7 @@ function Nt(t, e) {
             label: i,
             insertText: `${i}: `,
             kind: L.Property,
-            insertTextRules: w.KeepWhitespace,
+            insertTextRules: y.KeepWhitespace,
             range: void 0
           }))
         ]
@@ -3851,12 +3849,12 @@ function Nt(t, e) {
           label: i,
           insertText: `${i}: `,
           kind: L.Property,
-          insertTextRules: w.KeepWhitespace,
+          insertTextRules: y.KeepWhitespace,
           range: void 0
         }))
       };
   }
-  return R();
+  return D();
 }
 function ns(t, e, n) {
   switch (n == null ? void 0 : n.toLowerCase()) {
@@ -3867,7 +3865,7 @@ function ns(t, e, n) {
           label: s,
           insertText: s,
           kind: L.Value,
-          insertTextRules: w.KeepWhitespace,
+          insertTextRules: y.KeepWhitespace,
           range: void 0
         }))
       };
@@ -3877,17 +3875,17 @@ function ns(t, e, n) {
           label: s,
           insertText: `${s}`,
           kind: L.Value,
-          insertTextRules: w.KeepWhitespace,
+          insertTextRules: y.KeepWhitespace,
           range: void 0
         }))
       };
   }
-  return R();
+  return D();
 }
-function Gt(t, e, n) {
+function Ct(t, e, n) {
   const s = pe(n).unwrap_or([]);
   if (s.pop(), s.some((r) => !M(r)))
-    return R();
+    return D();
   const i = s.map((r) => j(r).unwrap());
   return Fe({
     suggestions: t.symbol.ofName({ nameStack: i, owner: t.container.element(e) }).flatMap(({ symbol: r }) => t.symbol.members(r)).map(({ kind: r, name: a }) => ({
@@ -3898,7 +3896,7 @@ function Gt(t, e, n) {
     }))
   });
 }
-function mt(t, e, n) {
+function Tt(t, e, n) {
   var i;
   switch (t.container.scopeKind(e)) {
     case O.TABLE:
@@ -3910,32 +3908,32 @@ function mt(t, e, n) {
     case O.ENUM:
       return ss(t, e, n);
     case O.REF: {
-      const r = Ct(t, e);
-      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && De(t.container.token(e).token, e) ? Pe(r) : r;
+      const r = Xt(t, e);
+      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && Re(t.container.token(e).token, e) ? Pe(r) : r;
     }
     case O.TABLEGROUP:
       return as(t);
     default:
-      return R();
+      return D();
   }
 }
-function Tt() {
+function bt() {
   return {
     suggestions: ["Table", "TableGroup", "Enum", "Project", "Ref"].map((t) => ({
       label: t,
       insertText: t,
-      insertTextRules: w.KeepWhitespace,
+      insertTextRules: y.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
   };
 }
 function ss(t, e, n) {
-  return n != null && n.callee && et(e, n) === 1 ? Be(t, e, t.container.element(e), [
+  return n != null && n.callee && tt(e, n) === 1 ? Be(t, e, t.container.element(e), [
     T.Schema,
     T.Table,
     T.Column
-  ]) : R();
+  ]) : D();
 }
 function is(t, e, n) {
   if (!(n != null && n.callee))
@@ -3943,42 +3941,42 @@ function is(t, e, n) {
       suggestions: ["Note", "indexes"].map((i) => ({
         label: i,
         insertText: i,
-        insertTextRules: w.KeepWhitespace,
+        insertTextRules: y.KeepWhitespace,
         kind: L.Keyword,
         range: void 0
       }))
     };
-  const s = et(e, n);
+  const s = tt(e, n);
   return s === 0 ? {
     suggestions: ["Note", "indexes"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: w.KeepWhitespace,
+      insertTextRules: y.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
-  } : s === 1 ? ls(t, e) : R();
+  } : s === 1 ? ls(t, e) : D();
 }
 function rs(t, e, n) {
-  return n != null && n.callee ? et(e, n) === 0 ? {
+  return n != null && n.callee ? tt(e, n) === 0 ? {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: w.KeepWhitespace,
+      insertTextRules: y.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
-  } : R() : {
+  } : D() : {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: w.KeepWhitespace,
+      insertTextRules: y.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
   };
 }
-function Ct(t, e) {
+function Xt(t, e) {
   return Be(t, e, t.container.element(e), [
     T.Schema,
     T.Table,
@@ -3997,7 +3995,7 @@ function as(t) {
           return s !== T.Table && s !== T.Schema ? [] : {
             label: i,
             insertText: i,
-            insertTextRules: w.KeepWhitespace,
+            insertTextRules: y.KeepWhitespace,
             kind: Ae(s),
             range: void 0
           };
@@ -4006,7 +4004,7 @@ function as(t) {
       ...["Note"].map((e) => ({
         label: e,
         insertText: e,
-        insertTextRules: w.KeepWhitespace,
+        insertTextRules: y.KeepWhitespace,
         kind: L.Keyword,
         range: void 0
       }))
@@ -4014,7 +4012,7 @@ function as(t) {
   };
 }
 function os(t, e) {
-  return Xt(t, e);
+  return $t(t, e);
 }
 function ls(t, e) {
   return {
@@ -4079,7 +4077,7 @@ function ls(t, e) {
       ].map((n) => ({
         label: n,
         insertText: n,
-        insertTextRules: w.KeepWhitespace,
+        insertTextRules: y.KeepWhitespace,
         kind: L.TypeParameter,
         sortText: L.TypeParameter.toString().padStart(2, "0"),
         range: void 0
@@ -4091,44 +4089,44 @@ function ls(t, e) {
     ]
   };
 }
-function Xt(t, e) {
+function $t(t, e) {
   const n = t.container.element(e), s = n == null ? void 0 : n.parent;
-  if (!((s == null ? void 0 : s.symbol) instanceof At))
-    return R();
+  if (!((s == null ? void 0 : s.symbol) instanceof vt))
+    return D();
   const { symbolTable: i } = s.symbol;
   return Fe({
     suggestions: [...i.entries()].flatMap(([r]) => {
       const a = ie(r).unwrap_or(void 0);
       if (a === void 0)
         return [];
-      const { name: c } = a;
+      const { name: l } = a;
       return {
-        label: c,
-        insertText: c,
-        insertTextRules: w.KeepWhitespace,
+        label: l,
+        insertText: l,
+        insertTextRules: y.KeepWhitespace,
         kind: Ae(T.Column),
         range: void 0
       };
     })
   });
 }
-function et(t, e) {
+function tt(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 $t {
+class Wt {
   constructor(e) {
     this.compiler = e;
   }
   provideDefinition(e, n) {
     var a;
-    const { uri: s } = e, i = Ke(e, n), r = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = et(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
-      const c = r.pop();
-      if ((a = c == null ? void 0 : c.referee) != null && a.declaration && [Ne.PRIMARY_EXPRESSION, Ne.VARIABLE].includes(c == null ? void 0 : c.kind)) {
-        const { startPos: p, endPos: f } = c.referee.declaration;
+      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)) {
+        const { startPos: p, endPos: f } = l.referee.declaration;
         return [
           {
             range: {
@@ -4145,12 +4143,12 @@ class $t {
     return [];
   }
 }
-class Wt {
+class jt {
   constructor(e) {
     this.compiler = e;
   }
   provideReferences(e, n) {
-    const { uri: s } = e, i = Ke(e, n), r = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = et(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const a = r.pop();
       if (a && [
@@ -4158,9 +4156,9 @@ class Wt {
         Ne.FUNCTION_APPLICATION,
         Ne.PRIMARY_EXPRESSION
       ].includes(a == null ? void 0 : a.kind)) {
-        const { symbol: c } = a;
-        if (c != null && c.references.length)
-          return c.references.map(({ startPos: p, endPos: f }) => ({
+        const { symbol: l } = a;
+        if (l != null && l.references.length)
+          return l.references.map(({ startPos: p, endPos: f }) => ({
             range: {
               startColumn: p.column + 1,
               startLineNumber: p.line + 1,
@@ -4176,11 +4174,11 @@ class Wt {
 }
 const hs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  CompletionItemInsertTextRule: w,
+  CompletionItemInsertTextRule: y,
   CompletionItemKind: L,
-  DBMLCompletionItemProvider: Vt,
-  DBMLDefinitionProvider: $t,
-  DBMLReferencesProvider: Wt
+  DBMLCompletionItemProvider: Gt,
+  DBMLDefinitionProvider: Wt,
+  DBMLReferencesProvider: jt
 }, Symbol.toStringTag, { value: "Module" }));
 var O = /* @__PURE__ */ ((t) => (t[t.TABLE = 0] = "TABLE", t[t.ENUM = 1] = "ENUM", t[t.TABLEGROUP = 2] = "TABLEGROUP", t[t.INDEXES = 3] = "INDEXES", t[t.NOTE = 4] = "NOTE", t[t.REF = 5] = "REF", t[t.PROJECT = 6] = "PROJECT", t[t.CUSTOM = 7] = "CUSTOM", t[t.TOPLEVEL = 8] = "TOPLEVEL", t))(O || {});
 class fs {
@@ -4188,10 +4186,10 @@ class fs {
     this.source = "", this.cache = new Array(
       16
       /* TOTAL_QUERY_COUNT */
-    ).fill(null), this.nodeIdGenerator = new qt(), this.symbolIdGenerator = new en(), this.token = {
+    ).fill(null), this.nodeIdGenerator = new Ht(), this.symbolIdGenerator = new tn(), this.token = {
       invalidStream: this.createQuery(
         6,
-        () => this.parse.tokens().filter(vt)
+        () => this.parse.tokens().filter(wt)
       ),
       // Valid + Invalid tokens (which are guarenteed to be non-trivials) are included in the stream
       flatStream: this.createQuery(
@@ -4203,7 +4201,7 @@ class fs {
       _: this.createQuery(
         0,
         () => {
-          const e = new hn(this.source).lex().chain((n) => new dn(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new Qn(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
+          const e = new fn(this.source).lex().chain((n) => new En(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new Qn(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
           return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new Kn(n).interpret().map((r) => ({ ast: n, tokens: s, rawDb: r })));
         }
       ),
@@ -4228,32 +4226,32 @@ class fs {
       stack: this.createQuery(
         10,
         (e) => {
-          const n = this.token.flatStream(), { index: s, token: i } = this.container.token(e), r = s === void 0 ? -1 : Yt(n, (f) => !f.isInvalid, s);
+          const n = this.token.flatStream(), { index: s, token: i } = this.container.token(e), r = s === void 0 ? -1 : zt(n, (f) => !f.isInvalid, s);
           if (r === -1)
             return [this.parse.ast()];
           const a = n[r].start;
-          let c = this.parse.ast();
-          const p = [c];
+          let l = this.parse.ast();
+          const p = [l];
           for (; ; ) {
-            const E = un(c).find((h) => ge(a, h));
+            const E = hn(l).find((h) => ge(a, h));
             if (E === void 0 || E instanceof F)
               break;
-            p.push(E), c = E;
+            p.push(E), l = E;
           }
           if ((i == null ? void 0 : i.kind) === u.COLON)
             return p;
           for (; p.length > 0; ) {
             let f = !1;
-            const E = it(p);
-            if (E instanceof y) {
+            const E = rt(p);
+            if (E instanceof w) {
               const h = this.parse.source();
               for (let m = E.end; m < e; m += 1)
                 h[m] === `
 ` && (p.pop(), f = !0);
             } else
-              E instanceof Q || E instanceof q ? this.container.token(e).token !== E.op && (p.pop(), f = !0) : E instanceof D ? E.listCloseBracket && E.end <= e && (p.pop(), f = !0) : E instanceof Z ? E.tupleCloseParen && E.end <= e && (p.pop(), f = !0) : E instanceof J ? E.blockCloseBrace && E.end <= e && (p.pop(), f = !0) : E instanceof Y || E.end < e && (p.pop(), f = !0);
+              E instanceof Q || E instanceof q ? this.container.token(e).token !== E.op && (p.pop(), f = !0) : E instanceof R ? E.listCloseBracket && E.end <= e && (p.pop(), f = !0) : E instanceof Z ? E.tupleCloseParen && E.end <= e && (p.pop(), f = !0) : E instanceof J ? E.blockCloseBrace && E.end <= e && (p.pop(), f = !0) : E instanceof Y || E.end < e && (p.pop(), f = !0);
             if (f) {
-              const h = it(p);
+              const h = rt(p);
               h instanceof v && h.end <= e && p.pop();
             }
             if (!f)
@@ -4331,14 +4329,14 @@ class fs {
             if (!((i = r.symbol) != null && i.symbolTable))
               continue;
             const { symbolTable: a } = r.symbol;
-            let c = [a], p = [];
+            let l = [a], p = [];
             for (const f of e)
-              p = c.flatMap(
-                (E) => Zt(f).flatMap((h) => {
+              p = l.flatMap(
+                (E) => Kt(f).flatMap((h) => {
                   const m = E.get(h), g = ie(h).unwrap_or(void 0);
                   return !m || !g ? [] : { ...g, symbol: m };
                 })
-              ), c = p.flatMap(
+              ), l = p.flatMap(
                 (E) => E.symbol.symbolTable ? E.symbol.symbolTable : []
               );
             s.push(...p);
@@ -4365,8 +4363,8 @@ class fs {
         if (r.has(a))
           return r.get(a);
       }
-      const c = n(i);
-      return i !== void 0 ? r instanceof Map ? r.set(a, c) : (this.cache[e] = /* @__PURE__ */ new Map(), this.cache[e].set(a, c)) : this.cache[e] = c, c;
+      const l = n(i);
+      return i !== void 0 ? r instanceof Map ? r.set(a, l) : (this.cache[e] = /* @__PURE__ */ new Map(), this.cache[e].set(a, l)) : this.cache[e] = l, l;
     };
   }
   setSource(e) {
@@ -4377,9 +4375,9 @@ class fs {
   }
   initMonacoServices() {
     return {
-      definitionProvider: new $t(this),
-      referenceProvider: new Wt(this),
-      autocompletionProvider: new Vt(this)
+      definitionProvider: new Wt(this),
+      referenceProvider: new jt(this),
+      autocompletionProvider: new Gt(this)
     };
   }
 }