@dbml/parse 3.7.1 → 3.7.3

package/dist/dbml-parse.mjs

@@ -1,6 +1,6 @@
-import I, { findLastIndex as jt, last as it } from "lodash";
-var l = /* @__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))(l || {});
-function Yt(t) {
+import I, { partition as jt, findLastIndex as Yt, last as it } 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) {
   switch (t.kind) {
     case "<newline>":
     case "<space>":
@@ -45,13 +45,13 @@ class F {
   }
 }
 function bt(t) {
-  return t.trailingTrivia.find(({ kind: e }) => e === l.NEWLINE) !== void 0;
+  return t.trailingTrivia.find(({ kind: e }) => e === u.NEWLINE) !== void 0;
 }
 function ot(t, e) {
-  return e.leadingTrivia.find(({ kind: s }) => s === l.NEWLINE) !== void 0 || bt(t);
+  return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || bt(t);
 }
 function Ce(t) {
-  return t.trailingTrivia.find(({ kind: e }) => e === l.SPACE) !== void 0;
+  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));
@@ -59,12 +59,12 @@ function It(t) {
 function Lt(t) {
   return t.leadingTrivia.length === 0 ? t.start : Lt(t.leadingTrivia[0]);
 }
-function zt(t) {
-  return [l.SINGLE_LINE_COMMENT, l.MULTILINE_COMMENT].includes(
+function Qt(t) {
+  return [u.SINGLE_LINE_COMMENT, u.MULTILINE_COMMENT].includes(
     t.kind
   );
 }
-class Qt {
+class qt {
   constructor() {
     this.id = 0;
   }
@@ -94,13 +94,13 @@ class x {
     }, this.fullEnd = NaN), this.start = this.startPos.offset, this.end = this.endPos.offset;
   }
 }
-var Ee = /* @__PURE__ */ ((t) => (t.PROGRAM = "<program>", t.ELEMENT_DECLARATION = "<element-declaration>", t.ATTRIBUTE = "<attribute>", t.IDENTIFIER_STREAM = "<identifer-stream>", t.LITERAL = "<literal>", t.VARIABLE = "<variable>", t.PREFIX_EXPRESSION = "<prefix-expression>", t.INFIX_EXPRESSION = "<infix-expression>", t.POSTFIX_EXPRESSION = "<postfix-expression>", t.FUNCTION_EXPRESSION = "<function-expression>", t.FUNCTION_APPLICATION = "<function-application>", t.BLOCK_EXPRESSION = "<block-expression>", t.LIST_EXPRESSION = "<list-expression>", t.TUPLE_EXPRESSION = "<tuple-expression>", t.CALL_EXPRESSION = "<call-expression>", t.PRIMARY_EXPRESSION = "<primary-expression>", t.GROUP_EXPRESSION = "<group-expression>", t.DUMMY = "<dummy>", t.ARRAY = "<array>", t))(Ee || {});
-class G extends x {
+var Ne = /* @__PURE__ */ ((t) => (t.PROGRAM = "<program>", t.ELEMENT_DECLARATION = "<element-declaration>", t.ATTRIBUTE = "<attribute>", t.IDENTIFIER_STREAM = "<identifer-stream>", t.LITERAL = "<literal>", t.VARIABLE = "<variable>", t.PREFIX_EXPRESSION = "<prefix-expression>", t.INFIX_EXPRESSION = "<infix-expression>", t.POSTFIX_EXPRESSION = "<postfix-expression>", t.FUNCTION_EXPRESSION = "<function-expression>", t.FUNCTION_APPLICATION = "<function-application>", t.BLOCK_EXPRESSION = "<block-expression>", t.LIST_EXPRESSION = "<list-expression>", t.TUPLE_EXPRESSION = "<tuple-expression>", t.CALL_EXPRESSION = "<call-expression>", t.PRIMARY_EXPRESSION = "<primary-expression>", t.GROUP_EXPRESSION = "<group-expression>", t.DUMMY = "<dummy>", t.ARRAY = "<array>", t))(Ne || {});
+class X extends x {
   constructor({ body: e = [], eof: n }, s) {
     super(s, "<program>", [...e, n]), this.body = e, this.eof = n;
   }
 }
-class A extends x {
+class v extends x {
   constructor({
     type: e,
     name: n,
@@ -108,7 +108,7 @@ class A extends x {
     alias: i,
     attributeList: r,
     bodyColon: a,
-    body: u
+    body: c
   }, p) {
     if (super(p, "<element-declaration>", [
       e,
@@ -117,13 +117,13 @@ class A extends x {
       i,
       r,
       a,
-      u
-    ]), u && a && !(u instanceof y || u instanceof A))
+      c
+    ]), c && a && !(c instanceof y || c 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 = u;
+    this.type = e, this.name = n, this.as = s, this.alias = i, this.attributeList = r, this.bodyColon = a, this.body = c;
   }
 }
-class $ extends x {
+class Y extends x {
   constructor({ identifiers: e = [] }, n) {
     super(n, "<identifer-stream>", e || []), this.identifiers = e;
   }
@@ -156,7 +156,7 @@ class Ue extends x {
     super(s, "<postfix-expression>", [n, e]), this.op = e, this.expression = n;
   }
 }
-class te extends x {
+class ne extends x {
   constructor({ value: e }, n) {
     super(n, "<function-expression>", [e]), this.value = e;
   }
@@ -166,7 +166,7 @@ class y extends x {
     super(s, "<function-application>", [e, ...n]), this.callee = e, this.args = n;
   }
 }
-class ne extends x {
+class J extends x {
   constructor({
     blockOpenBrace: e,
     body: n = [],
@@ -189,7 +189,7 @@ class D extends x {
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
 }
-class J extends x {
+class Z extends x {
   constructor({
     tupleOpenParen: e,
     elementList: n = [],
@@ -203,7 +203,7 @@ class J extends x {
     ]), this.tupleOpenParen = e, this.elementList = n, this.commaList = s, this.tupleCloseParen = i;
   }
 }
-class We extends J {
+class We extends Z {
   constructor({
     groupOpenParen: e,
     expression: n,
@@ -233,7 +233,7 @@ class be extends x {
     super(n, "<literal>", [e]), this.literal = e;
   }
 }
-class Z extends x {
+class K extends x {
   constructor({ variable: e }, n) {
     super(n, "<variable>", [e]), this.variable = e;
   }
@@ -245,11 +245,11 @@ class U extends x {
 }
 class xe extends x {
   constructor({ pre: e }, n) {
-    const s = F.create(l.SPACE, e.endPos, e.endPos, " ", !1);
+    const s = F.create(u.SPACE, e.endPos, e.endPos, " ", !1);
     super(n, "<dummy>", [s]);
   }
 }
-class ue extends x {
+class he extends x {
   constructor({ expression: e, indexer: n }, s) {
     super(s, "<array>", [e, n]), this.array = e, this.indexer = n;
   }
@@ -264,12 +264,12 @@ function gt(t, e) {
     (i) => i !== null
   );
 }
-function ls(t, e = !1) {
+function us(t, e = !1) {
   return JSON.stringify(
     t,
     function(n, s) {
       var i;
-      return !(this instanceof G) && n === "symbol" ? s == null ? void 0 : s.id : (
+      return !(this instanceof X) && n === "symbol" ? s == null ? void 0 : s.id : (
         /* this instanceof SyntaxNode && */
         n === "symbol" ? {
           symbolTable: s == null ? void 0 : s.symbolTable,
@@ -312,7 +312,7 @@ class S {
     return !0;
   }
 }
-class w {
+class k {
   // eslint-disable-next-line class-methods-use-this
   unwrap() {
     throw new Error("Trying to unwrap a None value");
@@ -323,11 +323,11 @@ class w {
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
   and_then(e) {
-    return new w();
+    return new k();
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
   map(e) {
-    return new w();
+    return new k();
   }
   // eslint-disable-next-line class-methods-use-this
   isOk() {
@@ -356,7 +356,7 @@ function qe(t) {
 function He(t) {
   return `TableGroup field:${t}`;
 }
-function qt(t) {
+function Ht(t) {
   return `Note:${t}`;
 }
 function Ve(t, e) {
@@ -384,16 +384,16 @@ function ie(t) {
   return Object.values(T).includes(e) ? new S({
     name: n,
     kind: e
-  }) : new w();
+  }) : new k();
 }
-function Ht(t) {
+function Jt(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 Jt(t) {
+function Zt(t) {
   return [
     je,
     Oe,
@@ -411,14 +411,14 @@ function Re(t) {
   const [e] = t;
   return e >= "0" && e <= "9";
 }
-function Zt(t) {
+function Kt(t) {
   const [e] = t;
   return Re(e) || Me(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
-function de(t) {
+function Ee(t) {
   return Me(t) || Re(t);
 }
-function ct(t, e) {
+function lt(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 ct(t, e) {
 function ge(t, e) {
   return t >= e.start && t < e.end;
 }
-class Kt {
+class en {
   constructor() {
     this.id = 0;
   }
@@ -443,12 +443,12 @@ class _t {
     this.references = [], this.id = n, this.symbolTable = e;
   }
 }
-class en {
+class tn {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class tn {
+class nn {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
@@ -458,28 +458,28 @@ class At {
     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 sn {
+class rn {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class rn {
+class an {
   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 c extends Error {
+class l 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, c.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, l.prototype);
   }
 }
-class B {
+class V {
   constructor(e, n) {
     this.value = e, this.errors = n === void 0 ? [] : n;
   }
@@ -491,21 +491,21 @@ class B {
   }
   chain(e) {
     const n = e(this.value), s = [...this.errors, ...n.errors];
-    return new B(n.value, s);
+    return new V(n.value, s);
   }
   map(e) {
-    return new B(e(this.value), this.errors);
+    return new V(e(this.value), this.errors);
   }
 }
-function an(t, e, n) {
+function on(t, e, n) {
   if (!t || !me(t) || e.length === 0)
-    return new w();
+    return new k();
   const s = [...e], i = Ge(t).unwrap(), r = s.pop();
-  if (!(r instanceof ne))
-    return new w();
+  if (!(r instanceof J))
+    return new k();
   const a = I.last(s) instanceof D ? s.pop() : void 0;
   return s.length === 3 && Ge(s[1]).unwrap().value === "as" ? new S(
-    n.create(A, {
+    n.create(v, {
       type: i,
       name: s[0],
       as: Ge(s[1]).unwrap(),
@@ -514,33 +514,33 @@ function an(t, e, n) {
       body: r
     })
   ) : s.length === 1 ? new S(
-    n.create(A, {
+    n.create(v, {
       type: i,
       name: s[0],
       attributeList: a,
       body: r
     })
   ) : s.length === 0 ? new S(
-    n.create(A, {
+    n.create(v, {
       type: i,
       attributeList: a,
       body: r
     })
-  ) : new w();
+  ) : new k();
 }
-function lt(t) {
-  return t.kind === l.IDENTIFIER && t.value === "as";
+function ct(t) {
+  return t.kind === u.IDENTIFIER && t.value === "as";
 }
 function N(t) {
-  t && (t instanceof F ? on(t) : cn(t));
+  t && (t instanceof F ? ln(t) : cn(t));
 }
-function on(t) {
-  t.kind !== l.EOF && (t.isInvalid = !0);
+function ln(t) {
+  t.kind !== u.EOF && (t.isInvalid = !0);
 }
 function cn(t) {
-  if (t instanceof A)
+  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 $)
+  else if (t instanceof Y)
     t.identifiers.forEach(N);
   else if (t instanceof se)
     N(t.name), N(t.colon), N(t.value);
@@ -550,11 +550,11 @@ function cn(t) {
     N(t.leftExpression), N(t.op), N(t.rightExpression);
   else if (t instanceof Ue)
     N(t.op), N(t.expression);
-  else if (t instanceof ne)
+  else if (t instanceof J)
     N(t.blockOpenBrace), t.body.forEach(N), N(t.blockCloseBrace);
   else if (t instanceof D)
     N(t.listOpenBracket), t.commaList.forEach(N), t.elementList.forEach(N), N(t.listCloseBracket);
-  else if (t instanceof J)
+  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);
@@ -562,9 +562,9 @@ function cn(t) {
     N(t.callee), t.args.forEach(N);
   else if (t instanceof U)
     N(t.expression);
-  else if (t instanceof te)
+  else if (t instanceof ne)
     N(t.value);
-  else if (t instanceof Z)
+  else if (t instanceof K)
     N(t.variable);
   else if (t instanceof be)
     N(t.literal);
@@ -577,10 +577,10 @@ function vt(t) {
 function P(...t) {
   return t.filter((e) => e !== void 0);
 }
-function ln(t) {
-  if (t instanceof G)
+function un(t) {
+  if (t instanceof X)
     return P(...t.body, t.eof);
-  if (t instanceof A)
+  if (t instanceof v)
     return P(
       t.type,
       t.name,
@@ -592,11 +592,11 @@ function ln(t) {
     );
   if (t instanceof se)
     return P(t.name, t.colon, t.value);
-  if (t instanceof $)
+  if (t instanceof Y)
     return t.identifiers;
   if (t instanceof be)
     return t.literal ? [t.literal] : [];
-  if (t instanceof Z)
+  if (t instanceof K)
     return P(t.variable);
   if (t instanceof Q)
     return P(t.op, t.expression);
@@ -604,29 +604,29 @@ function ln(t) {
     return P(t.leftExpression, t.op, t.rightExpression);
   if (t instanceof Ue)
     return P(t.expression, t.op);
-  if (t instanceof te)
+  if (t instanceof ne)
     return P(t.value);
   if (t instanceof y)
     return P(t.callee, ...t.args);
-  if (t instanceof ne)
+  if (t instanceof J)
     return P(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
   if (t instanceof D)
     return P(
       t.listOpenBracket,
-      ...ct(t.elementList, t.commaList),
+      ...lt(t.elementList, t.commaList),
       t.listCloseBracket
     );
-  if (t instanceof J)
+  if (t instanceof Z)
     return P(
       t.tupleOpenParen,
-      ...ct(t.elementList, t.commaList),
+      ...lt(t.elementList, t.commaList),
       t.tupleCloseParen
     );
   if (t instanceof H)
     return P(t.callee, t.argumentList);
   if (t instanceof U)
     return P(t.expression);
-  if (t instanceof ue)
+  if (t instanceof he)
     return P(
       t.array,
       t.indexer
@@ -634,18 +634,18 @@ function ln(t) {
   throw t instanceof We ? new Error("This case is already handled by TupleExpressionNode") : new Error("Unreachable - no other possible cases");
 }
 function Ge(t) {
-  return M(t) ? new S(t.expression.variable) : new w();
+  return M(t) ? new S(t.expression.variable) : new k();
 }
-function j(t) {
+function $(t) {
   var e;
-  return t instanceof U && (t.expression instanceof Z && t.expression.variable instanceof F && t.expression.variable.kind === l.QUOTED_STRING || t.expression instanceof be && ((e = t.expression.literal) == null ? void 0 : e.kind) === l.STRING_LITERAL);
+  return t instanceof U && (t.expression instanceof K && t.expression.variable instanceof F && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof be && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
 }
 function M(t) {
-  return t instanceof U && t.expression instanceof Z && t.expression.variable instanceof F;
+  return t instanceof U && t.expression instanceof K && t.expression.variable instanceof F;
 }
 function me(t) {
   var e;
-  return t instanceof U && t.expression instanceof Z && ((e = t.expression.variable) == null ? void 0 : e.kind) === l.IDENTIFIER;
+  return t instanceof U && t.expression instanceof K && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
 }
 function Je(t) {
   var e;
@@ -653,11 +653,11 @@ function Je(t) {
 }
 function Te(t) {
   if (t === void 0)
-    return new w();
+    return new k();
   const e = t.identifiers.map((n) => n.value).join(" ");
-  return e === "" ? new w() : new S(e);
+  return e === "" ? new k() : new S(e);
 }
-class un {
+class hn {
   // list of errors during lexing
   constructor(e) {
     this.start = {
@@ -706,50 +706,50 @@ class un {
     );
   }
   lex() {
-    return this.scanTokens(), this.tokens.push(F.create(l.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new B(this.tokens, this.errors);
+    return this.scanTokens(), this.tokens.push(F.create(u.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new V(this.tokens, this.errors);
   }
   scanTokens() {
     for (; !this.isAtEnd(); ) {
       const e = this.advance();
       switch (e) {
         case " ":
-          this.addToken(l.SPACE);
+          this.addToken(u.SPACE);
           break;
         case "\r":
           break;
         case `
 `:
-          this.addToken(l.NEWLINE);
+          this.addToken(u.NEWLINE);
           break;
         case "	":
-          this.addToken(l.TAB);
+          this.addToken(u.TAB);
           break;
         case ",":
-          this.addToken(l.COMMA);
+          this.addToken(u.COMMA);
           break;
         case "(":
-          this.addToken(l.LPAREN);
+          this.addToken(u.LPAREN);
           break;
         case ")":
-          this.addToken(l.RPAREN);
+          this.addToken(u.RPAREN);
           break;
         case "[":
-          this.addToken(l.LBRACKET);
+          this.addToken(u.LBRACKET);
           break;
         case "]":
-          this.addToken(l.RBRACKET);
+          this.addToken(u.RBRACKET);
           break;
         case "{":
-          this.addToken(l.LBRACE);
+          this.addToken(u.LBRACE);
           break;
         case "}":
-          this.addToken(l.RBRACE);
+          this.addToken(u.RBRACE);
           break;
         case ";":
-          this.addToken(l.SEMICOLON);
+          this.addToken(u.SEMICOLON);
           break;
         case ":":
-          this.addToken(l.COLON);
+          this.addToken(u.COLON);
           break;
         case "'":
           this.match("''") ? this.multilineStringLiteral() : this.singleLineStringLiteral();
@@ -779,11 +779,11 @@ class un {
             this.numericLiteralOrIdentifier();
             break;
           }
-          this.addToken(l.OP, !0), this.errors.push(
-            new c(
+          this.addToken(u.OP, !0), this.errors.push(
+            new l(
               o.UNKNOWN_SYMBOL,
               `Unexpected token '${e}'`,
-              this.createToken(l.OP, !0)
+              this.createToken(u.OP, !0)
             )
           );
           break;
@@ -795,7 +795,7 @@ class un {
     let e = !0, n = [], s;
     const i = [];
     for (const r of this.tokens)
-      Yt(r) ? (n.push(r), r.kind === l.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);
+      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);
     this.tokens = i;
   }
   gatherInvalid() {
@@ -820,14 +820,14 @@ class un {
     // Whether to interpret '\' as a backlash
     consumeStopSequence: a = !0
   }) {
-    let u = "";
+    let c = "";
     for (; !this.isAtEnd() && (s || !this.check(`
 `)) && !this.check(n); )
-      this.peek() === "\\" && !r ? (this.advance(), u += this.escapedString()) : u += this.advance();
+      this.peek() === "\\" && !r ? (this.advance(), c += this.escapedString()) : c += this.advance();
     if (this.isAtEnd() && !i) {
       const p = this.createToken(e, !0);
       this.tokens.push(p), this.errors.push(
-        new c(o.UNEXPECTED_EOF, "EOF reached while parsing", p)
+        new l(o.UNEXPECTED_EOF, "EOF reached while parsing", p)
       );
       return;
     }
@@ -835,7 +835,7 @@ class un {
 `) && !s) {
       const p = this.createToken(e, !0);
       this.tokens.push(p), this.errors.push(
-        new c(
+        new l(
           o.UNEXPECTED_NEWLINE,
           "Invalid newline encountered while parsing",
           p
@@ -843,38 +843,38 @@ class un {
       );
       return;
     }
-    a && this.match(n), this.tokens.push(F.create(e, this.start, this.current, u, !1));
+    a && this.match(n), this.tokens.push(F.create(e, this.start, this.current, c, !1));
   }
   singleLineStringLiteral() {
-    this.consumeUntil(l.STRING_LITERAL, "'", {
+    this.consumeUntil(u.STRING_LITERAL, "'", {
       allowNewline: !1,
       allowEof: !1,
       raw: !1
     });
   }
   multilineStringLiteral() {
-    this.consumeUntil(l.STRING_LITERAL, "'''", {
+    this.consumeUntil(u.STRING_LITERAL, "'''", {
       allowNewline: !0,
       allowEof: !1,
       raw: !1
     });
   }
   functionExpression() {
-    this.consumeUntil(l.FUNCTION_EXPRESSION, "`", {
+    this.consumeUntil(u.FUNCTION_EXPRESSION, "`", {
       allowNewline: !1,
       allowEof: !1,
       raw: !0
     });
   }
   quotedVariable() {
-    this.consumeUntil(l.QUOTED_STRING, '"', {
+    this.consumeUntil(u.QUOTED_STRING, '"', {
       allowNewline: !1,
       allowEof: !1,
       raw: !1
     });
   }
   singleLineComment() {
-    this.consumeUntil(l.SINGLE_LINE_COMMENT, `
+    this.consumeUntil(u.SINGLE_LINE_COMMENT, `
 `, {
       allowNewline: !0,
       allowEof: !0,
@@ -883,55 +883,55 @@ class un {
     });
   }
   multilineComment() {
-    this.consumeUntil(l.MULTILINE_COMMENT, "*/", {
+    this.consumeUntil(u.MULTILINE_COMMENT, "*/", {
       allowNewline: !0,
       allowEof: !1,
       raw: !0
     });
   }
   identifier() {
-    for (; !this.isAtEnd() && de(this.peek()); )
+    for (; !this.isAtEnd() && Ee(this.peek()); )
       this.advance();
-    this.addToken(l.IDENTIFIER);
+    this.addToken(u.IDENTIFIER);
   }
   operator() {
     for (; rt(this.peek()); )
       this.advance();
-    this.addToken(l.OP);
+    this.addToken(u.OP);
   }
   // we accept identifiers starting with digits but must contain at least one char or underscore
   numericLiteralOrIdentifier() {
     let e = 0;
     if (this.isAtEnd())
-      return this.addToken(l.NUMERIC_LITERAL);
+      return this.addToken(u.NUMERIC_LITERAL);
     for (; !this.isAtEnd(); ) {
       const n = this.check(".");
       if (e += n ? 1 : 0, e > 1)
         break;
       if (!n && this.current.offset === this.text.length - 1)
-        return this.advance(), this.addToken(l.NUMERIC_LITERAL);
-      if (!n && !de(this.peek()))
-        return this.addToken(l.NUMERIC_LITERAL);
+        return this.advance(), this.addToken(u.NUMERIC_LITERAL);
+      if (!n && !Ee(this.peek()))
+        return this.addToken(u.NUMERIC_LITERAL);
       if (!n && !Re(this.peek()))
         break;
       this.advance();
     }
     if (e > 0) {
-      for (; !this.isAtEnd() && (this.check(".") || de(this.peek())); )
+      for (; !this.isAtEnd() && (this.check(".") || Ee(this.peek())); )
         this.advance();
-      const n = this.createToken(l.NUMERIC_LITERAL, !0);
-      this.tokens.push(n), this.errors.push(new c(o.UNKNOWN_TOKEN, "Invalid number", n));
+      const n = this.createToken(u.NUMERIC_LITERAL, !0);
+      this.tokens.push(n), this.errors.push(new l(o.UNKNOWN_TOKEN, "Invalid number", n));
     } else {
-      for (; !this.isAtEnd() && de(this.peek()); )
+      for (; !this.isAtEnd() && Ee(this.peek()); )
         this.advance();
-      const n = this.createToken(l.IDENTIFIER, !1);
+      const n = this.createToken(u.IDENTIFIER, !1);
       this.tokens.push(n);
     }
   }
   colorLiteral() {
-    for (; !this.isAtEnd() && de(this.peek()); )
+    for (; !this.isAtEnd() && Ee(this.peek()); )
       this.advance();
-    this.addToken(l.COLOR_LITERAL);
+    this.addToken(u.COLOR_LITERAL);
   }
   escapedString() {
     const e = { column: this.current.column - 1, offset: this.current.offset - 1, line: this.current.line };
@@ -970,8 +970,8 @@ class un {
       case "u": {
         let n = "";
         for (let s = 0; s <= 3; s += 1) {
-          if (this.isAtEnd() || !de(this.peek()))
-            return this.errors.push(new c(o.INVALID_ESCAPE_SEQUENCE, `Invalid unicode escape sequence '\\u${n}', only unicode escape sequences of the form '\\uHHHH' where H is a hexadecimal number are allowed`, F.create(l.STRING_LITERAL, e, this.current, `\\u${n}`, !0))), `\\u${n}`;
+          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}`;
           n += this.advance();
         }
         return String.fromCharCode(parseInt(n, 16));
@@ -982,7 +982,7 @@ class un {
   }
 }
 var Se = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(Se || {});
-class hn {
+class fn {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
   }
@@ -1023,7 +1023,7 @@ class hn {
     if (!(this.numberOfNestedLBraces <= 0 && this.numberOfNestedLBrackets <= 0 && this.numberOfNestedLParens <= 0))
       for (let s = n; s < e.length - 1; s += 1)
         switch (e[s].kind) {
-          case l.COMMA:
+          case u.COMMA:
             if (this.isWithinGroupExpressionContext() || this.isWithinListExpressionContext())
               return [...this.stack].reverse().find(
                 (r) => [
@@ -1033,22 +1033,22 @@ class hn {
                 ].includes(r)
               );
             break;
-          case l.RPAREN:
+          case u.RPAREN:
             if (this.isWithinGroupExpressionContext())
               return 1;
             break;
-          case l.RBRACE:
+          case u.RBRACE:
             if (this.isWithinBlockExpressionContext())
               return 2;
             break;
-          case l.RBRACKET:
+          case u.RBRACKET:
             if (this.isWithinListExpressionContext())
               return 0;
             break;
         }
   }
 }
-class fn {
+class pn {
   constructor(e) {
     this.generator = e;
   }
@@ -1061,29 +1061,29 @@ class d {
     this.token = e, this.partialNode = n, this.handlerContext = s;
   }
 }
-class pn {
+class dn {
   constructor(e, n) {
-    this.current = 0, this.errors = [], this.contextStack = new hn(), this.synchronizeProgram = () => {
+    this.current = 0, this.errors = [], this.contextStack = new fn(), this.synchronizeProgram = () => {
       const s = this.peek();
-      s.kind !== l.EOF ? N(this.advance()) : (N(this.peek()), this.logError(s, o.UNEXPECTED_EOF, "Unexpected EOF"));
+      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 (lt(s) || this.check(l.COLON, l.LBRACE, l.LBRACKET))
+        if (ct(s) || this.check(u.COLON, u.LBRACE, u.LBRACKET))
           break;
         N(s), this.advance();
       }
     }, this.synchronizeElementDeclarationAlias = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(l.COLON, l.LBRACE, l.LBRACKET))
+        if (this.check(u.COLON, u.LBRACE, u.LBRACKET))
           break;
         N(s), this.advance();
       }
     }, this.blockExpression = this.contextStack.withContextDo(Se.BlockExpression, () => {
-      const s = { body: [] }, i = () => this.nodeFactory.create(ne, s);
+      const s = { body: [] }, i = () => this.nodeFactory.create(J, s);
       try {
-        this.consume("Expect an opening brace '{'", l.LBRACE), s.blockOpenBrace = this.previous();
+        this.consume("Expect an opening brace '{'", u.LBRACE), s.blockOpenBrace = this.previous();
       } catch (r) {
         if (!(r instanceof d))
           throw r;
@@ -1091,7 +1091,7 @@ class pn {
           throw new d(r.token, i(), r.handlerContext);
         this.synchronizeBlock();
       }
-      for (; !this.isAtEnd() && !this.check(l.RBRACE); )
+      for (; !this.isAtEnd() && !this.check(u.RBRACE); )
         try {
           s.body.push(this.canBeField() ? this.fieldDeclaration() : this.expression());
         } catch (r) {
@@ -1102,7 +1102,7 @@ class pn {
           this.synchronizeBlock();
         }
       try {
-        this.consume("Expect a closing brace '}'", l.RBRACE), s.blockCloseBrace = this.previous();
+        this.consume("Expect a closing brace '}'", u.RBRACE), s.blockCloseBrace = this.previous();
       } catch (r) {
         if (!(r instanceof d))
           throw r;
@@ -1112,10 +1112,10 @@ class pn {
       }
       return i();
     }), this.synchronizeBlock = () => {
-      if (!this.check(l.RBRACE))
+      if (!this.check(u.RBRACE))
         for (N(this.advance()); !this.isAtEnd(); ) {
           const s = this.peek();
-          if (this.check(l.RBRACE) || ot(this.previous(), s))
+          if (this.check(u.RBRACE) || ot(this.previous(), s))
             break;
           N(s), this.advance();
         }
@@ -1124,9 +1124,9 @@ class pn {
         groupOpenParen: s.tupleOpenParen,
         groupCloseParen: s.tupleCloseParen,
         expression: s.elementList[0]
-      }), r = () => this.nodeFactory.create(J, s);
+      }), r = () => this.nodeFactory.create(Z, s);
       try {
-        this.consume("Expect an opening parenthesis '('", l.LPAREN), s.tupleOpenParen = this.previous();
+        this.consume("Expect an opening parenthesis '('", u.LPAREN), s.tupleOpenParen = this.previous();
       } catch (a) {
         if (!(a instanceof d))
           throw a;
@@ -1134,7 +1134,7 @@ class pn {
           throw new d(a.token, r(), a.handlerContext);
         this.synchronizeTuple();
       }
-      if (!this.isAtEnd() && !this.check(l.RPAREN))
+      if (!this.isAtEnd() && !this.check(u.RPAREN))
         try {
           s.elementList.push(this.normalExpression());
         } catch (a) {
@@ -1144,9 +1144,9 @@ class pn {
             throw new d(a.token, i(), a.handlerContext);
           this.synchronizeTuple();
         }
-      for (; !this.isAtEnd() && !this.check(l.RPAREN); )
+      for (; !this.isAtEnd() && !this.check(u.RPAREN); )
         try {
-          this.consume("Expect a comma ','", l.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.normalExpression());
+          this.consume("Expect a comma ','", u.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.normalExpression());
         } catch (a) {
           if (!(a instanceof d))
             throw a;
@@ -1155,7 +1155,7 @@ class pn {
           this.synchronizeTuple();
         }
       try {
-        this.consume("Expect a closing parenthesis ')'", l.RPAREN), s.tupleCloseParen = this.previous();
+        this.consume("Expect a closing parenthesis ')'", u.RPAREN), s.tupleCloseParen = this.previous();
       } catch (a) {
         if (!(a instanceof d))
           throw a;
@@ -1167,14 +1167,14 @@ class pn {
     }), this.synchronizeTuple = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(l.RPAREN, l.COMMA))
+        if (this.check(u.RPAREN, u.COMMA))
           break;
         N(s), this.advance();
       }
     }, this.listExpression = this.contextStack.withContextDo(Se.ListExpression, () => {
       const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(D, s);
       try {
-        this.consume("Expect an opening bracket '['", l.LBRACKET), s.listOpenBracket = this.previous();
+        this.consume("Expect an opening bracket '['", u.LBRACKET), s.listOpenBracket = this.previous();
       } catch (r) {
         if (!(r instanceof d))
           throw r;
@@ -1182,7 +1182,7 @@ class pn {
           throw new d(r.token, i(), r.handlerContext);
         this.synchronizeList();
       }
-      if (!this.isAtEnd() && !this.check(l.RBRACKET))
+      if (!this.isAtEnd() && !this.check(u.RBRACKET))
         try {
           s.elementList.push(this.attribute());
         } catch (r) {
@@ -1192,9 +1192,9 @@ class pn {
             throw new d(r.token, i(), r.handlerContext);
           this.synchronizeList();
         }
-      for (; !this.isAtEnd() && !this.check(l.RBRACKET); )
+      for (; !this.isAtEnd() && !this.check(u.RBRACKET); )
         try {
-          this.consume("Expect a comma ','", l.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.attribute());
+          this.consume("Expect a comma ','", u.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.attribute());
         } catch (r) {
           if (!(r instanceof d))
             throw r;
@@ -1203,7 +1203,7 @@ class pn {
           this.synchronizeList();
         }
       try {
-        this.consume("Expect a closing bracket ']'", l.RBRACKET), s.listCloseBracket = this.previous();
+        this.consume("Expect a closing bracket ']'", u.RBRACKET), s.listCloseBracket = this.previous();
       } catch (r) {
         if (!(r instanceof d))
           throw r;
@@ -1215,28 +1215,28 @@ class pn {
     }), this.synchronizeList = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(l.COMMA, l.RBRACKET))
+        if (this.check(u.COMMA, u.RBRACKET))
           break;
         N(s), this.advance();
       }
     }, this.synchronizeAttributeName = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(l.COMMA, l.RBRACKET, l.COLON))
+        if (this.check(u.COMMA, u.RBRACKET, u.COLON))
           break;
         N(s), this.advance();
       }
     }, this.synchronizeAttributeValue = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(l.COMMA, l.RBRACKET))
+        if (this.check(u.COMMA, u.RBRACKET))
           break;
         N(s), this.advance();
       }
-    }, this.tokens = e, this.nodeFactory = new fn(n);
+    }, this.tokens = e, this.nodeFactory = new pn(n);
   }
   isAtEnd() {
-    return this.current >= this.tokens.length || this.tokens[this.current].kind === l.EOF;
+    return this.current >= this.tokens.length || this.tokens[this.current].kind === u.EOF;
   }
   advance() {
     return this.isAtEnd() ? I.last(this.tokens) : this.tokens[this.current++];
@@ -1289,8 +1289,8 @@ class pn {
     this.tokens = e;
   }
   parse() {
-    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(G, { body: e, eof: n });
-    return this.gatherInvalid(), new B({ ast: s, tokens: this.tokens }, this.errors);
+    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(X, { body: e, eof: n });
+    return this.gatherInvalid(), new V({ ast: s, tokens: this.tokens }, this.errors);
   }
   /* Parsing and synchronizing ProgramNode */
   program() {
@@ -1308,13 +1308,13 @@ class pn {
   }
   /* Parsing and synchronizing top-level ElementDeclarationNode */
   elementDeclaration() {
-    const e = {}, n = () => this.nodeFactory.create(A, e);
+    const e = {}, n = () => this.nodeFactory.create(v, e);
     try {
-      this.consume("Expect an identifier", l.IDENTIFIER), e.type = this.previous();
+      this.consume("Expect an identifier", u.IDENTIFIER), e.type = this.previous();
     } catch (s) {
       throw s instanceof d ? (e.type = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
-    if (!this.check(l.COLON, l.LBRACE, l.LBRACKET))
+    if (!this.check(u.COLON, u.LBRACE, u.LBRACKET))
       try {
         e.name = this.normalExpression();
       } catch (s) {
@@ -1324,8 +1324,8 @@ class pn {
           throw new d(s.token, n(), s.handlerContext);
         this.synchronizeElementDeclarationName();
       }
-    if (lt(this.peek()))
-      if (e.as = this.advance(), this.check(l.COLON, l.LBRACE, l.LBRACKET))
+    if (ct(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
         try {
@@ -1338,27 +1338,27 @@ class pn {
           this.synchronizeElementDeclarationAlias();
         }
     try {
-      e.attributeList = this.check(l.LBRACKET) ? this.listExpression() : void 0;
+      e.attributeList = this.check(u.LBRACKET) ? this.listExpression() : void 0;
     } catch (s) {
       throw s instanceof d ? (e.attributeList = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
     if (!this.discardUntil(
       "Expect an opening brace '{' or a colon ':'",
-      l.LBRACE,
-      l.COLON
+      u.LBRACE,
+      u.COLON
     ))
       return n();
     try {
-      if (this.match(l.COLON)) {
+      if (this.match(u.COLON)) {
         e.bodyColon = this.previous();
         const s = this.expression();
-        s instanceof A ? (N(s), this.logError(s, o.UNEXPECTED_ELEMENT_DECLARATION, "An element's simple body must not be an element declaration")) : e.body = s;
+        s instanceof v ? (N(s), this.logError(s, o.UNEXPECTED_ELEMENT_DECLARATION, "An element's simple body must not be an element declaration")) : e.body = s;
       } else
         e.body = this.blockExpression();
     } catch (s) {
       throw s instanceof d ? (e.body = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
-    return this.nodeFactory.create(A, e);
+    return this.nodeFactory.create(v, e);
   }
   /* Parsing nested element declarations with simple body */
   // e.g
@@ -1367,28 +1367,28 @@ class pn {
   //    Note: 'This is a note'  // fieldDeclaration() handles this
   //  }
   fieldDeclaration() {
-    const e = {}, n = () => this.nodeFactory.create(A, e);
+    const e = {}, n = () => this.nodeFactory.create(v, e);
     try {
-      this.consume("Expect an identifier", l.IDENTIFIER), e.type = this.previous();
+      this.consume("Expect an identifier", u.IDENTIFIER), e.type = this.previous();
     } catch (s) {
       throw s instanceof d ? (e.type = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
     try {
-      this.consume("Expect a colon ':'", l.COLON), e.bodyColon = this.previous();
+      this.consume("Expect a colon ':'", u.COLON), e.bodyColon = this.previous();
     } catch (s) {
       throw s instanceof d ? (e.bodyColon = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
     try {
       const s = this.expression();
-      s instanceof A ? this.errors.push(new c(o.INVALID_ELEMENT_IN_SIMPLE_BODY, "Simple body cannot be an element declaration", s)) : e.body = s;
+      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;
     } catch (s) {
       throw s instanceof d ? (e.body = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
-    return this.nodeFactory.create(A, e);
+    return this.nodeFactory.create(v, e);
   }
   /* Parsing any ExpressionNode, including non-NormalExpression */
   expression() {
-    const e = { args: [] }, n = () => an(e.callee, e.args, this.nodeFactory).unwrap_or(
+    const e = { args: [] }, n = () => on(e.callee, e.args, this.nodeFactory).unwrap_or(
       this.nodeFactory.create(y, e)
     );
     try {
@@ -1413,7 +1413,7 @@ class pn {
     if (this.isAtEnd() || bt(this.previous()))
       return !0;
     const e = this.peek().kind;
-    return e === l.RBRACE || e === l.RBRACKET || e === l.RPAREN || e === l.COMMA || e === l.COLON;
+    return e === u.RBRACE || e === u.RBRACKET || e === u.RPAREN || e === u.COMMA || e === u.COLON;
   }
   normalExpression() {
     return this.expression_bp(0);
@@ -1423,7 +1423,7 @@ class pn {
     let n = this.leftExpression_bp();
     for (; !this.isAtEnd(); ) {
       const s = this.peek();
-      if (s.kind === l.LPAREN) {
+      if (s.kind === u.LPAREN) {
         const { left: i } = ut(s);
         if (i < e || // When '(' is encountered,
         // consider it part of another expression if
@@ -1442,16 +1442,16 @@ class pn {
             argumentList: r.partialNode
           }), new d(r.token, n, r.handlerContext)) : r;
         }
-      } else if (s.kind === l.LBRACKET) {
+      } else if (s.kind === u.LBRACKET) {
         if (Ce(this.previous()))
           break;
         try {
-          n = this.nodeFactory.create(ue, {
+          n = this.nodeFactory.create(he, {
             expression: n,
             indexer: this.listExpression()
           });
         } catch (i) {
-          throw i instanceof d ? (n = this.nodeFactory.create(ue, {
+          throw i instanceof d ? (n = this.nodeFactory.create(he, {
             expression: n,
             indexer: i.partialNode
           }), new d(i.token, n, i.handlerContext)) : i;
@@ -1466,7 +1466,7 @@ class pn {
             op: i
           });
         } else {
-          const a = En(i);
+          const a = Nn(i);
           if (a.left === null || a.left <= e)
             break;
           this.advance();
@@ -1476,12 +1476,12 @@ class pn {
               op: i,
               rightExpression: i.value === "." ? this.extractOperand() : this.expression_bp(a.right)
             });
-          } catch (u) {
-            throw u instanceof d ? (n = this.nodeFactory.create(q, {
+          } catch (c) {
+            throw c instanceof d ? (n = this.nodeFactory.create(q, {
               leftExpression: n,
               op: i,
-              rightExpression: u.partialNode
-            }), new d(u.token, n, u.handlerContext)) : u;
+              rightExpression: c.partialNode
+            }), new d(c.token, n, c.handlerContext)) : c;
           }
         }
       } else
@@ -1494,7 +1494,7 @@ class pn {
     if (at(this.peek())) {
       const n = {};
       n.op = this.peek();
-      const s = mn(n.op);
+      const s = Tn(n.op);
       if (s.right === null)
         throw this.logError(
           n.op,
@@ -1530,12 +1530,12 @@ class pn {
   // e.g { ... }
   extractOperand() {
     return this.check(
-      l.NUMERIC_LITERAL,
-      l.STRING_LITERAL,
-      l.COLOR_LITERAL,
-      l.QUOTED_STRING,
-      l.IDENTIFIER
-    ) ? this.primaryExpression() : this.check(l.FUNCTION_EXPRESSION) ? this.functionExpression() : this.check(l.LBRACKET) ? this.listExpression() : this.check(l.LBRACE) ? this.blockExpression() : this.check(l.LPAREN) ? this.tupleExpression() : (this.peek().kind === l.EOF ? this.logError(
+      u.NUMERIC_LITERAL,
+      u.STRING_LITERAL,
+      u.COLOR_LITERAL,
+      u.QUOTED_STRING,
+      u.IDENTIFIER
+    ) ? this.primaryExpression() : this.check(u.FUNCTION_EXPRESSION) ? this.functionExpression() : this.check(u.LBRACKET) ? this.listExpression() : this.check(u.LBRACE) ? this.blockExpression() : this.check(u.LPAREN) ? this.tupleExpression() : (this.peek().kind === u.EOF ? this.logError(
       this.peek(),
       o.UNEXPECTED_EOF,
       "Unexpected EOF"
@@ -1549,32 +1549,32 @@ class pn {
   functionExpression() {
     const e = {};
     try {
-      this.consume("Expect a function expression", l.FUNCTION_EXPRESSION), e.value = this.previous();
+      this.consume("Expect a function expression", u.FUNCTION_EXPRESSION), e.value = this.previous();
     } catch (n) {
       throw n instanceof d ? (e.value = n.partialNode, new d(
         n.token,
-        this.nodeFactory.create(te, e),
+        this.nodeFactory.create(ne, e),
         n.handlerContext
       )) : n;
     }
-    return this.nodeFactory.create(te, e);
+    return this.nodeFactory.create(ne, e);
   }
   canBeField() {
-    return this.peek().kind === l.IDENTIFIER && this.peek(1).kind === l.COLON;
+    return this.peek().kind === u.IDENTIFIER && this.peek(1).kind === u.COLON;
   }
   /* Parsing PrimaryExpression */
   primaryExpression() {
     if (this.match(
-      l.COLOR_LITERAL,
-      l.STRING_LITERAL,
-      l.NUMERIC_LITERAL
+      u.COLOR_LITERAL,
+      u.STRING_LITERAL,
+      u.NUMERIC_LITERAL
     ))
       return this.nodeFactory.create(U, {
         expression: this.nodeFactory.create(be, { literal: this.previous() })
       });
-    if (this.match(l.QUOTED_STRING, l.IDENTIFIER))
+    if (this.match(u.QUOTED_STRING, u.IDENTIFIER))
       return this.nodeFactory.create(U, {
-        expression: this.nodeFactory.create(Z, { variable: this.previous() })
+        expression: this.nodeFactory.create(K, { variable: this.previous() })
       });
     throw this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect a variable or literal"), new d(
       this.peek(),
@@ -1584,13 +1584,13 @@ class pn {
   }
   attribute() {
     const e = {};
-    if (this.check(l.COLON, l.RBRACKET, l.COMMA)) {
+    if (this.check(u.COLON, u.RBRACKET, u.COMMA)) {
       const n = this.peek();
       this.logError(
         n,
         o.EMPTY_ATTRIBUTE_NAME,
         "Expect a non-empty attribute name"
-      ), e.name = this.nodeFactory.create($, { identifiers: [] });
+      ), e.name = this.nodeFactory.create(Y, { identifiers: [] });
     } else
       try {
         e.name = this.attributeName();
@@ -1605,12 +1605,12 @@ class pn {
           );
         this.synchronizeAttributeName();
       }
-    return this.match(l.COLON) && (e.colon = this.previous(), e.value = this.attributeValue()), this.nodeFactory.create(se, e);
+    return this.match(u.COLON) && (e.colon = this.previous(), e.value = this.attributeValue()), this.nodeFactory.create(se, e);
   }
   attributeValue() {
     let e;
     try {
-      e = this.peek().kind === l.IDENTIFIER && this.peek(1).kind === l.IDENTIFIER ? this.attributeName() : this.normalExpression();
+      e = this.peek().kind === u.IDENTIFIER && this.peek(1).kind === u.IDENTIFIER ? this.attributeName() : this.normalExpression();
     } catch (n) {
       if (!(n instanceof d) || !this.canHandle(n))
         throw n;
@@ -1620,25 +1620,25 @@ class pn {
   }
   attributeName() {
     const e = [];
-    if (this.peek().kind !== l.IDENTIFIER)
+    if (this.peek().kind !== u.IDENTIFIER)
       return this.primaryExpression();
-    for (; !this.isAtEnd() && !this.check(l.COLON, l.COMMA, l.RBRACKET); )
+    for (; !this.isAtEnd() && !this.check(u.COLON, u.COMMA, u.RBRACKET); )
       try {
-        this.consume("Expect an identifier", l.IDENTIFIER), e.push(this.previous());
+        this.consume("Expect an identifier", u.IDENTIFIER), e.push(this.previous());
       } catch (n) {
         throw n instanceof d ? new d(
           n.token,
-          this.nodeFactory.create($, { identifiers: e }),
+          this.nodeFactory.create(Y, { identifiers: e }),
           n.handlerContext
         ) : n;
       }
-    return this.nodeFactory.create($, { identifiers: e });
+    return this.nodeFactory.create(Y, { identifiers: e });
   }
   logError(e, n, s) {
-    this.errors.push(new c(n, s, e));
+    this.errors.push(new l(n, s, e));
   }
 }
-const dn = {
+const En = {
   "+": { left: 9, right: 10 },
   "*": { left: 11, right: 12 },
   "-": { left: 9, right: 10 },
@@ -1654,10 +1654,10 @@ const dn = {
   "!=": { left: 4, right: 5 },
   ".": { left: 16, right: 17 }
 };
-function En(t) {
-  return dn[t.value] || { left: null, right: null };
+function Nn(t) {
+  return En[t.value] || { left: null, right: null };
 }
-const Nn = {
+const mn = {
   "+": { left: null, right: 15 },
   "-": { left: null, right: 15 },
   "<": { left: null, right: 15 },
@@ -1665,14 +1665,14 @@ const Nn = {
   "<>": { left: null, right: 15 },
   "!": { left: null, right: 15 }
 };
-function mn(t) {
-  return Nn[t.value] || { left: null, right: null };
+function Tn(t) {
+  return mn[t.value] || { left: null, right: null };
 }
-const Tn = {
+const bn = {
   "(": { left: 14, right: null }
 };
 function ut(t) {
-  return Tn[t.value] || { left: null, right: null };
+  return bn[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) {
@@ -1688,51 +1688,51 @@ function ve(t) {
     case b.TableGroup:
       return new S(e);
     default:
-      return new w();
+      return new k();
   }
 }
-function fe(t) {
+function pe(t) {
   if (!Je(t))
     return new S([t]);
-  const e = fe(t.leftExpression).unwrap_or(void 0);
-  return e ? (e.push(t.rightExpression), new S(e)) : new w();
+  const e = pe(t.leftExpression).unwrap_or(void 0);
+  return e ? (e.push(t.rightExpression), new S(e)) : new k();
 }
-function C(t) {
+function W(t) {
   if (t === void 0)
-    return new w();
-  const e = fe(t).unwrap_or(void 0);
+    return new k();
+  const e = pe(t).unwrap_or(void 0);
   if (!e)
-    return new w();
+    return new k();
   const n = [];
   for (const s of e) {
-    const i = X(s).unwrap_or(void 0);
+    const i = j(s).unwrap_or(void 0);
     if (!i)
-      return new w();
+      return new k();
     n.push(i);
   }
   return new S(n);
 }
 function _e(t) {
   if (t === void 0)
-    return new w();
-  const e = fe(t).unwrap_or(void 0);
+    return new k();
+  const e = pe(t).unwrap_or(void 0);
   if (!e || e.length === 0)
-    return new w();
+    return new k();
   const n = [];
   let s;
   if (!M(I.last(e))) {
     const i = e.pop();
     if (xt(i))
       s = i.elementList.map(
-        (r) => V(r).unwrap()
+        (r) => C(r).unwrap()
       );
     else
-      return new w();
+      return new k();
   }
   for (const i of e) {
-    const r = X(i).unwrap_or(void 0);
+    const r = j(i).unwrap_or(void 0);
     if (!r)
-      return new w();
+      return new k();
     n.push(r);
   }
   return new S({
@@ -1740,33 +1740,33 @@ function _e(t) {
     tupleElements: s
   });
 }
-function X(t) {
-  return M(t) ? new S(t.expression.variable.value) : new w();
+function j(t) {
+  return M(t) ? new S(t.expression.variable.value) : new k();
 }
 function Xe(t) {
   if (ht(t))
-    return t instanceof te ? new S({ functional: [t], nonFunctional: [] }) : new S({ functional: [], nonFunctional: [t] });
-  if (t instanceof J && t.elementList.every(ht)) {
+    return t instanceof ne ? new S({ functional: [t], nonFunctional: [] }) : new S({ functional: [], nonFunctional: [t] });
+  if (t instanceof Z && t.elementList.every(ht)) {
     const e = t.elementList.filter(
-      (s) => s instanceof te
+      (s) => s instanceof ne
     ), n = t.elementList.filter(M);
     return new S({ functional: e, nonFunctional: n });
   }
-  return new w();
+  return new k();
 }
-function V(t) {
+function C(t) {
   var n;
   const e = (n = t == null ? void 0 : t.expression.variable) == null ? void 0 : n.value;
-  return e === void 0 ? new w() : new S(e);
+  return e === void 0 ? new k() : new S(e);
 }
-function z(t) {
-  return j(t) ? t.expression instanceof Z ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new w();
+function G(t) {
+  return $(t) ? t.expression instanceof K ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new k();
 }
-function bn(t) {
+function In(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;
 }
-function In(t) {
+function Ln(t) {
   const e = _e(t.leftExpression), n = _e(t.rightExpression);
   if (!e.isOk() || !n.isOk())
     return !1;
@@ -1774,23 +1774,23 @@ function In(t) {
   return (s == null ? void 0 : s.length) === (i == null ? void 0 : i.length);
 }
 function ht(t) {
-  return t instanceof U && t.expression instanceof Z || t instanceof te;
+  return t instanceof U && t.expression instanceof K || t instanceof ne;
 }
-function Ln(t, e) {
-  var i, r, a, u;
+function gn(t, e) {
+  var i, r, a, c;
   let n = e;
-  const s = Ht(t);
+  const s = Jt(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 (((u = n.symbol) == null ? void 0 : u.declaration) instanceof G && s)
+    if (((c = n.symbol) == null ? void 0 : c.declaration) instanceof X && s)
       return n.symbol;
-    if (n instanceof G)
+    if (n instanceof X)
       return;
     n = n.parent;
   }
 }
-class gn {
+class _n {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1798,24 +1798,24 @@ class gn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof G || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new c(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof 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)] : [];
   }
   validateName(e) {
-    return e ? [new c(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
+    return e ? [new l(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
   }
   validateAlias(e) {
-    return e ? [new c(o.UNEXPECTED_NAME, "A Custom element shouldn't have an alias", e)] : [];
+    return e ? [new l(o.UNEXPECTED_NAME, "A Custom element shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new c(o.UNEXPECTED_SETTINGS, "A Custom element shouldn't have a setting list", e)] : [];
+    return e ? [new l(o.UNEXPECTED_SETTINGS, "A Custom element shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof ne)
-      return [new c(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
+    if (e instanceof J)
+      return [new l(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
     const n = [];
-    return j(e.callee) || n.push(new c(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new c(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
+    return $(e.callee) || n.push(new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
   }
 }
 class we {
@@ -1835,7 +1835,7 @@ class we {
     return this.table.entries();
   }
 }
-class _n {
+class An {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1843,26 +1843,26 @@ class _n {
     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 A ? [new c(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof v ? [new l(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? yt(e) ? [] : [new c(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new c(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
+    return e ? 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)];
   }
   validateAlias(e) {
-    return e ? [new c(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
+    return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(en, { declaration: this.declarationNode, symbolTable: new we() });
-    const { name: n } = this.declarationNode, s = C(n);
+    this.declarationNode.symbol = this.symbolFactory.create(tn, { 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), u = ze(r);
-      a.has(u) && e.push(new c(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, n)), a.set(u, this.declarationNode.symbol);
+      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);
     }
     return e;
   }
   validateSettingList(e) {
-    return e ? [new c(o.UNEXPECTED_SETTINGS, "An Enum shouldn't have a setting list", e)] : [];
+    return e ? [new l(o.UNEXPECTED_SETTINGS, "An Enum shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
@@ -1873,25 +1873,25 @@ class _n {
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
-    return e.length === 0 ? [new c(o.EMPTY_ENUM, "An Enum must have at least one element", this.declarationNode)] : e.flatMap((n) => {
+    return e.length === 0 ? [new l(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 c(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 l(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 c(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", r))), s.push(...this.registerField(n)), s;
+      return I.last(i) instanceof 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;
     });
   }
   validateFieldSettings(e) {
-    const n = W(e), s = n.getErrors(), i = n.getValue();
+    const n = B(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
-          a.length > 1 && a.forEach((u) => s.push(new c(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", u))), a.forEach((u) => {
-            j(u.value) || s.push(new c(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", u));
+          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));
           });
           break;
         default:
-          a.forEach((u) => s.push(new c(o.UNKNOWN_ENUM_ELEMENT_SETTING, `Unknown enum field setting '${r}'`, u)));
+          a.forEach((c) => s.push(new l(o.UNKNOWN_ENUM_ELEMENT_SETTING, `Unknown enum field setting '${r}'`, c)));
       }
     }
     return s;
@@ -1900,20 +1900,20 @@ class _n {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = re(n);
+      const s = ae(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const n = V(e.callee).unwrap(), s = Qe(n), i = this.symbolFactory.create(tn, { declaration: e });
+      const n = C(e.callee).unwrap(), s = Qe(n), i = this.symbolFactory.create(nn, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
         const a = r.get(s);
         return [
-          new c(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, e),
-          new c(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, a.declaration)
+          new l(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, e),
+          new l(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, a.declaration)
         ];
       }
       r.set(s, i);
@@ -1921,7 +1921,7 @@ class _n {
     return [];
   }
 }
-class An {
+class vn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1929,22 +1929,22 @@ class An {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof G || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new c(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof 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)] : [];
   }
   validateName(e) {
-    return e ? [new c(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
+    return e ? [new l(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
   }
   validateAlias(e) {
-    return e ? [new c(o.UNEXPECTED_ALIAS, "An Indexes shouldn't have an alias", e)] : [];
+    return e ? [new l(o.UNEXPECTED_ALIAS, "An Indexes shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new c(o.UNEXPECTED_SETTINGS, "An Indexes shouldn't have a setting list", e)] : [];
+    return e ? [new l(o.UNEXPECTED_SETTINGS, "An Indexes shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
     if (e instanceof y)
-      return [new c(o.UNEXPECTED_SIMPLE_BODY, "An Indexes must have a complex body", e)];
+      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);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
@@ -1955,35 +1955,35 @@ class An {
       const s = [], i = [n.callee, ...n.args];
       return I.last(i) instanceof D && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
         for (; r instanceof H; )
-          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));
+          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));
       }), s;
     });
   }
   validateFieldSetting(e) {
-    const n = W(e), s = n.getErrors(), i = n.getValue();
+    const n = B(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
         case "name":
-          a.length > 1 && a.forEach((u) => s.push(new c(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, u))), a.forEach((u) => {
-            j(u.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, u));
+          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));
           });
           break;
         case "unique":
         case "pk":
-          a.length > 1 && a.forEach((u) => s.push(new c(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, u))), a.forEach((u) => {
-            le(u.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must not have a value`, u));
+          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));
           });
           break;
         case "type":
-          a.length > 1 && a.forEach((u) => s.push(new c(o.DUPLICATE_INDEX_SETTING, "'type' can only appear once", u))), a.forEach((u) => {
-            M(u.value) || s.push(new c(o.INVALID_INDEX_SETTING_VALUE, `'type' must be "btree" or "hash"`, u));
+          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));
           });
           break;
         default:
-          a.forEach((u) => s.push(new c(o.UNKNOWN_INDEX_SETTING, `Unknown index setting '${r}'`, u)));
+          a.forEach((c) => s.push(new l(o.UNKNOWN_INDEX_SETTING, `Unknown index setting '${r}'`, c)));
       }
     }
     return s;
@@ -1992,37 +1992,51 @@ class An {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = re(n);
+      const s = ae(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
-class vn {
+class wn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
   validate() {
-    return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
+    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 G) && ![b.Table, b.Project].includes(ve(this.declarationNode.parent).unwrap_or(void 0)) ? [new c(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project. Sticky note can only appear at the global scope.", this.declarationNode)] : [];
+    return !(this.declarationNode.parent instanceof X) && ![
+      b.Table,
+      b.TableGroup,
+      b.Project
+    ].includes(ve(this.declarationNode.parent).unwrap_or(void 0)) ? [new l(
+      o.INVALID_NOTE_CONTEXT,
+      "A Note can only appear inside a Table, a Table Group or a Project. Sticky note can only appear at the global scope.",
+      this.declarationNode
+    )] : [];
   }
   validateName(e) {
-    if (!(this.declarationNode.parent instanceof G))
-      return e ? [new c(o.UNEXPECTED_NAME, "A Note shouldn't have a name", e)] : [];
+    if (!(this.declarationNode.parent instanceof X))
+      return e ? [new l(o.UNEXPECTED_NAME, "A Note shouldn't have a name", e)] : [];
     if (!e)
-      return [new c(o.INVALID_NAME, "Sticky note must have a name", this.declarationNode)];
-    const n = C(e);
+      return [new l(o.INVALID_NAME, "Sticky note must have a name", this.declarationNode)];
+    const n = W(e);
     if (!n.isOk())
-      return [new c(o.INVALID_NAME, "Invalid name for sticky note ", this.declarationNode)];
-    const i = n.unwrap().join("."), r = qt(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), []);
+      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), []);
   }
   validateAlias(e) {
-    return e ? [new c(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
+    return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new c(o.UNEXPECTED_SETTINGS, "A Note shouldn't have a setting list", e)] : [];
+    return e ? [new l(o.UNEXPECTED_SETTINGS, "A Note shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
@@ -2034,18 +2048,18 @@ class vn {
   }
   validateFields(e) {
     const n = [];
-    return e.length === 0 ? [new c(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new c(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), j(e[0].callee) || n.push(new c(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new c(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
+    return e.length === 0 ? [new 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);
   }
   validateSubElements(e) {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = re(n);
+      const s = ae(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
-class wn {
+class yn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2053,25 +2067,25 @@ class wn {
     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 A ? [new c(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof v ? [new l(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? ye(e) ? [] : [new c(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? ye(e) ? [] : [new l(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
-    return e ? [new c(o.UNEXPECTED_ALIAS, "A Project shouldn't have an alias", e)] : [];
+    return e ? [new l(o.UNEXPECTED_ALIAS, "A Project shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new c(o.UNEXPECTED_SETTINGS, "A Project shouldn't have a setting list", e)] : [];
+    return e ? [new l(o.UNEXPECTED_SETTINGS, "A Project shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
     if (e instanceof y)
-      return [new c(o.UNEXPECTED_SIMPLE_BODY, "A Project's body must be a block", e)];
+      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);
     return [
-      ...n.map((i) => new c(o.INVALID_PROJECT_FIELD, "A Project can not have inline fields", i)),
+      ...n.map((i) => new l(o.INVALID_PROJECT_FIELD, "A Project can not have inline fields", i)),
       ...this.validateSubElements(s)
     ];
   }
@@ -2079,12 +2093,12 @@ class wn {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = re(n);
+      const s = ae(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
-class yn {
+class kn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2092,16 +2106,16 @@ 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 G ? [] : [new c(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
+    return this.declarationNode.parent instanceof X ? [] : [new l(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
   }
   validateName(e) {
-    return e ? ye(e) ? [] : [new c(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? ye(e) ? [] : [new l(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
-    return e ? [new c(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
+    return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new c(o.UNEXPECTED_SETTINGS, "A Ref shouldn't have a setting list", e)] : [];
+    return e ? [new l(o.UNEXPECTED_SETTINGS, "A Ref shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
@@ -2113,27 +2127,27 @@ class yn {
   }
   validateFields(e) {
     if (e.length === 0)
-      return [new c(o.EMPTY_REF, "A Ref must have at least one field", this.declarationNode)];
+      return [new l(o.EMPTY_REF, "A Ref must have at least one field", this.declarationNode)];
     const n = [];
-    return e.length > 1 && n.push(...e.slice(1).map((s) => new c(o.REF_REDEFINED, "A Ref can only contain one binary relationship", s))), e.forEach((s) => {
-      s.callee && !bn(s.callee) && n.push(new c(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !In(s.callee) && n.push(new c(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
+    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));
       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 c(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", r)));
+      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)));
     }), n;
   }
   validateFieldSettings(e) {
-    const n = W(e), s = n.getErrors(), i = n.getValue();
+    const n = B(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "delete":
         case "update":
-          a.length > 1 && a.forEach((u) => s.push(new c(o.DUPLICATE_REF_SETTING, `'${r}' can only appear once`, u))), a.forEach((u) => {
-            kn(u.value) || s.push(new c(o.INVALID_REF_SETTING_VALUE, `'${r}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, u));
+          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));
           });
           break;
         default:
-          a.forEach((u) => s.push(new c(o.UNKNOWN_REF_SETTING, `Unknown ref setting '${r}'`, u)));
+          a.forEach((c) => s.push(new l(o.UNKNOWN_REF_SETTING, `Unknown ref setting '${r}'`, c)));
       }
     }
     return s;
@@ -2142,16 +2156,16 @@ class yn {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = re(n);
+      const s = ae(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
-function kn(t) {
-  if (!(M(t) && t.expression.variable.kind !== l.QUOTED_STRING) && !(t instanceof $))
+function xn(t) {
+  if (!(M(t) && t.expression.variable.kind !== u.QUOTED_STRING) && !(t instanceof Y))
     return !1;
   let e;
-  if (t instanceof $ ? e = Te(t).unwrap_or("") : e = t.expression.variable.value, e)
+  if (t instanceof Y ? e = Te(t).unwrap_or("") : e = t.expression.variable.value, e)
     switch (e.toLowerCase()) {
       case "cascade":
       case "no action":
@@ -2164,7 +2178,7 @@ function kn(t) {
     }
   return !1;
 }
-class xn {
+class Sn {
   constructor(e, n, s) {
     this.declarationNode = e, this.symbolFactory = s, this.publicSymbolTable = n;
   }
@@ -2172,31 +2186,31 @@ class xn {
     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 A ? [new c(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof v ? [new l(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? e instanceof ue ? [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)] : yt(e) ? [] : [new c(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new c(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
+    return e ? e instanceof he ? [new 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)];
   }
   validateAlias(e) {
-    return e ? Dn(e) ? [] : [new c(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
+    return e ? Pn(e) ? [] : [new l(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
   }
   validateSettingList(e) {
-    const n = W(e), s = n.getErrors(), i = n.getValue();
+    const n = B(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "headercolor":
-          a.length > 1 && s.push(...a.map((u) => new c(o.DUPLICATE_TABLE_SETTING, "'headercolor' can only appear once", u))), a.forEach((u) => {
-            Pn(u.value) || s.push(new c(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", u.value || u.name));
+          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));
           });
           break;
         case "note":
-          a.length > 1 && s.push(...a.map((u) => new c(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", u))), a.forEach((u) => {
-            j(u.value) || s.push(new c(o.INVALID_TABLE_SETTING, "'note' must be a string literal", u.value || u.name));
+          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));
           });
           break;
         default:
-          s.push(...a.map((u) => new c(o.INVALID_TABLE_SETTING, `Unknown '${r}' setting`, u)));
+          s.push(...a.map((c) => new l(o.INVALID_TABLE_SETTING, `Unknown '${r}' setting`, c)));
       }
     }
     return s;
@@ -2204,14 +2218,14 @@ class xn {
   registerElement() {
     const e = [];
     this.declarationNode.symbol = this.symbolFactory.create(At, { declaration: this.declarationNode, symbolTable: new we() });
-    const { name: n, alias: s } = this.declarationNode, i = C(n);
+    const { name: n, alias: s } = this.declarationNode, i = W(n);
     if (i.isOk()) {
-      const r = [...i.unwrap()], a = r.pop(), u = Ze(r, this.publicSymbolTable, this.symbolFactory), p = Oe(a);
-      u.has(p) && e.push(new c(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, n)), u.set(p, this.declarationNode.symbol);
+      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);
     }
-    if (s && ye(s) && !On(s.expression.variable.value, i.unwrap_or([]))) {
-      const r = V(s).unwrap(), a = Oe(r);
-      this.publicSymbolTable.has(a) && e.push(new c(o.DUPLICATE_NAME, `Table name '${r}' already exists`, n)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
+    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);
     }
     return e;
   }
@@ -2219,30 +2233,30 @@ class xn {
     if (!e)
       return [];
     if (e instanceof y)
-      return [new c(o.UNEXPECTED_SIMPLE_BODY, "A Table's body must be a block", e)];
+      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);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
-    return e.length === 0 ? [new c(o.EMPTY_TABLE, "A Table must have at least one column", this.declarationNode)] : e.flatMap((n) => {
+    return e.length === 0 ? [new l(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 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] && !Sn(n.args[0]) && s.push(new c(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
+      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]));
       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 = V(e.callee).unwrap(), s = Ye(n), i = this.symbolFactory.create(nn, { declaration: e });
+      const n = C(e.callee).unwrap(), s = Ye(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 c(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, e),
-          new c(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, a.declaration)
+          new l(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, e),
+          new l(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, a.declaration)
         ];
       }
       r.set(s, i);
@@ -2252,74 +2266,74 @@ class xn {
   // 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 c(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
+      return [...e.map((p) => new l(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
     if (e.length === 0)
       return [];
     let n;
     I.last(e) instanceof D && (n = e.pop());
-    const s = W(n), i = s.getErrors(), r = s.getValue();
+    const s = B(n), i = s.getErrors(), r = s.getValue();
     for (const p of e) {
-      const f = V(p).unwrap_or("").toLowerCase();
+      const f = C(p).unwrap_or("").toLowerCase();
       if (f !== "pk" && f !== "unique") {
-        i.push(new c(o.INVALID_SETTINGS, "Inline column settings can only be `pk` or `unique`", p));
+        i.push(new l(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 || [], u = r["primary key"] || [];
-    a.length >= 1 && u.length >= 1 && i.push(...[...a, ...u].map((p) => new c(o.DUPLICATE_COLUMN_SETTING, "Either one of 'primary key' and 'pk' can appear", 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)));
     for (const p in r) {
       const f = r[p];
       switch (p) {
         case "note":
-          f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", h))), f.forEach((h) => {
-            j(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", h.value || h.name));
+          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));
           });
           break;
         case "ref":
           f.forEach((h) => {
-            Mn(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", h.value || h.name));
+            Fn(h.value) || i.push(new l(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 c(o.DUPLICATE_COLUMN_SETTING, "primary key can only appear once", h))), f.forEach((h) => {
-            le(h.value) || i.push(new c(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 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));
           });
           break;
         case "pk":
-          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 && !le(h.value) && i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", h.value || h.name));
+          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));
           });
           break;
         case "not null":
-          f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "'not null' can only appear once", h)));
+          f.length > 1 && i.push(...f.map((h) => new l(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 c(o.CONFLICTING_SETTING, "'not null' and 'null' can not be set at the same time", h))), f.forEach((h) => {
-            le(h.value) || i.push(new c(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 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));
           });
           break;
         case "null":
-          f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_COLUMN_SETTING, "'null' can only appear once", h))), f.forEach((h) => {
-            le(h.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'null' must not have a value", h.value || h.name));
+          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));
           });
           break;
         case "unique":
-          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 && !le(h.value) && i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", h.value || h.name));
+          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));
           });
           break;
         case "increment":
-          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 && !le(h.value) && i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", h.value || h.name));
+          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));
           });
           break;
         case "default":
-          f.length > 1 && i.push(...f.map((h) => new c(o.DUPLICATE_TABLE_SETTING, "'default' can only appear once", h))), f.forEach((h) => {
-            Un(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));
+          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));
           });
           break;
         default:
-          f.forEach((h) => i.push(new c(o.UNKNOWN_COLUMN_SETTING, `Unknown column setting '${p}'`, h)));
+          f.forEach((h) => i.push(new l(o.UNKNOWN_COLUMN_SETTING, `Unknown column setting '${p}'`, h)));
       }
     }
     return i;
@@ -2328,97 +2342,162 @@ class xn {
     const n = e.flatMap((i) => {
       if (i.parent = this.declarationNode, !i.type)
         return [];
-      const r = re(i);
+      const r = ae(i);
       return new r(i, this.publicSymbolTable, this.symbolFactory).validate();
     }), s = e.filter((i) => {
       var r;
       return ((r = i.type) == null ? void 0 : r.value.toLowerCase()) === "note";
     });
-    return s.length > 1 && (n.push(...s.map((i) => new c(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n.push()), n;
+    return s.length > 1 && n.push(...s.map((i) => new l(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n;
   }
 }
-function Sn(t) {
-  if (!(t instanceof H || Je(t) || t instanceof U || t instanceof ue))
+function On(t) {
+  if (!(t instanceof H || Je(t) || t instanceof U || t instanceof he))
     return !1;
   if (t instanceof H) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => he(n) || j(n) || me(n)))
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => fe(n) || $(n) || me(n)))
       return !1;
     t = t.callee;
   }
-  for (; t instanceof ue; ) {
-    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && he(n.name)))
+  for (; t instanceof he; ) {
+    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && fe(n.name)))
       return !1;
     t = t.array;
   }
-  const e = C(t).unwrap_or(void 0);
+  const e = W(t).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
-function On(t, e) {
+function Rn(t, e) {
   return e.length === 1 && t === e[0];
 }
-class Rn {
+class Dn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
   validate() {
-    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)];
+    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 A ? [new c(o.INVALID_TABLEGROUP_CONTEXT, "TableGroup must appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof v ? [new l(
+      o.INVALID_TABLEGROUP_CONTEXT,
+      "TableGroup must appear top-level",
+      this.declarationNode
+    )] : [];
   }
   validateName(e) {
-    return e ? ye(e) ? [] : [new c(o.INVALID_NAME, "A TableGroup name must be a single identifier", e)] : [new c(o.NAME_NOT_FOUND, "A TableGroup must have a name", this.declarationNode)];
+    return e ? ye(e) ? [] : [new l(
+      o.INVALID_NAME,
+      "A TableGroup name must be a single identifier",
+      e
+    )] : [new l(
+      o.NAME_NOT_FOUND,
+      "A TableGroup must have a name",
+      this.declarationNode
+    )];
   }
   validateAlias(e) {
-    return e ? [new c(o.UNEXPECTED_ALIAS, "A TableGroup shouldn't have an alias", e)] : [];
+    return e ? [new l(
+      o.UNEXPECTED_ALIAS,
+      "A TableGroup shouldn't have an alias",
+      e
+    )] : [];
   }
   registerElement() {
     const { name: e } = this.declarationNode;
-    this.declarationNode.symbol = this.symbolFactory.create(sn, { declaration: this.declarationNode, symbolTable: new we() });
-    const n = C(e);
+    this.declarationNode.symbol = this.symbolFactory.create(rn, { 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 c(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists`, e)];
+        return [new l(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists`, e)];
       r.set(a, this.declarationNode.symbol);
     }
     return [];
   }
   validateSettingList(e) {
-    return e ? [new c(o.UNEXPECTED_SETTINGS, "A TableGroup shouldn't have a setting list", e)] : [];
+    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
+          )));
+          break;
+        case "note":
+          r.length > 1 && s.push(...r.map((c) => new l(
+            o.DUPLICATE_TABLE_SETTING,
+            "'note' can only appear once",
+            c
+          ))), r.filter((c) => !$(c.value)).forEach((c) => {
+            s.push(new l(
+              o.INVALID_TABLE_SETTING,
+              "'note' must be a string literal",
+              c.value || c.name
+            ));
+          });
+          break;
+        default:
+          s.push(...r.map((c) => new l(
+            o.INVALID_TABLE_SETTING,
+            `Unknown '${a}' setting`,
+            c
+          )));
+          break;
+      }
+    }), s;
   }
   validateBody(e) {
     if (!e)
       return [];
     if (e instanceof y)
-      return [new c(o.UNEXPECTED_SIMPLE_BODY, "A TableGroup's body must be a block", e)];
+      return [new l(
+        o.UNEXPECTED_SIMPLE_BODY,
+        "A TableGroup's body must be a block",
+        e
+      )];
     const [n, s] = I.partition(e.body, (i) => i instanceof y);
-    return [...this.validateFields(n), ...this.validateSubElements(s)];
+    return [
+      ...this.validateFields(n),
+      ...this.validateSubElements(s)
+    ];
   }
   validateFields(e) {
     return e.flatMap((n) => {
       const s = [];
-      return n.callee && !C(n.callee).isOk() && s.push(new c(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", n.callee)), this.registerField(n), n.args.length > 0 && s.push(...n.args.map((i) => new c(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
+      return n.callee && !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;
     });
   }
   validateSubElements(e) {
-    return e.flatMap((n) => {
-      if (n.parent = this.declarationNode, !n.type)
+    const n = e.flatMap((i) => {
+      if (i.parent = this.declarationNode, !i.type)
         return [];
-      const s = re(n);
-      return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
+      const r = ae(i);
+      return new r(i, this.publicSymbolTable, this.symbolFactory).validate();
+    }), s = e.filter((i) => {
+      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;
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const n = V(e.callee).unwrap(), s = He(n), i = this.symbolFactory.create(rn, { declaration: e });
+      const n = C(e.callee).unwrap(), s = He(n), i = this.symbolFactory.create(an, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
         const a = r.get(s);
         return [
-          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)
+          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)
         ];
       }
       r.set(s, i);
@@ -2427,34 +2506,34 @@ class Rn {
   }
 }
 const wt = ["-", "+"];
-function re(t) {
+function ae(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
-      return _n;
+      return An;
     case b.Table:
-      return xn;
+      return Sn;
     case b.TableGroup:
-      return Rn;
+      return Dn;
     case b.Project:
-      return wn;
-    case b.Ref:
       return yn;
+    case b.Ref:
+      return kn;
     case b.Note:
-      return vn;
+      return wn;
     case b.Indexes:
-      return An;
+      return vn;
     default:
-      return gn;
+      return _n;
   }
 }
 function yt(t) {
-  return !!C(t).unwrap_or(!1);
+  return !!W(t).unwrap_or(!1);
 }
-function Dn(t) {
+function Pn(t) {
   return ye(t);
 }
 function ye(t) {
-  return t instanceof U && t.expression instanceof Z;
+  return t instanceof U && t.expression instanceof K;
 }
 function Ze(t, e, n) {
   var i;
@@ -2462,14 +2541,14 @@ function Ze(t, e, n) {
   let s = e;
   for (const r of t) {
     let a;
-    const u = je(r);
-    if (s.has(u)) {
-      if (a = (i = s.get(u)) == null ? void 0 : i.symbolTable, !a)
+    const c = je(r);
+    if (s.has(c)) {
+      if (a = (i = s.get(c)) == null ? void 0 : i.symbolTable, !a)
         throw new Error("Expect a symbol table in a schema symbol");
     } else {
       a = new we();
       const p = n.create(_t, { symbolTable: a });
-      s.set(u, p);
+      s.set(c, p);
     }
     s = a;
   }
@@ -2478,55 +2557,55 @@ function Ze(t, e, n) {
 function kt(t) {
   return t === "-" || t === "<>" || t === ">" || t === "<";
 }
-function Pn(t) {
+function Un(t) {
   var n;
-  if (!(t instanceof U) || !(t.expression instanceof be) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== l.COLOR_LITERAL)
+  if (!(t instanceof U) || !(t.expression instanceof be) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
     return !1;
   const e = t.expression.literal.value;
   if (e.length !== 4 && e.length !== 7 || e[0] !== "#")
     return !1;
   for (let s = 1; s < e.length; s += 1)
-    if (!Zt(e[s]))
+    if (!Kt(e[s]))
       return !1;
   return !0;
 }
-function le(t) {
+function ue(t) {
   return t === void 0;
 }
-function Un(t) {
+function Mn(t) {
   var e;
-  return !!(j(t) || he(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) && he(t.expression) || t instanceof te);
+  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);
 }
-function he(t) {
+function fe(t) {
   var e;
-  return t instanceof U && t.expression instanceof be && ((e = t.expression.literal) == null ? void 0 : e.kind) === l.NUMERIC_LITERAL;
+  return t instanceof U && t.expression instanceof be && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
 }
-function Mn(t) {
+function Fn(t) {
   var n;
   if (!(t instanceof Q) || !kt((n = t.op) == null ? void 0 : n.value))
     return !1;
-  const e = C(t.expression).unwrap_or(void 0);
+  const e = W(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
 function xt(t) {
-  return t instanceof J && t.elementList.every(M);
+  return t instanceof Z && t.elementList.every(M);
 }
-function W(t) {
+function B(t) {
   var s;
   const e = {}, n = [];
   if (!t)
-    return new B({});
+    return new V({});
   for (const i of t.elementList) {
     if (!i.name)
       continue;
     if (i.name instanceof U) {
-      n.push(new c(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
+      n.push(new l(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
       continue;
     }
     const r = (s = Te(i.name).unwrap_or(void 0)) == null ? void 0 : s.toLowerCase();
     r && (e[r] === void 0 ? e[r] = [i] : e[r].push(i));
   }
-  return new B(e, n);
+  return new V(e, n);
 }
 class ft {
   constructor(e, n) {
@@ -2539,7 +2618,7 @@ class ft {
     this.ast.body.forEach((s) => {
       if (s.parent = this.ast, s.type === void 0)
         return;
-      const i = re(s), r = new i(
+      const i = ae(s), r = new i(
         s,
         this.publicSchemaSymbol.symbolTable,
         this.symbolFactory
@@ -2547,10 +2626,10 @@ 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 c(o.PROJECT_REDEFINED, "Only one project can exist", s))), new B(this.ast, e);
+    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);
   }
 }
-class ae {
+class oe {
   constructor(e, n) {
     this.declarationNode = e, this.errors = n;
   }
@@ -2574,9 +2653,9 @@ class ae {
     if (!e.body)
       return;
     const { body: n } = e;
-    if (n instanceof ne)
+    if (n instanceof J)
       for (const s of n.body)
-        if (s instanceof A) {
+        if (s instanceof v) {
           if (!s.type)
             continue;
           const i = St(s);
@@ -2598,11 +2677,11 @@ class ae {
     var s, i;
     if (e)
       if (e instanceof U) {
-        if (e.expression instanceof Z && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
+        if (e.expression instanceof K && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
           return;
         this.bindFragments([e], n);
       } else
-        e instanceof q ? Je(e) ? this.bindFragments(fe(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof Q ? this.scanAndBind(e.expression, n) : e instanceof Ue ? this.scanAndBind(e.expression, n) : e instanceof J && e.elementList.forEach((r) => this.scanAndBind(r, n));
+        e instanceof q ? Je(e) ? this.bindFragments(pe(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof Q ? this.scanAndBind(e.expression, n) : e instanceof Ue ? this.scanAndBind(e.expression, n) : e instanceof Z && e.elementList.forEach((r) => this.scanAndBind(r, n));
   }
   // Bind the fragments of a member access expression
   // which can be a simple expression like v1.User,
@@ -2610,7 +2689,7 @@ class ae {
   bindFragments(e, n) {
     if (e.length === 0)
       return;
-    const s = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: i } = n, r = e.findIndex((h) => !M(h)), u = 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)), c = r !== -1 && xt(e[r]) ? e[r] : void 0, p = r >= 0 ? s.pop() : void 0, f = e.slice(
       0,
       r === -1 ? void 0 : r
     );
@@ -2618,26 +2697,26 @@ class ae {
       return;
     const E = [];
     for (; s.length && f.length; ) {
-      const h = s.pop(), m = f.pop(), g = V(m).unwrap();
+      const h = s.pop(), m = f.pop(), g = C(m).unwrap();
       E.unshift({
         index: Ve(g, h),
         referrer: m
       });
     }
     for (; f.length; ) {
-      const h = f.pop(), m = V(h).unwrap();
+      const h = f.pop(), m = C(h).unwrap();
       E.unshift({
         index: Ve(m, i),
         referrer: h
       });
     }
-    return u ? u.elementList.forEach(
+    return c ? c.elementList.forEach(
       (h) => this.resolveIndexStack(
         [
           ...E,
           {
             index: Ve(
-              V(h).unwrap(),
+              C(h).unwrap(),
               p
             ),
             referrer: h
@@ -2652,34 +2731,34 @@ class ae {
   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 = Ln(s.index, this.declarationNode);
+    const [s, ...i] = e, r = gn(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: u, name: p } = ie(s.index).unwrap();
+    let a = r.symbolTable, { kind: c, 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,
-          `${u} '${p}' does not have ${E} '${h}'`,
+          `${c} '${p}' does not have ${E} '${h}'`,
           n
         );
         return;
       }
-      if (u = E, p = h, f.referrer.referee = m, m.references.push(f.referrer), !m.symbolTable)
+      if (c = 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 c(o.BINDING_ERROR, n, e));
+    s || this.errors.push(new l(o.BINDING_ERROR, n, e));
   }
 }
-class Fn extends ae {
+class Bn extends oe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2689,7 +2768,7 @@ class Fn extends ae {
     }, this.settingList = {};
   }
 }
-class Bn extends ae {
+class Vn extends oe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2699,7 +2778,7 @@ class Bn extends ae {
     }, this.settingList = {};
   }
 }
-class Vn extends ae {
+class Gn extends oe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2734,7 +2813,7 @@ class Vn extends ae {
     }, this.settingList = {};
   }
 }
-class Gn extends ae {
+class Cn extends oe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2744,7 +2823,7 @@ class Gn extends ae {
     }, this.settingList = {};
   }
 }
-class Cn extends ae {
+class Xn extends oe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2754,7 +2833,7 @@ class Cn extends ae {
     }, this.settingList = {};
   }
 }
-class Xn extends ae {
+class $n extends oe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2771,7 +2850,7 @@ class Xn extends ae {
     }, this.settingList = {};
   }
 }
-class $n extends ae {
+class Wn extends oe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2799,7 +2878,7 @@ class $n extends ae {
     }, this.settingList = {};
   }
 }
-class Wn extends ae {
+class jn extends oe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2819,24 +2898,24 @@ class Wn extends ae {
 function St(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
-      return Bn;
+      return Vn;
     case b.Table:
-      return $n;
-    case b.TableGroup:
       return Wn;
+    case b.TableGroup:
+      return jn;
     case b.Project:
-      return Cn;
-    case b.Ref:
       return Xn;
+    case b.Ref:
+      return $n;
     case b.Note:
-      return Gn;
+      return Cn;
     case b.Indexes:
-      return Vn;
+      return Gn;
     default:
-      return Fn;
+      return Bn;
   }
 }
-class jn {
+class Yn {
   constructor(e) {
     this.ast = e, this.errors = [];
   }
@@ -2846,10 +2925,10 @@ class jn {
         const n = St(e);
         new n(e, this.errors).bind();
       }
-    return new B(this.ast, this.errors);
+    return new V(this.ast, this.errors);
   }
 }
-class Yn {
+class zn {
   constructor(e) {
     this.generator = e;
   }
@@ -2857,17 +2936,17 @@ class Yn {
     return new e(n, this.generator.nextId());
   }
 }
-class zn {
+class Qn {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = new Yn(n);
+    this.ast = e, this.symbolFactory = new zn(n);
   }
   // Analyzing: Invoking both the validator and binder
   analyze() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new jn(n).resolve());
+    return new ft(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 B(n, []));
+    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new V(n, []));
   }
 }
 function pt(t, e) {
@@ -2903,7 +2982,7 @@ function Ot(t) {
   }
   throw new Error("Invalid relation op");
 }
-function v(t) {
+function A(t) {
   return {
     start: {
       offset: t.startPos.offset,
@@ -2915,11 +2994,11 @@ function v(t) {
 }
 function $e(t) {
   var n;
-  const e = (n = fe(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
-  return e instanceof J ? e.elementList.map((s) => s.referee) : [e.referee];
+  const e = (n = pe(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
+  return e instanceof Z ? e.elementList.map((s) => s.referee) : [e.referee];
 }
 function Ie(t) {
-  const e = C(t).unwrap();
+  const e = W(t).unwrap();
   return {
     name: e.pop(),
     schemaName: e
@@ -2939,12 +3018,12 @@ function Dt(t, e) {
 function Pt(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, u]) => a === u);
+    return I.zip(i, r).every(([a, c]) => a === c);
   }
   const n = t.id, s = e.id;
   return n === s;
 }
-function Ne(t) {
+function re(t) {
   const e = t.split(`
 `), n = e.slice(e.findIndex((r) => r.trimStart() !== "")), s = n.filter((r) => r.trimStart()), i = Math.min(...s.map((r) => r.length - r.trimStart().length));
   return n.map((r) => r.slice(i)).join(`
@@ -2955,7 +3034,7 @@ class Ut {
     this.declarationNode = e, this.env = n, this.table = { name: void 0, schemaName: void 0, alias: null, fields: [], token: void 0, indexes: [] }, this.pkColumns = [];
   }
   interpret() {
-    this.table.token = v(this.declarationNode), this.env.tables.set(this.declarationNode, this.table);
+    this.table.token = A(this.declarationNode), this.env.tables.set(this.declarationNode, this.table);
     const e = [
       ...this.interpretName(this.declarationNode.name),
       ...this.interpretAlias(this.declarationNode.alias),
@@ -2975,12 +3054,12 @@ 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 c(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 l(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.table.name = n, this.table.schemaName = s.length ? s[0] : null, []);
   }
   interpretAlias(e) {
     if (!e)
       return [];
-    const n = V(e).unwrap_or(null);
+    const n = C(e).unwrap_or(null);
     return n && (this.env.aliases.push({
       name: n,
       kind: "table",
@@ -2992,12 +3071,12 @@ class Ut {
   }
   interpretSettingList(e) {
     var i, r, a;
-    const n = W(e).getValue();
+    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;
     const [s] = n.note || [];
     return this.table.note = s && {
-      value: z(s == null ? void 0 : s.value).map(Ne).unwrap(),
-      token: v(s)
+      value: G(s == null ? void 0 : s.value).map(re).unwrap(),
+      token: A(s)
     }, [];
   }
   interpretBody(e) {
@@ -3010,8 +3089,8 @@ class Ut {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: z(n.body instanceof ne ? n.body.body[0].callee : n.body.callee).map(Ne).unwrap(),
-            token: v(n)
+            value: G(n.body instanceof J ? n.body.body[0].callee : n.body.callee).map(re).unwrap(),
+            token: A(n)
           }, [];
         case "indexes":
           return this.interpretIndexes(n);
@@ -3023,85 +3102,85 @@ class Ut {
     return e.flatMap((n) => this.interpretColumn(n));
   }
   interpretColumn(e) {
-    var a, u, p, f, E, h, m, g;
+    var a, c, p, f, E, h, m, g;
     const n = [], s = {};
-    s.name = V(e.callee).unwrap();
-    const i = Qn(e.args[0]);
-    s.type = i.getValue(), n.push(...i.getErrors()), s.token = v(e), s.inline_refs = [];
+    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) {
-      const _ = W(r.pop()).getValue();
-      s.pk = !!((a = _.pk) != null && a.length) || !!((u = _["primary key"]) != null && u.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 = qn((m = (h = _.default) == null ? void 0 : h.at(0)) == null ? void 0 : m.value);
-      const K = (g = _.note) == null ? void 0 : g.at(0);
-      s.note = K && {
-        value: z(K.value).map(Ne).unwrap(),
-        token: v(K)
+      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);
+      const ee = (g = _.note) == null ? void 0 : g.at(0);
+      s.note = ee && {
+        value: G(ee.value).map(re).unwrap(),
+        token: A(ee)
       };
-      const oe = _.ref || [];
-      s.inline_refs = oe.flatMap((Y) => {
-        const [tt] = $e(Y.value.expression);
+      const le = _.ref || [];
+      s.inline_refs = le.flatMap((z) => {
+        const [tt] = $e(z.value.expression);
         if (Pt(tt, e.symbol))
-          return n.push(new c(o.SAME_ENDPOINT, "Two endpoints are the same", Y)), [];
-        const ke = Y.value.op, ee = C(Y.value.expression).unwrap();
-        let pe;
-        if (ee.length === 1) {
-          const [ce] = ee;
-          pe = {
+          return n.push(new l(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) {
+          const [ce] = te;
+          de = {
             schemaName: this.table.schemaName,
             tableName: this.table.name,
             fieldNames: [ce],
             relation: ke.value,
-            token: v(Y)
+            token: A(z)
           };
-        } else if (ee.length === 2) {
-          const [ce, Le] = ee;
-          pe = {
+        } else if (te.length === 2) {
+          const [ce, Le] = te;
+          de = {
             schemaName: null,
             tableName: ce,
             fieldNames: [Le],
             relation: ke.value,
-            token: v(Y)
+            token: A(z)
           };
-        } else if (ee.length === 3) {
-          const [ce, Le, st] = ee;
-          pe = {
+        } else if (te.length === 3) {
+          const [ce, Le, st] = te;
+          de = {
             schemaName: ce,
             tableName: Le,
             fieldNames: [st],
             relation: ke.value,
-            token: v(Y)
+            token: A(z)
           };
         } else {
-          n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", Y));
-          const ce = ee.pop(), Le = ee.pop();
-          pe = {
-            schemaName: ee.join("."),
+          n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", z));
+          const ce = te.pop(), Le = te.pop();
+          de = {
+            schemaName: te.join("."),
             tableName: Le,
             fieldNames: [ce],
             relation: ke.value,
-            token: v(Y)
+            token: A(z)
           };
         }
-        const nt = this.registerInlineRefToEnv(e, tt, pe, Y);
-        return n.push(...nt), nt.length === 0 ? pe : [];
+        const nt = this.registerInlineRefToEnv(e, tt, de, z);
+        return n.push(...nt), nt.length === 0 ? de : [];
       });
     }
-    return s.pk || (s.pk = r.some((_) => X(_).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((_) => X(_).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
+    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, u, p, f, E, h, m;
+      var a, c, p, f, E, h, m;
       const s = { columns: [] }, i = n;
-      s.token = v(e);
+      s.token = A(i);
       const r = [i.callee, ...i.args];
       if (I.last(r) instanceof D) {
-        const g = W(r.pop()).getValue();
-        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((u = g.unique) != null && u.length), s.name = z((f = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : f.value).unwrap_or(void 0);
+        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);
         const _ = (E = g.note) == null ? void 0 : E.at(0);
         s.note = _ && {
-          value: z(_.value).unwrap(),
-          token: v(_)
-        }, s.type = X((m = (h = g.type) == null ? void 0 : h.at(0)) == null ? void 0 : m.value).unwrap_or(void 0);
+          value: G(_.value).unwrap(),
+          token: A(_)
+        }, s.type = j((m = (h = g.type) == null ? void 0 : h.at(0)) == null ? void 0 : m.value).unwrap_or(void 0);
       }
       return r.flatMap((g) => {
         if (!(g instanceof H))
@@ -3111,17 +3190,17 @@ class Ut {
           _.push(g.argumentList), g = g.callee;
         return _.push(g), _;
       }).forEach((g) => {
-        const { functional: _, nonFunctional: K } = Xe(g).unwrap();
+        const { functional: _, nonFunctional: ee } = Xe(g).unwrap();
         s.columns.push(
-          ..._.map((oe) => ({
-            value: oe.value.value,
+          ..._.map((le) => ({
+            value: le.value.value,
             type: "expression",
-            token: v(oe)
+            token: A(le)
           })),
-          ...K.map((oe) => ({
-            value: V(oe).unwrap(),
+          ...ee.map((le) => ({
+            value: C(le).unwrap(),
             type: "column",
-            token: v(oe)
+            token: A(le)
           }))
         );
       }), s;
@@ -3131,8 +3210,8 @@ class Ut {
     const r = Dt(e.symbol, n);
     if (this.env.refIds[r])
       return [
-        new c(o.CIRCULAR_REF, "References with same endpoints exist", i),
-        new c(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[r])
+        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])
       ];
     const a = Ot(s.relation);
     return this.env.refIds[r] = i, this.env.ref.set(i, {
@@ -3147,43 +3226,43 @@ class Ut {
         {
           schemaName: this.table.schemaName,
           tableName: this.table.name,
-          fieldNames: [X(e.callee).unwrap()],
-          token: v(e),
+          fieldNames: [j(e.callee).unwrap()],
+          token: A(e),
           relation: a[0]
         }
       ]
     }), [];
   }
 }
-function Qn(t) {
+function qn(t) {
   let e = null;
-  t instanceof H && (e = t.argumentList.elementList.map((r) => he(r) ? r.expression.literal.value : j(r) ? z(r).unwrap() : X(r).unwrap()).join(","), t = t.callee);
+  t instanceof H && (e = t.argumentList.elementList.map((r) => fe(r) ? r.expression.literal.value : $(r) ? G(r).unwrap() : j(r).unwrap()).join(","), t = t.callee);
   let n = "";
-  for (; t instanceof ue; )
+  for (; t instanceof he; )
     n = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${n}`, t = t.array;
   const { name: s, schemaName: i } = Ie(t);
-  return i.length > 1 ? new B(
+  return i.length > 1 ? new V(
     {
       schemaName: i.length === 0 ? null : i[0],
       type_name: `${s}${n}${e ? `(${e})` : ""}`,
       args: e
     },
-    [new c(o.UNSUPPORTED, "Nested schema is not supported", t)]
-  ) : new B({
+    [new l(o.UNSUPPORTED, "Nested schema is not supported", t)]
+  ) : new V({
     schemaName: i.length === 0 ? null : i[0],
     type_name: `${s}${n}${e ? `(${e})` : ""}`,
     args: e
   });
 }
-function qn(t) {
+function Hn(t) {
   var e, n, s;
   if (t) {
-    if (j(t))
+    if ($(t))
       return {
-        value: z(t).unwrap(),
+        value: G(t).unwrap(),
         type: "string"
       };
-    if (he(t))
+    if (fe(t))
       return {
         type: "number",
         value: Number.parseFloat(t.expression.literal.value)
@@ -3193,14 +3272,14 @@ function qn(t) {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
       };
-    if (t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && he(t.expression)) {
+    if (t instanceof Q && wt.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,
         type: "number"
       };
     }
-    if (t instanceof te)
+    if (t instanceof ne)
       return {
         value: (s = t.value) == null ? void 0 : s.value,
         type: "expression"
@@ -3208,12 +3287,12 @@ function qn(t) {
     throw new Error("Unreachable");
   }
 }
-class Hn {
+class Jn {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.note = { name: void 0, content: void 0, token: void 0 };
   }
   interpret() {
-    return this.note.token = v(this.declarationNode), this.env.notes.set(this.declarationNode, this.note), [
+    return this.note.token = A(this.declarationNode), this.env.notes.set(this.declarationNode, this.note), [
       ...this.interpretName(this.declarationNode.name),
       ...this.interpretSettingList(this.declarationNode.attributeList),
       ...this.interpretBody(this.declarationNode.body)
@@ -3225,30 +3304,30 @@ class Hn {
   }
   interpretSettingList(e) {
     var s, i, r;
-    const n = W(e).getValue();
+    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, [];
   }
   interpretBody(e) {
     const [n, s] = I.partition(e.body, (i) => i instanceof y);
     return n.length !== 1 || s.length > 0 ? [
-      new c(o.INVALID_NOTE, "Invalid note syntax", e)
+      new l(o.INVALID_NOTE, "Invalid note syntax", e)
     ] : [...this.interpretNote(n[0])];
   }
   interpretNote(e) {
     const n = I.get(e, "callee.expression.literal.value", "");
-    return this.note.content = Ne(n), [];
+    return this.note.content = re(n), [];
   }
 }
 class Mt {
   constructor(e, n) {
-    this.declarationNode = e, this.env = n, this.container = this.declarationNode.parent instanceof A ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
+    this.declarationNode = e, this.env = n, this.container = this.declarationNode.parent instanceof v ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
   }
   interpret() {
-    return this.ref.token = v(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.ref.token = A(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
-    const n = [], s = C(this.declarationNode.name).unwrap_or([]);
-    return this.ref.name = s.pop() || null, s.length > 1 && n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name)), this.ref.schemaName = s.join(".") || null, n;
+    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;
   }
   interpretBody(e) {
     return e instanceof y ? this.interpretField(e) : this.interpretField(e.body[0]);
@@ -3257,32 +3336,32 @@ class Mt {
     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 c(o.SAME_ENDPOINT, "Two endpoints are the same", e)];
-    const u = Dt(r, a);
-    if (this.env.refIds[u])
+      return [new l(o.SAME_ENDPOINT, "Two endpoints are the same", e)];
+    const c = Dt(r, a);
+    if (this.env.refIds[c])
       return [
-        new c(o.CIRCULAR_REF, "References with same endpoints exist", this.declarationNode),
-        new c(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[u])
+        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])
       ];
     if (e.args[0]) {
-      const g = W(e.args[0]).getValue(), _ = (E = (f = g.delete) == null ? void 0 : f.at(0)) == null ? void 0 : E.value;
-      this.ref.onDelete = _ instanceof $ ? Te(_).unwrap_or(void 0) : X(_).unwrap_or(void 0);
-      const K = (m = (h = g.update) == null ? void 0 : h.at(0)) == null ? void 0 : m.value;
-      this.ref.onUpdate = K instanceof $ ? Te(K).unwrap_or(void 0) : X(K).unwrap_or(void 0);
+      const g = B(e.args[0]).getValue(), _ = (E = (f = g.delete) == null ? void 0 : f.at(0)) == null ? void 0 : E.value;
+      this.ref.onDelete = _ instanceof Y ? Te(_).unwrap_or(void 0) : j(_).unwrap_or(void 0);
+      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);
     return this.ref.endpoints = [
       {
         ...pt(s, this.container),
         relation: p[0],
-        token: v(s)
+        token: A(s)
       },
       {
         ...pt(i, this.container),
         relation: p[1],
-        token: v(i)
+        token: A(i)
       }
-    ], this.env.refIds[u] = this.declarationNode, [];
+    ], this.env.refIds[c] = this.declarationNode, [];
   }
 }
 class Ft {
@@ -3291,24 +3370,48 @@ class Ft {
   }
   interpret() {
     const e = [];
-    return this.tableGroup.token = v(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup), e.push(
+    return this.tableGroup.token = A(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup), e.push(
       ...this.interpretName(this.declarationNode.name),
+      ...this.interpretSettingList(this.declarationNode.attributeList),
       ...this.interpretBody(this.declarationNode.body)
     ), e;
   }
   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 c(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 l(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);
+    return [
+      ...this.interpretFields(n),
+      ...this.interpretSubElements(s)
+    ];
+  }
+  interpretSubElements(e) {
+    return e.flatMap((n) => {
+      var s;
+      switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
+        case "note":
+          this.tableGroup.note = {
+            value: G(
+              n.body instanceof J ? n.body.body[0].callee : n.body.callee
+            ).map(re).unwrap(),
+            token: A(n)
+          };
+          break;
+      }
+      return [];
+    });
+  }
+  interpretFields(e) {
     const n = [];
-    return this.tableGroup.tables = this.declarationNode.body.body.map((s) => {
-      const i = C(s.callee).unwrap();
-      i.length > 2 && n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", s));
-      const r = fe(s.callee).unwrap().pop().referee.id;
+    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));
+      const r = pe(s.callee).unwrap().pop().referee.id;
       if (this.env.groupOfTable[r]) {
-        const a = this.env.groupOfTable[r], { schemaName: u, name: p } = this.env.tableGroups.get(a), f = u ? `${u}.${p}` : p;
-        n.push(new c(o.TABLE_REAPPEAR_IN_TABLEGROUP, `Table "${i.join(".")}" already appears in group "${f}"`, s));
+        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));
       } else
         this.env.groupOfTable[r] = this.declarationNode;
       return {
@@ -3317,37 +3420,44 @@ class Ft {
       };
     }), n;
   }
+  interpretSettingList(e) {
+    const n = B(e).getValue(), [s] = n.note || [];
+    return this.tableGroup.note = s && {
+      value: G(s == null ? void 0 : s.value).map(re).unwrap(),
+      token: A(s)
+    }, [];
+  }
 }
 class Bt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.enum = { values: [] };
   }
   interpret() {
-    return this.enum.token = v(this.declarationNode), this.env.enums.set(this.declarationNode, this.enum), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.enum.token = A(this.declarationNode), this.env.enums.set(this.declarationNode, this.enum), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
     const { name: n, schemaName: s } = Ie(e);
-    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, []);
+    return s.length > 1 ? (this.enum.name = n, this.enum.schemaName = s.join("."), [new l(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.enum.name = n, this.enum.schemaName = s.length ? s[0] : null, []);
   }
   interpretBody(e) {
     return e.body.flatMap((n) => {
-      var u;
+      var c;
       const s = n, i = {};
-      i.token = v(s), i.name = X(s.callee).unwrap();
-      const a = (u = W(s.args[0]).getValue().note) == null ? void 0 : u.at(0);
+      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);
       return i.note = a && {
-        value: z(a.value).map(Ne).unwrap(),
-        token: v(a)
+        value: G(a.value).map(re).unwrap(),
+        token: A(a)
       }, this.enum.values.push(i), [];
     });
   }
 }
-class Jn {
+class Zn {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.project = { enums: [], refs: [], tableGroups: [], tables: [] };
   }
   interpret() {
-    return this.env.project.set(this.declarationNode, this.project), this.project.token = v(this.declarationNode), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.env.project.set(this.declarationNode, this.project), this.project.token = A(this.declarationNode), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
     if (!e)
@@ -3378,16 +3488,16 @@ class Jn {
         }
         case "note":
           return this.project.note = {
-            value: z(s.body instanceof ne ? s.body.body[0].callee : s.body.callee).map(Ne).unwrap(),
-            token: v(s)
+            value: G(s.body instanceof J ? s.body.body[0].callee : s.body.callee).map(re).unwrap(),
+            token: A(s)
           }, [];
         default:
-          return this.project[s.type.value.toLowerCase()] = z(s.body.callee).unwrap(), [];
+          return this.project[s.type.value.toLowerCase()] = G(s.body.callee).unwrap(), [];
       }
     });
   }
 }
-class Zn {
+class Kn {
   constructor(e) {
     this.ast = e, this.env = {
       schema: [],
@@ -3408,7 +3518,7 @@ class Zn {
         case b.Table:
           return new Ut(n, this.env).interpret();
         case b.Note:
-          return new Hn(n, this.env).interpret();
+          return new Jn(n, this.env).interpret();
         case b.Ref:
           return new Mt(n, this.env).interpret();
         case b.TableGroup:
@@ -3416,15 +3526,15 @@ class Zn {
         case b.Enum:
           return new Bt(n, this.env).interpret();
         case b.Project:
-          return new Jn(n, this.env).interpret();
+          return new Zn(n, this.env).interpret();
         default:
           return [];
       }
     });
-    return new B(Kn(this.env), e);
+    return new V(es(this.env), e);
   }
 }
-function Kn(t) {
+function es(t) {
   return {
     schemas: [],
     tables: Array.from(t.tables.values()),
@@ -3436,7 +3546,7 @@ function Kn(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 || {}), k = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(k || {});
+var L = /* @__PURE__ */ ((t) => (t[t.Function = 1] = "Function", t[t.Constructor = 2] = "Constructor", t[t.Field = 3] = "Field", t[t.Variable = 4] = "Variable", t[t.Class = 5] = "Class", t[t.Struct = 6] = "Struct", t[t.Interface = 7] = "Interface", t[t.Module = 8] = "Module", t[t.Property = 9] = "Property", t[t.Event = 10] = "Event", t[t.Operator = 11] = "Operator", t[t.Unit = 12] = "Unit", t[t.Value = 13] = "Value", t[t.Constant = 14] = "Constant", t[t.Enum = 15] = "Enum", t[t.EnumMember = 16] = "EnumMember", t[t.Keyword = 17] = "Keyword", t[t.Text = 18] = "Text", t[t.Color = 19] = "Color", t[t.File = 20] = "File", t[t.Reference = 21] = "Reference", t[t.Customcolor = 22] = "Customcolor", t[t.Folder = 23] = "Folder", t[t.TypeParameter = 24] = "TypeParameter", t[t.User = 25] = "User", t[t.Issue = 26] = "Issue", t[t.Snippet = 27] = "Snippet", t))(L || {}), w = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(w || {});
 function Ae(t) {
   switch (t) {
     case T.Schema:
@@ -3463,12 +3573,12 @@ function De(t, e) {
   for (const n of t.trailingTrivia) {
     if (n.start > e)
       break;
-    if (n.kind === l.NEWLINE && n.end <= e)
+    if (n.kind === u.NEWLINE && n.end <= e)
       return !1;
   }
   return !0;
 }
-function O() {
+function R() {
   return {
     suggestions: []
   };
@@ -3500,19 +3610,19 @@ class Vt {
   }
   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), u = a === void 0 ? i[0] : i[a + 1];
+    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];
     if ([
       ...(r == null ? void 0 : r.trailingTrivia) || [],
       ...(r == null ? void 0 : r.leadingTrivia) || [],
-      ...(u == null ? void 0 : u.leadingTrivia) || []
-    ].find((m) => zt(m) && ge(s, m)))
-      return O();
+      ...(c == null ? void 0 : c.leadingTrivia) || []
+    ].find((m) => Qt(m) && ge(s, m)))
+      return R();
     if (a === void 0)
       return Tt();
-    if ([l.STRING_LITERAL, l.QUOTED_STRING].includes(r.kind) && ge(s, r))
-      return O();
+    if ([u.STRING_LITERAL, u.QUOTED_STRING].includes(r.kind) && ge(s, r))
+      return R();
     const p = this.compiler.container.element(s);
-    if (this.compiler.container.scopeKind(s) === R.TOPLEVEL || p instanceof A && p.type && p.type.start <= s && p.type.end >= s)
+    if (this.compiler.container.scopeKind(s) === O.TOPLEVEL || p instanceof v && p.type && p.type.start <= s && p.type.end >= s)
       return Tt();
     const f = [...this.compiler.container.stack(s)].reverse();
     for (const m of f)
@@ -3551,19 +3661,19 @@ class Vt {
           return Et(this.compiler, s, m);
         if (m instanceof D)
           return Et(this.compiler, s, m);
-        if (m instanceof J)
-          return es(this.compiler, s);
+        if (m instanceof Z)
+          return ts(this.compiler, s);
         if (m instanceof y)
           return mt(this.compiler, s, m);
-        if (m instanceof A && (m.bodyColon && s >= m.bodyColon.end || m.body && ge(s, m.body)))
+        if (m instanceof v && (m.bodyColon && s >= m.bodyColon.end || m.body && ge(s, m.body)))
           return mt(this.compiler, s, void 0);
       }
-    return O();
+    return R();
   }
 }
 function dt(t, e, n) {
   const s = t.container.scopeKind(e);
-  if ([R.REF, R.TABLE].includes(s)) {
+  if ([O.REF, O.TABLE].includes(s)) {
     const i = Be(t, e, t.container.element(e), [
       T.Table,
       T.Schema,
@@ -3571,38 +3681,38 @@ function dt(t, e, n) {
     ]);
     return De(n.op, e) ? Pe(i) : i;
   }
-  return O();
+  return R();
 }
 function Be(t, e, n, s) {
   var a;
   if (n === void 0)
-    return O();
+    return R();
   let i = n;
   const r = { suggestions: [] };
   for (; i; ) {
     if ((a = i == null ? void 0 : i.symbol) != null && a.symbolTable) {
-      const { symbol: u } = i;
+      const { symbol: c } = i;
       r.suggestions.push(
-        ...t.symbol.members(u).filter(({ kind: p }) => s.includes(p)).map(({ name: p, kind: f }) => ({
+        ...t.symbol.members(c).filter(({ kind: p }) => s.includes(p)).map(({ name: p, kind: f }) => ({
           label: p,
           insertText: p,
-          insertTextRules: k.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           kind: Ae(f),
           sortText: Ae(f).toString().padStart(2, "0"),
           range: void 0
         }))
       );
     }
-    i = i instanceof A ? i.parent : void 0;
+    i = i instanceof v ? i.parent : void 0;
   }
   return Fe(r);
 }
-function es(t, e) {
+function ts(t, e) {
   var s;
   switch (t.container.scopeKind(e)) {
-    case R.INDEXES:
+    case O.INDEXES:
       return Xt(t, e);
-    case R.REF:
+    case O.REF:
       {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
@@ -3617,100 +3727,112 @@ function es(t, e) {
       }
       return Ct(t, e);
   }
-  return O();
+  return R();
 }
 function Et(t, e, n) {
   const { token: s } = t.container.token(e);
-  if ([l.COMMA, l.LBRACKET].includes(s == null ? void 0 : s.kind)) {
+  if ([u.COMMA, u.LBRACKET].includes(s == null ? void 0 : s.kind)) {
     const i = Nt(t, e);
-    return (s == null ? void 0 : s.kind) === l.COMMA && De(s, e) ? Pe(i) : i;
+    return (s == null ? void 0 : s.kind) === u.COMMA && De(s, e) ? Pe(i) : i;
   }
   if (n.name && n.name.start <= e && n.name.end >= e)
     return Nt(t, e);
-  if (n.name instanceof $) {
-    const i = ts(
+  if (n.name instanceof Y) {
+    const i = ns(
       t,
       e,
       Te(n.name).unwrap_or("")
     );
-    return (s == null ? void 0 : s.kind) === l.COLON && De(s, e) ? Pe(i) : i;
+    return (s == null ? void 0 : s.kind) === u.COLON && De(s, e) ? Pe(i) : i;
   }
-  return O();
+  return R();
 }
 function Nt(t, e) {
   const n = t.container.element(e), s = t.container.scopeKind(e);
-  if (n instanceof G)
-    return O();
+  if (n instanceof X)
+    return R();
   if (n.body && !ge(e, n.body))
     switch (s) {
-      case R.TABLE:
+      case O.TABLE:
         return {
           suggestions: [
             {
               label: "headercolor",
               insertText: "headercolor: ",
               kind: L.Field,
-              insertTextRules: k.KeepWhitespace,
+              insertTextRules: w.KeepWhitespace,
               range: void 0
             },
             {
               label: "note",
               insertText: "note: ",
               kind: L.Field,
-              insertTextRules: k.KeepWhitespace,
+              insertTextRules: w.KeepWhitespace,
+              range: void 0
+            }
+          ]
+        };
+      case O.TABLEGROUP:
+        return {
+          suggestions: [
+            {
+              label: "note",
+              insertText: "note: ",
+              kind: L.Field,
+              insertTextRules: w.KeepWhitespace,
               range: void 0
             }
           ]
         };
       default:
-        return O();
+        return R();
     }
   switch (s) {
-    case R.TABLE:
+    case O.TABLE:
       return {
         suggestions: [
           ...["primary key", "null", "not null", "increment", "pk", "unique"].map((i) => ({
             label: i,
             insertText: i,
             kind: L.Property,
-            insertTextRules: k.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           })),
           ...["ref", "default"].map((i) => ({
             label: i,
             insertText: `${i}: `,
             kind: L.Property,
-            insertTextRules: k.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           })),
           {
             label: "note",
             insertText: "note: ",
             kind: L.Property,
-            insertTextRules: k.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }
         ]
       };
-    case R.ENUM:
+    case O.ENUM:
       return {
         suggestions: [
           {
             label: "note",
             insertText: "note: ",
             kind: L.Property,
-            insertTextRules: k.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }
         ]
       };
-    case R.INDEXES:
+    case O.INDEXES:
       return {
         suggestions: [
           ...["unique", "pk"].map((i) => ({
             label: i,
             insertText: i,
-            insertTextRules: k.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             kind: L.Property,
             range: void 0
           })),
@@ -3718,25 +3840,25 @@ function Nt(t, e) {
             label: i,
             insertText: `${i}: `,
             kind: L.Property,
-            insertTextRules: k.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }))
         ]
       };
-    case R.REF:
+    case O.REF:
       return {
         suggestions: ["update", "delete"].map((i) => ({
           label: i,
           insertText: `${i}: `,
           kind: L.Property,
-          insertTextRules: k.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
   }
-  return O();
+  return R();
 }
-function ts(t, e, n) {
+function ns(t, e, n) {
   switch (n == null ? void 0 : n.toLowerCase()) {
     case "update":
     case "delete":
@@ -3745,7 +3867,7 @@ function ts(t, e, n) {
           label: s,
           insertText: s,
           kind: L.Value,
-          insertTextRules: k.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
@@ -3755,18 +3877,18 @@ function ts(t, e, n) {
           label: s,
           insertText: `${s}`,
           kind: L.Value,
-          insertTextRules: k.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
   }
-  return O();
+  return R();
 }
 function Gt(t, e, n) {
-  const s = fe(n).unwrap_or([]);
+  const s = pe(n).unwrap_or([]);
   if (s.pop(), s.some((r) => !M(r)))
-    return O();
-  const i = s.map((r) => X(r).unwrap());
+    return R();
+  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 }) => ({
       label: a,
@@ -3779,22 +3901,22 @@ function Gt(t, e, n) {
 function mt(t, e, n) {
   var i;
   switch (t.container.scopeKind(e)) {
-    case R.TABLE:
-      return ss(t, e, n);
-    case R.PROJECT:
+    case O.TABLE:
       return is(t, e, n);
-    case R.INDEXES:
-      return as(t, e);
-    case R.ENUM:
-      return ns(t, e, n);
-    case R.REF: {
+    case O.PROJECT:
+      return rs(t, e, n);
+    case O.INDEXES:
+      return os(t, e);
+    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) === l.COLON && De(t.container.token(e).token, e) ? Pe(r) : r;
+      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && De(t.container.token(e).token, e) ? Pe(r) : r;
     }
-    case R.TABLEGROUP:
-      return rs(t);
+    case O.TABLEGROUP:
+      return as(t);
     default:
-      return O();
+      return R();
   }
 }
 function Tt() {
@@ -3802,26 +3924,26 @@ function Tt() {
     suggestions: ["Table", "TableGroup", "Enum", "Project", "Ref"].map((t) => ({
       label: t,
       insertText: t,
-      insertTextRules: k.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
   };
 }
-function ns(t, e, n) {
+function ss(t, e, n) {
   return n != null && n.callee && et(e, n) === 1 ? Be(t, e, t.container.element(e), [
     T.Schema,
     T.Table,
     T.Column
-  ]) : O();
+  ]) : R();
 }
-function ss(t, e, n) {
+function is(t, e, n) {
   if (!(n != null && n.callee))
     return {
       suggestions: ["Note", "indexes"].map((i) => ({
         label: i,
         insertText: i,
-        insertTextRules: k.KeepWhitespace,
+        insertTextRules: w.KeepWhitespace,
         kind: L.Keyword,
         range: void 0
       }))
@@ -3831,26 +3953,26 @@ function ss(t, e, n) {
     suggestions: ["Note", "indexes"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: k.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
-  } : s === 1 ? os(t, e) : O();
+  } : s === 1 ? ls(t, e) : R();
 }
-function is(t, e, n) {
+function rs(t, e, n) {
   return n != null && n.callee ? et(e, n) === 0 ? {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: k.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
-  } : O() : {
+  } : R() : {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: k.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
@@ -3863,27 +3985,38 @@ function Ct(t, e) {
     T.Column
   ]);
 }
-function rs(t) {
-  return Fe({
-    suggestions: [...t.parse.publicSymbolTable().entries()].flatMap(([e]) => {
-      const n = ie(e).unwrap_or(void 0);
-      if (n === void 0)
-        return [];
-      const { kind: s, name: i } = n;
-      return s !== T.Table && s !== T.Schema ? [] : {
-        label: i,
-        insertText: i,
-        insertTextRules: k.KeepWhitespace,
-        kind: Ae(s),
+function as(t) {
+  return {
+    suggestions: [
+      ...Fe({
+        suggestions: [...t.parse.publicSymbolTable().entries()].flatMap(([e]) => {
+          const n = ie(e).unwrap_or(void 0);
+          if (n === void 0)
+            return [];
+          const { kind: s, name: i } = n;
+          return s !== T.Table && s !== T.Schema ? [] : {
+            label: i,
+            insertText: i,
+            insertTextRules: w.KeepWhitespace,
+            kind: Ae(s),
+            range: void 0
+          };
+        })
+      }).suggestions,
+      ...["Note"].map((e) => ({
+        label: e,
+        insertText: e,
+        insertTextRules: w.KeepWhitespace,
+        kind: L.Keyword,
         range: void 0
-      };
-    })
-  });
+      }))
+    ]
+  };
 }
-function as(t, e) {
+function os(t, e) {
   return Xt(t, e);
 }
-function os(t, e) {
+function ls(t, e) {
   return {
     suggestions: [
       ...[
@@ -3946,7 +4079,7 @@ function os(t, e) {
       ].map((n) => ({
         label: n,
         insertText: n,
-        insertTextRules: k.KeepWhitespace,
+        insertTextRules: w.KeepWhitespace,
         kind: L.TypeParameter,
         sortText: L.TypeParameter.toString().padStart(2, "0"),
         range: void 0
@@ -3961,18 +4094,18 @@ function os(t, e) {
 function Xt(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 O();
+    return R();
   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: u } = a;
+      const { name: c } = a;
       return {
-        label: u,
-        insertText: u,
-        insertTextRules: k.KeepWhitespace,
+        label: c,
+        insertText: c,
+        insertTextRules: w.KeepWhitespace,
         kind: Ae(T.Column),
         range: void 0
       };
@@ -3993,9 +4126,9 @@ class $t {
     var a;
     const { uri: s } = e, i = Ke(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
-      const u = r.pop();
-      if ((a = u == null ? void 0 : u.referee) != null && a.declaration && [Ee.PRIMARY_EXPRESSION, Ee.VARIABLE].includes(u == null ? void 0 : u.kind)) {
-        const { startPos: p, endPos: f } = u.referee.declaration;
+      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;
         return [
           {
             range: {
@@ -4021,13 +4154,13 @@ class Wt {
     for (; r.length !== 0; ) {
       const a = r.pop();
       if (a && [
-        Ee.ELEMENT_DECLARATION,
-        Ee.FUNCTION_APPLICATION,
-        Ee.PRIMARY_EXPRESSION
+        Ne.ELEMENT_DECLARATION,
+        Ne.FUNCTION_APPLICATION,
+        Ne.PRIMARY_EXPRESSION
       ].includes(a == null ? void 0 : a.kind)) {
-        const { symbol: u } = a;
-        if (u != null && u.references.length)
-          return u.references.map(({ startPos: p, endPos: f }) => ({
+        const { symbol: c } = a;
+        if (c != null && c.references.length)
+          return c.references.map(({ startPos: p, endPos: f }) => ({
             range: {
               startColumn: p.column + 1,
               startLineNumber: p.line + 1,
@@ -4041,21 +4174,21 @@ class Wt {
     return [];
   }
 }
-const us = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const hs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  CompletionItemInsertTextRule: k,
+  CompletionItemInsertTextRule: w,
   CompletionItemKind: L,
   DBMLCompletionItemProvider: Vt,
   DBMLDefinitionProvider: $t,
   DBMLReferencesProvider: Wt
 }, Symbol.toStringTag, { value: "Module" }));
-var R = /* @__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))(R || {});
-class hs {
+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 {
   constructor() {
     this.source = "", this.cache = new Array(
       16
       /* TOTAL_QUERY_COUNT */
-    ).fill(null), this.nodeIdGenerator = new Qt(), this.symbolIdGenerator = new Kt(), this.token = {
+    ).fill(null), this.nodeIdGenerator = new qt(), this.symbolIdGenerator = new en(), this.token = {
       invalidStream: this.createQuery(
         6,
         () => this.parse.tokens().filter(vt)
@@ -4070,8 +4203,8 @@ class hs {
       _: this.createQuery(
         0,
         () => {
-          const e = new un(this.source).lex().chain((n) => new pn(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new zn(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
-          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new Zn(n).interpret().map((r) => ({ ast: n, tokens: s, rawDb: r })));
+          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 })));
+          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new Kn(n).interpret().map((r) => ({ ast: n, tokens: s, rawDb: r })));
         }
       ),
       ast: this.createQuery(
@@ -4095,19 +4228,19 @@ class hs {
       stack: this.createQuery(
         10,
         (e) => {
-          const n = this.token.flatStream(), { index: s, token: i } = this.container.token(e), r = s === void 0 ? -1 : jt(n, (f) => !f.isInvalid, s);
+          const n = this.token.flatStream(), { index: s, token: i } = this.container.token(e), r = s === void 0 ? -1 : Yt(n, (f) => !f.isInvalid, s);
           if (r === -1)
             return [this.parse.ast()];
           const a = n[r].start;
-          let u = this.parse.ast();
-          const p = [u];
+          let c = this.parse.ast();
+          const p = [c];
           for (; ; ) {
-            const E = ln(u).find((h) => ge(a, h));
+            const E = un(c).find((h) => ge(a, h));
             if (E === void 0 || E instanceof F)
               break;
-            p.push(E), u = E;
+            p.push(E), c = E;
           }
-          if ((i == null ? void 0 : i.kind) === l.COLON)
+          if ((i == null ? void 0 : i.kind) === u.COLON)
             return p;
           for (; p.length > 0; ) {
             let f = !1;
@@ -4118,10 +4251,10 @@ class hs {
                 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 J ? E.tupleCloseParen && E.end <= e && (p.pop(), f = !0) : E instanceof ne ? E.blockCloseBrace && E.end <= e && (p.pop(), f = !0) : E instanceof $ || 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 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);
             if (f) {
               const h = it(p);
-              h instanceof A && h.end <= e && p.pop();
+              h instanceof v && h.end <= e && p.pop();
             }
             if (!f)
               break;
@@ -4144,7 +4277,7 @@ class hs {
         (e) => {
           const n = this.container.stack(e);
           for (let s = n.length - 1; s >= 0; s -= 1)
-            if (n[s] instanceof A)
+            if (n[s] instanceof v)
               return n[s];
           return this.parse.ast();
         }
@@ -4158,7 +4291,7 @@ class hs {
       ),
       scopeKind: this.createQuery(15, (e) => {
         var s;
-        if (this.container.element(e) instanceof G)
+        if (this.container.element(e) instanceof X)
           return 8;
         switch ((s = this.container.element(e).type) == null ? void 0 : s.value.toLowerCase()) {
           case "table":
@@ -4194,18 +4327,18 @@ class hs {
           if (e.length === 0)
             return [];
           const s = [];
-          for (let r = n; r; r = r instanceof A ? r.parent : void 0) {
+          for (let r = n; r; r = r instanceof v ? r.parent : void 0) {
             if (!((i = r.symbol) != null && i.symbolTable))
               continue;
             const { symbolTable: a } = r.symbol;
-            let u = [a], p = [];
+            let c = [a], p = [];
             for (const f of e)
-              p = u.flatMap(
-                (E) => Jt(f).flatMap((h) => {
+              p = c.flatMap(
+                (E) => Zt(f).flatMap((h) => {
                   const m = E.get(h), g = ie(h).unwrap_or(void 0);
                   return !m || !g ? [] : { ...g, symbol: m };
                 })
-              ), u = p.flatMap(
+              ), c = p.flatMap(
                 (E) => E.symbol.symbolTable ? E.symbol.symbolTable : []
               );
             s.push(...p);
@@ -4232,8 +4365,8 @@ class hs {
         if (r.has(a))
           return r.get(a);
       }
-      const u = n(i);
-      return i !== void 0 ? r instanceof Map ? r.set(a, u) : (this.cache[e] = /* @__PURE__ */ new Map(), this.cache[e].set(a, u)) : this.cache[e] = u, u;
+      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;
     };
   }
   setSource(e) {
@@ -4251,7 +4384,7 @@ class hs {
   }
 }
 export {
-  hs as Compiler,
-  ls as serialize,
-  us as services
+  fs as Compiler,
+  us as serialize,
+  hs as services
 };