@malloydata/render 0.0.203-dev241022191525 → 0.0.203-dev241022210817

package/dist/register/register.mjs

@@ -1407,10 +1407,10 @@ var F0 = {}, Ve = {};
     return Q === void 0 ? !1 : Q.by === "name";
   }
   t.isByExpression = X;
-  function ie(Q) {
+  function se(Q) {
     return typeof Q != "string";
   }
-  t.refIsStructDef = ie;
+  t.refIsStructDef = se;
   function oe(Q) {
     return !!((Q.type === "reduce" || Q.type === "project" || Q.type === "partial") && (Q.extendSource && Q.extendSource.some((fe) => fe.type === "error") || Q.queryFields.some((fe) => fe.type === "error")));
   }
@@ -2198,7 +2198,7 @@ var L0 = {}, JQ = {};
     takes: { value: "string" },
     returns: "string",
     impl: { function: "REVERSE" }
-  }, ie = {
+  }, se = {
     to_integer: {
       takes: { value: "number" },
       returns: "number",
@@ -2504,7 +2504,7 @@ var L0 = {}, JQ = {};
     repeat: J,
     replace: ne,
     reverse: X,
-    round: ie,
+    round: se,
     rtrim: oe,
     sign: Ee,
     sin: D,
@@ -6411,12 +6411,12 @@ var Ede = function(e) {
     return ne(ee);
   }
   t.isWeakSet = X;
-  function ie(ee) {
+  function se(ee) {
     return a(ee) === "[object ArrayBuffer]";
   }
-  ie.working = typeof ArrayBuffer < "u" && ie(new ArrayBuffer());
+  se.working = typeof ArrayBuffer < "u" && se(new ArrayBuffer());
   function oe(ee) {
-    return typeof ArrayBuffer > "u" ? !1 : ie.working ? ie(ee) : ee instanceof ArrayBuffer;
+    return typeof ArrayBuffer > "u" ? !1 : se.working ? se(ee) : ee instanceof ArrayBuffer;
   }
   t.isArrayBuffer = oe;
   function Ee(ee) {
@@ -6831,15 +6831,15 @@ var Cde = FO.exports;
   function X(D, k) {
     return Object.prototype.hasOwnProperty.call(D, k);
   }
-  var ie = typeof Symbol < "u" ? Symbol("util.promisify.custom") : void 0;
+  var se = typeof Symbol < "u" ? Symbol("util.promisify.custom") : void 0;
   t.promisify = function(k) {
     if (typeof k != "function")
       throw new TypeError('The "original" argument must be of type Function');
-    if (ie && k[ie]) {
-      var j = k[ie];
+    if (se && k[se]) {
+      var j = k[se];
       if (typeof j != "function")
         throw new TypeError('The "util.promisify.custom" argument must be of type Function');
-      return Object.defineProperty(j, ie, {
+      return Object.defineProperty(j, se, {
         value: j,
         enumerable: !1,
         writable: !1,
@@ -6861,7 +6861,7 @@ var Cde = FO.exports;
       }
       return $;
     }
-    return Object.setPrototypeOf(j, Object.getPrototypeOf(k)), ie && Object.defineProperty(j, ie, {
+    return Object.setPrototypeOf(j, Object.getPrototypeOf(k)), se && Object.defineProperty(j, se, {
       value: j,
       enumerable: !1,
       writable: !1,
@@ -6870,7 +6870,7 @@ var Cde = FO.exports;
       j,
       n(k)
     );
-  }, t.promisify.custom = ie;
+  }, t.promisify.custom = se;
   function oe(D, k) {
     if (!D) {
       var j = new Error("Promise was rejected with a falsy value");
@@ -7080,20 +7080,20 @@ function bde() {
   if (zB)
     return UT;
   zB = 1;
-  function t(X, ie) {
+  function t(X, se) {
     var oe = Object.keys(X);
     if (Object.getOwnPropertySymbols) {
       var Ee = Object.getOwnPropertySymbols(X);
-      ie && (Ee = Ee.filter(function(D) {
+      se && (Ee = Ee.filter(function(D) {
         return Object.getOwnPropertyDescriptor(X, D).enumerable;
       })), oe.push.apply(oe, Ee);
     }
     return oe;
   }
   function e(X) {
-    for (var ie = 1; ie < arguments.length; ie++) {
-      var oe = arguments[ie] != null ? arguments[ie] : {};
-      ie % 2 ? t(Object(oe), !0).forEach(function(Ee) {
+    for (var se = 1; se < arguments.length; se++) {
+      var oe = arguments[se] != null ? arguments[se] : {};
+      se % 2 ? t(Object(oe), !0).forEach(function(Ee) {
         n(X, Ee, oe[Ee]);
       }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(X, Object.getOwnPropertyDescriptors(oe)) : t(Object(oe)).forEach(function(Ee) {
         Object.defineProperty(X, Ee, Object.getOwnPropertyDescriptor(oe, Ee));
@@ -7101,48 +7101,48 @@ function bde() {
     }
     return X;
   }
-  function n(X, ie, oe) {
-    return ie = o(ie), ie in X ? Object.defineProperty(X, ie, { value: oe, enumerable: !0, configurable: !0, writable: !0 }) : X[ie] = oe, X;
+  function n(X, se, oe) {
+    return se = o(se), se in X ? Object.defineProperty(X, se, { value: oe, enumerable: !0, configurable: !0, writable: !0 }) : X[se] = oe, X;
   }
-  function r(X, ie) {
-    if (!(X instanceof ie))
+  function r(X, se) {
+    if (!(X instanceof se))
       throw new TypeError("Cannot call a class as a function");
   }
-  function i(X, ie) {
-    for (var oe = 0; oe < ie.length; oe++) {
-      var Ee = ie[oe];
+  function i(X, se) {
+    for (var oe = 0; oe < se.length; oe++) {
+      var Ee = se[oe];
       Ee.enumerable = Ee.enumerable || !1, Ee.configurable = !0, "value" in Ee && (Ee.writable = !0), Object.defineProperty(X, o(Ee.key), Ee);
     }
   }
-  function s(X, ie, oe) {
-    return ie && i(X.prototype, ie), oe && i(X, oe), Object.defineProperty(X, "prototype", { writable: !1 }), X;
+  function s(X, se, oe) {
+    return se && i(X.prototype, se), oe && i(X, oe), Object.defineProperty(X, "prototype", { writable: !1 }), X;
   }
   function o(X) {
-    var ie = u(X, "string");
-    return E(ie) === "symbol" ? ie : String(ie);
+    var se = u(X, "string");
+    return E(se) === "symbol" ? se : String(se);
   }
-  function u(X, ie) {
+  function u(X, se) {
     if (E(X) !== "object" || X === null)
       return X;
     var oe = X[Symbol.toPrimitive];
     if (oe !== void 0) {
-      var Ee = oe.call(X, ie || "default");
+      var Ee = oe.call(X, se || "default");
       if (E(Ee) !== "object")
         return Ee;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
-    return (ie === "string" ? String : Number)(X);
+    return (se === "string" ? String : Number)(X);
   }
-  function a(X, ie) {
-    if (typeof ie != "function" && ie !== null)
+  function a(X, se) {
+    if (typeof se != "function" && se !== null)
       throw new TypeError("Super expression must either be null or a function");
-    X.prototype = Object.create(ie && ie.prototype, { constructor: { value: X, writable: !0, configurable: !0 } }), Object.defineProperty(X, "prototype", { writable: !1 }), ie && g(X, ie);
+    X.prototype = Object.create(se && se.prototype, { constructor: { value: X, writable: !0, configurable: !0 } }), Object.defineProperty(X, "prototype", { writable: !1 }), se && g(X, se);
   }
   function l(X) {
-    var ie = p();
+    var se = p();
     return function() {
       var Ee = y(X), D;
-      if (ie) {
+      if (se) {
         var k = y(this).constructor;
         D = Reflect.construct(Ee, arguments, k);
       } else
@@ -7150,10 +7150,10 @@ function bde() {
       return c(this, D);
     };
   }
-  function c(X, ie) {
-    if (ie && (E(ie) === "object" || typeof ie == "function"))
-      return ie;
-    if (ie !== void 0)
+  function c(X, se) {
+    if (se && (E(se) === "object" || typeof se == "function"))
+      return se;
+    if (se !== void 0)
       throw new TypeError("Derived constructors may only return object or undefined");
     return f(X);
   }
@@ -7163,16 +7163,16 @@ function bde() {
     return X;
   }
   function x(X) {
-    var ie = typeof Map == "function" ? /* @__PURE__ */ new Map() : void 0;
+    var se = typeof Map == "function" ? /* @__PURE__ */ new Map() : void 0;
     return x = function(Ee) {
       if (Ee === null || !m(Ee))
         return Ee;
       if (typeof Ee != "function")
         throw new TypeError("Super expression must either be null or a function");
-      if (typeof ie < "u") {
-        if (ie.has(Ee))
-          return ie.get(Ee);
-        ie.set(Ee, D);
+      if (typeof se < "u") {
+        if (se.has(Ee))
+          return se.get(Ee);
+        se.set(Ee, D);
       }
       function D() {
         return h(Ee, arguments, y(this).constructor);
@@ -7180,7 +7180,7 @@ function bde() {
       return D.prototype = Object.create(Ee.prototype, { constructor: { value: D, enumerable: !1, writable: !0, configurable: !0 } }), g(D, Ee);
     }, x(X);
   }
-  function h(X, ie, oe) {
+  function h(X, se, oe) {
     return p() ? h = Reflect.construct.bind() : h = function(D, k, j) {
       var V = [null];
       V.push.apply(V, k);
@@ -7203,10 +7203,10 @@ function bde() {
   function m(X) {
     return Function.toString.call(X).indexOf("[native code]") !== -1;
   }
-  function g(X, ie) {
+  function g(X, se) {
     return g = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function(Ee, D) {
       return Ee.__proto__ = D, Ee;
-    }, g(X, ie);
+    }, g(X, se);
   }
   function y(X) {
     return y = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function(oe) {
@@ -7215,22 +7215,22 @@ function bde() {
   }
   function E(X) {
     "@babel/helpers - typeof";
-    return E = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(ie) {
-      return typeof ie;
-    } : function(ie) {
-      return ie && typeof Symbol == "function" && ie.constructor === Symbol && ie !== Symbol.prototype ? "symbol" : typeof ie;
+    return E = typeof Symbol == "function" && typeof Symbol.iterator == "symbol" ? function(se) {
+      return typeof se;
+    } : function(se) {
+      return se && typeof Symbol == "function" && se.constructor === Symbol && se !== Symbol.prototype ? "symbol" : typeof se;
     }, E(X);
   }
   var A = u0, v = A.inspect, _ = SG(), S = _.codes.ERR_INVALID_ARG_TYPE;
-  function C(X, ie, oe) {
-    return (oe === void 0 || oe > X.length) && (oe = X.length), X.substring(oe - ie.length, oe) === ie;
+  function C(X, se, oe) {
+    return (oe === void 0 || oe > X.length) && (oe = X.length), X.substring(oe - se.length, oe) === se;
   }
-  function b(X, ie) {
-    if (ie = Math.floor(ie), X.length == 0 || ie == 0)
+  function b(X, se) {
+    if (se = Math.floor(se), X.length == 0 || se == 0)
       return "";
-    var oe = X.length * ie;
-    for (ie = Math.floor(Math.log(ie) / Math.log(2)); ie; )
-      X += X, ie--;
+    var oe = X.length * se;
+    for (se = Math.floor(Math.log(se) / Math.log(2)); se; )
+      X += X, se--;
     return X += X.substring(0, oe - X.length), X;
   }
   var R = "", O = "", L = "", M = "", H = {
@@ -7247,8 +7247,8 @@ function bde() {
     notIdentical: "Values identical but not reference-equal:"
   }, W = 10;
   function G(X) {
-    var ie = Object.keys(X), oe = Object.create(Object.getPrototypeOf(X));
-    return ie.forEach(function(Ee) {
+    var se = Object.keys(X), oe = Object.create(Object.getPrototypeOf(X));
+    return se.forEach(function(Ee) {
       oe[Ee] = X[Ee];
     }), Object.defineProperty(oe, "message", {
       value: X.message
@@ -7275,14 +7275,14 @@ function bde() {
       getters: !0
     });
   }
-  function J(X, ie, oe) {
+  function J(X, se, oe) {
     var Ee = "", D = "", k = 0, j = "", V = !1, U = K(X), $ = U.split(`
-`), T = K(ie).split(`
+`), T = K(se).split(`
 `), N = 0, B = "";
-    if (oe === "strictEqual" && E(X) === "object" && E(ie) === "object" && X !== null && ie !== null && (oe = "strictEqualObject"), $.length === 1 && T.length === 1 && $[0] !== T[0]) {
+    if (oe === "strictEqual" && E(X) === "object" && E(se) === "object" && X !== null && se !== null && (oe = "strictEqualObject"), $.length === 1 && T.length === 1 && $[0] !== T[0]) {
       var q = $[0].length + T[0].length;
       if (q <= W) {
-        if ((E(X) !== "object" || X === null) && (E(ie) !== "object" || ie === null) && (X !== 0 || ie !== 0))
+        if ((E(X) !== "object" || X === null) && (E(se) !== "object" || se === null) && (X !== 0 || se !== 0))
           return "".concat(H[oe], `
 
 `) + "".concat($[0], " !== ").concat(T[0], `
@@ -7351,7 +7351,7 @@ function bde() {
     return "".concat(ee).concat(V ? xe : "", `
 `).concat(D).concat(Ee).concat(j).concat(B);
   }
-  var ne = /* @__PURE__ */ function(X, ie) {
+  var ne = /* @__PURE__ */ function(X, se) {
     a(Ee, X);
     var oe = l(Ee);
     function Ee(D) {
@@ -7399,7 +7399,7 @@ should equal
         return "".concat(this.name, " [").concat(this.code, "]: ").concat(this.message);
       }
     }, {
-      key: ie,
+      key: se,
       value: function(k, j) {
         return v(this, e(e({}, j), {}, {
           customInspect: !1,
@@ -7774,7 +7774,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
       }
     return be < je ? -1 : je < be ? 1 : 0;
   }
-  var ie = !0, oe = !1, Ee = 0, D = 1, k = 2, j = 3;
+  var se = !0, oe = !1, Ee = 0, D = 1, k = 2, j = 3;
   function V(re, ce) {
     return u ? re.source === ce.source && re.flags === ce.flags : RegExp.prototype.toString.call(re) === RegExp.prototype.toString.call(ce);
   }
@@ -8036,7 +8036,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     return B(re, ce, oe);
   }
   function mt(re, ce) {
-    return B(re, ce, ie);
+    return B(re, ce, se);
   }
   return XT = {
     isDeepEqual: rt,
@@ -8279,7 +8279,7 @@ function di() {
     }
     return $.prototype !== void 0 && U instanceof $ ? !0 : Error.isPrototypeOf($) ? !1 : $.call({}, U) === !0;
   }
-  function ie(U) {
+  function se(U) {
     if (typeof U != "function")
       throw new l("fn", "Function", U);
     try {
@@ -8357,7 +8357,7 @@ function di() {
   O.throws = function U($) {
     for (var T = arguments.length, N = new Array(T > 1 ? T - 1 : 0), B = 1; B < T; B++)
       N[B - 1] = arguments[B];
-    D.apply(void 0, [U, ie($)].concat(N));
+    D.apply(void 0, [U, se($)].concat(N));
   }, O.rejects = function U($) {
     for (var T = arguments.length, N = new Array(T > 1 ? T - 1 : 0), B = 1; B < T; B++)
       N[B - 1] = arguments[B];
@@ -8367,7 +8367,7 @@ function di() {
   }, O.doesNotThrow = function U($) {
     for (var T = arguments.length, N = new Array(T > 1 ? T - 1 : 0), B = 1; B < T; B++)
       N[B - 1] = arguments[B];
-    k.apply(void 0, [U, ie($)].concat(N));
+    k.apply(void 0, [U, se($)].concat(N));
   }, O.doesNotReject = function U($) {
     for (var T = arguments.length, N = new Array(T > 1 ? T - 1 : 0), B = 1; B < T; B++)
       N[B - 1] = arguments[B];
@@ -15925,7 +15925,7 @@ function Gh() {
     };
   };
   Object.defineProperty(cp, "__esModule", { value: !0 }), cp.ParserATNSimulator = void 0;
-  const n = Cm, r = Nm, i = Fo, s = $4, o = Bo(), u = Yf, a = vm(), l = k4(), c = cr, f = Im, x = Io, h = Z4, p = qu, m = B4(), g = Ph, y = lr, E = il, A = Ae, v = uw(), _ = jm(), S = As, C = Zs(), b = Lo(), R = tw(), O = oW, L = U0, M = Uh, H = Kf, W = ow(), G = uW(), K = Gt, J = vs, ne = di(), X = 65535, ie = -(1 << 31 >>> 0);
+  const n = Cm, r = Nm, i = Fo, s = $4, o = Bo(), u = Yf, a = vm(), l = k4(), c = cr, f = Im, x = Io, h = Z4, p = qu, m = B4(), g = Ph, y = lr, E = il, A = Ae, v = uw(), _ = jm(), S = As, C = Zs(), b = Lo(), R = tw(), O = oW, L = U0, M = Uh, H = Kf, W = ow(), G = uW(), K = Gt, J = vs, ne = di(), X = 65535, se = -(1 << 31 >>> 0);
   let oe = class at extends l.ATNSimulator {
     constructor(D, k) {
       super(D), this.predictionMode = O.PredictionMode.LL, this.force_global_context = !1, this.always_try_local_context = !0, this.enable_global_context_dfa = !1, this.optimize_unique_closure = !0, this.optimize_ll1 = !0, this.optimize_tail_calls = !0, this.tail_call_preserves_sll = !0, this.treat_sllk1_conflict_as_ambiguity = !1, this.reportAmbiguities = !1, this.userWantsCtxSensitive = !0, this._parser = k;
@@ -16569,7 +16569,7 @@ function Gh() {
           let I = D.context.hasEmpty, z = D.context.size - (I ? 1 : 0);
           for (let P = 0; P < z; P++) {
             let Z = D.context.getParent(P), he = this.atn.states[D.context.getReturnState(P)], ue = u.ATNConfig.create(he, D.alt, Z, D.semanticContext);
-            ue.outerContextDepth = D.outerContextDepth, ue.isPrecedenceFilterSuppressed = D.isPrecedenceFilterSuppressed, ne(N > ie), this.closureImpl(ue, k, j, V, U, $, T, N - 1, B);
+            ue.outerContextDepth = D.outerContextDepth, ue.isPrecedenceFilterSuppressed = D.isPrecedenceFilterSuppressed, ne(N > se), this.closureImpl(ue, k, j, V, U, $, T, N - 1, B);
           }
           if (!I || !$)
             return;
@@ -16598,7 +16598,7 @@ function Gh() {
           if (D.state instanceof L.RuleStopState) {
             if (this.dfa != null && this.dfa.isPrecedenceDfa && z.outermostPrecedenceReturn === this.dfa.atnStartState.ruleIndex && (Z.isPrecedenceFilterSuppressed = !0), Z.outerContextDepth = Z.outerContextDepth + 1, !V.add(Z))
               continue;
-            ne(he > ie), he--, at.debug && console.log("dips into outer ctx: " + Z);
+            ne(he > se), he--, at.debug && console.log("dips into outer ctx: " + Z);
           } else if (z instanceof M.RuleTransition)
             this.optimize_tail_calls && z.optimizedTailCall && (!this.tail_call_preserves_sll || !b.PredictionContext.isEmptyLocal(D.context)) ? (ne(Z.context === D.context), he === 0 && (he--, !this.tail_call_preserves_sll && b.PredictionContext.isEmptyLocal(D.context) && (Z.outerContextDepth = Z.outerContextDepth + 1))) : he >= 0 && he++;
           else if (!z.isEpsilon && !V.add(Z))
@@ -17411,7 +17411,7 @@ function Wh() {
     };
   };
   Object.defineProperty(ap, "__esModule", { value: !0 }), ap.ATNDeserializer = void 0;
-  const n = Nm, r = Fo, i = Bo(), s = wm, o = cr, u = Im, a = Q4, l = Rm, c = Io, f = G4, x = nx, h = qu, p = jG(), m = W4, g = tx(), y = Tm, E = V4, A = Y4, v = K4, _ = JG, S = ZG, C = X4, b = eW, R = J4, O = Mm, L = Ae, M = uw(), H = Gh(), W = e_, G = t_, K = n_, J = zm, ne = r_, X = i_, ie = U0, oe = Uh, Ee = ow(), D = s_, k = o_, j = Mh, V = Gt, U = u_, $ = a_, T = Dm;
+  const n = Nm, r = Fo, i = Bo(), s = wm, o = cr, u = Im, a = Q4, l = Rm, c = Io, f = G4, x = nx, h = qu, p = jG(), m = W4, g = tx(), y = Tm, E = V4, A = Y4, v = K4, _ = JG, S = ZG, C = X4, b = eW, R = J4, O = Mm, L = Ae, M = uw(), H = Gh(), W = e_, G = t_, K = n_, J = zm, ne = r_, X = i_, se = U0, oe = Uh, Ee = ow(), D = s_, k = o_, j = Mh, V = Gt, U = u_, $ = a_, T = Dm;
   var N;
   (function(q) {
     q[q.UNICODE_BMP = 0] = "UNICODE_BMP", q[q.UNICODE_SMP = 1] = "UNICODE_SMP";
@@ -17512,7 +17512,7 @@ function Wh() {
       }
       xe.ruleToStopState = new Array(je);
       for (let Y of xe.states)
-        Y instanceof ie.RuleStopState && (xe.ruleToStopState[Y.ruleIndex] = Y, xe.ruleToStartState[Y.ruleIndex].stopState = Y);
+        Y instanceof se.RuleStopState && (xe.ruleToStopState[Y.ruleIndex] = Y, xe.ruleToStartState[Y.ruleIndex].stopState = Y);
       let Pe = He.toInt(I[z++]);
       for (let Y = 0; Y < Pe; Y++) {
         let de = He.toInt(I[z++]);
@@ -17626,7 +17626,7 @@ function Wh() {
               if (nt.ruleIndex !== Y || !(nt instanceof j.StarLoopEntryState))
                 continue;
               let Kn = nt.transition(nt.numberOfTransitions - 1).target;
-              if (Kn instanceof O.LoopEndState && Kn.epsilonOnlyTransitions && Kn.transition(0).target instanceof ie.RuleStopState) {
+              if (Kn instanceof O.LoopEndState && Kn.epsilonOnlyTransitions && Kn.transition(0).target instanceof se.RuleStopState) {
                 qe = nt;
                 break;
               }
@@ -17691,7 +17691,7 @@ function Wh() {
       for (let P of I.states)
         if (P instanceof j.StarLoopEntryState && I.ruleToStartState[P.ruleIndex].isPrecedenceRule) {
           let Z = P.transition(P.numberOfTransitions - 1).target;
-          Z instanceof O.LoopEndState && Z.epsilonOnlyTransitions && Z.transition(0).target instanceof ie.RuleStopState && (z.set(P.ruleIndex, P), P.precedenceRuleDecision = !0, P.precedenceLoopbackStates = new c.BitSet(I.states.length));
+          Z instanceof O.LoopEndState && Z.epsilonOnlyTransitions && Z.transition(0).target instanceof se.RuleStopState && (z.set(P.ruleIndex, P), P.precedenceRuleDecision = !0, P.precedenceLoopbackStates = new c.BitSet(I.states.length));
         }
       for (let P of z)
         for (let Z of I.ruleToStopState[P[0]].getTransitions())
@@ -17713,7 +17713,7 @@ function Wh() {
             let P = z;
             this.checkCondition(P.numberOfTransitions <= 1 || P.decision >= 0);
           } else
-            this.checkCondition(z.numberOfTransitions <= 1 || z instanceof ie.RuleStopState);
+            this.checkCondition(z.numberOfTransitions <= 1 || z instanceof se.RuleStopState);
         }
     }
     checkCondition(I, z) {
@@ -17729,7 +17729,7 @@ function Wh() {
         if (ue.numberOfOptimizedTransitions !== 1)
           continue;
         let ee = ue.getOptimizedTransition(0), xe = ee.target;
-        if (!(ee.isEpsilon || !xe.onlyHasEpsilonTransitions || xe.numberOfOptimizedTransitions !== 1 || !(xe.getOptimizedTransition(0).target instanceof ie.RuleStopState)))
+        if (!(ee.isEpsilon || !xe.onlyHasEpsilonTransitions || xe.numberOfOptimizedTransitions !== 1 || !(xe.getOptimizedTransition(0).target instanceof se.RuleStopState)))
           switch (ee.serializationType) {
             case 5:
             case 2:
@@ -17792,7 +17792,7 @@ function Wh() {
     static combineChainedEpsilons(I) {
       let z = 0;
       for (let P of I.states) {
-        if (!P.onlyHasEpsilonTransitions || P instanceof ie.RuleStopState)
+        if (!P.onlyHasEpsilonTransitions || P instanceof se.RuleStopState)
           continue;
         let Z;
         e:
@@ -17893,7 +17893,7 @@ function Wh() {
         let ue = he.pop();
         if (!ue)
           break;
-        if (Z.get(ue.stateNumber) || ue instanceof ie.RuleStopState)
+        if (Z.get(ue.stateNumber) || ue instanceof se.RuleStopState)
           continue;
         if (!ue.onlyHasEpsilonTransitions)
           return !1;
@@ -17967,7 +17967,7 @@ function Wh() {
           P = new U.TokensStartState();
           break;
         case o.ATNStateType.RULE_STOP:
-          P = new ie.RuleStopState();
+          P = new se.RuleStopState();
           break;
         case o.ATNStateType.BLOCK_END:
           P = new f.BlockEndState();
@@ -21540,8 +21540,8 @@ function Mpe() {
         for (let G = 0; G < W; G++) {
           let K = b.substring(M[G] + this.start.length, H[G]), J = K, ne, X = K.indexOf(":");
           if (X >= 0 && (ne = K.substring(0, X), J = K.substring(X + 1, K.length)), L.push(new y.TagChunk(J, ne)), G + 1 < W) {
-            let ie = b.substring(H[G] + this.stop.length, M[G + 1]);
-            L.push(new A.TextChunk(ie));
+            let se = b.substring(H[G] + this.stop.length, M[G + 1]);
+            L.push(new A.TextChunk(se));
           }
         }
         if (W > 0) {
@@ -50316,13 +50316,13 @@ var abe = w && w.__createBinding || (Object.create ? function(t, e, n, r) {
 };
 Object.defineProperty(xC, "__esModule", { value: !0 });
 xC.MalloyToAST = void 0;
-const nj = y_, fbe = gm, se = cbe(Y_), q6 = K_, rj = lr, xbe = Y_, Tn = an, z6 = Ve, dbe = Pu, hbe = Jd;
-class ij extends se.SourceQueryElement {
+const nj = y_, fbe = gm, ie = cbe(Y_), q6 = K_, rj = lr, xbe = Y_, Tn = an, z6 = Ve, dbe = Pu, hbe = Jd;
+class ij extends ie.SourceQueryElement {
   constructor() {
     super(...arguments), this.elementType = "parseErrorSourceQuery";
   }
 }
-class H6 extends se.MalloyElement {
+class H6 extends ie.MalloyElement {
   constructor(e) {
     super(), this.elementType = "ignoredByParser", this.malloySrc = e;
   }
@@ -50402,13 +50402,13 @@ class gbe extends fbe.AbstractParseTreeVisitor {
     return Number.parseInt(e.text);
   }
   getFieldName(e) {
-    return this.astAt(new se.FieldName((0, Tn.getId)(e)), e.id());
+    return this.astAt(new ie.FieldName((0, Tn.getId)(e)), e.id());
   }
   getModelEntryName(e) {
-    return this.astAt(new se.ModelEntryReference((0, Tn.getId)(e)), e.id());
+    return this.astAt(new ie.ModelEntryReference((0, Tn.getId)(e)), e.id());
   }
   defaultResult() {
-    return new se.Unimplemented();
+    return new ie.Unimplemented();
   }
   astAt(e, n) {
     return e.location = {
@@ -50421,7 +50421,7 @@ class gbe extends fbe.AbstractParseTreeVisitor {
     return this.parseInfo.sourceStream.getText(i);
   }
   getFilterElement(e) {
-    const n = this.getFieldExpr(e), r = new se.FilterElement(n, this.getSourceCode(e));
+    const n = this.getFieldExpr(e), r = new ie.FilterElement(n, this.getSourceCode(e));
     return this.astAt(r, e);
   }
   getFieldDefs(e, n) {
@@ -50429,13 +50429,13 @@ class gbe extends fbe.AbstractParseTreeVisitor {
   }
   getFieldExpr(e) {
     const n = this.visit(e);
-    if (n instanceof se.ExpressionDef)
+    if (n instanceof ie.ExpressionDef)
       return this.astAt(n, e);
     throw this.internalError(e, `expression node unknown type '${n.elementType}'`);
   }
   getFilterShortcut(e) {
     const n = this.getFilterElement(e.fieldExpr());
-    return this.m4advisory(e, "filter-shortcut", "Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead"), new se.Filter([n]);
+    return this.m4advisory(e, "filter-shortcut", "Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead"), new ie.Filter([n]);
   }
   getPlainStringFrom(e) {
     const [n, r] = (0, Tn.getPlainString)(e);
@@ -50456,7 +50456,7 @@ class gbe extends fbe.AbstractParseTreeVisitor {
    */
   parseTime(e, n) {
     let r = n(e.text);
-    return r || (this.contextError(e, "failed-to-parse-time-literal", "Time data parse error"), r = new se.LiteralTimestamp({ text: e.text })), this.astAt(r, e);
+    return r || (this.contextError(e, "failed-to-parse-time-literal", "Time data parse error"), r = new ie.LiteralTimestamp({ text: e.text })), this.astAt(r, e);
   }
   /**
    * Get all the possibly missing annotations from this parse rule
@@ -50473,16 +50473,16 @@ class gbe extends fbe.AbstractParseTreeVisitor {
     return this.getNotes(e._beforeIs).concat(this.getNotes(e._afterIs));
   }
   visitMalloyDocument(e) {
-    const n = this.only(e.malloyStatement().map((r) => this.visit(r)), (r) => se.isDocStatementOrDocStatementList(r) && r, "statement");
-    return new se.Document(n);
+    const n = this.only(e.malloyStatement().map((r) => this.visit(r)), (r) => ie.isDocStatementOrDocStatementList(r) && r, "statement");
+    return new ie.Document(n);
   }
   visitDefineSourceStatement(e) {
-    const r = e.sourcePropertyList().sourceDefinition().map((o) => this.visitSourceDefinition(o)), i = this.getNotes(e.tags()), s = new se.DefineSourceList(r);
+    const r = e.sourcePropertyList().sourceDefinition().map((o) => this.visitSourceDefinition(o)), i = this.getNotes(e.tags()), s = new ie.DefineSourceList(r);
     return s.extendNote({ blockNotes: i }), s;
   }
   getSourceParameter(e) {
     const n = e.fieldExpr(), r = n ? this.astAt(new hbe.ConstantExpression(this.getFieldExpr(n)), n) : void 0, i = e.malloyType(), s = i ? this.getMalloyType(i) : void 0;
-    return this.astAt(new se.HasParameter({
+    return this.astAt(new ie.HasParameter({
       name: (0, Tn.getId)(e.parameterNameDef()),
       type: s,
       default: r
@@ -50492,57 +50492,57 @@ class gbe extends fbe.AbstractParseTreeVisitor {
     return e === void 0 ? [] : (this.inExperiment("parameters", e), e.sourceParameter().map((n) => this.getSourceParameter(n)));
   }
   visitSourceDefinition(e) {
-    const n = this.visit(e.sqExplore()), r = this.getSourceParameters(e.sourceParameters()), i = new se.DefineSource((0, Tn.getId)(e.sourceNameDef()), n instanceof se.SourceQueryElement ? n : void 0, !0, r), s = this.getNotes(e.tags()).concat(this.getIsNotes(e.isDefine()));
+    const n = this.visit(e.sqExplore()), r = this.getSourceParameters(e.sourceParameters()), i = new ie.DefineSource((0, Tn.getId)(e.sourceNameDef()), n instanceof ie.SourceQueryElement ? n : void 0, !0, r), s = this.getNotes(e.tags()).concat(this.getIsNotes(e.isDefine()));
     return i.extendNote({ notes: s }), this.astAt(i, e);
   }
   getSourceExtensions(e) {
     return this.astAt(this.visitExploreProperties(e), e);
   }
   visitExploreProperties(e) {
-    const n = e.filterShortcut(), r = this.only(e.exploreStatement().map((s) => this.visit(s)), (s) => se.isSourceProperty(s) && s, "source property"), i = new se.SourceDesc(r);
+    const n = e.filterShortcut(), r = this.only(e.exploreStatement().map((s) => this.visit(s)), (s) => ie.isSourceProperty(s) && s, "source property"), i = new ie.SourceDesc(r);
     return n && i.push(this.getFilterShortcut(n)), i;
   }
   visitTableFunction(e) {
-    const n = this.getPlainStringFrom(e.tableURI()), r = this.astAt(new se.TableFunctionSource(n), e);
+    const n = this.getPlainStringFrom(e.tableURI()), r = this.astAt(new ie.TableFunctionSource(n), e);
     return this.m4advisory(e, "table-function", "`table('connection_name:table_path')` is deprecated; use `connection_name.table('table_path')`"), r;
   }
   visitTableMethod(e) {
     const n = e.connectionId(), r = this.astAt(this.getModelEntryName(n), n), i = this.getPlainStringFrom(e.tablePath());
-    return this.astAt(new se.TableMethodSource(r, i), e);
+    return this.astAt(new ie.TableMethodSource(r, i), e);
   }
   visitSqlSource(e) {
-    const n = e.connectionId(), r = this.astAt(this.getModelEntryName(n), n), i = new se.SQLString(), s = e.sqlString();
+    const n = e.connectionId(), r = this.astAt(this.getModelEntryName(n), n), i = new ie.SQLString(), s = e.sqlString();
     s && this.makeSqlString(s, i);
     const o = e.shortString();
     o && i.push((0, Tn.getShortString)(o));
-    const u = new se.SQLSource(r, i);
+    const u = new ie.SQLSource(r, i);
     return this.astAt(u, e);
   }
   visitDefJoinMany(e) {
     const n = [];
     for (const i of e.joinList().joinDef()) {
       const s = this.visit(i);
-      s instanceof se.Join && (n.push(s), s instanceof se.ExpressionJoin ? (s.joinType = "many", s.joinOn === void 0 && this.contextError(e, "missing-on-in-join-many", "join_many: requires ON expression")) : s instanceof se.KeyJoin && this.contextError(e, "foreign-key-in-join-many", "Foreign key join not legal in join_many:"));
+      s instanceof ie.Join && (n.push(s), s instanceof ie.ExpressionJoin ? (s.joinType = "many", s.joinOn === void 0 && this.contextError(e, "missing-on-in-join-many", "join_many: requires ON expression")) : s instanceof ie.KeyJoin && this.contextError(e, "foreign-key-in-join-many", "Foreign key join not legal in join_many:"));
     }
-    const r = new se.JoinStatement(n);
+    const r = new ie.JoinStatement(n);
     return r.extendNote({ blockNotes: this.getNotes(e.tags()) }), r;
   }
   visitDefJoinOne(e) {
     const n = this.getJoinList(e.joinList()), r = [];
     for (const s of n)
-      s instanceof se.Join && (r.push(s), s instanceof se.ExpressionJoin && (s.joinType = "one"));
-    const i = new se.JoinStatement(r);
+      s instanceof ie.Join && (r.push(s), s instanceof ie.ExpressionJoin && (s.joinType = "one"));
+    const i = new ie.JoinStatement(r);
     return i.extendNote({ blockNotes: this.getNotes(e.tags()) }), i;
   }
   visitDefJoinCross(e) {
     const n = this.getJoinList(e.joinList()), r = [];
     for (const s of n)
-      s instanceof se.Join && (r.push(s), s instanceof se.ExpressionJoin ? s.joinType = "cross" : s.logError("foreign-key-in-join-cross", "Foreign key join not legal in join_cross:"));
-    const i = new se.JoinStatement(r);
+      s instanceof ie.Join && (r.push(s), s instanceof ie.ExpressionJoin ? s.joinType = "cross" : s.logError("foreign-key-in-join-cross", "Foreign key join not legal in join_cross:"));
+    const i = new ie.JoinStatement(r);
     return i.extendNote({ blockNotes: this.getNotes(e.tags()) }), i;
   }
   getJoinList(e) {
-    return this.only(e.joinDef().map((n) => this.visit(n)), (n) => n instanceof se.Join && n, "join");
+    return this.only(e.joinDef().map((n) => this.visit(n)), (n) => n instanceof ie.Join && n, "join");
   }
   getJoinFrom(e) {
     const n = e.isExplore(), r = this.getModelEntryName(e.joinNameDef());
@@ -50551,18 +50551,18 @@ class gbe extends fbe.AbstractParseTreeVisitor {
       return { joinFrom: s, notes: o, joinAs: r };
     }
     const i = e.sourceArguments();
-    return i ? { joinFrom: this.astAt(new se.SQReference(r, this.getSQArguments(i)), e), notes: [], joinAs: r } : { joinAs: r, joinFrom: new se.SQReference(r), notes: [] };
+    return i ? { joinFrom: this.astAt(new ie.SQReference(r, this.getSQArguments(i)), e), notes: [], joinAs: r } : { joinAs: r, joinFrom: new ie.SQReference(r), notes: [] };
   }
   visitQueryJoinStatement(e) {
     return this.astAt(this.visit(e.joinStatement()), e);
   }
   visitJoinOn(e) {
     var n;
-    const { joinAs: r, joinFrom: i, notes: s } = this.getJoinFrom(e.joinFrom()), o = new se.ExpressionJoin(r, i), u = e.joinExpression(), a = ((n = e.matrixOperation()) === null || n === void 0 ? void 0 : n.text.toLocaleLowerCase()) || "left";
+    const { joinAs: r, joinFrom: i, notes: s } = this.getJoinFrom(e.joinFrom()), o = new ie.ExpressionJoin(r, i), u = e.joinExpression(), a = ((n = e.matrixOperation()) === null || n === void 0 ? void 0 : n.text.toLocaleLowerCase()) || "left";
     return (0, z6.isMatrixOperation)(a) ? o.matrixOperation = a : this.contextError(e, "unknown-matrix-operation", "Internal Error: Unknown matrixOperation"), u && (o.joinOn = this.getFieldExpr(u)), o.extendNote({ notes: this.getNotes(e).concat(s) }), this.astAt(o, e);
   }
   visitJoinWith(e) {
-    const { joinAs: n, joinFrom: r, notes: i } = this.getJoinFrom(e.joinFrom()), s = this.getFieldExpr(e.fieldExpr()), o = new se.KeyJoin(n, r, s);
+    const { joinAs: n, joinFrom: r, notes: i } = this.getJoinFrom(e.joinFrom()), s = this.getFieldExpr(e.fieldExpr()), o = new ie.KeyJoin(n, r, s);
     return o.extendNote({ notes: this.getNotes(e).concat(i) }), this.astAt(o, e);
   }
   getFieldDef(e, n) {
@@ -50570,37 +50570,37 @@ class gbe extends fbe.AbstractParseTreeVisitor {
     return o.extendNote({ notes: u }), this.astAt(o, e);
   }
   visitDefDimensions(e) {
-    const n = this.getFieldDefs(e.defList().fieldDef(), se.DimensionFieldDeclaration), r = new se.Dimensions(n);
+    const n = this.getFieldDefs(e.defList().fieldDef(), ie.DimensionFieldDeclaration), r = new ie.Dimensions(n);
     return r.extendNote({ blockNotes: this.getNotes(e.tags()) }), this.astAt(r, e);
   }
   visitDefMeasures(e) {
-    const n = this.getFieldDefs(e.defList().fieldDef(), se.MeasureFieldDeclaration), r = new se.Measures(n);
+    const n = this.getFieldDefs(e.defList().fieldDef(), ie.MeasureFieldDeclaration), r = new ie.Measures(n);
     return r.extendNote({ blockNotes: this.getNotes(e.tags()) }), this.astAt(r, e);
   }
   visitQueryExtend(e) {
     const n = [], r = e.queryExtendStatementList().queryExtendStatement().map((s) => this.visit(s));
     for (const s of r)
-      if (se.isQueryExtendProperty(s))
+      if (ie.isQueryExtendProperty(s))
         n.push(s);
       else
         throw this.internalError(e, `Query extend matched, but ${s.elementType} found`);
-    const i = new se.ExtendBlock(n);
+    const i = new ie.ExtendBlock(n);
     return this.astAt(i, e);
   }
   visitDeclareStatement(e) {
-    const n = this.getFieldDefs(e.defList().fieldDef(), se.DeclareFieldDeclaration), r = new se.DeclareFields(n), i = this.astAt(r, e);
+    const n = this.getFieldDefs(e.defList().fieldDef(), ie.DeclareFieldDeclaration), r = new ie.DeclareFields(n), i = this.astAt(r, e);
     return this.m4advisory(e, "declare", "`declare:` is deprecated; use `dimension:` or `measure:` inside a source or `extend:` block"), i;
   }
   visitExploreRenameDef(e) {
-    const n = e.fieldName(0), r = e.fieldName(1), i = new se.RenameField((0, Tn.getId)(n), this.getFieldName(r));
+    const n = e.fieldName(0), r = e.fieldName(1), i = new ie.RenameField((0, Tn.getId)(n), this.getFieldName(r));
     return this.astAt(i, e);
   }
   visitDefExploreRename(e) {
-    const r = e.renameList().exploreRenameDef().map((s) => this.visitExploreRenameDef(s)), i = new se.Renames(r);
+    const r = e.renameList().exploreRenameDef().map((s) => this.visitExploreRenameDef(s)), i = new ie.Renames(r);
     return this.astAt(i, e);
   }
   visitFilterClauseList(e) {
-    return new se.Filter(e.fieldExpr().map((n) => this.getFilterElement(n)));
+    return new ie.Filter(e.fieldExpr().map((n) => this.getFilterElement(n)));
   }
   visitWhereStatement(e) {
     const n = this.visitFilterClauseList(e.filterClauseList());
@@ -50612,36 +50612,36 @@ class gbe extends fbe.AbstractParseTreeVisitor {
   }
   visitSubQueryDefList(e) {
     const n = e.exploreQueryDef().map((r) => this.visitExploreQueryDef(r));
-    return new se.Views(n);
+    return new ie.Views(n);
   }
   visitDefExploreQuery(e) {
     const n = this.visitSubQueryDefList(e.subQueryDefList()), r = this.getNotes(e.tags());
     return n.extendNote({ blockNotes: r }), e.QUERY() && this.m4advisory(e, "query-in-source", "Use view: inside of a source instead of query:"), n;
   }
   visitDefExplorePrimaryKey(e) {
-    const n = new se.PrimaryKey(this.getFieldName(e.fieldName()));
+    const n = new ie.PrimaryKey(this.getFieldName(e.fieldName()));
     return this.astAt(n, e);
   }
   visitFieldNameList(e) {
-    const n = e.fieldName().map((r) => new se.AcceptExceptFieldReference([this.getFieldName(r)]));
-    return new se.FieldReferences(n);
+    const n = e.fieldName().map((r) => new ie.AcceptExceptFieldReference([this.getFieldName(r)]));
+    return new ie.FieldReferences(n);
   }
   visitDefExploreEditField(e) {
     const n = e.ACCEPT() ? "accept" : "except";
-    return new se.FieldListEdit(n, this.visitFieldNameList(e.fieldNameList()));
+    return new ie.FieldListEdit(n, this.visitFieldNameList(e.fieldNameList()));
   }
   visitDefExploreTimezone(e) {
     return this.visitTimezoneStatement(e.timezoneStatement());
   }
   visitTimezoneStatement(e) {
-    const n = this.getPlainStringFrom(e), r = this.astAt(new se.TimezoneStatement(n), e.string());
+    const n = this.getPlainStringFrom(e), r = this.astAt(new ie.TimezoneStatement(n), e.string());
     return r.isValid || this.astError(r, "invalid-timezone", {
       timezone: r.tz
     }), this.astAt(r, e);
   }
   visitQueryProperties(e) {
-    const n = this.only(e.queryStatement().map((i) => this.astAt(this.visit(i), i)), (i) => se.isQueryProperty(i) && i, "query statement"), r = e.filterShortcut();
-    return r && n.push(this.getFilterShortcut(r)), new se.QOpDesc(n);
+    const n = this.only(e.queryStatement().map((i) => this.astAt(this.visit(i), i)), (i) => ie.isQueryProperty(i) && i, "query statement"), r = e.filterShortcut();
+    return r && n.push(this.getFilterShortcut(r)), new ie.QOpDesc(n);
   }
   getFieldPath(e, n) {
     const r = e.fieldName().map((i) => this.getFieldName(i));
@@ -50661,32 +50661,32 @@ class gbe extends fbe.AbstractParseTreeVisitor {
     throw new Error("Expected query field entry to be a field reference or definition");
   }
   getQueryItems(e, n, r) {
-    return this.only(e.queryFieldEntry().map((i) => this.getQueryFieldEntry(i, n, r)), (i) => i instanceof se.FieldReference || i instanceof se.AtomicFieldDeclaration ? i : !1, "view field");
+    return this.only(e.queryFieldEntry().map((i) => this.getQueryFieldEntry(i, n, r)), (i) => i instanceof ie.FieldReference || i instanceof ie.AtomicFieldDeclaration ? i : !1, "view field");
   }
   visitAggregateStatement(e) {
-    const n = new se.Aggregate(this.getQueryItems(e.queryFieldList(), se.AggregateFieldDeclaration, se.AggregateFieldReference));
+    const n = new ie.Aggregate(this.getQueryItems(e.queryFieldList(), ie.AggregateFieldDeclaration, ie.AggregateFieldReference));
     return n.extendNote({ blockNotes: this.getNotes(e.tags()) }), n;
   }
   visitGroupByStatement(e) {
-    const n = new se.GroupBy(this.getQueryItems(e.queryFieldList(), se.GroupByFieldDeclaration, se.GroupByFieldReference));
+    const n = new ie.GroupBy(this.getQueryItems(e.queryFieldList(), ie.GroupByFieldDeclaration, ie.GroupByFieldReference));
     return n.extendNote({ blockNotes: this.getNotes(e.tags()) }), n;
   }
   visitCalculateStatement(e) {
-    const n = new se.Calculate(this.getQueryItems(e.queryFieldList(), se.CalculateFieldDeclaration, se.CalculateFieldReference));
+    const n = new ie.Calculate(this.getQueryItems(e.queryFieldList(), ie.CalculateFieldDeclaration, ie.CalculateFieldReference));
     return n.extendNote({ blockNotes: this.getNotes(e.tags()) }), n;
   }
   getTaggedRef(e, n, r) {
     const i = e.refExpr();
     if (i) {
-      const o = this.getFieldPath(e.fieldPath(), se.ExpressionFieldReference);
+      const o = this.getFieldPath(e.fieldPath(), ie.ExpressionFieldReference);
       let u;
       const a = i.timeframe();
-      a && (u = new se.ExprGranularTime(new se.ExprIdReference(o), this.visitTimeframe(a).text, !0));
+      a && (u = new ie.ExprGranularTime(new ie.ExprIdReference(o), this.visitTimeframe(a).text, !0));
       const l = i.aggregate();
       if (l) {
         const f = l.text.toLowerCase();
         if (f === "sum")
-          u = new se.ExprSum(void 0, o);
+          u = new ie.ExprSum(void 0, o);
         else
           return this.contextError(l, "invalid-reference-only-aggregation", `\`${f}\` is not legal in a reference-only aggregation`), o;
       }
@@ -50710,8 +50710,8 @@ class gbe extends fbe.AbstractParseTreeVisitor {
   }
   // "FieldCollection" can only mean a select statement today
   visitFieldCollection(e) {
-    const n = e.collectionMember().map((r) => this.getFieldCollectionMember(r, se.ProjectFieldDeclaration, se.ProjectFieldReference));
-    return this.astAt(new se.ProjectStatement(n), e);
+    const n = e.collectionMember().map((r) => this.getFieldCollectionMember(r, ie.ProjectFieldDeclaration, ie.ProjectFieldReference));
+    return this.astAt(new ie.ProjectStatement(n), e);
   }
   visitProjectStatement(e) {
     e.PROJECT() && this.m4advisory(e, "project", "project: keyword is deprecated, use select:");
@@ -50720,7 +50720,7 @@ class gbe extends fbe.AbstractParseTreeVisitor {
   }
   visitCollectionWildCard(e) {
     var n;
-    const r = e.fieldPath(), i = r ? this.getFieldPath(r, se.ProjectFieldReference) : void 0, s = this.astAt(new se.WildcardFieldReference(i), e), o = ((n = e.starQualified()) === null || n === void 0 ? void 0 : n.fieldNameList()) || [];
+    const r = e.fieldPath(), i = r ? this.getFieldPath(r, ie.ProjectFieldReference) : void 0, s = this.astAt(new ie.WildcardFieldReference(i), e), o = ((n = e.starQualified()) === null || n === void 0 ? void 0 : n.fieldNameList()) || [];
     for (const u of o)
       for (const a of u.fieldName())
         s.except.add((0, Tn.getId)(a));
@@ -50730,45 +50730,45 @@ class gbe extends fbe.AbstractParseTreeVisitor {
     const n = e.indexElement().map((r) => {
       const i = r.fieldPath();
       if (!i)
-        return this.astAt(new se.WildcardFieldReference(void 0), e);
-      const s = this.getFieldPath(i, se.IndexFieldReference);
-      return r.STAR() ? this.astAt(new se.WildcardFieldReference(s), e) : this.astAt(s, e);
+        return this.astAt(new ie.WildcardFieldReference(void 0), e);
+      const s = this.getFieldPath(i, ie.IndexFieldReference);
+      return r.STAR() ? this.astAt(new ie.WildcardFieldReference(s), e) : this.astAt(s, e);
     });
-    return new se.FieldReferences(n);
+    return new ie.FieldReferences(n);
   }
   visitIndexStatement(e) {
-    const n = this.visitIndexFields(e.indexFields()), r = new se.Index(n), i = e.fieldName();
+    const n = this.visitIndexFields(e.indexFields()), r = new ie.Index(n), i = e.fieldName();
     return i && r.useWeight(this.getFieldName(i)), this.astAt(r, e);
   }
   visitFieldPropertyLimitStatement(e) {
     return this.inExperiment("aggregate_limit", e), this.visitLimitStatement(e.limitStatement());
   }
   visitLimitStatement(e) {
-    return new se.Limit(this.getNumber(e.INTEGER_LITERAL()));
+    return new ie.Limit(this.getNumber(e.INTEGER_LITERAL()));
   }
   visitAggregateOrderBySpec(e) {
     const n = e.ASC() ? "asc" : e.DESC() ? "desc" : void 0, r = e.fieldExpr(), i = r ? this.getFieldExpr(r) : void 0;
-    return this.astAt(new se.FunctionOrderBy(i, n), e);
+    return this.astAt(new ie.FunctionOrderBy(i, n), e);
   }
   visitAggregateOrderByStatement(e) {
     return this.visitAggregateOrdering(e.aggregateOrdering());
   }
   visitAggregateOrdering(e) {
     const n = e.aggregateOrderBySpec().map((r) => this.visitAggregateOrderBySpec(r));
-    return this.astAt(new se.FunctionOrdering(n), e);
+    return this.astAt(new ie.FunctionOrdering(n), e);
   }
   visitOrderBySpec(e) {
     const n = e.ASC() ? "asc" : e.DESC() ? "desc" : void 0, r = e.INTEGER_LITERAL();
     if (r)
-      return new se.OrderBy(this.getNumber(r), n);
+      return new ie.OrderBy(this.getNumber(r), n);
     const i = e.fieldName();
     if (i)
-      return new se.OrderBy(this.getFieldName(i), n);
+      return new ie.OrderBy(this.getFieldName(i), n);
     throw this.internalError(e, "can't parse order_by specification");
   }
   visitOrdering(e) {
     const n = e.orderBySpec().map((r) => this.visitOrderBySpec(r));
-    return this.astAt(new se.Ordering(n), e);
+    return this.astAt(new ie.Ordering(n), e);
   }
   visitTopStatement(e) {
     const n = e.bySpec(), r = this.getNumber(e.INTEGER_LITERAL());
@@ -50778,31 +50778,31 @@ class gbe extends fbe.AbstractParseTreeVisitor {
       const s = n.fieldName();
       if (s) {
         const u = this.getFieldName(s);
-        i = new se.Top(r, u);
+        i = new ie.Top(r, u);
       }
       const o = n.fieldExpr();
-      o && (i = new se.Top(r, this.getFieldExpr(o)));
+      o && (i = new ie.Top(r, this.getFieldExpr(o)));
     }
-    return i || (i = new se.Top(r, void 0)), this.astAt(i, e);
+    return i || (i = new ie.Top(r, void 0)), this.astAt(i, e);
   }
   visitTopLevelQueryDefs(e) {
-    const n = e.topLevelQueryDef().map((s) => this.visitTopLevelQueryDef(s)), r = this.getNotes(e.tags()), i = new se.DefineQueryList(n);
+    const n = e.topLevelQueryDef().map((s) => this.visitTopLevelQueryDef(s)), r = this.getNotes(e.tags()), i = new ie.DefineQueryList(n);
     return i.extendNote({ blockNotes: r }), i;
   }
   visitTopLevelQueryDef(e) {
     const n = (0, Tn.getId)(e.queryName()), r = this.visit(e.sqExpr()), i = this.getNotes(e.tags()).concat(this.getIsNotes(e.isDefine()));
-    if (r instanceof se.SourceQueryElement) {
-      const s = new se.DefineQuery(n, r);
+    if (r instanceof ie.SourceQueryElement) {
+      const s = new ie.DefineQuery(n, r);
       return s.extendNote({ notes: i }), this.astAt(s, e);
     }
     throw this.internalError(e, `Expected query definition, got a '${r.elementType}'`);
   }
   visitAnonymousQuery(e) {
-    const n = e.topLevelAnonQueryDef(), r = this.getSqExpr(n.sqExpr()), i = this.astAt(new se.AnonymousQuery(r), n), s = this.getNotes(e.topLevelAnonQueryDef().tags()), o = this.getNotes(e.tags());
+    const n = e.topLevelAnonQueryDef(), r = this.getSqExpr(n.sqExpr()), i = this.astAt(new ie.AnonymousQuery(r), n), s = this.getNotes(e.topLevelAnonQueryDef().tags()), o = this.getNotes(e.tags());
     return i.extendNote({ notes: s, blockNotes: o }), this.m4advisory(n, "anonymous-query", "Anonymous `query:` statements are deprecated, use `run:` instead"), this.astAt(i, e);
   }
   visitRunStatement(e) {
-    const n = e.topLevelAnonQueryDef(), r = this.getSqExpr(n.sqExpr()), i = this.astAt(new se.AnonymousQuery(r), n), s = this.getNotes(e.topLevelAnonQueryDef().tags()), o = this.getNotes(e.tags());
+    const n = e.topLevelAnonQueryDef(), r = this.getSqExpr(n.sqExpr()), i = this.astAt(new ie.AnonymousQuery(r), n), s = this.getNotes(e.topLevelAnonQueryDef().tags()), o = this.getNotes(e.tags());
     return i.extendNote({ notes: s, blockNotes: o }), this.astAt(i, e);
   }
   visitNestStatement(e) {
@@ -50810,7 +50810,7 @@ class gbe extends fbe.AbstractParseTreeVisitor {
     return n.extendNote({ blockNotes: this.getNotes(e.tags()) }), n;
   }
   visitNestedQueryList(e) {
-    return new se.Nests(this.only(e.nestEntry().map((n) => this.visit(n)), (n) => n instanceof se.NestFieldDeclaration && n, "query"));
+    return new ie.Nests(this.only(e.nestEntry().map((n) => this.visit(n)), (n) => n instanceof ie.NestFieldDeclaration && n, "query"));
   }
   visitNestDef(e) {
     const n = e.queryName();
@@ -50822,100 +50822,100 @@ class gbe extends fbe.AbstractParseTreeVisitor {
       const u = i.getImplicitName();
       u === void 0 && this.contextError(e, "anonymous-nest", "`nest:` view requires a name (add `nest_name is ...`)"), r = u ?? "__unnamed__";
     }
-    const s = new se.NestFieldDeclaration(r, i), o = e.isDefine();
+    const s = new ie.NestFieldDeclaration(r, i), o = e.isDefine();
     return s.extendNote({
       notes: this.getNotes(e.tags()).concat(o ? this.getIsNotes(o) : [])
     }), this.astAt(s, e);
   }
   visitExploreQueryDef(e) {
-    const n = (0, Tn.getId)(e.exploreQueryNameDef()), r = new se.ViewFieldDeclaration(n, this.getVExpr(e.vExpr())), i = this.getNotes(e).concat(this.getIsNotes(e.isDefine()));
+    const n = (0, Tn.getId)(e.exploreQueryNameDef()), r = new ie.ViewFieldDeclaration(n, this.getVExpr(e.vExpr())), i = this.getNotes(e).concat(this.getIsNotes(e.isDefine()));
     return r.extendNote({ notes: i }), this.astAt(r, e);
   }
   visitExprNot(e) {
-    return new se.ExprNot(this.getFieldExpr(e.fieldExpr()));
+    return new ie.ExprNot(this.getFieldExpr(e.fieldExpr()));
   }
   visitExprBool(e) {
-    return new se.Boolean(e.TRUE() ? "true" : "false");
+    return new ie.Boolean(e.TRUE() ? "true" : "false");
   }
   allFieldExpressions(e) {
     return e.map((n) => this.getFieldExpr(n));
   }
   visitExprLogicalOr(e) {
     const n = this.getFieldExpr(e.fieldExpr(0)), r = this.getFieldExpr(e.fieldExpr(1));
-    return new se.ExprLogicalOp(n, "or", r);
+    return new ie.ExprLogicalOp(n, "or", r);
   }
   visitExprLogicalAnd(e) {
     const n = this.getFieldExpr(e.fieldExpr(0)), r = this.getFieldExpr(e.fieldExpr(1));
-    return new se.ExprLogicalOp(n, "and", r);
+    return new ie.ExprLogicalOp(n, "and", r);
   }
   visitExprOrTree(e) {
     const n = this.getFieldExpr(e.fieldExpr()), r = this.getFieldExpr(e.partialAllowedFieldExpr());
-    return this.astAt(new se.ExprAlternationTree(n, "|", r), e);
+    return this.astAt(new ie.ExprAlternationTree(n, "|", r), e);
   }
   visitExprAndTree(e) {
     const n = this.getFieldExpr(e.fieldExpr()), r = this.getFieldExpr(e.partialAllowedFieldExpr());
-    return this.astAt(new se.ExprAlternationTree(n, "&", r), e);
+    return this.astAt(new ie.ExprAlternationTree(n, "&", r), e);
   }
   visitExprCoalesce(e) {
     const n = this.getFieldExpr(e.fieldExpr()[0]), r = this.getFieldExpr(e.fieldExpr()[1]);
-    return this.astAt(new se.ExprCoalesce(n, r), e);
+    return this.astAt(new ie.ExprCoalesce(n, r), e);
   }
   visitPartialAllowedFieldExpr(e) {
     var n;
     const r = this.getFieldExpr(e.fieldExpr()), i = (n = e.compareOp()) === null || n === void 0 ? void 0 : n.text;
     if (i) {
-      if (se.isComparison(i))
-        return this.astAt(new se.PartialCompare(i, r), e);
+      if (ie.isComparison(i))
+        return this.astAt(new ie.PartialCompare(i, r), e);
       throw this.internalError(e, `partial comparison '${i}' not recognized`);
     }
     return r;
   }
   visitExprString(e) {
     const n = this.getPlainStringFrom(e);
-    return new se.ExprString(n);
+    return new ie.ExprString(n);
   }
   visitExprRegex(e) {
     const n = e.HACKY_REGEX().text;
-    return new se.ExprRegEx(n.slice(2, -1));
+    return new ie.ExprRegEx(n.slice(2, -1));
   }
   visitExprNow(e) {
-    return new se.ExprNow();
+    return new ie.ExprNow();
   }
   visitExprNumber(e) {
-    return new se.ExprNumber(e.text);
+    return new ie.ExprNumber(e.text);
   }
   visitExprFieldPath(e) {
-    const n = new se.ExprIdReference(this.getFieldPath(e.fieldPath(), se.ExpressionFieldReference));
+    const n = new ie.ExprIdReference(this.getFieldPath(e.fieldPath(), ie.ExpressionFieldReference));
     return this.astAt(n, e);
   }
   visitExprNULL(e) {
-    return new se.ExprNULL();
+    return new ie.ExprNULL();
   }
   visitExprExpr(e) {
-    return new se.ExprParens(this.getFieldExpr(e.fieldExpr()));
+    return new ie.ExprParens(this.getFieldExpr(e.fieldExpr()));
   }
   visitExprMinus(e) {
-    return new se.ExprMinus(this.getFieldExpr(e.fieldExpr()));
+    return new ie.ExprMinus(this.getFieldExpr(e.fieldExpr()));
   }
   visitExprAddSub(e) {
     const n = this.getFieldExpr(e.fieldExpr(0)), r = this.getFieldExpr(e.fieldExpr(1)), i = e.PLUS() ? "+" : "-";
-    return new se.ExprAddSub(n, i, r);
+    return new ie.ExprAddSub(n, i, r);
   }
   visitExprMulDiv(e) {
     const n = e.STAR() ? "*" : e.SLASH() ? "/" : "%";
-    return new se.ExprMulDiv(this.getFieldExpr(e.fieldExpr(0)), n, this.getFieldExpr(e.fieldExpr(1)));
+    return new ie.ExprMulDiv(this.getFieldExpr(e.fieldExpr(0)), n, this.getFieldExpr(e.fieldExpr(1)));
   }
   visitExprCompare(e) {
     const n = e.compareOp().text, r = this.getFieldExpr(e.fieldExpr(0)), i = this.getFieldExpr(e.fieldExpr(1));
-    if (se.isEquality(n))
-      return this.astAt(new se.ExprEquality(r, n, i), e);
-    if (se.isComparison(n))
-      return this.astAt(new se.ExprCompare(r, n, i), e);
+    if (ie.isEquality(n))
+      return this.astAt(new ie.ExprEquality(r, n, i), e);
+    if (ie.isComparison(n))
+      return this.astAt(new ie.ExprCompare(r, n, i), e);
     throw this.internalError(e, `untranslatable comparison operator '${n}'`);
   }
   visitExprUngroup(e) {
     const n = e.fieldName().map((i) => this.getFieldName(i)), r = e.ungroup().text.toLowerCase();
-    return this.astAt(new se.ExprUngroup(r === "all" ? r : "exclude", this.getFieldExpr(e.fieldExpr()), n), e);
+    return this.astAt(new ie.ExprUngroup(r === "all" ? r : "exclude", this.getFieldExpr(e.fieldExpr()), n), e);
   }
   symmetricAggregateUsageError(e) {
     return `Symmetric aggregate function \`${e}\` must be written as \`${e}(expression)\` or \`path.to.field.${e}()\``;
@@ -50924,25 +50924,25 @@ class gbe extends fbe.AbstractParseTreeVisitor {
     return `Asymmetric aggregate function \`${e}\` must be written as \`path.to.field.${e}()\`, \`path.to.join.${e}(expression)\`, or \`${e}(expression)\``;
   }
   visitExprAggregate(e) {
-    const n = e.fieldPath(), r = this.getFieldPath(n, se.ExpressionFieldReference), i = n && r ? this.astAt(r, n) : void 0, s = e.aggregate().text.toLowerCase(), o = e.fieldExpr();
+    const n = e.fieldPath(), r = this.getFieldPath(n, ie.ExpressionFieldReference), i = n && r ? this.astAt(r, n) : void 0, s = e.aggregate().text.toLowerCase(), o = e.fieldExpr();
     if (e.aggregate().COUNT())
-      return o && this.contextError(o, "count-expression-with-locality", "Expression illegal inside path.count()"), new se.ExprCount(i);
+      return o && this.contextError(o, "count-expression-with-locality", "Expression illegal inside path.count()"), new ie.ExprCount(i);
     const u = o ? this.getFieldExpr(o) : void 0;
     if (s === "min" || s === "max")
       if (u)
         this.contextError(e, "invalid-symmetric-aggregate", this.symmetricAggregateUsageError(s));
       else {
-        const a = this.astAt(new se.ExprIdReference(r), n);
-        return s === "min" ? new se.ExprMin(a) : new se.ExprMax(a);
+        const a = this.astAt(new ie.ExprIdReference(r), n);
+        return s === "min" ? new ie.ExprMin(a) : new ie.ExprMax(a);
       }
     else {
       if (s === "avg")
-        return new se.ExprAvg(u, i);
+        return new ie.ExprAvg(u, i);
       if (s === "sum")
-        return new se.ExprSum(u, i);
+        return new ie.ExprSum(u, i);
       this.contextError(e, "aggregate-parse-error", `Cannot parse aggregate function ${s}`);
     }
-    return new se.ExprNULL();
+    return new ie.ExprNULL();
   }
   /*
    * error toodos
@@ -50960,35 +50960,35 @@ class gbe extends fbe.AbstractParseTreeVisitor {
   visitExprPathlessAggregate(e) {
     const n = e.fieldExpr(), r = n ? this.getFieldExpr(n) : void 0, i = void 0, s = e.aggregate().text.toLowerCase();
     if (e.STAR() && this.m4advisory(e, "wildcard-in-aggregate", `* illegal inside ${s}()`), s === "count")
-      return this.astAt(r ? new se.ExprCountDistinct(r) : new se.ExprCount(), e);
+      return this.astAt(r ? new ie.ExprCountDistinct(r) : new ie.ExprCount(), e);
     if (s === "min") {
       if (r)
-        return new se.ExprMin(r);
+        return new ie.ExprMin(r);
       this.contextError(e, "invalid-symmetric-aggregate", this.symmetricAggregateUsageError(s));
     } else if (s === "max") {
       if (r)
-        return new se.ExprMax(r);
+        return new ie.ExprMax(r);
       this.contextError(e, "invalid-symmetric-aggregate", this.symmetricAggregateUsageError(s));
     } else {
       if (r === void 0)
-        return this.contextError(e, "invalid-asymmetric-aggregate", this.asymmetricAggregateUsageError(s)), new se.ExprNULL();
+        return this.contextError(e, "invalid-asymmetric-aggregate", this.asymmetricAggregateUsageError(s)), new ie.ExprNULL();
       const o = e.SOURCE_KW() !== void 0;
       if (s === "avg")
-        return new se.ExprAvg(r, i, o);
+        return new ie.ExprAvg(r, i, o);
       if (s === "sum")
-        return new se.ExprSum(r, i, o);
+        return new ie.ExprSum(r, i, o);
     }
-    return new se.ExprNULL();
+    return new ie.ExprNULL();
   }
   visitExprApply(e) {
-    return new se.Apply(this.getFieldExpr(e.fieldExpr()), this.getFieldExpr(e.partialAllowedFieldExpr()));
+    return new ie.Apply(this.getFieldExpr(e.fieldExpr()), this.getFieldExpr(e.partialAllowedFieldExpr()));
   }
   visitExprRange(e) {
-    return new se.Range(this.getFieldExpr(e.fieldExpr(0)), this.getFieldExpr(e.fieldExpr(1)));
+    return new ie.Range(this.getFieldExpr(e.fieldExpr(0)), this.getFieldExpr(e.fieldExpr(1)));
   }
   visitExprCast(e) {
     const n = this.getMalloyOrSQLType(e.malloyOrSQLType());
-    return new se.ExprCast(this.getFieldExpr(e.fieldExpr()), n);
+    return new ie.ExprCast(this.getFieldExpr(e.fieldExpr()), n);
   }
   getMalloyType(e) {
     const n = e.text;
@@ -51007,21 +51007,21 @@ class gbe extends fbe.AbstractParseTreeVisitor {
   }
   visitExprSafeCast(e) {
     const n = this.getMalloyOrSQLType(e.malloyOrSQLType());
-    return new se.ExprCast(this.getFieldExpr(e.fieldExpr()), n, !0);
+    return new ie.ExprCast(this.getFieldExpr(e.fieldExpr()), n, !0);
   }
   visitExprTimeTrunc(e) {
-    return new se.ExprGranularTime(this.getFieldExpr(e.fieldExpr()), this.visitTimeframe(e.timeframe()).text, !0);
+    return new ie.ExprGranularTime(this.getFieldExpr(e.fieldExpr()), this.visitTimeframe(e.timeframe()).text, !0);
   }
   visitTimeframe(e) {
-    return new se.Timeframe(e.text);
+    return new ie.Timeframe(e.text);
   }
   visitExprForRange(e) {
     const n = this.getFieldExpr(e._startAt), r = this.getFieldExpr(e._duration), i = this.visitTimeframe(e.timeframe());
-    return new se.ForRange(n, r, i);
+    return new ie.ForRange(n, r, i);
   }
   visitExprAggFunc(e) {
-    const n = e.argumentList(), r = n ? this.allFieldExpressions(n.fieldExpr()) : [], i = (0, Tn.getId)(e), s = e.fieldPath(), o = s ? this.getFieldPath(s, se.ExpressionFieldReference) : void 0, u = s && o ? this.astAt(o, s) : void 0;
-    return se.ExprTimeExtract.extractor(i) ? this.astAt(new se.ExprTimeExtract(i, r), e) : this.astAt(new se.ExprFunc(i, r, !1, void 0, u), e);
+    const n = e.argumentList(), r = n ? this.allFieldExpressions(n.fieldExpr()) : [], i = (0, Tn.getId)(e), s = e.fieldPath(), o = s ? this.getFieldPath(s, ie.ExpressionFieldReference) : void 0, u = s && o ? this.astAt(o, s) : void 0;
+    return ie.ExprTimeExtract.extractor(i) ? this.astAt(new ie.ExprTimeExtract(i, r), e) : this.astAt(new ie.ExprFunc(i, r, !1, void 0, u), e);
   }
   visitExprFunc(e) {
     var n, r;
@@ -51029,62 +51029,62 @@ class gbe extends fbe.AbstractParseTreeVisitor {
     let a;
     u && ((0, z6.isCastType)(u) ? a = u : (this.contextError(e, "unexpected-malloy-type", `'#' assertion for unknown type '${u}'`), a = void 0));
     let l = (0, Tn.getOptionalId)(e) || ((r = e.timeframe()) === null || r === void 0 ? void 0 : r.text);
-    return l === void 0 && (this.contextError(e, "failed-to-parse-function-name", "Function name error"), l = "FUNCTION_NAME_ERROR"), se.ExprTimeExtract.extractor(l) ? this.astAt(new se.ExprTimeExtract(l, s), e) : this.astAt(new se.ExprFunc(l, s, o, a), e);
+    return l === void 0 && (this.contextError(e, "failed-to-parse-function-name", "Function name error"), l = "FUNCTION_NAME_ERROR"), ie.ExprTimeExtract.extractor(l) ? this.astAt(new ie.ExprTimeExtract(l, s), e) : this.astAt(new ie.ExprFunc(l, s, o, a), e);
   }
   visitExprDuration(e) {
-    return new se.ExprDuration(this.getFieldExpr(e.fieldExpr()), this.visitTimeframe(e.timeframe()).text);
+    return new ie.ExprDuration(this.getFieldExpr(e.fieldExpr()), this.visitTimeframe(e.timeframe()).text);
   }
   visitCaseStatement(e) {
-    const n = e._valueExpr, r = n ? this.getFieldExpr(n) : void 0, i = e.caseWhen(), s = i.map((a) => new se.CaseWhen(this.getFieldExpr(a._condition), this.getFieldExpr(a._result))), o = e._caseElse, u = o ? this.getFieldExpr(o) : void 0;
+    const n = e._valueExpr, r = n ? this.getFieldExpr(n) : void 0, i = e.caseWhen(), s = i.map((a) => new ie.CaseWhen(this.getFieldExpr(a._condition), this.getFieldExpr(a._result))), o = e._caseElse, u = o ? this.getFieldExpr(o) : void 0;
     return this.warnWithReplacement("sql-case", "Use a `pick` statement instead of `case`", this.parseInfo.rangeFromContext(e), `${[
       ...n ? [`${this.getSourceCode(n)} ?`] : [],
       ...i.map((a) => `pick ${this.getSourceCode(a._result)} when ${this.getSourceCode(a._condition)}`),
       o ? `else ${o.text}` : "else null"
-    ].join(" ")}`), new se.Case(r, s, u);
+    ].join(" ")}`), new ie.Case(r, s, u);
   }
   visitPickStatement(e) {
     const n = e.pick().map((r) => {
       let i;
-      return r._pickValue && (i = this.getFieldExpr(r._pickValue)), new se.PickWhen(i, this.getFieldExpr(r._pickWhen));
+      return r._pickValue && (i = this.getFieldExpr(r._pickValue)), new ie.PickWhen(i, this.getFieldExpr(r._pickWhen));
     });
-    return e.ELSE() ? new se.Pick(n, this.getFieldExpr(e._pickElse)) : new se.Pick(n);
+    return e.ELSE() ? new ie.Pick(n, this.getFieldExpr(e._pickElse)) : new ie.Pick(n);
   }
   visitExprFieldProps(e) {
-    const n = this.only(e.fieldProperties().fieldPropertyStatement().map((r) => this.visit(r)), (r) => se.isFieldPropStatement(r) && r, "field property statement");
-    return new se.ExprProps(this.getFieldExpr(e.fieldExpr()), n);
+    const n = this.only(e.fieldProperties().fieldPropertyStatement().map((r) => this.visit(r)), (r) => ie.isFieldPropStatement(r) && r, "field property statement");
+    return new ie.ExprProps(this.getFieldExpr(e.fieldExpr()), n);
   }
   visitPartitionByStatement(e) {
-    return this.astAt(new se.PartitionBy(e.id().map((n) => this.astAt(new se.PartitionByFieldReference([
-      this.astAt(new se.FieldName((0, Tn.idToStr)(n)), n)
+    return this.astAt(new ie.PartitionBy(e.id().map((n) => this.astAt(new ie.PartitionByFieldReference([
+      this.astAt(new ie.FieldName((0, Tn.idToStr)(n)), n)
     ]), n))), e);
   }
   visitLiteralTimestamp(e) {
-    return this.parseTime(e, se.LiteralTimestamp.parse);
+    return this.parseTime(e, ie.LiteralTimestamp.parse);
   }
   visitLiteralHour(e) {
-    return this.parseTime(e, se.LiteralHour.parse);
+    return this.parseTime(e, ie.LiteralHour.parse);
   }
   visitLiteralDay(e) {
-    return this.parseTime(e, se.LiteralDay.parse);
+    return this.parseTime(e, ie.LiteralDay.parse);
   }
   visitLiteralWeek(e) {
-    return this.parseTime(e, se.LiteralWeek.parse);
+    return this.parseTime(e, ie.LiteralWeek.parse);
   }
   visitLiteralMonth(e) {
-    return this.parseTime(e, se.LiteralMonth.parse);
+    return this.parseTime(e, ie.LiteralMonth.parse);
   }
   visitLiteralQuarter(e) {
-    return this.parseTime(e, se.LiteralQuarter.parse);
+    return this.parseTime(e, ie.LiteralQuarter.parse);
   }
   visitLiteralYear(e) {
-    return this.parseTime(e, se.LiteralYear.parse);
+    return this.parseTime(e, ie.LiteralYear.parse);
   }
   visitImportStatement(e) {
-    const n = this.getPlainStringFrom(e.importURL()), r = this.astAt(new se.ImportStatement(n, this.parseInfo.importBaseURL), e), i = e.importSelect();
+    const n = this.getPlainStringFrom(e.importURL()), r = this.astAt(new ie.ImportStatement(n, this.parseInfo.importBaseURL), e), i = e.importSelect();
     if (i)
       for (const s of i.importItem()) {
-        const o = s.id(), u = o[1] ? this.astAt(new se.ImportSourceName((0, Tn.idToStr)(o[1])), o[1]) : void 0;
-        r.push(this.astAt(new se.ImportSelect((0, Tn.idToStr)(o[0]), u), o[0]));
+        const o = s.id(), u = o[1] ? this.astAt(new ie.ImportSourceName((0, Tn.idToStr)(o[1])), o[1]) : void 0;
+        r.push(this.astAt(new ie.ImportSelect((0, Tn.idToStr)(o[0]), u), o[0]));
       }
     return r;
   }
@@ -51094,18 +51094,18 @@ class gbe extends fbe.AbstractParseTreeVisitor {
   visitSampleStatement(e) {
     const n = e.sampleSpec().INTEGER_LITERAL();
     if (n)
-      return new se.SampleProperty({ rows: this.getNumber(n) });
+      return new ie.SampleProperty({ rows: this.getNumber(n) });
     const r = e.sampleSpec().PERCENT_LITERAL();
     if (r)
-      return new se.SampleProperty({ percent: this.getNumber(r) });
+      return new ie.SampleProperty({ percent: this.getNumber(r) });
     const i = e.sampleSpec().TRUE() !== void 0;
-    return new se.SampleProperty({ enable: i });
+    return new ie.SampleProperty({ enable: i });
   }
   visitDocAnnotations(e) {
     const n = e.DOC_ANNOTATION().map((i) => ({
       text: i.text,
       at: this.getLocation(e)
-    })), r = new se.ModelAnnotation(n);
+    })), r = new ie.ModelAnnotation(n);
     return this.compilerFlags = r.getCompilerFlags(this.compilerFlags, this.msgLog), r;
   }
   visitIgnoredObjectAnnotations(e) {
@@ -51116,13 +51116,13 @@ class gbe extends fbe.AbstractParseTreeVisitor {
   }
   visitDefExploreAnnotation(e) {
     const n = this.getNotes(e);
-    return new se.ObjectAnnotation(n);
+    return new ie.ObjectAnnotation(n);
   }
   getSQArgument(e) {
-    const n = e.argumentId(), r = n ? this.astAt(new se.PartitionByFieldReference([
-      this.astAt(new se.FieldName((0, Tn.idToStr)(n.id())), n)
+    const n = e.argumentId(), r = n ? this.astAt(new ie.PartitionByFieldReference([
+      this.astAt(new ie.FieldName((0, Tn.idToStr)(n.id())), n)
     ]), n) : void 0;
-    return this.astAt(new se.Argument({
+    return this.astAt(new ie.Argument({
       id: r,
       value: this.getFieldExpr(e.fieldExpr())
     }), e);
@@ -51133,14 +51133,14 @@ class gbe extends fbe.AbstractParseTreeVisitor {
   }
   visitSQID(e) {
     const n = this.getModelEntryName(e), r = this.getSQArguments(e.sourceArguments());
-    return this.astAt(new se.SQReference(n, r), e.id());
+    return this.astAt(new ie.SQReference(n, r), e.id());
   }
   getSqExpr(e) {
     const n = this.visit(e);
-    return n instanceof se.SourceQueryElement ? n : (this.contextError(e, "unexpected-non-source-query-expression-node", `Expected a source/query expression, not '${n.elementType}'`), new ij());
+    return n instanceof ie.SourceQueryElement ? n : (this.contextError(e, "unexpected-non-source-query-expression-node", `Expected a source/query expression, not '${n.elementType}'`), new ij());
   }
   visitSQExtendedSource(e) {
-    const n = this.getSqExpr(e.sqExpr()), r = new se.SQExtend(n, this.getSourceExtensions(e.exploreProperties()));
+    const n = this.getSqExpr(e.sqExpr()), r = new ie.SQExtend(n, this.getSourceExtensions(e.exploreProperties()));
     return this.astAt(r, e);
   }
   visitSQParens(e) {
@@ -51148,20 +51148,20 @@ class gbe extends fbe.AbstractParseTreeVisitor {
     return this.astAt(n, e);
   }
   visitSQArrow(e) {
-    const n = this.getSqExpr(e.sqExpr()), r = e.segExpr(), i = new se.SQArrow(n, this.getVExpr(r));
+    const n = this.getSqExpr(e.sqExpr()), r = e.segExpr(), i = new ie.SQArrow(n, this.getVExpr(r));
     return this.astAt(i, e);
   }
   getVExpr(e) {
     const n = this.visit(e);
-    if (n instanceof se.View)
+    if (n instanceof ie.View)
       return n;
     throw this.internalError(e, `Expected view, got a '${n.elementType}'`);
   }
   visitSegField(e) {
-    return new se.ReferenceView(this.getFieldPath(e.fieldPath(), se.ViewOrScalarFieldReference));
+    return new ie.ReferenceView(this.getFieldPath(e.fieldPath(), ie.ViewOrScalarFieldReference));
   }
   visitSegOps(e) {
-    return new se.QOpDescView(this.visitQueryProperties(e.queryProperties()));
+    return new ie.QOpDescView(this.visitQueryProperties(e.queryProperties()));
   }
   visitSegParen(e) {
     return this.visit(e.vExpr());
@@ -51170,60 +51170,64 @@ class gbe extends fbe.AbstractParseTreeVisitor {
     return this.visit(e.segExpr());
   }
   visitSegRefine(e) {
-    return new se.ViewRefine(this.getVExpr(e._lhs), this.getVExpr(e._rhs));
+    return new ie.ViewRefine(this.getVExpr(e._lhs), this.getVExpr(e._rhs));
   }
   visitVArrow(e) {
-    return new se.ViewArrow(this.getVExpr(e._lhs), this.getVExpr(e._rhs));
+    return new ie.ViewArrow(this.getVExpr(e._lhs), this.getVExpr(e._rhs));
   }
   visitSQRefinedQuery(e) {
-    const n = this.getSqExpr(e.sqExpr()), r = e.segExpr(), i = new se.SQRefine(n, this.getVExpr(r));
+    const n = this.getSqExpr(e.sqExpr()), r = e.segExpr(), i = new ie.SQRefine(n, this.getVExpr(r));
     return this.astAt(i, e);
   }
   visitSQTable(e) {
     const n = this.visit(e.exploreTable());
     if (n instanceof xbe.TableSource) {
-      const r = new se.SQSource(n);
+      const r = new ie.SQSource(n);
       return this.astAt(r, e);
     }
     return new ij();
   }
   visitSQSQL(e) {
-    const n = new se.SQSource(this.visitSqlSource(e.sqlSource()));
+    const n = new ie.SQSource(this.visitSqlSource(e.sqlSource()));
     return this.astAt(n, e);
   }
   visitExperimentalStatementForTesting(e) {
-    return this.inExperiment("compilerTestExperimentParse", e), this.astAt(new se.ExperimentalExperiment("compilerTestExperimentTranslate"), e);
+    return this.inExperiment("compilerTestExperimentParse", e), this.astAt(new ie.ExperimentalExperiment("compilerTestExperimentTranslate"), e);
   }
   visitRecordRef(e) {
     const n = e.fieldPath(), r = n.fieldName().at(-1);
     if (r) {
-      const i = (0, Tn.getId)(r), s = new se.ExprIdReference(this.getFieldPath(n, se.ExpressionFieldReference));
-      return new se.RecordElement(i, s);
+      const i = (0, Tn.getId)(r), s = new ie.ExprIdReference(this.getFieldPath(n, ie.ExpressionFieldReference));
+      return new ie.RecordElement(i, s);
     }
     throw this.internalError(n, "IMPOSSIBLY A PATH CONTAINED ZERO ELEMENTS");
   }
   visitRecordExpr(e) {
     const n = (0, Tn.getId)(e.recordKey()), r = this.getFieldExpr(e.fieldExpr());
-    return new se.RecordElement(n, r);
+    return new ie.RecordElement(n, r);
   }
   visitExprLiteralRecord(e) {
-    const n = this.only(e.recordElement().map((r) => this.astAt(this.visit(r), r)), (r) => r instanceof se.RecordElement && r, "a key value pair");
-    return new se.RecordLiteral(n);
+    this.contextError(e, "not-yet-implemented", "Record data is not yet implemented");
+    const n = this.only(e.recordElement().map((r) => this.astAt(this.visit(r), r)), (r) => r instanceof ie.RecordElement && r, "a key value pair");
+    return new ie.RecordLiteral(n);
+  }
+  visitExprArrayLiteral(e) {
+    return this.contextError(e, "not-yet-implemented", "Array data is not yet implemented"), new ie.Unimplemented();
   }
   visitExprWarnLike(e) {
     let n = "~";
     const r = e.fieldExpr(0), i = e.fieldExpr(1), s = this.parseInfo.rangeFromContext(e);
-    return e.NOT() ? (n = "!~", this.warnWithReplacement("sql-not-like", "Use Malloy operator '!~' instead of 'NOT LIKE'", s, `${this.getSourceCode(r)} !~ ${this.getSourceCode(i)}`)) : this.warnWithReplacement("sql-like", "Use Malloy operator '~' instead of 'LIKE'", s, `${this.getSourceCode(r)} ~ ${this.getSourceCode(i)}`), this.astAt(new se.ExprCompare(this.getFieldExpr(r), n, this.getFieldExpr(i)), e);
+    return e.NOT() ? (n = "!~", this.warnWithReplacement("sql-not-like", "Use Malloy operator '!~' instead of 'NOT LIKE'", s, `${this.getSourceCode(r)} !~ ${this.getSourceCode(i)}`)) : this.warnWithReplacement("sql-like", "Use Malloy operator '~' instead of 'LIKE'", s, `${this.getSourceCode(r)} ~ ${this.getSourceCode(i)}`), this.astAt(new ie.ExprCompare(this.getFieldExpr(r), n, this.getFieldExpr(i)), e);
   }
   visitExprWarnNullCmp(e) {
     let n = "=";
     const r = e.fieldExpr(), i = this.parseInfo.rangeFromContext(e);
     e.NOT() ? (n = "!=", this.warnWithReplacement("sql-is-not-null", "Use '!= NULL' to check for NULL instead of 'IS NOT NULL'", i, `${this.getSourceCode(r)} != null`)) : this.warnWithReplacement("sql-is-null", "Use '= NULL' to check for NULL instead of 'IS NULL'", i, `${this.getSourceCode(r)} = null`);
-    const s = new se.ExprNULL();
-    return this.astAt(new se.ExprCompare(this.getFieldExpr(r), n, s), e);
+    const s = new ie.ExprNULL();
+    return this.astAt(new ie.ExprCompare(this.getFieldExpr(r), n, s), e);
   }
   visitExprWarnIn(e) {
-    const n = this.getFieldExpr(e.fieldExpr()), r = !!e.NOT(), i = e.fieldExprList().fieldExpr(), s = this.astAt(new se.ExprLegacyIn(n, r, i.map((o) => this.getFieldExpr(o))), e);
+    const n = this.getFieldExpr(e.fieldExpr()), r = !!e.NOT(), i = e.fieldExprList().fieldExpr(), s = this.astAt(new ie.ExprLegacyIn(n, r, i.map((o) => this.getFieldExpr(o))), e);
     return this.warnWithReplacement("sql-in", `Use = (a|b|c) instead of${r ? " NOT" : ""} IN (a,b,c)`, this.parseInfo.rangeFromContext(e), `${this.getSourceCode(e.fieldExpr())} ${r ? "!=" : "="} (${i.map((o) => this.getSourceCode(o)).join(" | ")})`), s;
   }
 }
@@ -55437,7 +55441,7 @@ var rJ = { exports: {} };
       return N;
     }
     i._split = X;
-    var ie = /\[[HhMmSs\u0E0A\u0E19\u0E17]*\]/;
+    var se = /\[[HhMmSs\u0E0A\u0E19\u0E17]*\]/;
     function oe(T) {
       for (var N = 0, B = "", q = ""; N < T.length; )
         switch (B = T.charAt(N)) {
@@ -55490,7 +55494,7 @@ var rJ = { exports: {} };
           case "[":
             for (q = B; T.charAt(N++) !== "]" && N < T.length; )
               q += T.charAt(N);
-            if (q.match(ie))
+            if (q.match(se))
               return !0;
             break;
           case ".":
@@ -55596,7 +55600,7 @@ var rJ = { exports: {} };
               z += T.charAt(P);
             if (z.slice(-1) !== "]")
               throw 'unterminated "[" block: |' + z + "|";
-            if (z.match(ie)) {
+            if (z.match(se)) {
               if (ue == null && (ue = C(N, B), ue == null))
                 return "";
               I[I.length] = { t: "Z", v: z.toLowerCase() }, he = z.charAt(1);
@@ -58079,7 +58083,7 @@ function SZ(t) {
     a: J,
     A: ne,
     b: X,
-    B: ie,
+    B: se,
     c: null,
     d: jj,
     e: jj,
@@ -58252,7 +58256,7 @@ function SZ(t) {
   function X(T) {
     return a[T.getMonth()];
   }
-  function ie(T) {
+  function se(T) {
     return u[T.getMonth()];
   }
   function oe(T) {
@@ -62765,17 +62769,17 @@ function VNe() {
         var G = oU(R / x * Ko(b)), K = oU(R / h * Ko(b));
         (S -= G * 2) > Nr ? (G *= y ? 1 : -1, v += G, _ -= G) : (S = 0, v = _ = (p + m) / 2), (C -= K * 2) > Nr ? (K *= y ? 1 : -1, E += K, A -= K) : (C = 0, E = A = (p + m) / 2);
       }
-      var J = h * Sc(E), ne = h * Ko(E), X = x * Sc(_), ie = x * Ko(_);
+      var J = h * Sc(E), ne = h * Ko(E), X = x * Sc(_), se = x * Ko(_);
       if (O > Nr) {
         var oe = h * Sc(A), Ee = h * Ko(A), D = x * Sc(v), k = x * Ko(v), j;
         if (g < oh)
-          if (j = WNe(J, ne, D, k, oe, Ee, X, ie)) {
+          if (j = WNe(J, ne, D, k, oe, Ee, X, se)) {
             var V = J - j[0], U = ne - j[1], $ = oe - j[0], T = Ee - j[1], N = 1 / Ko(PNe((V * $ + U * T) / (Uc(V * V + U * U) * Uc($ * $ + T * T))) / 2), B = Uc(j[0] * j[0] + j[1] * j[1]);
             L = uR(O, (x - B) / (N - 1)), M = uR(O, (h - B) / (N + 1));
           } else
             L = M = 0;
       }
-      C > Nr ? M > Nr ? (H = uE(D, k, J, ne, h, M, y), W = uE(oe, Ee, X, ie, h, M, y), u.moveTo(H.cx + H.x01, H.cy + H.y01), M < O ? u.arc(H.cx, H.cy, M, Dr(H.y01, H.x01), Dr(W.y01, W.x01), !y) : (u.arc(H.cx, H.cy, M, Dr(H.y01, H.x01), Dr(H.y11, H.x11), !y), u.arc(0, 0, h, Dr(H.cy + H.y11, H.cx + H.x11), Dr(W.cy + W.y11, W.cx + W.x11), !y), u.arc(W.cx, W.cy, M, Dr(W.y11, W.x11), Dr(W.y01, W.x01), !y))) : (u.moveTo(J, ne), u.arc(0, 0, h, E, A, !y)) : u.moveTo(J, ne), !(x > Nr) || !(S > Nr) ? u.lineTo(X, ie) : L > Nr ? (H = uE(X, ie, oe, Ee, x, -L, y), W = uE(J, ne, D, k, x, -L, y), u.lineTo(H.cx + H.x01, H.cy + H.y01), L < O ? u.arc(H.cx, H.cy, L, Dr(H.y01, H.x01), Dr(W.y01, W.x01), !y) : (u.arc(H.cx, H.cy, L, Dr(H.y01, H.x01), Dr(H.y11, H.x11), !y), u.arc(0, 0, x, Dr(H.cy + H.y11, H.cx + H.x11), Dr(W.cy + W.y11, W.cx + W.x11), y), u.arc(W.cx, W.cy, L, Dr(W.y11, W.x11), Dr(W.y01, W.x01), !y))) : u.arc(0, 0, x, _, v, y);
+      C > Nr ? M > Nr ? (H = uE(D, k, J, ne, h, M, y), W = uE(oe, Ee, X, se, h, M, y), u.moveTo(H.cx + H.x01, H.cy + H.y01), M < O ? u.arc(H.cx, H.cy, M, Dr(H.y01, H.x01), Dr(W.y01, W.x01), !y) : (u.arc(H.cx, H.cy, M, Dr(H.y01, H.x01), Dr(H.y11, H.x11), !y), u.arc(0, 0, h, Dr(H.cy + H.y11, H.cx + H.x11), Dr(W.cy + W.y11, W.cx + W.x11), !y), u.arc(W.cx, W.cy, M, Dr(W.y11, W.x11), Dr(W.y01, W.x01), !y))) : (u.moveTo(J, ne), u.arc(0, 0, h, E, A, !y)) : u.moveTo(J, ne), !(x > Nr) || !(S > Nr) ? u.lineTo(X, se) : L > Nr ? (H = uE(X, se, oe, Ee, x, -L, y), W = uE(J, ne, D, k, x, -L, y), u.lineTo(H.cx + H.x01, H.cy + H.y01), L < O ? u.arc(H.cx, H.cy, L, Dr(H.y01, H.x01), Dr(W.y01, W.x01), !y) : (u.arc(H.cx, H.cy, L, Dr(H.y01, H.x01), Dr(H.y11, H.x11), !y), u.arc(0, 0, x, Dr(H.cy + H.y11, H.cx + H.x11), Dr(W.cy + W.y11, W.cx + W.x11), y), u.arc(W.cx, W.cy, L, Dr(W.y11, W.x11), Dr(W.y01, W.x01), !y))) : u.arc(0, 0, x, _, v, y);
     }
     if (u.closePath(), c)
       return u = null, c + "" || null;
@@ -65477,8 +65481,8 @@ function rLe(t, e, n, r, i, s, o, u, a) {
   G < 0 && s === 1 ? G += uu : G > 0 && s === 0 && (G -= uu);
   const K = Math.ceil(Math.abs(G / (Bc + 1e-3))), J = [];
   for (let ne = 0; ne < K; ++ne) {
-    const X = H + ne * G / K, ie = H + (ne + 1) * G / K;
-    J[ne] = [L, M, X, ie, n, r, f, x];
+    const X = H + ne * G / K, se = H + (ne + 1) * G / K;
+    J[ne] = [L, M, X, se, n, r, f, x];
   }
   return pR[l] = J;
 }
@@ -69552,8 +69556,8 @@ function pke(t) {
         return W;
       var G = c[0], K = f[0], J = c[1], ne = f[1], X;
       K < G && (X = G, G = K, K = X);
-      var ie = K - G, oe = vt(ie - gt) < Ze, Ee = oe || ie < Ze;
-      if (!oe && ne < J && (X = J, J = ne, ne = X), Ee ? oe ? J + ne > 0 ^ W[1] < (vt(W[0] - G) < Ze ? J : ne) : J <= W[1] && W[1] <= ne : ie > gt ^ (G <= W[0] && W[0] <= K)) {
+      var se = K - G, oe = vt(se - gt) < Ze, Ee = oe || se < Ze;
+      if (!oe && ne < J && (X = J, J = ne, ne = X), Ee ? oe ? J + ne > 0 ^ W[1] < (vt(W[0] - G) < Ze ? J : ne) : J <= W[1] && W[1] <= ne : se > gt ^ (G <= W[0] && W[0] <= K)) {
         var D = yE(R, (-O + H) / L);
         return _R(D, C), [W, Xv(D)];
       }
@@ -69650,7 +69654,7 @@ function Vre(t, e, n, r) {
     }
     function R() {
       for (var G = 0, K = 0, J = h.length; K < J; ++K)
-        for (var ne = h[K], X = 1, ie = ne.length, oe = ne[0], Ee, D, k = oe[0], j = oe[1]; X < ie; ++X)
+        for (var ne = h[K], X = 1, se = ne.length, oe = ne[0], Ee, D, k = oe[0], j = oe[1]; X < se; ++X)
           Ee = k, D = j, oe = ne[X], k = oe[0], j = oe[1], D <= r ? j > r && (k - Ee) * (r - D) > (j - D) * (t - Ee) && ++G : j <= r && (k - Ee) * (r - D) < (j - D) * (t - Ee) && --G;
       return G;
     }
@@ -73921,13 +73925,13 @@ class vS {
         continue;
       let X = this._addTriangle(J, H, r[J], -1, -1, i[J]);
       i[H] = this._legalize(X + 2), i[J] = X, R++;
-      let ie = r[J];
-      for (; ne = r[ie], CE(W, G, e[2 * ie], e[2 * ie + 1], e[2 * ne], e[2 * ne + 1]) < 0; )
-        X = this._addTriangle(ie, H, ne, i[H], -1, i[ie]), i[H] = this._legalize(X + 2), r[ie] = ie, R--, ie = ne;
+      let se = r[J];
+      for (; ne = r[se], CE(W, G, e[2 * se], e[2 * se + 1], e[2 * ne], e[2 * ne + 1]) < 0; )
+        X = this._addTriangle(se, H, ne, i[H], -1, i[se]), i[H] = this._legalize(X + 2), r[se] = se, R--, se = ne;
       if (J === K)
         for (; ne = n[J], CE(W, G, e[2 * ne], e[2 * ne + 1], e[2 * J], e[2 * J + 1]) < 0; )
           X = this._addTriangle(ne, H, J, -1, i[J], i[ne]), this._legalize(X + 2), i[ne] = X, r[J] = J, R--, J = ne;
-      this._hullStart = n[H] = J, r[J] = n[ie] = H, r[H] = ie, s[this._hashKey(W, G)] = H, s[this._hashKey(e[2 * J], e[2 * J + 1])] = J;
+      this._hullStart = n[H] = J, r[J] = n[se] = H, r[H] = se, s[this._hashKey(W, G)] = H, s[this._hashKey(e[2 * J], e[2 * J + 1])] = J;
     }
     this.hull = new Uint32Array(R);
     for (let O = 0, L = this._hullStart; O < R; O++)
@@ -74120,8 +74124,8 @@ let dUe = class {
         const ne = 1e9 * Math.sign((s - C) * K - (o - b) * G);
         E = (C + L) / 2 - ne * K, A = (b + M) / 2 + ne * G;
       } else {
-        const ne = 1 / J, X = H * H + W * W, ie = G * G + K * K;
-        E = C + (K * X - W * ie) * ne, A = b + (H * ie - G * X) * ne;
+        const ne = 1 / J, X = H * H + W * W, se = G * G + K * K;
+        E = C + (K * X - W * se) * ne, A = b + (H * se - G * X) * ne;
       }
       u[g] = E, u[g + 1] = A;
     }
@@ -74616,8 +74620,8 @@ function CUe() {
       if (m.x = y + b, m.y = E + R, !(m.x + m.x0 < 0 || m.y + m.y0 < 0 || m.x + m.x1 > t[0] || m.y + m.y1 > t[1]) && (!g || !TUe(m, p, t[0])) && (!g || OUe(m, g))) {
         for (var O = m.sprite, L = m.width >> 5, M = t[0] >> 5, H = m.x - (L << 4), W = H & 127, G = 32 - W, K = m.y1 - m.y0, J = (m.y + m.y0) * M + (H >> 5), ne, X = 0; X < K; X++) {
           ne = 0;
-          for (var ie = 0; ie <= L; ie++)
-            p[J + ie] |= ne << G | (ie < L ? (ne = O[X * L + ie]) >>> W : 0);
+          for (var se = 0; se <= L; se++)
+            p[J + se] |= ne << G | (se < L ? (ne = O[X * L + se]) >>> W : 0);
           J += M;
         }
         return m.sprite = null, !0;
@@ -80102,8 +80106,8 @@ var foe = { exports: {} };
           y.push(_), E.push(C);
         }
         n(_, r) && _.forEach(function(J, ne) {
-          var X = v(ne, S - 1), ie = v(J, S - 1);
-          C.set(X, ie);
+          var X = v(ne, S - 1), se = v(J, S - 1);
+          C.set(X, se);
         }), n(_, i) && _.forEach(function(J) {
           var ne = v(J, S - 1);
           C.add(ne);
@@ -83413,7 +83417,7 @@ function jue(t, { config: e }) {
   ];
   if (x === "min-max")
     return Object.assign(Object.assign({}, a), { transform: ((r = a.transform) !== null && r !== void 0 ? r : []).concat(m), layer: X });
-  const ie = `datum["lower_box_${g.field}"]`, oe = `datum["upper_box_${g.field}"]`, Ee = `(${oe} - ${ie})`, D = `${ie} - ${c} * ${Ee}`, k = `${oe} + ${c} * ${Ee}`, j = `datum["${g.field}"]`, V = {
+  const se = `datum["lower_box_${g.field}"]`, oe = `datum["upper_box_${g.field}"]`, Ee = `(${oe} - ${se})`, D = `${se} - ${c} * ${Ee}`, k = `${oe} + ${c} * ${Ee}`, j = `datum["${g.field}"]`, V = {
     joinaggregate: Uue(g.field),
     groupby: E
   }, U = {
@@ -93084,11 +93088,11 @@ const Fit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, Lit = Fit,
     };
     if (n.root) {
       let ne = 0;
-      Object.entries(n.headerSizeStore[0]).sort(([ie], [oe]) => parseInt(ie) - parseInt(oe)).forEach(([ie, oe]) => {
-        J[`--malloy-render--table-header-height-${ie}`] = `${oe}px`, ne += oe, J[`--malloy-render--table-header-cumulative-height-${ie}`] = `${ne}px`;
+      Object.entries(n.headerSizeStore[0]).sort(([se], [oe]) => parseInt(se) - parseInt(oe)).forEach(([se, oe]) => {
+        J[`--malloy-render--table-header-height-${se}`] = `${oe}px`, ne += oe, J[`--malloy-render--table-header-cumulative-height-${se}`] = `${ne}px`;
       }), J["--total-header-size"] = n.layout.totalHeaderSize;
-      const X = o().map(([ie]) => {
-        const oe = n.store.columnWidths[ie];
+      const X = o().map(([se]) => {
+        const oe = n.store.columnWidths[se];
         return `minmax(${oe ? oe + "px" : "auto"}, max-content)`;
       }).join(" ");
       J["grid-template-columns"] = X;
@@ -93123,13 +93127,13 @@ const Fit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, Lit = Fit,
   id(() => {
     if (n.root) {
       const [K, J] = n.headerSizeStore, ne = new ResizeObserver((X) => {
-        const ie = X.reduce((oe, Ee) => {
+        const se = X.reduce((oe, Ee) => {
           const D = Ee.target.getAttribute("data-depth"), k = Ee.contentRect.height;
           return typeof D == "string" && K[D] !== k && (oe[D] = k), oe;
         }, {});
-        Object.entries(ie).length > 0 && J((oe) => ({
+        Object.entries(se).length > 0 && J((oe) => ({
           ...oe,
-          ...ie
+          ...se
         }));
       });
       v.forEach((X) => {
@@ -93160,10 +93164,10 @@ const Fit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, Lit = Fit,
       if (M || W) {
         const J = L.querySelectorAll("[data-pinned-header]"), ne = [];
         J.forEach((X) => {
-          const ie = X.getAttribute("data-pinned-header"), oe = X.clientWidth, Ee = n.store.columnWidths[ie];
-          (typeof Ee > "u" || oe > Ee) && ne.push([ie, oe]);
+          const se = X.getAttribute("data-pinned-header"), oe = X.clientWidth, Ee = n.store.columnWidths[se];
+          (typeof Ee > "u" || oe > Ee) && ne.push([se, oe]);
         }), ne.length > 0 && n.setStore("columnWidths", ait((X) => {
-          ne.forEach(([ie, oe]) => X[ie] = oe);
+          ne.forEach(([se, oe]) => X[se] = oe);
         })), setTimeout(() => W = !1, 0);
       }
     }).observe(L);
@@ -93173,8 +93177,8 @@ const Fit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, Lit = Fit,
       new ResizeObserver((ne) => {
         if (!M && !W) {
           const [X] = ne;
-          K !== X.contentRect.width && (K = X.contentRect.width, n.setStore((ie) => ({
-            ...ie,
+          K !== X.contentRect.width && (K = X.contentRect.width, n.setStore((se) => ({
+            ...se,
             columnWidths: {}
           })));
         }
@@ -93205,9 +93209,9 @@ const Fit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, Lit = Fit,
             get each() {
               return x();
             },
-            children: (X, ie) => (() => {
+            children: (X, se) => (() => {
               var oe = Nit();
-              return iu((Ee) => v[ie()] = Ee, oe), At(oe, ot(ts, {
+              return iu((Ee) => v[se()] = Ee, oe), At(oe, ot(ts, {
                 each: X,
                 children: (Ee) => ot(yQ, {
                   get field() {
@@ -93215,7 +93219,7 @@ const Fit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, Lit = Fit,
                   },
                   isPinned: !0
                 })
-              })), $r(() => du(oe, "data-depth", ie())), oe;
+              })), $r(() => du(oe, "data-depth", se())), oe;
             })()
           })), $r((X) => Dd(J, G(), X)), J;
         })()];
@@ -93227,10 +93231,10 @@ const Fit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, Lit = Fit,
         return J.style.setProperty("width", "100%"), J.style.setProperty("position", "relative"), ne.style.setProperty("height", "fit-content"), ne.style.setProperty("width", "100%"), At(ne, ot(ts, {
           each: O,
           children: (X) => (() => {
-            var ie = dO();
+            var se = dO();
             return iu((oe) => queueMicrotask(() => {
               S.measureElement(oe), X.index === 0 && b(oe.clientHeight);
-            }), ie), At(ie, ot(Bl, {
+            }), se), At(se, ot(Bl, {
               get when() {
                 return X.index >= 0;
               },
@@ -93247,12 +93251,12 @@ const Fit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, Lit = Fit,
                   })
                 });
               }
-            })), $r(() => du(ie, "data-index", X.index)), ie;
+            })), $r(() => du(se, "data-index", X.index)), se;
           })()
         })), $r((X) => {
           var Ee;
-          var ie = S.getTotalSize() + "px", oe = `${((Ee = O[0]) == null ? void 0 : Ee.start) ?? 0}px`;
-          return ie !== X.e && ((X.e = ie) != null ? J.style.setProperty("height", ie) : J.style.removeProperty("height")), oe !== X.t && ((X.t = oe) != null ? ne.style.setProperty("padding-top", oe) : ne.style.removeProperty("padding-top")), X;
+          var se = S.getTotalSize() + "px", oe = `${((Ee = O[0]) == null ? void 0 : Ee.start) ?? 0}px`;
+          return se !== X.e && ((X.e = se) != null ? J.style.setProperty("height", se) : J.style.removeProperty("height")), oe !== X.t && ((X.t = oe) != null ? ne.style.setProperty("padding-top", oe) : ne.style.removeProperty("padding-top")), X;
         }, {
           e: void 0,
           t: void 0
@@ -93303,8 +93307,8 @@ const Fit = navigator.userAgent.toLowerCase().indexOf("chrome") >= 0, Lit = Fit,
         })];
       }
     }), null), $r((J) => {
-      var ne = !!n.root, X = !!A(), ie = n.root ? "table-container" : "", oe = u();
-      return ne !== J.e && K.classList.toggle("root", J.e = ne), X !== J.t && K.classList.toggle("pinned", J.t = X), ie !== J.a && du(K, "part", J.a = ie), J.o = Dd(K, oe, J.o), J;
+      var ne = !!n.root, X = !!A(), se = n.root ? "table-container" : "", oe = u();
+      return ne !== J.e && K.classList.toggle("root", J.e = ne), X !== J.t && K.classList.toggle("pinned", J.t = X), se !== J.a && du(K, "part", J.a = se), J.o = Dd(K, oe, J.o), J;
     }, {
       e: void 0,
       t: void 0,
@@ -93610,9 +93614,9 @@ function nB(t, e, n, r) {
     e.fields[b].max
   ], L = Ot("linear")().domain([R, O]).nice().range([a, 0]), M = L.domain();
   if (v) {
-    const J = L.domain().at(1), ne = L.domain().at(0), X = LZ(), ie = X.format(",")(ne), oe = X.format(",")(J);
+    const J = L.domain().at(1), ne = L.domain().at(0), X = LZ(), se = X.format(",")(ne), oe = X.format(",")(J);
     h = Math.max(
-      W6(ie, "10px Inter, sans-serif") + 4,
+      W6(se, "10px Inter, sans-serif") + 4,
       W6(oe, "10px Inter, sans-serif") + 4
     ) + 5 + 31;
     const k = Math.ceil(a / 40), V = L.ticks(k).at(-1);
@@ -93622,8 +93626,8 @@ function nB(t, e, n, r) {
     }
   }
   if (A) {
-    const J = Us(i), ne = e.fields[J].maxString, X = W6(ne, "10px Inter, sans-serif") + 4, ie = 1;
-    E = 26, x = Math.min(X, ie * a), y = x;
+    const J = Us(i), ne = e.fields[J].maxString, X = W6(ne, "10px Inter, sans-serif") + 4, se = 1;
+    E = 26, x = Math.min(X, se * a), y = x;
     const oe = e.fields[J].values.size, D = oe <= 20 ? oe : _.maxUniqueFieldValueCounts.get(
       e.getFieldKey(i)
     ), k = u / D;
@@ -146384,8 +146388,8 @@ function yst(t, e, n, r) {
     throw new Error("Malloy Bar Chart: Missing y field");
   const u = ss(t, i), a = ss(t, s), l = o ? ss(t, o) : null;
   let c = 1 / 0, f = -1 / 0;
-  for (const ie of e.yChannel.fields) {
-    const oe = ss(t, ie), Ee = n.field(oe).min;
+  for (const se of e.yChannel.fields) {
+    const oe = ss(t, se), Ee = n.field(oe).min;
     Ee !== null && (c = Math.min(c, Ee));
     const D = n.field(oe).max;
     D !== null && (f = Math.max(f, D));
@@ -146490,7 +146494,7 @@ function yst(t, e, n, r) {
   }, G = l || e.yChannel.fields.length > 1;
   let K = 0;
   G && (l ? (K = ((X = n.field(l).maxString) == null ? void 0 : X.length) ?? 0, K = Math.max(K, l.name.length)) : K = e.yChannel.fields.reduce(
-    (ie, oe) => Math.max(ie, oe.length),
+    (se, oe) => Math.max(se, oe.length),
     K
   ));
   const J = Math.min(
@@ -146675,7 +146679,7 @@ function Sst(t, e, n, r) {
   ], W.encoding.y.field = "value", W.encoding.color.field = "key", delete W.encoding.color.datum, [...e.yChannel.fields], X.title = "", W.encoding.color.legend = X, W.encoding.y.axis.title = ""), e.isStreamGraph && (W.encoding.y.stack = "center", W.encoding.y.axis = null, W.encoding.x.axis.grid = !0, W.mark.line = !1, W.encoding.opacity = { value: 1 }, W.encoding.fillOpacity = { value: 1 }), e.isDiffChart && (W.encoding.y2 = {
     field: e.y2Channel.fields.at(0)
   });
-  const ie = [W];
+  const se = [W];
   e.isDiffChart && !e.isDimensionalSeries && (G.transform = [
     {
       fold: [...h]
@@ -146685,7 +146689,7 @@ function Sst(t, e, n, r) {
     legend: X
   }, X.title = "", W.encoding.color.legend = null, W.encoding.y.axis.title = "", G.encoding.y.axis.title = "", W.encoding.y2 = {
     field: e.y2Channel.fields.at(0)
-  }, ie.push(G));
+  }, se.push(G));
   const oe = g.padding;
   return K && (oe.right = ne), {
     spec: {
@@ -146700,7 +146704,7 @@ function Sst(t, e, n, r) {
       padding: oe,
       data: { values: [] },
       params: [{ name: "dataLength", expr: "length(data('source_0'))" }],
-      layer: ie
+      layer: se
     },
     specType: "vega-lite",
     plotWidth: g.plotWidth,