@object-ui/plugin-charts 6.0.3 → 6.1.0

package/dist/index.js

@@ -1,28 +1,28 @@
-import { ComponentRegistry as e, computeDrillFilter as t, extractRecords as n, isDrillEnabled as r, resolveDateMacros as i, resolveDrillTitle as a } from "@object-ui/core";
-import * as o from "react";
-import s, { Suspense as c, useCallback as l, useContext as u, useEffect as d, useMemo as f, useRef as p, useState as m } from "react";
-import { Dialog as h, DialogContent as g, DialogHeader as _, DialogTitle as ee, RefreshIndicator as v, Sheet as y, SheetContent as te, SheetHeader as b, SheetTitle as ne, Skeleton as x } from "@object-ui/components";
-import { Fragment as S, jsx as C, jsxs as w } from "react/jsx-runtime";
-import { Area as T, AreaChart as re, Bar as E, BarChart as D, CartesianGrid as O, Cell as k, Funnel as ie, FunnelChart as A, LabelList as j, Legend as M, Line as N, LineChart as P, Pie as F, PieChart as I, PolarAngleAxis as L, PolarGrid as R, PolarRadiusAxis as z, Radar as ae, RadarChart as oe, ResponsiveContainer as se, Scatter as ce, ScatterChart as le, Tooltip as ue, XAxis as B, YAxis as V, ZAxis as de } from "recharts";
-import { SchemaRenderer as fe, SchemaRendererContext as pe, useDataScope as me } from "@object-ui/react";
-import { AlertCircle as he } from "lucide-react";
-import { useSafeFieldLabel as ge } from "@object-ui/i18n";
+import { ComponentRegistry as e, compareToTrendLabelKey as t, computeDrillFilter as n, extractRecords as r, isDrillEnabled as i, resolveDateMacros as a, resolveDrillTitle as o, shiftFilterByCompareTo as s } from "@object-ui/core";
+import * as c from "react";
+import l, { Suspense as u, useCallback as d, useContext as f, useEffect as p, useMemo as m, useRef as h, useState as g } from "react";
+import { Dialog as _, DialogContent as ee, DialogHeader as v, DialogTitle as y, RefreshIndicator as te, Sheet as ne, SheetContent as re, SheetHeader as ie, SheetTitle as ae, Skeleton as b } from "@object-ui/components";
+import { Fragment as x, jsx as S, jsxs as C } from "react/jsx-runtime";
+import { Area as w, AreaChart as oe, Bar as T, BarChart as E, CartesianGrid as D, Cell as O, Funnel as se, FunnelChart as k, LabelList as A, Legend as j, Line as M, LineChart as ce, Pie as le, PieChart as N, PolarAngleAxis as ue, PolarGrid as de, PolarRadiusAxis as P, Radar as F, RadarChart as I, ResponsiveContainer as L, Scatter as R, ScatterChart as z, Tooltip as B, XAxis as V, YAxis as H, ZAxis as fe } from "recharts";
+import { SchemaRenderer as pe, SchemaRendererContext as me, useDataScope as he } from "@object-ui/react";
+import { AlertCircle as ge } from "lucide-react";
+import { useSafeFieldLabel as _e } from "@object-ui/i18n";
 //#region \0rolldown/runtime.js
-var _e = Object.defineProperty, H = (e, t) => () => (e && (t = e(e = 0)), t), ve = (e, t) => {
+var ve = Object.defineProperty, ye = (e, t) => () => (e && (t = e(e = 0)), t), be = (e, t) => {
 	let n = {};
-	for (var r in e) _e(n, r, {
+	for (var r in e) ve(n, r, {
 		get: e[r],
 		enumerable: !0
 	});
-	return t || _e(n, Symbol.toStringTag, { value: "Module" }), n;
-}, ye = /* @__PURE__ */ ve({ default: () => be });
-function be({ data: e = [], dataKey: t = "value", xAxisKey: n = "name", height: r = 400, className: i = "", color: a = "hsl(var(--primary))" }) {
-	return /* @__PURE__ */ C("div", {
+	return t || ve(n, Symbol.toStringTag, { value: "Module" }), n;
+}, xe = /* @__PURE__ */ be({ default: () => Se });
+function Se({ data: e = [], dataKey: t = "value", xAxisKey: n = "name", height: r = 400, className: i = "", color: a = "hsl(var(--primary))" }) {
+	return /* @__PURE__ */ S("div", {
 		className: `p-2 sm:p-3 md:p-4 rounded-xl border border-border bg-card/40 backdrop-blur-sm shadow-lg shadow-background/5 ${i}`,
-		children: /* @__PURE__ */ C(se, {
+		children: /* @__PURE__ */ S(L, {
 			width: "100%",
 			height: r,
-			children: /* @__PURE__ */ w(D, {
+			children: /* @__PURE__ */ C(E, {
 				data: e,
 				margin: {
 					top: 10,
@@ -31,64 +31,64 @@ function be({ data: e = [], dataKey: t = "value", xAxisKey: n = "name", height:
 					bottom: 5
 				},
 				children: [
-					/* @__PURE__ */ w("defs", { children: [/* @__PURE__ */ w("linearGradient", {
+					/* @__PURE__ */ C("defs", { children: [/* @__PURE__ */ C("linearGradient", {
 						id: "barGradient",
 						x1: "0",
 						y1: "0",
 						x2: "0",
 						y2: "1",
 						children: [
-							/* @__PURE__ */ C("stop", {
+							/* @__PURE__ */ S("stop", {
 								offset: "0%",
 								stopColor: a,
 								stopOpacity: 1
 							}),
-							/* @__PURE__ */ C("stop", {
+							/* @__PURE__ */ S("stop", {
 								offset: "90%",
 								stopColor: a,
 								stopOpacity: .6
 							}),
-							/* @__PURE__ */ C("stop", {
+							/* @__PURE__ */ S("stop", {
 								offset: "100%",
 								stopColor: a,
 								stopOpacity: .3
 							})
 						]
-					}), /* @__PURE__ */ w("filter", {
+					}), /* @__PURE__ */ C("filter", {
 						id: "glow",
 						height: "130%",
 						children: [
-							/* @__PURE__ */ C("feGaussianBlur", {
+							/* @__PURE__ */ S("feGaussianBlur", {
 								in: "SourceAlpha",
 								stdDeviation: "3",
 								result: "blur"
 							}),
-							/* @__PURE__ */ C("feOffset", {
+							/* @__PURE__ */ S("feOffset", {
 								in: "blur",
 								dx: "0",
 								dy: "0",
 								result: "offsetBlur"
 							}),
-							/* @__PURE__ */ C("feFlood", {
+							/* @__PURE__ */ S("feFlood", {
 								floodColor: a,
 								floodOpacity: "0.5",
 								result: "offsetColor"
 							}),
-							/* @__PURE__ */ C("feComposite", {
+							/* @__PURE__ */ S("feComposite", {
 								in: "offsetColor",
 								in2: "offsetBlur",
 								operator: "in",
 								result: "offsetBlur"
 							}),
-							/* @__PURE__ */ w("feMerge", { children: [/* @__PURE__ */ C("feMergeNode", { in: "offsetBlur" }), /* @__PURE__ */ C("feMergeNode", { in: "SourceGraphic" })] })
+							/* @__PURE__ */ C("feMerge", { children: [/* @__PURE__ */ S("feMergeNode", { in: "offsetBlur" }), /* @__PURE__ */ S("feMergeNode", { in: "SourceGraphic" })] })
 						]
 					})] }),
-					/* @__PURE__ */ C(O, {
+					/* @__PURE__ */ S(D, {
 						strokeDasharray: "3 3",
 						stroke: "hsl(var(--border))",
 						vertical: !1
 					}),
-					/* @__PURE__ */ C(B, {
+					/* @__PURE__ */ S(V, {
 						dataKey: n,
 						tick: {
 							fill: "hsl(var(--muted-foreground))",
@@ -99,7 +99,7 @@ function be({ data: e = [], dataKey: t = "value", xAxisKey: n = "name", height:
 						axisLine: { stroke: "hsl(var(--border))" },
 						dy: 10
 					}),
-					/* @__PURE__ */ C(V, {
+					/* @__PURE__ */ S(H, {
 						tick: {
 							fill: "hsl(var(--muted-foreground))",
 							fontSize: 12,
@@ -108,7 +108,7 @@ function be({ data: e = [], dataKey: t = "value", xAxisKey: n = "name", height:
 						tickLine: !1,
 						axisLine: !1
 					}),
-					/* @__PURE__ */ C(ue, {
+					/* @__PURE__ */ S(B, {
 						cursor: {
 							fill: "hsl(var(--muted))",
 							opacity: .2
@@ -123,11 +123,11 @@ function be({ data: e = [], dataKey: t = "value", xAxisKey: n = "name", height:
 						},
 						itemStyle: { color: "hsl(var(--primary))" }
 					}),
-					/* @__PURE__ */ C(M, { wrapperStyle: {
+					/* @__PURE__ */ S(j, { wrapperStyle: {
 						paddingTop: "20px",
 						fontFamily: "monospace"
 					} }),
-					/* @__PURE__ */ C(E, {
+					/* @__PURE__ */ S(T, {
 						dataKey: t,
 						fill: "url(#barGradient)",
 						radius: [
@@ -144,21 +144,21 @@ function be({ data: e = [], dataKey: t = "value", xAxisKey: n = "name", height:
 		})
 	});
 }
-var xe = H((() => {}));
+var Ce = ye((() => {}));
 //#endregion
 //#region src/ChartContainerImpl.tsx
-function Se() {
-	let e = o.useContext(Te);
+function we() {
+	let e = c.useContext(De);
 	if (!e) throw Error("useChart must be used within a <ChartContainer />");
 	return e;
 }
 function U({ id: e, className: t, children: n, config: r, ...i }) {
-	let a = o.useId(), s = `chart-${e || a.replace(/:/g, "")}`;
-	return /* @__PURE__ */ C(Te.Provider, {
+	let a = c.useId(), o = `chart-${e || a.replace(/:/g, "")}`;
+	return /* @__PURE__ */ S(De.Provider, {
 		value: { config: r },
-		children: /* @__PURE__ */ w("div", {
+		children: /* @__PURE__ */ C("div", {
 			"data-slot": "chart",
-			"data-chart": s,
+			"data-chart": o,
 			className: K("flex w-full h-[350px] justify-center text-xs [&_.recharts-cartesian-axis-tick_text]:fill-muted-foreground", t),
 			style: {
 				minHeight: 280,
@@ -166,10 +166,10 @@ function U({ id: e, className: t, children: n, config: r, ...i }) {
 				...i.style
 			},
 			...i,
-			children: [/* @__PURE__ */ C(Ee, {
-				id: s,
+			children: [/* @__PURE__ */ S(Oe, {
+				id: o,
 				config: r
-			}), /* @__PURE__ */ C(se, {
+			}), /* @__PURE__ */ S(L, {
 				width: "100%",
 				height: "100%",
 				children: n
@@ -177,20 +177,20 @@ function U({ id: e, className: t, children: n, config: r, ...i }) {
 		})
 	});
 }
-function W({ active: e, payload: t, className: n, indicator: r = "dot", hideLabel: i = !1, hideIndicator: a = !1, label: s, labelFormatter: c, labelClassName: l, formatter: u, color: d, nameKey: f, labelKey: p }) {
-	let { config: m } = Se(), h = o.useMemo(() => {
+function W({ active: e, payload: t, className: n, indicator: r = "dot", hideLabel: i = !1, hideIndicator: a = !1, label: o, labelFormatter: s, labelClassName: l, formatter: u, color: d, nameKey: f, labelKey: p }) {
+	let { config: m } = we(), h = c.useMemo(() => {
 		if (i || !t?.length) return null;
-		let [e] = t, n = Ce(m, e, `${p || e?.dataKey || e?.name || "value"}`), r = !p && typeof s == "string" ? m[s]?.label || s : n?.label;
-		return c ? /* @__PURE__ */ C("div", {
+		let [e] = t, n = Te(m, e, `${p || e?.dataKey || e?.name || "value"}`), r = !p && typeof o == "string" ? m[o]?.label || o : n?.label;
+		return s ? /* @__PURE__ */ S("div", {
 			className: K("font-medium", l),
-			children: c(r, t)
-		}) : r ? /* @__PURE__ */ C("div", {
+			children: s(r, t)
+		}) : r ? /* @__PURE__ */ S("div", {
 			className: K("font-medium", l),
 			children: r
 		}) : null;
 	}, [
+		o,
 		s,
-		c,
 		t,
 		i,
 		l,
@@ -199,29 +199,29 @@ function W({ active: e, payload: t, className: n, indicator: r = "dot", hideLabe
 	]);
 	if (!e || !t?.length) return null;
 	let g = t.length === 1 && r !== "dot";
-	return /* @__PURE__ */ w("div", {
+	return /* @__PURE__ */ C("div", {
 		className: K("border-border/50 bg-background grid min-w-[8rem] items-start gap-1.5 rounded-lg border px-2.5 py-1.5 text-xs shadow-xl", n),
-		children: [g ? null : h, /* @__PURE__ */ C("div", {
+		children: [g ? null : h, /* @__PURE__ */ S("div", {
 			className: "grid gap-1.5",
 			children: t.filter((e) => e.type !== "none").map((e, t) => {
-				let n = Ce(m, e, `${f || e.name || e.dataKey || "value"}`), i = d || e.payload.fill || e.color;
-				return /* @__PURE__ */ C("div", {
+				let n = Te(m, e, `${f || e.name || e.dataKey || "value"}`), i = d || e.payload.fill || e.color;
+				return /* @__PURE__ */ S("div", {
 					className: K("[&>svg]:text-muted-foreground flex w-full flex-wrap items-stretch gap-2 [&>svg]:h-2.5 [&>svg]:w-2.5", r === "dot" ? "items-center" : ""),
-					children: u && e?.value !== void 0 && e.name ? u(e.value, e.name, e, t, e.payload) : /* @__PURE__ */ w(S, { children: [n?.icon ? /* @__PURE__ */ C(n.icon, {}) : !a && /* @__PURE__ */ C("div", {
+					children: u && e?.value !== void 0 && e.name ? u(e.value, e.name, e, t, e.payload) : /* @__PURE__ */ C(x, { children: [n?.icon ? /* @__PURE__ */ S(n.icon, {}) : !a && /* @__PURE__ */ S("div", {
 						className: K("shrink-0 rounded-[2px] border-(--color-border) bg-(--color-bg)", r === "dot" ? "h-2.5 w-2.5" : "", r === "line" ? "w-1" : "", r === "dashed" ? "w-0 border-[1.5px] border-dashed bg-transparent" : "", g && r === "dashed" ? "my-0.5" : ""),
 						style: {
 							"--color-bg": i,
 							"--color-border": i
 						}
-					}), /* @__PURE__ */ w("div", {
+					}), /* @__PURE__ */ C("div", {
 						className: K("flex flex-1 justify-between leading-none", g ? "items-end" : "items-center"),
-						children: [/* @__PURE__ */ w("div", {
+						children: [/* @__PURE__ */ C("div", {
 							className: "grid gap-1.5",
-							children: [g ? h : null, /* @__PURE__ */ C("span", {
+							children: [g ? h : null, /* @__PURE__ */ S("span", {
 								className: "text-muted-foreground",
 								children: n?.label || e.name
 							})]
-						}), e.value && /* @__PURE__ */ C("span", {
+						}), e.value && /* @__PURE__ */ S("span", {
 							className: "text-foreground font-mono font-medium tabular-nums",
 							children: e.value.toLocaleString()
 						})]
@@ -232,14 +232,14 @@ function W({ active: e, payload: t, className: n, indicator: r = "dot", hideLabe
 	});
 }
 function G({ className: e, hideIcon: t = !1, payload: n, verticalAlign: r = "bottom", nameKey: i }) {
-	let { config: a } = Se();
-	return n?.length ? /* @__PURE__ */ C("div", {
+	let { config: a } = we();
+	return n?.length ? /* @__PURE__ */ S("div", {
 		className: K("flex items-center justify-center gap-4", r === "top" ? "pb-3" : "pt-3", e),
 		children: n.filter((e) => e.type !== "none").map((e) => {
-			let n = Ce(a, e, `${i || e.dataKey || "value"}`);
-			return /* @__PURE__ */ w("div", {
+			let n = Te(a, e, `${i || e.dataKey || "value"}`);
+			return /* @__PURE__ */ C("div", {
 				className: K("[&>svg]:text-muted-foreground flex items-center gap-1.5 [&>svg]:h-3 [&>svg]:w-3"),
-				children: [n?.icon && !t ? /* @__PURE__ */ C(n.icon, {}) : /* @__PURE__ */ C("div", {
+				children: [n?.icon && !t ? /* @__PURE__ */ S(n.icon, {}) : /* @__PURE__ */ S("div", {
 					className: "h-2 w-2 shrink-0 rounded-[2px]",
 					style: { backgroundColor: e.color }
 				}), n?.label]
@@ -247,18 +247,18 @@ function G({ className: e, hideIcon: t = !1, payload: n, verticalAlign: r = "bot
 		})
 	}) : null;
 }
-function Ce(e, t, n) {
+function Te(e, t, n) {
 	if (typeof t != "object" || !t) return;
 	let r = "payload" in t && typeof t.payload == "object" && t.payload !== null ? t.payload : void 0, i = n;
 	return n in t && typeof t[n] == "string" ? i = t[n] : r && n in r && typeof r[n] == "string" && (i = r[n]), i in e ? e[i] : e[n];
 }
-var K, we, Te, Ee, q, J, De = H((() => {
-	K = (...e) => e.filter(Boolean).join(" "), we = {
+var K, Ee, De, Oe, q, J, ke = ye((() => {
+	K = (...e) => e.filter(Boolean).join(" "), Ee = {
 		light: "",
 		dark: ".dark"
-	}, Te = o.createContext(null), Ee = ({ id: e, config: t }) => {
+	}, De = c.createContext(null), Oe = ({ id: e, config: t }) => {
 		let n = Object.entries(t).filter(([, e]) => e.theme || e.color);
-		return n.length ? /* @__PURE__ */ C("style", { dangerouslySetInnerHTML: { __html: Object.entries(we).map(([t, r]) => `
+		return n.length ? /* @__PURE__ */ S("style", { dangerouslySetInnerHTML: { __html: Object.entries(Ee).map(([t, r]) => `
 ${r} [data-chart=${e}] {
 ${n.map(([e, n]) => {
 			let r = n.theme?.[t] || n.color;
@@ -266,52 +266,52 @@ ${n.map(([e, n]) => {
 		}).join("\n")}
 }
 `).join("\n") } }) : null;
-	}, q = ue, J = M;
-})), Oe = /* @__PURE__ */ ve({ default: () => ke });
-function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r = "name", series: i = [], className: a = "", onChartClick: s }) {
-	let c = e === "column" ? "bar" : e, l = Array.isArray(t) ? t : [], [u, d] = o.useState(!1), f = o.useCallback((e) => {
-		if (!s || !e) return;
+	}, q = B, J = j;
+})), Ae = /* @__PURE__ */ be({ default: () => je });
+function je({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r = "name", series: i = [], className: a = "", onChartClick: o }) {
+	let s = e === "column" ? "bar" : e, l = Array.isArray(t) ? t : [], [u, d] = c.useState(!1), f = c.useCallback((e) => {
+		if (!o || !e) return;
 		let t = Array.isArray(e.activePayload) ? e.activePayload[0] : void 0;
-		s({
+		o({
 			category: e.activeLabel == null ? void 0 : String(e.activeLabel),
 			series: t?.dataKey ? String(t.dataKey) : void 0,
 			value: typeof t?.value == "number" ? t.value : void 0
 		});
-	}, [s]), p = o.useCallback((e) => {
-		if (!s || !e) return;
+	}, [o]), p = c.useCallback((e) => {
+		if (!o || !e) return;
 		let t = e.payload?.[r], n = i[0]?.dataKey || "value";
-		s({
+		o({
 			category: t == null ? void 0 : String(t),
 			series: n,
 			value: typeof e.payload?.[n] == "number" ? e.payload[n] : void 0
 		});
 	}, [
-		s,
+		o,
 		r,
 		i
-	]), m = s ? {
+	]), m = o ? {
 		onClick: f,
 		style: { cursor: "pointer" }
-	} : {}, h = s ? {
+	} : {}, h = o ? {
 		onClick: p,
 		style: { cursor: "pointer" }
 	} : {};
-	o.useEffect(() => {
+	c.useEffect(() => {
 		let e = () => d(window.innerWidth < 640);
 		return e(), window.addEventListener("resize", e), () => window.removeEventListener("resize", e);
 	}, []);
 	let g = {
-		bar: D,
-		"horizontal-bar": D,
-		line: P,
-		area: re,
-		pie: I,
-		donut: I,
-		radar: oe,
-		scatter: le,
-		funnel: A,
-		combo: D
-	}[c] || D, _ = o.useCallback((e) => {
+		bar: E,
+		"horizontal-bar": E,
+		line: ce,
+		area: oe,
+		pie: N,
+		donut: N,
+		radar: I,
+		scatter: z,
+		funnel: k,
+		combo: E
+	}[s] || E, _ = c.useCallback((e) => {
 		if (e == null || e === "") return "";
 		let t = typeof e == "string" ? e : String(e);
 		if (/^\d{4}-\d{2}-\d{2}/.test(t)) {
@@ -336,13 +336,13 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 		l,
 		r,
 		u
-	]), ee = o.useMemo(() => l.some((e) => String(e[r] || "").length > 5), [l, r]), v = () => [
+	]), ee = c.useMemo(() => l.some((e) => String(e[r] || "").length > 5), [l, r]), v = () => [
 		"hsl(var(--chart-1))",
 		"hsl(var(--chart-2))",
 		"hsl(var(--chart-3))",
 		"hsl(var(--chart-4))",
 		"hsl(var(--chart-5))"
-	], y = o.useCallback((e) => {
+	], y = c.useCallback((e) => {
 		if (e == null || e === "") return "";
 		let t = typeof e == "number" ? e : Number(e);
 		if (!Number.isFinite(t)) return String(e);
@@ -354,7 +354,7 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 		} catch {
 			return String(t);
 		}
-	}, []), te = o.useMemo(() => ({
+	}, []), te = c.useMemo(() => ({
 		tickLine: !1,
 		tickMargin: 10,
 		axisLine: !1,
@@ -371,8 +371,8 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 		ee,
 		_
 	]);
-	if (c === "pie" || c === "donut") {
-		let e = c === "donut" ? 60 : 0, t = v(), o = { ...n };
+	if (s === "pie" || s === "donut") {
+		let e = s === "donut" ? 60 : 0, t = v(), o = { ...n };
 		return l.forEach((e, n) => {
 			let i = e?.[r];
 			if (i == null || i === "") return;
@@ -381,15 +381,15 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 				label: a,
 				color: t[n % t.length]
 			});
-		}), /* @__PURE__ */ C(U, {
+		}), /* @__PURE__ */ S(U, {
 			config: o,
 			className: a,
-			children: /* @__PURE__ */ w(I, { children: [
-				/* @__PURE__ */ C(q, {
+			children: /* @__PURE__ */ C(N, { children: [
+				/* @__PURE__ */ S(q, {
 					cursor: !1,
-					content: /* @__PURE__ */ C(W, { hideLabel: !0 })
+					content: /* @__PURE__ */ S(W, { hideLabel: !0 })
 				}),
-				/* @__PURE__ */ C(F, {
+				/* @__PURE__ */ S(le, {
 					data: l,
 					dataKey: i[0]?.dataKey || "value",
 					nameKey: r || "name",
@@ -400,16 +400,16 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 					...h,
 					children: l.map((e, n) => {
 						let i = o[String(e[r])]?.color;
-						return i ||= t[n % t.length], /* @__PURE__ */ C(k, { fill: X(i) }, `cell-${n}`);
+						return i ||= t[n % t.length], /* @__PURE__ */ S(O, { fill: X(i) }, `cell-${n}`);
 					})
 				}),
-				/* @__PURE__ */ C(J, {
+				/* @__PURE__ */ S(J, {
 					verticalAlign: "bottom",
 					wrapperStyle: {
 						fontSize: u ? "11px" : "12px",
 						paddingTop: "8px"
 					},
-					content: /* @__PURE__ */ C(G, {
+					content: /* @__PURE__ */ S(G, {
 						nameKey: r,
 						className: "flex-wrap"
 					})
@@ -417,49 +417,49 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 			] })
 		});
 	}
-	if (c === "funnel") {
-		let e = i[0]?.dataKey || "value", t = v(), o = s ? (t) => {
-			t && s({
+	if (s === "funnel") {
+		let e = i[0]?.dataKey || "value", t = v(), s = o ? (t) => {
+			t && o({
 				category: t?.payload?.[r] ?? t?.[r],
 				value: t?.payload?.[e] ?? t?.[e]
 			});
-		} : void 0, c = o ? {
-			onClick: o,
+		} : void 0, c = s ? {
+			onClick: s,
 			style: { cursor: "pointer" }
 		} : {}, u = [...l].sort((t, n) => {
 			let r = Number(t?.[e] ?? 0);
 			return Number(n?.[e] ?? 0) - r;
 		});
-		return /* @__PURE__ */ C(U, {
+		return /* @__PURE__ */ S(U, {
 			config: n,
 			className: a,
-			children: /* @__PURE__ */ w(A, { children: [/* @__PURE__ */ C(q, { content: /* @__PURE__ */ C(W, {}) }), /* @__PURE__ */ w(ie, {
+			children: /* @__PURE__ */ C(k, { children: [/* @__PURE__ */ S(q, { content: /* @__PURE__ */ S(W, {}) }), /* @__PURE__ */ C(se, {
 				dataKey: e,
 				data: u,
 				nameKey: r,
 				isAnimationActive: !0,
 				...c,
-				children: [/* @__PURE__ */ C(j, {
+				children: [/* @__PURE__ */ S(A, {
 					position: "right",
 					fill: "hsl(var(--foreground))",
 					stroke: "none",
 					dataKey: r
-				}), u.map((e, n) => /* @__PURE__ */ C(k, { fill: X(t[n % t.length]) }, `funnel-cell-${n}`))]
+				}), u.map((e, n) => /* @__PURE__ */ S(O, { fill: X(t[n % t.length]) }, `funnel-cell-${n}`))]
 			})] })
 		});
 	}
-	if (c === "radar") return /* @__PURE__ */ C(U, {
+	if (s === "radar") return /* @__PURE__ */ S(U, {
 		config: n,
 		className: a,
-		children: /* @__PURE__ */ w(oe, {
+		children: /* @__PURE__ */ C(I, {
 			data: l,
 			children: [
-				/* @__PURE__ */ C(R, {}),
-				/* @__PURE__ */ C(L, { dataKey: r }),
-				/* @__PURE__ */ C(z, {}),
-				/* @__PURE__ */ C(q, { content: /* @__PURE__ */ C(W, {}) }),
-				/* @__PURE__ */ C(J, {
-					content: /* @__PURE__ */ C(G, {}),
+				/* @__PURE__ */ S(de, {}),
+				/* @__PURE__ */ S(ue, { dataKey: r }),
+				/* @__PURE__ */ S(P, {}),
+				/* @__PURE__ */ S(q, { content: /* @__PURE__ */ S(W, {}) }),
+				/* @__PURE__ */ S(J, {
+					content: /* @__PURE__ */ S(G, {}),
 					...u && {
 						verticalAlign: "bottom",
 						wrapperStyle: {
@@ -470,7 +470,7 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 				}),
 				i.map((e) => {
 					let t = X(n[e.dataKey]?.color || Y);
-					return /* @__PURE__ */ C(ae, {
+					return /* @__PURE__ */ S(F, {
 						dataKey: e.dataKey,
 						stroke: t,
 						fill: t,
@@ -480,12 +480,12 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 			]
 		})
 	});
-	if (c === "scatter") return /* @__PURE__ */ C(U, {
+	if (s === "scatter") return /* @__PURE__ */ S(U, {
 		config: n,
 		className: a,
-		children: /* @__PURE__ */ w(le, { children: [
-			/* @__PURE__ */ C(O, { vertical: !1 }),
-			/* @__PURE__ */ C(B, {
+		children: /* @__PURE__ */ C(z, { children: [
+			/* @__PURE__ */ S(D, { vertical: !1 }),
+			/* @__PURE__ */ S(V, {
 				type: "number",
 				dataKey: r,
 				name: String(n[r]?.label || r),
@@ -493,7 +493,7 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 				axisLine: !1,
 				minTickGap: u ? 32 : 48
 			}),
-			/* @__PURE__ */ C(V, {
+			/* @__PURE__ */ S(H, {
 				type: "number",
 				dataKey: i[0]?.dataKey || "value",
 				name: String(n[i[0]?.dataKey]?.label || i[0]?.dataKey),
@@ -502,13 +502,13 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 				tickFormatter: y,
 				width: 48
 			}),
-			/* @__PURE__ */ C(de, {
+			/* @__PURE__ */ S(fe, {
 				type: "number",
 				range: [60, 400]
 			}),
-			/* @__PURE__ */ C(q, { content: /* @__PURE__ */ C(W, {}) }),
-			/* @__PURE__ */ C(J, {
-				content: /* @__PURE__ */ C(G, {}),
+			/* @__PURE__ */ S(q, { content: /* @__PURE__ */ S(W, {}) }),
+			/* @__PURE__ */ S(J, {
+				content: /* @__PURE__ */ S(G, {}),
 				...u && {
 					verticalAlign: "bottom",
 					wrapperStyle: {
@@ -518,34 +518,35 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 				}
 			}),
 			i.map((e, t) => {
-				let r = v(), i = X(n[e.dataKey]?.color || r[t % r.length]);
-				return /* @__PURE__ */ C(ce, {
+				let r = v(), i = X(n[e.dataKey]?.color || r[t % r.length]), a = Z(e, "scatter");
+				return /* @__PURE__ */ S(R, {
 					name: n[e.dataKey]?.label || e.dataKey,
 					data: l,
-					fill: i
+					fill: i,
+					fillOpacity: a?.fillOpacity
 				}, e.dataKey);
 			})
 		] })
 	});
-	if (c === "combo") return /* @__PURE__ */ C(U, {
+	if (s === "combo") return /* @__PURE__ */ S(U, {
 		config: n,
 		className: a,
-		children: /* @__PURE__ */ w(D, {
+		children: /* @__PURE__ */ C(E, {
 			data: l,
 			children: [
-				/* @__PURE__ */ C(O, { vertical: !1 }),
-				/* @__PURE__ */ C(B, {
+				/* @__PURE__ */ S(D, { vertical: !1 }),
+				/* @__PURE__ */ S(V, {
 					dataKey: r,
 					...te
 				}),
-				/* @__PURE__ */ C(V, {
+				/* @__PURE__ */ S(H, {
 					yAxisId: "left",
 					tickLine: !1,
 					axisLine: !1,
 					tickFormatter: y,
 					width: 48
 				}),
-				/* @__PURE__ */ C(V, {
+				/* @__PURE__ */ S(H, {
 					yAxisId: "right",
 					orientation: "right",
 					tickLine: !1,
@@ -553,9 +554,9 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 					tickFormatter: y,
 					width: 48
 				}),
-				/* @__PURE__ */ C(q, { content: /* @__PURE__ */ C(W, {}) }),
-				/* @__PURE__ */ C(J, {
-					content: /* @__PURE__ */ C(G, {}),
+				/* @__PURE__ */ S(q, { content: /* @__PURE__ */ S(W, {}) }),
+				/* @__PURE__ */ S(J, {
+					content: /* @__PURE__ */ S(G, {}),
 					...u && {
 						verticalAlign: "bottom",
 						wrapperStyle: {
@@ -565,65 +566,70 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 					}
 				}),
 				i.map((e, t) => {
-					let r = X(n[e.dataKey]?.color || Y), i = e.chartType || (t === 0 ? "bar" : "line"), a = i === "bar" ? "left" : "right";
-					return i === "line" ? /* @__PURE__ */ C(N, {
+					let r = X(n[e.dataKey]?.color || Y), i = e.chartType || (t === 0 ? "bar" : "line"), a = i === "bar" ? "left" : "right", o = Z(e, i);
+					return i === "line" ? /* @__PURE__ */ S(M, {
 						yAxisId: a,
 						type: "monotone",
 						dataKey: e.dataKey,
 						stroke: r,
 						strokeWidth: 2,
-						dot: !1
-					}, e.dataKey) : i === "area" ? /* @__PURE__ */ C(T, {
+						dot: !1,
+						strokeOpacity: o?.strokeOpacity,
+						strokeDasharray: o?.strokeDasharray
+					}, e.dataKey) : i === "area" ? /* @__PURE__ */ S(w, {
 						yAxisId: a,
 						type: "monotone",
 						dataKey: e.dataKey,
 						fill: r,
 						stroke: r,
-						fillOpacity: .4
-					}, e.dataKey) : /* @__PURE__ */ C(E, {
+						fillOpacity: o?.fillOpacity ?? .4,
+						strokeOpacity: o?.strokeOpacity,
+						strokeDasharray: o?.strokeDasharray
+					}, e.dataKey) : /* @__PURE__ */ S(T, {
 						yAxisId: a,
 						dataKey: e.dataKey,
 						fill: r,
-						radius: 4
+						radius: 4,
+						fillOpacity: o?.fillOpacity
 					}, e.dataKey);
 				})
 			]
 		})
 	});
-	let b = c === "horizontal-bar";
-	return /* @__PURE__ */ C(U, {
+	let ne = s === "horizontal-bar";
+	return /* @__PURE__ */ S(U, {
 		config: n,
 		className: a,
-		children: /* @__PURE__ */ w(g, {
+		children: /* @__PURE__ */ C(g, {
 			data: l,
-			layout: b ? "vertical" : "horizontal",
+			layout: ne ? "vertical" : "horizontal",
 			...m,
 			children: [
-				/* @__PURE__ */ C(O, { vertical: !1 }),
-				b ? /* @__PURE__ */ w(S, { children: [/* @__PURE__ */ C(B, {
+				/* @__PURE__ */ S(D, { vertical: !1 }),
+				ne ? /* @__PURE__ */ C(x, { children: [/* @__PURE__ */ S(V, {
 					type: "number",
 					tickLine: !1,
 					axisLine: !1,
 					tickFormatter: y
-				}), /* @__PURE__ */ C(V, {
+				}), /* @__PURE__ */ S(H, {
 					type: "category",
 					dataKey: r,
 					tickLine: !1,
 					axisLine: !1,
 					width: Math.min(140, Math.max(60, Math.max(...l.map((e) => String(e[r] ?? "").length)) * 7)),
 					tickFormatter: _
-				})] }) : /* @__PURE__ */ w(S, { children: [/* @__PURE__ */ C(B, {
+				})] }) : /* @__PURE__ */ C(x, { children: [/* @__PURE__ */ S(V, {
 					dataKey: r,
 					...te
-				}), /* @__PURE__ */ C(V, {
+				}), /* @__PURE__ */ S(H, {
 					tickLine: !1,
 					axisLine: !1,
 					tickFormatter: y,
 					width: 48
 				})] }),
-				/* @__PURE__ */ C(q, { content: /* @__PURE__ */ C(W, {}) }),
-				/* @__PURE__ */ C(J, {
-					content: /* @__PURE__ */ C(G, {}),
+				/* @__PURE__ */ S(q, { content: /* @__PURE__ */ S(W, {}) }),
+				/* @__PURE__ */ S(J, {
+					content: /* @__PURE__ */ S(G, {}),
 					...u && {
 						verticalAlign: "bottom",
 						wrapperStyle: {
@@ -633,36 +639,49 @@ function ke({ chartType: e = "bar", data: t = [], config: n = {}, xAxisKey: r =
 					}
 				}),
 				i.map((e, t) => {
-					let r = v(), a = X(n[e.dataKey]?.color || r[t % r.length] || Y);
-					if (c === "bar" || c === "horizontal-bar") {
-						let t = i.length === 1 && l.length > 1;
-						return /* @__PURE__ */ C(E, {
+					let r = v(), a = e.variant === "comparison", o = a ? i.slice(0, t).find((e) => e.variant !== "comparison") || i[0] : e, c = a ? i.indexOf(o) : t, u = X(n[o.dataKey]?.color || r[c % r.length] || Y);
+					if (s === "bar" || s === "horizontal-bar") {
+						let t = i.filter((e) => e.variant !== "comparison").length === 1 && !a && i.length === 1 && l.length > 1, n = Z(e, "bar");
+						return /* @__PURE__ */ S(T, {
 							dataKey: e.dataKey,
-							fill: a,
+							fill: u,
 							radius: 4,
-							children: t && l.map((e, t) => /* @__PURE__ */ C(k, { fill: X(r[t % r.length]) }, `cell-${t}`))
+							fillOpacity: n?.fillOpacity,
+							children: t && l.map((e, t) => /* @__PURE__ */ S(O, { fill: X(r[t % r.length]) }, `cell-${t}`))
 						}, e.dataKey);
 					}
-					return c === "line" ? /* @__PURE__ */ C(N, {
-						type: "monotone",
-						dataKey: e.dataKey,
-						stroke: a,
-						strokeWidth: 2,
-						dot: !1
-					}, e.dataKey) : c === "area" ? /* @__PURE__ */ C(T, {
-						type: "monotone",
-						dataKey: e.dataKey,
-						fill: a,
-						stroke: a,
-						fillOpacity: .4
-					}, e.dataKey) : null;
+					if (s === "line") {
+						let t = Z(e, "line");
+						return /* @__PURE__ */ S(M, {
+							type: "monotone",
+							dataKey: e.dataKey,
+							stroke: u,
+							strokeWidth: 2,
+							dot: !1,
+							strokeOpacity: t?.strokeOpacity,
+							strokeDasharray: t?.strokeDasharray
+						}, e.dataKey);
+					}
+					if (s === "area") {
+						let t = Z(e, "area");
+						return /* @__PURE__ */ S(w, {
+							type: "monotone",
+							dataKey: e.dataKey,
+							fill: u,
+							stroke: u,
+							fillOpacity: t?.fillOpacity ?? .4,
+							strokeOpacity: t?.strokeOpacity,
+							strokeDasharray: t?.strokeDasharray
+						}, e.dataKey);
+					}
+					return null;
 				})
 			]
 		})
 	});
 }
-var Y, Ae, X, je = H((() => {
-	De(), Y = "hsl(var(--primary))", Ae = {
+var Y, Me, X, Z, Ne = ye((() => {
+	ke(), Y = "hsl(var(--primary))", Me = {
 		slate: "#64748b",
 		gray: "#6b7280",
 		zinc: "#71717a",
@@ -685,10 +704,14 @@ var Y, Ae, X, je = H((() => {
 		fuchsia: "#d946ef",
 		pink: "#ec4899",
 		rose: "#f43f5e"
-	}, X = (e) => Ae[e] || e;
-})), Me = s.lazy(() => Promise.resolve().then(() => (xe(), ye))), Ne = s.lazy(() => Promise.resolve().then(() => (je(), Oe))), Pe = ({ schema: e }) => /* @__PURE__ */ C(c, {
-	fallback: /* @__PURE__ */ C(x, { className: "w-full h-48 sm:h-64 md:h-80 lg:h-[400px]" }),
-	children: /* @__PURE__ */ C(Me, {
+	}, X = (e) => Me[e] || e, Z = (e, t) => e?.variant === "comparison" ? {
+		strokeOpacity: typeof e.opacity == "number" ? e.opacity : t === "line" || t === "scatter" ? .5 : .6,
+		fillOpacity: typeof e.opacity == "number" ? e.opacity : t === "bar" ? .4 : t === "area" ? .2 : .5,
+		strokeDasharray: e.dashArray ?? (t === "line" || t === "area" ? "4 4" : void 0)
+	} : null;
+})), Pe = l.lazy(() => Promise.resolve().then(() => (Ce(), xe))), Fe = l.lazy(() => Promise.resolve().then(() => (Ne(), Ae))), Ie = ({ schema: e }) => /* @__PURE__ */ S(u, {
+	fallback: /* @__PURE__ */ S(b, { className: "w-full h-48 sm:h-64 md:h-80 lg:h-[400px]" }),
+	children: /* @__PURE__ */ S(Pe, {
 		data: e.data,
 		dataKey: e.dataKey,
 		xAxisKey: e.xAxisKey,
@@ -696,8 +719,8 @@ var Y, Ae, X, je = H((() => {
 		className: e.className,
 		color: e.color
 	})
-}), Z = ({ schema: e, onChartClick: t }) => {
-	let n = s.useMemo(() => {
+}), Q = ({ schema: e, onChartClick: t }) => {
+	let n = l.useMemo(() => {
 		let t = e.series, n = e.xAxisKey, r = e.config;
 		if (n || (e.index ? n = e.index : e.category && (n = e.category)), t || (e.categories ? t = e.categories.map((e) => ({ dataKey: e })) : e.value && (t = [{ dataKey: e.value }])), !r && t) {
 			let n = e.colors || [
@@ -721,9 +744,9 @@ var Y, Ae, X, je = H((() => {
 			className: e.className
 		};
 	}, [e]);
-	return /* @__PURE__ */ C(c, {
-		fallback: /* @__PURE__ */ C(x, { className: "w-full h-48 sm:h-64 md:h-80 lg:h-[400px]" }),
-		children: /* @__PURE__ */ C(Ne, {
+	return /* @__PURE__ */ S(u, {
+		fallback: /* @__PURE__ */ S(b, { className: "w-full h-48 sm:h-64 md:h-80 lg:h-[400px]" }),
+		children: /* @__PURE__ */ S(Fe, {
 			chartType: n.chartType,
 			data: n.data,
 			config: n.config,
@@ -736,10 +759,10 @@ var Y, Ae, X, je = H((() => {
 };
 //#endregion
 //#region src/ObjectChart.tsx
-function Q(e) {
+function $(e) {
 	return e.replace(/[_-]/g, " ").replace(/\b\w/g, (e) => e.toUpperCase());
 }
-function Fe(e, t) {
+function Le(e, t) {
 	let { field: n, function: r, groupBy: i } = t, a = {};
 	for (let t of e) {
 		let e = String(t[i] ?? "Unknown");
@@ -770,13 +793,13 @@ function Fe(e, t) {
 		};
 	});
 }
-async function Ie(e, t, r, i, a) {
+async function Re(e, t, n, i, a) {
 	if (!e.length || !t) return e;
-	let o = a || ((e, t) => t), s = `__raw_${t}`, c = r?.fields?.[t];
+	let o = a || ((e, t) => t), s = `__raw_${t}`, c = n?.fields?.[t];
 	if (!c) {
 		let n = /^\d{4}-\d{2}-\d{2}/;
 		return e.map((e) => {
-			let r = e[t], i = String(r ?? ""), a = n.test(i) ? i : Q(i);
+			let r = e[t], i = String(r ?? ""), a = n.test(i) ? i : $(i);
 			return {
 				...e,
 				[t]: o(i, a),
@@ -788,7 +811,7 @@ async function Ie(e, t, r, i, a) {
 	if (l === "select" || l === "picklist" || l === "dropdown") {
 		let n = c.options || [];
 		if (n.length === 0) return e.map((e) => {
-			let n = e[t], r = String(n ?? ""), i = Q(r);
+			let n = e[t], r = String(n ?? ""), i = $(r);
 			return {
 				...e,
 				[t]: o(r, i),
@@ -798,7 +821,7 @@ async function Ie(e, t, r, i, a) {
 		let r = {};
 		for (let e of n) typeof e == "string" ? r[e] = e : e && typeof e == "object" && (r[String(e.value)] = e.label || String(e.value));
 		return e.map((e) => {
-			let n = e[t], i = String(n ?? ""), a = r[i] || Q(i);
+			let n = e[t], i = String(n ?? ""), a = r[i] || $(i);
 			return {
 				...e,
 				[t]: o(i, a),
@@ -807,8 +830,8 @@ async function Ie(e, t, r, i, a) {
 		});
 	}
 	if (l === "lookup" || l === "master_detail") {
-		let r = c.reference_to || c.reference;
-		if (!r || !i || typeof i.find != "function") return e.map((e) => ({
+		let n = c.reference_to || c.reference;
+		if (!n || !i || typeof i.find != "function") return e.map((e) => ({
 			...e,
 			[s]: e[t]
 		}));
@@ -819,7 +842,7 @@ async function Ie(e, t, r, i, a) {
 		}));
 		let o = c.id_field || "id";
 		try {
-			let l = n(await i.find(r, {
+			let l = r(await i.find(n, {
 				$filter: { [o]: { $in: a } },
 				$top: a.length
 			})), u = c.reference_field || c.display_field || "name", d = {};
@@ -851,173 +874,260 @@ async function Ie(e, t, r, i, a) {
 		let n = e[t], r = String(n ?? "");
 		return {
 			...e,
-			[t]: u.test(r) ? r : Q(r),
+			[t]: u.test(r) ? r : $(r),
 			[s]: n
 		};
 	});
 }
-var $ = (e) => {
-	let { schema: o } = e, s = u(pe), c = e.dataSource || s?.dataSource, x = me(o.bind), { fieldOptionLabel: S } = ge(), T = p(S);
-	d(() => {
-		T.current = S;
-	}, [S]);
-	let [re, E] = m([]), [D, O] = m(() => !(Array.isArray(o.data) && o.data.length > 0) && !!o.objectName), [k, ie] = m(null), [A, j] = m(null), M = f(() => o.aggregate ? JSON.stringify(o.aggregate) : "", [o.aggregate]), N = f(() => o.filter ? JSON.stringify(o.filter) : "", [o.filter]), P = l(async (e, t) => {
-		if (!e || !o.objectName) {
-			t.current && O(!1);
+var ze = (e) => {
+	let { schema: c } = e, l = f(me), u = e.dataSource || l?.dataSource, b = he(c.bind), { fieldOptionLabel: x } = _e(), w = h(x);
+	p(() => {
+		w.current = x;
+	}, [x]);
+	let [oe, T] = g([]), [E, D] = g(() => !(Array.isArray(c.data) && c.data.length > 0) && !!c.objectName), [O, se] = g(null), [k, A] = g(null), j = m(() => c.aggregate ? JSON.stringify(c.aggregate) : "", [c.aggregate]), M = m(() => c.filter ? JSON.stringify(c.filter) : "", [c.filter]), ce = m(() => c.compareTo ? JSON.stringify(c.compareTo) : "", [c.compareTo]), le = (e) => e !== "pie" && e !== "donut" && e !== "funnel", N = d(async (e, t) => {
+		if (c.aggregate && typeof e.aggregate == "function") {
+			let n = c.aggregate.groupBy;
+			if (n && typeof n == "object" && !Array.isArray(n)) {
+				let r = c.aggregate.field, i = c.aggregate.function, a = {
+					function: i,
+					alias: r || i
+				};
+				i !== "count" && r && (a.field = r);
+				let o = await e.aggregate(c.objectName, {
+					groupBy: [n],
+					aggregations: [a],
+					where: t
+				});
+				return Array.isArray(o) ? o : [];
+			}
+			let r = await e.aggregate(c.objectName, {
+				field: c.aggregate.field,
+				function: c.aggregate.function,
+				groupBy: n,
+				filter: t
+			});
+			return Array.isArray(r) ? r : [];
+		}
+		if (typeof e.find == "function") {
+			let n = r(await e.find(c.objectName, { $filter: t }));
+			return c.aggregate && n.length > 0 && (n = Le(n, c.aggregate)), n;
+		}
+		return [];
+	}, [c.objectName, j]), ue = d(async (e, t) => {
+		if (!e || !c.objectName) {
+			t.current && D(!1);
 			return;
 		}
-		t.current && (O(!0), ie(null));
+		t.current && (D(!0), se(null));
 		try {
-			let r, a = i(o.filter);
-			if (o.aggregate && typeof e.aggregate == "function") {
-				let t = await e.aggregate(o.objectName, {
-					field: o.aggregate.field,
-					function: o.aggregate.function,
-					groupBy: o.aggregate.groupBy,
-					filter: a
-				});
-				r = Array.isArray(t) ? t : [];
-			} else if (typeof e.find == "function") r = n(await e.find(o.objectName, { $filter: a })), o.aggregate && r.length > 0 && (r = Fe(r, o.aggregate));
-			else return;
-			let s = o.aggregate?.groupBy || o.xAxisKey;
-			if (s && typeof e.getObjectSchema == "function") try {
-				let t = await e.getObjectSchema(o.objectName);
-				r = await Ie(r, s, t, e, (e, t) => T.current(o.objectName, s, e, t));
+			let n = a(c.filter), r = c.compareTo, i = !!r && le(c.chartType), o = i ? s(c.filter, r) : null, [l, u] = await Promise.all([N(e, n), o ? N(e, o) : Promise.resolve([])]), d = l, f = c.aggregate?.groupBy, p = f && typeof f == "object" && !Array.isArray(f) ? f.alias || f.field : f || c.xAxisKey;
+			if (i && u.length > 0 && c.aggregate) {
+				let e = c.aggregate.field, t = c.aggregate.function, n = (n) => {
+					if (n == null) return null;
+					let r = `${e}_${t}`;
+					return r in n ? Number(n[r]) : t === "count" && `${e}_count` in n ? Number(n[`${e}_count`]) : e in n ? Number(n[e]) : "value" in n ? Number(n.value) : "count" in n ? Number(n.count) : null;
+				}, r = `${e}__comparison`, i = p;
+				if (i && d.some((e) => e[i] != null) && u.some((e) => e[i] != null)) {
+					let e = /* @__PURE__ */ new Map();
+					for (let t of u) {
+						let r = String(t[i] ?? "");
+						e.set(r, n(t));
+					}
+					d = d.map((t) => {
+						let n = String(t[i] ?? ""), a = e.get(n);
+						return a == null ? t : {
+							...t,
+							[r]: a
+						};
+					});
+					let t = new Set(d.map((e) => String(e[i] ?? "")));
+					for (let e of u) {
+						let a = String(e[i] ?? "");
+						t.has(a) || d.push({
+							[i]: a,
+							[r]: n(e)
+						});
+					}
+				} else {
+					let e = Math.max(d.length, u.length), t = [];
+					for (let i = 0; i < e; i++) {
+						let e = d[i] || {}, a = u[i];
+						t.push(a ? {
+							...e,
+							[r]: n(a)
+						} : e);
+					}
+					d = t;
+				}
+			}
+			if (p && typeof e.getObjectSchema == "function") try {
+				let t = await e.getObjectSchema(c.objectName);
+				d = await Re(d, p, t, e, (e, t) => w.current(c.objectName, p, e, t));
 			} catch {}
-			t.current && E(r);
+			t.current && T(d);
 		} catch (e) {
-			console.error("[ObjectChart] Fetch error:", e), t.current && ie(e instanceof Error ? e.message : "Failed to load chart data");
+			console.error("[ObjectChart] Fetch error:", e), t.current && se(e instanceof Error ? e.message : "Failed to load chart data");
 		} finally {
-			t.current && O(!1);
+			t.current && D(!1);
 		}
 	}, [
-		o.objectName,
+		c.objectName,
+		j,
 		M,
-		N,
-		o.xAxisKey
+		ce,
+		c.xAxisKey,
+		c.chartType,
+		N
 	]);
-	d(() => {
+	p(() => {
 		let e = { current: !0 };
-		return o.objectName && !x && !o.data ? P(c, e) : e.current && O(!1), () => {
+		return c.objectName && !b && !c.data ? ue(u, e) : e.current && D(!1), () => {
 			e.current = !1;
 		};
 	}, [
-		o.objectName,
-		c,
-		x,
-		o.data,
-		N,
+		c.objectName,
+		u,
+		b,
+		c.data,
 		M,
-		P
+		j,
+		ce,
+		ue
 	]);
-	let F = x || o.data || re, I = Array.isArray(F) ? F : [], L = o.drillDown, R = o.aggregate?.groupBy || o.xAxisKey, z = f(() => {
-		if (!R) return /* @__PURE__ */ new Map();
-		let e = /* @__PURE__ */ new Map(), t = `__raw_${R}`;
-		for (let n of I) {
-			let r = n?.[R];
+	let de = b || c.data || oe, P = Array.isArray(de) ? de : [], F = c.drillDown, I = c.aggregate?.groupBy || c.xAxisKey, L = m(() => {
+		if (!I) return /* @__PURE__ */ new Map();
+		let e = /* @__PURE__ */ new Map(), t = `__raw_${I}`;
+		for (let n of P) {
+			let r = n?.[I];
 			if (r == null) continue;
 			let i = t in (n || {}) ? n[t] : r;
 			e.set(String(r), i);
 		}
 		return e;
-	}, [I, R]), ae = {
-		...o,
-		data: I
+	}, [P, I]), R = c.compareTo, z = !!R && le(c.chartType) && !!c.aggregate && P.some((e) => e[`${c.aggregate.field}__comparison`] != null), B = m(() => {
+		let e = Array.isArray(c.series) ? c.series : null;
+		if (!z) return e;
+		let n = e || [{ dataKey: c.aggregate.field }], r = {
+			vsLastWeek: "Previous week",
+			vsLastMonth: "Previous month",
+			vsLastQuarter: "Previous quarter",
+			vsLastYear: "Previous year",
+			vsYesterday: "Yesterday",
+			vsPreviousPeriod: "Previous period"
+		}[t(R, c.filter)] || "Previous period";
+		return [...n.map((e) => ({
+			...e,
+			variant: e.variant || "current"
+		})), {
+			dataKey: `${c.aggregate.field}__comparison`,
+			label: r,
+			variant: "comparison"
+		}];
+	}, [
+		z,
+		c.series,
+		c.aggregate,
+		c.filter,
+		R
+	]), V = {
+		...c,
+		data: P,
+		...B ? { series: B } : {}
 	};
-	if (D && I.length === 0) return /* @__PURE__ */ C("div", {
-		className: "flex items-center justify-center text-muted-foreground text-sm p-4 " + (o.className || ""),
+	if (E && P.length === 0) return /* @__PURE__ */ S("div", {
+		className: "flex items-center justify-center text-muted-foreground text-sm p-4 " + (c.className || ""),
 		"data-testid": "chart-loading",
 		children: "Loading chart data…"
 	});
-	if (k) return /* @__PURE__ */ w("div", {
-		className: "flex flex-col items-center justify-center gap-2 p-4 " + (o.className || ""),
+	if (O) return /* @__PURE__ */ C("div", {
+		className: "flex flex-col items-center justify-center gap-2 p-4 " + (c.className || ""),
 		"data-testid": "chart-error",
 		role: "alert",
 		children: [
-			/* @__PURE__ */ C(he, { className: "h-6 w-6 text-destructive opacity-60" }),
-			/* @__PURE__ */ C("p", {
+			/* @__PURE__ */ S(ge, { className: "h-6 w-6 text-destructive opacity-60" }),
+			/* @__PURE__ */ S("p", {
 				className: "text-xs text-destructive font-medium",
 				children: "Failed to load chart data"
 			}),
-			/* @__PURE__ */ C("p", {
+			/* @__PURE__ */ S("p", {
 				className: "text-xs text-muted-foreground max-w-xs text-center",
-				children: k
+				children: O
 			})
 		]
 	});
-	if (!c && o.objectName && I.length === 0) return /* @__PURE__ */ w("div", {
-		className: "flex items-center justify-center text-muted-foreground text-sm p-4 " + (o.className || ""),
+	if (!u && c.objectName && P.length === 0) return /* @__PURE__ */ C("div", {
+		className: "flex items-center justify-center text-muted-foreground text-sm p-4 " + (c.className || ""),
 		"data-testid": "chart-no-datasource",
 		children: [
 			"No data source available for “",
-			o.objectName,
+			c.objectName,
 			"”"
 		]
 	});
-	let oe = r(L) ? (e) => {
-		let t = e.category, n = t != null && z.has(String(t)) ? z.get(String(t)) : t;
-		j({
+	let H = i(F) ? (e) => {
+		let t = e.category, n = t != null && L.has(String(t)) ? L.get(String(t)) : t;
+		A({
 			...e,
 			category: n,
 			categoryLabel: t,
 			scope: "cell"
 		});
-	} : void 0, se = A && o.objectName ? (() => {
-		let e = t(L, A, { groupByField: R }), n = {
-			...o.filter || {},
+	} : void 0, fe = k && c.objectName ? (() => {
+		let e = n(F, k, { groupByField: I }), t = {
+			...c.filter || {},
 			...e
-		}, r = a(L, A, o.title || "Details"), i = L?.target ?? "drawer", s = /* @__PURE__ */ C("div", {
+		}, r = o(F, k, c.title || "Details"), i = F?.target ?? "drawer", a = /* @__PURE__ */ S("div", {
 			className: "overflow-auto",
 			"data-testid": "chart-drill-body",
-			children: /* @__PURE__ */ C(fe, {
+			children: /* @__PURE__ */ S(pe, {
 				schema: {
 					type: "object-data-table",
-					objectName: o.objectName,
-					filter: n,
+					objectName: c.objectName,
+					filter: t,
 					pagination: !0,
-					pageSize: L?.maxRows,
-					columns: L?.columns?.map((e) => ({
+					pageSize: F?.maxRows,
+					columns: F?.columns?.map((e) => ({
 						accessorKey: e,
 						header: e
 					}))
 				},
-				dataSource: c
+				dataSource: u
 			})
 		});
-		return i === "dialog" ? /* @__PURE__ */ C(h, {
+		return i === "dialog" ? /* @__PURE__ */ S(_, {
 			open: !0,
-			onOpenChange: (e) => !e && j(null),
-			children: /* @__PURE__ */ w(g, {
+			onOpenChange: (e) => !e && A(null),
+			children: /* @__PURE__ */ C(ee, {
 				className: "max-w-4xl",
-				children: [/* @__PURE__ */ C(_, { children: /* @__PURE__ */ C(ee, { children: r }) }), s]
+				children: [/* @__PURE__ */ S(v, { children: /* @__PURE__ */ S(y, { children: r }) }), a]
 			})
-		}) : /* @__PURE__ */ C(y, {
+		}) : /* @__PURE__ */ S(ne, {
 			open: !0,
-			onOpenChange: (e) => !e && j(null),
-			children: /* @__PURE__ */ w(te, {
+			onOpenChange: (e) => !e && A(null),
+			children: /* @__PURE__ */ C(re, {
 				side: "right",
 				className: "w-full sm:max-w-2xl md:max-w-3xl lg:max-w-4xl flex flex-col",
-				children: [/* @__PURE__ */ C(b, { children: /* @__PURE__ */ C(ne, { children: r }) }), /* @__PURE__ */ C("div", {
+				children: [/* @__PURE__ */ S(ie, { children: /* @__PURE__ */ S(ae, { children: r }) }), /* @__PURE__ */ S("div", {
 					className: "flex-1 overflow-hidden mt-2",
-					children: s
+					children: a
 				})]
 			})
 		});
 	})() : null;
-	return /* @__PURE__ */ w("div", {
+	return /* @__PURE__ */ C("div", {
 		className: "relative",
 		children: [
-			/* @__PURE__ */ C(v, { active: D && I.length > 0 }),
-			/* @__PURE__ */ C(Z, {
+			/* @__PURE__ */ S(te, { active: E && P.length > 0 }),
+			/* @__PURE__ */ S(Q, {
 				...e,
-				schema: ae,
-				onChartClick: oe
+				schema: V,
+				onChartClick: H
 			}),
-			se
+			fe
 		]
 	});
 };
-e.register("object-chart", $, {
+e.register("object-chart", ze, {
 	namespace: "plugin-charts",
 	label: "Object Chart",
 	category: "view",
@@ -1049,11 +1159,11 @@ e.register("object-chart", $, {
 });
 //#endregion
 //#region src/index.tsx
-var Le = {
-	"bar-chart": Pe,
-	chart: Z
+var Be = {
+	"bar-chart": Ie,
+	chart: Q
 };
-e.register("bar-chart", Pe, {
+e.register("bar-chart", Ie, {
 	namespace: "plugin-charts",
 	label: "Bar Chart",
 	category: "plugin",
@@ -1117,7 +1227,7 @@ e.register("bar-chart", Pe, {
 		height: 400,
 		color: "#8884d8"
 	}
-}), e.register("chart", $, {
+}), e.register("chart", ze, {
 	namespace: "view",
 	category: "view",
 	label: "Chart",
@@ -1144,7 +1254,7 @@ e.register("bar-chart", Pe, {
 			label: "Value Field"
 		}
 	]
-}), e.register("chart", Z, {
+}), e.register("chart", Q, {
 	namespace: "plugin-charts",
 	label: "Chart",
 	category: "plugin",
@@ -1256,31 +1366,31 @@ e.register("bar-chart", Pe, {
 		xAxisKey: "name",
 		series: [{ dataKey: "sales" }, { dataKey: "revenue" }]
 	}
-}), e.register("chart:bar", Z, {
+}), e.register("chart:bar", Q, {
 	namespace: "plugin-charts",
 	label: "Bar Chart (Alias)",
 	category: "plugin",
 	defaultProps: { chartType: "bar" }
-}), e.register("pie-chart", Z, {
+}), e.register("pie-chart", Q, {
 	namespace: "plugin-charts",
 	label: "Pie Chart",
 	category: "plugin",
 	defaultProps: { chartType: "pie" }
-}), e.register("donut-chart", Z, {
+}), e.register("donut-chart", Q, {
 	namespace: "plugin-charts",
 	label: "Donut Chart",
 	category: "plugin",
 	defaultProps: { chartType: "donut" }
-}), e.register("radar-chart", Z, {
+}), e.register("radar-chart", Q, {
 	namespace: "plugin-charts",
 	label: "Radar Chart",
 	category: "plugin",
 	defaultProps: { chartType: "radar" }
-}), e.register("scatter-chart", Z, {
+}), e.register("scatter-chart", Q, {
 	namespace: "plugin-charts",
 	label: "Scatter Chart",
 	category: "plugin",
 	defaultProps: { chartType: "scatter" }
 });
 //#endregion
-export { Pe as ChartBarRenderer, Z as ChartRenderer, $ as ObjectChart, Le as chartComponents };
+export { Ie as ChartBarRenderer, Q as ChartRenderer, ze as ObjectChart, Be as chartComponents };