@pixerate/editor 0.52.0 → 0.54.0

package/dist/{chunk-WBOAXDKD.js → chunk-VODBAO32.js}

@@ -4,6 +4,7 @@ import {
   DEFAULT_CHART_THEME,
   chartColorsByCategory,
   chartDataFromTable,
+  chartErrorAmounts,
   chartFamily,
   chartPointColor,
   chartSeriesColor,
@@ -13,12 +14,13 @@ import {
   cloneChartSeries,
   cloneChartSpec,
   defaultChartAxis,
+  describeChartErrorBars,
   normalizeChartSpec,
   normalizeChartTrendline,
   parseChartValue,
   shadeChartColor,
   uniqueChartSeriesId
-} from "./chunk-OV7UAKIY.js";
+} from "./chunk-633QC34G.js";
 import {
   NumberFormat
 } from "./chunk-EKYHKQPG.js";
@@ -639,6 +641,50 @@ function linearMap(value, domain, range) {
   if (d1 === d0) return (r0 + r1) / 2;
   return r0 + (value - d0) / (d1 - d0) * (r1 - r0);
 }
+var tidy = (n) => n === 0 ? 0 : Number(n.toPrecision(12));
+function niceLogScale(lo, hi, count = 5, base = 10, fixedMin = null, fixedMax = null) {
+  if (!(base > 1) || !Number.isFinite(base)) base = 10;
+  if (fixedMin !== null && !(fixedMin > 0 && Number.isFinite(fixedMin))) fixedMin = null;
+  if (fixedMax !== null && !(fixedMax > 0 && Number.isFinite(fixedMax))) fixedMax = null;
+  if (!(lo > 0) || !Number.isFinite(lo)) lo = hi > 0 && Number.isFinite(hi) ? hi : fixedMin ?? 1;
+  if (!(hi > 0) || !Number.isFinite(hi)) hi = Math.max(lo, fixedMax ?? lo * base);
+  if (lo > hi) [lo, hi] = [hi, lo];
+  const log = (v) => Math.log(v) / Math.log(base);
+  const e0 = Math.floor(log(fixedMin ?? lo) + 1e-9);
+  let e1 = Math.ceil(log(fixedMax ?? hi) - 1e-9);
+  if (e1 <= e0) e1 = e0 + 1;
+  let min = fixedMin ?? tidy(Math.pow(base, e0));
+  let max = fixedMax ?? tidy(Math.pow(base, e1));
+  if (!(max > min)) {
+    if (fixedMax === null) max = tidy(min * base);
+    else min = tidy(max / base);
+  }
+  if (!Number.isFinite(max)) max = Number.MAX_VALUE;
+  if (!(min > 0)) min = Number.MIN_VALUE;
+  const inside = (t) => t >= min * (1 - 1e-9) && t <= max * (1 + 1e-9);
+  const decades = Math.max(1, log(max) - log(min));
+  let ticks = [];
+  const first = Math.ceil(log(min) - 1e-9);
+  const last = Math.floor(log(max) + 1e-9);
+  if (base === 10 && decades * 3 <= count + 1) {
+    for (let e = first - 1; e <= last; e++) for (const m of [1, 2, 5]) ticks.push(tidy(m * Math.pow(10, e)));
+  } else {
+    const every = Math.max(1, Math.ceil((last - first + 1) / (count + 2)));
+    for (let e = Math.ceil(first / every) * every; e <= last && ticks.length < 1e3; e += every) ticks.push(tidy(Math.pow(base, e)));
+  }
+  ticks = ticks.filter((t) => Number.isFinite(t) && t > 0 && inside(t));
+  if (ticks.length < 2) ticks = niceScale(min, max, count, min, max).ticks.filter((t) => t > 0);
+  return { min, max, step: base, ticks: [...new Set(ticks)].sort((a, b) => a - b) };
+}
+function chartScaleToPixel(value, scale) {
+  if (!scale.logBase) return linearMap(value, scale.domain, scale.range);
+  if (!(value > 0)) return NaN;
+  return linearMap(Math.log(value), [Math.log(scale.domain[0]), Math.log(scale.domain[1])], scale.range);
+}
+function chartScaleFromPixel(px, scale) {
+  if (!scale.logBase) return linearMap(px, scale.range, scale.domain);
+  return Math.exp(linearMap(px, scale.range, [Math.log(scale.domain[0]), Math.log(scale.domain[1])]));
+}
 
 // src/chart/layout-shared.ts
 var estimateChartTextWidth = (text, size, weight = 400) => text.length * size * (weight >= 600 ? 0.6 : 0.56);
@@ -752,6 +798,7 @@ var tickCount = (length) => Math.max(2, Math.min(10, Math.round(length / 56)));
 function axisScale(lo, hi, length, axis, frozen, headroom = false) {
   const fixedMin = frozen && Number.isFinite(frozen.min) ? frozen.min : axis.min;
   const fixedMax = frozen && Number.isFinite(frozen.max) ? frozen.max : axis.max;
+  if (axis.scale === "log") return niceLogScale(lo, hi, tickCount(length), axis.logBase ?? 10, fixedMin, fixedMax);
   const step = axis.step;
   if (step && step > 0 && Number.isFinite(lo) && Number.isFinite(hi)) {
     let min = fixedMin ?? Math.floor(lo / step + 1e-9) * step;
@@ -1179,11 +1226,14 @@ function chartSupportsTrendlines(type, stacking) {
 var MAX_CHART_DATA_LABELS = 200;
 var MAX_CHART_LINE_POINTS = 2e3;
 var MAX_CHART_MARKERS = 1e3;
-function scaleInfo(scale, range, format) {
-  const domain = [scale.min, scale.max];
-  const raw = (v) => linearMap(v, domain, range);
-  const px = (v) => raw(Math.min(scale.max, Math.max(scale.min, v)));
-  return { scale, range, px, raw, zero: px(0), format, tickText: (t) => formatChartNumber(t, format, format.decimals ?? stepDecimals(scale.step)) };
+function scaleInfo(scale, range, format, axis) {
+  const logBase = axis?.scale === "log" ? axis.logBase ?? 10 : void 0;
+  const r = axis?.reverse ? [range[1], range[0]] : range;
+  const vs = { domain: [scale.min, scale.max], range: r, logBase };
+  const raw = (v) => chartScaleToPixel(v, vs);
+  const px = (v) => logBase && !(v > 0) ? r[0] : raw(Math.min(scale.max, Math.max(scale.min, v)));
+  const tickText = (t) => formatChartNumber(t, format, logBase ? format.decimals : format.decimals ?? stepDecimals(scale.step));
+  return { scale, range: r, px, raw, zero: px(0), format, tickText, ...logBase ? { logBase } : {} };
 }
 function categoryFrame(ctx, area, input) {
   const { spec, theme, measure, fs, marks } = ctx;
@@ -1194,7 +1244,7 @@ function categoryFrame(ctx, area, input) {
   const labelTarget = input.labelTarget ?? ((i) => ({ kind: "category", index: i }));
   const estimate = (v, length) => {
     const s = axisScale(v.lo, v.hi, length, v.axis, v.frozen, v.headroom);
-    const info = scaleInfo(s, [0, 1], v.format);
+    const info = scaleInfo(s, [0, 1], v.format, v.axis);
     return Math.max(0, ...s.ticks.map((t) => measure(info.tickText(t), fs)));
   };
   const valueLen0 = horizontal ? area.width : area.height;
@@ -1232,12 +1282,12 @@ function categoryFrame(ctx, area, input) {
   };
   const valueLen = horizontal ? plot.width : plot.height;
   const range = horizontal ? [plot.x, plot.x + plot.width] : [plot.y + plot.height, plot.y];
-  const value = scaleInfo(axisScale(primary.lo, primary.hi, valueLen, primary.axis, primary.frozen, primary.headroom), range, primary.format);
-  const value2 = secondary ? scaleInfo(axisScale(secondary.lo, secondary.hi, valueLen, secondary.axis, secondary.frozen, secondary.headroom), range, secondary.format) : void 0;
+  const value = scaleInfo(axisScale(primary.lo, primary.hi, valueLen, primary.axis, primary.frozen, primary.headroom), range, primary.format, primary.axis);
+  const value2 = secondary ? scaleInfo(axisScale(secondary.lo, secondary.hi, valueLen, secondary.axis, secondary.frozen, secondary.headroom), range, secondary.format, secondary.axis) : void 0;
   const catStart = horizontal ? plot.y : plot.x;
   const catLen = horizontal ? plot.height : plot.width;
   const band = catLen / n;
-  const catCenter = (i) => catStart + band * (i + 0.5);
+  const catCenter = (i) => catStart + band * (xAxis.reverse ? n - i - 0.5 : i + 0.5);
   const map = (p) => horizontal ? [p.v, p.c] : [p.c, p.v];
   const gridAt = (info, key) => info.scale.ticks.forEach((t, i) => {
     const p = info.px(t);
@@ -1341,20 +1391,29 @@ function categoryFrame(ctx, area, input) {
   }
   return { plot, horizontal, n, band, catStart, catLen, catCenter, map, value, value2 };
 }
-var toValueScale = (info, axis) => ({ axis, domain: [info.scale.min, info.scale.max], range: info.range, ticks: info.scale.ticks });
+var toValueScale = (info, axis) => ({ axis, domain: [info.scale.min, info.scale.max], range: info.range, ticks: info.scale.ticks, ...info.logBase ? { logBase: info.logBase } : {} });
+function errorBarPath(map, c, a, b, width, capA, capB) {
+  if (!Number.isFinite(a) || !Number.isFinite(b) || !Number.isFinite(c) || Math.abs(a - b) < 0.01 && !capA && !capB) return "";
+  const at = (across, along) => map({ c: across, v: along }).map(r2).join(",");
+  let d = `M${at(c, a)}L${at(c, b)}`;
+  if (capA) d += `M${at(c - width / 2, a)}L${at(c + width / 2, a)}`;
+  if (capB) d += `M${at(c - width / 2, b)}L${at(c + width / 2, b)}`;
+  return d;
+}
 var order = (t) => t === "area" ? 0 : t === "bar" ? 1 : t === "line" ? 2 : 3;
 function pointMark(base, shape, cx, cy, r, fill, stroke, strokeWidth) {
   if (shape === "circle" || shape === "hit" || shape === "none") return { kind: "circle", role: "point", ...base, cx, cy, r, fill, ...stroke ? { stroke, strokeWidth } : {} };
   const closed = shape !== "cross";
   return { kind: "path", role: "point", ...base, d: markerPath(shape, cx, cy, r), fill: closed ? fill : "none", stroke: stroke ?? fill, strokeWidth: strokeWidth ?? 2 };
 }
-function drawTrendlines(ctx, plot, series, color, points, toPx, labels) {
+function drawTrendlines(ctx, plot, series, color, points, toPx, labels, logAxis = false) {
   (series.trendlines ?? []).forEach((t, ti) => {
     const target = { kind: "trendline", seriesId: series.id, index: ti };
     const selected = ctx.isSelected(target);
     const stroke = t.color ?? color;
     let px = [];
-    if (t.type === "moving-average") px = chartMovingAverage(points, t.period ?? 2).map(([x, y]) => toPx(x, y));
+    const finitePx = (q) => Number.isFinite(q[0]) && Number.isFinite(q[1]);
+    if (t.type === "moving-average") px = chartMovingAverage(points, t.period ?? 2).map(([x, y]) => toPx(x, y)).filter(finitePx);
     else {
       const fit = fitChartTrendline(t, points);
       if (!fit) {
@@ -1364,11 +1423,12 @@ function drawTrendlines(ctx, plot, series, color, points, toPx, labels) {
       const xs = points.map((p) => p[0]);
       const lo = Math.min(...xs) - (t.backward ?? 0);
       const hi = Math.max(...xs) + (t.forward ?? 0);
-      const steps = t.type === "linear" ? 1 : 200;
+      const steps = t.type === "linear" && !logAxis ? 1 : 200;
       for (let k = 0; k <= steps; k++) {
         const x = lo + (hi - lo) * k / steps;
         const y = fit.evaluate(x);
-        if (y !== null) px.push(toPx(x, y));
+        const q = y === null ? null : toPx(x, y);
+        if (q && finitePx(q)) px.push(q);
       }
       if (t.showEquation) labels.push({ text: fit.equation, color: stroke, target });
       if (t.showR2) labels.push({ text: fit.r2 === null ? "R\xB2 = #N/A" : `R\xB2 = ${trendNumberText(fit.r2)}`, color: stroke, target });
@@ -1444,10 +1504,29 @@ function layoutCartesian(ctx, area, visible) {
       }
     }
   }
+  const logOf = (secondary) => (secondary ? spec.yAxis2 : spec.yAxis).scale === "log";
+  const errors = /* @__PURE__ */ new Map();
+  for (const s of visible) {
+    if (!s.errorBars) continue;
+    const stack = stacks.get(s.id);
+    errors.set(
+      s.id,
+      chartErrorAmounts(s.errorBars, s.values).map((e, i) => {
+        const raw = s.values[i];
+        const seg = stack?.segments[i];
+        if (!e || raw === null || stack && !seg) return null;
+        const k = seg && percent ? raw ? (seg[1] - seg[0]) / raw : 0 : 1;
+        const center = (seg ? seg[1] : raw) + (e.center - raw) * k;
+        return { center, lo: center - e.minus * k, hi: center + e.plus * k };
+      })
+    );
+  }
   const range = (secondary) => {
     let lo = Infinity;
     let hi = -Infinity;
+    const log = logOf(secondary);
     const see = (v) => {
+      if (!Number.isFinite(v) || log && !(v > 0)) return;
       lo = Math.min(lo, v);
       hi = Math.max(hi, v);
     };
@@ -1455,13 +1534,18 @@ function layoutCartesian(ctx, area, visible) {
     for (const s of group) {
       const stack = stacks.get(s.id);
       if (stack) stack.segments.forEach((seg) => seg && (see(seg[0]), see(seg[1])));
-      else s.values.forEach((v) => v !== null && Number.isFinite(v) && see(v));
+      else s.values.forEach((v) => v !== null && see(v));
+      errors.get(s.id)?.forEach((e) => e && (see(e.lo), see(e.hi)));
+    }
+    if (log) {
+      const skipped = group.reduce((t, s) => t + s.values.filter((v) => v !== null && Number.isFinite(v) && v <= 0).length, 0);
+      if (skipped) ctx.warn("values-skipped", `${skipped} value${skipped === 1 ? "" : "s"} of 0 or less cannot be drawn on the logarithmic ${secondary ? "secondary " : ""}value axis and ${skipped === 1 ? "was" : "were"} skipped.`);
     }
     if (!Number.isFinite(lo)) {
-      lo = 0;
-      hi = 1;
+      lo = log ? 1 : 0;
+      hi = log ? 10 : 1;
     }
-    if (group.some((s) => types.get(s.id) === "bar" || types.get(s.id) === "area")) {
+    if (!log && group.some((s) => types.get(s.id) === "bar" || types.get(s.id) === "area")) {
       lo = Math.min(lo, 0);
       hi = Math.max(hi, 0);
     }
@@ -1487,6 +1571,7 @@ function layoutCartesian(ctx, area, visible) {
   const barWidth = slots ? groupWidth / (slots - (slots - 1) * o) : 0;
   const slotOf = (s) => stacked ? barAxes.indexOf(onSecondary(s)) : bars.indexOf(s);
   const labelMarks = [];
+  const errorMarks = [];
   const trendLabels = [];
   let hiddenLabels = 0;
   const trendsAllowed = chartSupportsTrendlines(spec.type, spec.stacking);
@@ -1500,6 +1585,7 @@ function layoutCartesian(ctx, area, visible) {
     const seriesTarget = { kind: "series", seriesId: s.id };
     const info = infoOf(s);
     const valuePx = info.px;
+    const log = logOf(onSecondary(s));
     const labelsOn = (s.dataLabels ?? spec.dataLabels) && s.values.length <= MAX_CHART_DATA_LABELS;
     if ((s.dataLabels ?? spec.dataLabels) && !labelsOn) ctx.warn("data-labels-hidden", `Data labels are off for "${s.name}": it has more than ${MAX_CHART_DATA_LABELS} points.`);
     const labelFormat = s.format ?? info.format;
@@ -1509,6 +1595,7 @@ function layoutCartesian(ctx, area, visible) {
       s.values.forEach((raw, i) => {
         const seg = stack ? stack.segments[i] : raw === null ? null : [0, raw];
         if (!seg || raw === null || !Number.isFinite(raw)) return;
+        if (log && (raw <= 0 || seg[1] <= 0)) return;
         const a = valuePx(seg[0]);
         const b = valuePx(seg[1]);
         const c0 = catCenter(i) - groupWidth / 2 + slot * barWidth * (1 - o);
@@ -1533,7 +1620,8 @@ function layoutCartesian(ctx, area, visible) {
         if (labelsOn) {
           const v = percent ? seg[1] - seg[0] : raw;
           const text = dataLabel(v);
-          const at = barLabel(ctx, text, rect, horizontal, seg[1] >= seg[0], stacked, fill, plot);
+          const grows = horizontal ? b >= a : b <= a;
+          const at = barLabel(ctx, text, rect, horizontal, grows, stacked, fill, plot);
           if (!at) {
             hiddenLabels++;
             return;
@@ -1545,7 +1633,7 @@ function layoutCartesian(ctx, area, visible) {
       const curve = s.curve ?? spec.curve;
       const pointValue = (i) => {
         const v = stack ? stack.segments[i]?.[1] ?? null : s.values[i];
-        return v !== null && Number.isFinite(v) ? v : null;
+        return v !== null && Number.isFinite(v) && !(log && (v <= 0 || (s.values[i] ?? 0) <= 0)) ? v : null;
       };
       const runs = [];
       let run = [];
@@ -1556,7 +1644,7 @@ function layoutCartesian(ctx, area, visible) {
           run = [];
           continue;
         }
-        run.push({ c: catCenter(i), v: valuePx(v) });
+        run.push({ c: catCenter(i), v: valuePx(v), i });
       }
       if (run.length) runs.push(run);
       const thin = (r) => {
@@ -1568,7 +1656,7 @@ function layoutCartesian(ctx, area, visible) {
       const drawn = runs.map(thin);
       if (type === "area") {
         const parts = drawn.map((r) => {
-          const baseline = stack ? r.map((pt) => ({ c: pt.c, v: valuePx(stack.segments[Math.round((pt.c - catStart) / band - 0.5)]?.[0] ?? 0) })).reverse() : [
+          const baseline = stack ? r.map((pt) => ({ c: pt.c, v: valuePx(stack.segments[pt.i]?.[0] ?? 0) })).reverse() : [
             { c: r[r.length - 1].c, v: info.zero },
             { c: r[0].c, v: info.zero }
           ];
@@ -1620,14 +1708,26 @@ function layoutCartesian(ctx, area, visible) {
         }
       }
     }
+    const errs = errors.get(s.id);
+    if (errs) {
+      const slot = type === "bar" ? slotOf(s) : 0;
+      const capWidth = type === "bar" ? Math.min(10, barWidth * 0.5) : 8;
+      const cap = s.errorBars.cap !== false;
+      errs.forEach((e, i) => {
+        if (!e || log && !((s.values[i] ?? 0) > 0)) return;
+        const c = type === "bar" ? catCenter(i) - groupWidth / 2 + slot * barWidth * (1 - o) + barWidth / 2 : catCenter(i);
+        const d = errorBarPath(map, c, valuePx(e.lo), valuePx(e.hi), capWidth, cap && e.lo < e.center, cap && e.hi > e.center);
+        if (d) errorMarks.push({ kind: "path", key: `error-bar-${s.id}-${i}`, role: "error-bar", d, fill: "none", stroke: type === "bar" ? theme.text : color, strokeWidth: selSeries ? 2 : 1.25, target: seriesTarget, selected: selSeries });
+      });
+    }
     if (trendsAllowed && s.trendlines?.length) {
       const points = [];
       s.values.forEach((v, i) => v !== null && Number.isFinite(v) && points.push([i + 1, v]));
-      const toPx = (x, y) => map({ c: catStart + band * (x - 0.5), v: info.raw(y) });
-      drawTrendlines(ctx, plot, s, color, points, toPx, trendLabels);
+      const toPx = (x, y) => map({ c: catCenter(x - 1), v: info.raw(y) });
+      drawTrendlines(ctx, plot, s, color, points, toPx, trendLabels, !!info.logBase);
     }
   }
-  marks.push(...labelMarks);
+  marks.push(...errorMarks, ...labelMarks);
   drawTrendLabels(ctx, plot, trendLabels);
   if (hiddenLabels) ctx.warn("data-labels-hidden", `${hiddenLabels} data label${hiddenLabels === 1 ? "" : "s"} did not fit and ${hiddenLabels === 1 ? "is" : "are"} hidden.`);
   return {
@@ -1640,33 +1740,60 @@ function layoutCartesian(ctx, area, visible) {
 function layoutXy(ctx, area, visible) {
   const { spec, theme, marks, measure, fs } = ctx;
   const bubble = spec.type === "bubble";
-  const pointsOf = (s) => s.values.map((y, i) => ({ i, x: s.x?.[i] ?? (bubble || !s.x ? i + 1 : null), y, size: s.sizes?.[i] ?? null })).filter((p) => p.x !== null && p.y !== null && Number.isFinite(p.x) && Number.isFinite(p.y));
+  const yAxis = spec.yAxis;
+  const xAxis = spec.xAxis;
+  const xLog = xAxis.scale === "log";
+  const yLog = yAxis.scale === "log";
+  let skipped = 0;
+  const pointsOf = (s) => s.values.map((y, i) => ({ i, x: s.x?.[i] ?? (bubble || !s.x ? i + 1 : null), y, size: s.sizes?.[i] ?? null })).filter((p) => {
+    if (p.x === null || p.y === null || !Number.isFinite(p.x) || !Number.isFinite(p.y)) return false;
+    if (xLog && p.x <= 0 || yLog && p.y <= 0) return skipped++, false;
+    return true;
+  });
   const all = visible.map((s) => ({ s, pts: pointsOf(s) }));
+  if (skipped) ctx.warn("values-skipped", `${skipped} point${skipped === 1 ? "" : "s"} with a value of 0 or less cannot be drawn on the logarithmic ${xLog && yLog ? "axes" : xLog ? "x axis" : "value axis"} and ${skipped === 1 ? "was" : "were"} skipped.`);
+  const yErrors = /* @__PURE__ */ new Map();
+  const xErrors = /* @__PURE__ */ new Map();
+  for (const { s } of all) {
+    if (s.errorBars) yErrors.set(s.id, chartErrorAmounts(s.errorBars, s.values));
+    if (s.xErrorBars) xErrors.set(s.id, chartErrorAmounts(s.xErrorBars, s.values.map((_, i) => s.x?.[i] ?? (bubble || !s.x ? i + 1 : null))));
+  }
   let xlo = Infinity;
   let xhi = -Infinity;
   let ylo = Infinity;
   let yhi = -Infinity;
   let maxSize = 0;
+  const seeX = (v) => {
+    if (!Number.isFinite(v) || xLog && !(v > 0)) return;
+    xlo = Math.min(xlo, v);
+    xhi = Math.max(xhi, v);
+  };
+  const seeY = (v) => {
+    if (!Number.isFinite(v) || yLog && !(v > 0)) return;
+    ylo = Math.min(ylo, v);
+    yhi = Math.max(yhi, v);
+  };
   for (const { s, pts } of all) {
     for (const p of pts) {
-      xlo = Math.min(xlo, p.x);
-      xhi = Math.max(xhi, p.x);
-      ylo = Math.min(ylo, p.y);
-      yhi = Math.max(yhi, p.y);
+      seeX(p.x);
+      seeY(p.y);
       if (p.size !== null && p.size > maxSize) maxSize = p.size;
+      const ey = yErrors.get(s.id)?.[p.i];
+      if (ey) seeY(ey.center - ey.minus), seeY(ey.center + ey.plus);
+      const ex = xErrors.get(s.id)?.[p.i];
+      if (ex) seeX(ex.center - ex.minus), seeX(ex.center + ex.plus);
     }
     for (const t of s.trendlines ?? []) {
       if (!pts.length) continue;
-      xlo = Math.min(xlo, Math.min(...pts.map((p) => p.x)) - (t.backward ?? 0));
-      xhi = Math.max(xhi, Math.max(...pts.map((p) => p.x)) + (t.forward ?? 0));
+      seeX(Math.min(...pts.map((p) => p.x)) - (t.backward ?? 0));
+      seeX(Math.max(...pts.map((p) => p.x)) + (t.forward ?? 0));
     }
   }
-  if (!Number.isFinite(xlo)) [xlo, xhi, ylo, yhi] = [0, 1, 0, 1];
+  if (!Number.isFinite(xlo)) [xlo, xhi] = xLog ? [1, 10] : [0, 1];
+  if (!Number.isFinite(ylo)) [ylo, yhi] = yLog ? [1, 10] : [0, 1];
   const titleBand = fs * 1.3 + 6;
-  const yAxis = spec.yAxis;
-  const xAxis = spec.xAxis;
   const yEst = axisScale(ylo, yhi, area.height, yAxis, ctx.options.valueDomain, true);
-  const yText = (t, step) => formatChartNumber(t, yAxis.format, yAxis.format.decimals ?? stepDecimals(step));
+  const yText = (t, step) => formatChartNumber(t, yAxis.format, yAxis.format.decimals ?? (yLog ? void 0 : stepDecimals(step)));
   const left = (yAxis.show ? Math.max(0, ...yEst.ticks.map((t) => measure(yText(t, yEst.step), fs))) + 8 : 2) + (yAxis.title ? titleBand : 0);
   const bottom = (xAxis.show ? fs * 1.6 : 2) + (xAxis.title ? titleBand : 0);
   const plot = { x: area.x + left, y: area.y + fs / 2 + 2, width: Math.max(1, area.width - left - 12), height: Math.max(1, area.height - bottom - fs / 2 - 2) };
@@ -1676,21 +1803,21 @@ function layoutXy(ctx, area, visible) {
   const xScale = axisScale(xlo, xhi, plot.width, xAxis, ctx.options.xDomain, true);
   const xRange = [plot.x + inset, plot.x + plot.width - inset];
   const yRange = [plot.y + plot.height - inset, plot.y + inset];
-  const xRaw = (x) => linearMap(x, [xScale.min, xScale.max], xRange);
-  const yRaw = (y) => linearMap(y, [yScale.min, yScale.max], yRange);
-  const xPx = (x) => xRaw(Math.min(xScale.max, Math.max(xScale.min, x)));
-  const yPx = (y) => yRaw(Math.min(yScale.max, Math.max(yScale.min, y)));
+  const xInfo = scaleInfo(xScale, xRange, xAxis.format, xAxis);
+  const yInfo = scaleInfo(yScale, yRange, yAxis.format, yAxis);
+  const { raw: xRaw, px: xPx } = xInfo;
+  const { raw: yRaw, px: yPx } = yInfo;
   const xTarget = { kind: "axis", axis: "x" };
   const yTarget = { kind: "axis", axis: "y" };
   if (yAxis.gridlines) yScale.ticks.forEach((t, i) => marks.push({ kind: "line", key: `grid-y-${i}`, role: "grid", x1: plot.x, y1: yPx(t), x2: plot.x + plot.width, y2: yPx(t), stroke: theme.grid, strokeWidth: 1 }));
   if (xAxis.gridlines) xScale.ticks.forEach((t, i) => marks.push({ kind: "line", key: `grid-x-${i}`, role: "grid", x1: xPx(t), y1: plot.y, x2: xPx(t), y2: plot.y + plot.height, stroke: theme.grid, strokeWidth: 1 }));
   if (yAxis.show) yScale.ticks.forEach((t, i) => marks.push({ kind: "text", key: `tick-y-${i}`, role: "tick-label", x: plot.x - 8, y: yPx(t), text: yText(t, yScale.step), anchor: "end", baseline: "middle", size: fs, fill: theme.mutedText, target: yTarget }));
   if (xAxis.show) {
-    const y0 = yScale.min <= 0 && yScale.max >= 0 ? yPx(0) : plot.y + plot.height;
+    const y0 = !yLog && yScale.min <= 0 && yScale.max >= 0 ? yPx(0) : yAxis.reverse ? plot.y : plot.y + plot.height;
     marks.push({ kind: "line", key: "axis-x", role: "axis", x1: plot.x, y1: y0, x2: plot.x + plot.width, y2: y0, stroke: theme.axis, strokeWidth: 1, target: xTarget });
-    const texts = xScale.ticks.map((t) => formatChartNumber(t, xAxis.format, xAxis.format.decimals ?? stepDecimals(xScale.step)));
+    const texts = xScale.ticks.map((t) => formatChartNumber(t, xAxis.format, xAxis.format.decimals ?? (xLog ? void 0 : stepDecimals(xScale.step))));
     const widest = Math.max(0, ...texts.map((t) => measure(t, fs)));
-    const spacing = xScale.ticks.length > 1 ? Math.abs(xPx(xScale.ticks[1]) - xPx(xScale.ticks[0])) : Infinity;
+    const spacing = Math.min(Infinity, ...xScale.ticks.slice(1).map((t, i) => Math.abs(xPx(t) - xPx(xScale.ticks[i]))));
     const every = Math.max(1, Math.ceil((widest + 8) / spacing));
     xScale.ticks.forEach((t, i) => {
       if (i % every) return;
@@ -1704,6 +1831,7 @@ function layoutXy(ctx, area, visible) {
     ctx.outline(`axis-${axis}-selection`, axis === "y" ? { x: area.x, y: plot.y - fs / 2, width: left - 2, height: plot.height + fs } : { x: plot.x - 4, y: plot.y + plot.height + 2, width: plot.width + 8, height: area.y + area.height - plot.y - plot.height - 2 });
   }
   const labelMarks = [];
+  const errorMarks = [];
   const trendLabels = [];
   for (const { s, pts } of all) {
     const si = spec.series.indexOf(s);
@@ -1740,14 +1868,32 @@ function layoutXy(ctx, area, visible) {
       if (selected) marks.push({ kind: "circle", key: `point-${s.id}-${p.i}-selection`, role: "selection", cx, cy, r: r + 3.5, fill: "none", stroke: theme.selection, strokeWidth: 1.5 });
       if (labelsOn) labelMarks.push({ kind: "text", key: `label-${s.id}-${p.i}`, role: "data-label", x: cx, y: cy - r - 4, text: formatChartNumber(p.y, labelFormat), anchor: "middle", baseline: "bottom", size: fs - 1, fill: theme.text, target });
     }
-    if (s.trendlines?.length) drawTrendlines(ctx, plot, s, color, pts.map((p) => [p.x, p.y]), (x, y) => [xRaw(x), yRaw(y)], trendLabels);
+    const stroke = color;
+    const errorBar = (key, d) => d && errorMarks.push({ kind: "path", key, role: "error-bar", d, fill: "none", stroke, strokeWidth: selSeries ? 2 : 1.25, target: seriesTarget, selected: selSeries });
+    for (const p of pts) {
+      const ey = yErrors.get(s.id)?.[p.i];
+      if (ey) {
+        const lo = ey.center - ey.minus;
+        const hi = ey.center + ey.plus;
+        const cap = s.errorBars.cap !== false;
+        errorBar(`error-bar-${s.id}-${p.i}`, errorBarPath((q) => [q.c, q.v], xPx(p.x), yPx(lo), yPx(hi), 8, cap && lo < ey.center, cap && hi > ey.center));
+      }
+      const ex = xErrors.get(s.id)?.[p.i];
+      if (ex) {
+        const lo = ex.center - ex.minus;
+        const hi = ex.center + ex.plus;
+        const cap = s.xErrorBars.cap !== false;
+        errorBar(`error-bar-x-${s.id}-${p.i}`, errorBarPath((q) => [q.v, q.c], yPx(p.y), xPx(lo), xPx(hi), 8, cap && lo < ex.center, cap && hi > ex.center));
+      }
+    }
+    if (s.trendlines?.length) drawTrendlines(ctx, plot, s, color, pts.map((p) => [p.x, p.y]), (x, y) => [xRaw(x), yRaw(y)], trendLabels, xLog || yLog);
   }
-  marks.push(...labelMarks);
+  marks.push(...errorMarks, ...labelMarks);
   drawTrendLabels(ctx, plot, trendLabels);
   return {
     plot,
-    valueScale: { axis: "y", domain: [yScale.min, yScale.max], range: yRange, ticks: yScale.ticks },
-    xScale: { axis: "x", domain: [xScale.min, xScale.max], range: xRange, ticks: xScale.ticks }
+    valueScale: toValueScale(yInfo, "y"),
+    xScale: toValueScale(xInfo, "x")
   };
 }
 function trendlineLegendItems(spec, color) {
@@ -2364,14 +2510,15 @@ function chartValueAtPoint(scene, point, secondary = false) {
   const scale = secondary ? scene.valueScale2 ?? scene.valueScale : scene.valueScale;
   if (!scale || scene.percent) return void 0;
   const px = scale.axis === "y" ? point.y : point.x;
-  return linearMap(px, scale.range, scale.domain);
+  return chartScaleFromPixel(px, scale);
 }
 function chartXAtPoint(scene, point) {
   const scale = scene.xScale;
   if (!scale) return void 0;
-  return linearMap(point.x, scale.range, scale.domain);
+  return chartScaleFromPixel(point.x, scale);
 }
-function snapChartValue(scene, value, step, ticks = scene.valueScale?.ticks ?? []) {
+function snapChartValue(scene, value, step, ticks = scene.valueScale?.ticks ?? [], logBase) {
+  if (logBase && step === void 0) return value > 0 && Number.isFinite(value) ? Number(value.toPrecision(2)) : value;
   const unit = step ?? (ticks.length > 1 ? (ticks[1] - ticks[0]) / 10 : 1);
   if (!(unit > 0)) return value;
   const snapped = Math.round(value / unit) * unit;
@@ -2384,15 +2531,15 @@ function summarizeChart(spec, size = { width: 640, height: 400 }, scene = layout
   const series = visible.map((s) => summarizeChartSeries(s, spec.categories));
   const colors = chartColorsByCategory(spec.type) ? spec.categories.map((_, i) => visible[0]?.pointColors?.[i] || chartSliceColor(spec, i)) : visible.map((s) => chartSeriesColor(spec, spec.series.indexOf(s)));
   const check = checkChartColors(colors, { surface: scene.theme.surface.startsWith("var(") ? "#ffffff" : scene.theme.surface });
-  const axis = (s) => s ? { min: s.domain[0], max: s.domain[1], ticks: [...s.ticks] } : void 0;
+  const axis = (s, a) => s ? { min: s.domain[0], max: s.domain[1], ticks: [...s.ticks], ...s.logBase ? { logBase: s.logBase } : {}, ...a.reverse ? { reversed: true } : {} } : void 0;
   return {
     type: spec.type,
     title: spec.title,
     categories: spec.categories.length,
     series,
-    ...scene.valueScale ? { valueAxis: axis(scene.valueScale) } : {},
-    ...scene.valueScale2 ? { secondaryAxis: axis(scene.valueScale2) } : {},
-    ...scene.xScale ? { xAxis: axis(scene.xScale) } : {},
+    ...scene.valueScale ? { valueAxis: axis(scene.valueScale, spec.yAxis) } : {},
+    ...scene.valueScale2 ? { secondaryAxis: axis(scene.valueScale2, spec.yAxis2) } : {},
+    ...scene.xScale ? { xAxis: axis(scene.xScale, spec.xAxis) } : {},
     warnings: scene.warnings,
     colors: { ok: check.ok, issues: check.issues },
     description: describeChart(spec, series)
@@ -2439,6 +2586,21 @@ function describeChart(spec, series = spec.series.filter((s) => !s.hidden).map((
     parts.push(`${s.name} ranges from ${fmt(s.min)} (${s.minAt}) to ${fmt(s.max)} (${s.maxAt})${trend}.`);
   }
   if (series.length > 8) parts.push(`${series.length - 8} more series are not described.`);
+  const axes = [];
+  for (const [a, name] of [
+    [spec.yAxis, "value axis"],
+    [spec.yAxis2, "secondary value axis"],
+    [spec.xAxis, family === "xy" ? "x axis" : "category axis"]
+  ]) {
+    if (name === "secondary value axis" && !spec.series.some((s) => !s.hidden && s.axis === "secondary")) continue;
+    const log = a.scale === "log" && name !== "category axis";
+    if (log || a.reverse) axes.push(`The ${name} is ${[log ? `logarithmic (base ${a.logBase ?? 10})` : "", a.reverse ? "reversed" : ""].filter(Boolean).join(" and ")}.`);
+  }
+  parts.push(...axes);
+  for (const s of spec.series.filter((x) => !x.hidden && (x.errorBars || x.xErrorBars)).slice(0, 8)) {
+    const bars = [s.errorBars ? describeChartErrorBars(s.errorBars) : "", s.xErrorBars ? `x ${describeChartErrorBars(s.xErrorBars)}` : ""].filter(Boolean).join(" and ");
+    parts.push(`${s.name} has ${bars}.`);
+  }
   return parts.join(" ");
 }
 
@@ -2879,7 +3041,7 @@ var ChartController = class {
       if (patch.hidden) next.hidden = true;
       else delete next.hidden;
     }
-    const resettable = ["axis", "x", "sizes", "pointColors", "marker", "curve", "dataLabels", "format"];
+    const resettable = ["axis", "x", "sizes", "pointColors", "marker", "curve", "dataLabels", "format", "errorBars", "xErrorBars"];
     for (const key of resettable) {
       if (!(key in patch) || patch[key] === void 0) continue;
       if (patch[key] === null) delete next[key];
@@ -3384,6 +3546,9 @@ export {
   stepDecimals,
   formatChartNumber,
   linearMap,
+  niceLogScale,
+  chartScaleToPixel,
+  chartScaleFromPixel,
   estimateChartTextWidth,
   sameChartSelection,
   contrastingTextColor,
@@ -3421,4 +3586,4 @@ export {
   layoutSparkline,
   sparklineToSvg
 };
-//# sourceMappingURL=chunk-WBOAXDKD.js.map
+//# sourceMappingURL=chunk-VODBAO32.js.map