@dbml/parse 3.2.0 → 3.4.0

package/dist/dbml-parse.mjs

@@ -1,6 +1,6 @@
 import I from "lodash";
 var u = /* @__PURE__ */ ((t) => (t.SPACE = "<space>", t.TAB = "<tab>", t.NEWLINE = "<newline>", t.COMMA = "<comma>", t.LPAREN = "<lparen>", t.RPAREN = "<rparen>", t.LBRACE = "<lbrace>", t.RBRACE = "<rbrace>", t.LBRACKET = "<lbracket>", t.RBRACKET = "<rbracket>", t.LANGLE = "<langle>", t.RANGLE = "<rangle>", t.OP = "<op>", t.EOF = "<eof>", t.NUMERIC_LITERAL = "<number>", t.STRING_LITERAL = "<string>", t.COLOR_LITERAL = "<color>", t.FUNCTION_EXPRESSION = "<function-expression>", t.QUOTED_STRING = "<variable>", t.IDENTIFIER = "<identifier>", t.SEMICOLON = "<semicolon>", t.COLON = "<colon>", t.SINGLE_LINE_COMMENT = "<single-line-comment>", t.MULTILINE_COMMENT = "<multiline-comment>", t))(u || {});
-function $t(t) {
+function Wt(t) {
   switch (t.kind) {
     case "<newline>":
     case "<space>":
@@ -12,7 +12,7 @@ function $t(t) {
       return !1;
   }
 }
-function it(t) {
+function rt(t) {
   if (!t)
     return !1;
   switch (t) {
@@ -33,7 +33,7 @@ function it(t) {
       return !1;
   }
 }
-function rt(t) {
+function at(t) {
   return t !== void 0 && t.kind === "<op>";
 }
 class B {
@@ -44,27 +44,27 @@ class B {
     return new B(e, n, s, i, r);
   }
 }
-function Tt(t) {
+function bt(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === u.NEWLINE) !== void 0;
 }
-function at(t, e) {
-  return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || Tt(t);
+function ot(t, e) {
+  return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || bt(t);
 }
-function Ve(t) {
+function Ce(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === u.SPACE) !== void 0;
 }
-function bt(t) {
-  return t.trailingTrivia.length === 0 ? t.end : bt(I.last(t.trailingTrivia));
-}
 function It(t) {
-  return t.leadingTrivia.length === 0 ? t.start : It(t.leadingTrivia[0]);
+  return t.trailingTrivia.length === 0 ? t.end : It(I.last(t.trailingTrivia));
 }
-function Wt(t) {
+function Lt(t) {
+  return t.leadingTrivia.length === 0 ? t.start : Lt(t.leadingTrivia[0]);
+}
+function jt(t) {
   return [u.SINGLE_LINE_COMMENT, u.MULTILINE_COMMENT].includes(
     t.kind
   );
 }
-class jt {
+class Yt {
   constructor() {
     this.id = 0;
   }
@@ -81,13 +81,13 @@ class k {
   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 ? It(i) : i.fullStart) : (this.startPos = {
+    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 = [...s].reverse().find((a) => a !== void 0 && !Number.isNaN(a.end));
-    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof B ? bt(r) : r.fullEnd) : (this.endPos = {
+    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof B ? It(r) : r.fullEnd) : (this.endPos = {
       offset: NaN,
       column: NaN,
       line: NaN
@@ -151,7 +151,7 @@ class H extends k {
     super(i, "<infix-expression>", [n, e, s]), this.op = e, this.leftExpression = n, this.rightExpression = s;
   }
 }
-class De extends k {
+class Pe extends k {
   constructor({ op: e, expression: n }, s) {
     super(s, "<postfix-expression>", [n, e]), this.op = e, this.expression = n;
   }
@@ -184,7 +184,7 @@ class P extends k {
   }, r) {
     super(r, "<list-expression>", [
       e,
-      ...Lt(n, s),
+      ...gt(n, s),
       i
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
@@ -198,12 +198,12 @@ class Z extends k {
   }, r) {
     super(r, "<tuple-expression>", [
       e,
-      ...Lt(n, s),
+      ...gt(n, s),
       i
     ]), this.tupleOpenParen = e, this.elementList = n, this.commaList = s, this.tupleCloseParen = i;
   }
 }
-class Xe extends Z {
+class We extends Z {
   constructor({
     groupOpenParen: e,
     expression: n,
@@ -228,7 +228,7 @@ class J extends k {
     super(s, "<call-expression>", [e, n]), this.callee = e, this.argumentList = n;
   }
 }
-class me extends k {
+class Te extends k {
   constructor({ literal: e }, n) {
     super(n, "<literal>", [e]), this.literal = e;
   }
@@ -243,7 +243,7 @@ class D extends k {
     super(n, "<primary-expression>", [e]), this.expression = e;
   }
 }
-class ye extends k {
+class ke extends k {
   constructor({ pre: e }, n) {
     const s = B.create(u.SPACE, e.endPos, e.endPos, " ", !1);
     super(n, "<dummy>", [s]);
@@ -254,7 +254,7 @@ class ce extends k {
     super(s, "<array>", [e, n]), this.array = e, this.indexer = n;
   }
 }
-function Lt(t, e) {
+function gt(t, e) {
   if (!t || t.length === 0)
     return e || [];
   if (!e || e.length === 0)
@@ -264,7 +264,7 @@ function Lt(t, e) {
     (i) => i !== null
   );
 }
-function as(t, e = !1) {
+function os(t, e = !1) {
   return JSON.stringify(
     t,
     function(n, s) {
@@ -335,46 +335,46 @@ class v {
   }
 }
 var m = /* @__PURE__ */ ((t) => (t.Schema = "Schema", t.Table = "Table", t.Column = "Column", t.TableGroup = "TableGroup", t.TableGroupField = "TableGroup field", t.Enum = "Enum", t.EnumField = "Enum field", t.Note = "Note", t))(m || {});
-function $e(t) {
+function je(t) {
   return `Schema:${t}`;
 }
-function xe(t) {
+function Se(t) {
   return `Table:${t}`;
 }
-function We(t) {
+function Ye(t) {
   return `Column:${t}`;
 }
-function je(t) {
+function ze(t) {
   return `Enum:${t}`;
 }
-function Ye(t) {
+function Qe(t) {
   return `Enum field:${t}`;
 }
-function ze(t) {
+function qe(t) {
   return `TableGroup:${t}`;
 }
-function Qe(t) {
+function He(t) {
   return `TableGroup field:${t}`;
 }
-function Yt(t) {
+function zt(t) {
   return `Note:${t}`;
 }
-function Fe(t, e) {
+function Ve(t, e) {
   switch (e) {
     case "Column":
-      return We(t);
+      return Ye(t);
     case "Enum":
-      return je(t);
+      return ze(t);
     case "Enum field":
-      return Ye(t);
+      return Qe(t);
     case "Schema":
-      return $e(t);
+      return je(t);
     case "Table":
-      return xe(t);
+      return Se(t);
     case "TableGroup":
-      return ze(t);
+      return qe(t);
     case "TableGroup field":
-      return Qe(t);
+      return He(t);
     default:
       throw new Error("Unreachable");
   }
@@ -386,49 +386,48 @@ function ie(t) {
     kind: e
   }) : new v();
 }
-function zt(t) {
+function Qt(t) {
   const e = ie(t).unwrap_or(void 0);
   if (!e)
     return !1;
   const { kind: n, name: s } = e;
   return n === "Schema" && s === "public";
 }
-function Qt(t) {
+function qt(t) {
   return [
-    $e,
-    xe,
     je,
+    Se,
     ze,
-    We,
+    qe,
     Ye,
-    Qe
+    Qe,
+    He
   ].map((e) => e(t));
 }
-function qe(t) {
-  const [e] = t;
-  return e >= "a" && e <= "z" || e >= "A" && e <= "Z" || e === "_";
+function Ue(t) {
+  return !!t.match(/(\p{L}|_|\p{M})/gu);
 }
-function Se(t) {
+function Oe(t) {
   const [e] = t;
   return e >= "0" && e <= "9";
 }
-function qt(t) {
+function Ht(t) {
   const [e] = t;
-  return Se(e) || qe(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
+  return Oe(e) || Ue(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
 function pe(t) {
-  return qe(t) || Se(t);
+  return Ue(t) || Oe(t);
 }
-function ot(t, e) {
+function lt(t, e) {
   const n = [], s = Math.min(t.length, e.length);
   for (let i = 0; i < s; i += 1)
     n.push(t[i], e[i]);
   return n.push(...t.slice(s), ...e.slice(s)), n;
 }
-function Le(t, e) {
+function ge(t, e) {
   return t >= e.start && t < e.end;
 }
-class Ht {
+class Jt {
   constructor() {
     this.id = 0;
   }
@@ -439,37 +438,37 @@ class Ht {
     return this.id++;
   }
 }
-class gt {
+class _t {
   constructor({ symbolTable: e }, n) {
     this.references = [], this.id = n, this.symbolTable = e;
   }
 }
-class Jt {
+class Zt {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class Zt {
+class Kt {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class _t {
+class At {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class Kt {
+class en {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class en {
+class tn {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
 }
-class tn {
+class nn {
   constructor({ declaration: e }, n) {
     this.references = [], this.id = n, this.declaration = e;
   }
@@ -498,18 +497,18 @@ class F {
     return new F(e(this.value), this.errors);
   }
 }
-function nn(t, e, n) {
-  if (!t || !Ee(t) || e.length === 0)
+function sn(t, e, n) {
+  if (!t || !Ne(t) || e.length === 0)
     return new v();
-  const s = [...e], i = Be(t).unwrap(), r = s.pop();
+  const s = [...e], i = Ge(t).unwrap(), r = s.pop();
   if (!(r instanceof ne))
     return new v();
   const a = I.last(s) instanceof P ? s.pop() : void 0;
-  return s.length === 3 && Be(s[1]).unwrap().value === "as" ? new S(
+  return s.length === 3 && Ge(s[1]).unwrap().value === "as" ? new S(
     n.create(A, {
       type: i,
       name: s[0],
-      as: Be(s[1]).unwrap(),
+      as: Ge(s[1]).unwrap(),
       alias: s[2],
       attributeList: a,
       body: r
@@ -529,16 +528,16 @@ function nn(t, e, n) {
     })
   ) : new v();
 }
-function lt(t) {
+function ct(t) {
   return t.kind === u.IDENTIFIER && t.value === "as";
 }
 function E(t) {
-  t && (t instanceof B ? sn(t) : rn(t));
+  t && (t instanceof B ? rn(t) : an(t));
 }
-function sn(t) {
+function rn(t) {
   t.kind !== u.EOF && (t.isInvalid = !0);
 }
-function rn(t) {
+function an(t) {
   if (t instanceof A)
     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 $)
@@ -549,7 +548,7 @@ function rn(t) {
     E(t.op), E(t.expression);
   else if (t instanceof H)
     E(t.leftExpression), E(t.op), E(t.rightExpression);
-  else if (t instanceof De)
+  else if (t instanceof Pe)
     E(t.op), E(t.expression);
   else if (t instanceof ne)
     E(t.blockOpenBrace), t.body.forEach(E), E(t.blockCloseBrace);
@@ -567,18 +566,18 @@ function rn(t) {
     E(t.value);
   else if (t instanceof j)
     E(t.variable);
-  else if (t instanceof me)
+  else if (t instanceof Te)
     E(t.literal);
   else
-    throw t instanceof Xe ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
+    throw t instanceof We ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
 }
-function At(t) {
+function vt(t) {
   return !!(t != null && t.isInvalid);
 }
 function U(...t) {
   return t.filter((e) => e !== void 0);
 }
-function an(t) {
+function on(t) {
   if (t instanceof G)
     return U(...t.body, t.eof);
   if (t instanceof A)
@@ -595,7 +594,7 @@ function an(t) {
     return U(t.name, t.colon, t.value);
   if (t instanceof $)
     return t.identifiers;
-  if (t instanceof me)
+  if (t instanceof Te)
     return t.literal ? [t.literal] : [];
   if (t instanceof j)
     return U(t.variable);
@@ -603,7 +602,7 @@ function an(t) {
     return U(t.op, t.expression);
   if (t instanceof H)
     return U(t.leftExpression, t.op, t.rightExpression);
-  if (t instanceof De)
+  if (t instanceof Pe)
     return U(t.expression, t.op);
   if (t instanceof te)
     return U(t.value);
@@ -614,13 +613,13 @@ function an(t) {
   if (t instanceof P)
     return U(
       t.listOpenBracket,
-      ...ot(t.elementList, t.commaList),
+      ...lt(t.elementList, t.commaList),
       t.listCloseBracket
     );
   if (t instanceof Z)
     return U(
       t.tupleOpenParen,
-      ...ot(t.elementList, t.commaList),
+      ...lt(t.elementList, t.commaList),
       t.tupleCloseParen
     );
   if (t instanceof J)
@@ -632,33 +631,33 @@ function an(t) {
       t.array,
       t.indexer
     );
-  throw t instanceof Xe ? new Error("This case is already handled by TupleExpressionNode") : new Error("Unreachable - no other possible cases");
+  throw t instanceof We ? new Error("This case is already handled by TupleExpressionNode") : new Error("Unreachable - no other possible cases");
 }
-function Be(t) {
+function Ge(t) {
   return M(t) ? new S(t.expression.variable) : new v();
 }
 function Y(t) {
   var e;
-  return t instanceof D && (t.expression instanceof j && t.expression.variable instanceof B && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof me && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
+  return t instanceof D && (t.expression instanceof j && t.expression.variable instanceof B && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof Te && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
 }
 function M(t) {
   return t instanceof D && t.expression instanceof j && t.expression.variable instanceof B;
 }
-function Ee(t) {
+function Ne(t) {
   var e;
   return t instanceof D && t.expression instanceof j && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
 }
-function He(t) {
+function Je(t) {
   var e;
   return t instanceof H && t.leftExpression instanceof k && t.rightExpression instanceof k && ((e = t.op) == null ? void 0 : e.value) === ".";
 }
-function Ne(t) {
+function me(t) {
   if (t === void 0)
     return new v();
   const e = t.identifiers.map((n) => n.value).join(" ");
   return e === "" ? new v() : new S(e);
 }
-class on {
+class ln {
   // list of errors during lexing
   constructor(e) {
     this.start = {
@@ -768,15 +767,15 @@ class on {
           this.match("/") ? this.singleLineComment() : this.match("*") ? this.multilineComment() : this.operator();
           break;
         default:
-          if (it(e)) {
+          if (rt(e)) {
             this.operator();
             break;
           }
-          if (qe(e)) {
+          if (Ue(e)) {
             this.identifier();
             break;
           }
-          if (Se(e)) {
+          if (Oe(e)) {
             this.numericLiteralOrIdentifier();
             break;
           }
@@ -796,13 +795,13 @@ class on {
     let e = !0, n = [], s;
     const i = [];
     for (const r of this.tokens)
-      $t(r) ? (n.push(r), r.kind === u.NEWLINE && s && (s.trailingTrivia = n, e = !0, s = void 0, n = [])) : (e ? r.leadingTrivia = n : s.trailingTrivia = n, i.push(r), n = [], s = r, e = !1);
+      Wt(r) ? (n.push(r), r.kind === u.NEWLINE && s && (s.trailingTrivia = n, e = !0, s = void 0, n = [])) : (e ? r.leadingTrivia = n : s.trailingTrivia = n, i.push(r), n = [], s = r, e = !1);
     this.tokens = i;
   }
   gatherInvalid() {
     let e;
     const n = [], s = [];
-    for (e = 0; e < this.tokens.length && At(this.tokens[e]); e += 1)
+    for (e = 0; e < this.tokens.length && vt(this.tokens[e]); e += 1)
       s.push(this.tokens[e]);
     let i = this.tokens[e];
     for (i.leadingInvalid = [...s, ...i.leadingInvalid]; e < this.tokens.length; e += 1) {
@@ -896,7 +895,7 @@ class on {
     this.addToken(u.IDENTIFIER);
   }
   operator() {
-    for (; it(this.peek()); )
+    for (; rt(this.peek()); )
       this.advance();
     this.addToken(u.OP);
   }
@@ -913,7 +912,7 @@ class on {
         return this.advance(), this.addToken(u.NUMERIC_LITERAL);
       if (!n && !pe(this.peek()))
         return this.addToken(u.NUMERIC_LITERAL);
-      if (!n && !Se(this.peek()))
+      if (!n && !Oe(this.peek()))
         break;
       this.advance();
     }
@@ -973,8 +972,8 @@ class on {
     }
   }
 }
-var ke = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(ke || {});
-class ln {
+var xe = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(xe || {});
+class cn {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
   }
@@ -1040,7 +1039,7 @@ class ln {
         }
   }
 }
-class cn {
+class un {
   constructor(e) {
     this.generator = e;
   }
@@ -1053,15 +1052,15 @@ class d {
     this.token = e, this.partialNode = n, this.handlerContext = s;
   }
 }
-class un {
+class hn {
   constructor(e, n) {
-    this.current = 0, this.errors = [], this.contextStack = new ln(), this.synchronizeProgram = () => {
+    this.current = 0, this.errors = [], this.contextStack = new cn(), this.synchronizeProgram = () => {
       const s = this.peek();
       s.kind !== u.EOF ? E(this.advance()) : (E(this.peek()), this.logError(s, o.UNEXPECTED_EOF, "Unexpected EOF"));
     }, this.synchronizeElementDeclarationName = () => {
       for (; !this.isAtEnd(); ) {
         const s = this.peek();
-        if (lt(s) || this.check(u.COLON, u.LBRACE, u.LBRACKET))
+        if (ct(s) || this.check(u.COLON, u.LBRACE, u.LBRACKET))
           break;
         E(s), this.advance();
       }
@@ -1072,7 +1071,7 @@ class un {
           break;
         E(s), this.advance();
       }
-    }, this.blockExpression = this.contextStack.withContextDo(ke.BlockExpression, () => {
+    }, this.blockExpression = this.contextStack.withContextDo(xe.BlockExpression, () => {
       const s = { body: [] }, i = () => this.nodeFactory.create(ne, s);
       try {
         this.consume("Expect an opening brace '{'", u.LBRACE), s.blockOpenBrace = this.previous();
@@ -1107,12 +1106,12 @@ class un {
       if (!this.check(u.RBRACE))
         for (E(this.advance()); !this.isAtEnd(); ) {
           const s = this.peek();
-          if (this.check(u.RBRACE) || at(this.previous(), s))
+          if (this.check(u.RBRACE) || ot(this.previous(), s))
             break;
           E(s), this.advance();
         }
-    }, this.tupleExpression = this.contextStack.withContextDo(ke.GroupExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(Xe, {
+    }, this.tupleExpression = this.contextStack.withContextDo(xe.GroupExpression, () => {
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(We, {
         groupOpenParen: s.tupleOpenParen,
         groupCloseParen: s.tupleCloseParen,
         expression: s.elementList[0]
@@ -1163,7 +1162,7 @@ class un {
           break;
         E(s), this.advance();
       }
-    }, this.listExpression = this.contextStack.withContextDo(ke.ListExpression, () => {
+    }, this.listExpression = this.contextStack.withContextDo(xe.ListExpression, () => {
       const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(P, s);
       try {
         this.consume("Expect an opening bracket '['", u.LBRACKET), s.listOpenBracket = this.previous();
@@ -1225,7 +1224,7 @@ class un {
           break;
         E(s), this.advance();
       }
-    }, this.tokens = e, this.nodeFactory = new cn(n);
+    }, this.tokens = e, this.nodeFactory = new un(n);
   }
   isAtEnd() {
     return this.current >= this.tokens.length || this.tokens[this.current].kind === u.EOF;
@@ -1316,7 +1315,7 @@ class un {
           throw new d(s.token, n(), s.handlerContext);
         this.synchronizeElementDeclarationName();
       }
-    if (lt(this.peek()))
+    if (ct(this.peek()))
       if (e.as = this.advance(), this.check(u.COLON, u.LBRACE, u.LBRACKET))
         this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect an alias");
       else
@@ -1380,7 +1379,7 @@ class un {
   }
   /* Parsing any ExpressionNode, including non-NormalExpression */
   expression() {
-    const e = { args: [] }, n = () => nn(e.callee, e.args, this.nodeFactory).unwrap_or(
+    const e = { args: [] }, n = () => sn(e.callee, e.args, this.nodeFactory).unwrap_or(
       this.nodeFactory.create(w, e)
     );
     try {
@@ -1392,7 +1391,7 @@ class un {
       return n();
     let s = e.callee;
     for (; !this.shouldStopExpression(); ) {
-      Ve(this.previous()) || this.logError(s, o.MISSING_SPACES, "Expect a following space");
+      Ce(this.previous()) || this.logError(s, o.MISSING_SPACES, "Expect a following space");
       try {
         s = this.normalExpression(), e.args.push(s);
       } catch (i) {
@@ -1402,7 +1401,7 @@ class un {
     return n();
   }
   shouldStopExpression() {
-    if (this.isAtEnd() || Tt(this.previous()))
+    if (this.isAtEnd() || bt(this.previous()))
       return !0;
     const e = this.peek().kind;
     return e === u.RBRACE || e === u.RBRACKET || e === u.RPAREN || e === u.COMMA || e === u.COLON;
@@ -1416,12 +1415,12 @@ class un {
     for (; !this.isAtEnd(); ) {
       const s = this.peek();
       if (s.kind === u.LPAREN) {
-        const { left: i } = ct(s);
+        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 '['
-        at(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
+        ot(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
           break;
         try {
           n = this.nodeFactory.create(J, {
@@ -1435,7 +1434,7 @@ class un {
           }), new d(r.token, n, r.handlerContext)) : r;
         }
       } else if (s.kind === u.LBRACKET) {
-        if (Ve(this.previous()))
+        if (Ce(this.previous()))
           break;
         try {
           n = this.nodeFactory.create(ce, {
@@ -1448,17 +1447,17 @@ class un {
             indexer: i.partialNode
           }), new d(i.token, n, i.handlerContext)) : i;
         }
-      } else if (rt(s)) {
-        const i = s, r = ct(i);
+      } else if (at(s)) {
+        const i = s, r = ut(i);
         if (r.left !== null) {
           if (r.left <= e)
             break;
-          this.advance(), n = this.nodeFactory.create(De, {
+          this.advance(), n = this.nodeFactory.create(Pe, {
             expression: n,
             op: i
           });
         } else {
-          const a = fn(i);
+          const a = pn(i);
           if (a.left === null || a.left <= e)
             break;
           this.advance();
@@ -1483,10 +1482,10 @@ class un {
   }
   leftExpression_bp() {
     let e;
-    if (rt(this.peek())) {
+    if (at(this.peek())) {
       const n = {};
       n.op = this.peek();
-      const s = dn(n.op);
+      const s = En(n.op);
       if (s.right === null)
         throw this.logError(
           n.op,
@@ -1494,7 +1493,7 @@ class un {
           `Unexpected '${n.op.value}' in an expression`
         ), new d(
           n.op,
-          this.nodeFactory.create(ye, { pre: n.op }),
+          this.nodeFactory.create(ke, { pre: n.op }),
           this.contextStack.findHandlerContext(this.tokens, this.current)
         );
       this.advance();
@@ -1508,10 +1507,10 @@ class un {
         )) : i;
       }
       e = this.nodeFactory.create(q, n);
-    } else if (e = this.extractOperand(), e instanceof ye)
+    } else if (e = this.extractOperand(), e instanceof ke)
       throw new d(
         this.peek(),
-        this.nodeFactory.create(ye, { pre: this.peek() }),
+        this.nodeFactory.create(ke, { pre: this.peek() }),
         this.contextStack.findHandlerContext(this.tokens, this.current)
       );
     return e;
@@ -1535,7 +1534,7 @@ class un {
       this.peek(),
       o.INVALID_OPERAND,
       `Invalid start of operand "${this.peek().value}"`
-    ), this.nodeFactory.create(ye, { pre: this.previous() }));
+    ), this.nodeFactory.create(ke, { pre: this.previous() }));
   }
   /* Parsing FunctionExpression */
   functionExpression() {
@@ -1562,7 +1561,7 @@ class un {
       u.NUMERIC_LITERAL
     ))
       return this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create(me, { literal: this.previous() })
+        expression: this.nodeFactory.create(Te, { literal: this.previous() })
       });
     if (this.match(u.QUOTED_STRING, u.IDENTIFIER))
       return this.nodeFactory.create(D, {
@@ -1632,7 +1631,7 @@ class un {
     this.errors.push(new c(n, s, e));
   }
 }
-const hn = {
+const fn = {
   "+": { left: 9, right: 10 },
   "*": { left: 11, right: 12 },
   "-": { left: 9, right: 10 },
@@ -1648,10 +1647,10 @@ const hn = {
   "!=": { left: 4, right: 5 },
   ".": { left: 16, right: 17 }
 };
-function fn(t) {
-  return hn[t.value] || { left: null, right: null };
+function pn(t) {
+  return fn[t.value] || { left: null, right: null };
 }
-const pn = {
+const dn = {
   "+": { left: null, right: 15 },
   "-": { left: null, right: 15 },
   "<": { left: null, right: 15 },
@@ -1659,17 +1658,17 @@ const pn = {
   "<>": { left: null, right: 15 },
   "!": { left: null, right: 15 }
 };
-function dn(t) {
-  return pn[t.value] || { left: null, right: null };
+function En(t) {
+  return dn[t.value] || { left: null, right: null };
 }
-const En = {
+const Nn = {
   "(": { left: 14, right: null }
 };
-function ct(t) {
-  return En[t.value] || { left: null, right: null };
+function ut(t) {
+  return Nn[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 Ae(t) {
+function ve(t) {
   var n;
   const e = (n = t == null ? void 0 : t.type) == null ? void 0 : n.value.toLowerCase();
   switch (e) {
@@ -1686,7 +1685,7 @@ function Ae(t) {
   }
 }
 function he(t) {
-  if (!He(t))
+  if (!Je(t))
     return new S([t]);
   const e = he(t.leftExpression).unwrap_or(void 0);
   return e ? (e.push(t.rightExpression), new S(e)) : new v();
@@ -1706,7 +1705,7 @@ function C(t) {
   }
   return new S(n);
 }
-function ge(t) {
+function _e(t) {
   if (t === void 0)
     return new v();
   const e = he(t).unwrap_or(void 0);
@@ -1716,7 +1715,7 @@ function ge(t) {
   let s;
   if (!M(I.last(e))) {
     const i = e.pop();
-    if (yt(i))
+    if (kt(i))
       s = i.elementList.map(
         (r) => V(r).unwrap()
       );
@@ -1737,10 +1736,10 @@ function ge(t) {
 function X(t) {
   return M(t) ? new S(t.expression.variable.value) : new v();
 }
-function Ge(t) {
-  if (ut(t))
+function Xe(t) {
+  if (ht(t))
     return t instanceof te ? new S({ functional: [t], nonFunctional: [] }) : new S({ functional: [], nonFunctional: [t] });
-  if (t instanceof Z && t.elementList.every(ut)) {
+  if (t instanceof Z && t.elementList.every(ht)) {
     const e = t.elementList.filter(
       (s) => s instanceof te
     ), n = t.elementList.filter(M);
@@ -1756,24 +1755,24 @@ function V(t) {
 function Q(t) {
   return Y(t) ? t.expression instanceof j ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new v();
 }
-function Nn(t) {
+function mn(t) {
   var e;
-  return !(t instanceof H) || !wt((e = t.op) == null ? void 0 : e.value) ? !1 : ge(t.leftExpression).and_then(() => ge(t.rightExpression)).unwrap_or(void 0) !== void 0;
+  return !(t instanceof H) || !yt((e = t.op) == null ? void 0 : e.value) ? !1 : _e(t.leftExpression).and_then(() => _e(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
-function mn(t) {
-  const e = ge(t.leftExpression), n = ge(t.rightExpression);
+function Tn(t) {
+  const e = _e(t.leftExpression), n = _e(t.rightExpression);
   if (!e.isOk() || !n.isOk())
     return !1;
   const { tupleElements: s } = e.unwrap(), { tupleElements: i } = n.unwrap();
   return (s == null ? void 0 : s.length) === (i == null ? void 0 : i.length);
 }
-function ut(t) {
+function ht(t) {
   return t instanceof D && t.expression instanceof j || t instanceof te;
 }
-function Tn(t, e) {
+function bn(t, e) {
   var i, r, a, l;
   let n = e;
-  const s = zt(t);
+  const s = Qt(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);
@@ -1784,7 +1783,7 @@ function Tn(t, e) {
     n = n.parent;
   }
 }
-class bn {
+class In {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1792,7 +1791,7 @@ class bn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof G || Ae(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new c(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof G || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Project ? [new c(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new c(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
@@ -1812,7 +1811,7 @@ class bn {
     return Y(e.callee) || n.push(new c(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new c(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
   }
 }
-class ve {
+class we {
   constructor() {
     this.table = /* @__PURE__ */ new Map();
   }
@@ -1829,7 +1828,7 @@ class ve {
     return this.table.entries();
   }
 }
-class In {
+class Ln {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1840,17 +1839,17 @@ class In {
     return this.declarationNode.parent instanceof A ? [new c(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Je(e) ? [] : [new c(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new c(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
+    return e ? Ze(e) ? [] : [new c(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new c(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
   }
   validateAlias(e) {
     return e ? [new c(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(Jt, { declaration: this.declarationNode, symbolTable: new ve() });
+    this.declarationNode.symbol = this.symbolFactory.create(Zt, { declaration: this.declarationNode, symbolTable: new we() });
     const { name: n } = this.declarationNode, s = C(n);
     if (s.isOk()) {
-      const i = s.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), l = je(r);
+      const i = s.unwrap(), r = i.pop(), a = Ke(i, this.publicSymbolTable, this.symbolFactory), l = ze(r);
       a.has(l) && e.push(new c(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, n)), a.set(l, this.declarationNode.symbol);
     }
     return e;
@@ -1900,7 +1899,7 @@ class In {
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const n = V(e.callee).unwrap(), s = Ye(n), i = this.symbolFactory.create(Zt, { declaration: e });
+      const n = V(e.callee).unwrap(), s = Qe(n), i = this.symbolFactory.create(Kt, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
@@ -1915,7 +1914,7 @@ class In {
     return [];
   }
 }
-class Ln {
+class gn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1923,7 +1922,7 @@ class Ln {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof G || Ae(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new c(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof G || ve(this.declarationNode.parent).unwrap_or(void 0) !== b.Table ? [new c(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new c(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
@@ -1949,8 +1948,8 @@ class Ln {
       const s = [], i = [n.callee, ...n.args];
       return I.last(i) instanceof P && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
         for (; r instanceof J; )
-          r.argumentList && !Ge(r.argumentList).isOk() && s.push(new c(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
-        Ge(r).isOk() || s.push(new c(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
+          r.argumentList && !Xe(r.argumentList).isOk() && s.push(new c(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
+        Xe(r).isOk() || s.push(new c(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
       }), s;
     });
   }
@@ -1991,7 +1990,7 @@ class Ln {
     });
   }
 }
-class gn {
+class _n {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -1999,7 +1998,7 @@ class gn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return !(this.declarationNode.parent instanceof G) && ![b.Table, b.Project].includes(Ae(this.declarationNode.parent).unwrap_or(void 0)) ? [new c(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project. Sticky note can only appear at the global scope.", this.declarationNode)] : [];
+    return !(this.declarationNode.parent instanceof G) && ![b.Table, b.Project].includes(ve(this.declarationNode.parent).unwrap_or(void 0)) ? [new c(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project. Sticky note can only appear at the global scope.", this.declarationNode)] : [];
   }
   validateName(e) {
     if (!(this.declarationNode.parent instanceof G))
@@ -2009,7 +2008,7 @@ class gn {
     const n = C(e);
     if (!n.isOk())
       return [new c(o.INVALID_NAME, "Invalid name for sticky note ", this.declarationNode)];
-    const i = n.unwrap().join("."), r = Yt(i);
+    const i = n.unwrap().join("."), r = zt(i);
     return this.publicSymbolTable.has(r) ? [new c(o.DUPLICATE_NAME, `Sticky note "${i}" has already been defined`, e)] : (this.publicSymbolTable.set(r, this.declarationNode.symbol), []);
   }
   validateAlias(e) {
@@ -2039,7 +2038,7 @@ class gn {
     });
   }
 }
-class _n {
+class An {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2050,7 +2049,7 @@ class _n {
     return this.declarationNode.parent instanceof A ? [new c(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Pe(e) ? [] : [new c(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? Me(e) ? [] : [new c(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new c(o.UNEXPECTED_ALIAS, "A Project shouldn't have an alias", e)] : [];
@@ -2078,7 +2077,7 @@ class _n {
     });
   }
 }
-class An {
+class vn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2089,7 +2088,7 @@ class An {
     return this.declarationNode.parent instanceof G ? [] : [new c(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
   }
   validateName(e) {
-    return e ? Pe(e) ? [] : [new c(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? Me(e) ? [] : [new c(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new c(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
@@ -2110,7 +2109,7 @@ class An {
       return [new c(o.EMPTY_REF, "A Ref must have at least one field", this.declarationNode)];
     const n = [];
     return e.length > 1 && n.push(...e.slice(1).map((s) => new c(o.REF_REDEFINED, "A Ref can only contain one binary relationship", s))), e.forEach((s) => {
-      s.callee && !Nn(s.callee) && n.push(new c(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !mn(s.callee) && n.push(new c(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
+      s.callee && !mn(s.callee) && n.push(new c(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !Tn(s.callee) && n.push(new c(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
       const i = [...s.args];
       I.last(i) instanceof P ? (this.validateFieldSettings(I.last(i)), i.pop()) : i[0] instanceof P && (n.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && n.push(...i.map((r) => new c(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", r)));
     }), n;
@@ -2123,7 +2122,7 @@ class An {
         case "delete":
         case "update":
           a.length > 1 && a.forEach((l) => s.push(new c(o.DUPLICATE_REF_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
-            vn(l.value) || s.push(new c(o.INVALID_REF_SETTING_VALUE, `'${r}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, l));
+            wn(l.value) || s.push(new c(o.INVALID_REF_SETTING_VALUE, `'${r}' can only have values "cascade", "no action", "set null", "set default" or "restrict"`, l));
           });
           break;
         default:
@@ -2141,11 +2140,11 @@ class An {
     });
   }
 }
-function vn(t) {
+function wn(t) {
   if (!(M(t) && t.expression.variable.kind !== u.QUOTED_STRING) && !(t instanceof $))
     return !1;
   let e;
-  if (t instanceof $ ? e = Ne(t).unwrap_or("") : e = t.expression.variable.value, e)
+  if (t instanceof $ ? e = me(t).unwrap_or("") : e = t.expression.variable.value, e)
     switch (e.toLowerCase()) {
       case "cascade":
       case "no action":
@@ -2158,7 +2157,7 @@ function vn(t) {
     }
   return !1;
 }
-class wn {
+class yn {
   constructor(e, n, s) {
     this.declarationNode = e, this.symbolFactory = s, this.publicSymbolTable = n;
   }
@@ -2169,10 +2168,10 @@ class wn {
     return this.declarationNode.parent instanceof A ? [new c(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? e instanceof ce ? [new c(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Je(e) ? [] : [new c(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new c(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
+    return e ? e instanceof ce ? [new c(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Ze(e) ? [] : [new c(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new c(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
   }
   validateAlias(e) {
-    return e ? Sn(e) ? [] : [new c(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
+    return e ? On(e) ? [] : [new c(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
   }
   validateSettingList(e) {
     const n = W(e), s = n.getErrors(), i = n.getValue();
@@ -2181,7 +2180,7 @@ class wn {
       switch (r) {
         case "headercolor":
           a.length > 1 && s.push(...a.map((l) => new c(o.DUPLICATE_TABLE_SETTING, "'headercolor' can only appear once", l))), a.forEach((l) => {
-            On(l.value) || s.push(new c(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", l.value || l.name));
+            Rn(l.value) || s.push(new c(o.INVALID_TABLE_SETTING, "'headercolor' must be a color literal", l.value || l.name));
           });
           break;
         case "note":
@@ -2197,14 +2196,14 @@ class wn {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(_t, { declaration: this.declarationNode, symbolTable: new ve() });
+    this.declarationNode.symbol = this.symbolFactory.create(At, { declaration: this.declarationNode, symbolTable: new we() });
     const { name: n, alias: s } = this.declarationNode, i = C(n);
     if (i.isOk()) {
-      const r = [...i.unwrap()], a = r.pop(), l = Ze(r, this.publicSymbolTable, this.symbolFactory), p = xe(a);
+      const r = [...i.unwrap()], a = r.pop(), l = Ke(r, this.publicSymbolTable, this.symbolFactory), p = Se(a);
       l.has(p) && e.push(new c(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, n)), l.set(p, this.declarationNode.symbol);
     }
-    if (s && Pe(s) && !kn(s.expression.variable.value, i.unwrap_or([]))) {
-      const r = V(s).unwrap(), a = xe(r);
+    if (s && Me(s) && !xn(s.expression.variable.value, i.unwrap_or([]))) {
+      const r = V(s).unwrap(), a = Se(r);
       this.publicSymbolTable.has(a) && e.push(new c(o.DUPLICATE_NAME, `Table name '${r}' already exists`, n)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
     }
     return e;
@@ -2222,14 +2221,14 @@ class wn {
       if (!n.callee)
         return [];
       const s = [];
-      n.args.length === 0 && s.push(new c(o.INVALID_COLUMN, "A column must have a type", n.callee)), M(n.callee) || s.push(new c(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), n.args[0] && !yn(n.args[0]) && s.push(new c(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
+      n.args.length === 0 && s.push(new c(o.INVALID_COLUMN, "A column must have a type", n.callee)), M(n.callee) || s.push(new c(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", n.callee)), n.args[0] && !kn(n.args[0]) && s.push(new c(o.INVALID_COLUMN_TYPE, "Invalid column type", n.args[0]));
       const i = n.args.slice(1);
       return s.push(...this.validateFieldSetting(i)), s.push(...this.registerField(n)), s;
     });
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const n = V(e.callee).unwrap(), s = We(n), i = this.symbolFactory.create(Kt, { declaration: e });
+      const n = V(e.callee).unwrap(), s = Ye(n), i = this.symbolFactory.create(en, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
@@ -2245,7 +2244,7 @@ class wn {
   }
   // This is needed to support legacy inline settings
   validateFieldSetting(e) {
-    if (!e.slice(0, -1).every(Ee) || !e.slice(-1).every((p) => Ee(p) || p instanceof P))
+    if (!e.slice(0, -1).every(Ne) || !e.slice(-1).every((p) => Ne(p) || p instanceof P))
       return [...e.map((p) => new c(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
     if (e.length === 0)
       return [];
@@ -2272,7 +2271,7 @@ class wn {
           break;
         case "ref":
           h.forEach((f) => {
-            Dn(f.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", f.value || f.name));
+            Pn(f.value) || i.push(new c(o.INVALID_COLUMN_SETTING_VALUE, "'ref' must be a valid unary relationship", f.value || f.name));
           });
           break;
         case "primary key":
@@ -2309,7 +2308,7 @@ class wn {
           break;
         case "default":
           h.length > 1 && i.push(...h.map((f) => new c(o.DUPLICATE_TABLE_SETTING, "'default' can only appear once", f))), h.forEach((f) => {
-            Rn(f.value) || i.push(new c(o.INVALID_TABLE_SETTING, "'default' must be a string literal, number literal, function expression, true, false or null", f.value || f.name));
+            Dn(f.value) || i.push(new c(o.INVALID_TABLE_SETTING, "'default' must be a string literal, number literal, function expression, true, false or null", f.value || f.name));
           });
           break;
         default:
@@ -2331,11 +2330,11 @@ class wn {
     return s.length > 1 && (n.push(...s.map((i) => new c(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), n.push()), n;
   }
 }
-function yn(t) {
-  if (!(t instanceof J || He(t) || t instanceof D || t instanceof ce))
+function kn(t) {
+  if (!(t instanceof J || Je(t) || t instanceof D || t instanceof ce))
     return !1;
   if (t instanceof J) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ue(n) || Y(n) || Ee(n)))
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ue(n) || Y(n) || Ne(n)))
       return !1;
     t = t.callee;
   }
@@ -2347,10 +2346,10 @@ function yn(t) {
   const e = C(t).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
-function kn(t, e) {
+function xn(t, e) {
   return e.length === 1 && t === e[0];
 }
-class xn {
+class Sn {
   constructor(e, n, s) {
     this.declarationNode = e, this.publicSymbolTable = n, this.symbolFactory = s;
   }
@@ -2361,17 +2360,17 @@ class xn {
     return this.declarationNode.parent instanceof A ? [new c(o.INVALID_TABLEGROUP_CONTEXT, "TableGroup must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Je(e) ? [] : [new c(o.INVALID_NAME, "A TableGroup name must be of the form <tablegroup> or <schema>.<tablegroup>", e)] : [new c(o.NAME_NOT_FOUND, "A TableGroup must have a name", this.declarationNode)];
+    return e ? Ze(e) ? [] : [new c(o.INVALID_NAME, "A TableGroup name must be of the form <tablegroup> or <schema>.<tablegroup>", e)] : [new c(o.NAME_NOT_FOUND, "A TableGroup must have a name", this.declarationNode)];
   }
   validateAlias(e) {
     return e ? [new c(o.UNEXPECTED_ALIAS, "A TableGroup shouldn't have an alias", e)] : [];
   }
   registerElement() {
     const { name: e } = this.declarationNode;
-    this.declarationNode.symbol = this.symbolFactory.create(en, { declaration: this.declarationNode, symbolTable: new ve() });
+    this.declarationNode.symbol = this.symbolFactory.create(tn, { declaration: this.declarationNode, symbolTable: new we() });
     const n = C(e);
     if (n.isOk()) {
-      const s = n.unwrap(), i = s.pop(), r = Ze(s, this.publicSymbolTable, this.symbolFactory), a = ze(i);
+      const s = n.unwrap(), i = s.pop(), r = Ke(s, this.publicSymbolTable, this.symbolFactory), a = qe(i);
       if (r.has(a))
         return [new c(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists in schema '${s.join(".") || "public"}'`, e)];
       r.set(a, this.declarationNode.symbol);
@@ -2405,7 +2404,7 @@ class xn {
   }
   registerField(e) {
     if (e.callee && M(e.callee)) {
-      const n = V(e.callee).unwrap(), s = Qe(n), i = this.symbolFactory.create(tn, { declaration: e });
+      const n = V(e.callee).unwrap(), s = He(n), i = this.symbolFactory.create(nn, { declaration: e });
       e.symbol = i;
       const r = this.declarationNode.symbol.symbolTable;
       if (r.has(s)) {
@@ -2420,89 +2419,89 @@ class xn {
     return [];
   }
 }
-const vt = ["-", "+"];
+const wt = ["-", "+"];
 function re(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
-      return In;
+      return Ln;
     case b.Table:
-      return wn;
+      return yn;
     case b.TableGroup:
-      return xn;
+      return Sn;
     case b.Project:
-      return _n;
-    case b.Ref:
       return An;
+    case b.Ref:
+      return vn;
     case b.Note:
-      return gn;
+      return _n;
     case b.Indexes:
-      return Ln;
+      return gn;
     default:
-      return bn;
+      return In;
   }
 }
-function Je(t) {
+function Ze(t) {
   return !!C(t).unwrap_or(!1);
 }
-function Sn(t) {
-  return Pe(t);
+function On(t) {
+  return Me(t);
 }
-function Pe(t) {
+function Me(t) {
   return t instanceof D && t.expression instanceof j;
 }
-function Ze(t, e, n) {
+function Ke(t, e, n) {
   var i;
   t[0] === "public" && (t = t.slice(1));
   let s = e;
   for (const r of t) {
     let a;
-    const l = $e(r);
+    const l = je(r);
     if (s.has(l)) {
       if (a = (i = s.get(l)) == null ? void 0 : i.symbolTable, !a)
         throw new Error("Expect a symbol table in a schema symbol");
     } else {
-      a = new ve();
-      const p = n.create(gt, { symbolTable: a });
+      a = new we();
+      const p = n.create(_t, { symbolTable: a });
       s.set(l, p);
     }
     s = a;
   }
   return s;
 }
-function wt(t) {
+function yt(t) {
   return t === "-" || t === "<>" || t === ">" || t === "<";
 }
-function On(t) {
+function Rn(t) {
   var n;
-  if (!(t instanceof D) || !(t.expression instanceof me) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
+  if (!(t instanceof D) || !(t.expression instanceof Te) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
     return !1;
   const e = t.expression.literal.value;
   if (e.length !== 4 && e.length !== 7 || e[0] !== "#")
     return !1;
   for (let s = 1; s < e.length; s += 1)
-    if (!qt(e[s]))
+    if (!Ht(e[s]))
       return !1;
   return !0;
 }
 function le(t) {
   return t === void 0;
 }
-function Rn(t) {
+function Dn(t) {
   var e;
-  return !!(Y(t) || ue(t) || Ee(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof q && vt.includes((e = t.op) == null ? void 0 : e.value) && ue(t.expression) || t instanceof te);
+  return !!(Y(t) || ue(t) || Ne(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof q && wt.includes((e = t.op) == null ? void 0 : e.value) && ue(t.expression) || t instanceof te);
 }
 function ue(t) {
   var e;
-  return t instanceof D && t.expression instanceof me && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
+  return t instanceof D && t.expression instanceof Te && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
 }
-function Dn(t) {
+function Pn(t) {
   var n;
-  if (!(t instanceof q) || !wt((n = t.op) == null ? void 0 : n.value))
+  if (!(t instanceof q) || !yt((n = t.op) == null ? void 0 : n.value))
     return !1;
   const e = C(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
-function yt(t) {
+function kt(t) {
   return t instanceof Z && t.elementList.every(M);
 }
 function W(t) {
@@ -2517,15 +2516,15 @@ function W(t) {
       n.push(new c(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
       continue;
     }
-    const r = (s = Ne(i.name).unwrap_or(void 0)) == null ? void 0 : s.toLowerCase();
+    const r = (s = me(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, n);
 }
-class ht {
+class ft {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(gt, {
-      symbolTable: new ve()
+    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(_t, {
+      symbolTable: new we()
     }), this.ast.symbol = this.publicSchemaSymbol, this.ast.symbol.declaration = this.ast;
   }
   validate() {
@@ -2540,7 +2539,7 @@ class ht {
       );
       e.push(...r.validate());
     });
-    const n = this.ast.body.filter((s) => Ae(s).unwrap_or(void 0) === b.Project);
+    const n = this.ast.body.filter((s) => ve(s).unwrap_or(void 0) === b.Project);
     return n.length > 1 && n.forEach((s) => e.push(new c(o.PROJECT_REDEFINED, "Only one project can exist", s))), new F(this.ast, e);
   }
 }
@@ -2556,7 +2555,7 @@ class ae {
       for (const s of e.elementList) {
         if (s.name instanceof D)
           continue;
-        const i = Ne(s.name).unwrap_or(void 0);
+        const i = me(s.name).unwrap_or(void 0);
         if (!i)
           continue;
         const r = n[i.toLowerCase()];
@@ -2573,7 +2572,7 @@ class ae {
         if (s instanceof A) {
           if (!s.type)
             continue;
-          const i = kt(s);
+          const i = xt(s);
           new i(s, this.errors).bind();
         } else
           this.bindSubfield(s);
@@ -2596,7 +2595,7 @@ class ae {
           return;
         this.bindFragments([e], n);
       } else
-        e instanceof H ? He(e) ? this.bindFragments(he(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 Z && e.elementList.forEach((r) => this.scanAndBind(r, n));
+        e instanceof H ? Je(e) ? this.bindFragments(he(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof q ? this.scanAndBind(e.expression, n) : e instanceof Pe ? this.scanAndBind(e.expression, n) : e instanceof Z && e.elementList.forEach((r) => this.scanAndBind(r, n));
   }
   // Bind the fragments of a member access expression
   // which can be a simple expression like v1.User,
@@ -2604,7 +2603,7 @@ class ae {
   bindFragments(e, n) {
     if (e.length === 0)
       return;
-    const s = [...n.topSubnamesSymbolKind], { remainingSubnamesSymbolKind: i } = n, r = e.findIndex((f) => !M(f)), l = r !== -1 && yt(e[r]) ? e[r] : void 0, p = r >= 0 ? s.pop() : void 0, h = e.slice(
+    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
     );
@@ -2614,14 +2613,14 @@ class ae {
     for (; s.length && h.length; ) {
       const f = s.pop(), N = h.pop(), g = V(N).unwrap();
       T.unshift({
-        index: Fe(g, f),
+        index: Ve(g, f),
         referrer: N
       });
     }
     for (; h.length; ) {
       const f = h.pop(), N = V(f).unwrap();
       T.unshift({
-        index: Fe(N, i),
+        index: Ve(N, i),
         referrer: f
       });
     }
@@ -2630,7 +2629,7 @@ class ae {
         [
           ...T,
           {
-            index: Fe(
+            index: Ve(
               V(f).unwrap(),
               p
             ),
@@ -2646,7 +2645,7 @@ class ae {
   resolveIndexStack(e, n) {
     if (e.length === 0)
       throw new Error("Unreachable - An unresolved name must have at least one name component");
-    const [s, ...i] = e, r = Tn(s.index, this.declarationNode);
+    const [s, ...i] = e, r = bn(s.index, this.declarationNode);
     if (r === void 0) {
       const { kind: h, name: T } = ie(s.index).unwrap();
       this.logError(s.referrer, `Can not find ${h} '${T}'`, n);
@@ -2673,7 +2672,7 @@ class ae {
     s || this.errors.push(new c(o.BINDING_ERROR, n, e));
   }
 }
-class Pn extends ae {
+class Un extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2683,7 +2682,7 @@ class Pn extends ae {
     }, this.settingList = {};
   }
 }
-class Un extends ae {
+class Mn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2693,7 +2692,7 @@ class Un extends ae {
     }, this.settingList = {};
   }
 }
-class Mn extends ae {
+class Fn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2728,7 +2727,7 @@ class Mn extends ae {
     }, this.settingList = {};
   }
 }
-class Fn extends ae {
+class Bn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2738,7 +2737,7 @@ class Fn extends ae {
     }, this.settingList = {};
   }
 }
-class Bn extends ae {
+class Vn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2748,7 +2747,7 @@ class Bn extends ae {
     }, this.settingList = {};
   }
 }
-class Vn extends ae {
+class Gn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2765,7 +2764,7 @@ class Vn extends ae {
     }, this.settingList = {};
   }
 }
-class Gn extends ae {
+class Cn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2793,7 +2792,7 @@ class Gn extends ae {
     }, this.settingList = {};
   }
 }
-class Cn extends ae {
+class Xn extends ae {
   constructor() {
     super(...arguments), this.subfield = {
       arg: {
@@ -2810,40 +2809,40 @@ class Cn extends ae {
     }, this.settingList = {};
   }
 }
-function kt(t) {
+function xt(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
-      return Un;
+      return Mn;
     case b.Table:
-      return Gn;
-    case b.TableGroup:
       return Cn;
+    case b.TableGroup:
+      return Xn;
     case b.Project:
-      return Bn;
-    case b.Ref:
       return Vn;
+    case b.Ref:
+      return Gn;
     case b.Note:
-      return Fn;
+      return Bn;
     case b.Indexes:
-      return Mn;
+      return Fn;
     default:
-      return Pn;
+      return Un;
   }
 }
-class Xn {
+class $n {
   constructor(e) {
     this.ast = e, this.errors = [];
   }
   resolve() {
     for (const e of this.ast.body)
       if (e.type) {
-        const n = kt(e);
+        const n = xt(e);
         new n(e, this.errors).bind();
       }
     return new F(this.ast, this.errors);
   }
 }
-class $n {
+class Wn {
   constructor(e) {
     this.generator = e;
   }
@@ -2851,21 +2850,21 @@ class $n {
     return new e(n, this.generator.nextId());
   }
 }
-class Wn {
+class jn {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = new $n(n);
+    this.ast = e, this.symbolFactory = new Wn(n);
   }
   // Analyzing: Invoking both the validator and binder
   analyze() {
-    return new ht(this.ast, this.symbolFactory).validate().chain((n) => new Xn(n).resolve());
+    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new $n(n).resolve());
   }
   // For invoking the validator only
   validate() {
-    return new ht(this.ast, this.symbolFactory).validate().chain((n) => new F(n, []));
+    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new F(n, []));
   }
 }
-function ft(t, e) {
-  const { variables: n, tupleElements: s } = ge(t).unwrap();
+function pt(t, e) {
+  const { variables: n, tupleElements: s } = _e(t).unwrap();
   return s ? n.length === 0 ? {
     schemaName: e.schemaName,
     tableName: e.name,
@@ -2884,7 +2883,7 @@ function ft(t, e) {
     schemaName: n.pop() || null
   };
 }
-function xt(t) {
+function St(t) {
   switch (t) {
     case "<":
       return ["1", "*"];
@@ -2907,30 +2906,30 @@ function x(t) {
     end: { offset: t.endPos.offset, line: t.endPos.line + 1, column: t.endPos.column + 1 }
   };
 }
-function Ce(t) {
+function $e(t) {
   var n;
   const e = (n = he(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
   return e instanceof Z ? e.elementList.map((s) => s.referee) : [e.referee];
 }
-function Te(t) {
+function be(t) {
   const e = C(t).unwrap();
   return {
     name: e.pop(),
     schemaName: e
   };
 }
-function St(t) {
+function Ot(t) {
   return t.expression.literal.value;
 }
-function Ot(t, e) {
+function Rt(t, e) {
   if (Array.isArray(t)) {
     const i = t.map(({ id: a }) => a).sort().join(","), r = e.map(({ id: a }) => a).sort().join(",");
     return i < r ? `${i}-${r}` : `${r}-${i}`;
   }
-  const n = t.id, s = e.id;
+  const n = t.id.toString(), s = e.id.toString();
   return n < s ? `${n}-${s}` : `${s}-${n}`;
 }
-function Rt(t, e) {
+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);
@@ -2938,7 +2937,13 @@ function Rt(t, e) {
   const n = t.id, s = e.id;
   return n === s;
 }
-class Dt {
+function Ee(t) {
+  const e = t.split(`
+`), n = e.filter((i) => i.trimStart()), s = Math.min(...n.map((i) => i.length - i.trimStart().length));
+  return e.map((i) => i.slice(s)).join(`
+`);
+}
+class Pt {
   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 = [];
   }
@@ -2962,7 +2967,7 @@ class Dt {
     }), this.pkColumns.forEach((n) => n.pk = !1)), e;
   }
   interpretName(e) {
-    const { name: n, schemaName: s } = Te(e);
+    const { name: n, schemaName: s } = be(e);
     return s.length > 1 ? (this.table.name = n, this.table.schemaName = s.join("."), [new c(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.table.name = n, this.table.schemaName = s.length ? s[0] : null, []);
   }
   interpretAlias(e) {
@@ -2979,12 +2984,12 @@ class Dt {
     }), this.table.alias = n), [];
   }
   interpretSettingList(e) {
-    var r, a, l;
+    var i, r, a;
     const n = W(e).getValue();
-    this.table.headerColor = (r = n.headercolor) != null && r.length ? St((l = (a = n.headercolor) == null ? void 0 : a.at(0)) == null ? void 0 : l.value) : void 0;
-    const [s] = n.note || [], i = Q(s == null ? void 0 : s.value).unwrap_or(void 0);
+    this.table.headerColor = (i = n.headercolor) != null && i.length ? Ot((a = (r = n.headercolor) == null ? void 0 : r.at(0)) == null ? void 0 : a.value) : void 0;
+    const [s] = n.note || [];
     return this.table.note = s && {
-      value: i,
+      value: Q(s == null ? void 0 : s.value).map(Ee).unwrap(),
       token: x(s)
     }, [];
   }
@@ -2998,7 +3003,7 @@ class Dt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: Q(n.body instanceof ne ? n.body.body[0].callee : n.body.callee).unwrap(),
+            value: Q(n.body instanceof ne ? n.body.body[0].callee : n.body.callee).map(Ee).unwrap(),
             token: x(n)
           }, [];
         case "indexes":
@@ -3014,23 +3019,23 @@ class Dt {
     var a, l, p, h, T, f, N, g;
     const n = [], s = {};
     s.name = V(e.callee).unwrap();
-    const i = jn(e.args[0]);
+    const i = Yn(e.args[0]);
     s.type = i.getValue(), n.push(...i.getErrors()), s.token = x(e), s.inline_refs = [];
     const r = e.args.slice(1);
     if (I.last(r) instanceof P) {
       const _ = W(r.pop()).getValue();
-      s.pk = !!((a = _.pk) != null && a.length) || !!((l = _["primary key"]) != null && l.length), s.increment = !!((p = _.increment) != null && p.length), s.unique = !!((h = _.unique) != null && h.length), s.not_null = !!((T = _["not null"]) != null && T.length) && !0, s.dbdefault = Yn((N = (f = _.default) == null ? void 0 : f.at(0)) == null ? void 0 : N.value);
+      s.pk = !!((a = _.pk) != null && a.length) || !!((l = _["primary key"]) != null && l.length), s.increment = !!((p = _.increment) != null && p.length), s.unique = !!((h = _.unique) != null && h.length), s.not_null = !!((T = _["not null"]) != null && T.length) && !0, s.dbdefault = zn((N = (f = _.default) == null ? void 0 : f.at(0)) == null ? void 0 : N.value);
       const K = (g = _.note) == null ? void 0 : g.at(0);
       s.note = K && {
-        value: Q(K.value).unwrap(),
+        value: Q(K.value).map(Ee).unwrap(),
         token: x(K)
       };
-      const be = _.ref || [];
-      s.inline_refs = be.flatMap((z) => {
-        const [tt] = Ce(z.value.expression);
-        if (Rt(tt, e.symbol))
+      const Ie = _.ref || [];
+      s.inline_refs = Ie.flatMap((z) => {
+        const [nt] = $e(z.value.expression);
+        if (Dt(nt, e.symbol))
           return n.push(new c(o.SAME_ENDPOINT, "Two endpoints are the same", z)), [];
-        const we = z.value.op, ee = C(z.value.expression).unwrap();
+        const ye = z.value.op, ee = C(z.value.expression).unwrap();
         let fe;
         if (ee.length === 1) {
           const [oe] = ee;
@@ -3038,40 +3043,40 @@ class Dt {
             schemaName: this.table.schemaName,
             tableName: this.table.name,
             fieldNames: [oe],
-            relation: we.value,
+            relation: ye.value,
             token: x(z)
           };
         } else if (ee.length === 2) {
-          const [oe, Ie] = ee;
+          const [oe, Le] = ee;
           fe = {
             schemaName: null,
             tableName: oe,
-            fieldNames: [Ie],
-            relation: we.value,
+            fieldNames: [Le],
+            relation: ye.value,
             token: x(z)
           };
         } else if (ee.length === 3) {
-          const [oe, Ie, st] = ee;
+          const [oe, Le, it] = ee;
           fe = {
             schemaName: oe,
-            tableName: Ie,
-            fieldNames: [st],
-            relation: we.value,
+            tableName: Le,
+            fieldNames: [it],
+            relation: ye.value,
             token: x(z)
           };
         } else {
           n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", z));
-          const oe = ee.pop(), Ie = ee.pop();
+          const oe = ee.pop(), Le = ee.pop();
           fe = {
             schemaName: ee.join("."),
-            tableName: Ie,
+            tableName: Le,
             fieldNames: [oe],
-            relation: we.value,
+            relation: ye.value,
             token: x(z)
           };
         }
-        const nt = this.registerInlineRefToEnv(e, tt, fe, z);
-        return n.push(...nt), nt.length === 0 ? fe : [];
+        const st = this.registerInlineRefToEnv(e, nt, fe, z);
+        return n.push(...st), st.length === 0 ? fe : [];
       });
     }
     return s.pk || (s.pk = r.some((_) => X(_).unwrap().toLowerCase() === "pk")), s.unique || (s.unique = r.some((_) => X(_).unwrap().toLowerCase() === "unique")), this.table.fields.push(s), s.pk && this.pkColumns.push(s), n;
@@ -3099,14 +3104,14 @@ class Dt {
           _.push(g.argumentList), g = g.callee;
         return _.push(g), _;
       }).forEach((g) => {
-        const { functional: _, nonFunctional: K } = Ge(g).unwrap();
+        const { functional: _, nonFunctional: K } = Xe(g).unwrap();
         s.columns.push(
-          ..._.map((be) => ({
-            value: be.value.value,
+          ..._.map((Ie) => ({
+            value: Ie.value.value,
             type: "expression"
           })),
-          ...K.map((be) => ({
-            value: V(be).unwrap(),
+          ...K.map((Ie) => ({
+            value: V(Ie).unwrap(),
             type: "column"
           }))
         );
@@ -3114,13 +3119,13 @@ class Dt {
     })), [];
   }
   registerInlineRefToEnv(e, n, s, i) {
-    const r = Ot(e.symbol, n);
+    const r = Rt(e.symbol, n);
     if (this.env.refIds[r])
       return [
         new c(o.CIRCULAR_REF, "References with same endpoints exist", i),
         new c(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[r])
       ];
-    const a = xt(s.relation);
+    const a = St(s.relation);
     return this.env.refIds[r] = i, this.env.ref.set(i, {
       name: null,
       schemaName: null,
@@ -3141,13 +3146,13 @@ class Dt {
     }), [];
   }
 }
-function jn(t) {
+function Yn(t) {
   let e = null;
   t instanceof J && (e = t.argumentList.elementList.map((r) => ue(r) ? r.expression.literal.value : Y(r) ? Q(r).unwrap() : X(r).unwrap()).join(","), t = t.callee);
   let n = "";
   for (; t instanceof ce; )
     n = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${n}`, t = t.array;
-  const { name: s, schemaName: i } = Te(t);
+  const { name: s, schemaName: i } = be(t);
   return i.length > 1 ? new F(
     {
       schemaName: i.length === 0 ? null : i[0],
@@ -3161,7 +3166,7 @@ function jn(t) {
     args: e
   });
 }
-function Yn(t) {
+function zn(t) {
   var e, n, s;
   if (t) {
     if (Y(t))
@@ -3174,12 +3179,12 @@ function Yn(t) {
         type: "number",
         value: Number.parseFloat(t.expression.literal.value)
       };
-    if (Ee(t))
+    if (Ne(t))
       return {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
       };
-    if (t instanceof q && vt.includes((e = t.op) == null ? void 0 : e.value) && ue(t.expression)) {
+    if (t instanceof q && wt.includes((e = t.op) == null ? void 0 : e.value) && ue(t.expression)) {
       const i = Number.parseFloat(t.expression.expression.literal.value);
       return {
         value: ((n = t.op) == null ? void 0 : n.value) === "-" ? 0 - i : i,
@@ -3194,7 +3199,7 @@ function Yn(t) {
     throw new Error("Unreachable");
   }
 }
-class zn {
+class Qn {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.note = { name: void 0, content: void 0, token: void 0 };
   }
@@ -3206,13 +3211,13 @@ class zn {
     ];
   }
   interpretName(e) {
-    const { name: n } = Te(e);
+    const { name: n } = be(e);
     return this.note.name = n, [];
   }
   interpretSettingList(e) {
     var s, i, r;
     const n = W(e).getValue();
-    return this.note.headerColor = (s = n.headercolor) != null && s.length ? St((r = (i = n.headercolor) == null ? void 0 : i.at(0)) == null ? void 0 : r.value) : void 0, [];
+    return this.note.headerColor = (s = n.headercolor) != null && s.length ? Ot((r = (i = n.headercolor) == null ? void 0 : i.at(0)) == null ? void 0 : r.value) : void 0, [];
   }
   interpretBody(e) {
     const [n, s] = I.partition(e.body, (i) => i instanceof w);
@@ -3222,10 +3227,10 @@ class zn {
   }
   interpretNote(e) {
     const n = I.get(e, "callee.expression.literal.value", "");
-    return this.note.content = n, [];
+    return this.note.content = Ee(n), [];
   }
 }
-class Pt {
+class Ut {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.container = this.declarationNode.parent instanceof A ? this.env.tables.get(this.declarationNode.parent) : void 0, this.ref = {};
   }
@@ -3241,10 +3246,10 @@ class Pt {
   }
   interpretField(e) {
     var h, T, f, N;
-    const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, r = Ce(s), a = Ce(i);
-    if (Rt(r, a))
+    const n = e.callee.op.value, { leftExpression: s, rightExpression: i } = e.callee, r = $e(s), a = $e(i);
+    if (Dt(r, a))
       return [new c(o.SAME_ENDPOINT, "Two endpoints are the same", e)];
-    const l = Ot(r, a);
+    const l = Rt(r, a);
     if (this.env.refIds[l])
       return [
         new c(o.CIRCULAR_REF, "References with same endpoints exist", this.declarationNode),
@@ -3252,26 +3257,26 @@ class Pt {
       ];
     if (e.args[0]) {
       const g = W(e.args[0]).getValue(), _ = (T = (h = g.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value;
-      this.ref.onDelete = _ instanceof $ ? Ne(_).unwrap_or(void 0) : X(_).unwrap_or(void 0);
+      this.ref.onDelete = _ instanceof $ ? me(_).unwrap_or(void 0) : X(_).unwrap_or(void 0);
       const K = (N = (f = g.update) == null ? void 0 : f.at(0)) == null ? void 0 : N.value;
-      this.ref.onUpdate = K instanceof $ ? Ne(K).unwrap_or(void 0) : X(K).unwrap_or(void 0);
+      this.ref.onUpdate = K instanceof $ ? me(K).unwrap_or(void 0) : X(K).unwrap_or(void 0);
     }
-    const p = xt(n);
+    const p = St(n);
     return this.ref.endpoints = [
       {
-        ...ft(s, this.container),
+        ...pt(s, this.container),
         relation: p[0],
         token: x(s)
       },
       {
-        ...ft(i, this.container),
+        ...pt(i, this.container),
         relation: p[1],
         token: x(i)
       }
     ], this.env.refIds[l] = this.declarationNode, [];
   }
 }
-class Ut {
+class Mt {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.tableGroup = { tables: [] };
   }
@@ -3283,7 +3288,7 @@ class Ut {
     ), e;
   }
   interpretName(e) {
-    const n = [], { name: s, schemaName: i } = Te(e);
+    const n = [], { name: s, schemaName: i } = be(e);
     return i.length >= 2 && (this.tableGroup.name = s, this.tableGroup.schemaName = i.join("."), n.push(new c(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = s, this.tableGroup.schemaName = i[0] || null, n;
   }
   interpretBody(e) {
@@ -3304,7 +3309,7 @@ class Ut {
     }), n;
   }
 }
-class Mt {
+class Ft {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.enum = { values: [] };
   }
@@ -3312,7 +3317,7 @@ class Mt {
     return this.enum.token = x(this.declarationNode), this.env.enums.set(this.declarationNode, this.enum), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
-    const { name: n, schemaName: s } = Te(e);
+    const { name: n, schemaName: s } = be(e);
     return s.length > 1 ? (this.enum.name = n, this.enum.schemaName = s.join("."), [new c(o.UNSUPPORTED, "Nested schema is not supported", e)]) : (this.enum.name = n, this.enum.schemaName = s.length ? s[0] : null, []);
   }
   interpretBody(e) {
@@ -3322,13 +3327,13 @@ class Mt {
       i.token = x(s), i.name = X(s.callee).unwrap();
       const a = (l = W(s.args[0]).getValue().note) == null ? void 0 : l.at(0);
       return i.note = a && {
-        value: Q(a.value).unwrap(),
+        value: Q(a.value).map(Ee).unwrap(),
         token: x(a)
       }, this.enum.values.push(i), [];
     });
   }
 }
-class Qn {
+class qn {
   constructor(e, n) {
     this.declarationNode = e, this.env = n, this.project = { enums: [], refs: [], tableGroups: [], tables: [] };
   }
@@ -3338,7 +3343,7 @@ class Qn {
   interpretName(e) {
     if (!e)
       return this.project.name = null, [];
-    const { name: n } = Te(e);
+    const { name: n } = be(e);
     return this.project.name = n, [];
   }
   interpretBody(e) {
@@ -3347,24 +3352,24 @@ class Qn {
       const s = n;
       switch ((i = s.type) == null ? void 0 : i.value.toLowerCase()) {
         case "table": {
-          const r = new Dt(s, this.env).interpret();
+          const r = new Pt(s, this.env).interpret();
           return this.project.tables.push(this.env.tables.get(s)), r;
         }
         case "ref": {
-          const r = new Pt(s, this.env).interpret();
+          const r = new Ut(s, this.env).interpret();
           return this.project.refs.push(this.env.ref.get(s)), r;
         }
         case "tablegroup": {
-          const r = new Ut(s, this.env).interpret();
+          const r = new Mt(s, this.env).interpret();
           return this.project.tableGroups.push(this.env.tableGroups.get(s)), r;
         }
         case "enum": {
-          const r = new Mt(s, this.env).interpret();
+          const r = new Ft(s, this.env).interpret();
           return this.project.enums.push(this.env.enums.get(s)), r;
         }
         case "note":
           return this.project.note = {
-            value: Q(s.body instanceof ne ? s.body.body[0].callee : s.body.callee).unwrap(),
+            value: Q(s.body instanceof ne ? s.body.body[0].callee : s.body.callee).map(Ee).unwrap(),
             token: x(s)
           }, [];
         default:
@@ -3373,7 +3378,7 @@ class Qn {
     });
   }
 }
-class qn {
+class Hn {
   constructor(e) {
     this.ast = e, this.env = {
       schema: [],
@@ -3390,27 +3395,27 @@ class qn {
   }
   interpret() {
     const e = this.ast.body.flatMap((n) => {
-      switch (Ae(n).unwrap_or(void 0)) {
+      switch (ve(n).unwrap_or(void 0)) {
         case b.Table:
-          return new Dt(n, this.env).interpret();
+          return new Pt(n, this.env).interpret();
         case b.Note:
-          return new zn(n, this.env).interpret();
+          return new Qn(n, this.env).interpret();
         case b.Ref:
-          return new Pt(n, this.env).interpret();
-        case b.TableGroup:
           return new Ut(n, this.env).interpret();
-        case b.Enum:
+        case b.TableGroup:
           return new Mt(n, this.env).interpret();
+        case b.Enum:
+          return new Ft(n, this.env).interpret();
         case b.Project:
-          return new Qn(n, this.env).interpret();
+          return new qn(n, this.env).interpret();
         default:
           return [];
       }
     });
-    return new F(Hn(this.env), e);
+    return new F(Jn(this.env), e);
   }
 }
-function Hn(t) {
+function Jn(t) {
   return {
     schemas: [],
     tables: Array.from(t.tables.values()),
@@ -3423,7 +3428,7 @@ function Hn(t) {
   };
 }
 var L = /* @__PURE__ */ ((t) => (t[t.Function = 1] = "Function", t[t.Constructor = 2] = "Constructor", t[t.Field = 3] = "Field", t[t.Variable = 4] = "Variable", t[t.Class = 5] = "Class", t[t.Struct = 6] = "Struct", t[t.Interface = 7] = "Interface", t[t.Module = 8] = "Module", t[t.Property = 9] = "Property", t[t.Event = 10] = "Event", t[t.Operator = 11] = "Operator", t[t.Unit = 12] = "Unit", t[t.Value = 13] = "Value", t[t.Constant = 14] = "Constant", t[t.Enum = 15] = "Enum", t[t.EnumMember = 16] = "EnumMember", t[t.Keyword = 17] = "Keyword", t[t.Text = 18] = "Text", t[t.Color = 19] = "Color", t[t.File = 20] = "File", t[t.Reference = 21] = "Reference", t[t.Customcolor = 22] = "Customcolor", t[t.Folder = 23] = "Folder", t[t.TypeParameter = 24] = "TypeParameter", t[t.User = 25] = "User", t[t.Issue = 26] = "Issue", t[t.Snippet = 27] = "Snippet", t))(L || {}), y = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(y || {});
-function _e(t) {
+function Ae(t) {
   switch (t) {
     case m.Schema:
       return L.Module;
@@ -3443,8 +3448,8 @@ function _e(t) {
       return L.Text;
   }
 }
-function Oe(t, e) {
-  if (!t || Ve(t))
+function Re(t, e) {
+  if (!t || Ce(t))
     return !1;
   for (const n of t.trailingTrivia) {
     if (n.start > e)
@@ -3459,7 +3464,7 @@ function O() {
     suggestions: []
   };
 }
-function Re(t) {
+function De(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
@@ -3468,38 +3473,38 @@ function Re(t) {
     }))
   };
 }
-function Ue(t) {
+function Fe(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
       ...e,
-      insertText: e.insertText.search(/[^a-zA-Z\d_]/) !== -1 || e.insertText[0].match(/\d/) ? `"${e.insertText}"` : e.insertText
+      insertText: e.insertText.split("").every(Ue) ? e.insertText : `"${e.insertText}"`
     }))
   };
 }
-function Ke(t, e) {
+function et(t, e) {
   return t.getOffsetAt(e);
 }
-class Ft {
+class Bt {
   constructor(e, n = []) {
     this.compiler = e, this.triggerCharacters = n;
   }
   provideCompletionItems(e, n) {
     var T, f;
-    const s = Ke(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), l = a === void 0 ? i[0] : i[a + 1];
+    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) => Wt(N) && Le(s, N)))
+    ].find((N) => jt(N) && ge(s, N)))
       return O();
     if (a === void 0)
-      return mt();
-    if ([u.STRING_LITERAL, u.QUOTED_STRING].includes(r.kind) && Le(s, r))
+      return Tt();
+    if ([u.STRING_LITERAL, u.QUOTED_STRING].includes(r.kind) && ge(s, r))
       return O();
     const p = this.compiler.container.element(s);
     if (this.compiler.container.scopeKind(s) === R.TOPLEVEL || p instanceof A && p.type && p.type.start <= s && p.type.end >= s)
-      return mt();
+      return Tt();
     const h = [...this.compiler.container.stack(s)].reverse();
     for (const N of h)
       if (N instanceof q)
@@ -3508,7 +3513,7 @@ class Ft {
           case "<":
           case "<>":
           case "-":
-            return pt(
+            return dt(
               this.compiler,
               s,
               N
@@ -3520,13 +3525,13 @@ class Ft {
           case "<":
           case "<>":
           case "-":
-            return pt(
+            return dt(
               this.compiler,
               s,
               N
             );
           case ".":
-            return Bt(
+            return Vt(
               this.compiler,
               s,
               N
@@ -3534,32 +3539,32 @@ class Ft {
         }
       else {
         if (N instanceof se)
-          return dt(this.compiler, s, N);
+          return Et(this.compiler, s, N);
         if (N instanceof P)
-          return dt(this.compiler, s, N);
+          return Et(this.compiler, s, N);
         if (N instanceof Z)
-          return Jn(this.compiler, s);
+          return Zn(this.compiler, s);
         if (N instanceof w)
-          return Nt(this.compiler, s, N);
-        if (N instanceof A && (N.bodyColon && s >= N.bodyColon.end || N.body && Le(s, N.body)))
-          return Nt(this.compiler, s, void 0);
+          return mt(this.compiler, s, N);
+        if (N instanceof A && (N.bodyColon && s >= N.bodyColon.end || N.body && ge(s, N.body)))
+          return mt(this.compiler, s, void 0);
       }
     return O();
   }
 }
-function pt(t, e, n) {
+function dt(t, e, n) {
   const s = t.container.scopeKind(e);
   if ([R.REF, R.TABLE].includes(s)) {
-    const i = Me(t, e, t.container.element(e), [
+    const i = Be(t, e, t.container.element(e), [
       m.Table,
       m.Schema,
       m.Column
     ]);
-    return Oe(n.op, e) ? Re(i) : i;
+    return Re(n.op, e) ? De(i) : i;
   }
   return O();
 }
-function Me(t, e, n, s) {
+function Be(t, e, n, s) {
   var a;
   if (n === void 0)
     return O();
@@ -3573,61 +3578,61 @@ function Me(t, e, n, s) {
           label: p,
           insertText: p,
           insertTextRules: y.KeepWhitespace,
-          kind: _e(h),
-          sortText: _e(h).toString().padStart(2, "0"),
+          kind: Ae(h),
+          sortText: Ae(h).toString().padStart(2, "0"),
           range: void 0
         }))
       );
     }
     i = i instanceof A ? i.parent : void 0;
   }
-  return Ue(r);
+  return Fe(r);
 }
-function Jn(t, e) {
+function Zn(t, e) {
   var s;
   switch (t.container.scopeKind(e)) {
     case R.INDEXES:
-      return Gt(t, e);
+      return Ct(t, e);
     case R.REF:
       {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
           const r = i.pop();
           if (r instanceof H && ((s = r.op) == null ? void 0 : s.value) === ".")
-            return Bt(
+            return Vt(
               t,
               e,
               r
             );
         }
       }
-      return Vt(t, e);
+      return Gt(t, e);
   }
   return O();
 }
-function dt(t, e, n) {
+function Et(t, e, n) {
   const { token: s } = t.container.token(e);
   if ([u.COMMA, u.LBRACKET].includes(s == null ? void 0 : s.kind)) {
-    const i = Et(t, e);
-    return (s == null ? void 0 : s.kind) === u.COMMA && Oe(s, e) ? Re(i) : i;
+    const i = Nt(t, e);
+    return (s == null ? void 0 : s.kind) === u.COMMA && Re(s, e) ? De(i) : i;
   }
   if (n.name && n.name.start <= e && n.name.end >= e)
-    return Et(t, e);
+    return Nt(t, e);
   if (n.name instanceof $) {
-    const i = Zn(
+    const i = Kn(
       t,
       e,
-      Ne(n.name).unwrap()
+      me(n.name).unwrap()
     );
-    return (s == null ? void 0 : s.kind) === u.COLON && Oe(s, e) ? Re(i) : i;
+    return (s == null ? void 0 : s.kind) === u.COLON && Re(s, e) ? De(i) : i;
   }
   return O();
 }
-function Et(t, e) {
+function Nt(t, e) {
   const n = t.container.element(e), s = t.container.scopeKind(e);
   if (n instanceof G)
     return O();
-  if (n.body && !Le(e, n.body))
+  if (n.body && !ge(e, n.body))
     switch (s) {
       case R.TABLE:
         return {
@@ -3722,7 +3727,7 @@ function Et(t, e) {
   }
   return O();
 }
-function Zn(t, e, n) {
+function Kn(t, e, n) {
   switch (n == null ? void 0 : n.toLowerCase()) {
     case "update":
     case "delete":
@@ -3748,42 +3753,42 @@ function Zn(t, e, n) {
   }
   return O();
 }
-function Bt(t, e, n) {
+function Vt(t, e, n) {
   const s = he(n).unwrap_or([]);
   if (s.pop(), s.some((r) => !M(r)))
     return O();
   const i = s.map((r) => X(r).unwrap());
-  return Ue({
+  return Fe({
     suggestions: t.symbol.ofName({ nameStack: i, owner: t.container.element(e) }).flatMap(({ symbol: r }) => t.symbol.members(r)).map(({ kind: r, name: a }) => ({
       label: a,
       insertText: a,
-      kind: _e(r),
+      kind: Ae(r),
       range: void 0
     }))
   });
 }
-function Nt(t, e, n) {
+function mt(t, e, n) {
   var i;
   switch (t.container.scopeKind(e)) {
     case R.TABLE:
-      return es(t, e, n);
-    case R.PROJECT:
       return ts(t, e, n);
+    case R.PROJECT:
+      return ns(t, e, n);
     case R.INDEXES:
-      return ss(t, e);
+      return is(t, e);
     case R.ENUM:
-      return Kn(t, e, n);
+      return es(t, e, n);
     case R.REF: {
-      const r = Vt(t, e);
-      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && Oe(t.container.token(e).token, e) ? Re(r) : r;
+      const r = Gt(t, e);
+      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && Re(t.container.token(e).token, e) ? De(r) : r;
     }
     case R.TABLEGROUP:
-      return ns(t);
+      return ss(t);
     default:
       return O();
   }
 }
-function mt() {
+function Tt() {
   return {
     suggestions: ["Table", "TableGroup", "Enum", "Project", "Ref"].map((t) => ({
       label: t,
@@ -3794,14 +3799,14 @@ function mt() {
     }))
   };
 }
-function Kn(t, e, n) {
-  return n != null && n.callee && et(e, n) === 1 ? Me(t, e, t.container.element(e), [
+function es(t, e, n) {
+  return n != null && n.callee && tt(e, n) === 1 ? Be(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
   ]) : O();
 }
-function es(t, e, n) {
+function ts(t, e, n) {
   if (!(n != null && n.callee))
     return {
       suggestions: ["Note", "indexes"].map((i) => ({
@@ -3812,7 +3817,7 @@ function es(t, e, n) {
         range: void 0
       }))
     };
-  const s = et(e, n);
+  const s = tt(e, n);
   return s === 0 ? {
     suggestions: ["Note", "indexes"].map((i) => ({
       label: i,
@@ -3821,10 +3826,10 @@ function es(t, e, n) {
       kind: L.Keyword,
       range: void 0
     }))
-  } : s === 1 ? is(t, e) : O();
+  } : s === 1 ? rs(t, e) : O();
 }
-function ts(t, e, n) {
-  return n != null && n.callee ? et(e, n) === 0 ? {
+function ns(t, e, n) {
+  return n != null && n.callee ? tt(e, n) === 0 ? {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
@@ -3842,15 +3847,15 @@ function ts(t, e, n) {
     }))
   };
 }
-function Vt(t, e) {
-  return Me(t, e, t.container.element(e), [
+function Gt(t, e) {
+  return Be(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
   ]);
 }
-function ns(t) {
-  return Ue({
+function ss(t) {
+  return Fe({
     suggestions: [...t.parse.publicSymbolTable().entries()].flatMap(([e]) => {
       const n = ie(e).unwrap_or(void 0);
       if (n === void 0)
@@ -3860,16 +3865,16 @@ function ns(t) {
         label: i,
         insertText: i,
         insertTextRules: y.KeepWhitespace,
-        kind: _e(s),
+        kind: Ae(s),
         range: void 0
       };
     })
   });
 }
-function ss(t, e) {
-  return Gt(t, e);
-}
 function is(t, e) {
+  return Ct(t, e);
+}
+function rs(t, e) {
   return {
     suggestions: [
       ...[
@@ -3937,19 +3942,19 @@ function is(t, e) {
         sortText: L.TypeParameter.toString().padStart(2, "0"),
         range: void 0
       })),
-      ...Me(t, e, t.container.element(e), [
+      ...Be(t, e, t.container.element(e), [
         m.Enum,
         m.Schema
       ]).suggestions
     ]
   };
 }
-function Gt(t, e) {
+function Ct(t, e) {
   const n = t.container.element(e), s = n == null ? void 0 : n.parent;
-  if (!((s == null ? void 0 : s.symbol) instanceof _t))
+  if (!((s == null ? void 0 : s.symbol) instanceof At))
     return O();
   const { symbolTable: i } = s.symbol;
-  return Ue({
+  return Fe({
     suggestions: [...i.entries()].flatMap(([r]) => {
       const a = ie(r).unwrap_or(void 0);
       if (a === void 0)
@@ -3959,25 +3964,25 @@ function Gt(t, e) {
         label: l,
         insertText: l,
         insertTextRules: y.KeepWhitespace,
-        kind: _e(m.Column),
+        kind: Ae(m.Column),
         range: void 0
       };
     })
   });
 }
-function et(t, e) {
+function tt(t, e) {
   if (!e.callee)
     return -1;
   const n = [e.callee, ...e.args], s = n.findIndex((i) => t <= i.end);
   return s === -1 ? n.length : s;
 }
-class Ct {
+class Xt {
   constructor(e) {
     this.compiler = e;
   }
   provideDefinition(e, n) {
     var a;
-    const { uri: s } = e, i = Ke(e, n), 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 && [de.PRIMARY_EXPRESSION, de.VARIABLE].includes(l == null ? void 0 : l.kind)) {
@@ -3998,12 +4003,12 @@ class Ct {
     return [];
   }
 }
-class Xt {
+class $t {
   constructor(e) {
     this.compiler = e;
   }
   provideReferences(e, n) {
-    const { uri: s } = e, i = Ke(e, n), 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 a = r.pop();
       if (a && [
@@ -4027,24 +4032,24 @@ class Xt {
     return [];
   }
 }
-const os = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const ls = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   CompletionItemInsertTextRule: y,
   CompletionItemKind: L,
-  DBMLCompletionItemProvider: Ft,
-  DBMLDefinitionProvider: Ct,
-  DBMLReferencesProvider: Xt
+  DBMLCompletionItemProvider: Bt,
+  DBMLDefinitionProvider: Xt,
+  DBMLReferencesProvider: $t
 }, Symbol.toStringTag, { value: "Module" }));
 var R = /* @__PURE__ */ ((t) => (t[t.TABLE = 0] = "TABLE", t[t.ENUM = 1] = "ENUM", t[t.TABLEGROUP = 2] = "TABLEGROUP", t[t.INDEXES = 3] = "INDEXES", t[t.NOTE = 4] = "NOTE", t[t.REF = 5] = "REF", t[t.PROJECT = 6] = "PROJECT", t[t.CUSTOM = 7] = "CUSTOM", t[t.TOPLEVEL = 8] = "TOPLEVEL", t))(R || {});
-class ls {
+class cs {
   constructor() {
     this.source = "", this.cache = new Array(
       16
       /* TOTAL_QUERY_COUNT */
-    ).fill(null), this.nodeIdGenerator = new jt(), this.symbolIdGenerator = new Ht(), this.token = {
+    ).fill(null), this.nodeIdGenerator = new Yt(), this.symbolIdGenerator = new Jt(), this.token = {
       invalidStream: this.createQuery(
         6,
-        () => this.parse.tokens().filter(At)
+        () => this.parse.tokens().filter(vt)
       ),
       // Valid + Invalid tokens (which are guarenteed to be non-trivials) are included in the stream
       flatStream: this.createQuery(
@@ -4056,8 +4061,8 @@ class ls {
       _: this.createQuery(
         0,
         () => {
-          const e = new on(this.source).lex().chain((n) => new un(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new Wn(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
-          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new qn(n).interpret().map((r) => ({ ast: n, tokens: s, rawDb: r })));
+          const e = new ln(this.source).lex().chain((n) => new hn(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new jn(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
+          return e.getErrors().length > 0 ? e : e.chain(({ ast: n, tokens: s }) => new Hn(n).interpret().map((r) => ({ ast: n, tokens: s, rawDb: r })));
         }
       ),
       ast: this.createQuery(
@@ -4094,7 +4099,7 @@ class ls {
           let a = this.parse.ast();
           const l = [a];
           for (; ; ) {
-            const h = an(a).find((T) => Le(r, T));
+            const h = on(a).find((T) => ge(r, T));
             if (h === void 0 || h instanceof B)
               break;
             l.push(h), a = h;
@@ -4193,7 +4198,7 @@ class ls {
             let l = [a], p = [];
             for (const h of e)
               p = l.flatMap(
-                (T) => Qt(h).flatMap((f) => {
+                (T) => qt(h).flatMap((f) => {
                   const N = T.get(f), g = ie(f).unwrap_or(void 0);
                   return !N || !g ? [] : { ...g, symbol: N };
                 })
@@ -4236,14 +4241,14 @@ class ls {
   }
   initMonacoServices() {
     return {
-      definitionProvider: new Ct(this),
-      referenceProvider: new Xt(this),
-      autocompletionProvider: new Ft(this)
+      definitionProvider: new Xt(this),
+      referenceProvider: new $t(this),
+      autocompletionProvider: new Bt(this)
     };
   }
 }
 export {
-  ls as Compiler,
-  as as serialize,
-  os as services
+  cs as Compiler,
+  os as serialize,
+  ls as services
 };