@dbml/parse 3.1.5-alpha.0 → 3.1.6

package/dist/dbml-parse.mjs

@@ -1,6 +1,6 @@
 import I from "lodash";
-var u = /* @__PURE__ */ ((t) => (t.SPACE = "<space>", t.TAB = "<tab>", t.NEWLINE = "<newline>", t.COMMA = "<comma>", t.LPAREN = "<lparen>", t.RPAREN = "<rparen>", t.LBRACE = "<lbrace>", t.RBRACE = "<rbrace>", t.LBRACKET = "<lbracket>", t.RBRACKET = "<rbracket>", t.LANGLE = "<langle>", t.RANGLE = "<rangle>", t.OP = "<op>", t.EOF = "<eof>", t.NUMERIC_LITERAL = "<number>", t.STRING_LITERAL = "<string>", t.COLOR_LITERAL = "<color>", t.FUNCTION_EXPRESSION = "<function-expression>", t.QUOTED_STRING = "<variable>", t.IDENTIFIER = "<identifier>", t.SEMICOLON = "<semicolon>", t.COLON = "<colon>", t.SINGLE_LINE_COMMENT = "<single-line-comment>", t.MULTILINE_COMMENT = "<multiline-comment>", t))(u || {});
-function $t(t) {
+var c = /* @__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))(c || {});
+function Xt(t) {
   switch (t.kind) {
     case "<newline>":
     case "<space>":
@@ -12,7 +12,7 @@ function $t(t) {
       return !1;
   }
 }
-function rt(t) {
+function it(t) {
   if (!t)
     return !1;
   switch (t) {
@@ -33,38 +33,38 @@ function rt(t) {
       return !1;
   }
 }
-function at(t) {
+function rt(t) {
   return t !== void 0 && t.kind === "<op>";
 }
-class V {
+class B {
   constructor(e, n, s, i, r) {
     this.kind = e, this.startPos = n, this.endPos = s, this.value = i, this.leadingTrivia = [], this.trailingTrivia = [], this.leadingInvalid = [], this.trailingInvalid = [], this.isInvalid = r, this.start = n.offset, this.end = s.offset;
   }
   static create(e, n, s, i, r) {
-    return new V(e, n, s, i, r);
+    return new B(e, n, s, i, r);
   }
 }
-function bt(t) {
-  return t.trailingTrivia.find(({ kind: e }) => e === u.NEWLINE) !== void 0;
+function Tt(t) {
+  return t.trailingTrivia.find(({ kind: e }) => e === c.NEWLINE) !== void 0;
 }
-function ot(t, e) {
-  return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || bt(t);
+function at(t, e) {
+  return e.leadingTrivia.find(({ kind: s }) => s === c.NEWLINE) !== void 0 || Tt(t);
 }
 function Ve(t) {
-  return t.trailingTrivia.find(({ kind: e }) => e === u.SPACE) !== void 0;
+  return t.trailingTrivia.find(({ kind: e }) => e === c.SPACE) !== void 0;
 }
-function It(t) {
-  return t.trailingTrivia.length === 0 ? t.end : It(I.last(t.trailingTrivia));
+function bt(t) {
+  return t.trailingTrivia.length === 0 ? t.end : bt(I.last(t.trailingTrivia));
 }
-function Lt(t) {
-  return t.leadingTrivia.length === 0 ? t.start : Lt(t.leadingTrivia[0]);
+function It(t) {
+  return t.leadingTrivia.length === 0 ? t.start : It(t.leadingTrivia[0]);
 }
-function Wt(t) {
-  return [u.SINGLE_LINE_COMMENT, u.MULTILINE_COMMENT].includes(
+function $t(t) {
+  return [c.SINGLE_LINE_COMMENT, c.MULTILINE_COMMENT].includes(
     t.kind
   );
 }
-class jt {
+class Wt {
   constructor() {
     this.id = 0;
   }
@@ -75,32 +75,32 @@ class jt {
     return this.id++;
   }
 }
-class x {
+class y {
   // The symbol that this syntax node refers to
   // args must be passed in order of appearance in the node
   constructor(e, n, s) {
     this.id = e, this.kind = n;
     const i = s.find((a) => a !== void 0 && !Number.isNaN(a.start));
-    i ? (this.startPos = i.startPos, this.fullStart = i instanceof V ? Lt(i) : i.fullStart) : (this.startPos = {
+    i ? (this.startPos = i.startPos, this.fullStart = i instanceof B ? It(i) : i.fullStart) : (this.startPos = {
       offset: NaN,
       column: NaN,
       line: NaN
     }, this.fullStart = NaN);
     const r = [...s].reverse().find((a) => a !== void 0 && !Number.isNaN(a.end));
-    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof V ? It(r) : r.fullEnd) : (this.endPos = {
+    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof B ? bt(r) : r.fullEnd) : (this.endPos = {
       offset: NaN,
       column: NaN,
       line: NaN
     }, this.fullEnd = NaN), this.start = this.startPos.offset, this.end = this.endPos.offset;
   }
 }
-var ue = /* @__PURE__ */ ((t) => (t.PROGRAM = "<program>", t.ELEMENT_DECLARATION = "<element-declaration>", t.ATTRIBUTE = "<attribute>", t.IDENTIFIER_STREAM = "<identifer-stream>", t.LITERAL = "<literal>", t.VARIABLE = "<variable>", t.PREFIX_EXPRESSION = "<prefix-expression>", t.INFIX_EXPRESSION = "<infix-expression>", t.POSTFIX_EXPRESSION = "<postfix-expression>", t.FUNCTION_EXPRESSION = "<function-expression>", t.FUNCTION_APPLICATION = "<function-application>", t.BLOCK_EXPRESSION = "<block-expression>", t.LIST_EXPRESSION = "<list-expression>", t.TUPLE_EXPRESSION = "<tuple-expression>", t.CALL_EXPRESSION = "<call-expression>", t.PRIMARY_EXPRESSION = "<primary-expression>", t.GROUP_EXPRESSION = "<group-expression>", t.DUMMY = "<dummy>", t.ARRAY = "<array>", t))(ue || {});
-class F extends x {
+var pe = /* @__PURE__ */ ((t) => (t.PROGRAM = "<program>", t.ELEMENT_DECLARATION = "<element-declaration>", t.ATTRIBUTE = "<attribute>", t.IDENTIFIER_STREAM = "<identifer-stream>", t.LITERAL = "<literal>", t.VARIABLE = "<variable>", t.PREFIX_EXPRESSION = "<prefix-expression>", t.INFIX_EXPRESSION = "<infix-expression>", t.POSTFIX_EXPRESSION = "<postfix-expression>", t.FUNCTION_EXPRESSION = "<function-expression>", t.FUNCTION_APPLICATION = "<function-application>", t.BLOCK_EXPRESSION = "<block-expression>", t.LIST_EXPRESSION = "<list-expression>", t.TUPLE_EXPRESSION = "<tuple-expression>", t.CALL_EXPRESSION = "<call-expression>", t.PRIMARY_EXPRESSION = "<primary-expression>", t.GROUP_EXPRESSION = "<group-expression>", t.DUMMY = "<dummy>", t.ARRAY = "<array>", t))(pe || {});
+class C extends y {
   constructor({ body: e = [], eof: n }, s) {
     super(s, "<program>", [...e, n]), this.body = e, this.eof = n;
   }
 }
-class _ extends x {
+class _ extends y {
   constructor({
     type: e,
     name: n,
@@ -108,7 +108,7 @@ class _ extends x {
     alias: i,
     attributeList: r,
     bodyColon: a,
-    body: c
+    body: l
   }, p) {
     if (super(p, "<element-declaration>", [
       e,
@@ -117,18 +117,18 @@ class _ extends x {
       i,
       r,
       a,
-      c
-    ]), c && a && !(c instanceof v || c instanceof _))
+      l
+    ]), l && a && !(l instanceof k || l instanceof _))
       throw new Error("If an element has a simple body, it must be a function application node");
-    this.type = e, this.name = n, this.as = s, this.alias = i, this.attributeList = r, this.bodyColon = a, this.body = c;
+    this.type = e, this.name = n, this.as = s, this.alias = i, this.attributeList = r, this.bodyColon = a, this.body = l;
   }
 }
-class te extends x {
+class K extends y {
   constructor({ identifiers: e = [] }, n) {
     super(n, "<identifer-stream>", e || []), this.identifiers = e;
   }
 }
-class ne extends x {
+class ne extends y {
   constructor({
     name: e,
     colon: n,
@@ -137,12 +137,12 @@ class ne extends x {
     super(i, "<attribute>", [e, n, s]), this.name = e, this.value = s, this.colon = n;
   }
 }
-class Q extends x {
+class Q extends y {
   constructor({ op: e, expression: n }, s) {
     super(s, "<prefix-expression>", [e, n]), this.op = e, this.expression = n;
   }
 }
-class q extends x {
+class q extends y {
   constructor({
     op: e,
     leftExpression: n,
@@ -151,22 +151,22 @@ class q extends x {
     super(i, "<infix-expression>", [n, e, s]), this.op = e, this.leftExpression = n, this.rightExpression = s;
   }
 }
-class De extends x {
+class Re extends y {
   constructor({ op: e, expression: n }, s) {
     super(s, "<postfix-expression>", [n, e]), this.op = e, this.expression = n;
   }
 }
-class K extends x {
+class ee extends y {
   constructor({ value: e }, n) {
     super(n, "<function-expression>", [e]), this.value = e;
   }
 }
-class v extends x {
+class k extends y {
   constructor({ callee: e, args: n = [] }, s) {
     super(s, "<function-application>", [e, ...n]), this.callee = e, this.args = n;
   }
 }
-class ee extends x {
+class te extends y {
   constructor({
     blockOpenBrace: e,
     body: n = [],
@@ -175,7 +175,7 @@ class ee extends x {
     super(i, "<block-expression>", [e, ...n, s]), this.blockOpenBrace = e, this.body = n, this.blockCloseBrace = s;
   }
 }
-class U extends x {
+class P extends y {
   constructor({
     listOpenBracket: e,
     elementList: n = [],
@@ -184,12 +184,12 @@ class U extends x {
   }, r) {
     super(r, "<list-expression>", [
       e,
-      ...gt(n, s),
+      ...Lt(n, s),
       i
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
 }
-class J extends x {
+class J extends y {
   constructor({
     tupleOpenParen: e,
     elementList: n = [],
@@ -198,7 +198,7 @@ class J extends x {
   }, r) {
     super(r, "<tuple-expression>", [
       e,
-      ...gt(n, s),
+      ...Lt(n, s),
       i
     ]), this.tupleOpenParen = e, this.elementList = n, this.commaList = s, this.tupleCloseParen = i;
   }
@@ -220,7 +220,7 @@ class Xe extends J {
     ), this.kind = "<group-expression>";
   }
 }
-class H extends x {
+class H extends y {
   constructor({
     callee: e,
     argumentList: n
@@ -228,33 +228,33 @@ class H extends x {
     super(s, "<call-expression>", [e, n]), this.callee = e, this.argumentList = n;
   }
 }
-class pe extends x {
+class Ee extends y {
   constructor({ literal: e }, n) {
     super(n, "<literal>", [e]), this.literal = e;
   }
 }
-class W extends x {
+class X extends y {
   constructor({ variable: e }, n) {
     super(n, "<variable>", [e]), this.variable = e;
   }
 }
-class R extends x {
+class D extends y {
   constructor({ expression: e }, n) {
     super(n, "<primary-expression>", [e]), this.expression = e;
   }
 }
-class we extends x {
+class we extends y {
   constructor({ pre: e }, n) {
-    const s = V.create(u.SPACE, e.endPos, e.endPos, " ", !1);
+    const s = B.create(c.SPACE, e.endPos, e.endPos, " ", !1);
     super(n, "<dummy>", [s]);
   }
 }
-class he extends x {
+class le extends y {
   constructor({ expression: e, indexer: n }, s) {
     super(s, "<array>", [e, n]), this.array = e, this.indexer = n;
   }
 }
-function gt(t, e) {
+function Lt(t, e) {
   if (!t || t.length === 0)
     return e || [];
   if (!e || e.length === 0)
@@ -264,12 +264,12 @@ function gt(t, e) {
     (i) => i !== null
   );
 }
-function as(t, e = !1) {
+function is(t, e = !1) {
   return JSON.stringify(
     t,
     function(n, s) {
       var i;
-      return !(this instanceof F) && n === "symbol" ? s == null ? void 0 : s.id : (
+      return !(this instanceof C) && n === "symbol" ? s == null ? void 0 : s.id : (
         /* this instanceof SyntaxNode && */
         n === "symbol" ? {
           symbolTable: s == null ? void 0 : s.symbolTable,
@@ -290,7 +290,7 @@ function as(t, e = !1) {
     e ? 2 : 0
   );
 }
-class S {
+class O {
   constructor(e) {
     this.value = e;
   }
@@ -305,7 +305,7 @@ class S {
     return e(this.value);
   }
   map(e) {
-    return new S(e(this.value));
+    return new O(e(this.value));
   }
   // eslint-disable-next-line class-methods-use-this
   isOk() {
@@ -334,11 +334,11 @@ class A {
     return !1;
   }
 }
-var m = /* @__PURE__ */ ((t) => (t.Schema = "Schema", t.Table = "Table", t.Column = "Column", t.TableGroup = "TableGroup", t.TableGroupField = "TableGroup field", t.Enum = "Enum", t.EnumField = "Enum field", t.Note = "Note", t))(m || {});
+var m = /* @__PURE__ */ ((t) => (t.Schema = "Schema", t.Table = "Table", t.Column = "Column", t.TableGroup = "TableGroup", t.TableGroupField = "TableGroup field", t.Enum = "Enum", t.EnumField = "Enum field", t))(m || {});
 function $e(t) {
   return `Schema:${t}`;
 }
-function xe(t) {
+function ke(t) {
   return `Table:${t}`;
 }
 function We(t) {
@@ -356,9 +356,6 @@ function ze(t) {
 function Qe(t) {
   return `TableGroup field:${t}`;
 }
-function Yt(t) {
-  return `Note:${t}`;
-}
 function Fe(t, e) {
   switch (e) {
     case "Column":
@@ -370,7 +367,7 @@ function Fe(t, e) {
     case "Schema":
       return $e(t);
     case "Table":
-      return xe(t);
+      return ke(t);
     case "TableGroup":
       return ze(t);
     case "TableGroup field":
@@ -381,22 +378,22 @@ function Fe(t, e) {
 }
 function se(t) {
   const [e, n] = t.split(":");
-  return Object.values(m).includes(e) ? new S({
+  return Object.values(m).includes(e) ? new O({
     name: n,
     kind: e
   }) : new A();
 }
-function zt(t) {
+function jt(t) {
   const e = se(t).unwrap_or(void 0);
   if (!e)
     return !1;
   const { kind: n, name: s } = e;
   return n === "Schema" && s === "public";
 }
-function Qt(t) {
+function Yt(t) {
   return [
     $e,
-    xe,
+    ke,
     je,
     ze,
     We,
@@ -408,27 +405,27 @@ function qe(t) {
   const [e] = t;
   return e >= "a" && e <= "z" || e >= "A" && e <= "Z" || e === "_";
 }
-function ke(t) {
+function xe(t) {
   const [e] = t;
   return e >= "0" && e <= "9";
 }
-function qt(t) {
+function zt(t) {
   const [e] = t;
-  return ke(e) || qe(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
+  return xe(e) || qe(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
-function Ie(t) {
-  return qe(t) || ke(t);
+function fe(t) {
+  return qe(t) || xe(t);
 }
-function ct(t, e) {
+function ot(t, e) {
   const n = [], s = Math.min(t.length, e.length);
   for (let i = 0; i < s; i += 1)
     n.push(t[i], e[i]);
   return n.push(...t.slice(s), ...e.slice(s)), n;
 }
-function Le(t, e) {
+function be(t, e) {
   return t >= e.start && t < e.end;
 }
-class Ht {
+class Qt {
   constructor() {
     this.id = 0;
   }
@@ -439,48 +436,48 @@ class Ht {
     return this.id++;
   }
 }
-class _t {
+class gt {
   constructor({ symbolTable: e }, n) {
     this.references = [], this.id = n, this.symbolTable = e;
   }
 }
-class Jt {
+class qt {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class Zt {
+class Ht {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class At {
+class _t {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class Kt {
+class Jt {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class en {
+class Zt {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class tn {
+class Kt {
   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_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))(o || {});
-class l extends Error {
+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_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 u extends Error {
   constructor(e, n, s) {
-    super(n), this.code = e, this.diagnostic = n, this.nodeOrToken = s, this.start = s.start, this.end = s.end, this.name = this.constructor.name, Object.setPrototypeOf(this, l.prototype);
+    super(n), this.code = e, this.diagnostic = n, this.nodeOrToken = s, this.start = s.start, this.end = s.end, this.name = this.constructor.name, Object.setPrototypeOf(this, u.prototype);
   }
 }
-class B {
+class F {
   constructor(e, n) {
     this.value = e, this.errors = n === void 0 ? [] : n;
   }
@@ -492,20 +489,20 @@ class B {
   }
   chain(e) {
     const n = e(this.value), s = [...this.errors, ...n.errors];
-    return new B(n.value, s);
+    return new F(n.value, s);
   }
   map(e) {
-    return new B(e(this.value), this.errors);
+    return new F(e(this.value), this.errors);
   }
 }
-function nn(t, e, n) {
-  if (!t || !fe(t) || e.length === 0)
+function en(t, e, n) {
+  if (!t || !de(t) || e.length === 0)
     return new A();
   const s = [...e], i = Be(t).unwrap(), r = s.pop();
-  if (!(r instanceof ee))
+  if (!(r instanceof te))
     return new A();
-  const a = I.last(s) instanceof U ? s.pop() : void 0;
-  return s.length === 3 && Be(s[1]).unwrap().value === "as" ? new S(
+  const a = I.last(s) instanceof P ? s.pop() : void 0;
+  return s.length === 3 && Be(s[1]).unwrap().value === "as" ? new O(
     n.create(_, {
       type: i,
       name: s[0],
@@ -514,14 +511,14 @@ function nn(t, e, n) {
       attributeList: a,
       body: r
     })
-  ) : s.length === 1 ? new S(
+  ) : s.length === 1 ? new O(
     n.create(_, {
       type: i,
       name: s[0],
       attributeList: a,
       body: r
     })
-  ) : s.length === 0 ? new S(
+  ) : s.length === 0 ? new O(
     n.create(_, {
       type: i,
       attributeList: a,
@@ -530,18 +527,18 @@ function nn(t, e, n) {
   ) : new A();
 }
 function lt(t) {
-  return t.kind === u.IDENTIFIER && t.value === "as";
+  return t.kind === c.IDENTIFIER && t.value === "as";
 }
 function E(t) {
-  t && (t instanceof V ? sn(t) : rn(t));
+  t && (t instanceof B ? tn(t) : nn(t));
 }
-function sn(t) {
-  t.kind !== u.EOF && (t.isInvalid = !0);
+function tn(t) {
+  t.kind !== c.EOF && (t.isInvalid = !0);
 }
-function rn(t) {
+function nn(t) {
   if (t instanceof _)
     E(t.type), E(t.name), E(t.as), E(t.alias), E(t.bodyColon), E(t.attributeList), E(t.body);
-  else if (t instanceof te)
+  else if (t instanceof K)
     t.identifiers.forEach(E);
   else if (t instanceof ne)
     E(t.name), E(t.colon), E(t.value);
@@ -549,40 +546,40 @@ function rn(t) {
     E(t.op), E(t.expression);
   else if (t instanceof q)
     E(t.leftExpression), E(t.op), E(t.rightExpression);
-  else if (t instanceof De)
+  else if (t instanceof Re)
     E(t.op), E(t.expression);
-  else if (t instanceof ee)
+  else if (t instanceof te)
     E(t.blockOpenBrace), t.body.forEach(E), E(t.blockCloseBrace);
-  else if (t instanceof U)
+  else if (t instanceof P)
     E(t.listOpenBracket), t.commaList.forEach(E), t.elementList.forEach(E), E(t.listCloseBracket);
   else if (t instanceof J)
     E(t.tupleOpenParen), t.commaList.forEach(E), t.elementList.forEach(E), E(t.tupleCloseParen);
   else if (t instanceof H)
     E(t.callee), E(t.argumentList);
-  else if (t instanceof v)
+  else if (t instanceof k)
     E(t.callee), t.args.forEach(E);
-  else if (t instanceof R)
+  else if (t instanceof D)
     E(t.expression);
-  else if (t instanceof K)
+  else if (t instanceof ee)
     E(t.value);
-  else if (t instanceof W)
+  else if (t instanceof X)
     E(t.variable);
-  else if (t instanceof pe)
+  else if (t instanceof Ee)
     E(t.literal);
   else
     throw t instanceof Xe ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
 }
-function vt(t) {
+function At(t) {
   return !!(t != null && t.isInvalid);
 }
-function P(...t) {
+function U(...t) {
   return t.filter((e) => e !== void 0);
 }
-function an(t) {
-  if (t instanceof F)
-    return P(...t.body, t.eof);
+function sn(t) {
+  if (t instanceof C)
+    return U(...t.body, t.eof);
   if (t instanceof _)
-    return P(
+    return U(
       t.type,
       t.name,
       t.as,
@@ -592,68 +589,73 @@ function an(t) {
       t.body
     );
   if (t instanceof ne)
-    return P(t.name, t.colon, t.value);
-  if (t instanceof te)
+    return U(t.name, t.colon, t.value);
+  if (t instanceof K)
     return t.identifiers;
-  if (t instanceof pe)
+  if (t instanceof Ee)
     return t.literal ? [t.literal] : [];
-  if (t instanceof W)
-    return P(t.variable);
+  if (t instanceof X)
+    return U(t.variable);
   if (t instanceof Q)
-    return P(t.op, t.expression);
+    return U(t.op, t.expression);
   if (t instanceof q)
-    return P(t.leftExpression, t.op, t.rightExpression);
-  if (t instanceof De)
-    return P(t.expression, t.op);
-  if (t instanceof K)
-    return P(t.value);
-  if (t instanceof v)
-    return P(t.callee, ...t.args);
+    return U(t.leftExpression, t.op, t.rightExpression);
+  if (t instanceof Re)
+    return U(t.expression, t.op);
   if (t instanceof ee)
-    return P(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
-  if (t instanceof U)
-    return P(
+    return U(t.value);
+  if (t instanceof k)
+    return U(t.callee, ...t.args);
+  if (t instanceof te)
+    return U(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
+  if (t instanceof P)
+    return U(
       t.listOpenBracket,
-      ...ct(t.elementList, t.commaList),
+      ...ot(t.elementList, t.commaList),
       t.listCloseBracket
     );
   if (t instanceof J)
-    return P(
+    return U(
       t.tupleOpenParen,
-      ...ct(t.elementList, t.commaList),
+      ...ot(t.elementList, t.commaList),
       t.tupleCloseParen
     );
   if (t instanceof H)
-    return P(t.callee, t.argumentList);
-  if (t instanceof R)
-    return P(t.expression);
+    return U(t.callee, t.argumentList);
+  if (t instanceof D)
+    return U(t.expression);
+  if (t instanceof le)
+    return U(
+      t.array,
+      t.indexer
+    );
   throw t instanceof Xe ? new Error("This case is already handled by TupleExpressionNode") : new Error("Unreachable - no other possible cases");
 }
 function Be(t) {
-  return M(t) ? new S(t.expression.variable) : new A();
+  return M(t) ? new O(t.expression.variable) : new A();
 }
-function j(t) {
+function $(t) {
   var e;
-  return t instanceof R && (t.expression instanceof W && t.expression.variable instanceof V && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof pe && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
+  return t instanceof D && (t.expression instanceof X && t.expression.variable instanceof B && t.expression.variable.kind === c.QUOTED_STRING || t.expression instanceof Ee && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.STRING_LITERAL);
 }
 function M(t) {
-  return t instanceof R && t.expression instanceof W && t.expression.variable instanceof V;
+  return t instanceof D && t.expression instanceof X && t.expression.variable instanceof B;
 }
-function fe(t) {
+function de(t) {
   var e;
-  return t instanceof R && t.expression instanceof W && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
+  return t instanceof D && t.expression instanceof X && ((e = t.expression.variable) == null ? void 0 : e.kind) === c.IDENTIFIER;
 }
 function He(t) {
   var e;
-  return t instanceof q && t.leftExpression instanceof x && t.rightExpression instanceof x && ((e = t.op) == null ? void 0 : e.value) === ".";
+  return t instanceof q && t.leftExpression instanceof y && t.rightExpression instanceof y && ((e = t.op) == null ? void 0 : e.value) === ".";
 }
-function Re(t) {
+function De(t) {
   if (t === void 0)
     return new A();
   const e = t.identifiers.map((n) => n.value).join(" ");
-  return e === "" ? new A() : new S(e);
+  return e === "" ? new A() : new O(e);
 }
-class on {
+class rn {
   // list of errors during lexing
   constructor(e) {
     this.start = {
@@ -693,7 +695,7 @@ class on {
     this.tokens.push(this.createToken(e, n));
   }
   createToken(e, n = !1) {
-    return V.create(
+    return B.create(
       e,
       this.start,
       this.current,
@@ -702,50 +704,50 @@ class on {
     );
   }
   lex() {
-    return this.scanTokens(), this.tokens.push(V.create(u.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new B(this.tokens, this.errors);
+    return this.scanTokens(), this.tokens.push(B.create(c.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new F(this.tokens, this.errors);
   }
   scanTokens() {
     for (; !this.isAtEnd(); ) {
       const e = this.advance();
       switch (e) {
         case " ":
-          this.addToken(u.SPACE);
+          this.addToken(c.SPACE);
           break;
         case "\r":
           break;
         case `
 `:
-          this.addToken(u.NEWLINE);
+          this.addToken(c.NEWLINE);
           break;
         case "	":
-          this.addToken(u.TAB);
+          this.addToken(c.TAB);
           break;
         case ",":
-          this.addToken(u.COMMA);
+          this.addToken(c.COMMA);
           break;
         case "(":
-          this.addToken(u.LPAREN);
+          this.addToken(c.LPAREN);
           break;
         case ")":
-          this.addToken(u.RPAREN);
+          this.addToken(c.RPAREN);
           break;
         case "[":
-          this.addToken(u.LBRACKET);
+          this.addToken(c.LBRACKET);
           break;
         case "]":
-          this.addToken(u.RBRACKET);
+          this.addToken(c.RBRACKET);
           break;
         case "{":
-          this.addToken(u.LBRACE);
+          this.addToken(c.LBRACE);
           break;
         case "}":
-          this.addToken(u.RBRACE);
+          this.addToken(c.RBRACE);
           break;
         case ";":
-          this.addToken(u.SEMICOLON);
+          this.addToken(c.SEMICOLON);
           break;
         case ":":
-          this.addToken(u.COLON);
+          this.addToken(c.COLON);
           break;
         case "'":
           this.match("''") ? this.multilineStringLiteral() : this.singleLineStringLiteral();
@@ -763,7 +765,7 @@ class on {
           this.match("/") ? this.singleLineComment() : this.match("*") ? this.multilineComment() : this.operator();
           break;
         default:
-          if (rt(e)) {
+          if (it(e)) {
             this.operator();
             break;
           }
@@ -771,15 +773,15 @@ class on {
             this.identifier();
             break;
           }
-          if (ke(e)) {
-            this.numericLiteral();
+          if (xe(e)) {
+            this.numericLiteralOrIdentifier();
             break;
           }
-          this.addToken(u.OP, !0), this.errors.push(
-            new l(
+          this.addToken(c.OP, !0), this.errors.push(
+            new u(
               o.UNKNOWN_SYMBOL,
               `Unexpected token '${e}'`,
-              this.createToken(u.OP, !0)
+              this.createToken(c.OP, !0)
             )
           );
           break;
@@ -791,13 +793,13 @@ class on {
     let e = !0, n = [], s;
     const i = [];
     for (const r of this.tokens)
-      $t(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);
+      Xt(r) ? (n.push(r), r.kind === c.NEWLINE && s && (s.trailingTrivia = n, e = !0, s = void 0, n = [])) : (e ? r.leadingTrivia = n : s.trailingTrivia = n, i.push(r), n = [], s = r, e = !1);
     this.tokens = i;
   }
   gatherInvalid() {
     let e;
     const n = [], s = [];
-    for (e = 0; e < this.tokens.length && vt(this.tokens[e]); e += 1)
+    for (e = 0; e < this.tokens.length && At(this.tokens[e]); e += 1)
       s.push(this.tokens[e]);
     let i = this.tokens[e];
     for (i.leadingInvalid = [...s, ...i.leadingInvalid]; e < this.tokens.length; e += 1) {
@@ -816,14 +818,14 @@ class on {
     // Whether to interpret '\' as a backlash
     consumeStopSequence: a = !0
   }) {
-    let c = "";
+    let l = "";
     for (; !this.isAtEnd() && (s || !this.check(`
 `)) && !this.check(n); )
-      this.peek() === "\\" && !r ? (this.advance(), c += this.escapedString()) : c += this.advance();
+      this.peek() === "\\" && !r ? (this.advance(), l += this.escapedString()) : l += this.advance();
     if (this.isAtEnd() && !i) {
       const p = this.createToken(e, !0);
       this.tokens.push(p), this.errors.push(
-        new l(o.UNEXPECTED_EOF, "EOF reached while parsing", p)
+        new u(o.UNEXPECTED_EOF, "EOF reached while parsing", p)
       );
       return;
     }
@@ -831,7 +833,7 @@ class on {
 `) && !s) {
       const p = this.createToken(e, !0);
       this.tokens.push(p), this.errors.push(
-        new l(
+        new u(
           o.UNEXPECTED_NEWLINE,
           "Invalid newline encountered while parsing",
           p
@@ -839,38 +841,38 @@ class on {
       );
       return;
     }
-    a && this.match(n), this.tokens.push(V.create(e, this.start, this.current, c, !1));
+    a && this.match(n), this.tokens.push(B.create(e, this.start, this.current, l, !1));
   }
   singleLineStringLiteral() {
-    this.consumeUntil(u.STRING_LITERAL, "'", {
+    this.consumeUntil(c.STRING_LITERAL, "'", {
       allowNewline: !1,
       allowEof: !1,
       raw: !1
     });
   }
   multilineStringLiteral() {
-    this.consumeUntil(u.STRING_LITERAL, "'''", {
+    this.consumeUntil(c.STRING_LITERAL, "'''", {
       allowNewline: !0,
       allowEof: !1,
       raw: !1
     });
   }
   functionExpression() {
-    this.consumeUntil(u.FUNCTION_EXPRESSION, "`", {
+    this.consumeUntil(c.FUNCTION_EXPRESSION, "`", {
       allowNewline: !1,
       allowEof: !1,
       raw: !0
     });
   }
   quotedVariable() {
-    this.consumeUntil(u.QUOTED_STRING, '"', {
+    this.consumeUntil(c.QUOTED_STRING, '"', {
       allowNewline: !1,
       allowEof: !1,
       raw: !1
     });
   }
   singleLineComment() {
-    this.consumeUntil(u.SINGLE_LINE_COMMENT, `
+    this.consumeUntil(c.SINGLE_LINE_COMMENT, `
 `, {
       allowNewline: !0,
       allowEof: !0,
@@ -879,47 +881,55 @@ class on {
     });
   }
   multilineComment() {
-    this.consumeUntil(u.MULTILINE_COMMENT, "*/", {
+    this.consumeUntil(c.MULTILINE_COMMENT, "*/", {
       allowNewline: !0,
       allowEof: !1,
       raw: !0
     });
   }
   identifier() {
-    for (; !this.isAtEnd() && Ie(this.peek()); )
+    for (; !this.isAtEnd() && fe(this.peek()); )
       this.advance();
-    this.addToken(u.IDENTIFIER);
+    this.addToken(c.IDENTIFIER);
   }
   operator() {
-    for (; rt(this.peek()); )
+    for (; it(this.peek()); )
       this.advance();
-    this.addToken(u.OP);
+    this.addToken(c.OP);
   }
-  numericLiteral() {
+  // 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(u.NUMERIC_LITERAL);
+      return this.addToken(c.NUMERIC_LITERAL);
     for (; !this.isAtEnd(); ) {
-      const s = this.check(".");
-      if (e += s ? 1 : 0, e > 1)
+      const n = this.check(".");
+      if (e += n ? 1 : 0, e > 1)
         break;
-      if (!s && this.current.offset === this.text.length - 1)
-        return this.advance(), this.addToken(u.NUMERIC_LITERAL);
-      if (!s && !Ie(this.peek()))
-        return this.addToken(u.NUMERIC_LITERAL);
-      if (!s && !ke(this.peek()))
+      if (!n && this.current.offset === this.text.length - 1)
+        return this.advance(), this.addToken(c.NUMERIC_LITERAL);
+      if (!n && !fe(this.peek()))
+        return this.addToken(c.NUMERIC_LITERAL);
+      if (!n && !xe(this.peek()))
         break;
       this.advance();
     }
-    for (; !this.isAtEnd() && (this.check(".") || Ie(this.peek())); )
-      this.advance();
-    const n = this.createToken(u.NUMERIC_LITERAL, !0);
-    this.tokens.push(n), this.errors.push(new l(o.UNKNOWN_TOKEN, "Invalid number", n));
+    if (e > 0) {
+      for (; !this.isAtEnd() && (this.check(".") || fe(this.peek())); )
+        this.advance();
+      const n = this.createToken(c.NUMERIC_LITERAL, !0);
+      this.tokens.push(n), this.errors.push(new u(o.UNKNOWN_TOKEN, "Invalid number", n));
+    } else {
+      for (; !this.isAtEnd() && fe(this.peek()); )
+        this.advance();
+      const n = this.createToken(c.IDENTIFIER, !1);
+      this.tokens.push(n);
+    }
   }
   colorLiteral() {
-    for (; !this.isAtEnd() && Ie(this.peek()); )
+    for (; !this.isAtEnd() && fe(this.peek()); )
       this.advance();
-    this.addToken(u.COLOR_LITERAL);
+    this.addToken(c.COLOR_LITERAL);
   }
   escapedString() {
     if (this.isAtEnd())
@@ -949,7 +959,7 @@ class on {
       case "u": {
         let e = "";
         for (let n = 0; n <= 3; n += 1) {
-          if (this.isAtEnd() || !Ie(this.peek()))
+          if (this.isAtEnd() || !fe(this.peek()))
             return `\\u${e}`;
           e += this.advance();
         }
@@ -961,7 +971,7 @@ class on {
   }
 }
 var ye = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(ye || {});
-class cn {
+class an {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
   }
@@ -1002,7 +1012,7 @@ class cn {
     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 u.COMMA:
+          case c.COMMA:
             if (this.isWithinGroupExpressionContext() || this.isWithinListExpressionContext())
               return [...this.stack].reverse().find(
                 (r) => [
@@ -1012,22 +1022,22 @@ class cn {
                 ].includes(r)
               );
             break;
-          case u.RPAREN:
+          case c.RPAREN:
             if (this.isWithinGroupExpressionContext())
               return 1;
             break;
-          case u.RBRACE:
+          case c.RBRACE:
             if (this.isWithinBlockExpressionContext())
               return 2;
             break;
-          case u.RBRACKET:
+          case c.RBRACKET:
             if (this.isWithinListExpressionContext())
               return 0;
             break;
         }
   }
 }
-class ln {
+class on {
   constructor(e) {
     this.generator = e;
   }
@@ -1040,29 +1050,29 @@ class d {
     this.token = e, this.partialNode = n, this.handlerContext = s;
   }
 }
-class un {
+class ln {
   constructor(e, n) {
-    this.current = 0, this.errors = [], this.contextStack = new cn(), this.synchronizeProgram = () => {
+    this.current = 0, this.errors = [], this.contextStack = new an(), this.synchronizeProgram = () => {
       const s = this.peek();
-      s.kind !== u.EOF ? E(this.advance()) : (E(this.peek()), this.logError(s, o.UNEXPECTED_EOF, "Unexpected EOF"));
+      s.kind !== c.EOF ? E(this.advance()) : (E(this.peek()), this.logError(s, o.UNEXPECTED_EOF, "Unexpected EOF"));
     }, this.synchronizeElementDeclarationName = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (lt(s) || this.check(u.COLON, u.LBRACE, u.LBRACKET))
+        if (lt(s) || this.check(c.COLON, c.LBRACE, c.LBRACKET))
           break;
         E(s), this.advance();
       }
     }, this.synchronizeElementDeclarationAlias = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(u.COLON, u.LBRACE, u.LBRACKET))
+        if (this.check(c.COLON, c.LBRACE, c.LBRACKET))
           break;
         E(s), this.advance();
       }
     }, this.blockExpression = this.contextStack.withContextDo(ye.BlockExpression, () => {
-      const s = { body: [] }, i = () => this.nodeFactory.create(ee, s);
+      const s = { body: [] }, i = () => this.nodeFactory.create(te, s);
       try {
-        this.consume("Expect an opening brace '{'", u.LBRACE), s.blockOpenBrace = this.previous();
+        this.consume("Expect an opening brace '{'", c.LBRACE), s.blockOpenBrace = this.previous();
       } catch (r) {
         if (!(r instanceof d))
           throw r;
@@ -1070,7 +1080,7 @@ class un {
           throw new d(r.token, i(), r.handlerContext);
         this.synchronizeBlock();
       }
-      for (; !this.isAtEnd() && !this.check(u.RBRACE); )
+      for (; !this.isAtEnd() && !this.check(c.RBRACE); )
         try {
           s.body.push(this.canBeField() ? this.fieldDeclaration() : this.expression());
         } catch (r) {
@@ -1081,7 +1091,7 @@ class un {
           this.synchronizeBlock();
         }
       try {
-        this.consume("Expect a closing brace '}'", u.RBRACE), s.blockCloseBrace = this.previous();
+        this.consume("Expect a closing brace '}'", c.RBRACE), s.blockCloseBrace = this.previous();
       } catch (r) {
         if (!(r instanceof d))
           throw r;
@@ -1091,10 +1101,10 @@ class un {
       }
       return i();
     }), this.synchronizeBlock = () => {
-      if (!this.check(u.RBRACE))
+      if (!this.check(c.RBRACE))
         for (E(this.advance()); !this.isAtEnd(); ) {
           const s = this.peek();
-          if (this.check(u.RBRACE) || ot(this.previous(), s))
+          if (this.check(c.RBRACE) || at(this.previous(), s))
             break;
           E(s), this.advance();
         }
@@ -1105,7 +1115,7 @@ class un {
         expression: s.elementList[0]
       }), r = () => this.nodeFactory.create(J, s);
       try {
-        this.consume("Expect an opening parenthesis '('", u.LPAREN), s.tupleOpenParen = this.previous();
+        this.consume("Expect an opening parenthesis '('", c.LPAREN), s.tupleOpenParen = this.previous();
       } catch (a) {
         if (!(a instanceof d))
           throw a;
@@ -1113,7 +1123,7 @@ class un {
           throw new d(a.token, r(), a.handlerContext);
         this.synchronizeTuple();
       }
-      if (!this.isAtEnd() && !this.check(u.RPAREN))
+      if (!this.isAtEnd() && !this.check(c.RPAREN))
         try {
           s.elementList.push(this.normalExpression());
         } catch (a) {
@@ -1123,18 +1133,18 @@ class un {
             throw new d(a.token, i(), a.handlerContext);
           this.synchronizeTuple();
         }
-      for (; !this.isAtEnd() && !this.check(u.RPAREN); )
+      for (; !this.isAtEnd() && !this.check(c.RPAREN); )
         try {
-          this.consume("Expect a comma ','", u.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.normalExpression());
+          this.consume("Expect a comma ','", c.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.normalExpression());
         } catch (a) {
           if (!(a instanceof d))
             throw a;
-          if (a.partialNode instanceof x && s.elementList.push(a.partialNode), !this.canHandle(a))
+          if (a.partialNode instanceof y && s.elementList.push(a.partialNode), !this.canHandle(a))
             throw new d(a.token, r(), a.handlerContext);
           this.synchronizeTuple();
         }
       try {
-        this.consume("Expect a closing parenthesis ')'", u.RPAREN), s.tupleCloseParen = this.previous();
+        this.consume("Expect a closing parenthesis ')'", c.RPAREN), s.tupleCloseParen = this.previous();
       } catch (a) {
         if (!(a instanceof d))
           throw a;
@@ -1146,14 +1156,14 @@ class un {
     }), this.synchronizeTuple = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(u.RPAREN, u.COMMA))
+        if (this.check(c.RPAREN, c.COMMA))
           break;
         E(s), this.advance();
       }
     }, this.listExpression = this.contextStack.withContextDo(ye.ListExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(U, s);
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(P, s);
       try {
-        this.consume("Expect an opening bracket '['", u.LBRACKET), s.listOpenBracket = this.previous();
+        this.consume("Expect an opening bracket '['", c.LBRACKET), s.listOpenBracket = this.previous();
       } catch (r) {
         if (!(r instanceof d))
           throw r;
@@ -1161,7 +1171,7 @@ class un {
           throw new d(r.token, i(), r.handlerContext);
         this.synchronizeList();
       }
-      if (!this.isAtEnd() && !this.check(u.RBRACKET))
+      if (!this.isAtEnd() && !this.check(c.RBRACKET))
         try {
           s.elementList.push(this.attribute());
         } catch (r) {
@@ -1171,18 +1181,18 @@ class un {
             throw new d(r.token, i(), r.handlerContext);
           this.synchronizeList();
         }
-      for (; !this.isAtEnd() && !this.check(u.RBRACKET); )
+      for (; !this.isAtEnd() && !this.check(c.RBRACKET); )
         try {
-          this.consume("Expect a comma ','", u.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.attribute());
+          this.consume("Expect a comma ','", c.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.attribute());
         } catch (r) {
           if (!(r instanceof d))
             throw r;
-          if (r.partialNode instanceof x && s.elementList.push(r.partialNode), !this.canHandle(r))
+          if (r.partialNode instanceof y && s.elementList.push(r.partialNode), !this.canHandle(r))
             throw new d(r.token, i(), r.handlerContext);
           this.synchronizeList();
         }
       try {
-        this.consume("Expect a closing bracket ']'", u.RBRACKET), s.listCloseBracket = this.previous();
+        this.consume("Expect a closing bracket ']'", c.RBRACKET), s.listCloseBracket = this.previous();
       } catch (r) {
         if (!(r instanceof d))
           throw r;
@@ -1194,28 +1204,28 @@ class un {
     }), this.synchronizeList = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(u.COMMA, u.RBRACKET))
+        if (this.check(c.COMMA, c.RBRACKET))
           break;
         E(s), this.advance();
       }
     }, this.synchronizeAttributeName = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(u.COMMA, u.RBRACKET, u.COLON))
+        if (this.check(c.COMMA, c.RBRACKET, c.COLON))
           break;
         E(s), this.advance();
       }
     }, this.synchronizeAttributeValue = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(u.COMMA, u.RBRACKET))
+        if (this.check(c.COMMA, c.RBRACKET))
           break;
         E(s), this.advance();
       }
-    }, this.tokens = e, this.nodeFactory = new ln(n);
+    }, this.tokens = e, this.nodeFactory = new on(n);
   }
   isAtEnd() {
-    return this.current >= this.tokens.length || this.tokens[this.current].kind === u.EOF;
+    return this.current >= this.tokens.length || this.tokens[this.current].kind === c.EOF;
   }
   advance() {
     return this.isAtEnd() ? I.last(this.tokens) : this.tokens[this.current++];
@@ -1268,8 +1278,8 @@ class un {
     this.tokens = e;
   }
   parse() {
-    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(F, { body: e, eof: n });
-    return this.gatherInvalid(), new B({ ast: s, tokens: this.tokens }, this.errors);
+    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(C, { body: e, eof: n });
+    return this.gatherInvalid(), new F({ ast: s, tokens: this.tokens }, this.errors);
   }
   /* Parsing and synchronizing ProgramNode */
   program() {
@@ -1289,11 +1299,11 @@ class un {
   elementDeclaration() {
     const e = {}, n = () => this.nodeFactory.create(_, e);
     try {
-      this.consume("Expect an identifier", u.IDENTIFIER), e.type = this.previous();
+      this.consume("Expect an identifier", c.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(u.COLON, u.LBRACE, u.LBRACKET))
+    if (!this.check(c.COLON, c.LBRACE, c.LBRACKET))
       try {
         e.name = this.normalExpression();
       } catch (s) {
@@ -1304,7 +1314,7 @@ class un {
         this.synchronizeElementDeclarationName();
       }
     if (lt(this.peek()))
-      if (e.as = this.advance(), this.check(u.COLON, u.LBRACE, u.LBRACKET))
+      if (e.as = this.advance(), this.check(c.COLON, c.LBRACE, c.LBRACKET))
         this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect an alias");
       else
         try {
@@ -1317,18 +1327,18 @@ class un {
           this.synchronizeElementDeclarationAlias();
         }
     try {
-      e.attributeList = this.check(u.LBRACKET) ? this.listExpression() : void 0;
+      e.attributeList = this.check(c.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 ':'",
-      u.LBRACE,
-      u.COLON
+      c.LBRACE,
+      c.COLON
     ))
       return n();
     try {
-      if (this.match(u.COLON)) {
+      if (this.match(c.COLON)) {
         e.bodyColon = this.previous();
         const s = this.expression();
         s instanceof _ ? (E(s), this.logError(s, o.UNEXPECTED_ELEMENT_DECLARATION, "An element's simple body must not be an element declaration")) : e.body = s;
@@ -1348,18 +1358,18 @@ class un {
   fieldDeclaration() {
     const e = {}, n = () => this.nodeFactory.create(_, e);
     try {
-      this.consume("Expect an identifier", u.IDENTIFIER), e.type = this.previous();
+      this.consume("Expect an identifier", c.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 ':'", u.COLON), e.bodyColon = this.previous();
+      this.consume("Expect a colon ':'", c.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 _ ? this.errors.push(new l(o.INVALID_ELEMENT_IN_SIMPLE_BODY, "Simple body cannot be an element declaration", s)) : e.body = s;
+      s instanceof _ ? this.errors.push(new u(o.INVALID_ELEMENT_IN_SIMPLE_BODY, "Simple body cannot be an element declaration", s)) : e.body = s;
     } catch (s) {
       throw s instanceof d ? (e.body = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
@@ -1367,8 +1377,8 @@ class un {
   }
   /* Parsing any ExpressionNode, including non-NormalExpression */
   expression() {
-    const e = { args: [] }, n = () => nn(e.callee, e.args, this.nodeFactory).unwrap_or(
-      this.nodeFactory.create(v, e)
+    const e = { args: [] }, n = () => en(e.callee, e.args, this.nodeFactory).unwrap_or(
+      this.nodeFactory.create(k, e)
     );
     try {
       e.callee = this.normalExpression();
@@ -1389,10 +1399,10 @@ class un {
     return n();
   }
   shouldStopExpression() {
-    if (this.isAtEnd() || bt(this.previous()))
+    if (this.isAtEnd() || Tt(this.previous()))
       return !0;
     const e = this.peek().kind;
-    return e === u.RBRACE || e === u.RBRACKET || e === u.RPAREN || e === u.COMMA || e === u.COLON;
+    return e === c.RBRACE || e === c.RBRACKET || e === c.RPAREN || e === c.COMMA || e === c.COLON;
   }
   normalExpression() {
     return this.expression_bp(0);
@@ -1402,13 +1412,13 @@ class un {
     let n = this.leftExpression_bp();
     for (; !this.isAtEnd(); ) {
       const s = this.peek();
-      if (s.kind === u.LPAREN) {
-        const { left: i } = ut(s);
+      if (s.kind === c.LPAREN) {
+        const { left: i } = ct(s);
         if (i < e || // When '(' is encountered,
         // consider it part of another expression if
         // it's at the start of a new line
         // and we're currently not having unmatched '(' or '['
-        ot(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
+        at(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
           break;
         try {
           n = this.nodeFactory.create(H, {
@@ -1421,31 +1431,31 @@ class un {
             argumentList: r.partialNode
           }), new d(r.token, n, r.handlerContext)) : r;
         }
-      } else if (s.kind === u.LBRACKET) {
+      } else if (s.kind === c.LBRACKET) {
         if (Ve(this.previous()))
           break;
         try {
-          n = this.nodeFactory.create(he, {
+          n = this.nodeFactory.create(le, {
             expression: n,
             indexer: this.listExpression()
           });
         } catch (i) {
-          throw i instanceof d ? (n = this.nodeFactory.create(he, {
+          throw i instanceof d ? (n = this.nodeFactory.create(le, {
             expression: n,
             indexer: i.partialNode
           }), new d(i.token, n, i.handlerContext)) : i;
         }
-      } else if (at(s)) {
-        const i = s, r = ut(i);
+      } else if (rt(s)) {
+        const i = s, r = ct(i);
         if (r.left !== null) {
           if (r.left <= e)
             break;
-          this.advance(), n = this.nodeFactory.create(De, {
+          this.advance(), n = this.nodeFactory.create(Re, {
             expression: n,
             op: i
           });
         } else {
-          const a = fn(i);
+          const a = un(i);
           if (a.left === null || a.left <= e)
             break;
           this.advance();
@@ -1455,12 +1465,12 @@ class un {
               op: i,
               rightExpression: i.value === "." ? this.extractOperand() : this.expression_bp(a.right)
             });
-          } catch (c) {
-            throw c instanceof d ? (n = this.nodeFactory.create(q, {
+          } catch (l) {
+            throw l instanceof d ? (n = this.nodeFactory.create(q, {
               leftExpression: n,
               op: i,
-              rightExpression: c.partialNode
-            }), new d(c.token, n, c.handlerContext)) : c;
+              rightExpression: l.partialNode
+            }), new d(l.token, n, l.handlerContext)) : l;
           }
         }
       } else
@@ -1470,10 +1480,10 @@ class un {
   }
   leftExpression_bp() {
     let e;
-    if (at(this.peek())) {
+    if (rt(this.peek())) {
       const n = {};
       n.op = this.peek();
-      const s = dn(n.op);
+      const s = fn(n.op);
       if (s.right === null)
         throw this.logError(
           n.op,
@@ -1509,12 +1519,12 @@ class un {
   // e.g { ... }
   extractOperand() {
     return this.check(
-      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(
+      c.NUMERIC_LITERAL,
+      c.STRING_LITERAL,
+      c.COLOR_LITERAL,
+      c.QUOTED_STRING,
+      c.IDENTIFIER
+    ) ? this.primaryExpression() : this.check(c.FUNCTION_EXPRESSION) ? this.functionExpression() : this.check(c.LBRACKET) ? this.listExpression() : this.check(c.LBRACE) ? this.blockExpression() : this.check(c.LPAREN) ? this.tupleExpression() : (this.peek().kind === c.EOF ? this.logError(
       this.peek(),
       o.UNEXPECTED_EOF,
       "Unexpected EOF"
@@ -1528,50 +1538,50 @@ class un {
   functionExpression() {
     const e = {};
     try {
-      this.consume("Expect a function expression", u.FUNCTION_EXPRESSION), e.value = this.previous();
+      this.consume("Expect a function expression", c.FUNCTION_EXPRESSION), e.value = this.previous();
     } catch (n) {
       throw n instanceof d ? (e.value = n.partialNode, new d(
         n.token,
-        this.nodeFactory.create(K, e),
+        this.nodeFactory.create(ee, e),
         n.handlerContext
       )) : n;
     }
-    return this.nodeFactory.create(K, e);
+    return this.nodeFactory.create(ee, e);
   }
   canBeField() {
-    return this.peek().kind === u.IDENTIFIER && this.peek(1).kind === u.COLON;
+    return this.peek().kind === c.IDENTIFIER && this.peek(1).kind === c.COLON;
   }
   /* Parsing PrimaryExpression */
   primaryExpression() {
     if (this.match(
-      u.COLOR_LITERAL,
-      u.STRING_LITERAL,
-      u.NUMERIC_LITERAL
+      c.COLOR_LITERAL,
+      c.STRING_LITERAL,
+      c.NUMERIC_LITERAL
     ))
-      return this.nodeFactory.create(R, {
-        expression: this.nodeFactory.create(pe, { literal: this.previous() })
+      return this.nodeFactory.create(D, {
+        expression: this.nodeFactory.create(Ee, { literal: this.previous() })
       });
-    if (this.match(u.QUOTED_STRING, u.IDENTIFIER))
-      return this.nodeFactory.create(R, {
-        expression: this.nodeFactory.create(W, { variable: this.previous() })
+    if (this.match(c.QUOTED_STRING, c.IDENTIFIER))
+      return this.nodeFactory.create(D, {
+        expression: this.nodeFactory.create(X, { variable: this.previous() })
       });
     throw this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect a variable or literal"), new d(
       this.peek(),
-      this.nodeFactory.create(R, {
-        expression: this.nodeFactory.create(W, {})
+      this.nodeFactory.create(D, {
+        expression: this.nodeFactory.create(X, {})
       }),
       this.contextStack.findHandlerContext(this.tokens, this.current)
     );
   }
   attribute() {
     const e = {};
-    if (this.check(u.COLON, u.RBRACKET, u.COMMA)) {
+    if (this.check(c.COLON, c.RBRACKET, c.COMMA)) {
       const n = this.peek();
       this.logError(
         n,
         o.EMPTY_ATTRIBUTE_NAME,
         "Expect a non-empty attribute name"
-      ), e.name = this.nodeFactory.create(te, { identifiers: [] });
+      ), e.name = this.nodeFactory.create(K, { identifiers: [] });
     } else
       try {
         e.name = this.attributeName();
@@ -1586,12 +1596,12 @@ class un {
           );
         this.synchronizeAttributeName();
       }
-    return this.match(u.COLON) && (e.colon = this.previous(), e.value = this.attributeValue()), this.nodeFactory.create(ne, e);
+    return this.match(c.COLON) && (e.colon = this.previous(), e.value = this.attributeValue()), this.nodeFactory.create(ne, e);
   }
   attributeValue() {
     let e;
     try {
-      e = this.peek().kind === u.IDENTIFIER && this.peek(1).kind === u.IDENTIFIER ? this.attributeName() : this.normalExpression();
+      e = this.peek().kind === c.IDENTIFIER && this.peek(1).kind === c.IDENTIFIER ? this.attributeName() : this.normalExpression();
     } catch (n) {
       if (!(n instanceof d) || !this.canHandle(n))
         throw n;
@@ -1601,25 +1611,25 @@ class un {
   }
   attributeName() {
     const e = [];
-    if (this.peek().kind !== u.IDENTIFIER)
+    if (this.peek().kind !== c.IDENTIFIER)
       return this.primaryExpression();
-    for (; !this.isAtEnd() && !this.check(u.COLON, u.COMMA, u.RBRACKET); )
+    for (; !this.isAtEnd() && !this.check(c.COLON, c.COMMA, c.RBRACKET); )
       try {
-        this.consume("Expect an identifier", u.IDENTIFIER), e.push(this.previous());
+        this.consume("Expect an identifier", c.IDENTIFIER), e.push(this.previous());
       } catch (n) {
         throw n instanceof d ? new d(
           n.token,
-          this.nodeFactory.create(te, { identifiers: e }),
+          this.nodeFactory.create(K, { identifiers: e }),
           n.handlerContext
         ) : n;
       }
-    return this.nodeFactory.create(te, { identifiers: e });
+    return this.nodeFactory.create(K, { identifiers: e });
   }
   logError(e, n, s) {
-    this.errors.push(new l(n, s, e));
+    this.errors.push(new u(n, s, e));
   }
 }
-const hn = {
+const cn = {
   "+": { left: 9, right: 10 },
   "*": { left: 11, right: 12 },
   "-": { left: 9, right: 10 },
@@ -1635,10 +1645,10 @@ const hn = {
   "!=": { left: 4, right: 5 },
   ".": { left: 16, right: 17 }
 };
-function fn(t) {
-  return hn[t.value] || { left: null, right: null };
+function un(t) {
+  return cn[t.value] || { left: null, right: null };
 }
-const pn = {
+const hn = {
   "+": { left: null, right: 15 },
   "-": { left: null, right: 15 },
   "<": { left: null, right: 15 },
@@ -1646,17 +1656,17 @@ const pn = {
   "<>": { left: null, right: 15 },
   "!": { left: null, right: 15 }
 };
-function dn(t) {
-  return pn[t.value] || { left: null, right: null };
+function fn(t) {
+  return hn[t.value] || { left: null, right: null };
 }
-const En = {
+const pn = {
   "(": { left: 14, right: null }
 };
-function ut(t) {
-  return En[t.value] || { left: null, right: null };
+function ct(t) {
+  return pn[t.value] || { left: null, right: null };
 }
 var b = /* @__PURE__ */ ((t) => (t.Table = "table", t.Enum = "enum", t.Ref = "ref", t.Note = "note", t.Project = "project", t.Indexes = "indexes", t.TableGroup = "tablegroup", t))(b || {});
-function de(t) {
+function ge(t) {
   var n;
   const e = (n = t == null ? void 0 : t.type) == null ? void 0 : n.value.toLowerCase();
   switch (e) {
@@ -1667,111 +1677,111 @@ function de(t) {
     case b.Project:
     case b.Ref:
     case b.TableGroup:
-      return new S(e);
+      return new O(e);
     default:
       return new A();
   }
 }
-function Ee(t) {
+function ue(t) {
   if (!He(t))
-    return new S([t]);
-  const e = Ee(t.leftExpression).unwrap_or(void 0);
-  return e ? (e.push(t.rightExpression), new S(e)) : new A();
+    return new O([t]);
+  const e = ue(t.leftExpression).unwrap_or(void 0);
+  return e ? (e.push(t.rightExpression), new O(e)) : new A();
 }
-function C(t) {
+function W(t) {
   if (t === void 0)
     return new A();
-  const e = Ee(t).unwrap_or(void 0);
+  const e = ue(t).unwrap_or(void 0);
   if (!e)
     return new A();
   const n = [];
   for (const s of e) {
-    const i = X(s).unwrap_or(void 0);
+    const i = G(s).unwrap_or(void 0);
     if (!i)
       return new A();
     n.push(i);
   }
-  return new S(n);
+  return new O(n);
 }
-function ge(t) {
+function Ie(t) {
   if (t === void 0)
     return new A();
-  const e = Ee(t).unwrap_or(void 0);
+  const e = ue(t).unwrap_or(void 0);
   if (!e || e.length === 0)
     return new A();
   const n = [];
   let s;
   if (!M(I.last(e))) {
     const i = e.pop();
-    if (xt(i))
+    if (yt(i))
       s = i.elementList.map(
-        (r) => G(r).unwrap()
+        (r) => V(r).unwrap()
       );
     else
       return new A();
   }
   for (const i of e) {
-    const r = X(i).unwrap_or(void 0);
+    const r = G(i).unwrap_or(void 0);
     if (!r)
       return new A();
     n.push(r);
   }
-  return new S({
+  return new O({
     variables: n,
     tupleElements: s
   });
 }
-function X(t) {
-  return M(t) ? new S(t.expression.variable.value) : new A();
+function G(t) {
+  return M(t) ? new O(t.expression.variable.value) : new A();
 }
 function Ge(t) {
-  if (ht(t))
-    return t instanceof K ? new S({ functional: [t], nonFunctional: [] }) : new S({ functional: [], nonFunctional: [t] });
-  if (t instanceof J && t.elementList.every(ht)) {
+  if (ut(t))
+    return t instanceof ee ? new O({ functional: [t], nonFunctional: [] }) : new O({ functional: [], nonFunctional: [t] });
+  if (t instanceof J && t.elementList.every(ut)) {
     const e = t.elementList.filter(
-      (s) => s instanceof K
+      (s) => s instanceof ee
     ), n = t.elementList.filter(M);
-    return new S({ functional: e, nonFunctional: n });
+    return new O({ functional: e, nonFunctional: n });
   }
   return new A();
 }
-function G(t) {
+function V(t) {
   var n;
   const e = (n = t == null ? void 0 : t.expression.variable) == null ? void 0 : n.value;
-  return e === void 0 ? new A() : new S(e);
+  return e === void 0 ? new A() : new O(e);
 }
-function z(t) {
-  return j(t) ? t.expression instanceof W ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new A();
+function Y(t) {
+  return $(t) ? t.expression instanceof X ? new O(t.expression.variable.value) : new O(t.expression.literal.value) : new A();
 }
-function Nn(t) {
+function dn(t) {
   var e;
-  return !(t instanceof q) || !yt((e = t.op) == null ? void 0 : e.value) ? !1 : ge(t.leftExpression).and_then(() => ge(t.rightExpression)).unwrap_or(void 0) !== void 0;
+  return !(t instanceof q) || !wt((e = t.op) == null ? void 0 : e.value) ? !1 : Ie(t.leftExpression).and_then(() => Ie(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
-function mn(t) {
-  const e = ge(t.leftExpression), n = ge(t.rightExpression);
+function En(t) {
+  const e = Ie(t.leftExpression), n = Ie(t.rightExpression);
   if (!e.isOk() || !n.isOk())
     return !1;
   const { tupleElements: s } = e.unwrap(), { tupleElements: i } = n.unwrap();
   return (s == null ? void 0 : s.length) === (i == null ? void 0 : i.length);
 }
-function ht(t) {
-  return t instanceof R && t.expression instanceof W || t instanceof K;
+function ut(t) {
+  return t instanceof D && t.expression instanceof X || t instanceof ee;
 }
-function Tn(t, e) {
-  var i, r, a, c;
+function Nn(t, e) {
+  var i, r, a, l;
   let n = e;
-  const s = zt(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 (((c = n.symbol) == null ? void 0 : c.declaration) instanceof F && s)
+    if (((l = n.symbol) == null ? void 0 : l.declaration) instanceof C && s)
       return n.symbol;
-    if (n instanceof F)
+    if (n instanceof C)
       return;
     n = n.parent;
   }
 }
-class bn {
+class mn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1779,27 +1789,27 @@ class bn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof F || de(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new l(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof C || ge(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new u(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? [new l(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
+    return e ? [new u(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
   }
   validateAlias(e) {
-    return e ? [new l(o.UNEXPECTED_NAME, "A Custom element shouldn't have an alias", e)] : [];
+    return e ? [new u(o.UNEXPECTED_NAME, "A Custom element shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new l(o.UNEXPECTED_SETTINGS, "A Custom element shouldn't have a setting list", e)] : [];
+    return e ? [new u(o.UNEXPECTED_SETTINGS, "A Custom element shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof ee)
-      return [new l(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
+    if (e instanceof te)
+      return [new u(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
     const n = [];
-    return j(e.callee) || n.push(new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
+    return $(e.callee) || n.push(new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
   }
 }
-class Ae {
+class _e {
   constructor() {
     this.table = /* @__PURE__ */ new Map();
   }
@@ -1816,7 +1826,7 @@ class Ae {
     return this.table.entries();
   }
 }
-class In {
+class Tn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1824,53 +1834,55 @@ class In {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.registerElement(), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof _ ? [new l(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof _ ? [new u(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Je(e) ? [] : [new l(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new l(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
+    return e ? Je(e) ? [] : [new u(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new u(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
   }
   validateAlias(e) {
-    return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
+    return e ? [new u(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(Jt, { declaration: this.declarationNode, symbolTable: new Ae() });
-    const { name: n } = this.declarationNode, s = C(n);
+    this.declarationNode.symbol = this.symbolFactory.create(qt, { declaration: this.declarationNode, symbolTable: new _e() });
+    const { name: n } = this.declarationNode, s = W(n);
     if (s.isOk()) {
-      const i = s.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), c = je(r);
-      a.has(c) && e.push(new l(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, n)), a.set(c, this.declarationNode.symbol);
+      const i = s.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), l = je(r);
+      a.has(l) && e.push(new u(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, n)), a.set(l, this.declarationNode.symbol);
     }
     return e;
   }
   validateSettingList(e) {
-    return e ? [new l(o.UNEXPECTED_SETTINGS, "An Enum shouldn't have a setting list", e)] : [];
+    return e ? [new u(o.UNEXPECTED_SETTINGS, "An Enum shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof v)
+    if (e instanceof k)
       return this.validateFields([e]);
-    const [n, s] = I.partition(e.body, (i) => i instanceof v);
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
-    return e.length === 0 ? [new l(o.EMPTY_ENUM, "An Enum must have at least one element", this.declarationNode)] : e.flatMap((n) => {
+    return e.length === 0 ? [new u(o.EMPTY_ENUM, "An Enum must have at least one element", this.declarationNode)] : e.flatMap((n) => {
       const s = [];
-      return n.callee && !M(n.callee) && s.push(new l(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), I.last(n.args) instanceof U && s.push(...this.validateFieldSetting(I.last(n.args))), n.args.length > 1 && s.push(...n.args.map((i) => new l(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", i))), s.push(...this.registerField(n)), s;
+      n.callee && !M(n.callee) && s.push(new u(o.INVALID_ENUM_ELEMENT_NAME, "An enum field must be an identifier or a quoted identifier", n.callee));
+      const i = [...n.args];
+      return I.last(i) instanceof P ? (s.push(...this.validateFieldSettings(I.last(i))), i.pop()) : i[0] instanceof P && (s.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && s.push(...i.map((r) => new u(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", r))), s.push(...this.registerField(n)), s;
     });
   }
-  validateFieldSetting(e) {
-    const n = $(e), s = n.getErrors(), i = n.getValue();
+  validateFieldSettings(e) {
+    const n = z(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
-          a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", c))), a.forEach((c) => {
-            j(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
+          a.length > 1 && a.forEach((l) => s.push(new u(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
+            $(l.value) || s.push(new u(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
           });
           break;
         default:
-          a.forEach((c) => s.push(new l(o.UNKNOWN_ENUM_ELEMENT_SETTING, `Unknown enum field setting '${r}'`, c)));
+          a.forEach((l) => s.push(new u(o.UNKNOWN_ENUM_ELEMENT_SETTING, `Unknown enum field setting '${r}'`, l)));
       }
     }
     return s;
@@ -1885,14 +1897,14 @@ class In {
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const n = G(e.callee).unwrap(), s = Ye(n), i = this.symbolFactory.create(Zt, { declaration: e });
+      const n = V(e.callee).unwrap(), s = Ye(n), i = this.symbolFactory.create(Ht, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
         const a = r.get(s);
         return [
-          new l(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, e),
-          new l(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, a.declaration)
+          new u(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, e),
+          new u(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, a.declaration)
         ];
       }
       r.set(s, i);
@@ -1900,7 +1912,7 @@ class In {
     return [];
   }
 }
-class Ln {
+class bn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1908,23 +1920,23 @@ class Ln {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof F || de(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new l(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof C || ge(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new u(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? [new l(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
+    return e ? [new u(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
   }
   validateAlias(e) {
-    return e ? [new l(o.UNEXPECTED_ALIAS, "An Indexes shouldn't have an alias", e)] : [];
+    return e ? [new u(o.UNEXPECTED_ALIAS, "An Indexes shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new l(o.UNEXPECTED_SETTINGS, "An Indexes shouldn't have a setting list", e)] : [];
+    return e ? [new u(o.UNEXPECTED_SETTINGS, "An Indexes shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof v)
-      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 v);
+    if (e instanceof k)
+      return [new u(o.UNEXPECTED_SIMPLE_BODY, "An Indexes must have a complex body", e)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -1932,37 +1944,37 @@ class Ln {
       if (!n.callee)
         return [];
       const s = [], i = [n.callee, ...n.args];
-      return I.last(i) instanceof U && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
+      return I.last(i) instanceof P && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
         for (; r instanceof H; )
-          r.argumentList && !Ge(r.argumentList).isOk() && s.push(new l(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
-        Ge(r).isOk() || s.push(new l(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
+          r.argumentList && !Ge(r.argumentList).isOk() && s.push(new u(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
+        Ge(r).isOk() || s.push(new u(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
       }), s;
     });
   }
   validateFieldSetting(e) {
-    const n = $(e), s = n.getErrors(), i = n.getValue();
+    const n = z(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
         case "name":
-          a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, c))), a.forEach((c) => {
-            j(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, c));
+          a.length > 1 && a.forEach((l) => s.push(new u(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
+            $(l.value) || s.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
           });
           break;
         case "unique":
         case "pk":
-          a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, c))), a.forEach((c) => {
-            oe(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must not have a value`, c));
+          a.length > 1 && a.forEach((l) => s.push(new u(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
+            oe(l.value) || s.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must not have a value`, l));
           });
           break;
         case "type":
-          a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_INDEX_SETTING, "'type' can only appear once", c))), a.forEach((c) => {
-            M(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'type' must be "btree" or "hash"`, c));
+          a.length > 1 && a.forEach((l) => s.push(new u(o.DUPLICATE_INDEX_SETTING, "'type' can only appear once", l))), a.forEach((l) => {
+            M(l.value) || s.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'type' must be "btree" or "hash"`, l));
           });
           break;
         default:
-          a.forEach((c) => s.push(new l(o.UNKNOWN_INDEX_SETTING, `Unknown index setting '${r}'`, c)));
+          a.forEach((l) => s.push(new u(o.UNKNOWN_INDEX_SETTING, `Unknown index setting '${r}'`, l)));
       }
     }
     return s;
@@ -1976,7 +1988,7 @@ class Ln {
     });
   }
 }
-class gn {
+class In {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1984,36 +1996,28 @@ 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 F) && ![b.Table, b.Project].includes(de(this.declarationNode.parent).unwrap_or(void 0)) ? [new l(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project. Sticky note can only appear at the global scope.", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof C || ![b.Table, b.Project].includes(ge(this.declarationNode.parent).unwrap_or(void 0)) ? [new u(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project", this.declarationNode)] : [];
   }
   validateName(e) {
-    if (!(this.declarationNode.parent instanceof F))
-      return e ? [new l(o.UNEXPECTED_NAME, "A Note shouldn't have a name", e)] : [];
-    if (!e)
-      return [new l(o.INVALID_NAME, "Sticky note must have a name", this.declarationNode)];
-    const n = C(e);
-    if (!n.isOk())
-      return [];
-    const i = n.unwrap().join("."), r = Yt(i);
-    return this.publicSymbolTable.has(r) ? [new l(o.DUPLICATE_NAME, `Sticky note "${i}" has already been defined`, e)] : (this.publicSymbolTable.set(r, this.declarationNode.symbol), []);
+    return e ? [new u(o.UNEXPECTED_NAME, "A Note shouldn't have a name", e)] : [];
   }
   validateAlias(e) {
-    return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
+    return e ? [new u(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e && !(this.declarationNode.parent instanceof F) ? [new l(o.UNEXPECTED_SETTINGS, "A Note shouldn't have a setting list", e)] : [];
+    return e ? [new u(o.UNEXPECTED_SETTINGS, "A Note shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof v)
+    if (e instanceof k)
       return this.validateFields([e]);
-    const [n, s] = I.partition(e.body, (i) => i instanceof v);
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
     const n = [];
-    return e.length === 0 ? [new l(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new l(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), j(e[0].callee) || n.push(new l(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new l(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
+    return e.length === 0 ? [new u(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new u(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), $(e[0].callee) || n.push(new u(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new u(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
   }
   validateSubElements(e) {
     return e.flatMap((n) => {
@@ -2024,7 +2028,7 @@ class gn {
     });
   }
 }
-class _n {
+class Ln {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2032,25 +2036,25 @@ class _n {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof _ ? [new l(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof _ ? [new u(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Pe(e) ? [] : [new l(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? Pe(e) ? [] : [new u(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
-    return e ? [new l(o.UNEXPECTED_ALIAS, "A Project shouldn't have an alias", e)] : [];
+    return e ? [new u(o.UNEXPECTED_ALIAS, "A Project shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new l(o.UNEXPECTED_SETTINGS, "A Project shouldn't have a setting list", e)] : [];
+    return e ? [new u(o.UNEXPECTED_SETTINGS, "A Project shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof v)
-      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 v);
+    if (e instanceof k)
+      return [new u(o.UNEXPECTED_SIMPLE_BODY, "A Project's body must be a block", e)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
     return [
-      ...n.map((i) => new l(o.INVALID_PROJECT_FIELD, "A Project can not have inline fields", i)),
+      ...n.map((i) => new u(o.INVALID_PROJECT_FIELD, "A Project can not have inline fields", i)),
       ...this.validateSubElements(s)
     ];
   }
@@ -2063,7 +2067,7 @@ class _n {
     });
   }
 }
-class An {
+class gn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2071,46 +2075,48 @@ 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 F || de(this.declarationNode.parent).unwrap_or(void 0) === b.Table ? [] : [new l(o.INVALID_REF_CONTEXT, "A Ref must appear top-level or inside a table", this.declarationNode)];
+    return this.declarationNode.parent instanceof C ? [] : [new u(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
   }
   validateName(e) {
-    return e ? Pe(e) ? [] : [new l(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? Pe(e) ? [] : [new u(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
-    return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
+    return e ? [new u(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
   }
   validateSettingList(e) {
-    return e ? [new l(o.UNEXPECTED_SETTINGS, "A Ref shouldn't have a setting list", e)] : [];
+    return e ? [new u(o.UNEXPECTED_SETTINGS, "A Ref shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof v)
+    if (e instanceof k)
       return this.validateFields([e]);
-    const [n, s] = I.partition(e.body, (i) => i instanceof v);
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
     if (e.length === 0)
-      return [new l(o.EMPTY_REF, "A Ref must have at least one field", this.declarationNode)];
+      return [new u(o.EMPTY_REF, "A Ref must have at least one field", this.declarationNode)];
     const n = [];
-    return e.length > 1 && n.push(...e.slice(1).map((s) => new l(o.REF_REDEFINED, "A Ref can only contain one binary relationship", s))), e.forEach((s) => {
-      s.callee && !Nn(s.callee) && n.push(new l(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !mn(s.callee) && n.push(new l(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee)), I.last(s.args) instanceof U && this.validateFieldSettings(I.last(s.args)), s.args.length > 1 && n.push(...s.args.map((i) => new l(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", i)));
+    return e.length > 1 && n.push(...e.slice(1).map((s) => new u(o.REF_REDEFINED, "A Ref can only contain one binary relationship", s))), e.forEach((s) => {
+      s.callee && !dn(s.callee) && n.push(new u(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !En(s.callee) && n.push(new u(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
+      const i = [...s.args];
+      I.last(i) instanceof P ? (this.validateFieldSettings(I.last(i)), i.pop()) : i[0] instanceof P && (n.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && n.push(...i.map((r) => new u(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", r)));
     }), n;
   }
   validateFieldSettings(e) {
-    const n = $(e), s = n.getErrors(), i = n.getValue();
+    const n = z(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((c) => s.push(new l(o.DUPLICATE_REF_SETTING, `'${r}' can only appear once`, c))), a.forEach((c) => {
-            vn(c.value) || s.push(new l(o.INVALID_REF_SETTING_VALUE, `'${r}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, c));
+          a.length > 1 && a.forEach((l) => s.push(new u(o.DUPLICATE_REF_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
+            _n(l.value) || s.push(new u(o.INVALID_REF_SETTING_VALUE, `'${r}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, l));
           });
           break;
         default:
-          a.forEach((c) => s.push(new l(o.UNKNOWN_REF_SETTING, `Unknown ref setting '${r}'`, c)));
+          a.forEach((l) => s.push(new u(o.UNKNOWN_REF_SETTING, `Unknown ref setting '${r}'`, l)));
       }
     }
     return s;
@@ -2124,11 +2130,11 @@ class An {
     });
   }
 }
-function vn(t) {
-  if (!(M(t) && t.expression.variable.kind !== u.QUOTED_STRING) && !(t instanceof te))
+function _n(t) {
+  if (!(M(t) && t.expression.variable.kind !== c.QUOTED_STRING) && !(t instanceof K))
     return !1;
   let e;
-  if (t instanceof te ? e = Re(t).unwrap_or("") : e = t.expression.variable.value, e)
+  if (t instanceof K ? e = De(t).unwrap_or("") : e = t.expression.variable.value, e)
     switch (e.toLowerCase()) {
       case "cascade":
       case "no action":
@@ -2141,7 +2147,7 @@ function vn(t) {
     }
   return !1;
 }
-class wn {
+class An {
   constructor(e, n, s) {
     this.declarationNode = e, this.symbolFactory = s, this.publicSymbolTable = n;
   }
@@ -2149,77 +2155,77 @@ class wn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.registerElement(), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof _ ? [new l(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof _ ? [new u(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? e instanceof he ? [new l(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Je(e) ? [] : [new l(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new l(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
+    return e ? e instanceof le ? [new u(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Je(e) ? [] : [new u(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new u(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
   }
   validateAlias(e) {
-    return e ? Sn(e) ? [] : [new l(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
+    return e ? kn(e) ? [] : [new u(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
   }
   validateSettingList(e) {
-    const n = $(e), s = n.getErrors(), i = n.getValue();
+    const n = z(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "headercolor":
-          a.length > 1 && s.push(...a.map((c) => new l(o.DUPLICATE_TABLE_SETTING, "'headercolor' can only appear once", c))), a.forEach((c) => {
-            On(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", c.value || c.name));
+          a.length > 1 && s.push(...a.map((l) => new u(o.DUPLICATE_TABLE_SETTING, "'headercolor' can only appear once", l))), a.forEach((l) => {
+            xn(l.value) || s.push(new u(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", l.value || l.name));
           });
           break;
         case "note":
-          a.length > 1 && s.push(...a.map((c) => new l(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", c))), a.forEach((c) => {
-            j(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
+          a.length > 1 && s.push(...a.map((l) => new u(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
+            $(l.value) || s.push(new u(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
           });
           break;
         default:
-          s.push(...a.map((c) => new l(o.INVALID_TABLE_SETTING, `Unknown '${r}' setting`, c)));
+          s.push(...a.map((l) => new u(o.INVALID_TABLE_SETTING, `Unknown '${r}' setting`, l)));
       }
     }
     return s;
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(At, { declaration: this.declarationNode, symbolTable: new Ae() });
-    const { name: n, alias: s } = this.declarationNode, i = C(n);
+    this.declarationNode.symbol = this.symbolFactory.create(_t, { declaration: this.declarationNode, symbolTable: new _e() });
+    const { name: n, alias: s } = this.declarationNode, i = W(n);
     if (i.isOk()) {
-      const r = [...i.unwrap()], a = r.pop(), c = Ze(r, this.publicSymbolTable, this.symbolFactory), p = xe(a);
-      c.has(p) && e.push(new l(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, n)), c.set(p, this.declarationNode.symbol);
+      const r = [...i.unwrap()], a = r.pop(), l = Ze(r, this.publicSymbolTable, this.symbolFactory), p = ke(a);
+      l.has(p) && e.push(new u(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, n)), l.set(p, this.declarationNode.symbol);
     }
-    if (s && Pe(s) && !xn(s.expression.variable.value, i.unwrap_or([]))) {
-      const r = G(s).unwrap(), a = xe(r);
-      this.publicSymbolTable.has(a) && e.push(new l(o.DUPLICATE_NAME, `Table name '${r}' already exists`, n)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
+    if (s && Pe(s) && !wn(s.expression.variable.value, i.unwrap_or([]))) {
+      const r = V(s).unwrap(), a = ke(r);
+      this.publicSymbolTable.has(a) && e.push(new u(o.DUPLICATE_NAME, `Table name '${r}' already exists`, n)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
     }
     return e;
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof v)
-      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 v);
+    if (e instanceof k)
+      return [new u(o.UNEXPECTED_SIMPLE_BODY, "A Table's body must be a block", e)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
-    return e.length === 0 ? [new l(o.EMPTY_TABLE, "A Table must have at least one column", this.declarationNode)] : e.flatMap((n) => {
+    return e.length === 0 ? [new u(o.EMPTY_TABLE, "A Table must have at least one column", this.declarationNode)] : e.flatMap((n) => {
       if (!n.callee)
         return [];
       const s = [];
-      n.args.length === 0 && s.push(new l(o.INVALID_COLUMN, "A column must have a type", n.callee)), M(n.callee) || s.push(new l(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), n.args[0] && !yn(n.args[0]) && s.push(new l(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
+      n.args.length === 0 && s.push(new u(o.INVALID_COLUMN, "A column must have a type", n.callee)), M(n.callee) || s.push(new u(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), n.args[0] && !vn(n.args[0]) && s.push(new u(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 = G(e.callee).unwrap(), s = We(n), i = this.symbolFactory.create(Kt, { declaration: e });
+      const n = V(e.callee).unwrap(), s = We(n), i = this.symbolFactory.create(Jt, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
         const a = r.get(s);
         return [
-          new l(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, e),
-          new l(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, a.declaration)
+          new u(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, e),
+          new u(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, a.declaration)
         ];
       }
       r.set(s, i);
@@ -2228,75 +2234,75 @@ class wn {
   }
   // This is needed to support legacy inline settings
   validateFieldSetting(e) {
-    if (!e.slice(0, -1).every(fe) || !e.slice(-1).every((p) => fe(p) || p instanceof U))
-      return [...e.map((p) => new l(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
+    if (!e.slice(0, -1).every(de) || !e.slice(-1).every((p) => de(p) || p instanceof P))
+      return [...e.map((p) => new u(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
     if (e.length === 0)
       return [];
     let n;
-    I.last(e) instanceof U && (n = e.pop());
-    const s = $(n), i = s.getErrors(), r = s.getValue();
+    I.last(e) instanceof P && (n = e.pop());
+    const s = z(n), i = s.getErrors(), r = s.getValue();
     for (const p of e) {
-      const h = G(p).unwrap_or("").toLowerCase();
+      const h = V(p).unwrap_or("").toLowerCase();
       if (h !== "pk" && h !== "unique") {
-        i.push(new l(o.INVALID_SETTINGS, "Inline column settings can only be `pk` or `unique`", p));
+        i.push(new u(o.INVALID_SETTINGS, "Inline column settings can only be `pk` or `unique`", p));
         continue;
       }
       r[h] === void 0 ? r[h] = [p] : r[h].push(p);
     }
-    const a = r.pk || [], c = r["primary key"] || [];
-    a.length >= 1 && c.length >= 1 && i.push(...[...a, ...c].map((p) => new l(o.DUPLICATE_COLUMN_SETTING, "Either one of 'primary key' and 'pk' can appear", p)));
+    const a = r.pk || [], l = r["primary key"] || [];
+    a.length >= 1 && l.length >= 1 && i.push(...[...a, ...l].map((p) => new u(o.DUPLICATE_COLUMN_SETTING, "Either one of 'primary key' and 'pk' can appear", p)));
     for (const p in r) {
       const h = r[p];
       switch (p) {
         case "note":
-          h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", f))), h.forEach((f) => {
-            j(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
+          h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", f))), h.forEach((f) => {
+            $(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
           });
           break;
         case "ref":
           h.forEach((f) => {
-            Rn(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", f.value || f.name));
+            Sn(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", f.value || f.name));
           });
           break;
         case "primary key":
-          h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "primary key can only appear once", f))), h.forEach((f) => {
-            oe(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'primary key' must not have a value", f.value || f.name));
+          h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "primary key can only appear once", f))), h.forEach((f) => {
+            oe(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'primary key' must not have a value", f.value || f.name));
           });
           break;
         case "pk":
-          h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "'pk' can only appear once", f))), h.forEach((f) => {
-            f instanceof ne && !oe(f.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", f.value || f.name));
+          h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "'pk' can only appear once", f))), h.forEach((f) => {
+            f instanceof ne && !oe(f.value) && i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", f.value || f.name));
           });
           break;
         case "not null":
-          h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "'not null' can only appear once", f)));
+          h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "'not null' can only appear once", f)));
           const T = r.null || [];
-          h.length >= 1 && T.length >= 1 && i.push(...[...h, ...T].map((f) => new l(o.CONFLICTING_SETTING, "'not null' and 'null' can not be set at the same time", f))), h.forEach((f) => {
-            oe(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'not null' must not have a value", f.value || f.name));
+          h.length >= 1 && T.length >= 1 && i.push(...[...h, ...T].map((f) => new u(o.CONFLICTING_SETTING, "'not null' and 'null' can not be set at the same time", f))), h.forEach((f) => {
+            oe(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'not null' must not have a value", f.value || f.name));
           });
           break;
         case "null":
-          h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "'null' can only appear once", f))), h.forEach((f) => {
-            oe(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'null' must not have a value", f.value || f.name));
+          h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "'null' can only appear once", f))), h.forEach((f) => {
+            oe(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'null' must not have a value", f.value || f.name));
           });
           break;
         case "unique":
-          h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "'unique' can only appear once", f))), h.forEach((f) => {
-            f instanceof ne && !oe(f.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", f.value || f.name));
+          h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "'unique' can only appear once", f))), h.forEach((f) => {
+            f instanceof ne && !oe(f.value) && i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", f.value || f.name));
           });
           break;
         case "increment":
-          h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "'increment' can only appear once", f))), h.forEach((f) => {
-            f instanceof ne && !oe(f.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", f.value || f.name));
+          h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "'increment' can only appear once", f))), h.forEach((f) => {
+            f instanceof ne && !oe(f.value) && i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", f.value || f.name));
           });
           break;
         case "default":
-          h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_TABLE_SETTING, "'default' can only appear once", f))), h.forEach((f) => {
-            Dn(f.value) || i.push(new l(o.INVALID_TABLE_SETTING, "'default' must be a string literal, number literal, function expression, true, false or null", f.value || f.name));
+          h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_TABLE_SETTING, "'default' can only appear once", f))), h.forEach((f) => {
+            On(f.value) || i.push(new u(o.INVALID_TABLE_SETTING, "'default' must be a string literal, number literal, function expression, true, false or null", f.value || f.name));
           });
           break;
         default:
-          h.forEach((f) => i.push(new l(o.UNKNOWN_COLUMN_SETTING, `Unknown column setting '${p}'`, f)));
+          h.forEach((f) => i.push(new u(o.UNKNOWN_COLUMN_SETTING, `Unknown column setting '${p}'`, f)));
       }
     }
     return i;
@@ -2311,29 +2317,29 @@ class wn {
       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.push()), n;
+    return s.length > 1 && (n.push(...s.map((i) => new u(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n.push()), n;
   }
 }
-function yn(t) {
-  if (!(t instanceof H || He(t) || t instanceof R || t instanceof he))
+function vn(t) {
+  if (!(t instanceof H || He(t) || t instanceof D || t instanceof le))
     return !1;
   if (t instanceof H) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ce(n) || j(n) || fe(n)))
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ce(n) || $(n) || de(n)))
       return !1;
     t = t.callee;
   }
-  for (; t instanceof he; ) {
+  for (; t instanceof le; ) {
     if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && ce(n.name)))
       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 xn(t, e) {
+function wn(t, e) {
   return e.length === 1 && t === e[0];
 }
-class kn {
+class yn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2341,41 +2347,41 @@ class kn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.registerElement(), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof _ ? [new l(o.INVALID_TABLEGROUP_CONTEXT, "TableGroup must appear top-level", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof _ ? [new u(o.INVALID_TABLEGROUP_CONTEXT, "TableGroup must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Je(e) ? [] : [new l(o.INVALID_NAME, "A TableGroup name must be of the form <tablegroup> or <schema>.<tablegroup>", e)] : [new l(o.NAME_NOT_FOUND, "A TableGroup must have a name", this.declarationNode)];
+    return e ? Je(e) ? [] : [new u(o.INVALID_NAME, "A TableGroup name must be of the form <tablegroup> or <schema>.<tablegroup>", e)] : [new u(o.NAME_NOT_FOUND, "A TableGroup must have a name", this.declarationNode)];
   }
   validateAlias(e) {
-    return e ? [new l(o.UNEXPECTED_ALIAS, "A TableGroup shouldn't have an alias", e)] : [];
+    return e ? [new u(o.UNEXPECTED_ALIAS, "A TableGroup shouldn't have an alias", e)] : [];
   }
   registerElement() {
     const { name: e } = this.declarationNode;
-    this.declarationNode.symbol = this.symbolFactory.create(en, { declaration: this.declarationNode, symbolTable: new Ae() });
-    const n = C(e);
+    this.declarationNode.symbol = this.symbolFactory.create(Zt, { declaration: this.declarationNode, symbolTable: new _e() });
+    const n = W(e);
     if (n.isOk()) {
       const s = n.unwrap(), i = s.pop(), r = Ze(s, this.publicSymbolTable, this.symbolFactory), a = ze(i);
       if (r.has(a))
-        return [new l(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists in schema '${s.join(".") || "public"}'`, e)];
+        return [new u(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists in schema '${s.join(".") || "public"}'`, e)];
       r.set(a, this.declarationNode.symbol);
     }
     return [];
   }
   validateSettingList(e) {
-    return e ? [new l(o.UNEXPECTED_SETTINGS, "A TableGroup shouldn't have a setting list", e)] : [];
+    return e ? [new u(o.UNEXPECTED_SETTINGS, "A TableGroup shouldn't have a setting list", e)] : [];
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof v)
-      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 v);
+    if (e instanceof k)
+      return [new u(o.UNEXPECTED_SIMPLE_BODY, "A TableGroup's body must be a block", e)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
     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 l(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", n.callee)), this.registerField(n), n.args.length > 0 && s.push(...n.args.map((i) => new l(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
+      return n.callee && !W(n.callee).isOk() && s.push(new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", n.callee)), this.registerField(n), n.args.length > 0 && s.push(...n.args.map((i) => new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
     });
   }
   validateSubElements(e) {
@@ -2388,14 +2394,14 @@ class kn {
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const n = G(e.callee).unwrap(), s = Qe(n), i = this.symbolFactory.create(tn, { declaration: e });
+      const n = V(e.callee).unwrap(), s = Qe(n), i = this.symbolFactory.create(Kt, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
         const a = r.get(s);
         return [
-          new l(o.DUPLICATE_TABLEGROUP_FIELD_NAME, `${n} already exists in the group`, e),
-          new l(o.DUPLICATE_TABLEGROUP_FIELD_NAME, `${n} already exists in the group`, a.declaration)
+          new u(o.DUPLICATE_TABLEGROUP_FIELD_NAME, `${n} already exists in the group`, e),
+          new u(o.DUPLICATE_TABLEGROUP_FIELD_NAME, `${n} already exists in the group`, a.declaration)
         ];
       }
       r.set(s, i);
@@ -2403,35 +2409,35 @@ class kn {
     return [];
   }
 }
-const wt = ["-", "+"];
+const vt = ["-", "+"];
 function ie(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
-      return In;
+      return Tn;
     case b.Table:
-      return wn;
+      return An;
     case b.TableGroup:
-      return kn;
+      return yn;
     case b.Project:
-      return _n;
+      return Ln;
     case b.Ref:
-      return An;
-    case b.Note:
       return gn;
+    case b.Note:
+      return In;
     case b.Indexes:
-      return Ln;
-    default:
       return bn;
+    default:
+      return mn;
   }
 }
 function Je(t) {
-  return !!C(t).unwrap_or(!1);
+  return !!W(t).unwrap_or(!1);
 }
-function Sn(t) {
+function kn(t) {
   return Pe(t);
 }
 function Pe(t) {
-  return t instanceof R && t.expression instanceof W;
+  return t instanceof D && t.expression instanceof X;
 }
 function Ze(t, e, n) {
   var i;
@@ -2439,76 +2445,76 @@ function Ze(t, e, n) {
   let s = e;
   for (const r of t) {
     let a;
-    const c = $e(r);
-    if (s.has(c)) {
-      if (a = (i = s.get(c)) == null ? void 0 : i.symbolTable, !a)
+    const l = $e(r);
+    if (s.has(l)) {
+      if (a = (i = s.get(l)) == null ? void 0 : i.symbolTable, !a)
         throw new Error("Expect a symbol table in a schema symbol");
     } else {
-      a = new Ae();
-      const p = n.create(_t, { symbolTable: a });
-      s.set(c, p);
+      a = new _e();
+      const p = n.create(gt, { symbolTable: a });
+      s.set(l, p);
     }
     s = a;
   }
   return s;
 }
-function yt(t) {
+function wt(t) {
   return t === "-" || t === "<>" || t === ">" || t === "<";
 }
-function On(t) {
+function xn(t) {
   var n;
-  if (!(t instanceof R) || !(t.expression instanceof pe) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
+  if (!(t instanceof D) || !(t.expression instanceof Ee) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== c.COLOR_LITERAL)
     return !1;
   const e = t.expression.literal.value;
   if (e.length !== 4 && e.length !== 7 || e[0] !== "#")
     return !1;
   for (let s = 1; s < e.length; s += 1)
-    if (!qt(e[s]))
+    if (!zt(e[s]))
       return !1;
   return !0;
 }
 function oe(t) {
   return t === void 0;
 }
-function Dn(t) {
+function On(t) {
   var e;
-  return !!(j(t) || ce(t) || fe(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && ce(t.expression) || t instanceof K);
+  return !!($(t) || ce(t) || de(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && vt.includes((e = t.op) == null ? void 0 : e.value) && ce(t.expression) || t instanceof ee);
 }
 function ce(t) {
   var e;
-  return t instanceof R && t.expression instanceof pe && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
+  return t instanceof D && t.expression instanceof Ee && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.NUMERIC_LITERAL;
 }
-function Rn(t) {
+function Sn(t) {
   var n;
-  if (!(t instanceof Q) || !yt((n = t.op) == null ? void 0 : n.value))
+  if (!(t instanceof Q) || !wt((n = t.op) == null ? void 0 : n.value))
     return !1;
-  const e = 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) {
+function yt(t) {
   return t instanceof J && t.elementList.every(M);
 }
-function $(t) {
+function z(t) {
   var s;
   const e = {}, n = [];
   if (!t)
-    return new B({});
+    return new F({});
   for (const i of t.elementList) {
     if (!i.name)
       continue;
-    if (i.name instanceof R) {
-      n.push(new l(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
+    if (i.name instanceof D) {
+      n.push(new u(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
       continue;
     }
-    const r = (s = Re(i.name).unwrap_or(void 0)) == null ? void 0 : s.toLowerCase();
+    const r = (s = De(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 F(e, n);
 }
-class ft {
+class ht {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(_t, {
-      symbolTable: new Ae()
+    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(gt, {
+      symbolTable: new _e()
     }), this.ast.symbol = this.publicSchemaSymbol, this.ast.symbol.declaration = this.ast;
   }
   validate() {
@@ -2523,8 +2529,8 @@ class ft {
       );
       e.push(...r.validate());
     });
-    const n = this.ast.body.filter((s) => de(s).unwrap_or(void 0) === b.Project);
-    return n.length > 1 && n.forEach((s) => e.push(new l(o.PROJECT_REDEFINED, "Only one project can exist", s))), new B(this.ast, e);
+    const n = this.ast.body.filter((s) => ge(s).unwrap_or(void 0) === b.Project);
+    return n.length > 1 && n.forEach((s) => e.push(new u(o.PROJECT_REDEFINED, "Only one project can exist", s))), new F(this.ast, e);
   }
 }
 class re {
@@ -2537,9 +2543,9 @@ class re {
   bindSettingList(e, n) {
     if (e)
       for (const s of e.elementList) {
-        if (s.name instanceof R)
+        if (s.name instanceof D)
           continue;
-        const i = Re(s.name).unwrap_or(void 0);
+        const i = De(s.name).unwrap_or(void 0);
         if (!i)
           continue;
         const r = n[i.toLowerCase()];
@@ -2551,7 +2557,7 @@ class re {
     if (!e.body)
       return;
     const { body: n } = e;
-    if (n instanceof ee)
+    if (n instanceof te)
       for (const s of n.body)
         if (s instanceof _) {
           if (!s.type)
@@ -2565,7 +2571,7 @@ class re {
   }
   bindSubfield(e) {
     const n = [e.callee, ...e.args], s = I.last(n);
-    s instanceof U && (n.pop(), this.bindSettingList(s, this.subfield.settingList));
+    s instanceof P && (n.pop(), this.bindSettingList(s, this.subfield.settingList));
     const { argBinderRules: i } = this.subfield.arg;
     for (let r = 0; r < Math.min(n.length, i.length); r += 1)
       i[r].shouldBind && this.scanAndBind(n[r], i[r]);
@@ -2574,12 +2580,12 @@ class re {
   scanAndBind(e, n) {
     var s, i;
     if (e)
-      if (e instanceof R) {
-        if (e.expression instanceof W && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
+      if (e instanceof D) {
+        if (e.expression instanceof X && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
           return;
         this.bindFragments([e], n);
       } else
-        e instanceof q ? He(e) ? this.bindFragments(Ee(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof Q ? this.scanAndBind(e.expression, n) : e instanceof De ? this.scanAndBind(e.expression, n) : e instanceof J && e.elementList.forEach((r) => this.scanAndBind(r, n));
+        e instanceof q ? He(e) ? this.bindFragments(ue(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof Q ? this.scanAndBind(e.expression, n) : e instanceof Re ? this.scanAndBind(e.expression, n) : e instanceof J && e.elementList.forEach((r) => this.scanAndBind(r, n));
   }
   // Bind the fragments of a member access expression
   // which can be a simple expression like v1.User,
@@ -2587,7 +2593,7 @@ class re {
   bindFragments(e, n) {
     if (e.length === 0)
       return;
-    const s = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: i } = n, r = e.findIndex((f) => !M(f)), c = r !== -1 && xt(e[r]) ? e[r] : void 0, p = r >= 0 ? s.pop() : void 0, h = e.slice(
+    const s = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: i } = n, r = e.findIndex((f) => !M(f)), l = r !== -1 && yt(e[r]) ? e[r] : void 0, p = r >= 0 ? s.pop() : void 0, h = e.slice(
       0,
       r === -1 ? void 0 : r
     );
@@ -2595,26 +2601,26 @@ class re {
       return;
     const T = [];
     for (; s.length && h.length; ) {
-      const f = s.pop(), N = h.pop(), g = G(N).unwrap();
+      const f = s.pop(), N = h.pop(), g = V(N).unwrap();
       T.unshift({
         index: Fe(g, f),
         referrer: N
       });
     }
     for (; h.length; ) {
-      const f = h.pop(), N = G(f).unwrap();
+      const f = h.pop(), N = V(f).unwrap();
       T.unshift({
         index: Fe(N, i),
         referrer: f
       });
     }
-    return c ? c.elementList.forEach(
+    return l ? l.elementList.forEach(
       (f) => this.resolveIndexStack(
         [
           ...T,
           {
             index: Fe(
-              G(f).unwrap(),
+              V(f).unwrap(),
               p
             ),
             referrer: f
@@ -2629,34 +2635,34 @@ class re {
   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 = Tn(s.index, this.declarationNode);
+    const [s, ...i] = e, r = Nn(s.index, this.declarationNode);
     if (r === void 0) {
       const { kind: h, name: T } = se(s.index).unwrap();
       this.logError(s.referrer, `Can not find ${h} '${T}'`, n);
       return;
     }
     r.references.push(s.referrer), s.referrer.referee = r;
-    let a = r.symbolTable, { kind: c, name: p } = se(s.index).unwrap();
+    let a = r.symbolTable, { kind: l, name: p } = se(s.index).unwrap();
     for (const h of i) {
       const { kind: T, name: f } = se(h.index).unwrap(), N = a.get(h.index);
       if (!N) {
         this.logError(
           h.referrer,
-          `${c} '${p}' does not have ${T} '${f}'`,
+          `${l} '${p}' does not have ${T} '${f}'`,
           n
         );
         return;
       }
-      if (c = T, p = f, h.referrer.referee = N, N.references.push(h.referrer), !N.symbolTable)
+      if (l = T, p = f, h.referrer.referee = N, N.references.push(h.referrer), !N.symbolTable)
         break;
       a = N.symbolTable;
     }
   }
   logError(e, n, s) {
-    s || this.errors.push(new l(o.BINDING_ERROR, n, e));
+    s || this.errors.push(new u(o.BINDING_ERROR, n, e));
   }
 }
-class Pn extends re {
+class Rn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2666,7 +2672,7 @@ class Pn extends re {
     }, this.settingList = {};
   }
 }
-class Un extends re {
+class Dn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2676,7 +2682,7 @@ class Un extends re {
     }, this.settingList = {};
   }
 }
-class Mn extends re {
+class Pn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2711,7 +2717,7 @@ class Mn extends re {
     }, this.settingList = {};
   }
 }
-class Fn extends re {
+class Un extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2721,7 +2727,7 @@ class Fn extends re {
     }, this.settingList = {};
   }
 }
-class Bn extends re {
+class Mn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2731,7 +2737,7 @@ class Bn extends re {
     }, this.settingList = {};
   }
 }
-class Vn extends re {
+class Fn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2748,7 +2754,7 @@ class Vn extends re {
     }, this.settingList = {};
   }
 }
-class Gn extends re {
+class Bn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2776,7 +2782,7 @@ class Gn extends re {
     }, this.settingList = {};
   }
 }
-class Cn extends re {
+class Vn extends re {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2796,24 +2802,24 @@ class Cn extends re {
 function kt(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
-      return Un;
+      return Dn;
     case b.Table:
-      return Gn;
+      return Bn;
     case b.TableGroup:
-      return Cn;
+      return Vn;
     case b.Project:
-      return Bn;
+      return Mn;
     case b.Ref:
-      return Vn;
-    case b.Note:
       return Fn;
+    case b.Note:
+      return Un;
     case b.Indexes:
-      return Mn;
-    default:
       return Pn;
+    default:
+      return Rn;
   }
 }
-class Xn {
+class Gn {
   constructor(e) {
     this.ast = e, this.errors = [];
   }
@@ -2823,10 +2829,10 @@ class Xn {
         const n = kt(e);
         new n(e, this.errors).bind();
       }
-    return new B(this.ast, this.errors);
+    return new F(this.ast, this.errors);
   }
 }
-class $n {
+class Cn {
   constructor(e) {
     this.generator = e;
   }
@@ -2834,21 +2840,21 @@ class $n {
     return new e(n, this.generator.nextId());
   }
 }
-class Wn {
+class Xn {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = new $n(n);
+    this.ast = e, this.symbolFactory = new Cn(n);
   }
   // Analyzing: Invoking both the validator and binder
   analyze() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new Xn(n).resolve());
+    return new ht(this.ast, this.symbolFactory).validate().chain((n) => new Gn(n).resolve());
   }
   // For invoking the validator only
   validate() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new B(n, []));
+    return new ht(this.ast, this.symbolFactory).validate().chain((n) => new F(n, []));
   }
 }
-function pt(t, e) {
-  const { variables: n, tupleElements: s } = ge(t).unwrap();
+function ft(t, e) {
+  const { variables: n, tupleElements: s } = Ie(t).unwrap();
   return s ? n.length === 0 ? {
     schemaName: e.schemaName,
     tableName: e.name,
@@ -2867,7 +2873,7 @@ function pt(t, e) {
     schemaName: n.pop() || null
   };
 }
-function St(t) {
+function xt(t) {
   switch (t) {
     case "<":
       return ["1", "*"];
@@ -2880,7 +2886,7 @@ function St(t) {
   }
   throw new Error("Invalid relation op");
 }
-function k(t) {
+function x(t) {
   return {
     start: {
       offset: t.startPos.offset,
@@ -2892,85 +2898,41 @@ function k(t) {
 }
 function Ce(t) {
   var n;
-  const e = (n = Ee(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
+  const e = (n = ue(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
   return e instanceof J ? e.elementList.map((s) => s.referee) : [e.referee];
 }
-function Ne(t) {
-  const e = C(t).unwrap();
+function Ae(t) {
+  const e = W(t).unwrap();
   return {
     name: e.pop(),
     schemaName: e
   };
 }
-function Ot(t) {
+function $n(t) {
   return t.expression.literal.value;
 }
-function Dt(t, e) {
+function Ot(t, e) {
   if (Array.isArray(t)) {
     const i = t.map(({ id: a }) => a).sort().join(","), r = e.map(({ id: a }) => a).sort().join(",");
-    return i < r ? `${i}-${r}` : `${i}-${r}`;
+    return i < r ? `${i}-${r}` : `${r}-${i}`;
   }
   const n = t.id, s = e.id;
   return n < s ? `${n}-${s}` : `${s}-${n}`;
 }
-function Rt(t, e) {
+function St(t, e) {
   if (Array.isArray(t)) {
     const i = t.map(({ id: a }) => a).sort(), r = e.map(({ id: a }) => a).sort();
-    return I.zip(i, r).every(([a, c]) => a === c);
+    return I.zip(i, r).every(([a, l]) => a === l);
   }
   const n = t.id, s = e.id;
   return n === s;
 }
-class Ke {
-  constructor(e, n) {
-    this.declarationNode = e, this.env = n, this.container = this.declarationNode.parent instanceof _ ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
-  }
-  interpret() {
-    return this.ref.token = k(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
-  }
-  interpretName(e) {
-    const n = [], s = C(this.declarationNode.name).unwrap_or([]);
-    return this.ref.name = s.pop() || null, s.length > 1 && n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name)), this.ref.schemaName = s.join(".") || null, n;
-  }
-  interpretBody(e) {
-    return e instanceof v ? this.interpretField(e) : this.interpretField(e.body[0]);
-  }
-  interpretField(e) {
-    var h, T, f, N;
-    const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, r = Ce(s), a = Ce(i);
-    if (Rt(r, a))
-      return [new l(o.SAME_ENDPOINT, "Two endpoints are the same", e)];
-    const c = Dt(r, a);
-    if (this.env.refIds[c])
-      return [
-        new l(o.CIRCULAR_REF, "References with same endpoints exist", this.declarationNode),
-        new l(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[c])
-      ];
-    if (e.args[0]) {
-      const g = $(e.args[0]).getValue();
-      this.ref.onDelete = X((T = (h = g.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value).unwrap_or(void 0), this.ref.onDelete = X((N = (f = g.delete) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
-    }
-    const p = St(n);
-    return this.ref.endpoints = [
-      {
-        ...pt(s, this.container),
-        relation: p[0],
-        token: k(s)
-      },
-      {
-        ...pt(i, this.container),
-        relation: p[1],
-        token: k(i)
-      }
-    ], this.env.refIds[c] = this.declarationNode, [];
-  }
-}
-class Pt {
+class Rt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.table = { name: void 0, schemaName: void 0, alias: null, fields: [], token: void 0, indexes: [] }, this.pkColumns = [];
   }
   interpret() {
-    this.table.token = k(this.declarationNode), this.env.tables.set(this.declarationNode, this.table);
+    this.table.token = x(this.declarationNode), this.env.tables.set(this.declarationNode, this.table);
     const e = [
       ...this.interpretName(this.declarationNode.name),
       ...this.interpretAlias(this.declarationNode.alias),
@@ -2989,13 +2951,13 @@ class Pt {
     }), this.pkColumns.forEach((n) => n.pk = !1)), e;
   }
   interpretName(e) {
-    const { name: n, schemaName: s } = Ne(e);
-    return s.length > 1 ? (this.table.name = n, this.table.schemaName = s.join("."), [new l(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.table.name = n, this.table.schemaName = s.length ? s[0] : null, []);
+    const { name: n, schemaName: s } = Ae(e);
+    return s.length > 1 ? (this.table.name = n, this.table.schemaName = s.join("."), [new u(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.table.name = n, this.table.schemaName = s.length ? s[0] : null, []);
   }
   interpretAlias(e) {
     if (!e)
       return [];
-    const n = G(e).unwrap_or(null);
+    const n = V(e).unwrap_or(null);
     return n && (this.env.aliases.push({
       name: n,
       kind: "table",
@@ -3006,17 +2968,17 @@ class Pt {
     }), this.table.alias = n), [];
   }
   interpretSettingList(e) {
-    var r, a, c;
-    const n = $(e).getValue();
-    this.table.headerColor = (r = n.headercolor) != null && r.length ? Ot((c = (a = n.headercolor) == null ? void 0 : a.at(0)) == null ? void 0 : c.value) : void 0;
-    const [s] = n.note || [], i = z(s == null ? void 0 : s.value).unwrap_or(void 0);
+    var r, a, l;
+    const n = z(e).getValue();
+    this.table.headerColor = (r = n.headercolor) != null && r.length ? $n((l = (a = n.headercolor) == null ? void 0 : a.at(0)) == null ? void 0 : l.value) : void 0;
+    const [s] = n.note || [], i = Y(s == null ? void 0 : s.value).unwrap_or(void 0);
     return this.table.note = s && {
       value: i,
-      token: k(s)
+      token: x(s)
     }, [];
   }
   interpretBody(e) {
-    const [n, s] = I.partition(e.body, (i) => i instanceof v);
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
     return [...this.interpretFields(n), ...this.interpretSubElements(s)];
   }
   interpretSubElements(e) {
@@ -3025,13 +2987,11 @@ class Pt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: z(n.body instanceof ee ? n.body.body[0].callee : n.body.callee).unwrap(),
-            token: k(n)
+            value: Y(n.body instanceof te ? n.body.body[0].callee : n.body.callee).unwrap(),
+            token: x(n)
           }, [];
         case "indexes":
           return this.interpretIndexes(n);
-        case "ref":
-          return new Ke(n, this.env).interpret();
       }
       return [];
     });
@@ -3040,102 +3000,102 @@ class Pt {
     return e.flatMap((n) => this.interpretColumn(n));
   }
   interpretColumn(e) {
-    var a, c, p, h, T, f, N, g;
+    var a, l, p, h, T, f, N, g;
     const n = [], s = {};
-    s.name = G(e.callee).unwrap();
-    const i = jn(e.args[0]);
-    s.type = i.getValue(), n.push(...i.getErrors()), s.token = k(e), s.inline_refs = [];
+    s.name = V(e.callee).unwrap();
+    const i = Wn(e.args[0]);
+    s.type = i.getValue(), n.push(...i.getErrors()), s.token = x(e), s.inline_refs = [];
     const r = e.args.slice(1);
-    if (I.last(r) instanceof U) {
-      const w = $(r.pop()).getValue();
-      s.pk = !!((a = w.pk) != null && a.length) || !!((c = w["primary key"]) != null && c.length), s.increment = !!((p = w.increment) != null && p.length), s.unique = !!((h = w.unique) != null && h.length), s.not_null = !!((T = w["not null"]) != null && T.length) && !0, s.dbdefault = Yn((N = (f = w.default) == null ? void 0 : f.at(0)) == null ? void 0 : N.value);
-      const me = (g = w.note) == null ? void 0 : g.at(0);
-      s.note = me && {
-        value: z(me.value).unwrap(),
-        token: k(me)
+    if (I.last(r) instanceof P) {
+      const v = z(r.pop()).getValue();
+      s.pk = !!((a = v.pk) != null && a.length) || !!((l = v["primary key"]) != null && l.length), s.increment = !!((p = v.increment) != null && p.length), s.unique = !!((h = v.unique) != null && h.length), s.not_null = !!((T = v["not null"]) != null && T.length) && !0, s.dbdefault = jn((N = (f = v.default) == null ? void 0 : f.at(0)) == null ? void 0 : N.value);
+      const Ne = (g = v.note) == null ? void 0 : g.at(0);
+      s.note = Ne && {
+        value: Y(Ne.value).unwrap(),
+        token: x(Ne)
       };
-      const Te = w.ref || [];
-      s.inline_refs = Te.flatMap((Y) => {
-        const [nt] = Ce(Y.value.expression);
-        if (Rt(nt, e.symbol))
-          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", Y)), [];
-        const ve = Y.value.op, Z = C(Y.value.expression).unwrap();
-        let le;
+      const me = v.ref || [];
+      s.inline_refs = me.flatMap((j) => {
+        const [tt] = Ce(j.value.expression);
+        if (St(tt, e.symbol))
+          return n.push(new u(o.SAME_ENDPOINT, "Two endpoints are the same", j)), [];
+        const ve = j.value.op, Z = W(j.value.expression).unwrap();
+        let he;
         if (Z.length === 1) {
           const [ae] = Z;
-          le = {
+          he = {
             schemaName: this.table.schemaName,
             tableName: this.table.name,
             fieldNames: [ae],
             relation: ve.value,
-            token: k(Y)
+            token: x(j)
           };
         } else if (Z.length === 2) {
-          const [ae, be] = Z;
-          le = {
+          const [ae, Te] = Z;
+          he = {
             schemaName: null,
             tableName: ae,
-            fieldNames: [be],
+            fieldNames: [Te],
             relation: ve.value,
-            token: k(Y)
+            token: x(j)
           };
         } else if (Z.length === 3) {
-          const [ae, be, it] = Z;
-          le = {
+          const [ae, Te, st] = Z;
+          he = {
             schemaName: ae,
-            tableName: be,
-            fieldNames: [it],
+            tableName: Te,
+            fieldNames: [st],
             relation: ve.value,
-            token: k(Y)
+            token: x(j)
           };
         } else {
-          n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", Y));
-          const ae = Z.pop(), be = Z.pop();
-          le = {
+          n.push(new u(o.UNSUPPORTED, "Nested schema is not supported", j));
+          const ae = Z.pop(), Te = Z.pop();
+          he = {
             schemaName: Z.join("."),
-            tableName: be,
+            tableName: Te,
             fieldNames: [ae],
             relation: ve.value,
-            token: k(Y)
+            token: x(j)
           };
         }
-        const st = this.registerInlineRefToEnv(e, nt, le, Y);
-        return n.push(...st), st.length === 0 ? le : [];
+        const nt = this.registerInlineRefToEnv(e, tt, he, j);
+        return n.push(...nt), nt.length === 0 ? he : [];
       });
     }
-    return s.pk || (s.pk = r.some((w) => X(w).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((w) => X(w).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
+    return s.pk || (s.pk = r.some((v) => G(v).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((v) => G(v).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
   }
   interpretIndexes(e) {
     return this.table.indexes.push(...e.body.body.map((n) => {
-      var a, c, p, h, T, f, N;
+      var a, l, p, h, T, f, N;
       const s = { columns: [] }, i = n;
-      s.token = k(e);
+      s.token = x(e);
       const r = [i.callee, ...i.args];
-      if (I.last(r) instanceof U) {
-        const g = $(r.pop()).getValue();
-        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((c = g.unique) != null && c.length), s.name = z((h = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
-        const w = (T = g.note) == null ? void 0 : T.at(0);
-        s.note = w && {
-          value: z(w.value).unwrap(),
-          token: k(w)
-        }, s.type = X((N = (f = g.type) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
+      if (I.last(r) instanceof P) {
+        const g = z(r.pop()).getValue();
+        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((l = g.unique) != null && l.length), s.name = Y((h = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
+        const v = (T = g.note) == null ? void 0 : T.at(0);
+        s.note = v && {
+          value: Y(v.value).unwrap(),
+          token: x(v)
+        }, s.type = G((N = (f = g.type) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
       }
       return r.flatMap((g) => {
         if (!(g instanceof H))
           return g;
-        const w = [];
+        const v = [];
         for (; g instanceof H; )
-          w.push(g.argumentList), g = g.callee;
-        return w.push(g), w;
+          v.push(g.argumentList), g = g.callee;
+        return v.push(g), v;
       }).forEach((g) => {
-        const { functional: w, nonFunctional: me } = Ge(g).unwrap();
+        const { functional: v, nonFunctional: Ne } = Ge(g).unwrap();
         s.columns.push(
-          ...w.map((Te) => ({
-            value: Te.value.value,
+          ...v.map((me) => ({
+            value: me.value.value,
             type: "expression"
           })),
-          ...me.map((Te) => ({
-            value: G(Te).unwrap(),
+          ...Ne.map((me) => ({
+            value: V(me).unwrap(),
             type: "column"
           }))
         );
@@ -3143,13 +3103,13 @@ class Pt {
     })), [];
   }
   registerInlineRefToEnv(e, n, s, i) {
-    const r = Dt(e.symbol, n);
+    const r = Ot(e.symbol, n);
     if (this.env.refIds[r])
       return [
-        new l(o.CIRCULAR_REF, "References with same endpoints exist", i),
-        new l(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[r])
+        new u(o.CIRCULAR_REF, "References with same endpoints exist", i),
+        new u(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[r])
       ];
-    const a = St(s.relation);
+    const a = xt(s.relation);
     return this.env.refIds[r] = i, this.env.ref.set(i, {
       name: null,
       schemaName: null,
@@ -3162,40 +3122,40 @@ class Pt {
         {
           schemaName: this.table.schemaName,
           tableName: this.table.name,
-          fieldNames: [X(e.callee).unwrap()],
-          token: k(e),
+          fieldNames: [G(e.callee).unwrap()],
+          token: x(e),
           relation: a[0]
         }
       ]
     }), [];
   }
 }
-function jn(t) {
+function Wn(t) {
   let e = null;
-  t instanceof H && (e = t.argumentList.elementList.map((r) => ce(r) ? r.expression.literal.value : j(r) ? z(r).unwrap() : X(r).unwrap()).join(","), t = t.callee);
+  t instanceof H && (e = t.argumentList.elementList.map((r) => ce(r) ? r.expression.literal.value : $(r) ? Y(r).unwrap() : G(r).unwrap()).join(","), t = t.callee);
   let n = "";
-  for (; t instanceof he; )
+  for (; t instanceof le; )
     n = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${n}`, t = t.array;
-  const { name: s, schemaName: i } = Ne(t);
-  return i.length > 1 && new B(
+  const { name: s, schemaName: i } = Ae(t);
+  return i.length > 1 ? new F(
     {
       schemaName: i.length === 0 ? null : i[0],
       type_name: `${s}${n}${e ? `(${e})` : ""}`,
       args: e
     },
-    [new l(o.UNSUPPORTED, "Nested schema is not supported", t)]
-  ), new B({
+    [new u(o.UNSUPPORTED, "Nested schema is not supported", t)]
+  ) : new F({
     schemaName: i.length === 0 ? null : i[0],
     type_name: `${s}${n}${e ? `(${e})` : ""}`,
     args: e
   });
 }
-function Yn(t) {
+function jn(t) {
   var e, n, s;
   if (t) {
-    if (j(t))
+    if ($(t))
       return {
-        value: z(t).unwrap(),
+        value: Y(t).unwrap(),
         type: "string"
       };
     if (ce(t))
@@ -3203,19 +3163,19 @@ function Yn(t) {
         type: "number",
         value: Number.parseFloat(t.expression.literal.value)
       };
-    if (fe(t))
+    if (de(t))
       return {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
       };
-    if (t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && ce(t.expression)) {
+    if (t instanceof Q && vt.includes((e = t.op) == null ? void 0 : e.value) && ce(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 K)
+    if (t instanceof ee)
       return {
         value: (s = t.value) == null ? void 0 : s.value,
         type: "expression"
@@ -3223,79 +3183,108 @@ function Yn(t) {
     throw new Error("Unreachable");
   }
 }
-class zn {
+class Dt {
   constructor(e, n) {
-    this.declarationNode = e, this.env = n, this.note = { name: void 0, content: void 0, token: void 0 };
+    this.declarationNode = e, this.env = n, this.container = this.declarationNode.parent instanceof _ ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
   }
   interpret() {
-    return this.note.token = k(this.declarationNode), this.env.notes.set(this.declarationNode, this.note), [
-      ...this.interpretName(this.declarationNode.name),
-      ...this.interpretSettingList(this.declarationNode.attributeList),
-      ...this.interpretBody(this.declarationNode.body)
-    ];
+    return this.ref.token = x(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
-    const { name: n } = Ne(e);
-    return this.note.name = n, [];
-  }
-  interpretSettingList(e) {
-    var s, i, r;
-    const n = $(e).getValue();
-    return this.note.headerColor = (s = n.headercolor) != null && s.length ? Ot((r = (i = n.headercolor) == null ? void 0 : i.at(0)) == null ? void 0 : r.value) : void 0, [];
+    const n = [], s = W(this.declarationNode.name).unwrap_or([]);
+    return this.ref.name = s.pop() || null, s.length > 1 && n.push(new u(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name)), this.ref.schemaName = s.join(".") || null, n;
   }
   interpretBody(e) {
-    const [n, s] = I.partition(e.body, (i) => i instanceof v);
-    return n.length !== 1 || s.length > 0 ? [
-      new l(o.INVALID_NOTE, "Invalid note syntax", e)
-    ] : [...this.interpretNote(n[0])];
+    return e instanceof k ? this.interpretField(e) : this.interpretField(e.body[0]);
   }
-  interpretNote(e) {
-    const n = I.get(e, "callee.expression.literal.value", "");
-    return this.note.content = n, [];
+  interpretField(e) {
+    var h, T, f, N;
+    const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, r = Ce(s), a = Ce(i);
+    if (St(r, a))
+      return [new u(o.SAME_ENDPOINT, "Two endpoints are the same", e)];
+    const l = Ot(r, a);
+    if (this.env.refIds[l])
+      return [
+        new u(o.CIRCULAR_REF, "References with same endpoints exist", this.declarationNode),
+        new u(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[l])
+      ];
+    if (e.args[0]) {
+      const g = z(e.args[0]).getValue();
+      this.ref.onDelete = G((T = (h = g.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value).unwrap_or(void 0), this.ref.onDelete = G((N = (f = g.delete) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
+    }
+    const p = xt(n);
+    return this.ref.endpoints = [
+      {
+        ...ft(s, this.container),
+        relation: p[0],
+        token: x(s)
+      },
+      {
+        ...ft(i, this.container),
+        relation: p[1],
+        token: x(i)
+      }
+    ], this.env.refIds[l] = this.declarationNode, [];
   }
 }
-class Ut {
+class Pt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.tableGroup = { tables: [] };
   }
   interpret() {
     const e = [];
-    this.tableGroup.token = k(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup);
-    const { name: n, schemaName: s } = Ne(this.declarationNode.name);
-    return s.length >= 2 && (this.tableGroup.name = n, this.tableGroup.schemaName = s.join("."), e.push(new l(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = n, this.tableGroup.schemaName = s[0] || null, this.tableGroup.tables = this.declarationNode.body.body.map((i) => {
-      const r = C(i.callee).unwrap();
-      return r.length > 2 && e.push(new l(o.UNSUPPORTED, "Nested schema is not supported", i)), {
-        name: r.pop(),
-        schemaName: r.join(".")
+    return this.tableGroup.token = x(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup), e.push(
+      ...this.interpretName(this.declarationNode.name),
+      ...this.interpretBody(this.declarationNode.body)
+    ), e;
+  }
+  interpretName(e) {
+    const n = [], { name: s, schemaName: i } = Ae(e);
+    return i.length >= 2 && (this.tableGroup.name = s, this.tableGroup.schemaName = i.join("."), n.push(new u(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = s, this.tableGroup.schemaName = i[0] || null, n;
+  }
+  interpretBody(e) {
+    const n = [];
+    return this.tableGroup.tables = this.declarationNode.body.body.map((s) => {
+      const i = W(s.callee).unwrap();
+      i.length > 2 && n.push(new u(o.UNSUPPORTED, "Nested schema is not supported", s));
+      const r = ue(s.callee).unwrap().pop().referee.id;
+      if (this.env.groupOfTable[r]) {
+        const a = this.env.groupOfTable[r], { schemaName: l, name: p } = this.env.tableGroups.get(a), h = l ? `${l}.${p}` : p;
+        n.push(new u(o.TABLE_REAPPEAR_IN_TABLEGROUP, `Table "${i.join(".")}" already appears in group "${h}"`, s));
+      } else
+        this.env.groupOfTable[r] = this.declarationNode;
+      return {
+        name: i.pop(),
+        schemaName: i.join(".")
       };
-    }), e;
+    }), n;
   }
 }
-class Mt {
+class Ut {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.enum = { values: [] };
   }
   interpret() {
-    return this.enum.token = k(this.declarationNode), this.env.enums.set(this.declarationNode, this.enum), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.enum.token = x(this.declarationNode), this.env.enums.set(this.declarationNode, this.enum), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
-    const { name: n, schemaName: s } = Ne(e);
-    return s.length > 1 ? (this.enum.name = n, this.enum.schemaName = s.join("."), [new l(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.enum.name = n, this.enum.schemaName = s.length ? s[0] : null, []);
+    const { name: n, schemaName: s } = Ae(e);
+    return s.length > 1 ? (this.enum.name = n, this.enum.schemaName = s.join("."), [new u(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.enum.name = n, this.enum.schemaName = s.length ? s[0] : null, []);
   }
   interpretBody(e) {
     return e.body.flatMap((n) => {
-      var c;
+      var l;
       const s = n, i = {};
-      i.token = k(s), i.name = X(s.callee).unwrap();
-      const a = (c = $(s.args[0]).getValue().note) == null ? void 0 : c.at(0);
+      i.token = x(s), i.name = G(s.callee).unwrap();
+      const a = (l = z(s.args[0]).getValue().note) == null ? void 0 : l.at(0);
       return i.note = a && {
-        value: z(a.value).unwrap(),
-        token: k(a)
+        value: Y(a.value).unwrap(),
+        token: x(a)
       }, this.enum.values.push(i), [];
     });
   }
 }
-class Qn {
+class Yn {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.project = { enums: [], refs: [], tableGroups: [], tables: [] };
   }
@@ -3305,7 +3294,7 @@ class Qn {
   interpretName(e) {
     if (!e)
       return this.project.name = null, [];
-    const { name: n } = Ne(e);
+    const { name: n } = Ae(e);
     return this.project.name = n, [];
   }
   interpretBody(e) {
@@ -3314,73 +3303,70 @@ class Qn {
       const s = n;
       switch ((i = s.type) == null ? void 0 : i.value.toLowerCase()) {
         case "table": {
-          const r = new Pt(s, this.env).interpret();
+          const r = new Rt(s, this.env).interpret();
           return this.project.tables.push(this.env.tables.get(s)), r;
         }
         case "ref": {
-          const r = new Ke(s, this.env).interpret();
+          const r = new Dt(s, this.env).interpret();
           return this.project.refs.push(this.env.ref.get(s)), r;
         }
         case "tablegroup": {
-          const r = new Ut(s, this.env).interpret();
+          const r = new Pt(s, this.env).interpret();
           return this.project.tableGroups.push(this.env.tableGroups.get(s)), r;
         }
         case "enum": {
-          const r = new Mt(s, this.env).interpret();
+          const r = new Ut(s, this.env).interpret();
           return this.project.enums.push(this.env.enums.get(s)), r;
         }
         case "note":
           return this.project.note = {
-            value: z(s.body instanceof ee ? s.body.body[0].callee : s.body.callee).unwrap(),
-            token: k(s)
+            value: Y(s.body instanceof te ? s.body.body[0].callee : s.body.callee).unwrap(),
+            token: x(s)
           }, [];
         default:
-          return this.project[s.type.value.toLowerCase()] = z(s.body.callee).unwrap(), [];
+          return this.project[s.type.value.toLowerCase()] = Y(s.body.callee).unwrap(), [];
       }
     });
   }
 }
-class qn {
+class zn {
   constructor(e) {
     this.ast = e, this.env = {
       schema: [],
       tables: /* @__PURE__ */ new Map(),
-      notes: /* @__PURE__ */ new Map(),
       refIds: {},
       ref: /* @__PURE__ */ new Map(),
       enums: /* @__PURE__ */ new Map(),
       tableGroups: /* @__PURE__ */ new Map(),
+      groupOfTable: {},
       aliases: [],
       project: /* @__PURE__ */ new Map()
     };
   }
   interpret() {
     const e = this.ast.body.flatMap((n) => {
-      switch (de(n).unwrap_or(void 0)) {
+      switch (ge(n).unwrap_or(void 0)) {
         case b.Table:
-          return new Pt(n, this.env).interpret();
-        case b.Note:
-          return new zn(n, this.env).interpret();
+          return new Rt(n, this.env).interpret();
         case b.Ref:
-          return new Ke(n, this.env).interpret();
+          return new Dt(n, this.env).interpret();
         case b.TableGroup:
-          return new Ut(n, this.env).interpret();
+          return new Pt(n, this.env).interpret();
         case b.Enum:
-          return new Mt(n, this.env).interpret();
+          return new Ut(n, this.env).interpret();
         case b.Project:
-          return new Qn(n, this.env).interpret();
+          return new Yn(n, this.env).interpret();
         default:
           return [];
       }
     });
-    return new B(Hn(this.env), e);
+    return new F(Qn(this.env), e);
   }
 }
-function Hn(t) {
+function Qn(t) {
   return {
     schemas: [],
     tables: Array.from(t.tables.values()),
-    notes: Array.from(t.notes.values()),
     refs: Array.from(t.ref.values()),
     enums: Array.from(t.enums.values()),
     tableGroups: Array.from(t.tableGroups.values()),
@@ -3388,8 +3374,8 @@ function Hn(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 || {}), y = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(y || {});
-function _e(t) {
+var L = /* @__PURE__ */ ((t) => (t[t.Function = 1] = "Function", t[t.Constructor = 2] = "Constructor", t[t.Field = 3] = "Field", t[t.Variable = 4] = "Variable", t[t.Class = 5] = "Class", t[t.Struct = 6] = "Struct", t[t.Interface = 7] = "Interface", t[t.Module = 8] = "Module", t[t.Property = 9] = "Property", t[t.Event = 10] = "Event", t[t.Operator = 11] = "Operator", t[t.Unit = 12] = "Unit", t[t.Value = 13] = "Value", t[t.Constant = 14] = "Constant", t[t.Enum = 15] = "Enum", t[t.EnumMember = 16] = "EnumMember", t[t.Keyword = 17] = "Keyword", t[t.Text = 18] = "Text", t[t.Color = 19] = "Color", t[t.File = 20] = "File", t[t.Reference = 21] = "Reference", t[t.Customcolor = 22] = "Customcolor", t[t.Folder = 23] = "Folder", t[t.TypeParameter = 24] = "TypeParameter", t[t.User = 25] = "User", t[t.Issue = 26] = "Issue", t[t.Snippet = 27] = "Snippet", t))(L || {}), w = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(w || {});
+function Le(t) {
   switch (t) {
     case m.Schema:
       return L.Module;
@@ -3409,23 +3395,23 @@ function _e(t) {
       return L.Text;
   }
 }
-function Se(t, e) {
+function Oe(t, e) {
   if (!t || Ve(t))
     return !1;
   for (const n of t.trailingTrivia) {
     if (n.start > e)
       break;
-    if (n.kind === u.NEWLINE && n.end <= e)
+    if (n.kind === c.NEWLINE && n.end <= e)
       return !1;
   }
   return !0;
 }
-function O() {
+function S() {
   return {
     suggestions: []
   };
 }
-function Oe(t) {
+function Se(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
@@ -3443,29 +3429,29 @@ function Ue(t) {
     }))
   };
 }
-function et(t, e) {
+function Ke(t, e) {
   return t.getOffsetAt(e);
 }
-class Ft {
+class Mt {
   constructor(e, n = []) {
     this.compiler = e, this.triggerCharacters = n;
   }
   provideCompletionItems(e, n) {
     var T, f;
-    const s = et(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), c = a === void 0 ? i[0] : i[a + 1];
+    const s = Ke(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), l = a === void 0 ? i[0] : i[a + 1];
     if ([
       ...(r == null ? void 0 : r.trailingTrivia) || [],
       ...(r == null ? void 0 : r.leadingTrivia) || [],
-      ...(c == null ? void 0 : c.leadingTrivia) || []
-    ].find((N) => Wt(N) && Le(s, N)))
-      return O();
+      ...(l == null ? void 0 : l.leadingTrivia) || []
+    ].find((N) => $t(N) && be(s, N)))
+      return S();
     if (a === void 0)
-      return Tt();
-    if ([u.STRING_LITERAL, u.QUOTED_STRING].includes(r.kind) && Le(s, r))
-      return O();
+      return mt();
+    if ([c.STRING_LITERAL, c.QUOTED_STRING].includes(r.kind) && be(s, r))
+      return S();
     const p = this.compiler.container.element(s);
-    if (this.compiler.container.scopeKind(s) === D.TOPLEVEL || p instanceof _ && p.type && p.type.start <= s && p.type.end >= s)
-      return Tt();
+    if (this.compiler.container.scopeKind(s) === R.TOPLEVEL || p instanceof _ && p.type && p.type.start <= s && p.type.end >= s)
+      return mt();
     const h = [...this.compiler.container.stack(s)].reverse();
     for (const N of h)
       if (N instanceof Q)
@@ -3474,7 +3460,7 @@ class Ft {
           case "<":
           case "<>":
           case "-":
-            return dt(
+            return pt(
               this.compiler,
               s,
               N
@@ -3486,13 +3472,13 @@ class Ft {
           case "<":
           case "<>":
           case "-":
-            return dt(
+            return pt(
               this.compiler,
               s,
               N
             );
           case ".":
-            return Bt(
+            return Ft(
               this.compiler,
               s,
               N
@@ -3500,47 +3486,47 @@ class Ft {
         }
       else {
         if (N instanceof ne)
-          return Et(this.compiler, s, N);
-        if (N instanceof U)
-          return Et(this.compiler, s, N);
+          return dt(this.compiler, s, N);
+        if (N instanceof P)
+          return dt(this.compiler, s, N);
         if (N instanceof J)
-          return Jn(this.compiler, s);
-        if (N instanceof v)
-          return mt(this.compiler, s, N);
-        if (N instanceof _ && (N.bodyColon && s >= N.bodyColon.end || N.body && Le(s, N.body)))
-          return mt(this.compiler, s, void 0);
+          return qn(this.compiler, s);
+        if (N instanceof k)
+          return Nt(this.compiler, s, N);
+        if (N instanceof _ && (N.bodyColon && s >= N.bodyColon.end || N.body && be(s, N.body)))
+          return Nt(this.compiler, s, void 0);
       }
-    return O();
+    return S();
   }
 }
-function dt(t, e, n) {
+function pt(t, e, n) {
   const s = t.container.scopeKind(e);
-  if ([D.REF, D.TABLE].includes(s)) {
+  if ([R.REF, R.TABLE].includes(s)) {
     const i = Me(t, e, t.container.element(e), [
       m.Table,
       m.Schema,
       m.Column
     ]);
-    return Se(n.op, e) ? Oe(i) : i;
+    return Oe(n.op, e) ? Se(i) : i;
   }
-  return O();
+  return S();
 }
 function Me(t, e, n, s) {
   var a;
   if (n === void 0)
-    return O();
+    return S();
   let i = n;
   const r = { suggestions: [] };
   for (; i; ) {
     if ((a = i == null ? void 0 : i.symbol) != null && a.symbolTable) {
-      const { symbol: c } = i;
+      const { symbol: l } = i;
       r.suggestions.push(
-        ...t.symbol.members(c).filter(({ kind: p }) => s.includes(p)).map(({ name: p, kind: h }) => ({
+        ...t.symbol.members(l).filter(({ kind: p }) => s.includes(p)).map(({ name: p, kind: h }) => ({
           label: p,
           insertText: p,
-          insertTextRules: y.KeepWhitespace,
-          kind: _e(h),
-          sortText: _e(h).toString().padStart(2, "0"),
+          insertTextRules: w.KeepWhitespace,
+          kind: Le(h),
+          sortText: Le(h).toString().padStart(2, "0"),
           range: void 0
         }))
       );
@@ -3549,120 +3535,120 @@ function Me(t, e, n, s) {
   }
   return Ue(r);
 }
-function Jn(t, e) {
+function qn(t, e) {
   var s;
   switch (t.container.scopeKind(e)) {
-    case D.INDEXES:
-      return Gt(t, e);
-    case D.REF:
+    case R.INDEXES:
+      return Vt(t, e);
+    case R.REF:
       {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
           const r = i.pop();
           if (r instanceof q && ((s = r.op) == null ? void 0 : s.value) === ".")
-            return Bt(
+            return Ft(
               t,
               e,
               r
             );
         }
       }
-      return Vt(t, e);
+      return Bt(t, e);
   }
-  return O();
+  return S();
 }
-function Et(t, e, n) {
+function dt(t, e, n) {
   const { token: s } = t.container.token(e);
-  if ([u.COMMA, u.LBRACKET].includes(s == null ? void 0 : s.kind)) {
-    const i = Nt(t, e);
-    return (s == null ? void 0 : s.kind) === u.COMMA && Se(s, e) ? Oe(i) : i;
+  if ([c.COMMA, c.LBRACKET].includes(s == null ? void 0 : s.kind)) {
+    const i = Et(t, e);
+    return (s == null ? void 0 : s.kind) === c.COMMA && Oe(s, e) ? Se(i) : i;
   }
   if (n.name && n.name.start <= e && n.name.end >= e)
-    return Nt(t, e);
-  if (n.name) {
-    const i = Zn(
+    return Et(t, e);
+  if (n.name instanceof K) {
+    const i = Hn(
       t,
       e,
-      Re(n.name).unwrap()
+      De(n.name).unwrap()
     );
-    return (s == null ? void 0 : s.kind) === u.COLON && Se(s, e) ? Oe(i) : i;
+    return (s == null ? void 0 : s.kind) === c.COLON && Oe(s, e) ? Se(i) : i;
   }
-  return O();
+  return S();
 }
-function Nt(t, e) {
+function Et(t, e) {
   const n = t.container.element(e), s = t.container.scopeKind(e);
-  if (n instanceof F)
-    return O();
-  if (n.body && !Le(e, n.body))
+  if (n instanceof C)
+    return S();
+  if (n.body && !be(e, n.body))
     switch (s) {
-      case D.TABLE:
+      case R.TABLE:
         return {
           suggestions: [
             {
               label: "headercolor",
               insertText: "headercolor: ",
               kind: L.Field,
-              insertTextRules: y.KeepWhitespace,
+              insertTextRules: w.KeepWhitespace,
               range: void 0
             },
             {
               label: "note",
               insertText: "note: ",
               kind: L.Field,
-              insertTextRules: y.KeepWhitespace,
+              insertTextRules: w.KeepWhitespace,
               range: void 0
             }
           ]
         };
       default:
-        return O();
+        return S();
     }
   switch (s) {
-    case D.TABLE:
+    case R.TABLE:
       return {
         suggestions: [
           ...["primary key", "null", "not null", "increment", "pk", "unique"].map((i) => ({
             label: i,
             insertText: i,
             kind: L.Property,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           })),
           ...["ref", "default"].map((i) => ({
             label: i,
             insertText: `${i}: `,
             kind: L.Property,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           })),
           {
             label: "note",
             insertText: "note: ",
             kind: L.Property,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }
         ]
       };
-    case D.ENUM:
+    case R.ENUM:
       return {
         suggestions: [
           {
             label: "note",
             insertText: "note: ",
             kind: L.Property,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }
         ]
       };
-    case D.INDEXES:
+    case R.INDEXES:
       return {
         suggestions: [
           ...["unique", "pk"].map((i) => ({
             label: i,
             insertText: i,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             kind: L.Property,
             range: void 0
           })),
@@ -3670,25 +3656,25 @@ function Nt(t, e) {
             label: i,
             insertText: `${i}: `,
             kind: L.Property,
-            insertTextRules: y.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }))
         ]
       };
-    case D.REF:
+    case R.REF:
       return {
         suggestions: ["update", "delete"].map((i) => ({
           label: i,
           insertText: `${i}: `,
           kind: L.Property,
-          insertTextRules: y.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
   }
-  return O();
+  return S();
 }
-function Zn(t, e, n) {
+function Hn(t, e, n) {
   switch (n == null ? void 0 : n.toLowerCase()) {
     case "update":
     case "delete":
@@ -3697,7 +3683,7 @@ function Zn(t, e, n) {
           label: s,
           insertText: s,
           kind: L.Value,
-          insertTextRules: y.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
@@ -3707,115 +3693,115 @@ function Zn(t, e, n) {
           label: s,
           insertText: `${s}`,
           kind: L.Value,
-          insertTextRules: y.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
   }
-  return O();
+  return S();
 }
-function Bt(t, e, n) {
-  const s = Ee(n).unwrap_or([]);
+function Ft(t, e, n) {
+  const s = ue(n).unwrap_or([]);
   if (s.pop(), s.some((r) => !M(r)))
-    return O();
-  const i = s.map((r) => X(r).unwrap());
+    return S();
+  const i = s.map((r) => G(r).unwrap());
   return Ue({
     suggestions: t.symbol.ofName({ nameStack: i, owner: t.container.element(e) }).flatMap(({ symbol: r }) => t.symbol.members(r)).map(({ kind: r, name: a }) => ({
       label: a,
       insertText: a,
-      kind: _e(r),
+      kind: Le(r),
       range: void 0
     }))
   });
 }
-function mt(t, e, n) {
+function Nt(t, e, n) {
   var i;
   switch (t.container.scopeKind(e)) {
-    case D.TABLE:
-      return es(t, e, n);
-    case D.PROJECT:
-      return ts(t, e, n);
-    case D.INDEXES:
-      return ss(t, e);
-    case D.ENUM:
+    case R.TABLE:
+      return Zn(t, e, n);
+    case R.PROJECT:
       return Kn(t, e, n);
-    case D.REF: {
-      const r = Vt(t, e);
-      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && Se(t.container.token(e).token, e) ? Oe(r) : r;
+    case R.INDEXES:
+      return ts(t, e);
+    case R.ENUM:
+      return Jn(t, e, n);
+    case R.REF: {
+      const r = Bt(t, e);
+      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === c.COLON && Oe(t.container.token(e).token, e) ? Se(r) : r;
     }
-    case D.TABLEGROUP:
-      return ns(t);
+    case R.TABLEGROUP:
+      return es(t);
     default:
-      return O();
+      return S();
   }
 }
-function Tt() {
+function mt() {
   return {
     suggestions: ["Table", "TableGroup", "Enum", "Project", "Ref"].map((t) => ({
       label: t,
       insertText: t,
-      insertTextRules: y.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
   };
 }
-function Kn(t, e, n) {
-  return n != null && n.callee && tt(e, n) === 1 ? Me(t, e, t.container.element(e), [
+function Jn(t, e, n) {
+  return n != null && n.callee && et(e, n) === 1 ? Me(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
-  ]) : O();
+  ]) : S();
 }
-function es(t, e, n) {
+function Zn(t, e, n) {
   if (!(n != null && n.callee))
     return {
-      suggestions: ["Ref", "Note", "indexes"].map((i) => ({
+      suggestions: ["Note", "indexes"].map((i) => ({
         label: i,
         insertText: i,
-        insertTextRules: y.KeepWhitespace,
+        insertTextRules: w.KeepWhitespace,
         kind: L.Keyword,
         range: void 0
       }))
     };
-  const s = tt(e, n);
+  const s = et(e, n);
   return s === 0 ? {
-    suggestions: ["Ref", "Note", "indexes"].map((i) => ({
+    suggestions: ["Note", "indexes"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: y.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
-  } : s === 1 ? is(t, e) : O();
+  } : s === 1 ? ns(t, e) : S();
 }
-function ts(t, e, n) {
-  return n != null && n.callee ? tt(e, n) === 0 ? {
+function Kn(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: y.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
-  } : O() : {
+  } : S() : {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: y.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: L.Keyword,
       range: void 0
     }))
   };
 }
-function Vt(t, e) {
+function Bt(t, e) {
   return Me(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
   ]);
 }
-function ns(t) {
+function es(t) {
   return Ue({
     suggestions: [...t.parse.publicSymbolTable().entries()].flatMap(([e]) => {
       const n = se(e).unwrap_or(void 0);
@@ -3825,17 +3811,17 @@ function ns(t) {
       return s !== m.Table && s !== m.Schema ? [] : {
         label: i,
         insertText: i,
-        insertTextRules: y.KeepWhitespace,
-        kind: _e(s),
+        insertTextRules: w.KeepWhitespace,
+        kind: Le(s),
         range: void 0
       };
     })
   });
 }
-function ss(t, e) {
-  return Gt(t, e);
+function ts(t, e) {
+  return Vt(t, e);
 }
-function is(t, e) {
+function ns(t, e) {
   return {
     suggestions: [
       ...[
@@ -3898,7 +3884,7 @@ function is(t, e) {
       ].map((n) => ({
         label: n,
         insertText: n,
-        insertTextRules: y.KeepWhitespace,
+        insertTextRules: w.KeepWhitespace,
         kind: L.TypeParameter,
         sortText: L.TypeParameter.toString().padStart(2, "0"),
         range: void 0
@@ -3910,44 +3896,44 @@ function is(t, e) {
     ]
   };
 }
-function Gt(t, e) {
-  const s = t.container.element(e).parent;
-  if (!((s == null ? void 0 : s.symbol) instanceof At))
-    return O();
+function Vt(t, e) {
+  const n = t.container.element(e), s = n == null ? void 0 : n.parent;
+  if (!((s == null ? void 0 : s.symbol) instanceof _t))
+    return S();
   const { symbolTable: i } = s.symbol;
   return Ue({
     suggestions: [...i.entries()].flatMap(([r]) => {
       const a = se(r).unwrap_or(void 0);
       if (a === void 0)
         return [];
-      const { name: c } = a;
+      const { name: l } = a;
       return {
-        label: c,
-        insertText: c,
-        insertTextRules: y.KeepWhitespace,
-        kind: _e(m.Column),
+        label: l,
+        insertText: l,
+        insertTextRules: w.KeepWhitespace,
+        kind: Le(m.Column),
         range: void 0
       };
     })
   });
 }
-function tt(t, e) {
+function et(t, e) {
   if (!e.callee)
     return -1;
   const n = [e.callee, ...e.args], s = n.findIndex((i) => t <= i.end);
   return s === -1 ? n.length : s;
 }
-class Ct {
+class Gt {
   constructor(e) {
     this.compiler = e;
   }
   provideDefinition(e, n) {
     var a;
-    const { uri: s } = e, i = et(e, n), r = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = Ke(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
-      const c = r.pop();
-      if ((a = c == null ? void 0 : c.referee) != null && a.declaration && [ue.PRIMARY_EXPRESSION, ue.VARIABLE].includes(c == null ? void 0 : c.kind)) {
-        const { startPos: p, endPos: h } = c.referee.declaration;
+      const l = r.pop();
+      if ((a = l == null ? void 0 : l.referee) != null && a.declaration && [pe.PRIMARY_EXPRESSION, pe.VARIABLE].includes(l == null ? void 0 : l.kind)) {
+        const { startPos: p, endPos: h } = l.referee.declaration;
         return [
           {
             range: {
@@ -3964,22 +3950,22 @@ class Ct {
     return [];
   }
 }
-class Xt {
+class Ct {
   constructor(e) {
     this.compiler = e;
   }
   provideReferences(e, n) {
-    const { uri: s } = e, i = et(e, n), r = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = Ke(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const a = r.pop();
       if (a && [
-        ue.ELEMENT_DECLARATION,
-        ue.FUNCTION_APPLICATION,
-        ue.PRIMARY_EXPRESSION
+        pe.ELEMENT_DECLARATION,
+        pe.FUNCTION_APPLICATION,
+        pe.PRIMARY_EXPRESSION
       ].includes(a == null ? void 0 : a.kind)) {
-        const { symbol: c } = a;
-        if (c != null && c.references.length)
-          return c.references.map(({ startPos: p, endPos: h }) => ({
+        const { symbol: l } = a;
+        if (l != null && l.references.length)
+          return l.references.map(({ startPos: p, endPos: h }) => ({
             range: {
               startColumn: p.column + 1,
               startLineNumber: p.line + 1,
@@ -3993,24 +3979,24 @@ class Xt {
     return [];
   }
 }
-const os = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const rs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  CompletionItemInsertTextRule: y,
+  CompletionItemInsertTextRule: w,
   CompletionItemKind: L,
-  DBMLCompletionItemProvider: Ft,
-  DBMLDefinitionProvider: Ct,
-  DBMLReferencesProvider: Xt
+  DBMLCompletionItemProvider: Mt,
+  DBMLDefinitionProvider: Gt,
+  DBMLReferencesProvider: Ct
 }, Symbol.toStringTag, { value: "Module" }));
-var D = /* @__PURE__ */ ((t) => (t[t.TABLE = 0] = "TABLE", t[t.ENUM = 1] = "ENUM", t[t.TABLEGROUP = 2] = "TABLEGROUP", t[t.INDEXES = 3] = "INDEXES", t[t.NOTE = 4] = "NOTE", t[t.REF = 5] = "REF", t[t.PROJECT = 6] = "PROJECT", t[t.CUSTOM = 7] = "CUSTOM", t[t.TOPLEVEL = 8] = "TOPLEVEL", t))(D || {});
-class cs {
+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 as {
   constructor() {
     this.source = "", this.cache = new Array(
       16
       /* TOTAL_QUERY_COUNT */
-    ).fill(null), this.nodeIdGenerator = new jt(), this.symbolIdGenerator = new Ht(), this.token = {
+    ).fill(null), this.nodeIdGenerator = new Wt(), this.symbolIdGenerator = new Qt(), this.token = {
       invalidStream: this.createQuery(
         6,
-        () => this.parse.tokens().filter(vt)
+        () => this.parse.tokens().filter(At)
       ),
       // Valid + Invalid tokens (which are guarenteed to be non-trivials) are included in the stream
       flatStream: this.createQuery(
@@ -4022,8 +4008,8 @@ class cs {
       _: this.createQuery(
         0,
         () => {
-          const e = new on(this.source).lex().chain((n) => new un(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new Wn(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
-          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new qn(n).interpret().map((r) => ({ ast: n, tokens: s, rawDb: r })));
+          const e = new rn(this.source).lex().chain((n) => new ln(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new Xn(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 })));
         }
       ),
       ast: this.createQuery(
@@ -4058,33 +4044,33 @@ class cs {
             return [this.parse.ast()];
           const r = n[s].start;
           let a = this.parse.ast();
-          const c = [a];
+          const l = [a];
           for (; ; ) {
-            const h = an(a).find((T) => Le(r, T));
-            if (h === void 0 || h instanceof V)
+            const h = sn(a).find((T) => be(r, T));
+            if (h === void 0 || h instanceof B)
               break;
-            c.push(h), a = h;
+            l.push(h), a = h;
           }
-          if ((i == null ? void 0 : i.kind) === u.COLON)
-            return c;
-          for (; c.length > 0; ) {
+          if ((i == null ? void 0 : i.kind) === c.COLON)
+            return l;
+          for (; l.length > 0; ) {
             let p = !1;
-            const h = I.last(c);
-            if (h instanceof v) {
+            const h = I.last(l);
+            if (h instanceof k) {
               const T = this.parse.source();
               for (let f = h.end; f < e; f += 1)
                 T[f] === `
-` && (c.pop(), p = !0);
+` && (l.pop(), p = !0);
             } else
-              h instanceof Q || h instanceof q ? this.container.token(e).token !== h.op && (c.pop(), p = !0) : h instanceof U ? h.listCloseBracket && h.end <= e && (c.pop(), p = !0) : h instanceof J ? h.tupleCloseParen && h.end <= e && (c.pop(), p = !0) : h instanceof ee ? h.blockCloseBrace && h.end <= e && (c.pop(), p = !0) : h instanceof te || h.end < e && (c.pop(), p = !0);
+              h instanceof Q || h instanceof q ? this.container.token(e).token !== h.op && (l.pop(), p = !0) : h instanceof P ? h.listCloseBracket && h.end <= e && (l.pop(), p = !0) : h instanceof J ? h.tupleCloseParen && h.end <= e && (l.pop(), p = !0) : h instanceof te ? h.blockCloseBrace && h.end <= e && (l.pop(), p = !0) : h instanceof K || h.end < e && (l.pop(), p = !0);
             if (p) {
-              const T = I.last(c);
-              T instanceof _ && T.end <= e && c.pop();
+              const T = I.last(l);
+              T instanceof _ && T.end <= e && l.pop();
             }
             if (!p)
               break;
           }
-          return c;
+          return l;
         }
       ),
       token: this.createQuery(
@@ -4116,7 +4102,7 @@ class cs {
       ),
       scopeKind: this.createQuery(15, (e) => {
         var s;
-        if (this.container.element(e) instanceof F)
+        if (this.container.element(e) instanceof C)
           return 8;
         switch ((s = this.container.element(e).type) == null ? void 0 : s.value.toLowerCase()) {
           case "table":
@@ -4156,14 +4142,14 @@ class cs {
             if (!((i = r.symbol) != null && i.symbolTable))
               continue;
             const { symbolTable: a } = r.symbol;
-            let c = [a], p = [];
+            let l = [a], p = [];
             for (const h of e)
-              p = c.flatMap(
-                (T) => Qt(h).flatMap((f) => {
+              p = l.flatMap(
+                (T) => Yt(h).flatMap((f) => {
                   const N = T.get(f), g = se(f).unwrap_or(void 0);
                   return !N || !g ? [] : { ...g, symbol: N };
                 })
-              ), c = p.flatMap(
+              ), l = p.flatMap(
                 (T) => T.symbol.symbolTable ? T.symbol.symbolTable : []
               );
             s.push(...p);
@@ -4190,8 +4176,8 @@ class cs {
         if (r.has(a))
           return r.get(a);
       }
-      const c = n(i);
-      return i !== void 0 ? r instanceof Map ? r.set(a, c) : (this.cache[e] = /* @__PURE__ */ new Map(), this.cache[e].set(a, c)) : this.cache[e] = c, c;
+      const l = n(i);
+      return i !== void 0 ? r instanceof Map ? r.set(a, l) : (this.cache[e] = /* @__PURE__ */ new Map(), this.cache[e].set(a, l)) : this.cache[e] = l, l;
     };
   }
   setSource(e) {
@@ -4202,14 +4188,14 @@ class cs {
   }
   initMonacoServices() {
     return {
-      definitionProvider: new Ct(this),
-      referenceProvider: new Xt(this),
-      autocompletionProvider: new Ft(this)
+      definitionProvider: new Gt(this),
+      referenceProvider: new Ct(this),
+      autocompletionProvider: new Mt(this)
     };
   }
 }
 export {
-  cs as Compiler,
-  as as serialize,
-  os as services
+  as as Compiler,
+  is as serialize,
+  rs as services
 };