@object-ui/plugin-report 16.0.0 → 17.1.0

package/dist/index.js

@@ -6,10 +6,10 @@ import { SchemaRenderer as u, SchemaRendererContext as d } from "@object-ui/reac
 import { Badge as f, Button as p, Card as m, CardContent as h, CardDescription as g, CardHeader as _, CardTitle as v, Skeleton as y } from "@object-ui/components";
 import { jsx as b, jsxs as x } from "react/jsx-runtime";
 import { AlertTriangle as S, Download as C, Loader2 as w, Printer as T, RefreshCw as E, Table2 as D } from "lucide-react";
-import { getCellRenderer as O, resolveCellRendererType as k } from "@object-ui/fields";
-import { useSafeFieldLabel as A, useSafeTranslate as j } from "@object-ui/i18n";
+import { getCellRenderer as O, resolveCellRendererType as ee } from "@object-ui/fields";
+import { useSafeFieldLabel as k, useSafeTranslate as A } from "@object-ui/i18n";
 //#region src/LegacyReportRenderer.tsx
-var M = ({ schema: t }) => {
+var j = ({ schema: t }) => {
 	let { title: n, description: r, data: i, columns: a } = t;
 	t.chart?.type;
 	let o = !!t.chart;
@@ -64,29 +64,29 @@ var M = ({ schema: t }) => {
 };
 //#endregion
 //#region src/ReportExportEngine.ts
-function N(e, t, n) {
+function M(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 = z(n), typeof n == "string" && (n.includes(",") || n.includes("\"") || n.includes("\n")) ? `"${n.replace(/"/g, "\"\"")}"` : n ?? "";
+		return n = R(n), typeof n == "string" && (n.includes(",") || n.includes("\"") || n.includes("\n")) ? `"${n.replace(/"/g, "\"\"")}"` : n ?? "";
 	}));
-	V([...n?.includeHeaders === !1 ? [] : [i.join(",")], ...a.map((e) => e.join(","))].join("\n"), n?.filename || `${e.title || "report"}.csv`, "text/csv");
+	z([...n?.includeHeaders === !1 ? [] : [i.join(",")], ...a.map((e) => e.join(","))].join("\n"), n?.filename || `${e.title || "report"}.csv`, "text/csv");
 }
-function P(e, t, n) {
+function N(e, t, n) {
 	let r = {
 		title: e.title,
 		description: e.description,
 		generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
 		data: t
 	};
-	V(JSON.stringify(r, null, 2), n?.filename || `${e.title || "report"}.json`, "application/json");
+	z(JSON.stringify(r, null, 2), n?.filename || `${e.title || "report"}.json`, "application/json");
 }
-function F(e, t, n) {
-	let r = e.fields || [], i = te(n?.orientation), a = B(n?.pageSize);
-	V(`<!DOCTYPE html>
+function P(e, t, n) {
+	let r = e.fields || [], i = re(n?.orientation), a = ne(n?.pageSize);
+	z(`<!DOCTYPE html>
 <html>
 <head>
 <meta charset="utf-8">
-<title>${R(e.title || "Report")}</title>
+<title>${L(e.title || "Report")}</title>
 <style>
   @page { size: ${a} ${i}; margin: 20mm; }
   body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; color: #333; }
@@ -100,20 +100,20 @@ function F(e, t, n) {
 </style>
 </head>
 <body>
-<h1>${R(e.title || "Report")}</h1>
-${e.description ? `<p class="description">${R(e.description)}</p>` : ""}
+<h1>${L(e.title || "Report")}</h1>
+${e.description ? `<p class="description">${L(e.description)}</p>` : ""}
 <p class="meta">Generated: ${(/* @__PURE__ */ new Date()).toLocaleString()}</p>
 <table>
-<thead><tr>${r.map((e) => `<th>${R(e.label || e.name)}</th>`).join("")}</tr></thead>
-<tbody>${t.map((e) => `<tr>${r.map((t) => `<td>${R(String(e[t.name] ?? ""))}</td>`).join("")}</tr>`).join("")}</tbody>
+<thead><tr>${r.map((e) => `<th>${L(e.label || e.name)}</th>`).join("")}</tr></thead>
+<tbody>${t.map((e) => `<tr>${r.map((t) => `<td>${L(String(e[t.name] ?? ""))}</td>`).join("")}</tr>`).join("")}</tbody>
 </table>
 </body>
 </html>`, n?.filename || `${e.title || "report"}.html`, "text/html");
 }
-function ee(e, t, n) {
-	let r = e.fields || [], i = te(n?.orientation), a = B(n?.pageSize), o = window.open("", "_blank");
+function te(e, t, n) {
+	let r = e.fields || [], i = re(n?.orientation), a = ne(n?.pageSize), o = window.open("", "_blank");
 	if (!o) {
-		F(e, t, {
+		P(e, t, {
 			...n,
 			format: "html",
 			filename: n?.filename?.replace(/\.pdf$/, ".html") || `${e.title || "report"}.html`
@@ -124,7 +124,7 @@ function ee(e, t, n) {
 <html>
 <head>
 <meta charset="utf-8">
-<title>${R(e.title || "Report")}</title>
+<title>${L(e.title || "Report")}</title>
 <style>
   @page { size: ${a} ${i}; margin: 20mm; }
   @media print { .no-print { display: none; } }
@@ -139,56 +139,56 @@ function ee(e, t, n) {
 </style>
 </head>
 <body>
-<h1>${R(e.title || "Report")}</h1>
-${e.description ? `<p class="description">${R(e.description)}</p>` : ""}
+<h1>${L(e.title || "Report")}</h1>
+${e.description ? `<p class="description">${L(e.description)}</p>` : ""}
 <p class="meta">Generated: ${(/* @__PURE__ */ new Date()).toLocaleString()}</p>
 <table>
-<thead><tr>${r.map((e) => `<th>${R(e.label || e.name)}</th>`).join("")}</tr></thead>
-<tbody>${t.map((e) => `<tr>${r.map((t) => `<td>${R(String(e[t.name] ?? ""))}</td>`).join("")}</tr>`).join("")}</tbody>
+<thead><tr>${r.map((e) => `<th>${L(e.label || e.name)}</th>`).join("")}</tr></thead>
+<tbody>${t.map((e) => `<tr>${r.map((t) => `<td>${L(String(e[t.name] ?? ""))}</td>`).join("")}</tr>`).join("")}</tbody>
 </table>
 </body>
 </html>`), o.document.close(), o.onload = () => {
 		o.print();
 	};
 }
-function I(e, t, n) {
+function F(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 = z(n), typeof n == "string" && (n.includes(",") || n.includes("\"") || n.includes("\n") || n.includes("	")) ? `"${n.replace(/"/g, "\"\"")}"` : n ?? "";
+		return n = R(n), typeof n == "string" && (n.includes(",") || n.includes("\"") || n.includes("\n") || n.includes("	")) ? `"${n.replace(/"/g, "\"\"")}"` : n ?? "";
 	}));
-	V("" + [...n?.includeHeaders === !1 ? [] : [i.join("	")], ...a.map((e) => e.join("	"))].join("\n"), n?.filename || `${e.title || "report"}.tsv`, "text/tab-separated-values");
+	z("" + [...n?.includeHeaders === !1 ? [] : [i.join("	")], ...a.map((e) => e.join("	"))].join("\n"), n?.filename || `${e.title || "report"}.tsv`, "text/tab-separated-values");
 }
-function L(e, t, n, r) {
+function I(e, t, n, r) {
 	switch (e) {
 		case "csv":
-			N(t, n, r);
+			M(t, n, r);
 			break;
 		case "json":
-			P(t, n, r);
+			N(t, n, r);
 			break;
 		case "html":
-			F(t, n, r);
+			P(t, n, r);
 			break;
 		case "pdf":
-			ee(t, n, r);
+			te(t, n, r);
 			break;
 		case "excel":
-			I(t, n, r);
+			F(t, n, r);
 			break;
 		default: console.warn(`Unsupported export format: ${e}`);
 	}
 }
-function R(e) {
+function L(e) {
 	return e.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
 }
-function z(e) {
+function R(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 B(e) {
+function ne(e) {
 	return [
 		"A4",
 		"A3",
@@ -196,19 +196,19 @@ function B(e) {
 		"Legal"
 	].includes(e || "") ? e : "A4";
 }
-function te(e) {
+function re(e) {
 	return e === "landscape" ? "landscape" : "portrait";
 }
-function V(e, t, n) {
+function z(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 H(e, t) {
+function B(e, t) {
 	if (e == null || e === "") return "";
 	let n = t?.type, r = t?.format;
-	if (n === "date" || r === "date" || ne(e)) return re(e);
+	if (n === "date" || r === "date" || ie(e)) return ae(e);
 	if (n === "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", {
@@ -224,10 +224,10 @@ function H(e, t) {
 	}
 	return String(e);
 }
-function ne(e) {
+function ie(e) {
 	return typeof e == "string" && /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2})?/.test(e);
 }
-function re(e) {
+function ae(e) {
 	try {
 		let t = new Date(e);
 		return isNaN(t.getTime()) ? String(e) : `${t.getFullYear()}-${String(t.getMonth() + 1).padStart(2, "0")}-${String(t.getDate()).padStart(2, "0")}`;
@@ -237,7 +237,7 @@ function re(e) {
 }
 //#endregion
 //#region src/ReportViewer.tsx
-function ie(e, t) {
+function oe(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,129 +253,131 @@ function ie(e, t) {
 	let o = n.sort === "desc" ? -1 : 1;
 	return a.sort((e, t) => e.key.localeCompare(t.key) * o), a;
 }
-var U = ({ schema: t, onRefresh: n }) => {
-	let { report: r, data: i, showToolbar: a = !0, allowExport: o = !0, allowPrint: c = !0, loading: l = !1 } = t, d = (e) => {
-		if (!r) {
+function se(e, t, n) {
+	if (!e) return 0;
+	let r = e.map((e) => Number(e[t]) || 0);
+	switch (n) {
+		case "count": return e.length;
+		case "sum": return r.reduce((e, t) => e + t, 0);
+		case "avg": return r.length > 0 ? (r.reduce((e, t) => e + t, 0) / r.length).toFixed(2) : 0;
+		case "min": return r.length > 0 ? Math.min(...r) : 0;
+		case "max": return r.length > 0 ? Math.max(...r) : 0;
+		case "distinct": return new Set(e.map((e) => e[t])).size;
+		default: return "";
+	}
+}
+var V = ({ schema: e, onRefresh: t }) => {
+	let { report: n, data: r, showToolbar: i = !0, allowExport: a = !0, allowPrint: o = !0, loading: c = !1 } = e, l = (e) => {
+		if (!n) {
 			console.warn("ReportViewer: Cannot export, no report defined");
 			return;
 		}
-		L(e, r, i || [], r.exportConfigs?.[e]);
-	}, S = () => {
+		I(e, n, r || [], n.exportConfigs?.[e]);
+	}, d = () => {
 		window.print();
-	}, w = () => {
-		n?.();
-	}, D = (e, t) => {
-		if (!i) return 0;
-		let n = i.map((t) => Number(t[e]) || 0);
-		switch (t) {
-			case "count": return i.length;
-			case "sum": return n.reduce((e, t) => e + t, 0);
-			case "avg": return n.length > 0 ? (n.reduce((e, t) => e + t, 0) / n.length).toFixed(2) : 0;
-			case "min": return n.length > 0 ? Math.min(...n) : 0;
-			case "max": return n.length > 0 ? Math.max(...n) : 0;
-			default: return "";
-		}
-	}, A = (e, t) => {
-		let n = r?.conditionalFormatting;
-		if (!(!n || !Array.isArray(n))) for (let r of n) {
-			if (r.field !== e) continue;
-			let n = String(t ?? ""), i = String(r.value ?? ""), a = !1;
-			switch (r.operator) {
+	}, S = () => {
+		t?.();
+	}, w = (e, t) => se(r, e, t), D = (e, t) => {
+		let r = n?.conditionalFormatting;
+		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) {
 				case "equals":
-					a = n === i;
+					a = r === i;
 					break;
 				case "not_equals":
-					a = n !== i;
+					a = r !== i;
 					break;
 				case "contains":
-					a = n.includes(i);
+					a = r.includes(i);
 					break;
 				case "greater_than":
-					a = Number(t) > Number(r.value);
+					a = Number(t) > Number(n.value);
 					break;
 				case "less_than":
-					a = Number(t) < Number(r.value);
+					a = Number(t) < Number(n.value);
 					break;
 			}
 			if (a) {
 				let e = {};
-				return r.backgroundColor && (e.backgroundColor = r.backgroundColor), r.textColor && (e.color = r.textColor), e;
+				return n.backgroundColor && (e.backgroundColor = n.backgroundColor), n.textColor && (e.color = n.textColor), e;
 			}
 		}
-	}, j = (e, t) => {
+	}, k = (e, t) => {
 		if (e == null || e === "") return "";
 		if (t.renderAs === "badge" && (!t.type || t.type === "string" || t.type === "text")) return /* @__PURE__ */ b(f, {
 			className: t.colorMap?.[String(e)] || "",
 			children: String(e)
 		});
-		if (t.aggregation) return H(e, t);
+		if (t.aggregation) return B(e, t);
 		if (t.type) {
 			let n = { ...t };
 			return t.colorMap && !n.options && (n.options = Object.entries(t.colorMap).map(([e, t]) => ({
 				value: e,
 				label: e,
 				color: t
-			}))), /* @__PURE__ */ b(O(k(n)), {
+			}))), /* @__PURE__ */ b(O(ee(n)), {
 				value: e,
 				field: n
 			});
 		}
-		return H(e, t);
+		return B(e, t);
 	};
-	return r ? /* @__PURE__ */ x("div", {
+	return n ? /* @__PURE__ */ x("div", {
 		className: "space-y-4",
-		children: [a && /* @__PURE__ */ x("div", {
+		children: [i && /* @__PURE__ */ x("div", {
 			className: "flex items-center justify-between gap-2 p-4 bg-card rounded-lg border",
 			children: [/* @__PURE__ */ x("div", { children: [/* @__PURE__ */ b("h2", {
 				className: "text-lg font-semibold",
-				children: r.title
-			}), r.description && /* @__PURE__ */ b("p", {
+				children: n.title
+			}), n.description && /* @__PURE__ */ b("p", {
 				className: "text-sm text-muted-foreground",
-				children: r.description
+				children: n.description
 			})] }), /* @__PURE__ */ x("div", {
 				className: "flex items-center gap-2",
 				children: [
-					r.refreshInterval && /* @__PURE__ */ x(p, {
+					n.refreshInterval && /* @__PURE__ */ x(p, {
 						variant: "outline",
 						size: "sm",
-						onClick: w,
+						onClick: S,
 						children: [/* @__PURE__ */ b(E, { className: "h-4 w-4 mr-2" }), "Refresh"]
 					}),
-					c && /* @__PURE__ */ x(p, {
+					o && /* @__PURE__ */ x(p, {
 						variant: "outline",
 						size: "sm",
-						onClick: S,
+						onClick: d,
 						children: [/* @__PURE__ */ b(T, { className: "h-4 w-4 mr-2" }), "Print"]
 					}),
-					o && r.showExportButtons && /* @__PURE__ */ x("div", {
+					a && n.showExportButtons && /* @__PURE__ */ x("div", {
 						className: "flex items-center gap-1",
 						children: [
 							/* @__PURE__ */ x(p, {
 								variant: "outline",
 								size: "sm",
-								onClick: () => d("pdf"),
+								onClick: () => l("pdf"),
 								children: [/* @__PURE__ */ b(C, { className: "h-4 w-4 mr-2" }), "PDF"]
 							}),
 							/* @__PURE__ */ x(p, {
 								variant: "outline",
 								size: "sm",
-								onClick: () => d("excel"),
+								onClick: () => l("excel"),
 								children: [/* @__PURE__ */ b(C, { className: "h-4 w-4 mr-2" }), "Excel"]
 							}),
 							/* @__PURE__ */ x(p, {
 								variant: "outline",
 								size: "sm",
-								onClick: () => d("csv"),
+								onClick: () => l("csv"),
 								children: [/* @__PURE__ */ b(C, { className: "h-4 w-4 mr-2" }), "CSV"]
 							})
 						]
 					})
 				]
 			})]
-		}), /* @__PURE__ */ x(m, { children: [/* @__PURE__ */ x(_, { children: [!a && r.title && /* @__PURE__ */ b(v, { children: r.title }), !a && r.description && /* @__PURE__ */ b(g, { children: r.description })] }), /* @__PURE__ */ x(h, {
+		}), /* @__PURE__ */ x(m, { children: [/* @__PURE__ */ x(_, { children: [!i && n.title && /* @__PURE__ */ b(v, { children: n.title }), !i && n.description && /* @__PURE__ */ b(g, { children: n.description })] }), /* @__PURE__ */ x(h, {
 			className: "space-y-6",
 			children: [
-				l && /* @__PURE__ */ x("div", {
+				c && /* @__PURE__ */ x("div", {
 					className: "space-y-6",
 					children: [/* @__PURE__ */ b("div", {
 						className: "grid grid-cols-1 md:grid-cols-3 gap-4",
@@ -398,115 +400,96 @@ var U = ({ schema: t, onRefresh: n }) => {
 						].map((e) => /* @__PURE__ */ b(y, { className: "h-8 w-full" }, e))]
 					})]
 				}),
-				!l && r.sections?.map((t, n) => t.visible === !1 ? null : /* @__PURE__ */ x("div", {
+				!c && n.sections?.map((e, t) => e.visible === !1 ? null : /* @__PURE__ */ x("div", {
 					className: "space-y-2",
 					children: [
-						t.title && t.type !== "header" && /* @__PURE__ */ b("h3", {
+						e.title && e.type !== "header" && /* @__PURE__ */ b("h3", {
 							className: "text-lg font-semibold border-b pb-2",
-							children: t.title
+							children: e.title
 						}),
-						t.type === "header" && t.title && /* @__PURE__ */ b("div", {
+						e.type === "header" && e.title && /* @__PURE__ */ b("div", {
 							className: "text-2xl font-bold py-4",
-							children: t.title
+							children: e.title
 						}),
-						t.type === "summary" && /* @__PURE__ */ b("div", {
+						e.type === "summary" && /* @__PURE__ */ b("div", {
 							className: "grid grid-cols-1 md:grid-cols-3 gap-4",
-							children: r.fields?.filter((e) => e.showInSummary).map((e, t) => /* @__PURE__ */ b(m, { children: /* @__PURE__ */ x(h, {
+							children: n.fields?.filter((e) => e.showInSummary).map((e, t) => /* @__PURE__ */ b(m, { children: /* @__PURE__ */ x(h, {
 								className: "p-4",
 								children: [/* @__PURE__ */ b("div", {
 									className: "text-sm text-muted-foreground",
 									children: e.label || e.name
 								}), /* @__PURE__ */ b("div", {
 									className: "text-2xl font-bold",
-									children: H(D(e.name, e.aggregation), e)
+									children: B(w(e.name, e.aggregation), e)
 								})]
 							}) }, t))
 						}),
-						t.type === "chart" && t.chart && /* @__PURE__ */ b("div", {
-							className: "min-h-[300px]",
-							children: (() => {
-								let n = t.chart.type, r = !!t.chart.chartType;
-								!n && r && (n = "chart"), n && e.get(n) || (n = "chart");
-								let a = n === "chart" ? {
-									xAxisKey: t.chart.xAxisKey || t.chart.xAxisField || "name",
-									series: t.chart.series || (t.chart.yAxisFields ? t.chart.yAxisFields.map((e) => ({ dataKey: e })) : []),
-									chartType: t.chart.chartType || "bar"
-								} : {};
-								return /* @__PURE__ */ b(u, { schema: {
-									...t.chart,
-									type: n,
-									...a,
-									data: i || t.chart.data,
-									className: t.chart.className || "w-full h-[350px]"
-								} });
-							})()
-						}),
-						t.type === "table" && /* @__PURE__ */ b("div", {
+						e.type === "table" && /* @__PURE__ */ b("div", {
 							className: "border rounded-lg overflow-x-auto",
 							children: /* @__PURE__ */ x("table", {
 								className: "w-full text-sm min-w-[600px]",
 								children: [/* @__PURE__ */ b("thead", {
 									className: "bg-muted",
-									children: /* @__PURE__ */ b("tr", { children: t.columns?.map((e, t) => /* @__PURE__ */ b("th", {
+									children: /* @__PURE__ */ b("tr", { children: e.columns?.map((e, t) => /* @__PURE__ */ b("th", {
 										className: `px-4 py-2 font-medium ${e.type === "number" ? "text-right" : "text-left"}`,
 										children: e.label || e.name
 									}, t)) })
 								}), /* @__PURE__ */ b("tbody", { children: (() => {
-									let e = ie(i || [], r.groupBy || []);
-									return e ? e.map((e) => /* @__PURE__ */ x(s.Fragment, { children: [/* @__PURE__ */ b("tr", {
+									let t = oe(r || [], n.groupBy || []);
+									return t ? t.map((t) => /* @__PURE__ */ x(s.Fragment, { children: [/* @__PURE__ */ b("tr", {
 										className: "bg-muted/60",
 										children: /* @__PURE__ */ x("td", {
-											colSpan: t.columns?.length || 1,
+											colSpan: e.columns?.length || 1,
 											className: "px-4 py-2 font-semibold text-sm",
 											children: [
-												e.label,
+												t.label,
 												" (",
-												e.rows.length,
+												t.rows.length,
 												")"
 											]
 										})
-									}), e.rows.map((e, n) => /* @__PURE__ */ b("tr", {
+									}), t.rows.map((t, n) => /* @__PURE__ */ b("tr", {
 										className: "border-t hover:bg-muted/50 even:bg-muted/20",
-										children: t.columns?.map((t, n) => /* @__PURE__ */ b("td", {
-											className: `px-4 py-2 ${t.type === "number" ? "text-right tabular-nums" : ""}`,
-											style: A(t.name, e[t.name]),
-											children: j(e[t.name], t)
+										children: e.columns?.map((e, n) => /* @__PURE__ */ b("td", {
+											className: `px-4 py-2 ${e.type === "number" ? "text-right tabular-nums" : ""}`,
+											style: D(e.name, t[e.name]),
+											children: k(t[e.name], e)
 										}, n))
-									}, n))] }, e.key)) : i?.map((e, n) => /* @__PURE__ */ b("tr", {
+									}, n))] }, t.key)) : r?.map((t, n) => /* @__PURE__ */ b("tr", {
 										className: "border-t hover:bg-muted/50 even:bg-muted/20",
-										children: t.columns?.map((t, n) => /* @__PURE__ */ b("td", {
-											className: `px-4 py-2 ${t.type === "number" ? "text-right tabular-nums" : ""}`,
-											style: A(t.name, e[t.name]),
-											children: j(e[t.name], t)
+										children: e.columns?.map((e, n) => /* @__PURE__ */ b("td", {
+											className: `px-4 py-2 ${e.type === "number" ? "text-right tabular-nums" : ""}`,
+											style: D(e.name, t[e.name]),
+											children: k(t[e.name], e)
 										}, n))
 									}, n));
 								})() })]
 							})
 						}),
-						t.type === "text" && t.text && /* @__PURE__ */ b("div", {
+						e.type === "text" && e.text && /* @__PURE__ */ b("div", {
 							className: "prose max-w-none",
-							children: /* @__PURE__ */ b("p", { children: t.text })
+							children: /* @__PURE__ */ b("p", { children: e.text })
 						}),
-						t.type === "page-break" && /* @__PURE__ */ b("div", { className: "border-t-2 border-dashed my-8 print:page-break-after-always" }),
-						t.content && /* @__PURE__ */ b(u, { schema: t.content })
+						e.type === "page-break" && /* @__PURE__ */ b("div", { className: "border-t-2 border-dashed my-8 print:page-break-after-always" }),
+						e.content && /* @__PURE__ */ b(u, { schema: e.content })
 					]
-				}, n)),
-				!r.sections && i && i.length > 0 && /* @__PURE__ */ b("div", {
+				}, t)),
+				!n.sections && r && r.length > 0 && /* @__PURE__ */ b("div", {
 					className: "border rounded-lg overflow-x-auto",
 					children: /* @__PURE__ */ x("table", {
 						className: "w-full text-sm min-w-[600px]",
 						children: [/* @__PURE__ */ b("thead", {
 							className: "bg-muted",
-							children: /* @__PURE__ */ b("tr", { children: r.fields?.map((e, t) => /* @__PURE__ */ b("th", {
+							children: /* @__PURE__ */ b("tr", { children: n.fields?.map((e, t) => /* @__PURE__ */ b("th", {
 								className: `px-4 py-2 font-medium ${e.type === "number" ? "text-right" : "text-left"}`,
 								children: e.label || e.name
 							}, t)) })
-						}), /* @__PURE__ */ b("tbody", { children: i.map((e, t) => /* @__PURE__ */ b("tr", {
+						}), /* @__PURE__ */ b("tbody", { children: r.map((e, t) => /* @__PURE__ */ b("tr", {
 							className: "border-t hover:bg-muted/50 even:bg-muted/20",
-							children: r.fields?.map((t, n) => /* @__PURE__ */ b("td", {
+							children: n.fields?.map((t, n) => /* @__PURE__ */ b("td", {
 								className: `px-4 py-2 ${t.type === "number" ? "text-right tabular-nums" : ""}`,
-								style: A(t.name, e[t.name]),
-								children: j(e[t.name], t)
+								style: D(t.name, e[t.name]),
+								children: k(e[t.name], t)
 							}, n))
 						}, t)) })]
 					})
@@ -520,26 +503,41 @@ var U = ({ schema: t, onRefresh: n }) => {
 };
 //#endregion
 //#region src/DatasetReportRenderer.tsx
-function W(e) {
+function H(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");
 }
-function G(e, t) {
+function U(e, t) {
 	return e ? typeof e == "string" ? e : typeof e == "object" && typeof e.default == "string" ? e.default : t : t;
 }
-function K(e) {
+function W(e) {
 	return Array.isArray(e) ? e.filter((e) => typeof e == "string" && !!e) : [];
 }
-function q(e, t, n, r, i, a) {
-	let [s, c] = o.useState({
+function G(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");
+	}
+	return Object.keys(t).length > 0 ? t : void 0;
+}
+function ce(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 K(e, t, n, r, i, a, s) {
+	let [c, l] = o.useState({
 		status: "idle",
 		rows: []
-	}), l = JSON.stringify(r ?? null), u = JSON.stringify(a ?? null), d = `${e}|${t.join(",")}|${n.join(",")}|${l}|${u}`;
+	}), u = ce(s, t, n), d = JSON.stringify(r ?? null), f = JSON.stringify(a ?? null), p = JSON.stringify(u ?? null), m = `${e}|${t.join(",")}|${n.join(",")}|${d}|${f}|${p}`;
 	return o.useEffect(() => {
 		let o = i;
 		if (!o || typeof o.queryDataset != "function") {
-			c({
+			l({
 				status: "error",
 				rows: [],
 				error: "This data source does not support dataset queries."
@@ -547,33 +545,35 @@ function q(e, t, n, r, i, a) {
 			return;
 		}
 		if (!e || n.length === 0) {
-			c({
+			l({
 				status: "idle",
 				rows: []
 			});
 			return;
 		}
 		let s = !1;
-		return c({
+		return l({
 			status: "loading",
 			rows: []
 		}), o.queryDataset(e, {
 			dimensions: t,
 			measures: n,
 			...r && Object.keys(r).length > 0 ? { runtimeFilter: r } : {},
-			...a ? { totals: { groupings: a } } : {}
+			...a ? { totals: { groupings: a } } : {},
+			...u ? { order: u } : {}
 		}).then((e) => {
-			s || c({
+			s || l({
 				status: "ok",
 				rows: Array.isArray(e?.rows) ? e.rows : [],
 				fields: Array.isArray(e?.fields) ? e.fields : [],
 				object: e?.object,
 				dimensionFields: e?.dimensionFields,
 				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({
+			s || l({
 				status: "error",
 				rows: [],
 				error: String(e?.message ?? e)
@@ -581,9 +581,9 @@ function q(e, t, n, r, i, a) {
 		}), () => {
 			s = !0;
 		};
-	}, [d]), s;
+	}, [m]), c;
 }
-function J({ dataset: e }) {
+function q({ dataset: e }) {
 	return /* @__PURE__ */ x("div", {
 		className: "flex items-center justify-center rounded-md border border-dashed bg-muted/20 p-4 text-xs text-muted-foreground",
 		children: [
@@ -593,7 +593,7 @@ function J({ dataset: e }) {
 		]
 	});
 }
-function Y({ status: e, error: t }) {
+function J({ status: e, error: t }) {
 	return e === "error" ? /* @__PURE__ */ x("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",
@@ -606,68 +606,106 @@ function Y({ status: e, error: t }) {
 		children: [/* @__PURE__ */ b(w, { className: "h-4 w-4 animate-spin" }), " Running report…"]
 	});
 }
-function X() {
+function Y() {
 	return /* @__PURE__ */ x("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__ */ b(D, { className: "h-6 w-6" }), " The dataset returned no rows for this report’s scope."]
 	});
 }
-var Z = "cursor-pointer hover:bg-accent/40";
-function ae({ dataset: e, rows: a, values: o, runtimeFilter: s, dataSource: c, onDrill: l }) {
-	let u = q(e, a, o, s, c), { fieldLabel: d } = A();
-	if (o.length === 0) return /* @__PURE__ */ b(J, { dataset: e });
-	if (u.status === "loading" || u.status === "idle") return /* @__PURE__ */ b(Y, { status: u.status });
-	if (u.status === "error") return /* @__PURE__ */ b(Y, {
+var le = "cursor-pointer hover:bg-accent/40";
+function ue({ dataset: e, rows: a, values: o, runtimeFilter: s, dataSource: c, onDrill: l, order: u, withTotals: d }) {
+	let f = K(e, a, o, s, c, d && a.length > 0 ? [[]] : void 0, u), { fieldLabel: p } = k(), m = A();
+	if (o.length === 0) return /* @__PURE__ */ b(q, { dataset: e });
+	if (f.status === "loading" || f.status === "idle") return /* @__PURE__ */ b(J, { status: f.status });
+	if (f.status === "error") return /* @__PURE__ */ b(J, {
 		status: "error",
-		error: u.error
+		error: f.error
 	});
-	if (u.rows.length === 0) return /* @__PURE__ */ b(X, {});
-	let f = !!l && a.length > 0, p = u.dimensionFields ? a.filter((e) => e in u.dimensionFields) : [], m = (n, r) => {
+	if (f.rows.length === 0) return /* @__PURE__ */ b(Y, {});
+	let h = !!l && a.length > 0, g = f.dimensionFields ? a.filter((e) => e in f.dimensionFields) : [], _ = (n, r) => {
 		let i = {};
 		for (let e of a) i[e] = n[e];
-		let o = u.object && u.dimensionFields && p.length > 0 ? t(u.drillRawRows?.[r], p, u.dimensionFields, s) : void 0;
+		let o = f.drillRanges?.[r], c = !!o && Object.keys(o).length > 0, u = f.object && (g.length > 0 || c) ? t(f.drillRawRows?.[r], g, f.dimensionFields ?? {}, s, o) : void 0;
 		l({
 			dataset: e,
 			groupKey: i,
 			runtimeFilter: s,
-			object: u.object,
-			objectFilter: o
+			object: f.object,
+			objectFilter: u
 		});
-	}, { measureField: h, headerLabel: g } = n(u.fields, u.object, d), _ = [...a, ...o];
+	}, { measureField: v, headerLabel: y } = n(f.fields, f.object, p), S = [...a, ...o], C = d ? f.totals?.find((e) => Array.isArray(e.dimensions) && e.dimensions.length === 0)?.rows?.[0] : void 0, w = m("report.total", "Total");
 	return /* @__PURE__ */ b("div", {
 		className: "overflow-auto max-h-[70vh] rounded-md border",
 		children: /* @__PURE__ */ x("table", {
 			className: "w-full text-xs",
 			children: [/* @__PURE__ */ b("thead", {
 				className: "bg-muted/40",
-				children: /* @__PURE__ */ b("tr", { children: _.map((e) => /* @__PURE__ */ b("th", {
+				children: /* @__PURE__ */ b("tr", { children: S.map((e) => /* @__PURE__ */ b("th", {
 					className: "px-2 py-1.5 text-left font-medium whitespace-nowrap",
-					children: g(e)
+					children: y(e)
 				}, e)) })
-			}), /* @__PURE__ */ b("tbody", { children: u.rows.map((e, t) => /* @__PURE__ */ b("tr", {
-				className: `border-t${f ? ` ${Z}` : ""}`,
-				"data-testid": f ? "dataset-drill-row" : void 0,
-				onClick: f ? () => m(e, t) : void 0,
-				children: _.map((t) => /* @__PURE__ */ b("td", {
+			}), /* @__PURE__ */ x("tbody", { children: [f.rows.map((e, t) => /* @__PURE__ */ b("tr", {
+				className: `border-t${h ? ` ${le}` : ""}`,
+				"data-testid": h ? "dataset-drill-row" : void 0,
+				onClick: h ? () => _(e, t) : void 0,
+				children: S.map((t) => /* @__PURE__ */ b("td", {
 					className: "px-2 py-1 tabular-nums whitespace-nowrap",
-					children: o.includes(t) ? i(e[t], h(t)?.format, h(t)?.currency) : r(e[t])
+					children: o.includes(t) ? i(e[t], v(t)?.format, v(t)?.currency) : r(e[t])
 				}, t))
-			}, t)) })]
+			}, t)), C && /* @__PURE__ */ x("tr", {
+				className: "border-t bg-muted/30 font-medium",
+				"data-testid": "dataset-report-total-row",
+				children: [a.length > 0 && /* @__PURE__ */ b("td", {
+					colSpan: a.length,
+					className: "px-2 py-1 whitespace-nowrap",
+					children: w
+				}), o.map((e) => /* @__PURE__ */ b("td", {
+					className: "px-2 py-1 tabular-nums whitespace-nowrap",
+					children: i(C[e], v(e)?.format, v(e)?.currency)
+				}, e))]
+			})] })]
 		})
 	});
 }
-function oe(e) {
+function de(e) {
 	switch (e) {
-		case "line": return "line";
-		case "area": return "area";
-		case "pie": return "pie";
-		case "donut": return "donut";
-		case "radar": return "radar";
-		case "scatter": return "scatter";
-		default: return "bar";
+		case "summary": return "summary";
+		case "matrix": return "matrix";
+		case "joined": return "joined";
+		default: return "tabular";
+	}
+}
+function fe(e) {
+	switch (e) {
+		case "bar":
+		case "column":
+		case "horizontal-bar":
+		case "line":
+		case "area":
+		case "pie":
+		case "donut":
+		case "funnel":
+		case "scatter":
+		case "treemap":
+		case "sankey":
+		case "radar": return {
+			kind: "series",
+			chartType: e
+		};
+		case "gauge":
+		case "solid-gauge":
+		case "metric":
+		case "kpi":
+		case "bullet": return { kind: "single_value" };
+		case "table":
+		case "pivot": return { kind: "tabular" };
+		default: return {
+			kind: "unsupported",
+			type: String(e)
+		};
 	}
 }
-function se(t) {
+function pe(t) {
 	let [, n] = o.useReducer((e) => e + 1, 0);
 	return o.useEffect(() => {
 		if (e.get(t)) return;
@@ -677,54 +715,83 @@ function se(t) {
 		return i && typeof i.then == "function" && i.then(() => n()).catch(() => {}), r;
 	}, [t]), e.get(t);
 }
-function ce({ dataset: e, chart: t, runtimeFilter: n, dataSource: r }) {
-	let i = typeof t.xAxis == "string" ? t.xAxis : "", a = typeof t.yAxis == "string" ? t.yAxis : "", o = q(e, i ? [i] : [], a ? [a] : [], n, r), s = se("chart");
-	if (!i || !a) return null;
-	if (o.status === "loading" || o.status === "idle") return /* @__PURE__ */ x("div", {
+function me({ dataset: e, chart: t, runtimeFilter: r, dataSource: a, order: o }) {
+	let s = typeof t.xAxis == "string" ? t.xAxis : "", c = typeof t.yAxis == "string" ? t.yAxis : "", l = fe(t.type), u = l.kind === "series" || l.kind === "single_value", d = K(e, l.kind === "series" && s ? [s] : [], u && c ? [c] : [], r, a, void 0, o), f = pe("chart"), { fieldLabel: p } = k(), m = typeof t.title == "string" ? t.title : void 0;
+	if (l.kind === "tabular") return null;
+	if (l.kind === "unsupported") return /* @__PURE__ */ x("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 “",
+			l.type,
+			"” is not a spec chart type — the grouped table below carries this report’s numbers."
+		]
+	});
+	if (l.kind === "series" && !s || !c) return null;
+	if (d.status === "loading" || d.status === "idle") return /* @__PURE__ */ x("div", {
 		className: "flex items-center gap-2 p-4 text-xs text-muted-foreground",
 		children: [/* @__PURE__ */ b(w, { className: "h-4 w-4 animate-spin" }), " Loading chart…"]
 	});
-	if (o.status === "error" || o.rows.length === 0 || !s) return null;
-	let c = typeof t.title == "string" ? t.title : void 0;
-	return /* @__PURE__ */ x("div", {
+	if (d.status === "error" || d.rows.length === 0) return null;
+	if (l.kind === "single_value") {
+		let { measureField: e, headerLabel: t } = n(d.fields, d.object, p), r = e(c);
+		return /* @__PURE__ */ x("div", {
+			className: "rounded-md border bg-card p-3",
+			"data-testid": "dataset-report-metric",
+			children: [m ? /* @__PURE__ */ b("h3", {
+				className: "mb-2 text-sm font-semibold",
+				children: m
+			}) : null, /* @__PURE__ */ x("div", {
+				className: "flex flex-col gap-0.5 py-2",
+				children: [/* @__PURE__ */ b("span", {
+					className: "text-2xl font-semibold tabular-nums",
+					children: i(d.rows[0]?.[c], r?.format, r?.currency)
+				}), /* @__PURE__ */ b("span", {
+					className: "text-xs text-muted-foreground",
+					children: t(c)
+				})]
+			})]
+		});
+	}
+	return f ? /* @__PURE__ */ x("div", {
 		className: "rounded-md border bg-card p-3",
 		"data-testid": "dataset-report-chart",
-		children: [c ? /* @__PURE__ */ b("h3", {
+		children: [m ? /* @__PURE__ */ b("h3", {
 			className: "mb-2 text-sm font-semibold",
-			children: c
-		}) : null, /* @__PURE__ */ b(s, { schema: {
-			chartType: oe(t.type),
-			data: o.rows,
-			xAxisKey: i,
-			series: [{ dataKey: a }],
+			children: m
+		}) : null, /* @__PURE__ */ b(f, { schema: {
+			chartType: l.chartType,
+			data: d.rows,
+			xAxisKey: s,
+			series: [{ dataKey: c }],
 			height: typeof t.height == "number" ? t.height : 280,
 			isAnimationActive: !1
 		} })]
-	});
+	}) : null;
 }
-function Q(e, t) {
+function X(e, t) {
 	return e.map((e) => String(t[e] ?? "∅")).join("");
 }
-function le(e, t) {
+function he(e, t) {
 	return e.map((e) => r(t[e])).join(" / ");
 }
-function ue({ dataset: e, rows: a, columnsAcross: s, values: c, runtimeFilter: l, dataSource: u, onDrill: d }) {
-	let f = q(e, [...a, ...s], c, l, u, [
+function Z({ dataset: e, rows: a, columnsAcross: s, values: c, runtimeFilter: l, dataSource: u, onDrill: d, order: f }) {
+	let p = K(e, [...a, ...s], c, l, u, [
 		a,
 		s,
 		[]
-	]), p = j(), { fieldLabel: m } = A(), h = o.useMemo(() => {
-		if (f.status !== "ok") return null;
+	], f), m = A(), { fieldLabel: h } = k(), g = o.useMemo(() => {
+		if (p.status !== "ok") return null;
 		let e = [], t = [], n = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), i = /* @__PURE__ */ new Map();
-		return f.rows.forEach((o, c) => {
-			let l = Q(a, o), u = Q(s, o);
+		return p.rows.forEach((o, c) => {
+			let l = X(a, o), u = X(s, o);
 			if (!n.has(l)) {
 				n.add(l);
 				let t = {};
 				for (let e of a) t[e] = o[e];
 				e.push({
 					id: l,
-					label: le(a, o),
+					label: he(a, o),
 					key: t
 				});
 			}
@@ -734,7 +801,7 @@ function ue({ dataset: e, rows: a, columnsAcross: s, values: c, runtimeFilter: l
 				for (let t of s) e[t] = o[t];
 				t.push({
 					id: u,
-					label: le(s, o),
+					label: he(s, o),
 					key: e
 				});
 			}
@@ -748,19 +815,19 @@ function ue({ dataset: e, rows: a, columnsAcross: s, values: c, runtimeFilter: l
 			cells: i
 		};
 	}, [
-		f,
+		p,
 		a,
 		s
 	]);
-	if (c.length === 0) return /* @__PURE__ */ b(J, { dataset: e });
-	if (f.status === "loading" || f.status === "idle") return /* @__PURE__ */ b(Y, { status: f.status });
-	if (f.status === "error") return /* @__PURE__ */ b(Y, {
+	if (c.length === 0) return /* @__PURE__ */ b(q, { dataset: e });
+	if (p.status === "loading" || p.status === "idle") return /* @__PURE__ */ b(J, { status: p.status });
+	if (p.status === "error") return /* @__PURE__ */ b(J, {
 		status: "error",
-		error: f.error
+		error: p.error
 	});
-	if (!h || h.rowHeaders.length === 0) return /* @__PURE__ */ b(X, {});
-	let { measureField: g, headerLabel: _ } = n(f.fields, f.object, m), v = p("report.total", "Total"), y = !!d, S = f.dimensionFields ? [...a, ...s].filter((e) => e in f.dimensionFields) : [], C = (n, r, i) => {
-		let a = f.object && f.dimensionFields && S.length > 0 ? t(f.drillRawRows?.[i], S, f.dimensionFields, l) : void 0;
+	if (!g || g.rowHeaders.length === 0) return /* @__PURE__ */ b(Y, {});
+	let { measureField: _, headerLabel: v } = n(p.fields, p.object, h), y = m("report.total", "Total"), S = !!d, C = p.dimensionFields ? [...a, ...s].filter((e) => e in p.dimensionFields) : [], w = (n, r, i) => {
+		let a = p.drillRanges?.[i], o = !!a && Object.keys(a).length > 0, s = p.object && (C.length > 0 || o) ? t(p.drillRawRows?.[i], C, p.dimensionFields ?? {}, l, a) : void 0;
 		d({
 			dataset: e,
 			groupKey: {
@@ -768,18 +835,18 @@ function ue({ dataset: e, rows: a, columnsAcross: s, values: c, runtimeFilter: l
 				...r
 			},
 			runtimeFilter: l,
-			object: f.object,
-			objectFilter: a
+			object: p.object,
+			objectFilter: s
 		});
-	}, w = h.colHeaders.flatMap((e) => c.map((t) => ({
+	}, T = g.colHeaders.flatMap((e) => c.map((t) => ({
 		col: e,
 		measure: t,
-		header: c.length === 1 ? e.label : `${e.label} · ${_(t)}`
-	}))), T = (e) => f.totals?.find((t) => Array.isArray(t.dimensions) && t.dimensions.join(",") === e.join(","))?.rows, E = /* @__PURE__ */ new Map();
-	for (let e of T(a) ?? []) E.set(Q(a, e), e);
-	let D = /* @__PURE__ */ new Map();
-	for (let e of T(s) ?? []) D.set(Q(s, e), e);
-	let O = T([])?.[0], k = E.size > 0, M = D.size > 0;
+		header: c.length === 1 ? e.label : `${e.label} · ${v(t)}`
+	}))), E = (e) => p.totals?.find((t) => Array.isArray(t.dimensions) && t.dimensions.join(",") === e.join(","))?.rows, D = /* @__PURE__ */ new Map();
+	for (let e of E(a) ?? []) D.set(X(a, e), e);
+	let O = /* @__PURE__ */ new Map();
+	for (let e of E(s) ?? []) O.set(X(s, e), e);
+	let ee = E([])?.[0], j = D.size > 0, M = O.size > 0;
 	return /* @__PURE__ */ b("div", {
 		className: "overflow-auto max-h-[70vh] rounded-md border",
 		"data-testid": "dataset-matrix",
@@ -790,38 +857,38 @@ function ue({ dataset: e, rows: a, columnsAcross: s, values: c, runtimeFilter: l
 				children: /* @__PURE__ */ x("tr", { children: [
 					a.map((e) => /* @__PURE__ */ b("th", {
 						className: "px-2 py-1.5 text-left font-medium whitespace-nowrap",
-						children: _(e)
+						children: v(e)
 					}, e)),
-					w.map((e) => /* @__PURE__ */ b("th", {
+					T.map((e) => /* @__PURE__ */ b("th", {
 						className: "px-2 py-1.5 text-right font-medium whitespace-nowrap",
 						children: e.header
 					}, `${e.col.id}-${e.measure}`)),
-					k && c.map((e) => /* @__PURE__ */ b("th", {
+					j && c.map((e) => /* @__PURE__ */ b("th", {
 						className: "px-2 py-1.5 text-right font-medium whitespace-nowrap",
 						"data-testid": "matrix-total-col-header",
-						children: c.length === 1 ? v : `${v} · ${_(e)}`
+						children: c.length === 1 ? y : `${y} · ${v(e)}`
 					}, `total-${e}`))
 				] })
-			}), /* @__PURE__ */ x("tbody", { children: [h.rowHeaders.map((e) => /* @__PURE__ */ x("tr", {
+			}), /* @__PURE__ */ x("tbody", { children: [g.rowHeaders.map((e) => /* @__PURE__ */ x("tr", {
 				className: "border-t",
 				children: [
 					a.map((t) => /* @__PURE__ */ b("td", {
 						className: "px-2 py-1 whitespace-nowrap font-medium",
 						children: r(e.key[t])
 					}, t)),
-					w.map((t) => {
-						let n = h.cells.get(`${e.id} ${t.col.id}`), r = n?.row[t.measure], a = y && n != null;
+					T.map((t) => {
+						let n = g.cells.get(`${e.id} ${t.col.id}`), r = n?.row[t.measure], a = S && n != null;
 						return /* @__PURE__ */ b("td", {
-							className: `px-2 py-1 text-right tabular-nums whitespace-nowrap${a ? ` ${Z}` : ""}`,
+							className: `px-2 py-1 text-right tabular-nums whitespace-nowrap${a ? ` ${le}` : ""}`,
 							"data-testid": a ? "dataset-drill-cell" : void 0,
-							onClick: a ? () => C(e.key, t.col.key, n.index) : void 0,
-							children: i(r, g(t.measure)?.format, g(t.measure)?.currency)
+							onClick: a ? () => w(e.key, t.col.key, n.index) : void 0,
+							children: i(r, _(t.measure)?.format, _(t.measure)?.currency)
 						}, `${t.col.id}-${t.measure}`);
 					}),
-					k && c.map((t) => /* @__PURE__ */ b("td", {
+					j && c.map((t) => /* @__PURE__ */ b("td", {
 						className: "px-2 py-1 text-right tabular-nums whitespace-nowrap font-medium",
 						"data-testid": "matrix-row-total",
-						children: i(E.get(e.id)?.[t], g(t)?.format, g(t)?.currency)
+						children: i(D.get(e.id)?.[t], _(t)?.format, _(t)?.currency)
 					}, `total-${t}`))
 				]
 			}, e.id)), M && /* @__PURE__ */ x("tr", {
@@ -831,25 +898,25 @@ function ue({ dataset: e, rows: a, columnsAcross: s, values: c, runtimeFilter: l
 					a.length > 0 && /* @__PURE__ */ b("td", {
 						colSpan: a.length,
 						className: "px-2 py-1 whitespace-nowrap",
-						children: v
+						children: y
 					}),
-					w.map((e) => /* @__PURE__ */ b("td", {
+					T.map((e) => /* @__PURE__ */ b("td", {
 						className: "px-2 py-1 text-right tabular-nums whitespace-nowrap",
-						children: i(D.get(e.col.id)?.[e.measure], g(e.measure)?.format, g(e.measure)?.currency)
+						children: i(O.get(e.col.id)?.[e.measure], _(e.measure)?.format, _(e.measure)?.currency)
 					}, `${e.col.id}-${e.measure}`)),
-					k && c.map((e) => /* @__PURE__ */ b("td", {
+					j && c.map((e) => /* @__PURE__ */ b("td", {
 						className: "px-2 py-1 text-right tabular-nums whitespace-nowrap",
 						"data-testid": "matrix-grand-total",
-						children: i(O?.[e], g(e)?.format, g(e)?.currency)
+						children: i(ee?.[e], _(e)?.format, _(e)?.currency)
 					}, `grand-${e}`))
 				]
 			})] })]
 		})
 	});
 }
-var de = ({ report: e, dataSource: t, runtimeFilter: n, onDrill: r, className: i }) => {
-	let o = a(e.runtimeFilter ?? e.filter, n), s = e.drilldown === !1 ? void 0 : r;
-	if (e.type === "joined" && Array.isArray(e.blocks)) return /* @__PURE__ */ b("div", {
+var ge = ({ report: e, dataSource: t, runtimeFilter: n, onDrill: r, className: i }) => {
+	let o = a(e.runtimeFilter ?? e.filter, n), s = e.drilldown === !1 ? void 0 : r, c = de(e.type);
+	if (c === "joined" && Array.isArray(e.blocks)) return /* @__PURE__ */ b("div", {
 		className: i,
 		"data-testid": "dataset-joined-report",
 		"data-report-name": e.name,
@@ -859,21 +926,24 @@ var de = ({ report: e, dataSource: t, runtimeFilter: n, onDrill: r, className: i
 			gap: 24
 		},
 		children: e.blocks.map((e, n) => {
-			let r = a(o, e.runtimeFilter ?? e.filter), i = K(e.columns), c = e.type === "matrix" && i.length > 0 ? /* @__PURE__ */ b(ue, {
+			let r = a(o, e.runtimeFilter ?? e.filter), i = W(e.columns), c = G(e.order), l = de(e.type), u = l === "matrix" && i.length > 0 ? /* @__PURE__ */ b(Z, {
 				dataset: String(e.dataset ?? ""),
-				rows: K(e.rows),
+				rows: W(e.rows),
 				columnsAcross: i,
-				values: K(e.values),
+				values: W(e.values),
 				runtimeFilter: r,
 				dataSource: t,
-				onDrill: s
-			}) : /* @__PURE__ */ b(ae, {
+				onDrill: s,
+				order: c
+			}) : /* @__PURE__ */ b(ue, {
 				dataset: String(e.dataset ?? ""),
-				rows: K(e.rows),
-				values: K(e.values),
+				rows: W(e.rows),
+				values: W(e.values),
 				runtimeFilter: r,
 				dataSource: t,
-				onDrill: s
+				onDrill: s,
+				order: c,
+				withTotals: l === "summary" || l === "matrix"
 			});
 			return /* @__PURE__ */ x("section", {
 				"data-testid": "dataset-report-block",
@@ -883,52 +953,57 @@ var de = ({ report: e, dataSource: t, runtimeFilter: n, onDrill: r, className: i
 					className: "flex flex-col gap-0.5",
 					children: [/* @__PURE__ */ b("h3", {
 						className: "text-sm font-semibold",
-						children: G(e.label, e.name ?? `Block ${n + 1}`)
+						children: U(e.label, e.name ?? `Block ${n + 1}`)
 					}), e.description ? /* @__PURE__ */ b("p", {
 						className: "text-xs text-muted-foreground",
-						children: G(e.description, "")
+						children: U(e.description, "")
 					}) : null]
-				}), c]
+				}), u]
 			}, e.name ?? `block-${n}`);
 		})
 	});
-	let c = K(e.columns);
-	if (e.type === "matrix" && c.length > 0) return /* @__PURE__ */ b("div", {
+	let l = W(e.columns), u = G(e.order);
+	if (c === "matrix" && l.length > 0) return /* @__PURE__ */ b("div", {
 		className: i,
 		"data-testid": "dataset-report",
 		"data-report-name": e.name,
-		children: /* @__PURE__ */ b(ue, {
+		children: /* @__PURE__ */ b(Z, {
 			dataset: String(e.dataset ?? ""),
-			rows: K(e.rows),
-			columnsAcross: c,
-			values: K(e.values),
+			rows: W(e.rows),
+			columnsAcross: l,
+			values: W(e.values),
 			runtimeFilter: o,
 			dataSource: t,
-			onDrill: s
+			onDrill: s,
+			order: u
 		})
 	});
-	let l = e.chart && typeof e.chart == "object" && e.chart.type ? e.chart : null;
+	let d = e.chart && typeof e.chart == "object" && e.chart.type ? e.chart : null;
 	return /* @__PURE__ */ x("div", {
 		className: `${i ?? ""} flex flex-col gap-3`,
 		"data-testid": "dataset-report",
 		"data-report-name": e.name,
-		children: [l ? /* @__PURE__ */ b(ce, {
+		"data-report-presentation": c,
+		children: [d ? /* @__PURE__ */ b(me, {
 			dataset: String(e.dataset ?? ""),
-			chart: l,
+			chart: d,
 			runtimeFilter: o,
-			dataSource: t
-		}) : null, /* @__PURE__ */ b(ae, {
+			dataSource: t,
+			order: u
+		}) : null, /* @__PURE__ */ b(ue, {
 			dataset: String(e.dataset ?? ""),
-			rows: K(e.rows),
-			values: K(e.values),
+			rows: W(e.rows),
+			values: W(e.values),
 			runtimeFilter: o,
 			dataSource: t,
-			onDrill: s
+			onDrill: s,
+			order: u,
+			withTotals: c === "summary" || c === "matrix"
 		})]
 	});
-}, $ = (e) => {
+}, Q = (e) => {
 	let { dataSource: t, rows: n, runtimeFilter: r, onDrill: i, className: a } = e, s = o.useContext(d), u = t ?? s?.dataSource, f = e.schema;
-	return f && typeof f == "object" && f.type === "spec-report" && f.report && typeof f.report == "object" && (f = f.report), W(f) ? /* @__PURE__ */ b(de, {
+	return f && typeof f == "object" && f.type === "spec-report" && f.report && typeof f.report == "object" && (f = f.report), H(f) ? /* @__PURE__ */ b(ge, {
 		report: f,
 		dataSource: u,
 		runtimeFilter: r,
@@ -937,21 +1012,21 @@ var de = ({ report: e, dataSource: t, runtimeFilter: n, onDrill: r, className: i
 	}) : c(f) ? /* @__PURE__ */ b("div", {
 		className: a,
 		"data-testid": "report-presentation-bridge",
-		children: /* @__PURE__ */ b(U, { schema: {
+		children: /* @__PURE__ */ b(V, { schema: {
 			type: "report-viewer",
 			report: l(f),
 			data: n ?? [],
 			showToolbar: !1
 		} })
-	}) : /* @__PURE__ */ b(M, { schema: f });
+	}) : /* @__PURE__ */ b(j, { schema: f });
 };
 //#endregion
 //#region src/LiveReportExporter.ts
-async function fe(e, t) {
+async function $(e, t) {
 	let { dataSource: n, resource: r, queryParams: i, format: a, exportConfig: o } = t, s = a || e.defaultExportFormat || "pdf";
 	try {
 		let t = (await n.find(r, i)).data || [];
-		return L(s, e, t, {
+		return I(s, e, t, {
 			format: s,
 			...e.exportConfigs?.[s],
 			...o
@@ -969,17 +1044,17 @@ async function fe(e, t) {
 		};
 	}
 }
-function pe(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 _e(e, t, n = {}) {
+	let { columns: r, filename: i, includeAggregationRow: a = !1 } = n, o = r || (e.fields || []).map(ye), s = o.map((e) => e.header), c = t.map((e, t) => o.map((n) => {
 		if (n.formula) return n.formula.replace(/\{ROW\}/g, String(t + 2));
 		let r = e[n.name];
-		return ge(r, n.numberFormat);
+		return be(r, n.numberFormat);
 	}));
 	if (a && t.length > 0) {
 		let n = o.map((n, r) => {
 			let i = (e.fields || []).find((e) => e.name === n.name);
 			if (i?.aggregation) {
-				let e = ve(r), n = t.length + 1;
+				let e = Se(r), n = t.length + 1;
 				switch (i.aggregation) {
 					case "sum": return `=SUM(${e}2:${e}${n})`;
 					case "avg": return `=AVERAGE(${e}2:${e}${n})`;
@@ -993,15 +1068,15 @@ function pe(e, t, n = {}) {
 		});
 		c.push(n);
 	}
-	be("" + [s.join("	"), ...c.map((e) => e.join("	"))].join("\n"), i || `${e.title || "report"}.tsv`, "text/tab-separated-values");
+	we("" + [s.join("	"), ...c.map((e) => e.join("	"))].join("\n"), i || `${e.title || "report"}.tsv`, "text/tab-separated-values");
 }
-function me(e, t, n, r) {
+function ve(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 fe(e, {
+			let i = await $(e, {
 				dataSource: t,
 				resource: n,
 				format: r
@@ -1011,16 +1086,16 @@ function me(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 ge(e, t) {
-	return e == null ? "" : typeof e == "number" && t ? e.toLocaleString("en-US", _e(t)) : ye(String(e));
+function be(e, t) {
+	return e == null ? "" : typeof e == "number" && t ? e.toLocaleString("en-US", xe(t)) : Ce(String(e));
 }
-function _e(e) {
+function xe(e) {
 	if (e.includes("%")) return {
 		style: "percent",
 		minimumFractionDigits: 0
@@ -1031,23 +1106,23 @@ function _e(e) {
 		maximumFractionDigits: Math.max(0, t - 1)
 	};
 }
-function ve(e) {
+function Se(e) {
 	let t = "", n = e;
 	for (; n >= 0;) t = String.fromCharCode(n % 26 + 65) + t, n = Math.floor(n / 26) - 1;
 	return t;
 }
-function ye(e) {
+function Ce(e) {
 	if (e.length > 0) {
 		let t = e.charAt(0);
 		if (t === "=" || t === "+" || t === "-" || t === "@" || t === "|") return `'${e}`;
 	}
 	return e;
 }
-function be(e, t, n) {
+function we(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", $, {
+e.register("report", Q, {
 	namespace: "report",
 	label: "Report",
 	category: "Report",
@@ -1068,7 +1143,7 @@ e.register("report", $, {
 			label: "Chart Configuration"
 		}
 	]
-}), e.register("spec-report", $, {
+}), e.register("spec-report", Q, {
 	namespace: "report",
 	label: "Spec Report",
 	category: "Report",
@@ -1081,7 +1156,7 @@ e.register("report", $, {
 		type: "string",
 		label: "Report Type"
 	}]
-}), e.register("report-viewer", U, {
+}), e.register("report-viewer", V, {
 	namespace: "report",
 	label: "Report Viewer",
 	category: "Report",
@@ -1096,4 +1171,4 @@ e.register("report", $, {
 	}]
 });
 //#endregion
-export { de as DatasetReportRenderer, M as LegacyReportRenderer, $ as ReportRenderer, U as ReportViewer, me as createScheduleTrigger, N as exportAsCSV, I as exportAsExcel, F as exportAsHTML, P as exportAsJSON, ee as exportAsPDF, pe as exportExcelWithFormulas, L as exportReport, fe as exportWithLiveData, H as formatValue, W as isDatasetReport, a as mergeFilters };
+export { ge as DatasetReportRenderer, j as LegacyReportRenderer, Q as ReportRenderer, V as ReportViewer, ve as createScheduleTrigger, M as exportAsCSV, F as exportAsExcel, P as exportAsHTML, N as exportAsJSON, te as exportAsPDF, _e as exportExcelWithFormulas, I as exportReport, $ as exportWithLiveData, B as formatValue, H as isDatasetReport, a as mergeFilters };