@dbml/parse 3.13.3-alpha.0 → 3.13.4-alpha.0

package/dist/dbml-parse.mjs

@@ -1,6 +1,6 @@
-import g, { last as Ve, forIn as dt, partition as St, head as an, findLastIndex as rn } from "lodash";
-var h = /* @__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.TILDE = "<tilde>", t.SINGLE_LINE_COMMENT = "<single-line-comment>", t.MULTILINE_COMMENT = "<multiline-comment>", t))(h || {});
-function on(t) {
+import g, { last as Ve, forIn as Ge, partition as Pt, head as ln, findLastIndex as cn } 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.TILDE = "<tilde>", t.SINGLE_LINE_COMMENT = "<single-line-comment>", t.MULTILINE_COMMENT = "<multiline-comment>", t))(u || {});
+function un(t) {
   switch (t.kind) {
     case "<newline>":
     case "<space>":
@@ -12,7 +12,7 @@ function on(t) {
       return !1;
   }
 }
-function Et(t) {
+function hn(t) {
   if (!t)
     return !1;
   switch (t) {
@@ -33,38 +33,38 @@ function Et(t) {
       return !1;
   }
 }
-function Nt(t) {
+function Et(t) {
   return t !== void 0 && t.kind === "<op>";
 }
-class K {
+class Q {
   constructor(e, n, s, i, a) {
     this.kind = e, this.startPos = n, this.endPos = s, this.value = i, this.leadingTrivia = [], this.trailingTrivia = [], this.leadingInvalid = [], this.trailingInvalid = [], this.isInvalid = a, this.start = n.offset, this.end = s.offset;
   }
   static create(e, n, s, i, a) {
-    return new K(e, n, s, i, a);
+    return new Q(e, n, s, i, a);
   }
 }
-function xt(t) {
-  return t.trailingTrivia.find(({ kind: e }) => e === h.NEWLINE) !== void 0;
+function St(t) {
+  return t.trailingTrivia.find(({ kind: e }) => e === u.NEWLINE) !== void 0;
 }
-function Tt(t, e) {
-  return e.leadingTrivia.find(({ kind: s }) => s === h.NEWLINE) !== void 0 || xt(t);
+function Nt(t, e) {
+  return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || St(t);
 }
 function et(t) {
-  return t.trailingTrivia.find(({ kind: e }) => [h.SPACE, h.TAB].includes(e)) !== void 0;
+  return t.trailingTrivia.find(({ kind: e }) => [u.SPACE, u.TAB].includes(e)) !== void 0;
 }
 function Dt(t) {
   return t.trailingTrivia.length === 0 ? t.end : Dt(Ve(t.trailingTrivia));
 }
-function Ot(t) {
-  return t.leadingTrivia.length === 0 ? t.start : Ot(t.leadingTrivia[0]);
+function xt(t) {
+  return t.leadingTrivia.length === 0 ? t.start : xt(t.leadingTrivia[0]);
 }
-function ln(t) {
-  return [h.SINGLE_LINE_COMMENT, h.MULTILINE_COMMENT].includes(
+function fn(t) {
+  return [u.SINGLE_LINE_COMMENT, u.MULTILINE_COMMENT].includes(
     t.kind
   );
 }
-class cn {
+class pn {
   constructor() {
     this.id = 0;
   }
@@ -75,32 +75,32 @@ class cn {
     return this.id++;
   }
 }
-class D {
+class x {
   // 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((r) => r !== void 0 && !Number.isNaN(r.start));
-    i ? (this.startPos = i.startPos, this.fullStart = i instanceof K ? Ot(i) : i.fullStart) : (this.startPos = {
+    i ? (this.startPos = i.startPos, this.fullStart = i instanceof Q ? xt(i) : i.fullStart) : (this.startPos = {
       offset: NaN,
       column: NaN,
       line: NaN
     }, this.fullStart = NaN);
     const a = [...s].reverse().find((r) => r !== void 0 && !Number.isNaN(r.end));
-    a ? (this.endPos = a.endPos, this.fullEnd = a instanceof K ? Dt(a) : a.fullEnd) : (this.endPos = {
+    a ? (this.endPos = a.endPos, this.fullEnd = a instanceof Q ? Dt(a) : a.fullEnd) : (this.endPos = {
       offset: NaN,
       column: NaN,
       line: NaN
     }, this.fullEnd = NaN), this.start = this.startPos.offset, this.end = this.endPos.offset;
   }
 }
-var Le = /* @__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.PARTIAL_INJECTION = "<partial-injection>", t))(Le || {});
-class Z extends D {
+var me = /* @__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.PARTIAL_INJECTION = "<partial-injection>", t))(me || {});
+class K extends x {
   constructor({ body: e = [], eof: n }, s) {
     super(s, "<program>", [...e, n]), this.body = e, this.eof = n;
   }
 }
-class y extends D {
+class y extends x {
   constructor({
     type: e,
     name: n,
@@ -109,8 +109,8 @@ class y extends D {
     attributeList: a,
     bodyColon: r,
     body: c
-  }, p) {
-    if (super(p, "<element-declaration>", [
+  }, f) {
+    if (super(f, "<element-declaration>", [
       e,
       n,
       s,
@@ -123,12 +123,12 @@ class y extends D {
     this.type = e, this.name = n, this.as = s, this.alias = i, this.attributeList = a, this.bodyColon = r, this.body = c;
   }
 }
-class ne extends D {
+class ne extends x {
   constructor({ identifiers: e = [] }, n) {
     super(n, "<identifer-stream>", e || []), this.identifiers = e;
   }
 }
-class se extends D {
+class se extends x {
   constructor({
     name: e,
     colon: n,
@@ -137,12 +137,12 @@ class se extends D {
     super(i, "<attribute>", [e, n, s]), this.name = e, this.value = s, this.colon = n;
   }
 }
-class ae extends D {
+class Z extends x {
   constructor({ op: e, expression: n }, s) {
     super(s, "<prefix-expression>", [e, n]), this.op = e, this.expression = n;
   }
 }
-class ce extends D {
+class le extends x {
   constructor({
     op: e,
     leftExpression: n,
@@ -151,22 +151,22 @@ class ce extends D {
     super(i, "<infix-expression>", [n, e, s]), this.op = e, this.leftExpression = n, this.rightExpression = s;
   }
 }
-class Ye extends D {
+class qe extends x {
   constructor({ op: e, expression: n }, s) {
     super(s, "<postfix-expression>", [n, e]), this.op = e, this.expression = n;
   }
 }
-class ue extends D {
+class ue extends x {
   constructor({ value: e }, n) {
     super(n, "<function-expression>", [e]), this.value = e;
   }
 }
-class w extends D {
+class w extends x {
   constructor({ callee: e, args: n = [] }, s) {
     super(s, "<function-application>", [e, ...n]), this.callee = e, this.args = n;
   }
 }
-class oe extends D {
+class oe extends x {
   constructor({
     blockOpenBrace: e,
     body: n = [],
@@ -175,12 +175,12 @@ class oe extends D {
     super(i, "<block-expression>", [e, ...n, s]), this.blockOpenBrace = e, this.body = n, this.blockCloseBrace = s;
   }
 }
-class Ae extends D {
+class be extends x {
   constructor({ op: e, partial: n }, s) {
     super(s, "<partial-injection>", [e, n]), this.partial = n;
   }
 }
-class M extends D {
+class M extends x {
   constructor({
     listOpenBracket: e,
     elementList: n = [],
@@ -189,12 +189,12 @@ class M extends D {
   }, a) {
     super(a, "<list-expression>", [
       e,
-      ...Rt(n, s),
+      ...Ot(n, s),
       i
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
 }
-class pe extends D {
+class ce extends x {
   constructor({
     tupleOpenParen: e,
     elementList: n = [],
@@ -203,12 +203,12 @@ class pe extends D {
   }, a) {
     super(a, "<tuple-expression>", [
       e,
-      ...Rt(n, s),
+      ...Ot(n, s),
       i
     ]), this.tupleOpenParen = e, this.elementList = n, this.commaList = s, this.tupleCloseParen = i;
   }
 }
-class tt extends pe {
+class nt extends ce {
   constructor({
     groupOpenParen: e,
     expression: n,
@@ -225,7 +225,7 @@ class tt extends pe {
     ), this.kind = "<group-expression>";
   }
 }
-class q extends D {
+class ee extends x {
   constructor({
     callee: e,
     argumentList: n
@@ -233,33 +233,33 @@ class q extends D {
     super(s, "<call-expression>", [e, n]), this.callee = e, this.argumentList = n;
   }
 }
-class ye extends D {
+class ye extends x {
   constructor({ literal: e }, n) {
     super(n, "<literal>", [e]), this.literal = e;
   }
 }
-class re extends D {
+class re extends x {
   constructor({ variable: e }, n) {
     super(n, "<variable>", [e]), this.variable = e;
   }
 }
-class j extends D {
+class j extends x {
   constructor({ expression: e }, n) {
     super(n, "<primary-expression>", [e]), this.expression = e;
   }
 }
-class Me extends D {
+class Me extends x {
   constructor({ pre: e }, n) {
-    const s = K.create(h.SPACE, e.endPos, e.endPos, " ", !1);
+    const s = Q.create(u.SPACE, e.endPos, e.endPos, " ", !1);
     super(n, "<dummy>", [s]);
   }
 }
-class he extends D {
+class Ie extends x {
   constructor({ expression: e, indexer: n }, s) {
     super(s, "<array>", [e, n]), this.array = e, this.indexer = n;
   }
 }
-function Rt(t, e) {
+function Ot(t, e) {
   if (!t || t.length === 0)
     return e || [];
   if (!e || e.length === 0)
@@ -269,12 +269,12 @@ function Rt(t, e) {
     (i) => i !== null
   );
 }
-function xs(t, e = !1) {
+function Ss(t, e = !1) {
   return JSON.stringify(
     t,
     function(n, s) {
       var i;
-      return !(this instanceof Z) && n === "symbol" ? s == null ? void 0 : s.id : (
+      return !(this instanceof K) && n === "symbol" ? s == null ? void 0 : s.id : (
         /* this instanceof SyntaxNode && */
         n === "symbol" ? {
           symbolTable: s == null ? void 0 : s.symbolTable,
@@ -340,81 +340,81 @@ class S {
   }
 }
 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.TablePartial = "TablePartial", t.TablePartialInjection = "TablePartialInjection", t))(m || {});
-function nt(t) {
+function st(t) {
   return `Schema:${t}`;
 }
-function Ge(t) {
+function Ce(t) {
   return `Table:${t}`;
 }
-function qe(t) {
+function He(t) {
   return `Column:${t}`;
 }
-function st(t) {
+function it(t) {
   return `Enum:${t}`;
 }
-function it(t) {
+function at(t) {
   return `Enum field:${t}`;
 }
-function at(t) {
+function rt(t) {
   return `TableGroup:${t}`;
 }
-function rt(t) {
+function ot(t) {
   return `TableGroup field:${t}`;
 }
-function un(t) {
+function dn(t) {
   return `Note:${t}`;
 }
-function ot(t) {
+function lt(t) {
   return `TablePartial:${t}`;
 }
-function Ut(t) {
+function Rt(t) {
   return `TablePartialInjection:${t}`;
 }
 function Fe(t, e) {
   switch (e) {
     case "Column":
-      return qe(t);
+      return He(t);
     case "Enum":
-      return st(t);
-    case "Enum field":
       return it(t);
+    case "Enum field":
+      return at(t);
     case "Schema":
-      return nt(t);
+      return st(t);
     case "Table":
-      return Ge(t);
+      return Ce(t);
     case "TableGroup":
-      return at(t);
-    case "TableGroup field":
       return rt(t);
-    case "TablePartial":
+    case "TableGroup field":
       return ot(t);
+    case "TablePartial":
+      return lt(t);
     default:
       throw new Error("Unreachable");
   }
 }
-function le(t) {
+function ie(t) {
   const [e, n] = t.split(":");
   return Object.values(m).includes(e) ? new U({
     name: n,
     kind: e
   }) : new S();
 }
-function hn(t) {
-  const e = le(t).unwrap_or(void 0);
+function En(t) {
+  const e = ie(t).unwrap_or(void 0);
   if (!e)
     return !1;
   const { kind: n, name: s } = e;
   return n === "Schema" && s === "public";
 }
-function fn(t) {
-  const e = le(t).unwrap_or(void 0);
+function Nn(t) {
+  const e = ie(t).unwrap_or(void 0);
   if (!e)
     return !1;
   const { kind: n } = e;
   return n === "TablePartialInjection";
 }
-function pn(t) {
-  const e = le(t).unwrap_or(void 0);
+function Tn(t) {
+  const e = ie(t).unwrap_or(void 0);
   if (!e)
     return null;
   const { kind: n, name: s } = e;
@@ -424,7 +424,7 @@ function pn(t) {
     /* TablePartial */
   ) : null;
 }
-class dn {
+class mn {
   constructor() {
     this.id = 0;
   }
@@ -435,87 +435,87 @@ class dn {
     return this.id++;
   }
 }
-class Mt {
+class Ut {
   constructor({ symbolTable: e }, n) {
     this.references = [], this.id = n, this.symbolTable = e;
   }
 }
-class En {
+class bn {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class Nn {
+class In {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class Ft {
+class Mt {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class lt {
+class ct {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class Tn {
+class Ln {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class mn {
+class An {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class bn {
+class _n {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class In {
+class gn {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class Ln {
+class vn {
   constructor({ injectorFieldSymbol: e, injectorDeclaration: n }, s) {
     this.references = [], this.id = s, this.injectorDeclaration = n, this.injectorFieldSymbol = e;
   }
 }
-function An(t) {
+function wn(t) {
   return [
-    nt,
-    Ge,
     st,
-    at,
-    qe,
+    Ce,
     it,
     rt,
+    He,
+    at,
     ot,
-    Ut
+    lt,
+    Rt
   ].map((e) => e(t));
 }
-function _n(t) {
-  return t instanceof lt ? Ln : null;
+function yn(t) {
+  return t instanceof ct ? vn : null;
 }
 function ze(t) {
   return !!t.match(/(\p{L}|_|\p{M})/gu);
 }
-function Ce(t) {
+function Xe(t) {
   const [e] = t;
   return e >= "0" && e <= "9";
 }
-function gn(t) {
+function kn(t) {
   const [e] = t;
-  return Ce(e) || ze(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
+  return Xe(e) || ze(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
 function ve(t) {
-  return ze(t) || Ce(t);
+  return ze(t) || Xe(t);
 }
-function mt(t, e) {
+function Tt(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]);
@@ -524,13 +524,21 @@ function mt(t, e) {
 function Se(t, e) {
   return t >= e.start && t < e.end;
 }
+function Ft(t) {
+  var e;
+  return t instanceof Z ? `${(e = t.op) == null ? void 0 : e.value}${Ft(t.expression)}` : t.expression.literal.value;
+}
+function tt(t) {
+  var e;
+  return t instanceof Z ? ((e = t.op) == null ? void 0 : e.value) === "-" ? -tt(t.expression) : tt(t.expression) : Number.parseFloat(t.expression.literal.value);
+}
 var o = /* @__PURE__ */ ((t) => (t[t.UNKNOWN_SYMBOL = 1e3] = "UNKNOWN_SYMBOL", t[t.UNEXPECTED_SYMBOL = 1001] = "UNEXPECTED_SYMBOL", t[t.UNEXPECTED_EOF = 1002] = "UNEXPECTED_EOF", t[t.UNEXPECTED_NEWLINE = 1003] = "UNEXPECTED_NEWLINE", t[t.UNKNOWN_TOKEN = 1004] = "UNKNOWN_TOKEN", t[t.UNEXPECTED_TOKEN = 1005] = "UNEXPECTED_TOKEN", t[t.UNEXPECTED_ELEMENT_DECLARATION = 1006] = "UNEXPECTED_ELEMENT_DECLARATION", t[t.MISSING_SPACES = 1007] = "MISSING_SPACES", t[t.UNKNOWN_PREFIX_OP = 1008] = "UNKNOWN_PREFIX_OP", t[t.INVALID_OPERAND = 1009] = "INVALID_OPERAND", t[t.EMPTY_ATTRIBUTE_NAME = 1010] = "EMPTY_ATTRIBUTE_NAME", t[t.INVALID_ESCAPE_SEQUENCE = 1011] = "INVALID_ESCAPE_SEQUENCE", t[t.INVALID_NAME = 3e3] = "INVALID_NAME", t[t.UNEXPECTED_NAME = 3001] = "UNEXPECTED_NAME", t[t.NAME_NOT_FOUND = 3002] = "NAME_NOT_FOUND", t[t.DUPLICATE_NAME = 3003] = "DUPLICATE_NAME", t[t.INVALID_ALIAS = 3004] = "INVALID_ALIAS", t[t.UNEXPECTED_ALIAS = 3005] = "UNEXPECTED_ALIAS", t[t.UNEXPECTED_SETTINGS = 3006] = "UNEXPECTED_SETTINGS", t[t.INVALID_SETTINGS = 3007] = "INVALID_SETTINGS", t[t.UNEXPECTED_SIMPLE_BODY = 3008] = "UNEXPECTED_SIMPLE_BODY", t[t.UNEXPECTED_COMPLEX_BODY = 3009] = "UNEXPECTED_COMPLEX_BODY", t[t.INVALID_TABLE_CONTEXT = 3010] = "INVALID_TABLE_CONTEXT", t[t.INVALID_TABLE_SETTING = 3011] = "INVALID_TABLE_SETTING", t[t.DUPLICATE_TABLE_SETTING = 3012] = "DUPLICATE_TABLE_SETTING", t[t.INVALID_TABLEGROUP_CONTEXT = 3013] = "INVALID_TABLEGROUP_CONTEXT", t[t.INVALID_TABLEGROUP_ELEMENT_NAME = 3014] = "INVALID_TABLEGROUP_ELEMENT_NAME", t[t.DUPLICATE_TABLEGROUP_ELEMENT_NAME = 3015] = "DUPLICATE_TABLEGROUP_ELEMENT_NAME", t[t.DUPLICATE_TABLEGROUP_FIELD_NAME = 3016] = "DUPLICATE_TABLEGROUP_FIELD_NAME", t[t.INVALID_TABLEGROUP_FIELD = 3017] = "INVALID_TABLEGROUP_FIELD", t[t.EMPTY_TABLE = 3018] = "EMPTY_TABLE", t[t.INVALID_COLUMN = 3019] = "INVALID_COLUMN", t[t.INVALID_COLUMN_NAME = 3020] = "INVALID_COLUMN_NAME", t[t.UNKNOWN_COLUMN_SETTING = 3021] = "UNKNOWN_COLUMN_SETTING", t[t.INVALID_COLUMN_TYPE = 3022] = "INVALID_COLUMN_TYPE", t[t.DUPLICATE_COLUMN_NAME = 3023] = "DUPLICATE_COLUMN_NAME", t[t.DUPLICATE_COLUMN_SETTING = 3024] = "DUPLICATE_COLUMN_SETTING", t[t.INVALID_COLUMN_SETTING_VALUE = 3025] = "INVALID_COLUMN_SETTING_VALUE", t[t.INVALID_ENUM_CONTEXT = 3026] = "INVALID_ENUM_CONTEXT", t[t.INVALID_ENUM_ELEMENT_NAME = 3027] = "INVALID_ENUM_ELEMENT_NAME", t[t.INVALID_ENUM_ELEMENT = 3028] = "INVALID_ENUM_ELEMENT", t[t.DUPLICATE_ENUM_ELEMENT_NAME = 3029] = "DUPLICATE_ENUM_ELEMENT_NAME", t[t.UNKNOWN_ENUM_ELEMENT_SETTING = 3030] = "UNKNOWN_ENUM_ELEMENT_SETTING", t[t.DUPLICATE_ENUM_ELEMENT_SETTING = 3031] = "DUPLICATE_ENUM_ELEMENT_SETTING", t[t.INVALID_ENUM_ELEMENT_SETTING = 3032] = "INVALID_ENUM_ELEMENT_SETTING", t[t.EMPTY_ENUM = 3033] = "EMPTY_ENUM", t[t.INVALID_REF_CONTEXT = 3034] = "INVALID_REF_CONTEXT", t[t.UNKNOWN_REF_SETTING = 3035] = "UNKNOWN_REF_SETTING", t[t.DUPLICATE_REF_SETTING = 3036] = "DUPLICATE_REF_SETTING", t[t.INVALID_REF_SETTING_VALUE = 3037] = "INVALID_REF_SETTING_VALUE", t[t.INVALID_REF_RELATIONSHIP = 3038] = "INVALID_REF_RELATIONSHIP", t[t.INVALID_REF_FIELD = 3039] = "INVALID_REF_FIELD", t[t.EMPTY_REF = 3040] = "EMPTY_REF", t[t.REF_REDEFINED = 3041] = "REF_REDEFINED", t[t.INVALID_NOTE_CONTEXT = 3042] = "INVALID_NOTE_CONTEXT", t[t.INVALID_NOTE = 3043] = "INVALID_NOTE", t[t.NOTE_REDEFINED = 3044] = "NOTE_REDEFINED", t[t.NOTE_CONTENT_REDEFINED = 3045] = "NOTE_CONTENT_REDEFINED", t[t.EMPTY_NOTE = 3046] = "EMPTY_NOTE", t[t.INVALID_INDEXES_CONTEXT = 3047] = "INVALID_INDEXES_CONTEXT", t[t.INVALID_INDEXES_FIELD = 3048] = "INVALID_INDEXES_FIELD", t[t.INVALID_INDEX = 3049] = "INVALID_INDEX", t[t.UNKNOWN_INDEX_SETTING = 3050] = "UNKNOWN_INDEX_SETTING", t[t.DUPLICATE_INDEX_SETTING = 3051] = "DUPLICATE_INDEX_SETTING", t[t.UNEXPECTED_INDEX_SETTING_VALUE = 3052] = "UNEXPECTED_INDEX_SETTING_VALUE", t[t.INVALID_INDEX_SETTING_VALUE = 3053] = "INVALID_INDEX_SETTING_VALUE", t[t.INVALID_PROJECT_CONTEXT = 3054] = "INVALID_PROJECT_CONTEXT", t[t.PROJECT_REDEFINED = 3055] = "PROJECT_REDEFINED", t[t.INVALID_PROJECT_FIELD = 3056] = "INVALID_PROJECT_FIELD", t[t.INVALID_CUSTOM_CONTEXT = 3057] = "INVALID_CUSTOM_CONTEXT", t[t.INVALID_CUSTOM_ELEMENT_VALUE = 3058] = "INVALID_CUSTOM_ELEMENT_VALUE", t[t.INVALID_ELEMENT_IN_SIMPLE_BODY = 3059] = "INVALID_ELEMENT_IN_SIMPLE_BODY", t[t.INVALID_TABLE_PARTIAL_CONTEXT = 3060] = "INVALID_TABLE_PARTIAL_CONTEXT", t[t.INVALID_TABLE_PARTIAL_ELEMENT_NAME = 3061] = "INVALID_TABLE_PARTIAL_ELEMENT_NAME", t[t.INVALID_TABLE_PARTIAL_SETTING = 3062] = "INVALID_TABLE_PARTIAL_SETTING", t[t.DUPLICATE_TABLE_PARTIAL_ELEMENT_NAME = 3063] = "DUPLICATE_TABLE_PARTIAL_ELEMENT_NAME", t[t.DUPLICATE_TABLE_PARTIAL_SETTING = 3064] = "DUPLICATE_TABLE_PARTIAL_SETTING", t[t.INVALID_TABLE_PARTIAL_INJECTION = 3065] = "INVALID_TABLE_PARTIAL_INJECTION", t[t.INVALID_TABLE_PARTIAL_INJECTION_OP = 3066] = "INVALID_TABLE_PARTIAL_INJECTION_OP", t[t.INVALID_TABLE_PARTIAL_INJECTION_NAME = 3067] = "INVALID_TABLE_PARTIAL_INJECTION_NAME", t[t.DUPLICATE_TABLE_PARTIAL_INJECTION_NAME = 3068] = "DUPLICATE_TABLE_PARTIAL_INJECTION_NAME", t[t.BINDING_ERROR = 4e3] = "BINDING_ERROR", t[t.UNSUPPORTED = 5e3] = "UNSUPPORTED", t[t.CIRCULAR_REF = 5001] = "CIRCULAR_REF", t[t.SAME_ENDPOINT = 5002] = "SAME_ENDPOINT", t[t.UNEQUAL_FIELDS_BINARY_REF = 5003] = "UNEQUAL_FIELDS_BINARY_REF", t[t.CONFLICTING_SETTING = 5004] = "CONFLICTING_SETTING", t[t.TABLE_REAPPEAR_IN_TABLEGROUP = 5005] = "TABLE_REAPPEAR_IN_TABLEGROUP", t))(o || {});
 class l extends Error {
   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);
   }
 }
-class z {
+class J {
   constructor(e, n) {
     this.value = e, this.errors = n === void 0 ? [] : n;
   }
@@ -542,14 +550,14 @@ class z {
   }
   chain(e) {
     const n = e(this.value), s = [...this.errors, ...n.errors];
-    return new z(n.value, s);
+    return new J(n.value, s);
   }
   map(e) {
-    return new z(e(this.value), this.errors);
+    return new J(e(this.value), this.errors);
   }
 }
-function vn(t, e, n) {
-  if (!t || !fe(t) || e.length === 0)
+function Pn(t, e, n) {
+  if (!t || !Ne(t) || e.length === 0)
     return new S();
   const s = [...e], i = Ze(t).unwrap(), a = s.pop();
   if (!(a instanceof oe))
@@ -579,35 +587,35 @@ function vn(t, e, n) {
     })
   ) : new S();
 }
-function bt(t) {
-  return t.kind === h.IDENTIFIER && t.value === "as";
+function mt(t) {
+  return t.kind === u.IDENTIFIER && t.value === "as";
 }
 function b(t) {
-  t && (t instanceof K ? wn(t) : yn(t));
+  t && (t instanceof Q ? Sn(t) : Dn(t));
 }
-function wn(t) {
-  t.kind !== h.EOF && (t.isInvalid = !0);
+function Sn(t) {
+  t.kind !== u.EOF && (t.isInvalid = !0);
 }
-function yn(t) {
+function Dn(t) {
   if (t instanceof y)
     b(t.type), b(t.name), b(t.as), b(t.alias), b(t.bodyColon), b(t.attributeList), b(t.body);
   else if (t instanceof ne)
     t.identifiers.forEach(b);
   else if (t instanceof se)
     b(t.name), b(t.colon), b(t.value);
-  else if (t instanceof ae)
+  else if (t instanceof Z)
     b(t.op), b(t.expression);
-  else if (t instanceof ce)
+  else if (t instanceof le)
     b(t.leftExpression), b(t.op), b(t.rightExpression);
-  else if (t instanceof Ye)
+  else if (t instanceof qe)
     b(t.op), b(t.expression);
   else if (t instanceof oe)
     b(t.blockOpenBrace), t.body.forEach(b), b(t.blockCloseBrace);
   else if (t instanceof M)
     b(t.listOpenBracket), t.commaList.forEach(b), t.elementList.forEach(b), b(t.listCloseBracket);
-  else if (t instanceof pe)
+  else if (t instanceof ce)
     b(t.tupleOpenParen), t.commaList.forEach(b), t.elementList.forEach(b), b(t.tupleCloseParen);
-  else if (t instanceof q)
+  else if (t instanceof ee)
     b(t.callee), b(t.argumentList);
   else if (t instanceof w)
     b(t.callee), t.args.forEach(b);
@@ -620,19 +628,19 @@ function yn(t) {
   else if (t instanceof ye)
     b(t.literal);
   else
-    throw t instanceof tt ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
+    throw t instanceof nt ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
 }
 function Bt(t) {
   return !!(t != null && t.isInvalid);
 }
-function X(...t) {
+function C(...t) {
   return t.filter((e) => e !== void 0);
 }
-function kn(t) {
-  if (t instanceof Z)
-    return X(...t.body, t.eof);
+function xn(t) {
+  if (t instanceof K)
+    return C(...t.body, t.eof);
   if (t instanceof y)
-    return X(
+    return C(
       t.type,
       t.name,
       t.as,
@@ -642,67 +650,67 @@ function kn(t) {
       t.body
     );
   if (t instanceof se)
-    return X(t.name, t.colon, t.value);
+    return C(t.name, t.colon, t.value);
   if (t instanceof ne)
     return t.identifiers;
   if (t instanceof ye)
     return t.literal ? [t.literal] : [];
   if (t instanceof re)
-    return X(t.variable);
-  if (t instanceof ae)
-    return X(t.op, t.expression);
-  if (t instanceof ce)
-    return X(t.leftExpression, t.op, t.rightExpression);
-  if (t instanceof Ye)
-    return X(t.expression, t.op);
+    return C(t.variable);
+  if (t instanceof Z)
+    return C(t.op, t.expression);
+  if (t instanceof le)
+    return C(t.leftExpression, t.op, t.rightExpression);
+  if (t instanceof qe)
+    return C(t.expression, t.op);
   if (t instanceof ue)
-    return X(t.value);
+    return C(t.value);
   if (t instanceof w)
-    return X(t.callee, ...t.args);
+    return C(t.callee, ...t.args);
   if (t instanceof oe)
-    return X(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
+    return C(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
   if (t instanceof M)
-    return X(
+    return C(
       t.listOpenBracket,
-      ...mt(t.elementList, t.commaList),
+      ...Tt(t.elementList, t.commaList),
       t.listCloseBracket
     );
-  if (t instanceof pe)
-    return X(
+  if (t instanceof ce)
+    return C(
       t.tupleOpenParen,
-      ...mt(t.elementList, t.commaList),
+      ...Tt(t.elementList, t.commaList),
       t.tupleCloseParen
     );
-  if (t instanceof q)
-    return X(t.callee, t.argumentList);
+  if (t instanceof ee)
+    return C(t.callee, t.argumentList);
   if (t instanceof j)
-    return X(t.expression);
-  if (t instanceof he)
-    return X(
+    return C(t.expression);
+  if (t instanceof Ie)
+    return C(
       t.array,
       t.indexer
     );
-  if (t instanceof Ae)
-    return X(t.partial);
-  throw t instanceof tt ? new Error("This case is already handled by TupleExpressionNode") : new Error("Unreachable - no other possible cases");
+  if (t instanceof be)
+    return C(t.partial);
+  throw t instanceof nt ? new Error("This case is already handled by TupleExpressionNode") : new Error("Unreachable - no other possible cases");
 }
 function Ze(t) {
-  return W(t) ? new U(t.expression.variable) : new S();
+  return $(t) ? new U(t.expression.variable) : new S();
 }
-function C(t) {
+function Y(t) {
   var e;
-  return t instanceof j && (t.expression instanceof re && t.expression.variable instanceof K && t.expression.variable.kind === h.QUOTED_STRING || t.expression instanceof ye && ((e = t.expression.literal) == null ? void 0 : e.kind) === h.STRING_LITERAL);
+  return t instanceof j && (t.expression instanceof re && t.expression.variable instanceof Q && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof ye && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
 }
-function W(t) {
-  return t instanceof j && t.expression instanceof re && t.expression.variable instanceof K;
+function $(t) {
+  return t instanceof j && t.expression instanceof re && t.expression.variable instanceof Q;
 }
-function fe(t) {
+function Ne(t) {
   var e;
-  return t instanceof j && t.expression instanceof re && ((e = t.expression.variable) == null ? void 0 : e.kind) === h.IDENTIFIER;
+  return t instanceof j && t.expression instanceof re && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
 }
-function He(t) {
+function ut(t) {
   var e;
-  return t instanceof ce && t.leftExpression instanceof D && t.rightExpression instanceof D && ((e = t.op) == null ? void 0 : e.value) === ".";
+  return t instanceof le && t.leftExpression instanceof x && t.rightExpression instanceof x && ((e = t.op) == null ? void 0 : e.value) === ".";
 }
 function we(t) {
   if (t === void 0)
@@ -710,7 +718,7 @@ function we(t) {
   const e = t.identifiers.map((n) => n.value).join(" ");
   return e === "" ? new S() : new U(e);
 }
-class Pn {
+class On {
   // list of errors during lexing
   constructor(e) {
     this.start = {
@@ -750,7 +758,7 @@ class Pn {
     this.tokens.push(this.createToken(e, n));
   }
   createToken(e, n = !1) {
-    return K.create(
+    return Q.create(
       e,
       this.start,
       this.current,
@@ -759,53 +767,53 @@ class Pn {
     );
   }
   lex() {
-    return this.scanTokens(), this.tokens.push(K.create(h.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new z(this.tokens, this.errors);
+    return this.scanTokens(), this.tokens.push(Q.create(u.EOF, this.start, this.current, "", !1)), this.gatherTrivia(), this.gatherInvalid(), new J(this.tokens, this.errors);
   }
   scanTokens() {
     for (; !this.isAtEnd(); ) {
       const e = this.advance();
       switch (e) {
         case " ":
-          this.addToken(h.SPACE);
+          this.addToken(u.SPACE);
           break;
         case "\r":
           break;
         case `
 `:
-          this.addToken(h.NEWLINE);
+          this.addToken(u.NEWLINE);
           break;
         case "	":
-          this.addToken(h.TAB);
+          this.addToken(u.TAB);
           break;
         case ",":
-          this.addToken(h.COMMA);
+          this.addToken(u.COMMA);
           break;
         case "(":
-          this.addToken(h.LPAREN);
+          this.addToken(u.LPAREN);
           break;
         case ")":
-          this.addToken(h.RPAREN);
+          this.addToken(u.RPAREN);
           break;
         case "[":
-          this.addToken(h.LBRACKET);
+          this.addToken(u.LBRACKET);
           break;
         case "]":
-          this.addToken(h.RBRACKET);
+          this.addToken(u.RBRACKET);
           break;
         case "{":
-          this.addToken(h.LBRACE);
+          this.addToken(u.LBRACE);
           break;
         case "}":
-          this.addToken(h.RBRACE);
+          this.addToken(u.RBRACE);
           break;
         case ";":
-          this.addToken(h.SEMICOLON);
+          this.addToken(u.SEMICOLON);
           break;
         case ":":
-          this.addToken(h.COLON);
+          this.addToken(u.COLON);
           break;
         case "~":
-          this.addToken(h.TILDE);
+          this.addToken(u.TILDE);
           break;
         case "'":
           this.match("''") ? this.multilineStringLiteral() : this.singleLineStringLiteral();
@@ -820,26 +828,26 @@ class Pn {
           this.colorLiteral();
           break;
         case "/":
-          this.match("/") ? this.singleLineComment() : this.match("*") ? this.multilineComment() : this.operator();
+          this.match("/") ? this.singleLineComment() : this.match("*") ? this.multilineComment() : this.operator(e);
           break;
         default:
-          if (Et(e)) {
-            this.operator();
+          if (hn(e)) {
+            this.operator(e);
             break;
           }
           if (ze(e)) {
             this.identifier();
             break;
           }
-          if (Ce(e)) {
+          if (Xe(e)) {
             this.numericLiteralOrIdentifier();
             break;
           }
-          this.addToken(h.OP, !0), this.errors.push(
+          this.addToken(u.OP, !0), this.errors.push(
             new l(
               o.UNKNOWN_SYMBOL,
               `Unexpected token '${e}'`,
-              this.createToken(h.OP, !0)
+              this.createToken(u.OP, !0)
             )
           );
           break;
@@ -851,7 +859,7 @@ class Pn {
     let e = !0, n = [], s;
     const i = [];
     for (const a of this.tokens)
-      on(a) ? (n.push(a), a.kind === h.NEWLINE && s && (s.trailingTrivia = n, e = !0, s = void 0, n = [])) : (e ? a.leadingTrivia = n : s.trailingTrivia = n, i.push(a), n = [], s = a, e = !1);
+      un(a) ? (n.push(a), a.kind === u.NEWLINE && s && (s.trailingTrivia = n, e = !0, s = void 0, n = [])) : (e ? a.leadingTrivia = n : s.trailingTrivia = n, i.push(a), n = [], s = a, e = !1);
     this.tokens = i;
   }
   gatherInvalid() {
@@ -881,56 +889,56 @@ class Pn {
 `)) && !this.check(n); )
       this.peek() === "\\" && !a ? (this.advance(), c += this.escapedString()) : c += this.advance();
     if (this.isAtEnd() && !i) {
-      const p = this.createToken(e, !0);
-      this.tokens.push(p), this.errors.push(
-        new l(o.UNEXPECTED_EOF, "EOF reached while parsing", p)
+      const f = this.createToken(e, !0);
+      this.tokens.push(f), this.errors.push(
+        new l(o.UNEXPECTED_EOF, "EOF reached while parsing", f)
       );
       return;
     }
     if (this.check(`
 `) && !s) {
-      const p = this.createToken(e, !0);
-      this.tokens.push(p), this.errors.push(
+      const f = this.createToken(e, !0);
+      this.tokens.push(f), this.errors.push(
         new l(
           o.UNEXPECTED_NEWLINE,
           "Invalid newline encountered while parsing",
-          p
+          f
         )
       );
       return;
     }
-    r && this.match(n), this.tokens.push(K.create(e, this.start, this.current, c, !1));
+    r && this.match(n), this.tokens.push(Q.create(e, this.start, this.current, c, !1));
   }
   singleLineStringLiteral() {
-    this.consumeUntil(h.STRING_LITERAL, "'", {
+    this.consumeUntil(u.STRING_LITERAL, "'", {
       allowNewline: !1,
       allowEof: !1,
       raw: !1
     });
   }
   multilineStringLiteral() {
-    this.consumeUntil(h.STRING_LITERAL, "'''", {
+    this.consumeUntil(u.STRING_LITERAL, "'''", {
       allowNewline: !0,
       allowEof: !1,
       raw: !1
     });
   }
   functionExpression() {
-    this.consumeUntil(h.FUNCTION_EXPRESSION, "`", {
+    this.consumeUntil(u.FUNCTION_EXPRESSION, "`", {
       allowNewline: !1,
       allowEof: !1,
       raw: !0
     });
   }
   quotedVariable() {
-    this.consumeUntil(h.QUOTED_STRING, '"', {
+    this.consumeUntil(u.QUOTED_STRING, '"', {
       allowNewline: !1,
       allowEof: !1,
       raw: !1
     });
   }
   singleLineComment() {
-    this.consumeUntil(h.SINGLE_LINE_COMMENT, `
+    this.consumeUntil(u.SINGLE_LINE_COMMENT, `
 `, {
       allowNewline: !0,
       allowEof: !0,
@@ -939,7 +947,7 @@ class Pn {
     });
   }
   multilineComment() {
-    this.consumeUntil(h.MULTILINE_COMMENT, "*/", {
+    this.consumeUntil(u.MULTILINE_COMMENT, "*/", {
       allowNewline: !0,
       allowEof: !1,
       raw: !0
@@ -948,46 +956,58 @@ class Pn {
   identifier() {
     for (; !this.isAtEnd() && ve(this.peek()); )
       this.advance();
-    this.addToken(h.IDENTIFIER);
+    this.addToken(u.IDENTIFIER);
   }
-  operator() {
-    for (; Et(this.peek()); )
-      this.advance();
-    this.addToken(h.OP);
+  operator(e) {
+    switch (e) {
+      case "<":
+        [">", "="].includes(this.peek()) && this.advance();
+        break;
+      case ">":
+        this.peek() === "=" && this.advance();
+        break;
+      case "=":
+        this.peek() === "=" && this.advance();
+        break;
+      case "!":
+        this.peek() === "=" && this.advance();
+        break;
+    }
+    this.addToken(u.OP);
   }
   // we accept identifiers starting with digits but must contain at least one char or underscore
   numericLiteralOrIdentifier() {
     let e = 0;
     if (this.isAtEnd())
-      return this.addToken(h.NUMERIC_LITERAL);
+      return this.addToken(u.NUMERIC_LITERAL);
     for (; !this.isAtEnd(); ) {
       const n = this.check(".");
       if (e += n ? 1 : 0, e > 1)
         break;
       if (!n && this.current.offset === this.text.length - 1)
-        return this.advance(), this.addToken(h.NUMERIC_LITERAL);
+        return this.advance(), this.addToken(u.NUMERIC_LITERAL);
       if (!n && !ve(this.peek()))
-        return this.addToken(h.NUMERIC_LITERAL);
-      if (!n && !Ce(this.peek()))
+        return this.addToken(u.NUMERIC_LITERAL);
+      if (!n && !Xe(this.peek()))
         break;
       this.advance();
     }
     if (e > 0) {
       for (; !this.isAtEnd() && (this.check(".") || ve(this.peek())); )
         this.advance();
-      const n = this.createToken(h.NUMERIC_LITERAL, !0);
+      const n = this.createToken(u.NUMERIC_LITERAL, !0);
       this.tokens.push(n), this.errors.push(new l(o.UNKNOWN_TOKEN, "Invalid number", n));
     } else {
       for (; !this.isAtEnd() && ve(this.peek()); )
         this.advance();
-      const n = this.createToken(h.IDENTIFIER, !1);
+      const n = this.createToken(u.IDENTIFIER, !1);
       this.tokens.push(n);
     }
   }
   colorLiteral() {
     for (; !this.isAtEnd() && ve(this.peek()); )
       this.advance();
-    this.addToken(h.COLOR_LITERAL);
+    this.addToken(u.COLOR_LITERAL);
   }
   escapedString() {
     const e = { column: this.current.column - 1, offset: this.current.offset - 1, line: this.current.line };
@@ -1027,7 +1047,7 @@ class Pn {
         let n = "";
         for (let s = 0; s <= 3; s += 1) {
           if (this.isAtEnd() || !ve(this.peek()))
-            return this.errors.push(new l(o.INVALID_ESCAPE_SEQUENCE, `Invalid unicode escape sequence '\\u${n}', only unicode escape sequences of the form '\\uHHHH' where H is a hexadecimal number are allowed`, K.create(h.STRING_LITERAL, e, this.current, `\\u${n}`, !0))), `\\u${n}`;
+            return this.errors.push(new l(o.INVALID_ESCAPE_SEQUENCE, `Invalid unicode escape sequence '\\u${n}', only unicode escape sequences of the form '\\uHHHH' where H is a hexadecimal number are allowed`, Q.create(u.STRING_LITERAL, e, this.current, `\\u${n}`, !0))), `\\u${n}`;
           n += this.advance();
         }
         return String.fromCharCode(parseInt(n, 16));
@@ -1038,7 +1058,7 @@ class Pn {
   }
 }
 var Be = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(Be || {});
-class Sn {
+class Rn {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
   }
@@ -1079,7 +1099,7 @@ class Sn {
     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 h.COMMA:
+          case u.COMMA:
             if (this.isWithinGroupExpressionContext() || this.isWithinListExpressionContext())
               return [...this.stack].reverse().find(
                 (a) => [
@@ -1089,22 +1109,22 @@ class Sn {
                 ].includes(a)
               );
             break;
-          case h.RPAREN:
+          case u.RPAREN:
             if (this.isWithinGroupExpressionContext())
               return 1;
             break;
-          case h.RBRACE:
+          case u.RBRACE:
             if (this.isWithinBlockExpressionContext())
               return 2;
             break;
-          case h.RBRACKET:
+          case u.RBRACKET:
             if (this.isWithinListExpressionContext())
               return 0;
             break;
         }
   }
 }
-class xn {
+class Un {
   constructor(e) {
     this.generator = e;
   }
@@ -1112,191 +1132,191 @@ class xn {
     return new e(n, this.generator.nextId());
   }
 }
-class N {
+class T {
   constructor(e, n, s) {
     this.token = e, this.partialNode = n, this.handlerContext = s;
   }
 }
-class Dn {
+class Mn {
   constructor(e, n) {
-    this.current = 0, this.errors = [], this.contextStack = new Sn(), this.synchronizeProgram = () => {
+    this.current = 0, this.errors = [], this.contextStack = new Rn(), this.synchronizeProgram = () => {
       const s = this.peek();
-      s.kind !== h.EOF ? b(this.advance()) : (b(this.peek()), this.logError(s, o.UNEXPECTED_EOF, "Unexpected EOF"));
+      s.kind !== u.EOF ? b(this.advance()) : (b(this.peek()), this.logError(s, o.UNEXPECTED_EOF, "Unexpected EOF"));
     }, this.synchronizeElementDeclarationName = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (bt(s) || this.check(h.COLON, h.LBRACE, h.LBRACKET))
+        if (mt(s) || this.check(u.COLON, u.LBRACE, u.LBRACKET))
           break;
         b(s), this.advance();
       }
     }, this.synchronizeElementDeclarationAlias = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(h.COLON, h.LBRACE, h.LBRACKET))
+        if (this.check(u.COLON, u.LBRACE, u.LBRACKET))
           break;
         b(s), this.advance();
       }
     }, this.blockExpression = this.contextStack.withContextDo(Be.BlockExpression, () => {
       const s = { body: [] }, i = () => this.nodeFactory.create(oe, s);
       try {
-        this.consume("Expect an opening brace '{'", h.LBRACE), s.blockOpenBrace = this.previous();
+        this.consume("Expect an opening brace '{'", u.LBRACE), s.blockOpenBrace = this.previous();
       } catch (a) {
-        if (!(a instanceof N))
+        if (!(a instanceof T))
           throw a;
         if (s.blockOpenBrace = a.partialNode, !this.canHandle(a))
-          throw new N(a.token, i(), a.handlerContext);
+          throw new T(a.token, i(), a.handlerContext);
         this.synchronizeBlock();
       }
-      for (; !this.isAtEnd() && !this.check(h.RBRACE); )
+      for (; !this.isAtEnd() && !this.check(u.RBRACE); )
         try {
-          if (this.match(h.TILDE)) {
-            const a = this.previous(), r = this.variable(), c = this.nodeFactory.create(Ae, { op: a, partial: r });
+          if (this.match(u.TILDE)) {
+            const a = this.previous(), r = this.variable(), c = this.nodeFactory.create(be, { op: a, partial: r });
             s.body.push(c);
           } else
             s.body.push(this.canBeField() ? this.fieldDeclaration() : this.expression());
         } catch (a) {
-          if (!(a instanceof N))
+          if (!(a instanceof T))
             throw a;
           if (s.body.push(a.partialNode), !this.canHandle(a))
-            throw new N(a.token, i(), a.handlerContext);
+            throw new T(a.token, i(), a.handlerContext);
           this.synchronizeBlock();
         }
       try {
-        this.consume("Expect a closing brace '}'", h.RBRACE), s.blockCloseBrace = this.previous();
+        this.consume("Expect a closing brace '}'", u.RBRACE), s.blockCloseBrace = this.previous();
       } catch (a) {
-        if (!(a instanceof N))
+        if (!(a instanceof T))
           throw a;
         if (s.blockCloseBrace = a.partialNode, !this.canHandle(a))
-          throw new N(a.token, i(), a.handlerContext);
+          throw new T(a.token, i(), a.handlerContext);
         this.synchronizeBlock();
       }
       return i();
     }), this.synchronizeBlock = () => {
-      if (!this.check(h.RBRACE))
+      if (!this.check(u.RBRACE))
         for (b(this.advance()); !this.isAtEnd(); ) {
           const s = this.peek();
-          if (this.check(h.RBRACE) || Tt(this.previous(), s))
+          if (this.check(u.RBRACE) || Nt(this.previous(), s))
             break;
           b(s), this.advance();
         }
     }, this.tupleExpression = this.contextStack.withContextDo(Be.GroupExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(tt, {
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(nt, {
         groupOpenParen: s.tupleOpenParen,
         groupCloseParen: s.tupleCloseParen,
         expression: s.elementList[0]
-      }), a = () => this.nodeFactory.create(pe, s);
+      }), a = () => this.nodeFactory.create(ce, s);
       try {
-        this.consume("Expect an opening parenthesis '('", h.LPAREN), s.tupleOpenParen = this.previous();
+        this.consume("Expect an opening parenthesis '('", u.LPAREN), s.tupleOpenParen = this.previous();
       } catch (r) {
-        if (!(r instanceof N))
+        if (!(r instanceof T))
           throw r;
         if (s.tupleOpenParen = r.partialNode, !this.canHandle(r))
-          throw new N(r.token, a(), r.handlerContext);
+          throw new T(r.token, a(), r.handlerContext);
         this.synchronizeTuple();
       }
-      if (!this.isAtEnd() && !this.check(h.RPAREN))
+      if (!this.isAtEnd() && !this.check(u.RPAREN))
         try {
           s.elementList.push(this.normalExpression());
         } catch (r) {
-          if (!(r instanceof N))
+          if (!(r instanceof T))
             throw r;
           if (s.elementList.push(r.partialNode), !this.canHandle(r))
-            throw new N(r.token, i(), r.handlerContext);
+            throw new T(r.token, i(), r.handlerContext);
           this.synchronizeTuple();
         }
-      for (; !this.isAtEnd() && !this.check(h.RPAREN); )
+      for (; !this.isAtEnd() && !this.check(u.RPAREN); )
         try {
-          this.consume("Expect a comma ','", h.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.normalExpression());
+          this.consume("Expect a comma ','", u.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.normalExpression());
         } catch (r) {
-          if (!(r instanceof N))
+          if (!(r instanceof T))
             throw r;
-          if (r.partialNode instanceof D && s.elementList.push(r.partialNode), !this.canHandle(r))
-            throw new N(r.token, a(), r.handlerContext);
+          if (r.partialNode instanceof x && s.elementList.push(r.partialNode), !this.canHandle(r))
+            throw new T(r.token, a(), r.handlerContext);
           this.synchronizeTuple();
         }
       try {
-        this.consume("Expect a closing parenthesis ')'", h.RPAREN), s.tupleCloseParen = this.previous();
+        this.consume("Expect a closing parenthesis ')'", u.RPAREN), s.tupleCloseParen = this.previous();
       } catch (r) {
-        if (!(r instanceof N))
+        if (!(r instanceof T))
           throw r;
         if (s.tupleCloseParen = r.partialNode, !this.canHandle(r))
-          throw new N(r.token, a(), r.handlerContext);
+          throw new T(r.token, a(), r.handlerContext);
         this.synchronizeTuple();
       }
       return s.elementList.length === 1 ? i() : a();
     }), this.synchronizeTuple = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(h.RPAREN, h.COMMA))
+        if (this.check(u.RPAREN, u.COMMA))
           break;
         b(s), this.advance();
       }
     }, this.listExpression = this.contextStack.withContextDo(Be.ListExpression, () => {
       const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(M, s);
       try {
-        this.consume("Expect an opening bracket '['", h.LBRACKET), s.listOpenBracket = this.previous();
+        this.consume("Expect an opening bracket '['", u.LBRACKET), s.listOpenBracket = this.previous();
       } catch (a) {
-        if (!(a instanceof N))
+        if (!(a instanceof T))
           throw a;
         if (s.listOpenBracket = a.partialNode, !this.canHandle(a))
-          throw new N(a.token, i(), a.handlerContext);
+          throw new T(a.token, i(), a.handlerContext);
         this.synchronizeList();
       }
-      if (!this.isAtEnd() && !this.check(h.RBRACKET))
+      if (!this.isAtEnd() && !this.check(u.RBRACKET))
         try {
           s.elementList.push(this.attribute());
         } catch (a) {
-          if (!(a instanceof N))
+          if (!(a instanceof T))
             throw a;
           if (s.elementList.push(a.partialNode), !this.canHandle(a))
-            throw new N(a.token, i(), a.handlerContext);
+            throw new T(a.token, i(), a.handlerContext);
           this.synchronizeList();
         }
-      for (; !this.isAtEnd() && !this.check(h.RBRACKET); )
+      for (; !this.isAtEnd() && !this.check(u.RBRACKET); )
         try {
-          this.consume("Expect a comma ','", h.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.attribute());
+          this.consume("Expect a comma ','", u.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.attribute());
         } catch (a) {
-          if (!(a instanceof N))
+          if (!(a instanceof T))
             throw a;
-          if (a.partialNode instanceof D && s.elementList.push(a.partialNode), !this.canHandle(a))
-            throw new N(a.token, i(), a.handlerContext);
+          if (a.partialNode instanceof x && s.elementList.push(a.partialNode), !this.canHandle(a))
+            throw new T(a.token, i(), a.handlerContext);
           this.synchronizeList();
         }
       try {
-        this.consume("Expect a closing bracket ']'", h.RBRACKET), s.listCloseBracket = this.previous();
+        this.consume("Expect a closing bracket ']'", u.RBRACKET), s.listCloseBracket = this.previous();
       } catch (a) {
-        if (!(a instanceof N))
+        if (!(a instanceof T))
           throw a;
         if (s.listCloseBracket = a.partialNode, !this.canHandle(a))
-          throw new N(a.token, i(), a.handlerContext);
+          throw new T(a.token, i(), a.handlerContext);
         this.synchronizeList();
       }
       return i();
     }), this.synchronizeList = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(h.COMMA, h.RBRACKET))
+        if (this.check(u.COMMA, u.RBRACKET))
           break;
         b(s), this.advance();
       }
     }, this.synchronizeAttributeName = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(h.COMMA, h.RBRACKET, h.COLON))
+        if (this.check(u.COMMA, u.RBRACKET, u.COLON))
           break;
         b(s), this.advance();
       }
     }, this.synchronizeAttributeValue = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (this.check(h.COMMA, h.RBRACKET))
+        if (this.check(u.COMMA, u.RBRACKET))
           break;
         b(s), this.advance();
       }
-    }, this.tokens = e, this.nodeFactory = new xn(n);
+    }, this.tokens = e, this.nodeFactory = new Un(n);
   }
   isAtEnd() {
-    return this.current >= this.tokens.length || this.tokens[this.current].kind === h.EOF;
+    return this.current >= this.tokens.length || this.tokens[this.current].kind === u.EOF;
   }
   advance() {
     return this.isAtEnd() ? g.last(this.tokens) : this.tokens[this.current++];
@@ -1320,7 +1340,7 @@ class Dn {
   }
   consume(e, ...n) {
     if (!this.match(...n))
-      throw this.logError(this.peek(), o.UNEXPECTED_TOKEN, e), new N(
+      throw this.logError(this.peek(), o.UNEXPECTED_TOKEN, e), new T(
         this.peek(),
         void 0,
         this.contextStack.findHandlerContext(this.tokens, this.current)
@@ -1349,8 +1369,8 @@ class Dn {
     this.tokens = e;
   }
   parse() {
-    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(Z, { body: e, eof: n });
-    return this.gatherInvalid(), new z({ ast: s, tokens: this.tokens }, this.errors);
+    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(K, { body: e, eof: n });
+    return this.gatherInvalid(), new J({ ast: s, tokens: this.tokens }, this.errors);
   }
   /* Parsing and synchronizing ProgramNode */
   program() {
@@ -1360,7 +1380,7 @@ class Dn {
         const n = this.elementDeclaration();
         e.push(n);
       } catch (n) {
-        if (!(n instanceof N))
+        if (!(n instanceof T))
           throw n;
         e.push(n.partialNode), this.synchronizeProgram();
       }
@@ -1370,53 +1390,53 @@ class Dn {
   elementDeclaration() {
     const e = {}, n = () => this.nodeFactory.create(y, e);
     try {
-      this.consume("Expect an identifier", h.IDENTIFIER), e.type = this.previous();
+      this.consume("Expect an identifier", u.IDENTIFIER), e.type = this.previous();
     } catch (s) {
-      throw s instanceof N ? (e.type = s.partialNode, new N(s.token, n(), s.handlerContext)) : s;
+      throw s instanceof T ? (e.type = s.partialNode, new T(s.token, n(), s.handlerContext)) : s;
     }
-    if (!this.check(h.COLON, h.LBRACE, h.LBRACKET))
+    if (!this.check(u.COLON, u.LBRACE, u.LBRACKET))
       try {
         e.name = this.normalExpression();
       } catch (s) {
-        if (!(s instanceof N))
+        if (!(s instanceof T))
           throw s;
         if (e.name = s.partialNode, !this.canHandle(s))
-          throw new N(s.token, n(), s.handlerContext);
+          throw new T(s.token, n(), s.handlerContext);
         this.synchronizeElementDeclarationName();
       }
-    if (bt(this.peek()))
-      if (e.as = this.advance(), this.check(h.COLON, h.LBRACE, h.LBRACKET))
+    if (mt(this.peek()))
+      if (e.as = this.advance(), this.check(u.COLON, u.LBRACE, u.LBRACKET))
         this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect an alias");
       else
         try {
           e.alias = this.normalExpression();
         } catch (s) {
-          if (!(s instanceof N))
+          if (!(s instanceof T))
             throw s;
           if (e.alias = s.partialNode, !this.canHandle(s))
-            throw new N(s.token, n(), s.handlerContext);
+            throw new T(s.token, n(), s.handlerContext);
           this.synchronizeElementDeclarationAlias();
         }
     try {
-      e.attributeList = this.check(h.LBRACKET) ? this.listExpression() : void 0;
+      e.attributeList = this.check(u.LBRACKET) ? this.listExpression() : void 0;
     } catch (s) {
-      throw s instanceof N ? (e.attributeList = s.partialNode, new N(s.token, n(), s.handlerContext)) : s;
+      throw s instanceof T ? (e.attributeList = s.partialNode, new T(s.token, n(), s.handlerContext)) : s;
     }
     if (!this.discardUntil(
       "Expect an opening brace '{' or a colon ':'",
-      h.LBRACE,
-      h.COLON
+      u.LBRACE,
+      u.COLON
     ))
       return n();
     try {
-      if (this.match(h.COLON)) {
+      if (this.match(u.COLON)) {
         e.bodyColon = this.previous();
         const s = this.expression();
         s instanceof y ? (b(s), this.logError(s, o.UNEXPECTED_ELEMENT_DECLARATION, "An element's simple body must not be an element declaration")) : e.body = s;
       } else
         e.body = this.blockExpression();
     } catch (s) {
-      throw s instanceof N ? (e.body = s.partialNode, new N(s.token, n(), s.handlerContext)) : s;
+      throw s instanceof T ? (e.body = s.partialNode, new T(s.token, n(), s.handlerContext)) : s;
     }
     return this.nodeFactory.create(y, e);
   }
@@ -1429,32 +1449,32 @@ class Dn {
   fieldDeclaration() {
     const e = {}, n = () => this.nodeFactory.create(y, e);
     try {
-      this.consume("Expect an identifier", h.IDENTIFIER), e.type = this.previous();
+      this.consume("Expect an identifier", u.IDENTIFIER), e.type = this.previous();
     } catch (s) {
-      throw s instanceof N ? (e.type = s.partialNode, new N(s.token, n(), s.handlerContext)) : s;
+      throw s instanceof T ? (e.type = s.partialNode, new T(s.token, n(), s.handlerContext)) : s;
     }
     try {
-      this.consume("Expect a colon ':'", h.COLON), e.bodyColon = this.previous();
+      this.consume("Expect a colon ':'", u.COLON), e.bodyColon = this.previous();
     } catch (s) {
-      throw s instanceof N ? (e.bodyColon = s.partialNode, new N(s.token, n(), s.handlerContext)) : s;
+      throw s instanceof T ? (e.bodyColon = s.partialNode, new T(s.token, n(), s.handlerContext)) : s;
     }
     try {
       const s = this.expression();
       s instanceof y ? this.errors.push(new l(o.INVALID_ELEMENT_IN_SIMPLE_BODY, "Simple body cannot be an element declaration", s)) : e.body = s;
     } catch (s) {
-      throw s instanceof N ? (e.body = s.partialNode, new N(s.token, n(), s.handlerContext)) : s;
+      throw s instanceof T ? (e.body = s.partialNode, new T(s.token, n(), s.handlerContext)) : s;
     }
     return this.nodeFactory.create(y, e);
   }
   /* Parsing any ExpressionNode, including non-NormalExpression */
   expression() {
-    const e = { args: [] }, n = () => vn(e.callee, e.args, this.nodeFactory).unwrap_or(
+    const e = { args: [] }, n = () => Pn(e.callee, e.args, this.nodeFactory).unwrap_or(
       this.nodeFactory.create(w, e)
     );
     try {
       e.callee = this.normalExpression();
     } catch (i) {
-      throw i instanceof N ? (e.callee = i.partialNode, new N(i.token, n(), i.handlerContext)) : i;
+      throw i instanceof T ? (e.callee = i.partialNode, new T(i.token, n(), i.handlerContext)) : i;
     }
     if (this.shouldStopExpression())
       return n();
@@ -1464,16 +1484,16 @@ class Dn {
       try {
         s = this.normalExpression(), e.args.push(s);
       } catch (i) {
-        throw i instanceof N ? (s = i.partialNode, e.args.push(s), new N(i.token, n(), i.handlerContext)) : i;
+        throw i instanceof T ? (s = i.partialNode, e.args.push(s), new T(i.token, n(), i.handlerContext)) : i;
       }
     }
     return n();
   }
   shouldStopExpression() {
-    if (this.isAtEnd() || xt(this.previous()))
+    if (this.isAtEnd() || St(this.previous()))
       return !0;
     const e = this.peek().kind;
-    return e === h.RBRACE || e === h.RBRACKET || e === h.RPAREN || e === h.COMMA || e === h.COLON;
+    return e === u.RBRACE || e === u.RBRACKET || e === u.RPAREN || e === u.COMMA || e === u.COLON;
   }
   normalExpression() {
     return this.expression_bp(0);
@@ -1483,65 +1503,65 @@ class Dn {
     let n = this.leftExpression_bp();
     for (; !this.isAtEnd(); ) {
       const s = this.peek();
-      if (s.kind === h.LPAREN) {
-        const { left: i } = It(s);
+      if (s.kind === u.LPAREN) {
+        const { left: i } = bt(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 '['
-        Tt(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
+        Nt(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
           break;
         try {
-          n = this.nodeFactory.create(q, {
+          n = this.nodeFactory.create(ee, {
             callee: n,
             argumentList: this.tupleExpression()
           });
         } catch (a) {
-          throw a instanceof N ? (n = this.nodeFactory.create(q, {
+          throw a instanceof T ? (n = this.nodeFactory.create(ee, {
             callee: n,
             argumentList: a.partialNode
-          }), new N(a.token, n, a.handlerContext)) : a;
+          }), new T(a.token, n, a.handlerContext)) : a;
         }
-      } else if (s.kind === h.LBRACKET) {
+      } else if (s.kind === u.LBRACKET) {
         if (et(this.previous()))
           break;
         try {
-          n = this.nodeFactory.create(he, {
+          n = this.nodeFactory.create(Ie, {
             expression: n,
             indexer: this.listExpression()
           });
         } catch (i) {
-          throw i instanceof N ? (n = this.nodeFactory.create(he, {
+          throw i instanceof T ? (n = this.nodeFactory.create(Ie, {
             expression: n,
             indexer: i.partialNode
-          }), new N(i.token, n, i.handlerContext)) : i;
+          }), new T(i.token, n, i.handlerContext)) : i;
         }
-      } else if (Nt(s)) {
-        const i = s, a = It(i);
+      } else if (Et(s)) {
+        const i = s, a = bt(i);
         if (a.left !== null) {
           if (a.left <= e)
             break;
-          this.advance(), n = this.nodeFactory.create(Ye, {
+          this.advance(), n = this.nodeFactory.create(qe, {
             expression: n,
             op: i
           });
         } else {
-          const r = Rn(i);
+          const r = Bn(i);
           if (r.left === null || r.left <= e)
             break;
           this.advance();
           try {
-            n = this.nodeFactory.create(ce, {
+            n = this.nodeFactory.create(le, {
               leftExpression: n,
               op: i,
               rightExpression: i.value === "." ? this.extractOperand() : this.expression_bp(r.right)
             });
           } catch (c) {
-            throw c instanceof N ? (n = this.nodeFactory.create(ce, {
+            throw c instanceof T ? (n = this.nodeFactory.create(le, {
               leftExpression: n,
               op: i,
               rightExpression: c.partialNode
-            }), new N(c.token, n, c.handlerContext)) : c;
+            }), new T(c.token, n, c.handlerContext)) : c;
           }
         }
       } else
@@ -1551,16 +1571,16 @@ class Dn {
   }
   leftExpression_bp() {
     let e;
-    if (Nt(this.peek())) {
+    if (Et(this.peek())) {
       const n = {};
       n.op = this.peek();
-      const s = Mn(n.op);
+      const s = Gn(n.op);
       if (s.right === null)
         throw this.logError(
           n.op,
           o.UNKNOWN_PREFIX_OP,
           `Unexpected '${n.op.value}' in an expression`
-        ), new N(
+        ), new T(
           n.op,
           this.nodeFactory.create(Me, { pre: n.op }),
           this.contextStack.findHandlerContext(this.tokens, this.current)
@@ -1569,15 +1589,15 @@ class Dn {
       try {
         n.expression = this.expression_bp(s.right);
       } catch (i) {
-        throw i instanceof N ? (n.expression = i.partialNode, new N(
+        throw i instanceof T ? (n.expression = i.partialNode, new T(
           i.token,
-          this.nodeFactory.create(ae, n),
+          this.nodeFactory.create(Z, n),
           i.handlerContext
         )) : i;
       }
-      e = this.nodeFactory.create(ae, n);
+      e = this.nodeFactory.create(Z, n);
     } else if (e = this.extractOperand(), e instanceof Me)
-      throw new N(
+      throw new T(
         this.peek(),
         this.nodeFactory.create(Me, { pre: this.peek() }),
         this.contextStack.findHandlerContext(this.tokens, this.current)
@@ -1590,12 +1610,12 @@ class Dn {
   // e.g { ... }
   extractOperand() {
     return this.check(
-      h.NUMERIC_LITERAL,
-      h.STRING_LITERAL,
-      h.COLOR_LITERAL,
-      h.QUOTED_STRING,
-      h.IDENTIFIER
-    ) ? this.primaryExpression() : this.check(h.FUNCTION_EXPRESSION) ? this.functionExpression() : this.check(h.LBRACKET) ? this.listExpression() : this.check(h.LBRACE) ? this.blockExpression() : this.check(h.LPAREN) ? this.tupleExpression() : (this.peek().kind === h.EOF ? this.logError(
+      u.NUMERIC_LITERAL,
+      u.STRING_LITERAL,
+      u.COLOR_LITERAL,
+      u.QUOTED_STRING,
+      u.IDENTIFIER
+    ) ? this.primaryExpression() : this.check(u.FUNCTION_EXPRESSION) ? this.functionExpression() : this.check(u.LBRACKET) ? this.listExpression() : this.check(u.LBRACE) ? this.blockExpression() : this.check(u.LPAREN) ? this.tupleExpression() : (this.peek().kind === u.EOF ? this.logError(
       this.peek(),
       o.UNEXPECTED_EOF,
       "Unexpected EOF"
@@ -1609,9 +1629,9 @@ class Dn {
   functionExpression() {
     const e = {};
     try {
-      this.consume("Expect a function expression", h.FUNCTION_EXPRESSION), e.value = this.previous();
+      this.consume("Expect a function expression", u.FUNCTION_EXPRESSION), e.value = this.previous();
     } catch (n) {
-      throw n instanceof N ? (e.value = n.partialNode, new N(
+      throw n instanceof T ? (e.value = n.partialNode, new T(
         n.token,
         this.nodeFactory.create(ue, e),
         n.handlerContext
@@ -1620,28 +1640,28 @@ class Dn {
     return this.nodeFactory.create(ue, e);
   }
   variable() {
-    this.consume("Expect a variable", h.IDENTIFIER);
+    this.consume("Expect a variable", u.IDENTIFIER);
     const e = this.previous();
     return this.nodeFactory.create(re, { variable: e });
   }
   canBeField() {
-    return this.peek().kind === h.IDENTIFIER && this.peek(1).kind === h.COLON;
+    return this.peek().kind === u.IDENTIFIER && this.peek(1).kind === u.COLON;
   }
   /* Parsing PrimaryExpression */
   primaryExpression() {
     if (this.match(
-      h.COLOR_LITERAL,
-      h.STRING_LITERAL,
-      h.NUMERIC_LITERAL
+      u.COLOR_LITERAL,
+      u.STRING_LITERAL,
+      u.NUMERIC_LITERAL
     ))
       return this.nodeFactory.create(j, {
         expression: this.nodeFactory.create(ye, { literal: this.previous() })
       });
-    if (this.match(h.QUOTED_STRING, h.IDENTIFIER))
+    if (this.match(u.QUOTED_STRING, u.IDENTIFIER))
       return this.nodeFactory.create(j, {
         expression: this.nodeFactory.create(re, { variable: this.previous() })
       });
-    throw this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect a variable or literal"), new N(
+    throw this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect a variable or literal"), new T(
       this.peek(),
       void 0,
       this.contextStack.findHandlerContext(this.tokens, this.current)
@@ -1649,7 +1669,7 @@ class Dn {
   }
   attribute() {
     const e = {};
-    if (this.check(h.COLON, h.RBRACKET, h.COMMA)) {
+    if (this.check(u.COLON, u.RBRACKET, u.COMMA)) {
       const n = this.peek();
       this.logError(
         n,
@@ -1660,24 +1680,24 @@ class Dn {
       try {
         e.name = this.attributeName();
       } catch (n) {
-        if (!(n instanceof N))
+        if (!(n instanceof T))
           throw n;
         if (e.name = n.partialNode, !this.canHandle(n))
-          throw new N(
+          throw new T(
             n.token,
             this.nodeFactory.create(se, e),
             n.handlerContext
           );
         this.synchronizeAttributeName();
       }
-    return this.match(h.COLON) && (e.colon = this.previous(), e.value = this.attributeValue()), this.nodeFactory.create(se, e);
+    return this.match(u.COLON) && (e.colon = this.previous(), e.value = this.attributeValue()), this.nodeFactory.create(se, e);
   }
   attributeValue() {
     let e;
     try {
-      e = this.peek().kind === h.IDENTIFIER && this.peek(1).kind === h.IDENTIFIER ? this.attributeName() : this.normalExpression();
+      e = this.peek().kind === u.IDENTIFIER && this.peek(1).kind === u.IDENTIFIER ? this.attributeName() : this.normalExpression();
     } catch (n) {
-      if (!(n instanceof N) || !this.canHandle(n))
+      if (!(n instanceof T) || !this.canHandle(n))
         throw n;
       e = n.partialNode, this.synchronizeAttributeValue();
     }
@@ -1685,13 +1705,13 @@ class Dn {
   }
   attributeName() {
     const e = [];
-    if (this.peek().kind !== h.IDENTIFIER)
+    if (this.peek().kind !== u.IDENTIFIER)
       return this.primaryExpression();
-    for (; !this.isAtEnd() && !this.check(h.COLON, h.COMMA, h.RBRACKET); )
+    for (; !this.isAtEnd() && !this.check(u.COLON, u.COMMA, u.RBRACKET); )
       try {
-        this.consume("Expect an identifier", h.IDENTIFIER), e.push(this.previous());
+        this.consume("Expect an identifier", u.IDENTIFIER), e.push(this.previous());
       } catch (n) {
-        throw n instanceof N ? new N(
+        throw n instanceof T ? new T(
           n.token,
           this.nodeFactory.create(ne, { identifiers: e }),
           n.handlerContext
@@ -1703,7 +1723,7 @@ class Dn {
     this.errors.push(new l(n, s, e));
   }
 }
-const On = {
+const Fn = {
   "+": { left: 9, right: 10 },
   "*": { left: 11, right: 12 },
   "-": { left: 9, right: 10 },
@@ -1719,10 +1739,10 @@ const On = {
   "!=": { left: 4, right: 5 },
   ".": { left: 16, right: 17 }
 };
-function Rn(t) {
-  return On[t.value] || { left: null, right: null };
+function Bn(t) {
+  return Fn[t.value] || { left: null, right: null };
 }
-const Un = {
+const Vn = {
   "+": { left: null, right: 15 },
   "-": { left: null, right: 15 },
   "<": { left: null, right: 15 },
@@ -1730,17 +1750,17 @@ const Un = {
   "<>": { left: null, right: 15 },
   "!": { left: null, right: 15 }
 };
-function Mn(t) {
-  return Un[t.value] || { left: null, right: null };
+function Gn(t) {
+  return Vn[t.value] || { left: null, right: null };
 }
-const Fn = {
+const Cn = {
   "(": { left: 14, right: null }
 };
-function It(t) {
-  return Fn[t.value] || { left: null, right: null };
+function bt(t) {
+  return Cn[t.value] || { left: null, right: null };
 }
-var I = /* @__PURE__ */ ((t) => (t.Table = "table", t.Enum = "enum", t.Ref = "ref", t.Note = "note", t.Project = "project", t.Indexes = "indexes", t.TableGroup = "tablegroup", t.TablePartial = "tablepartial", t))(I || {}), T = /* @__PURE__ */ ((t) => (t.Color = "color", t.HeaderColor = "headercolor", t.Note = "note", t.PK = "pk", t.PKey = "primary key", t.Unique = "unique", t.Ref = "ref", t.NotNull = "not null", t.Null = "null", t.Increment = "increment", t.Default = "default", t.Name = "name", t.Type = "type", t.Update = "update", t.Delete = "delete", t))(T || {});
-function _e(t) {
+var I = /* @__PURE__ */ ((t) => (t.Table = "table", t.Enum = "enum", t.Ref = "ref", t.Note = "note", t.Project = "project", t.Indexes = "indexes", t.TableGroup = "tablegroup", t.TablePartial = "tablepartial", t))(I || {}), E = /* @__PURE__ */ ((t) => (t.Color = "color", t.HeaderColor = "headercolor", t.Note = "note", t.PK = "pk", t.PKey = "primary key", t.Unique = "unique", t.Ref = "ref", t.NotNull = "not null", t.Null = "null", t.Increment = "increment", t.Default = "default", t.Name = "name", t.Type = "type", t.Update = "update", t.Delete = "delete", t))(E || {});
+function Le(t) {
   var n;
   const e = (n = t == null ? void 0 : t.type) == null ? void 0 : n.value.toLowerCase();
   switch (e) {
@@ -1757,46 +1777,46 @@ function _e(t) {
       return new S();
   }
 }
-function ge(t) {
-  if (!He(t))
+function _e(t) {
+  if (!ut(t))
     return new U([t]);
-  const e = ge(t.leftExpression).unwrap_or(void 0);
+  const e = _e(t.leftExpression).unwrap_or(void 0);
   return e ? (e.push(t.rightExpression), new U(e)) : new S();
 }
-function H(t) {
+function q(t) {
   if (t === void 0)
     return new S();
-  const e = ge(t).unwrap_or(void 0);
+  const e = _e(t).unwrap_or(void 0);
   if (!e)
     return new S();
   const n = [];
   for (const s of e) {
-    const i = Y(s).unwrap_or(void 0);
+    const i = W(s).unwrap_or(void 0);
     if (!i)
       return new S();
     n.push(i);
   }
   return new U(n);
 }
-function xe(t) {
+function De(t) {
   if (t === void 0)
     return new S();
-  const e = ge(t).unwrap_or(void 0);
+  const e = _e(t).unwrap_or(void 0);
   if (!e || e.length === 0)
     return new S();
   const n = [];
   let s;
-  if (!W(g.last(e))) {
+  if (!$(g.last(e))) {
     const i = e.pop();
     if ($t(i))
       s = i.elementList.map(
-        (a) => $(a).unwrap()
+        (a) => X(a).unwrap()
       );
     else
       return new S();
   }
   for (const i of e) {
-    const a = Y(i).unwrap_or(void 0);
+    const a = W(i).unwrap_or(void 0);
     if (!a)
       return new S();
     n.push(a);
@@ -1806,62 +1826,62 @@ function xe(t) {
     tupleElements: s
   });
 }
-function Y(t) {
-  return W(t) ? new U(t.expression.variable.value) : new S();
+function W(t) {
+  return $(t) ? new U(t.expression.variable.value) : new S();
 }
-function Xe(t) {
-  if (Lt(t))
+function $e(t) {
+  if (It(t))
     return t instanceof ue ? new U({ functional: [t], nonFunctional: [] }) : new U({ functional: [], nonFunctional: [t] });
-  if (t instanceof pe && t.elementList.every(Lt)) {
+  if (t instanceof ce && t.elementList.every(It)) {
     const e = t.elementList.filter(
       (s) => s instanceof ue
-    ), n = t.elementList.filter(W);
+    ), n = t.elementList.filter($);
     return new U({ functional: e, nonFunctional: n });
   }
   return new S();
 }
-function $(t) {
+function X(t) {
   var n;
   const e = (n = t == null ? void 0 : t.expression.variable) == null ? void 0 : n.value;
   return e === void 0 ? new S() : new U(e);
 }
-function Bn(t) {
+function Xn(t) {
   var n, s;
   const e = (s = (n = t == null ? void 0 : t.partial) == null ? void 0 : n.variable) == null ? void 0 : s.value;
   return e === void 0 ? new S() : new U(e);
 }
-function F(t) {
-  return C(t) ? t.expression instanceof re ? new U(t.expression.variable.value) : new U(t.expression.literal.value) : new S();
+function V(t) {
+  return Y(t) ? t.expression instanceof re ? new U(t.expression.variable.value) : new U(t.expression.literal.value) : new S();
 }
-function Vn(t) {
+function $n(t) {
   var e;
-  return !(t instanceof ce) || !Gt((e = t.op) == null ? void 0 : e.value) ? !1 : xe(t.leftExpression).and_then(() => xe(t.rightExpression)).unwrap_or(void 0) !== void 0;
+  return !(t instanceof le) || !Gt((e = t.op) == null ? void 0 : e.value) ? !1 : De(t.leftExpression).and_then(() => De(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
-function Gn(t) {
-  const e = xe(t.leftExpression), n = xe(t.rightExpression);
+function jn(t) {
+  const e = De(t.leftExpression), n = De(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 Lt(t) {
+function It(t) {
   return t instanceof j && t.expression instanceof re || t instanceof ue;
 }
-function At(t, e) {
+function Lt(t, e) {
   var i, a, r, c;
   let n = e;
-  const s = hn(t);
+  const s = En(t);
   for (; n; ) {
     if ((a = (i = n.symbol) == null ? void 0 : i.symbolTable) != null && a.has(t))
       return (r = n.symbol.symbolTable) == null ? void 0 : r.get(t);
-    if (((c = n.symbol) == null ? void 0 : c.declaration) instanceof Z && s)
+    if (((c = n.symbol) == null ? void 0 : c.declaration) instanceof K && s)
       return n.symbol;
-    if (n instanceof Z)
+    if (n instanceof K)
       return;
     n = n.parent;
   }
 }
-class Cn {
+class Wn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1869,7 +1889,7 @@ class Cn {
     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 Z || _e(this.declarationNode.parent).unwrap_or(void 0) !== I.Project ? [new l(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof K || Le(this.declarationNode.parent).unwrap_or(void 0) !== I.Project ? [new l(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)] : [];
@@ -1886,7 +1906,7 @@ class Cn {
     if (e instanceof oe)
       return [new l(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
     const n = [];
-    return C(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 Y(e.callee) || n.push(new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
   }
 }
 class ke {
@@ -1909,7 +1929,7 @@ class ke {
     return this.table.forEach(e);
   }
 }
-class Xn {
+class Yn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1927,10 +1947,10 @@ class Xn {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(En, { declaration: this.declarationNode, symbolTable: new ke() });
-    const { name: n } = this.declarationNode, s = H(n);
+    this.declarationNode.symbol = this.symbolFactory.create(bn, { declaration: this.declarationNode, symbolTable: new ke() });
+    const { name: n } = this.declarationNode, s = q(n);
     if (s.isOk()) {
-      const i = s.unwrap(), a = i.pop(), r = Qe(i, this.publicSymbolTable, this.symbolFactory), c = st(a);
+      const i = s.unwrap(), a = i.pop(), r = Qe(i, this.publicSymbolTable, this.symbolFactory), c = it(a);
       r.has(c) && e.push(new l(o.DUPLICATE_NAME, `Enum name ${a} already exists in schema '${i.join(".") || "public"}'`, n)), r.set(c, this.declarationNode.symbol);
     }
     return e;
@@ -1949,19 +1969,19 @@ class Xn {
   validateFields(e) {
     return e.length === 0 ? [new l(o.EMPTY_ENUM, "An Enum must have at least one element", this.declarationNode)] : e.flatMap((n) => {
       const s = [];
-      n.callee && !W(n.callee) && s.push(new l(o.INVALID_ENUM_ELEMENT_NAME, "An enum field must be an identifier or a quoted identifier", n.callee));
+      n.callee && !$(n.callee) && s.push(new l(o.INVALID_ENUM_ELEMENT_NAME, "An enum field must be an identifier or a quoted identifier", n.callee));
       const i = [...n.args];
       return g.last(i) instanceof M ? (s.push(...this.validateFieldSettings(g.last(i))), i.pop()) : i[0] instanceof M && (s.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && s.push(...i.map((a) => new l(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", a))), s.push(...this.registerField(n)), s;
     });
   }
   validateFieldSettings(e) {
-    const n = B(e), s = n.getErrors(), i = n.getValue();
+    const n = F(e), s = n.getErrors(), i = n.getValue();
     for (const a in i) {
       const r = i[a];
       switch (a) {
         case "note":
           r.length > 1 && r.forEach((c) => s.push(new l(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", c))), r.forEach((c) => {
-            C(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
+            Y(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
           });
           break;
         default:
@@ -1974,13 +1994,13 @@ class Xn {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = de(n);
+      const s = he(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
   registerField(e) {
-    if (e.callee && W(e.callee)) {
-      const n = $(e.callee).unwrap(), s = it(n), i = this.symbolFactory.create(Nn, { declaration: e });
+    if (e.callee && $(e.callee)) {
+      const n = X(e.callee).unwrap(), s = at(n), i = this.symbolFactory.create(In, { declaration: e });
       e.symbol = i;
       const a = this.declarationNode.symbol.symbolTable;
       if (a.has(s)) {
@@ -1995,7 +2015,7 @@ class Xn {
     return [];
   }
 }
-class $n {
+class qn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2014,9 +2034,9 @@ class $n {
       "An Indexes can only appear inside a Table or a TablePartial",
       this.declarationNode
     );
-    if (this.declarationNode.parent instanceof Z)
+    if (this.declarationNode.parent instanceof K)
       return [e];
-    const n = _e(this.declarationNode.parent).unwrap_or(void 0);
+    const n = Le(this.declarationNode.parent).unwrap_or(void 0);
     return n && [I.Table, I.TablePartial].includes(n) ? [] : [e];
   }
   validateName(e) {
@@ -2042,32 +2062,32 @@ class $n {
         return [];
       const s = [], i = [n.callee, ...n.args];
       return g.last(i) instanceof M && s.push(...this.validateFieldSetting(i.pop())), i.forEach((a) => {
-        for (; a instanceof q; )
-          a.argumentList && !Xe(a.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", a.argumentList)), a = a.callee;
-        Xe(a).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", a));
+        for (; a instanceof ee; )
+          a.argumentList && !$e(a.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", a.argumentList)), a = a.callee;
+        $e(a).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", a));
       }), s;
     });
   }
   validateFieldSetting(e) {
-    const n = B(e), s = n.getErrors(), i = n.getValue();
+    const n = F(e), s = n.getErrors(), i = n.getValue();
     for (const a in i) {
       const r = i[a];
       switch (a) {
         case "note":
         case "name":
           r.length > 1 && r.forEach((c) => s.push(new l(o.DUPLICATE_INDEX_SETTING, `'${a}' can only appear once`, c))), r.forEach((c) => {
-            C(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${a}' must be a string`, c));
+            Y(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${a}' must be a string`, c));
           });
           break;
         case "unique":
         case "pk":
           r.length > 1 && r.forEach((c) => s.push(new l(o.DUPLICATE_INDEX_SETTING, `'${a}' can only appear once`, c))), r.forEach((c) => {
-            J(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${a}' must not have a value`, c));
+            z(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${a}' must not have a value`, c));
           });
           break;
         case "type":
           r.length > 1 && r.forEach((c) => s.push(new l(o.DUPLICATE_INDEX_SETTING, "'type' can only appear once", c))), r.forEach((c) => {
-            W(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'type' must be "btree" or "hash"`, c));
+            $(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'type' must be "btree" or "hash"`, c));
           });
           break;
         default:
@@ -2080,12 +2100,12 @@ class $n {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = de(n);
+      const s = he(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
-class jn {
+class Hn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2099,26 +2119,26 @@ class jn {
     ];
   }
   validateContext() {
-    return !(this.declarationNode.parent instanceof Z) && ![
+    return !(this.declarationNode.parent instanceof K) && ![
       I.Table,
       I.TableGroup,
       I.TablePartial,
       I.Project
-    ].includes(_e(this.declarationNode.parent).unwrap_or(void 0)) ? [new l(
+    ].includes(Le(this.declarationNode.parent).unwrap_or(void 0)) ? [new l(
       o.INVALID_NOTE_CONTEXT,
       "A Note can only appear inside a Table, a TableGroup, a TablePartial or a Project. Sticky note can only appear at the global scope.",
       this.declarationNode
     )] : [];
   }
   validateName(e) {
-    if (!(this.declarationNode.parent instanceof Z))
+    if (!(this.declarationNode.parent instanceof K))
       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 = H(e);
+    const n = q(e);
     if (!n.isOk())
       return [new l(o.INVALID_NAME, "Invalid name for sticky note ", this.declarationNode)];
-    const i = n.unwrap().join("."), a = un(i);
+    const i = n.unwrap().join("."), a = dn(i);
     return this.publicSymbolTable.has(a) ? [new l(o.DUPLICATE_NAME, `Sticky note "${i}" has already been defined`, e)] : (this.publicSymbolTable.set(a, this.declarationNode.symbol), []);
   }
   validateAlias(e) {
@@ -2137,18 +2157,18 @@ class jn {
   }
   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))), C(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 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))), Y(e[0].callee) || n.push(new l(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new l(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
   }
   validateSubElements(e) {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = de(n);
+      const s = he(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
-class Wn {
+class zn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2182,12 +2202,12 @@ class Wn {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = de(n);
+      const s = he(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
-class Yn {
+class Qn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2195,7 +2215,7 @@ class Yn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof Z ? [] : [new l(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
+    return this.declarationNode.parent instanceof K ? [] : [new l(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)] : [];
@@ -2219,7 +2239,7 @@ class Yn {
       return [new l(o.EMPTY_REF, "A Ref must have at least one field", this.declarationNode)];
     const n = [];
     return e.length > 1 && n.push(...e.slice(1).map((s) => new l(o.REF_REDEFINED, "A Ref can only contain one binary relationship", s))), e.forEach((s) => {
-      s.callee && !Vn(s.callee) && n.push(new l(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !Gn(s.callee) && n.push(new l(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
+      s.callee && !$n(s.callee) && n.push(new l(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !jn(s.callee) && n.push(new l(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
       const i = [...s.args];
       if (g.last(i) instanceof M) {
         const a = this.validateFieldSettings(g.last(i));
@@ -2230,14 +2250,14 @@ class Yn {
     }), n;
   }
   validateFieldSettings(e) {
-    const n = B(e), s = n.getErrors(), i = n.getValue();
+    const n = F(e), s = n.getErrors(), i = n.getValue();
     for (const a in i) {
       const r = i[a];
       switch (a) {
         case "delete":
         case "update":
           r.length > 1 && r.forEach((c) => s.push(new l(o.DUPLICATE_REF_SETTING, `'${a}' can only appear once`, c))), r.forEach((c) => {
-            qn(c.value) || s.push(new l(o.INVALID_REF_SETTING_VALUE, `'${a}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, c));
+            Jn(c.value) || s.push(new l(o.INVALID_REF_SETTING_VALUE, `'${a}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, c));
           });
           break;
         case "color":
@@ -2255,13 +2275,13 @@ class Yn {
     return e.flatMap((n) => {
       if (n.parent = this.declarationNode, !n.type)
         return [];
-      const s = de(n);
+      const s = he(n);
       return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
-function qn(t) {
-  if (!(W(t) && t.expression.variable.kind !== h.QUOTED_STRING) && !(t instanceof ne))
+function Jn(t) {
+  if (!($(t) && t.expression.variable.kind !== u.QUOTED_STRING) && !(t instanceof ne))
     return !1;
   let e;
   if (t instanceof ne ? e = we(t).unwrap_or("") : e = t.expression.variable.value, e)
@@ -2277,7 +2297,7 @@ function qn(t) {
     }
   return !1;
 }
-class zn {
+class Kn {
   constructor(e, n, s) {
     this.declarationNode = e, this.symbolFactory = s, this.publicSymbolTable = n;
   }
@@ -2295,42 +2315,40 @@ class zn {
     return this.declarationNode.parent instanceof y ? [new l(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)] : Vt(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 Ie ? [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)] : Vt(e) ? [] : [new l(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new l(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
   }
   validateAlias(e) {
-    return e ? es(e) ? [] : [new l(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
+    return e ? ss(e) ? [] : [new l(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
   }
   validateSettingList(e) {
-    const n = B(e), s = n.getErrors(), i = n.getValue();
-    for (const a in i) {
-      const r = i[a];
-      switch (a) {
-        case "headercolor":
-          r.length > 1 && s.push(...r.map((c) => new l(o.DUPLICATE_TABLE_SETTING, "'headercolor' can only appear once", c))), r.forEach((c) => {
+    const n = F(e), s = n.getErrors(), i = n.getValue();
+    return Ge(i, (a, r) => {
+      switch (r) {
+        case E.HeaderColor:
+          a.length > 1 && s.push(...a.map((c) => new l(o.DUPLICATE_TABLE_SETTING, "'headercolor' can only appear once", c))), a.forEach((c) => {
             Je(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", c.value || c.name));
           });
           break;
-        case "note":
-          r.length > 1 && s.push(...r.map((c) => new l(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", c))), r.forEach((c) => {
-            C(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
+        case E.Note:
+          a.length > 1 && s.push(...a.map((c) => new l(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", c))), a.forEach((c) => {
+            Y(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
           });
           break;
         default:
-          s.push(...r.map((c) => new l(o.INVALID_TABLE_SETTING, `Unknown '${a}' setting`, c)));
+          s.push(...a.map((c) => new l(o.INVALID_TABLE_SETTING, `Unknown '${r}' setting`, c)));
       }
-    }
-    return s;
+    }), s;
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(Ft, { declaration: this.declarationNode, symbolTable: new ke() });
-    const { name: n, alias: s } = this.declarationNode, i = H(n);
+    this.declarationNode.symbol = this.symbolFactory.create(Mt, { declaration: this.declarationNode, symbolTable: new ke() });
+    const { name: n, alias: s } = this.declarationNode, i = q(n);
     if (i.isOk()) {
-      const a = [...i.unwrap()], r = a.pop(), c = Qe(a, this.publicSymbolTable, this.symbolFactory), p = Ge(r);
-      c.has(p) && e.push(new l(o.DUPLICATE_NAME, `Table name '${r}' already exists in schema '${a.join(".") || "public"}'`, n)), c.set(p, this.declarationNode.symbol);
+      const a = [...i.unwrap()], r = a.pop(), c = Qe(a, this.publicSymbolTable, this.symbolFactory), f = Ce(r);
+      c.has(f) && e.push(new l(o.DUPLICATE_NAME, `Table name '${r}' already exists in schema '${a.join(".") || "public"}'`, n)), c.set(f, this.declarationNode.symbol);
     }
-    if (s && Pe(s) && !Qn(s.expression.variable.value, i.unwrap_or([]))) {
-      const a = $(s).unwrap(), r = Ge(a);
+    if (s && Pe(s) && !Zn(s.expression.variable.value, i.unwrap_or([]))) {
+      const a = X(s).unwrap(), r = Ce(a);
       this.publicSymbolTable.has(r) && e.push(new l(o.DUPLICATE_NAME, `Table name '${a}' already exists`, n)), this.publicSymbolTable.set(r, this.declarationNode.symbol);
     }
     return e;
@@ -2340,7 +2358,7 @@ class zn {
       return [];
     if (e instanceof w)
       return [new l(o.UNEXPECTED_SIMPLE_BODY, "A Table's body must be a block", e)];
-    const [n, s, i] = e.body.reduce((a, r) => (r instanceof w ? a[0].push(r) : r instanceof Ae ? a[1].push(r) : r instanceof y && a[2].push(r), a), [[], [], []]);
+    const [n, s, i] = e.body.reduce((a, r) => (r instanceof w ? a[0].push(r) : r instanceof be ? a[1].push(r) : r instanceof y && a[2].push(r), a), [[], [], []]);
     return [
       ...this.validateFields(n),
       ...this.validateInjections(s),
@@ -2351,10 +2369,10 @@ class zn {
     return e.flatMap((n) => this.registerInjection(n));
   }
   registerInjection(e) {
-    var c, p, f;
-    if (!((p = (c = e.partial) == null ? void 0 : c.variable) != null && p.value))
+    var c, f, p;
+    if (!((f = (c = e.partial) == null ? void 0 : c.variable) != null && f.value))
       return [];
-    const n = (f = e.partial.variable) == null ? void 0 : f.value, s = Ut(n), i = this.symbolFactory.create(In, { declaration: e });
+    const n = (p = e.partial.variable) == null ? void 0 : p.value, s = Rt(n), i = this.symbolFactory.create(gn, { declaration: e });
     e.symbol = i;
     const a = this.declarationNode.symbol.symbolTable, r = a.get(s);
     return r ? [
@@ -2363,18 +2381,18 @@ class zn {
     ] : (a.set(s, i), []);
   }
   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.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)), W(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] && !Hn(n.args[0]) && s.push(new l(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
+      n.args.length === 0 && s.push(new l(o.INVALID_COLUMN, "A column must have a type", n.callee)), $(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] && !jt(n.args[0]) && s.push(new l(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
       const i = n.args.slice(1);
       return s.push(...this.validateFieldSetting(i)), s.push(...this.registerField(n)), s;
     });
   }
   registerField(e) {
-    if (e.callee && W(e.callee)) {
-      const n = $(e.callee).unwrap(), s = qe(n), i = this.symbolFactory.create(lt, { declaration: e });
+    if (e.callee && $(e.callee)) {
+      const n = X(e.callee).unwrap(), s = He(n), i = this.symbolFactory.create(ct, { declaration: e });
       e.symbol = i;
       const a = this.declarationNode.symbol.symbolTable;
       if (a.has(s)) {
@@ -2390,84 +2408,90 @@ class zn {
   }
   // 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 M))
-      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(Ne) || !e.slice(-1).every((f) => Ne(f) || f instanceof M))
+      return [...e.map((f) => new l(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", f))];
     if (e.length === 0)
       return [];
     let n;
     g.last(e) instanceof M && (n = e.pop());
-    const s = B(n), i = s.getErrors(), a = s.getValue();
-    for (const p of e) {
-      const f = $(p).unwrap_or("").toLowerCase();
-      if (f !== "pk" && f !== "unique") {
-        i.push(new l(o.INVALID_SETTINGS, "Inline column settings can only be `pk` or `unique`", p));
-        continue;
+    const s = F(n), i = s.getErrors(), a = s.getValue();
+    e.forEach((f) => {
+      const p = X(f).unwrap_or("").toLowerCase();
+      if (p !== "pk" && p !== "unique") {
+        i.push(new l(o.INVALID_SETTINGS, "Inline column settings can only be `pk` or `unique`", f));
+        return;
       }
-      a[f] === void 0 ? a[f] = [p] : a[f].push(p);
-    }
-    const r = a.pk || [], c = a["primary key"] || [];
-    r.length >= 1 && c.length >= 1 && i.push(...[...r, ...c].map((p) => new l(o.DUPLICATE_COLUMN_SETTING, "Either one of 'primary key' and 'pk' can appear", p)));
-    for (const p in a) {
-      const f = a[p];
+      a[p] === void 0 ? a[p] = [f] : a[p].push(f);
+    });
+    const r = a[E.PK] || [], c = a[E.PKey] || [];
+    return r.length >= 1 && c.length >= 1 && i.push(
+      ...[...r, ...c].map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "Either one of 'primary key' and 'pk' can appear", f))
+    ), Ge(a, (f, p) => {
       switch (p) {
-        case "note":
-          f.length > 1 && i.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", u))), f.forEach((u) => {
-            C(u.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", u.value || u.name));
+        case E.Note:
+          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", h))), f.forEach((h) => {
+            Y(h.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", h.value || h.name));
           });
           break;
-        case "ref":
-          f.forEach((u) => {
-            Xt(u.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", u.value || u.name));
+        case E.Ref:
+          f.forEach((h) => {
+            Xt(h.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", h.value || h.name));
           });
           break;
-        case "primary key":
-          f.length > 1 && i.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, "primary key can only appear once", u))), f.forEach((u) => {
-            J(u.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'primary key' must not have a value", u.value || u.name));
+        case E.PKey:
+          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_COLUMN_SETTING, "primary key can only appear once", h))), f.forEach((h) => {
+            z(h.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'primary key' must not have a value", h.value || h.name));
           });
           break;
-        case "pk":
-          f.length > 1 && i.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, "'pk' can only appear once", u))), f.forEach((u) => {
-            u instanceof se && !J(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", u.value || u.name));
+        case E.PK:
+          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_COLUMN_SETTING, "'pk' can only appear once", h))), f.forEach((h) => {
+            h instanceof se && !z(h.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", h.value || h.name));
           });
           break;
-        case "not null":
-          f.length > 1 && i.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, "'not null' can only appear once", u)));
-          const d = a.null || [];
-          f.length >= 1 && d.length >= 1 && i.push(...[...f, ...d].map((u) => new l(o.CONFLICTING_SETTING, "'not null' and 'null' can not be set at the same time", u))), f.forEach((u) => {
-            J(u.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'not null' must not have a value", u.value || u.name));
+        case E.NotNull: {
+          f.length > 1 && i.push(...f.map((d) => new l(o.DUPLICATE_COLUMN_SETTING, "'not null' can only appear once", d)));
+          const h = a[E.Null] || [];
+          f.length >= 1 && h.length >= 1 && i.push(
+            ...[...f, ...h].map((d) => new l(o.CONFLICTING_SETTING, "'not null' and 'null' can not be set at the same time", d))
+          ), f.forEach((d) => {
+            z(d.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'not null' must not have a value", d.value || d.name));
           });
           break;
-        case "null":
-          f.length > 1 && i.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, "'null' can only appear once", u))), f.forEach((u) => {
-            J(u.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'null' must not have a value", u.value || u.name));
+        }
+        case E.Null:
+          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_COLUMN_SETTING, "'null' can only appear once", h))), f.forEach((h) => {
+            z(h.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'null' must not have a value", h.value || h.name));
           });
           break;
-        case "unique":
-          f.length > 1 && i.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, "'unique' can only appear once", u))), f.forEach((u) => {
-            u instanceof se && !J(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", u.value || u.name));
+        case E.Unique:
+          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_COLUMN_SETTING, "'unique' can only appear once", h))), f.forEach((h) => {
+            h instanceof se && !z(h.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", h.value || h.name));
           });
           break;
-        case "increment":
-          f.length > 1 && i.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, "'increment' can only appear once", u))), f.forEach((u) => {
-            u instanceof se && !J(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", u.value || u.name));
+        case E.Increment:
+          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_COLUMN_SETTING, "'increment' can only appear once", h))), f.forEach((h) => {
+            h instanceof se && !z(h.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", h.value || h.name));
           });
           break;
-        case "default":
-          f.length > 1 && i.push(...f.map((u) => new l(o.DUPLICATE_TABLE_SETTING, "'default' can only appear once", u))), f.forEach((u) => {
-            Ct(u.value) || i.push(new l(o.INVALID_TABLE_SETTING, "'default' must be a string literal, number literal, function expression, true, false or null", u.value || u.name));
+        case E.Default:
+          f.length > 1 && i.push(...f.map((h) => new l(o.DUPLICATE_TABLE_SETTING, "'default' can only appear once", h))), f.forEach((h) => {
+            Ct(h.value) || i.push(new l(
+              o.INVALID_TABLE_SETTING,
+              "'default' must be a string literal, number literal, function expression, true, false or null",
+              h.value || h.name
+            ));
           });
           break;
         default:
-          f.forEach((u) => i.push(new l(o.UNKNOWN_COLUMN_SETTING, `Unknown column setting '${p}'`, u)));
+          f.forEach((h) => i.push(new l(o.UNKNOWN_COLUMN_SETTING, `Unknown column setting '${p}'`, h)));
       }
-    }
-    return i;
+    }), i;
   }
   validateSubElements(e) {
     const n = e.flatMap((i) => {
       if (i.parent = this.declarationNode, !i.type)
         return [];
-      const a = de(i);
+      const a = he(i);
       return new a(i, this.publicSymbolTable, this.symbolFactory).validate();
     }), s = e.filter((i) => {
       var a;
@@ -2476,26 +2500,10 @@ class zn {
     return s.length > 1 && n.push(...s.map((i) => new l(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n;
   }
 }
-function Hn(t) {
-  if (!(t instanceof q || He(t) || t instanceof j || t instanceof he))
-    return !1;
-  if (t instanceof q) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ee(n) || C(n) || fe(n)))
-      return !1;
-    t = t.callee;
-  }
-  for (; t instanceof he; ) {
-    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && ee(n.name)))
-      return !1;
-    t = t.array;
-  }
-  const e = H(t).unwrap_or(void 0);
-  return e !== void 0 && e.length > 0;
-}
-function Qn(t, e) {
+function Zn(t, e) {
   return e.length === 1 && t === e[0];
 }
-class Jn {
+class es {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2536,10 +2544,10 @@ class Jn {
   }
   registerElement() {
     const { name: e } = this.declarationNode;
-    this.declarationNode.symbol = this.symbolFactory.create(Tn, { declaration: this.declarationNode, symbolTable: new ke() });
-    const n = H(e);
+    this.declarationNode.symbol = this.symbolFactory.create(Ln, { declaration: this.declarationNode, symbolTable: new ke() });
+    const n = q(e);
     if (n.isOk()) {
-      const s = n.unwrap(), i = s.pop(), a = Qe(s, this.publicSymbolTable, this.symbolFactory), r = at(i);
+      const s = n.unwrap(), i = s.pop(), a = Qe(s, this.publicSymbolTable, this.symbolFactory), r = rt(i);
       if (a.has(r))
         return [new l(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists`, e)];
       a.set(r, this.declarationNode.symbol);
@@ -2547,7 +2555,7 @@ class Jn {
     return [];
   }
   validateSettingList(e) {
-    const n = B(e), s = n.getErrors(), i = n.getValue();
+    const n = F(e), s = n.getErrors(), i = n.getValue();
     return g.forIn(i, (a, r) => {
       switch (r) {
         case "color":
@@ -2568,7 +2576,7 @@ class Jn {
             o.DUPLICATE_TABLE_SETTING,
             "'note' can only appear once",
             c
-          ))), a.filter((c) => !C(c.value)).forEach((c) => {
+          ))), a.filter((c) => !Y(c.value)).forEach((c) => {
             s.push(new l(
               o.INVALID_TABLE_SETTING,
               "'note' must be a string literal",
@@ -2604,14 +2612,14 @@ class Jn {
   validateFields(e) {
     return e.flatMap((n) => {
       const s = [];
-      return n.callee && !H(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 && !q(n.callee).isOk() && s.push(new l(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", n.callee)), this.registerField(n), n.args.length > 0 && s.push(...n.args.map((i) => new l(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
     });
   }
   validateSubElements(e) {
     const n = e.flatMap((i) => {
       if (i.parent = this.declarationNode, !i.type)
         return [];
-      const a = de(i);
+      const a = he(i);
       return new a(i, this.publicSymbolTable, this.symbolFactory).validate();
     }), s = e.filter((i) => {
       var a;
@@ -2620,8 +2628,8 @@ class Jn {
     return s.length > 1 && n.push(...s.map((i) => new l(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n;
   }
   registerField(e) {
-    if (e.callee && W(e.callee)) {
-      const n = $(e.callee).unwrap(), s = rt(n), i = this.symbolFactory.create(mn, { declaration: e });
+    if (e.callee && $(e.callee)) {
+      const n = X(e.callee).unwrap(), s = ot(n), i = this.symbolFactory.create(An, { declaration: e });
       e.symbol = i;
       const a = this.declarationNode.symbol.symbolTable;
       if (a.has(s)) {
@@ -2636,24 +2644,8 @@ class Jn {
     return [];
   }
 }
-const ct = ["-", "+"];
-function Kn(t) {
-  if (!(t instanceof q || He(t) || t instanceof j || t instanceof he))
-    return !1;
-  if (t instanceof q) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ee(n) || C(n) || fe(n)))
-      return !1;
-    t = t.callee;
-  }
-  for (; t instanceof he; ) {
-    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && ee(n.name)))
-      return !1;
-    t = t.array;
-  }
-  const e = H(t).unwrap_or(void 0);
-  return e !== void 0 && e.length > 0;
-}
-class Zn {
+const ts = ["-", "+"];
+class ns {
   constructor(e, n, s) {
     this.declarationNode = e, this.symbolFactory = s, this.publicSymbolTable = n;
   }
@@ -2693,17 +2685,17 @@ class Zn {
     )] : [];
   }
   validateSettingList(e) {
-    const n = B(e), s = n.getErrors(), i = n.getValue();
-    return dt(i, (a, r) => {
+    const n = F(e), s = n.getErrors(), i = n.getValue();
+    return Ge(i, (a, r) => {
       switch (r) {
-        case T.HeaderColor:
+        case E.HeaderColor:
           a.length > 1 && s.push(...a.map((c) => new l(o.DUPLICATE_TABLE_PARTIAL_SETTING, `'${r}' can only appear once`, c))), a.forEach((c) => {
             Je(c.value) || s.push(new l(o.INVALID_TABLE_PARTIAL_SETTING, `'${r}' must be a color literal`, c.value || c.name));
           });
           break;
-        case T.Note:
+        case E.Note:
           a.length > 1 && s.push(...a.map((c) => new l(o.DUPLICATE_TABLE_PARTIAL_SETTING, `'${r}' can only appear once`, c))), a.forEach((c) => {
-            C(c.value) || s.push(new l(o.INVALID_TABLE_PARTIAL_SETTING, `'${r}' must be a string literal`, c.value || c.name));
+            Y(c.value) || s.push(new l(o.INVALID_TABLE_PARTIAL_SETTING, `'${r}' must be a string literal`, c.value || c.name));
           });
           break;
         default:
@@ -2713,11 +2705,11 @@ class Zn {
   }
   registerElement() {
     const { name: e } = this.declarationNode;
-    this.declarationNode.symbol = this.symbolFactory.create(bn, { declaration: this.declarationNode, symbolTable: new ke() });
-    const n = H(e);
+    this.declarationNode.symbol = this.symbolFactory.create(_n, { declaration: this.declarationNode, symbolTable: new ke() });
+    const n = q(e);
     if (!n.isOk())
       return [];
-    const s = n.unwrap(), i = s.pop(), a = Qe(s, this.publicSymbolTable, this.symbolFactory), r = ot(i);
+    const s = n.unwrap(), i = s.pop(), a = Qe(s, this.publicSymbolTable, this.symbolFactory), r = lt(i);
     return a.has(r) ? [new l(o.DUPLICATE_NAME, `TablePartial name '${i}' already exists`, e)] : (a.set(r, this.declarationNode.symbol), []);
   }
   validateBody(e) {
@@ -2736,7 +2728,7 @@ class Zn {
       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)), W(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] && !Kn(n.args[0]) && s.push(new l(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
+      n.args.length === 0 && s.push(new l(o.INVALID_COLUMN, "A column must have a type", n.callee)), $(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] && !jt(n.args[0]) && s.push(new l(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
       const i = n.args.slice(1);
       return s.push(
         ...this.validateFieldSetting(i),
@@ -2745,9 +2737,9 @@ class Zn {
     });
   }
   registerField(e) {
-    if (!e.callee || !W(e.callee))
+    if (!e.callee || !$(e.callee))
       return [];
-    const n = $(e.callee).unwrap(), s = qe(n), i = this.symbolFactory.create(lt, { declaration: e });
+    const n = X(e.callee).unwrap(), s = He(n), i = this.symbolFactory.create(ct, { declaration: e });
     e.symbol = i;
     const a = this.declarationNode.symbol.symbolTable;
     if (a.has(s)) {
@@ -2762,86 +2754,86 @@ class Zn {
   // This is needed to support legacy inline settings
   validateFieldSetting(e) {
     const n = Ve(e);
-    if (!e.slice(0, -1).every(fe) || !(fe(n) || n instanceof M))
-      return [...e.map((f) => new l(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", f))];
+    if (!e.slice(0, -1).every(Ne) || !(Ne(n) || n instanceof M))
+      return [...e.map((p) => new l(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
     if (e.length === 0)
       return [];
     let s;
     g.last(e) instanceof M && (s = e.pop());
-    const i = B(s), a = i.getErrors(), r = i.getValue();
-    e.forEach((f) => {
-      const d = $(f).unwrap_or("").toLowerCase();
-      if (d !== T.PK && d !== T.Unique) {
-        a.push(new l(o.INVALID_SETTINGS, "Inline column settings can only be `pk` or `unique`", f));
+    const i = F(s), a = i.getErrors(), r = i.getValue();
+    e.forEach((p) => {
+      const h = X(p).unwrap_or("").toLowerCase();
+      if (h !== E.PK && h !== E.Unique) {
+        a.push(new l(o.INVALID_SETTINGS, "Inline column settings can only be `pk` or `unique`", p));
         return;
       }
-      r[d] === void 0 ? r[d] = [f] : r[d].push(f);
+      r[h] === void 0 ? r[h] = [p] : r[h].push(p);
     });
-    const c = r[T.PK] || [], p = r[T.PKey] || [];
-    return c.length >= 1 && p.length >= 1 && a.push(...[...c, ...p].map((f) => new l(
+    const c = r[E.PK] || [], f = r[E.PKey] || [];
+    return c.length >= 1 && f.length >= 1 && a.push(...[...c, ...f].map((p) => new l(
       o.DUPLICATE_COLUMN_SETTING,
       "Either one of 'primary key' and 'pk' can appear",
-      f
-    ))), dt(r, (f, d) => {
-      switch (d) {
-        case T.Note:
-          f.length > 1 && a.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, `'${d}' can only appear once`, u))), f.forEach((u) => {
-            C(u.value) || a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${d}' must be a quoted string`, u.value || u.name));
+      p
+    ))), Ge(r, (p, h) => {
+      switch (h) {
+        case E.Note:
+          p.length > 1 && a.push(...p.map((d) => new l(o.DUPLICATE_COLUMN_SETTING, `'${h}' can only appear once`, d))), p.forEach((d) => {
+            Y(d.value) || a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${h}' must be a quoted string`, d.value || d.name));
           });
           break;
-        case T.Ref:
-          f.forEach((u) => {
-            Xt(u.value) || a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${d}' must be a valid unary relationship`, u.value || u.name));
+        case E.Ref:
+          p.forEach((d) => {
+            Xt(d.value) || a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${h}' must be a valid unary relationship`, d.value || d.name));
           });
           break;
-        case T.PKey:
-          f.length > 1 && a.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, `'${d}' can only appear once`, u))), f.forEach((u) => {
-            J(u.value) || a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${d}' must not have a value`, u.value || u.name));
+        case E.PKey:
+          p.length > 1 && a.push(...p.map((d) => new l(o.DUPLICATE_COLUMN_SETTING, `'${h}' can only appear once`, d))), p.forEach((d) => {
+            z(d.value) || a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${h}' must not have a value`, d.value || d.name));
           });
           break;
-        case T.PK:
-          f.length > 1 && a.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, `'${d}' can only appear once`, u))), f.forEach((u) => {
-            u instanceof se && !J(u.value) && a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${d}' must not have a value`, u.value || u.name));
+        case E.PK:
+          p.length > 1 && a.push(...p.map((d) => new l(o.DUPLICATE_COLUMN_SETTING, `'${h}' can only appear once`, d))), p.forEach((d) => {
+            d instanceof se && !z(d.value) && a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${h}' must not have a value`, d.value || d.name));
           });
           break;
-        case T.NotNull: {
-          f.length > 1 && a.push(...f.map((E) => new l(o.DUPLICATE_COLUMN_SETTING, `'${d}' can only appear once`, E)));
-          const u = r[T.Null] || [];
-          f.length >= 1 && u.length >= 1 && a.push(...[...f, ...u].map((E) => new l(
+        case E.NotNull: {
+          p.length > 1 && a.push(...p.map((N) => new l(o.DUPLICATE_COLUMN_SETTING, `'${h}' can only appear once`, N)));
+          const d = r[E.Null] || [];
+          p.length >= 1 && d.length >= 1 && a.push(...[...p, ...d].map((N) => new l(
             o.CONFLICTING_SETTING,
             "'not null' and 'null' can not be set at the same time",
-            E
-          ))), f.forEach((E) => {
-            J(E.value) || a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${d}' must not have a value`, E.value || E.name));
+            N
+          ))), p.forEach((N) => {
+            z(N.value) || a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${h}' must not have a value`, N.value || N.name));
           });
           break;
         }
-        case T.Null:
-          f.length > 1 && a.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, `'${d}' can only appear once`, u))), f.forEach((u) => {
-            J(u.value) || a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${d}' must not have a value`, u.value || u.name));
+        case E.Null:
+          p.length > 1 && a.push(...p.map((d) => new l(o.DUPLICATE_COLUMN_SETTING, `'${h}' can only appear once`, d))), p.forEach((d) => {
+            z(d.value) || a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${h}' must not have a value`, d.value || d.name));
           });
           break;
-        case T.Unique:
-          f.length > 1 && a.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, `'${d}' can only appear once`, u))), f.forEach((u) => {
-            u instanceof se && !J(u.value) && a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${d}' must not have a value`, u.value || u.name));
+        case E.Unique:
+          p.length > 1 && a.push(...p.map((d) => new l(o.DUPLICATE_COLUMN_SETTING, `'${h}' can only appear once`, d))), p.forEach((d) => {
+            d instanceof se && !z(d.value) && a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${h}' must not have a value`, d.value || d.name));
           });
           break;
-        case T.Increment:
-          f.length > 1 && a.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, `'${d}' can only appear once`, u))), f.forEach((u) => {
-            u instanceof se && !J(u.value) && a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${d}' must not have a value`, u.value || u.name));
+        case E.Increment:
+          p.length > 1 && a.push(...p.map((d) => new l(o.DUPLICATE_COLUMN_SETTING, `'${h}' can only appear once`, d))), p.forEach((d) => {
+            d instanceof se && !z(d.value) && a.push(new l(o.INVALID_COLUMN_SETTING_VALUE, `'${h}' must not have a value`, d.value || d.name));
           });
           break;
-        case T.Default:
-          f.length > 1 && a.push(...f.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, `'${d}' can only appear once`, u))), f.forEach((u) => {
-            Ct(u.value) || a.push(new l(
+        case E.Default:
+          p.length > 1 && a.push(...p.map((d) => new l(o.DUPLICATE_COLUMN_SETTING, `'${h}' can only appear once`, d))), p.forEach((d) => {
+            Ct(d.value) || a.push(new l(
               o.INVALID_COLUMN_SETTING_VALUE,
-              `'${d}' must be a string literal, number literal, function expression, true, false or null`,
-              u.value || u.name
+              `'${h}' must be a string literal, number literal, function expression, true, false or null`,
+              d.value || d.name
             ));
           });
           break;
         default:
-          f.forEach((u) => a.push(new l(o.UNKNOWN_COLUMN_SETTING, `Unknown column setting '${d}'`, u)));
+          p.forEach((d) => a.push(new l(o.UNKNOWN_COLUMN_SETTING, `Unknown column setting '${h}'`, d)));
       }
     }), a;
   }
@@ -2849,7 +2841,7 @@ class Zn {
     const n = e.flatMap((i) => {
       if (i.parent = this.declarationNode, !i.type)
         return [];
-      const a = de(i);
+      const a = he(i);
       return new a(i, this.publicSymbolTable, this.symbolFactory).validate();
     }), s = e.filter((i) => {
       var a;
@@ -2858,32 +2850,32 @@ class Zn {
     return s.length > 1 && n.push(...s.map((i) => new l(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n;
   }
 }
-function de(t) {
+function he(t) {
   switch (t.type.value.toLowerCase()) {
     case I.Enum:
-      return Xn;
+      return Yn;
     case I.Table:
-      return zn;
+      return Kn;
     case I.TableGroup:
-      return Jn;
+      return es;
     case I.Project:
-      return Wn;
+      return zn;
     case I.Ref:
-      return Yn;
+      return Qn;
     case I.Note:
-      return jn;
+      return Hn;
     case I.Indexes:
-      return $n;
+      return qn;
     case I.TablePartial:
-      return Zn;
+      return ns;
     default:
-      return Cn;
+      return Wn;
   }
 }
 function Vt(t) {
-  return !!H(t).unwrap_or(!1);
+  return !!q(t).unwrap_or(!1);
 }
-function es(t) {
+function ss(t) {
   return Pe(t);
 }
 function Pe(t) {
@@ -2895,14 +2887,14 @@ function Qe(t, e, n) {
   let s = e;
   for (const a of t) {
     let r;
-    const c = nt(a);
+    const c = st(a);
     if (s.has(c)) {
       if (r = (i = s.get(c)) == null ? void 0 : i.symbolTable, !r)
         throw new Error("Expect a symbol table in a schema symbol");
     } else {
       r = new ke();
-      const p = n.create(Mt, { symbolTable: r });
-      s.set(c, p);
+      const f = n.create(Ut, { symbolTable: r });
+      s.set(c, f);
     }
     s = r;
   }
@@ -2913,42 +2905,58 @@ function Gt(t) {
 }
 function Je(t) {
   var n;
-  if (!(t instanceof j) || !(t.expression instanceof ye) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== h.COLOR_LITERAL)
+  if (!(t instanceof j) || !(t.expression instanceof ye) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
     return !1;
   const e = t.expression.literal.value;
   if (e.length !== 4 && e.length !== 7 || e[0] !== "#")
     return !1;
   for (let s = 1; s < e.length; s += 1)
-    if (!gn(e[s]))
+    if (!kn(e[s]))
       return !1;
   return !0;
 }
-function J(t) {
+function z(t) {
   return t === void 0;
 }
 function Ct(t) {
   var e;
-  return !!(C(t) || ee(t) || fe(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof ae && ct.includes((e = t.op) == null ? void 0 : e.value) && ee(t.expression) || t instanceof ue);
+  return !!(Y(t) || Ae(t) || Ne(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Z && ts.includes((e = t.op) == null ? void 0 : e.value) && Ae(t.expression) || t instanceof ue);
 }
-function ee(t) {
-  var e;
-  return t instanceof j && t.expression instanceof ye && ((e = t.expression.literal) == null ? void 0 : e.kind) === h.NUMERIC_LITERAL;
+function Ae(t) {
+  var e, n, s;
+  return t instanceof Z ? ((e = t.op) == null ? void 0 : e.value) !== "-" && ((n = t.op) == null ? void 0 : n.value) !== "+" ? !1 : Ae(t.expression) : t instanceof j && t.expression instanceof ye && ((s = t.expression.literal) == null ? void 0 : s.kind) === u.NUMERIC_LITERAL;
 }
 function Xt(t) {
   var n;
-  if (!(t instanceof ae) || !Gt((n = t.op) == null ? void 0 : n.value))
+  if (!(t instanceof Z) || !Gt((n = t.op) == null ? void 0 : n.value))
     return !1;
-  const e = H(t.expression).unwrap_or(void 0);
+  const e = q(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
 function $t(t) {
-  return t instanceof pe && t.elementList.every(W);
+  return t instanceof ce && t.elementList.every($);
 }
-function B(t) {
+function jt(t) {
+  if (!(t instanceof ee || ut(t) || t instanceof j || t instanceof Ie))
+    return !1;
+  if (t instanceof ee) {
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => Ae(n) || Y(n) || Ne(n)))
+      return !1;
+    t = t.callee;
+  }
+  for (; t instanceof Ie; ) {
+    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && Ae(n.name)))
+      return !1;
+    t = t.array;
+  }
+  const e = q(t).unwrap_or(void 0);
+  return e !== void 0 && e.length > 0;
+}
+function F(t) {
   var s;
   const e = {}, n = [];
   if (!t)
-    return new z({});
+    return new J({});
   for (const i of t.elementList) {
     if (!i.name)
       continue;
@@ -2959,11 +2967,11 @@ function B(t) {
     const a = (s = we(i.name).unwrap_or(void 0)) == null ? void 0 : s.toLowerCase();
     a && (e[a] === void 0 ? e[a] = [i] : e[a].push(i));
   }
-  return new z(e, n);
+  return new J(e, n);
 }
-class _t {
+class At {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(Mt, {
+    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(Ut, {
       symbolTable: new ke()
     }), this.ast.symbol = this.publicSchemaSymbol, this.ast.symbol.declaration = this.ast;
   }
@@ -2972,18 +2980,18 @@ class _t {
     this.ast.body.forEach((s) => {
       if (s.parent = this.ast, s.type === void 0)
         return;
-      const i = de(s), a = new i(
+      const i = he(s), a = new i(
         s,
         this.publicSchemaSymbol.symbolTable,
         this.symbolFactory
       );
       e.push(...a.validate());
     });
-    const n = this.ast.body.filter((s) => _e(s).unwrap_or(void 0) === I.Project);
-    return n.length > 1 && n.forEach((s) => e.push(new l(o.PROJECT_REDEFINED, "Only one project can exist", s))), new z(this.ast, e);
+    const n = this.ast.body.filter((s) => Le(s).unwrap_or(void 0) === I.Project);
+    return n.length > 1 && n.forEach((s) => e.push(new l(o.PROJECT_REDEFINED, "Only one project can exist", s))), new J(this.ast, e);
   }
 }
-class Ee {
+class fe {
   constructor(e, n) {
     this.declarationNode = e, this.errors = n;
   }
@@ -3008,9 +3016,9 @@ class Ee {
     const { body: n } = e;
     n instanceof oe ? n.body.forEach((s) => {
       if (s instanceof y) {
-        if (!s.type || _e(this.declarationNode).unwrap_or(null) === I.TablePartial && _e(s).unwrap_or(null) === I.Indexes)
+        if (!s.type || Le(this.declarationNode).unwrap_or(null) === I.TablePartial && Le(s).unwrap_or(null) === I.Indexes)
           return;
-        const i = jt(s);
+        const i = Wt(s);
         new i(s, this.errors).bind();
       } else
         s instanceof w ? this.bindSubfield(s) : this.bindPartialInjection(s);
@@ -3036,7 +3044,7 @@ class Ee {
           return;
         this.bindFragments([e], n);
       } else
-        e instanceof ce ? He(e) ? this.bindFragments(ge(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof ae ? this.scanAndBind(e.expression, n) : e instanceof Ye ? this.scanAndBind(e.expression, n) : e instanceof pe ? e.elementList.forEach((a) => this.scanAndBind(a, n)) : e instanceof Ae && this.bindFragments([e], n);
+        e instanceof le ? ut(e) ? this.bindFragments(_e(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof Z ? this.scanAndBind(e.expression, n) : e instanceof qe ? this.scanAndBind(e.expression, n) : e instanceof ce ? e.elementList.forEach((a) => this.scanAndBind(a, n)) : e instanceof be && this.bindFragments([e], n);
   }
   // Bind the fragments of a member access expression
   // which can be a simple expression like v1.User,
@@ -3044,67 +3052,67 @@ class Ee {
   bindFragments(e, n) {
     if (e.length === 0)
       return;
-    const s = e.length === 1 && e[0] instanceof Ae, i = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: a } = n, r = s ? -1 : e.findIndex((E) => !W(E)), p = r !== -1 && $t(e[r]) ? e[r] : void 0, f = r >= 0 ? i.pop() : void 0, d = e.slice(
+    const s = e.length === 1 && e[0] instanceof be, i = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: a } = n, r = s ? -1 : e.findIndex((N) => !$(N)), f = r !== -1 && $t(e[r]) ? e[r] : void 0, p = r >= 0 ? i.pop() : void 0, h = e.slice(
       0,
       r === -1 ? void 0 : r
     );
-    if (d.length === 0)
+    if (h.length === 0)
       return;
-    const u = [];
-    for (; i.length && d.length; ) {
-      const E = i.pop(), L = d.pop(), v = $(L).unwrap();
-      u.unshift({
-        index: Fe(v, E),
+    const d = [];
+    for (; i.length && h.length; ) {
+      const N = i.pop(), L = h.pop(), v = X(L).unwrap();
+      d.unshift({
+        index: Fe(v, N),
         referrer: L
       });
     }
-    for (; d.length; ) {
-      const E = d.pop(), L = s ? Bn(E).unwrap() : $(E).unwrap();
-      u.unshift({
+    for (; h.length; ) {
+      const N = h.pop(), L = s ? Xn(N).unwrap() : X(N).unwrap();
+      d.unshift({
         index: Fe(L, a),
-        referrer: E
+        referrer: N
       });
     }
-    return p ? p.elementList.forEach((E) => this.resolveIndexStack(
+    return f ? f.elementList.forEach((N) => this.resolveIndexStack(
       [
-        ...u,
+        ...d,
         {
           index: Fe(
-            $(E).unwrap(),
-            f
+            X(N).unwrap(),
+            p
           ),
-          referrer: E
+          referrer: N
         }
       ],
       n.ignoreNameNotFound
-    )) : this.resolveIndexStack(u, n.ignoreNameNotFound);
+    )) : this.resolveIndexStack(d, n.ignoreNameNotFound);
   }
   // Looking up the indexes in the subname stack from the current declaration node
   // Each time the index resolves to a symbol, the referrer's symbol is bound to it
   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, a = At(s.index, this.declarationNode);
+    const [s, ...i] = e, a = Lt(s.index, this.declarationNode);
     if (a === void 0) {
-      const { kind: f, name: d } = le(s.index).unwrap();
-      this.logError(s.referrer, `Can not find ${f} '${d}'`, n);
+      const { kind: p, name: h } = ie(s.index).unwrap();
+      this.logError(s.referrer, `Can not find ${p} '${h}'`, n);
       return;
     }
     a.references.push(s.referrer), s.referrer.referee = a;
-    let r = a.symbolTable, { kind: c, name: p } = le(s.index).unwrap();
-    for (const f of i) {
-      const { kind: d, name: u } = le(f.index).unwrap(), E = r.get(f.index);
-      if (!E) {
+    let r = a.symbolTable, { kind: c, name: f } = ie(s.index).unwrap();
+    for (const p of i) {
+      const { kind: h, name: d } = ie(p.index).unwrap(), N = r.get(p.index);
+      if (!N) {
         this.logError(
-          f.referrer,
-          `${c} '${p}' does not have ${d} '${u}'`,
+          p.referrer,
+          `${c} '${f}' does not have ${h} '${d}'`,
           n
         );
         return;
       }
-      if (c = d, p = u, f.referrer.referee = E, E.references.push(f.referrer), !E.symbolTable)
+      if (c = h, f = d, p.referrer.referee = N, N.references.push(p.referrer), !N.symbolTable)
         break;
-      r = E.symbolTable;
+      r = N.symbolTable;
     }
   }
   logError(e, n, s) {
@@ -3118,23 +3126,23 @@ class Ee {
       return;
     const s = /* @__PURE__ */ new Map();
     n.forEach((a, r) => {
-      var f, d;
-      if (!fn(r))
+      var p, h;
+      if (!Nn(r))
         return;
-      const c = At(pn(r), this.declarationNode), p = (d = (f = c == null ? void 0 : c.declaration) == null ? void 0 : f.symbol) == null ? void 0 : d.symbolTable;
-      p && p.forEach((u, E) => {
-        n.has(E) || s.set(E, { injectorFieldSymbol: u, injectorDeclaration: a.declaration });
+      const c = Lt(Tn(r), this.declarationNode), f = (h = (p = c == null ? void 0 : c.declaration) == null ? void 0 : p.symbol) == null ? void 0 : h.symbolTable;
+      f && f.forEach((d, N) => {
+        n.has(N) || s.set(N, { injectorFieldSymbol: d, injectorDeclaration: a.declaration });
       });
     }), s.forEach((a, r) => {
-      const c = _n(a.injectorFieldSymbol);
+      const c = yn(a.injectorFieldSymbol);
       if (!c)
         return;
-      const p = e.create(c, a);
-      n.set(r, p);
+      const f = e.create(c, a);
+      n.set(r, f);
     });
   }
 }
-class ts extends Ee {
+class is extends fe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3144,7 +3152,7 @@ class ts extends Ee {
     }, this.settingList = {};
   }
 }
-class ns extends Ee {
+class as extends fe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3154,7 +3162,7 @@ class ns extends Ee {
     }, this.settingList = {};
   }
 }
-class ss extends Ee {
+class rs extends fe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3189,7 +3197,7 @@ class ss extends Ee {
     }, this.settingList = {};
   }
 }
-class is extends Ee {
+class os extends fe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3199,7 +3207,7 @@ class is extends Ee {
     }, this.settingList = {};
   }
 }
-class as extends Ee {
+class ls extends fe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3209,7 +3217,7 @@ class as extends Ee {
     }, this.settingList = {};
   }
 }
-class rs extends Ee {
+class cs extends fe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3226,7 +3234,7 @@ class rs extends Ee {
     }, this.settingList = {};
   }
 }
-class os extends Ee {
+class us extends fe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3259,7 +3267,7 @@ class os extends Ee {
     };
   }
 }
-class ls extends Ee {
+class hs extends fe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3276,7 +3284,7 @@ class ls extends Ee {
     }, this.settingList = {};
   }
 }
-class cs extends Ee {
+class fs extends fe {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3304,29 +3312,29 @@ class cs extends Ee {
     }, this.settingList = {};
   }
 }
-function jt(t) {
+function Wt(t) {
   switch (t.type.value.toLowerCase()) {
     case I.Enum:
-      return ns;
+      return as;
     case I.Table:
-      return os;
+      return us;
     case I.TableGroup:
-      return ls;
+      return hs;
     case I.Project:
-      return as;
+      return ls;
     case I.Ref:
-      return rs;
+      return cs;
     case I.Note:
-      return is;
+      return os;
     case I.Indexes:
-      return ss;
+      return rs;
     case I.TablePartial:
-      return cs;
+      return fs;
     default:
-      return ts;
+      return is;
   }
 }
-class us {
+class ps {
   constructor(e) {
     this.ast = e, this.errors = [];
   }
@@ -3334,12 +3342,12 @@ class us {
     return this.ast.body.map((n) => {
       if (!n.type)
         return null;
-      const s = jt(n), i = new s(n, this.errors);
+      const s = Wt(n), i = new s(n, this.errors);
       return i.resolveInjections(e), i;
-    }).forEach((n) => n == null ? void 0 : n.bind()), new z(this.ast, this.errors);
+    }).forEach((n) => n == null ? void 0 : n.bind()), new J(this.ast, this.errors);
   }
 }
-class hs {
+class ds {
   constructor(e) {
     this.generator = e;
   }
@@ -3347,21 +3355,21 @@ class hs {
     return new e(n, this.generator.nextId());
   }
 }
-class fs {
+class Es {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = new hs(n);
+    this.ast = e, this.symbolFactory = new ds(n);
   }
   // Analyzing: Invoking both the validator and binder
   analyze() {
-    return new _t(this.ast, this.symbolFactory).validate().chain((n) => new us(n).resolve(this.symbolFactory));
+    return new At(this.ast, this.symbolFactory).validate().chain((n) => new ps(n).resolve(this.symbolFactory));
   }
   // For invoking the validator only
   validate() {
-    return new _t(this.ast, this.symbolFactory).validate().chain((n) => new z(n, []));
+    return new At(this.ast, this.symbolFactory).validate().chain((n) => new J(n, []));
   }
 }
-function gt(t, e) {
-  const { variables: n, tupleElements: s } = xe(t).unwrap();
+function _t(t, e) {
+  const { variables: n, tupleElements: s } = De(t).unwrap();
   return s ? n.length === 0 ? {
     schemaName: e.schemaName,
     tableName: e.name,
@@ -3380,7 +3388,7 @@ function gt(t, e) {
     schemaName: n.pop() || null
   };
 }
-function Wt(t) {
+function Yt(t) {
   switch (t) {
     case "<":
       return ["1", "*"];
@@ -3390,8 +3398,9 @@ function Wt(t) {
       return ["*", "1"];
     case "-":
       return ["1", "1"];
+    default:
+      throw new Error("Invalid relation op");
   }
-  throw new Error("Invalid relation op");
 }
 function _(t) {
   return {
@@ -3400,16 +3409,20 @@ function _(t) {
       line: t.startPos.line + 1,
       column: t.startPos.column + 1
     },
-    end: { offset: t.endPos.offset, line: t.endPos.line + 1, column: t.endPos.column + 1 }
+    end: {
+      offset: t.endPos.offset,
+      line: t.endPos.line + 1,
+      column: t.endPos.column + 1
+    }
   };
 }
-function $e(t) {
+function je(t) {
   var n;
-  const e = (n = ge(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
-  return e instanceof pe ? e.elementList.map((s) => s.referee) : [e.referee];
+  const e = (n = _e(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
+  return e instanceof ce ? e.elementList.map((s) => s.referee) : [e.referee];
 }
-function be(t) {
-  const e = H(t).unwrap();
+function ge(t) {
+  const e = q(t).unwrap();
   return {
     name: e.pop(),
     schemaName: e
@@ -3418,7 +3431,7 @@ function be(t) {
 function Oe(t) {
   return t.expression.literal.value;
 }
-function Yt(t, e) {
+function qt(t, e) {
   if (Array.isArray(t)) {
     const i = t.map(({ id: r }) => r).sort().join(","), a = e.map(({ id: r }) => r).sort().join(",");
     return i < a ? `${i}-${a}` : `${a}-${i}`;
@@ -3426,7 +3439,7 @@ function Yt(t, e) {
   const n = t.id.toString(), s = e.id.toString();
   return n < s ? `${n}-${s}` : `${s}-${n}`;
 }
-function ut(t, e) {
+function ht(t, e) {
   if (Array.isArray(t)) {
     const i = t.map(({ id: r }) => r).sort(), a = e.map(({ id: r }) => r).sort();
     return g.zip(i, a).every(([r, c]) => r === c);
@@ -3434,13 +3447,58 @@ function ut(t, e) {
   const n = t.id, s = e.id;
   return n === s;
 }
-function ie(t) {
+function ae(t) {
   const e = t.split(`
 `), n = e.slice(e.findIndex((a) => a.trimStart() !== "")), s = n.filter((a) => a.trimStart()), i = Math.min(...s.map((a) => a.length - a.trimStart().length));
   return n.map((a) => a.slice(i)).join(`
 `);
 }
-class qt {
+function Ht(t) {
+  if (t) {
+    if (Y(t))
+      return {
+        value: V(t).unwrap(),
+        type: "string"
+      };
+    if (Ae(t))
+      return {
+        type: "number",
+        value: tt(t)
+      };
+    if (Ne(t))
+      return {
+        value: t.expression.variable.value.toLowerCase(),
+        type: "boolean"
+      };
+    if (t instanceof ue && t.value)
+      return {
+        value: t.value.value,
+        type: "expression"
+      };
+    throw new Error("Unreachable");
+  }
+}
+function zt(t) {
+  let e = null;
+  t instanceof ee && (e = t.argumentList.elementList.map((a) => Ae(a) ? Ft(a) : Y(a) ? V(a).unwrap() : W(a).unwrap()).join(","), t = t.callee);
+  let n = "";
+  for (; t instanceof Ie; )
+    n = `[${t.indexer.elementList.map((a) => a.name.expression.literal.value).join(",")}]${n}`, t = t.array;
+  const { name: s, schemaName: i } = ge(t);
+  return i.length > 1 ? new J(
+    {
+      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 J({
+    schemaName: i.length === 0 ? null : i[0],
+    type_name: `${s}${n}${e ? `(${e})` : ""}`,
+    args: e
+  });
+}
+class Qt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.table = {
       name: void 0,
@@ -3469,16 +3527,18 @@ class qt {
         // do not make sense to have a meaningful end (?)
       },
       pk: !0
-    }), this.pkColumns.forEach((n) => n.pk = !1)), e;
+    }), this.pkColumns.forEach((n) => {
+      n.pk = !1;
+    })), e;
   }
   interpretName(e) {
-    const { name: n, schemaName: s } = be(e);
+    const { name: n, schemaName: s } = ge(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, []);
   }
   interpretAlias(e) {
     if (!e)
       return [];
-    const n = $(e).unwrap_or(null);
+    const n = X(e).unwrap_or(null);
     return n && (this.env.aliases.push({
       name: n,
       kind: "table",
@@ -3490,16 +3550,16 @@ class qt {
   }
   interpretSettingList(e) {
     var i, a, r;
-    const n = B(e).getValue();
-    this.table.headerColor = (i = n.headercolor) != null && i.length ? Oe((r = (a = n.headercolor) == null ? void 0 : a.at(0)) == null ? void 0 : r.value) : void 0;
-    const [s] = n.note || [];
+    const n = F(e).getValue();
+    this.table.headerColor = (i = n[E.HeaderColor]) != null && i.length ? Oe((r = (a = n[E.HeaderColor]) == null ? void 0 : a.at(0)) == null ? void 0 : r.value) : void 0;
+    const [s] = n[E.Note] || [];
     return this.table.note = s && {
-      value: F(s == null ? void 0 : s.value).map(ie).unwrap(),
+      value: V(s == null ? void 0 : s.value).map(ae).unwrap(),
       token: _(s)
     }, [];
   }
   interpretBody(e) {
-    const [n, s] = g.partition(e.body, (i) => i instanceof w || i instanceof Ae);
+    const [n, s] = g.partition(e.body, (i) => i instanceof w || i instanceof be);
     return [
       ...this.interpretFields(n),
       ...this.interpretSubElements(s)
@@ -3511,9 +3571,9 @@ class qt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case I.Note:
           return this.table.note = {
-            value: F(
+            value: V(
               n.body instanceof oe ? n.body.body[0].callee : n.body.callee
-            ).map(ie).unwrap(),
+            ).map(ae).unwrap(),
             token: _(n)
           }, [];
         case I.Indexes:
@@ -3528,98 +3588,106 @@ class qt {
     return s.name = e.partial.variable.value, this.table.partials.push(s), [];
   }
   interpretFields(e) {
-    return e.flatMap((n, s) => n instanceof w ? this.interpretColumn(n) : this.interpretInjection(n, s));
+    var r;
+    const i = ((r = this.declarationNode.symbol) != null && r.symbolTable ? [...this.declarationNode.symbol.symbolTable.entries()] : []).filter(([c]) => {
+      const f = ie(c).unwrap_or(null);
+      return (f == null ? void 0 : f.kind) === m.Column;
+    }).length ? [] : [new l(o.EMPTY_TABLE, "A Table must have at least one column", this.declarationNode)], a = e.flatMap((c, f) => c instanceof w ? this.interpretColumn(c) : this.interpretInjection(c, f));
+    return [
+      ...i,
+      ...a
+    ];
   }
   interpretColumn(e) {
-    var r, c, p, f, d, u, E, L, v;
+    var r, c, f, p, h, d, N, L, v;
     const n = [], s = {};
-    s.name = $(e.callee).unwrap();
-    const i = ps(e.args[0]);
+    s.name = X(e.callee).unwrap();
+    const i = zt(e.args[0]);
     s.type = i.getValue(), n.push(...i.getErrors()), s.token = _(e), s.inline_refs = [];
     const a = e.args.slice(1);
     if (g.last(a) instanceof M) {
-      const A = B(a.pop()).getValue();
-      s.pk = !!((r = A.pk) != null && r.length) || !!((c = A["primary key"]) != null && c.length), s.increment = !!((p = A.increment) != null && p.length), s.unique = !!((f = A.unique) != null && f.length), s.not_null = (d = A["not null"]) != null && d.length ? !0 : (u = A.null) != null && u.length ? !1 : void 0, s.dbdefault = ds((L = (E = A.default) == null ? void 0 : E.at(0)) == null ? void 0 : L.value);
-      const P = (v = A.note) == null ? void 0 : v.at(0);
+      const A = F(a.pop()).getValue();
+      s.pk = !!((r = A[E.PK]) != null && r.length) || !!((c = A[E.PKey]) != null && c.length), s.increment = !!((f = A[E.Increment]) != null && f.length), s.unique = !!((p = A[E.Unique]) != null && p.length), s.not_null = (h = A[E.NotNull]) != null && h.length ? !0 : (d = A[E.Null]) != null && d.length ? !1 : void 0, s.dbdefault = Ht((L = (N = A[E.Default]) == null ? void 0 : N.at(0)) == null ? void 0 : L.value);
+      const P = (v = A[E.Note]) == null ? void 0 : v.at(0);
       s.note = P && {
-        value: F(P.value).map(ie).unwrap(),
+        value: V(P.value).map(ae).unwrap(),
         token: _(P)
       };
-      const Ie = A.ref || [];
-      s.inline_refs = Ie.flatMap((x) => {
-        const [Ue] = $e(x.value.expression);
-        if (ut(Ue, e.symbol))
-          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", x)), [];
-        const Ne = x.value.op, V = H(x.value.expression).unwrap();
+      const Te = A[E.Ref] || [];
+      s.inline_refs = Te.flatMap((D) => {
+        const [Ue] = je(D.value.expression);
+        if (ht(Ue, e.symbol))
+          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", D)), [];
+        const pe = D.value.op, B = q(D.value.expression).unwrap();
         let te;
-        if (V.length === 1) {
-          const [Q] = V;
+        if (B.length === 1) {
+          const [H] = B;
           te = {
             schemaName: this.table.schemaName,
             tableName: this.table.name,
-            fieldNames: [Q],
-            relation: Ne.value,
-            token: _(x)
+            fieldNames: [H],
+            relation: pe.value,
+            token: _(D)
           };
-        } else if (V.length === 2) {
-          const [Q, me] = V;
+        } else if (B.length === 2) {
+          const [H, Ee] = B;
           te = {
             schemaName: null,
-            tableName: Q,
-            fieldNames: [me],
-            relation: Ne.value,
-            token: _(x)
+            tableName: H,
+            fieldNames: [Ee],
+            relation: pe.value,
+            token: _(D)
           };
-        } else if (V.length === 3) {
-          const [Q, me, pt] = V;
+        } else if (B.length === 3) {
+          const [H, Ee, dt] = B;
           te = {
-            schemaName: Q,
-            tableName: me,
-            fieldNames: [pt],
-            relation: Ne.value,
-            token: _(x)
+            schemaName: H,
+            tableName: Ee,
+            fieldNames: [dt],
+            relation: pe.value,
+            token: _(D)
           };
         } else {
-          n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", x));
-          const Q = V.pop(), me = V.pop();
+          n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", D));
+          const H = B.pop(), Ee = B.pop();
           te = {
-            schemaName: V.join("."),
-            tableName: me,
-            fieldNames: [Q],
-            relation: Ne.value,
-            token: _(x)
+            schemaName: B.join("."),
+            tableName: Ee,
+            fieldNames: [H],
+            relation: pe.value,
+            token: _(D)
           };
         }
-        const Te = this.registerInlineRefToEnv(e, Ue, te, x);
-        return n.push(...Te), Te.length === 0 ? te : [];
+        const de = this.registerInlineRefToEnv(e, Ue, te, D);
+        return n.push(...de), de.length === 0 ? te : [];
       });
     }
-    return s.pk || (s.pk = a.some((A) => Y(A).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = a.some((A) => Y(A).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
+    return s.pk || (s.pk = a.some((A) => W(A).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = a.some((A) => W(A).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 r, c, p, f, d, u, E;
+      var r, c, f, p, h, d, N;
       const s = { columns: [] }, i = n;
       s.token = _(i);
       const a = [i.callee, ...i.args];
       if (g.last(a) instanceof M) {
-        const L = B(a.pop()).getValue();
-        s.pk = !!((r = L.pk) != null && r.length), s.unique = !!((c = L.unique) != null && c.length), s.name = F((f = (p = L.name) == null ? void 0 : p.at(0)) == null ? void 0 : f.value).unwrap_or(void 0);
-        const v = (d = L.note) == null ? void 0 : d.at(0);
+        const L = F(a.pop()).getValue();
+        s.pk = !!((r = L[E.PK]) != null && r.length), s.unique = !!((c = L[E.Unique]) != null && c.length), s.name = V((p = (f = L[E.Name]) == null ? void 0 : f.at(0)) == null ? void 0 : p.value).unwrap_or(void 0);
+        const v = (h = L[E.Note]) == null ? void 0 : h.at(0);
         s.note = v && {
-          value: F(v.value).unwrap(),
+          value: V(v.value).unwrap(),
           token: _(v)
-        }, s.type = Y((E = (u = L.type) == null ? void 0 : u.at(0)) == null ? void 0 : E.value).unwrap_or(void 0);
+        }, s.type = W((N = (d = L[E.Type]) == null ? void 0 : d.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
       }
       return a.flatMap((L) => {
-        if (!(L instanceof q))
+        if (!(L instanceof ee))
           return L;
         const v = [];
-        for (; L instanceof q; )
+        for (; L instanceof ee; )
           v.push(L.argumentList), L = L.callee;
         return v.push(L), v;
       }).forEach((L) => {
-        const { functional: v, nonFunctional: A } = Xe(L).unwrap();
+        const { functional: v, nonFunctional: A } = $e(L).unwrap();
         s.columns.push(
           ...v.map((P) => ({
             value: P.value.value,
@@ -3627,7 +3695,7 @@ class qt {
             token: _(P)
           })),
           ...A.map((P) => ({
-            value: $(P).unwrap(),
+            value: X(P).unwrap(),
             type: "column",
             token: _(P)
           }))
@@ -3636,13 +3704,13 @@ class qt {
     })), [];
   }
   registerInlineRefToEnv(e, n, s, i) {
-    const a = Yt(e.symbol, n);
+    const a = qt(e.symbol, n);
     if (this.env.refIds[a])
       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[a])
       ];
-    const r = Wt(s.relation);
+    const r = Yt(s.relation);
     return this.env.refIds[a] = i, this.env.ref.set(i, {
       name: null,
       schemaName: null,
@@ -3655,7 +3723,7 @@ class qt {
         {
           schemaName: this.table.schemaName,
           tableName: this.table.name,
-          fieldNames: [Y(e.callee).unwrap()],
+          fieldNames: [W(e.callee).unwrap()],
           token: _(e),
           relation: r[0]
         }
@@ -3663,60 +3731,7 @@ class qt {
     }), [];
   }
 }
-function ps(t) {
-  let e = null;
-  t instanceof q && (e = t.argumentList.elementList.map((a) => ee(a) ? a.expression.literal.value : C(a) ? F(a).unwrap() : Y(a).unwrap()).join(","), t = t.callee);
-  let n = "";
-  for (; t instanceof he; )
-    n = `[${t.indexer.elementList.map((a) => a.name.expression.literal.value).join(",")}]${n}`, t = t.array;
-  const { name: s, schemaName: i } = be(t);
-  return i.length > 1 ? new z(
-    {
-      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 z({
-    schemaName: i.length === 0 ? null : i[0],
-    type_name: `${s}${n}${e ? `(${e})` : ""}`,
-    args: e
-  });
-}
-function ds(t) {
-  var e, n, s;
-  if (t) {
-    if (C(t))
-      return {
-        value: F(t).unwrap(),
-        type: "string"
-      };
-    if (ee(t))
-      return {
-        type: "number",
-        value: Number.parseFloat(t.expression.literal.value)
-      };
-    if (fe(t))
-      return {
-        value: t.expression.variable.value.toLowerCase(),
-        type: "boolean"
-      };
-    if (t instanceof ae && ct.includes((e = t.op) == null ? void 0 : e.value) && ee(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 ue)
-      return {
-        value: (s = t.value) == null ? void 0 : s.value,
-        type: "expression"
-      };
-    throw new Error("Unreachable");
-  }
-}
-class Es {
+class Ns {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.note = { name: void 0, content: void 0, token: void 0 };
   }
@@ -3728,12 +3743,12 @@ class Es {
     ];
   }
   interpretName(e) {
-    const { name: n } = be(e);
+    const { name: n } = ge(e);
     return this.note.name = n, [];
   }
   interpretSettingList(e) {
     var s, i, a;
-    const n = B(e).getValue();
+    const n = F(e).getValue();
     return this.note.headerColor = (s = n.headercolor) != null && s.length ? Oe((a = (i = n.headercolor) == null ? void 0 : i.at(0)) == null ? void 0 : a.value) : void 0, [];
   }
   interpretBody(e) {
@@ -3744,10 +3759,10 @@ class Es {
   }
   interpretNote(e) {
     const n = g.get(e, "callee.expression.literal.value", "");
-    return this.note.content = ie(n), [];
+    return this.note.content = ae(n), [];
   }
 }
-class zt {
+class Jt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.container = this.declarationNode.parent instanceof y ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
   }
@@ -3758,45 +3773,45 @@ class zt {
     ];
   }
   interpretName(e) {
-    const n = [], s = H(this.declarationNode.name).unwrap_or([]);
+    const n = [], s = q(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 w ? this.interpretField(e) : this.interpretField(e.body[0]);
   }
   interpretField(e) {
-    var f, d, u, E, L, v, A;
-    const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, a = $e(s), r = $e(i);
-    if (ut(a, r))
+    var p, h, d, N, L, v, A;
+    const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, a = je(s), r = je(i);
+    if (ht(a, r))
       return [new l(o.SAME_ENDPOINT, "Two endpoints are the same", e)];
-    const c = Yt(a, r);
+    const c = qt(a, r);
     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 P = B(e.args[0]).getValue(), Ie = (d = (f = P.delete) == null ? void 0 : f.at(0)) == null ? void 0 : d.value;
-      this.ref.onDelete = Ie instanceof ne ? we(Ie).unwrap_or(void 0) : Y(Ie).unwrap_or(void 0);
-      const x = (E = (u = P.update) == null ? void 0 : u.at(0)) == null ? void 0 : E.value;
-      this.ref.onUpdate = x instanceof ne ? we(x).unwrap_or(void 0) : Y(x).unwrap_or(void 0), this.ref.color = (L = P.color) != null && L.length ? Oe((A = (v = P.color) == null ? void 0 : v.at(0)) == null ? void 0 : A.value) : void 0;
+      const P = F(e.args[0]).getValue(), Te = (h = (p = P.delete) == null ? void 0 : p.at(0)) == null ? void 0 : h.value;
+      this.ref.onDelete = Te instanceof ne ? we(Te).unwrap_or(void 0) : W(Te).unwrap_or(void 0);
+      const D = (N = (d = P.update) == null ? void 0 : d.at(0)) == null ? void 0 : N.value;
+      this.ref.onUpdate = D instanceof ne ? we(D).unwrap_or(void 0) : W(D).unwrap_or(void 0), this.ref.color = (L = P.color) != null && L.length ? Oe((A = (v = P.color) == null ? void 0 : v.at(0)) == null ? void 0 : A.value) : void 0;
     }
-    const p = Wt(n);
+    const f = Yt(n);
     return this.ref.endpoints = [
       {
-        ...gt(s, this.container),
-        relation: p[0],
+        ..._t(s, this.container),
+        relation: f[0],
         token: _(s)
       },
       {
-        ...gt(i, this.container),
-        relation: p[1],
+        ..._t(i, this.container),
+        relation: f[1],
         token: _(i)
       }
     ], this.env.refIds[c] = this.declarationNode, [];
   }
 }
-class Ht {
+class Kt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.tableGroup = { tables: [] };
   }
@@ -3809,11 +3824,11 @@ class Ht {
     ), e;
   }
   interpretName(e) {
-    const n = [], { name: s, schemaName: i } = be(e);
+    const n = [], { name: s, schemaName: i } = ge(e);
     return i.length >= 2 && (this.tableGroup.name = s, this.tableGroup.schemaName = i.join("."), n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = s, this.tableGroup.schemaName = i[0] || null, n;
   }
   interpretBody(e) {
-    const [n, s] = St(e.body, (i) => i instanceof w);
+    const [n, s] = Pt(e.body, (i) => i instanceof w);
     return [
       ...this.interpretFields(n),
       ...this.interpretSubElements(s)
@@ -3825,9 +3840,9 @@ class Ht {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           this.tableGroup.note = {
-            value: F(
+            value: V(
               n.body instanceof oe ? n.body.body[0].callee : n.body.callee
-            ).map(ie).unwrap(),
+            ).map(ae).unwrap(),
             token: _(n)
           };
           break;
@@ -3838,12 +3853,12 @@ class Ht {
   interpretFields(e) {
     const n = [];
     return this.tableGroup.tables = e.map((s) => {
-      const i = H(s.callee).unwrap();
+      const i = q(s.callee).unwrap();
       i.length > 2 && n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", s));
-      const a = ge(s.callee).unwrap().pop().referee.id;
+      const a = _e(s.callee).unwrap().pop().referee.id;
       if (this.env.groupOfTable[a]) {
-        const r = this.env.groupOfTable[a], { schemaName: c, name: p } = this.env.tableGroups.get(r), f = c ? `${c}.${p}` : p;
-        n.push(new l(o.TABLE_REAPPEAR_IN_TABLEGROUP, `Table "${i.join(".")}" already appears in group "${f}"`, s));
+        const r = this.env.groupOfTable[a], { schemaName: c, name: f } = this.env.tableGroups.get(r), p = c ? `${c}.${f}` : f;
+        n.push(new l(o.TABLE_REAPPEAR_IN_TABLEGROUP, `Table "${i.join(".")}" already appears in group "${p}"`, s));
       } else
         this.env.groupOfTable[a] = this.declarationNode;
       return {
@@ -3854,16 +3869,16 @@ class Ht {
   }
   interpretSettingList(e) {
     var i, a, r;
-    const n = B(e).getValue();
+    const n = F(e).getValue();
     this.tableGroup.color = (i = n.color) != null && i.length ? Oe((r = (a = n.color) == null ? void 0 : a.at(0)) == null ? void 0 : r.value) : void 0;
     const [s] = n.note || [];
     return this.tableGroup.note = s && {
-      value: F(s == null ? void 0 : s.value).map(ie).unwrap(),
+      value: V(s == null ? void 0 : s.value).map(ae).unwrap(),
       token: _(s)
     }, [];
   }
 }
-class Qt {
+class Zt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.enum = { values: [] };
   }
@@ -3871,76 +3886,23 @@ class Qt {
     return this.enum.token = _(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 } = be(e);
+    const { name: n, schemaName: s } = ge(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, []);
   }
   interpretBody(e) {
     return e.body.flatMap((n) => {
       var c;
       const s = n, i = {};
-      i.token = _(s), i.name = Y(s.callee).unwrap();
-      const r = (c = B(s.args[0]).getValue().note) == null ? void 0 : c.at(0);
+      i.token = _(s), i.name = W(s.callee).unwrap();
+      const r = (c = F(s.args[0]).getValue().note) == null ? void 0 : c.at(0);
       return i.note = r && {
-        value: F(r.value).map(ie).unwrap(),
+        value: V(r.value).map(ae).unwrap(),
         token: _(r)
       }, this.enum.values.push(i), [];
     });
   }
 }
-function Ns(t) {
-  let e = null, n = t;
-  n instanceof q && (e = n.argumentList.elementList.map((r) => ee(r) ? r.expression.literal.value : C(r) ? F(r).unwrap() : Y(r).unwrap()).join(","), n = n.callee);
-  let s = "";
-  for (; n instanceof he; )
-    s = `[${n.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${s}`, n = n.array;
-  const { name: i, schemaName: a } = be(t);
-  return a.length > 1 ? new z(
-    {
-      schemaName: a.length === 0 ? null : a[0],
-      type_name: `${i}${s}${e ? `(${e})` : ""}`,
-      args: e
-    },
-    [new l(o.UNSUPPORTED, "Nested schema is not supported", t)]
-  ) : new z({
-    schemaName: a.length === 0 ? null : a[0],
-    type_name: `${i}${s}${e ? `(${e})` : ""}`,
-    args: e
-  });
-}
-function Ts(t) {
-  var e, n;
-  if (t) {
-    if (C(t))
-      return {
-        value: F(t).unwrap(),
-        type: "string"
-      };
-    if (ee(t))
-      return {
-        type: "number",
-        value: Number.parseFloat(t.expression.literal.value)
-      };
-    if (fe(t))
-      return {
-        value: t.expression.variable.value.toLowerCase(),
-        type: "boolean"
-      };
-    if (t instanceof ae && ct.includes((e = t.op) == null ? void 0 : e.value) && ee(t.expression)) {
-      const s = Number.parseFloat(t.expression.expression.literal.value);
-      return {
-        value: ((n = t.op) == null ? void 0 : n.value) === "-" ? 0 - s : s,
-        type: "number"
-      };
-    }
-    if (t instanceof ue && t.value)
-      return {
-        value: t.value.value,
-        type: "expression"
-      };
-    throw new Error("Unreachable");
-  }
-}
-class Jt {
+class en {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.tablePartial = {
       name: void 0,
@@ -3970,20 +3932,20 @@ class Jt {
     })), e;
   }
   interpretName(e) {
-    const { name: n } = be(e);
+    const { name: n } = ge(e);
     return this.tablePartial.name = n, [];
   }
   interpretSettingList(e) {
-    const n = B(e).getValue(), s = an(n[T.HeaderColor]);
+    const n = F(e).getValue(), s = ln(n[E.HeaderColor]);
     this.tablePartial.headerColor = s ? Oe(s.value) : void 0;
-    const [i] = n[T.Note] || [];
+    const [i] = n[E.Note] || [];
     return this.tablePartial.note = i && {
-      value: F(i == null ? void 0 : i.value).map(ie).unwrap(),
+      value: V(i == null ? void 0 : i.value).map(ae).unwrap(),
       token: _(i)
     }, [];
   }
   interpretBody(e) {
-    const [n, s] = St(e.body, (i) => i instanceof w);
+    const [n, s] = Pt(e.body, (i) => i instanceof w);
     return [
       ...this.interpretFields(n),
       ...this.interpretSubElements(s)
@@ -3995,9 +3957,9 @@ class Jt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case I.Note:
           return this.tablePartial.note = {
-            value: F(
+            value: V(
               n.body instanceof oe ? n.body.body[0].callee : n.body.callee
-            ).map(ie).unwrap(),
+            ).map(ae).unwrap(),
             token: _(n)
           }, [];
         case I.Indexes:
@@ -4011,86 +3973,86 @@ class Jt {
     return e.flatMap((n) => this.interpretColumn(n));
   }
   interpretColumn(e) {
-    var r, c, p, f, d, u, E, L, v;
+    var r, c, f, p, h, d, N, L, v;
     const n = [], s = {};
-    s.name = $(e.callee).unwrap();
-    const i = Ns(e.args[0]);
+    s.name = X(e.callee).unwrap();
+    const i = zt(e.args[0]);
     s.type = i.getValue(), n.push(...i.getErrors()), s.token = _(e), s.inline_refs = [];
     const a = e.args.slice(1);
     if (g.last(a) instanceof M) {
-      const A = B(a.pop()).getValue();
-      s.pk = !!((r = A[T.PK]) != null && r.length) || !!((c = A[T.PKey]) != null && c.length), s.increment = !!((p = A[T.Increment]) != null && p.length), s.unique = !!((f = A[T.Unique]) != null && f.length), s.not_null = (d = A[T.NotNull]) != null && d.length ? !0 : (u = A[T.Null]) != null && u.length ? !1 : void 0, s.dbdefault = Ts((L = (E = A[T.Default]) == null ? void 0 : E.at(0)) == null ? void 0 : L.value);
-      const P = (v = A[T.Note]) == null ? void 0 : v.at(0);
+      const A = F(a.pop()).getValue();
+      s.pk = !!((r = A[E.PK]) != null && r.length) || !!((c = A[E.PKey]) != null && c.length), s.increment = !!((f = A[E.Increment]) != null && f.length), s.unique = !!((p = A[E.Unique]) != null && p.length), s.not_null = (h = A[E.NotNull]) != null && h.length ? !0 : (d = A[E.Null]) != null && d.length ? !1 : void 0, s.dbdefault = Ht((L = (N = A[E.Default]) == null ? void 0 : N.at(0)) == null ? void 0 : L.value);
+      const P = (v = A[E.Note]) == null ? void 0 : v.at(0);
       s.note = P && {
-        value: F(P.value).map(ie).unwrap(),
+        value: V(P.value).map(ae).unwrap(),
         token: _(P)
       };
-      const Ie = A[T.Ref] || [];
-      s.inline_refs = Ie.flatMap((x) => {
-        const [Ue] = $e(x.value.expression);
-        if (ut(Ue, e.symbol))
-          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", x)), [];
-        const Ne = x.value.op, V = H(x.value.expression).unwrap();
+      const Te = A[E.Ref] || [];
+      s.inline_refs = Te.flatMap((D) => {
+        const [Ue] = je(D.value.expression);
+        if (ht(Ue, e.symbol))
+          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", D)), [];
+        const pe = D.value.op, B = q(D.value.expression).unwrap();
         let te;
-        if (V.length === 2) {
-          const [Te, Q] = V;
+        if (B.length === 2) {
+          const [de, H] = B;
           te = {
             schemaName: null,
-            tableName: Te,
-            fieldNames: [Q],
-            relation: Ne.value,
-            token: _(x)
+            tableName: de,
+            fieldNames: [H],
+            relation: pe.value,
+            token: _(D)
           };
-        } else if (V.length === 3) {
-          const [Te, Q, me] = V;
+        } else if (B.length === 3) {
+          const [de, H, Ee] = B;
           te = {
-            schemaName: Te,
-            tableName: Q,
-            fieldNames: [me],
-            relation: Ne.value,
-            token: _(x)
+            schemaName: de,
+            tableName: H,
+            fieldNames: [Ee],
+            relation: pe.value,
+            token: _(D)
           };
         } else {
-          n.push(new l(o.UNSUPPORTED, "Unsupported", x));
-          const Te = V.pop(), Q = V.pop();
+          n.push(new l(o.UNSUPPORTED, "Unsupported", D));
+          const de = B.pop(), H = B.pop();
           te = {
-            schemaName: V.join("."),
-            tableName: Q,
-            fieldNames: [Te],
-            relation: Ne.value,
-            token: _(x)
+            schemaName: B.join("."),
+            tableName: H,
+            fieldNames: [de],
+            relation: pe.value,
+            token: _(D)
           };
         }
         return te;
       });
     }
-    return s.pk || (s.pk = a.some((A) => Y(A).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = a.some((A) => Y(A).unwrap().toLowerCase() === "unique")), this.tablePartial.fields.push(s), s.pk && this.pkColumns.push(s), n;
+    return s.pk || (s.pk = a.some((A) => W(A).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = a.some((A) => W(A).unwrap().toLowerCase() === "unique")), this.tablePartial.fields.push(s), s.pk && this.pkColumns.push(s), n;
   }
   interpretIndexes(e) {
     return this.tablePartial.indexes.push(...e.body.body.map((n) => {
-      var r, c, p, f, d, u, E;
+      var r, c, f, p, h, d, N;
       const s = { columns: [] }, i = n;
       s.token = _(i);
       const a = [i.callee, ...i.args];
       if (g.last(a) instanceof M) {
-        const L = B(a.pop()).getValue();
-        s.pk = !!((r = L[T.PK]) != null && r.length), s.unique = !!((c = L[T.Unique]) != null && c.length), s.name = F((f = (p = L[T.Name]) == null ? void 0 : p.at(0)) == null ? void 0 : f.value).unwrap_or(void 0);
-        const v = (d = L[T.Note]) == null ? void 0 : d.at(0);
+        const L = F(a.pop()).getValue();
+        s.pk = !!((r = L[E.PK]) != null && r.length), s.unique = !!((c = L[E.Unique]) != null && c.length), s.name = V((p = (f = L[E.Name]) == null ? void 0 : f.at(0)) == null ? void 0 : p.value).unwrap_or(void 0);
+        const v = (h = L[E.Note]) == null ? void 0 : h.at(0);
         s.note = v && {
-          value: F(v.value).unwrap(),
+          value: V(v.value).unwrap(),
           token: _(v)
-        }, s.type = Y((E = (u = L[T.Type]) == null ? void 0 : u.at(0)) == null ? void 0 : E.value).unwrap_or(void 0);
+        }, s.type = W((N = (d = L[E.Type]) == null ? void 0 : d.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
       }
       return a.flatMap((L) => {
-        if (!(L instanceof q))
+        if (!(L instanceof ee))
           return L;
         const v = [];
         let A = L;
-        for (; A instanceof q; )
+        for (; A instanceof ee; )
           v.push(A.argumentList), A = A.callee;
         return v.push(A), v;
       }).forEach((L) => {
-        const { functional: v, nonFunctional: A } = Xe(L).unwrap();
+        const { functional: v, nonFunctional: A } = $e(L).unwrap();
         s.columns.push(
           ...v.map((P) => ({
             value: P.value.value,
@@ -4098,7 +4060,7 @@ class Jt {
             token: _(P)
           })),
           ...A.map((P) => ({
-            value: $(P).unwrap(),
+            value: X(P).unwrap(),
             type: "column",
             token: _(P)
           }))
@@ -4107,7 +4069,7 @@ class Jt {
     })), [];
   }
 }
-class ms {
+class Ts {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.project = { enums: [], refs: [], tableGroups: [], tables: [], tablePartials: [] };
   }
@@ -4117,7 +4079,7 @@ class ms {
   interpretName(e) {
     if (!e)
       return this.project.name = null, [];
-    const { name: n } = be(e);
+    const { name: n } = ge(e);
     return this.project.name = n, [];
   }
   interpretBody(e) {
@@ -4126,37 +4088,37 @@ class ms {
       const s = n;
       switch ((i = s.type) == null ? void 0 : i.value.toLowerCase()) {
         case "table": {
-          const a = new qt(s, this.env).interpret();
+          const a = new Qt(s, this.env).interpret();
           return this.project.tables.push(this.env.tables.get(s)), a;
         }
         case "ref": {
-          const a = new zt(s, this.env).interpret();
+          const a = new Jt(s, this.env).interpret();
           return this.project.refs.push(this.env.ref.get(s)), a;
         }
         case "tablegroup": {
-          const a = new Ht(s, this.env).interpret();
+          const a = new Kt(s, this.env).interpret();
           return this.project.tableGroups.push(this.env.tableGroups.get(s)), a;
         }
         case "enum": {
-          const a = new Qt(s, this.env).interpret();
+          const a = new Zt(s, this.env).interpret();
           return this.project.enums.push(this.env.enums.get(s)), a;
         }
         case "note":
           return this.project.note = {
-            value: F(s.body instanceof oe ? s.body.body[0].callee : s.body.callee).map(ie).unwrap(),
+            value: V(s.body instanceof oe ? s.body.body[0].callee : s.body.callee).map(ae).unwrap(),
             token: _(s)
           }, [];
         case "tablepartial": {
-          const a = new Jt(s, this.env).interpret();
+          const a = new en(s, this.env).interpret();
           return this.project.tablePartials.push(this.env.tablePartials.get(s)), a;
         }
         default:
-          return this.project[s.type.value.toLowerCase()] = F(s.body.callee).unwrap(), [];
+          return this.project[s.type.value.toLowerCase()] = V(s.body.callee).unwrap(), [];
       }
     });
   }
 }
-function bs(t) {
+function ms(t) {
   return {
     schemas: [],
     tables: Array.from(t.tables.values()),
@@ -4169,7 +4131,7 @@ function bs(t) {
     tablePartials: Array.from(t.tablePartials.values())
   };
 }
-class Is {
+class bs {
   constructor(e) {
     this.ast = e, this.env = {
       schema: [],
@@ -4187,30 +4149,30 @@ class Is {
   }
   interpret() {
     const e = this.ast.body.flatMap((n) => {
-      switch (_e(n).unwrap_or(void 0)) {
+      switch (Le(n).unwrap_or(void 0)) {
         case I.Table:
-          return new qt(n, this.env).interpret();
+          return new Qt(n, this.env).interpret();
         case I.Note:
-          return new Es(n, this.env).interpret();
+          return new Ns(n, this.env).interpret();
         case I.Ref:
-          return new zt(n, this.env).interpret();
+          return new Jt(n, this.env).interpret();
         case I.TableGroup:
-          return new Ht(n, this.env).interpret();
+          return new Kt(n, this.env).interpret();
         case I.TablePartial:
-          return new Jt(n, this.env).interpret();
+          return new en(n, this.env).interpret();
         case I.Enum:
-          return new Qt(n, this.env).interpret();
+          return new Zt(n, this.env).interpret();
         case I.Project:
-          return new ms(n, this.env).interpret();
+          return new Ts(n, this.env).interpret();
         default:
           return [];
       }
     });
-    return new z(bs(this.env), e);
+    return new J(ms(this.env), e);
   }
 }
 var k = /* @__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))(k || {}), R = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(R || {});
-function De(t) {
+function xe(t) {
   switch (t) {
     case m.Schema:
       return k.Module;
@@ -4230,13 +4192,13 @@ function De(t) {
       return k.Text;
   }
 }
-function je(t, e) {
+function We(t, e) {
   if (!t || et(t))
     return !1;
   for (const n of t.trailingTrivia) {
     if (n.start > e)
       break;
-    if (n.kind === h.NEWLINE && n.end <= e)
+    if (n.kind === u.NEWLINE && n.end <= e)
       return !1;
   }
   return !0;
@@ -4246,7 +4208,7 @@ function G() {
     suggestions: []
   };
 }
-function We(t) {
+function Ye(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
@@ -4264,83 +4226,83 @@ function Ke(t) {
     }))
   };
 }
-function ht(t, e) {
+function ft(t, e) {
   return t.getOffsetAt(e);
 }
-class Kt {
+class tn {
   constructor(e, n = []) {
     this.compiler = e, this.triggerCharacters = n;
   }
   provideCompletionItems(e, n) {
-    var d, u;
-    const s = ht(e, n), i = this.compiler.token.flatStream(), { token: a, index: r } = this.compiler.container.token(s), c = r === void 0 ? i[0] : i[r + 1];
+    var h, d;
+    const s = ft(e, n), i = this.compiler.token.flatStream(), { token: a, index: r } = this.compiler.container.token(s), c = r === void 0 ? i[0] : i[r + 1];
     if ([
       ...(a == null ? void 0 : a.trailingTrivia) || [],
       ...(a == null ? void 0 : a.leadingTrivia) || [],
       ...(c == null ? void 0 : c.leadingTrivia) || []
-    ].find((E) => ln(E) && Se(s, E)))
+    ].find((N) => fn(N) && Se(s, N)))
       return G();
     if (r === void 0)
-      return Pt();
-    if ([h.STRING_LITERAL, h.QUOTED_STRING].includes(a.kind) && Se(s, a))
+      return kt();
+    if ([u.STRING_LITERAL, u.QUOTED_STRING].includes(a.kind) && Se(s, a))
       return G();
-    const p = this.compiler.container.element(s);
-    if (this.compiler.container.scopeKind(s) === O.TOPLEVEL || p instanceof y && p.type && p.type.start <= s && p.type.end >= s)
-      return Pt();
-    const f = [...this.compiler.container.stack(s)].reverse();
-    for (const E of f)
-      if (E instanceof ae)
-        switch ((d = E.op) == null ? void 0 : d.value) {
+    const f = this.compiler.container.element(s);
+    if (this.compiler.container.scopeKind(s) === O.TOPLEVEL || f instanceof y && f.type && f.type.start <= s && f.type.end >= s)
+      return kt();
+    const p = [...this.compiler.container.stack(s)].reverse();
+    for (const N of p)
+      if (N instanceof Z)
+        switch ((h = N.op) == null ? void 0 : h.value) {
           case ">":
           case "<":
           case "<>":
           case "-":
-            return vt(
+            return gt(
               this.compiler,
               s,
-              E
+              N
             );
         }
-      else if (E instanceof ce)
-        switch ((u = E.op) == null ? void 0 : u.value) {
+      else if (N instanceof le)
+        switch ((d = N.op) == null ? void 0 : d.value) {
           case ">":
           case "<":
           case "<>":
           case "-":
-            return vt(
+            return gt(
               this.compiler,
               s,
-              E
+              N
             );
           case ".":
-            return Zt(
+            return nn(
               this.compiler,
               s,
-              E
+              N
             );
         }
       else {
-        if (E instanceof se)
-          return wt(this.compiler, s, E);
-        if (E instanceof M)
-          return wt(this.compiler, s, E);
-        if (E instanceof pe)
-          return As(this.compiler, s);
-        if (E instanceof Ae)
+        if (N instanceof se)
+          return vt(this.compiler, s, N);
+        if (N instanceof M)
+          return vt(this.compiler, s, N);
+        if (N instanceof ce)
           return Ls(this.compiler, s);
-        if (E instanceof w)
-          return kt(this.compiler, s, E);
-        if (E instanceof y && (E.bodyColon && s >= E.bodyColon.end || E.body && Se(s, E.body)))
-          return kt(this.compiler, s, void 0);
+        if (N instanceof be)
+          return Is(this.compiler, s);
+        if (N instanceof w)
+          return yt(this.compiler, s, N);
+        if (N instanceof y && (N.bodyColon && s >= N.bodyColon.end || N.body && Se(s, N.body)))
+          return yt(this.compiler, s, void 0);
       }
     return G();
   }
 }
-function Ls(t, e) {
+function Is(t, e) {
   const n = t.container.element(e);
   return Re(t, e, n, [m.TablePartial]);
 }
-function vt(t, e, n) {
+function gt(t, e, n) {
   const s = t.container.scopeKind(e);
   if ([
     O.REF,
@@ -4352,7 +4314,7 @@ function vt(t, e, n) {
       m.Schema,
       m.Column
     ]);
-    return je(n.op, e) ? We(i) : i;
+    return We(n.op, e) ? Ye(i) : i;
   }
   return G();
 }
@@ -4366,12 +4328,12 @@ function Re(t, e, n, s) {
     if ((r = i == null ? void 0 : i.symbol) != null && r.symbolTable) {
       const { symbol: c } = i;
       a.suggestions.push(
-        ...t.symbol.members(c).filter(({ kind: p }) => s.includes(p)).map(({ name: p, kind: f }) => ({
-          label: p,
-          insertText: p,
+        ...t.symbol.members(c).filter(({ kind: f }) => s.includes(f)).map(({ name: f, kind: p }) => ({
+          label: f,
+          insertText: f,
           insertTextRules: R.KeepWhitespace,
-          kind: De(f),
-          sortText: De(f).toString().padStart(2, "0"),
+          kind: xe(p),
+          sortText: xe(p).toString().padStart(2, "0"),
           range: void 0
         }))
       );
@@ -4380,49 +4342,49 @@ function Re(t, e, n, s) {
   }
   return Ke(a);
 }
-function As(t, e) {
+function Ls(t, e) {
   var s;
   switch (t.container.scopeKind(e)) {
     case O.INDEXES:
-      return tn(t, e);
+      return an(t, e);
     case O.REF:
       {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
           const a = i.pop();
-          if (a instanceof ce && ((s = a.op) == null ? void 0 : s.value) === ".")
-            return Zt(
+          if (a instanceof le && ((s = a.op) == null ? void 0 : s.value) === ".")
+            return nn(
               t,
               e,
               a
             );
         }
       }
-      return en(t, e);
+      return sn(t, e);
   }
   return G();
 }
-function wt(t, e, n) {
+function vt(t, e, n) {
   const { token: s } = t.container.token(e);
-  if ([h.COMMA, h.LBRACKET].includes(s == null ? void 0 : s.kind)) {
-    const i = yt(t, e);
-    return (s == null ? void 0 : s.kind) === h.COMMA && je(s, e) ? We(i) : i;
+  if ([u.COMMA, u.LBRACKET].includes(s == null ? void 0 : s.kind)) {
+    const i = wt(t, e);
+    return (s == null ? void 0 : s.kind) === u.COMMA && We(s, e) ? Ye(i) : i;
   }
   if (n.name && n.name.start <= e && n.name.end >= e)
-    return yt(t, e);
+    return wt(t, e);
   if (n.name instanceof ne) {
-    const i = _s(
+    const i = As(
       t,
       e,
       we(n.name).unwrap_or("")
     );
-    return (s == null ? void 0 : s.kind) === h.COLON && je(s, e) ? We(i) : i;
+    return (s == null ? void 0 : s.kind) === u.COLON && We(s, e) ? Ye(i) : i;
   }
   return G();
 }
-function yt(t, e) {
+function wt(t, e) {
   const n = t.container.element(e);
-  if (n instanceof Z)
+  if (n instanceof K)
     return G();
   const s = t.container.scopeKind(e);
   if (n.body && !Se(e, n.body)) {
@@ -4430,10 +4392,10 @@ function yt(t, e) {
     switch (s) {
       case O.TABLE:
       case O.TABLEPARTIAL:
-        i = [T.HeaderColor, T.Note];
+        i = [E.HeaderColor, E.Note];
         break;
       case O.TABLEGROUP:
-        i = [T.Color, T.Note];
+        i = [E.Color, E.Note];
         break;
       default:
         i = [];
@@ -4454,12 +4416,12 @@ function yt(t, e) {
       return {
         suggestions: [
           ...[
-            T.PK,
-            T.PKey,
-            T.Null,
-            T.NotNull,
-            T.Increment,
-            T.Unique
+            E.PK,
+            E.PKey,
+            E.Null,
+            E.NotNull,
+            E.Increment,
+            E.Unique
           ].map((i) => ({
             label: i,
             insertText: i,
@@ -4467,7 +4429,7 @@ function yt(t, e) {
             insertTextRules: R.KeepWhitespace,
             range: void 0
           })),
-          ...[T.Ref, T.Default, T.Note].map((i) => ({
+          ...[E.Ref, E.Default, E.Note].map((i) => ({
             label: i,
             insertText: `${i}: `,
             kind: k.Property,
@@ -4479,7 +4441,7 @@ function yt(t, e) {
     case O.ENUM:
       return {
         suggestions: [
-          ...[T.Note].map((i) => ({
+          ...[E.Note].map((i) => ({
             label: i,
             insertText: `${i}: `,
             kind: k.Property,
@@ -4491,14 +4453,14 @@ function yt(t, e) {
     case O.INDEXES:
       return {
         suggestions: [
-          ...[T.Unique, T.PK].map((i) => ({
+          ...[E.Unique, E.PK].map((i) => ({
             label: i,
             insertText: i,
             insertTextRules: R.KeepWhitespace,
             kind: k.Property,
             range: void 0
           })),
-          ...[T.Note, T.Name, T.Type].map((i) => ({
+          ...[E.Note, E.Name, E.Type].map((i) => ({
             label: i,
             insertText: `${i}: `,
             kind: k.Property,
@@ -4509,7 +4471,7 @@ function yt(t, e) {
       };
     case O.REF:
       return {
-        suggestions: [T.Update, T.Delete].map((i) => ({
+        suggestions: [E.Update, E.Delete].map((i) => ({
           label: i,
           insertText: `${i}: `,
           kind: k.Property,
@@ -4520,7 +4482,7 @@ function yt(t, e) {
   }
   return G();
 }
-function _s(t, e, n) {
+function As(t, e, n) {
   switch (n == null ? void 0 : n.toLowerCase()) {
     case "update":
     case "delete":
@@ -4546,43 +4508,43 @@ function _s(t, e, n) {
   }
   return G();
 }
-function Zt(t, e, n) {
-  const s = ge(n).unwrap_or([]);
-  if (s.pop(), s.some((a) => !W(a)))
+function nn(t, e, n) {
+  const s = _e(n).unwrap_or([]);
+  if (s.pop(), s.some((a) => !$(a)))
     return G();
-  const i = s.map((a) => Y(a).unwrap());
+  const i = s.map((a) => W(a).unwrap());
   return Ke({
     suggestions: t.symbol.ofName({ nameStack: i, owner: t.container.element(e) }).flatMap(({ symbol: a }) => t.symbol.members(a)).map(({ kind: a, name: r }) => ({
       label: r,
       insertText: r,
-      kind: De(a),
+      kind: xe(a),
       range: void 0
     }))
   });
 }
-function kt(t, e, n) {
+function yt(t, e, n) {
   var i;
   switch (t.container.scopeKind(e)) {
     case O.TABLE:
     case O.TABLEPARTIAL:
-      return vs(t, e, n);
+      return gs(t, e, n);
     case O.PROJECT:
-      return ws(t, e, n);
+      return vs(t, e, n);
     case O.INDEXES:
-      return ks(t, e);
+      return ys(t, e);
     case O.ENUM:
-      return gs(t, e, n);
+      return _s(t, e, n);
     case O.REF: {
-      const a = en(t, e);
-      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === h.COLON && je(t.container.token(e).token, e) ? We(a) : a;
+      const a = sn(t, e);
+      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && We(t.container.token(e).token, e) ? Ye(a) : a;
     }
     case O.TABLEGROUP:
-      return ys(t);
+      return ws(t);
     default:
       return G();
   }
 }
-function Pt() {
+function kt() {
   return {
     suggestions: ["Table", "TableGroup", "Enum", "Project", "Ref", "TablePartial"].map((t) => ({
       label: t,
@@ -4593,14 +4555,14 @@ function Pt() {
     }))
   };
 }
-function gs(t, e, n) {
-  return n != null && n.callee && ft(e, n) === 1 ? Re(t, e, t.container.element(e), [
+function _s(t, e, n) {
+  return n != null && n.callee && pt(e, n) === 1 ? Re(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
   ]) : G();
 }
-function vs(t, e, n) {
+function gs(t, e, n) {
   const s = ["Note", "indexes"];
   if (!(n != null && n.callee))
     return {
@@ -4612,7 +4574,7 @@ function vs(t, e, n) {
         range: void 0
       }))
     };
-  const i = ft(e, n);
+  const i = pt(e, n);
   return i === 0 ? {
     suggestions: s.map((a) => ({
       label: a,
@@ -4621,11 +4583,11 @@ function vs(t, e, n) {
       kind: k.Keyword,
       range: void 0
     }))
-  } : i === 1 ? Ps(t, e) : G();
+  } : i === 1 ? ks(t, e) : G();
 }
-function ws(t, e, n) {
+function vs(t, e, n) {
   const s = ["Table", "TableGroup", "Enum", "Note", "Ref", "TablePartial"];
-  return n != null && n.callee ? ft(e, n) === 0 ? {
+  return n != null && n.callee ? pt(e, n) === 0 ? {
     suggestions: s.map((a) => ({
       label: a,
       insertText: a,
@@ -4643,19 +4605,19 @@ function ws(t, e, n) {
     }))
   };
 }
-function en(t, e) {
+function sn(t, e) {
   return Re(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
   ]);
 }
-function ys(t) {
+function ws(t) {
   return {
     suggestions: [
       ...Ke({
         suggestions: [...t.parse.publicSymbolTable().entries()].flatMap(([e]) => {
-          const n = le(e).unwrap_or(void 0);
+          const n = ie(e).unwrap_or(void 0);
           if (n === void 0)
             return [];
           const { kind: s, name: i } = n;
@@ -4663,7 +4625,7 @@ function ys(t) {
             label: i,
             insertText: i,
             insertTextRules: R.KeepWhitespace,
-            kind: De(s),
+            kind: xe(s),
             range: void 0
           };
         })
@@ -4678,10 +4640,10 @@ function ys(t) {
     ]
   };
 }
-function ks(t, e) {
-  return tn(t, e);
+function ys(t, e) {
+  return an(t, e);
 }
-function Ps(t, e) {
+function ks(t, e) {
   return {
     suggestions: [
       ...[
@@ -4756,14 +4718,14 @@ function Ps(t, e) {
     ]
   };
 }
-function tn(t, e) {
+function an(t, e) {
   const n = t.container.element(e), s = n == null ? void 0 : n.parent;
-  if (!((s == null ? void 0 : s.symbol) instanceof Ft))
+  if (!((s == null ? void 0 : s.symbol) instanceof Mt))
     return G();
   const { symbolTable: i } = s.symbol;
   return Ke({
     suggestions: [...i.entries()].flatMap(([a]) => {
-      const r = le(a).unwrap_or(void 0);
+      const r = ie(a).unwrap_or(void 0);
       if (r === void 0)
         return [];
       const { name: c } = r;
@@ -4771,43 +4733,43 @@ function tn(t, e) {
         label: c,
         insertText: c,
         insertTextRules: R.KeepWhitespace,
-        kind: De(m.Column),
+        kind: xe(m.Column),
         range: void 0
       };
     })
   });
 }
-function ft(t, e) {
+function pt(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 nn {
+class rn {
   constructor(e) {
     this.compiler = e;
   }
   provideDefinition(e, n) {
     var r, c;
-    const { uri: s } = e, i = ht(e, n), a = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = ft(e, n), a = [...this.compiler.container.stack(i)];
     for (; a.length !== 0; ) {
-      const p = a.pop();
-      if (!(p != null && p.referee))
+      const f = a.pop();
+      if (!(f != null && f.referee))
         continue;
-      let f;
-      if ((r = p.referee) != null && r.declaration && [
-        Le.PRIMARY_EXPRESSION,
-        Le.VARIABLE,
-        Le.PARTIAL_INJECTION
-      ].includes(p == null ? void 0 : p.kind) ? { declaration: f } = p.referee : (c = p.referee) != null && c.injectorDeclaration && (f = p.referee.injectorDeclaration), f) {
-        const { startPos: d, endPos: u } = f;
+      let p;
+      if ((r = f.referee) != null && r.declaration && [
+        me.PRIMARY_EXPRESSION,
+        me.VARIABLE,
+        me.PARTIAL_INJECTION
+      ].includes(f == null ? void 0 : f.kind) ? { declaration: p } = f.referee : (c = f.referee) != null && c.injectorDeclaration && (p = f.referee.injectorDeclaration), p) {
+        const { startPos: h, endPos: d } = p;
         return [
           {
             range: {
-              startColumn: d.column + 1,
-              startLineNumber: d.line + 1,
-              endColumn: u.column + 1,
-              endLineNumber: u.line + 1
+              startColumn: h.column + 1,
+              startLineNumber: h.line + 1,
+              endColumn: d.column + 1,
+              endLineNumber: d.line + 1
             },
             uri: s
           }
@@ -4817,27 +4779,27 @@ class nn {
     return [];
   }
 }
-class sn {
+class on {
   constructor(e) {
     this.compiler = e;
   }
   provideReferences(e, n) {
-    const { uri: s } = e, i = ht(e, n), a = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = ft(e, n), a = [...this.compiler.container.stack(i)];
     for (; a.length !== 0; ) {
       const r = a.pop();
       if (r && [
-        Le.ELEMENT_DECLARATION,
-        Le.FUNCTION_APPLICATION,
-        Le.PRIMARY_EXPRESSION
+        me.ELEMENT_DECLARATION,
+        me.FUNCTION_APPLICATION,
+        me.PRIMARY_EXPRESSION
       ].includes(r == null ? void 0 : r.kind)) {
         const { symbol: c } = r;
         if (c != null && c.references.length)
-          return c.references.map(({ startPos: p, endPos: f }) => ({
+          return c.references.map(({ startPos: f, endPos: p }) => ({
             range: {
-              startColumn: p.column + 1,
-              startLineNumber: p.line + 1,
-              endColumn: f.column + 1,
-              endLineNumber: f.line + 1
+              startColumn: f.column + 1,
+              startLineNumber: f.line + 1,
+              endColumn: p.column + 1,
+              endLineNumber: p.line + 1
             },
             uri: s
           }));
@@ -4850,17 +4812,17 @@ const Ds = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   CompletionItemInsertTextRule: R,
   CompletionItemKind: k,
-  DBMLCompletionItemProvider: Kt,
-  DBMLDefinitionProvider: nn,
-  DBMLReferencesProvider: sn
+  DBMLCompletionItemProvider: tn,
+  DBMLDefinitionProvider: rn,
+  DBMLReferencesProvider: on
 }, Symbol.toStringTag, { value: "Module" }));
 var O = /* @__PURE__ */ ((t) => (t[t.TABLE = 0] = "TABLE", t[t.ENUM = 1] = "ENUM", t[t.TABLEGROUP = 2] = "TABLEGROUP", t[t.INDEXES = 3] = "INDEXES", t[t.NOTE = 4] = "NOTE", t[t.REF = 5] = "REF", t[t.PROJECT = 6] = "PROJECT", t[t.CUSTOM = 7] = "CUSTOM", t[t.TOPLEVEL = 8] = "TOPLEVEL", t[t.TABLEPARTIAL = 9] = "TABLEPARTIAL", t))(O || {});
-class Os {
+class xs {
   constructor() {
     this.source = "", this.cache = new Array(
       16
       /* TOTAL_QUERY_COUNT */
-    ).fill(null), this.nodeIdGenerator = new cn(), this.symbolIdGenerator = new dn(), this.token = {
+    ).fill(null), this.nodeIdGenerator = new pn(), this.symbolIdGenerator = new mn(), this.token = {
       invalidStream: this.createQuery(
         6,
         () => this.parse.tokens().filter(Bt)
@@ -4875,8 +4837,8 @@ class Os {
       _: this.createQuery(
         0,
         () => {
-          const e = new Pn(this.source).lex().chain((n) => new Dn(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new fs(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
-          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new Is(n).interpret().map((a) => ({ ast: n, tokens: s, rawDb: a })));
+          const e = new On(this.source).lex().chain((n) => new Mn(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new Es(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
+          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new bs(n).interpret().map((a) => ({ ast: n, tokens: s, rawDb: a })));
         }
       ),
       ast: this.createQuery(
@@ -4900,38 +4862,38 @@ class Os {
       stack: this.createQuery(
         10,
         (e) => {
-          const n = this.token.flatStream(), { index: s, token: i } = this.container.token(e), a = s === void 0 ? -1 : rn(n, (f) => !f.isInvalid, s);
+          const n = this.token.flatStream(), { index: s, token: i } = this.container.token(e), a = s === void 0 ? -1 : cn(n, (p) => !p.isInvalid, s);
           if (a === -1)
             return [this.parse.ast()];
           const r = n[a].start;
           let c = this.parse.ast();
-          const p = [c];
+          const f = [c];
           for (; ; ) {
-            const d = kn(c).find((u) => Se(r, u));
-            if (d === void 0 || d instanceof K)
+            const h = xn(c).find((d) => Se(r, d));
+            if (h === void 0 || h instanceof Q)
               break;
-            p.push(d), c = d;
+            f.push(h), c = h;
           }
-          if ((i == null ? void 0 : i.kind) === h.COLON)
-            return p;
-          for (; p.length > 0; ) {
-            let f = !1;
-            const d = Ve(p);
-            if (d instanceof w) {
-              const u = this.parse.source();
-              for (let E = d.end; E < e; E += 1)
-                u[E] === `
-` && (p.pop(), f = !0);
+          if ((i == null ? void 0 : i.kind) === u.COLON)
+            return f;
+          for (; f.length > 0; ) {
+            let p = !1;
+            const h = Ve(f);
+            if (h instanceof w) {
+              const d = this.parse.source();
+              for (let N = h.end; N < e; N += 1)
+                d[N] === `
+` && (f.pop(), p = !0);
             } else
-              d instanceof ae || d instanceof ce ? this.container.token(e).token !== d.op && (p.pop(), f = !0) : d instanceof M ? d.listCloseBracket && d.end <= e && (p.pop(), f = !0) : d instanceof pe ? d.tupleCloseParen && d.end <= e && (p.pop(), f = !0) : d instanceof oe ? d.blockCloseBrace && d.end <= e && (p.pop(), f = !0) : d instanceof ne || d.end < e && (p.pop(), f = !0);
-            if (f) {
-              const u = Ve(p);
-              u instanceof y && u.end <= e && p.pop();
+              h instanceof Z || h instanceof le ? this.container.token(e).token !== h.op && (f.pop(), p = !0) : h instanceof M ? h.listCloseBracket && h.end <= e && (f.pop(), p = !0) : h instanceof ce ? h.tupleCloseParen && h.end <= e && (f.pop(), p = !0) : h instanceof oe ? h.blockCloseBrace && h.end <= e && (f.pop(), p = !0) : h instanceof ne || h.end < e && (f.pop(), p = !0);
+            if (p) {
+              const d = Ve(f);
+              d instanceof y && d.end <= e && f.pop();
             }
-            if (!f)
+            if (!p)
               break;
           }
-          return p;
+          return f;
         }
       ),
       token: this.createQuery(
@@ -4963,7 +4925,7 @@ class Os {
       ),
       scopeKind: this.createQuery(15, (e) => {
         var s;
-        if (this.container.element(e) instanceof Z)
+        if (this.container.element(e) instanceof K)
           return 8;
         switch ((s = this.container.element(e).type) == null ? void 0 : s.value.toLowerCase()) {
           case "table":
@@ -5005,17 +4967,17 @@ class Os {
             if (!((i = a.symbol) != null && i.symbolTable))
               continue;
             const { symbolTable: r } = a.symbol;
-            let c = [r], p = [];
-            for (const f of e)
-              p = c.flatMap(
-                (d) => An(f).flatMap((u) => {
-                  const E = d.get(u), L = le(u).unwrap_or(void 0);
-                  return !E || !L ? [] : { ...L, symbol: E };
+            let c = [r], f = [];
+            for (const p of e)
+              f = c.flatMap(
+                (h) => wn(p).flatMap((d) => {
+                  const N = h.get(d), L = ie(d).unwrap_or(void 0);
+                  return !N || !L ? [] : { ...L, symbol: N };
                 })
-              ), c = p.flatMap(
-                (d) => d.symbol.symbolTable ? d.symbol.symbolTable : []
+              ), c = f.flatMap(
+                (h) => h.symbol.symbolTable ? h.symbol.symbolTable : []
               );
-            s.push(...p);
+            s.push(...f);
           }
           return s;
         },
@@ -5024,7 +4986,7 @@ class Os {
       members: this.createQuery(
         9,
         (e) => e.symbolTable ? [...e.symbolTable.entries()].map(([n, s]) => ({
-          ...le(n).unwrap(),
+          ...ie(n).unwrap(),
           symbol: s
         })) : []
       )
@@ -5051,14 +5013,14 @@ class Os {
   }
   initMonacoServices() {
     return {
-      definitionProvider: new nn(this),
-      referenceProvider: new sn(this),
-      autocompletionProvider: new Kt(this)
+      definitionProvider: new rn(this),
+      referenceProvider: new on(this),
+      autocompletionProvider: new tn(this)
     };
   }
 }
 export {
-  Os as Compiler,
-  xs as serialize,
+  xs as Compiler,
+  Ss as serialize,
   Ds as services
 };