@malloydata/render 0.0.236-dev250219154103 → 0.0.236-dev250221173808

package/dist/module/index.mjs

@@ -39047,6 +39047,7 @@ function PA(t, e, n, r = void 0) {
       d = y;
     } else
       return { error: { code: "not_a_composite_source", data: { path: t } } };
+  f.arguments = e.arguments;
   const p = {}, g = (a = r == null ? void 0 : r.joined) !== null && a !== void 0 ? a : {};
   for (const m of f.fields)
     p[(l = m.as) !== null && l !== void 0 ? l : m.name] = m;
@@ -52958,7 +52959,7 @@ const N6e = (t, e, n) => {
   for (const s of n) {
     const o = !s.currentToken || i.type === s.currentToken, u = !s.offendingSymbol || (e == null ? void 0 : e.type) === s.offendingSymbol, a = !s.ruleContextOptions || s.ruleContextOptions.includes(r);
     if (o && u && a) {
-      if (s.precedingTokenOptions && !s.precedingTokenOptions.some((f) => SU(t, f, "lookback")) || s.lookAheadOptions && !s.lookAheadOptions.some((f) => SU(t, f, "lookahead")))
+      if (s.precedingTokenOptions && !s.precedingTokenOptions.some((f) => SU(t, f, "lookback", s.lookbackFromOffendingSymbol ? e == null ? void 0 : e.tokenIndex : void 0)) || s.lookAheadOptions && !s.lookAheadOptions.some((f) => SU(t, f, "lookahead", s.lookbackFromOffendingSymbol ? e == null ? void 0 : e.tokenIndex : void 0)))
         continue;
       return s.errorMessage.replace("${currentToken}", (e == null ? void 0 : e.text) || i.text || "");
     }
@@ -52966,11 +52967,18 @@ const N6e = (t, e, n) => {
   return "";
 };
 h3.checkCustomErrorMessage = N6e;
-const SU = (t, e, n) => {
+const SU = (t, e, n, r) => {
   try {
-    for (let r = 0; r < e.length; r++) {
-      const i = n === "lookahead" ? r + 2 : -1 * (r + 1), s = t.inputStream.LA(i);
-      if (e[r] >= -1 && s !== e[r] || e[r] < -1 && s === -1 * e[r])
+    for (let i = 0; i < e.length; i++) {
+      let s;
+      if (typeof r == "number") {
+        const o = n === "lookahead" ? i + 1 : -1 * (i + 1);
+        s = t.inputStream.get(r + o).type;
+      } else {
+        const o = n === "lookahead" ? i + 2 : -1 * (i + 1);
+        s = t.inputStream.LA(o);
+      }
+      if (e[i] >= -1 && s !== e[i] || e[i] < -1 && s === -1 * e[i])
         return !1;
     }
     return !0;
@@ -53028,6 +53036,12 @@ var ZJ = {};
         [e.MalloyParser.RUN],
         [e.MalloyParser.SOURCE]
       ]
+    },
+    {
+      errorMessage: "'aggregate:' entries must include a name (ex: `some_name is count()`)",
+      precedingTokenOptions: [[e.MalloyParser.AGGREGATE]],
+      lookAheadOptions: [[-e.MalloyParser.IS]],
+      lookbackFromOffendingSymbol: !0
     }
   ];
   class i {