@dbml/parse 3.4.1 → 3.4.2

package/dist/dbml-parse.mjs

@@ -137,12 +137,12 @@ class se extends x {
     super(i, "<attribute>", [e, n, s]), this.name = e, this.value = s, this.colon = n;
   }
 }
-class q extends x {
+class Q extends x {
   constructor({ op: e, expression: n }, s) {
     super(s, "<prefix-expression>", [e, n]), this.op = e, this.expression = n;
   }
 }
-class H extends x {
+class q extends x {
   constructor({
     op: e,
     leftExpression: n,
@@ -175,7 +175,7 @@ class ne extends x {
     super(i, "<block-expression>", [e, ...n, s]), this.blockOpenBrace = e, this.body = n, this.blockCloseBrace = s;
   }
 }
-class P extends x {
+class D extends x {
   constructor({
     listOpenBracket: e,
     elementList: n = [],
@@ -189,7 +189,7 @@ class P extends x {
     ]), this.listOpenBracket = e, this.elementList = n, this.commaList = s, this.listCloseBracket = i;
   }
 }
-class Z extends x {
+class J extends x {
   constructor({
     tupleOpenParen: e,
     elementList: n = [],
@@ -203,7 +203,7 @@ class Z extends x {
     ]), this.tupleOpenParen = e, this.elementList = n, this.commaList = s, this.tupleCloseParen = i;
   }
 }
-class je extends Z {
+class je extends J {
   constructor({
     groupOpenParen: e,
     expression: n,
@@ -220,7 +220,7 @@ class je extends Z {
     ), this.kind = "<group-expression>";
   }
 }
-class J extends x {
+class H extends x {
   constructor({
     callee: e,
     argumentList: n
@@ -233,12 +233,12 @@ class Te extends x {
     super(n, "<literal>", [e]), this.literal = e;
   }
 }
-class W extends x {
+class Z extends x {
   constructor({ variable: e }, n) {
     super(n, "<variable>", [e]), this.variable = e;
   }
 }
-class D extends x {
+class U extends x {
   constructor({ expression: e }, n) {
     super(n, "<primary-expression>", [e]), this.expression = e;
   }
@@ -503,7 +503,7 @@ function sn(t, e, n) {
   const s = [...e], i = Ge(t).unwrap(), r = s.pop();
   if (!(r instanceof ne))
     return new v();
-  const a = I.last(s) instanceof P ? s.pop() : void 0;
+  const a = I.last(s) instanceof D ? s.pop() : void 0;
   return s.length === 3 && Ge(s[1]).unwrap().value === "as" ? new S(
     n.create(A, {
       type: i,
@@ -544,27 +544,27 @@ function an(t) {
     t.identifiers.forEach(E);
   else if (t instanceof se)
     E(t.name), E(t.colon), E(t.value);
-  else if (t instanceof q)
+  else if (t instanceof Q)
     E(t.op), E(t.expression);
-  else if (t instanceof H)
+  else if (t instanceof q)
     E(t.leftExpression), E(t.op), E(t.rightExpression);
   else if (t instanceof Pe)
     E(t.op), E(t.expression);
   else if (t instanceof ne)
     E(t.blockOpenBrace), t.body.forEach(E), E(t.blockCloseBrace);
-  else if (t instanceof P)
+  else if (t instanceof D)
     E(t.listOpenBracket), t.commaList.forEach(E), t.elementList.forEach(E), E(t.listCloseBracket);
-  else if (t instanceof Z)
-    E(t.tupleOpenParen), t.commaList.forEach(E), t.elementList.forEach(E), E(t.tupleCloseParen);
   else if (t instanceof J)
+    E(t.tupleOpenParen), t.commaList.forEach(E), t.elementList.forEach(E), E(t.tupleCloseParen);
+  else if (t instanceof H)
     E(t.callee), E(t.argumentList);
   else if (t instanceof w)
     E(t.callee), t.args.forEach(E);
-  else if (t instanceof D)
+  else if (t instanceof U)
     E(t.expression);
   else if (t instanceof te)
     E(t.value);
-  else if (t instanceof W)
+  else if (t instanceof Z)
     E(t.variable);
   else if (t instanceof Te)
     E(t.literal);
@@ -574,14 +574,14 @@ function an(t) {
 function vt(t) {
   return !!(t != null && t.isInvalid);
 }
-function U(...t) {
+function P(...t) {
   return t.filter((e) => e !== void 0);
 }
 function on(t) {
   if (t instanceof G)
-    return U(...t.body, t.eof);
+    return P(...t.body, t.eof);
   if (t instanceof A)
-    return U(
+    return P(
       t.type,
       t.name,
       t.as,
@@ -591,43 +591,43 @@ function on(t) {
       t.body
     );
   if (t instanceof se)
-    return U(t.name, t.colon, t.value);
+    return P(t.name, t.colon, t.value);
   if (t instanceof $)
     return t.identifiers;
   if (t instanceof Te)
     return t.literal ? [t.literal] : [];
-  if (t instanceof W)
-    return U(t.variable);
+  if (t instanceof Z)
+    return P(t.variable);
+  if (t instanceof Q)
+    return P(t.op, t.expression);
   if (t instanceof q)
-    return U(t.op, t.expression);
-  if (t instanceof H)
-    return U(t.leftExpression, t.op, t.rightExpression);
+    return P(t.leftExpression, t.op, t.rightExpression);
   if (t instanceof Pe)
-    return U(t.expression, t.op);
+    return P(t.expression, t.op);
   if (t instanceof te)
-    return U(t.value);
+    return P(t.value);
   if (t instanceof w)
-    return U(t.callee, ...t.args);
+    return P(t.callee, ...t.args);
   if (t instanceof ne)
-    return U(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
-  if (t instanceof P)
-    return U(
+    return P(t.blockOpenBrace, ...t.body, t.blockCloseBrace);
+  if (t instanceof D)
+    return P(
       t.listOpenBracket,
       ...ct(t.elementList, t.commaList),
       t.listCloseBracket
     );
-  if (t instanceof Z)
-    return U(
+  if (t instanceof J)
+    return P(
       t.tupleOpenParen,
       ...ct(t.elementList, t.commaList),
       t.tupleCloseParen
     );
-  if (t instanceof J)
-    return U(t.callee, t.argumentList);
-  if (t instanceof D)
-    return U(t.expression);
+  if (t instanceof H)
+    return P(t.callee, t.argumentList);
+  if (t instanceof U)
+    return P(t.expression);
   if (t instanceof le)
-    return U(
+    return P(
       t.array,
       t.indexer
     );
@@ -636,20 +636,20 @@ function on(t) {
 function Ge(t) {
   return M(t) ? new S(t.expression.variable) : new v();
 }
-function Y(t) {
+function W(t) {
   var e;
-  return t instanceof D && (t.expression instanceof W && t.expression.variable instanceof F && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof Te && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
+  return t instanceof U && (t.expression instanceof Z && t.expression.variable instanceof F && t.expression.variable.kind === u.QUOTED_STRING || t.expression instanceof Te && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.STRING_LITERAL);
 }
 function M(t) {
-  return t instanceof D && t.expression instanceof W && t.expression.variable instanceof F;
+  return t instanceof U && t.expression instanceof Z && t.expression.variable instanceof F;
 }
 function Ne(t) {
   var e;
-  return t instanceof D && t.expression instanceof W && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
+  return t instanceof U && t.expression instanceof Z && ((e = t.expression.variable) == null ? void 0 : e.kind) === u.IDENTIFIER;
 }
 function Je(t) {
   var e;
-  return t instanceof H && t.leftExpression instanceof x && t.rightExpression instanceof x && ((e = t.op) == null ? void 0 : e.value) === ".";
+  return t instanceof q && t.leftExpression instanceof x && t.rightExpression instanceof x && ((e = t.op) == null ? void 0 : e.value) === ".";
 }
 function me(t) {
   if (t === void 0)
@@ -1124,7 +1124,7 @@ class hn {
         groupOpenParen: s.tupleOpenParen,
         groupCloseParen: s.tupleCloseParen,
         expression: s.elementList[0]
-      }), r = () => this.nodeFactory.create(Z, s);
+      }), r = () => this.nodeFactory.create(J, s);
       try {
         this.consume("Expect an opening parenthesis '('", u.LPAREN), s.tupleOpenParen = this.previous();
       } catch (a) {
@@ -1172,7 +1172,7 @@ class hn {
         E(s), this.advance();
       }
     }, this.listExpression = this.contextStack.withContextDo(xe.ListExpression, () => {
-      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(P, s);
+      const s = { elementList: [], commaList: [] }, i = () => this.nodeFactory.create(D, s);
       try {
         this.consume("Expect an opening bracket '['", u.LBRACKET), s.listOpenBracket = this.previous();
       } catch (r) {
@@ -1432,12 +1432,12 @@ class hn {
         ot(this.previous(), s) && !this.contextStack.isWithinGroupExpressionContext() && !this.contextStack.isWithinListExpressionContext())
           break;
         try {
-          n = this.nodeFactory.create(J, {
+          n = this.nodeFactory.create(H, {
             callee: n,
             argumentList: this.tupleExpression()
           });
         } catch (r) {
-          throw r instanceof d ? (n = this.nodeFactory.create(J, {
+          throw r instanceof d ? (n = this.nodeFactory.create(H, {
             callee: n,
             argumentList: r.partialNode
           }), new d(r.token, n, r.handlerContext)) : r;
@@ -1471,13 +1471,13 @@ class hn {
             break;
           this.advance();
           try {
-            n = this.nodeFactory.create(H, {
+            n = this.nodeFactory.create(q, {
               leftExpression: n,
               op: i,
               rightExpression: i.value === "." ? this.extractOperand() : this.expression_bp(a.right)
             });
           } catch (c) {
-            throw c instanceof d ? (n = this.nodeFactory.create(H, {
+            throw c instanceof d ? (n = this.nodeFactory.create(q, {
               leftExpression: n,
               op: i,
               rightExpression: c.partialNode
@@ -1511,11 +1511,11 @@ class hn {
       } catch (i) {
         throw i instanceof d ? (n.expression = i.partialNode, new d(
           i.token,
-          this.nodeFactory.create(q, n),
+          this.nodeFactory.create(Q, n),
           i.handlerContext
         )) : i;
       }
-      e = this.nodeFactory.create(q, n);
+      e = this.nodeFactory.create(Q, n);
     } else if (e = this.extractOperand(), e instanceof ke)
       throw new d(
         this.peek(),
@@ -1569,18 +1569,16 @@ class hn {
       u.STRING_LITERAL,
       u.NUMERIC_LITERAL
     ))
-      return this.nodeFactory.create(D, {
+      return this.nodeFactory.create(U, {
         expression: this.nodeFactory.create(Te, { literal: this.previous() })
       });
     if (this.match(u.QUOTED_STRING, u.IDENTIFIER))
-      return this.nodeFactory.create(D, {
-        expression: this.nodeFactory.create(W, { variable: this.previous() })
+      return this.nodeFactory.create(U, {
+        expression: this.nodeFactory.create(Z, { 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(W, {})
-      }),
+      void 0,
       this.contextStack.findHandlerContext(this.tokens, this.current)
     );
   }
@@ -1748,7 +1746,7 @@ function X(t) {
 function Xe(t) {
   if (ht(t))
     return t instanceof te ? new S({ functional: [t], nonFunctional: [] }) : new S({ functional: [], nonFunctional: [t] });
-  if (t instanceof Z && t.elementList.every(ht)) {
+  if (t instanceof J && t.elementList.every(ht)) {
     const e = t.elementList.filter(
       (s) => s instanceof te
     ), n = t.elementList.filter(M);
@@ -1761,12 +1759,12 @@ function V(t) {
   const e = (n = t == null ? void 0 : t.expression.variable) == null ? void 0 : n.value;
   return e === void 0 ? new v() : new S(e);
 }
-function Q(t) {
-  return Y(t) ? t.expression instanceof W ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new v();
+function z(t) {
+  return W(t) ? t.expression instanceof Z ? new S(t.expression.variable.value) : new S(t.expression.literal.value) : new v();
 }
 function mn(t) {
   var e;
-  return !(t instanceof H) || !yt((e = t.op) == null ? void 0 : e.value) ? !1 : _e(t.leftExpression).and_then(() => _e(t.rightExpression)).unwrap_or(void 0) !== void 0;
+  return !(t instanceof q) || !yt((e = t.op) == null ? void 0 : e.value) ? !1 : _e(t.leftExpression).and_then(() => _e(t.rightExpression)).unwrap_or(void 0) !== void 0;
 }
 function Tn(t) {
   const e = _e(t.leftExpression), n = _e(t.rightExpression);
@@ -1776,7 +1774,7 @@ function Tn(t) {
   return (s == null ? void 0 : s.length) === (i == null ? void 0 : i.length);
 }
 function ht(t) {
-  return t instanceof D && t.expression instanceof W || t instanceof te;
+  return t instanceof U && t.expression instanceof Z || t instanceof te;
 }
 function bn(t, e) {
   var i, r, a, c;
@@ -1817,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 Y(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 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;
   }
 }
 class we {
@@ -1879,7 +1877,7 @@ class Ln {
       const s = [];
       n.callee && !M(n.callee) && s.push(new l(o.INVALID_ENUM_ELEMENT_NAME, "An enum field must be an identifier or a quoted identifier", n.callee));
       const i = [...n.args];
-      return I.last(i) instanceof P ? (s.push(...this.validateFieldSettings(I.last(i))), i.pop()) : i[0] instanceof P && (s.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && s.push(...i.map((r) => new l(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", r))), s.push(...this.registerField(n)), s;
+      return I.last(i) instanceof D ? (s.push(...this.validateFieldSettings(I.last(i))), i.pop()) : i[0] instanceof D && (s.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && s.push(...i.map((r) => new l(o.INVALID_ENUM_ELEMENT, "An Enum must have only a field and optionally a setting list", r))), s.push(...this.registerField(n)), s;
     });
   }
   validateFieldSettings(e) {
@@ -1889,7 +1887,7 @@ class Ln {
       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) => {
-            Y(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
+            W(c.value) || s.push(new l(o.INVALID_ENUM_ELEMENT_SETTING, "'note' must be a string", c));
           });
           break;
         default:
@@ -1955,8 +1953,8 @@ class gn {
       if (!n.callee)
         return [];
       const s = [], i = [n.callee, ...n.args];
-      return I.last(i) instanceof P && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
-        for (; r instanceof J; )
+      return I.last(i) instanceof D && s.push(...this.validateFieldSetting(i.pop())), i.forEach((r) => {
+        for (; r instanceof H; )
           r.argumentList && !Xe(r.argumentList).isOk() && s.push(new l(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r.argumentList)), r = r.callee;
         Xe(r).isOk() || s.push(new l(o.INVALID_INDEXES_FIELD, "An index field must be an identifier, a quoted identifier, a functional expression or a tuple of such", r));
       }), s;
@@ -1970,7 +1968,7 @@ class gn {
         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) => {
-            Y(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, c));
+            W(c.value) || s.push(new l(o.INVALID_INDEX_SETTING_VALUE, `'${r}' must be a string`, c));
           });
           break;
         case "unique":
@@ -2036,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))), Y(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))), 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);
   }
   validateSubElements(e) {
     return e.flatMap((n) => {
@@ -2120,7 +2118,7 @@ class vn {
     return e.length > 1 && n.push(...e.slice(1).map((s) => new l(o.REF_REDEFINED, "A Ref can only contain one binary relationship", s))), e.forEach((s) => {
       s.callee && !mn(s.callee) && n.push(new l(o.INVALID_REF_FIELD, "A Ref field must be a binary relationship", s.callee)), s.callee && !Tn(s.callee) && n.push(new l(o.UNEQUAL_FIELDS_BINARY_REF, "Unequal fields in ref endpoints", s.callee));
       const i = [...s.args];
-      I.last(i) instanceof P ? (this.validateFieldSettings(I.last(i)), i.pop()) : i[0] instanceof P && (n.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && n.push(...i.map((r) => new l(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", r)));
+      I.last(i) instanceof D ? (this.validateFieldSettings(I.last(i)), i.pop()) : i[0] instanceof D && (n.push(...this.validateFieldSettings(i[0])), i.shift()), i.length > 0 && n.push(...i.map((r) => new l(o.INVALID_REF_FIELD, "A Ref field should only have a single binary relationship", r)));
     }), n;
   }
   validateFieldSettings(e) {
@@ -2194,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) => {
-            Y(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
+            W(c.value) || s.push(new l(o.INVALID_TABLE_SETTING, "'note' must be a string literal", c.value || c.name));
           });
           break;
         default:
@@ -2253,12 +2251,12 @@ class yn {
   }
   // This is needed to support legacy inline settings
   validateFieldSetting(e) {
-    if (!e.slice(0, -1).every(Ne) || !e.slice(-1).every((p) => Ne(p) || p instanceof P))
+    if (!e.slice(0, -1).every(Ne) || !e.slice(-1).every((p) => Ne(p) || p instanceof D))
       return [...e.map((p) => new l(o.INVALID_COLUMN, "These fields must be some inline settings optionally ended with a setting list", p))];
     if (e.length === 0)
       return [];
     let n;
-    I.last(e) instanceof P && (n = e.pop());
+    I.last(e) instanceof D && (n = e.pop());
     const s = j(n), i = s.getErrors(), r = s.getValue();
     for (const p of e) {
       const h = V(p).unwrap_or("").toLowerCase();
@@ -2275,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) => {
-            Y(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
+            W(f.value) || i.push(new l(o.INVALID_COLUMN_SETTING_VALUE, "'note' must be a quoted string", f.value || f.name));
           });
           break;
         case "ref":
@@ -2340,10 +2338,10 @@ class yn {
   }
 }
 function kn(t) {
-  if (!(t instanceof J || Je(t) || t instanceof D || t instanceof le))
+  if (!(t instanceof H || Je(t) || t instanceof U || t instanceof le))
     return !1;
-  if (t instanceof J) {
-    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ue(n) || Y(n) || Ne(n)))
+  if (t instanceof H) {
+    if (t.callee === void 0 || t.argumentList === void 0 || !t.argumentList.elementList.every((n) => ue(n) || W(n) || Ne(n)))
       return !1;
     t = t.callee;
   }
@@ -2456,7 +2454,7 @@ function On(t) {
   return Me(t);
 }
 function Me(t) {
-  return t instanceof D && t.expression instanceof W;
+  return t instanceof U && t.expression instanceof Z;
 }
 function Ke(t, e, n) {
   var i;
@@ -2482,7 +2480,7 @@ function yt(t) {
 }
 function Rn(t) {
   var n;
-  if (!(t instanceof D) || !(t.expression instanceof Te) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
+  if (!(t instanceof U) || !(t.expression instanceof Te) || ((n = t.expression.literal) == null ? void 0 : n.kind) !== u.COLOR_LITERAL)
     return !1;
   const e = t.expression.literal.value;
   if (e.length !== 4 && e.length !== 7 || e[0] !== "#")
@@ -2497,21 +2495,21 @@ function ce(t) {
 }
 function Dn(t) {
   var e;
-  return !!(Y(t) || ue(t) || Ne(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof q && wt.includes((e = t.op) == null ? void 0 : e.value) && ue(t.expression) || t instanceof te);
+  return !!(W(t) || ue(t) || Ne(t) && ["true", "false", "null"].includes(t.expression.variable.value.toLowerCase()) || t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && ue(t.expression) || t instanceof te);
 }
 function ue(t) {
   var e;
-  return t instanceof D && t.expression instanceof Te && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
+  return t instanceof U && t.expression instanceof Te && ((e = t.expression.literal) == null ? void 0 : e.kind) === u.NUMERIC_LITERAL;
 }
 function Pn(t) {
   var n;
-  if (!(t instanceof q) || !yt((n = t.op) == null ? void 0 : n.value))
+  if (!(t instanceof Q) || !yt((n = t.op) == null ? void 0 : n.value))
     return !1;
   const e = C(t.expression).unwrap_or(void 0);
   return e !== void 0 && e.length > 0;
 }
 function kt(t) {
-  return t instanceof Z && t.elementList.every(M);
+  return t instanceof J && t.elementList.every(M);
 }
 function j(t) {
   var s;
@@ -2521,7 +2519,7 @@ function j(t) {
   for (const i of t.elementList) {
     if (!i.name)
       continue;
-    if (i.name instanceof D) {
+    if (i.name instanceof U) {
       n.push(new l(o.INVALID_SETTINGS, "A setting name must be a stream of identifiers", i.name));
       continue;
     }
@@ -2562,7 +2560,7 @@ class ae {
   bindSettingList(e, n) {
     if (e)
       for (const s of e.elementList) {
-        if (s.name instanceof D)
+        if (s.name instanceof U)
           continue;
         const i = me(s.name).unwrap_or(void 0);
         if (!i)
@@ -2590,7 +2588,7 @@ class ae {
   }
   bindSubfield(e) {
     const n = [e.callee, ...e.args], s = I.last(n);
-    s instanceof P && (n.pop(), this.bindSettingList(s, this.subfield.settingList));
+    s instanceof D && (n.pop(), this.bindSettingList(s, this.subfield.settingList));
     const { argBinderRules: i } = this.subfield.arg;
     for (let r = 0; r < Math.min(n.length, i.length); r += 1)
       i[r].shouldBind && this.scanAndBind(n[r], i[r]);
@@ -2599,12 +2597,12 @@ class ae {
   scanAndBind(e, n) {
     var s, i;
     if (e)
-      if (e instanceof D) {
-        if (e.expression instanceof W && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
+      if (e instanceof U) {
+        if (e.expression instanceof Z && ((i = n.keywords) != null && i.includes((s = e.expression.variable) == null ? void 0 : s.value.toLowerCase())))
           return;
         this.bindFragments([e], n);
       } else
-        e instanceof H ? Je(e) ? this.bindFragments(he(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof q ? this.scanAndBind(e.expression, n) : e instanceof Pe ? this.scanAndBind(e.expression, n) : e instanceof Z && e.elementList.forEach((r) => this.scanAndBind(r, n));
+        e instanceof q ? Je(e) ? this.bindFragments(he(e).unwrap_or([]), n) : (this.scanAndBind(e.leftExpression, n), this.scanAndBind(e.rightExpression, n)) : e instanceof Q ? this.scanAndBind(e.expression, n) : e instanceof Pe ? this.scanAndBind(e.expression, n) : e instanceof 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,
@@ -2918,7 +2916,7 @@ function y(t) {
 function $e(t) {
   var n;
   const e = (n = he(t).unwrap_or(void 0)) == null ? void 0 : n.pop();
-  return e instanceof Z ? e.elementList.map((s) => s.referee) : [e.referee];
+  return e instanceof J ? e.elementList.map((s) => s.referee) : [e.referee];
 }
 function be(t) {
   const e = C(t).unwrap();
@@ -2998,7 +2996,7 @@ class Pt {
     this.table.headerColor = (i = n.headercolor) != null && i.length ? Ot((a = (r = n.headercolor) == null ? void 0 : r.at(0)) == null ? void 0 : a.value) : void 0;
     const [s] = n.note || [];
     return this.table.note = s && {
-      value: Q(s == null ? void 0 : s.value).map(Ee).unwrap(),
+      value: z(s == null ? void 0 : s.value).map(Ee).unwrap(),
       token: y(s)
     }, [];
   }
@@ -3012,7 +3010,7 @@ class Pt {
       switch ((s = n.type) == null ? void 0 : s.value.toLowerCase()) {
         case "note":
           return this.table.note = {
-            value: Q(n.body instanceof ne ? n.body.body[0].callee : n.body.callee).map(Ee).unwrap(),
+            value: z(n.body instanceof ne ? n.body.body[0].callee : n.body.callee).map(Ee).unwrap(),
             token: y(n)
           }, [];
         case "indexes":
@@ -3031,20 +3029,20 @@ class Pt {
     const i = Yn(e.args[0]);
     s.type = i.getValue(), n.push(...i.getErrors()), s.token = y(e), s.inline_refs = [];
     const r = e.args.slice(1);
-    if (I.last(r) instanceof P) {
+    if (I.last(r) instanceof D) {
       const _ = j(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 && {
-        value: Q(K.value).map(Ee).unwrap(),
+        value: z(K.value).map(Ee).unwrap(),
         token: y(K)
       };
       const Ie = _.ref || [];
-      s.inline_refs = Ie.flatMap((z) => {
-        const [nt] = $e(z.value.expression);
+      s.inline_refs = Ie.flatMap((Y) => {
+        const [nt] = $e(Y.value.expression);
         if (Dt(nt, e.symbol))
-          return n.push(new l(o.SAME_ENDPOINT, "Two endpoints are the same", z)), [];
-        const ye = z.value.op, ee = C(z.value.expression).unwrap();
+          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();
         let fe;
         if (ee.length === 1) {
           const [oe] = ee;
@@ -3053,7 +3051,7 @@ class Pt {
             tableName: this.table.name,
             fieldNames: [oe],
             relation: ye.value,
-            token: y(z)
+            token: y(Y)
           };
         } else if (ee.length === 2) {
           const [oe, Le] = ee;
@@ -3062,7 +3060,7 @@ class Pt {
             tableName: oe,
             fieldNames: [Le],
             relation: ye.value,
-            token: y(z)
+            token: y(Y)
           };
         } else if (ee.length === 3) {
           const [oe, Le, it] = ee;
@@ -3071,20 +3069,20 @@ class Pt {
             tableName: Le,
             fieldNames: [it],
             relation: ye.value,
-            token: y(z)
+            token: y(Y)
           };
         } else {
-          n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", z));
+          n.push(new l(o.UNSUPPORTED, "Nested schema is not supported", Y));
           const oe = ee.pop(), Le = ee.pop();
           fe = {
             schemaName: ee.join("."),
             tableName: Le,
             fieldNames: [oe],
             relation: ye.value,
-            token: y(z)
+            token: y(Y)
           };
         }
-        const st = this.registerInlineRefToEnv(e, nt, fe, z);
+        const st = this.registerInlineRefToEnv(e, nt, fe, Y);
         return n.push(...st), st.length === 0 ? fe : [];
       });
     }
@@ -3096,20 +3094,20 @@ class Pt {
       const s = { columns: [] }, i = n;
       s.token = y(e);
       const r = [i.callee, ...i.args];
-      if (I.last(r) instanceof P) {
+      if (I.last(r) instanceof D) {
         const g = j(r.pop()).getValue();
-        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((c = g.unique) != null && c.length), s.name = Q((h = (p = g.name) == null ? void 0 : p.at(0)) == null ? void 0 : h.value).unwrap_or(void 0);
+        s.pk = !!((a = g.pk) != null && a.length), s.unique = !!((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 = _ && {
-          value: Q(_.value).unwrap(),
+          value: z(_.value).unwrap(),
           token: y(_)
         }, s.type = X((N = (f = g.type) == null ? void 0 : f.at(0)) == null ? void 0 : N.value).unwrap_or(void 0);
       }
       return r.flatMap((g) => {
-        if (!(g instanceof J))
+        if (!(g instanceof H))
           return g;
         const _ = [];
-        for (; g instanceof J; )
+        for (; g instanceof H; )
           _.push(g.argumentList), g = g.callee;
         return _.push(g), _;
       }).forEach((g) => {
@@ -3157,7 +3155,7 @@ class Pt {
 }
 function Yn(t) {
   let e = null;
-  t instanceof J && (e = t.argumentList.elementList.map((r) => ue(r) ? r.expression.literal.value : Y(r) ? Q(r).unwrap() : X(r).unwrap()).join(","), t = t.callee);
+  t instanceof H && (e = t.argumentList.elementList.map((r) => ue(r) ? r.expression.literal.value : W(r) ? z(r).unwrap() : X(r).unwrap()).join(","), t = t.callee);
   let n = "";
   for (; t instanceof le; )
     n = `[${t.indexer.elementList.map((r) => r.name.expression.literal.value).join(",")}]${n}`, t = t.array;
@@ -3178,9 +3176,9 @@ function Yn(t) {
 function zn(t) {
   var e, n, s;
   if (t) {
-    if (Y(t))
+    if (W(t))
       return {
-        value: Q(t).unwrap(),
+        value: z(t).unwrap(),
         type: "string"
       };
     if (ue(t))
@@ -3193,7 +3191,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) && ue(t.expression)) {
+    if (t instanceof Q && wt.includes((e = t.op) == null ? void 0 : e.value) && ue(t.expression)) {
       const i = Number.parseFloat(t.expression.expression.literal.value);
       return {
         value: ((n = t.op) == null ? void 0 : n.value) === "-" ? 0 - i : i,
@@ -3336,7 +3334,7 @@ class Ft {
       i.token = y(s), i.name = X(s.callee).unwrap();
       const a = (c = j(s.args[0]).getValue().note) == null ? void 0 : c.at(0);
       return i.note = a && {
-        value: Q(a.value).map(Ee).unwrap(),
+        value: z(a.value).map(Ee).unwrap(),
         token: y(a)
       }, this.enum.values.push(i), [];
     });
@@ -3378,11 +3376,11 @@ class qn {
         }
         case "note":
           return this.project.note = {
-            value: Q(s.body instanceof ne ? s.body.body[0].callee : s.body.callee).map(Ee).unwrap(),
+            value: z(s.body instanceof ne ? s.body.body[0].callee : s.body.callee).map(Ee).unwrap(),
             token: y(s)
           }, [];
         default:
-          return this.project[s.type.value.toLowerCase()] = Q(s.body.callee).unwrap(), [];
+          return this.project[s.type.value.toLowerCase()] = z(s.body.callee).unwrap(), [];
       }
     });
   }
@@ -3516,7 +3514,7 @@ class Bt {
       return Tt();
     const h = [...this.compiler.container.stack(s)].reverse();
     for (const N of h)
-      if (N instanceof q)
+      if (N instanceof Q)
         switch ((T = N.op) == null ? void 0 : T.value) {
           case ">":
           case "<":
@@ -3528,7 +3526,7 @@ class Bt {
               N
             );
         }
-      else if (N instanceof H)
+      else if (N instanceof q)
         switch ((f = N.op) == null ? void 0 : f.value) {
           case ">":
           case "<":
@@ -3549,9 +3547,9 @@ class Bt {
       else {
         if (N instanceof se)
           return Et(this.compiler, s, N);
-        if (N instanceof P)
+        if (N instanceof D)
           return Et(this.compiler, s, N);
-        if (N instanceof Z)
+        if (N instanceof J)
           return Zn(this.compiler, s);
         if (N instanceof w)
           return mt(this.compiler, s, N);
@@ -3607,7 +3605,7 @@ function Zn(t, e) {
         const i = [...t.container.stack(e)];
         for (; i.length > 0; ) {
           const r = i.pop();
-          if (r instanceof H && ((s = r.op) == null ? void 0 : s.value) === ".")
+          if (r instanceof q && ((s = r.op) == null ? void 0 : s.value) === ".")
             return Vt(
               t,
               e,
@@ -4124,7 +4122,7 @@ class ls {
                 T[f] === `
 ` && (c.pop(), p = !0);
             } else
-              h instanceof q || h instanceof H ? this.container.token(e).token !== h.op && (c.pop(), p = !0) : h instanceof P ? h.listCloseBracket && h.end <= e && (c.pop(), p = !0) : h instanceof Z ? h.tupleCloseParen && h.end <= e && (c.pop(), p = !0) : h instanceof ne ? h.blockCloseBrace && h.end <= e && (c.pop(), p = !0) : h instanceof $ || h.end < e && (c.pop(), p = !0);
+              h instanceof Q || h instanceof q ? this.container.token(e).token !== h.op && (c.pop(), p = !0) : h instanceof D ? h.listCloseBracket && h.end <= e && (c.pop(), p = !0) : h instanceof J ? h.tupleCloseParen && h.end <= e && (c.pop(), p = !0) : h instanceof ne ? h.blockCloseBrace && h.end <= e && (c.pop(), p = !0) : h instanceof $ || h.end < e && (c.pop(), p = !0);
             if (p) {
               const T = I.last(c);
               T instanceof A && T.end <= e && c.pop();