@object-ui/plugin-report 17.6.0 → 17.7.0

package/dist/index.js

@@ -1,56 +1,56 @@
-import { ComponentRegistry as e, buildCategoryOrder as t, buildChartSeries as n, buildDatasetDrillFilter as r, buildDatasetFieldHelpers as i, buildOptionColorMap as a, chartConfigPresentation as o, deriveDimensionLabelMaps as s, dimensionOptionTranslator as c, formatDimensionValue as l, formatMeasure as u, localizeFieldOptions as d, mergeAuthoredSeries as f, mergeFilters as p, pivotBucketId as m, pivotCellKey as h, pivotDimensionValue as g, relabelDimensions as _ } from "@object-ui/core";
-import * as v from "react";
-import y from "react";
-import { isSpecReport as b, specReportToPresentation as x } from "@object-ui/types";
-import { SchemaRenderer as S, SchemaRendererContext as C, toRenderableSchema as w, useDatasetDimensionLabels as T, useDatasetDimensionMeta as E } from "@object-ui/react";
-import { Badge as D, Button as O, Card as k, CardContent as A, CardDescription as j, CardHeader as M, CardTitle as N, Skeleton as P } from "@object-ui/components";
-import { jsx as F, jsxs as I } from "react/jsx-runtime";
-import { AlertTriangle as ee, Download as L, Loader2 as te, Printer as R, RefreshCw as ne, Table2 as re } from "lucide-react";
-import { getCellRenderer as ie, resolveCellRendererType as ae } from "@object-ui/fields";
-import { pickLocalized as oe, useDisplayLocale as z, useObjectTranslation as se, useSafeFieldLabel as B, useSafeTranslate as V } from "@object-ui/i18n";
+import { ComponentRegistry as e, FilterOperatorError as t, buildCategoryOrder as n, buildChartSeries as r, buildDatasetDrillFilter as i, buildDatasetFieldHelpers as a, buildOptionColorMap as o, chartConfigPresentation as s, deriveDimensionLabelMaps as c, dimensionOptionTranslator as l, formatDimensionValue as u, formatMeasure as d, localizeFieldOptions as f, mergeAuthoredSeries as p, mergeFilters as m, pivotBucketId as h, pivotCellKey as g, pivotDimensionValue as _, relabelDimensions as v, toDisplayDate as y } from "@object-ui/core";
+import * as b from "react";
+import x from "react";
+import { isSpecReport as S, specReportToPresentation as C } from "@object-ui/types";
+import { SchemaRenderer as w, SchemaRendererContext as T, toRenderableSchema as E, useDataInvalidation as D, useDatasetDimensionLabels as O, useDatasetDimensionMeta as k } from "@object-ui/react";
+import { Badge as A, Button as j, Card as M, CardContent as N, CardDescription as P, CardHeader as F, CardTitle as I, Skeleton as L, renderNodeSlot as ee } from "@object-ui/components";
+import { jsx as R, jsxs as z } from "react/jsx-runtime";
+import { AlertTriangle as te, Download as B, Loader2 as ne, Printer as re, RefreshCw as ie, Table2 as ae } from "lucide-react";
+import { getCellRenderer as oe, resolveCellRendererType as se } from "@object-ui/fields";
+import { builtinAggregateLabels as V, pickLocalized as ce, useDisplayLocale as H, useObjectTranslation as le, useSafeFieldLabel as U, useSafeTranslate as W } from "@object-ui/i18n";
 //#region src/LegacyReportRenderer.tsx
-var H = ({ schema: t }) => {
+var ue = ({ schema: t }) => {
 	let { title: n, description: r, data: i, columns: a } = t;
 	t.chart?.type;
 	let o = !!t.chart;
-	return /* @__PURE__ */ I(k, {
+	return /* @__PURE__ */ z(M, {
 		className: `h-full flex flex-col ${t.className || ""}`,
-		children: [/* @__PURE__ */ I(M, { children: [n && /* @__PURE__ */ F(N, { children: n }), r && /* @__PURE__ */ F(j, { children: r })] }), /* @__PURE__ */ I(A, {
+		children: [/* @__PURE__ */ z(F, { children: [n && /* @__PURE__ */ R(I, { children: n }), r && /* @__PURE__ */ R(P, { children: r })] }), /* @__PURE__ */ z(N, {
 			className: "flex-1 overflow-auto space-y-4",
 			children: [o && (() => {
 				let n = t.chart?.type, r = n ? e.get(n) : null;
-				return r ||= e.get("chart"), r ? /* @__PURE__ */ F("div", {
+				return r ||= e.get("chart"), r ? /* @__PURE__ */ R("div", {
 					className: "min-h-[300px] border rounded-lg p-4 bg-background/50",
-					children: /* @__PURE__ */ F(r, { schema: {
+					children: /* @__PURE__ */ R(r, { schema: {
 						...t.chart,
 						data: t.chart.data || i
 					} })
-				}) : /* @__PURE__ */ I("div", {
+				}) : /* @__PURE__ */ z("div", {
 					className: "min-h-[100px] border rounded-md p-4 bg-muted/20 text-muted-foreground flex items-center justify-center",
 					children: ["Unknown component type: ", n || "chart"]
 				});
-			})(), i && i.length > 0 && /* @__PURE__ */ F("div", {
+			})(), i && i.length > 0 && /* @__PURE__ */ R("div", {
 				className: "border rounded-lg",
 				children: (() => {
 					let t = e.get("grid") || e.get("table");
-					return t ? /* @__PURE__ */ F(t, { schema: {
+					return t ? /* @__PURE__ */ R(t, { schema: {
 						type: "grid",
 						rowData: i,
 						columnDefs: a,
 						domLayout: "autoHeight"
-					} }) : /* @__PURE__ */ F("div", {
+					} }) : /* @__PURE__ */ R("div", {
 						className: "overflow-x-auto",
-						children: /* @__PURE__ */ I("table", {
+						children: /* @__PURE__ */ z("table", {
 							className: "w-full text-sm text-left",
-							children: [/* @__PURE__ */ F("thead", {
+							children: [/* @__PURE__ */ R("thead", {
 								className: "text-xs uppercase bg-muted",
-								children: /* @__PURE__ */ F("tr", { children: a?.map((e) => /* @__PURE__ */ F("th", {
+								children: /* @__PURE__ */ R("tr", { children: a?.map((e) => /* @__PURE__ */ R("th", {
 									className: "px-6 py-3",
 									children: e.headerName || e.label || e.field
 								}, e.field)) })
-							}), /* @__PURE__ */ F("tbody", { children: i.map((e, t) => /* @__PURE__ */ F("tr", {
+							}), /* @__PURE__ */ R("tbody", { children: i.map((e, t) => /* @__PURE__ */ R("tr", {
 								className: "bg-background border-b",
-								children: a?.map((t) => /* @__PURE__ */ F("td", {
+								children: a?.map((t) => /* @__PURE__ */ R("td", {
 									className: "px-6 py-4",
 									children: e[t.field]
 								}, t.field))
@@ -62,33 +62,40 @@ var H = ({ schema: t }) => {
 		})]
 	});
 };
+function G(e, t, n) {
+	try {
+		return e.toLocaleString(t, n);
+	} catch {
+		return e.toLocaleString("en", n);
+	}
+}
 //#endregion
 //#region src/ReportExportEngine.ts
-function ce(e, t, n) {
+function de(e, t, n) {
 	let r = e.fields || [], i = r.map((e) => e.label || e.name), a = t.map((e) => r.map((t) => {
 		let n = e[t.name];
-		return n = fe(n), typeof n == "string" && (n.includes(",") || n.includes("\"") || n.includes("\n")) ? `"${n.replace(/"/g, "\"\"")}"` : n ?? "";
+		return n = ge(n), typeof n == "string" && (n.includes(",") || n.includes("\"") || n.includes("\n")) ? `"${n.replace(/"/g, "\"\"")}"` : n ?? "";
 	}));
-	K([...n?.includeHeaders === !1 ? [] : [i.join(",")], ...a.map((e) => e.join(","))].join("\n"), n?.filename || `${e.title || "report"}.csv`, "text/csv");
+	J([...n?.includeHeaders === !1 ? [] : [i.join(",")], ...a.map((e) => e.join(","))].join("\n"), n?.filename || `${e.title || "report"}.csv`, "text/csv");
 }
-function le(e, t, n) {
+function fe(e, t, n) {
 	let r = {
 		title: e.title,
 		description: e.description,
 		generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
 		data: t
 	};
-	K(JSON.stringify(r, null, 2), n?.filename || `${e.title || "report"}.json`, "application/json");
+	J(JSON.stringify(r, null, 2), n?.filename || `${e.title || "report"}.json`, "application/json");
 }
-function U(e, t, n) {
-	let r = e.fields || [], i = me(n?.orientation), a = pe(n?.pageSize);
-	K(`<!DOCTYPE html>
+function K(e, t, n, r = "en") {
+	let i = e.fields || [], a = ve(n?.orientation), o = _e(n?.pageSize);
+	J(`<!DOCTYPE html>
 <html>
 <head>
 <meta charset="utf-8">
-<title>${G(e.title || "Report")}</title>
+<title>${q(e.title || "Report")}</title>
 <style>
-  @page { size: ${a} ${i}; margin: 20mm; }
+  @page { size: ${o} ${a}; margin: 20mm; }
   body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; color: #333; }
   h1 { font-size: 24px; margin-bottom: 8px; }
   .description { color: #666; margin-bottom: 24px; }
@@ -100,33 +107,33 @@ function U(e, t, n) {
 </style>
 </head>
 <body>
-<h1>${G(e.title || "Report")}</h1>
-${e.description ? `<p class="description">${G(e.description)}</p>` : ""}
-<p class="meta">Generated: ${(/* @__PURE__ */ new Date()).toLocaleString()}</p>
+<h1>${q(e.title || "Report")}</h1>
+${e.description ? `<p class="description">${q(e.description)}</p>` : ""}
+<p class="meta">Generated: ${(/* @__PURE__ */ new Date()).toLocaleString(r)}</p>
 <table>
-<thead><tr>${r.map((e) => `<th>${G(e.label || e.name)}</th>`).join("")}</tr></thead>
-<tbody>${t.map((e) => `<tr>${r.map((t) => `<td>${G(String(e[t.name] ?? ""))}</td>`).join("")}</tr>`).join("")}</tbody>
+<thead><tr>${i.map((e) => `<th>${q(e.label || e.name)}</th>`).join("")}</tr></thead>
+<tbody>${t.map((e) => `<tr>${i.map((t) => `<td>${q(String(e[t.name] ?? ""))}</td>`).join("")}</tr>`).join("")}</tbody>
 </table>
 </body>
 </html>`, n?.filename || `${e.title || "report"}.html`, "text/html");
 }
-function ue(e, t, n) {
-	let r = e.fields || [], i = me(n?.orientation), a = pe(n?.pageSize), o = window.open("", "_blank");
-	if (!o) {
-		U(e, t, {
+function pe(e, t, n, r = "en") {
+	let i = e.fields || [], a = ve(n?.orientation), o = _e(n?.pageSize), s = window.open("", "_blank");
+	if (!s) {
+		K(e, t, {
 			...n,
 			format: "html",
 			filename: n?.filename?.replace(/\.pdf$/, ".html") || `${e.title || "report"}.html`
-		});
+		}, r);
 		return;
 	}
-	o.document.write(`<!DOCTYPE html>
+	s.document.write(`<!DOCTYPE html>
 <html>
 <head>
 <meta charset="utf-8">
-<title>${G(e.title || "Report")}</title>
+<title>${q(e.title || "Report")}</title>
 <style>
-  @page { size: ${a} ${i}; margin: 20mm; }
+  @page { size: ${o} ${a}; margin: 20mm; }
   @media print { .no-print { display: none; } }
   body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; color: #333; }
   h1 { font-size: 24px; margin-bottom: 8px; }
@@ -139,56 +146,56 @@ function ue(e, t, n) {
 </style>
 </head>
 <body>
-<h1>${G(e.title || "Report")}</h1>
-${e.description ? `<p class="description">${G(e.description)}</p>` : ""}
-<p class="meta">Generated: ${(/* @__PURE__ */ new Date()).toLocaleString()}</p>
+<h1>${q(e.title || "Report")}</h1>
+${e.description ? `<p class="description">${q(e.description)}</p>` : ""}
+<p class="meta">Generated: ${(/* @__PURE__ */ new Date()).toLocaleString(r)}</p>
 <table>
-<thead><tr>${r.map((e) => `<th>${G(e.label || e.name)}</th>`).join("")}</tr></thead>
-<tbody>${t.map((e) => `<tr>${r.map((t) => `<td>${G(String(e[t.name] ?? ""))}</td>`).join("")}</tr>`).join("")}</tbody>
+<thead><tr>${i.map((e) => `<th>${q(e.label || e.name)}</th>`).join("")}</tr></thead>
+<tbody>${t.map((e) => `<tr>${i.map((t) => `<td>${q(String(e[t.name] ?? ""))}</td>`).join("")}</tr>`).join("")}</tbody>
 </table>
 </body>
-</html>`), o.document.close(), o.onload = () => {
-		o.print();
+</html>`), s.document.close(), s.onload = () => {
+		s.print();
 	};
 }
-function de(e, t, n) {
+function me(e, t, n) {
 	let r = e.fields || [], i = r.map((e) => e.label || e.name), a = t.map((e) => r.map((t) => {
 		let n = e[t.name];
-		return n = fe(n), typeof n == "string" && (n.includes(",") || n.includes("\"") || n.includes("\n") || n.includes("	")) ? `"${n.replace(/"/g, "\"\"")}"` : n ?? "";
+		return n = ge(n), typeof n == "string" && (n.includes(",") || n.includes("\"") || n.includes("\n") || n.includes("	")) ? `"${n.replace(/"/g, "\"\"")}"` : n ?? "";
 	}));
-	K("" + [...n?.includeHeaders === !1 ? [] : [i.join("	")], ...a.map((e) => e.join("	"))].join("\n"), n?.filename || `${e.title || "report"}.tsv`, "text/tab-separated-values");
+	J("" + [...n?.includeHeaders === !1 ? [] : [i.join("	")], ...a.map((e) => e.join("	"))].join("\n"), n?.filename || `${e.title || "report"}.tsv`, "text/tab-separated-values");
 }
-function W(e, t, n, r) {
+function he(e, t, n, r, i = "en") {
 	switch (e) {
 		case "csv":
-			ce(t, n, r);
+			de(t, n, r);
 			break;
 		case "json":
-			le(t, n, r);
+			fe(t, n, r);
 			break;
 		case "html":
-			U(t, n, r);
+			K(t, n, r, i);
 			break;
 		case "pdf":
-			ue(t, n, r);
+			pe(t, n, r, i);
 			break;
 		case "excel":
-			de(t, n, r);
+			me(t, n, r);
 			break;
 		default: console.warn(`Unsupported export format: ${e}`);
 	}
 }
-function G(e) {
+function q(e) {
 	return e.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
 }
-function fe(e) {
+function ge(e) {
 	if (typeof e == "string" && e.length > 0) {
 		let t = e.charAt(0);
 		if (t === "=" || t === "+" || t === "-" || t === "@" || t === "|") return `\t${e}`;
 	}
 	return e;
 }
-function pe(e) {
+function _e(e) {
 	return [
 		"A4",
 		"A3",
@@ -196,40 +203,40 @@ function pe(e) {
 		"Legal"
 	].includes(e || "") ? e : "A4";
 }
-function me(e) {
+function ve(e) {
 	return e === "landscape" ? "landscape" : "portrait";
 }
-function K(e, t, n) {
+function J(e, t, n) {
 	let r = new Blob([e], { type: `${n};charset=utf-8` }), i = URL.createObjectURL(r), a = document.createElement("a");
 	a.href = i, a.download = t, document.body.appendChild(a), a.click(), document.body.removeChild(a), URL.revokeObjectURL(i);
 }
 //#endregion
 //#region src/formatValue.ts
-function q(e, t) {
+function Y(e, t, n = "en") {
 	if (e == null || e === "") return "";
-	let n = t?.type, r = t?.format;
-	if (n === "date" || r === "date" || he(e)) return ge(e);
-	if (n === "number" || typeof e == "number") {
+	let r = t?.type, i = t?.format;
+	if (r === "date" || i === "date" || ye(e)) return be(e);
+	if (r === "number" || typeof e == "number") {
 		let t = typeof e == "number" ? e : Number(e);
-		return isNaN(t) ? String(e) : r === "currency" || r === "currency_cny" ? `¥${t.toLocaleString("en-US", {
+		return isNaN(t) ? String(e) : i === "currency" || i === "currency_cny" ? `¥${G(t, n, {
 			minimumFractionDigits: 0,
 			maximumFractionDigits: 0
-		})}` : r === "currency_usd" ? `$${t.toLocaleString("en-US", {
+		})}` : i === "currency_usd" ? `$${G(t, n, {
 			minimumFractionDigits: 0,
 			maximumFractionDigits: 0
-		})}` : r === "percent" ? `${t.toLocaleString("en-US", {
+		})}` : i === "percent" ? `${G(t, n, {
 			minimumFractionDigits: 1,
 			maximumFractionDigits: 1
-		})}%` : t.toLocaleString("en-US");
+		})}%` : G(t, n);
 	}
 	return String(e);
 }
-function he(e) {
+function ye(e) {
 	return typeof e == "string" && /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2})?/.test(e);
 }
-function ge(e) {
+function be(e) {
 	try {
-		let t = new Date(e);
+		let t = y(e);
 		return isNaN(t.getTime()) ? String(e) : `${t.getFullYear()}-${String(t.getMonth() + 1).padStart(2, "0")}-${String(t.getDate()).padStart(2, "0")}`;
 	} catch {
 		return String(e);
@@ -237,7 +244,7 @@ function ge(e) {
 }
 //#endregion
 //#region src/ReportViewer.tsx
-function _e(e, t) {
+function xe(e, t) {
 	if (!t || t.length === 0 || !e || e.length === 0) return null;
 	let n = t[0], r = n.field, i = /* @__PURE__ */ new Map();
 	for (let t of e) {
@@ -253,7 +260,7 @@ function _e(e, t) {
 	let o = n.sort === "desc" ? -1 : 1;
 	return a.sort((e, t) => e.key.localeCompare(t.key) * o), a;
 }
-function ve(e, t, n) {
+function Se(e, t, n) {
 	if (!e) return 0;
 	let r = e.map((e) => Number(e[t]) || 0);
 	switch (n) {
@@ -266,20 +273,20 @@ function ve(e, t, n) {
 		default: return "";
 	}
 }
-var J = ({ schema: e, onRefresh: t }) => {
-	let { report: n, data: r, showToolbar: i = !0, allowExport: a = !0, allowPrint: o = !0, loading: s = !1 } = e, c = V(), l = (e) => {
+var Ce = ({ schema: e, onRefresh: t }) => {
+	let { report: n, data: r, showToolbar: i = !0, allowExport: a = !0, allowPrint: o = !0, loading: s = !1 } = e, c = W(), l = H(), u = (e) => {
 		if (!n) {
 			console.warn("ReportViewer: Cannot export, no report defined");
 			return;
 		}
-		W(e, n, r || [], n.exportConfigs?.[e]);
-	}, u = c("common.printDialogHint", "Opens your browser’s print dialog (not a PDF export)"), d = () => {
+		he(e, n, r || [], n.exportConfigs?.[e], l);
+	}, d = c("common.printDialogHint", "Opens your browser’s print dialog (not a PDF export)"), f = () => {
 		window.print();
-	}, f = () => {
+	}, p = () => {
 		t?.();
-	}, p = (e, t) => ve(r, e, t), m = (e, t) => {
+	}, m = (e, t) => Se(r, e, t), h = (e, t) => {
 		let r = n?.conditionalFormatting;
-		if (!(!r || !Array.isArray(r))) for (let n of r) {
+		if (r && Array.isArray(r)) for (let n of r) {
 			if (n.field !== e) continue;
 			let r = String(t ?? ""), i = String(n.value ?? ""), a = !1;
 			switch (n.operator) {
@@ -302,16 +309,16 @@ var J = ({ schema: e, onRefresh: t }) => {
 				return n.backgroundColor && (e.backgroundColor = n.backgroundColor), n.textColor && (e.color = n.textColor), e;
 			}
 		}
-	}, h = (e, t) => {
+	}, g = (e, t) => {
 		if (e == null || e === "") return "";
 		if (t.renderAs === "badge" && (!t.type || t.type === "string" || t.type === "text")) {
 			let n = t.colorMap?.[String(e)] || "";
-			return /* @__PURE__ */ F(D, {
+			return /* @__PURE__ */ R(A, {
 				className: n,
 				children: String(e)
 			});
 		}
-		if (t.aggregation) return q(e, t);
+		if (t.aggregation) return Y(e, t, l);
 		if (t.type) {
 			let n = { ...t };
 			t.colorMap && !n.options && (n.options = Object.entries(t.colorMap).map(([e, t]) => ({
@@ -319,132 +326,132 @@ var J = ({ schema: e, onRefresh: t }) => {
 				label: e,
 				color: t
 			})));
-			let r = ie(ae(n));
-			return /* @__PURE__ */ F(r, {
+			let r = oe(se(n));
+			return /* @__PURE__ */ R(r, {
 				value: e,
 				field: n
 			});
 		}
-		return q(e, t);
+		return Y(e, t, l);
 	};
-	return n ? /* @__PURE__ */ I("div", {
+	return n ? /* @__PURE__ */ z("div", {
 		className: "space-y-4",
-		children: [i && /* @__PURE__ */ I("div", {
+		children: [i && /* @__PURE__ */ z("div", {
 			className: "flex items-center justify-between gap-2 p-4 bg-card rounded-lg border",
-			children: [/* @__PURE__ */ I("div", { children: [/* @__PURE__ */ F("h2", {
+			children: [/* @__PURE__ */ z("div", { children: [/* @__PURE__ */ R("h2", {
 				className: "text-lg font-semibold",
 				children: n.title
-			}), n.description && /* @__PURE__ */ F("p", {
+			}), n.description && /* @__PURE__ */ R("p", {
 				className: "text-sm text-muted-foreground",
 				children: n.description
-			})] }), /* @__PURE__ */ I("div", {
+			})] }), /* @__PURE__ */ z("div", {
 				className: "flex items-center gap-2",
 				"data-print-hide": !0,
 				children: [
-					n.refreshInterval && /* @__PURE__ */ I(O, {
+					n.refreshInterval && /* @__PURE__ */ z(j, {
 						variant: "outline",
 						size: "sm",
-						onClick: f,
-						children: [/* @__PURE__ */ F(ne, { className: "h-4 w-4 mr-2" }), "Refresh"]
+						onClick: p,
+						children: [/* @__PURE__ */ R(ie, { className: "h-4 w-4 mr-2" }), "Refresh"]
 					}),
-					o && /* @__PURE__ */ I(O, {
+					o && /* @__PURE__ */ z(j, {
 						variant: "outline",
 						size: "sm",
-						onClick: d,
-						"aria-label": `Print: ${u}`,
-						title: u,
-						children: [/* @__PURE__ */ F(R, { className: "h-4 w-4 mr-2" }), "Print"]
+						onClick: f,
+						"aria-label": `Print: ${d}`,
+						title: d,
+						children: [/* @__PURE__ */ R(re, { className: "h-4 w-4 mr-2" }), "Print"]
 					}),
-					a && n.showExportButtons && /* @__PURE__ */ I("div", {
+					a && n.showExportButtons && /* @__PURE__ */ z("div", {
 						className: "flex items-center gap-1",
 						children: [
-							/* @__PURE__ */ I(O, {
+							/* @__PURE__ */ z(j, {
 								variant: "outline",
 								size: "sm",
-								onClick: () => l("pdf"),
-								children: [/* @__PURE__ */ F(L, { className: "h-4 w-4 mr-2" }), "PDF"]
+								onClick: () => u("pdf"),
+								children: [/* @__PURE__ */ R(B, { className: "h-4 w-4 mr-2" }), "PDF"]
 							}),
-							/* @__PURE__ */ I(O, {
+							/* @__PURE__ */ z(j, {
 								variant: "outline",
 								size: "sm",
-								onClick: () => l("excel"),
-								children: [/* @__PURE__ */ F(L, { className: "h-4 w-4 mr-2" }), "Excel"]
+								onClick: () => u("excel"),
+								children: [/* @__PURE__ */ R(B, { className: "h-4 w-4 mr-2" }), "Excel"]
 							}),
-							/* @__PURE__ */ I(O, {
+							/* @__PURE__ */ z(j, {
 								variant: "outline",
 								size: "sm",
-								onClick: () => l("csv"),
-								children: [/* @__PURE__ */ F(L, { className: "h-4 w-4 mr-2" }), "CSV"]
+								onClick: () => u("csv"),
+								children: [/* @__PURE__ */ R(B, { className: "h-4 w-4 mr-2" }), "CSV"]
 							})
 						]
 					})
 				]
 			})]
-		}), /* @__PURE__ */ I(k, { children: [/* @__PURE__ */ I(M, { children: [!i && n.title && /* @__PURE__ */ F(N, { children: n.title }), !i && n.description && /* @__PURE__ */ F(j, { children: n.description })] }), /* @__PURE__ */ I(A, {
+		}), /* @__PURE__ */ z(M, { children: [/* @__PURE__ */ z(F, { children: [!i && n.title && /* @__PURE__ */ R(I, { children: n.title }), !i && n.description && /* @__PURE__ */ R(P, { children: n.description })] }), /* @__PURE__ */ z(N, {
 			className: "space-y-6",
 			children: [
-				s && /* @__PURE__ */ I("div", {
+				s && /* @__PURE__ */ z("div", {
 					className: "space-y-6",
-					children: [/* @__PURE__ */ F("div", {
+					children: [/* @__PURE__ */ R("div", {
 						className: "grid grid-cols-1 md:grid-cols-3 gap-4",
 						children: [
 							1,
 							2,
 							3
-						].map((e) => /* @__PURE__ */ F(k, { children: /* @__PURE__ */ I(A, {
+						].map((e) => /* @__PURE__ */ R(M, { children: /* @__PURE__ */ z(N, {
 							className: "p-4 space-y-2",
-							children: [/* @__PURE__ */ F(P, { className: "h-4 w-20" }), /* @__PURE__ */ F(P, { className: "h-8 w-28" })]
+							children: [/* @__PURE__ */ R(L, { className: "h-4 w-20" }), /* @__PURE__ */ R(L, { className: "h-8 w-28" })]
 						}) }, e))
-					}), /* @__PURE__ */ I("div", {
+					}), /* @__PURE__ */ z("div", {
 						className: "space-y-2",
-						children: [/* @__PURE__ */ F(P, { className: "h-10 w-full" }), [
+						children: [/* @__PURE__ */ R(L, { className: "h-10 w-full" }), [
 							1,
 							2,
 							3,
 							4,
 							5
-						].map((e) => /* @__PURE__ */ F(P, { className: "h-8 w-full" }, e))]
+						].map((e) => /* @__PURE__ */ R(L, { className: "h-8 w-full" }, e))]
 					})]
 				}),
-				!s && n.sections?.map((e, t) => e.visible === !1 ? null : /* @__PURE__ */ I("div", {
+				!s && n.sections?.map((e, t) => e.visible === !1 ? null : /* @__PURE__ */ z("div", {
 					className: "space-y-2",
 					children: [
-						e.title && e.type !== "header" && /* @__PURE__ */ F("h3", {
+						e.title && e.type !== "header" && /* @__PURE__ */ R("h3", {
 							className: "text-lg font-semibold border-b pb-2",
 							children: e.title
 						}),
-						e.type === "header" && e.title && /* @__PURE__ */ F("div", {
+						e.type === "header" && e.title && /* @__PURE__ */ R("div", {
 							className: "text-2xl font-bold py-4",
 							children: e.title
 						}),
-						e.type === "summary" && /* @__PURE__ */ F("div", {
+						e.type === "summary" && /* @__PURE__ */ R("div", {
 							className: "grid grid-cols-1 md:grid-cols-3 gap-4",
-							children: n.fields?.filter((e) => e.showInSummary).map((e, t) => /* @__PURE__ */ F(k, { children: /* @__PURE__ */ I(A, {
+							children: n.fields?.filter((e) => e.showInSummary).map((e, t) => /* @__PURE__ */ R(M, { children: /* @__PURE__ */ z(N, {
 								className: "p-4",
-								children: [/* @__PURE__ */ F("div", {
+								children: [/* @__PURE__ */ R("div", {
 									className: "text-sm text-muted-foreground",
 									children: e.label || e.name
-								}), /* @__PURE__ */ F("div", {
+								}), /* @__PURE__ */ R("div", {
 									className: "text-2xl font-bold",
-									children: q(p(e.name, e.aggregation), e)
+									children: Y(m(e.name, e.aggregation), e, l)
 								})]
 							}) }, t))
 						}),
-						e.type === "table" && /* @__PURE__ */ F("div", {
+						e.type === "table" && /* @__PURE__ */ R("div", {
 							className: "border rounded-lg overflow-x-auto",
-							children: /* @__PURE__ */ I("table", {
+							children: /* @__PURE__ */ z("table", {
 								className: "w-full text-sm min-w-[600px]",
-								children: [/* @__PURE__ */ F("thead", {
+								children: [/* @__PURE__ */ R("thead", {
 									className: "bg-muted",
-									children: /* @__PURE__ */ F("tr", { children: e.columns?.map((e, t) => /* @__PURE__ */ F("th", {
+									children: /* @__PURE__ */ R("tr", { children: e.columns?.map((e, t) => /* @__PURE__ */ R("th", {
 										className: `px-4 py-2 font-medium ${e.type === "number" ? "text-right" : "text-left"}`,
 										children: e.label || e.name
 									}, t)) })
-								}), /* @__PURE__ */ F("tbody", { children: (() => {
-									let t = _e(r || [], n.groupBy || []);
-									return t ? t.map((t) => /* @__PURE__ */ I(y.Fragment, { children: [/* @__PURE__ */ F("tr", {
+								}), /* @__PURE__ */ R("tbody", { children: (() => {
+									let t = xe(r || [], n.groupBy || []);
+									return t ? t.map((t) => /* @__PURE__ */ z(x.Fragment, { children: [/* @__PURE__ */ R("tr", {
 										className: "bg-muted/60",
-										children: /* @__PURE__ */ I("td", {
+										children: /* @__PURE__ */ z("td", {
 											colSpan: e.columns?.length || 1,
 											className: "px-4 py-2 font-semibold text-sm",
 											children: [
@@ -454,107 +461,107 @@ var J = ({ schema: e, onRefresh: t }) => {
 												")"
 											]
 										})
-									}), t.rows.map((t, n) => /* @__PURE__ */ F("tr", {
+									}), t.rows.map((t, n) => /* @__PURE__ */ R("tr", {
 										className: "border-t hover:bg-muted/50 even:bg-muted/20",
-										children: e.columns?.map((e, n) => /* @__PURE__ */ F("td", {
+										children: e.columns?.map((e, n) => /* @__PURE__ */ R("td", {
 											className: `px-4 py-2 ${e.type === "number" ? "text-right tabular-nums" : ""}`,
-											style: m(e.name, t[e.name]),
-											children: h(t[e.name], e)
+											style: h(e.name, t[e.name]),
+											children: g(t[e.name], e)
 										}, n))
-									}, n))] }, t.key)) : r?.map((t, n) => /* @__PURE__ */ F("tr", {
+									}, n))] }, t.key)) : r?.map((t, n) => /* @__PURE__ */ R("tr", {
 										className: "border-t hover:bg-muted/50 even:bg-muted/20",
-										children: e.columns?.map((e, n) => /* @__PURE__ */ F("td", {
+										children: e.columns?.map((e, n) => /* @__PURE__ */ R("td", {
 											className: `px-4 py-2 ${e.type === "number" ? "text-right tabular-nums" : ""}`,
-											style: m(e.name, t[e.name]),
-											children: h(t[e.name], e)
+											style: h(e.name, t[e.name]),
+											children: g(t[e.name], e)
 										}, n))
 									}, n));
 								})() })]
 							})
 						}),
-						e.type === "text" && e.text && /* @__PURE__ */ F("div", {
+						e.type === "text" && e.text && /* @__PURE__ */ R("div", {
 							className: "prose max-w-none",
-							children: /* @__PURE__ */ F("p", { children: e.text })
+							children: /* @__PURE__ */ R("p", { children: e.text })
 						}),
-						e.type === "page-break" && /* @__PURE__ */ F("div", { className: "border-t-2 border-dashed my-8 print:page-break-after-always" }),
-						Array.isArray(e.content) ? e.content.map((e, t) => /* @__PURE__ */ F(S, { schema: w(e) }, t)) : e.content && /* @__PURE__ */ F(S, { schema: w(e.content) })
+						e.type === "page-break" && /* @__PURE__ */ R("div", { className: "border-t-2 border-dashed my-8 print:page-break-after-always" }),
+						Array.isArray(e.content) ? e.content.map((e, t) => /* @__PURE__ */ R(w, { schema: E(e) }, t)) : ee(e.content, (e) => /* @__PURE__ */ R(w, { schema: E(e) }))
 					]
 				}, t)),
-				!n.sections && r && r.length > 0 && /* @__PURE__ */ F("div", {
+				!n.sections && r && r.length > 0 && /* @__PURE__ */ R("div", {
 					className: "border rounded-lg overflow-x-auto",
-					children: /* @__PURE__ */ I("table", {
+					children: /* @__PURE__ */ z("table", {
 						className: "w-full text-sm min-w-[600px]",
-						children: [/* @__PURE__ */ F("thead", {
+						children: [/* @__PURE__ */ R("thead", {
 							className: "bg-muted",
-							children: /* @__PURE__ */ F("tr", { children: n.fields?.map((e, t) => /* @__PURE__ */ F("th", {
+							children: /* @__PURE__ */ R("tr", { children: n.fields?.map((e, t) => /* @__PURE__ */ R("th", {
 								className: `px-4 py-2 font-medium ${e.type === "number" ? "text-right" : "text-left"}`,
 								children: e.label || e.name
 							}, t)) })
-						}), /* @__PURE__ */ F("tbody", { children: r.map((e, t) => /* @__PURE__ */ F("tr", {
+						}), /* @__PURE__ */ R("tbody", { children: r.map((e, t) => /* @__PURE__ */ R("tr", {
 							className: "border-t hover:bg-muted/50 even:bg-muted/20",
-							children: n.fields?.map((t, n) => /* @__PURE__ */ F("td", {
+							children: n.fields?.map((t, n) => /* @__PURE__ */ R("td", {
 								className: `px-4 py-2 ${t.type === "number" ? "text-right tabular-nums" : ""}`,
-								style: m(t.name, e[t.name]),
-								children: h(e[t.name], t)
+								style: h(t.name, e[t.name]),
+								children: g(e[t.name], t)
 							}, n))
 						}, t)) })]
 					})
 				})
 			]
 		})] })]
-	}) : /* @__PURE__ */ F(k, { children: /* @__PURE__ */ F(A, {
+	}) : /* @__PURE__ */ R(M, { children: /* @__PURE__ */ R(N, {
 		className: "p-8 text-center text-muted-foreground",
 		children: "No report to display"
 	}) });
 };
 //#endregion
 //#region src/DatasetReportRenderer.tsx
-function ye(e) {
+function we(e) {
 	if (!e || typeof e != "object") return !1;
 	let t = e;
 	return typeof t.dataset == "string" && t.dataset.length > 0 || t.type === "joined" && Array.isArray(t.blocks) && t.blocks.some((e) => typeof e?.dataset == "string");
 }
-var be = /* @__PURE__ */ new Set(), xe = () => globalThis.process?.env?.NODE_ENV !== "production";
-function Se(e, t) {
-	if (!xe()) return;
+var Te = /* @__PURE__ */ new Set(), Ee = () => globalThis.process?.env?.NODE_ENV !== "production";
+function De(e, t) {
+	if (!Ee()) return;
 	let n = e.filter;
 	if (n === void 0) return;
 	let r = `${t}:${n && typeof n == "object" ? Object.keys(n).sort().join(",") : String(n)}`;
-	be.has(r) || (be.add(r), console.warn(`[ObjectUI] ${t} carries \`filter\`, which is not an authorable key. Did you mean \`filter\` → \`runtimeFilter\`? NO filter was applied — it renders UNFILTERED, showing rows the report was scoped to exclude. \`ReportSchema\` (\`@objectstack/spec\`) is strict and rejects \`filter\`, so this document did not come through the validated path; the renderer no longer reads it either. Fix the producer: rename \`filter\` to \`runtimeFilter\`. (objectui#5137)`));
+	Te.has(r) || (Te.add(r), console.warn(`[ObjectUI] ${t} carries \`filter\`, which is not an authorable key. Did you mean \`filter\` → \`runtimeFilter\`? NO filter was applied — it renders UNFILTERED, showing rows the report was scoped to exclude. \`ReportSchema\` (\`@objectstack/spec\`) is strict and rejects \`filter\`, so this document did not come through the validated path; the renderer no longer reads it either. Fix the producer: rename \`filter\` to \`runtimeFilter\`. (objectui#5137)`));
 }
-function Ce(e) {
+function Oe(e) {
 	return `Report \`${e.name ?? "(unnamed)"}\``;
 }
-function we(e, t) {
+function ke(e, t) {
 	return e ? typeof e == "string" ? e : typeof e == "object" && typeof e.default == "string" ? e.default : t : t;
 }
-function Y(e) {
+function X(e) {
 	return Array.isArray(e) ? e.filter((e) => typeof e == "string" && !!e) : [];
 }
-function Te(e) {
+function Ae(e) {
 	if (!Array.isArray(e)) return;
 	let t = {};
 	for (let n of e) {
 		let e = n && typeof n == "object" ? n.by : void 0;
-		typeof e != "string" || !e || (t[e] = n.direction === "desc" ? "desc" : "asc");
+		typeof e == "string" && e && (t[e] = n.direction === "desc" ? "desc" : "asc");
 	}
 	return Object.keys(t).length > 0 ? t : void 0;
 }
-function Ee(e, t, n) {
+function je(e, t, n) {
 	if (!e) return;
 	let r = /* @__PURE__ */ new Set([...t, ...n]), i = {};
 	for (let [t, n] of Object.entries(e)) r.has(t) && (i[t] = n);
 	return Object.keys(i).length > 0 ? i : void 0;
 }
-function X(e, t, n, r, i, a, o) {
-	let [s, c] = v.useState({
+function Z(e, t, n, r, i, a, o) {
+	let [s, c] = b.useState({
 		status: "idle",
 		rows: []
-	}), l = Ee(o, t, n), u = JSON.stringify(r ?? null), d = JSON.stringify(a ?? null), f = JSON.stringify(l ?? null), p = `${e}|${t.join(",")}|${n.join(",")}|${u}|${d}|${f}`;
-	return v.useEffect(() => {
+	}), l = je(o, t, n), u = JSON.stringify(r ?? null), d = JSON.stringify(a ?? null), f = JSON.stringify(l ?? null), p = `${e}|${t.join(",")}|${n.join(",")}|${u}|${d}|${f}`, [m, h] = b.useState(void 0), g = D(m), _ = b.useRef(null);
+	return b.useEffect(() => {
 		let o = i;
 		if (!o || typeof o.queryDataset != "function") {
-			c({
+			_.current = null, h(void 0), c({
 				status: "error",
 				rows: [],
 				error: "This data source does not support dataset queries."
@@ -562,24 +569,24 @@ function X(e, t, n, r, i, a, o) {
 			return;
 		}
 		if (!e || n.length === 0) {
-			c({
+			_.current = null, h(void 0), c({
 				status: "idle",
 				rows: []
 			});
 			return;
 		}
-		let s = !1;
-		return c({
+		let s = !1, u = _.current === p;
+		return _.current = p, u || (h(void 0), c({
 			status: "loading",
 			rows: []
-		}), o.queryDataset(e, {
+		})), o.queryDataset(e, {
 			dimensions: t,
 			measures: n,
 			...r && Object.keys(r).length > 0 ? { runtimeFilter: r } : {},
 			...a ? { totals: { groupings: a } } : {},
 			...l ? { order: l } : {}
 		}).then((e) => {
-			s || c({
+			s || (h(typeof e?.object == "string" && e.object ? e.object : void 0), c({
 				status: "ok",
 				rows: Array.isArray(e?.rows) ? e.rows : [],
 				fields: Array.isArray(e?.fields) ? e.fields : [],
@@ -588,7 +595,7 @@ function X(e, t, n, r, i, a, o) {
 				drillRawRows: Array.isArray(e?.drillRawRows) ? e.drillRawRows : void 0,
 				drillRanges: Array.isArray(e?.drillRanges) ? e.drillRanges : void 0,
 				totals: Array.isArray(e?.totals) ? e.totals : void 0
-			});
+			}));
 		}).catch((e) => {
 			s || c({
 				status: "error",
@@ -598,10 +605,18 @@ function X(e, t, n, r, i, a, o) {
 		}), () => {
 			s = !0;
 		};
-	}, [p]), s;
+	}, [p, g]), s;
 }
-function De({ dataset: e }) {
-	return /* @__PURE__ */ I("div", {
+function Me(...e) {
+	try {
+		return i(...e);
+	} catch (e) {
+		if (!(e instanceof t)) throw e;
+		return console.warn(`[DatasetReportRenderer] drill-down refused — the drilled list cannot be scoped: ${e.message}`), null;
+	}
+}
+function Ne({ dataset: e }) {
+	return /* @__PURE__ */ z("div", {
 		className: "flex items-center justify-center rounded-md border border-dashed bg-muted/20 p-4 text-xs text-muted-foreground",
 		children: [
 			"This report binds the “",
@@ -610,81 +625,86 @@ function De({ dataset: e }) {
 		]
 	});
 }
-function Z({ status: e, error: t }) {
-	return e === "error" ? /* @__PURE__ */ I("div", {
+function Q({ status: e, error: t }) {
+	return e === "error" ? /* @__PURE__ */ z("div", {
 		role: "alert",
 		className: "flex items-start gap-2 rounded-md border border-destructive/40 bg-destructive/5 px-3 py-2 text-xs text-destructive",
-		children: [/* @__PURE__ */ F(ee, { className: "h-3.5 w-3.5 mt-0.5 shrink-0" }), /* @__PURE__ */ F("span", {
+		children: [/* @__PURE__ */ R(te, { className: "h-3.5 w-3.5 mt-0.5 shrink-0" }), /* @__PURE__ */ R("span", {
 			className: "break-words",
 			children: t
 		})]
-	}) : /* @__PURE__ */ I("div", {
+	}) : /* @__PURE__ */ z("div", {
 		className: "flex items-center gap-2 p-4 text-xs text-muted-foreground",
-		children: [/* @__PURE__ */ F(te, { className: "h-4 w-4 animate-spin" }), " Running report…"]
+		children: [/* @__PURE__ */ R(ne, { className: "h-4 w-4 animate-spin" }), " Running report…"]
 	});
 }
-function Oe() {
-	return /* @__PURE__ */ I("div", {
+function Pe() {
+	return /* @__PURE__ */ z("div", {
 		className: "flex flex-col items-center justify-center gap-2 rounded-md border border-dashed bg-muted/20 p-6 text-xs text-muted-foreground",
-		children: [/* @__PURE__ */ F(re, { className: "h-6 w-6" }), " The dataset returned no rows for this report’s scope."]
+		children: [/* @__PURE__ */ R(ae, { className: "h-6 w-6" }), " The dataset returned no rows for this report’s scope."]
 	});
 }
-var ke = "cursor-pointer hover:bg-accent/40";
-function Ae({ dataset: e, rows: t, values: n, runtimeFilter: a, dataSource: o, onDrill: s, order: c, withTotals: d }) {
-	let f = X(e, t, n, a, o, d && t.length > 0 ? [[]] : void 0, c), { fieldLabel: p } = B(), m = V(), h = z(), g = T(f.object, f.dimensionFields, t);
-	if (n.length === 0) return /* @__PURE__ */ F(De, { dataset: e });
-	if (f.status === "loading" || f.status === "idle") return /* @__PURE__ */ F(Z, { status: f.status });
-	if (f.status === "error") return /* @__PURE__ */ F(Z, {
+var Fe = "cursor-pointer hover:bg-accent/40";
+function Ie({ dataset: e, rows: t, values: n, runtimeFilter: r, dataSource: i, onDrill: o, order: s, withTotals: c }) {
+	let l = Z(e, t, n, r, i, c && t.length > 0 ? [[]] : void 0, s), { fieldLabel: f } = U(), p = W(), m = H(), h = O(l.object, l.dimensionFields, t);
+	if (n.length === 0) return /* @__PURE__ */ R(Ne, { dataset: e });
+	if (l.status === "loading" || l.status === "idle") return /* @__PURE__ */ R(Q, { status: l.status });
+	if (l.status === "error") return /* @__PURE__ */ R(Q, {
 		status: "error",
-		error: f.error
+		error: l.error
 	});
-	if (f.rows.length === 0) return /* @__PURE__ */ F(Oe, {});
-	let v = !!s && t.length > 0, y = f.dimensionFields ? t.filter((e) => e in f.dimensionFields) : [], b = (n, i) => {
-		let o = {};
-		for (let e of t) o[e] = n[e];
-		let c = f.drillRanges?.[i], l = !!c && Object.keys(c).length > 0, u = f.object && (y.length > 0 || l) ? r(f.drillRawRows?.[i], y, f.dimensionFields ?? {}, a, c) : void 0;
-		s({
+	if (l.rows.length === 0) return /* @__PURE__ */ R(Pe, {});
+	let g = !!o && t.length > 0, _ = l.dimensionFields ? t.filter((e) => e in l.dimensionFields) : [], y = (n, i) => {
+		let a = {};
+		for (let e of t) a[e] = n[e];
+		let s = l.drillRanges?.[i], c = !!s && Object.keys(s).length > 0, u;
+		if (l.object && (_.length > 0 || c)) {
+			let e = Me(l.drillRawRows?.[i], _, l.dimensionFields ?? {}, r, s);
+			if (e === null) return;
+			u = e;
+		}
+		o({
 			dataset: e,
-			groupKey: o,
-			runtimeFilter: a,
-			object: f.object,
+			groupKey: a,
+			runtimeFilter: r,
+			object: l.object,
 			objectFilter: u
 		});
-	}, { measureField: x, headerLabel: S } = i(f.fields, f.object, p), C = [...t, ...n], w = _(f.rows, g), E = d ? f.totals?.find((e) => Array.isArray(e.dimensions) && e.dimensions.length === 0)?.rows?.[0] : void 0, D = m("report.total", "Total");
-	return /* @__PURE__ */ F("div", {
+	}, { measureField: b, headerLabel: x } = a(l.fields, l.object, f, V(p)), S = [...t, ...n], C = v(l.rows, h), w = c ? l.totals?.find((e) => Array.isArray(e.dimensions) && e.dimensions.length === 0)?.rows?.[0] : void 0, T = p("report.total", "Total");
+	return /* @__PURE__ */ R("div", {
 		className: "overflow-auto max-h-[70vh] rounded-md border",
-		children: /* @__PURE__ */ I("table", {
+		children: /* @__PURE__ */ z("table", {
 			className: "w-full text-xs",
-			children: [/* @__PURE__ */ F("thead", {
+			children: [/* @__PURE__ */ R("thead", {
 				className: "bg-muted/40",
-				children: /* @__PURE__ */ F("tr", { children: C.map((e) => /* @__PURE__ */ F("th", {
+				children: /* @__PURE__ */ R("tr", { children: S.map((e) => /* @__PURE__ */ R("th", {
 					className: "px-2 py-1.5 text-left font-medium whitespace-nowrap",
-					children: S(e)
+					children: x(e)
 				}, e)) })
-			}), /* @__PURE__ */ I("tbody", { children: [w.map((e, t) => /* @__PURE__ */ F("tr", {
-				className: `border-t${v ? ` ${ke}` : ""}`,
-				"data-testid": v ? "dataset-drill-row" : void 0,
-				onClick: v ? () => b(f.rows[t], t) : void 0,
-				children: C.map((t) => /* @__PURE__ */ F("td", {
+			}), /* @__PURE__ */ z("tbody", { children: [C.map((e, t) => /* @__PURE__ */ R("tr", {
+				className: `border-t${g ? ` ${Fe}` : ""}`,
+				"data-testid": g ? "dataset-drill-row" : void 0,
+				onClick: g ? () => y(l.rows[t], t) : void 0,
+				children: S.map((t) => /* @__PURE__ */ R("td", {
 					className: "px-2 py-1 tabular-nums whitespace-nowrap",
-					children: n.includes(t) ? u(e[t], x(t)?.format, x(t)?.currency, x(t)?.percentScale, h) : l(e[t], h)
+					children: n.includes(t) ? d(e[t], b(t)?.format, b(t)?.currency, b(t)?.percentScale, m) : u(e[t], m)
 				}, t))
-			}, t)), E && /* @__PURE__ */ I("tr", {
+			}, t)), w && /* @__PURE__ */ z("tr", {
 				className: "border-t bg-muted/30 font-medium",
 				"data-testid": "dataset-report-total-row",
-				children: [t.length > 0 && /* @__PURE__ */ F("td", {
+				children: [t.length > 0 && /* @__PURE__ */ R("td", {
 					colSpan: t.length,
 					className: "px-2 py-1 whitespace-nowrap",
-					children: D
-				}), n.map((e) => /* @__PURE__ */ F("td", {
+					children: T
+				}), n.map((e) => /* @__PURE__ */ R("td", {
 					className: "px-2 py-1 tabular-nums whitespace-nowrap",
-					children: u(E[e], x(e)?.format, x(e)?.currency, x(e)?.percentScale, h)
+					children: d(w[e], b(e)?.format, b(e)?.currency, b(e)?.percentScale, m)
 				}, e))]
 			})] })]
 		})
 	});
 }
-function je(e) {
+function Le(e) {
 	switch (e) {
 		case "summary": return "summary";
 		case "matrix": return "matrix";
@@ -692,7 +712,7 @@ function je(e) {
 		default: return "tabular";
 	}
 }
-function Me(e) {
+function Re(e) {
 	switch (e) {
 		case "bar":
 		case "column":
@@ -723,9 +743,9 @@ function Me(e) {
 		};
 	}
 }
-function Ne(t) {
-	let [, n] = v.useReducer((e) => e + 1, 0);
-	return v.useEffect(() => {
+function ze(t) {
+	let [, n] = b.useReducer((e) => e + 1, 0);
+	return b.useEffect(() => {
 		if (e.get(t)) return;
 		let r = typeof e.subscribe == "function" ? e.subscribe(() => {
 			e.get(t) && n();
@@ -733,127 +753,130 @@ function Ne(t) {
 		return i && typeof i.then == "function" && i.then(() => n()).catch(() => {}), r;
 	}, [t]), e.get(t);
 }
-function Pe(e, t, n) {
-	if (!(!Array.isArray(e) || !t)) for (let r of e) {
+function Be(e, t, n) {
+	if (Array.isArray(e) && t) for (let r of e) {
 		if (!r || typeof r != "object") continue;
 		let { name: e, label: i } = r;
-		if (e === t) return oe(i, n) || void 0;
+		if (e === t) return ce(i, n) || void 0;
 	}
 }
-function Fe({ dataset: e, chart: r, runtimeFilter: l, dataSource: p, order: m }) {
-	let h = typeof r.xAxis == "string" ? r.xAxis : "", g = typeof r.yAxis == "string" ? r.yAxis : "", y = Me(r.type), b = y.kind === "series" || y.kind === "single_value", x = X(e, y.kind === "series" && h ? [h] : [], b && g ? [g] : [], l, p, void 0, m), S = Ne("chart"), { fieldLabel: C, fieldOptionLabel: w } = B(), T = V(), D = z(), { language: O } = se(), k = v.useMemo(() => h ? [h] : [], [h]), A = E(x.object, x.dimensionFields, k), { categoryColors: j, dimensionLabels: M, categoryOrder: N } = v.useMemo(() => {
+function Ve({ dataset: e, chart: t, runtimeFilter: i, dataSource: u, order: m }) {
+	let h = typeof t.xAxis == "string" ? t.xAxis : "", g = typeof t.yAxis == "string" ? t.yAxis : "", _ = Re(t.type), y = _.kind === "series" || _.kind === "single_value", x = Z(e, _.kind === "series" && h ? [h] : [], y && g ? [g] : [], i, u, void 0, m), S = ze("chart"), { fieldLabel: C, fieldOptionLabel: w } = U(), T = W(), E = H(), { language: D } = le(), O = b.useMemo(() => h ? [h] : [], [h]), A = k(x.object, x.dimensionFields, O), { categoryColors: j, dimensionLabels: M, categoryOrder: N } = b.useMemo(() => {
 		if (!A) return {
 			categoryColors: null,
 			dimensionLabels: null,
 			categoryOrder: null
 		};
-		let { metaByPath: e, relabel: n } = A, r = n[0]?.path, i = r ? e[r] : void 0, o = r ? d(i?.options, c(i, w)) : void 0;
+		let { metaByPath: e, relabel: t } = A, r = t[0]?.path, i = r ? e[r] : void 0, a = r ? f(i?.options, l(i, w)) : void 0;
 		return {
-			categoryColors: a(o),
-			dimensionLabels: s(e, n, w),
-			categoryOrder: t(o)
+			categoryColors: o(a),
+			dimensionLabels: c(e, t, w),
+			categoryOrder: n(a)
 		};
-	}, [A, w]), P = typeof r.title == "string" ? r.title : void 0;
-	if (y.kind === "tabular") return null;
-	if (y.kind === "unsupported") return /* @__PURE__ */ I("div", {
+	}, [A, w]), P = ce(t.title, D) || void 0;
+	if (_.kind === "tabular") return null;
+	if (_.kind === "unsupported") return /* @__PURE__ */ z("div", {
 		className: "rounded-md border border-dashed bg-muted/20 px-3 py-2 text-xs text-muted-foreground",
 		"data-testid": "dataset-report-chart-unsupported",
 		children: [
 			"Chart type “",
-			y.type,
-			"” is not a spec chart type — the grouped table below carries this report’s numbers."
+			_.type,
+			"” is not a spec chart type — the report’s table carries its numbers."
 		]
 	});
-	if (y.kind === "series" && !h || !g) return null;
-	if (x.status === "loading" || x.status === "idle") return /* @__PURE__ */ I("div", {
+	if (_.kind === "series" && !h || !g) return null;
+	if (x.status === "loading" || x.status === "idle") return /* @__PURE__ */ z("div", {
 		className: "flex items-center gap-2 p-4 text-xs text-muted-foreground",
-		children: [/* @__PURE__ */ F(te, { className: "h-4 w-4 animate-spin" }), " Loading chart…"]
+		children: [/* @__PURE__ */ R(ne, { className: "h-4 w-4 animate-spin" }), " Loading chart…"]
 	});
 	if (x.status === "error" || x.rows.length === 0) return null;
-	let { measureField: ee, headerLabel: L } = i(x.fields, x.object, C), R = Pe(r.series, g, O) ?? L(g);
-	if (y.kind === "single_value") {
-		let e = ee(g);
-		return /* @__PURE__ */ I("div", {
+	let { measureField: F, headerLabel: I } = a(x.fields, x.object, C, V(T)), L = Be(t.series, g, D) ?? I(g);
+	if (_.kind === "single_value") {
+		let e = F(g);
+		return /* @__PURE__ */ z("div", {
 			className: "rounded-md border bg-card p-3",
 			"data-testid": "dataset-report-metric",
-			children: [P ? /* @__PURE__ */ F("h3", {
+			children: [P ? /* @__PURE__ */ R("h3", {
 				className: "mb-2 text-sm font-semibold",
 				children: P
-			}) : null, /* @__PURE__ */ I("div", {
+			}) : null, /* @__PURE__ */ z("div", {
 				className: "flex flex-col gap-0.5 py-2",
-				children: [/* @__PURE__ */ F("span", {
+				children: [/* @__PURE__ */ R("span", {
 					className: "text-2xl font-semibold tabular-nums",
-					children: u(x.rows[0]?.[g], e?.format, e?.currency, e?.percentScale, D)
-				}), /* @__PURE__ */ F("span", {
+					children: d(x.rows[0]?.[g], e?.format, e?.currency, e?.percentScale, E)
+				}), /* @__PURE__ */ R("span", {
 					className: "text-xs text-muted-foreground",
-					children: R
+					children: L
 				})]
 			})]
 		});
 	}
 	if (!S) return null;
-	let { data: ne, xAxisKey: re, series: ie } = n(_(x.rows, M), [h], [g], x.fields, { nullCategoryLabel: T("chart.nullCategory", "(None)") }), ae = f(ie, r.series).map((e) => e.dataKey === g ? {
+	let { data: ee, xAxisKey: te, series: B } = r(v(x.rows, M), [h], [g], x.fields, {
+		nullCategoryLabel: T("chart.nullCategory", "(None)"),
+		builtinAggregateLabels: V(T)
+	}), re = p(B, t.series).map((e) => e.dataKey === g ? {
 		...e,
-		label: R
-	} : e), { title: oe, ...H } = o(r, j);
-	return /* @__PURE__ */ I("div", {
+		label: L
+	} : e), { title: ie, ...ae } = s(t, j);
+	return /* @__PURE__ */ z("div", {
 		className: "rounded-md border bg-card p-3",
 		"data-testid": "dataset-report-chart",
-		children: [P ? /* @__PURE__ */ F("h3", {
+		children: [P ? /* @__PURE__ */ R("h3", {
 			className: "mb-2 text-sm font-semibold",
 			children: P
-		}) : null, /* @__PURE__ */ F(S, { schema: {
-			chartType: y.chartType,
-			data: ne,
-			xAxisKey: re,
-			series: ae,
+		}) : null, /* @__PURE__ */ R(S, { schema: {
+			chartType: _.chartType,
+			data: ee,
+			xAxisKey: te,
+			series: re,
 			height: 280,
 			isAnimationActive: !1,
-			...H,
+			...ae,
 			...N ? { categoryOrder: N } : {}
 		} })]
 	});
 }
-function Q(e, t) {
-	return m(e.map((e) => g(t[e])));
+function $(e, t) {
+	return h(e.map((e) => _(t[e])));
 }
-function Ie(e, t, n) {
-	return e.map((e) => l(t[e], n)).join(" / ");
+function He(e, t, n) {
+	return e.map((e) => u(t[e], n)).join(" / ");
 }
-function Le({ dataset: e, rows: t, columnsAcross: n, values: a, runtimeFilter: o, dataSource: s, onDrill: c, order: d }) {
-	let f = X(e, [...t, ...n], a, o, s, [
+function Ue({ dataset: e, rows: t, columnsAcross: n, values: r, runtimeFilter: i, dataSource: o, onDrill: s, order: c }) {
+	let l = Z(e, [...t, ...n], r, i, o, [
 		t,
 		n,
 		[]
-	], d), p = V(), { fieldLabel: m } = B(), g = z(), y = T(f.object, f.dimensionFields, [...t, ...n]), b = v.useMemo(() => {
-		if (f.status !== "ok") return null;
+	], c), f = W(), { fieldLabel: p } = U(), m = H(), h = O(l.object, l.dimensionFields, [...t, ...n]), _ = b.useMemo(() => {
+		if (l.status !== "ok") return null;
 		let e = [], r = [], i = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Set(), o = /* @__PURE__ */ new Map();
-		return _(f.rows, y).forEach((s, c) => {
-			let l = f.rows[c], u = Q(t, s), d = Q(n, s);
-			if (!i.has(u)) {
-				i.add(u);
+		return v(l.rows, h).forEach((s, c) => {
+			let u = l.rows[c], d = $(t, s), f = $(n, s);
+			if (!i.has(d)) {
+				i.add(d);
 				let n = {}, r = {};
-				for (let e of t) n[e] = l[e], r[e] = s[e];
+				for (let e of t) n[e] = u[e], r[e] = s[e];
 				e.push({
-					id: u,
-					label: Ie(t, s, g),
+					id: d,
+					label: He(t, s, m),
 					key: n,
 					display: r
 				});
 			}
-			if (!a.has(d)) {
-				a.add(d);
+			if (!a.has(f)) {
+				a.add(f);
 				let e = {}, t = {};
-				for (let r of n) e[r] = l[r], t[r] = s[r];
+				for (let r of n) e[r] = u[r], t[r] = s[r];
 				r.push({
-					id: d,
-					label: Ie(n, s, g),
+					id: f,
+					label: He(n, s, m),
 					key: e,
 					display: t
 				});
 			}
-			o.set(h(u, d), {
-				row: l,
+			o.set(g(d, f), {
+				row: u,
 				index: c
 			});
 		}), {
@@ -862,115 +885,120 @@ function Le({ dataset: e, rows: t, columnsAcross: n, values: a, runtimeFilter: o
 			cells: o
 		};
 	}, [
-		f,
+		l,
 		t,
 		n,
-		y,
-		g
+		h,
+		m
 	]);
-	if (a.length === 0) return /* @__PURE__ */ F(De, { dataset: e });
-	if (f.status === "loading" || f.status === "idle") return /* @__PURE__ */ F(Z, { status: f.status });
-	if (f.status === "error") return /* @__PURE__ */ F(Z, {
+	if (r.length === 0) return /* @__PURE__ */ R(Ne, { dataset: e });
+	if (l.status === "loading" || l.status === "idle") return /* @__PURE__ */ R(Q, { status: l.status });
+	if (l.status === "error") return /* @__PURE__ */ R(Q, {
 		status: "error",
-		error: f.error
+		error: l.error
 	});
-	if (!b || b.rowHeaders.length === 0) return /* @__PURE__ */ F(Oe, {});
-	let { measureField: x, headerLabel: S } = i(f.fields, f.object, m), C = p("report.total", "Total"), w = !!c, E = f.dimensionFields ? [...t, ...n].filter((e) => e in f.dimensionFields) : [], D = (t, n, i) => {
-		let a = f.drillRanges?.[i], s = !!a && Object.keys(a).length > 0, l = f.object && (E.length > 0 || s) ? r(f.drillRawRows?.[i], E, f.dimensionFields ?? {}, o, a) : void 0;
-		c({
+	if (!_ || _.rowHeaders.length === 0) return /* @__PURE__ */ R(Pe, {});
+	let { measureField: y, headerLabel: x } = a(l.fields, l.object, p, V(f)), S = f("report.total", "Total"), C = !!s, w = l.dimensionFields ? [...t, ...n].filter((e) => e in l.dimensionFields) : [], T = (t, n, r) => {
+		let a = l.drillRanges?.[r], o = !!a && Object.keys(a).length > 0, c;
+		if (l.object && (w.length > 0 || o)) {
+			let e = Me(l.drillRawRows?.[r], w, l.dimensionFields ?? {}, i, a);
+			if (e === null) return;
+			c = e;
+		}
+		s({
 			dataset: e,
 			groupKey: {
 				...t,
 				...n
 			},
-			runtimeFilter: o,
-			object: f.object,
-			objectFilter: l
+			runtimeFilter: i,
+			object: l.object,
+			objectFilter: c
 		});
-	}, O = b.colHeaders.flatMap((e) => a.map((t) => ({
+	}, E = _.colHeaders.flatMap((e) => r.map((t) => ({
 		col: e,
 		measure: t,
-		header: a.length === 1 ? e.label : `${e.label} · ${S(t)}`
-	}))), k = (e) => {
-		let t = f.totals?.find((t) => Array.isArray(t.dimensions) && t.dimensions.join(",") === e.join(","))?.rows;
-		return t && _(t, y);
-	}, A = /* @__PURE__ */ new Map();
-	for (let e of k(t) ?? []) A.set(Q(t, e), e);
-	let j = /* @__PURE__ */ new Map();
-	for (let e of k(n) ?? []) j.set(Q(n, e), e);
-	let M = k([])?.[0], N = A.size > 0, P = j.size > 0;
-	return /* @__PURE__ */ F("div", {
+		header: r.length === 1 ? e.label : `${e.label} · ${x(t)}`
+	}))), D = (e) => {
+		let t = l.totals?.find((t) => Array.isArray(t.dimensions) && t.dimensions.join(",") === e.join(","))?.rows;
+		return t && v(t, h);
+	}, k = /* @__PURE__ */ new Map();
+	for (let e of D(t) ?? []) k.set($(t, e), e);
+	let A = /* @__PURE__ */ new Map();
+	for (let e of D(n) ?? []) A.set($(n, e), e);
+	let j = D([])?.[0], M = k.size > 0, N = A.size > 0;
+	return /* @__PURE__ */ R("div", {
 		className: "overflow-auto max-h-[70vh] rounded-md border",
 		"data-testid": "dataset-matrix",
-		children: /* @__PURE__ */ I("table", {
+		children: /* @__PURE__ */ z("table", {
 			className: "w-full text-xs",
-			children: [/* @__PURE__ */ F("thead", {
+			children: [/* @__PURE__ */ R("thead", {
 				className: "bg-muted/40",
-				children: /* @__PURE__ */ I("tr", { children: [
-					t.map((e) => /* @__PURE__ */ F("th", {
+				children: /* @__PURE__ */ z("tr", { children: [
+					t.map((e) => /* @__PURE__ */ R("th", {
 						className: "px-2 py-1.5 text-left font-medium whitespace-nowrap",
-						children: S(e)
+						children: x(e)
 					}, e)),
-					O.map((e) => /* @__PURE__ */ F("th", {
+					E.map((e) => /* @__PURE__ */ R("th", {
 						className: "px-2 py-1.5 text-right font-medium whitespace-nowrap",
 						children: e.header
 					}, `${e.col.id}-${e.measure}`)),
-					N && a.map((e) => /* @__PURE__ */ F("th", {
+					M && r.map((e) => /* @__PURE__ */ R("th", {
 						className: "px-2 py-1.5 text-right font-medium whitespace-nowrap",
 						"data-testid": "matrix-total-col-header",
-						children: a.length === 1 ? C : `${C} · ${S(e)}`
+						children: r.length === 1 ? S : `${S} · ${x(e)}`
 					}, `total-${e}`))
 				] })
-			}), /* @__PURE__ */ I("tbody", { children: [b.rowHeaders.map((e) => /* @__PURE__ */ I("tr", {
+			}), /* @__PURE__ */ z("tbody", { children: [_.rowHeaders.map((e) => /* @__PURE__ */ z("tr", {
 				className: "border-t",
 				children: [
-					t.map((t) => /* @__PURE__ */ F("td", {
+					t.map((t) => /* @__PURE__ */ R("td", {
 						className: "px-2 py-1 whitespace-nowrap font-medium",
-						children: l(e.display[t], g)
+						children: u(e.display[t], m)
 					}, t)),
-					O.map((t) => {
-						let n = b.cells.get(h(e.id, t.col.id)), r = n?.row[t.measure], i = w && n != null;
-						return /* @__PURE__ */ F("td", {
-							className: `px-2 py-1 text-right tabular-nums whitespace-nowrap${i ? ` ${ke}` : ""}`,
+					E.map((t) => {
+						let n = _.cells.get(g(e.id, t.col.id)), r = n?.row[t.measure], i = C && n != null;
+						return /* @__PURE__ */ R("td", {
+							className: `px-2 py-1 text-right tabular-nums whitespace-nowrap${i ? ` ${Fe}` : ""}`,
 							"data-testid": i ? "dataset-drill-cell" : void 0,
-							onClick: i ? () => D(e.key, t.col.key, n.index) : void 0,
-							children: u(r, x(t.measure)?.format, x(t.measure)?.currency, x(t.measure)?.percentScale, g)
+							onClick: i ? () => T(e.key, t.col.key, n.index) : void 0,
+							children: d(r, y(t.measure)?.format, y(t.measure)?.currency, y(t.measure)?.percentScale, m)
 						}, `${t.col.id}-${t.measure}`);
 					}),
-					N && a.map((t) => /* @__PURE__ */ F("td", {
+					M && r.map((t) => /* @__PURE__ */ R("td", {
 						className: "px-2 py-1 text-right tabular-nums whitespace-nowrap font-medium",
 						"data-testid": "matrix-row-total",
-						children: u(A.get(e.id)?.[t], x(t)?.format, x(t)?.currency, x(t)?.percentScale, g)
+						children: d(k.get(e.id)?.[t], y(t)?.format, y(t)?.currency, y(t)?.percentScale, m)
 					}, `total-${t}`))
 				]
-			}, e.id)), P && /* @__PURE__ */ I("tr", {
+			}, e.id)), N && /* @__PURE__ */ z("tr", {
 				className: "border-t bg-muted/30 font-medium",
 				"data-testid": "matrix-total-row",
 				children: [
-					t.length > 0 && /* @__PURE__ */ F("td", {
+					t.length > 0 && /* @__PURE__ */ R("td", {
 						colSpan: t.length,
 						className: "px-2 py-1 whitespace-nowrap",
-						children: C
+						children: S
 					}),
-					O.map((e) => /* @__PURE__ */ F("td", {
+					E.map((e) => /* @__PURE__ */ R("td", {
 						className: "px-2 py-1 text-right tabular-nums whitespace-nowrap",
-						children: u(j.get(e.col.id)?.[e.measure], x(e.measure)?.format, x(e.measure)?.currency, x(e.measure)?.percentScale, g)
+						children: d(A.get(e.col.id)?.[e.measure], y(e.measure)?.format, y(e.measure)?.currency, y(e.measure)?.percentScale, m)
 					}, `${e.col.id}-${e.measure}`)),
-					N && a.map((e) => /* @__PURE__ */ F("td", {
+					M && r.map((e) => /* @__PURE__ */ R("td", {
 						className: "px-2 py-1 text-right tabular-nums whitespace-nowrap",
 						"data-testid": "matrix-grand-total",
-						children: u(M?.[e], x(e)?.format, x(e)?.currency, x(e)?.percentScale, g)
+						children: d(j?.[e], y(e)?.format, y(e)?.currency, y(e)?.percentScale, m)
 					}, `grand-${e}`))
 				]
 			})] })]
 		})
 	});
 }
-var Re = ({ report: e, dataSource: t, runtimeFilter: n, onDrill: r, className: i }) => {
-	let a = Ce(e);
-	Se(e, a);
-	let o = p(e.runtimeFilter, n), s = e.drilldown === !1 ? void 0 : r, c = je(e.type);
-	if (c === "joined" && Array.isArray(e.blocks)) return /* @__PURE__ */ F("div", {
+var We = ({ report: e, dataSource: t, runtimeFilter: n, onDrill: r, className: i }) => {
+	let a = Oe(e);
+	De(e, a);
+	let o = m(e.runtimeFilter, n), s = e.drilldown === !1 ? void 0 : r, c = Le(e.type);
+	if (c === "joined" && Array.isArray(e.blocks)) return /* @__PURE__ */ R("div", {
 		className: i,
 		"data-testid": "dataset-joined-report",
 		"data-report-name": e.name,
@@ -980,141 +1008,134 @@ var Re = ({ report: e, dataSource: t, runtimeFilter: n, onDrill: r, className: i
 			gap: 24
 		},
 		children: e.blocks.map((e, n) => {
-			Se(e, `${a} block \`${e.name ?? n}\``);
-			let r = p(o, e.runtimeFilter), i = Y(e.columns), c = Te(e.order), l = je(e.type), u = l === "matrix" && i.length > 0 ? /* @__PURE__ */ F(Le, {
+			De(e, `${a} block \`${e.name ?? n}\``);
+			let r = m(o, e.runtimeFilter), i = X(e.columns), c = Ae(e.order), l = Le(e.type), u = l === "matrix" && i.length > 0 ? /* @__PURE__ */ R(Ue, {
 				dataset: String(e.dataset ?? ""),
-				rows: Y(e.rows),
+				rows: X(e.rows),
 				columnsAcross: i,
-				values: Y(e.values),
+				values: X(e.values),
 				runtimeFilter: r,
 				dataSource: t,
 				onDrill: s,
 				order: c
-			}) : /* @__PURE__ */ F(Ae, {
+			}) : /* @__PURE__ */ R(Ie, {
 				dataset: String(e.dataset ?? ""),
-				rows: Y(e.rows),
-				values: Y(e.values),
+				rows: X(e.rows),
+				values: X(e.values),
 				runtimeFilter: r,
 				dataSource: t,
 				onDrill: s,
 				order: c,
 				withTotals: l === "summary" || l === "matrix"
 			});
-			return /* @__PURE__ */ I("section", {
+			return /* @__PURE__ */ z("section", {
 				"data-testid": "dataset-report-block",
 				"data-block-id": e.name ?? `block-${n}`,
 				className: "flex flex-col gap-2 rounded-lg border bg-card p-4",
-				children: [/* @__PURE__ */ I("header", {
+				children: [/* @__PURE__ */ z("header", {
 					className: "flex flex-col gap-0.5",
-					children: [/* @__PURE__ */ F("h3", {
+					children: [/* @__PURE__ */ R("h3", {
 						className: "text-sm font-semibold",
-						children: we(e.label, e.name ?? `Block ${n + 1}`)
-					}), e.description ? /* @__PURE__ */ F("p", {
+						children: ke(e.label, e.name ?? `Block ${n + 1}`)
+					}), e.description ? /* @__PURE__ */ R("p", {
 						className: "text-xs text-muted-foreground",
-						children: we(e.description, "")
+						children: ke(e.description, "")
 					}) : null]
 				}), u]
 			}, e.name ?? `block-${n}`);
 		})
 	});
-	let l = Y(e.columns), u = Te(e.order);
-	if (c === "matrix" && l.length > 0) return /* @__PURE__ */ F("div", {
-		className: i,
-		"data-testid": "dataset-report",
-		"data-report-name": e.name,
-		children: /* @__PURE__ */ F(Le, {
-			dataset: String(e.dataset ?? ""),
-			rows: Y(e.rows),
-			columnsAcross: l,
-			values: Y(e.values),
-			runtimeFilter: o,
-			dataSource: t,
-			onDrill: s,
-			order: u
-		})
+	let l = X(e.columns), u = Ae(e.order), d = c === "matrix" && l.length > 0, f = e.chart && typeof e.chart == "object" && e.chart.type ? e.chart : null, p = f ? /* @__PURE__ */ R(Ve, {
+		dataset: String(e.dataset ?? ""),
+		chart: f,
+		runtimeFilter: o,
+		dataSource: t,
+		order: u
+	}) : null, h = d ? /* @__PURE__ */ R(Ue, {
+		dataset: String(e.dataset ?? ""),
+		rows: X(e.rows),
+		columnsAcross: l,
+		values: X(e.values),
+		runtimeFilter: o,
+		dataSource: t,
+		onDrill: s,
+		order: u
+	}) : /* @__PURE__ */ R(Ie, {
+		dataset: String(e.dataset ?? ""),
+		rows: X(e.rows),
+		values: X(e.values),
+		runtimeFilter: o,
+		dataSource: t,
+		onDrill: s,
+		order: u,
+		withTotals: c === "summary" || c === "matrix"
 	});
-	let d = e.chart && typeof e.chart == "object" && e.chart.type ? e.chart : null;
-	return /* @__PURE__ */ I("div", {
+	return /* @__PURE__ */ z("div", {
 		className: `${i ?? ""} flex flex-col gap-3`,
 		"data-testid": "dataset-report",
 		"data-report-name": e.name,
 		"data-report-presentation": c,
-		children: [d ? /* @__PURE__ */ F(Fe, {
-			dataset: String(e.dataset ?? ""),
-			chart: d,
-			runtimeFilter: o,
-			dataSource: t,
-			order: u
-		}) : null, /* @__PURE__ */ F(Ae, {
-			dataset: String(e.dataset ?? ""),
-			rows: Y(e.rows),
-			values: Y(e.values),
-			runtimeFilter: o,
-			dataSource: t,
-			onDrill: s,
-			order: u,
-			withTotals: c === "summary" || c === "matrix"
-		})]
+		children: [d ? h : p, d ? p : h]
 	});
-}, $ = (e) => {
-	let { dataSource: t, rows: n, runtimeFilter: r, onDrill: i, className: a } = e, o = v.useContext(C), s = t ?? o?.dataSource, c = e.schema;
-	if (c && typeof c == "object" && c.type === "spec-report" && c.report && typeof c.report == "object" && (c = c.report), ye(c)) return /* @__PURE__ */ F(Re, {
+}, Ge = (e) => {
+	let { dataSource: t, rows: n, runtimeFilter: r, onDrill: i, className: a } = e, o = b.useContext(T), s = t ?? o?.dataSource, c = e.schema;
+	if (c && typeof c == "object" && c.type === "report" && c.report && typeof c.report == "object" && (c = c.report), we(c)) return /* @__PURE__ */ R(We, {
 		report: c,
 		dataSource: s,
 		runtimeFilter: r,
 		onDrill: i,
 		className: a
 	});
-	if (b(c)) {
+	if (S(c)) {
 		let e = {
 			type: "report-viewer",
-			report: x(c),
+			report: C(c),
 			data: n ?? [],
 			showToolbar: !1
 		};
-		return /* @__PURE__ */ F("div", {
+		return /* @__PURE__ */ R("div", {
 			className: a,
 			"data-testid": "report-presentation-bridge",
-			children: /* @__PURE__ */ F(J, { schema: e })
+			children: /* @__PURE__ */ R(Ce, { schema: e })
 		});
 	}
-	return /* @__PURE__ */ F(H, { schema: c });
+	return /* @__PURE__ */ R(ue, { schema: c });
 };
 //#endregion
 //#region src/LiveReportExporter.ts
-async function ze(e, t) {
-	let { dataSource: n, resource: r, queryParams: i, format: a, exportConfig: o } = t, s = a || e.defaultExportFormat || "pdf";
+async function Ke(e, t) {
+	let { dataSource: n, resource: r, queryParams: i, format: a, exportConfig: o, locale: s } = t, c = a || e.defaultExportFormat || "pdf";
 	try {
 		let t = (await n.find(r, i)).data || [];
-		return W(s, e, t, {
-			format: s,
-			...e.exportConfigs?.[s],
+		return he(c, e, t, {
+			format: c,
+			...e.exportConfigs?.[c],
 			...o
-		}), {
+		}, s), {
 			success: !0,
 			recordCount: t.length,
-			format: s
+			format: c
 		};
 	} catch (e) {
 		return {
 			success: !1,
 			recordCount: 0,
-			format: s,
+			format: c,
 			error: e.message
 		};
 	}
 }
-function Be(e, t, n = {}) {
-	let { columns: r, filename: i, includeAggregationRow: a = !1 } = n, o = r || (e.fields || []).map(He), s = o.map((e) => e.header), c = t.map((e, t) => o.map((n) => {
+function qe(e, t, n = {}) {
+	let { columns: r, filename: i, includeAggregationRow: a = !1, locale: o = "en" } = n, s = r || (e.fields || []).map(Ye), c = s.map((e) => e.header), l = t.map((e, t) => s.map((n) => {
 		if (n.formula) return n.formula.replace(/\{ROW\}/g, String(t + 2));
 		let r = e[n.name];
-		return Ue(r, n.numberFormat);
+		return Xe(r, n.numberFormat, o);
 	}));
 	if (a && t.length > 0) {
-		let n = o.map((n, r) => {
+		let n = s.map((n, r) => {
 			let i = (e.fields || []).find((e) => e.name === n.name);
 			if (i?.aggregation) {
-				let e = Ge(r), n = t.length + 1;
+				let e = Qe(r), n = t.length + 1;
 				switch (i.aggregation) {
 					case "sum": return `=SUM(${e}2:${e}${n})`;
 					case "avg": return `=AVERAGE(${e}2:${e}${n})`;
@@ -1126,17 +1147,17 @@ function Be(e, t, n = {}) {
 			}
 			return "";
 		});
-		c.push(n);
+		l.push(n);
 	}
-	qe("" + [s.join("	"), ...c.map((e) => e.join("	"))].join("\n"), i || `${e.title || "report"}.tsv`, "text/tab-separated-values");
+	et("" + [c.join("	"), ...l.map((e) => e.join("	"))].join("\n"), i || `${e.title || "report"}.tsv`, "text/tab-separated-values");
 }
-function Ve(e, t, n, r) {
+function Je(e, t, n, r) {
 	return async () => {
 		let i = e.schedule;
 		if (!i?.enabled) return [];
 		let a = i.formats || [e.defaultExportFormat || "pdf"], o = [];
 		for (let r of a) {
-			let i = await ze(e, {
+			let i = await Ke(e, {
 				dataSource: t,
 				resource: n,
 				format: r
@@ -1146,16 +1167,16 @@ function Ve(e, t, n, r) {
 		return r(e, i), o;
 	};
 }
-function He(e) {
+function Ye(e) {
 	return {
 		name: e.name,
 		header: e.label || e.name
 	};
 }
-function Ue(e, t) {
-	return e == null ? "" : typeof e == "number" && t ? e.toLocaleString("en-US", We(t)) : Ke(String(e));
+function Xe(e, t, n = "en") {
+	return e == null ? "" : typeof e == "number" && t ? G(e, n, Ze(t)) : $e(String(e));
 }
-function We(e) {
+function Ze(e) {
 	if (e.includes("%")) return {
 		style: "percent",
 		minimumFractionDigits: 0
@@ -1166,69 +1187,56 @@ function We(e) {
 		maximumFractionDigits: Math.max(0, t - 1)
 	};
 }
-function Ge(e) {
+function Qe(e) {
 	let t = "", n = e;
 	for (; n >= 0;) t = String.fromCharCode(n % 26 + 65) + t, n = Math.floor(n / 26) - 1;
 	return t;
 }
-function Ke(e) {
+function $e(e) {
 	if (e.length > 0) {
 		let t = e.charAt(0);
 		if (t === "=" || t === "+" || t === "-" || t === "@" || t === "|") return `'${e}`;
 	}
 	return e;
 }
-function qe(e, t, n) {
+function et(e, t, n) {
 	let r = new Blob([e], { type: `${n};charset=utf-8` }), i = URL.createObjectURL(r), a = document.createElement("a");
 	a.href = i, a.download = t, document.body.appendChild(a), a.click(), document.body.removeChild(a), URL.revokeObjectURL(i);
 }
-e.register("report", $, {
-	namespace: "report",
+e.register("report", Ge, {
+	namespace: "plugin-report",
 	label: "Report",
 	category: "Report",
 	inputs: [
 		{
 			name: "title",
-			type: "string",
-			label: "Title"
+			type: "string"
 		},
 		{
 			name: "description",
-			type: "string",
-			label: "Description"
+			type: "string"
 		},
 		{
 			name: "chart",
-			type: "code",
-			label: "Chart Configuration"
+			type: "code"
+		},
+		{
+			name: "report",
+			type: "object",
+			description: "The report to render, as `@objectstack/spec` declares it (`ReportSchema`: `name`, `label`, `type`, `dataset`, `rows`, `values`, …). When present, the block renders this report and reads none of its own presentation inputs."
 		}
 	]
-}), e.register("spec-report", $, {
-	namespace: "report",
-	label: "Spec Report",
-	category: "Report",
-	inputs: [{
-		name: "dataset",
-		type: "string",
-		label: "Dataset"
-	}, {
-		name: "type",
-		type: "string",
-		label: "Report Type"
-	}]
-}), e.register("report-viewer", J, {
-	namespace: "report",
+}), e.register("report-viewer", Ce, {
+	namespace: "plugin-report",
 	label: "Report Viewer",
 	category: "Report",
 	inputs: [{
 		name: "report",
-		type: "code",
-		label: "Report Definition"
+		type: "code"
 	}, {
 		name: "showToolbar",
-		type: "boolean",
-		label: "Show Toolbar"
+		type: "boolean"
 	}]
 });
 //#endregion
-export { Re as DatasetReportRenderer, H as LegacyReportRenderer, $ as ReportRenderer, J as ReportViewer, Ve as createScheduleTrigger, ce as exportAsCSV, de as exportAsExcel, U as exportAsHTML, le as exportAsJSON, ue as exportAsPDF, Be as exportExcelWithFormulas, W as exportReport, ze as exportWithLiveData, q as formatValue, ye as isDatasetReport, p as mergeFilters };
+export { We as DatasetReportRenderer, ue as LegacyReportRenderer, Ge as ReportRenderer, Ce as ReportViewer, Je as createScheduleTrigger, de as exportAsCSV, me as exportAsExcel, K as exportAsHTML, fe as exportAsJSON, pe as exportAsPDF, qe as exportExcelWithFormulas, he as exportReport, Ke as exportWithLiveData, Y as formatValue, we as isDatasetReport, m as mergeFilters };