@dbml/parse 3.4.3 → 3.5.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 jt(t) {
+function Wt(t) {
   switch (t.kind) {
     case "<newline>":
     case "<space>":
@@ -12,7 +12,7 @@ function jt(t) {
       return !1;
   }
 }
-function rt(t) {
+function it(t) {
   if (!t)
     return !1;
   switch (t) {
@@ -33,7 +33,7 @@ function rt(t) {
       return !1;
   }
 }
-function at(t) {
+function rt(t) {
   return t !== void 0 && t.kind === "<op>";
 }
 class F {
@@ -44,22 +44,22 @@ class F {
     return new F(e, n, s, i, r);
   }
 }
-function bt(t) {
+function Tt(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === u.NEWLINE) !== void 0;
 }
-function ot(t, e) {
-  return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || bt(t);
+function at(t, e) {
+  return e.leadingTrivia.find(({ kind: s }) => s === u.NEWLINE) !== void 0 || Tt(t);
 }
 function Ce(t) {
   return t.trailingTrivia.find(({ kind: e }) => e === u.SPACE) !== void 0;
 }
-function It(t) {
-  return t.trailingTrivia.length === 0 ? t.end : It(I.last(t.trailingTrivia));
+function bt(t) {
+  return t.trailingTrivia.length === 0 ? t.end : bt(I.last(t.trailingTrivia));
 }
-function Lt(t) {
-  return t.leadingTrivia.length === 0 ? t.start : Lt(t.leadingTrivia[0]);
+function It(t) {
+  return t.leadingTrivia.length === 0 ? t.start : It(t.leadingTrivia[0]);
 }
-function Wt(t) {
+function jt(t) {
   return [u.SINGLE_LINE_COMMENT, u.MULTILINE_COMMENT].includes(
     t.kind
   );
@@ -81,13 +81,13 @@ class x {
   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 F ? Lt(i) : i.fullStart) : (this.startPos = {
+    i ? (this.startPos = i.startPos, this.fullStart = i instanceof F ? It(i) : i.fullStart) : (this.startPos = {
       offset: NaN,
       column: NaN,
       line: NaN
     }, this.fullStart = NaN);
     const r = [...s].reverse().find((a) => a !== void 0 && !Number.isNaN(a.end));
-    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof F ? It(r) : r.fullEnd) : (this.endPos = {
+    r ? (this.endPos = r.endPos, this.fullEnd = r instanceof F ? bt(r) : r.fullEnd) : (this.endPos = {
       offset: NaN,
       column: NaN,
       line: NaN
@@ -151,7 +151,7 @@ class q extends x {
     super(i, "<infix-expression>", [n, e, s]), this.op = e, this.leftExpression = n, this.rightExpression = s;
   }
 }
-class Pe extends x {
+class Ue extends x {
   constructor({ op: e, expression: n }, s) {
     super(s, "<postfix-expression>", [n, e]), this.op = e, this.expression = n;
   }
@@ -184,7 +184,7 @@ class D extends x {
   }, r) {
     super(r, "<list-expression>", [
       e,
-      ...gt(n, s),
+      ...Lt(n, s),
       i
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
@@ -198,12 +198,12 @@ class J extends x {
   }, r) {
     super(r, "<tuple-expression>", [
       e,
-      ...gt(n, s),
+      ...Lt(n, s),
       i
     ]), this.tupleOpenParen = e, this.elementList = n, this.commaList = s, this.tupleCloseParen = i;
   }
 }
-class je extends J {
+class We extends J {
   constructor({
     groupOpenParen: e,
     expression: n,
@@ -243,7 +243,7 @@ class U extends x {
     super(n, "<primary-expression>", [e]), this.expression = e;
   }
 }
-class ke extends x {
+class xe extends x {
   constructor({ pre: e }, n) {
     const s = F.create(u.SPACE, e.endPos, e.endPos, " ", !1);
     super(n, "<dummy>", [s]);
@@ -254,7 +254,7 @@ class ue extends x {
     super(s, "<array>", [e, n]), this.array = e, this.indexer = n;
   }
 }
-function gt(t, e) {
+function Lt(t, e) {
   if (!t || t.length === 0)
     return e || [];
   if (!e || e.length === 0)
@@ -335,10 +335,10 @@ class w {
   }
 }
 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 We(t) {
+function je(t) {
   return `Schema:${t}`;
 }
-function Se(t) {
+function Oe(t) {
   return `Table:${t}`;
 }
 function Ye(t) {
@@ -368,9 +368,9 @@ function Ve(t, e) {
     case "Enum field":
       return Qe(t);
     case "Schema":
-      return We(t);
+      return je(t);
     case "Table":
-      return Se(t);
+      return Oe(t);
     case "TableGroup":
       return qe(t);
     case "TableGroup field":
@@ -395,8 +395,8 @@ function Qt(t) {
 }
 function qt(t) {
   return [
-    We,
-    Se,
+    je,
+    Oe,
     ze,
     qe,
     Ye,
@@ -404,21 +404,21 @@ function qt(t) {
     He
   ].map((e) => e(t));
 }
-function Ue(t) {
+function Me(t) {
   return !!t.match(/(\p{L}|_|\p{M})/gu);
 }
-function Oe(t) {
+function Re(t) {
   const [e] = t;
   return e >= "0" && e <= "9";
 }
 function Ht(t) {
   const [e] = t;
-  return Oe(e) || Ue(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
+  return Re(e) || Me(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
 function de(t) {
-  return Ue(t) || Oe(t);
+  return Me(t) || Re(t);
 }
-function ct(t, e) {
+function ot(t, e) {
   const n = [], s = Math.min(t.length, e.length);
   for (let i = 0; i < s; i += 1)
     n.push(t[i], e[i]);
@@ -438,7 +438,7 @@ class Jt {
     return this.id++;
   }
 }
-class _t {
+class gt {
   constructor({ symbolTable: e }, n) {
     this.references = [], this.id = n, this.symbolTable = e;
   }
@@ -453,7 +453,7 @@ class Kt {
     this.references = [], this.id = n, this.declaration = e;
   }
 }
-class At {
+class _t {
   constructor({ symbolTable: e, declaration: n }, s) {
     this.references = [], this.id = s, this.symbolTable = e, this.declaration = n;
   }
@@ -528,7 +528,7 @@ function sn(t, e, n) {
     })
   ) : new w();
 }
-function lt(t) {
+function ct(t) {
   return t.kind === u.IDENTIFIER && t.value === "as";
 }
 function E(t) {
@@ -548,7 +548,7 @@ function an(t) {
     E(t.op), E(t.expression);
   else if (t instanceof q)
     E(t.leftExpression), E(t.op), E(t.rightExpression);
-  else if (t instanceof Pe)
+  else if (t instanceof Ue)
     E(t.op), E(t.expression);
   else if (t instanceof ne)
     E(t.blockOpenBrace), t.body.forEach(E), E(t.blockCloseBrace);
@@ -569,9 +569,9 @@ function an(t) {
   else if (t instanceof be)
     E(t.literal);
   else
-    throw t instanceof je ? 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 vt(t) {
+function At(t) {
   return !!(t != null && t.isInvalid);
 }
 function P(...t) {
@@ -602,7 +602,7 @@ function on(t) {
     return P(t.op, t.expression);
   if (t instanceof q)
     return P(t.leftExpression, t.op, t.rightExpression);
-  if (t instanceof Pe)
+  if (t instanceof Ue)
     return P(t.expression, t.op);
   if (t instanceof te)
     return P(t.value);
@@ -613,13 +613,13 @@ function on(t) {
   if (t instanceof D)
     return P(
       t.listOpenBracket,
-      ...ct(t.elementList, t.commaList),
+      ...ot(t.elementList, t.commaList),
       t.listCloseBracket
     );
   if (t instanceof J)
     return P(
       t.tupleOpenParen,
-      ...ct(t.elementList, t.commaList),
+      ...ot(t.elementList, t.commaList),
       t.tupleCloseParen
     );
   if (t instanceof H)
@@ -631,12 +631,12 @@ function on(t) {
       t.array,
       t.indexer
     );
-  throw t instanceof je ? 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 Ge(t) {
   return M(t) ? new S(t.expression.variable) : new w();
 }
-function W(t) {
+function j(t) {
   var e;
   return t instanceof U && (t.expression instanceof Z && t.expression.variable instanceof F && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof be && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
 }
@@ -767,15 +767,15 @@ class cn {
           this.match("/") ? this.singleLineComment() : this.match("*") ? this.multilineComment() : this.operator();
           break;
         default:
-          if (rt(e)) {
+          if (it(e)) {
             this.operator();
             break;
           }
-          if (Ue(e)) {
+          if (Me(e)) {
             this.identifier();
             break;
           }
-          if (Oe(e)) {
+          if (Re(e)) {
             this.numericLiteralOrIdentifier();
             break;
           }
@@ -795,13 +795,13 @@ class cn {
     let e = !0, n = [], s;
     const i = [];
     for (const r of this.tokens)
-      jt(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 && vt(this.tokens[e]); e += 1)
+    for (e = 0; e < this.tokens.length && At(this.tokens[e]); e += 1)
       s.push(this.tokens[e]);
     let i = this.tokens[e];
     for (i.leadingInvalid = [...s, ...i.leadingInvalid]; e < this.tokens.length; e += 1) {
@@ -895,7 +895,7 @@ class cn {
     this.addToken(u.IDENTIFIER);
   }
   operator() {
-    for (; rt(this.peek()); )
+    for (; it(this.peek()); )
       this.advance();
     this.addToken(u.OP);
   }
@@ -912,7 +912,7 @@ class cn {
         return this.advance(), this.addToken(u.NUMERIC_LITERAL);
       if (!n && !de(this.peek()))
         return this.addToken(u.NUMERIC_LITERAL);
-      if (!n && !Oe(this.peek()))
+      if (!n && !Re(this.peek()))
         break;
       this.advance();
     }
@@ -981,7 +981,7 @@ class cn {
     }
   }
 }
-var xe = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(xe || {});
+var Se = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(Se || {});
 class ln {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
@@ -1069,7 +1069,7 @@ class hn {
     }, 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();
       }
@@ -1080,7 +1080,7 @@ class hn {
           break;
         E(s), this.advance();
       }
-    }, this.blockExpression = this.contextStack.withContextDo(xe.BlockExpression, () => {
+    }, this.blockExpression = this.contextStack.withContextDo(Se.BlockExpression, () => {
       const s = { body: [] }, i = () => this.nodeFactory.create(ne, s);
       try {
         this.consume("Expect an opening brace '{'", u.LBRACE), s.blockOpenBrace = this.previous();
@@ -1115,12 +1115,12 @@ class hn {
       if (!this.check(u.RBRACE))
         for (E(this.advance()); !this.isAtEnd(); ) {
           const s = this.peek();
-          if (this.check(u.RBRACE) || ot(this.previous(), s))
+          if (this.check(u.RBRACE) || at(this.previous(), s))
             break;
           E(s), this.advance();
         }
-    }, this.tupleExpression = this.contextStack.withContextDo(xe.GroupExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(je, {
+    }, this.tupleExpression = this.contextStack.withContextDo(Se.GroupExpression, () => {
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(We, {
         groupOpenParen: s.tupleOpenParen,
         groupCloseParen: s.tupleCloseParen,
         expression: s.elementList[0]
@@ -1171,7 +1171,7 @@ class hn {
           break;
         E(s), this.advance();
       }
-    }, this.listExpression = this.contextStack.withContextDo(xe.ListExpression, () => {
+    }, this.listExpression = this.contextStack.withContextDo(Se.ListExpression, () => {
       const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(D, s);
       try {
         this.consume("Expect an opening bracket '['", u.LBRACKET), s.listOpenBracket = this.previous();
@@ -1324,7 +1324,7 @@ class hn {
           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
@@ -1410,7 +1410,7 @@ class hn {
     return n();
   }
   shouldStopExpression() {
-    if (this.isAtEnd() || bt(this.previous()))
+    if (this.isAtEnd() || Tt(this.previous()))
       return !0;
     const e = this.peek().kind;
     return e === u.RBRACE || e === u.RBRACKET || e === u.RPAREN || e === u.COMMA || e === u.COLON;
@@ -1424,12 +1424,12 @@ class hn {
     for (; !this.isAtEnd(); ) {
       const s = this.peek();
       if (s.kind === u.LPAREN) {
-        const { left: i } = ut(s);
+        const { left: i } = lt(s);
         if (i < e || // When '(' is encountered,
         // consider it part of another expression if
         // it's at the start of a new line
         // and we're currently not having unmatched '(' or '['
-        ot(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
+        at(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
           break;
         try {
           n = this.nodeFactory.create(H, {
@@ -1456,12 +1456,12 @@ class hn {
             indexer: i.partialNode
           }), new d(i.token, n, i.handlerContext)) : i;
         }
-      } else if (at(s)) {
-        const i = s, r = ut(i);
+      } else if (rt(s)) {
+        const i = s, r = lt(i);
         if (r.left !== null) {
           if (r.left <= e)
             break;
-          this.advance(), n = this.nodeFactory.create(Pe, {
+          this.advance(), n = this.nodeFactory.create(Ue, {
             expression: n,
             op: i
           });
@@ -1491,7 +1491,7 @@ class hn {
   }
   leftExpression_bp() {
     let e;
-    if (at(this.peek())) {
+    if (rt(this.peek())) {
       const n = {};
       n.op = this.peek();
       const s = En(n.op);
@@ -1502,7 +1502,7 @@ class hn {
           `Unexpected '${n.op.value}' in an expression`
         ), new d(
           n.op,
-          this.nodeFactory.create(ke, { pre: n.op }),
+          this.nodeFactory.create(xe, { pre: n.op }),
           this.contextStack.findHandlerContext(this.tokens, this.current)
         );
       this.advance();
@@ -1516,10 +1516,10 @@ class hn {
         )) : i;
       }
       e = this.nodeFactory.create(Q, n);
-    } else if (e = this.extractOperand(), e instanceof ke)
+    } else if (e = this.extractOperand(), e instanceof xe)
       throw new d(
         this.peek(),
-        this.nodeFactory.create(ke, { pre: this.peek() }),
+        this.nodeFactory.create(xe, { pre: this.peek() }),
         this.contextStack.findHandlerContext(this.tokens, this.current)
       );
     return e;
@@ -1543,7 +1543,7 @@ class hn {
       this.peek(),
       o.INVALID_OPERAND,
       `Invalid start of operand "${this.peek().value}"`
-    ), this.nodeFactory.create(ke, { pre: this.previous() }));
+    ), this.nodeFactory.create(xe, { pre: this.previous() }));
   }
   /* Parsing FunctionExpression */
   functionExpression() {
@@ -1671,7 +1671,7 @@ function En(t) {
 const Nn = {
   "(": { left: 14, right: null }
 };
-function ut(t) {
+function lt(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 || {});
@@ -1744,9 +1744,9 @@ function X(t) {
   return M(t) ? new S(t.expression.variable.value) : new w();
 }
 function Xe(t) {
-  if (ht(t))
+  if (ut(t))
     return t instanceof te ? new S({ functional: [t], nonFunctional: [] }) : new S({ functional: [], nonFunctional: [t] });
-  if (t instanceof J && t.elementList.every(ht)) {
+  if (t instanceof J && t.elementList.every(ut)) {
     const e = t.elementList.filter(
       (s) => s instanceof te
     ), n = t.elementList.filter(M);
@@ -1760,7 +1760,7 @@ function V(t) {
   return e === void 0 ? new w() : new S(e);
 }
 function z(t) {
-  return W(t) ? t.expression instanceof Z ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new w();
+  return j(t) ? t.expression instanceof Z ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new w();
 }
 function mn(t) {
   var e;
@@ -1773,7 +1773,7 @@ function Tn(t) {
   const { tupleElements: s } = e.unwrap(), { tupleElements: i } = n.unwrap();
   return (s == null ? void 0 : s.length) === (i == null ? void 0 : i.length);
 }
-function ht(t) {
+function ut(t) {
   return t instanceof U && t.expression instanceof Z || t instanceof te;
 }
 function bn(t, e) {
@@ -1815,7 +1815,7 @@ class In {
     if (e instanceof ne)
       return [new l(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
     const n = [];
-    return W(e.callee) || n.push(new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
+    return j(e.callee) || n.push(new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && n.push(...e.args.map((s) => new l(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", s))), n;
   }
 }
 class we {
@@ -1846,7 +1846,7 @@ class Ln {
     return this.declarationNode.parent instanceof A ? [new l(o.INVALID_PROJECT_CONTEXT, "An Enum can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Ze(e) ? [] : [new l(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new l(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
+    return e ? wt(e) ? [] : [new l(o.INVALID_NAME, "An Enum name must be of the form <enum> or <schema>.<enum>", e)] : [new l(o.NAME_NOT_FOUND, "An Enum must have a name", this.declarationNode)];
   }
   validateAlias(e) {
     return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
@@ -1856,7 +1856,7 @@ class Ln {
     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 = Ke(i, this.publicSymbolTable, this.symbolFactory), c = ze(r);
+      const i = s.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), c = ze(r);
       a.has(c) && e.push(new l(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, n)), a.set(c, this.declarationNode.symbol);
     }
     return e;
@@ -1881,13 +1881,13 @@ class Ln {
     });
   }
   validateFieldSettings(e) {
-    const n = j(e), s = n.getErrors(), i = n.getValue();
+    const n = W(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
           a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", c))), a.forEach((c) => {
-            W(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
+            j(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
           });
           break;
         default:
@@ -1961,14 +1961,14 @@ class gn {
     });
   }
   validateFieldSetting(e) {
-    const n = j(e), s = n.getErrors(), i = n.getValue();
+    const n = W(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
         case "name":
           a.length > 1 && a.forEach((c) => s.push(new l(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, c))), a.forEach((c) => {
-            W(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, c));
+            j(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, c));
           });
           break;
         case "unique":
@@ -2034,7 +2034,7 @@ class _n {
   }
   validateFields(e) {
     const n = [];
-    return e.length === 0 ? [new l(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new l(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), W(e[0].callee) || n.push(new l(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new l(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
+    return e.length === 0 ? [new l(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((s) => n.push(new l(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", s))), j(e[0].callee) || n.push(new l(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && n.push(...e[0].args.map((s) => new l(o.INVALID_NOTE, "A Note can only contain one quoted string", s))), n);
   }
   validateSubElements(e) {
     return e.flatMap((n) => {
@@ -2056,7 +2056,7 @@ class An {
     return this.declarationNode.parent instanceof A ? [new l(o.INVALID_PROJECT_CONTEXT, "A Project can only appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Me(e) ? [] : [new l(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? ye(e) ? [] : [new l(o.INVALID_NAME, "A Project's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new l(o.UNEXPECTED_ALIAS, "A Project shouldn't have an alias", e)] : [];
@@ -2095,7 +2095,7 @@ class vn {
     return this.declarationNode.parent instanceof G ? [] : [new l(o.INVALID_REF_CONTEXT, "A Ref must appear top-level", this.declarationNode)];
   }
   validateName(e) {
-    return e ? Me(e) ? [] : [new l(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
+    return e ? ye(e) ? [] : [new l(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
   }
   validateAlias(e) {
     return e ? [new l(o.UNEXPECTED_ALIAS, "A Ref shouldn't have an alias", e)] : [];
@@ -2122,7 +2122,7 @@ class vn {
     }), n;
   }
   validateFieldSettings(e) {
-    const n = j(e), s = n.getErrors(), i = n.getValue();
+    const n = W(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
@@ -2175,13 +2175,13 @@ class yn {
     return this.declarationNode.parent instanceof A ? [new l(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? e instanceof ue ? [new l(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Ze(e) ? [] : [new l(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new l(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
+    return e ? e instanceof ue ? [new l(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : wt(e) ? [] : [new l(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new l(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
   }
   validateAlias(e) {
     return e ? On(e) ? [] : [new l(o.INVALID_ALIAS, "Table aliases can only contains alphanumeric and underscore unless surrounded by double quotes", e)] : [];
   }
   validateSettingList(e) {
-    const n = j(e), s = n.getErrors(), i = n.getValue();
+    const n = W(e), s = n.getErrors(), i = n.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
@@ -2192,7 +2192,7 @@ class yn {
           break;
         case "note":
           a.length > 1 && s.push(...a.map((c) => new l(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", c))), a.forEach((c) => {
-            W(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
+            j(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
           });
           break;
         default:
@@ -2203,14 +2203,14 @@ class yn {
   }
   registerElement() {
     const e = [];
-    this.declarationNode.symbol = this.symbolFactory.create(At, { declaration: this.declarationNode, symbolTable: new we() });
+    this.declarationNode.symbol = this.symbolFactory.create(_t, { 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(), c = Ke(r, this.publicSymbolTable, this.symbolFactory), p = Se(a);
+      const r = [...i.unwrap()], a = r.pop(), c = Ze(r, this.publicSymbolTable, this.symbolFactory), p = Oe(a);
       c.has(p) && e.push(new l(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, n)), c.set(p, this.declarationNode.symbol);
     }
-    if (s && Me(s) && !xn(s.expression.variable.value, i.unwrap_or([]))) {
-      const r = V(s).unwrap(), a = Se(r);
+    if (s && ye(s) && !xn(s.expression.variable.value, i.unwrap_or([]))) {
+      const r = V(s).unwrap(), a = Oe(r);
       this.publicSymbolTable.has(a) && e.push(new l(o.DUPLICATE_NAME, `Table name '${r}' already exists`, n)), this.publicSymbolTable.set(a, this.declarationNode.symbol);
     }
     return e;
@@ -2257,7 +2257,7 @@ class yn {
       return [];
     let n;
     I.last(e) instanceof D && (n = e.pop());
-    const s = j(n), i = s.getErrors(), r = s.getValue();
+    const s = W(n), i = s.getErrors(), r = s.getValue();
     for (const p of e) {
       const h = V(p).unwrap_or("").toLowerCase();
       if (h !== "pk" && h !== "unique") {
@@ -2273,7 +2273,7 @@ class yn {
       switch (p) {
         case "note":
           h.length > 1 && i.push(...h.map((f) => new l(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", f))), h.forEach((f) => {
-            W(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
+            j(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
           });
           break;
         case "ref":
@@ -2341,7 +2341,7 @@ function kn(t) {
   if (!(t instanceof H || Je(t) || t instanceof U || t instanceof ue))
     return !1;
   if (t instanceof H) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => he(n) || W(n) || me(n)))
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => he(n) || j(n) || me(n)))
       return !1;
     t = t.callee;
   }
@@ -2367,7 +2367,7 @@ class Sn {
     return this.declarationNode.parent instanceof A ? [new l(o.INVALID_TABLEGROUP_CONTEXT, "TableGroup must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? Ze(e) ? [] : [new l(o.INVALID_NAME, "A TableGroup name must be of the form <tablegroup> or <schema>.<tablegroup>", e)] : [new l(o.NAME_NOT_FOUND, "A TableGroup must have a name", this.declarationNode)];
+    return e ? ye(e) ? [] : [new l(o.INVALID_NAME, "A TableGroup name must be a single identifier", e)] : [new l(o.NAME_NOT_FOUND, "A TableGroup must have a name", this.declarationNode)];
   }
   validateAlias(e) {
     return e ? [new l(o.UNEXPECTED_ALIAS, "A TableGroup shouldn't have an alias", e)] : [];
@@ -2377,9 +2377,9 @@ class Sn {
     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 = Ke(s, this.publicSymbolTable, this.symbolFactory), a = qe(i);
+      const s = n.unwrap(), i = s.pop(), r = Ze(s, this.publicSymbolTable, this.symbolFactory), a = qe(i);
       if (r.has(a))
-        return [new l(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists in schema '${s.join(".") || "public"}'`, e)];
+        return [new l(o.DUPLICATE_NAME, `TableGroup name '${i}' already exists`, e)];
       r.set(a, this.declarationNode.symbol);
     }
     return [];
@@ -2426,7 +2426,7 @@ class Sn {
     return [];
   }
 }
-const wt = ["-", "+"];
+const vt = ["-", "+"];
 function re(t) {
   switch (t.type.value.toLowerCase()) {
     case b.Enum:
@@ -2447,28 +2447,28 @@ function re(t) {
       return In;
   }
 }
-function Ze(t) {
+function wt(t) {
   return !!C(t).unwrap_or(!1);
 }
 function On(t) {
-  return Me(t);
+  return ye(t);
 }
-function Me(t) {
+function ye(t) {
   return t instanceof U && t.expression instanceof Z;
 }
-function Ke(t, e, n) {
+function Ze(t, e, n) {
   var i;
   t[0] === "public" && (t = t.slice(1));
   let s = e;
   for (const r of t) {
     let a;
-    const c = We(r);
+    const c = je(r);
     if (s.has(c)) {
       if (a = (i = s.get(c)) == null ? void 0 : i.symbolTable, !a)
         throw new Error("Expect a symbol table in a schema symbol");
     } else {
       a = new we();
-      const p = n.create(_t, { symbolTable: a });
+      const p = n.create(gt, { symbolTable: a });
       s.set(c, p);
     }
     s = a;
@@ -2495,7 +2495,7 @@ function le(t) {
 }
 function Dn(t) {
   var e;
-  return !!(W(t) || he(t) || me(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && he(t.expression) || t instanceof te);
+  return !!(j(t) || he(t) || me(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && vt.includes((e = t.op) == null ? void 0 : e.value) && he(t.expression) || t instanceof te);
 }
 function he(t) {
   var e;
@@ -2511,7 +2511,7 @@ function Pn(t) {
 function kt(t) {
   return t instanceof J && t.elementList.every(M);
 }
-function j(t) {
+function W(t) {
   var s;
   const e = {}, n = [];
   if (!t)
@@ -2528,9 +2528,9 @@ function j(t) {
   }
   return new B(e, n);
 }
-class ft {
+class ht {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(_t, {
+    this.ast = e, this.symbolFactory = n, this.publicSchemaSymbol = this.symbolFactory.create(gt, {
       symbolTable: new we()
     }), this.ast.symbol = this.publicSchemaSymbol, this.ast.symbol.declaration = this.ast;
   }
@@ -2602,7 +2602,7 @@ class ae {
           return;
         this.bindFragments([e], n);
       } else
-        e instanceof q ? Je(e) ? this.bindFragments(fe(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 J && e.elementList.forEach((r) => this.scanAndBind(r, n));
+        e instanceof q ? Je(e) ? this.bindFragments(fe(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof Q ? this.scanAndBind(e.expression, n) : e instanceof Ue ? this.scanAndBind(e.expression, n) : e instanceof J && e.elementList.forEach((r) => this.scanAndBind(r, n));
   }
   // Bind the fragments of a member access expression
   // which can be a simple expression like v1.User,
@@ -2849,7 +2849,7 @@ class $n {
     return new B(this.ast, this.errors);
   }
 }
-class jn {
+class Wn {
   constructor(e) {
     this.generator = e;
   }
@@ -2857,20 +2857,20 @@ class jn {
     return new e(n, this.generator.nextId());
   }
 }
-class Wn {
+class jn {
   constructor(e, n) {
-    this.ast = e, this.symbolFactory = new jn(n);
+    this.ast = e, this.symbolFactory = new Wn(n);
   }
   // Analyzing: Invoking both the validator and binder
   analyze() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new $n(n).resolve());
+    return new ht(this.ast, this.symbolFactory).validate().chain((n) => new $n(n).resolve());
   }
   // For invoking the validator only
   validate() {
-    return new ft(this.ast, this.symbolFactory).validate().chain((n) => new B(n, []));
+    return new ht(this.ast, this.symbolFactory).validate().chain((n) => new B(n, []));
   }
 }
-function pt(t, e) {
+function ft(t, e) {
   const { variables: n, tupleElements: s } = _e(t).unwrap();
   return s ? n.length === 0 ? {
     schemaName: e.schemaName,
@@ -2992,7 +2992,7 @@ class Pt {
   }
   interpretSettingList(e) {
     var i, r, a;
-    const n = j(e).getValue();
+    const n = W(e).getValue();
     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 && {
@@ -3030,7 +3030,7 @@ class Pt {
     s.type = i.getValue(), n.push(...i.getErrors()), s.token = v(e), s.inline_refs = [];
     const r = e.args.slice(1);
     if (I.last(r) instanceof D) {
-      const _ = j(r.pop()).getValue();
+      const _ = W(r.pop()).getValue();
       s.pk = !!((a = _.pk) != null && a.length) || !!((c = _["primary key"]) != null && c.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 && {
@@ -3039,10 +3039,10 @@ class Pt {
       };
       const oe = _.ref || [];
       s.inline_refs = oe.flatMap((Y) => {
-        const [nt] = $e(Y.value.expression);
-        if (Dt(nt, e.symbol))
+        const [tt] = $e(Y.value.expression);
+        if (Dt(tt, e.symbol))
           return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", Y)), [];
-        const ye = Y.value.op, ee = C(Y.value.expression).unwrap();
+        const ke = Y.value.op, ee = C(Y.value.expression).unwrap();
         let pe;
         if (ee.length === 1) {
           const [ce] = ee;
@@ -3050,7 +3050,7 @@ class Pt {
             schemaName: this.table.schemaName,
             tableName: this.table.name,
             fieldNames: [ce],
-            relation: ye.value,
+            relation: ke.value,
             token: v(Y)
           };
         } else if (ee.length === 2) {
@@ -3059,16 +3059,16 @@ class Pt {
             schemaName: null,
             tableName: ce,
             fieldNames: [Le],
-            relation: ye.value,
+            relation: ke.value,
             token: v(Y)
           };
         } else if (ee.length === 3) {
-          const [ce, Le, it] = ee;
+          const [ce, Le, st] = ee;
           pe = {
             schemaName: ce,
             tableName: Le,
-            fieldNames: [it],
-            relation: ye.value,
+            fieldNames: [st],
+            relation: ke.value,
             token: v(Y)
           };
         } else {
@@ -3078,12 +3078,12 @@ class Pt {
             schemaName: ee.join("."),
             tableName: Le,
             fieldNames: [ce],
-            relation: ye.value,
+            relation: ke.value,
             token: v(Y)
           };
         }
-        const st = this.registerInlineRefToEnv(e, nt, pe, Y);
-        return n.push(...st), st.length === 0 ? pe : [];
+        const nt = this.registerInlineRefToEnv(e, tt, pe, Y);
+        return n.push(...nt), nt.length === 0 ? pe : [];
       });
     }
     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;
@@ -3095,7 +3095,7 @@ class Pt {
       s.token = v(e);
       const r = [i.callee, ...i.args];
       if (I.last(r) instanceof D) {
-        const g = j(r.pop()).getValue();
+        const g = W(r.pop()).getValue();
         s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((c = g.unique) != null && c.length), s.name = z((h = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
         const _ = (T = g.note) == null ? void 0 : T.at(0);
         s.note = _ && {
@@ -3157,7 +3157,7 @@ class Pt {
 }
 function Yn(t) {
   let e = null;
-  t instanceof H && (e = t.argumentList.elementList.map((r) => he(r) ? r.expression.literal.value : W(r) ? z(r).unwrap() : X(r).unwrap()).join(","), t = t.callee);
+  t instanceof H && (e = t.argumentList.elementList.map((r) => he(r) ? r.expression.literal.value : j(r) ? z(r).unwrap() : X(r).unwrap()).join(","), t = t.callee);
   let n = "";
   for (; t instanceof ue; )
     n = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${n}`, t = t.array;
@@ -3178,7 +3178,7 @@ function Yn(t) {
 function zn(t) {
   var e, n, s;
   if (t) {
-    if (W(t))
+    if (j(t))
       return {
         value: z(t).unwrap(),
         type: "string"
@@ -3193,7 +3193,7 @@ function zn(t) {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
       };
-    if (t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && he(t.expression)) {
+    if (t instanceof Q && vt.includes((e = t.op) == null ? void 0 : e.value) && he(t.expression)) {
       const i = Number.parseFloat(t.expression.expression.literal.value);
       return {
         value: ((n = t.op) == null ? void 0 : n.value) === "-" ? 0 - i : i,
@@ -3225,7 +3225,7 @@ class Qn {
   }
   interpretSettingList(e) {
     var s, i, r;
-    const n = j(e).getValue();
+    const n = W(e).getValue();
     return this.note.headerColor = (s = n.headercolor) != null && s.length ? Ot((r = (i = n.headercolor) == null ? void 0 : i.at(0)) == null ? void 0 : r.value) : void 0, [];
   }
   interpretBody(e) {
@@ -3265,7 +3265,7 @@ class Ut {
         new l(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[c])
       ];
     if (e.args[0]) {
-      const g = j(e.args[0]).getValue(), _ = (T = (h = g.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value;
+      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 $ ? Te(_).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 $ ? Te(K).unwrap_or(void 0) : X(K).unwrap_or(void 0);
@@ -3273,12 +3273,12 @@ class Ut {
     const p = St(n);
     return this.ref.endpoints = [
       {
-        ...pt(s, this.container),
+        ...ft(s, this.container),
         relation: p[0],
         token: v(s)
       },
       {
-        ...pt(i, this.container),
+        ...ft(i, this.container),
         relation: p[1],
         token: v(i)
       }
@@ -3334,7 +3334,7 @@ class Ft {
       var c;
       const s = n, i = {};
       i.token = v(s), i.name = X(s.callee).unwrap();
-      const a = (c = j(s.args[0]).getValue().note) == null ? void 0 : c.at(0);
+      const a = (c = W(s.args[0]).getValue().note) == null ? void 0 : c.at(0);
       return i.note = a && {
         value: z(a.value).map(Ne).unwrap(),
         token: v(a)
@@ -3457,7 +3457,7 @@ function Ae(t) {
       return L.Text;
   }
 }
-function Re(t, e) {
+function De(t, e) {
   if (!t || Ce(t))
     return !1;
   for (const n of t.trailingTrivia) {
@@ -3473,7 +3473,7 @@ function O() {
     suggestions: []
   };
 }
-function De(t) {
+function Pe(t) {
   return {
     ...t,
     suggestions: t.suggestions.map((e) => ({
@@ -3487,11 +3487,11 @@ function Fe(t) {
     ...t,
     suggestions: t.suggestions.map((e) => ({
       ...e,
-      insertText: e.insertText.split("").every(Ue) ? e.insertText : `"${e.insertText}"`
+      insertText: e.insertText.split("").every(Me) ? e.insertText : `"${e.insertText}"`
     }))
   };
 }
-function et(t, e) {
+function Ke(t, e) {
   return t.getOffsetAt(e);
 }
 class Bt {
@@ -3500,20 +3500,20 @@ class Bt {
   }
   provideCompletionItems(e, n) {
     var T, f;
-    const s = et(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), c = a === void 0 ? i[0] : i[a + 1];
+    const s = Ke(e, n), i = this.compiler.token.flatStream(), { token: r, index: a } = this.compiler.container.token(s), c = a === void 0 ? i[0] : i[a + 1];
     if ([
       ...(r == null ? void 0 : r.trailingTrivia) || [],
       ...(r == null ? void 0 : r.leadingTrivia) || [],
       ...(c == null ? void 0 : c.leadingTrivia) || []
-    ].find((N) => Wt(N) && ge(s, N)))
+    ].find((N) => jt(N) && ge(s, N)))
       return O();
     if (a === void 0)
-      return Tt();
+      return mt();
     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 Tt();
+      return mt();
     const h = [...this.compiler.container.stack(s)].reverse();
     for (const N of h)
       if (N instanceof Q)
@@ -3522,7 +3522,7 @@ class Bt {
           case "<":
           case "<>":
           case "-":
-            return dt(
+            return pt(
               this.compiler,
               s,
               N
@@ -3534,7 +3534,7 @@ class Bt {
           case "<":
           case "<>":
           case "-":
-            return dt(
+            return pt(
               this.compiler,
               s,
               N
@@ -3548,20 +3548,20 @@ class Bt {
         }
       else {
         if (N instanceof se)
-          return Et(this.compiler, s, N);
+          return dt(this.compiler, s, N);
         if (N instanceof D)
-          return Et(this.compiler, s, N);
+          return dt(this.compiler, s, N);
         if (N instanceof J)
           return Zn(this.compiler, s);
         if (N instanceof y)
-          return mt(this.compiler, s, N);
+          return Nt(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 Nt(this.compiler, s, void 0);
       }
     return O();
   }
 }
-function dt(t, e, n) {
+function pt(t, e, n) {
   const s = t.container.scopeKind(e);
   if ([R.REF, R.TABLE].includes(s)) {
     const i = Be(t, e, t.container.element(e), [
@@ -3569,7 +3569,7 @@ function dt(t, e, n) {
       m.Schema,
       m.Column
     ]);
-    return Re(n.op, e) ? De(i) : i;
+    return De(n.op, e) ? Pe(i) : i;
   }
   return O();
 }
@@ -3619,25 +3619,25 @@ function Zn(t, e) {
   }
   return O();
 }
-function Et(t, e, n) {
+function dt(t, e, n) {
   const { token: s } = t.container.token(e);
   if ([u.COMMA, u.LBRACKET].includes(s == null ? void 0 : s.kind)) {
-    const i = Nt(t, e);
-    return (s == null ? void 0 : s.kind) === u.COMMA && Re(s, e) ? De(i) : i;
+    const i = Et(t, e);
+    return (s == null ? void 0 : s.kind) === u.COMMA && De(s, e) ? Pe(i) : i;
   }
   if (n.name && n.name.start <= e && n.name.end >= e)
-    return Nt(t, e);
+    return Et(t, e);
   if (n.name instanceof $) {
     const i = Kn(
       t,
       e,
       Te(n.name).unwrap()
     );
-    return (s == null ? void 0 : s.kind) === u.COLON && Re(s, e) ? De(i) : i;
+    return (s == null ? void 0 : s.kind) === u.COLON && De(s, e) ? Pe(i) : i;
   }
   return O();
 }
-function Nt(t, e) {
+function Et(t, e) {
   const n = t.container.element(e), s = t.container.scopeKind(e);
   if (n instanceof G)
     return O();
@@ -3776,7 +3776,7 @@ function Vt(t, e, n) {
     }))
   });
 }
-function mt(t, e, n) {
+function Nt(t, e, n) {
   var i;
   switch (t.container.scopeKind(e)) {
     case R.TABLE:
@@ -3789,7 +3789,7 @@ function mt(t, e, n) {
       return es(t, e, n);
     case R.REF: {
       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;
+      return ((i = t.container.token(e).token) == null ? void 0 : i.kind) === u.COLON && De(t.container.token(e).token, e) ? Pe(r) : r;
     }
     case R.TABLEGROUP:
       return ss(t);
@@ -3797,7 +3797,7 @@ function mt(t, e, n) {
       return O();
   }
 }
-function Tt() {
+function mt() {
   return {
     suggestions: ["Table", "TableGroup", "Enum", "Project", "Ref"].map((t) => ({
       label: t,
@@ -3809,7 +3809,7 @@ function Tt() {
   };
 }
 function es(t, e, n) {
-  return n != null && n.callee && tt(e, n) === 1 ? Be(t, e, t.container.element(e), [
+  return n != null && n.callee && et(e, n) === 1 ? Be(t, e, t.container.element(e), [
     m.Schema,
     m.Table,
     m.Column
@@ -3826,7 +3826,7 @@ function ts(t, e, n) {
         range: void 0
       }))
     };
-  const s = tt(e, n);
+  const s = et(e, n);
   return s === 0 ? {
     suggestions: ["Note", "indexes"].map((i) => ({
       label: i,
@@ -3838,7 +3838,7 @@ function ts(t, e, n) {
   } : s === 1 ? rs(t, e) : O();
 }
 function ns(t, e, n) {
-  return n != null && n.callee ? tt(e, n) === 0 ? {
+  return n != null && n.callee ? et(e, n) === 0 ? {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
@@ -3960,7 +3960,7 @@ function rs(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 At))
+  if (!((s == null ? void 0 : s.symbol) instanceof _t))
     return O();
   const { symbolTable: i } = s.symbol;
   return Fe({
@@ -3979,7 +3979,7 @@ function Ct(t, e) {
     })
   });
 }
-function tt(t, e) {
+function et(t, e) {
   if (!e.callee)
     return -1;
   const n = [e.callee, ...e.args], s = n.findIndex((i) => t <= i.end);
@@ -3991,7 +3991,7 @@ class Xt {
   }
   provideDefinition(e, n) {
     var a;
-    const { uri: s } = e, i = et(e, n), r = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = Ke(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const c = r.pop();
       if ((a = c == null ? void 0 : c.referee) != null && a.declaration && [Ee.PRIMARY_EXPRESSION, Ee.VARIABLE].includes(c == null ? void 0 : c.kind)) {
@@ -4017,7 +4017,7 @@ class $t {
     this.compiler = e;
   }
   provideReferences(e, n) {
-    const { uri: s } = e, i = et(e, n), r = [...this.compiler.container.stack(i)];
+    const { uri: s } = e, i = Ke(e, n), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const a = r.pop();
       if (a && [
@@ -4058,7 +4058,7 @@ class ls {
     ).fill(null), this.nodeIdGenerator = new Yt(), this.symbolIdGenerator = new Jt(), this.token = {
       invalidStream: this.createQuery(
         6,
-        () => this.parse.tokens().filter(vt)
+        () => this.parse.tokens().filter(At)
       ),
       // Valid + Invalid tokens (which are guarenteed to be non-trivials) are included in the stream
       flatStream: this.createQuery(
@@ -4070,7 +4070,7 @@ class ls {
       _: this.createQuery(
         0,
         () => {
-          const e = new cn(this.source).lex().chain((n) => new hn(n, this.nodeIdGenerator).parse()).chain(({ ast: n, tokens: s }) => new Wn(n, this.symbolIdGenerator).analyze().map(() => ({ ast: n, tokens: s })));
+          const e = new cn(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 })));
         }
       ),