@dbml/parse 3.1.0 → 3.1.2

package/dist/dbml-parse.mjs

@@ -75,7 +75,7 @@ class Wt {
     return this.id++;
   }
 }
-class w {
+class v {
   // The symbol that this syntax node refers to
   // args must be passed in order of appearance in the node
   constructor(e, s, n) {
@@ -94,13 +94,13 @@ class w {
     }, this.fullEnd = NaN), this.start = this.startPos.offset, this.end = this.endPos.offset;
   }
 }
-var ue = /* @__PURE__ */ ((t) => (t.PROGRAM = "<program>", t.ELEMENT_DECLARATION = "<element-declaration>", t.ATTRIBUTE = "<attribute>", t.IDENTIFIER_STREAM = "<identifer-stream>", t.LITERAL = "<literal>", t.VARIABLE = "<variable>", t.PREFIX_EXPRESSION = "<prefix-expression>", t.INFIX_EXPRESSION = "<infix-expression>", t.POSTFIX_EXPRESSION = "<postfix-expression>", t.FUNCTION_EXPRESSION = "<function-expression>", t.FUNCTION_APPLICATION = "<function-application>", t.BLOCK_EXPRESSION = "<block-expression>", t.LIST_EXPRESSION = "<list-expression>", t.TUPLE_EXPRESSION = "<tuple-expression>", t.CALL_EXPRESSION = "<call-expression>", t.PRIMARY_EXPRESSION = "<primary-expression>", t.GROUP_EXPRESSION = "<group-expression>", t.DUMMY = "<dummy>", t.ARRAY = "<array>", t))(ue || {});
-class C extends w {
+var he = /* @__PURE__ */ ((t) => (t.PROGRAM = "<program>", t.ELEMENT_DECLARATION = "<element-declaration>", t.ATTRIBUTE = "<attribute>", t.IDENTIFIER_STREAM = "<identifer-stream>", t.LITERAL = "<literal>", t.VARIABLE = "<variable>", t.PREFIX_EXPRESSION = "<prefix-expression>", t.INFIX_EXPRESSION = "<infix-expression>", t.POSTFIX_EXPRESSION = "<postfix-expression>", t.FUNCTION_EXPRESSION = "<function-expression>", t.FUNCTION_APPLICATION = "<function-application>", t.BLOCK_EXPRESSION = "<block-expression>", t.LIST_EXPRESSION = "<list-expression>", t.TUPLE_EXPRESSION = "<tuple-expression>", t.CALL_EXPRESSION = "<call-expression>", t.PRIMARY_EXPRESSION = "<primary-expression>", t.GROUP_EXPRESSION = "<group-expression>", t.DUMMY = "<dummy>", t.ARRAY = "<array>", t))(he || {});
+class X extends v {
   constructor({ body: e = [], eof: s }, n) {
     super(n, "<program>", [...e, s]), this.body = e, this.eof = s;
   }
 }
-class _ extends w {
+class _ extends v {
   constructor({
     type: e,
     name: s,
@@ -123,12 +123,12 @@ class _ extends w {
     this.type = e, this.name = s, this.as = n, this.alias = i, this.attributeList = r, this.bodyColon = a, this.body = l;
   }
 }
-class te extends w {
+class te extends v {
   constructor({ identifiers: e = [] }, s) {
     super(s, "<identifer-stream>", e || []), this.identifiers = e;
   }
 }
-class ne extends w {
+class ne extends v {
   constructor({
     name: e,
     colon: s,
@@ -137,12 +137,12 @@ class ne extends w {
     super(i, "<attribute>", [e, s, n]), this.name = e, this.value = n, this.colon = s;
   }
 }
-class Y extends w {
+class Q extends v {
   constructor({ op: e, expression: s }, n) {
     super(n, "<prefix-expression>", [e, s]), this.op = e, this.expression = s;
   }
 }
-class z extends w {
+class q extends v {
   constructor({
     op: e,
     leftExpression: s,
@@ -151,22 +151,22 @@ class z extends w {
     super(i, "<infix-expression>", [s, e, n]), this.op = e, this.leftExpression = s, this.rightExpression = n;
   }
 }
-class Oe extends w {
+class Oe extends v {
   constructor({ op: e, expression: s }, n) {
     super(n, "<postfix-expression>", [s, e]), this.op = e, this.expression = s;
   }
 }
-class Z extends w {
+class K extends v {
   constructor({ value: e }, s) {
     super(s, "<function-expression>", [e]), this.value = e;
   }
 }
-class y extends w {
+class y extends v {
   constructor({ callee: e, args: s = [] }, n) {
     super(n, "<function-application>", [e, ...s]), this.callee = e, this.args = s;
   }
 }
-class ee extends w {
+class ee extends v {
   constructor({
     blockOpenBrace: e,
     body: s = [],
@@ -175,7 +175,7 @@ class ee extends w {
     super(i, "<block-expression>", [e, ...s, n]), this.blockOpenBrace = e, this.body = s, this.blockCloseBrace = n;
   }
 }
-class U extends w {
+class U extends v {
   constructor({
     listOpenBracket: e,
     elementList: s = [],
@@ -189,7 +189,7 @@ class U extends w {
     ]), this.listOpenBracket = e, this.elementList = s, this.commaList = n, this.listCloseBracket = i;
   }
 }
-class q extends w {
+class J extends v {
   constructor({
     tupleOpenParen: e,
     elementList: s = [],
@@ -203,7 +203,7 @@ class q extends w {
     ]), this.tupleOpenParen = e, this.elementList = s, this.commaList = n, this.tupleCloseParen = i;
   }
 }
-class Xe extends q {
+class Xe extends J {
   constructor({
     groupOpenParen: e,
     expression: s,
@@ -220,7 +220,7 @@ class Xe extends q {
     ), this.kind = "<group-expression>";
   }
 }
-class Q extends w {
+class H extends v {
   constructor({
     callee: e,
     argumentList: s
@@ -228,28 +228,28 @@ class Q extends w {
     super(n, "<call-expression>", [e, s]), this.callee = e, this.argumentList = s;
   }
 }
-class pe extends w {
+class de extends v {
   constructor({ literal: e }, s) {
     super(s, "<literal>", [e]), this.literal = e;
   }
 }
-class X extends w {
+class $ extends v {
   constructor({ variable: e }, s) {
     super(s, "<variable>", [e]), this.variable = e;
   }
 }
-class D extends w {
+class D extends v {
   constructor({ expression: e }, s) {
     super(s, "<primary-expression>", [e]), this.expression = e;
   }
 }
-class ve extends w {
+class we extends v {
   constructor({ pre: e }, s) {
     const n = V.create(c.SPACE, e.endPos, e.endPos, " ", !1);
     super(s, "<dummy>", [n]);
   }
 }
-class he extends w {
+class fe extends v {
   constructor({ expression: e, indexer: s }, n) {
     super(n, "<array>", [e, s]), this.array = e, this.indexer = s;
   }
@@ -269,7 +269,7 @@ function ss(t, e = !1) {
     t,
     function(s, n) {
       var i;
-      return !(this instanceof C) && s === "symbol" ? n == null ? void 0 : n.id : (
+      return !(this instanceof X) && s === "symbol" ? n == null ? void 0 : n.id : (
         /* this instanceof SyntaxNode && */
         s === "symbol" ? {
           symbolTable: n == null ? void 0 : n.symbolTable,
@@ -413,7 +413,7 @@ function zt(t) {
   const [e] = t;
   return xe(e) || qe(e) && e.toLowerCase() >= "a" && e.toLowerCase() <= "f";
 }
-function me(t) {
+function Te(t) {
   return qe(t) || xe(t);
 }
 function lt(t, e) {
@@ -422,7 +422,7 @@ function lt(t, e) {
     s.push(t[i], e[i]);
   return s.push(...t.slice(n), ...e.slice(n)), s;
 }
-function Te(t, e) {
+function be(t, e) {
   return t >= e.start && t < e.end;
 }
 class Qt {
@@ -496,7 +496,7 @@ class B {
   }
 }
 function en(t, e, s) {
-  if (!t || !be(t) || e.length === 0)
+  if (!t || !pe(t) || e.length === 0)
     return new A();
   const n = [...e], i = Be(t).unwrap(), r = n.pop();
   if (!(r instanceof ee))
@@ -542,9 +542,9 @@ function nn(t) {
     t.identifiers.forEach(E);
   else if (t instanceof ne)
     E(t.name), E(t.colon), E(t.value);
-  else if (t instanceof Y)
+  else if (t instanceof Q)
     E(t.op), E(t.expression);
-  else if (t instanceof z)
+  else if (t instanceof q)
     E(t.leftExpression), E(t.op), E(t.rightExpression);
   else if (t instanceof Oe)
     E(t.op), E(t.expression);
@@ -552,31 +552,31 @@ function nn(t) {
     E(t.blockOpenBrace), t.body.forEach(E), E(t.blockCloseBrace);
   else if (t instanceof U)
     E(t.listOpenBracket), t.commaList.forEach(E), t.elementList.forEach(E), E(t.listCloseBracket);
-  else if (t instanceof q)
+  else if (t instanceof J)
     E(t.tupleOpenParen), t.commaList.forEach(E), t.elementList.forEach(E), E(t.tupleCloseParen);
-  else if (t instanceof Q)
+  else if (t instanceof H)
     E(t.callee), E(t.argumentList);
   else if (t instanceof y)
     E(t.callee), t.args.forEach(E);
   else if (t instanceof D)
     E(t.expression);
-  else if (t instanceof Z)
+  else if (t instanceof K)
     E(t.value);
-  else if (t instanceof X)
+  else if (t instanceof $)
     E(t.variable);
-  else if (t instanceof pe)
+  else if (t instanceof de)
     E(t.literal);
   else
     throw t instanceof Xe ? new Error("This case is handled by the TupleExpressionNode case") : new Error("Unreachable case in markInvalidNode");
 }
-function vt(t) {
+function wt(t) {
   return !!(t != null && t.isInvalid);
 }
 function P(...t) {
   return t.filter((e) => e !== void 0);
 }
 function sn(t) {
-  if (t instanceof C)
+  if (t instanceof X)
     return P(...t.body, t.eof);
   if (t instanceof _)
     return P(
@@ -592,17 +592,17 @@ function sn(t) {
     return P(t.name, t.colon, t.value);
   if (t instanceof te)
     return t.identifiers;
-  if (t instanceof pe)
+  if (t instanceof de)
     return t.literal ? [t.literal] : [];
-  if (t instanceof X)
+  if (t instanceof $)
     return P(t.variable);
-  if (t instanceof Y)
+  if (t instanceof Q)
     return P(t.op, t.expression);
-  if (t instanceof z)
+  if (t instanceof q)
     return P(t.leftExpression, t.op, t.rightExpression);
   if (t instanceof Oe)
     return P(t.expression, t.op);
-  if (t instanceof Z)
+  if (t instanceof K)
     return P(t.value);
   if (t instanceof y)
     return P(t.callee, ...t.args);
@@ -614,13 +614,13 @@ function sn(t) {
       ...lt(t.elementList, t.commaList),
       t.listCloseBracket
     );
-  if (t instanceof q)
+  if (t instanceof J)
     return P(
       t.tupleOpenParen,
       ...lt(t.elementList, t.commaList),
       t.tupleCloseParen
     );
-  if (t instanceof Q)
+  if (t instanceof H)
     return P(t.callee, t.argumentList);
   if (t instanceof D)
     return P(t.expression);
@@ -629,20 +629,20 @@ function sn(t) {
 function Be(t) {
   return M(t) ? new k(t.expression.variable) : new A();
 }
-function K(t) {
+function W(t) {
   var e;
-  return t instanceof D && (t.expression instanceof X && t.expression.variable instanceof V && t.expression.variable.kind === c.QUOTED_STRING || t.expression instanceof pe && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.STRING_LITERAL);
+  return t instanceof D && (t.expression instanceof $ && t.expression.variable instanceof V && t.expression.variable.kind === c.QUOTED_STRING || t.expression instanceof de && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.STRING_LITERAL);
 }
 function M(t) {
-  return t instanceof D && t.expression instanceof X && t.expression.variable instanceof V;
+  return t instanceof D && t.expression instanceof $ && t.expression.variable instanceof V;
 }
-function be(t) {
+function pe(t) {
   var e;
-  return t instanceof D && t.expression instanceof X && ((e = t.expression.variable) == null ? void 0 : e.kind) === c.IDENTIFIER;
+  return t instanceof D && t.expression instanceof $ && ((e = t.expression.variable) == null ? void 0 : e.kind) === c.IDENTIFIER;
 }
 function He(t) {
   var e;
-  return t instanceof z && t.leftExpression instanceof w && t.rightExpression instanceof w && ((e = t.op) == null ? void 0 : e.value) === ".";
+  return t instanceof q && t.leftExpression instanceof v && t.rightExpression instanceof v && ((e = t.op) == null ? void 0 : e.value) === ".";
 }
 function De(t) {
   if (t === void 0)
@@ -794,7 +794,7 @@ class rn {
   gatherInvalid() {
     let e;
     const s = [], n = [];
-    for (e = 0; e < this.tokens.length && vt(this.tokens[e]); e += 1)
+    for (e = 0; e < this.tokens.length && wt(this.tokens[e]); e += 1)
       n.push(this.tokens[e]);
     let i = this.tokens[e];
     for (i.leadingInvalid = [...n, ...i.leadingInvalid]; e < this.tokens.length; e += 1) {
@@ -883,7 +883,7 @@ class rn {
     });
   }
   identifier() {
-    for (; !this.isAtEnd() && me(this.peek()); )
+    for (; !this.isAtEnd() && Te(this.peek()); )
       this.advance();
     this.addToken(c.IDENTIFIER);
   }
@@ -902,19 +902,19 @@ class rn {
         break;
       if (!n && this.current.offset === this.text.length - 1)
         return this.advance(), this.addToken(c.NUMERIC_LITERAL);
-      if (!n && !me(this.peek()))
+      if (!n && !Te(this.peek()))
         return this.addToken(c.NUMERIC_LITERAL);
       if (!n && !xe(this.peek()))
         break;
       this.advance();
     }
-    for (; !this.isAtEnd() && (this.check(".") || me(this.peek())); )
+    for (; !this.isAtEnd() && (this.check(".") || Te(this.peek())); )
       this.advance();
     const s = this.createToken(c.NUMERIC_LITERAL, !0);
     this.tokens.push(s), this.errors.push(new u(o.UNKNOWN_TOKEN, "Invalid number", s));
   }
   colorLiteral() {
-    for (; !this.isAtEnd() && me(this.peek()); )
+    for (; !this.isAtEnd() && Te(this.peek()); )
       this.advance();
     this.addToken(c.COLOR_LITERAL);
   }
@@ -946,7 +946,7 @@ class rn {
       case "u": {
         let e = "";
         for (let s = 0; s <= 3; s += 1) {
-          if (this.isAtEnd() || !me(this.peek()))
+          if (this.isAtEnd() || !Te(this.peek()))
             return `\\u${e}`;
           e += this.advance();
         }
@@ -957,7 +957,7 @@ class rn {
     }
   }
 }
-var we = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(we || {});
+var ve = /* @__PURE__ */ ((t) => (t[t.ListExpression = 0] = "ListExpression", t[t.GroupExpression = 1] = "GroupExpression", t[t.BlockExpression = 2] = "BlockExpression", t))(ve || {});
 class an {
   constructor() {
     this.stack = [], this.numberOfNestedLParens = 0, this.numberOfNestedLBrackets = 0, this.numberOfNestedLBraces = 0;
@@ -1056,7 +1056,7 @@ class ln {
           break;
         E(n), this.advance();
       }
-    }, this.blockExpression = this.contextStack.withContextDo(we.BlockExpression, () => {
+    }, this.blockExpression = this.contextStack.withContextDo(ve.BlockExpression, () => {
       const n = { body: [] }, i = () => this.nodeFactory.create(ee, n);
       try {
         this.consume("Expect an opening brace '{'", c.LBRACE), n.blockOpenBrace = this.previous();
@@ -1095,12 +1095,12 @@ class ln {
             break;
           E(n), this.advance();
         }
-    }, this.tupleExpression = this.contextStack.withContextDo(we.GroupExpression, () => {
+    }, this.tupleExpression = this.contextStack.withContextDo(ve.GroupExpression, () => {
       const n = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(Xe, {
         groupOpenParen: n.tupleOpenParen,
         groupCloseParen: n.tupleCloseParen,
         expression: n.elementList[0]
-      }), r = () => this.nodeFactory.create(q, n);
+      }), r = () => this.nodeFactory.create(J, n);
       try {
         this.consume("Expect an opening parenthesis '('", c.LPAREN), n.tupleOpenParen = this.previous();
       } catch (a) {
@@ -1126,7 +1126,7 @@ class ln {
         } catch (a) {
           if (!(a instanceof d))
             throw a;
-          if (a.partialNode instanceof w && n.elementList.push(a.partialNode), !this.canHandle(a))
+          if (a.partialNode instanceof v && n.elementList.push(a.partialNode), !this.canHandle(a))
             throw new d(a.token, r(), a.handlerContext);
           this.synchronizeTuple();
         }
@@ -1147,7 +1147,7 @@ class ln {
           break;
         E(n), this.advance();
       }
-    }, this.listExpression = this.contextStack.withContextDo(we.ListExpression, () => {
+    }, this.listExpression = this.contextStack.withContextDo(ve.ListExpression, () => {
       const n = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(U, n);
       try {
         this.consume("Expect an opening bracket '['", c.LBRACKET), n.listOpenBracket = this.previous();
@@ -1174,7 +1174,7 @@ class ln {
         } catch (r) {
           if (!(r instanceof d))
             throw r;
-          if (r.partialNode instanceof w && n.elementList.push(r.partialNode), !this.canHandle(r))
+          if (r.partialNode instanceof v && n.elementList.push(r.partialNode), !this.canHandle(r))
             throw new d(r.token, i(), r.handlerContext);
           this.synchronizeList();
         }
@@ -1265,7 +1265,7 @@ class ln {
     this.tokens = e;
   }
   parse() {
-    const e = this.program(), s = this.advance(), n = this.nodeFactory.create(C, { body: e, eof: s });
+    const e = this.program(), s = this.advance(), n = this.nodeFactory.create(X, { body: e, eof: s });
     return this.gatherInvalid(), new B({ ast: n, tokens: this.tokens }, this.errors);
   }
   /* Parsing and synchronizing ProgramNode */
@@ -1408,12 +1408,12 @@ class ln {
         ot(this.previous(), n) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
           break;
         try {
-          s = this.nodeFactory.create(Q, {
+          s = this.nodeFactory.create(H, {
             callee: s,
             argumentList: this.tupleExpression()
           });
         } catch (r) {
-          throw r instanceof d ? (s = this.nodeFactory.create(Q, {
+          throw r instanceof d ? (s = this.nodeFactory.create(H, {
             callee: s,
             argumentList: r.partialNode
           }), new d(r.token, s, r.handlerContext)) : r;
@@ -1422,12 +1422,12 @@ class ln {
         if (Ve(this.previous()))
           break;
         try {
-          s = this.nodeFactory.create(he, {
+          s = this.nodeFactory.create(fe, {
             expression: s,
             indexer: this.listExpression()
           });
         } catch (i) {
-          throw i instanceof d ? (s = this.nodeFactory.create(he, {
+          throw i instanceof d ? (s = this.nodeFactory.create(fe, {
             expression: s,
             indexer: i.partialNode
           }), new d(i.token, s, i.handlerContext)) : i;
@@ -1447,13 +1447,13 @@ class ln {
             break;
           this.advance();
           try {
-            s = this.nodeFactory.create(z, {
+            s = this.nodeFactory.create(q, {
               leftExpression: s,
               op: i,
               rightExpression: i.value === "." ? this.extractOperand() : this.expression_bp(a.right)
             });
           } catch (l) {
-            throw l instanceof d ? (s = this.nodeFactory.create(z, {
+            throw l instanceof d ? (s = this.nodeFactory.create(q, {
               leftExpression: s,
               op: i,
               rightExpression: l.partialNode
@@ -1478,7 +1478,7 @@ class ln {
           `Unexpected '${s.op.value}' in an expression`
         ), new d(
           s.op,
-          this.nodeFactory.create(ve, { pre: s.op }),
+          this.nodeFactory.create(we, { pre: s.op }),
           this.contextStack.findHandlerContext(this.tokens, this.current)
         );
       this.advance();
@@ -1487,15 +1487,15 @@ class ln {
       } catch (i) {
         throw i instanceof d ? (s.expression = i.partialNode, new d(
           i.token,
-          this.nodeFactory.create(Y, s),
+          this.nodeFactory.create(Q, s),
           i.handlerContext
         )) : i;
       }
-      e = this.nodeFactory.create(Y, s);
-    } else if (e = this.extractOperand(), e instanceof ve)
+      e = this.nodeFactory.create(Q, s);
+    } else if (e = this.extractOperand(), e instanceof we)
       throw new d(
         this.peek(),
-        this.nodeFactory.create(ve, { pre: this.peek() }),
+        this.nodeFactory.create(we, { pre: this.peek() }),
         this.contextStack.findHandlerContext(this.tokens, this.current)
       );
     return e;
@@ -1519,7 +1519,7 @@ class ln {
       this.peek(),
       o.INVALID_OPERAND,
       `Invalid start of operand "${this.peek().value}"`
-    ), this.nodeFactory.create(ve, { pre: this.previous() }));
+    ), this.nodeFactory.create(we, { pre: this.previous() }));
   }
   /* Parsing FunctionExpression */
   functionExpression() {
@@ -1529,11 +1529,11 @@ class ln {
     } catch (s) {
       throw s instanceof d ? (e.value = s.partialNode, new d(
         s.token,
-        this.nodeFactory.create(Z, e),
+        this.nodeFactory.create(K, e),
         s.handlerContext
       )) : s;
     }
-    return this.nodeFactory.create(Z, e);
+    return this.nodeFactory.create(K, e);
   }
   canBeField() {
     return this.peek().kind === c.IDENTIFIER && this.peek(1).kind === c.COLON;
@@ -1546,16 +1546,16 @@ class ln {
       c.NUMERIC_LITERAL
     ))
       return this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create(pe, { literal: this.previous() })
+        expression: this.nodeFactory.create(de, { literal: this.previous() })
       });
     if (this.match(c.QUOTED_STRING, c.IDENTIFIER))
       return this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create(X, { variable: this.previous() })
+        expression: this.nodeFactory.create($, { variable: this.previous() })
       });
     throw this.logError(this.peek(), o.UNEXPECTED_TOKEN, "Expect a variable or literal"), new d(
       this.peek(),
       this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create(X, {})
+        expression: this.nodeFactory.create($, {})
       }),
       this.contextStack.findHandlerContext(this.tokens, this.current)
     );
@@ -1653,7 +1653,7 @@ function ut(t) {
   return pn[t.value] || { left: null, right: null };
 }
 var I = /* @__PURE__ */ ((t) => (t.Table = "table", t.Enum = "enum", t.Ref = "ref", t.Note = "note", t.Project = "project", t.Indexes = "indexes", t.TableGroup = "tablegroup", t))(I || {});
-function de(t) {
+function Ee(t) {
   var s;
   const e = (s = t == null ? void 0 : t.type) == null ? void 0 : s.value.toLowerCase();
   switch (e) {
@@ -1669,21 +1669,21 @@ function de(t) {
       return new A();
   }
 }
-function Ee(t) {
+function Ne(t) {
   if (!He(t))
     return new k([t]);
-  const e = Ee(t.leftExpression).unwrap_or(void 0);
+  const e = Ne(t.leftExpression).unwrap_or(void 0);
   return e ? (e.push(t.rightExpression), new k(e)) : new A();
 }
-function $(t) {
+function j(t) {
   if (t === void 0)
     return new A();
-  const e = Ee(t).unwrap_or(void 0);
+  const e = Ne(t).unwrap_or(void 0);
   if (!e)
     return new A();
   const s = [];
   for (const n of e) {
-    const i = W(n).unwrap_or(void 0);
+    const i = C(n).unwrap_or(void 0);
     if (!i)
       return new A();
     s.push(i);
@@ -1693,7 +1693,7 @@ function $(t) {
 function Ie(t) {
   if (t === void 0)
     return new A();
-  const e = Ee(t).unwrap_or(void 0);
+  const e = Ne(t).unwrap_or(void 0);
   if (!e || e.length === 0)
     return new A();
   const s = [];
@@ -1708,7 +1708,7 @@ function Ie(t) {
       return new A();
   }
   for (const i of e) {
-    const r = W(i).unwrap_or(void 0);
+    const r = C(i).unwrap_or(void 0);
     if (!r)
       return new A();
     s.push(r);
@@ -1718,15 +1718,15 @@ function Ie(t) {
     tupleElements: n
   });
 }
-function W(t) {
+function C(t) {
   return M(t) ? new k(t.expression.variable.value) : new A();
 }
 function Ge(t) {
   if (ht(t))
-    return t instanceof Z ? new k({ functional: [t], nonFunctional: [] }) : new k({ functional: [], nonFunctional: [t] });
-  if (t instanceof q && t.elementList.every(ht)) {
+    return t instanceof K ? new k({ functional: [t], nonFunctional: [] }) : new k({ functional: [], nonFunctional: [t] });
+  if (t instanceof J && t.elementList.every(ht)) {
     const e = t.elementList.filter(
-      (n) => n instanceof Z
+      (n) => n instanceof K
     ), s = t.elementList.filter(M);
     return new k({ functional: e, nonFunctional: s });
   }
@@ -1737,12 +1737,12 @@ function G(t) {
   const e = (s = t == null ? void 0 : t.expression.variable) == null ? void 0 : s.value;
   return e === void 0 ? new A() : new k(e);
 }
-function J(t) {
-  return K(t) ? t.expression instanceof X ? new k(t.expression.variable.value) : new k(t.expression.literal.value) : new A();
+function Y(t) {
+  return W(t) ? t.expression instanceof $ ? new k(t.expression.variable.value) : new k(t.expression.literal.value) : new A();
 }
 function dn(t) {
   var e;
-  return !(t instanceof z) || !yt((e = t.op) == null ? void 0 : e.value) ? !1 : Ie(t.leftExpression).and_then(() => Ie(t.rightExpression)).unwrap_or(void 0) !== void 0;
+  return !(t instanceof q) || !yt((e = t.op) == null ? void 0 : e.value) ? !1 : Ie(t.leftExpression).and_then(() => Ie(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
 function En(t) {
   const e = Ie(t.leftExpression), s = Ie(t.rightExpression);
@@ -1752,7 +1752,7 @@ function En(t) {
   return (n == null ? void 0 : n.length) === (i == null ? void 0 : i.length);
 }
 function ht(t) {
-  return t instanceof D && t.expression instanceof X || t instanceof Z;
+  return t instanceof D && t.expression instanceof $ || t instanceof K;
 }
 function Nn(t, e) {
   var i, r, a, l;
@@ -1761,9 +1761,9 @@ function Nn(t, e) {
   for (; s; ) {
     if ((r = (i = s.symbol) == null ? void 0 : i.symbolTable) != null && r.has(t))
       return (a = s.symbol.symbolTable) == null ? void 0 : a.get(t);
-    if (((l = s.symbol) == null ? void 0 : l.declaration) instanceof C && n)
+    if (((l = s.symbol) == null ? void 0 : l.declaration) instanceof X && n)
       return s.symbol;
-    if (s instanceof C)
+    if (s instanceof X)
       return;
     s = s.parent;
   }
@@ -1776,7 +1776,7 @@ class mn {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof C || de(this.declarationNode.parent).unwrap_or(void 0) !== I.Project ? [new u(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof X || Ee(this.declarationNode.parent).unwrap_or(void 0) !== I.Project ? [new u(o.INVALID_CUSTOM_CONTEXT, "A custom element can only appear in a Project", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new u(o.UNEXPECTED_NAME, "A Custom element shouldn't have a name", e)] : [];
@@ -1793,7 +1793,7 @@ class mn {
     if (e instanceof ee)
       return [new u(o.UNEXPECTED_COMPLEX_BODY, "A Custom element can only have an inline field", e)];
     const s = [];
-    return K(e.callee) || s.push(new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && s.push(...e.args.map((n) => new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", n))), s;
+    return W(e.callee) || s.push(new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", e)), e.args.length > 0 && s.push(...e.args.map((n) => new u(o.INVALID_CUSTOM_ELEMENT_VALUE, "A Custom element value can only be a string", n))), s;
   }
 }
 class ge {
@@ -1832,7 +1832,7 @@ class Tn {
   registerElement() {
     const e = [];
     this.declarationNode.symbol = this.symbolFactory.create(qt, { declaration: this.declarationNode, symbolTable: new ge() });
-    const { name: s } = this.declarationNode, n = $(s);
+    const { name: s } = this.declarationNode, n = j(s);
     if (n.isOk()) {
       const i = n.unwrap(), r = i.pop(), a = Ze(i, this.publicSymbolTable, this.symbolFactory), l = je(r);
       a.has(l) && e.push(new u(o.DUPLICATE_NAME, `Enum name ${r} already exists in schema '${i.join(".") || "public"}'`, s)), a.set(l, this.declarationNode.symbol);
@@ -1857,13 +1857,13 @@ class Tn {
     });
   }
   validateFieldSetting(e) {
-    const s = j(e), n = s.getErrors(), i = s.getValue();
+    const s = z(e), n = s.getErrors(), i = s.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
           a.length > 1 && a.forEach((l) => n.push(new u(o.DUPLICATE_ENUM_ELEMENT_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
-            K(l.value) || n.push(new u(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
+            W(l.value) || n.push(new u(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", l));
           });
           break;
         default:
@@ -1905,7 +1905,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 C || de(this.declarationNode.parent).unwrap_or(void 0) !== I.Table ? [new u(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof X || Ee(this.declarationNode.parent).unwrap_or(void 0) !== I.Table ? [new u(o.INVALID_NOTE_CONTEXT, "An Indexes can only appear inside a Table", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new u(o.UNEXPECTED_NAME, "An Indexes shouldn't have a name", e)] : [];
@@ -1930,21 +1930,21 @@ class bn {
         return [];
       const n = [], i = [s.callee, ...s.args];
       return L.last(i) instanceof U && n.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
-        for (; r instanceof Q; )
+        for (; r instanceof H; )
           r.argumentList && !Ge(r.argumentList).isOk() && n.push(new u(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
         Ge(r).isOk() || n.push(new u(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
       }), n;
     });
   }
   validateFieldSetting(e) {
-    const s = j(e), n = s.getErrors(), i = s.getValue();
+    const s = z(e), n = s.getErrors(), i = s.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
         case "note":
         case "name":
           a.length > 1 && a.forEach((l) => n.push(new u(o.DUPLICATE_INDEX_SETTING, `'${r}' can only appear once`, l))), a.forEach((l) => {
-            K(l.value) || n.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
+            W(l.value) || n.push(new u(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, l));
           });
           break;
         case "unique":
@@ -1981,7 +1981,7 @@ class In {
     return [...this.validateContext(), ...this.validateName(this.declarationNode.name), ...this.validateAlias(this.declarationNode.alias), ...this.validateSettingList(this.declarationNode.attributeList), ...this.validateBody(this.declarationNode.body)];
   }
   validateContext() {
-    return this.declarationNode.parent instanceof C || ![I.Table, I.Project].includes(de(this.declarationNode.parent).unwrap_or(void 0)) ? [new u(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project", this.declarationNode)] : [];
+    return this.declarationNode.parent instanceof X || ![I.Table, I.Project].includes(Ee(this.declarationNode.parent).unwrap_or(void 0)) ? [new u(o.INVALID_NOTE_CONTEXT, "A Note can only appear inside a Table or a Project", this.declarationNode)] : [];
   }
   validateName(e) {
     return e ? [new u(o.UNEXPECTED_NAME, "A Note shouldn't have a name", e)] : [];
@@ -2002,7 +2002,7 @@ class In {
   }
   validateFields(e) {
     const s = [];
-    return e.length === 0 ? [new u(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((n) => s.push(new u(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", n))), K(e[0].callee) || s.push(new u(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && s.push(...e[0].args.map((n) => new u(o.INVALID_NOTE, "A Note can only contain one quoted string", n))), s);
+    return e.length === 0 ? [new u(o.EMPTY_NOTE, "A Note must have a content", this.declarationNode)] : (e.length > 1 && e.slice(1).forEach((n) => s.push(new u(o.NOTE_CONTENT_REDEFINED, "A Note can only contain one string", n))), W(e[0].callee) || s.push(new u(o.INVALID_NOTE, "A Note content must be a quoted string", e[0])), e[0].args.length > 0 && s.push(...e[0].args.map((n) => new u(o.INVALID_NOTE, "A Note can only contain one quoted string", n))), s);
   }
   validateSubElements(e) {
     return e.flatMap((s) => {
@@ -2060,7 +2060,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 C || de(this.declarationNode.parent).unwrap_or(void 0) === I.Table ? [] : [new u(o.INVALID_REF_CONTEXT, "A Ref must appear top-level or inside a table", this.declarationNode)];
+    return this.declarationNode.parent instanceof X || Ee(this.declarationNode.parent).unwrap_or(void 0) === I.Table ? [] : [new u(o.INVALID_REF_CONTEXT, "A Ref must appear top-level or inside a table", this.declarationNode)];
   }
   validateName(e) {
     return e ? Re(e) ? [] : [new u(o.INVALID_NAME, "A Ref's name is optional or must be an identifier or a quoted identifer", e)] : [];
@@ -2088,7 +2088,7 @@ class gn {
     }), s;
   }
   validateFieldSettings(e) {
-    const s = j(e), n = s.getErrors(), i = s.getValue();
+    const s = z(e), n = s.getErrors(), i = s.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
@@ -2141,13 +2141,13 @@ class An {
     return this.declarationNode.parent instanceof _ ? [new u(o.INVALID_TABLE_CONTEXT, "Table must appear top-level", this.declarationNode)] : [];
   }
   validateName(e) {
-    return e ? e instanceof he ? [new u(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Je(e) ? [] : [new u(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new u(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
+    return e ? e instanceof fe ? [new u(o.INVALID_NAME, "Invalid array as Table name, maybe you forget to add a space between the name and the setting list?", e)] : Je(e) ? [] : [new u(o.INVALID_NAME, "A Table name must be of the form <table> or <schema>.<table>", e)] : [new u(o.NAME_NOT_FOUND, "A Table must have a name", this.declarationNode)];
   }
   validateAlias(e) {
     return e ? yn(e) ? [] : [new u(o.INVALID_ALIAS, "A Table alias must be of the form <alias>", e)] : [];
   }
   validateSettingList(e) {
-    const s = j(e), n = s.getErrors(), i = s.getValue();
+    const s = z(e), n = s.getErrors(), i = s.getValue();
     for (const r in i) {
       const a = i[r];
       switch (r) {
@@ -2158,7 +2158,7 @@ class An {
           break;
         case "note":
           a.length > 1 && n.push(...a.map((l) => new u(o.DUPLICATE_TABLE_SETTING, "'note' can only appear once", l))), a.forEach((l) => {
-            K(l.value) || n.push(new u(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
+            W(l.value) || n.push(new u(o.INVALID_TABLE_SETTING, "'note' must be a string literal", l.value || l.name));
           });
           break;
         default:
@@ -2170,7 +2170,7 @@ class An {
   registerElement() {
     const e = [];
     this.declarationNode.symbol = this.symbolFactory.create(At, { declaration: this.declarationNode, symbolTable: new ge() });
-    const { name: s, alias: n } = this.declarationNode, i = $(s);
+    const { name: s, alias: n } = this.declarationNode, i = j(s);
     if (i.isOk()) {
       const r = i.unwrap(), a = r.pop(), l = Ze(r, this.publicSymbolTable, this.symbolFactory), p = ye(a);
       l.has(p) && e.push(new u(o.DUPLICATE_NAME, `Table name '${a}' already exists in schema '${r.join(".") || "public"}'`, s)), l.set(p, this.declarationNode.symbol);
@@ -2194,7 +2194,7 @@ class An {
       if (!s.callee)
         return [];
       const n = [];
-      s.args.length === 0 && n.push(new u(o.INVALID_COLUMN, "A column must have a type", s.callee)), M(s.callee) || n.push(new u(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", s.callee)), s.args[0] && !vn(s.args[0]) && n.push(new u(o.INVALID_COLUMN_TYPE, "Invalid column type", s.args[0]));
+      s.args.length === 0 && n.push(new u(o.INVALID_COLUMN, "A column must have a type", s.callee)), M(s.callee) || n.push(new u(o.INVALID_COLUMN_NAME, "A column name must be an identifier or a quoted identifier", s.callee)), s.args[0] && !wn(s.args[0]) && n.push(new u(o.INVALID_COLUMN_TYPE, "Invalid column type", s.args[0]));
       const i = s.args.slice(1);
       return n.push(...this.validateFieldSetting(i)), n.push(...this.registerField(s)), n;
     });
@@ -2217,13 +2217,13 @@ class An {
   }
   // This is needed to support legacy inline settings
   validateFieldSetting(e) {
-    if (!e.slice(0, -1).every(be) || !e.slice(-1).every((p) => be(p) || p instanceof U))
+    if (!e.slice(0, -1).every(pe) || !e.slice(-1).every((p) => pe(p) || p instanceof U))
       return [...e.map((p) => new u(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
     if (e.length === 0)
       return [];
     let s;
     L.last(e) instanceof U && (s = e.pop());
-    const n = j(s), i = n.getErrors(), r = n.getValue();
+    const n = z(s), i = n.getErrors(), r = n.getValue();
     for (const p of e) {
       const h = G(p).unwrap_or("").toLowerCase();
       if (h !== "pk" && h !== "unique") {
@@ -2239,7 +2239,7 @@ class An {
       switch (p) {
         case "note":
           h.length > 1 && i.push(...h.map((f) => new u(o.DUPLICATE_COLUMN_SETTING, "note can only appear once", f))), h.forEach((f) => {
-            K(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
+            W(f.value) || i.push(new u(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
           });
           break;
         case "ref":
@@ -2303,23 +2303,23 @@ class An {
     return n.length > 1 && (s.push(...n.map((i) => new u(o.NOTE_REDEFINED, "Duplicate notes are defined", i))), s.push()), s;
   }
 }
-function vn(t) {
-  if (!(t instanceof Q || He(t) || t instanceof D || t instanceof he))
+function wn(t) {
+  if (!(t instanceof H || He(t) || t instanceof D || t instanceof fe))
     return !1;
-  if (t instanceof Q) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every(fe))
+  if (t instanceof H) {
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((s) => le(s) || W(s) || pe(s)))
       return !1;
     t = t.callee;
   }
-  for (; t instanceof he; ) {
-    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((s) => !s.colon && !s.value && fe(s.name)))
+  for (; t instanceof fe; ) {
+    if (t.array === void 0 || t.indexer === void 0 || !t.indexer.elementList.every((s) => !s.colon && !s.value && le(s.name)))
       return !1;
     t = t.array;
   }
-  const e = $(t).unwrap_or(void 0);
+  const e = j(t).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
-class wn {
+class vn {
   constructor(e, s, n) {
     this.declarationNode = e, this.publicSymbolTable = s, this.symbolFactory = n;
   }
@@ -2338,7 +2338,7 @@ class wn {
   registerElement() {
     const { name: e } = this.declarationNode;
     this.declarationNode.symbol = this.symbolFactory.create(Zt, { declaration: this.declarationNode, symbolTable: new ge() });
-    const s = $(e);
+    const s = j(e);
     if (s.isOk()) {
       const n = s.unwrap(), i = n.pop(), r = Ze(n, this.publicSymbolTable, this.symbolFactory), a = ze(i);
       if (r.has(a))
@@ -2361,7 +2361,7 @@ class wn {
   validateFields(e) {
     return e.flatMap((s) => {
       const n = [];
-      return s.callee && !$(s.callee).isOk() && n.push(new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", s.callee)), this.registerField(s), s.args.length > 0 && n.push(...s.args.map((i) => new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), n;
+      return s.callee && !j(s.callee).isOk() && n.push(new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field must be of the form <table> or <schema>.<table>", s.callee)), this.registerField(s), s.args.length > 0 && n.push(...s.args.map((i) => new u(o.INVALID_TABLEGROUP_FIELD, "A TableGroup field should only have a single Table name", i))), n;
     });
   }
   validateSubElements(e) {
@@ -2389,7 +2389,7 @@ class wn {
     return [];
   }
 }
-const wt = ["-", "+"];
+const vt = ["-", "+"];
 function ie(t) {
   switch (t.type.value.toLowerCase()) {
     case I.Enum:
@@ -2397,7 +2397,7 @@ function ie(t) {
     case I.Table:
       return An;
     case I.TableGroup:
-      return wn;
+      return vn;
     case I.Project:
       return Ln;
     case I.Ref:
@@ -2411,13 +2411,13 @@ function ie(t) {
   }
 }
 function Je(t) {
-  return !!$(t).unwrap_or(!1);
+  return !!j(t).unwrap_or(!1);
 }
 function yn(t) {
   return Re(t);
 }
 function Re(t) {
-  return t instanceof D && t.expression instanceof X;
+  return t instanceof D && t.expression instanceof $;
 }
 function Ze(t, e, s) {
   var i;
@@ -2443,7 +2443,7 @@ function yt(t) {
 }
 function xn(t) {
   var s;
-  if (!(t instanceof D) || !(t.expression instanceof pe) || ((s = t.expression.literal) == null ? void 0 : s.kind) !== c.COLOR_LITERAL)
+  if (!(t instanceof D) || !(t.expression instanceof de) || ((s = t.expression.literal) == null ? void 0 : s.kind) !== c.COLOR_LITERAL)
     return !1;
   const e = t.expression.literal.value;
   if (e.length !== 4 && e.length !== 7 || e[0] !== "#")
@@ -2458,23 +2458,23 @@ function oe(t) {
 }
 function kn(t) {
   var e;
-  return !!(K(t) || fe(t) || be(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Y && wt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression) || t instanceof Z);
+  return !!(W(t) || le(t) || pe(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && vt.includes((e = t.op) == null ? void 0 : e.value) && le(t.expression) || t instanceof K);
 }
-function fe(t) {
+function le(t) {
   var e;
-  return t instanceof D && t.expression instanceof pe && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.NUMERIC_LITERAL;
+  return t instanceof D && t.expression instanceof de && ((e = t.expression.literal) == null ? void 0 : e.kind) === c.NUMERIC_LITERAL;
 }
 function Sn(t) {
   var s;
-  if (!(t instanceof Y) || !yt((s = t.op) == null ? void 0 : s.value))
+  if (!(t instanceof Q) || !yt((s = t.op) == null ? void 0 : s.value))
     return !1;
-  const e = $(t.expression).unwrap_or(void 0);
+  const e = j(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
 function xt(t) {
-  return t instanceof q && t.elementList.every(M);
+  return t instanceof J && t.elementList.every(M);
 }
-function j(t) {
+function z(t) {
   var n;
   const e = {}, s = [];
   if (!t)
@@ -2509,7 +2509,7 @@ class ft {
       );
       e.push(...r.validate());
     });
-    const s = this.ast.body.filter((n) => de(n).unwrap_or(void 0) === I.Project);
+    const s = this.ast.body.filter((n) => Ee(n).unwrap_or(void 0) === I.Project);
     return s.length > 1 && s.forEach((n) => e.push(new u(o.PROJECT_REDEFINED, "Only one project can exist", n))), new B(this.ast, e);
   }
 }
@@ -2561,11 +2561,11 @@ class re {
     var n, i;
     if (e)
       if (e instanceof D) {
-        if (e.expression instanceof X && ((i = s.keywords) != null && i.includes((n = e.expression.variable) == null ? void 0 : n.value.toLowerCase())))
+        if (e.expression instanceof $ && ((i = s.keywords) != null && i.includes((n = e.expression.variable) == null ? void 0 : n.value.toLowerCase())))
           return;
         this.bindFragments([e], s);
       } else
-        e instanceof z ? He(e) ? this.bindFragments(Ee(e).unwrap_or([]), s) : (this.scanAndBind(e.leftExpression, s), this.scanAndBind(e.rightExpression, s)) : e instanceof Y ? this.scanAndBind(e.expression, s) : e instanceof Oe ? this.scanAndBind(e.expression, s) : e instanceof q && e.elementList.forEach((r) => this.scanAndBind(r, s));
+        e instanceof q ? He(e) ? this.bindFragments(Ne(e).unwrap_or([]), s) : (this.scanAndBind(e.leftExpression, s), this.scanAndBind(e.rightExpression, s)) : e instanceof Q ? this.scanAndBind(e.expression, s) : e instanceof Oe ? this.scanAndBind(e.expression, s) : e instanceof J && e.elementList.forEach((r) => this.scanAndBind(r, s));
   }
   // Bind the fragments of a member access expression
   // which can be a simple expression like v1.User,
@@ -2878,16 +2878,16 @@ function x(t) {
 }
 function Ce(t) {
   var s;
-  const e = (s = Ee(t).unwrap_or(void 0)) == null ? void 0 : s.pop();
-  return e instanceof q ? e.elementList.map((n) => n.referee) : [e.referee];
+  const e = (s = Ne(t).unwrap_or(void 0)) == null ? void 0 : s.pop();
+  return e instanceof J ? e.elementList.map((n) => n.referee) : [e.referee];
 }
-function ce(t) {
+function ue(t) {
   return t.split(`
 `).map((e) => e.trim()).join(`
 `);
 }
 function _e(t) {
-  const e = $(t).unwrap();
+  const e = j(t).unwrap();
   return {
     name: e.pop(),
     schemaName: e
@@ -2920,7 +2920,7 @@ class Ke {
     return this.ref.token = x(this.declarationNode), this.env.ref.set(this.declarationNode, this.ref), [...this.interpretName(this.declarationNode.name), ...this.interpretBody(this.declarationNode.body)];
   }
   interpretName(e) {
-    const s = [], n = $(this.declarationNode.name).unwrap_or([]);
+    const s = [], n = j(this.declarationNode.name).unwrap_or([]);
     return this.ref.name = n.pop() || null, n.length > 1 && s.push(new u(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name)), this.ref.schemaName = n.join(".") || null, s;
   }
   interpretBody(e) {
@@ -2938,8 +2938,8 @@ class Ke {
         new u(o.CIRCULAR_REF, "References with same endpoints exist", this.env.refIds[l])
       ];
     if (e.args[0]) {
-      const b = j(e.args[0]).getValue();
-      this.ref.onDelete = W((T = (h = b.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value).unwrap_or(void 0), this.ref.onDelete = W((N = (f = b.delete) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
+      const b = z(e.args[0]).getValue();
+      this.ref.onDelete = C((T = (h = b.delete) == null ? void 0 : h.at(0)) == null ? void 0 : T.value).unwrap_or(void 0), this.ref.onDelete = C((N = (f = b.delete) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
     }
     const p = St(s);
     return this.ref.endpoints = [
@@ -2998,11 +2998,11 @@ class Rt {
   }
   interpretSettingList(e) {
     var r, a, l;
-    const s = j(e).getValue();
+    const s = z(e).getValue();
     this.table.headerColor = (r = s.headercolor) != null && r.length ? Xn((l = (a = s.headercolor) == null ? void 0 : a.at(0)) == null ? void 0 : l.value) : void 0;
-    const [n] = s.note || [], i = J(n == null ? void 0 : n.value).unwrap_or(void 0);
+    const [n] = s.note || [], i = Y(n == null ? void 0 : n.value).unwrap_or(void 0);
     return this.table.note = n && {
-      value: ce(i),
+      value: ue(i),
       token: x(n)
     }, [];
   }
@@ -3016,7 +3016,7 @@ class Rt {
       switch ((n = s.type) == null ? void 0 : n.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: ce(J(s.body instanceof ee ? s.body.body[0].callee : s.body.callee).unwrap()),
+            value: ue(Y(s.body instanceof ee ? s.body.body[0].callee : s.body.callee).unwrap()),
             token: x(s)
           }, [];
         case "indexes":
@@ -3038,11 +3038,11 @@ class Rt {
     n.type = i.getValue(), s.push(...i.getErrors()), n.token = x(e), n.inline_refs = [];
     const r = e.args.slice(1);
     if (L.last(r) instanceof U) {
-      const b = j(r.pop()).getValue();
+      const b = z(r.pop()).getValue();
       n.pk = !!((a = b.pk) != null && a.length), n.increment = !!((l = b.increment) != null && l.length), n.unique = !!((p = b.unique) != null && p.length), n.not_null = !!((h = b["not null"]) != null && h.length) && !0, n.dbdefault = Wn((f = (T = b.default) == null ? void 0 : T.at(0)) == null ? void 0 : f.value);
       const F = (N = b.note) == null ? void 0 : N.at(0);
       n.note = F && {
-        value: ce(J(F.value).unwrap()),
+        value: ue(Y(F.value).unwrap()),
         token: x(F)
       };
       const Me = b.ref || [];
@@ -3050,51 +3050,51 @@ class Rt {
         const [nt] = Ce(R.value.expression);
         if (Dt(nt, e.symbol))
           return s.push(new u(o.SAME_ENDPOINT, "Two endpoints are the same", R)), [];
-        const Ae = R.value.op, H = $(R.value.expression).unwrap();
-        let le;
-        if (H.length === 1) {
-          const [ae] = H;
-          le = {
+        const Ae = R.value.op, Z = j(R.value.expression).unwrap();
+        let ce;
+        if (Z.length === 1) {
+          const [ae] = Z;
+          ce = {
             schemaName: this.table.schemaName,
             tableName: this.table.name,
             fieldNames: [ae],
             relation: Ae.value,
             token: x(R)
           };
-        } else if (H.length === 2) {
-          const [ae, Ne] = H;
-          le = {
+        } else if (Z.length === 2) {
+          const [ae, me] = Z;
+          ce = {
             schemaName: null,
             tableName: ae,
-            fieldNames: [Ne],
+            fieldNames: [me],
             relation: Ae.value,
             token: x(R)
           };
-        } else if (H.length === 3) {
-          const [ae, Ne, it] = H;
-          le = {
+        } else if (Z.length === 3) {
+          const [ae, me, it] = Z;
+          ce = {
             schemaName: ae,
-            tableName: Ne,
+            tableName: me,
             fieldNames: [it],
             relation: Ae.value,
             token: x(R)
           };
         } else {
           s.push(new u(o.UNSUPPORTED, "Nested schema is not supported", R));
-          const ae = H.pop(), Ne = H.pop();
-          le = {
-            schemaName: H.join("."),
-            tableName: Ne,
+          const ae = Z.pop(), me = Z.pop();
+          ce = {
+            schemaName: Z.join("."),
+            tableName: me,
             fieldNames: [ae],
             relation: Ae.value,
             token: x(R)
           };
         }
-        const st = this.registerInlineRefToEnv(e, nt, le, R);
-        return s.push(...st), st.length === 0 ? le : [];
+        const st = this.registerInlineRefToEnv(e, nt, ce, R);
+        return s.push(...st), st.length === 0 ? ce : [];
       });
     }
-    return n.pk || (n.pk = r.some((b) => W(b).unwrap().toLowerCase() === "pk")), n.unique || (n.unique = r.some((b) => W(b).unwrap().toLowerCase() === "unique")), this.table.fields.push(n), n.pk && this.pkColumns.push(n), s;
+    return n.pk || (n.pk = r.some((b) => C(b).unwrap().toLowerCase() === "pk")), n.unique || (n.unique = r.some((b) => C(b).unwrap().toLowerCase() === "unique")), this.table.fields.push(n), n.pk && this.pkColumns.push(n), s;
   }
   interpretIndexes(e) {
     return this.table.indexes.push(...e.body.body.map((s) => {
@@ -3103,19 +3103,19 @@ class Rt {
       n.token = x(e);
       const r = [i.callee, ...i.args];
       if (L.last(r) instanceof U) {
-        const b = j(r.pop()).getValue();
-        n.pk = !!((a = b.pk) != null && a.length), n.unique = !!((l = b.unique) != null && l.length), n.name = J((h = (p = b.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
+        const b = z(r.pop()).getValue();
+        n.pk = !!((a = b.pk) != null && a.length), n.unique = !!((l = b.unique) != null && l.length), n.name = Y((h = (p = b.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
         const F = (T = b.note) == null ? void 0 : T.at(0);
         n.note = F && {
-          value: ce(J(F.value).unwrap()),
+          value: ue(Y(F.value).unwrap()),
           token: x(F)
-        }, n.type = W((N = (f = b.type) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
+        }, n.type = C((N = (f = b.type) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
       }
       return r.flatMap((b) => {
-        if (!(b instanceof Q))
+        if (!(b instanceof H))
           return b;
         const F = [];
-        for (; b instanceof Q; )
+        for (; b instanceof H; )
           F.push(b.argumentList), b = b.callee;
         return F.push(b), F;
       }).forEach((b) => {
@@ -3149,7 +3149,7 @@ class Rt {
         {
           schemaName: this.table.schemaName,
           tableName: this.table.name,
-          fieldNames: [W(e.callee).unwrap()],
+          fieldNames: [C(e.callee).unwrap()],
           token: x(e),
           relation: a[0]
         },
@@ -3163,9 +3163,9 @@ class Rt {
 }
 function $n(t) {
   let e = null;
-  t instanceof Q && (e = t.argumentList.elementList.map((r) => r.expression.literal.value).join(","), t = t.callee);
+  t instanceof H && (e = t.argumentList.elementList.map((r) => le(r) ? r.expression.literal.value : W(r) ? Y(r).unwrap() : C(r).unwrap()).join(","), t = t.callee);
   let s = "";
-  for (; t instanceof he; )
+  for (; t instanceof fe; )
     s = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${s}`, t = t.array;
   const { name: n, schemaName: i } = _e(t);
   return i.length > 1 && new B(
@@ -3184,29 +3184,29 @@ function $n(t) {
 function Wn(t) {
   var e, s, n;
   if (t) {
-    if (K(t))
+    if (W(t))
       return {
-        value: J(t).unwrap(),
+        value: Y(t).unwrap(),
         type: "string"
       };
-    if (fe(t))
+    if (le(t))
       return {
         type: "number",
         value: Number.parseFloat(t.expression.literal.value)
       };
-    if (be(t))
+    if (pe(t))
       return {
         value: t.expression.variable.value.toLowerCase(),
         type: "boolean"
       };
-    if (t instanceof Y && wt.includes((e = t.op) == null ? void 0 : e.value) && fe(t.expression)) {
+    if (t instanceof Q && vt.includes((e = t.op) == null ? void 0 : e.value) && le(t.expression)) {
       const i = Number.parseFloat(t.expression.expression.literal.value);
       return {
         value: ((s = t.op) == null ? void 0 : s.value) === "-" ? 0 - i : i,
         type: "number"
       };
     }
-    if (t instanceof Z)
+    if (t instanceof K)
       return {
         value: (n = t.value) == null ? void 0 : n.value,
         type: "expression"
@@ -3223,7 +3223,7 @@ class Pt {
     this.tableGroup.token = x(this.declarationNode), this.env.tableGroups.set(this.declarationNode, this.tableGroup);
     const { name: s, schemaName: n } = _e(this.declarationNode.name);
     return n.length >= 2 && (this.tableGroup.name = s, this.tableGroup.schemaName = n.join("."), e.push(new u(o.UNSUPPORTED, "Nested schema is not supported", this.declarationNode.name))), this.tableGroup.name = s, this.tableGroup.schemaName = n[0] || null, this.tableGroup.tables = this.declarationNode.body.body.map((i) => {
-      const r = $(i.callee).unwrap();
+      const r = j(i.callee).unwrap();
       return r.length > 2 && e.push(new u(o.UNSUPPORTED, "Nested schema is not supported", i)), {
         name: r.pop(),
         schemaName: r.join(".")
@@ -3246,10 +3246,10 @@ class Ut {
     return e.body.flatMap((s) => {
       var l;
       const n = s, i = {};
-      i.token = x(n), i.name = W(n.callee).unwrap();
-      const a = (l = j(n.args[0]).getValue().note) == null ? void 0 : l.at(0);
+      i.token = x(n), i.name = C(n.callee).unwrap();
+      const a = (l = z(n.args[0]).getValue().note) == null ? void 0 : l.at(0);
       return i.note = a && {
-        value: ce(J(a.value).unwrap()),
+        value: ue(Y(a.value).unwrap()),
         token: x(a)
       }, this.enum.values.push(i), [];
     });
@@ -3291,11 +3291,11 @@ class jn {
         }
         case "note":
           return this.project.note = {
-            value: ce(J(n.body instanceof ee ? n.body.body[0].callee : n.body.callee).unwrap()),
+            value: ue(Y(n.body instanceof ee ? n.body.body[0].callee : n.body.callee).unwrap()),
             token: x(n)
           }, [];
         default:
-          return this.project[n.type.value.toLowerCase()] = J(n.body.callee).unwrap(), [];
+          return this.project[n.type.value.toLowerCase()] = Y(n.body.callee).unwrap(), [];
       }
     });
   }
@@ -3315,7 +3315,7 @@ class Yn {
   }
   interpret() {
     const e = this.ast.body.flatMap((s) => {
-      switch (de(s).unwrap_or(void 0)) {
+      switch (Ee(s).unwrap_or(void 0)) {
         case I.Table:
           return new Rt(s, this.env).interpret();
         case I.Ref:
@@ -3344,7 +3344,7 @@ function zn(t) {
     project: Array.from(t.project.values())[0] || {}
   };
 }
-var g = /* @__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))(g || {}), v = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(v || {});
+var g = /* @__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))(g || {}), w = /* @__PURE__ */ ((t) => (t[t.None = 0] = "None", t[t.KeepWhitespace = 1] = "KeepWhitespace", t[t.InsertAsSnippet = 4] = "InsertAsSnippet", t))(w || {});
 function Le(t) {
   switch (t) {
     case m.Schema:
@@ -3413,18 +3413,18 @@ class Mt {
       ...(r == null ? void 0 : r.trailingTrivia) || [],
       ...(r == null ? void 0 : r.leadingTrivia) || [],
       ...(l == null ? void 0 : l.leadingTrivia) || []
-    ].find((N) => $t(N) && Te(n, N)))
+    ].find((N) => $t(N) && be(n, N)))
       return S();
     if (a === void 0)
       return Tt();
-    if ([c.STRING_LITERAL, c.QUOTED_STRING].includes(r.kind) && Te(n, r))
+    if ([c.STRING_LITERAL, c.QUOTED_STRING].includes(r.kind) && be(n, r))
       return S();
     const p = this.compiler.container.element(n);
     if (this.compiler.container.scopeKind(n) === O.TOPLEVEL || p instanceof _ && p.type && p.type.start <= n && p.type.end >= n)
       return Tt();
     const h = [...this.compiler.container.stack(n)].reverse();
     for (const N of h)
-      if (N instanceof Y)
+      if (N instanceof Q)
         switch ((T = N.op) == null ? void 0 : T.value) {
           case ">":
           case "<":
@@ -3436,7 +3436,7 @@ class Mt {
               N
             );
         }
-      else if (N instanceof z)
+      else if (N instanceof q)
         switch ((f = N.op) == null ? void 0 : f.value) {
           case ">":
           case "<":
@@ -3459,11 +3459,11 @@ class Mt {
           return Et(this.compiler, n, N);
         if (N instanceof U)
           return Et(this.compiler, n, N);
-        if (N instanceof q)
+        if (N instanceof J)
           return Qn(this.compiler, n);
         if (N instanceof y)
           return mt(this.compiler, n, N);
-        if (N instanceof _ && (N.bodyColon && n >= N.bodyColon.end || N.body && Te(n, N.body)))
+        if (N instanceof _ && (N.bodyColon && n >= N.bodyColon.end || N.body && be(n, N.body)))
           return mt(this.compiler, n, void 0);
       }
     return S();
@@ -3494,7 +3494,7 @@ function Ue(t, e, s, n) {
         ...t.symbol.members(l).filter(({ kind: p }) => n.includes(p)).map(({ name: p, kind: h }) => ({
           label: p,
           insertText: p,
-          insertTextRules: v.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           kind: Le(h),
           sortText: Le(h).toString().padStart(2, "0"),
           range: void 0
@@ -3515,7 +3515,7 @@ function Qn(t, e) {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
           const r = i.pop();
-          if (r instanceof z && ((n = r.op) == null ? void 0 : n.value) === ".")
+          if (r instanceof q && ((n = r.op) == null ? void 0 : n.value) === ".")
             return Ft(
               t,
               e,
@@ -3547,9 +3547,9 @@ function Et(t, e, s) {
 }
 function Nt(t, e) {
   const s = t.container.element(e), n = t.container.scopeKind(e);
-  if (s instanceof C)
+  if (s instanceof X)
     return S();
-  if (s.body && !Te(e, s.body))
+  if (s.body && !be(e, s.body))
     switch (n) {
       case O.TABLE:
         return {
@@ -3558,14 +3558,14 @@ function Nt(t, e) {
               label: "headercolor",
               insertText: "headercolor: ",
               kind: g.Field,
-              insertTextRules: v.KeepWhitespace,
+              insertTextRules: w.KeepWhitespace,
               range: void 0
             },
             {
               label: "note",
               insertText: "note: ",
               kind: g.Field,
-              insertTextRules: v.KeepWhitespace,
+              insertTextRules: w.KeepWhitespace,
               range: void 0
             }
           ]
@@ -3581,21 +3581,21 @@ function Nt(t, e) {
             label: i,
             insertText: i,
             kind: g.Property,
-            insertTextRules: v.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           })),
           ...["ref", "default"].map((i) => ({
             label: i,
             insertText: `${i}: `,
             kind: g.Property,
-            insertTextRules: v.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           })),
           {
             label: "note",
             insertText: "note: ",
             kind: g.Property,
-            insertTextRules: v.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }
         ]
@@ -3607,7 +3607,7 @@ function Nt(t, e) {
             label: "note",
             insertText: "note: ",
             kind: g.Property,
-            insertTextRules: v.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }
         ]
@@ -3618,7 +3618,7 @@ function Nt(t, e) {
           ...["unique", "pk"].map((i) => ({
             label: i,
             insertText: i,
-            insertTextRules: v.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             kind: g.Property,
             range: void 0
           })),
@@ -3626,7 +3626,7 @@ function Nt(t, e) {
             label: i,
             insertText: `${i}: `,
             kind: g.Property,
-            insertTextRules: v.KeepWhitespace,
+            insertTextRules: w.KeepWhitespace,
             range: void 0
           }))
         ]
@@ -3637,7 +3637,7 @@ function Nt(t, e) {
           label: i,
           insertText: `${i}: `,
           kind: g.Property,
-          insertTextRules: v.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
@@ -3653,7 +3653,7 @@ function qn(t, e, s) {
           label: n,
           insertText: n,
           kind: g.Value,
-          insertTextRules: v.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
@@ -3663,7 +3663,7 @@ function qn(t, e, s) {
           label: n,
           insertText: `${n}`,
           kind: g.Value,
-          insertTextRules: v.KeepWhitespace,
+          insertTextRules: w.KeepWhitespace,
           range: void 0
         }))
       };
@@ -3671,10 +3671,10 @@ function qn(t, e, s) {
   return S();
 }
 function Ft(t, e, s) {
-  const n = Ee(s).unwrap_or([]);
+  const n = Ne(s).unwrap_or([]);
   if (n.pop(), n.some((r) => !M(r)))
     return S();
-  const i = n.map((r) => W(r).unwrap());
+  const i = n.map((r) => C(r).unwrap());
   return Pe({
     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,
@@ -3710,7 +3710,7 @@ function Tt() {
     suggestions: ["Table", "TableGroup", "Enum", "Project", "Ref"].map((t) => ({
       label: t,
       insertText: t,
-      insertTextRules: v.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: g.Keyword,
       range: void 0
     }))
@@ -3729,7 +3729,7 @@ function Jn(t, e, s) {
       suggestions: ["Ref", "Note", "indexes"].map((i) => ({
         label: i,
         insertText: i,
-        insertTextRules: v.KeepWhitespace,
+        insertTextRules: w.KeepWhitespace,
         kind: g.Keyword,
         range: void 0
       }))
@@ -3739,7 +3739,7 @@ function Jn(t, e, s) {
     suggestions: ["Ref", "Note", "indexes"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: v.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: g.Keyword,
       range: void 0
     }))
@@ -3750,7 +3750,7 @@ function Zn(t, e, s) {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: v.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: g.Keyword,
       range: void 0
     }))
@@ -3758,7 +3758,7 @@ function Zn(t, e, s) {
     suggestions: ["Table", "TableGroup", "Enum", "Note", "Ref"].map((i) => ({
       label: i,
       insertText: i,
-      insertTextRules: v.KeepWhitespace,
+      insertTextRules: w.KeepWhitespace,
       kind: g.Keyword,
       range: void 0
     }))
@@ -3781,7 +3781,7 @@ function Kn(t) {
       return n !== m.Table && n !== m.Schema ? [] : {
         label: i,
         insertText: i,
-        insertTextRules: v.KeepWhitespace,
+        insertTextRules: w.KeepWhitespace,
         kind: Le(n),
         range: void 0
       };
@@ -3854,7 +3854,7 @@ function ts(t, e) {
       ].map((s) => ({
         label: s,
         insertText: s,
-        insertTextRules: v.KeepWhitespace,
+        insertTextRules: w.KeepWhitespace,
         kind: g.TypeParameter,
         sortText: g.TypeParameter.toString().padStart(2, "0"),
         range: void 0
@@ -3880,7 +3880,7 @@ function Vt(t, e) {
       return {
         label: l,
         insertText: l,
-        insertTextRules: v.KeepWhitespace,
+        insertTextRules: w.KeepWhitespace,
         kind: Le(m.Column),
         range: void 0
       };
@@ -3902,7 +3902,7 @@ class Gt {
     const { uri: n } = e, i = et(e, s), r = [...this.compiler.container.stack(i)];
     for (; r.length !== 0; ) {
       const l = r.pop();
-      if ((a = l == null ? void 0 : l.referee) != null && a.declaration && [ue.PRIMARY_EXPRESSION, ue.VARIABLE].includes(l == null ? void 0 : l.kind)) {
+      if ((a = l == null ? void 0 : l.referee) != null && a.declaration && [he.PRIMARY_EXPRESSION, he.VARIABLE].includes(l == null ? void 0 : l.kind)) {
         const { startPos: p, endPos: h } = l.referee.declaration;
         return [
           {
@@ -3929,9 +3929,9 @@ class Ct {
     for (; r.length !== 0; ) {
       const a = r.pop();
       if (a && [
-        ue.ELEMENT_DECLARATION,
-        ue.FUNCTION_APPLICATION,
-        ue.PRIMARY_EXPRESSION
+        he.ELEMENT_DECLARATION,
+        he.FUNCTION_APPLICATION,
+        he.PRIMARY_EXPRESSION
       ].includes(a == null ? void 0 : a.kind)) {
         const { symbol: l } = a;
         if (l != null && l.references.length)
@@ -3951,7 +3951,7 @@ class Ct {
 }
 const is = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  CompletionItemInsertTextRule: v,
+  CompletionItemInsertTextRule: w,
   CompletionItemKind: g,
   DBMLCompletionItemProvider: Mt,
   DBMLDefinitionProvider: Gt,
@@ -3966,7 +3966,7 @@ class rs {
     ).fill(null), this.nodeIdGenerator = new Wt(), this.symbolIdGenerator = new Qt(), this.token = {
       invalidStream: this.createQuery(
         6,
-        () => this.parse.tokens().filter(vt)
+        () => this.parse.tokens().filter(wt)
       ),
       // Valid + Invalid tokens (which are guarenteed to be non-trivials) are included in the stream
       flatStream: this.createQuery(
@@ -4016,7 +4016,7 @@ class rs {
           let a = this.parse.ast();
           const l = [a];
           for (; ; ) {
-            const h = sn(a).find((T) => Te(r, T));
+            const h = sn(a).find((T) => be(r, T));
             if (h === void 0 || h instanceof V)
               break;
             l.push(h), a = h;
@@ -4032,7 +4032,7 @@ class rs {
                 T[f] === `
 ` && (l.pop(), p = !0);
             } else
-              h instanceof Y || h instanceof z ? this.container.token(e).token !== h.op && (l.pop(), p = !0) : h instanceof U ? h.listCloseBracket && h.end <= e && (l.pop(), p = !0) : h instanceof q ? h.tupleCloseParen && h.end <= e && (l.pop(), p = !0) : h instanceof ee ? h.blockCloseBrace && h.end <= e && (l.pop(), p = !0) : h instanceof te || h.end < e && (l.pop(), p = !0);
+              h instanceof Q || h instanceof q ? this.container.token(e).token !== h.op && (l.pop(), p = !0) : h instanceof U ? h.listCloseBracket && h.end <= e && (l.pop(), p = !0) : h instanceof J ? h.tupleCloseParen && h.end <= e && (l.pop(), p = !0) : h instanceof ee ? h.blockCloseBrace && h.end <= e && (l.pop(), p = !0) : h instanceof te || h.end < e && (l.pop(), p = !0);
             if (p) {
               const T = L.last(l);
               T instanceof _ && T.end <= e && l.pop();
@@ -4072,7 +4072,7 @@ class rs {
       ),
       scopeKind: this.createQuery(15, (e) => {
         var n;
-        if (this.container.element(e) instanceof C)
+        if (this.container.element(e) instanceof X)
           return 8;
         switch ((n = this.container.element(e).type) == null ? void 0 : n.value.toLowerCase()) {
           case "table":