@dbml/parse 3.1.4 → 3.1.5

package/dist/dbml-parse.mjs

@@ -37,18 +37,18 @@ function at(t) {
   return t !== void 0 && t.kind === "<op>";
 }
 class B {
-  constructor(e, s, n, i, r) {
-    this.kind = e, this.startPos = s, this.endPos = n, this.value = i, this.leadingTrivia = [], this.trailingTrivia = [], this.leadingInvalid = [], this.trailingInvalid = [], this.isInvalid = r, this.start = s.offset, this.end = n.offset;
+  constructor(e, n, s, i, r) {
+    this.kind = e, this.startPos = n, this.endPos = s, this.value = i, this.leadingTrivia = [], this.trailingTrivia = [], this.leadingInvalid = [], this.trailingInvalid = [], this.isInvalid = r, this.start = n.offset, this.end = s.offset;
   }
-  static create(e, s, n, i, r) {
-    return new B(e, s, n, i, r);
+  static create(e, n, s, i, r) {
+    return new B(e, n, s, i, r);
   }
 }
 function bt(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === c.NEWLINE) !== void 0;
 }
 function ot(t, e) {
-  return e.leadingTrivia.find(({ kind: n }) => n === c.NEWLINE) !== void 0 || bt(t);
+  return e.leadingTrivia.find(({ kind: s }) => s === c.NEWLINE) !== void 0 || bt(t);
 }
 function Ve(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === c.SPACE) !== void 0;
@@ -78,15 +78,15 @@ class Wt {
 class y {
   // The symbol that this syntax node refers to
   // args must be passed in order of appearance in the node
-  constructor(e, s, n) {
-    this.id = e, this.kind = s;
-    const i = n.find((a) => a !== void 0 && !Number.isNaN(a.start));
+  constructor(e, n, s) {
+    this.id = e, this.kind = n;
+    const i = s.find((a) => a !== void 0 && !Number.isNaN(a.start));
     i ? (this.startPos = i.startPos, this.fullStart = i instanceof B ? Lt(i) : i.fullStart) : (this.startPos = {
       offset: NaN,
       column: NaN,
       line: NaN
     }, this.fullStart = NaN);
-    const r = [...n].reverse().find((a) => a !== void 0 && !Number.isNaN(a.end));
+    const r = [...s].reverse().find((a) => a !== void 0 && !Number.isNaN(a.end));
     r ? (this.endPos = r.endPos, this.fullEnd = r instanceof B ? It(r) : r.fullEnd) : (this.endPos = {
       offset: NaN,
       column: NaN,
@@ -94,17 +94,17 @@ class y {
     }, this.fullEnd = NaN), this.start = this.startPos.offset, this.end = this.endPos.offset;
   }
 }
-var ue = /* @__PURE__ */ ((t) => (t.PROGRAM = "<program>", t.ELEMENT_DECLARATION = "<element-declaration>", t.ATTRIBUTE = "<attribute>", t.IDENTIFIER_STREAM = "<identifer-stream>", t.LITERAL = "<literal>", t.VARIABLE = "<variable>", t.PREFIX_EXPRESSION = "<prefix-expression>", t.INFIX_EXPRESSION = "<infix-expression>", t.POSTFIX_EXPRESSION = "<postfix-expression>", t.FUNCTION_EXPRESSION = "<function-expression>", t.FUNCTION_APPLICATION = "<function-application>", t.BLOCK_EXPRESSION = "<block-expression>", t.LIST_EXPRESSION = "<list-expression>", t.TUPLE_EXPRESSION = "<tuple-expression>", t.CALL_EXPRESSION = "<call-expression>", t.PRIMARY_EXPRESSION = "<primary-expression>", t.GROUP_EXPRESSION = "<group-expression>", t.DUMMY = "<dummy>", t.ARRAY = "<array>", t))(ue || {});
+var he = /* @__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))(he || {});
 class C extends y {
-  constructor({ body: e = [], eof: s }, n) {
-    super(n, "<program>", [...e, s]), this.body = e, this.eof = s;
+  constructor({ body: e = [], eof: n }, s) {
+    super(s, "<program>", [...e, n]), this.body = e, this.eof = n;
   }
 }
 class _ extends y {
   constructor({
     type: e,
-    name: s,
-    as: n,
+    name: n,
+    as: s,
     alias: i,
     attributeList: r,
     bodyColon: a,
@@ -112,109 +112,109 @@ class _ extends y {
   }, p) {
     if (super(p, "<element-declaration>", [
       e,
-      s,
       n,
+      s,
       i,
       r,
       a,
       l
-    ]), l && a && !(l instanceof x || l instanceof _))
+    ]), l && a && !(l instanceof k || l instanceof _))
       throw new Error("If an element has a simple body, it must be a function application node");
-    this.type = e, this.name = s, this.as = n, this.alias = i, this.attributeList = r, this.bodyColon = a, this.body = l;
+    this.type = e, this.name = n, this.as = s, this.alias = i, this.attributeList = r, this.bodyColon = a, this.body = l;
   }
 }
-class te extends y {
-  constructor({ identifiers: e = [] }, s) {
-    super(s, "<identifer-stream>", e || []), this.identifiers = e;
+class K extends y {
+  constructor({ identifiers: e = [] }, n) {
+    super(n, "<identifer-stream>", e || []), this.identifiers = e;
   }
 }
 class ne extends y {
   constructor({
     name: e,
-    colon: s,
-    value: n
+    colon: n,
+    value: s
   }, i) {
-    super(i, "<attribute>", [e, s, n]), this.name = e, this.value = n, this.colon = s;
+    super(i, "<attribute>", [e, n, s]), this.name = e, this.value = s, this.colon = n;
   }
 }
 class Q extends y {
-  constructor({ op: e, expression: s }, n) {
-    super(n, "<prefix-expression>", [e, s]), this.op = e, this.expression = s;
+  constructor({ op: e, expression: n }, s) {
+    super(s, "<prefix-expression>", [e, n]), this.op = e, this.expression = n;
   }
 }
 class q extends y {
   constructor({
     op: e,
-    leftExpression: s,
-    rightExpression: n
+    leftExpression: n,
+    rightExpression: s
   }, i) {
-    super(i, "<infix-expression>", [s, e, n]), this.op = e, this.leftExpression = s, this.rightExpression = n;
+    super(i, "<infix-expression>", [n, e, s]), this.op = e, this.leftExpression = n, this.rightExpression = s;
   }
 }
 class De extends y {
-  constructor({ op: e, expression: s }, n) {
-    super(n, "<postfix-expression>", [s, e]), this.op = e, this.expression = s;
+  constructor({ op: e, expression: n }, s) {
+    super(s, "<postfix-expression>", [n, e]), this.op = e, this.expression = n;
   }
 }
-class K extends y {
-  constructor({ value: e }, s) {
-    super(s, "<function-expression>", [e]), this.value = e;
+class ee extends y {
+  constructor({ value: e }, n) {
+    super(n, "<function-expression>", [e]), this.value = e;
   }
 }
-class x extends y {
-  constructor({ callee: e, args: s = [] }, n) {
-    super(n, "<function-application>", [e, ...s]), this.callee = e, this.args = s;
+class k extends y {
+  constructor({ callee: e, args: n = [] }, s) {
+    super(s, "<function-application>", [e, ...n]), this.callee = e, this.args = n;
   }
 }
-class ee extends y {
+class te extends y {
   constructor({
     blockOpenBrace: e,
-    body: s = [],
-    blockCloseBrace: n
+    body: n = [],
+    blockCloseBrace: s
   }, i) {
-    super(i, "<block-expression>", [e, ...s, n]), this.blockOpenBrace = e, this.body = s, this.blockCloseBrace = n;
+    super(i, "<block-expression>", [e, ...n, s]), this.blockOpenBrace = e, this.body = n, this.blockCloseBrace = s;
   }
 }
 class U extends y {
   constructor({
     listOpenBracket: e,
-    elementList: s = [],
-    commaList: n = [],
+    elementList: n = [],
+    commaList: s = [],
     listCloseBracket: i
   }, r) {
     super(r, "<list-expression>", [
       e,
-      ...gt(s, n),
+      ...gt(n, s),
       i
-    ]), this.listOpenBracket = e, this.elementList = s, this.commaList = n, this.listCloseBracket = i;
+    ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
 }
 class J extends y {
   constructor({
     tupleOpenParen: e,
-    elementList: s = [],
-    commaList: n = [],
+    elementList: n = [],
+    commaList: s = [],
     tupleCloseParen: i
   }, r) {
     super(r, "<tuple-expression>", [
       e,
-      ...gt(s, n),
+      ...gt(n, s),
       i
-    ]), this.tupleOpenParen = e, this.elementList = s, this.commaList = n, this.tupleCloseParen = i;
+    ]), this.tupleOpenParen = e, this.elementList = n, this.commaList = s, this.tupleCloseParen = i;
   }
 }
 class Xe extends J {
   constructor({
     groupOpenParen: e,
-    expression: s,
-    groupCloseParen: n
+    expression: n,
+    groupCloseParen: s
   }, i) {
     super(
       {
         tupleOpenParen: e,
-        elementList: s && [s],
+        elementList: n && [n],
         commaList: [],
-        tupleCloseParen: n
+        tupleCloseParen: s
       },
       i
     ), this.kind = "<group-expression>";
@@ -223,35 +223,35 @@ class Xe extends J {
 class H extends y {
   constructor({
     callee: e,
-    argumentList: s
-  }, n) {
-    super(n, "<call-expression>", [e, s]), this.callee = e, this.argumentList = s;
+    argumentList: n
+  }, s) {
+    super(s, "<call-expression>", [e, n]), this.callee = e, this.argumentList = n;
   }
 }
-class pe extends y {
-  constructor({ literal: e }, s) {
-    super(s, "<literal>", [e]), this.literal = e;
+class de extends y {
+  constructor({ literal: e }, n) {
+    super(n, "<literal>", [e]), this.literal = e;
   }
 }
 class X extends y {
-  constructor({ variable: e }, s) {
-    super(s, "<variable>", [e]), this.variable = e;
+  constructor({ variable: e }, n) {
+    super(n, "<variable>", [e]), this.variable = e;
   }
 }
 class R extends y {
-  constructor({ expression: e }, s) {
-    super(s, "<primary-expression>", [e]), this.expression = e;
+  constructor({ expression: e }, n) {
+    super(n, "<primary-expression>", [e]), this.expression = e;
   }
 }
 class we extends y {
-  constructor({ pre: e }, s) {
-    const n = B.create(c.SPACE, e.endPos, e.endPos, " ", !1);
-    super(s, "<dummy>", [n]);
+  constructor({ pre: e }, n) {
+    const s = B.create(c.SPACE, e.endPos, e.endPos, " ", !1);
+    super(n, "<dummy>", [s]);
   }
 }
-class he extends y {
-  constructor({ expression: e, indexer: s }, n) {
-    super(n, "<array>", [e, s]), this.array = e, this.indexer = s;
+class fe extends y {
+  constructor({ expression: e, indexer: n }, s) {
+    super(s, "<array>", [e, n]), this.array = e, this.indexer = n;
   }
 }
 function gt(t, e) {
@@ -259,30 +259,30 @@ function gt(t, e) {
     return e || [];
   if (!e || e.length === 0)
     return t || [];
-  const [s] = t, [n] = e;
-  return (s.start < n.start ? I.flatten(I.zip(t, e)) : I.flatten(I.zip(e, t))).filter(
+  const [n] = t, [s] = e;
+  return (n.start < s.start ? I.flatten(I.zip(t, e)) : I.flatten(I.zip(e, t))).filter(
     (i) => i !== null
   );
 }
 function is(t, e = !1) {
   return JSON.stringify(
     t,
-    function(s, n) {
+    function(n, s) {
       var i;
-      return !(this instanceof C) && s === "symbol" ? n == null ? void 0 : n.id : (
+      return !(this instanceof C) && n === "symbol" ? s == null ? void 0 : s.id : (
         /* this instanceof SyntaxNode && */
-        s === "symbol" ? {
-          symbolTable: n == null ? void 0 : n.symbolTable,
-          id: n == null ? void 0 : n.id,
-          references: n == null ? void 0 : n.references.map((r) => r.id),
-          declaration: (i = n == null ? void 0 : n.declaration) == null ? void 0 : i.id
+        n === "symbol" ? {
+          symbolTable: s == null ? void 0 : s.symbolTable,
+          id: s == null ? void 0 : s.id,
+          references: s == null ? void 0 : s.references.map((r) => r.id),
+          declaration: (i = s == null ? void 0 : s.declaration) == null ? void 0 : i.id
         } : (
           /* this instanceof SyntaxNode && */
-          s === "referee" || /* this instanceof SyntaxNode && */
-          s === "parent" || /* this instanceof NodeSymbol && */
-          s === "declaration" ? n == null ? void 0 : n.id : (
+          n === "referee" || /* this instanceof SyntaxNode && */
+          n === "parent" || /* this instanceof NodeSymbol && */
+          n === "declaration" ? s == null ? void 0 : s.id : (
             /* this instanceof NodeSymbol && */
-            s === "symbolTable" ? Object.fromEntries(n.table) : n
+            n === "symbolTable" ? Object.fromEntries(s.table) : s
           )
         )
       );
@@ -338,7 +338,7 @@ var m = /* @__PURE__ */ ((t) => (t.Schema = "Schema", t.Table = "Table", t.Colum
 function $e(t) {
   return `Schema:${t}`;
 }
-function xe(t) {
+function ke(t) {
   return `Table:${t}`;
 }
 function We(t) {
@@ -367,7 +367,7 @@ function Fe(t, e) {
     case "Schema":
       return $e(t);
     case "Table":
-      return xe(t);
+      return ke(t);
     case "TableGroup":
       return ze(t);
     case "TableGroup field":
@@ -377,9 +377,9 @@ function Fe(t, e) {
   }
 }
 function se(t) {
-  const [e, s] = t.split(":");
+  const [e, n] = t.split(":");
   return Object.values(m).includes(e) ? new S({
-    name: s,
+    name: n,
     kind: e
   }) : new A();
 }
@@ -387,13 +387,13 @@ function jt(t) {
   const e = se(t).unwrap_or(void 0);
   if (!e)
     return !1;
-  const { kind: s, name: n } = e;
-  return s === "Schema" && n === "public";
+  const { kind: n, name: s } = e;
+  return n === "Schema" && s === "public";
 }
 function Yt(t) {
   return [
     $e,
-    xe,
+    ke,
     je,
     ze,
     We,
@@ -405,22 +405,22 @@ function qe(t) {
   const [e] = t;
   return e >= "a" && e <= "z" || e >= "A" && e <= "Z" || e === "_";
 }
-function ke(t) {
+function xe(t) {
   const [e] = t;
   return e >= "0" && e <= "9";
 }
 function zt(t) {
   const [e] = t;
-  return ke(e) || qe(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
+  return xe(e) || qe(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
-function be(t) {
-  return qe(t) || ke(t);
+function ue(t) {
+  return qe(t) || xe(t);
 }
 function lt(t, e) {
-  const s = [], n = Math.min(t.length, e.length);
-  for (let i = 0; i < n; i += 1)
-    s.push(t[i], e[i]);
-  return s.push(...t.slice(n), ...e.slice(n)), s;
+  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 Ie(t, e) {
   return t >= e.start && t < e.end;
@@ -437,49 +437,49 @@ class Qt {
   }
 }
 class _t {
-  constructor({ symbolTable: e }, s) {
-    this.references = [], this.id = s, this.symbolTable = e;
+  constructor({ symbolTable: e }, n) {
+    this.references = [], this.id = n, this.symbolTable = e;
   }
 }
 class qt {
-  constructor({ symbolTable: e, declaration: s }, n) {
-    this.references = [], this.id = n, this.symbolTable = e, this.declaration = s;
+  constructor({ symbolTable: e, declaration: n }, s) {
+    this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
 class Ht {
-  constructor({ declaration: e }, s) {
-    this.references = [], this.id = s, this.declaration = e;
+  constructor({ declaration: e }, n) {
+    this.references = [], this.id = n, this.declaration = e;
   }
 }
 class At {
-  constructor({ symbolTable: e, declaration: s }, n) {
-    this.references = [], this.id = n, this.symbolTable = e, this.declaration = s;
+  constructor({ symbolTable: e, declaration: n }, s) {
+    this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
 class Jt {
-  constructor({ declaration: e }, s) {
-    this.references = [], this.id = s, this.declaration = e;
+  constructor({ declaration: e }, n) {
+    this.references = [], this.id = n, this.declaration = e;
   }
 }
 class Zt {
-  constructor({ symbolTable: e, declaration: s }, n) {
-    this.references = [], this.id = n, this.symbolTable = e, this.declaration = s;
+  constructor({ symbolTable: e, declaration: n }, s) {
+    this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
 class Kt {
-  constructor({ declaration: e }, s) {
-    this.references = [], this.id = s, this.declaration = e;
+  constructor({ declaration: e }, n) {
+    this.references = [], this.id = n, this.declaration = e;
   }
 }
 var o = /* @__PURE__ */ ((t) => (t[t.UNKNOWN_SYMBOL = 1e3] = "UNKNOWN_SYMBOL", t[t.UNEXPECTED_SYMBOL = 1001] = "UNEXPECTED_SYMBOL", t[t.UNEXPECTED_EOF = 1002] = "UNEXPECTED_EOF", t[t.UNEXPECTED_NEWLINE = 1003] = "UNEXPECTED_NEWLINE", t[t.UNKNOWN_TOKEN = 1004] = "UNKNOWN_TOKEN", t[t.UNEXPECTED_TOKEN = 1005] = "UNEXPECTED_TOKEN", t[t.UNEXPECTED_ELEMENT_DECLARATION = 1006] = "UNEXPECTED_ELEMENT_DECLARATION", t[t.MISSING_SPACES = 1007] = "MISSING_SPACES", t[t.UNKNOWN_PREFIX_OP = 1008] = "UNKNOWN_PREFIX_OP", t[t.INVALID_OPERAND = 1009] = "INVALID_OPERAND", t[t.EMPTY_ATTRIBUTE_NAME = 1010] = "EMPTY_ATTRIBUTE_NAME", t[t.INVALID_NAME = 3e3] = "INVALID_NAME", t[t.UNEXPECTED_NAME = 3001] = "UNEXPECTED_NAME", t[t.NAME_NOT_FOUND = 3002] = "NAME_NOT_FOUND", t[t.DUPLICATE_NAME = 3003] = "DUPLICATE_NAME", t[t.INVALID_ALIAS = 3004] = "INVALID_ALIAS", t[t.UNEXPECTED_ALIAS = 3005] = "UNEXPECTED_ALIAS", t[t.UNEXPECTED_SETTINGS = 3006] = "UNEXPECTED_SETTINGS", t[t.INVALID_SETTINGS = 3007] = "INVALID_SETTINGS", t[t.UNEXPECTED_SIMPLE_BODY = 3008] = "UNEXPECTED_SIMPLE_BODY", t[t.UNEXPECTED_COMPLEX_BODY = 3009] = "UNEXPECTED_COMPLEX_BODY", t[t.INVALID_TABLE_CONTEXT = 3010] = "INVALID_TABLE_CONTEXT", t[t.INVALID_TABLE_SETTING = 3011] = "INVALID_TABLE_SETTING", t[t.DUPLICATE_TABLE_SETTING = 3012] = "DUPLICATE_TABLE_SETTING", t[t.INVALID_TABLEGROUP_CONTEXT = 3013] = "INVALID_TABLEGROUP_CONTEXT", t[t.INVALID_TABLEGROUP_ELEMENT_NAME = 3014] = "INVALID_TABLEGROUP_ELEMENT_NAME", t[t.DUPLICATE_TABLEGROUP_ELEMENT_NAME = 3015] = "DUPLICATE_TABLEGROUP_ELEMENT_NAME", t[t.DUPLICATE_TABLEGROUP_FIELD_NAME = 3016] = "DUPLICATE_TABLEGROUP_FIELD_NAME", t[t.INVALID_TABLEGROUP_FIELD = 3017] = "INVALID_TABLEGROUP_FIELD", t[t.EMPTY_TABLE = 3018] = "EMPTY_TABLE", t[t.INVALID_COLUMN = 3019] = "INVALID_COLUMN", t[t.INVALID_COLUMN_NAME = 3020] = "INVALID_COLUMN_NAME", t[t.UNKNOWN_COLUMN_SETTING = 3021] = "UNKNOWN_COLUMN_SETTING", t[t.INVALID_COLUMN_TYPE = 3022] = "INVALID_COLUMN_TYPE", t[t.DUPLICATE_COLUMN_NAME = 3023] = "DUPLICATE_COLUMN_NAME", t[t.DUPLICATE_COLUMN_SETTING = 3024] = "DUPLICATE_COLUMN_SETTING", t[t.INVALID_COLUMN_SETTING_VALUE = 3025] = "INVALID_COLUMN_SETTING_VALUE", t[t.INVALID_ENUM_CONTEXT = 3026] = "INVALID_ENUM_CONTEXT", t[t.INVALID_ENUM_ELEMENT_NAME = 3027] = "INVALID_ENUM_ELEMENT_NAME", t[t.INVALID_ENUM_ELEMENT = 3028] = "INVALID_ENUM_ELEMENT", t[t.DUPLICATE_ENUM_ELEMENT_NAME = 3029] = "DUPLICATE_ENUM_ELEMENT_NAME", t[t.UNKNOWN_ENUM_ELEMENT_SETTING = 3030] = "UNKNOWN_ENUM_ELEMENT_SETTING", t[t.DUPLICATE_ENUM_ELEMENT_SETTING = 3031] = "DUPLICATE_ENUM_ELEMENT_SETTING", t[t.INVALID_ENUM_ELEMENT_SETTING = 3032] = "INVALID_ENUM_ELEMENT_SETTING", t[t.EMPTY_ENUM = 3033] = "EMPTY_ENUM", t[t.INVALID_REF_CONTEXT = 3034] = "INVALID_REF_CONTEXT", t[t.UNKNOWN_REF_SETTING = 3035] = "UNKNOWN_REF_SETTING", t[t.DUPLICATE_REF_SETTING = 3036] = "DUPLICATE_REF_SETTING", t[t.INVALID_REF_SETTING_VALUE = 3037] = "INVALID_REF_SETTING_VALUE", t[t.INVALID_REF_RELATIONSHIP = 3038] = "INVALID_REF_RELATIONSHIP", t[t.INVALID_REF_FIELD = 3039] = "INVALID_REF_FIELD", t[t.EMPTY_REF = 3040] = "EMPTY_REF", t[t.REF_REDEFINED = 3041] = "REF_REDEFINED", t[t.INVALID_NOTE_CONTEXT = 3042] = "INVALID_NOTE_CONTEXT", t[t.INVALID_NOTE = 3043] = "INVALID_NOTE", t[t.NOTE_REDEFINED = 3044] = "NOTE_REDEFINED", t[t.NOTE_CONTENT_REDEFINED = 3045] = "NOTE_CONTENT_REDEFINED", t[t.EMPTY_NOTE = 3046] = "EMPTY_NOTE", t[t.INVALID_INDEXES_CONTEXT = 3047] = "INVALID_INDEXES_CONTEXT", t[t.INVALID_INDEXES_FIELD = 3048] = "INVALID_INDEXES_FIELD", t[t.INVALID_INDEX = 3049] = "INVALID_INDEX", t[t.UNKNOWN_INDEX_SETTING = 3050] = "UNKNOWN_INDEX_SETTING", t[t.DUPLICATE_INDEX_SETTING = 3051] = "DUPLICATE_INDEX_SETTING", t[t.UNEXPECTED_INDEX_SETTING_VALUE = 3052] = "UNEXPECTED_INDEX_SETTING_VALUE", t[t.INVALID_INDEX_SETTING_VALUE = 3053] = "INVALID_INDEX_SETTING_VALUE", t[t.INVALID_PROJECT_CONTEXT = 3054] = "INVALID_PROJECT_CONTEXT", t[t.PROJECT_REDEFINED = 3055] = "PROJECT_REDEFINED", t[t.INVALID_PROJECT_FIELD = 3056] = "INVALID_PROJECT_FIELD", t[t.INVALID_CUSTOM_CONTEXT = 3057] = "INVALID_CUSTOM_CONTEXT", t[t.INVALID_CUSTOM_ELEMENT_VALUE = 3058] = "INVALID_CUSTOM_ELEMENT_VALUE", t[t.INVALID_ELEMENT_IN_SIMPLE_BODY = 3059] = "INVALID_ELEMENT_IN_SIMPLE_BODY", t[t.BINDING_ERROR = 4e3] = "BINDING_ERROR", t[t.UNSUPPORTED = 5e3] = "UNSUPPORTED", t[t.CIRCULAR_REF = 5001] = "CIRCULAR_REF", t[t.SAME_ENDPOINT = 5002] = "SAME_ENDPOINT", t[t.UNEQUAL_FIELDS_BINARY_REF = 5003] = "UNEQUAL_FIELDS_BINARY_REF", t[t.CONFLICTING_SETTING = 5004] = "CONFLICTING_SETTING", t))(o || {});
 class u extends Error {
-  constructor(e, s, n) {
-    super(s), this.code = e, this.diagnostic = s, this.nodeOrToken = n, this.start = n.start, this.end = n.end, this.name = this.constructor.name, Object.setPrototypeOf(this, u.prototype);
+  constructor(e, n, s) {
+    super(n), this.code = e, this.diagnostic = n, this.nodeOrToken = s, this.start = s.start, this.end = s.end, this.name = this.constructor.name, Object.setPrototypeOf(this, u.prototype);
   }
 }
 class F {
-  constructor(e, s) {
-    this.value = e, this.errors = s === void 0 ? [] : s;
+  constructor(e, n) {
+    this.value = e, this.errors = n === void 0 ? [] : n;
   }
   getValue() {
     return this.value;
@@ -488,38 +488,38 @@ class F {
     return this.errors;
   }
   chain(e) {
-    const s = e(this.value), n = [...this.errors, ...s.errors];
-    return new F(s.value, n);
+    const n = e(this.value), s = [...this.errors, ...n.errors];
+    return new F(n.value, s);
   }
   map(e) {
     return new F(e(this.value), this.errors);
   }
 }
-function en(t, e, s) {
-  if (!t || !fe(t) || e.length === 0)
+function en(t, e, n) {
+  if (!t || !pe(t) || e.length === 0)
     return new A();
-  const n = [...e], i = Be(t).unwrap(), r = n.pop();
-  if (!(r instanceof ee))
+  const s = [...e], i = Be(t).unwrap(), r = s.pop();
+  if (!(r instanceof te))
     return new A();
-  const a = I.last(n) instanceof U ? n.pop() : void 0;
-  return n.length === 3 && Be(n[1]).unwrap().value === "as" ? new S(
-    s.create(_, {
+  const a = I.last(s) instanceof U ? s.pop() : void 0;
+  return s.length === 3 && Be(s[1]).unwrap().value === "as" ? new S(
+    n.create(_, {
       type: i,
-      name: n[0],
-      as: Be(n[1]).unwrap(),
-      alias: n[2],
+      name: s[0],
+      as: Be(s[1]).unwrap(),
+      alias: s[2],
       attributeList: a,
       body: r
     })
-  ) : n.length === 1 ? new S(
-    s.create(_, {
+  ) : s.length === 1 ? new S(
+    n.create(_, {
       type: i,
-      name: n[0],
+      name: s[0],
       attributeList: a,
       body: r
     })
-  ) : n.length === 0 ? new S(
-    s.create(_, {
+  ) : s.length === 0 ? new S(
+    n.create(_, {
       type: i,
       attributeList: a,
       body: r
@@ -538,7 +538,7 @@ function tn(t) {
 function nn(t) {
   if (t instanceof _)
     E(t.type), E(t.name), E(t.as), E(t.alias), E(t.bodyColon), E(t.attributeList), E(t.body);
-  else if (t instanceof te)
+  else if (t instanceof K)
     t.identifiers.forEach(E);
   else if (t instanceof ne)
     E(t.name), E(t.colon), E(t.value);
@@ -548,7 +548,7 @@ function nn(t) {
     E(t.leftExpression), E(t.op), E(t.rightExpression);
   else if (t instanceof De)
     E(t.op), E(t.expression);
-  else if (t instanceof ee)
+  else if (t instanceof te)
     E(t.blockOpenBrace), t.body.forEach(E), E(t.blockCloseBrace);
   else if (t instanceof U)
     E(t.listOpenBracket), t.commaList.forEach(E), t.elementList.forEach(E), E(t.listCloseBracket);
@@ -556,15 +556,15 @@ function nn(t) {
     E(t.tupleOpenParen), t.commaList.forEach(E), t.elementList.forEach(E), E(t.tupleCloseParen);
   else if (t instanceof H)
     E(t.callee), E(t.argumentList);
-  else if (t instanceof x)
+  else if (t instanceof k)
     E(t.callee), t.args.forEach(E);
   else if (t instanceof R)
     E(t.expression);
-  else if (t instanceof K)
+  else if (t instanceof ee)
     E(t.value);
   else if (t instanceof X)
     E(t.variable);
-  else if (t instanceof pe)
+  else if (t instanceof de)
     E(t.literal);
   else
     throw t instanceof Xe ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
@@ -590,9 +590,9 @@ function sn(t) {
     );
   if (t instanceof ne)
     return P(t.name, t.colon, t.value);
-  if (t instanceof te)
+  if (t instanceof K)
     return t.identifiers;
-  if (t instanceof pe)
+  if (t instanceof de)
     return t.literal ? [t.literal] : [];
   if (t instanceof X)
     return P(t.variable);
@@ -602,11 +602,11 @@ function sn(t) {
     return P(t.leftExpression, t.op, t.rightExpression);
   if (t instanceof De)
     return P(t.expression, t.op);
-  if (t instanceof K)
+  if (t instanceof ee)
     return P(t.value);
-  if (t instanceof x)
+  if (t instanceof k)
     return P(t.callee, ...t.args);
-  if (t instanceof ee)
+  if (t instanceof te)
     return P(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
   if (t instanceof U)
     return P(
@@ -631,12 +631,12 @@ function Be(t) {
 }
 function $(t) {
   var e;
-  return t instanceof R && (t.expression instanceof X && t.expression.variable instanceof B && t.expression.variable.kind === c.QUOTED_STRING || t.expression instanceof pe && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.STRING_LITERAL);
+  return t instanceof R && (t.expression instanceof X && t.expression.variable instanceof B && t.expression.variable.kind === c.QUOTED_STRING || t.expression instanceof de && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.STRING_LITERAL);
 }
 function M(t) {
   return t instanceof R && t.expression instanceof X && t.expression.variable instanceof B;
 }
-function fe(t) {
+function pe(t) {
   var e;
   return t instanceof R && t.expression instanceof X && ((e = t.expression.variable) == null ? void 0 : e.kind) === c.IDENTIFIER;
 }
@@ -647,7 +647,7 @@ function He(t) {
 function Re(t) {
   if (t === void 0)
     return new A();
-  const e = t.identifiers.map((s) => s.value).join(" ");
+  const e = t.identifiers.map((n) => n.value).join(" ");
   return e === "" ? new A() : new S(e);
 }
 class rn {
@@ -677,8 +677,8 @@ class rn {
   }
   // Check if the sequence ahead matches `sequence`
   check(e) {
-    for (let s = 0; s < e.length; s += 1)
-      if (e[s] !== this.peek(s))
+    for (let n = 0; n < e.length; n += 1)
+      if (e[n] !== this.peek(n))
         return !1;
     return !0;
   }
@@ -686,16 +686,16 @@ class rn {
   match(e) {
     return this.check(e) ? (e.split("").forEach(() => this.advance()), !0) : !1;
   }
-  addToken(e, s = !1) {
-    this.tokens.push(this.createToken(e, s));
+  addToken(e, n = !1) {
+    this.tokens.push(this.createToken(e, n));
   }
-  createToken(e, s = !1) {
+  createToken(e, n = !1) {
     return B.create(
       e,
       this.start,
       this.current,
       this.text.substring(this.start.offset, this.current.offset),
-      s
+      n
     );
   }
   lex() {
@@ -768,8 +768,8 @@ class rn {
             this.identifier();
             break;
           }
-          if (ke(e)) {
-            this.numericLiteral();
+          if (xe(e)) {
+            this.numericLiteralOrIdentifier();
             break;
           }
           this.addToken(c.OP, !0), this.errors.push(
@@ -785,27 +785,27 @@ class rn {
     }
   }
   gatherTrivia() {
-    let e = !0, s = [], n;
+    let e = !0, n = [], s;
     const i = [];
     for (const r of this.tokens)
-      Xt(r) ? (s.push(r), r.kind === c.NEWLINE && n && (n.trailingTrivia = s, e = !0, n = void 0, s = [])) : (e ? r.leadingTrivia = s : n.trailingTrivia = s, i.push(r), s = [], n = r, e = !1);
+      Xt(r) ? (n.push(r), r.kind === c.NEWLINE && s && (s.trailingTrivia = n, e = !0, s = void 0, n = [])) : (e ? r.leadingTrivia = n : s.trailingTrivia = n, i.push(r), n = [], s = r, e = !1);
     this.tokens = i;
   }
   gatherInvalid() {
     let e;
-    const s = [], n = [];
+    const n = [], s = [];
     for (e = 0; e < this.tokens.length && vt(this.tokens[e]); e += 1)
-      n.push(this.tokens[e]);
+      s.push(this.tokens[e]);
     let i = this.tokens[e];
-    for (i.leadingInvalid = [...n, ...i.leadingInvalid]; e < this.tokens.length; e += 1) {
+    for (i.leadingInvalid = [...s, ...i.leadingInvalid]; e < this.tokens.length; e += 1) {
       const r = this.tokens[e];
-      r.isInvalid ? i.trailingInvalid.push(r) : (i = r, s.push(r));
+      r.isInvalid ? i.trailingInvalid.push(r) : (i = r, n.push(r));
     }
-    this.tokens = s;
+    this.tokens = n;
   }
   // Consuming characters until the `stopSequence` is encountered
-  consumeUntil(e, s, {
-    allowNewline: n,
+  consumeUntil(e, n, {
+    allowNewline: s,
     // Whether newline is allowed
     allowEof: i,
     // Whether EOF is allowed
@@ -814,8 +814,8 @@ class rn {
     consumeStopSequence: a = !0
   }) {
     let l = "";
-    for (; !this.isAtEnd() && (n || !this.check(`
-`)) && !this.check(s); )
+    for (; !this.isAtEnd() && (s || !this.check(`
+`)) && !this.check(n); )
       this.peek() === "\\" && !r ? (this.advance(), l += this.escapedString()) : l += this.advance();
     if (this.isAtEnd() && !i) {
       const p = this.createToken(e, !0);
@@ -825,7 +825,7 @@ class rn {
       return;
     }
     if (this.check(`
-`) && !n) {
+`) && !s) {
       const p = this.createToken(e, !0);
       this.tokens.push(p), this.errors.push(
         new u(
@@ -836,7 +836,7 @@ class rn {
       );
       return;
     }
-    a && this.match(s), this.tokens.push(B.create(e, this.start, this.current, l, !1));
+    a && this.match(n), this.tokens.push(B.create(e, this.start, this.current, l, !1));
   }
   singleLineStringLiteral() {
     this.consumeUntil(c.STRING_LITERAL, "'", {
@@ -883,7 +883,7 @@ class rn {
     });
   }
   identifier() {
-    for (; !this.isAtEnd() && be(this.peek()); )
+    for (; !this.isAtEnd() && ue(this.peek()); )
       this.advance();
     this.addToken(c.IDENTIFIER);
   }
@@ -892,7 +892,8 @@ class rn {
       this.advance();
     this.addToken(c.OP);
   }
-  numericLiteral() {
+  // we accept identifiers starting with digits but must contain at least one char or underscore
+  numericLiteralOrIdentifier() {
     let e = 0;
     if (this.isAtEnd())
       return this.addToken(c.NUMERIC_LITERAL);
@@ -902,19 +903,26 @@ class rn {
         break;
       if (!n && this.current.offset === this.text.length - 1)
         return this.advance(), this.addToken(c.NUMERIC_LITERAL);
-      if (!n && !be(this.peek()))
+      if (!n && !ue(this.peek()))
         return this.addToken(c.NUMERIC_LITERAL);
-      if (!n && !ke(this.peek()))
+      if (!n && !xe(this.peek()))
         break;
       this.advance();
     }
-    for (; !this.isAtEnd() && (this.check(".") || be(this.peek())); )
-      this.advance();
-    const s = this.createToken(c.NUMERIC_LITERAL, !0);
-    this.tokens.push(s), this.errors.push(new u(o.UNKNOWN_TOKEN, "Invalid number", s));
+    if (e > 0) {
+      for (; !this.isAtEnd() && (this.check(".") || ue(this.peek())); )
+        this.advance();
+      const n = this.createToken(c.NUMERIC_LITERAL, !0);
+      this.tokens.push(n), this.errors.push(new u(o.UNKNOWN_TOKEN, "Invalid number", n));
+    } else {
+      for (; !this.isAtEnd() && ue(this.peek()); )
+        this.advance();
+      const n = this.createToken(c.IDENTIFIER, !1);
+      this.tokens.push(n);
+    }
   }
   colorLiteral() {
-    for (; !this.isAtEnd() && be(this.peek()); )
+    for (; !this.isAtEnd() && ue(this.peek()); )
       this.advance();
     this.addToken(c.COLOR_LITERAL);
   }
@@ -945,8 +953,8 @@ class rn {
         return "\f";
       case "u": {
         let e = "";
-        for (let s = 0; s <= 3; s += 1) {
-          if (this.isAtEnd() || !be(this.peek()))
+        for (let n = 0; n <= 3; n += 1) {
+          if (this.isAtEnd() || !ue(this.peek()))
             return `\\u${e}`;
           e += this.advance();
         }
@@ -984,21 +992,21 @@ class an {
   // Call the passed in callback
   // with the guarantee that the passed in context will be pushed and popped properly
   // even in cases of exceptions
-  withContextDo(e, s) {
+  withContextDo(e, n) {
     return () => {
       this.push(e);
       try {
-        return s();
+        return n();
       } finally {
         this.pop();
       }
     };
   }
   // Return the type of the handler context currently in the context stack to handle `token`
-  findHandlerContext(e, s) {
+  findHandlerContext(e, n) {
     if (!(this.numberOfNestedLBraces <= 0 && this.numberOfNestedLBrackets <= 0 && this.numberOfNestedLParens <= 0))
-      for (let n = s; n < e.length - 1; n += 1)
-        switch (e[n].kind) {
+      for (let s = n; s < e.length - 1; s += 1)
+        switch (e[s].kind) {
           case c.COMMA:
             if (this.isWithinGroupExpressionContext() || this.isWithinListExpressionContext())
               return [...this.stack].reverse().find(
@@ -1028,61 +1036,61 @@ class on {
   constructor(e) {
     this.generator = e;
   }
-  create(e, s) {
-    return new e(s, this.generator.nextId());
+  create(e, n) {
+    return new e(n, this.generator.nextId());
   }
 }
 class d {
-  constructor(e, s, n) {
-    this.token = e, this.partialNode = s, this.handlerContext = n;
+  constructor(e, n, s) {
+    this.token = e, this.partialNode = n, this.handlerContext = s;
   }
 }
 class ln {
-  constructor(e, s) {
+  constructor(e, n) {
     this.current = 0, this.errors = [], this.contextStack = new an(), this.synchronizeProgram = () => {
-      const n = this.peek();
-      n.kind !== c.EOF ? E(this.advance()) : (E(this.peek()), this.logError(n, o.UNEXPECTED_EOF, "Unexpected EOF"));
+      const s = this.peek();
+      s.kind !== c.EOF ? E(this.advance()) : (E(this.peek()), this.logError(s, o.UNEXPECTED_EOF, "Unexpected EOF"));
     }, this.synchronizeElementDeclarationName = () => {
       for (; !this.isAtEnd(); ) {
-        const n = this.peek();
-        if (ct(n) || this.check(c.COLON, c.LBRACE, c.LBRACKET))
+        const s = this.peek();
+        if (ct(s) || this.check(c.COLON, c.LBRACE, c.LBRACKET))
           break;
-        E(n), this.advance();
+        E(s), this.advance();
       }
     }, this.synchronizeElementDeclarationAlias = () => {
       for (; !this.isAtEnd(); ) {
-        const n = this.peek();
+        const s = this.peek();
         if (this.check(c.COLON, c.LBRACE, c.LBRACKET))
           break;
-        E(n), this.advance();
+        E(s), this.advance();
       }
     }, this.blockExpression = this.contextStack.withContextDo(ye.BlockExpression, () => {
-      const n = { body: [] }, i = () => this.nodeFactory.create(ee, n);
+      const s = { body: [] }, i = () => this.nodeFactory.create(te, s);
       try {
-        this.consume("Expect an opening brace '{'", c.LBRACE), n.blockOpenBrace = this.previous();
+        this.consume("Expect an opening brace '{'", c.LBRACE), s.blockOpenBrace = this.previous();
       } catch (r) {
         if (!(r instanceof d))
           throw r;
-        if (n.blockOpenBrace = r.partialNode, !this.canHandle(r))
+        if (s.blockOpenBrace = r.partialNode, !this.canHandle(r))
           throw new d(r.token, i(), r.handlerContext);
         this.synchronizeBlock();
       }
       for (; !this.isAtEnd() && !this.check(c.RBRACE); )
         try {
-          n.body.push(this.canBeField() ? this.fieldDeclaration() : this.expression());
+          s.body.push(this.canBeField() ? this.fieldDeclaration() : this.expression());
         } catch (r) {
           if (!(r instanceof d))
             throw r;
-          if (n.body.push(r.partialNode), !this.canHandle(r))
+          if (s.body.push(r.partialNode), !this.canHandle(r))
             throw new d(r.token, i(), r.handlerContext);
           this.synchronizeBlock();
         }
       try {
-        this.consume("Expect a closing brace '}'", c.RBRACE), n.blockCloseBrace = this.previous();
+        this.consume("Expect a closing brace '}'", c.RBRACE), s.blockCloseBrace = this.previous();
       } catch (r) {
         if (!(r instanceof d))
           throw r;
-        if (n.blockCloseBrace = r.partialNode, !this.canHandle(r))
+        if (s.blockCloseBrace = r.partialNode, !this.canHandle(r))
           throw new d(r.token, i(), r.handlerContext);
         this.synchronizeBlock();
       }
@@ -1090,126 +1098,126 @@ class ln {
     }), this.synchronizeBlock = () => {
       if (!this.check(c.RBRACE))
         for (E(this.advance()); !this.isAtEnd(); ) {
-          const n = this.peek();
-          if (this.check(c.RBRACE) || ot(this.previous(), n))
+          const s = this.peek();
+          if (this.check(c.RBRACE) || ot(this.previous(), s))
             break;
-          E(n), this.advance();
+          E(s), this.advance();
         }
     }, this.tupleExpression = this.contextStack.withContextDo(ye.GroupExpression, () => {
-      const n = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(Xe, {
-        groupOpenParen: n.tupleOpenParen,
-        groupCloseParen: n.tupleCloseParen,
-        expression: n.elementList[0]
-      }), r = () => this.nodeFactory.create(J, n);
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(Xe, {
+        groupOpenParen: s.tupleOpenParen,
+        groupCloseParen: s.tupleCloseParen,
+        expression: s.elementList[0]
+      }), r = () => this.nodeFactory.create(J, s);
       try {
-        this.consume("Expect an opening parenthesis '('", c.LPAREN), n.tupleOpenParen = this.previous();
+        this.consume("Expect an opening parenthesis '('", c.LPAREN), s.tupleOpenParen = this.previous();
       } catch (a) {
         if (!(a instanceof d))
           throw a;
-        if (n.tupleOpenParen = a.partialNode, !this.canHandle(a))
+        if (s.tupleOpenParen = a.partialNode, !this.canHandle(a))
           throw new d(a.token, r(), a.handlerContext);
         this.synchronizeTuple();
       }
       if (!this.isAtEnd() && !this.check(c.RPAREN))
         try {
-          n.elementList.push(this.normalExpression());
+          s.elementList.push(this.normalExpression());
         } catch (a) {
           if (!(a instanceof d))
             throw a;
-          if (n.elementList.push(a.partialNode), !this.canHandle(a))
+          if (s.elementList.push(a.partialNode), !this.canHandle(a))
             throw new d(a.token, i(), a.handlerContext);
           this.synchronizeTuple();
         }
       for (; !this.isAtEnd() && !this.check(c.RPAREN); )
         try {
-          this.consume("Expect a comma ','", c.COMMA), n.commaList.push(this.previous()), n.elementList.push(this.normalExpression());
+          this.consume("Expect a comma ','", c.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.normalExpression());
         } catch (a) {
           if (!(a instanceof d))
             throw a;
-          if (a.partialNode instanceof y && n.elementList.push(a.partialNode), !this.canHandle(a))
+          if (a.partialNode instanceof y && s.elementList.push(a.partialNode), !this.canHandle(a))
             throw new d(a.token, r(), a.handlerContext);
           this.synchronizeTuple();
         }
       try {
-        this.consume("Expect a closing parenthesis ')'", c.RPAREN), n.tupleCloseParen = this.previous();
+        this.consume("Expect a closing parenthesis ')'", c.RPAREN), s.tupleCloseParen = this.previous();
       } catch (a) {
         if (!(a instanceof d))
           throw a;
-        if (n.tupleCloseParen = a.partialNode, !this.canHandle(a))
+        if (s.tupleCloseParen = a.partialNode, !this.canHandle(a))
           throw new d(a.token, r(), a.handlerContext);
         this.synchronizeTuple();
       }
-      return n.elementList.length === 1 ? i() : r();
+      return s.elementList.length === 1 ? i() : r();
     }), this.synchronizeTuple = () => {
       for (; !this.isAtEnd(); ) {
-        const n = this.peek();
+        const s = this.peek();
         if (this.check(c.RPAREN, c.COMMA))
           break;
-        E(n), this.advance();
+        E(s), this.advance();
       }
     }, this.listExpression = this.contextStack.withContextDo(ye.ListExpression, () => {
-      const n = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(U, n);
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(U, s);
       try {
-        this.consume("Expect an opening bracket '['", c.LBRACKET), n.listOpenBracket = this.previous();
+        this.consume("Expect an opening bracket '['", c.LBRACKET), s.listOpenBracket = this.previous();
       } catch (r) {
         if (!(r instanceof d))
           throw r;
-        if (n.listOpenBracket = r.partialNode, !this.canHandle(r))
+        if (s.listOpenBracket = r.partialNode, !this.canHandle(r))
           throw new d(r.token, i(), r.handlerContext);
         this.synchronizeList();
       }
       if (!this.isAtEnd() && !this.check(c.RBRACKET))
         try {
-          n.elementList.push(this.attribute());
+          s.elementList.push(this.attribute());
         } catch (r) {
           if (!(r instanceof d))
             throw r;
-          if (n.elementList.push(r.partialNode), !this.canHandle(r))
+          if (s.elementList.push(r.partialNode), !this.canHandle(r))
             throw new d(r.token, i(), r.handlerContext);
           this.synchronizeList();
         }
       for (; !this.isAtEnd() && !this.check(c.RBRACKET); )
         try {
-          this.consume("Expect a comma ','", c.COMMA), n.commaList.push(this.previous()), n.elementList.push(this.attribute());
+          this.consume("Expect a comma ','", c.COMMA), s.commaList.push(this.previous()), s.elementList.push(this.attribute());
         } catch (r) {
           if (!(r instanceof d))
             throw r;
-          if (r.partialNode instanceof y && n.elementList.push(r.partialNode), !this.canHandle(r))
+          if (r.partialNode instanceof y && s.elementList.push(r.partialNode), !this.canHandle(r))
             throw new d(r.token, i(), r.handlerContext);
           this.synchronizeList();
         }
       try {
-        this.consume("Expect a closing bracket ']'", c.RBRACKET), n.listCloseBracket = this.previous();
+        this.consume("Expect a closing bracket ']'", c.RBRACKET), s.listCloseBracket = this.previous();
       } catch (r) {
         if (!(r instanceof d))
           throw r;
-        if (n.listCloseBracket = r.partialNode, !this.canHandle(r))
+        if (s.listCloseBracket = r.partialNode, !this.canHandle(r))
           throw new d(r.token, i(), r.handlerContext);
         this.synchronizeList();
       }
       return i();
     }), this.synchronizeList = () => {
       for (; !this.isAtEnd(); ) {
-        const n = this.peek();
+        const s = this.peek();
         if (this.check(c.COMMA, c.RBRACKET))
           break;
-        E(n), this.advance();
+        E(s), this.advance();
       }
     }, this.synchronizeAttributeName = () => {
       for (; !this.isAtEnd(); ) {
-        const n = this.peek();
+        const s = this.peek();
         if (this.check(c.COMMA, c.RBRACKET, c.COLON))
           break;
-        E(n), this.advance();
+        E(s), this.advance();
       }
     }, this.synchronizeAttributeValue = () => {
       for (; !this.isAtEnd(); ) {
-        const n = this.peek();
+        const s = this.peek();
         if (this.check(c.COMMA, c.RBRACKET))
           break;
-        E(n), this.advance();
+        E(s), this.advance();
       }
-    }, this.tokens = e, this.nodeFactory = new on(s);
+    }, this.tokens = e, this.nodeFactory = new on(n);
   }
   isAtEnd() {
     return this.current >= this.tokens.length || this.tokens[this.current].kind === c.EOF;
@@ -1221,12 +1229,12 @@ class ln {
     return e + this.current >= this.tokens.length ? I.last(this.tokens) : this.tokens[this.current + e];
   }
   match(...e) {
-    const s = this.check(...e);
-    return s && this.advance(), s;
+    const n = this.check(...e);
+    return n && this.advance(), n;
   }
   check(...e) {
-    const s = this.peek();
-    return e.includes(s.kind);
+    const n = this.peek();
+    return e.includes(n.kind);
   }
   previous() {
     return this.tokens[this.current - 1];
@@ -1234,8 +1242,8 @@ class ln {
   canHandle(e) {
     return e.handlerContext === void 0 || e.handlerContext === this.contextStack.top();
   }
-  consume(e, ...s) {
-    if (!this.match(...s))
+  consume(e, ...n) {
+    if (!this.match(...n))
       throw this.logError(this.peek(), o.UNEXPECTED_TOKEN, e), new d(
         this.peek(),
         void 0,
@@ -1245,59 +1253,59 @@ class ln {
   // Discard tokens until one of `kind` is found
   // If any tokens are discarded, the error message is logged
   // Return whether the token of one of the listed kinds are eventually reached
-  discardUntil(e, ...s) {
-    if (this.isAtEnd() || !this.check(...s)) {
-      for (E(this.peek()), this.logError(this.advance(), o.UNEXPECTED_TOKEN, e); !this.isAtEnd() && !this.check(...s); )
+  discardUntil(e, ...n) {
+    if (this.isAtEnd() || !this.check(...n)) {
+      for (E(this.peek()), this.logError(this.advance(), o.UNEXPECTED_TOKEN, e); !this.isAtEnd() && !this.check(...n); )
         E(this.advance());
       return !this.isAtEnd();
     }
     return !0;
   }
   gatherInvalid() {
-    const e = [], s = [];
-    let n, i = 0;
+    const e = [], n = [];
+    let s, i = 0;
     for (; i < this.tokens.length && this.tokens[i].isInvalid; i += 1)
-      s.push(this.tokens[i]);
-    for (n = this.tokens[i], n.leadingInvalid = s, e.push(n), i += 1; i < this.tokens.length; i += 1) {
+      n.push(this.tokens[i]);
+    for (s = this.tokens[i], s.leadingInvalid = n, e.push(s), i += 1; i < this.tokens.length; i += 1) {
       const r = this.tokens[i];
-      r.isInvalid ? n.trailingInvalid.push(r) : (n = r, e.push(n));
+      r.isInvalid ? s.trailingInvalid.push(r) : (s = r, e.push(s));
     }
     this.tokens = e;
   }
   parse() {
-    const e = this.program(), s = this.advance(), n = this.nodeFactory.create(C, { body: e, eof: s });
-    return this.gatherInvalid(), new F({ ast: n, tokens: this.tokens }, this.errors);
+    const e = this.program(), n = this.advance(), s = this.nodeFactory.create(C, { body: e, eof: n });
+    return this.gatherInvalid(), new F({ ast: s, tokens: this.tokens }, this.errors);
   }
   /* Parsing and synchronizing ProgramNode */
   program() {
     const e = [];
     for (; !this.isAtEnd(); )
       try {
-        const s = this.elementDeclaration();
-        e.push(s);
-      } catch (s) {
-        if (!(s instanceof d))
-          throw s;
-        e.push(s.partialNode), this.synchronizeProgram();
+        const n = this.elementDeclaration();
+        e.push(n);
+      } catch (n) {
+        if (!(n instanceof d))
+          throw n;
+        e.push(n.partialNode), this.synchronizeProgram();
       }
     return e;
   }
   /* Parsing and synchronizing top-level ElementDeclarationNode */
   elementDeclaration() {
-    const e = {}, s = () => this.nodeFactory.create(_, e);
+    const e = {}, n = () => this.nodeFactory.create(_, e);
     try {
       this.consume("Expect an identifier", c.IDENTIFIER), e.type = this.previous();
-    } catch (n) {
-      throw n instanceof d ? (e.type = n.partialNode, new d(n.token, s(), n.handlerContext)) : n;
+    } catch (s) {
+      throw s instanceof d ? (e.type = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
     if (!this.check(c.COLON, c.LBRACE, c.LBRACKET))
       try {
         e.name = this.normalExpression();
-      } catch (n) {
-        if (!(n instanceof d))
-          throw n;
-        if (e.name = n.partialNode, !this.canHandle(n))
-          throw new d(n.token, s(), n.handlerContext);
+      } catch (s) {
+        if (!(s instanceof d))
+          throw s;
+        if (e.name = s.partialNode, !this.canHandle(s))
+          throw new d(s.token, n(), s.handlerContext);
         this.synchronizeElementDeclarationName();
       }
     if (ct(this.peek()))
@@ -1306,33 +1314,33 @@ class ln {
       else
         try {
           e.alias = this.normalExpression();
-        } catch (n) {
-          if (!(n instanceof d))
-            throw n;
-          if (e.alias = n.partialNode, !this.canHandle(n))
-            throw new d(n.token, s(), n.handlerContext);
+        } catch (s) {
+          if (!(s instanceof d))
+            throw s;
+          if (e.alias = s.partialNode, !this.canHandle(s))
+            throw new d(s.token, n(), s.handlerContext);
           this.synchronizeElementDeclarationAlias();
         }
     try {
       e.attributeList = this.check(c.LBRACKET) ? this.listExpression() : void 0;
-    } catch (n) {
-      throw n instanceof d ? (e.attributeList = n.partialNode, new d(n.token, s(), n.handlerContext)) : n;
+    } catch (s) {
+      throw s instanceof d ? (e.attributeList = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
     if (!this.discardUntil(
       "Expect an opening brace '{' or a colon ':'",
       c.LBRACE,
       c.COLON
     ))
-      return s();
+      return n();
     try {
       if (this.match(c.COLON)) {
         e.bodyColon = this.previous();
-        const n = this.expression();
-        n instanceof _ ? (E(n), this.logError(n, o.UNEXPECTED_ELEMENT_DECLARATION, "An element's simple body must not be an element declaration")) : e.body = n;
+        const s = this.expression();
+        s instanceof _ ? (E(s), this.logError(s, o.UNEXPECTED_ELEMENT_DECLARATION, "An element's simple body must not be an element declaration")) : e.body = s;
       } else
         e.body = this.blockExpression();
-    } catch (n) {
-      throw n instanceof d ? (e.body = n.partialNode, new d(n.token, s(), n.handlerContext)) : n;
+    } catch (s) {
+      throw s instanceof d ? (e.body = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
     return this.nodeFactory.create(_, e);
   }
@@ -1343,47 +1351,47 @@ class ln {
   //    Note: 'This is a note'  // fieldDeclaration() handles this
   //  }
   fieldDeclaration() {
-    const e = {}, s = () => this.nodeFactory.create(_, e);
+    const e = {}, n = () => this.nodeFactory.create(_, e);
     try {
       this.consume("Expect an identifier", c.IDENTIFIER), e.type = this.previous();
-    } catch (n) {
-      throw n instanceof d ? (e.type = n.partialNode, new d(n.token, s(), n.handlerContext)) : n;
+    } catch (s) {
+      throw s instanceof d ? (e.type = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
     try {
       this.consume("Expect a colon ':'", c.COLON), e.bodyColon = this.previous();
-    } catch (n) {
-      throw n instanceof d ? (e.bodyColon = n.partialNode, new d(n.token, s(), n.handlerContext)) : n;
+    } catch (s) {
+      throw s instanceof d ? (e.bodyColon = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
     try {
-      const n = this.expression();
-      n instanceof _ ? this.errors.push(new u(o.INVALID_ELEMENT_IN_SIMPLE_BODY, "Simple body cannot be an element declaration", n)) : e.body = n;
-    } catch (n) {
-      throw n instanceof d ? (e.body = n.partialNode, new d(n.token, s(), n.handlerContext)) : n;
+      const s = this.expression();
+      s instanceof _ ? this.errors.push(new u(o.INVALID_ELEMENT_IN_SIMPLE_BODY, "Simple body cannot be an element declaration", s)) : e.body = s;
+    } catch (s) {
+      throw s instanceof d ? (e.body = s.partialNode, new d(s.token, n(), s.handlerContext)) : s;
     }
     return this.nodeFactory.create(_, e);
   }
   /* Parsing any ExpressionNode, including non-NormalExpression */
   expression() {
-    const e = { args: [] }, s = () => en(e.callee, e.args, this.nodeFactory).unwrap_or(
-      this.nodeFactory.create(x, e)
+    const e = { args: [] }, n = () => en(e.callee, e.args, this.nodeFactory).unwrap_or(
+      this.nodeFactory.create(k, e)
     );
     try {
       e.callee = this.normalExpression();
     } catch (i) {
-      throw i instanceof d ? (e.callee = i.partialNode, new d(i.token, s(), i.handlerContext)) : i;
+      throw i instanceof d ? (e.callee = i.partialNode, new d(i.token, n(), i.handlerContext)) : i;
     }
     if (this.shouldStopExpression())
-      return s();
-    let n = e.callee;
+      return n();
+    let s = e.callee;
     for (; !this.shouldStopExpression(); ) {
-      Ve(this.previous()) || this.logError(n, o.MISSING_SPACES, "Expect a following space");
+      Ve(this.previous()) || this.logError(s, o.MISSING_SPACES, "Expect a following space");
       try {
-        n = this.normalExpression(), e.args.push(n);
+        s = this.normalExpression(), e.args.push(s);
       } catch (i) {
-        throw i instanceof d ? (n = i.partialNode, e.args.push(n), new d(i.token, s(), i.handlerContext)) : i;
+        throw i instanceof d ? (s = i.partialNode, e.args.push(s), new d(i.token, n(), i.handlerContext)) : i;
       }
     }
-    return s();
+    return n();
   }
   shouldStopExpression() {
     if (this.isAtEnd() || bt(this.previous()))
@@ -1396,49 +1404,49 @@ class ln {
   }
   // Pratt's parsing algorithm
   expression_bp(e) {
-    let s = this.leftExpression_bp();
+    let n = this.leftExpression_bp();
     for (; !this.isAtEnd(); ) {
-      const n = this.peek();
-      if (n.kind === c.LPAREN) {
-        const { left: i } = ut(n);
+      const s = this.peek();
+      if (s.kind === c.LPAREN) {
+        const { left: i } = ut(s);
         if (i < e || // When '(' is encountered,
         // consider it part of another expression if
         // it's at the start of a new line
         // and we're currently not having unmatched '(' or '['
-        ot(this.previous(), n) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
+        ot(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
           break;
         try {
-          s = this.nodeFactory.create(H, {
-            callee: s,
+          n = this.nodeFactory.create(H, {
+            callee: n,
             argumentList: this.tupleExpression()
           });
         } catch (r) {
-          throw r instanceof d ? (s = this.nodeFactory.create(H, {
-            callee: s,
+          throw r instanceof d ? (n = this.nodeFactory.create(H, {
+            callee: n,
             argumentList: r.partialNode
-          }), new d(r.token, s, r.handlerContext)) : r;
+          }), new d(r.token, n, r.handlerContext)) : r;
         }
-      } else if (n.kind === c.LBRACKET) {
+      } else if (s.kind === c.LBRACKET) {
         if (Ve(this.previous()))
           break;
         try {
-          s = this.nodeFactory.create(he, {
-            expression: s,
+          n = this.nodeFactory.create(fe, {
+            expression: n,
             indexer: this.listExpression()
           });
         } catch (i) {
-          throw i instanceof d ? (s = this.nodeFactory.create(he, {
-            expression: s,
+          throw i instanceof d ? (n = this.nodeFactory.create(fe, {
+            expression: n,
             indexer: i.partialNode
-          }), new d(i.token, s, i.handlerContext)) : i;
+          }), new d(i.token, n, i.handlerContext)) : i;
         }
-      } else if (at(n)) {
-        const i = n, r = ut(i);
+      } else if (at(s)) {
+        const i = s, r = ut(i);
         if (r.left !== null) {
           if (r.left <= e)
             break;
-          this.advance(), s = this.nodeFactory.create(De, {
-            expression: s,
+          this.advance(), n = this.nodeFactory.create(De, {
+            expression: n,
             op: i
           });
         } else {
@@ -1447,51 +1455,51 @@ class ln {
             break;
           this.advance();
           try {
-            s = this.nodeFactory.create(q, {
-              leftExpression: s,
+            n = this.nodeFactory.create(q, {
+              leftExpression: n,
               op: i,
               rightExpression: i.value === "." ? this.extractOperand() : this.expression_bp(a.right)
             });
           } catch (l) {
-            throw l instanceof d ? (s = this.nodeFactory.create(q, {
-              leftExpression: s,
+            throw l instanceof d ? (n = this.nodeFactory.create(q, {
+              leftExpression: n,
               op: i,
               rightExpression: l.partialNode
-            }), new d(l.token, s, l.handlerContext)) : l;
+            }), new d(l.token, n, l.handlerContext)) : l;
           }
         }
       } else
         break;
     }
-    return s;
+    return n;
   }
   leftExpression_bp() {
     let e;
     if (at(this.peek())) {
-      const s = {};
-      s.op = this.peek();
-      const n = fn(s.op);
-      if (n.right === null)
+      const n = {};
+      n.op = this.peek();
+      const s = fn(n.op);
+      if (s.right === null)
         throw this.logError(
-          s.op,
+          n.op,
           o.UNKNOWN_PREFIX_OP,
-          `Unexpected '${s.op.value}' in an expression`
+          `Unexpected '${n.op.value}' in an expression`
         ), new d(
-          s.op,
-          this.nodeFactory.create(we, { pre: s.op }),
+          n.op,
+          this.nodeFactory.create(we, { pre: n.op }),
           this.contextStack.findHandlerContext(this.tokens, this.current)
         );
       this.advance();
       try {
-        s.expression = this.expression_bp(n.right);
+        n.expression = this.expression_bp(s.right);
       } catch (i) {
-        throw i instanceof d ? (s.expression = i.partialNode, new d(
+        throw i instanceof d ? (n.expression = i.partialNode, new d(
           i.token,
-          this.nodeFactory.create(Q, s),
+          this.nodeFactory.create(Q, n),
           i.handlerContext
         )) : i;
       }
-      e = this.nodeFactory.create(Q, s);
+      e = this.nodeFactory.create(Q, n);
     } else if (e = this.extractOperand(), e instanceof we)
       throw new d(
         this.peek(),
@@ -1526,14 +1534,14 @@ class ln {
     const e = {};
     try {
       this.consume("Expect a function expression", c.FUNCTION_EXPRESSION), e.value = this.previous();
-    } catch (s) {
-      throw s instanceof d ? (e.value = s.partialNode, new d(
-        s.token,
-        this.nodeFactory.create(K, e),
-        s.handlerContext
-      )) : s;
+    } catch (n) {
+      throw n instanceof d ? (e.value = n.partialNode, new d(
+        n.token,
+        this.nodeFactory.create(ee, e),
+        n.handlerContext
+      )) : n;
     }
-    return this.nodeFactory.create(K, e);
+    return this.nodeFactory.create(ee, e);
   }
   canBeField() {
     return this.peek().kind === c.IDENTIFIER && this.peek(1).kind === c.COLON;
@@ -1546,7 +1554,7 @@ class ln {
       c.NUMERIC_LITERAL
     ))
       return this.nodeFactory.create(R, {
-        expression: this.nodeFactory.create(pe, { literal: this.previous() })
+        expression: this.nodeFactory.create(de, { literal: this.previous() })
       });
     if (this.match(c.QUOTED_STRING, c.IDENTIFIER))
       return this.nodeFactory.create(R, {
@@ -1563,23 +1571,23 @@ class ln {
   attribute() {
     const e = {};
     if (this.check(c.COLON, c.RBRACKET, c.COMMA)) {
-      const s = this.peek();
+      const n = this.peek();
       this.logError(
-        s,
+        n,
         o.EMPTY_ATTRIBUTE_NAME,
         "Expect a non-empty attribute name"
-      ), e.name = this.nodeFactory.create(te, { identifiers: [] });
+      ), e.name = this.nodeFactory.create(K, { identifiers: [] });
     } else
       try {
         e.name = this.attributeName();
-      } catch (s) {
-        if (!(s instanceof d))
-          throw s;
-        if (e.name = s.partialNode, !this.canHandle(s))
+      } catch (n) {
+        if (!(n instanceof d))
+          throw n;
+        if (e.name = n.partialNode, !this.canHandle(n))
           throw new d(
-            s.token,
+            n.token,
             this.nodeFactory.create(ne, e),
-            s.handlerContext
+            n.handlerContext
           );
         this.synchronizeAttributeName();
       }
@@ -1589,10 +1597,10 @@ class ln {
     let e;
     try {
       e = this.peek().kind === c.IDENTIFIER && this.peek(1).kind === c.IDENTIFIER ? this.attributeName() : this.normalExpression();
-    } catch (s) {
-      if (!(s instanceof d) || !this.canHandle(s))
-        throw s;
-      e = s.partialNode, this.synchronizeAttributeValue();
+    } catch (n) {
+      if (!(n instanceof d) || !this.canHandle(n))
+        throw n;
+      e = n.partialNode, this.synchronizeAttributeValue();
     }
     return e;
   }
@@ -1603,17 +1611,17 @@ class ln {
     for (; !this.isAtEnd() && !this.check(c.COLON, c.COMMA, c.RBRACKET); )
       try {
         this.consume("Expect an identifier", c.IDENTIFIER), e.push(this.previous());
-      } catch (s) {
-        throw s instanceof d ? new d(
-          s.token,
-          this.nodeFactory.create(te, { identifiers: e }),
-          s.handlerContext
-        ) : s;
+      } catch (n) {
+        throw n instanceof d ? new d(
+          n.token,
+          this.nodeFactory.create(K, { identifiers: e }),
+          n.handlerContext
+        ) : n;
       }
-    return this.nodeFactory.create(te, { identifiers: e });
+    return this.nodeFactory.create(K, { identifiers: e });
   }
-  logError(e, s, n) {
-    this.errors.push(new u(s, n, e));
+  logError(e, n, s) {
+    this.errors.push(new u(n, s, e));
   }
 }
 const cn = {
@@ -1653,9 +1661,9 @@ function ut(t) {
   return pn[t.value] || { left: null, right: null };
 }
 var b = /* @__PURE__ */ ((t) => (t.Table = "table", t.Enum = "enum", t.Ref = "ref", t.Note = "note", t.Project = "project", t.Indexes = "indexes", t.TableGroup = "tablegroup", t))(b || {});
-function de(t) {
-  var s;
-  const e = (s = t == null ? void 0 : t.type) == null ? void 0 : s.value.toLowerCase();
+function Ee(t) {
+  var n;
+  const e = (n = t == null ? void 0 : t.type) == null ? void 0 : n.value.toLowerCase();
   switch (e) {
     case b.Enum:
     case b.Table:
@@ -1669,39 +1677,39 @@ function de(t) {
       return new A();
   }
 }
-function Ee(t) {
+function Ne(t) {
   if (!He(t))
     return new S([t]);
-  const e = Ee(t.leftExpression).unwrap_or(void 0);
+  const e = Ne(t.leftExpression).unwrap_or(void 0);
   return e ? (e.push(t.rightExpression), new S(e)) : new A();
 }
 function W(t) {
   if (t === void 0)
     return new A();
-  const e = Ee(t).unwrap_or(void 0);
+  const e = Ne(t).unwrap_or(void 0);
   if (!e)
     return new A();
-  const s = [];
-  for (const n of e) {
-    const i = G(n).unwrap_or(void 0);
+  const n = [];
+  for (const s of e) {
+    const i = G(s).unwrap_or(void 0);
     if (!i)
       return new A();
-    s.push(i);
+    n.push(i);
   }
-  return new S(s);
+  return new S(n);
 }
 function Le(t) {
   if (t === void 0)
     return new A();
-  const e = Ee(t).unwrap_or(void 0);
+  const e = Ne(t).unwrap_or(void 0);
   if (!e || e.length === 0)
     return new A();
-  const s = [];
-  let n;
+  const n = [];
+  let s;
   if (!M(I.last(e))) {
     const i = e.pop();
-    if (xt(i))
-      n = i.elementList.map(
+    if (kt(i))
+      s = i.elementList.map(
         (r) => V(r).unwrap()
       );
     else
@@ -1711,11 +1719,11 @@ function Le(t) {
     const r = G(i).unwrap_or(void 0);
     if (!r)
       return new A();
-    s.push(r);
+    n.push(r);
   }
   return new S({
-    variables: s,
-    tupleElements: n
+    variables: n,
+    tupleElements: s
   });
 }
 function G(t) {
@@ -1723,18 +1731,18 @@ function G(t) {
 }
 function Ge(t) {
   if (ht(t))
-    return t instanceof K ? new S({ functional: [t], nonFunctional: [] }) : new S({ functional: [], nonFunctional: [t] });
+    return t instanceof ee ? new S({ functional: [t], nonFunctional: [] }) : new S({ functional: [], nonFunctional: [t] });
   if (t instanceof J && t.elementList.every(ht)) {
     const e = t.elementList.filter(
-      (n) => n instanceof K
-    ), s = t.elementList.filter(M);
-    return new S({ functional: e, nonFunctional: s });
+      (s) => s instanceof ee
+    ), n = t.elementList.filter(M);
+    return new S({ functional: e, nonFunctional: n });
   }
   return new A();
 }
 function V(t) {
-  var s;
-  const e = (s = t == null ? void 0 : t.expression.variable) == null ? void 0 : s.value;
+  var n;
+  const e = (n = t == null ? void 0 : t.expression.variable) == null ? void 0 : n.value;
   return e === void 0 ? new A() : new S(e);
 }
 function Y(t) {
@@ -1745,38 +1753,38 @@ function dn(t) {
   return !(t instanceof q) || !yt((e = t.op) == null ? void 0 : e.value) ? !1 : Le(t.leftExpression).and_then(() => Le(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
 function En(t) {
-  const e = Le(t.leftExpression), s = Le(t.rightExpression);
-  if (!e.isOk() || !s.isOk())
+  const e = Le(t.leftExpression), n = Le(t.rightExpression);
+  if (!e.isOk() || !n.isOk())
     return !1;
-  const { tupleElements: n } = e.unwrap(), { tupleElements: i } = s.unwrap();
-  return (n == null ? void 0 : n.length) === (i == null ? void 0 : i.length);
+  const { tupleElements: s } = e.unwrap(), { tupleElements: i } = n.unwrap();
+  return (s == null ? void 0 : s.length) === (i == null ? void 0 : i.length);
 }
 function ht(t) {
-  return t instanceof R && t.expression instanceof X || t instanceof K;
+  return t instanceof R && t.expression instanceof X || t instanceof ee;
 }
 function Nn(t, e) {
   var i, r, a, l;
-  let s = e;
-  const n = jt(t);
-  for (; s; ) {
-    if ((r = (i = s.symbol) == null ? void 0 : i.symbolTable) != null && r.has(t))
-      return (a = s.symbol.symbolTable) == null ? void 0 : a.get(t);
-    if (((l = s.symbol) == null ? void 0 : l.declaration) instanceof C && n)
-      return s.symbol;
-    if (s instanceof C)
+  let n = e;
+  const s = jt(t);
+  for (; n; ) {
+    if ((r = (i = n.symbol) == null ? void 0 : i.symbolTable) != null && r.has(t))
+      return (a = n.symbol.symbolTable) == null ? void 0 : a.get(t);
+    if (((l = n.symbol) == null ? void 0 : l.declaration) instanceof C && s)
+      return n.symbol;
+    if (n instanceof C)
       return;
-    s = s.parent;
+    n = n.parent;
   }
 }
 class mn {
-  constructor(e, s, n) {
-    this.declarationNode = e, this.publicSymbolTable = s, this.symbolFactory = n;
+  constructor(e, n, s) {
+    this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
   validate() {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof C || de(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new u(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof C || Ee(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new u(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new u(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
@@ -1790,10 +1798,10 @@ class mn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof ee)
+    if (e instanceof te)
       return [new u(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
-    const s = [];
-    return $(e.callee) || s.push(new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && s.push(...e.args.map((n) => new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", n))), s;
+    const n = [];
+    return $(e.callee) || n.push(new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
   }
 }
 class _e {
@@ -1803,19 +1811,19 @@ class _e {
   has(e) {
     return this.table.has(e);
   }
-  set(e, s) {
-    this.table.set(e, s);
+  set(e, n) {
+    this.table.set(e, n);
   }
-  get(e, s) {
-    return this.table.get(e) || s !== void 0 && this.set(e, s) || s;
+  get(e, n) {
+    return this.table.get(e) || n !== void 0 && this.set(e, n) || n;
   }
   entries() {
     return this.table.entries();
   }
 }
 class Tn {
-  constructor(e, s, n) {
-    this.declarationNode = e, this.publicSymbolTable = s, this.symbolFactory = n;
+  constructor(e, n, s) {
+    this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
   validate() {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.registerElement(), ...this.validateBody(this.declarationNode.body)];
@@ -1832,10 +1840,10 @@ class Tn {
   registerElement() {
     const e = [];
     this.declarationNode.symbol = this.symbolFactory.create(qt, { declaration: this.declarationNode, symbolTable: new _e() });
-    const { name: s } = this.declarationNode, n = W(s);
-    if (n.isOk()) {
-      const i = n.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), l = je(r);
-      a.has(l) && e.push(new u(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, s)), a.set(l, this.declarationNode.symbol);
+    const { name: n } = this.declarationNode, s = W(n);
+    if (s.isOk()) {
+      const i = s.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), l = je(r);
+      a.has(l) && e.push(new u(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, n)), a.set(l, this.declarationNode.symbol);
     }
     return e;
   }
@@ -1845,67 +1853,67 @@ class Tn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof x)
+    if (e instanceof k)
       return this.validateFields([e]);
-    const [s, n] = I.partition(e.body, (i) => i instanceof x);
-    return [...this.validateFields(s), ...this.validateSubElements(n)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
+    return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
-    return e.length === 0 ? [new u(o.EMPTY_ENUM, "An Enum must have at least one element", this.declarationNode)] : e.flatMap((s) => {
-      const n = [];
-      return s.callee && !M(s.callee) && n.push(new u(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", s.callee)), I.last(s.args) instanceof U && n.push(...this.validateFieldSetting(I.last(s.args))), s.args.length > 1 && n.push(...s.args.map((i) => new u(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", i))), n.push(...this.registerField(s)), n;
+    return e.length === 0 ? [new u(o.EMPTY_ENUM, "An Enum must have at least one element", this.declarationNode)] : e.flatMap((n) => {
+      const s = [];
+      return n.callee && !M(n.callee) && s.push(new u(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), I.last(n.args) instanceof U && s.push(...this.validateFieldSetting(I.last(n.args))), n.args.length > 1 && s.push(...n.args.map((i) => new u(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", i))), s.push(...this.registerField(n)), s;
     });
   }
   validateFieldSetting(e) {
-    const s = z(e), n = s.getErrors(), i = s.getValue();
+    const n = z(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
-          a.length > 1 && a.forEach((l) => n.push(new u(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
-            $(l.value) || n.push(new u(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
+          a.length > 1 && a.forEach((l) => s.push(new u(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
+            $(l.value) || s.push(new u(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
           });
           break;
         default:
-          a.forEach((l) => n.push(new u(o.UNKNOWN_ENUM_ELEMENT_SETTING, `Unknown enum field setting '${r}'`, l)));
+          a.forEach((l) => s.push(new u(o.UNKNOWN_ENUM_ELEMENT_SETTING, `Unknown enum field setting '${r}'`, l)));
       }
     }
-    return n;
+    return s;
   }
   validateSubElements(e) {
-    return e.flatMap((s) => {
-      if (s.parent = this.declarationNode, !s.type)
+    return e.flatMap((n) => {
+      if (n.parent = this.declarationNode, !n.type)
         return [];
-      const n = ie(s);
-      return new n(s, this.publicSymbolTable, this.symbolFactory).validate();
+      const s = ie(n);
+      return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const s = V(e.callee).unwrap(), n = Ye(s), i = this.symbolFactory.create(Ht, { declaration: e });
+      const n = V(e.callee).unwrap(), s = Ye(n), i = this.symbolFactory.create(Ht, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
-      if (r.has(n)) {
-        const a = r.get(n);
+      if (r.has(s)) {
+        const a = r.get(s);
         return [
-          new u(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${s}`, e),
-          new u(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${s}`, a.declaration)
+          new u(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, e),
+          new u(o.DUPLICATE_COLUMN_NAME, `Duplicate enum field ${n}`, a.declaration)
         ];
       }
-      r.set(n, i);
+      r.set(s, i);
     }
     return [];
   }
 }
 class bn {
-  constructor(e, s, n) {
-    this.declarationNode = e, this.publicSymbolTable = s, this.symbolFactory = n;
+  constructor(e, n, s) {
+    this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
   validate() {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof C || de(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new u(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof C || Ee(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new u(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new u(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
@@ -1919,69 +1927,69 @@ class bn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof x)
+    if (e instanceof k)
       return [new u(o.UNEXPECTED_SIMPLE_BODY, "An Indexes must have a complex body", e)];
-    const [s, n] = I.partition(e.body, (i) => i instanceof x);
-    return [...this.validateFields(s), ...this.validateSubElements(n)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
+    return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
-    return e.flatMap((s) => {
-      if (!s.callee)
+    return e.flatMap((n) => {
+      if (!n.callee)
         return [];
-      const n = [], i = [s.callee, ...s.args];
-      return I.last(i) instanceof U && n.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
+      const s = [], i = [n.callee, ...n.args];
+      return I.last(i) instanceof U && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
         for (; r instanceof H; )
-          r.argumentList && !Ge(r.argumentList).isOk() && n.push(new u(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
-        Ge(r).isOk() || n.push(new u(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
-      }), n;
+          r.argumentList && !Ge(r.argumentList).isOk() && s.push(new u(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
+        Ge(r).isOk() || s.push(new u(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
+      }), s;
     });
   }
   validateFieldSetting(e) {
-    const s = z(e), n = s.getErrors(), i = s.getValue();
+    const n = z(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
         case "name":
-          a.length > 1 && a.forEach((l) => n.push(new u(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
-            $(l.value) || n.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
+          a.length > 1 && a.forEach((l) => s.push(new u(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
+            $(l.value) || s.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
           });
           break;
         case "unique":
         case "pk":
-          a.length > 1 && a.forEach((l) => n.push(new u(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
-            oe(l.value) || n.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must not have a value`, l));
+          a.length > 1 && a.forEach((l) => s.push(new u(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
+            oe(l.value) || s.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must not have a value`, l));
           });
           break;
         case "type":
-          a.length > 1 && a.forEach((l) => n.push(new u(o.DUPLICATE_INDEX_SETTING, "'type' can only appear once", l))), a.forEach((l) => {
-            M(l.value) || n.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'type' must be "btree" or "hash"`, l));
+          a.length > 1 && a.forEach((l) => s.push(new u(o.DUPLICATE_INDEX_SETTING, "'type' can only appear once", l))), a.forEach((l) => {
+            M(l.value) || s.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'type' must be "btree" or "hash"`, l));
           });
           break;
         default:
-          a.forEach((l) => n.push(new u(o.UNKNOWN_INDEX_SETTING, `Unknown index setting '${r}'`, l)));
+          a.forEach((l) => s.push(new u(o.UNKNOWN_INDEX_SETTING, `Unknown index setting '${r}'`, l)));
       }
     }
-    return n;
+    return s;
   }
   validateSubElements(e) {
-    return e.flatMap((s) => {
-      if (s.parent = this.declarationNode, !s.type)
+    return e.flatMap((n) => {
+      if (n.parent = this.declarationNode, !n.type)
         return [];
-      const n = ie(s);
-      return new n(s, this.publicSymbolTable, this.symbolFactory).validate();
+      const s = ie(n);
+      return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
 class In {
-  constructor(e, s, n) {
-    this.declarationNode = e, this.publicSymbolTable = s, this.symbolFactory = n;
+  constructor(e, n, s) {
+    this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
   validate() {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof C || ![b.Table, b.Project].includes(de(this.declarationNode.parent).unwrap_or(void 0)) ? [new u(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof C || ![b.Table, b.Project].includes(Ee(this.declarationNode.parent).unwrap_or(void 0)) ? [new u(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new u(o.UNEXPECTED_NAME, "A Note shouldn't have a name", e)] : [];
@@ -1995,27 +2003,27 @@ class In {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof x)
+    if (e instanceof k)
       return this.validateFields([e]);
-    const [s, n] = I.partition(e.body, (i) => i instanceof x);
-    return [...this.validateFields(s), ...this.validateSubElements(n)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
+    return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
-    const s = [];
-    return e.length === 0 ? [new u(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((n) => s.push(new u(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", n))), $(e[0].callee) || s.push(new u(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && s.push(...e[0].args.map((n) => new u(o.INVALID_NOTE, "A Note can only contain one quoted string", n))), s);
+    const n = [];
+    return e.length === 0 ? [new u(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new u(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), $(e[0].callee) || n.push(new u(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new u(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
   }
   validateSubElements(e) {
-    return e.flatMap((s) => {
-      if (s.parent = this.declarationNode, !s.type)
+    return e.flatMap((n) => {
+      if (n.parent = this.declarationNode, !n.type)
         return [];
-      const n = ie(s);
-      return new n(s, this.publicSymbolTable, this.symbolFactory).validate();
+      const s = ie(n);
+      return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
 class Ln {
-  constructor(e, s, n) {
-    this.declarationNode = e, this.publicSymbolTable = s, this.symbolFactory = n;
+  constructor(e, n, s) {
+    this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
   validate() {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
@@ -2035,32 +2043,32 @@ class Ln {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof x)
+    if (e instanceof k)
       return [new u(o.UNEXPECTED_SIMPLE_BODY, "A Project's body must be a block", e)];
-    const [s, n] = I.partition(e.body, (i) => i instanceof x);
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
     return [
-      ...s.map((i) => new u(o.INVALID_PROJECT_FIELD, "A Project can not have inline fields", i)),
-      ...this.validateSubElements(n)
+      ...n.map((i) => new u(o.INVALID_PROJECT_FIELD, "A Project can not have inline fields", i)),
+      ...this.validateSubElements(s)
     ];
   }
   validateSubElements(e) {
-    return e.flatMap((s) => {
-      if (s.parent = this.declarationNode, !s.type)
+    return e.flatMap((n) => {
+      if (n.parent = this.declarationNode, !n.type)
         return [];
-      const n = ie(s);
-      return new n(s, this.publicSymbolTable, this.symbolFactory).validate();
+      const s = ie(n);
+      return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
 class gn {
-  constructor(e, s, n) {
-    this.declarationNode = e, this.publicSymbolTable = s, this.symbolFactory = n;
+  constructor(e, n, s) {
+    this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
   validate() {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof C || de(this.declarationNode.parent).unwrap_or(void 0) === b.Table ? [] : [new u(o.INVALID_REF_CONTEXT, "A Ref must appear top-level or inside a table", this.declarationNode)];
+    return this.declarationNode.parent instanceof C || Ee(this.declarationNode.parent).unwrap_or(void 0) === b.Table ? [] : [new u(o.INVALID_REF_CONTEXT, "A Ref must appear top-level or inside a table", this.declarationNode)];
   }
   validateName(e) {
     return e ? Pe(e) ? [] : [new u(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
@@ -2074,50 +2082,50 @@ class gn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof x)
+    if (e instanceof k)
       return this.validateFields([e]);
-    const [s, n] = I.partition(e.body, (i) => i instanceof x);
-    return [...this.validateFields(s), ...this.validateSubElements(n)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
+    return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
     if (e.length === 0)
       return [new u(o.EMPTY_REF, "A Ref must have at least one field", this.declarationNode)];
-    const s = [];
-    return e.length > 1 && s.push(...e.slice(1).map((n) => new u(o.REF_REDEFINED, "A Ref can only contain one binary relationship", n))), e.forEach((n) => {
-      n.callee && !dn(n.callee) && s.push(new u(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", n.callee)), n.callee && !En(n.callee) && s.push(new u(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", n.callee)), I.last(n.args) instanceof U && this.validateFieldSettings(I.last(n.args)), n.args.length > 1 && s.push(...n.args.map((i) => new u(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", i)));
-    }), s;
+    const n = [];
+    return e.length > 1 && n.push(...e.slice(1).map((s) => new u(o.REF_REDEFINED, "A Ref can only contain one binary relationship", s))), e.forEach((s) => {
+      s.callee && !dn(s.callee) && n.push(new u(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !En(s.callee) && n.push(new u(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee)), I.last(s.args) instanceof U && this.validateFieldSettings(I.last(s.args)), s.args.length > 1 && n.push(...s.args.map((i) => new u(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", i)));
+    }), n;
   }
   validateFieldSettings(e) {
-    const s = z(e), n = s.getErrors(), i = s.getValue();
+    const n = z(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "delete":
         case "update":
-          a.length > 1 && a.forEach((l) => n.push(new u(o.DUPLICATE_REF_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
-            _n(l.value) || n.push(new u(o.INVALID_REF_SETTING_VALUE, `'${r}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, l));
+          a.length > 1 && a.forEach((l) => s.push(new u(o.DUPLICATE_REF_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
+            _n(l.value) || s.push(new u(o.INVALID_REF_SETTING_VALUE, `'${r}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, l));
           });
           break;
         default:
-          a.forEach((l) => n.push(new u(o.UNKNOWN_REF_SETTING, `Unknown ref setting '${r}'`, l)));
+          a.forEach((l) => s.push(new u(o.UNKNOWN_REF_SETTING, `Unknown ref setting '${r}'`, l)));
       }
     }
-    return n;
+    return s;
   }
   validateSubElements(e) {
-    return e.flatMap((s) => {
-      if (s.parent = this.declarationNode, !s.type)
+    return e.flatMap((n) => {
+      if (n.parent = this.declarationNode, !n.type)
         return [];
-      const n = ie(s);
-      return new n(s, this.publicSymbolTable, this.symbolFactory).validate();
+      const s = ie(n);
+      return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
 }
 function _n(t) {
-  if (!(M(t) && t.expression.variable.kind !== c.QUOTED_STRING) && !(t instanceof te))
+  if (!(M(t) && t.expression.variable.kind !== c.QUOTED_STRING) && !(t instanceof K))
     return !1;
   let e;
-  if (t instanceof te ? e = Re(t).unwrap_or("") : e = t.expression.variable.value, e)
+  if (t instanceof K ? e = Re(t).unwrap_or("") : e = t.expression.variable.value, e)
     switch (e.toLowerCase()) {
       case "cascade":
       case "no action":
@@ -2131,8 +2139,8 @@ function _n(t) {
   return !1;
 }
 class An {
-  constructor(e, s, n) {
-    this.declarationNode = e, this.symbolFactory = n, this.publicSymbolTable = s;
+  constructor(e, n, s) {
+    this.declarationNode = e, this.symbolFactory = s, this.publicSymbolTable = n;
   }
   validate() {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.registerElement(), ...this.validateBody(this.declarationNode.body)];
@@ -2141,89 +2149,89 @@ class An {
     return this.declarationNode.parent instanceof _ ? [new u(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? e instanceof he ? [new u(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Je(e) ? [] : [new u(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new u(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
+    return e ? e instanceof fe ? [new u(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Je(e) ? [] : [new u(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new u(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
   }
   validateAlias(e) {
-    return e ? xn(e) ? [] : [new u(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
+    return e ? kn(e) ? [] : [new u(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
   }
   validateSettingList(e) {
-    const s = z(e), n = s.getErrors(), i = s.getValue();
+    const n = z(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "headercolor":
-          a.length > 1 && n.push(...a.map((l) => new u(o.DUPLICATE_TABLE_SETTING, "'headercolor' can only appear once", l))), a.forEach((l) => {
-            kn(l.value) || n.push(new u(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", l.value || l.name));
+          a.length > 1 && s.push(...a.map((l) => new u(o.DUPLICATE_TABLE_SETTING, "'headercolor' can only appear once", l))), a.forEach((l) => {
+            xn(l.value) || s.push(new u(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", l.value || l.name));
           });
           break;
         case "note":
-          a.length > 1 && n.push(...a.map((l) => new u(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
-            $(l.value) || n.push(new u(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
+          a.length > 1 && s.push(...a.map((l) => new u(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
+            $(l.value) || s.push(new u(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
           });
           break;
         default:
-          n.push(...a.map((l) => new u(o.INVALID_TABLE_SETTING, `Unknown '${r}' setting`, l)));
+          s.push(...a.map((l) => new u(o.INVALID_TABLE_SETTING, `Unknown '${r}' setting`, l)));
       }
     }
-    return n;
+    return s;
   }
   registerElement() {
     const e = [];
     this.declarationNode.symbol = this.symbolFactory.create(At, { declaration: this.declarationNode, symbolTable: new _e() });
-    const { name: s, alias: n } = this.declarationNode, i = W(s);
+    const { name: n, alias: s } = this.declarationNode, i = W(n);
     if (i.isOk()) {
-      const r = [...i.unwrap()], a = r.pop(), l = Ze(r, this.publicSymbolTable, this.symbolFactory), p = xe(a);
-      l.has(p) && e.push(new u(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, s)), l.set(p, this.declarationNode.symbol);
+      const r = [...i.unwrap()], a = r.pop(), l = Ze(r, this.publicSymbolTable, this.symbolFactory), p = ke(a);
+      l.has(p) && e.push(new u(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, n)), l.set(p, this.declarationNode.symbol);
     }
-    if (n && Pe(n) && !wn(n.expression.variable.value, i.unwrap_or([]))) {
-      const r = V(n).unwrap(), a = xe(r);
-      this.publicSymbolTable.has(a) && e.push(new u(o.DUPLICATE_NAME, `Table name '${r}' already exists`, s)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
+    if (s && Pe(s) && !wn(s.expression.variable.value, i.unwrap_or([]))) {
+      const r = V(s).unwrap(), a = ke(r);
+      this.publicSymbolTable.has(a) && e.push(new u(o.DUPLICATE_NAME, `Table name '${r}' already exists`, n)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
     }
     return e;
   }
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof x)
+    if (e instanceof k)
       return [new u(o.UNEXPECTED_SIMPLE_BODY, "A Table's body must be a block", e)];
-    const [s, n] = I.partition(e.body, (i) => i instanceof x);
-    return [...this.validateFields(s), ...this.validateSubElements(n)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
+    return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
-    return e.length === 0 ? [new u(o.EMPTY_TABLE, "A Table must have at least one column", this.declarationNode)] : e.flatMap((s) => {
-      if (!s.callee)
+    return e.length === 0 ? [new u(o.EMPTY_TABLE, "A Table must have at least one column", this.declarationNode)] : e.flatMap((n) => {
+      if (!n.callee)
         return [];
-      const n = [];
-      s.args.length === 0 && n.push(new u(o.INVALID_COLUMN, "A column must have a type", s.callee)), M(s.callee) || n.push(new u(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", s.callee)), s.args[0] && !vn(s.args[0]) && n.push(new u(o.INVALID_COLUMN_TYPE, "Invalid column type", s.args[0]));
-      const i = s.args.slice(1);
-      return n.push(...this.validateFieldSetting(i)), n.push(...this.registerField(s)), n;
+      const s = [];
+      n.args.length === 0 && s.push(new u(o.INVALID_COLUMN, "A column must have a type", n.callee)), M(n.callee) || s.push(new u(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), n.args[0] && !vn(n.args[0]) && s.push(new u(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
+      const i = n.args.slice(1);
+      return s.push(...this.validateFieldSetting(i)), s.push(...this.registerField(n)), s;
     });
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const s = V(e.callee).unwrap(), n = We(s), i = this.symbolFactory.create(Jt, { declaration: e });
+      const n = V(e.callee).unwrap(), s = We(n), i = this.symbolFactory.create(Jt, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
-      if (r.has(n)) {
-        const a = r.get(n);
+      if (r.has(s)) {
+        const a = r.get(s);
         return [
-          new u(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${s}`, e),
-          new u(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${s}`, a.declaration)
+          new u(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, e),
+          new u(o.DUPLICATE_COLUMN_NAME, `Duplicate column ${n}`, a.declaration)
         ];
       }
-      r.set(n, i);
+      r.set(s, i);
     }
     return [];
   }
   // This is needed to support legacy inline settings
   validateFieldSetting(e) {
-    if (!e.slice(0, -1).every(fe) || !e.slice(-1).every((p) => fe(p) || p instanceof U))
+    if (!e.slice(0, -1).every(pe) || !e.slice(-1).every((p) => pe(p) || p instanceof U))
       return [...e.map((p) => new u(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
     if (e.length === 0)
       return [];
-    let s;
-    I.last(e) instanceof U && (s = e.pop());
-    const n = z(s), i = n.getErrors(), r = n.getValue();
+    let n;
+    I.last(e) instanceof U && (n = e.pop());
+    const s = z(n), i = s.getErrors(), r = s.getValue();
     for (const p of e) {
       const h = V(p).unwrap_or("").toLowerCase();
       if (h !== "pk" && h !== "unique") {
@@ -2291,28 +2299,28 @@ class An {
     return i;
   }
   validateSubElements(e) {
-    const s = e.flatMap((i) => {
+    const n = e.flatMap((i) => {
       if (i.parent = this.declarationNode, !i.type)
         return [];
       const r = ie(i);
       return new r(i, this.publicSymbolTable, this.symbolFactory).validate();
-    }), n = e.filter((i) => {
+    }), s = e.filter((i) => {
       var r;
       return ((r = i.type) == null ? void 0 : r.value.toLowerCase()) === "note";
     });
-    return n.length > 1 && (s.push(...n.map((i) => new u(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), s.push()), s;
+    return s.length > 1 && (n.push(...s.map((i) => new u(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n.push()), n;
   }
 }
 function vn(t) {
-  if (!(t instanceof H || He(t) || t instanceof R || t instanceof he))
+  if (!(t instanceof H || He(t) || t instanceof R || t instanceof fe))
     return !1;
   if (t instanceof H) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((s) => le(s) || $(s) || fe(s)))
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => le(n) || $(n) || pe(n)))
       return !1;
     t = t.callee;
   }
-  for (; t instanceof he; ) {
-    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((s) => !s.colon && !s.value && le(s.name)))
+  for (; t instanceof fe; ) {
+    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((n) => !n.colon && !n.value && le(n.name)))
       return !1;
     t = t.array;
   }
@@ -2323,8 +2331,8 @@ function wn(t, e) {
   return e.length === 1 && t === e[0];
 }
 class yn {
-  constructor(e, s, n) {
-    this.declarationNode = e, this.publicSymbolTable = s, this.symbolFactory = n;
+  constructor(e, n, s) {
+    this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
   validate() {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.registerElement(), ...this.validateBody(this.declarationNode.body)];
@@ -2341,11 +2349,11 @@ class yn {
   registerElement() {
     const { name: e } = this.declarationNode;
     this.declarationNode.symbol = this.symbolFactory.create(Zt, { declaration: this.declarationNode, symbolTable: new _e() });
-    const s = W(e);
-    if (s.isOk()) {
-      const n = s.unwrap(), i = n.pop(), r = Ze(n, this.publicSymbolTable, this.symbolFactory), a = ze(i);
+    const n = W(e);
+    if (n.isOk()) {
+      const s = n.unwrap(), i = s.pop(), r = Ze(s, this.publicSymbolTable, this.symbolFactory), a = ze(i);
       if (r.has(a))
-        return [new u(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists in schema '${n.join(".") || "public"}'`, e)];
+        return [new u(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists in schema '${s.join(".") || "public"}'`, e)];
       r.set(a, this.declarationNode.symbol);
     }
     return [];
@@ -2356,38 +2364,38 @@ class yn {
   validateBody(e) {
     if (!e)
       return [];
-    if (e instanceof x)
+    if (e instanceof k)
       return [new u(o.UNEXPECTED_SIMPLE_BODY, "A TableGroup's body must be a block", e)];
-    const [s, n] = I.partition(e.body, (i) => i instanceof x);
-    return [...this.validateFields(s), ...this.validateSubElements(n)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
+    return [...this.validateFields(n), ...this.validateSubElements(s)];
   }
   validateFields(e) {
-    return e.flatMap((s) => {
-      const n = [];
-      return s.callee && !W(s.callee).isOk() && n.push(new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", s.callee)), this.registerField(s), s.args.length > 0 && n.push(...s.args.map((i) => new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), n;
+    return e.flatMap((n) => {
+      const s = [];
+      return n.callee && !W(n.callee).isOk() && s.push(new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", n.callee)), this.registerField(n), n.args.length > 0 && s.push(...n.args.map((i) => new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), s;
     });
   }
   validateSubElements(e) {
-    return e.flatMap((s) => {
-      if (s.parent = this.declarationNode, !s.type)
+    return e.flatMap((n) => {
+      if (n.parent = this.declarationNode, !n.type)
         return [];
-      const n = ie(s);
-      return new n(s, this.publicSymbolTable, this.symbolFactory).validate();
+      const s = ie(n);
+      return new s(n, this.publicSymbolTable, this.symbolFactory).validate();
     });
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const s = V(e.callee).unwrap(), n = Qe(s), i = this.symbolFactory.create(Kt, { declaration: e });
+      const n = V(e.callee).unwrap(), s = Qe(n), i = this.symbolFactory.create(Kt, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
-      if (r.has(n)) {
-        const a = r.get(n);
+      if (r.has(s)) {
+        const a = r.get(s);
         return [
-          new u(o.DUPLICATE_TABLEGROUP_FIELD_NAME, `${s} already exists in the group`, e),
-          new u(o.DUPLICATE_TABLEGROUP_FIELD_NAME, `${s} already exists in the group`, a.declaration)
+          new u(o.DUPLICATE_TABLEGROUP_FIELD_NAME, `${n} already exists in the group`, e),
+          new u(o.DUPLICATE_TABLEGROUP_FIELD_NAME, `${n} already exists in the group`, a.declaration)
         ];
       }
-      r.set(n, i);
+      r.set(s, i);
     }
     return [];
   }
@@ -2416,43 +2424,43 @@ function ie(t) {
 function Je(t) {
   return !!W(t).unwrap_or(!1);
 }
-function xn(t) {
+function kn(t) {
   return Pe(t);
 }
 function Pe(t) {
   return t instanceof R && t.expression instanceof X;
 }
-function Ze(t, e, s) {
+function Ze(t, e, n) {
   var i;
   t[0] === "public" && (t = t.slice(1));
-  let n = e;
+  let s = e;
   for (const r of t) {
     let a;
     const l = $e(r);
-    if (n.has(l)) {
-      if (a = (i = n.get(l)) == null ? void 0 : i.symbolTable, !a)
+    if (s.has(l)) {
+      if (a = (i = s.get(l)) == null ? void 0 : i.symbolTable, !a)
         throw new Error("Expect a symbol table in a schema symbol");
     } else {
       a = new _e();
-      const p = s.create(_t, { symbolTable: a });
-      n.set(l, p);
+      const p = n.create(_t, { symbolTable: a });
+      s.set(l, p);
     }
-    n = a;
+    s = a;
   }
-  return n;
+  return s;
 }
 function yt(t) {
   return t === "-" || t === "<>" || t === ">" || t === "<";
 }
-function kn(t) {
-  var s;
-  if (!(t instanceof R) || !(t.expression instanceof pe) || ((s = t.expression.literal) == null ? void 0 : s.kind) !== c.COLOR_LITERAL)
+function xn(t) {
+  var n;
+  if (!(t instanceof R) || !(t.expression instanceof de) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== c.COLOR_LITERAL)
     return !1;
   const e = t.expression.literal.value;
   if (e.length !== 4 && e.length !== 7 || e[0] !== "#")
     return !1;
-  for (let n = 1; n < e.length; n += 1)
-    if (!zt(e[n]))
+  for (let s = 1; s < e.length; s += 1)
+    if (!zt(e[s]))
       return !1;
   return !0;
 }
@@ -2461,130 +2469,130 @@ function oe(t) {
 }
 function Sn(t) {
   var e;
-  return !!($(t) || le(t) || fe(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && le(t.expression) || t instanceof K);
+  return !!($(t) || le(t) || pe(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && le(t.expression) || t instanceof ee);
 }
 function le(t) {
   var e;
-  return t instanceof R && t.expression instanceof pe && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.NUMERIC_LITERAL;
+  return t instanceof R && t.expression instanceof de && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.NUMERIC_LITERAL;
 }
 function On(t) {
-  var s;
-  if (!(t instanceof Q) || !yt((s = t.op) == null ? void 0 : s.value))
+  var n;
+  if (!(t instanceof Q) || !yt((n = t.op) == null ? void 0 : n.value))
     return !1;
   const e = W(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
-function xt(t) {
+function kt(t) {
   return t instanceof J && t.elementList.every(M);
 }
 function z(t) {
-  var n;
-  const e = {}, s = [];
+  var s;
+  const e = {}, n = [];
   if (!t)
     return new F({});
   for (const i of t.elementList) {
     if (!i.name)
       continue;
     if (i.name instanceof R) {
-      s.push(new u(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
+      n.push(new u(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
       continue;
     }
-    const r = (n = Re(i.name).unwrap_or(void 0)) == null ? void 0 : n.toLowerCase();
+    const r = (s = Re(i.name).unwrap_or(void 0)) == null ? void 0 : s.toLowerCase();
     r && (e[r] === void 0 ? e[r] = [i] : e[r].push(i));
   }
-  return new F(e, s);
+  return new F(e, n);
 }
 class ft {
-  constructor(e, s) {
-    this.ast = e, this.symbolFactory = s, this.publicSchemaSymbol = this.symbolFactory.create(_t, {
+  constructor(e, n) {
+    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(_t, {
       symbolTable: new _e()
     }), this.ast.symbol = this.publicSchemaSymbol, this.ast.symbol.declaration = this.ast;
   }
   validate() {
     const e = [];
-    this.ast.body.forEach((n) => {
-      if (n.parent = this.ast, n.type === void 0)
+    this.ast.body.forEach((s) => {
+      if (s.parent = this.ast, s.type === void 0)
         return;
-      const i = ie(n), r = new i(
-        n,
+      const i = ie(s), r = new i(
+        s,
         this.publicSchemaSymbol.symbolTable,
         this.symbolFactory
       );
       e.push(...r.validate());
     });
-    const s = this.ast.body.filter((n) => de(n).unwrap_or(void 0) === b.Project);
-    return s.length > 1 && s.forEach((n) => e.push(new u(o.PROJECT_REDEFINED, "Only one project can exist", n))), new F(this.ast, e);
+    const n = this.ast.body.filter((s) => Ee(s).unwrap_or(void 0) === b.Project);
+    return n.length > 1 && n.forEach((s) => e.push(new u(o.PROJECT_REDEFINED, "Only one project can exist", s))), new F(this.ast, e);
   }
 }
 class re {
-  constructor(e, s) {
-    this.declarationNode = e, this.errors = s;
+  constructor(e, n) {
+    this.declarationNode = e, this.errors = n;
   }
   bind() {
     this.bindSettingList(this.declarationNode.attributeList, this.settingList), this.bindBody();
   }
-  bindSettingList(e, s) {
+  bindSettingList(e, n) {
     if (e)
-      for (const n of e.elementList) {
-        if (n.name instanceof R)
+      for (const s of e.elementList) {
+        if (s.name instanceof R)
           continue;
-        const i = Re(n.name).unwrap_or(void 0);
+        const i = Re(s.name).unwrap_or(void 0);
         if (!i)
           continue;
-        const r = s[i.toLowerCase()];
-        r != null && r.shouldBind && this.scanAndBind(n.value, r);
+        const r = n[i.toLowerCase()];
+        r != null && r.shouldBind && this.scanAndBind(s.value, r);
       }
   }
   bindBody() {
     const e = this.declarationNode;
     if (!e.body)
       return;
-    const { body: s } = e;
-    if (s instanceof ee)
-      for (const n of s.body)
-        if (n instanceof _) {
-          if (!n.type)
+    const { body: n } = e;
+    if (n instanceof te)
+      for (const s of n.body)
+        if (s instanceof _) {
+          if (!s.type)
             continue;
-          const i = kt(n);
-          new i(n, this.errors).bind();
+          const i = xt(s);
+          new i(s, this.errors).bind();
         } else
-          this.bindSubfield(n);
+          this.bindSubfield(s);
     else
-      this.bindSubfield(s);
+      this.bindSubfield(n);
   }
   bindSubfield(e) {
-    const s = [e.callee, ...e.args], n = I.last(s);
-    n instanceof U && (s.pop(), this.bindSettingList(n, this.subfield.settingList));
+    const n = [e.callee, ...e.args], s = I.last(n);
+    s instanceof U && (n.pop(), this.bindSettingList(s, this.subfield.settingList));
     const { argBinderRules: i } = this.subfield.arg;
-    for (let r = 0; r < Math.min(s.length, i.length); r += 1)
-      i[r].shouldBind && this.scanAndBind(s[r], i[r]);
+    for (let r = 0; r < Math.min(n.length, i.length); r += 1)
+      i[r].shouldBind && this.scanAndBind(n[r], i[r]);
   }
   // Scan for variable node and member access expression in the node to bind
-  scanAndBind(e, s) {
-    var n, i;
+  scanAndBind(e, n) {
+    var s, i;
     if (e)
       if (e instanceof R) {
-        if (e.expression instanceof X && ((i = s.keywords) != null && i.includes((n = e.expression.variable) == null ? void 0 : n.value.toLowerCase())))
+        if (e.expression instanceof X && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
           return;
-        this.bindFragments([e], s);
+        this.bindFragments([e], n);
       } else
-        e instanceof q ? He(e) ? this.bindFragments(Ee(e).unwrap_or([]), s) : (this.scanAndBind(e.leftExpression, s), this.scanAndBind(e.rightExpression, s)) : e instanceof Q ? this.scanAndBind(e.expression, s) : e instanceof De ? this.scanAndBind(e.expression, s) : e instanceof J && e.elementList.forEach((r) => this.scanAndBind(r, s));
+        e instanceof q ? He(e) ? this.bindFragments(Ne(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof Q ? this.scanAndBind(e.expression, n) : e instanceof De ? this.scanAndBind(e.expression, n) : e instanceof J && e.elementList.forEach((r) => this.scanAndBind(r, n));
   }
   // Bind the fragments of a member access expression
   // which can be a simple expression like v1.User,
   // or a complex tuple like v1.User.(id, name)
-  bindFragments(e, s) {
+  bindFragments(e, n) {
     if (e.length === 0)
       return;
-    const n = [...s.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: i } = s, r = e.findIndex((f) => !M(f)), l = r !== -1 && xt(e[r]) ? e[r] : void 0, p = r >= 0 ? n.pop() : void 0, h = e.slice(
+    const s = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: i } = n, r = e.findIndex((f) => !M(f)), l = r !== -1 && kt(e[r]) ? e[r] : void 0, p = r >= 0 ? s.pop() : void 0, h = e.slice(
       0,
       r === -1 ? void 0 : r
     );
     if (h.length === 0)
       return;
     const T = [];
-    for (; n.length && h.length; ) {
-      const f = n.pop(), N = h.pop(), g = V(N).unwrap();
+    for (; s.length && h.length; ) {
+      const f = s.pop(), N = h.pop(), g = V(N).unwrap();
       T.unshift({
         index: Fe(g, f),
         referrer: N
@@ -2609,30 +2617,30 @@ class re {
             referrer: f
           }
         ],
-        s.ignoreNameNotFound
+        n.ignoreNameNotFound
       )
-    ) : this.resolveIndexStack(T, s.ignoreNameNotFound);
+    ) : this.resolveIndexStack(T, 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, s) {
+  resolveIndexStack(e, n) {
     if (e.length === 0)
       throw new Error("Unreachable - An unresolved name must have at least one name component");
-    const [n, ...i] = e, r = Nn(n.index, this.declarationNode);
+    const [s, ...i] = e, r = Nn(s.index, this.declarationNode);
     if (r === void 0) {
-      const { kind: h, name: T } = se(n.index).unwrap();
-      this.logError(n.referrer, `Can not find ${h} '${T}'`, s);
+      const { kind: h, name: T } = se(s.index).unwrap();
+      this.logError(s.referrer, `Can not find ${h} '${T}'`, n);
       return;
     }
-    r.references.push(n.referrer), n.referrer.referee = r;
-    let a = r.symbolTable, { kind: l, name: p } = se(n.index).unwrap();
+    r.references.push(s.referrer), s.referrer.referee = r;
+    let a = r.symbolTable, { kind: l, name: p } = se(s.index).unwrap();
     for (const h of i) {
       const { kind: T, name: f } = se(h.index).unwrap(), N = a.get(h.index);
       if (!N) {
         this.logError(
           h.referrer,
           `${l} '${p}' does not have ${T} '${f}'`,
-          s
+          n
         );
         return;
       }
@@ -2641,8 +2649,8 @@ class re {
       a = N.symbolTable;
     }
   }
-  logError(e, s, n) {
-    n || this.errors.push(new u(o.BINDING_ERROR, s, e));
+  logError(e, n, s) {
+    s || this.errors.push(new u(o.BINDING_ERROR, n, e));
   }
 }
 class Dn extends re {
@@ -2782,7 +2790,7 @@ class Vn extends re {
     }, this.settingList = {};
   }
 }
-function kt(t) {
+function xt(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
       return Rn;
@@ -2809,8 +2817,8 @@ class Gn {
   resolve() {
     for (const e of this.ast.body)
       if (e.type) {
-        const s = kt(e);
-        new s(e, this.errors).bind();
+        const n = xt(e);
+        new n(e, this.errors).bind();
       }
     return new F(this.ast, this.errors);
   }
@@ -2819,41 +2827,41 @@ class Cn {
   constructor(e) {
     this.generator = e;
   }
-  create(e, s) {
-    return new e(s, this.generator.nextId());
+  create(e, n) {
+    return new e(n, this.generator.nextId());
   }
 }
 class Xn {
-  constructor(e, s) {
-    this.ast = e, this.symbolFactory = new Cn(s);
+  constructor(e, n) {
+    this.ast = e, this.symbolFactory = new Cn(n);
   }
   // Analyzing: Invoking both the validator and binder
   analyze() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((s) => new Gn(s).resolve());
+    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new Gn(n).resolve());
   }
   // For invoking the validator only
   validate() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((s) => new F(s, []));
+    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new F(n, []));
   }
 }
 function pt(t, e) {
-  const { variables: s, tupleElements: n } = Le(t).unwrap();
-  return n ? s.length === 0 ? {
+  const { variables: n, tupleElements: s } = Le(t).unwrap();
+  return s ? n.length === 0 ? {
     schemaName: e.schemaName,
     tableName: e.name,
-    fieldNames: n
+    fieldNames: s
   } : {
-    tableName: s.pop(),
-    schemaName: s.pop() || null,
-    fieldNames: n
-  } : s.length === 1 ? {
+    tableName: n.pop(),
+    schemaName: n.pop() || null,
+    fieldNames: s
+  } : n.length === 1 ? {
     schemaName: e.schemaName,
     tableName: e.name,
-    fieldNames: [s[0]]
+    fieldNames: [n[0]]
   } : {
-    fieldNames: [s.pop()],
-    tableName: s.pop(),
-    schemaName: s.pop() || null
+    fieldNames: [n.pop()],
+    tableName: n.pop(),
+    schemaName: n.pop() || null
   };
 }
 function St(t) {
@@ -2869,7 +2877,7 @@ function St(t) {
   }
   throw new Error("Invalid relation op");
 }
-function k(t) {
+function x(t) {
   return {
     start: {
       offset: t.startPos.offset,
@@ -2880,9 +2888,9 @@ function k(t) {
   };
 }
 function Ce(t) {
-  var s;
-  const e = (s = Ee(t).unwrap_or(void 0)) == null ? void 0 : s.pop();
-  return e instanceof J ? e.elementList.map((n) => n.referee) : [e.referee];
+  var n;
+  const e = (n = Ne(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
+  return e instanceof J ? e.elementList.map((s) => s.referee) : [e.referee];
 }
 function Ae(t) {
   const e = W(t).unwrap();
@@ -2899,34 +2907,34 @@ function Ot(t, e) {
     const i = t.map(({ id: a }) => a).sort().join(","), r = e.map(({ id: a }) => a).sort().join(",");
     return i < r ? `${i}-${r}` : `${i}-${r}`;
   }
-  const s = t.id, n = e.id;
-  return s < n ? `${s}-${n}` : `${n}-${s}`;
+  const n = t.id, s = e.id;
+  return n < s ? `${n}-${s}` : `${s}-${n}`;
 }
 function Dt(t, e) {
   if (Array.isArray(t)) {
     const i = t.map(({ id: a }) => a).sort(), r = e.map(({ id: a }) => a).sort();
     return I.zip(i, r).every(([a, l]) => a === l);
   }
-  const s = t.id, n = e.id;
-  return s === n;
+  const n = t.id, s = e.id;
+  return n === s;
 }
 class Ke {
-  constructor(e, s) {
-    this.declarationNode = e, this.env = s, this.container = this.declarationNode.parent instanceof _ ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
+  constructor(e, n) {
+    this.declarationNode = e, this.env = n, this.container = this.declarationNode.parent instanceof _ ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
   }
   interpret() {
-    return this.ref.token = k(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.ref.token = x(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
-    const s = [], n = W(this.declarationNode.name).unwrap_or([]);
-    return this.ref.name = n.pop() || null, n.length > 1 && s.push(new u(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name)), this.ref.schemaName = n.join(".") || null, s;
+    const n = [], s = W(this.declarationNode.name).unwrap_or([]);
+    return this.ref.name = s.pop() || null, s.length > 1 && n.push(new u(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name)), this.ref.schemaName = s.join(".") || null, n;
   }
   interpretBody(e) {
-    return e instanceof x ? this.interpretField(e) : this.interpretField(e.body[0]);
+    return e instanceof k ? this.interpretField(e) : this.interpretField(e.body[0]);
   }
   interpretField(e) {
     var h, T, f, N;
-    const s = e.callee.op.value, { leftExpression: n, rightExpression: i } = e.callee, r = Ce(n), a = Ce(i);
+    const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, r = Ce(s), a = Ce(i);
     if (Dt(r, a))
       return [new u(o.SAME_ENDPOINT, "Two endpoints are the same", e)];
     const l = Ot(r, a);
@@ -2939,27 +2947,27 @@ class Ke {
       const g = z(e.args[0]).getValue();
       this.ref.onDelete = G((T = (h = g.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value).unwrap_or(void 0), this.ref.onDelete = G((N = (f = g.delete) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
     }
-    const p = St(s);
+    const p = St(n);
     return this.ref.endpoints = [
       {
-        ...pt(n, this.container),
+        ...pt(s, this.container),
         relation: p[0],
-        token: k(n)
+        token: x(s)
       },
       {
         ...pt(i, this.container),
         relation: p[1],
-        token: k(i)
+        token: x(i)
       }
     ], this.env.refIds[l] = this.declarationNode, [];
   }
 }
 class Rt {
-  constructor(e, s) {
-    this.declarationNode = e, this.env = s, this.table = { name: void 0, schemaName: void 0, alias: null, fields: [], token: void 0, indexes: [] }, this.pkColumns = [];
+  constructor(e, n) {
+    this.declarationNode = e, this.env = n, this.table = { name: void 0, schemaName: void 0, alias: null, fields: [], token: void 0, indexes: [] }, this.pkColumns = [];
   }
   interpret() {
-    this.table.token = k(this.declarationNode), this.env.tables.set(this.declarationNode, this.table);
+    this.table.token = x(this.declarationNode), this.env.tables.set(this.declarationNode, this.table);
     const e = [
       ...this.interpretName(this.declarationNode.name),
       ...this.interpretAlias(this.declarationNode.alias),
@@ -2967,7 +2975,7 @@ class Rt {
       ...this.interpretBody(this.declarationNode.body)
     ];
     return this.pkColumns.length >= 2 && (this.table.indexes.push({
-      columns: this.pkColumns.map(({ name: s }) => ({ value: s, type: "column" })),
+      columns: this.pkColumns.map(({ name: n }) => ({ value: n, type: "column" })),
       token: {
         start: { offset: -1, line: -1, column: -1 },
         // do not make sense to have a meaningful start (?)
@@ -2975,79 +2983,79 @@ class Rt {
         // do not make sense to have a meaningful end (?)
       },
       pk: !0
-    }), this.pkColumns.forEach((s) => s.pk = !1)), e;
+    }), this.pkColumns.forEach((n) => n.pk = !1)), e;
   }
   interpretName(e) {
-    const { name: s, schemaName: n } = Ae(e);
-    return n.length > 1 ? (this.table.name = s, this.table.schemaName = n.join("."), [new u(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.table.name = s, this.table.schemaName = n.length ? n[0] : null, []);
+    const { name: n, schemaName: s } = Ae(e);
+    return s.length > 1 ? (this.table.name = n, this.table.schemaName = s.join("."), [new u(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.table.name = n, this.table.schemaName = s.length ? s[0] : null, []);
   }
   interpretAlias(e) {
     if (!e)
       return [];
-    const s = V(e).unwrap_or(null);
-    return s && (this.env.aliases.push({
-      name: s,
+    const n = V(e).unwrap_or(null);
+    return n && (this.env.aliases.push({
+      name: n,
       kind: "table",
       value: {
         tableName: this.table.name,
         schemaName: this.table.schemaName
       }
-    }), this.table.alias = s), [];
+    }), this.table.alias = n), [];
   }
   interpretSettingList(e) {
     var r, a, l;
-    const s = z(e).getValue();
-    this.table.headerColor = (r = s.headercolor) != null && r.length ? $n((l = (a = s.headercolor) == null ? void 0 : a.at(0)) == null ? void 0 : l.value) : void 0;
-    const [n] = s.note || [], i = Y(n == null ? void 0 : n.value).unwrap_or(void 0);
-    return this.table.note = n && {
+    const n = z(e).getValue();
+    this.table.headerColor = (r = n.headercolor) != null && r.length ? $n((l = (a = n.headercolor) == null ? void 0 : a.at(0)) == null ? void 0 : l.value) : void 0;
+    const [s] = n.note || [], i = Y(s == null ? void 0 : s.value).unwrap_or(void 0);
+    return this.table.note = s && {
       value: i,
-      token: k(n)
+      token: x(s)
     }, [];
   }
   interpretBody(e) {
-    const [s, n] = I.partition(e.body, (i) => i instanceof x);
-    return [...this.interpretFields(s), ...this.interpretSubElements(n)];
+    const [n, s] = I.partition(e.body, (i) => i instanceof k);
+    return [...this.interpretFields(n), ...this.interpretSubElements(s)];
   }
   interpretSubElements(e) {
-    return e.flatMap((s) => {
-      var n;
-      switch ((n = s.type) == null ? void 0 : n.value.toLowerCase()) {
+    return e.flatMap((n) => {
+      var s;
+      switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: Y(s.body instanceof ee ? s.body.body[0].callee : s.body.callee).unwrap(),
-            token: k(s)
+            value: Y(n.body instanceof te ? n.body.body[0].callee : n.body.callee).unwrap(),
+            token: x(n)
           }, [];
         case "indexes":
-          return this.interpretIndexes(s);
+          return this.interpretIndexes(n);
         case "ref":
-          return new Ke(s, this.env).interpret();
+          return new Ke(n, this.env).interpret();
       }
       return [];
     });
   }
   interpretFields(e) {
-    return e.flatMap((s) => this.interpretColumn(s));
+    return e.flatMap((n) => this.interpretColumn(n));
   }
   interpretColumn(e) {
     var a, l, p, h, T, f, N, g;
-    const s = [], n = {};
-    n.name = V(e.callee).unwrap();
+    const n = [], s = {};
+    s.name = V(e.callee).unwrap();
     const i = Wn(e.args[0]);
-    n.type = i.getValue(), s.push(...i.getErrors()), n.token = k(e), n.inline_refs = [];
+    s.type = i.getValue(), n.push(...i.getErrors()), s.token = x(e), s.inline_refs = [];
     const r = e.args.slice(1);
     if (I.last(r) instanceof U) {
       const v = z(r.pop()).getValue();
-      n.pk = !!((a = v.pk) != null && a.length) || !!((l = v["primary key"]) != null && l.length), n.increment = !!((p = v.increment) != null && p.length), n.unique = !!((h = v.unique) != null && h.length), n.not_null = !!((T = v["not null"]) != null && T.length) && !0, n.dbdefault = jn((N = (f = v.default) == null ? void 0 : f.at(0)) == null ? void 0 : N.value);
-      const Ne = (g = v.note) == null ? void 0 : g.at(0);
-      n.note = Ne && {
-        value: Y(Ne.value).unwrap(),
-        token: k(Ne)
+      s.pk = !!((a = v.pk) != null && a.length) || !!((l = v["primary key"]) != null && l.length), s.increment = !!((p = v.increment) != null && p.length), s.unique = !!((h = v.unique) != null && h.length), s.not_null = !!((T = v["not null"]) != null && T.length) && !0, s.dbdefault = jn((N = (f = v.default) == null ? void 0 : f.at(0)) == null ? void 0 : N.value);
+      const me = (g = v.note) == null ? void 0 : g.at(0);
+      s.note = me && {
+        value: Y(me.value).unwrap(),
+        token: x(me)
       };
-      const me = v.ref || [];
-      n.inline_refs = me.flatMap((j) => {
+      const Te = v.ref || [];
+      s.inline_refs = Te.flatMap((j) => {
         const [nt] = Ce(j.value.expression);
         if (Dt(nt, e.symbol))
-          return s.push(new u(o.SAME_ENDPOINT, "Two endpoints are the same", j)), [];
+          return n.push(new u(o.SAME_ENDPOINT, "Two endpoints are the same", j)), [];
         const ve = j.value.op, Z = W(j.value.expression).unwrap();
         let ce;
         if (Z.length === 1) {
@@ -3057,57 +3065,57 @@ class Rt {
             tableName: this.table.name,
             fieldNames: [ae],
             relation: ve.value,
-            token: k(j)
+            token: x(j)
           };
         } else if (Z.length === 2) {
-          const [ae, Te] = Z;
+          const [ae, be] = Z;
           ce = {
             schemaName: null,
             tableName: ae,
-            fieldNames: [Te],
+            fieldNames: [be],
             relation: ve.value,
-            token: k(j)
+            token: x(j)
           };
         } else if (Z.length === 3) {
-          const [ae, Te, it] = Z;
+          const [ae, be, it] = Z;
           ce = {
             schemaName: ae,
-            tableName: Te,
+            tableName: be,
             fieldNames: [it],
             relation: ve.value,
-            token: k(j)
+            token: x(j)
           };
         } else {
-          s.push(new u(o.UNSUPPORTED, "Nested schema is not supported", j));
-          const ae = Z.pop(), Te = Z.pop();
+          n.push(new u(o.UNSUPPORTED, "Nested schema is not supported", j));
+          const ae = Z.pop(), be = Z.pop();
           ce = {
             schemaName: Z.join("."),
-            tableName: Te,
+            tableName: be,
             fieldNames: [ae],
             relation: ve.value,
-            token: k(j)
+            token: x(j)
           };
         }
         const st = this.registerInlineRefToEnv(e, nt, ce, j);
-        return s.push(...st), st.length === 0 ? ce : [];
+        return n.push(...st), st.length === 0 ? ce : [];
       });
     }
-    return n.pk || (n.pk = r.some((v) => G(v).unwrap().toLowerCase() === "pk")), n.unique || (n.unique = r.some((v) => G(v).unwrap().toLowerCase() === "unique")), this.table.fields.push(n), n.pk && this.pkColumns.push(n), s;
+    return s.pk || (s.pk = r.some((v) => G(v).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((v) => G(v).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
   }
   interpretIndexes(e) {
-    return this.table.indexes.push(...e.body.body.map((s) => {
+    return this.table.indexes.push(...e.body.body.map((n) => {
       var a, l, p, h, T, f, N;
-      const n = { columns: [] }, i = s;
-      n.token = k(e);
+      const s = { columns: [] }, i = n;
+      s.token = x(e);
       const r = [i.callee, ...i.args];
       if (I.last(r) instanceof U) {
         const g = z(r.pop()).getValue();
-        n.pk = !!((a = g.pk) != null && a.length), n.unique = !!((l = g.unique) != null && l.length), n.name = Y((h = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
+        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((l = g.unique) != null && l.length), s.name = Y((h = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
         const v = (T = g.note) == null ? void 0 : T.at(0);
-        n.note = v && {
+        s.note = v && {
           value: Y(v.value).unwrap(),
-          token: k(v)
-        }, n.type = G((N = (f = g.type) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
+          token: x(v)
+        }, s.type = G((N = (f = g.type) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
       }
       return r.flatMap((g) => {
         if (!(g instanceof H))
@@ -3117,42 +3125,42 @@ class Rt {
           v.push(g.argumentList), g = g.callee;
         return v.push(g), v;
       }).forEach((g) => {
-        const { functional: v, nonFunctional: Ne } = Ge(g).unwrap();
-        n.columns.push(
-          ...v.map((me) => ({
-            value: me.value.value,
+        const { functional: v, nonFunctional: me } = Ge(g).unwrap();
+        s.columns.push(
+          ...v.map((Te) => ({
+            value: Te.value.value,
             type: "expression"
           })),
-          ...Ne.map((me) => ({
-            value: V(me).unwrap(),
+          ...me.map((Te) => ({
+            value: V(Te).unwrap(),
             type: "column"
           }))
         );
-      }), n;
+      }), s;
     })), [];
   }
-  registerInlineRefToEnv(e, s, n, i) {
-    const r = Ot(e.symbol, s);
+  registerInlineRefToEnv(e, n, s, i) {
+    const r = Ot(e.symbol, n);
     if (this.env.refIds[r])
       return [
         new u(o.CIRCULAR_REF, "References with same endpoints exist", i),
         new u(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[r])
       ];
-    const a = St(n.relation);
+    const a = St(s.relation);
     return this.env.refIds[r] = i, this.env.ref.set(i, {
       name: null,
       schemaName: null,
-      token: n.token,
+      token: s.token,
       endpoints: [
         {
-          ...n,
+          ...s,
           relation: a[1]
         },
         {
           schemaName: this.table.schemaName,
           tableName: this.table.name,
           fieldNames: [G(e.callee).unwrap()],
-          token: k(e),
+          token: x(e),
           relation: a[0]
         }
       ]
@@ -3162,25 +3170,25 @@ class Rt {
 function Wn(t) {
   let e = null;
   t instanceof H && (e = t.argumentList.elementList.map((r) => le(r) ? r.expression.literal.value : $(r) ? Y(r).unwrap() : G(r).unwrap()).join(","), t = t.callee);
-  let s = "";
-  for (; t instanceof he; )
-    s = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${s}`, t = t.array;
-  const { name: n, schemaName: i } = Ae(t);
-  return i.length > 1 && new F(
+  let n = "";
+  for (; t instanceof fe; )
+    n = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${n}`, t = t.array;
+  const { name: s, schemaName: i } = Ae(t);
+  return i.length > 1 ? new F(
     {
       schemaName: i.length === 0 ? null : i[0],
-      type_name: `${n}${s}${e ? `(${e})` : ""}`,
+      type_name: `${s}${n}${e ? `(${e})` : ""}`,
       args: e
     },
     [new u(o.UNSUPPORTED, "Nested schema is not supported", t)]
-  ), new F({
+  ) : new F({
     schemaName: i.length === 0 ? null : i[0],
-    type_name: `${n}${s}${e ? `(${e})` : ""}`,
+    type_name: `${s}${n}${e ? `(${e})` : ""}`,
     args: e
   });
 }
 function jn(t) {
-  var e, s, n;
+  var e, n, s;
   if (t) {
     if ($(t))
       return {
@@ -3192,7 +3200,7 @@ function jn(t) {
         type: "number",
         value: Number.parseFloat(t.expression.literal.value)
       };
-    if (fe(t))
+    if (pe(t))
       return {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
@@ -3200,27 +3208,27 @@ function jn(t) {
     if (t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && le(t.expression)) {
       const i = Number.parseFloat(t.expression.expression.literal.value);
       return {
-        value: ((s = t.op) == null ? void 0 : s.value) === "-" ? 0 - i : i,
+        value: ((n = t.op) == null ? void 0 : n.value) === "-" ? 0 - i : i,
         type: "number"
       };
     }
-    if (t instanceof K)
+    if (t instanceof ee)
       return {
-        value: (n = t.value) == null ? void 0 : n.value,
+        value: (s = t.value) == null ? void 0 : s.value,
         type: "expression"
       };
     throw new Error("Unreachable");
   }
 }
 class Pt {
-  constructor(e, s) {
-    this.declarationNode = e, this.env = s, this.tableGroup = { tables: [] };
+  constructor(e, n) {
+    this.declarationNode = e, this.env = n, this.tableGroup = { tables: [] };
   }
   interpret() {
     const e = [];
-    this.tableGroup.token = k(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup);
-    const { name: s, schemaName: n } = Ae(this.declarationNode.name);
-    return n.length >= 2 && (this.tableGroup.name = s, this.tableGroup.schemaName = n.join("."), e.push(new u(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = s, this.tableGroup.schemaName = n[0] || null, this.tableGroup.tables = this.declarationNode.body.body.map((i) => {
+    this.tableGroup.token = x(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup);
+    const { name: n, schemaName: s } = Ae(this.declarationNode.name);
+    return s.length >= 2 && (this.tableGroup.name = n, this.tableGroup.schemaName = s.join("."), e.push(new u(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = n, this.tableGroup.schemaName = s[0] || null, this.tableGroup.tables = this.declarationNode.body.body.map((i) => {
       const r = W(i.callee).unwrap();
       return r.length > 2 && e.push(new u(o.UNSUPPORTED, "Nested schema is not supported", i)), {
         name: r.pop(),
@@ -3230,32 +3238,32 @@ class Pt {
   }
 }
 class Ut {
-  constructor(e, s) {
-    this.declarationNode = e, this.env = s, this.enum = { values: [] };
+  constructor(e, n) {
+    this.declarationNode = e, this.env = n, this.enum = { values: [] };
   }
   interpret() {
-    return this.enum.token = k(this.declarationNode), this.env.enums.set(this.declarationNode, this.enum), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
+    return this.enum.token = x(this.declarationNode), this.env.enums.set(this.declarationNode, this.enum), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
-    const { name: s, schemaName: n } = Ae(e);
-    return n.length > 1 ? (this.enum.name = s, this.enum.schemaName = n.join("."), [new u(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.enum.name = s, this.enum.schemaName = n.length ? n[0] : null, []);
+    const { name: n, schemaName: s } = Ae(e);
+    return s.length > 1 ? (this.enum.name = n, this.enum.schemaName = s.join("."), [new u(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.enum.name = n, this.enum.schemaName = s.length ? s[0] : null, []);
   }
   interpretBody(e) {
-    return e.body.flatMap((s) => {
+    return e.body.flatMap((n) => {
       var l;
-      const n = s, i = {};
-      i.token = k(n), i.name = G(n.callee).unwrap();
-      const a = (l = z(n.args[0]).getValue().note) == null ? void 0 : l.at(0);
+      const s = n, i = {};
+      i.token = x(s), i.name = G(s.callee).unwrap();
+      const a = (l = z(s.args[0]).getValue().note) == null ? void 0 : l.at(0);
       return i.note = a && {
         value: Y(a.value).unwrap(),
-        token: k(a)
+        token: x(a)
       }, this.enum.values.push(i), [];
     });
   }
 }
 class Yn {
-  constructor(e, s) {
-    this.declarationNode = e, this.env = s, this.project = { enums: [], refs: [], tableGroups: [], tables: [] };
+  constructor(e, n) {
+    this.declarationNode = e, this.env = n, this.project = { enums: [], refs: [], tableGroups: [], tables: [] };
   }
   interpret() {
     return this.env.project.set(this.declarationNode, this.project), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
@@ -3263,37 +3271,37 @@ class Yn {
   interpretName(e) {
     if (!e)
       return this.project.name = null, [];
-    const { name: s } = Ae(e);
-    return this.project.name = s, [];
+    const { name: n } = Ae(e);
+    return this.project.name = n, [];
   }
   interpretBody(e) {
-    return e.body.flatMap((s) => {
+    return e.body.flatMap((n) => {
       var i;
-      const n = s;
-      switch ((i = n.type) == null ? void 0 : i.value.toLowerCase()) {
+      const s = n;
+      switch ((i = s.type) == null ? void 0 : i.value.toLowerCase()) {
         case "table": {
-          const r = new Rt(n, this.env).interpret();
-          return this.project.tables.push(this.env.tables.get(n)), r;
+          const r = new Rt(s, this.env).interpret();
+          return this.project.tables.push(this.env.tables.get(s)), r;
         }
         case "ref": {
-          const r = new Ke(n, this.env).interpret();
-          return this.project.refs.push(this.env.ref.get(n)), r;
+          const r = new Ke(s, this.env).interpret();
+          return this.project.refs.push(this.env.ref.get(s)), r;
         }
         case "tablegroup": {
-          const r = new Pt(n, this.env).interpret();
-          return this.project.tableGroups.push(this.env.tableGroups.get(n)), r;
+          const r = new Pt(s, this.env).interpret();
+          return this.project.tableGroups.push(this.env.tableGroups.get(s)), r;
         }
         case "enum": {
-          const r = new Ut(n, this.env).interpret();
-          return this.project.enums.push(this.env.enums.get(n)), r;
+          const r = new Ut(s, this.env).interpret();
+          return this.project.enums.push(this.env.enums.get(s)), r;
         }
         case "note":
           return this.project.note = {
-            value: Y(n.body instanceof ee ? n.body.body[0].callee : n.body.callee).unwrap(),
-            token: k(n)
+            value: Y(s.body instanceof te ? s.body.body[0].callee : s.body.callee).unwrap(),
+            token: x(s)
           }, [];
         default:
-          return this.project[n.type.value.toLowerCase()] = Y(n.body.callee).unwrap(), [];
+          return this.project[s.type.value.toLowerCase()] = Y(s.body.callee).unwrap(), [];
       }
     });
   }
@@ -3312,18 +3320,18 @@ class zn {
     };
   }
   interpret() {
-    const e = this.ast.body.flatMap((s) => {
-      switch (de(s).unwrap_or(void 0)) {
+    const e = this.ast.body.flatMap((n) => {
+      switch (Ee(n).unwrap_or(void 0)) {
         case b.Table:
-          return new Rt(s, this.env).interpret();
+          return new Rt(n, this.env).interpret();
         case b.Ref:
-          return new Ke(s, this.env).interpret();
+          return new Ke(n, this.env).interpret();
         case b.TableGroup:
-          return new Pt(s, this.env).interpret();
+          return new Pt(n, this.env).interpret();
         case b.Enum:
-          return new Ut(s, this.env).interpret();
+          return new Ut(n, this.env).interpret();
         case b.Project:
-          return new Yn(s, this.env).interpret();
+          return new Yn(n, this.env).interpret();
         default:
           return [];
       }
@@ -3366,10 +3374,10 @@ function ge(t) {
 function Se(t, e) {
   if (!t || Ve(t))
     return !1;
-  for (const s of t.trailingTrivia) {
-    if (s.start > e)
+  for (const n of t.trailingTrivia) {
+    if (n.start > e)
       break;
-    if (s.kind === c.NEWLINE && s.end <= e)
+    if (n.kind === c.NEWLINE && n.end <= e)
       return !1;
   }
   return !0;
@@ -3401,26 +3409,26 @@ function et(t, e) {
   return t.getOffsetAt(e);
 }
 class Mt {
-  constructor(e, s = []) {
-    this.compiler = e, this.triggerCharacters = s;
+  constructor(e, n = []) {
+    this.compiler = e, this.triggerCharacters = n;
   }
-  provideCompletionItems(e, s) {
+  provideCompletionItems(e, n) {
     var T, f;
-    const n = et(e, s), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(n), l = a === void 0 ? i[0] : i[a + 1];
+    const s = et(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), l = a === void 0 ? i[0] : i[a + 1];
     if ([
       ...(r == null ? void 0 : r.trailingTrivia) || [],
       ...(r == null ? void 0 : r.leadingTrivia) || [],
       ...(l == null ? void 0 : l.leadingTrivia) || []
-    ].find((N) => $t(N) && Ie(n, N)))
+    ].find((N) => $t(N) && Ie(s, N)))
       return O();
     if (a === void 0)
       return Tt();
-    if ([c.STRING_LITERAL, c.QUOTED_STRING].includes(r.kind) && Ie(n, r))
+    if ([c.STRING_LITERAL, c.QUOTED_STRING].includes(r.kind) && Ie(s, r))
       return O();
-    const p = this.compiler.container.element(n);
-    if (this.compiler.container.scopeKind(n) === D.TOPLEVEL || p instanceof _ && p.type && p.type.start <= n && p.type.end >= n)
+    const p = this.compiler.container.element(s);
+    if (this.compiler.container.scopeKind(s) === D.TOPLEVEL || p instanceof _ && p.type && p.type.start <= s && p.type.end >= s)
       return Tt();
-    const h = [...this.compiler.container.stack(n)].reverse();
+    const h = [...this.compiler.container.stack(s)].reverse();
     for (const N of h)
       if (N instanceof Q)
         switch ((T = N.op) == null ? void 0 : T.value) {
@@ -3430,7 +3438,7 @@ class Mt {
           case "-":
             return dt(
               this.compiler,
-              n,
+              s,
               N
             );
         }
@@ -3442,54 +3450,54 @@ class Mt {
           case "-":
             return dt(
               this.compiler,
-              n,
+              s,
               N
             );
           case ".":
             return Ft(
               this.compiler,
-              n,
+              s,
               N
             );
         }
       else {
         if (N instanceof ne)
-          return Et(this.compiler, n, N);
+          return Et(this.compiler, s, N);
         if (N instanceof U)
-          return Et(this.compiler, n, N);
+          return Et(this.compiler, s, N);
         if (N instanceof J)
-          return qn(this.compiler, n);
-        if (N instanceof x)
-          return mt(this.compiler, n, N);
-        if (N instanceof _ && (N.bodyColon && n >= N.bodyColon.end || N.body && Ie(n, N.body)))
-          return mt(this.compiler, n, void 0);
+          return qn(this.compiler, s);
+        if (N instanceof k)
+          return mt(this.compiler, s, N);
+        if (N instanceof _ && (N.bodyColon && s >= N.bodyColon.end || N.body && Ie(s, N.body)))
+          return mt(this.compiler, s, void 0);
       }
     return O();
   }
 }
-function dt(t, e, s) {
-  const n = t.container.scopeKind(e);
-  if ([D.REF, D.TABLE].includes(n)) {
+function dt(t, e, n) {
+  const s = t.container.scopeKind(e);
+  if ([D.REF, D.TABLE].includes(s)) {
     const i = Me(t, e, t.container.element(e), [
       m.Table,
       m.Schema,
       m.Column
     ]);
-    return Se(s.op, e) ? Oe(i) : i;
+    return Se(n.op, e) ? Oe(i) : i;
   }
   return O();
 }
-function Me(t, e, s, n) {
+function Me(t, e, n, s) {
   var a;
-  if (s === void 0)
+  if (n === void 0)
     return O();
-  let i = s;
+  let i = n;
   const r = { suggestions: [] };
   for (; i; ) {
     if ((a = i == null ? void 0 : i.symbol) != null && a.symbolTable) {
       const { symbol: l } = i;
       r.suggestions.push(
-        ...t.symbol.members(l).filter(({ kind: p }) => n.includes(p)).map(({ name: p, kind: h }) => ({
+        ...t.symbol.members(l).filter(({ kind: p }) => s.includes(p)).map(({ name: p, kind: h }) => ({
           label: p,
           insertText: p,
           insertTextRules: w.KeepWhitespace,
@@ -3504,7 +3512,7 @@ function Me(t, e, s, n) {
   return Ue(r);
 }
 function qn(t, e) {
-  var n;
+  var s;
   switch (t.container.scopeKind(e)) {
     case D.INDEXES:
       return Vt(t, e);
@@ -3513,7 +3521,7 @@ function qn(t, e) {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
           const r = i.pop();
-          if (r instanceof q && ((n = r.op) == null ? void 0 : n.value) === ".")
+          if (r instanceof q && ((s = r.op) == null ? void 0 : s.value) === ".")
             return Ft(
               t,
               e,
@@ -3525,30 +3533,30 @@ function qn(t, e) {
   }
   return O();
 }
-function Et(t, e, s) {
-  const { token: n } = t.container.token(e);
-  if ([c.COMMA, c.LBRACKET].includes(n == null ? void 0 : n.kind)) {
+function Et(t, e, n) {
+  const { token: s } = t.container.token(e);
+  if ([c.COMMA, c.LBRACKET].includes(s == null ? void 0 : s.kind)) {
     const i = Nt(t, e);
-    return (n == null ? void 0 : n.kind) === c.COMMA && Se(n, e) ? Oe(i) : i;
+    return (s == null ? void 0 : s.kind) === c.COMMA && Se(s, e) ? Oe(i) : i;
   }
-  if (s.name && s.name.start <= e && s.name.end >= e)
+  if (n.name && n.name.start <= e && n.name.end >= e)
     return Nt(t, e);
-  if (s.name) {
+  if (n.name instanceof K) {
     const i = Hn(
       t,
       e,
-      Re(s.name).unwrap()
+      Re(n.name).unwrap()
     );
-    return (n == null ? void 0 : n.kind) === c.COLON && Se(n, e) ? Oe(i) : i;
+    return (s == null ? void 0 : s.kind) === c.COLON && Se(s, e) ? Oe(i) : i;
   }
   return O();
 }
 function Nt(t, e) {
-  const s = t.container.element(e), n = t.container.scopeKind(e);
-  if (s instanceof C)
+  const n = t.container.element(e), s = t.container.scopeKind(e);
+  if (n instanceof C)
     return O();
-  if (s.body && !Ie(e, s.body))
-    switch (n) {
+  if (n.body && !Ie(e, n.body))
+    switch (s) {
       case D.TABLE:
         return {
           suggestions: [
@@ -3571,7 +3579,7 @@ function Nt(t, e) {
       default:
         return O();
     }
-  switch (n) {
+  switch (s) {
     case D.TABLE:
       return {
         suggestions: [
@@ -3642,14 +3650,14 @@ function Nt(t, e) {
   }
   return O();
 }
-function Hn(t, e, s) {
-  switch (s == null ? void 0 : s.toLowerCase()) {
+function Hn(t, e, n) {
+  switch (n == null ? void 0 : n.toLowerCase()) {
     case "update":
     case "delete":
       return {
-        suggestions: ["cascade", "set default", "set null", "restrict"].map((n) => ({
-          label: n,
-          insertText: n,
+        suggestions: ["cascade", "set default", "set null", "restrict"].map((s) => ({
+          label: s,
+          insertText: s,
           kind: L.Value,
           insertTextRules: w.KeepWhitespace,
           range: void 0
@@ -3657,9 +3665,9 @@ function Hn(t, e, s) {
       };
     case "type":
       return {
-        suggestions: ["btree", "hash"].map((n) => ({
-          label: n,
-          insertText: `${n}`,
+        suggestions: ["btree", "hash"].map((s) => ({
+          label: s,
+          insertText: `${s}`,
           kind: L.Value,
           insertTextRules: w.KeepWhitespace,
           range: void 0
@@ -3668,11 +3676,11 @@ function Hn(t, e, s) {
   }
   return O();
 }
-function Ft(t, e, s) {
-  const n = Ee(s).unwrap_or([]);
-  if (n.pop(), n.some((r) => !M(r)))
+function Ft(t, e, n) {
+  const s = Ne(n).unwrap_or([]);
+  if (s.pop(), s.some((r) => !M(r)))
     return O();
-  const i = n.map((r) => G(r).unwrap());
+  const i = s.map((r) => G(r).unwrap());
   return Ue({
     suggestions: t.symbol.ofName({ nameStack: i, owner: t.container.element(e) }).flatMap(({ symbol: r }) => t.symbol.members(r)).map(({ kind: r, name: a }) => ({
       label: a,
@@ -3682,17 +3690,17 @@ function Ft(t, e, s) {
     }))
   });
 }
-function mt(t, e, s) {
+function mt(t, e, n) {
   var i;
   switch (t.container.scopeKind(e)) {
     case D.TABLE:
-      return Zn(t, e, s);
+      return Zn(t, e, n);
     case D.PROJECT:
-      return Kn(t, e, s);
+      return Kn(t, e, n);
     case D.INDEXES:
       return ts(t, e);
     case D.ENUM:
-      return Jn(t, e, s);
+      return Jn(t, e, n);
     case D.REF: {
       const r = Bt(t, e);
       return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === c.COLON && Se(t.container.token(e).token, e) ? Oe(r) : r;
@@ -3714,15 +3722,15 @@ function Tt() {
     }))
   };
 }
-function Jn(t, e, s) {
-  return s != null && s.callee && tt(e, s) === 1 ? Me(t, e, t.container.element(e), [
+function Jn(t, e, n) {
+  return n != null && n.callee && tt(e, n) === 1 ? Me(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
   ]) : O();
 }
-function Zn(t, e, s) {
-  if (!(s != null && s.callee))
+function Zn(t, e, n) {
+  if (!(n != null && n.callee))
     return {
       suggestions: ["Ref", "Note", "indexes"].map((i) => ({
         label: i,
@@ -3732,8 +3740,8 @@ function Zn(t, e, s) {
         range: void 0
       }))
     };
-  const n = tt(e, s);
-  return n === 0 ? {
+  const s = tt(e, n);
+  return s === 0 ? {
     suggestions: ["Ref", "Note", "indexes"].map((i) => ({
       label: i,
       insertText: i,
@@ -3741,10 +3749,10 @@ function Zn(t, e, s) {
       kind: L.Keyword,
       range: void 0
     }))
-  } : n === 1 ? ns(t, e) : O();
+  } : s === 1 ? ns(t, e) : O();
 }
-function Kn(t, e, s) {
-  return s != null && s.callee ? tt(e, s) === 0 ? {
+function Kn(t, e, n) {
+  return n != null && n.callee ? tt(e, n) === 0 ? {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
@@ -3772,15 +3780,15 @@ function Bt(t, e) {
 function es(t) {
   return Ue({
     suggestions: [...t.parse.publicSymbolTable().entries()].flatMap(([e]) => {
-      const s = se(e).unwrap_or(void 0);
-      if (s === void 0)
+      const n = se(e).unwrap_or(void 0);
+      if (n === void 0)
         return [];
-      const { kind: n, name: i } = s;
-      return n !== m.Table && n !== m.Schema ? [] : {
+      const { kind: s, name: i } = n;
+      return s !== m.Table && s !== m.Schema ? [] : {
         label: i,
         insertText: i,
         insertTextRules: w.KeepWhitespace,
-        kind: ge(n),
+        kind: ge(s),
         range: void 0
       };
     })
@@ -3849,9 +3857,9 @@ function ns(t, e) {
         "CLOB",
         "NCLOB",
         "RAW"
-      ].map((s) => ({
-        label: s,
-        insertText: s,
+      ].map((n) => ({
+        label: n,
+        insertText: n,
         insertTextRules: w.KeepWhitespace,
         kind: L.TypeParameter,
         sortText: L.TypeParameter.toString().padStart(2, "0"),
@@ -3865,10 +3873,10 @@ function ns(t, e) {
   };
 }
 function Vt(t, e) {
-  const n = t.container.element(e).parent;
-  if (!((n == null ? void 0 : n.symbol) instanceof At))
+  const n = t.container.element(e), s = n == null ? void 0 : n.parent;
+  if (!((s == null ? void 0 : s.symbol) instanceof At))
     return O();
-  const { symbolTable: i } = n.symbol;
+  const { symbolTable: i } = s.symbol;
   return Ue({
     suggestions: [...i.entries()].flatMap(([r]) => {
       const a = se(r).unwrap_or(void 0);
@@ -3888,19 +3896,19 @@ function Vt(t, e) {
 function tt(t, e) {
   if (!e.callee)
     return -1;
-  const s = [e.callee, ...e.args], n = s.findIndex((i) => t <= i.end);
-  return n === -1 ? s.length : n;
+  const n = [e.callee, ...e.args], s = n.findIndex((i) => t <= i.end);
+  return s === -1 ? n.length : s;
 }
 class Gt {
   constructor(e) {
     this.compiler = e;
   }
-  provideDefinition(e, s) {
+  provideDefinition(e, n) {
     var a;
-    const { uri: n } = e, i = et(e, s), r = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = et(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const l = r.pop();
-      if ((a = l == null ? void 0 : l.referee) != null && a.declaration && [ue.PRIMARY_EXPRESSION, ue.VARIABLE].includes(l == null ? void 0 : l.kind)) {
+      if ((a = l == null ? void 0 : l.referee) != null && a.declaration && [he.PRIMARY_EXPRESSION, he.VARIABLE].includes(l == null ? void 0 : l.kind)) {
         const { startPos: p, endPos: h } = l.referee.declaration;
         return [
           {
@@ -3910,7 +3918,7 @@ class Gt {
               endColumn: h.column + 1,
               endLineNumber: h.line + 1
             },
-            uri: n
+            uri: s
           }
         ];
       }
@@ -3922,14 +3930,14 @@ class Ct {
   constructor(e) {
     this.compiler = e;
   }
-  provideReferences(e, s) {
-    const { uri: n } = e, i = et(e, s), r = [...this.compiler.container.stack(i)];
+  provideReferences(e, n) {
+    const { uri: s } = e, i = et(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const a = r.pop();
       if (a && [
-        ue.ELEMENT_DECLARATION,
-        ue.FUNCTION_APPLICATION,
-        ue.PRIMARY_EXPRESSION
+        he.ELEMENT_DECLARATION,
+        he.FUNCTION_APPLICATION,
+        he.PRIMARY_EXPRESSION
       ].includes(a == null ? void 0 : a.kind)) {
         const { symbol: l } = a;
         if (l != null && l.references.length)
@@ -3940,7 +3948,7 @@ class Ct {
               endColumn: h.column + 1,
               endLineNumber: h.line + 1
             },
-            uri: n
+            uri: s
           }));
       }
     }
@@ -3976,8 +3984,8 @@ class as {
       _: this.createQuery(
         0,
         () => {
-          const e = new rn(this.source).lex().chain((s) => new ln(s, this.nodeIdGenerator).parse()).chain(({ ast: s, tokens: n }) => new Xn(s, this.symbolIdGenerator).analyze().map(() => ({ ast: s, tokens: n })));
-          return e.getErrors().length > 0 ? e : e.chain(({ ast: s, tokens: n }) => new zn(s).interpret().map((r) => ({ ast: s, tokens: n, rawDb: r })));
+          const e = new rn(this.source).lex().chain((n) => new ln(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new Xn(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
+          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new zn(n).interpret().map((r) => ({ ast: n, tokens: s, rawDb: r })));
         }
       ),
       ast: this.createQuery(
@@ -4001,16 +4009,16 @@ class as {
       stack: this.createQuery(
         10,
         (e) => {
-          const s = this.parse.tokens();
-          let { index: n } = this.container.token(e);
+          const n = this.parse.tokens();
+          let { index: s } = this.container.token(e);
           const { token: i } = this.container.token(e);
-          if (n === void 0)
+          if (s === void 0)
             return [this.parse.ast()];
-          for (; s[n].isInvalid && n >= 0; )
-            n -= 1;
-          if (n === -1)
+          for (; n[s].isInvalid && s >= 0; )
+            s -= 1;
+          if (s === -1)
             return [this.parse.ast()];
-          const r = s[n].start;
+          const r = n[s].start;
           let a = this.parse.ast();
           const l = [a];
           for (; ; ) {
@@ -4024,13 +4032,13 @@ class as {
           for (; l.length > 0; ) {
             let p = !1;
             const h = I.last(l);
-            if (h instanceof x) {
+            if (h instanceof k) {
               const T = this.parse.source();
               for (let f = h.end; f < e; f += 1)
                 T[f] === `
 ` && (l.pop(), p = !0);
             } else
-              h instanceof Q || h instanceof q ? this.container.token(e).token !== h.op && (l.pop(), p = !0) : h instanceof U ? h.listCloseBracket && h.end <= e && (l.pop(), p = !0) : h instanceof J ? h.tupleCloseParen && h.end <= e && (l.pop(), p = !0) : h instanceof ee ? h.blockCloseBrace && h.end <= e && (l.pop(), p = !0) : h instanceof te || h.end < e && (l.pop(), p = !0);
+              h instanceof Q || h instanceof q ? this.container.token(e).token !== h.op && (l.pop(), p = !0) : h instanceof U ? h.listCloseBracket && h.end <= e && (l.pop(), p = !0) : h instanceof J ? h.tupleCloseParen && h.end <= e && (l.pop(), p = !0) : h instanceof te ? h.blockCloseBrace && h.end <= e && (l.pop(), p = !0) : h instanceof K || h.end < e && (l.pop(), p = !0);
             if (p) {
               const T = I.last(l);
               T instanceof _ && T.end <= e && l.pop();
@@ -4044,35 +4052,35 @@ class as {
       token: this.createQuery(
         11,
         (e) => {
-          const s = this.token.flatStream().findIndex((n) => n.start >= e);
-          return s === void 0 ? { token: void 0, index: void 0 } : s <= 0 ? { token: void 0, index: void 0 } : {
-            token: this.token.flatStream()[s - 1],
-            index: s - 1
+          const n = this.token.flatStream().findIndex((s) => s.start >= e);
+          return n === void 0 ? { token: void 0, index: void 0 } : n <= 0 ? { token: void 0, index: void 0 } : {
+            token: this.token.flatStream()[n - 1],
+            index: n - 1
           };
         }
       ),
       element: this.createQuery(
         12,
         (e) => {
-          const s = this.container.stack(e);
-          for (let n = s.length - 1; n >= 0; n -= 1)
-            if (s[n] instanceof _)
-              return s[n];
+          const n = this.container.stack(e);
+          for (let s = n.length - 1; s >= 0; s -= 1)
+            if (n[s] instanceof _)
+              return n[s];
           return this.parse.ast();
         }
       ),
       scope: this.createQuery(
         14,
         (e) => {
-          var s, n;
-          return (n = (s = this.container.element(e)) == null ? void 0 : s.symbol) == null ? void 0 : n.symbolTable;
+          var n, s;
+          return (s = (n = this.container.element(e)) == null ? void 0 : n.symbol) == null ? void 0 : s.symbolTable;
         }
       ),
       scopeKind: this.createQuery(15, (e) => {
-        var n;
+        var s;
         if (this.container.element(e) instanceof C)
           return 8;
-        switch ((n = this.container.element(e).type) == null ? void 0 : n.value.toLowerCase()) {
+        switch ((s = this.container.element(e).type) == null ? void 0 : s.value.toLowerCase()) {
           case "table":
             return 0;
           case "enum":
@@ -4100,13 +4108,13 @@ class as {
         8,
         ({
           nameStack: e,
-          owner: s = this.parse.ast()
+          owner: n = this.parse.ast()
         }) => {
           var i;
           if (e.length === 0)
             return [];
-          const n = [];
-          for (let r = s; r; r = r instanceof _ ? r.parent : void 0) {
+          const s = [];
+          for (let r = n; r; r = r instanceof _ ? r.parent : void 0) {
             if (!((i = r.symbol) != null && i.symbolTable))
               continue;
             const { symbolTable: a } = r.symbol;
@@ -4120,31 +4128,31 @@ class as {
               ), l = p.flatMap(
                 (T) => T.symbol.symbolTable ? T.symbol.symbolTable : []
               );
-            n.push(...p);
+            s.push(...p);
           }
-          return n;
+          return s;
         },
-        ({ nameStack: e, owner: s }) => `${e.join(".")}@${s.id}`
+        ({ nameStack: e, owner: n }) => `${e.join(".")}@${n.id}`
       ),
       members: this.createQuery(
         9,
-        (e) => e.symbolTable ? [...e.symbolTable.entries()].map(([s, n]) => ({
-          ...se(s).unwrap(),
-          symbol: n
+        (e) => e.symbolTable ? [...e.symbolTable.entries()].map(([n, s]) => ({
+          ...se(n).unwrap(),
+          symbol: s
         })) : []
       )
     };
   }
-  createQuery(e, s, n) {
+  createQuery(e, n, s) {
     return (i) => {
-      const r = this.cache[e], a = i && n ? n(i) : i;
+      const r = this.cache[e], a = i && s ? s(i) : i;
       if (r !== null) {
         if (!(r instanceof Map))
           return r;
         if (r.has(a))
           return r.get(a);
       }
-      const l = s(i);
+      const l = n(i);
       return i !== void 0 ? r instanceof Map ? r.set(a, l) : (this.cache[e] = /* @__PURE__ */ new Map(), this.cache[e].set(a, l)) : this.cache[e] = l, l;
     };
   }