@dbml/parse 3.13.0-alpha.0 → 3.13.0-alpha.2

package/dist/dbml-parse.mjs

@@ -1,6 +1,6 @@
-import _, { last as Ke, forIn as ft, partition as tn, findLastIndex as nn } from "lodash";
+import _, { last as Ze, forIn as pt, partition as nn, findLastIndex as sn } 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 sn(t) {
+function an(t) {
   switch (t.kind) {
     case "<newline>":
     case "<space>":
@@ -12,7 +12,7 @@ function sn(t) {
       return !1;
   }
 }
-function pt(t) {
+function dt(t) {
   if (!t)
     return !1;
   switch (t) {
@@ -28,13 +28,12 @@ function pt(t) {
     case ".":
     case "&":
     case "|":
-    case "~":
       return !0;
     default:
       return !1;
   }
 }
-function dt(t) {
+function Et(t) {
   return t !== void 0 && t.kind === "<op>";
 }
 class J {
@@ -45,27 +44,27 @@ class J {
     return new J(e, n, s, i, a);
   }
 }
-function kt(t) {
+function St(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === h.NEWLINE) !== void 0;
 }
-function Et(t, e) {
-  return e.leadingTrivia.find(({ kind: s }) => s === h.NEWLINE) !== void 0 || kt(t);
+function Nt(t, e) {
+  return e.leadingTrivia.find(({ kind: s }) => s === h.NEWLINE) !== void 0 || St(t);
 }
-function Ze(t) {
+function Ke(t) {
   return t.trailingTrivia.find(({ kind: e }) => [h.SPACE, h.TAB].includes(e)) !== void 0;
 }
-function St(t) {
-  return t.trailingTrivia.length === 0 ? t.end : St(Ke(t.trailingTrivia));
+function Pt(t) {
+  return t.trailingTrivia.length === 0 ? t.end : Pt(Ze(t.trailingTrivia));
 }
 function xt(t) {
   return t.leadingTrivia.length === 0 ? t.start : xt(t.leadingTrivia[0]);
 }
-function an(t) {
+function rn(t) {
   return [h.SINGLE_LINE_COMMENT, h.MULTILINE_COMMENT].includes(
     t.kind
   );
 }
-class rn {
+class on {
   constructor() {
     this.id = 0;
   }
@@ -76,7 +75,7 @@ class rn {
     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) {
@@ -88,20 +87,20 @@ class D {
       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 J ? St(a) : a.fullEnd) : (this.endPos = {
+    a ? (this.endPos = a.endPos, this.fullEnd = a instanceof J ? Pt(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 _e = /* @__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))(_e || {});
-class K extends D {
+var Ie = /* @__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))(Ie || {});
+class Z 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,
@@ -119,17 +118,17 @@ class y extends D {
       a,
       r,
       c
-    ]), c && r && !(c instanceof w || c instanceof y))
+    ]), c && r && !(c instanceof v || c instanceof y))
       throw new Error("If an element has a simple body, it must be a function application node");
     this.type = e, this.name = n, this.as = s, this.alias = i, this.attributeList = a, this.bodyColon = r, this.body = c;
   }
 }
-class ne extends D {
+class te extends x {
   constructor({ identifiers: e = [] }, n) {
     super(n, "<identifer-stream>", e || []), this.identifiers = e;
   }
 }
-class se extends D {
+class ne extends x {
   constructor({
     name: e,
     colon: n,
@@ -138,12 +137,12 @@ class se extends D {
     super(i, "<attribute>", [e, n, s]), this.name = e, this.value = s, this.colon = n;
   }
 }
-class Z extends D {
+class ie extends x {
   constructor({ op: e, expression: n }, s) {
     super(s, "<prefix-expression>", [e, n]), this.op = e, this.expression = n;
   }
 }
-class le extends D {
+class le extends x {
   constructor({
     op: e,
     leftExpression: n,
@@ -152,22 +151,22 @@ class le extends D {
     super(i, "<infix-expression>", [n, e, s]), this.op = e, this.leftExpression = n, this.rightExpression = s;
   }
 }
-class $e extends D {
+class $e extends x {
   constructor({ op: e, expression: n }, s) {
     super(s, "<postfix-expression>", [n, e]), this.op = e, this.expression = n;
   }
 }
-class ce extends D {
+class ce extends x {
   constructor({ value: e }, n) {
     super(n, "<function-expression>", [e]), this.value = e;
   }
 }
-class w extends D {
+class v extends x {
   constructor({ callee: e, args: n = [] }, s) {
     super(s, "<function-application>", [e, ...n]), this.callee = e, this.args = n;
   }
 }
-class re extends D {
+class re extends x {
   constructor({
     blockOpenBrace: e,
     body: n = [],
@@ -176,12 +175,12 @@ class re extends D {
     super(i, "<block-expression>", [e, ...n, s]), this.blockOpenBrace = e, this.body = n, this.blockCloseBrace = s;
   }
 }
-class ke extends D {
-  constructor({ partial: e }, n) {
-    super(n, "<partial-injection>", [e]), this.partial = e;
+class Le extends x {
+  constructor({ op: e, partial: n }, s) {
+    super(s, "<partial-injection>", [e, n]), this.partial = n;
   }
 }
-class R extends D {
+class U extends x {
   constructor({
     listOpenBracket: e,
     elementList: n = [],
@@ -190,12 +189,12 @@ class R extends D {
   }, a) {
     super(a, "<list-expression>", [
       e,
-      ...Pt(n, s),
+      ...Dt(n, s),
       i
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
 }
-class fe extends D {
+class fe extends x {
   constructor({
     tupleOpenParen: e,
     elementList: n = [],
@@ -204,12 +203,12 @@ class fe extends D {
   }, a) {
     super(a, "<tuple-expression>", [
       e,
-      ...Pt(n, s),
+      ...Dt(n, s),
       i
     ]), this.tupleOpenParen = e, this.elementList = n, this.commaList = s, this.tupleCloseParen = i;
   }
 }
-class tt extends fe {
+class et extends fe {
   constructor({
     groupOpenParen: e,
     expression: n,
@@ -226,7 +225,7 @@ class tt extends fe {
     ), this.kind = "<group-expression>";
   }
 }
-class Y extends D {
+class Y extends x {
   constructor({
     callee: e,
     argumentList: n
@@ -234,33 +233,33 @@ class Y extends D {
     super(s, "<call-expression>", [e, n]), this.callee = e, this.argumentList = n;
   }
 }
-class ge extends D {
+class we extends x {
   constructor({ literal: e }, n) {
     super(n, "<literal>", [e]), this.literal = e;
   }
 }
-class ae extends D {
+class ae extends x {
   constructor({ variable: e }, n) {
     super(n, "<variable>", [e]), this.variable = e;
   }
 }
-class G extends D {
+class j extends x {
   constructor({ expression: e }, n) {
     super(n, "<primary-expression>", [e]), this.expression = e;
   }
 }
-class Re extends D {
+class Ue extends x {
   constructor({ pre: e }, n) {
     const s = J.create(h.SPACE, e.endPos, e.endPos, " ", !1);
     super(n, "<dummy>", [s]);
   }
 }
-class ue extends D {
+class ue extends x {
   constructor({ expression: e, indexer: n }, s) {
     super(s, "<array>", [e, n]), this.array = e, this.indexer = n;
   }
 }
-function Pt(t, e) {
+function Dt(t, e) {
   if (!t || t.length === 0)
     return e || [];
   if (!e || e.length === 0)
@@ -270,12 +269,12 @@ function Pt(t, e) {
     (i) => i !== null
   );
 }
-function ws(t, e = !1) {
+function Ss(t, e = !1) {
   return JSON.stringify(
     t,
     function(n, s) {
       var i;
-      return !(this instanceof K) && n === "symbol" ? s == null ? void 0 : s.id : (
+      return !(this instanceof Z) && n === "symbol" ? s == null ? void 0 : s.id : (
         /* this instanceof SyntaxNode && */
         n === "symbol" ? {
           symbolTable: s == null ? void 0 : s.symbolTable,
@@ -296,7 +295,7 @@ function ws(t, e = !1) {
     e ? 2 : 0
   );
 }
-class O {
+class R {
   constructor(e) {
     this.value = e;
   }
@@ -311,14 +310,14 @@ class O {
     return e(this.value);
   }
   map(e) {
-    return new O(e(this.value));
+    return new R(e(this.value));
   }
   // eslint-disable-next-line class-methods-use-this
   isOk() {
     return !0;
   }
 }
-class P {
+class S {
   // eslint-disable-next-line class-methods-use-this
   unwrap() {
     throw new Error("Trying to unwrap a None value");
@@ -329,11 +328,11 @@ class P {
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
   and_then(e) {
-    return new P();
+    return new S();
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
   map(e) {
-    return new P();
+    return new S();
   }
   // eslint-disable-next-line class-methods-use-this
   isOk() {
@@ -341,64 +340,64 @@ class P {
   }
 }
 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 tt(t) {
   return `Schema:${t}`;
 }
-function Fe(t) {
+function Be(t) {
   return `Table:${t}`;
 }
-function je(t) {
+function We(t) {
   return `Column:${t}`;
 }
-function st(t) {
+function nt(t) {
   return `Enum:${t}`;
 }
-function it(t) {
+function st(t) {
   return `Enum field:${t}`;
 }
-function at(t) {
+function it(t) {
   return `TableGroup:${t}`;
 }
-function rt(t) {
+function at(t) {
   return `TableGroup field:${t}`;
 }
-function on(t) {
+function ln(t) {
   return `Note:${t}`;
 }
-function Dt(t) {
+function rt(t) {
   return `TablePartial:${t}`;
 }
-function ln(t) {
+function Ot(t) {
   return `TablePartialInjection:${t}`;
 }
-function Ue(t, e) {
+function Me(t, e) {
   switch (e) {
     case "Column":
-      return je(t);
+      return We(t);
     case "Enum":
-      return st(t);
+      return nt(t);
     case "Enum field":
-      return it(t);
+      return st(t);
     case "Schema":
-      return nt(t);
+      return tt(t);
     case "Table":
-      return Fe(t);
+      return Be(t);
     case "TableGroup":
-      return at(t);
+      return it(t);
     case "TableGroup field":
-      return rt(t);
+      return at(t);
     case "TablePartial":
-      return Dt(t);
+      return rt(t);
     default:
       throw new Error("Unreachable");
   }
 }
 function oe(t) {
   const [e, n] = t.split(":");
-  return Object.values(m).includes(e) ? new O({
+  return Object.values(m).includes(e) ? new R({
     name: n,
     kind: e
-  }) : new P();
+  }) : new S();
 }
 function cn(t) {
   const e = oe(t).unwrap_or(void 0);
@@ -419,47 +418,13 @@ function hn(t) {
   if (!e)
     return null;
   const { kind: n, name: s } = e;
-  return n === "TablePartialInjection" ? Ue(
+  return n === "TablePartialInjection" ? Me(
     s,
     "TablePartial"
     /* TablePartial */
   ) : null;
 }
-function fn(t) {
-  return [
-    nt,
-    Fe,
-    st,
-    at,
-    je,
-    it,
-    rt
-  ].map((e) => e(t));
-}
-function We(t) {
-  return !!t.match(/(\p{L}|_|\p{M})/gu);
-}
-function Be(t) {
-  const [e] = t;
-  return e >= "0" && e <= "9";
-}
-function pn(t) {
-  const [e] = t;
-  return Be(e) || We(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
-}
-function Le(t) {
-  return We(t) || Be(t);
-}
-function Nt(t, e) {
-  const n = [], s = Math.min(t.length, e.length);
-  for (let i = 0; i < s; i += 1)
-    n.push(t[i], e[i]);
-  return n.push(...t.slice(s), ...e.slice(s)), n;
-}
-function ye(t, e) {
-  return t >= e.start && t < e.end;
-}
-class dn {
+class fn {
   constructor() {
     this.id = 0;
   }
@@ -470,56 +435,95 @@ class dn {
     return this.id++;
   }
 }
-class Ot {
+class Rt {
   constructor({ symbolTable: e }, n) {
     this.references = [], this.id = n, this.symbolTable = e;
   }
 }
-class En {
+class pn {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class Nn {
+class dn {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class Rt {
+class Ut {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class Ut {
+class ot {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class mn {
+class En {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class Tn {
+class Nn {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class bn {
+class mn {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class In {
+class Tn {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class Ln {
-  constructor({ injectorId: e }, n) {
-    this.references = [], this.id = n, this.injectorId = e;
+class bn {
+  constructor({ injectorFieldSymbol: e, injectorDeclaration: n }, s) {
+    this.references = [], this.id = s, this.injectorDeclaration = n, this.injectorFieldSymbol = e;
   }
 }
+function In(t) {
+  return [
+    tt,
+    Be,
+    We,
+    nt,
+    st,
+    it,
+    at,
+    rt,
+    Ot
+  ].map((e) => e(t));
+}
+function Ln(t) {
+  return t instanceof ot ? bn : null;
+}
+function Ye(t) {
+  return !!t.match(/(\p{L}|_|\p{M})/gu);
+}
+function Ve(t) {
+  const [e] = t;
+  return e >= "0" && e <= "9";
+}
+function An(t) {
+  const [e] = t;
+  return Ve(e) || Ye(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
+}
+function ge(t) {
+  return Ye(t) || Ve(t);
+}
+function mt(t, e) {
+  const n = [], s = Math.min(t.length, e.length);
+  for (let i = 0; i < s; i += 1)
+    n.push(t[i], e[i]);
+  return n.push(...t.slice(s), ...e.slice(s)), n;
+}
+function Se(t, e) {
+  return t >= e.start && t < e.end;
+}
 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_TABLE_FIELD = 3013] = "INVALID_TABLE_FIELD", t[t.INVALID_TABLEGROUP_CONTEXT = 3014] = "INVALID_TABLEGROUP_CONTEXT", t[t.INVALID_TABLEGROUP_ELEMENT_NAME = 3015] = "INVALID_TABLEGROUP_ELEMENT_NAME", t[t.DUPLICATE_TABLEGROUP_ELEMENT_NAME = 3016] = "DUPLICATE_TABLEGROUP_ELEMENT_NAME", t[t.DUPLICATE_TABLEGROUP_FIELD_NAME = 3017] = "DUPLICATE_TABLEGROUP_FIELD_NAME", t[t.INVALID_TABLEGROUP_FIELD = 3018] = "INVALID_TABLEGROUP_FIELD", t[t.INVALID_TABLE_PARTIAL_CONTEXT = 3019] = "INVALID_TABLE_PARTIAL_CONTEXT", t[t.INVALID_TABLE_PARTIAL_ELEMENT_NAME = 3020] = "INVALID_TABLE_PARTIAL_ELEMENT_NAME", t[t.INVALID_TABLE_PARTIAL_SETTING = 3021] = "INVALID_TABLE_PARTIAL_SETTING", t[t.DUPLICATE_TABLE_PARTIAL_ELEMENT_NAME = 3022] = "DUPLICATE_TABLE_PARTIAL_ELEMENT_NAME", t[t.DUPLICATE_TABLE_PARTIAL_SETTING = 3023] = "DUPLICATE_TABLE_PARTIAL_SETTING", t[t.INVALID_TABLE_PARTIAL_INJECTION = 3024] = "INVALID_TABLE_PARTIAL_INJECTION", t[t.INVALID_TABLE_PARTIAL_INJECTION_OP = 3025] = "INVALID_TABLE_PARTIAL_INJECTION_OP", t[t.INVALID_TABLE_PARTIAL_INJECTION_NAME = 3026] = "INVALID_TABLE_PARTIAL_INJECTION_NAME", t[t.DUPLICATE_TABLE_PARTIAL_INJECTION_NAME = 3027] = "DUPLICATE_TABLE_PARTIAL_INJECTION_NAME", t[t.EMPTY_TABLE = 3028] = "EMPTY_TABLE", t[t.INVALID_COLUMN = 3029] = "INVALID_COLUMN", t[t.INVALID_COLUMN_NAME = 3030] = "INVALID_COLUMN_NAME", t[t.UNKNOWN_COLUMN_SETTING = 3031] = "UNKNOWN_COLUMN_SETTING", t[t.INVALID_COLUMN_TYPE = 3032] = "INVALID_COLUMN_TYPE", t[t.DUPLICATE_COLUMN_NAME = 3033] = "DUPLICATE_COLUMN_NAME", t[t.DUPLICATE_COLUMN_SETTING = 3034] = "DUPLICATE_COLUMN_SETTING", t[t.INVALID_COLUMN_SETTING_VALUE = 3035] = "INVALID_COLUMN_SETTING_VALUE", t[t.INVALID_ENUM_CONTEXT = 3036] = "INVALID_ENUM_CONTEXT", t[t.INVALID_ENUM_ELEMENT_NAME = 3037] = "INVALID_ENUM_ELEMENT_NAME", t[t.INVALID_ENUM_ELEMENT = 3038] = "INVALID_ENUM_ELEMENT", t[t.DUPLICATE_ENUM_ELEMENT_NAME = 3039] = "DUPLICATE_ENUM_ELEMENT_NAME", t[t.UNKNOWN_ENUM_ELEMENT_SETTING = 3040] = "UNKNOWN_ENUM_ELEMENT_SETTING", t[t.DUPLICATE_ENUM_ELEMENT_SETTING = 3041] = "DUPLICATE_ENUM_ELEMENT_SETTING", t[t.INVALID_ENUM_ELEMENT_SETTING = 3042] = "INVALID_ENUM_ELEMENT_SETTING", t[t.EMPTY_ENUM = 3043] = "EMPTY_ENUM", t[t.INVALID_REF_CONTEXT = 3044] = "INVALID_REF_CONTEXT", t[t.UNKNOWN_REF_SETTING = 3045] = "UNKNOWN_REF_SETTING", t[t.DUPLICATE_REF_SETTING = 3046] = "DUPLICATE_REF_SETTING", t[t.INVALID_REF_SETTING_VALUE = 3047] = "INVALID_REF_SETTING_VALUE", t[t.INVALID_REF_RELATIONSHIP = 3048] = "INVALID_REF_RELATIONSHIP", t[t.INVALID_REF_FIELD = 3049] = "INVALID_REF_FIELD", t[t.EMPTY_REF = 3050] = "EMPTY_REF", t[t.REF_REDEFINED = 3051] = "REF_REDEFINED", t[t.INVALID_NOTE_CONTEXT = 3052] = "INVALID_NOTE_CONTEXT", t[t.INVALID_NOTE = 3053] = "INVALID_NOTE", t[t.NOTE_REDEFINED = 3054] = "NOTE_REDEFINED", t[t.NOTE_CONTENT_REDEFINED = 3055] = "NOTE_CONTENT_REDEFINED", t[t.EMPTY_NOTE = 3056] = "EMPTY_NOTE", t[t.INVALID_INDEXES_CONTEXT = 3057] = "INVALID_INDEXES_CONTEXT", t[t.INVALID_INDEXES_FIELD = 3058] = "INVALID_INDEXES_FIELD", t[t.INVALID_INDEX = 3059] = "INVALID_INDEX", t[t.UNKNOWN_INDEX_SETTING = 3060] = "UNKNOWN_INDEX_SETTING", t[t.DUPLICATE_INDEX_SETTING = 3061] = "DUPLICATE_INDEX_SETTING", t[t.UNEXPECTED_INDEX_SETTING_VALUE = 3062] = "UNEXPECTED_INDEX_SETTING_VALUE", t[t.INVALID_INDEX_SETTING_VALUE = 3063] = "INVALID_INDEX_SETTING_VALUE", t[t.INVALID_PROJECT_CONTEXT = 3064] = "INVALID_PROJECT_CONTEXT", t[t.PROJECT_REDEFINED = 3065] = "PROJECT_REDEFINED", t[t.INVALID_PROJECT_FIELD = 3066] = "INVALID_PROJECT_FIELD", t[t.INVALID_CUSTOM_CONTEXT = 3067] = "INVALID_CUSTOM_CONTEXT", t[t.INVALID_CUSTOM_ELEMENT_VALUE = 3068] = "INVALID_CUSTOM_ELEMENT_VALUE", t[t.INVALID_ELEMENT_IN_SIMPLE_BODY = 3069] = "INVALID_ELEMENT_IN_SIMPLE_BODY", t[t.BINDING_ERROR = 4e3] = "BINDING_ERROR", t[t.UNSUPPORTED = 5e3] = "UNSUPPORTED", t[t.CIRCULAR_REF = 5001] = "CIRCULAR_REF", t[t.SAME_ENDPOINT = 5002] = "SAME_ENDPOINT", t[t.UNEQUAL_FIELDS_BINARY_REF = 5003] = "UNEQUAL_FIELDS_BINARY_REF", t[t.CONFLICTING_SETTING = 5004] = "CONFLICTING_SETTING", t[t.TABLE_REAPPEAR_IN_TABLEGROUP = 5005] = "TABLE_REAPPEAR_IN_TABLEGROUP", t))(o || {});
 class l extends Error {
   constructor(e, n, s) {
@@ -546,12 +550,12 @@ class q {
 }
 function _n(t, e, n) {
   if (!t || !he(t) || e.length === 0)
-    return new P();
+    return new S();
   const s = [...e], i = Je(t).unwrap(), a = s.pop();
   if (!(a instanceof re))
-    return new P();
-  const r = _.last(s) instanceof R ? s.pop() : void 0;
-  return s.length === 3 && Je(s[1]).unwrap().value === "as" ? new O(
+    return new S();
+  const r = _.last(s) instanceof U ? s.pop() : void 0;
+  return s.length === 3 && Je(s[1]).unwrap().value === "as" ? new R(
     n.create(y, {
       type: i,
       name: s[0],
@@ -560,38 +564,38 @@ function _n(t, e, n) {
       attributeList: r,
       body: a
     })
-  ) : s.length === 1 ? new O(
+  ) : s.length === 1 ? new R(
     n.create(y, {
       type: i,
       name: s[0],
       attributeList: r,
       body: a
     })
-  ) : s.length === 0 ? new O(
+  ) : s.length === 0 ? new R(
     n.create(y, {
       type: i,
       attributeList: r,
       body: a
     })
-  ) : new P();
+  ) : new S();
 }
-function mt(t) {
+function Tt(t) {
   return t.kind === h.IDENTIFIER && t.value === "as";
 }
 function T(t) {
-  t && (t instanceof J ? An(t) : gn(t));
+  t && (t instanceof J ? gn(t) : vn(t));
 }
-function An(t) {
+function gn(t) {
   t.kind !== h.EOF && (t.isInvalid = !0);
 }
-function gn(t) {
+function vn(t) {
   if (t instanceof y)
     T(t.type), T(t.name), T(t.as), T(t.alias), T(t.bodyColon), T(t.attributeList), T(t.body);
-  else if (t instanceof ne)
+  else if (t instanceof te)
     t.identifiers.forEach(T);
-  else if (t instanceof se)
+  else if (t instanceof ne)
     T(t.name), T(t.colon), T(t.value);
-  else if (t instanceof Z)
+  else if (t instanceof ie)
     T(t.op), T(t.expression);
   else if (t instanceof le)
     T(t.leftExpression), T(t.op), T(t.rightExpression);
@@ -599,36 +603,36 @@ function gn(t) {
     T(t.op), T(t.expression);
   else if (t instanceof re)
     T(t.blockOpenBrace), t.body.forEach(T), T(t.blockCloseBrace);
-  else if (t instanceof R)
+  else if (t instanceof U)
     T(t.listOpenBracket), t.commaList.forEach(T), t.elementList.forEach(T), T(t.listCloseBracket);
   else if (t instanceof fe)
     T(t.tupleOpenParen), t.commaList.forEach(T), t.elementList.forEach(T), T(t.tupleCloseParen);
   else if (t instanceof Y)
     T(t.callee), T(t.argumentList);
-  else if (t instanceof w)
+  else if (t instanceof v)
     T(t.callee), t.args.forEach(T);
-  else if (t instanceof G)
+  else if (t instanceof j)
     T(t.expression);
   else if (t instanceof ce)
     T(t.value);
   else if (t instanceof ae)
     T(t.variable);
-  else if (t instanceof ge)
+  else if (t instanceof we)
     T(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 et ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
 }
 function Mt(t) {
   return !!(t != null && t.isInvalid);
 }
-function j(...t) {
+function C(...t) {
   return t.filter((e) => e !== void 0);
 }
-function vn(t) {
-  if (t instanceof K)
-    return j(...t.body, t.eof);
+function wn(t) {
+  if (t instanceof Z)
+    return C(...t.body, t.eof);
   if (t instanceof y)
-    return j(
+    return C(
       t.type,
       t.name,
       t.as,
@@ -637,74 +641,76 @@ function vn(t) {
       t.bodyColon,
       t.body
     );
-  if (t instanceof se)
-    return j(t.name, t.colon, t.value);
   if (t instanceof ne)
+    return C(t.name, t.colon, t.value);
+  if (t instanceof te)
     return t.identifiers;
-  if (t instanceof ge)
+  if (t instanceof we)
     return t.literal ? [t.literal] : [];
   if (t instanceof ae)
-    return j(t.variable);
-  if (t instanceof Z)
-    return j(t.op, t.expression);
+    return C(t.variable);
+  if (t instanceof ie)
+    return C(t.op, t.expression);
   if (t instanceof le)
-    return j(t.leftExpression, t.op, t.rightExpression);
+    return C(t.leftExpression, t.op, t.rightExpression);
   if (t instanceof $e)
-    return j(t.expression, t.op);
+    return C(t.expression, t.op);
   if (t instanceof ce)
-    return j(t.value);
-  if (t instanceof w)
-    return j(t.callee, ...t.args);
+    return C(t.value);
+  if (t instanceof v)
+    return C(t.callee, ...t.args);
   if (t instanceof re)
-    return j(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
-  if (t instanceof R)
-    return j(
+    return C(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
+  if (t instanceof U)
+    return C(
       t.listOpenBracket,
-      ...Nt(t.elementList, t.commaList),
+      ...mt(t.elementList, t.commaList),
       t.listCloseBracket
     );
   if (t instanceof fe)
-    return j(
+    return C(
       t.tupleOpenParen,
-      ...Nt(t.elementList, t.commaList),
+      ...mt(t.elementList, t.commaList),
       t.tupleCloseParen
     );
   if (t instanceof Y)
-    return j(t.callee, t.argumentList);
-  if (t instanceof G)
-    return j(t.expression);
+    return C(t.callee, t.argumentList);
+  if (t instanceof j)
+    return C(t.expression);
   if (t instanceof ue)
-    return j(
+    return C(
       t.array,
       t.indexer
     );
-  throw t instanceof tt ? new Error("This case is already handled by TupleExpressionNode") : new Error("Unreachable - no other possible cases");
+  if (t instanceof Le)
+    return C(t.partial);
+  throw t instanceof et ? new Error("This case is already handled by TupleExpressionNode") : new Error("Unreachable - no other possible cases");
 }
 function Je(t) {
-  return $(t) ? new O(t.expression.variable) : new P();
+  return $(t) ? new R(t.expression.variable) : new S();
 }
-function C(t) {
+function G(t) {
   var e;
-  return t instanceof G && (t.expression instanceof ae && t.expression.variable instanceof J && t.expression.variable.kind === h.QUOTED_STRING || t.expression instanceof ge && ((e = t.expression.literal) == null ? void 0 : e.kind) === h.STRING_LITERAL);
+  return t instanceof j && (t.expression instanceof ae && t.expression.variable instanceof J && t.expression.variable.kind === h.QUOTED_STRING || t.expression instanceof we && ((e = t.expression.literal) == null ? void 0 : e.kind) === h.STRING_LITERAL);
 }
 function $(t) {
-  return t instanceof G && t.expression instanceof ae && t.expression.variable instanceof J;
+  return t instanceof j && t.expression instanceof ae && t.expression.variable instanceof J;
 }
 function he(t) {
   var e;
-  return t instanceof G && t.expression instanceof ae && ((e = t.expression.variable) == null ? void 0 : e.kind) === h.IDENTIFIER;
+  return t instanceof j && t.expression instanceof ae && ((e = t.expression.variable) == null ? void 0 : e.kind) === h.IDENTIFIER;
 }
-function Ye(t) {
+function qe(t) {
   var e;
-  return t instanceof le && 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 Ae(t) {
+function ve(t) {
   if (t === void 0)
-    return new P();
+    return new S();
   const e = t.identifiers.map((n) => n.value).join(" ");
-  return e === "" ? new P() : new O(e);
+  return e === "" ? new S() : new R(e);
 }
-class wn {
+class yn {
   // list of errors during lexing
   constructor(e) {
     this.start = {
@@ -817,15 +823,15 @@ class wn {
           this.match("/") ? this.singleLineComment() : this.match("*") ? this.multilineComment() : this.operator();
           break;
         default:
-          if (pt(e)) {
+          if (dt(e)) {
             this.operator();
             break;
           }
-          if (We(e)) {
+          if (Ye(e)) {
             this.identifier();
             break;
           }
-          if (Be(e)) {
+          if (Ve(e)) {
             this.numericLiteralOrIdentifier();
             break;
           }
@@ -845,7 +851,7 @@ class wn {
     let e = !0, n = [], s;
     const i = [];
     for (const a of this.tokens)
-      sn(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);
+      an(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);
     this.tokens = i;
   }
   gatherInvalid() {
@@ -940,12 +946,12 @@ class wn {
     });
   }
   identifier() {
-    for (; !this.isAtEnd() && Le(this.peek()); )
+    for (; !this.isAtEnd() && ge(this.peek()); )
       this.advance();
     this.addToken(h.IDENTIFIER);
   }
   operator() {
-    for (; pt(this.peek()); )
+    for (; dt(this.peek()); )
       this.advance();
     this.addToken(h.OP);
   }
@@ -960,26 +966,26 @@ class wn {
         break;
       if (!n && this.current.offset === this.text.length - 1)
         return this.advance(), this.addToken(h.NUMERIC_LITERAL);
-      if (!n && !Le(this.peek()))
+      if (!n && !ge(this.peek()))
         return this.addToken(h.NUMERIC_LITERAL);
-      if (!n && !Be(this.peek()))
+      if (!n && !Ve(this.peek()))
         break;
       this.advance();
     }
     if (e > 0) {
-      for (; !this.isAtEnd() && (this.check(".") || Le(this.peek())); )
+      for (; !this.isAtEnd() && (this.check(".") || ge(this.peek())); )
         this.advance();
       const n = this.createToken(h.NUMERIC_LITERAL, !0);
       this.tokens.push(n), this.errors.push(new l(o.UNKNOWN_TOKEN, "Invalid number", n));
     } else {
-      for (; !this.isAtEnd() && Le(this.peek()); )
+      for (; !this.isAtEnd() && ge(this.peek()); )
         this.advance();
       const n = this.createToken(h.IDENTIFIER, !1);
       this.tokens.push(n);
     }
   }
   colorLiteral() {
-    for (; !this.isAtEnd() && Le(this.peek()); )
+    for (; !this.isAtEnd() && ge(this.peek()); )
       this.advance();
     this.addToken(h.COLOR_LITERAL);
   }
@@ -1020,7 +1026,7 @@ class wn {
       case "u": {
         let n = "";
         for (let s = 0; s <= 3; s += 1) {
-          if (this.isAtEnd() || !Le(this.peek()))
+          if (this.isAtEnd() || !ge(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`, J.create(h.STRING_LITERAL, e, this.current, `\\u${n}`, !0))), `\\u${n}`;
           n += this.advance();
         }
@@ -1031,8 +1037,8 @@ class wn {
     }
   }
 }
-var Me = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(Me || {});
-class yn {
+var Fe = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(Fe || {});
+class kn {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
   }
@@ -1098,7 +1104,7 @@ class yn {
         }
   }
 }
-class kn {
+class Sn {
   constructor(e) {
     this.generator = e;
   }
@@ -1111,15 +1117,15 @@ class N {
     this.token = e, this.partialNode = n, this.handlerContext = s;
   }
 }
-class Sn {
+class Pn {
   constructor(e, n) {
-    this.current = 0, this.errors = [], this.contextStack = new yn(), this.synchronizeProgram = () => {
+    this.current = 0, this.errors = [], this.contextStack = new kn(), this.synchronizeProgram = () => {
       const s = this.peek();
       s.kind !== h.EOF ? T(this.advance()) : (T(this.peek()), this.logError(s, o.UNEXPECTED_EOF, "Unexpected EOF"));
     }, this.synchronizeElementDeclarationName = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (mt(s) || this.check(h.COLON, h.LBRACE, h.LBRACKET))
+        if (Tt(s) || this.check(h.COLON, h.LBRACE, h.LBRACKET))
           break;
         T(s), this.advance();
       }
@@ -1130,7 +1136,7 @@ class Sn {
           break;
         T(s), this.advance();
       }
-    }, this.blockExpression = this.contextStack.withContextDo(Me.BlockExpression, () => {
+    }, this.blockExpression = this.contextStack.withContextDo(Fe.BlockExpression, () => {
       const s = { body: [] }, i = () => this.nodeFactory.create(re, s);
       try {
         this.consume("Expect an opening brace '{'", h.LBRACE), s.blockOpenBrace = this.previous();
@@ -1144,7 +1150,7 @@ class Sn {
       for (; !this.isAtEnd() && !this.check(h.RBRACE); )
         try {
           if (this.match(h.TILDE)) {
-            const a = this.previous(), r = this.variable(), c = this.nodeFactory.create(ke, { op: a, partial: r });
+            const a = this.previous(), r = this.variable(), c = this.nodeFactory.create(Le, { op: a, partial: r });
             s.body.push(c);
           } else
             s.body.push(this.canBeField() ? this.fieldDeclaration() : this.expression());
@@ -1169,12 +1175,12 @@ class Sn {
       if (!this.check(h.RBRACE))
         for (T(this.advance()); !this.isAtEnd(); ) {
           const s = this.peek();
-          if (this.check(h.RBRACE) || Et(this.previous(), s))
+          if (this.check(h.RBRACE) || Nt(this.previous(), s))
             break;
           T(s), this.advance();
         }
-    }, this.tupleExpression = this.contextStack.withContextDo(Me.GroupExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(tt, {
+    }, this.tupleExpression = this.contextStack.withContextDo(Fe.GroupExpression, () => {
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(et, {
         groupOpenParen: s.tupleOpenParen,
         groupCloseParen: s.tupleCloseParen,
         expression: s.elementList[0]
@@ -1204,7 +1210,7 @@ class Sn {
         } catch (r) {
           if (!(r instanceof N))
             throw r;
-          if (r.partialNode instanceof D && s.elementList.push(r.partialNode), !this.canHandle(r))
+          if (r.partialNode instanceof x && s.elementList.push(r.partialNode), !this.canHandle(r))
             throw new N(r.token, a(), r.handlerContext);
           this.synchronizeTuple();
         }
@@ -1225,8 +1231,8 @@ class Sn {
           break;
         T(s), this.advance();
       }
-    }, this.listExpression = this.contextStack.withContextDo(Me.ListExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(R, s);
+    }, this.listExpression = this.contextStack.withContextDo(Fe.ListExpression, () => {
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(U, s);
       try {
         this.consume("Expect an opening bracket '['", h.LBRACKET), s.listOpenBracket = this.previous();
       } catch (a) {
@@ -1252,7 +1258,7 @@ class Sn {
         } catch (a) {
           if (!(a instanceof N))
             throw a;
-          if (a.partialNode instanceof D && s.elementList.push(a.partialNode), !this.canHandle(a))
+          if (a.partialNode instanceof x && s.elementList.push(a.partialNode), !this.canHandle(a))
             throw new N(a.token, i(), a.handlerContext);
           this.synchronizeList();
         }
@@ -1287,7 +1293,7 @@ class Sn {
           break;
         T(s), this.advance();
       }
-    }, this.tokens = e, this.nodeFactory = new kn(n);
+    }, this.tokens = e, this.nodeFactory = new Sn(n);
   }
   isAtEnd() {
     return this.current >= this.tokens.length || this.tokens[this.current].kind === h.EOF;
@@ -1343,7 +1349,7 @@ class Sn {
     this.tokens = e;
   }
   parse() {
-    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(K, { body: e, eof: n });
+    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(Z, { body: e, eof: n });
     return this.gatherInvalid(), new q({ ast: s, tokens: this.tokens }, this.errors);
   }
   /* Parsing and synchronizing ProgramNode */
@@ -1378,7 +1384,7 @@ class Sn {
           throw new N(s.token, n(), s.handlerContext);
         this.synchronizeElementDeclarationName();
       }
-    if (mt(this.peek()))
+    if (Tt(this.peek()))
       if (e.as = this.advance(), this.check(h.COLON, h.LBRACE, h.LBRACKET))
         this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect an alias");
       else
@@ -1443,7 +1449,7 @@ class Sn {
   /* Parsing any ExpressionNode, including non-NormalExpression */
   expression() {
     const e = { args: [] }, n = () => _n(e.callee, e.args, this.nodeFactory).unwrap_or(
-      this.nodeFactory.create(w, e)
+      this.nodeFactory.create(v, e)
     );
     try {
       e.callee = this.normalExpression();
@@ -1454,7 +1460,7 @@ class Sn {
       return n();
     let s = e.callee;
     for (; !this.shouldStopExpression(); ) {
-      Ze(this.previous()) || this.logError(s, o.MISSING_SPACES, "Expect a following space");
+      Ke(this.previous()) || this.logError(s, o.MISSING_SPACES, "Expect a following space");
       try {
         s = this.normalExpression(), e.args.push(s);
       } catch (i) {
@@ -1464,7 +1470,7 @@ class Sn {
     return n();
   }
   shouldStopExpression() {
-    if (this.isAtEnd() || kt(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;
@@ -1478,12 +1484,12 @@ class Sn {
     for (; !this.isAtEnd(); ) {
       const s = this.peek();
       if (s.kind === h.LPAREN) {
-        const { left: i } = Tt(s);
+        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 '['
-        Et(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(Y, {
@@ -1497,7 +1503,7 @@ class Sn {
           }), new N(a.token, n, a.handlerContext)) : a;
         }
       } else if (s.kind === h.LBRACKET) {
-        if (Ze(this.previous()))
+        if (Ke(this.previous()))
           break;
         try {
           n = this.nodeFactory.create(ue, {
@@ -1510,8 +1516,8 @@ class Sn {
             indexer: i.partialNode
           }), new N(i.token, n, i.handlerContext)) : i;
         }
-      } else if (dt(s)) {
-        const i = s, a = Tt(i);
+      } else if (Et(s)) {
+        const i = s, a = bt(i);
         if (a.left !== null) {
           if (a.left <= e)
             break;
@@ -1520,7 +1526,7 @@ class Sn {
             op: i
           });
         } else {
-          const r = Pn(i);
+          const r = Dn(i);
           if (r.left === null || r.left <= e)
             break;
           this.advance();
@@ -1545,10 +1551,10 @@ class Sn {
   }
   leftExpression_bp() {
     let e;
-    if (dt(this.peek())) {
+    if (Et(this.peek())) {
       const n = {};
       n.op = this.peek();
-      const s = On(n.op);
+      const s = Rn(n.op);
       if (s.right === null)
         throw this.logError(
           n.op,
@@ -1556,7 +1562,7 @@ class Sn {
           `Unexpected '${n.op.value}' in an expression`
         ), new N(
           n.op,
-          this.nodeFactory.create(Re, { pre: n.op }),
+          this.nodeFactory.create(Ue, { pre: n.op }),
           this.contextStack.findHandlerContext(this.tokens, this.current)
         );
       this.advance();
@@ -1565,15 +1571,15 @@ class Sn {
       } catch (i) {
         throw i instanceof N ? (n.expression = i.partialNode, new N(
           i.token,
-          this.nodeFactory.create(Z, n),
+          this.nodeFactory.create(ie, n),
           i.handlerContext
         )) : i;
       }
-      e = this.nodeFactory.create(Z, n);
-    } else if (e = this.extractOperand(), e instanceof Re)
+      e = this.nodeFactory.create(ie, n);
+    } else if (e = this.extractOperand(), e instanceof Ue)
       throw new N(
         this.peek(),
-        this.nodeFactory.create(Re, { pre: this.peek() }),
+        this.nodeFactory.create(Ue, { pre: this.peek() }),
         this.contextStack.findHandlerContext(this.tokens, this.current)
       );
     return e;
@@ -1597,7 +1603,7 @@ class Sn {
       this.peek(),
       o.INVALID_OPERAND,
       `Invalid start of operand "${this.peek().value}"`
-    ), this.nodeFactory.create(Re, { pre: this.previous() }));
+    ), this.nodeFactory.create(Ue, { pre: this.previous() }));
   }
   /* Parsing FunctionExpression */
   functionExpression() {
@@ -1628,11 +1634,11 @@ class Sn {
       h.STRING_LITERAL,
       h.NUMERIC_LITERAL
     ))
-      return this.nodeFactory.create(G, {
-        expression: this.nodeFactory.create(ge, { literal: this.previous() })
+      return this.nodeFactory.create(j, {
+        expression: this.nodeFactory.create(we, { literal: this.previous() })
       });
     if (this.match(h.QUOTED_STRING, h.IDENTIFIER))
-      return this.nodeFactory.create(G, {
+      return this.nodeFactory.create(j, {
         expression: this.nodeFactory.create(ae, { variable: this.previous() })
       });
     throw this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect a variable or literal"), new N(
@@ -1649,7 +1655,7 @@ class Sn {
         n,
         o.EMPTY_ATTRIBUTE_NAME,
         "Expect a non-empty attribute name"
-      ), e.name = this.nodeFactory.create(ne, { identifiers: [] });
+      ), e.name = this.nodeFactory.create(te, { identifiers: [] });
     } else
       try {
         e.name = this.attributeName();
@@ -1659,12 +1665,12 @@ class Sn {
         if (e.name = n.partialNode, !this.canHandle(n))
           throw new N(
             n.token,
-            this.nodeFactory.create(se, e),
+            this.nodeFactory.create(ne, 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(h.COLON) && (e.colon = this.previous(), e.value = this.attributeValue()), this.nodeFactory.create(ne, e);
   }
   attributeValue() {
     let e;
@@ -1687,11 +1693,11 @@ class Sn {
       } catch (n) {
         throw n instanceof N ? new N(
           n.token,
-          this.nodeFactory.create(ne, { identifiers: e }),
+          this.nodeFactory.create(te, { identifiers: e }),
           n.handlerContext
         ) : n;
       }
-    return this.nodeFactory.create(ne, { identifiers: e });
+    return this.nodeFactory.create(te, { identifiers: e });
   }
   logError(e, n, s) {
     this.errors.push(new l(n, s, e));
@@ -1713,10 +1719,10 @@ const xn = {
   "!=": { left: 4, right: 5 },
   ".": { left: 16, right: 17 }
 };
-function Pn(t) {
+function Dn(t) {
   return xn[t.value] || { left: null, right: null };
 }
-const Dn = {
+const On = {
   "+": { left: null, right: 15 },
   "-": { left: null, right: 15 },
   "<": { left: null, right: 15 },
@@ -1724,17 +1730,17 @@ const Dn = {
   "<>": { left: null, right: 15 },
   "!": { left: null, right: 15 }
 };
-function On(t) {
-  return Dn[t.value] || { left: null, right: null };
+function Rn(t) {
+  return On[t.value] || { left: null, right: null };
 }
-const Rn = {
+const Un = {
   "(": { left: 14, right: null }
 };
-function Tt(t) {
-  return Rn[t.value] || { left: null, right: null };
+function bt(t) {
+  return Un[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 || {});
-function Pe(t) {
+function Ae(t) {
   var n;
   const e = (n = t == null ? void 0 : t.type) == null ? void 0 : n.value.toLowerCase();
   switch (e) {
@@ -1746,38 +1752,38 @@ function Pe(t) {
     case I.Ref:
     case I.TableGroup:
     case I.TablePartial:
-      return new O(e);
+      return new R(e);
     default:
-      return new P();
+      return new S();
   }
 }
-function Ie(t) {
-  if (!Ye(t))
-    return new O([t]);
-  const e = Ie(t.leftExpression).unwrap_or(void 0);
-  return e ? (e.push(t.rightExpression), new O(e)) : new P();
+function _e(t) {
+  if (!qe(t))
+    return new R([t]);
+  const e = _e(t.leftExpression).unwrap_or(void 0);
+  return e ? (e.push(t.rightExpression), new R(e)) : new S();
 }
 function z(t) {
   if (t === void 0)
-    return new P();
-  const e = Ie(t).unwrap_or(void 0);
+    return new S();
+  const e = _e(t).unwrap_or(void 0);
   if (!e)
-    return new P();
+    return new S();
   const n = [];
   for (const s of e) {
     const i = W(s).unwrap_or(void 0);
     if (!i)
-      return new P();
+      return new S();
     n.push(i);
   }
-  return new O(n);
+  return new R(n);
 }
-function Se(t) {
+function Pe(t) {
   if (t === void 0)
-    return new P();
-  const e = Ie(t).unwrap_or(void 0);
+    return new S();
+  const e = _e(t).unwrap_or(void 0);
   if (!e || e.length === 0)
-    return new P();
+    return new S();
   const n = [];
   let s;
   if (!$(_.last(e))) {
@@ -1787,70 +1793,75 @@ function Se(t) {
         (a) => X(a).unwrap()
       );
     else
-      return new P();
+      return new S();
   }
   for (const i of e) {
     const a = W(i).unwrap_or(void 0);
     if (!a)
-      return new P();
+      return new S();
     n.push(a);
   }
-  return new O({
+  return new R({
     variables: n,
     tupleElements: s
   });
 }
 function W(t) {
-  return $(t) ? new O(t.expression.variable.value) : new P();
+  return $(t) ? new R(t.expression.variable.value) : new S();
 }
-function Ve(t) {
-  if (bt(t))
-    return t instanceof ce ? new O({ functional: [t], nonFunctional: [] }) : new O({ functional: [], nonFunctional: [t] });
-  if (t instanceof fe && t.elementList.every(bt)) {
+function Ge(t) {
+  if (It(t))
+    return t instanceof ce ? new R({ functional: [t], nonFunctional: [] }) : new R({ functional: [], nonFunctional: [t] });
+  if (t instanceof fe && t.elementList.every(It)) {
     const e = t.elementList.filter(
       (s) => s instanceof ce
     ), n = t.elementList.filter($);
-    return new O({ functional: e, nonFunctional: n });
+    return new R({ functional: e, nonFunctional: n });
   }
-  return new P();
+  return new S();
 }
 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 P() : new O(e);
+  return e === void 0 ? new S() : new R(e);
 }
-function U(t) {
-  return C(t) ? t.expression instanceof ae ? new O(t.expression.variable.value) : new O(t.expression.literal.value) : new P();
+function Mn(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 R(e);
 }
-function Un(t) {
+function M(t) {
+  return G(t) ? t.expression instanceof ae ? new R(t.expression.variable.value) : new R(t.expression.literal.value) : new S();
+}
+function Fn(t) {
   var e;
-  return !(t instanceof le) || !Bt((e = t.op) == null ? void 0 : e.value) ? !1 : Se(t.leftExpression).and_then(() => Se(t.rightExpression)).unwrap_or(void 0) !== void 0;
+  return !(t instanceof le) || !Bt((e = t.op) == null ? void 0 : e.value) ? !1 : Pe(t.leftExpression).and_then(() => Pe(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
-function Mn(t) {
-  const e = Se(t.leftExpression), n = Se(t.rightExpression);
+function Bn(t) {
+  const e = Pe(t.leftExpression), n = Pe(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 bt(t) {
-  return t instanceof G && t.expression instanceof ae || t instanceof ce;
+function It(t) {
+  return t instanceof j && t.expression instanceof ae || t instanceof ce;
 }
-function It(t, e) {
+function Lt(t, e) {
   var i, a, r, c;
   let n = e;
   const s = cn(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 K && s)
+    if (((c = n.symbol) == null ? void 0 : c.declaration) instanceof Z && s)
       return n.symbol;
-    if (n instanceof K)
+    if (n instanceof Z)
       return;
     n = n.parent;
   }
 }
-class Fn {
+class Vn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1858,7 +1869,7 @@ class Fn {
     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 K || Pe(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 Z || Ae(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)] : [];
@@ -1875,10 +1886,10 @@ class Fn {
     if (e instanceof re)
       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 G(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 ve {
+class ye {
   constructor() {
     this.table = /* @__PURE__ */ new Map();
   }
@@ -1898,7 +1909,7 @@ class ve {
     return this.table.forEach(e);
   }
 }
-class Bn {
+class Gn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1916,10 +1927,10 @@ class Bn {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(En, { declaration: this.declarationNode, symbolTable: new ve() });
+    this.declarationNode.symbol = this.symbolFactory.create(pn, { declaration: this.declarationNode, symbolTable: new ye() });
     const { name: n } = this.declarationNode, s = z(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 = ze(i, this.publicSymbolTable, this.symbolFactory), c = nt(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;
@@ -1930,9 +1941,9 @@ class Bn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       return this.validateFields([e]);
-    const [n, s] = _.partition(e.body, (i) => i instanceof w);
+    const [n, s] = _.partition(e.body, (i) => i instanceof v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -1940,7 +1951,7 @@ class Bn {
       const s = [];
       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 _.last(i) instanceof R ? (s.push(...this.validateFieldSettings(_.last(i))), i.pop()) : i[0] instanceof R && (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;
+      return _.last(i) instanceof U ? (s.push(...this.validateFieldSettings(_.last(i))), i.pop()) : i[0] instanceof U && (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) {
@@ -1950,7 +1961,7 @@ class Bn {
       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));
+            G(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
           });
           break;
         default:
@@ -1969,7 +1980,7 @@ class Bn {
   }
   registerField(e) {
     if (e.callee && $(e.callee)) {
-      const n = X(e.callee).unwrap(), s = it(n), i = this.symbolFactory.create(Nn, { declaration: e });
+      const n = X(e.callee).unwrap(), s = st(n), i = this.symbolFactory.create(dn, { declaration: e });
       e.symbol = i;
       const a = this.declarationNode.symbol.symbolTable;
       if (a.has(s)) {
@@ -1984,7 +1995,7 @@ class Bn {
     return [];
   }
 }
-class Vn {
+class Cn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1992,13 +2003,13 @@ class Vn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    if (this.declarationNode.parent instanceof K)
+    if (this.declarationNode.parent instanceof Z)
       return [new l(
         o.INVALID_NOTE_CONTEXT,
         "An Indexes can only appear inside a Table or a TablePartial",
         this.declarationNode
       )];
-    const e = Pe(this.declarationNode.parent).unwrap_or(void 0);
+    const e = Ae(this.declarationNode.parent).unwrap_or(void 0);
     return e && [I.Table, I.TablePartial].includes(e) ? [] : [new l(
       o.INVALID_NOTE_CONTEXT,
       "An Indexes can only appear inside a Table or a TablePartial",
@@ -2017,9 +2028,9 @@ class Vn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       return [new l(o.UNEXPECTED_SIMPLE_BODY, "An Indexes must have a complex body", e)];
-    const [n, s] = _.partition(e.body, (i) => i instanceof w);
+    const [n, s] = _.partition(e.body, (i) => i instanceof v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -2027,10 +2038,10 @@ class Vn {
       if (!n.callee)
         return [];
       const s = [], i = [n.callee, ...n.args];
-      return _.last(i) instanceof R && s.push(...this.validateFieldSetting(i.pop())), i.forEach((a) => {
+      return _.last(i) instanceof U && s.push(...this.validateFieldSetting(i.pop())), i.forEach((a) => {
         for (; a instanceof Y; )
-          a.argumentList && !Ve(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;
-        Ve(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));
+          a.argumentList && !Ge(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;
+        Ge(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;
     });
   }
@@ -2042,7 +2053,7 @@ class Vn {
         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));
+            G(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${a}' must be a string`, c));
           });
           break;
         case "unique":
@@ -2071,7 +2082,7 @@ class Vn {
     });
   }
 }
-class Gn {
+class Xn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2085,26 +2096,26 @@ class Gn {
     ];
   }
   validateContext() {
-    return !(this.declarationNode.parent instanceof K) && ![
+    return !(this.declarationNode.parent instanceof Z) && ![
       I.Table,
       I.TableGroup,
       I.TablePartial,
       I.Project
-    ].includes(Pe(this.declarationNode.parent).unwrap_or(void 0)) ? [new l(
+    ].includes(Ae(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 K))
+    if (!(this.declarationNode.parent instanceof Z))
       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 = z(e);
     if (!n.isOk())
       return [new l(o.INVALID_NAME, "Invalid name for sticky note ", this.declarationNode)];
-    const i = n.unwrap().join("."), a = on(i);
+    const i = n.unwrap().join("."), a = ln(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) {
@@ -2116,14 +2127,14 @@ class Gn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       return this.validateFields([e]);
-    const [n, s] = _.partition(e.body, (i) => i instanceof w);
+    const [n, s] = _.partition(e.body, (i) => i instanceof v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
     const n = [];
-    return e.length === 0 ? [new l(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new l(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), 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))), G(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) => {
@@ -2134,7 +2145,7 @@ class Gn {
     });
   }
 }
-class Cn {
+class jn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2145,7 +2156,7 @@ class Cn {
     return this.declarationNode.parent instanceof y ? [new l(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? we(e) ? [] : [new l(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? ke(e) ? [] : [new l(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new l(o.UNEXPECTED_ALIAS, "A Project shouldn't have an alias", e)] : [];
@@ -2156,9 +2167,9 @@ class Cn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       return [new l(o.UNEXPECTED_SIMPLE_BODY, "A Project's body must be a block", e)];
-    const [n, s] = _.partition(e.body, (i) => i instanceof w);
+    const [n, s] = _.partition(e.body, (i) => i instanceof v);
     return [
       ...n.map((i) => new l(o.INVALID_PROJECT_FIELD, "A Project can not have inline fields", i)),
       ...this.validateSubElements(s)
@@ -2173,7 +2184,7 @@ class Cn {
     });
   }
 }
-class Xn {
+class $n {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2181,10 +2192,10 @@ class Xn {
     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 K ? [] : [new l(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
+    return this.declarationNode.parent instanceof Z ? [] : [new l(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
   }
   validateName(e) {
-    return e ? we(e) ? [] : [new l(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? ke(e) ? [] : [new l(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
@@ -2195,9 +2206,9 @@ class Xn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       return this.validateFields([e]);
-    const [n, s] = _.partition(e.body, (i) => i instanceof w);
+    const [n, s] = _.partition(e.body, (i) => i instanceof v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -2205,13 +2216,13 @@ class Xn {
       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 && !Un(s.callee) && n.push(new l(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !Mn(s.callee) && n.push(new l(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
+      s.callee && !Fn(s.callee) && n.push(new l(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !Bn(s.callee) && n.push(new l(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
       const i = [...s.args];
-      if (_.last(i) instanceof R) {
+      if (_.last(i) instanceof U) {
         const a = this.validateFieldSettings(_.last(i));
         n.push(...a), i.pop();
       } else
-        i[0] instanceof R && (n.push(...this.validateFieldSettings(i[0])), i.shift());
+        i[0] instanceof U && (n.push(...this.validateFieldSettings(i[0])), i.shift());
       i.length > 0 && n.push(...i.map((a) => new l(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", a)));
     }), n;
   }
@@ -2223,12 +2234,12 @@ class Xn {
         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) => {
-            $n(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));
+            Wn(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":
           r.length > 1 && s.push(...r.map((c) => new l(o.DUPLICATE_REF_SETTING, "'color' can only appear once", c))), r.forEach((c) => {
-            ze(c.value) || s.push(new l(o.INVALID_REF_SETTING_VALUE, "'color' must be a color literal", c));
+            Qe(c.value) || s.push(new l(o.INVALID_REF_SETTING_VALUE, "'color' must be a color literal", c));
           });
           break;
         default:
@@ -2246,11 +2257,11 @@ class Xn {
     });
   }
 }
-function $n(t) {
-  if (!($(t) && t.expression.variable.kind !== h.QUOTED_STRING) && !(t instanceof ne))
+function Wn(t) {
+  if (!($(t) && t.expression.variable.kind !== h.QUOTED_STRING) && !(t instanceof te))
     return !1;
   let e;
-  if (t instanceof ne ? e = Ae(t).unwrap_or("") : e = t.expression.variable.value, e)
+  if (t instanceof te ? e = ve(t).unwrap_or("") : e = t.expression.variable.value, e)
     switch (e.toLowerCase()) {
       case "cascade":
       case "no action":
@@ -2263,7 +2274,7 @@ function $n(t) {
     }
   return !1;
 }
-class jn {
+class Yn {
   constructor(e, n, s) {
     this.declarationNode = e, this.symbolFactory = s, this.publicSymbolTable = n;
   }
@@ -2277,7 +2288,7 @@ class jn {
     return e ? e instanceof ue ? [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)] : Ft(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 ? Hn(e) ? [] : [new l(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
+    return e ? Zn(e) ? [] : [new l(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
   }
   validateSettingList(e) {
     const n = F(e), s = n.getErrors(), i = n.getValue();
@@ -2286,12 +2297,12 @@ class jn {
       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) => {
-            ze(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", c.value || c.name));
+            Qe(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));
+            G(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
           });
           break;
         default:
@@ -2302,14 +2313,14 @@ class jn {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(Rt, { declaration: this.declarationNode, symbolTable: new ve() });
+    this.declarationNode.symbol = this.symbolFactory.create(Ut, { declaration: this.declarationNode, symbolTable: new ye() });
     const { name: n, alias: s } = this.declarationNode, i = z(n);
     if (i.isOk()) {
-      const a = [...i.unwrap()], r = a.pop(), c = qe(a, this.publicSymbolTable, this.symbolFactory), f = Fe(r);
+      const a = [...i.unwrap()], r = a.pop(), c = ze(a, this.publicSymbolTable, this.symbolFactory), f = Be(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 && we(s) && !Yn(s.expression.variable.value, i.unwrap_or([]))) {
-      const a = X(s).unwrap(), r = Fe(a);
+    if (s && ke(s) && !zn(s.expression.variable.value, i.unwrap_or([]))) {
+      const a = X(s).unwrap(), r = Be(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;
@@ -2317,52 +2328,46 @@ class jn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       return [new l(o.UNEXPECTED_SIMPLE_BODY, "A Table's body must be a block", e)];
-    const [n, s] = _.partition(e.body, (r) => r instanceof w), [i, a] = _.partition(s, (r) => r instanceof ke);
+    const [n, s, i] = e.body.reduce((a, r) => (r instanceof v ? a[0].push(r) : r instanceof Le ? a[1].push(r) : r instanceof y && a[2].push(r), a), [[], [], []]);
     return [
       ...this.validateFields(n),
-      ...this.validateInjections(i),
-      ...this.validateSubElements(a)
-    ];
-  }
-  validateFields(e) {
-    const [n, s, i] = e.reduce((a, r) => (r.callee instanceof G ? a[0].push(r) : r.callee instanceof Z ? a[1].push(r) : a[2].push(new l(o.INVALID_TABLE_FIELD, "A Table field must be a column or a TablePartial injection", r)), a), [[], [], []]);
-    return [
-      ...i,
-      ...this.validateColumns(n),
-      ...this.validateInjections(s)
+      ...this.validateInjections(s),
+      ...this.validateSubElements(i)
     ];
   }
   validateInjections(e) {
     return e.flatMap((n) => this.registerInjection(n));
   }
   registerInjection(e) {
-    var n, s;
-    if (e.partial && ((n = e.partial.variable) != null && n.value)) {
-      const i = (s = e.partial.variable) == null ? void 0 : s.value, a = ln(i), r = this.symbolFactory.create(In, { declaration: e });
-      e.symbol = r;
-      const c = this.declarationNode.symbol.symbolTable, f = c.get(a);
-      if (f)
+    var n, s, i;
+    if ((s = (n = e.partial) == null ? void 0 : n.variable) != null && s.value) {
+      const a = (i = e.partial.variable) == null ? void 0 : i.value, r = Ot(a), c = this.symbolFactory.create(Tn, { declaration: e });
+      e.symbol = c;
+      const f = this.declarationNode.symbol.symbolTable, p = f.get(r);
+      if (p)
         return [
-          new l(o.DUPLICATE_TABLE_PARTIAL_INJECTION_NAME, `Duplicate injection ${i}`, e),
-          new l(o.DUPLICATE_TABLE_PARTIAL_INJECTION_NAME, `Duplicate injection ${i}`, f.declaration)
+          new l(o.DUPLICATE_TABLE_PARTIAL_INJECTION_NAME, `Duplicate injection ${a}`, e),
+          new l(o.DUPLICATE_TABLE_PARTIAL_INJECTION_NAME, `Duplicate injection ${a}`, p.declaration)
         ];
-      c.set(a, r);
+      f.set(r, c);
     }
     return [];
   }
-  validateColumns(e) {
+  validateFields(e) {
     return e.length === 0 ? [new l(o.EMPTY_TABLE, "A Table must have at least one column", this.declarationNode)] : e.flatMap((n) => {
+      if (!n.callee)
+        return [];
       const s = [];
-      n.args.length === 0 && s.push(new 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] && !Wn(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] && !qn(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.validateColumnSetting(i)), s.push(...this.registerColumn(n)), s;
+      return s.push(...this.validateFieldSetting(i)), s.push(...this.registerField(n)), s;
     });
   }
-  registerColumn(e) {
+  registerField(e) {
     if (e.callee && $(e.callee)) {
-      const n = X(e.callee).unwrap(), s = je(n), i = this.symbolFactory.create(Ut, { declaration: e });
+      const n = X(e.callee).unwrap(), s = We(n), i = this.symbolFactory.create(ot, { declaration: e });
       e.symbol = i;
       const a = this.declarationNode.symbol.symbolTable;
       if (a.has(s)) {
@@ -2377,13 +2382,13 @@ class jn {
     return [];
   }
   // This is needed to support legacy inline settings
-  validateColumnSetting(e) {
-    if (!e.slice(0, -1).every(he) || !e.slice(-1).every((f) => he(f) || f instanceof R))
+  validateFieldSetting(e) {
+    if (!e.slice(0, -1).every(he) || !e.slice(-1).every((f) => he(f) || f instanceof U))
       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;
-    _.last(e) instanceof R && (n = e.pop());
+    _.last(e) instanceof U && (n = e.pop());
     const s = F(n), i = s.getErrors(), a = s.getValue();
     for (const f of e) {
       const p = X(f).unwrap_or("").toLowerCase();
@@ -2400,7 +2405,7 @@ class jn {
       switch (f) {
         case "note":
           p.length > 1 && i.push(...p.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", u))), p.forEach((u) => {
-            C(u.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", u.value || u.name));
+            G(u.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", u.value || u.name));
           });
           break;
         case "ref":
@@ -2415,7 +2420,7 @@ class jn {
           break;
         case "pk":
           p.length > 1 && i.push(...p.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, "'pk' can only appear once", u))), p.forEach((u) => {
-            u instanceof se && !H(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", u.value || u.name));
+            u instanceof ne && !H(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", u.value || u.name));
           });
           break;
         case "not null":
@@ -2432,12 +2437,12 @@ class jn {
           break;
         case "unique":
           p.length > 1 && i.push(...p.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, "'unique' can only appear once", u))), p.forEach((u) => {
-            u instanceof se && !H(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", u.value || u.name));
+            u instanceof ne && !H(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", u.value || u.name));
           });
           break;
         case "increment":
           p.length > 1 && i.push(...p.map((u) => new l(o.DUPLICATE_COLUMN_SETTING, "'increment' can only appear once", u))), p.forEach((u) => {
-            u instanceof se && !H(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", u.value || u.name));
+            u instanceof ne && !H(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", u.value || u.name));
           });
           break;
         case "default":
@@ -2453,39 +2458,37 @@ class jn {
   }
   validateSubElements(e) {
     const n = e.flatMap((i) => {
-      if (!i)
-        return [];
       if (i.parent = this.declarationNode, !i.type)
         return [];
       const a = pe(i);
       return new a(i, this.publicSymbolTable, this.symbolFactory).validate();
     }), s = e.filter((i) => {
       var a;
-      return ((a = i == null ? void 0 : i.type) == null ? void 0 : a.value.toLowerCase()) === "note";
+      return ((a = i.type) == null ? void 0 : a.value.toLowerCase()) === "note";
     });
     return s.length > 1 && n.push(...s.map((i) => new l(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n;
   }
 }
-function Wn(t) {
-  if (!(t instanceof Y || Ye(t) || t instanceof G || t instanceof ue))
+function qn(t) {
+  if (!(t instanceof Y || qe(t) || t instanceof j || t instanceof ue))
     return !1;
   if (t instanceof Y) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ee(n) || C(n) || he(n)))
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => K(n) || G(n) || he(n)))
       return !1;
     t = t.callee;
   }
   for (; t instanceof ue; ) {
-    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && ee(n.name)))
+    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && K(n.name)))
       return !1;
     t = t.array;
   }
   const e = z(t).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
-function Yn(t, e) {
+function zn(t, e) {
   return e.length === 1 && t === e[0];
 }
-class qn {
+class Qn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2507,7 +2510,7 @@ class qn {
     )] : [];
   }
   validateName(e) {
-    return e ? we(e) ? [] : [new l(
+    return e ? ke(e) ? [] : [new l(
       o.INVALID_NAME,
       "A TableGroup name must be a single identifier",
       e
@@ -2526,10 +2529,10 @@ class qn {
   }
   registerElement() {
     const { name: e } = this.declarationNode;
-    this.declarationNode.symbol = this.symbolFactory.create(mn, { declaration: this.declarationNode, symbolTable: new ve() });
+    this.declarationNode.symbol = this.symbolFactory.create(En, { declaration: this.declarationNode, symbolTable: new ye() });
     const n = z(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 = ze(s, this.publicSymbolTable, this.symbolFactory), r = it(i);
       if (a.has(r))
         return [new l(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists`, e)];
       a.set(r, this.declarationNode.symbol);
@@ -2546,7 +2549,7 @@ class qn {
             "'color' can only appear once",
             c
           ))), a.forEach((c) => {
-            ze(c.value) || s.push(new l(
+            Qe(c.value) || s.push(new l(
               o.INVALID_TABLE_SETTING,
               "'color' must be a color literal",
               c.value || c.name
@@ -2558,7 +2561,7 @@ class qn {
             o.DUPLICATE_TABLE_SETTING,
             "'note' can only appear once",
             c
-          ))), a.filter((c) => !C(c.value)).forEach((c) => {
+          ))), a.filter((c) => !G(c.value)).forEach((c) => {
             s.push(new l(
               o.INVALID_TABLE_SETTING,
               "'note' must be a string literal",
@@ -2579,13 +2582,13 @@ class qn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       return [new l(
         o.UNEXPECTED_SIMPLE_BODY,
         "A TableGroup's body must be a block",
         e
       )];
-    const [n, s] = _.partition(e.body, (i) => i instanceof w);
+    const [n, s] = _.partition(e.body, (i) => i instanceof v);
     return [
       ...this.validateFields(n),
       ...this.validateSubElements(s)
@@ -2611,7 +2614,7 @@ class qn {
   }
   registerField(e) {
     if (e.callee && $(e.callee)) {
-      const n = X(e.callee).unwrap(), s = rt(n), i = this.symbolFactory.create(Tn, { declaration: e });
+      const n = X(e.callee).unwrap(), s = at(n), i = this.symbolFactory.create(Nn, { declaration: e });
       e.symbol = i;
       const a = this.declarationNode.symbol.symbolTable;
       if (a.has(s)) {
@@ -2626,24 +2629,24 @@ class qn {
     return [];
   }
 }
-const ot = ["-", "+"];
-function zn(t) {
-  if (!(t instanceof Y || Ye(t) || t instanceof G || t instanceof ue))
+const lt = ["-", "+"];
+function Hn(t) {
+  if (!(t instanceof Y || qe(t) || t instanceof j || t instanceof ue))
     return !1;
   if (t instanceof Y) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ee(n) || C(n) || he(n)))
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => K(n) || G(n) || he(n)))
       return !1;
     t = t.callee;
   }
   for (; t instanceof ue; ) {
-    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && ee(n.name)))
+    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && K(n.name)))
       return !1;
     t = t.array;
   }
   const e = z(t).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
-class Qn {
+class Jn {
   constructor(e, n, s) {
     this.declarationNode = e, this.symbolFactory = s, this.publicSymbolTable = n;
   }
@@ -2665,7 +2668,7 @@ class Qn {
     )] : [];
   }
   validateName(e) {
-    return e ? we(e) ? [] : [new l(
+    return e ? ke(e) ? [] : [new l(
       o.INVALID_NAME,
       "A TablePartial name must be an identifier or a quoted identifer",
       e
@@ -2684,16 +2687,16 @@ class Qn {
   }
   validateSettingList(e) {
     const n = F(e), s = n.getErrors(), i = n.getValue();
-    return ft(i, (a, r) => {
+    return pt(i, (a, r) => {
       switch (r) {
         case "headercolor":
           a.length > 1 && s.push(...a.map((c) => new l(o.DUPLICATE_TABLE_PARTIAL_SETTING, "'headercolor' can only appear once", c))), a.forEach((c) => {
-            ze(c.value) || s.push(new l(o.INVALID_TABLE_PARTIAL_SETTING, "'headercolor' must be a color literal", c.value || c.name));
+            Qe(c.value) || s.push(new l(o.INVALID_TABLE_PARTIAL_SETTING, "'headercolor' must be a color literal", c.value || c.name));
           });
           break;
         case "note":
           a.length > 1 && s.push(...a.map((c) => new l(o.DUPLICATE_TABLE_PARTIAL_SETTING, "'note' can only appear once", c))), a.forEach((c) => {
-            C(c.value) || s.push(new l(o.INVALID_TABLE_PARTIAL_SETTING, "'note' must be a string literal", c.value || c.name));
+            G(c.value) || s.push(new l(o.INVALID_TABLE_PARTIAL_SETTING, "'note' must be a string literal", c.value || c.name));
           });
           break;
         default:
@@ -2703,10 +2706,10 @@ class Qn {
   }
   registerElement() {
     const { name: e } = this.declarationNode;
-    this.declarationNode.symbol = this.symbolFactory.create(bn, { declaration: this.declarationNode, symbolTable: new ve() });
+    this.declarationNode.symbol = this.symbolFactory.create(mn, { declaration: this.declarationNode, symbolTable: new ye() });
     const n = z(e);
     if (n.isOk()) {
-      const s = n.unwrap(), i = s.pop(), a = qe(s, this.publicSymbolTable, this.symbolFactory), r = Dt(i);
+      const s = n.unwrap(), i = s.pop(), a = ze(s, this.publicSymbolTable, this.symbolFactory), r = rt(i);
       if (a.has(r))
         return [new l(o.DUPLICATE_NAME, `TablePartial name '${i}' already exists`, e)];
       a.set(r, this.declarationNode.symbol);
@@ -2716,9 +2719,9 @@ class Qn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof w)
+    if (e instanceof v)
       return [new l(o.UNEXPECTED_SIMPLE_BODY, "A TablePartial's body must be a block", e)];
-    const [n, s] = _.partition(e.body, (i) => i instanceof w);
+    const [n, s] = _.partition(e.body, (i) => i instanceof v);
     return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
@@ -2726,14 +2729,14 @@ class Qn {
       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)), $(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] && !zn(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] && !Hn(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 && $(e.callee)) {
-      const n = X(e.callee).unwrap(), s = je(n), i = this.symbolFactory.create(Ut, { declaration: e });
+      const n = X(e.callee).unwrap(), s = We(n), i = this.symbolFactory.create(ot, { declaration: e });
       e.symbol = i;
       const a = this.declarationNode.symbol.symbolTable;
       if (a.has(s)) {
@@ -2749,12 +2752,12 @@ class Qn {
   }
   // This is needed to support legacy inline settings
   validateFieldSetting(e) {
-    if (!e.slice(0, -1).every(he) || !e.slice(-1).every((f) => he(f) || f instanceof R))
+    if (!e.slice(0, -1).every(he) || !e.slice(-1).every((f) => he(f) || f instanceof U))
       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;
-    _.last(e) instanceof R && (n = e.pop());
+    _.last(e) instanceof U && (n = e.pop());
     const s = F(n), i = s.getErrors(), a = s.getValue();
     e.forEach((f) => {
       const p = X(f).unwrap_or("").toLowerCase();
@@ -2769,11 +2772,11 @@ class Qn {
       o.DUPLICATE_COLUMN_SETTING,
       "Either one of 'primary key' and 'pk' can appear",
       f
-    ))), ft(a, (f, p) => {
+    ))), pt(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));
+            G(u.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", u.value || u.name));
           });
           break;
         case "ref":
@@ -2788,7 +2791,7 @@ class Qn {
           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 && !H(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", u.value || u.name));
+            u instanceof ne && !H(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'pk' must not have a value", u.value || u.name));
           });
           break;
         case "not null":
@@ -2809,12 +2812,12 @@ class Qn {
           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 && !H(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", u.value || u.name));
+            u instanceof ne && !H(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'unique' must not have a value", u.value || u.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 && !H(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", u.value || u.name));
+            u instanceof ne && !H(u.value) && i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'increment' must not have a value", u.value || u.name));
           });
           break;
         case "default":
@@ -2847,47 +2850,47 @@ class Qn {
 function pe(t) {
   switch (t.type.value.toLowerCase()) {
     case I.Enum:
-      return Bn;
+      return Gn;
     case I.Table:
-      return jn;
+      return Yn;
     case I.TableGroup:
-      return qn;
+      return Qn;
     case I.Project:
-      return Cn;
+      return jn;
     case I.Ref:
-      return Xn;
+      return $n;
     case I.Note:
-      return Gn;
+      return Xn;
     case I.Indexes:
-      return Vn;
+      return Cn;
     case I.TablePartial:
-      return Qn;
+      return Jn;
     default:
-      return Fn;
+      return Vn;
   }
 }
 function Ft(t) {
   return !!z(t).unwrap_or(!1);
 }
-function Hn(t) {
-  return we(t);
+function Zn(t) {
+  return ke(t);
 }
-function we(t) {
-  return t instanceof G && t.expression instanceof ae;
+function ke(t) {
+  return t instanceof j && t.expression instanceof ae;
 }
-function qe(t, e, n) {
+function ze(t, e, n) {
   var i;
   t[0] === "public" && (t = t.slice(1));
   let s = e;
   for (const a of t) {
     let r;
-    const c = nt(a);
+    const c = tt(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 ve();
-      const f = n.create(Ot, { symbolTable: r });
+      r = new ye();
+      const f = n.create(Rt, { symbolTable: r });
       s.set(c, f);
     }
     s = r;
@@ -2897,15 +2900,15 @@ function qe(t, e, n) {
 function Bt(t) {
   return t === "-" || t === "<>" || t === ">" || t === "<";
 }
-function ze(t) {
+function Qe(t) {
   var n;
-  if (!(t instanceof G) || !(t.expression instanceof ge) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== h.COLOR_LITERAL)
+  if (!(t instanceof j) || !(t.expression instanceof we) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== h.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 (!pn(e[s]))
+    if (!An(e[s]))
       return !1;
   return !0;
 }
@@ -2914,15 +2917,15 @@ function H(t) {
 }
 function Vt(t) {
   var e;
-  return !!(C(t) || ee(t) || he(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Z && ot.includes((e = t.op) == null ? void 0 : e.value) && ee(t.expression) || t instanceof ce);
+  return !!(G(t) || K(t) || he(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof ie && lt.includes((e = t.op) == null ? void 0 : e.value) && K(t.expression) || t instanceof ce);
 }
-function ee(t) {
+function K(t) {
   var e;
-  return t instanceof G && t.expression instanceof ge && ((e = t.expression.literal) == null ? void 0 : e.kind) === h.NUMERIC_LITERAL;
+  return t instanceof j && t.expression instanceof we && ((e = t.expression.literal) == null ? void 0 : e.kind) === h.NUMERIC_LITERAL;
 }
 function Gt(t) {
   var n;
-  if (!(t instanceof Z) || !Bt((n = t.op) == null ? void 0 : n.value))
+  if (!(t instanceof ie) || !Bt((n = t.op) == null ? void 0 : n.value))
     return !1;
   const e = z(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
@@ -2938,19 +2941,19 @@ function F(t) {
   for (const i of t.elementList) {
     if (!i.name)
       continue;
-    if (i.name instanceof G) {
+    if (i.name instanceof j) {
       n.push(new l(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
       continue;
     }
-    const a = (s = Ae(i.name).unwrap_or(void 0)) == null ? void 0 : s.toLowerCase();
+    const a = (s = ve(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 q(e, n);
 }
-class Lt {
+class At {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(Ot, {
-      symbolTable: new ve()
+    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(Rt, {
+      symbolTable: new ye()
     }), this.ast.symbol = this.publicSchemaSymbol, this.ast.symbol.declaration = this.ast;
   }
   validate() {
@@ -2965,7 +2968,7 @@ class Lt {
       );
       e.push(...a.validate());
     });
-    const n = this.ast.body.filter((s) => Pe(s).unwrap_or(void 0) === I.Project);
+    const n = this.ast.body.filter((s) => Ae(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 q(this.ast, e);
   }
 }
@@ -2977,56 +2980,52 @@ class de {
     this.bindSettingList(this.declarationNode.attributeList, this.settingList), this.bindBody();
   }
   bindSettingList(e, n) {
-    if (e)
-      for (const s of e.elementList) {
-        if (s.name instanceof G)
-          continue;
-        const i = Ae(s.name).unwrap_or(void 0);
-        if (!i)
-          continue;
-        const a = n[i.toLowerCase()];
-        a != null && a.shouldBind && this.scanAndBind(s.value, a);
-      }
+    e && e.elementList.forEach((s) => {
+      if (s.name instanceof j)
+        return;
+      const i = ve(s.name).unwrap_or(void 0);
+      if (!i)
+        return;
+      const a = n[i.toLowerCase()];
+      a != null && a.shouldBind && this.scanAndBind(s.value, a);
+    });
   }
   bindBody() {
-    var s, i;
     const e = this.declarationNode;
     if (!e.body)
       return;
     const { body: n } = e;
-    if (n instanceof re)
-      for (const a of n.body)
-        if (a instanceof y) {
-          if (((s = this.declarationNode.type) == null ? void 0 : s.value.toLowerCase()) === I.TablePartial && ((i = a.type) == null ? void 0 : i.value.toLowerCase()) === I.Indexes || !a.type)
-            continue;
-          const r = et(a);
-          new r(a, this.errors).bind();
-        } else
-          a instanceof w ? this.bindSubfield(a) : this.bindPartialInjection(a);
-    else
-      this.bindSubfield(n);
+    n instanceof re ? n.body.forEach((s) => {
+      if (s instanceof y) {
+        if (!s.type || Ae(this.declarationNode).unwrap_or(null) === I.TablePartial && Ae(s).unwrap_or(null) === I.Indexes)
+          return;
+        const i = Xt(s);
+        new i(s, this.errors).bind();
+      } else
+        s instanceof v ? this.bindSubfield(s) : this.bindPartialInjection(s);
+    }) : this.bindSubfield(n);
   }
   bindSubfield(e) {
     const n = [e.callee, ...e.args], s = _.last(n);
-    s instanceof R && (n.pop(), this.bindSettingList(s, this.subfield.settingList));
+    s instanceof U && (n.pop(), this.bindSettingList(s, this.subfield.settingList));
     const { argBinderRules: i } = this.subfield.arg;
     for (let a = 0; a < Math.min(n.length, i.length); a += 1)
       i[a].shouldBind && this.scanAndBind(n[a], i[a]);
   }
   bindPartialInjection(e) {
     var n;
-    (n = this.subfield.injection) != null && n.injectionBinderRule.shouldBind && this.scanAndBind(e, this.subfield.injection.injectionBinderRule);
+    (n = this.injectionBinderRule) != null && n.shouldBind && this.scanAndBind(e, this.injectionBinderRule);
   }
   // Scan for variable node and member access expression in the node to bind
   scanAndBind(e, n) {
     var s, i;
     if (e)
-      if (e instanceof G) {
+      if (e instanceof j) {
         if (e.expression instanceof ae && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
           return;
         this.bindFragments([e], n);
       } else
-        e instanceof le ? Ye(e) ? this.bindFragments(Ie(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof Z ? this.scanAndBind(e.expression, n) : e instanceof $e ? this.scanAndBind(e.expression, n) : e instanceof fe ? e.elementList.forEach((a) => this.scanAndBind(a, n)) : e instanceof ke && this.bindFragments([e], n);
+        e instanceof le ? qe(e) ? this.bindFragments(_e(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof ie ? this.scanAndBind(e.expression, n) : e instanceof $e ? this.scanAndBind(e.expression, n) : e instanceof fe ? e.elementList.forEach((a) => this.scanAndBind(a, n)) : e instanceof Le && this.bindFragments([e], n);
   }
   // Bind the fragments of a member access expression
   // which can be a simple expression like v1.User,
@@ -3034,7 +3033,7 @@ class de {
   bindFragments(e, n) {
     if (e.length === 0)
       return;
-    const s = e[0] instanceof ke, i = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: a } = n, r = s ? -1 : e.findIndex((E) => !$(E)), f = r !== -1 && Ct(e[r]) ? e[r] : void 0, p = r >= 0 ? i.pop() : void 0, d = e.slice(
+    const s = e.length === 1 && e[0] instanceof Le, i = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: a } = n, r = s ? -1 : e.findIndex((E) => !$(E)), f = r !== -1 && Ct(e[r]) ? e[r] : void 0, p = r >= 0 ? i.pop() : void 0, d = e.slice(
       0,
       r === -1 ? void 0 : r
     );
@@ -3044,39 +3043,37 @@ class de {
     for (; i.length && d.length; ) {
       const E = i.pop(), b = d.pop(), g = X(b).unwrap();
       u.unshift({
-        index: Ue(g, E),
+        index: Me(g, E),
         referrer: b
       });
     }
     for (; d.length; ) {
-      const E = d.pop(), b = s ? E.partial.variable.value : X(E).unwrap();
+      const E = d.pop(), b = s ? Mn(E).unwrap() : X(E).unwrap();
       u.unshift({
-        index: Ue(b, a),
+        index: Me(b, a),
         referrer: E
       });
     }
-    return f ? f.elementList.forEach(
-      (E) => this.resolveIndexStack(
-        [
-          ...u,
-          {
-            index: Ue(
-              X(E).unwrap(),
-              p
-            ),
-            referrer: E
-          }
-        ],
-        n.ignoreNameNotFound
-      )
-    ) : this.resolveIndexStack(u, n.ignoreNameNotFound);
+    return f ? f.elementList.forEach((E) => this.resolveIndexStack(
+      [
+        ...u,
+        {
+          index: Me(
+            X(E).unwrap(),
+            p
+          ),
+          referrer: E
+        }
+      ],
+      n.ignoreNameNotFound
+    )) : this.resolveIndexStack(u, 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 = It(s.index, this.declarationNode);
+    const [s, ...i] = e, a = Lt(s.index, this.declarationNode);
     if (a === void 0) {
       const { kind: p, name: d } = oe(s.index).unwrap();
       this.logError(s.referrer, `Can not find ${p} '${d}'`, n);
@@ -3109,20 +3106,23 @@ class de {
       return;
     const s = /* @__PURE__ */ new Map();
     n.forEach((a, r) => {
-      var c, f, p;
-      if (un(r)) {
-        const d = It(hn(r), this.declarationNode);
-        (p = (f = (c = d == null ? void 0 : d.declaration) == null ? void 0 : c.symbol) == null ? void 0 : f.symbolTable) == null || p.forEach((u, E) => {
-          n.has(E) || s.set(E, u);
-        });
-      }
+      var p, d;
+      if (!un(r))
+        return;
+      const c = Lt(hn(r), this.declarationNode), f = (d = (p = c == null ? void 0 : c.declaration) == null ? void 0 : p.symbol) == null ? void 0 : d.symbolTable;
+      f && f.forEach((u, E) => {
+        n.has(E) || s.set(E, { injectorFieldSymbol: u, injectorDeclaration: a.declaration });
+      });
     }), s.forEach((a, r) => {
-      const c = e.create(Ln, { injectorId: a.id });
-      n.set(r, c);
+      const c = Ln(a.injectorFieldSymbol);
+      if (!c)
+        return;
+      const f = e.create(c, a);
+      n.set(r, f);
     });
   }
 }
-class Jn extends de {
+class Kn extends de {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3132,7 +3132,7 @@ class Jn extends de {
     }, this.settingList = {};
   }
 }
-class Kn extends de {
+class es extends de {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3142,7 +3142,7 @@ class Kn extends de {
     }, this.settingList = {};
   }
 }
-class Zn extends de {
+class ts extends de {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3177,7 +3177,7 @@ class Zn extends de {
     }, this.settingList = {};
   }
 }
-class es extends de {
+class ns extends de {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3187,7 +3187,7 @@ class es extends de {
     }, this.settingList = {};
   }
 }
-class ts extends de {
+class ss extends de {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3197,7 +3197,7 @@ class ts extends de {
     }, this.settingList = {};
   }
 }
-class ns extends de {
+class is extends de {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3214,7 +3214,7 @@ class ns extends de {
     }, this.settingList = {};
   }
 }
-class ss extends de {
+class as extends de {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3228,14 +3228,6 @@ class ss extends de {
           }
         ]
       },
-      injection: {
-        injectionBinderRule: {
-          shouldBind: !0,
-          topSubnamesSymbolKind: [],
-          remainingSubnamesSymbolKind: m.TablePartial,
-          ignoreNameNotFound: !1
-        }
-      },
       settingList: {
         ref: {
           shouldBind: !0,
@@ -3247,10 +3239,15 @@ class ss extends de {
           shouldBind: !1
         }
       }
-    }, this.settingList = {};
+    }, this.settingList = {}, this.injectionBinderRule = {
+      shouldBind: !0,
+      topSubnamesSymbolKind: [],
+      remainingSubnamesSymbolKind: m.TablePartial,
+      ignoreNameNotFound: !1
+    };
   }
 }
-class is extends de {
+class rs extends de {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3267,7 +3264,7 @@ class is extends de {
     }, this.settingList = {};
   }
 }
-class as extends de {
+class os extends de {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -3295,48 +3292,42 @@ class as extends de {
     }, this.settingList = {};
   }
 }
-function et(t) {
+function Xt(t) {
   switch (t.type.value.toLowerCase()) {
     case I.Enum:
-      return Kn;
+      return es;
     case I.Table:
-      return ss;
+      return as;
     case I.TableGroup:
-      return is;
+      return rs;
     case I.Project:
-      return ts;
+      return ss;
     case I.Ref:
-      return ns;
+      return is;
     case I.Note:
-      return es;
+      return ns;
     case I.Indexes:
-      return Zn;
+      return ts;
     case I.TablePartial:
-      return as;
+      return os;
     default:
-      return Jn;
+      return Kn;
   }
 }
-class rs {
+class ls {
   constructor(e) {
     this.ast = e, this.errors = [];
   }
   resolve(e) {
-    this.ast.body.forEach((n) => {
-      if (n.type) {
-        const s = et(n);
-        new s(n, this.errors).resolveInjections(e);
-      }
-    });
-    for (const n of this.ast.body)
-      if (n.type) {
-        const s = et(n);
-        new s(n, this.errors).bind();
-      }
-    return new q(this.ast, this.errors);
+    return this.ast.body.map((n) => {
+      if (!n.type)
+        return null;
+      const s = Xt(n), i = new s(n, this.errors);
+      return i.resolveInjections(e), i;
+    }).forEach((n) => n == null ? void 0 : n.bind()), new q(this.ast, this.errors);
   }
 }
-class os {
+class cs {
   constructor(e) {
     this.generator = e;
   }
@@ -3344,21 +3335,21 @@ class os {
     return new e(n, this.generator.nextId());
   }
 }
-class ls {
+class us {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = new os(n);
+    this.ast = e, this.symbolFactory = new cs(n);
   }
   // Analyzing: Invoking both the validator and binder
   analyze() {
-    return new Lt(this.ast, this.symbolFactory).validate().chain((n) => new rs(n).resolve(this.symbolFactory));
+    return new At(this.ast, this.symbolFactory).validate().chain((n) => new ls(n).resolve(this.symbolFactory));
   }
   // For invoking the validator only
   validate() {
-    return new Lt(this.ast, this.symbolFactory).validate().chain((n) => new q(n, []));
+    return new At(this.ast, this.symbolFactory).validate().chain((n) => new q(n, []));
   }
 }
 function _t(t, e) {
-  const { variables: n, tupleElements: s } = Se(t).unwrap();
+  const { variables: n, tupleElements: s } = Pe(t).unwrap();
   return s ? n.length === 0 ? {
     schemaName: e.schemaName,
     tableName: e.name,
@@ -3377,7 +3368,7 @@ function _t(t, e) {
     schemaName: n.pop() || null
   };
 }
-function Xt(t) {
+function jt(t) {
   switch (t) {
     case "<":
       return ["1", "*"];
@@ -3400,9 +3391,9 @@ function L(t) {
     end: { offset: t.endPos.offset, line: t.endPos.line + 1, column: t.endPos.column + 1 }
   };
 }
-function Ge(t) {
+function Ce(t) {
   var n;
-  const e = (n = Ie(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
+  const e = (n = _e(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
   return e instanceof fe ? e.elementList.map((s) => s.referee) : [e.referee];
 }
 function Te(t) {
@@ -3423,7 +3414,7 @@ function $t(t, e) {
   const n = t.id.toString(), s = e.id.toString();
   return n < s ? `${n}-${s}` : `${s}-${n}`;
 }
-function lt(t, e) {
+function ct(t, e) {
   if (Array.isArray(t)) {
     const i = t.map(({ id: r }) => r).sort(), a = e.map(({ id: r }) => r).sort();
     return _.zip(i, a).every(([r, c]) => r === c);
@@ -3431,13 +3422,13 @@ function lt(t, e) {
   const n = t.id, s = e.id;
   return n === s;
 }
-function ie(t) {
+function se(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 jt {
+class Wt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.table = { name: void 0, schemaName: void 0, alias: null, fields: [], token: void 0, indexes: [], partials: [] }, this.pkColumns = [];
   }
@@ -3483,12 +3474,12 @@ class jt {
     this.table.headerColor = (i = n.headercolor) != null && i.length ? De((r = (a = n.headercolor) == null ? void 0 : a.at(0)) == null ? void 0 : r.value) : void 0;
     const [s] = n.note || [];
     return this.table.note = s && {
-      value: U(s == null ? void 0 : s.value).map(ie).unwrap(),
+      value: M(s == null ? void 0 : s.value).map(se).unwrap(),
       token: L(s)
     }, [];
   }
   interpretBody(e) {
-    const [n, s] = _.partition(e.body, (i) => i instanceof w || i instanceof ke);
+    const [n, s] = _.partition(e.body, (i) => i instanceof v || i instanceof Le);
     return [
       ...this.interpretFields(n),
       ...this.interpretSubElements(s)
@@ -3500,7 +3491,7 @@ class jt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: U(n.body instanceof re ? n.body.body[0].callee : n.body.callee).map(ie).unwrap(),
+            value: M(n.body instanceof re ? n.body.body[0].callee : n.body.callee).map(se).unwrap(),
             token: L(n)
           }, [];
         case "indexes":
@@ -3514,70 +3505,70 @@ class jt {
     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));
+    return e.flatMap((n, s) => n instanceof v ? this.interpretColumn(n) : this.interpretInjection(n, s));
   }
   interpretColumn(e) {
     var r, c, f, p, d, u, E, b, g;
     const n = [], s = {};
     s.name = X(e.callee).unwrap();
-    const i = cs(e.args[0]);
+    const i = hs(e.args[0]);
     s.type = i.getValue(), n.push(...i.getErrors()), s.token = L(e), s.inline_refs = [];
     const a = e.args.slice(1);
-    if (_.last(a) instanceof R) {
+    if (_.last(a) instanceof U) {
       const A = F(a.pop()).getValue();
-      s.pk = !!((r = A.pk) != null && r.length) || !!((c = A["primary key"]) != null && c.length), s.increment = !!((f = A.increment) != null && f.length), s.unique = !!((p = A.unique) != null && p.length), s.not_null = (d = A["not null"]) != null && d.length ? !0 : (u = A.null) != null && u.length ? !1 : void 0, s.dbdefault = us((b = (E = A.default) == null ? void 0 : E.at(0)) == null ? void 0 : b.value);
+      s.pk = !!((r = A.pk) != null && r.length) || !!((c = A["primary key"]) != null && c.length), s.increment = !!((f = A.increment) != null && f.length), s.unique = !!((p = A.unique) != null && p.length), s.not_null = (d = A["not null"]) != null && d.length ? !0 : (u = A.null) != null && u.length ? !1 : void 0, s.dbdefault = fs((b = (E = A.default) == null ? void 0 : E.at(0)) == null ? void 0 : b.value);
       const k = (g = A.note) == null ? void 0 : g.at(0);
       s.note = k && {
-        value: U(k.value).map(ie).unwrap(),
+        value: M(k.value).map(se).unwrap(),
         token: L(k)
       };
       const be = A.ref || [];
-      s.inline_refs = be.flatMap((S) => {
-        const [Oe] = Ge(S.value.expression);
-        if (lt(Oe, e.symbol))
-          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", S)), [];
-        const Ee = S.value.op, V = z(S.value.expression).unwrap();
-        let te;
-        if (V.length === 1) {
-          const [Q] = V;
-          te = {
+      s.inline_refs = be.flatMap((P) => {
+        const [Re] = Ce(P.value.expression);
+        if (ct(Re, e.symbol))
+          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", P)), [];
+        const Ee = P.value.op, B = z(P.value.expression).unwrap();
+        let ee;
+        if (B.length === 1) {
+          const [Q] = B;
+          ee = {
             schemaName: this.table.schemaName,
             tableName: this.table.name,
             fieldNames: [Q],
             relation: Ee.value,
-            token: L(S)
+            token: L(P)
           };
-        } else if (V.length === 2) {
-          const [Q, me] = V;
-          te = {
+        } else if (B.length === 2) {
+          const [Q, me] = B;
+          ee = {
             schemaName: null,
             tableName: Q,
             fieldNames: [me],
             relation: Ee.value,
-            token: L(S)
+            token: L(P)
           };
-        } else if (V.length === 3) {
-          const [Q, me, ht] = V;
-          te = {
+        } else if (B.length === 3) {
+          const [Q, me, ft] = B;
+          ee = {
             schemaName: Q,
             tableName: me,
-            fieldNames: [ht],
+            fieldNames: [ft],
             relation: Ee.value,
-            token: L(S)
+            token: L(P)
           };
         } else {
-          n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", S));
-          const Q = V.pop(), me = V.pop();
-          te = {
-            schemaName: V.join("."),
+          n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", P));
+          const Q = B.pop(), me = B.pop();
+          ee = {
+            schemaName: B.join("."),
             tableName: me,
             fieldNames: [Q],
             relation: Ee.value,
-            token: L(S)
+            token: L(P)
           };
         }
-        const Ne = this.registerInlineRefToEnv(e, Oe, te, S);
-        return n.push(...Ne), Ne.length === 0 ? te : [];
+        const Ne = this.registerInlineRefToEnv(e, Re, ee, P);
+        return n.push(...Ne), Ne.length === 0 ? ee : [];
       });
     }
     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;
@@ -3588,12 +3579,12 @@ class jt {
       const s = { columns: [] }, i = n;
       s.token = L(i);
       const a = [i.callee, ...i.args];
-      if (_.last(a) instanceof R) {
+      if (_.last(a) instanceof U) {
         const b = F(a.pop()).getValue();
-        s.pk = !!((r = b.pk) != null && r.length), s.unique = !!((c = b.unique) != null && c.length), s.name = U((p = (f = b.name) == null ? void 0 : f.at(0)) == null ? void 0 : p.value).unwrap_or(void 0);
+        s.pk = !!((r = b.pk) != null && r.length), s.unique = !!((c = b.unique) != null && c.length), s.name = M((p = (f = b.name) == null ? void 0 : f.at(0)) == null ? void 0 : p.value).unwrap_or(void 0);
         const g = (d = b.note) == null ? void 0 : d.at(0);
         s.note = g && {
-          value: U(g.value).unwrap(),
+          value: M(g.value).unwrap(),
           token: L(g)
         }, s.type = W((E = (u = b.type) == null ? void 0 : u.at(0)) == null ? void 0 : E.value).unwrap_or(void 0);
       }
@@ -3605,7 +3596,7 @@ class jt {
           g.push(b.argumentList), b = b.callee;
         return g.push(b), g;
       }).forEach((b) => {
-        const { functional: g, nonFunctional: A } = Ve(b).unwrap();
+        const { functional: g, nonFunctional: A } = Ge(b).unwrap();
         s.columns.push(
           ...g.map((k) => ({
             value: k.value.value,
@@ -3628,7 +3619,7 @@ class jt {
         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 = Xt(s.relation);
+    const r = jt(s.relation);
     return this.env.refIds[a] = i, this.env.ref.set(i, {
       name: null,
       schemaName: null,
@@ -3649,9 +3640,9 @@ class jt {
     }), [];
   }
 }
-function cs(t) {
+function hs(t) {
   let e = null;
-  t instanceof Y && (e = t.argumentList.elementList.map((a) => ee(a) ? a.expression.literal.value : C(a) ? U(a).unwrap() : W(a).unwrap()).join(","), t = t.callee);
+  t instanceof Y && (e = t.argumentList.elementList.map((a) => K(a) ? a.expression.literal.value : G(a) ? M(a).unwrap() : W(a).unwrap()).join(","), t = t.callee);
   let n = "";
   for (; t instanceof ue; )
     n = `[${t.indexer.elementList.map((a) => a.name.expression.literal.value).join(",")}]${n}`, t = t.array;
@@ -3669,15 +3660,15 @@ function cs(t) {
     args: e
   });
 }
-function us(t) {
+function fs(t) {
   var e, n, s;
   if (t) {
-    if (C(t))
+    if (G(t))
       return {
-        value: U(t).unwrap(),
+        value: M(t).unwrap(),
         type: "string"
       };
-    if (ee(t))
+    if (K(t))
       return {
         type: "number",
         value: Number.parseFloat(t.expression.literal.value)
@@ -3687,7 +3678,7 @@ function us(t) {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
       };
-    if (t instanceof Z && ot.includes((e = t.op) == null ? void 0 : e.value) && ee(t.expression)) {
+    if (t instanceof ie && lt.includes((e = t.op) == null ? void 0 : e.value) && K(t.expression)) {
       const i = Number.parseFloat(t.expression.expression.literal.value);
       return {
         value: ((n = t.op) == null ? void 0 : n.value) === "-" ? 0 - i : i,
@@ -3702,7 +3693,7 @@ function us(t) {
     throw new Error("Unreachable");
   }
 }
-class hs {
+class ps {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.note = { name: void 0, content: void 0, token: void 0 };
   }
@@ -3723,17 +3714,17 @@ class hs {
     return this.note.headerColor = (s = n.headercolor) != null && s.length ? De((a = (i = n.headercolor) == null ? void 0 : i.at(0)) == null ? void 0 : a.value) : void 0, [];
   }
   interpretBody(e) {
-    const [n, s] = _.partition(e.body, (i) => i instanceof w);
+    const [n, s] = _.partition(e.body, (i) => i instanceof v);
     return n.length !== 1 || s.length > 0 ? [
       new l(o.INVALID_NOTE, "Invalid note syntax", e)
     ] : [...this.interpretNote(n[0])];
   }
   interpretNote(e) {
     const n = _.get(e, "callee.expression.literal.value", "");
-    return this.note.content = ie(n), [];
+    return this.note.content = se(n), [];
   }
 }
-class Wt {
+class Yt {
   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 = {};
   }
@@ -3748,12 +3739,12 @@ class Wt {
     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]);
+    return e instanceof v ? this.interpretField(e) : this.interpretField(e.body[0]);
   }
   interpretField(e) {
     var p, d, u, E, b, g, A;
-    const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, a = Ge(s), r = Ge(i);
-    if (lt(a, r))
+    const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, a = Ce(s), r = Ce(i);
+    if (ct(a, r))
       return [new l(o.SAME_ENDPOINT, "Two endpoints are the same", e)];
     const c = $t(a, r);
     if (this.env.refIds[c])
@@ -3763,11 +3754,11 @@ class Wt {
       ];
     if (e.args[0]) {
       const k = F(e.args[0]).getValue(), be = (d = (p = k.delete) == null ? void 0 : p.at(0)) == null ? void 0 : d.value;
-      this.ref.onDelete = be instanceof ne ? Ae(be).unwrap_or(void 0) : W(be).unwrap_or(void 0);
-      const S = (E = (u = k.update) == null ? void 0 : u.at(0)) == null ? void 0 : E.value;
-      this.ref.onUpdate = S instanceof ne ? Ae(S).unwrap_or(void 0) : W(S).unwrap_or(void 0), this.ref.color = (b = k.color) != null && b.length ? De((A = (g = k.color) == null ? void 0 : g.at(0)) == null ? void 0 : A.value) : void 0;
+      this.ref.onDelete = be instanceof te ? ve(be).unwrap_or(void 0) : W(be).unwrap_or(void 0);
+      const P = (E = (u = k.update) == null ? void 0 : u.at(0)) == null ? void 0 : E.value;
+      this.ref.onUpdate = P instanceof te ? ve(P).unwrap_or(void 0) : W(P).unwrap_or(void 0), this.ref.color = (b = k.color) != null && b.length ? De((A = (g = k.color) == null ? void 0 : g.at(0)) == null ? void 0 : A.value) : void 0;
     }
-    const f = Xt(n);
+    const f = jt(n);
     return this.ref.endpoints = [
       {
         ..._t(s, this.container),
@@ -3782,7 +3773,7 @@ class Wt {
     ], this.env.refIds[c] = this.declarationNode, [];
   }
 }
-class Yt {
+class qt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.tableGroup = { tables: [] };
   }
@@ -3799,7 +3790,7 @@ class Yt {
     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] = tn(e.body, (i) => i instanceof w);
+    const [n, s] = nn(e.body, (i) => i instanceof v);
     return [
       ...this.interpretFields(n),
       ...this.interpretSubElements(s)
@@ -3811,9 +3802,9 @@ class Yt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           this.tableGroup.note = {
-            value: U(
+            value: M(
               n.body instanceof re ? n.body.body[0].callee : n.body.callee
-            ).map(ie).unwrap(),
+            ).map(se).unwrap(),
             token: L(n)
           };
           break;
@@ -3826,7 +3817,7 @@ class Yt {
     return this.tableGroup.tables = e.map((s) => {
       const i = z(s.callee).unwrap();
       i.length > 2 && n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", s));
-      const a = Ie(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: 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));
@@ -3844,12 +3835,12 @@ class Yt {
     this.tableGroup.color = (i = n.color) != null && i.length ? De((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: U(s == null ? void 0 : s.value).map(ie).unwrap(),
+      value: M(s == null ? void 0 : s.value).map(se).unwrap(),
       token: L(s)
     }, [];
   }
 }
-class qt {
+class zt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.enum = { values: [] };
   }
@@ -3867,13 +3858,13 @@ class qt {
       i.token = L(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: U(r.value).map(ie).unwrap(),
+        value: M(r.value).map(se).unwrap(),
         token: L(r)
       }, this.enum.values.push(i), [];
     });
   }
 }
-class zt {
+class Qt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.tablePartial = { name: void 0, fields: [], token: void 0, indexes: [] }, this.pkColumns = [];
   }
@@ -3905,12 +3896,12 @@ class zt {
     this.tablePartial.headerColor = (i = n.headercolor) != null && i.length ? De((r = (a = n.headercolor) == null ? void 0 : a.at(0)) == null ? void 0 : r.value) : void 0;
     const [s] = n.note || [];
     return this.tablePartial.note = s && {
-      value: U(s == null ? void 0 : s.value).map(ie).unwrap(),
+      value: M(s == null ? void 0 : s.value).map(se).unwrap(),
       token: L(s)
     }, [];
   }
   interpretBody(e) {
-    const [n, s] = _.partition(e.body, (i) => i instanceof w);
+    const [n, s] = _.partition(e.body, (i) => i instanceof v);
     return [...this.interpretFields(n), ...this.interpretSubElements(s)];
   }
   interpretSubElements(e) {
@@ -3919,7 +3910,7 @@ class zt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           return this.tablePartial.note = {
-            value: U(n.body instanceof re ? n.body.body[0].callee : n.body.callee).map(ie).unwrap(),
+            value: M(n.body instanceof re ? n.body.body[0].callee : n.body.callee).map(se).unwrap(),
             token: L(n)
           }, [];
         case "indexes":
@@ -3935,54 +3926,54 @@ class zt {
     var r, c, f, p, d, u, E, b, g;
     const n = [], s = {};
     s.name = X(e.callee).unwrap();
-    const i = fs(e.args[0]);
+    const i = ds(e.args[0]);
     s.type = i.getValue(), n.push(...i.getErrors()), s.token = L(e), s.inline_refs = [];
     const a = e.args.slice(1);
-    if (_.last(a) instanceof R) {
+    if (_.last(a) instanceof U) {
       const A = F(a.pop()).getValue();
-      s.pk = !!((r = A.pk) != null && r.length) || !!((c = A["primary key"]) != null && c.length), s.increment = !!((f = A.increment) != null && f.length), s.unique = !!((p = A.unique) != null && p.length), s.not_null = (d = A["not null"]) != null && d.length ? !0 : (u = A.null) != null && u.length ? !1 : void 0, s.dbdefault = ps((b = (E = A.default) == null ? void 0 : E.at(0)) == null ? void 0 : b.value);
+      s.pk = !!((r = A.pk) != null && r.length) || !!((c = A["primary key"]) != null && c.length), s.increment = !!((f = A.increment) != null && f.length), s.unique = !!((p = A.unique) != null && p.length), s.not_null = (d = A["not null"]) != null && d.length ? !0 : (u = A.null) != null && u.length ? !1 : void 0, s.dbdefault = Es((b = (E = A.default) == null ? void 0 : E.at(0)) == null ? void 0 : b.value);
       const k = (g = A.note) == null ? void 0 : g.at(0);
       s.note = k && {
-        value: U(k.value).map(ie).unwrap(),
+        value: M(k.value).map(se).unwrap(),
         token: L(k)
       };
       const be = A.ref || [];
-      s.inline_refs = be.flatMap((S) => {
-        const [Oe] = Ge(S.value.expression);
-        if (lt(Oe, e.symbol))
-          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", S)), [];
-        const Ee = S.value.op, V = z(S.value.expression).unwrap();
-        let te;
-        if (V.length === 2) {
-          const [Ne, Q] = V;
-          te = {
+      s.inline_refs = be.flatMap((P) => {
+        const [Re] = Ce(P.value.expression);
+        if (ct(Re, e.symbol))
+          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", P)), [];
+        const Ee = P.value.op, B = z(P.value.expression).unwrap();
+        let ee;
+        if (B.length === 2) {
+          const [Ne, Q] = B;
+          ee = {
             schemaName: null,
             tableName: Ne,
             fieldNames: [Q],
             relation: Ee.value,
-            token: L(S)
+            token: L(P)
           };
-        } else if (V.length === 3) {
-          const [Ne, Q, me] = V;
-          te = {
+        } else if (B.length === 3) {
+          const [Ne, Q, me] = B;
+          ee = {
             schemaName: Ne,
             tableName: Q,
             fieldNames: [me],
             relation: Ee.value,
-            token: L(S)
+            token: L(P)
           };
         } else {
-          n.push(new l(o.UNSUPPORTED, "Unsupported", S));
-          const Ne = V.pop(), Q = V.pop();
-          te = {
-            schemaName: V.join("."),
+          n.push(new l(o.UNSUPPORTED, "Unsupported", P));
+          const Ne = B.pop(), Q = B.pop();
+          ee = {
+            schemaName: B.join("."),
             tableName: Q,
             fieldNames: [Ne],
             relation: Ee.value,
-            token: L(S)
+            token: L(P)
           };
         }
-        return te;
+        return ee;
       });
     }
     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;
@@ -3993,12 +3984,12 @@ class zt {
       const s = { columns: [] }, i = n;
       s.token = L(i);
       const a = [i.callee, ...i.args];
-      if (_.last(a) instanceof R) {
+      if (_.last(a) instanceof U) {
         const b = F(a.pop()).getValue();
-        s.pk = !!((r = b.pk) != null && r.length), s.unique = !!((c = b.unique) != null && c.length), s.name = U((p = (f = b.name) == null ? void 0 : f.at(0)) == null ? void 0 : p.value).unwrap_or(void 0);
+        s.pk = !!((r = b.pk) != null && r.length), s.unique = !!((c = b.unique) != null && c.length), s.name = M((p = (f = b.name) == null ? void 0 : f.at(0)) == null ? void 0 : p.value).unwrap_or(void 0);
         const g = (d = b.note) == null ? void 0 : d.at(0);
         s.note = g && {
-          value: U(g.value).unwrap(),
+          value: M(g.value).unwrap(),
           token: L(g)
         }, s.type = W((E = (u = b.type) == null ? void 0 : u.at(0)) == null ? void 0 : E.value).unwrap_or(void 0);
       }
@@ -4010,7 +4001,7 @@ class zt {
           g.push(b.argumentList), b = b.callee;
         return g.push(b), g;
       }).forEach((b) => {
-        const { functional: g, nonFunctional: A } = Ve(b).unwrap();
+        const { functional: g, nonFunctional: A } = Ge(b).unwrap();
         s.columns.push(
           ...g.map((k) => ({
             value: k.value.value,
@@ -4059,9 +4050,9 @@ class zt {
   //   return [];
   // }
 }
-function fs(t) {
+function ds(t) {
   let e = null;
-  t instanceof Y && (e = t.argumentList.elementList.map((a) => ee(a) ? a.expression.literal.value : C(a) ? U(a).unwrap() : W(a).unwrap()).join(","), t = t.callee);
+  t instanceof Y && (e = t.argumentList.elementList.map((a) => K(a) ? a.expression.literal.value : G(a) ? M(a).unwrap() : W(a).unwrap()).join(","), t = t.callee);
   let n = "";
   for (; t instanceof ue; )
     n = `[${t.indexer.elementList.map((a) => a.name.expression.literal.value).join(",")}]${n}`, t = t.array;
@@ -4079,15 +4070,15 @@ function fs(t) {
     args: e
   });
 }
-function ps(t) {
+function Es(t) {
   var e, n, s;
   if (t) {
-    if (C(t))
+    if (G(t))
       return {
-        value: U(t).unwrap(),
+        value: M(t).unwrap(),
         type: "string"
       };
-    if (ee(t))
+    if (K(t))
       return {
         type: "number",
         value: Number.parseFloat(t.expression.literal.value)
@@ -4097,7 +4088,7 @@ function ps(t) {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
       };
-    if (t instanceof Z && ot.includes((e = t.op) == null ? void 0 : e.value) && ee(t.expression)) {
+    if (t instanceof ie && lt.includes((e = t.op) == null ? void 0 : e.value) && K(t.expression)) {
       const i = Number.parseFloat(t.expression.expression.literal.value);
       return {
         value: ((n = t.op) == null ? void 0 : n.value) === "-" ? 0 - i : i,
@@ -4112,7 +4103,7 @@ function ps(t) {
     throw new Error("Unreachable");
   }
 }
-class ds {
+class Ns {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.project = { enums: [], refs: [], tableGroups: [], tables: [], tablePartials: [] };
   }
@@ -4131,37 +4122,37 @@ class ds {
       const s = n;
       switch ((i = s.type) == null ? void 0 : i.value.toLowerCase()) {
         case "table": {
-          const a = new jt(s, this.env).interpret();
+          const a = new Wt(s, this.env).interpret();
           return this.project.tables.push(this.env.tables.get(s)), a;
         }
         case "ref": {
-          const a = new Wt(s, this.env).interpret();
+          const a = new Yt(s, this.env).interpret();
           return this.project.refs.push(this.env.ref.get(s)), a;
         }
         case "tablegroup": {
-          const a = new Yt(s, this.env).interpret();
+          const a = new qt(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: U(s.body instanceof re ? s.body.body[0].callee : s.body.callee).map(ie).unwrap(),
+            value: M(s.body instanceof re ? s.body.body[0].callee : s.body.callee).map(se).unwrap(),
             token: L(s)
           }, [];
         case "tablepartial": {
-          const a = new zt(s, this.env).interpret();
+          const a = new Qt(s, this.env).interpret();
           return this.project.tablePartials.push(this.env.tablePartials.get(s)), a;
         }
         default:
-          return this.project[s.type.value.toLowerCase()] = U(s.body.callee).unwrap(), [];
+          return this.project[s.type.value.toLowerCase()] = M(s.body.callee).unwrap(), [];
       }
     });
   }
 }
-class Es {
+class ms {
   constructor(e) {
     this.ast = e, this.env = {
       schema: [],
@@ -4179,29 +4170,29 @@ class Es {
   }
   interpret() {
     const e = this.ast.body.flatMap((n) => {
-      switch (Pe(n).unwrap_or(void 0)) {
+      switch (Ae(n).unwrap_or(void 0)) {
         case I.Table:
-          return new jt(n, this.env).interpret();
+          return new Wt(n, this.env).interpret();
         case I.Note:
-          return new hs(n, this.env).interpret();
+          return new ps(n, this.env).interpret();
         case I.Ref:
-          return new Wt(n, this.env).interpret();
-        case I.TableGroup:
           return new Yt(n, this.env).interpret();
+        case I.TableGroup:
+          return new qt(n, this.env).interpret();
         case I.TablePartial:
-          return new zt(n, this.env).interpret();
+          return new Qt(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 ds(n, this.env).interpret();
+          return new Ns(n, this.env).interpret();
         default:
           return [];
       }
     });
-    return new q(Ns(this.env), e);
+    return new q(Ts(this.env), e);
   }
 }
-function Ns(t) {
+function Ts(t) {
   return {
     schemas: [],
     tables: Array.from(t.tables.values()),
@@ -4214,29 +4205,29 @@ function Ns(t) {
     tablePartials: Array.from(t.tablePartials.values())
   };
 }
-var v = /* @__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))(v || {}), x = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(x || {});
+var w = /* @__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))(w || {}), D = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(D || {});
 function xe(t) {
   switch (t) {
     case m.Schema:
-      return v.Module;
+      return w.Module;
     case m.Table:
-      return v.Class;
+    case m.TablePartial:
+      return w.Class;
     case m.Column:
-      return v.Field;
+    case m.TableGroupField:
+      return w.Field;
     case m.Enum:
-      return v.Enum;
+      return w.Enum;
     case m.EnumField:
-      return v.EnumMember;
+      return w.EnumMember;
     case m.TableGroup:
-      return v.Struct;
-    case m.TableGroupField:
-      return v.Field;
+      return w.Struct;
     default:
-      return v.Text;
+      return w.Text;
   }
 }
-function Ce(t, e) {
-  if (!t || Ze(t))
+function Xe(t, e) {
+  if (!t || Ke(t))
     return !1;
   for (const n of t.trailingTrivia) {
     if (n.start > e)
@@ -4246,12 +4237,12 @@ function Ce(t, e) {
   }
   return !0;
 }
-function B() {
+function V() {
   return {
     suggestions: []
   };
 }
-function Xe(t) {
+function je(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
@@ -4260,47 +4251,47 @@ function Xe(t) {
     }))
   };
 }
-function Qe(t) {
+function He(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
       ...e,
-      insertText: e.insertText.split("").every(We) ? e.insertText : `"${e.insertText}"`
+      insertText: e.insertText.split("").every(Ye) ? e.insertText : `"${e.insertText}"`
     }))
   };
 }
-function ct(t, e) {
+function ut(t, e) {
   return t.getOffsetAt(e);
 }
-class Qt {
+class Ht {
   constructor(e, n = []) {
     this.compiler = e, this.triggerCharacters = n;
   }
   provideCompletionItems(e, n) {
     var d, u;
-    const s = ct(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];
+    const s = ut(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) => an(E) && ye(s, E)))
-      return B();
+    ].find((E) => rn(E) && Se(s, E)))
+      return V();
     if (r === void 0)
-      return yt();
-    if ([h.STRING_LITERAL, h.QUOTED_STRING].includes(a.kind) && ye(s, a))
-      return B();
+      return kt();
+    if ([h.STRING_LITERAL, h.QUOTED_STRING].includes(a.kind) && Se(s, a))
+      return V();
     const f = this.compiler.container.element(s);
-    if (this.compiler.container.scopeKind(s) === M.TOPLEVEL || f instanceof y && f.type && f.type.start <= s && f.type.end >= s)
-      return yt();
+    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 E of p)
-      if (E instanceof Z)
+      if (E instanceof ie)
         switch ((d = E.op) == null ? void 0 : d.value) {
           case ">":
           case "<":
           case "<>":
           case "-":
-            return At(
+            return gt(
               this.compiler,
               s,
               E
@@ -4312,49 +4303,59 @@ class Qt {
           case "<":
           case "<>":
           case "-":
-            return At(
+            return gt(
               this.compiler,
               s,
               E
             );
           case ".":
-            return Ht(
+            return Jt(
               this.compiler,
               s,
               E
             );
         }
       else {
-        if (E instanceof se)
-          return gt(this.compiler, s, E);
-        if (E instanceof R)
-          return gt(this.compiler, s, E);
+        if (E instanceof ne)
+          return vt(this.compiler, s, E);
+        if (E instanceof U)
+          return vt(this.compiler, s, E);
         if (E instanceof fe)
-          return ms(this.compiler, s);
-        if (E instanceof w)
-          return wt(this.compiler, s, E);
-        if (E instanceof y && (E.bodyColon && s >= E.bodyColon.end || E.body && ye(s, E.body)))
-          return wt(this.compiler, s, void 0);
+          return Is(this.compiler, s);
+        if (E instanceof Le)
+          return bs(this.compiler, s);
+        if (E instanceof v)
+          return yt(this.compiler, s, E);
+        if (E instanceof y && (E.bodyColon && s >= E.bodyColon.end || E.body && Se(s, E.body)))
+          return yt(this.compiler, s, void 0);
       }
-    return B();
+    return V();
   }
 }
-function At(t, e, n) {
+function bs(t, e) {
+  const n = t.container.element(e);
+  return Oe(t, e, n, [m.TablePartial]);
+}
+function gt(t, e, n) {
   const s = t.container.scopeKind(e);
-  if ([M.REF, M.TABLE].includes(s)) {
-    const i = He(t, e, t.container.element(e), [
+  if ([
+    O.REF,
+    O.TABLE,
+    O.TABLEPARTIAL
+  ].includes(s)) {
+    const i = Oe(t, e, t.container.element(e), [
       m.Table,
       m.Schema,
       m.Column
     ]);
-    return Ce(n.op, e) ? Xe(i) : i;
+    return Xe(n.op, e) ? je(i) : i;
   }
-  return B();
+  return V();
 }
-function He(t, e, n, s) {
+function Oe(t, e, n, s) {
   var r;
   if (n === void 0)
-    return B();
+    return V();
   let i = n;
   const a = { suggestions: [] };
   for (; i; ) {
@@ -4364,7 +4365,7 @@ function He(t, e, n, s) {
         ...t.symbol.members(c).filter(({ kind: f }) => s.includes(f)).map(({ name: f, kind: p }) => ({
           label: f,
           insertText: f,
-          insertTextRules: x.KeepWhitespace,
+          insertTextRules: D.KeepWhitespace,
           kind: xe(p),
           sortText: xe(p).toString().padStart(2, "0"),
           range: void 0
@@ -4373,149 +4374,149 @@ function He(t, e, n, s) {
     }
     i = i instanceof y ? i.parent : void 0;
   }
-  return Qe(a);
+  return He(a);
 }
-function ms(t, e) {
+function Is(t, e) {
   var s;
   switch (t.container.scopeKind(e)) {
-    case M.INDEXES:
+    case O.INDEXES:
       return Kt(t, e);
-    case M.REF:
+    case O.REF:
       {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
           const a = i.pop();
           if (a instanceof le && ((s = a.op) == null ? void 0 : s.value) === ".")
-            return Ht(
+            return Jt(
               t,
               e,
               a
             );
         }
       }
-      return Jt(t, e);
+      return Zt(t, e);
   }
-  return B();
+  return V();
 }
-function gt(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 = vt(t, e);
-    return (s == null ? void 0 : s.kind) === h.COMMA && Ce(s, e) ? Xe(i) : i;
+    const i = wt(t, e);
+    return (s == null ? void 0 : s.kind) === h.COMMA && Xe(s, e) ? je(i) : i;
   }
   if (n.name && n.name.start <= e && n.name.end >= e)
-    return vt(t, e);
-  if (n.name instanceof ne) {
-    const i = Ts(
+    return wt(t, e);
+  if (n.name instanceof te) {
+    const i = Ls(
       t,
       e,
-      Ae(n.name).unwrap_or("")
+      ve(n.name).unwrap_or("")
     );
-    return (s == null ? void 0 : s.kind) === h.COLON && Ce(s, e) ? Xe(i) : i;
+    return (s == null ? void 0 : s.kind) === h.COLON && Xe(s, e) ? je(i) : i;
   }
-  return B();
+  return V();
 }
-function vt(t, e) {
-  const n = t.container.element(e), s = t.container.scopeKind(e);
-  if (n instanceof K)
-    return B();
-  if (n.body && !ye(e, n.body))
+function wt(t, e) {
+  const n = t.container.element(e);
+  if (n instanceof Z)
+    return V();
+  const s = t.container.scopeKind(e);
+  if (n.body && !Se(e, n.body)) {
+    let i;
     switch (s) {
-      case M.TABLE:
-        return {
-          suggestions: ["headercolor", "note"].map((i) => ({
-            label: i,
-            insertText: `${i}: `,
-            kind: v.Field,
-            insertTextRules: x.KeepWhitespace,
-            range: void 0
-          }))
-        };
-      case M.TABLEGROUP:
-        return {
-          suggestions: ["color", "note"].map((i) => ({
-            label: i,
-            insertText: `${i}: `,
-            kind: v.Field,
-            insertTextRules: x.KeepWhitespace,
-            range: void 0
-          }))
-        };
+      case O.TABLE:
+      case O.TABLEPARTIAL:
+        i = ["headercolor", "note"];
+        break;
+      case O.TABLEGROUP:
+        i = ["color", "note"];
+        break;
       default:
-        return B();
+        i = [];
     }
+    return {
+      suggestions: i.map((a) => ({
+        label: a,
+        insertText: `${a}: `,
+        kind: w.Field,
+        insertTextRules: D.KeepWhitespace,
+        range: void 0
+      }))
+    };
+  }
   switch (s) {
-    case M.TABLE:
+    case O.TABLE:
+    case O.TABLEPARTIAL:
       return {
         suggestions: [
           ...["primary key", "null", "not null", "increment", "pk", "unique"].map((i) => ({
             label: i,
             insertText: i,
-            kind: v.Property,
-            insertTextRules: x.KeepWhitespace,
+            kind: w.Property,
+            insertTextRules: D.KeepWhitespace,
             range: void 0
           })),
           ...["ref", "default"].map((i) => ({
             label: i,
             insertText: `${i}: `,
-            kind: v.Property,
-            insertTextRules: x.KeepWhitespace,
+            kind: w.Property,
+            insertTextRules: D.KeepWhitespace,
             range: void 0
           })),
           {
             label: "note",
             insertText: "note: ",
-            kind: v.Property,
-            insertTextRules: x.KeepWhitespace,
+            kind: w.Property,
+            insertTextRules: D.KeepWhitespace,
             range: void 0
           }
         ]
       };
-    case M.ENUM:
+    case O.ENUM:
       return {
         suggestions: [
           {
             label: "note",
             insertText: "note: ",
-            kind: v.Property,
-            insertTextRules: x.KeepWhitespace,
+            kind: w.Property,
+            insertTextRules: D.KeepWhitespace,
             range: void 0
           }
         ]
       };
-    case M.INDEXES:
+    case O.INDEXES:
       return {
         suggestions: [
           ...["unique", "pk"].map((i) => ({
             label: i,
             insertText: i,
-            insertTextRules: x.KeepWhitespace,
-            kind: v.Property,
+            insertTextRules: D.KeepWhitespace,
+            kind: w.Property,
             range: void 0
           })),
           ...["note", "name", "type"].map((i) => ({
             label: i,
             insertText: `${i}: `,
-            kind: v.Property,
-            insertTextRules: x.KeepWhitespace,
+            kind: w.Property,
+            insertTextRules: D.KeepWhitespace,
             range: void 0
           }))
         ]
       };
-    case M.REF:
+    case O.REF:
       return {
         suggestions: ["update", "delete"].map((i) => ({
           label: i,
           insertText: `${i}: `,
-          kind: v.Property,
-          insertTextRules: x.KeepWhitespace,
+          kind: w.Property,
+          insertTextRules: D.KeepWhitespace,
           range: void 0
         }))
       };
   }
-  return B();
+  return V();
 }
-function Ts(t, e, n) {
+function Ls(t, e, n) {
   switch (n == null ? void 0 : n.toLowerCase()) {
     case "update":
     case "delete":
@@ -4523,8 +4524,8 @@ function Ts(t, e, n) {
         suggestions: ["cascade", "set default", "set null", "restrict"].map((s) => ({
           label: s,
           insertText: s,
-          kind: v.Value,
-          insertTextRules: x.KeepWhitespace,
+          kind: w.Value,
+          insertTextRules: D.KeepWhitespace,
           range: void 0
         }))
       };
@@ -4533,20 +4534,20 @@ function Ts(t, e, n) {
         suggestions: ["btree", "hash"].map((s) => ({
           label: s,
           insertText: `${s}`,
-          kind: v.Value,
-          insertTextRules: x.KeepWhitespace,
+          kind: w.Value,
+          insertTextRules: D.KeepWhitespace,
           range: void 0
         }))
       };
   }
-  return B();
+  return V();
 }
-function Ht(t, e, n) {
-  const s = Ie(n).unwrap_or([]);
+function Jt(t, e, n) {
+  const s = _e(n).unwrap_or([]);
   if (s.pop(), s.some((a) => !$(a)))
-    return B();
+    return V();
   const i = s.map((a) => W(a).unwrap());
-  return Qe({
+  return He({
     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,
@@ -4555,97 +4556,100 @@ function Ht(t, e, n) {
     }))
   });
 }
-function wt(t, e, n) {
+function yt(t, e, n) {
   var i;
   switch (t.container.scopeKind(e)) {
-    case M.TABLE:
-      return Is(t, e, n);
-    case M.PROJECT:
-      return Ls(t, e, n);
-    case M.INDEXES:
-      return As(t, e);
-    case M.ENUM:
-      return bs(t, e, n);
-    case M.REF: {
-      const a = Jt(t, e);
-      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === h.COLON && Ce(t.container.token(e).token, e) ? Xe(a) : a;
+    case O.TABLE:
+    case O.TABLEPARTIAL:
+      return _s(t, e, n);
+    case O.PROJECT:
+      return gs(t, e, n);
+    case O.INDEXES:
+      return ws(t, e);
+    case O.ENUM:
+      return As(t, e, n);
+    case O.REF: {
+      const a = Zt(t, e);
+      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === h.COLON && Xe(t.container.token(e).token, e) ? je(a) : a;
     }
-    case M.TABLEGROUP:
-      return _s(t);
+    case O.TABLEGROUP:
+      return vs(t);
     default:
-      return B();
+      return V();
   }
 }
-function yt() {
+function kt() {
   return {
-    suggestions: ["Table", "TableGroup", "Enum", "Project", "Ref"].map((t) => ({
+    suggestions: ["Table", "TableGroup", "Enum", "Project", "Ref", "TablePartial"].map((t) => ({
       label: t,
       insertText: t,
-      insertTextRules: x.KeepWhitespace,
-      kind: v.Keyword,
+      insertTextRules: D.KeepWhitespace,
+      kind: w.Keyword,
       range: void 0
     }))
   };
 }
-function bs(t, e, n) {
-  return n != null && n.callee && ut(e, n) === 1 ? He(t, e, t.container.element(e), [
+function As(t, e, n) {
+  return n != null && n.callee && ht(e, n) === 1 ? Oe(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
-  ]) : B();
+  ]) : V();
 }
-function Is(t, e, n) {
+function _s(t, e, n) {
+  const s = ["Note", "indexes"];
   if (!(n != null && n.callee))
     return {
-      suggestions: ["Note", "indexes"].map((i) => ({
-        label: i,
-        insertText: i,
-        insertTextRules: x.KeepWhitespace,
-        kind: v.Keyword,
+      suggestions: s.map((a) => ({
+        label: a,
+        insertText: a,
+        insertTextRules: D.KeepWhitespace,
+        kind: w.Keyword,
         range: void 0
       }))
     };
-  const s = ut(e, n);
-  return s === 0 ? {
-    suggestions: ["Note", "indexes"].map((i) => ({
-      label: i,
-      insertText: i,
-      insertTextRules: x.KeepWhitespace,
-      kind: v.Keyword,
+  const i = ht(e, n);
+  return i === 0 ? {
+    suggestions: s.map((a) => ({
+      label: a,
+      insertText: a,
+      insertTextRules: D.KeepWhitespace,
+      kind: w.Keyword,
       range: void 0
     }))
-  } : s === 1 ? gs(t, e) : B();
-}
-function Ls(t, e, n) {
-  return n != null && n.callee ? ut(e, n) === 0 ? {
-    suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
-      label: i,
-      insertText: i,
-      insertTextRules: x.KeepWhitespace,
-      kind: v.Keyword,
+  } : i === 1 ? ys(t, e) : V();
+}
+function gs(t, e, n) {
+  const s = ["Table", "TableGroup", "Enum", "Note", "Ref", "TablePartial"];
+  return n != null && n.callee ? ht(e, n) === 0 ? {
+    suggestions: s.map((a) => ({
+      label: a,
+      insertText: a,
+      insertTextRules: D.KeepWhitespace,
+      kind: w.Keyword,
       range: void 0
     }))
-  } : B() : {
-    suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
-      label: i,
-      insertText: i,
-      insertTextRules: x.KeepWhitespace,
-      kind: v.Keyword,
+  } : V() : {
+    suggestions: s.map((a) => ({
+      label: a,
+      insertText: a,
+      insertTextRules: D.KeepWhitespace,
+      kind: w.Keyword,
       range: void 0
     }))
   };
 }
-function Jt(t, e) {
-  return He(t, e, t.container.element(e), [
+function Zt(t, e) {
+  return Oe(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
   ]);
 }
-function _s(t) {
+function vs(t) {
   return {
     suggestions: [
-      ...Qe({
+      ...He({
         suggestions: [...t.parse.publicSymbolTable().entries()].flatMap(([e]) => {
           const n = oe(e).unwrap_or(void 0);
           if (n === void 0)
@@ -4654,7 +4658,7 @@ function _s(t) {
           return s !== m.Table && s !== m.Schema ? [] : {
             label: i,
             insertText: i,
-            insertTextRules: x.KeepWhitespace,
+            insertTextRules: D.KeepWhitespace,
             kind: xe(s),
             range: void 0
           };
@@ -4663,17 +4667,17 @@ function _s(t) {
       ...["Note"].map((e) => ({
         label: e,
         insertText: e,
-        insertTextRules: x.KeepWhitespace,
-        kind: v.Keyword,
+        insertTextRules: D.KeepWhitespace,
+        kind: w.Keyword,
         range: void 0
       }))
     ]
   };
 }
-function As(t, e) {
+function ws(t, e) {
   return Kt(t, e);
 }
-function gs(t, e) {
+function ys(t, e) {
   return {
     suggestions: [
       ...[
@@ -4736,12 +4740,12 @@ function gs(t, e) {
       ].map((n) => ({
         label: n,
         insertText: n,
-        insertTextRules: x.KeepWhitespace,
-        kind: v.TypeParameter,
-        sortText: v.TypeParameter.toString().padStart(2, "0"),
+        insertTextRules: D.KeepWhitespace,
+        kind: w.TypeParameter,
+        sortText: w.TypeParameter.toString().padStart(2, "0"),
         range: void 0
       })),
-      ...He(t, e, t.container.element(e), [
+      ...Oe(t, e, t.container.element(e), [
         m.Enum,
         m.Schema
       ]).suggestions
@@ -4750,10 +4754,10 @@ function gs(t, e) {
 }
 function Kt(t, e) {
   const n = t.container.element(e), s = n == null ? void 0 : n.parent;
-  if (!((s == null ? void 0 : s.symbol) instanceof Rt))
-    return B();
+  if (!((s == null ? void 0 : s.symbol) instanceof Ut))
+    return V();
   const { symbolTable: i } = s.symbol;
-  return Qe({
+  return He({
     suggestions: [...i.entries()].flatMap(([a]) => {
       const r = oe(a).unwrap_or(void 0);
       if (r === void 0)
@@ -4762,37 +4766,44 @@ function Kt(t, e) {
       return {
         label: c,
         insertText: c,
-        insertTextRules: x.KeepWhitespace,
+        insertTextRules: D.KeepWhitespace,
         kind: xe(m.Column),
         range: void 0
       };
     })
   });
 }
-function ut(t, e) {
+function ht(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 Zt {
+class en {
   constructor(e) {
     this.compiler = e;
   }
   provideDefinition(e, n) {
-    var r;
-    const { uri: s } = e, i = ct(e, n), a = [...this.compiler.container.stack(i)];
+    var r, c;
+    const { uri: s } = e, i = ut(e, n), a = [...this.compiler.container.stack(i)];
     for (; a.length !== 0; ) {
-      const c = a.pop();
-      if ((r = c == null ? void 0 : c.referee) != null && r.declaration && [_e.PRIMARY_EXPRESSION, _e.VARIABLE].includes(c == null ? void 0 : c.kind)) {
-        const { startPos: f, endPos: p } = c.referee.declaration;
+      const f = a.pop();
+      if (!(f != null && f.referee))
+        continue;
+      let p;
+      if ((r = f.referee) != null && r.declaration && [
+        Ie.PRIMARY_EXPRESSION,
+        Ie.VARIABLE,
+        Ie.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: d, endPos: u } = p;
         return [
           {
             range: {
-              startColumn: f.column + 1,
-              startLineNumber: f.line + 1,
-              endColumn: p.column + 1,
-              endLineNumber: p.line + 1
+              startColumn: d.column + 1,
+              startLineNumber: d.line + 1,
+              endColumn: u.column + 1,
+              endLineNumber: u.line + 1
             },
             uri: s
           }
@@ -4802,18 +4813,18 @@ class Zt {
     return [];
   }
 }
-class en {
+class tn {
   constructor(e) {
     this.compiler = e;
   }
   provideReferences(e, n) {
-    const { uri: s } = e, i = ct(e, n), a = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = ut(e, n), a = [...this.compiler.container.stack(i)];
     for (; a.length !== 0; ) {
       const r = a.pop();
       if (r && [
-        _e.ELEMENT_DECLARATION,
-        _e.FUNCTION_APPLICATION,
-        _e.PRIMARY_EXPRESSION
+        Ie.ELEMENT_DECLARATION,
+        Ie.FUNCTION_APPLICATION,
+        Ie.PRIMARY_EXPRESSION
       ].includes(r == null ? void 0 : r.kind)) {
         const { symbol: c } = r;
         if (c != null && c.references.length)
@@ -4831,21 +4842,21 @@ class en {
     return [];
   }
 }
-const ys = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Ps = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  CompletionItemInsertTextRule: x,
-  CompletionItemKind: v,
-  DBMLCompletionItemProvider: Qt,
-  DBMLDefinitionProvider: Zt,
-  DBMLReferencesProvider: en
+  CompletionItemInsertTextRule: D,
+  CompletionItemKind: w,
+  DBMLCompletionItemProvider: Ht,
+  DBMLDefinitionProvider: en,
+  DBMLReferencesProvider: tn
 }, Symbol.toStringTag, { value: "Module" }));
-var M = /* @__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))(M || {});
-class ks {
+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 xs {
   constructor() {
     this.source = "", this.cache = new Array(
       16
       /* TOTAL_QUERY_COUNT */
-    ).fill(null), this.nodeIdGenerator = new rn(), this.symbolIdGenerator = new dn(), this.token = {
+    ).fill(null), this.nodeIdGenerator = new on(), this.symbolIdGenerator = new fn(), this.token = {
       invalidStream: this.createQuery(
         6,
         () => this.parse.tokens().filter(Mt)
@@ -4860,8 +4871,8 @@ class ks {
       _: this.createQuery(
         0,
         () => {
-          const e = new wn(this.source).lex().chain((n) => new Sn(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new ls(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
-          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new Es(n).interpret().map((a) => ({ ast: n, tokens: s, rawDb: a })));
+          const e = new yn(this.source).lex().chain((n) => new Pn(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new us(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
+          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new ms(n).interpret().map((a) => ({ ast: n, tokens: s, rawDb: a })));
         }
       ),
       ast: this.createQuery(
@@ -4885,14 +4896,14 @@ class ks {
       stack: this.createQuery(
         10,
         (e) => {
-          const n = this.token.flatStream(), { index: s, token: i } = this.container.token(e), a = s === void 0 ? -1 : nn(n, (p) => !p.isInvalid, s);
+          const n = this.token.flatStream(), { index: s, token: i } = this.container.token(e), a = s === void 0 ? -1 : sn(n, (p) => !p.isInvalid, s);
           if (a === -1)
             return [this.parse.ast()];
           const r = n[a].start;
           let c = this.parse.ast();
           const f = [c];
           for (; ; ) {
-            const d = vn(c).find((u) => ye(r, u));
+            const d = wn(c).find((u) => Se(r, u));
             if (d === void 0 || d instanceof J)
               break;
             f.push(d), c = d;
@@ -4901,16 +4912,16 @@ class ks {
             return f;
           for (; f.length > 0; ) {
             let p = !1;
-            const d = Ke(f);
-            if (d instanceof w) {
+            const d = Ze(f);
+            if (d instanceof v) {
               const u = this.parse.source();
               for (let E = d.end; E < e; E += 1)
                 u[E] === `
 ` && (f.pop(), p = !0);
             } else
-              d instanceof Z || d instanceof le ? this.container.token(e).token !== d.op && (f.pop(), p = !0) : d instanceof R ? d.listCloseBracket && d.end <= e && (f.pop(), p = !0) : d instanceof fe ? d.tupleCloseParen && d.end <= e && (f.pop(), p = !0) : d instanceof re ? d.blockCloseBrace && d.end <= e && (f.pop(), p = !0) : d instanceof ne || d.end < e && (f.pop(), p = !0);
+              d instanceof ie || d instanceof le ? this.container.token(e).token !== d.op && (f.pop(), p = !0) : d instanceof U ? d.listCloseBracket && d.end <= e && (f.pop(), p = !0) : d instanceof fe ? d.tupleCloseParen && d.end <= e && (f.pop(), p = !0) : d instanceof re ? d.blockCloseBrace && d.end <= e && (f.pop(), p = !0) : d instanceof te || d.end < e && (f.pop(), p = !0);
             if (p) {
-              const u = Ke(f);
+              const u = Ze(f);
               u instanceof y && u.end <= e && f.pop();
             }
             if (!p)
@@ -4948,7 +4959,7 @@ class ks {
       ),
       scopeKind: this.createQuery(15, (e) => {
         var s;
-        if (this.container.element(e) instanceof K)
+        if (this.container.element(e) instanceof Z)
           return 8;
         switch ((s = this.container.element(e).type) == null ? void 0 : s.value.toLowerCase()) {
           case "table":
@@ -4965,6 +4976,8 @@ class ks {
             return 4;
           case "project":
             return 6;
+          case "tablepartial":
+            return 9;
           default:
             return 7;
         }
@@ -4991,7 +5004,7 @@ class ks {
             let c = [r], f = [];
             for (const p of e)
               f = c.flatMap(
-                (d) => fn(p).flatMap((u) => {
+                (d) => In(p).flatMap((u) => {
                   const E = d.get(u), b = oe(u).unwrap_or(void 0);
                   return !E || !b ? [] : { ...b, symbol: E };
                 })
@@ -5034,14 +5047,14 @@ class ks {
   }
   initMonacoServices() {
     return {
-      definitionProvider: new Zt(this),
-      referenceProvider: new en(this),
-      autocompletionProvider: new Qt(this)
+      definitionProvider: new en(this),
+      referenceProvider: new tn(this),
+      autocompletionProvider: new Ht(this)
     };
   }
 }
 export {
-  ks as Compiler,
-  ws as serialize,
-  ys as services
+  xs as Compiler,
+  Ss as serialize,
+  Ps as services
 };