minerva-design 1.4.0 → 1.6.0

package/dist/charts/engine/model.js

@@ -1,12 +1,16 @@
 import { collectCategories as e, collectYCategories as t, normalizeData as n, xResolver as r } from "./data.js";
-import { mix as i, packColor as a, rampColor as o, resolveStaticColor as s, toCss as c } from "./color.js";
-import { resolveLocale as l } from "./locale.js";
-import { chartLabels as u } from "./labels.js";
-import { ensureSpan as d, niceDomain as f, tickStep as p } from "./scale.js";
-import { formatPercent as m, valueFormatter as h } from "./format.js";
-import { GridIndex as g } from "./spatial.js";
+import { luminance as i, mixOklab as a, oklabRamp as o, resolveStaticColor as s, toCss as c, withLightness as l } from "./color.js";
+import { resolveLocale as u } from "./locale.js";
+import { chartLabels as d } from "./labels.js";
+import { ensureSpan as f, niceDomain as p, tickStep as m } from "./scale.js";
+import { formatPercent as h, valueFormatter as g } from "./format.js";
+import { GridIndex as _ } from "./spatial.js";
 //#region src/engine/model.ts
-var ee = (e) => {
+var v = {
+	scale: 1,
+	offset: 0,
+	log: !0
+}, y = (e) => {
 	if (typeof e == "object" && e && !("length" in e)) {
 		let t = e.x;
 		return t && t.length ? t[0] : void 0;
@@ -17,14 +21,14 @@ var ee = (e) => {
 		if (Array.isArray(n)) return n[0];
 		if (n && typeof n == "object") return n.x;
 	}
-}, _ = (e) => {
+}, b = (e) => {
 	for (let t of e) {
-		let e = ee(t);
+		let e = y(t);
 		if (e instanceof Date) return "time";
 		if (typeof e == "string") return "category";
 	}
 	return "linear";
-}, v = (e, t, n, r, i) => ({
+}, x = (e, t, n, r, i) => ({
 	type: t,
 	reverse: !!e?.reverse,
 	categories: n,
@@ -35,19 +39,19 @@ var ee = (e) => {
 	tickCount: e?.tickCount,
 	locale: i,
 	timeZone: e?.timeZone ?? "local"
-}), te = (e) => {
+}), S = (e) => {
 	let t = {};
 	if (!e) return t;
 	for (let n of Object.keys(e)) e[n] !== void 0 && (t[n] = e[n]);
 	return t;
-}, y = (e) => {
+}, C = (e) => {
 	let t = Infinity, n = -Infinity;
 	for (let r = 0; r < e.length; r++) {
 		let i = e[r];
 		Number.isFinite(i) && (i < t && (t = i), i > n && (n = i));
 	}
 	return [t, n];
-}, b = (e, t) => {
+}, w = (e, t) => {
 	let n = Infinity;
 	return e.forEach((e, r) => {
 		let i = t[r] ? e : Float64Array.from(e).sort();
@@ -56,11 +60,11 @@ var ee = (e) => {
 			t > 0 && t < n && (n = t);
 		}
 	}), n;
-}, x = (e, t, n) => {
+}, T = (e, t, n) => {
 	if (n) return 1;
-	let r = b(e.map((e) => t === "x" ? e.cols.x : e.cols.y), e.map((e) => t === "x" && e.cols.sorted));
+	let r = w(e.map((e) => t === "x" ? e.cols.x : e.cols.y), e.map((e) => t === "x" && e.cols.sorted));
 	return Number.isFinite(r) ? r : 1;
-}, S = (e, t) => {
+}, ee = (e, t) => {
 	let n = /* @__PURE__ */ new Map();
 	if (t) for (let { s: t, stack: r } of e) {
 		let e = n.get(r);
@@ -109,7 +113,7 @@ var ee = (e) => {
 			top: f
 		};
 	});
-}, ne = "var(--success-color, #16a34a)", re = "var(--danger-color, #dc2626)", ie = (e) => {
+}, te = "var(--success-color, #16a34a)", ne = "var(--danger-color, #dc2626)", re = (e) => {
 	for (let t of e) {
 		if (typeof t != "object" || !t || !("length" in t)) continue;
 		let e = t;
@@ -122,91 +126,176 @@ var ee = (e) => {
 		}
 	}
 	return !1;
-}, C = (e) => Number(e.toPrecision(12)), w = (e) => {
+}, E = (e) => Number(e.toPrecision(12)), D = (e) => {
 	let t = 10 ** Math.floor(Math.log10(e) + 1e-9), n = e / t;
 	return (n < 1.5 ? 2 : n < 3.5 ? 5 : 10) * t;
-}, ae = (e, t, n, r) => {
-	let [i, a] = n, o = p(i, a, r), s = o > 0 ? Math.round((a - i) / o) : 0;
-	if ([e, t] = d(e, t), s < 1 || Math.abs(s * o - (a - i)) > o * 1e-6) return f(e, t, r);
-	let c = p(e, t, s);
+}, ie = (e, t, n, r) => {
+	let [i, a] = n, o = m(i, a, r), s = o > 0 ? Math.round((a - i) / o) : 0;
+	if ([e, t] = f(e, t), s < 1 || Math.abs(s * o - (a - i)) > o * 1e-6) return p(e, t, r);
+	let c = m(e, t, s);
 	for (let n = 0; n < 40 && c > 0; n++) {
 		let n = Math.floor(e / c + 1e-9) * c;
-		if (n + s * c >= t - c * 1e-9) return [C(n), C(n + s * c)];
-		c = w(c);
+		if (n + s * c >= t - c * 1e-9) return [E(n), E(n + s * c)];
+		c = D(c);
 	}
-	return f(e, t, r);
-}, T = /* @__PURE__ */ new WeakMap(), oe = (e, t) => {
-	let n = `${t.scale},${t.offset}`, r = T.get(e);
+	return p(e, t, r);
+}, O = /* @__PURE__ */ new WeakMap(), ae = (e, t) => {
+	let n = `${t.scale},${t.offset},${!!t.log}`, r = O.get(e);
 	if (r && r.key === n) return r.cols;
-	let i = (e) => e * t.scale + t.offset, a = (e) => e ? e.map(i) : null, o = i(e.yMin), s = i(e.yMax), c = {
-		...e,
-		y: e.y.map(i),
-		open: a(e.open),
-		high: a(e.high),
-		low: a(e.low),
-		y0: a(e.y0),
-		q1: a(e.q1),
-		q3: a(e.q3),
-		outliers: e.outliers ? e.outliers.map((e) => e?.map(i)) : null,
-		yMin: Math.min(o, s),
-		yMax: Math.max(o, s)
+	let i = ce(t), a = (e) => e ? e.map(i) : null, o = e, s = {
+		...o,
+		y: o.y.map(i),
+		open: a(o.open),
+		high: a(o.high),
+		low: a(o.low),
+		y0: a(o.y0),
+		q1: a(o.q1),
+		q3: a(o.q3),
+		outliers: o.outliers ? o.outliers.map((e) => e?.map(i)) : null
 	};
-	return T.set(e, {
+	if (t.log) {
+		let e = [Infinity, -Infinity], t = (t) => {
+			if (t) for (let n = 0; n < t.length; n++) {
+				let r = t[n];
+				Number.isFinite(r) && (r < e[0] && (e[0] = r), r > e[1] && (e[1] = r));
+			}
+		};
+		for (let e of [
+			s.y,
+			s.y0,
+			s.high,
+			s.low,
+			s.q1,
+			s.q3
+		]) t(e);
+		s.outliers?.forEach((e) => t(e)), s.yMin = e[0] <= e[1] ? e[0] : NaN, s.yMax = e[0] <= e[1] ? e[1] : NaN;
+	} else {
+		let e = i(o.yMin), t = i(o.yMax);
+		s.yMin = Math.min(e, t), s.yMax = Math.max(e, t);
+	}
+	return O.set(e, {
 		key: n,
-		cols: c
-	}), c;
-}, E = (p, g, ee, b, C = null) => {
-	let w = C ?? g.resolve ?? ((e, t) => s(e, {}, t)), T = p.series, E = l(p.locale), D = typeof p.tooltip == "object" ? p.tooltip : void 0, O = u(E, {
-		...te(D?.labels),
-		...te(p.labels)
-	}), k = T.map((e) => e.data), A = p.xAxis?.type ?? _(k), j = A === "category" ? [...p.xAxis?.categories ?? e(k)] : [], se = new Map(j.map((e, t) => [e, t])), ce = r(A, (e) => se.get(e) ?? NaN), M = p.yAxis, le = T.filter((e) => e.type === "heatmap").map((e) => e.data), N = M?.type === "category" || !M?.type && le.length ? [...M?.categories ?? t(le)] : [], P = M?.type === "category" || N.length ? "category" : M?.type === "time" || !M?.type && ie(k) ? "time" : "linear", ue = new Map(N.map((e, t) => [e, t])), de = (e) => typeof e == "number" ? e : typeof e == "string" ? P === "category" ? ue.get(e) ?? NaN : P === "time" ? Date.parse(e) : Number(e) : e instanceof Date ? e.getTime() : NaN, F = `${A}|${j.join("
")}|${P}|${N.join("
")}`, I = p.stackMode === "percent", L = p.orientation === "horizontal", R = /* @__PURE__ */ new Set(), z = T.map((e, t) => {
+		cols: s
+	}), s;
+}, oe = (e) => {
+	let t = Math.floor(e[0] + 1e-9), n = Math.ceil(e[1] - 1e-9);
+	return [t, n > t ? n : t + 1];
+}, se = (e, t, n = -Infinity) => {
+	let r = ce(t), i = (e) => e ? e.map(r) : null, a = e.stackBase;
+	e.cols = ae(e.cols, t), e.barBase = e.barBase && !e.floating ? e.barBase.map((e) => e === 0 ? t.log ? -Infinity : r(0) : r(e)) : i(e.barBase), e.barTop = i(e.barTop), e.stackTop = i(e.stackTop), e.stackBase = a && a === e.raw.y0 ? e.cols.y0 : a ? i(a) : e.type === "area" ? new Float64Array(e.cols.count).fill(n) : null;
+}, ce = (e) => (t) => (e.log ? Math.log10(t) : t) * e.scale + e.offset, k = (e, t) => e.y.type === "log" ? Math.log10(t) : t, A = (e, t) => e.y.type === "log" ? 10 ** t : t, j = (e, t) => e.x.type === "log" ? Math.log10(t) : t, M = (e, t) => e.x.type === "log" ? 10 ** t : t, le = (e, t) => ({
+	x: [M(e, t.x[0]), M(e, t.x[1])],
+	y: [A(e, t.y[0]), A(e, t.y[1])]
+}), N = (e, t, n) => ({
+	x: t.x ? [j(e, t.x[0]), j(e, t.x[1])] : n.x,
+	y: t.y ? [k(e, t.y[0]), k(e, t.y[1])] : n.y
+}), P = /* @__PURE__ */ new WeakMap(), ue = (e) => {
+	let t = P.get(e);
+	if (t) return t;
+	let n = e.x.map((e) => e > 0 ? Math.log10(e) : NaN), r = e.y, i = !1;
+	for (let t = 0; t < e.count; t++) Number.isFinite(n[t]) || (i || (r = Float64Array.from(e.y)), i = !0, r[t] = NaN);
+	let [a, o] = C(n), s = {
+		...e,
+		x: n,
+		y: r,
+		xMin: a,
+		xMax: o,
+		sorted: e.sorted && !i
+	};
+	return P.set(e, s), s;
+}, de = (e, t) => {
+	for (let n of [e.barBase, e.stackBase]) if (n) for (let e = 0; e < n.length; e++) n[e] === -Infinity && (n[e] = t);
+}, fe = (e, t) => {
+	let [n, r] = e.valueRange, i = e.colorMidpoint, a;
+	return a = i !== null && i > n && i < r ? t < i ? (t - n) / (i - n) * .5 : .5 + (t - i) / (r - i) * .5 : (t - n) / (r - n || 1), a < 0 ? 0 : a > 1 ? 1 : a;
+}, pe = (e, t, n, r) => {
+	let o = i(n.background) < .4;
+	if (e === "diverging") {
+		let e = a(n.surface, n.textMuted, o ? .12 : .08), i = (e) => o ? l(e, .7, 1.25) : l(e, .5, 1.05), s = (t) => a(e, i(t), .5);
+		return [
+			i(r),
+			s(r),
+			e,
+			s(t),
+			i(t)
+		];
+	}
+	return o ? [
+		a(n.surface, t, .14),
+		l(t, .46, .95),
+		l(t, .64, 1.2),
+		l(t, .8, 1.15)
+	] : [
+		a(n.surface, t, .06),
+		l(t, .8, .6),
+		l(t, .58, 1),
+		l(t, .36, .9)
+	];
+}, F = (i, a, l, m, _ = null) => {
+	let y = _ ?? a.resolve ?? ((e, t) => s(e, {}, t)), w = i.series, E = u(i.locale), D = typeof i.tooltip == "object" ? i.tooltip : void 0, O = d(E, {
+		...S(D?.labels),
+		...S(i.labels)
+	}), k = w.map((e) => e.data), A = i.xAxis?.type ?? b(k), j = A === "category" ? [...i.xAxis?.categories ?? e(k)] : [], M = new Map(j.map((e, t) => [e, t])), le = r(A, (e) => M.get(e) ?? NaN), N = i.yAxis, P = w.filter((e) => e.type === "heatmap").map((e) => e.data), F = N?.type === "category" || !N?.type && P.length ? [...N?.categories ?? t(P)] : [], I = N?.type === "category" || F.length ? "category" : N?.type === "time" || !N?.type && re(k) ? "time" : N?.type === "log" ? "log" : "linear", L = I === "log", me = new Map(F.map((e, t) => [e, t])), he = (e) => typeof e == "number" ? e : typeof e == "string" ? I === "category" ? me.get(e) ?? NaN : I === "time" ? Date.parse(e) : Number(e) : e instanceof Date ? e.getTime() : NaN, ge = `${A}|${j.join("
")}|${I}|${F.join("
")}`, R = i.stackMode === "percent", _e = i.orientation === "horizontal", ve = /* @__PURE__ */ new Set(), z = w.map((e, t) => {
 		let r = e.id ?? `#${t}`;
-		for (; R.has(r);) r += "'";
-		R.add(r);
-		let s = b.get(r);
-		(!s || s.data !== e.data || s.resolverKey !== F) && (s = {
+		for (; ve.has(r);) r += "'";
+		ve.add(r);
+		let i = m.get(r);
+		(!i || i.data !== e.data || i.resolverKey !== ge) && (i = {
 			data: e.data,
-			resolverKey: F,
-			cols: n(e.data, ce, de)
-		}, b.set(r, s));
-		let l = e.type ?? "line", u = g.palette[t % g.palette.length], d = e.color ? w(e.color, u) : u, f = s.cols, p = null;
-		if ((l === "scatter" || l === "bar" || l === "boxplot") && f.colors) {
+			resolverKey: ge,
+			cols: n(e.data, le, he)
+		}, m.set(r, i));
+		let s = e.type ?? "line", u = a.palette[t % a.palette.length], d = e.color ? y(e.color, u) : u, f = i.cols, p = null;
+		if ((s === "scatter" || s === "bar" || s === "boxplot") && f.colors) {
 			let e = /* @__PURE__ */ new Map();
 			p = f.colors.map((t) => {
 				if (t === void 0) return;
 				let n = e.get(t);
-				return n || e.set(t, n = w(t, d)), n;
+				return n || e.set(t, n = y(t, d)), n;
 			});
 		}
-		let m = [], h = [0, 1], _ = null;
-		if (l === "heatmap") {
-			m = e.colorScale && e.colorScale.length ? e.colorScale.map((e) => w(e, d)) : [i(g.background, d, .08), d], h = e.valueRange ? [e.valueRange[0], e.valueRange[1]] : [f.valueMin, f.valueMax], Number.isFinite(h[0]) || (h = [0, 1]);
-			let t = f.value ?? f.y, [n, r] = h, s = r - n || 1;
+		let h = [], g = [0, 1], _ = null, v = null, b = null;
+		if (s === "heatmap") {
+			let t = e.colorScale, n = t === "diverging" ? "diverging" : "sequential";
+			h = typeof t == "object" && t.length ? t.map((e) => y(e, d)) : pe(n, d, a, y(ne, [
+				.86,
+				.15,
+				.15,
+				1
+			])), g = e.valueRange ? [e.valueRange[0], e.valueRange[1]] : [f.valueMin, f.valueMax], Number.isFinite(g[0]) || (g = [0, 1]);
+			let [r, i] = g;
+			v = e.colorMidpoint ?? (n === "diverging" && typeof t != "object" ? r < 0 && i > 0 ? 0 : (r + i) / 2 : null);
+			let s = o(h);
+			b = s;
+			let c = f.value ?? f.y, l = {
+				valueRange: g,
+				colorMidpoint: v
+			};
 			_ = new Uint32Array(f.count);
 			for (let e = 0; e < f.count; e++) {
-				let r = t[e];
-				Number.isFinite(r) && Number.isFinite(f.y[e]) && (_[e] = a(o(m, (r - n) / s)));
+				let t = c[e];
+				Number.isFinite(t) && Number.isFinite(f.y[e]) && (_[e] = s[Math.round(fe(l, t) * 255)]);
 			}
 		}
-		let v = e.id ?? String(t);
+		let x = e.connector ? typeof e.connector == "object" ? e.connector : {} : null, S = e.id ?? String(t);
 		return {
 			index: t,
 			key: r,
-			id: v,
+			id: S,
 			name: e.name ?? `${O.series} ${t + 1}`,
-			type: l,
+			type: s,
 			color: d,
 			colorCss: c(d),
-			lineWidth: e.lineWidth ?? (l === "candlestick" ? 1 : l === "boxplot" ? 1.5 : 2),
-			pointSize: e.pointSize ?? (l === "boxplot" ? 6 : 8),
-			opacity: e.opacity ?? (l === "area" ? .28 : l === "scatter" ? .78 : l === "boxplot" ? .22 : 1),
-			hidden: !!e.hidden || ee.has(v),
+			lineWidth: e.lineWidth ?? (s === "candlestick" ? 1 : s === "boxplot" ? 1.5 : 2),
+			pointSize: e.pointSize ?? (s === "boxplot" ? 6 : 8),
+			opacity: e.opacity ?? (s === "area" ? .28 : s === "scatter" ? .78 : s === "boxplot" ? .22 : 1),
+			hidden: !!e.hidden || l.has(S),
 			showLabels: !!e.showLabels,
 			curve: e.curve ?? "linear",
 			cols: f,
 			raw: f,
-			yAxis: e.yAxis === "right" && !L ? "right" : "left",
-			floating: l === "bar" && !!f.y0,
+			yAxis: e.yAxis === "right" && !_e ? "right" : "left",
+			floating: s === "bar" && !!f.y0,
 			barOffset: 0,
 			barHalfWidth: 0,
 			barBase: null,
@@ -214,13 +303,13 @@ var ee = (e) => {
 			stackBase: null,
 			stackTop: null,
 			pointColors: p,
-			upColor: l === "candlestick" ? w(e.upColor ?? ne, [
+			upColor: s === "candlestick" ? y(e.upColor ?? te, [
 				.09,
 				.64,
 				.29,
 				1
 			]) : d,
-			downColor: l === "candlestick" ? w(e.downColor ?? re, [
+			downColor: s === "candlestick" ? y(e.downColor ?? ne, [
 				.86,
 				.15,
 				.15,
@@ -231,38 +320,50 @@ var ee = (e) => {
 				x: .5,
 				y: .5
 			},
-			colorScale: m,
-			valueRange: h,
-			radius: e.radius ?? (l === "heatmap" ? 2 : l === "boxplot" ? 0 : 3),
+			colorScale: h,
+			valueRange: g,
+			colorMidpoint: v,
+			colorLut: b,
+			tooltip: e.tooltip !== !1,
+			outlierShape: e.outlierShape ?? "hollow",
+			outlierSize: e.outlierSize ?? e.pointSize ?? 7,
+			connector: x && s === "bar" ? {
+				color: x.color ? y(x.color, a.textMuted) : a.textMuted,
+				dash: [...x.dash ?? [3, 3]],
+				width: x.width ?? 1
+			} : null,
+			radius: e.radius ?? (s === "heatmap" ? 2 : s === "boxplot" ? 0 : 3),
 			format: e.format,
 			valueName: e.valueName
 		};
-	}), B = z.filter((e) => !e.hidden), V = z.length > 0 && z.every((e) => e.type === "scatter" || e.type === "heatmap"), H = B.filter((e) => e.type === "bar" || e.type === "boxplot"), U = B.filter((e) => e.type === "bar"), fe = x(H, "x", A === "category");
-	if (H.length) {
-		let e = /* @__PURE__ */ new Map(), t = (e) => T[e.index].stack ?? `\u0000${e.key}`;
-		for (let n of H) e.has(t(n)) || e.set(t(n), e.size);
+	}), B = z.filter((e) => !e.hidden), V = A === "log";
+	if (V) for (let e of z) e.cols = ue(e.raw);
+	let H = z.length > 0 && z.every((e) => e.type === "scatter" || e.type === "heatmap"), U = B.filter((e) => e.type === "bar" || e.type === "boxplot"), W = B.filter((e) => e.type === "bar"), ye = T(U, "x", A === "category");
+	if (U.length) {
+		let e = /* @__PURE__ */ new Map(), t = (e) => w[e.index].stack ?? `\u0000${e.key}`;
+		for (let n of U) e.has(t(n)) || e.set(t(n), e.size);
 		let n = 0;
-		for (let e of H) {
-			let t = T[e.index].barWidth;
+		for (let e of U) {
+			let t = w[e.index].barWidth;
 			t !== void 0 && t > n && (n = Math.min(1, t));
 		}
-		let r = fe * (n || (e.size > 1 ? .78 : .62)), i = r / e.size;
-		for (let n of H) {
+		let r = ye * (n || (e.size > 1 ? .78 : .62)), i = r / e.size;
+		for (let n of U) {
 			let a = e.get(t(n)) ?? 0;
 			n.barOffset = -r / 2 + i * (a + .5), n.barHalfWidth = i / 2 * (e.size > 1 ? .86 : 1);
 		}
-		let a = U.filter((e) => !e.floating), o = S(a.map((e) => ({
+		let a = W.filter((e) => !e.floating), o = ee(a.map((e) => ({
 			s: e,
 			stack: t(e)
-		})), !1), s = I ? S(a.filter((e) => T[e.index].stack !== void 0).map((e) => ({
+		})), !1), s = R ? ee(a.filter((e) => w[e.index].stack !== void 0).map((e) => ({
 			s: e,
 			stack: t(e)
 		})), !0) : [], c = 0;
 		a.forEach((e, t) => {
-			let n = I && T[e.index].stack !== void 0 ? s[c++] : o[t];
+			let n = R && w[e.index].stack !== void 0 ? s[c++] : o[t];
 			e.barBase = n.base, e.barTop = n.top;
 		});
-		for (let e of U) {
+		for (let e of W) {
 			let { y: t, y0: n, count: r } = e.cols;
 			if (!e.floating || !n) continue;
 			let i = new Float64Array(r), a = new Float64Array(r);
@@ -273,127 +374,130 @@ var ee = (e) => {
 			e.barBase = i, e.barTop = a;
 		}
 	}
-	for (let e of B) e.type === "area" && e.cols.y0 && T[e.index].stack === void 0 && (e.stackBase = e.cols.y0);
-	let W = B.filter((e) => (e.type === "line" || e.type === "area") && T[e.index].stack !== void 0);
-	if (W.length) {
-		let e = S(W.map((e) => ({
+	for (let e of B) e.type === "area" && e.cols.y0 && w[e.index].stack === void 0 && (e.stackBase = e.cols.y0);
+	let G = B.filter((e) => (e.type === "line" || e.type === "area") && w[e.index].stack !== void 0);
+	if (G.length) {
+		let e = ee(G.map((e) => ({
 			s: e,
-			stack: T[e.index].stack ?? ""
-		})), I);
-		W.forEach((t, n) => {
+			stack: w[e.index].stack ?? ""
+		})), R);
+		G.forEach((t, n) => {
 			t.stackBase = e[n].base, t.stackTop = e[n].top;
 		});
 	}
-	let G = B.filter((e) => e.type === "candlestick"), pe = x(G, "x", A === "category");
-	for (let e of G) e.barHalfWidth = pe * .3;
+	let be = B.filter((e) => e.type === "candlestick"), xe = T(be, "x", A === "category");
+	for (let e of be) e.barHalfWidth = xe * .3;
 	let K = B.filter((e) => e.type === "heatmap");
 	if (K.length) {
-		let e = x(K, "x", A === "category") / 2, t = x(K, "y", P === "category") / 2;
+		let e = T(K, "x", A === "category") / 2, t = T(K, "y", I === "category") / 2;
 		for (let n of K) n.cellHalf = {
 			x: e,
 			y: t
 		};
 	}
-	let q = p.xAxis, J;
+	let q = i.xAxis, J;
 	if (A === "category") J = [-.5, Math.max(1, j.length) - .5];
 	else {
 		let e = [];
 		for (let t of B) {
 			e.push(t.cols.xMin, t.cols.xMax);
-			let n = t.type === "bar" || t.type === "boxplot" ? fe / 2 : t.type === "candlestick" ? pe / 2 : t.type === "heatmap" ? t.cellHalf.x : 0;
+			let n = t.type === "bar" || t.type === "boxplot" ? ye / 2 : t.type === "candlestick" ? xe / 2 : t.type === "heatmap" ? t.cellHalf.x : 0;
 			n && e.push(t.cols.xMin - n, t.cols.xMax + n);
 		}
-		J = d(...y(e), A === "time" ? [Date.now() - 864e5, Date.now()] : [0, 1]);
+		J = f(...C(e), A === "time" ? [Date.now() - 864e5, Date.now()] : [0, 1]);
 		let t = z.every((e) => e.type === "scatter");
 		if (t) {
 			let e = (J[1] - J[0]) * .04;
 			J = [J[0] - e, J[1] + e];
 		}
-		(q?.nice ?? (t && A === "linear")) && A === "linear" && (J = f(J[0], J[1], q?.tickCount ?? 6));
+		(q?.nice ?? (t && A === "linear")) && A === "linear" && (J = p(J[0], J[1], q?.tickCount ?? 6)), V && q?.nice !== !1 && (J = oe(J));
 	}
-	q?.min !== void 0 && (J[0] = q.min), q?.max !== void 0 && (J[1] = q.max), J = d(J[0], J[1]);
-	let me = (e, t) => {
-		let n = [];
-		for (let t of e) t.type === "bar" && t.barBase && t.barTop ? n.push(...y(t.barBase), ...y(t.barTop)) : t.stackBase && t.stackTop ? n.push(...y(t.stackBase), ...y(t.stackTop)) : t.type === "heatmap" ? n.push(t.cols.yMin - t.cellHalf.y, t.cols.yMax + t.cellHalf.y) : n.push(t.cols.yMin, t.cols.yMax);
-		let r = e.filter((e) => e.type === "bar");
-		if ((r.some((e) => !e.floating) || t) && n.push(0), r.some((e) => e.showLabels)) {
-			let [e, t] = y(n);
-			t > 0 && n.push(t + (t - Math.min(0, e)) * .1), e < 0 && n.push(e - (Math.max(0, t) - e) * .1);
+	let Se = (e) => V ? Math.log10(e) : e;
+	if (q?.min !== void 0 && (J[0] = Se(q.min)), q?.max !== void 0 && (J[1] = Se(q.max)), J = f(J[0], J[1]), L) for (let e of z) e.yAxis !== "right" && e.type !== "heatmap" && se(e, v);
+	let Ce = (e, t, n = !1) => {
+		let r = [];
+		for (let t of e) t.type === "bar" && t.barBase && t.barTop ? r.push(...C(t.barBase), ...C(t.barTop)) : t.stackBase && t.stackTop ? r.push(...C(t.stackBase), ...C(t.stackTop)) : t.type === "heatmap" ? r.push(t.cols.yMin - t.cellHalf.y, t.cols.yMax + t.cellHalf.y) : r.push(t.cols.yMin, t.cols.yMax);
+		let i = e.filter((e) => e.type === "bar");
+		if (!n && (i.some((e) => !e.floating) || t) && r.push(0), i.some((e) => e.showLabels)) {
+			let [e, t] = C(r);
+			t > 0 && r.push(t + (t - Math.min(0, e)) * .1), e < 0 && r.push(e - (Math.max(0, t) - e) * .1);
 		}
-		return n;
-	}, he = B.filter((e) => e.yAxis === "left"), Y = he.length ? he : B, ge = Y.filter((e) => e.type === "bar"), X;
-	if (P === "category") X = [-.5, Math.max(1, N.length) - .5];
+		return r;
+	}, we = B.filter((e) => e.yAxis === "left"), Y = we.length ? we : B, Te = Y.filter((e) => e.type === "bar"), X;
+	if (I === "category") X = [-.5, Math.max(1, F.length) - .5];
 	else {
-		let e = me(Y, M?.zero), t = ge.length > 0 || Y.some((e) => e.type === "area");
-		if (X = d(...y(e)), z.every((e) => e.type === "scatter")) {
+		let e = Ce(Y, N?.zero, L), t = Te.length > 0 || Y.some((e) => e.type === "area");
+		if (X = f(...C(e)), z.every((e) => e.type === "scatter")) {
 			let e = (X[1] - X[0]) * .06;
 			X = [X[0] - e, X[1] + e];
-		} else if ((G.length || Y.some((e) => e.type === "boxplot")) && !ge.length) {
+		} else if ((be.length || Y.some((e) => e.type === "boxplot")) && !Te.length) {
 			let e = (X[1] - X[0]) * .04;
 			X = [X[0] - e, X[1] + e];
 		}
-		(M?.nice ?? !K.length) && P === "linear" && (X = f(X[0], X[1], M?.tickCount ?? 5)), I && (U.length || W.length) && (X = [y(e)[0] < 0 ? -100 : 0, 100]), t && !M?.zero && X[0] < 0 && y(e)[0] >= 0 && (X[0] = 0);
+		(N?.nice ?? !K.length) && I === "linear" && (X = p(X[0], X[1], N?.tickCount ?? 5)), L && N?.nice !== !1 && (X = oe(X)), R && (W.length || G.length) && (X = [C(e)[0] < 0 ? -100 : 0, 100]), t && !N?.zero && !L && X[0] < 0 && C(e)[0] >= 0 && (X[0] = 0);
 	}
-	M?.min !== void 0 && (X[0] = M.min), M?.max !== void 0 && (X[1] = M.max), X = d(X[0], X[1]);
-	let Z = p.yAxis2, _e = null, ve = null, Q = z.filter((e) => e.yAxis === "right");
-	if (Q.length && P !== "category") {
-		let e = me(Q.filter((e) => !e.hidden), Z?.zero), [t, n] = d(...y(e)), r = Z?.nice === !1 ? [t, n] : ae(t, n, X, M?.tickCount ?? 5);
-		Z?.min !== void 0 && (r[0] = Z.min), Z?.max !== void 0 && (r[1] = Z.max), r = d(r[0], r[1]);
-		let i = (X[1] - X[0]) / (r[1] - r[0]), a = {
-			scale: i,
-			offset: X[0] - r[0] * i
+	let Ee = (e) => L ? Math.log10(e) : e;
+	if (N?.min !== void 0 && (X[0] = Ee(N.min)), N?.max !== void 0 && (X[1] = Ee(N.max)), X = f(X[0], X[1]), L) for (let e of z) e.yAxis === "left" && de(e, X[0]);
+	let Z = i.yAxis2, De = null, Oe = null, Q = z.filter((e) => e.yAxis === "right");
+	if (Q.length && I !== "category") {
+		let e = Z?.type === "log", t = Q.filter((e) => !e.hidden), n = e ? t.flatMap((e) => {
+			let t = ae(e.raw, v);
+			return [t.yMin, t.yMax];
+		}) : Ce(t, Z?.zero), [r, i] = f(...C(n)), a = Z?.nice === !1 ? [r, i] : e ? oe([r, i]) : ie(r, i, X, N?.tickCount ?? 5), o = (t) => e ? Math.log10(t) : t;
+		Z?.min !== void 0 && (a[0] = o(Z.min)), Z?.max !== void 0 && (a[1] = o(Z.max)), a = f(a[0], a[1]);
+		let s = (X[1] - X[0]) / (a[1] - a[0]), c = {
+			scale: s,
+			offset: X[0] - a[0] * s,
+			log: e
 		};
-		ve = a;
-		let o = (e) => e * a.scale + a.offset, s = (e) => e ? e.map(o) : null, c = o(Math.min(Math.max(0, r[0]), r[1]));
-		for (let e of Q) {
-			let t = e.stackBase;
-			e.cols = oe(e.raw, a), e.barBase = s(e.barBase), e.barTop = s(e.barTop), e.stackTop = s(e.stackTop), e.stackBase = t && t === e.raw.y0 ? e.cols.y0 : t ? s(t) : e.type === "area" ? new Float64Array(e.cols.count).fill(c) : null;
-		}
-		_e = v(Z, "linear", [], !1, E);
+		Oe = c;
+		let l = e ? X[0] : ce(c)(Math.min(Math.max(0, a[0]), a[1]));
+		for (let e of Q) se(e, c, l), de(e, X[0]);
+		De = x(Z, e ? "log" : "linear", [], !1, E);
 	}
-	let $ = p.interaction === !1 ? !1 : p.interaction === !0 || p.interaction === void 0 ? !0 : p.interaction.zoom ?? !0, ye = $ === !1 ? {
+	let ke = I === "time" && z.some((e) => e.type === "bar") && z.every((e) => e.type === "bar" ? e.floating : e.type === "scatter"), $ = i.interaction === !1 ? !1 : i.interaction === !0 || i.interaction === void 0 ? !0 : i.interaction.zoom ?? !0, Ae = $ === !1 ? {
 		x: !1,
 		y: !1
 	} : $ === !0 ? {
 		x: !0,
-		y: V
+		y: H
 	} : {
 		x: $.includes("x"),
 		y: $.includes("y")
-	}, be = M?.format ?? (I && (U.length || W.length) ? (e) => m(e, E) : void 0);
+	}, je = N?.format ?? (R && (W.length || G.length) ? (e) => h(e, E) : void 0);
 	return {
 		series: z,
-		x: v(q, A, j, !1, E),
+		x: x(q, A, j, !1, E),
 		y: {
-			...v(M, P, N, P !== "category", E),
-			format: be
+			...x(N, I, F, I !== "category", E),
+			format: je
 		},
-		y2: _e,
-		y2Map: ve,
-		horizontal: L,
+		y2: De,
+		y2Map: Oe,
+		horizontal: _e,
 		locale: E,
 		labels: O,
-		formatValue: h(E),
+		formatValue: g(E),
 		base: {
 			x: J,
 			y: X
 		},
-		allScatter: V,
-		zoom: ye,
-		tooltipMode: D?.mode ?? (V ? "nearest" : "axis"),
-		baseline: Math.min(Math.max(0, X[0]), X[1]),
+		allScatter: H,
+		zoom: Ae,
+		tooltipMode: D?.mode ?? (H ? "nearest" : ke ? "item" : "axis"),
+		baseline: L ? X[0] : Math.min(Math.max(0, X[0]), X[1]),
 		minSpan: {
 			x: A === "category" ? 1 : (J[1] - J[0]) * 1e-7,
-			y: P === "category" ? 1 : (X[1] - X[0]) * 1e-7
+			y: I === "category" ? 1 : (X[1] - X[0]) * 1e-7
 		},
-		percent: I,
-		stacks: T.map((e) => e.stack !== void 0 && (e.type === "bar" || e.type === "line" || e.type === "area" || !e.type) ? `${e.type === "bar" ? "bar" : "line"}:${e.stack}` : null)
+		percent: R,
+		stacks: w.map((e) => e.stack !== void 0 && (e.type === "bar" || e.type === "line" || e.type === "area" || !e.type) ? `${e.type === "bar" ? "bar" : "line"}:${e.stack}` : null)
 	};
-}, D = (e, t) => e.barTop ? e.barTop[t] : e.stackTop ? e.stackTop[t] : e.cols.y[t], O = /* @__PURE__ */ new WeakMap(), k = (e) => {
-	let t = O.get(e.cols);
-	return t || (t = new g(e.cols.x, e.cols.y, e.cols.count), O.set(e.cols, t)), t;
+}, I = (e, t) => e.barTop ? e.barTop[t] : e.stackTop ? e.stackTop[t] : e.cols.y[t], L = /* @__PURE__ */ new WeakMap(), me = (e) => {
+	let t = L.get(e.cols);
+	return t || (t = new _(e.cols.x, e.cols.y, e.cols.count), L.set(e.cols, t)), t;
 };
 //#endregion
-export { ae as alignedDomain, E as buildModel, _ as detectXType, k as gridOf, D as plottedY };
+export { ie as alignedDomain, F as buildModel, b as detectXType, M as fromPlotX, A as fromPlotY, me as gridOf, fe as heatPosition, pe as heatmapStops, I as plottedY, j as toPlotX, k as toPlotY, N as viewFromValues, le as viewToValues };
 
 //# sourceMappingURL=model.js.map