@uwdata/mosaic-plot 0.5.0 → 0.6.0

package/dist/mosaic-plot.js

@@ -12810,8 +12810,7 @@ var castDouble = (expr) => cast(expr, "DOUBLE");
 
 // ../sql/src/datetime.js
 var epoch_ms = (expr) => {
-  const d = asColumn(expr);
-  return sql`(1000 * (epoch(${d}) - second(${d})) + millisecond(${d}))::DOUBLE`;
+  return sql`epoch_ms(${asColumn(expr)})`;
 };
 
 // ../sql/src/spatial.js
@@ -13218,6 +13217,89 @@ function isDoubleQuoted(s2) {
   return s2[0] === '"' && s2[s2.length - 1] === '"';
 }
 
+// ../sql/src/scales.js
+var identity = (x3) => x3;
+function scaleLinear() {
+  return {
+    apply: identity,
+    invert: identity,
+    sqlApply: asColumn,
+    sqlInvert: identity
+  };
+}
+function scaleLog({ base } = {}) {
+  if (base == null || base === Math.E) {
+    return {
+      apply: Math.log,
+      invert: Math.exp,
+      sqlApply: (c4) => sql`LN(${asColumn(c4)})`,
+      sqlInvert: (c4) => sql`EXP(${c4})`
+    };
+  } else if (base === 10) {
+    return {
+      apply: Math.log10,
+      invert: (x3) => Math.pow(10, x3),
+      sqlApply: (c4) => sql`LOG(${asColumn(c4)})`,
+      sqlInvert: (c4) => sql`POW(10, ${c4})`
+    };
+  } else {
+    const b = +base;
+    return {
+      apply: (x3) => Math.log(x3) / Math.log(b),
+      invert: (x3) => Math.pow(b, x3),
+      sqlApply: (c4) => sql`LN(${asColumn(c4)}) / LN(${b})`,
+      sqlInvert: (c4) => sql`POW(${b}, ${c4})`
+    };
+  }
+}
+function scaleSymlog({ constant: constant2 = 1 } = {}) {
+  const _ = +constant2;
+  return {
+    apply: (x3) => Math.sign(x3) * Math.log1p(Math.abs(x3)),
+    invert: (x3) => Math.sign(x3) * Math.exp(Math.abs(x3) - _),
+    sqlApply: (c4) => (c4 = asColumn(c4), sql`SIGN(${c4}) * LN(${_} + ABS(${c4}))`),
+    sqlInvert: (c4) => sql`SIGN(${c4}) * (EXP(ABS(${c4})) - ${_})`
+  };
+}
+function scaleSqrt() {
+  return {
+    apply: (x3) => Math.sign(x3) * Math.sqrt(Math.abs(x3)),
+    invert: (x3) => Math.sign(x3) * x3 * x3,
+    sqlApply: (c4) => (c4 = asColumn(c4), sql`SIGN(${c4}) * SQRT(ABS(${c4}))`),
+    sqlInvert: (c4) => sql`SIGN(${c4}) * (${c4}) ** 2`
+  };
+}
+function scalePow({ exponent = 1 } = {}) {
+  const e = +exponent;
+  return {
+    apply: (x3) => Math.sign(x3) * Math.pow(Math.abs(x3), e),
+    invert: (x3) => Math.sign(x3) * Math.pow(Math.abs(x3), 1 / e),
+    sqlApply: (c4) => (c4 = asColumn(c4), sql`SIGN(${c4}) * POW(ABS(${c4}), ${e})`),
+    sqlInvert: (c4) => sql`SIGN(${c4}) * POW(ABS(${c4}), 1/${e})`
+  };
+}
+function scaleTime() {
+  return {
+    apply: (x3) => +x3,
+    invert: (x3) => new Date(x3),
+    sqlApply: (c4) => c4 instanceof Date ? +c4 : epoch_ms(asColumn(c4)),
+    sqlInvert: identity
+  };
+}
+var scales = {
+  linear: scaleLinear,
+  log: scaleLog,
+  symlog: scaleSymlog,
+  sqrt: scaleSqrt,
+  pow: scalePow,
+  time: scaleTime,
+  utc: scaleTime
+};
+function scaleTransform(options) {
+  const scale3 = scales[options.type];
+  return scale3 ? { ...options, ...scale3(options) } : null;
+}
+
 // ../sql/src/load/create.js
 function create(name, query, {
   replace = false,
@@ -13377,7 +13459,6 @@ function fnv_mix(a2) {
 }
 
 // ../core/src/DataCubeIndexer.js
-var identity = (x3) => x3;
 var DataCubeIndexer = class {
   /**
    *
@@ -13470,10 +13551,10 @@ function getActiveView(clause) {
   let columns = clause.predicate?.columns;
   if (!schema || !columns)
     return null;
-  const { type: type2, scales, pixelSize = 1 } = schema;
+  const { type: type2, scales: scales2, pixelSize = 1 } = schema;
   let predicate;
-  if (type2 === "interval" && scales) {
-    const bins2 = scales.map((s2) => binInterval(s2, pixelSize));
+  if (type2 === "interval" && scales2) {
+    const bins2 = scales2.map((s2) => binInterval(s2, pixelSize));
     if (bins2.some((b) => b == null))
       return null;
     if (bins2.length === 1) {
@@ -13486,7 +13567,7 @@ function getActiveView(clause) {
       );
     }
   } else if (type2 === "point") {
-    predicate = identity;
+    predicate = (x3) => x3;
     columns = Object.fromEntries(columns.map((col) => [col.toString(), col]));
   } else {
     return null;
@@ -13494,39 +13575,15 @@ function getActiveView(clause) {
   return { source, columns, predicate };
 }
 function binInterval(scale3, pixelSize) {
-  const { type: type2, domain, range: range3 } = scale3;
-  let lift, toSql;
-  switch (type2) {
-    case "linear":
-      lift = identity;
-      toSql = asColumn;
-      break;
-    case "log":
-      lift = Math.log;
-      toSql = (c4) => sql`LN(${asColumn(c4)})`;
-      break;
-    case "symlog":
-      lift = (x3) => Math.sign(x3) * Math.log1p(Math.abs(x3));
-      toSql = (c4) => (c4 = asColumn(c4), sql`SIGN(${c4}) * LN(1 + ABS(${c4}))`);
-      break;
-    case "sqrt":
-      lift = Math.sqrt;
-      toSql = (c4) => sql`SQRT(${asColumn(c4)})`;
-      break;
-    case "utc":
-    case "time":
-      lift = (x3) => +x3;
-      toSql = (c4) => c4 instanceof Date ? +c4 : epoch_ms(asColumn(c4));
-      break;
+  const { apply: apply2, sqlApply } = scaleTransform(scale3);
+  if (apply2) {
+    const { domain, range: range3 } = scale3;
+    const lo = apply2(Math.min(...domain));
+    const hi = apply2(Math.max(...domain));
+    const a2 = Math.abs(range3[1] - range3[0]) / (hi - lo) / pixelSize;
+    const s2 = pixelSize === 1 ? "" : `${pixelSize}::INTEGER * `;
+    return (value) => sql`${s2}FLOOR(${a2}::DOUBLE * (${sqlApply(value)} - ${lo}::DOUBLE))::INTEGER`;
   }
-  return lift ? binFunction(domain, range3, pixelSize, lift, toSql) : null;
-}
-function binFunction(domain, range3, pixelSize, lift, toSql) {
-  const lo = lift(Math.min(domain[0], domain[1]));
-  const hi = lift(Math.max(domain[0], domain[1]));
-  const a2 = Math.abs(lift(range3[1]) - lift(range3[0])) / (hi - lo) / pixelSize;
-  const s2 = pixelSize === 1 ? "" : `${pixelSize}::INTEGER * `;
-  return (value) => sql`${s2}FLOOR(${a2}::DOUBLE * (${toSql(value)} - ${lo}::DOUBLE))::INTEGER`;
 }
 var NO_INDEX = { from: NaN };
 function getIndexColumns(client) {
@@ -29271,10 +29328,10 @@ function createChannels(channels, data) {
     Object.entries(channels).map(([name, channel]) => [name, createChannel(data, channel, name)])
   );
 }
-function valueObject(channels, scales) {
+function valueObject(channels, scales2) {
   const values2 = Object.fromEntries(
     Object.entries(channels).map(([name, { scale: scaleName, value }]) => {
-      const scale3 = scaleName == null ? null : scales[scaleName];
+      const scale3 = scaleName == null ? null : scales2[scaleName];
       return [name, scale3 == null ? value : map2(value, scale3)];
     })
   );
@@ -30076,14 +30133,14 @@ function projectionAspectRatio(projection3) {
   }
   return defaultAspectRatio;
 }
-function applyPosition(channels, scales, { projection: projection3 }) {
+function applyPosition(channels, scales2, { projection: projection3 }) {
   const { x: x3, y: y3 } = channels;
   let position3 = {};
   if (x3)
     position3.x = x3;
   if (y3)
     position3.y = y3;
-  position3 = valueObject(position3, scales);
+  position3 = valueObject(position3, scales2);
   if (projection3 && x3?.scale === "x" && y3?.scale === "y")
     project("x", "y", position3, projection3);
   if (x3)
@@ -30821,7 +30878,7 @@ function createScales(channelsByScale, {
   facet: { label: facetLabel = globalLabel } = {},
   ...options
 } = {}) {
-  const scales = {};
+  const scales2 = {};
   for (const [key, channels] of channelsByScale) {
     const scaleOptions = options[key];
     const scale3 = createScale(key, channels, {
@@ -30864,17 +30921,17 @@ function createScales(channelsByScale, {
         scale3.insetTop = +insetTop;
         scale3.insetBottom = +insetBottom;
       }
-      scales[key] = scale3;
+      scales2[key] = scale3;
     }
   }
-  return scales;
+  return scales2;
 }
 function createScaleFunctions(descriptors) {
-  const scales = {};
-  const scaleFunctions = { scales };
+  const scales2 = {};
+  const scaleFunctions = { scales: scales2 };
   for (const [key, descriptor] of Object.entries(descriptors)) {
     const { scale: scale3, type: type2, interval: interval2, label } = descriptor;
-    scales[key] = exposeScale(descriptor);
+    scales2[key] = exposeScale(descriptor);
     scaleFunctions[key] = scale3;
     scale3.type = type2;
     if (interval2 != null)
@@ -30884,14 +30941,14 @@ function createScaleFunctions(descriptors) {
   }
   return scaleFunctions;
 }
-function autoScaleRange(scales, dimensions) {
-  const { x: x3, y: y3, fx, fy } = scales;
+function autoScaleRange(scales2, dimensions) {
+  const { x: x3, y: y3, fx, fy } = scales2;
   const superdimensions = fx || fy ? outerDimensions(dimensions) : dimensions;
   if (fx)
     autoScaleRangeX(fx, superdimensions);
   if (fy)
     autoScaleRangeY(fy, superdimensions);
-  const subdimensions = fx || fy ? innerDimensions(scales, dimensions) : dimensions;
+  const subdimensions = fx || fy ? innerDimensions(scales2, dimensions) : dimensions;
   if (x3)
     autoScaleRangeX(x3, subdimensions);
   if (y3)
@@ -31234,11 +31291,11 @@ function scale2(options = {}) {
     throw new Error("invalid scale definition; no scale found");
   return scale3;
 }
-function exposeScales(scales) {
+function exposeScales(scales2) {
   return (key) => {
     if (!registry.has(key = `${key}`))
       throw new Error(`unknown scale: ${key}`);
-    return scales[key];
+    return scales2[key];
   };
 }
 function exposeScale({ scale: scale3, type: type2, domain, range: range3, interpolate, interval: interval2, transform: transform3, percent, pivot }) {
@@ -31278,7 +31335,7 @@ function exposeScale({ scale: scale3, type: type2, domain, range: range3, interp
 }
 
 // ../../node_modules/@observablehq/plot/src/dimensions.js
-function createDimensions(scales, marks2, options = {}) {
+function createDimensions(scales2, marks2, options = {}) {
   let marginTopDefault = 0.5 - offset, marginRightDefault = 0.5 + offset, marginBottomDefault = 0.5 + offset, marginLeftDefault = 0.5 - offset;
   for (const { marginTop: marginTop2, marginRight: marginRight2, marginBottom: marginBottom2, marginLeft: marginLeft2 } of marks2) {
     if (marginTop2 > marginTopDefault)
@@ -31303,7 +31360,7 @@ function createDimensions(scales, marks2, options = {}) {
   marginLeft = +marginLeft;
   let {
     width = 640,
-    height = autoHeight(scales, options, {
+    height = autoHeight(scales2, options, {
       width,
       marginTopDefault,
       marginRightDefault,
@@ -31321,7 +31378,7 @@ function createDimensions(scales, marks2, options = {}) {
     marginBottom,
     marginLeft
   };
-  if (scales.fx || scales.fy) {
+  if (scales2.fx || scales2.fy) {
     let {
       margin: facetMargin,
       marginTop: facetMarginTop = facetMargin !== void 0 ? facetMargin : marginTop,
@@ -31667,8 +31724,8 @@ var Mark = class {
       }
     }
   }
-  scale(channels, scales, context) {
-    const values2 = valueObject(channels, scales);
+  scale(channels, scales2, context) {
+    const values2 = valueObject(channels, scales2);
     if (context.projection)
       this.project(channels, values2, context);
     return values2;
@@ -31726,7 +31783,7 @@ function pointerK(kx2, ky2, { x: x3, y: y3, px, py, maxRadius = 40, channels, re
     // Unlike other composed transforms, the render transform must be the
     // outermost render function because it will re-render dynamically in
     // response to pointer events.
-    render: composeRender(function(index2, scales, values2, dimensions, context, next) {
+    render: composeRender(function(index2, scales2, values2, dimensions, context, next) {
       context = { ...context, pointerSticky: false };
       const svg = context.ownerSVGElement;
       const { data } = context.getMarkState(this);
@@ -31734,7 +31791,7 @@ function pointerK(kx2, ky2, { x: x3, y: y3, px, py, maxRadius = 40, channels, re
       if (!state)
         states.set(svg, state = { sticky: false, roots: [], renders: [] });
       let renderIndex = state.renders.push(render2) - 1;
-      const { x: x4, y: y4, fx, fy } = scales;
+      const { x: x4, y: y4, fx, fy } = scales2;
       let tx = fx ? fx(index2.fx) - dimensions.marginLeft : 0;
       let ty = fy ? fy(index2.fy) - dimensions.marginTop : 0;
       if (x4?.bandwidth)
@@ -31790,7 +31847,7 @@ function pointerK(kx2, ky2, { x: x3, y: y3, px, py, maxRadius = 40, channels, re
         const I = i == null ? [] : [i];
         if (faceted)
           I.fx = index2.fx, I.fy = index2.fy, I.fi = index2.fi;
-        const r = next(I, scales, values2, dimensions, context);
+        const r = next(I, scales2, values2, dimensions, context);
         if (g) {
           if (faceted) {
             const p = g.parentNode;
@@ -32162,8 +32219,8 @@ var RuleX = class extends Mark {
     this.insetBottom = number5(insetBottom);
     markers(this, options);
   }
-  render(index2, scales, channels, dimensions, context) {
-    const { x: x3, y: y3 } = scales;
+  render(index2, scales2, channels, dimensions, context) {
+    const { x: x3, y: y3 } = scales2;
     const { x: X3, y1: Y13, y2: Y23 } = channels;
     const { width, height, marginTop, marginRight, marginLeft, marginBottom } = dimensions;
     const { insetTop, insetBottom } = this;
@@ -32192,8 +32249,8 @@ var RuleY = class extends Mark {
     this.insetLeft = number5(insetLeft);
     markers(this, options);
   }
-  render(index2, scales, channels, dimensions, context) {
-    const { x: x3, y: y3 } = scales;
+  render(index2, scales2, channels, dimensions, context) {
+    const { x: x3, y: y3 } = scales2;
     const { y: Y3, x1: X13, x2: X23 } = channels;
     const { width, height, marginTop, marginRight, marginLeft, marginBottom } = dimensions;
     const { insetLeft, insetRight } = this;
@@ -32315,8 +32372,8 @@ var Text = class extends Mark {
     this.splitLines = splitter2(this);
     this.clipLine = clipper(this);
   }
-  render(index2, scales, channels, dimensions, context) {
-    const { x: x3, y: y3 } = scales;
+  render(index2, scales2, channels, dimensions, context) {
+    const { x: x3, y: y3 } = scales2;
     const { x: X3, y: Y3, rotate: R, text: T, title: TL, fontSize: FS } = channels;
     const { rotate } = this;
     const [cx, cy] = applyFrameAnchor(this, dimensions);
@@ -32739,8 +32796,8 @@ var Vector2 = class extends Mark {
     this.anchor = keyword(anchor, "anchor", ["start", "middle", "end"]);
     this.frameAnchor = maybeFrameAnchor(frameAnchor);
   }
-  render(index2, scales, channels, dimensions, context) {
-    const { x: x3, y: y3 } = scales;
+  render(index2, scales2, channels, dimensions, context) {
+    const { x: x3, y: y3 } = scales2;
     const { x: X3, y: Y3, length: L, rotate: A5 } = channels;
     const { length: length4, rotate, anchor, shape, r } = this;
     const [cx, cy] = applyFrameAnchor(this, dimensions);
@@ -32892,8 +32949,8 @@ function axisKy(k2, anchor, data, {
     }) : null,
     !isNoneish(fill) && label !== null ? text(
       [],
-      labelOptions({ fill, fillOpacity, ...options }, function(data2, facets, channels, scales, dimensions) {
-        const scale3 = scales[k2];
+      labelOptions({ fill, fillOpacity, ...options }, function(data2, facets, channels, scales2, dimensions) {
+        const scale3 = scales2[k2];
         const { marginTop: marginTop2, marginRight: marginRight2, marginBottom: marginBottom2, marginLeft: marginLeft2 } = k2 === "y" && dimensions.inset || dimensions;
         const cla = labelAnchor ?? (scale3.bandwidth ? "center" : "top");
         const clo = labelOffset ?? (anchor === "right" ? marginRight2 : marginLeft2) - 3;
@@ -32982,8 +33039,8 @@ function axisKx(k2, anchor, data, {
     }) : null,
     !isNoneish(fill) && label !== null ? text(
       [],
-      labelOptions({ fill, fillOpacity, ...options }, function(data2, facets, channels, scales, dimensions) {
-        const scale3 = scales[k2];
+      labelOptions({ fill, fillOpacity, ...options }, function(data2, facets, channels, scales2, dimensions) {
+        const scale3 = scales2[k2];
         const { marginTop: marginTop2, marginRight: marginRight2, marginBottom: marginBottom2, marginLeft: marginLeft2 } = k2 === "x" && dimensions.inset || dimensions;
         const cla = labelAnchor ?? (scale3.bandwidth ? "center" : "right");
         const clo = labelOffset ?? (anchor === "top" ? marginTop2 : marginBottom2) - 3;
@@ -33227,9 +33284,9 @@ function labelOptions({
 }
 function axisMark(mark, k2, anchor, ariaLabel, data, options, initialize) {
   let channels;
-  function axisInitializer(data2, facets, _channels, scales, dimensions, context) {
+  function axisInitializer(data2, facets, _channels, scales2, dimensions, context) {
     const initializeFacets = data2 == null && (k2 === "fx" || k2 === "fy");
-    const { [k2]: scale3 } = scales;
+    const { [k2]: scale3 } = scales2;
     if (!scale3)
       throw new Error(`missing scale: ${k2}`);
     const domain = scale3.domain();
@@ -33516,13 +33573,13 @@ function legend(options = {}) {
   }
   throw new Error("unknown legend type; no scale found");
 }
-function exposeLegends(scales, context, defaults23 = {}) {
+function exposeLegends(scales2, context, defaults23 = {}) {
   return (key, options) => {
     if (!legendRegistry.has(key))
       throw new Error(`unknown legend type: ${key}`);
-    if (!(key in scales))
+    if (!(key in scales2))
       return;
-    return legendRegistry.get(key)(scales[key], legendOptions(context, defaults23[key], options), (key2) => scales[key2]);
+    return legendRegistry.get(key)(scales2[key], legendOptions(context, defaults23[key], options), (key2) => scales2[key2]);
   };
 }
 function legendOptions({ className, ...context }, { label, ticks: ticks2, tickFormat: tickFormat2 } = {}, options) {
@@ -33555,12 +33612,12 @@ function interpolateOpacity(color3) {
   const { r, g, b } = rgb(color3) || rgb(0, 0, 0);
   return (t) => `rgba(${r},${g},${b},${t})`;
 }
-function createLegends(scales, context, options) {
+function createLegends(scales2, context, options) {
   const legends = [];
   for (const [key, value] of legendRegistry) {
     const o = options[key];
-    if (o?.legend && key in scales) {
-      const legend2 = value(scales[key], legendOptions(context, scales[key], o), (key2) => scales[key2]);
+    if (o?.legend && key in scales2) {
+      const legend2 = value(scales2[key], legendOptions(context, scales2[key], o), (key2) => scales2[key2]);
       if (legend2 != null)
         legends.push(legend2);
     }
@@ -33603,7 +33660,7 @@ var Frame = class extends Mark {
     this.rx = number5(rx);
     this.ry = number5(ry);
   }
-  render(index2, scales, channels, dimensions, context) {
+  render(index2, scales2, channels, dimensions, context) {
     const { marginTop, marginRight, marginBottom, marginLeft, width, height } = dimensions;
     const { anchor, insetTop, insetRight, insetBottom, insetLeft, rx, ry } = this;
     const x12 = marginLeft + insetLeft;
@@ -33698,9 +33755,9 @@ var Tip = class extends Mark {
     this.clipLine = clipper(this);
     this.format = { ...format3 };
   }
-  render(index2, scales, values2, dimensions, context) {
+  render(index2, scales2, values2, dimensions, context) {
     const mark = this;
-    const { x: x3, y: y3, fx, fy } = scales;
+    const { x: x3, y: y3, fx, fy } = scales2;
     const { ownerSVGElement: svg, document: document2 } = context;
     const { anchor, monospace, lineHeight, lineWidth } = this;
     const { textPadding: r, pointerSize: m, pathFilter } = this;
@@ -33718,7 +33775,7 @@ var Tip = class extends Mark {
       sources = values2.channels;
       format3 = formatTitle;
     } else {
-      sources = getSourceChannels.call(this, values2, scales);
+      sources = getSourceChannels.call(this, values2, scales2);
       format3 = formatChannels;
     }
     const g = create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyIndirectTextStyles, this).call(applyTransform, this, { x: X3 && x3, y: Y3 && y3 }).call(
@@ -33728,7 +33785,7 @@ var Tip = class extends Mark {
           this.setAttribute("fill", "currentColor");
           this.setAttribute("fill-opacity", 1);
           this.setAttribute("stroke", "none");
-          const lines = format3.call(mark, i, index2, sources, scales, values2);
+          const lines = format3.call(mark, i, index2, sources, scales2, values2);
           if (typeof lines === "string") {
             for (const line2 of mark.splitLines(lines)) {
               renderLine(that, { value: mark.clipLine(line2) });
@@ -33866,7 +33923,7 @@ function getPath(anchor, m, r, width, height) {
       return `M0,0l${m / 2},${-m / 2}v${m / 2 - h / 2}h${w}v${h}h${-w}v${m / 2 - h / 2}z`;
   }
 }
-function getSourceChannels({ channels }, scales) {
+function getSourceChannels({ channels }, scales2) {
   const sources = {};
   let format3 = this.format;
   format3 = maybeExpandPairedFormat(format3, channels, "x");
@@ -33892,18 +33949,18 @@ function getSourceChannels({ channels }, scales) {
       sources[key] = source;
   }
   if (this.facet) {
-    if (scales.fx && !("fx" in format3))
+    if (scales2.fx && !("fx" in format3))
       sources.fx = true;
-    if (scales.fy && !("fy" in format3))
+    if (scales2.fy && !("fy" in format3))
       sources.fy = true;
   }
   for (const key in sources) {
     const format4 = this.format[key];
     if (typeof format4 === "string") {
-      const value = sources[key]?.value ?? scales[key]?.domain() ?? [];
+      const value = sources[key]?.value ?? scales2[key]?.domain() ?? [];
       this.format[key] = (isTemporal(value) ? utcFormat : format)(format4);
     } else if (format4 === void 0 || format4 === true) {
-      const scale3 = scales[key];
+      const scale3 = scales2[key];
       this.format[key] = scale3?.bandwidth ? inferTickFormat(scale3, scale3.domain()) : formatDefault;
     }
   }
@@ -33924,11 +33981,11 @@ function maybeExpandPairedFormat(format3, channels, key) {
 function formatTitle(i, index2, { title }) {
   return formatDefault(title.value[i], i);
 }
-function* formatChannels(i, index2, channels, scales, values2) {
+function* formatChannels(i, index2, channels, scales2, values2) {
   for (const key in channels) {
     if (key === "fx" || key === "fy") {
       yield {
-        label: formatLabel(scales, channels, key),
+        label: formatLabel(scales2, channels, key),
         value: this.format[key](index2[key], i)
       };
       continue;
@@ -33940,12 +33997,12 @@ function* formatChannels(i, index2, channels, scales, values2) {
     const channel = channels[key];
     if (key === "x2" && "x1" in channels) {
       yield {
-        label: formatPairLabel(scales, channels, "x"),
+        label: formatPairLabel(scales2, channels, "x"),
         value: formatPair(this.format.x2, channels.x1, channel, i)
       };
     } else if (key === "y2" && "y1" in channels) {
       yield {
-        label: formatPairLabel(scales, channels, "y"),
+        label: formatPairLabel(scales2, channels, "y"),
         value: formatPair(this.format.y2, channels.y1, channel, i)
       };
     } else {
@@ -33954,7 +34011,7 @@ function* formatChannels(i, index2, channels, scales, values2) {
       if (!defined(value) && scale3 == null)
         continue;
       yield {
-        label: formatLabel(scales, channels, key),
+        label: formatLabel(scales2, channels, key),
         value: this.format[key](value, i),
         color: scale3 === "color" ? values2[key][i] : null,
         opacity: scale3 === "opacity" ? values2[key][i] : null
@@ -33965,14 +34022,14 @@ function* formatChannels(i, index2, channels, scales, values2) {
 function formatPair(formatValue, c1, c22, i) {
   return c22.hint?.length ? `${formatValue(c22.value[i] - c1.value[i], i)}` : `${formatValue(c1.value[i], i)}\u2013${formatValue(c22.value[i], i)}`;
 }
-function formatPairLabel(scales, channels, key) {
-  const l1 = formatLabel(scales, channels, `${key}1`, key);
-  const l2 = formatLabel(scales, channels, `${key}2`, key);
+function formatPairLabel(scales2, channels, key) {
+  const l1 = formatLabel(scales2, channels, `${key}1`, key);
+  const l2 = formatLabel(scales2, channels, `${key}2`, key);
   return l1 === l2 ? l1 : `${l1}\u2013${l2}`;
 }
-function formatLabel(scales, channels, key, defaultLabel = key) {
+function formatLabel(scales2, channels, key, defaultLabel = key) {
   const channel = channels[key];
-  const scale3 = scales[channel?.scale ?? key];
+  const scale3 = scales2[channel?.scale ?? key];
   return String(scale3?.label ?? channel?.label ?? defaultLabel);
 }
 
@@ -34047,10 +34104,10 @@ function plot(options = {}) {
   const scaleDescriptors = createScales(addScaleChannels(channelsByScale, stateByMark, options), options);
   const dimensions = createDimensions(scaleDescriptors, marks2, options);
   autoScaleRange(scaleDescriptors, dimensions);
-  const scales = createScaleFunctions(scaleDescriptors);
-  const { fx, fy } = scales;
+  const scales2 = createScaleFunctions(scaleDescriptors);
+  const { fx, fy } = scales2;
   const subdimensions = fx || fy ? innerDimensions(scaleDescriptors, dimensions) : dimensions;
-  const superdimensions = fx || fy ? actualDimensions(scales, dimensions) : dimensions;
+  const superdimensions = fx || fy ? actualDimensions(scales2, dimensions) : dimensions;
   const context = createContext(options);
   const document2 = context.document;
   const svg = creator_default("svg").call(document2.documentElement);
@@ -34076,7 +34133,7 @@ function plot(options = {}) {
   for (const [mark, state] of stateByMark) {
     if (mark.initializer != null) {
       const dimensions2 = mark.facet === "super" ? superdimensions : subdimensions;
-      const update2 = mark.initializer(state.data, state.facets, state.channels, scales, dimensions2, context);
+      const update2 = mark.initializer(state.data, state.facets, state.channels, scales2, dimensions2, context);
       if (update2.data !== void 0) {
         state.data = update2.data;
       }
@@ -34106,8 +34163,8 @@ function plot(options = {}) {
     const newScaleDescriptors = inheritScaleLabels(createScales(newChannelsByScale, options), scaleDescriptors);
     const { scales: newExposedScales, ...newScales } = createScaleFunctions(newScaleDescriptors);
     Object.assign(scaleDescriptors, newScaleDescriptors);
-    Object.assign(scales, newScales);
-    Object.assign(scales.scales, newExposedScales);
+    Object.assign(scales2, newScales);
+    Object.assign(scales2.scales, newExposedScales);
   }
   let facetDomains, facetTranslate;
   if (facets !== void 0) {
@@ -34116,7 +34173,7 @@ function plot(options = {}) {
     facetTranslate = facetTranslator(fx, fy, dimensions);
   }
   for (const [mark, state] of stateByMark) {
-    state.values = mark.scale(state.channels, scales, context);
+    state.values = mark.scale(state.channels, scales2, context);
   }
   const { width, height } = dimensions;
   select_default2(svg).attr("class", className).attr("fill", "currentColor").attr("font-family", "system-ui, sans-serif").attr("font-size", 10).attr("text-anchor", "middle").attr("width", width).attr("height", height).attr("viewBox", `0 0 ${width} ${height}`).attr("aria-label", ariaLabel).attr("aria-description", ariaDescription).call(
@@ -34147,7 +34204,7 @@ function plot(options = {}) {
         if (index2.length === 0)
           continue;
       }
-      const node = mark.render(index2, scales, values2, superdimensions, context);
+      const node = mark.render(index2, scales2, values2, superdimensions, context);
       if (node == null)
         continue;
       svg.appendChild(node);
@@ -34167,7 +34224,7 @@ function plot(options = {}) {
             index2 = subarray(index2);
           index2.fx = f.x, index2.fy = f.y, index2.fi = f.i;
         }
-        const node = mark.render(index2, scales, values2, subdimensions, context);
+        const node = mark.render(index2, scales2, values2, subdimensions, context);
         if (node == null)
           continue;
         (g ??= select_default2(svg).append("g")).append(() => node).datum(f);
@@ -34195,7 +34252,7 @@ function plot(options = {}) {
     if (caption != null)
       figure.append(createFigcaption(document2, caption));
   }
-  figure.scale = exposeScales(scales.scales);
+  figure.scale = exposeScales(scales2.scales);
   figure.legend = exposeLegends(scaleDescriptors, context, options);
   figure.projection = context.projection;
   const w = consumeWarnings();
@@ -34342,7 +34399,7 @@ function maybeMarkFacet(mark, topFacetState, options) {
   }
 }
 function derive(mark, options = {}) {
-  return initializer({ ...options, x: null, y: null }, (data, facets, channels, scales, dimensions, context) => {
+  return initializer({ ...options, x: null, y: null }, (data, facets, channels, scales2, dimensions, context) => {
     return context.getMarkState(mark);
   });
 }
@@ -34517,10 +34574,10 @@ function hasPositionChannel(k2, marks2) {
   }
   return false;
 }
-function inheritScaleLabels(newScales, scales) {
+function inheritScaleLabels(newScales, scales2) {
   for (const key in newScales) {
     const newScale = newScales[key];
-    const scale3 = scales[key];
+    const scale3 = scales2[key];
     if (newScale.label === void 0 && scale3) {
       newScale.label = scale3.label;
     }
@@ -35408,9 +35465,9 @@ var Area = class extends Mark {
   filter(index2) {
     return index2;
   }
-  render(index2, scales, channels, dimensions, context) {
+  render(index2, scales2, channels, dimensions, context) {
     const { x1: X13, y1: Y13, x2: X23 = X13, y2: Y23 = Y13 } = channels;
-    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales, 0, 0).call(
+    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales2, 0, 0).call(
       (g) => g.selectAll().data(groupIndex(index2, [X13, Y13, X23, Y23], this, channels)).enter().append("path").call(applyDirectStyles, this).call(applyGroupedChannelStyles, this, channels).attr(
         "d",
         area_default3().curve(this.curve).defined((i) => i >= 0).x0((i) => X13[i]).y0((i) => Y13[i]).x1((i) => X23[i]).y1((i) => Y23[i])
@@ -35461,10 +35518,10 @@ var Link = class extends Mark {
       super.project(channels, values2, context);
     }
   }
-  render(index2, scales, channels, dimensions, context) {
+  render(index2, scales2, channels, dimensions, context) {
     const { x1: X13, y1: Y13, x2: X23 = X13, y2: Y23 = Y13 } = channels;
     const { curve } = this;
-    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales).call(
+    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales2).call(
       (g) => g.selectAll().data(index2).enter().append("path").call(applyDirectStyles, this).attr(
         "d",
         curve === curveAuto && context.projection ? sphereLink(context.projection, X13, Y13, X23, Y23) : (i) => {
@@ -35559,13 +35616,13 @@ var Arrow = class extends Mark {
     this.insetEnd = +insetEnd;
     this.sweep = maybeSweep(sweep);
   }
-  render(index2, scales, channels, dimensions, context) {
+  render(index2, scales2, channels, dimensions, context) {
     const { x1: X13, y1: Y13, x2: X23 = X13, y2: Y23 = Y13, SW } = channels;
     const { strokeWidth, bend, headAngle, headLength, insetStart, insetEnd } = this;
     const sw = SW ? (i) => SW[i] : constant(strokeWidth === void 0 ? 1 : strokeWidth);
     const wingAngle = headAngle * radians3 / 2;
     const wingScale = headLength / 1.5;
-    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales).call(
+    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales2).call(
       (g) => g.selectAll().data(index2).enter().append("path").call(applyDirectStyles, this).attr("d", (i) => {
         let x12 = X13[i], y12 = Y13[i], x22 = X23[i], y22 = Y23[i];
         const lineLength = Math.hypot(x22 - x12, y22 - y12);
@@ -35654,17 +35711,17 @@ var AbstractBar = class extends Mark {
     this.rx = impliedString(rx, "auto");
     this.ry = impliedString(ry, "auto");
   }
-  render(index2, scales, channels, dimensions, context) {
+  render(index2, scales2, channels, dimensions, context) {
     const { rx, ry } = this;
-    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(this._transform, this, scales).call(
-      (g) => g.selectAll().data(index2).enter().append("rect").call(applyDirectStyles, this).attr("x", this._x(scales, channels, dimensions)).attr("width", this._width(scales, channels, dimensions)).attr("y", this._y(scales, channels, dimensions)).attr("height", this._height(scales, channels, dimensions)).call(applyAttr, "rx", rx).call(applyAttr, "ry", ry).call(applyChannelStyles, this, channels)
+    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(this._transform, this, scales2).call(
+      (g) => g.selectAll().data(index2).enter().append("rect").call(applyDirectStyles, this).attr("x", this._x(scales2, channels, dimensions)).attr("width", this._width(scales2, channels, dimensions)).attr("y", this._y(scales2, channels, dimensions)).attr("height", this._height(scales2, channels, dimensions)).call(applyAttr, "rx", rx).call(applyAttr, "ry", ry).call(applyChannelStyles, this, channels)
     ).node();
   }
-  _x(scales, { x: X3 }, { marginLeft }) {
+  _x(scales2, { x: X3 }, { marginLeft }) {
     const { insetLeft } = this;
     return X3 ? (i) => X3[i] + insetLeft : marginLeft + insetLeft;
   }
-  _y(scales, { y: Y3 }, { marginTop }) {
+  _y(scales2, { y: Y3 }, { marginTop }) {
     const { insetTop } = this;
     return Y3 ? (i) => Y3[i] + insetTop : marginTop + insetTop;
   }
@@ -35822,8 +35879,8 @@ var Dot = class extends Mark {
       };
     }
   }
-  render(index2, scales, channels, dimensions, context) {
-    const { x: x3, y: y3 } = scales;
+  render(index2, scales2, channels, dimensions, context) {
+    const { x: x3, y: y3 } = scales2;
     const { x: X3, y: Y3, r: R, rotate: A5, symbol: S } = channels;
     const { r, rotate, symbol: symbol2 } = this;
     const [cx, cy] = applyFrameAnchor(this, dimensions);
@@ -35917,10 +35974,10 @@ var Line = class extends Mark {
       super.project(channels, values2, context);
     }
   }
-  render(index2, scales, channels, dimensions, context) {
+  render(index2, scales2, channels, dimensions, context) {
     const { x: X3, y: Y3 } = channels;
     const { curve } = this;
-    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales).call(
+    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales2).call(
       (g) => g.selectAll().data(groupIndex(index2, [X3, Y3], this, channels)).enter().append("path").call(applyDirectStyles, this).call(applyGroupedChannelStyles, this, channels).call(applyGroupedMarkers, this, channels, context).attr(
         "d",
         curve === curveAuto && context.projection ? sphereLine(context.projection, X3, Y3) : line_default2().curve(curve).defined((i) => i >= 0).x((i) => X3[i]).y((i) => Y3[i])
@@ -35994,8 +36051,8 @@ var Rect = class extends Mark {
     this.rx = impliedString(rx, "auto");
     this.ry = impliedString(ry, "auto");
   }
-  render(index2, scales, channels, dimensions, context) {
-    const { x: x3, y: y3 } = scales;
+  render(index2, scales2, channels, dimensions, context) {
+    const { x: x3, y: y3 } = scales2;
     const { x1: X13, y1: Y13, x2: X23, y2: Y23 } = channels;
     const { marginTop, marginRight, marginBottom, marginLeft, width, height } = dimensions;
     const { projection: projection3 } = context;
@@ -36771,9 +36828,9 @@ var AbstractTick = class extends Mark {
     super(data, channels, options, defaults15);
     markers(this, options);
   }
-  render(index2, scales, channels, dimensions, context) {
-    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(this._transform, this, scales).call(
-      (g) => g.selectAll().data(index2).enter().append("line").call(applyDirectStyles, this).attr("x1", this._x1(scales, channels, dimensions)).attr("x2", this._x2(scales, channels, dimensions)).attr("y1", this._y1(scales, channels, dimensions)).attr("y2", this._y2(scales, channels, dimensions)).call(applyChannelStyles, this, channels).call(applyMarkers, this, channels, context)
+  render(index2, scales2, channels, dimensions, context) {
+    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(this._transform, this, scales2).call(
+      (g) => g.selectAll().data(index2).enter().append("line").call(applyDirectStyles, this).attr("x1", this._x1(scales2, channels, dimensions)).attr("x2", this._x2(scales2, channels, dimensions)).attr("y1", this._y1(scales2, channels, dimensions)).attr("y2", this._y2(scales2, channels, dimensions)).call(applyChannelStyles, this, channels).call(applyMarkers, this, channels, context)
     ).node();
   }
 };
@@ -36794,10 +36851,10 @@ var TickX = class extends AbstractTick {
   _transform(selection2, mark, { x: x3 }) {
     selection2.call(applyTransform, mark, { x: x3 }, offset, 0);
   }
-  _x1(scales, { x: X3 }) {
+  _x1(scales2, { x: X3 }) {
     return (i) => X3[i];
   }
-  _x2(scales, { x: X3 }) {
+  _x2(scales2, { x: X3 }) {
     return (i) => X3[i];
   }
   _y1({ y: y3 }, { y: Y3 }, { marginTop }) {
@@ -36834,10 +36891,10 @@ var TickY = class extends AbstractTick {
     const { insetRight } = this;
     return X3 && x3 ? (i) => X3[i] + x3.bandwidth() - insetRight : width - marginRight - insetRight;
   }
-  _y1(scales, { y: Y3 }) {
+  _y1(scales2, { y: Y3 }) {
     return (i) => Y3[i];
   }
-  _y2(scales, { y: Y3 }) {
+  _y2(scales2, { y: Y3 }) {
     return (i) => Y3[i];
   }
 };
@@ -36997,11 +37054,11 @@ var Raster = class extends AbstractRaster {
     this.imageRendering = impliedString(imageRendering, "auto");
   }
   // Ignore the color scale, so the fill channel is returned unscaled.
-  scale(channels, { color: color3, ...scales }, context) {
-    return super.scale(channels, scales, context);
+  scale(channels, { color: color3, ...scales2 }, context) {
+    return super.scale(channels, scales2, context);
   }
-  render(index2, scales, values2, dimensions, context) {
-    const color3 = scales[values2.channels.fill?.scale] ?? ((x3) => x3);
+  render(index2, scales2, values2, dimensions, context) {
+    const color3 = scales2[values2.channels.fill?.scale] ?? ((x3) => x3);
     const { x: X3, y: Y3 } = values2;
     const { document: document2 } = context;
     const [x12, y12, x22, y22] = renderBounds(values2, dimensions, context);
@@ -37050,7 +37107,7 @@ var Raster = class extends AbstractRaster {
     if (this.blur > 0)
       blurImage(image2, this.blur);
     context2d.putImageData(image2, 0, 0);
-    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales).call(
+    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales2).call(
       (g2) => g2.append("image").attr("transform", `translate(${x12},${y12}) scale(${Math.sign(x22 - x12)},${Math.sign(y22 - y12)})`).attr("width", Math.abs(dx)).attr("height", Math.abs(dy)).attr("preserveAspectRatio", "none").call(applyAttr, "image-rendering", this.imageRendering).call(applyDirectStyles, this).attr("xlink:href", canvas.toDataURL())
     ).node();
   }
@@ -37082,7 +37139,7 @@ function renderBounds({ x1: x12, y1: y12, x2: x22, y2: y22 }, dimensions, { proj
     y22 && projection3 == null ? y22[0] : height - marginBottom
   ];
 }
-function rasterBounds({ x1: x12, y1: y12, x2: x22, y2: y22 }, scales, dimensions, context) {
+function rasterBounds({ x1: x12, y1: y12, x2: x22, y2: y22 }, scales2, dimensions, context) {
   const channels = {};
   if (x12)
     channels.x1 = x12;
@@ -37092,19 +37149,19 @@ function rasterBounds({ x1: x12, y1: y12, x2: x22, y2: y22 }, scales, dimensions
     channels.x2 = x22;
   if (y22)
     channels.y2 = y22;
-  return renderBounds(valueObject(channels, scales), dimensions, context);
+  return renderBounds(valueObject(channels, scales2), dimensions, context);
 }
 function sampler(name, options = {}) {
   const { [name]: value } = options;
   if (typeof value !== "function")
     throw new Error(`invalid ${name}: not a function`);
-  return initializer({ ...options, [name]: void 0 }, function(data, facets, channels, scales, dimensions, context) {
-    const { x: x3, y: y3 } = scales;
+  return initializer({ ...options, [name]: void 0 }, function(data, facets, channels, scales2, dimensions, context) {
+    const { x: x3, y: y3 } = scales2;
     if (!x3)
       throw new Error("missing scale: x");
     if (!y3)
       throw new Error("missing scale: y");
-    const [x12, y12, x22, y22] = rasterBounds(channels, scales, dimensions, context);
+    const [x12, y12, x22, y22] = rasterBounds(channels, scales2, dimensions, context);
     const dx = x22 - x12;
     const dy = y22 - y12;
     const { pixelSize: k2 } = this;
@@ -37414,18 +37471,18 @@ var Contour = class extends AbstractRaster {
   filter(index2, { x: x3, y: y3, value, ...channels }, values2) {
     return super.filter(index2, channels, values2);
   }
-  render(index2, scales, channels, dimensions, context) {
+  render(index2, scales2, channels, dimensions, context) {
     const { geometry: G } = channels;
     const path2 = path_default();
-    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales).call((g) => {
+    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales2).call((g) => {
       g.selectAll().data(index2).enter().append("path").call(applyDirectStyles, this).attr("d", (i) => path2(G[i])).call(applyChannelStyles, this, channels);
     }).node();
   }
 };
 function contourGeometry({ thresholds, interval: interval2, ...options }) {
   thresholds = maybeThresholds(thresholds, interval2, thresholdSturges);
-  return initializer(options, function(data, facets, channels, scales, dimensions, context) {
-    const [x12, y12, x22, y22] = rasterBounds(channels, scales, dimensions, context);
+  return initializer(options, function(data, facets, channels, scales2, dimensions, context) {
+    const [x12, y12, x22, y22] = rasterBounds(channels, scales2, dimensions, context);
     const dx = x22 - x12;
     const dy = y22 - y12;
     const { pixelSize: k2, width: w = Math.round(Math.abs(dx) / k2), height: h = Math.round(Math.abs(dy) / k2) } = this;
@@ -37434,7 +37491,7 @@ function contourGeometry({ thresholds, interval: interval2, ...options }) {
     const V = channels.value.value;
     const VV = [];
     if (this.interpolate) {
-      const { x: X3, y: Y3 } = applyPosition(channels, scales, context);
+      const { x: X3, y: Y3 } = applyPosition(channels, scales2, context);
       const IX = map2(X3, (x3) => (x3 - x12) * kx2, Float64Array);
       const IY = map2(Y3, (y3) => (y3 - y12) * ky2, Float64Array);
       const ichannels = [channels.x, channels.y, channels.value];
@@ -37645,8 +37702,8 @@ var DelaunayLink = class extends Mark {
     this.curve = maybeCurve(curve, tension);
     markers(this, options);
   }
-  render(index2, scales, channels, dimensions, context) {
-    const { x: x3, y: y3 } = scales;
+  render(index2, scales2, channels, dimensions, context) {
+    const { x: x3, y: y3 } = scales2;
     const { x: X3, y: Y3, z: Z } = channels;
     const { curve } = this;
     const [cx, cy] = applyFrameAnchor(this, dimensions);
@@ -37712,8 +37769,8 @@ var AbstractDelaunayMark = class extends Mark {
       defaults23
     );
   }
-  render(index2, scales, channels, dimensions, context) {
-    const { x: x3, y: y3 } = scales;
+  render(index2, scales2, channels, dimensions, context) {
+    const { x: x3, y: y3 } = scales2;
     const { x: X3, y: Y3, z: Z } = channels;
     const [cx, cy] = applyFrameAnchor(this, dimensions);
     const xi = X3 ? (i) => X3[i] : constant(cx);
@@ -37759,8 +37816,8 @@ var Voronoi2 = class extends Mark {
       voronoiDefaults
     );
   }
-  render(index2, scales, channels, dimensions, context) {
-    const { x: x3, y: y3 } = scales;
+  render(index2, scales2, channels, dimensions, context) {
+    const { x: x3, y: y3 } = scales2;
     const { x: X3, y: Y3, z: Z } = channels;
     const [cx, cy] = applyFrameAnchor(this, dimensions);
     const xi = X3 ? (i) => X3[i] : constant(cx);
@@ -37840,7 +37897,7 @@ var Density = class extends Mark {
   filter(index2) {
     return index2;
   }
-  render(index2, scales, channels, dimensions, context) {
+  render(index2, scales2, channels, dimensions, context) {
     const { contours } = channels;
     const path2 = path_default();
     return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, {}).call(
@@ -37858,13 +37915,13 @@ function densityInitializer(options, fillDensity, strokeDensity) {
   let { bandwidth, thresholds } = options;
   bandwidth = bandwidth === void 0 ? 20 : +bandwidth;
   thresholds = thresholds === void 0 ? 20 : typeof thresholds?.[Symbol.iterator] === "function" ? coerceNumbers(thresholds) : +thresholds;
-  return initializer(options, function(data, facets, channels, scales, dimensions, context) {
+  return initializer(options, function(data, facets, channels, scales2, dimensions, context) {
     const W = channels.weight ? coerceNumbers(channels.weight.value) : null;
     const Z = channels.z?.value;
     const { z } = this;
     const [cx, cy] = applyFrameAnchor(this, dimensions);
     const { width, height } = dimensions;
-    const { x: X3, y: Y3 } = applyPosition(channels, scales, context);
+    const { x: X3, y: Y3 } = applyPosition(channels, scales2, context);
     const newChannels = Object.fromEntries(
       Object.entries(channels).filter(([key]) => !dropChannels.has(key)).map(([key, channel]) => [key, { ...channel, value: [] }])
     );
@@ -38024,14 +38081,14 @@ function memo(v2) {
   return { transform: (data) => V || (V = valueof(data, value)), label };
 }
 function clipDifferenceY(positive2) {
-  return (index2, scales, channels, dimensions, context, next) => {
+  return (index2, scales2, channels, dimensions, context, next) => {
     const { x1: x12, x2: x22 } = channels;
     const { height } = dimensions;
     const y12 = new Float32Array(x12.length);
     const y22 = new Float32Array(x22.length);
-    (positive2 === inferScaleOrder(scales.y) < 0 ? y12 : y22).fill(height);
-    const oc = next(index2, scales, { ...channels, x2: x12, y2: y22 }, dimensions, context);
-    const og = next(index2, scales, { ...channels, x1: x22, y1: y12 }, dimensions, context);
+    (positive2 === inferScaleOrder(scales2.y) < 0 ? y12 : y22).fill(height);
+    const oc = next(index2, scales2, { ...channels, x2: x12, y2: y22 }, dimensions, context);
+    const og = next(index2, scales2, { ...channels, x1: x22, y1: y12 }, dimensions, context);
     const c4 = oc.querySelector("g") ?? oc;
     const g = og.querySelector("g") ?? og;
     for (let i = 0; c4.firstChild; i += 2) {
@@ -38069,15 +38126,15 @@ var Geo = class extends Mark {
     );
     this.r = cr;
   }
-  render(index2, scales, channels, dimensions, context) {
+  render(index2, scales2, channels, dimensions, context) {
     const { geometry: G, r: R } = channels;
-    const path2 = path_default(context.projection ?? scaleProjection2(scales));
+    const path2 = path_default(context.projection ?? scaleProjection2(scales2));
     const { r } = this;
     if (negative(r))
       index2 = [];
     else if (r !== void 0)
       path2.pointRadius(r);
-    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales).call((g) => {
+    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales2).call((g) => {
       g.selectAll().data(index2).enter().append("path").call(applyDirectStyles, this).attr("d", R ? (i) => path2.pointRadius(R[i])(G[i]) : (i) => path2(G[i])).call(applyChannelStyles, this, channels);
     }).node();
   }
@@ -38134,13 +38191,13 @@ function hexbin(outputs = { fill: "count" }, { binWidth, ...options } = {}) {
     options.symbol = "hexagon";
   if (options.r === void 0 && !hasOutput(outputs, "r"))
     options.r = binWidth / 2;
-  return initializer(options, (data, facets, channels, scales, _, context) => {
+  return initializer(options, (data, facets, channels, scales2, _, context) => {
     let { x: X3, y: Y3, z: Z, fill: F, stroke: S, symbol: Q } = channels;
     if (X3 === void 0)
       throw new Error("missing channel: x");
     if (Y3 === void 0)
       throw new Error("missing channel: y");
-    ({ x: X3, y: Y3 } = applyPosition(channels, scales, context));
+    ({ x: X3, y: Y3 } = applyPosition(channels, scales2, context));
     Z = Z ? Z.value : valueof(data, z);
     F = F?.value;
     S = S?.value;
@@ -38182,8 +38239,8 @@ function hexbin(outputs = { fill: "count" }, { binWidth, ...options } = {}) {
     const sx = channels.x.scale;
     const sy = channels.y.scale;
     const binChannels = {
-      x: { value: BX, source: scales[sx] ? { value: map2(BX, scales[sx].invert), scale: sx } : null },
-      y: { value: BY, source: scales[sy] ? { value: map2(BY, scales[sy].invert), scale: sy } : null },
+      x: { value: BX, source: scales2[sx] ? { value: map2(BX, scales2[sx].invert), scale: sx } : null },
+      y: { value: BY, source: scales2[sy] ? { value: map2(BY, scales2[sy].invert), scale: sy } : null },
       ...Z && { z: { value: GZ } },
       ...F && { fill: { value: GF, scale: "auto" } },
       ...S && { stroke: { value: GS, scale: "auto" } },
@@ -38242,7 +38299,7 @@ var Hexgrid = class extends Mark {
     super(singleton, void 0, { clip, ...options }, defaults20);
     this.binWidth = number5(binWidth);
   }
-  render(index2, scales, channels, dimensions, context) {
+  render(index2, scales2, channels, dimensions, context) {
     const { binWidth } = this;
     const { marginTop, marginRight, marginBottom, marginLeft, width, height } = dimensions;
     const x06 = marginLeft - ox, x12 = width - marginRight - ox, y06 = marginTop - oy, y12 = height - marginBottom - oy, rx = binWidth / 2, ry = rx * sqrt4_3, hy = ry / 2, wx = rx * 2, wy = ry * 1.5, i0 = Math.floor(x06 / wx), i1 = Math.ceil(x12 / wx), j0 = Math.floor((y06 + hy) / wy), j1 = Math.ceil((y12 - hy) / wy) + 1, path2 = `m0,${round(-ry)}l${round(rx)},${round(hy)}v${round(ry)}l${round(-rx)},${round(hy)}`;
@@ -38314,8 +38371,8 @@ var Image = class extends Mark {
     this.frameAnchor = maybeFrameAnchor(frameAnchor);
     this.imageRendering = impliedString(imageRendering, "auto");
   }
-  render(index2, scales, channels, dimensions, context) {
-    const { x: x3, y: y3 } = scales;
+  render(index2, scales2, channels, dimensions, context) {
+    const { x: x3, y: y3 } = scales2;
     const { x: X3, y: Y3, width: W, height: H, r: R, rotate: A5, src: S } = channels;
     const { r, width, height, rotate } = this;
     const [cx, cy] = applyFrameAnchor(this, dimensions);
@@ -38485,10 +38542,10 @@ var LinearRegression = class extends Mark {
     if (!(this.precision > 0))
       throw new Error(`invalid precision: ${precision}`);
   }
-  render(index2, scales, channels, dimensions, context) {
+  render(index2, scales2, channels, dimensions, context) {
     const { x: X3, y: Y3, z: Z } = channels;
     const { ci } = this;
-    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales).call(
+    return create3("svg:g", context).call(applyIndirectStyles, this, dimensions, context).call(applyTransform, this, scales2).call(
       (g) => g.selectAll().data(Z ? groupZ2(index2, Z, this.z) : [index2]).enter().call(
         (enter) => enter.append("path").attr("fill", "none").call(applyDirectStyles, this).call(applyGroupedChannelStyles, this, { ...channels, fill: null, fillOpacity: null }).attr("d", (I) => this._renderLine(I, X3, Y3)).call(
           ci && !isNone(this.fill) ? (path2) => path2.select(pathBefore).attr("stroke", "none").call(applyDirectStyles, this).call(applyGroupedChannelStyles, this, {
@@ -39000,7 +39057,7 @@ function cluster(data, options) {
 
 // ../../node_modules/@observablehq/plot/src/transforms/centroid.js
 function centroid2({ geometry = identity7, ...options } = {}) {
-  return initializer({ ...options, x: null, y: null }, (data, facets, channels, scales, dimensions, { projection: projection3 }) => {
+  return initializer({ ...options, x: null, y: null }, (data, facets, channels, scales2, dimensions, { projection: projection3 }) => {
     const G = valueof(data, geometry);
     const n = G.length;
     const X3 = new Float64Array(n);
@@ -39090,14 +39147,14 @@ function dodge(y3, x3, anchor, padding, r, options) {
     if (sort3 === void 0 && reverse3 === void 0)
       options.sort = { channel: "-r" };
   }
-  return initializer(options, function(data, facets, channels, scales, dimensions, context) {
+  return initializer(options, function(data, facets, channels, scales2, dimensions, context) {
     let { [x3]: X3, r: R } = channels;
     if (!channels[x3])
       throw new Error(`missing channel: ${x3}`);
-    ({ [x3]: X3 } = applyPosition(channels, scales, context));
+    ({ [x3]: X3 } = applyPosition(channels, scales2, context));
     const cr = R ? void 0 : r !== void 0 ? number5(r) : this.r !== void 0 ? this.r : 3;
     if (R)
-      R = valueof(R.value, scales[R.scale] || identity7, Float64Array);
+      R = valueof(R.value, scales2[R.scale] || identity7, Float64Array);
     let [ky2, ty] = anchor(dimensions);
     const compare = ky2 ? compareAscending : compareSymmetric;
     const Y3 = new Float64Array(X3.length);
@@ -39427,6 +39484,9 @@ var attributeMap = /* @__PURE__ */ new Map([
   ["xAriaDescription", "x.ariaDescription"],
   ["xReverse", "x.reverse"],
   ["xZero", "x.zero"],
+  ["xBase", "x.base"],
+  ["xExponent", "x.exponent"],
+  ["xConstant", "x.constant"],
   ["yScale", "y.type"],
   ["yDomain", "y.domain"],
   ["yRange", "y.range"],
@@ -39457,6 +39517,9 @@ var attributeMap = /* @__PURE__ */ new Map([
   ["yAriaDescription", "y.ariaDescription"],
   ["yReverse", "y.reverse"],
   ["yZero", "y.zero"],
+  ["yBase", "y.base"],
+  ["yExponent", "y.exponent"],
+  ["yConstant", "y.constant"],
   ["facetMargin", "facet.margin"],
   ["facetMarginTop", "facet.marginTop"],
   ["facetMarginBottom", "facet.marginBottom"],
@@ -39532,6 +39595,9 @@ var attributeMap = /* @__PURE__ */ new Map([
   ["colorReverse", "color.reverse"],
   ["colorZero", "color.zero"],
   ["colorTickFormat", "color.tickFormat"],
+  ["colorBase", "color.base"],
+  ["colorExponent", "color.exponent"],
+  ["colorConstant", "color.constant"],
   ["opacityScale", "opacity.type"],
   ["opacityDomain", "opacity.domain"],
   ["opacityRange", "opacity.range"],
@@ -39541,18 +39607,27 @@ var attributeMap = /* @__PURE__ */ new Map([
   ["opacityReverse", "opacity.reverse"],
   ["opacityZero", "opacity.zero"],
   ["opacityTickFormat", "opacity.tickFormat"],
+  ["opacityBase", "opacity.base"],
+  ["opacityExponent", "opacity.exponent"],
+  ["opacityConstant", "opacity.constant"],
   ["rScale", "r.type"],
   ["rDomain", "r.domain"],
   ["rRange", "r.range"],
   ["rClamp", "r.clamp"],
   ["rNice", "r.nice"],
   ["rZero", "r.zero"],
+  ["rBase", "r.base"],
+  ["rExponent", "r.exponent"],
+  ["rConstant", "r.constant"],
   ["lengthScale", "length.type"],
   ["lengthDomain", "length.domain"],
   ["lengthRange", "length.range"],
   ["lengthClamp", "length.clamp"],
   ["lengthNice", "length.nice"],
   ["lengthZero", "length.zero"],
+  ["lengthBase", "length.base"],
+  ["lengthExponent", "length.exponent"],
+  ["lengthConstant", "length.constant"],
   ["projectionType", "projection.type"],
   ["projectionParallels", "projection.parallels"],
   ["projectionPrecision", "projection.precision"],
@@ -39909,14 +39984,26 @@ function isSymbol2(value) {
   return symbols2.has(`${value}`.toLowerCase());
 }
 
-// src/marks/util/is-arrow-table.js
+// src/marks/util/arrow.js
+var INTEGER = 2;
+var FLOAT = 3;
+var DECIMAL = 7;
+var TIMESTAMP = 10;
 function isArrowTable(values2) {
   return typeof values2?.getChild === "function";
 }
+function convertArrow(type2) {
+  const { typeId } = type2;
+  if (typeId === TIMESTAMP) {
+    return (v2) => v2 == null ? v2 : new Date(v2);
+  }
+  if (typeId === INTEGER && type2.bitWidth >= 64) {
+    return (v2) => v2 == null ? v2 : Number(v2);
+  }
+  return (v2) => v2;
+}
 
 // src/marks/util/to-data-array.js
-var INTEGER = 2;
-var TIMESTAMP = 10;
 function toDataArray(data) {
   return isArrowTable(data) ? arrowToObjects(data) : data;
 }
@@ -39931,7 +40018,7 @@ function arrowToObjects(data) {
     for (let j = 0; j < numCols; ++j) {
       const child = batch.getChildAt(j);
       const { name, type: type2 } = schema.fields[j];
-      const valueOf = convert(type2);
+      const valueOf = convertArrow(type2);
       for (let o = k2, i = 0; i < numRows; ++i, ++o) {
         objects[o][name] = valueOf(child.get(i));
       }
@@ -39940,16 +40027,6 @@ function arrowToObjects(data) {
   }
   return objects;
 }
-function convert(type2) {
-  const { typeId } = type2;
-  if (typeId === TIMESTAMP) {
-    return (v2) => v2 == null ? v2 : new Date(v2);
-  }
-  if (typeId === INTEGER && type2.bitWidth >= 64) {
-    return (v2) => v2 == null ? v2 : Number(v2);
-  }
-  return (v2) => v2;
-}
 
 // src/marks/Mark.js
 var isColorChannel = (channel) => channel === "stroke" || channel === "fill";
@@ -40126,19 +40203,43 @@ function markQuery(channels, table, skip = []) {
   return q;
 }
 
-// src/marks/util/bin-field.js
-function binField(mark, channel, expr) {
-  if (!mark.stats)
-    return field2;
+// src/marks/util/channel-scale.js
+function channelScale(mark, channel) {
+  const { plot: plot2 } = mark;
+  let scaleType = plot2.getAttribute(`${channel}Scale`);
+  if (!scaleType) {
+    const { field: field2 } = mark.channelField(channel, `${channel}1`, `${channel}2`);
+    const { type: type2 } = mark.stats[field2.column];
+    scaleType = type2 === "date" ? "time" : "linear";
+  }
+  const options = { type: scaleType };
+  switch (scaleType) {
+    case "log":
+      options.base = plot2.getAttribute(`${channel}Base`) ?? 10;
+      break;
+    case "pow":
+      options.exponent = plot2.getAttribute(`${channel}Exponent`) ?? 1;
+      break;
+    case "symlog":
+      options.constant = plot2.getAttribute(`${channel}Constant`) ?? 1;
+      break;
+  }
+  return scaleTransform(options);
+}
+
+// src/marks/util/bin-expr.js
+function binExpr(mark, channel, n, extent4, pad3 = 1, expr) {
   const { field: field2 } = mark.channelField(channel);
-  const { type: type2 } = mark.stats[field2.column];
   expr = expr ?? field2;
-  return type2 === "date" ? epoch_ms(expr) : expr;
-}
-function bin1d(x3, x06, x12, n, reverse3 = false, pad3 = 1) {
-  const d = (n - pad3) / (x12 - x06);
-  const f = d !== 1 ? ` * ${d}::DOUBLE` : "";
-  return reverse3 ? sql`(${+x12} - ${x3}::DOUBLE)${f}` : sql`(${x3}::DOUBLE - ${+x06})${f}`;
+  const { type: type2, apply: apply2, sqlApply } = channelScale(mark, channel);
+  const reverse3 = !!mark.plot.getAttribute(`${channel}Reverse`);
+  const [lo, hi] = extent4.map((v3) => apply2(v3));
+  const v2 = sqlApply(expr);
+  const f = type2 === "time" || type2 === "utc" ? v2 : expr;
+  const d = hi === lo ? 0 : (n - pad3) / (hi - lo);
+  const s2 = d !== 1 ? ` * ${d}::DOUBLE` : "";
+  const bin3 = reverse3 ? sql`(${hi} - ${v2}::DOUBLE)${s2}` : sql`(${v2}::DOUBLE - ${lo})${s2}`;
+  return [bin3, f];
 }
 
 // src/marks/util/extent.js
@@ -40194,7 +40295,7 @@ function filteredExtent(filter3, column3) {
 var ConnectedMark = class extends Mark2 {
   constructor(type2, source, encodings) {
     const dim = type2.endsWith("X") ? "y" : type2.endsWith("Y") ? "x" : null;
-    const req = { [dim]: ["count", "min", "max"] };
+    const req = { [dim]: ["min", "max"] };
     super(type2, source, encodings, req);
     this.dim = dim;
   }
@@ -40202,27 +40303,29 @@ var ConnectedMark = class extends Mark2 {
     const { plot: plot2, dim, source, stats } = this;
     const { optimize = true } = source.options || {};
     const q = super.query(filter3);
-    if (optimize && dim) {
-      const { field: field2, as } = this.channelField(dim);
+    if (!dim)
+      return q;
+    const ortho = dim === "x" ? "y" : "x";
+    const value = this.channelField(ortho)?.as;
+    const { field: field2, as } = this.channelField(dim);
+    const { type: type2 } = stats[field2.column];
+    const isContinuous = type2 === "date" || type2 === "number";
+    if (optimize && isContinuous && value) {
       const { column: column3 } = field2;
-      const { count: count4, max: max4, min: min5 } = stats[column3];
+      const { max: max4, min: min5 } = stats[column3];
       const size = dim === "x" ? plot2.innerWidth() : plot2.innerHeight();
       const [lo, hi] = filteredExtent(filter3, column3) || [min5, max4];
-      const scale3 = (hi - lo) / (max4 - min5);
-      if (count4 * scale3 > size * 4) {
-        const dd = binField(this, dim, as);
-        const val = this.channelField(dim === "x" ? "y" : "x").as;
-        const cols = q.select().map((c4) => c4.as).filter((c4) => c4 !== as && c4 !== val);
-        return m4(q, dd, as, val, lo, hi, size, cols);
-      }
-      q.orderby(as);
+      const [expr] = binExpr(this, dim, size, [lo, hi], 1, as);
+      const cols = q.select().map((c4) => c4.as).filter((c4) => c4 !== as && c4 !== value);
+      return m4(q, expr, as, value, cols);
+    } else {
+      return q.orderby(field2);
     }
-    return q;
   }
 };
-function m4(input, bx, x3, y3, lo, hi, width, cols = []) {
-  const bins2 = sql`FLOOR(${width / (hi - lo)}::DOUBLE * (${bx} - ${+lo}::DOUBLE))::INTEGER`;
-  const q = (sel) => Query.from(input).select(sel).groupby(bins2, cols);
+function m4(input, bin3, x3, y3, cols = []) {
+  const pixel = sql`FLOOR(${bin3})::INTEGER`;
+  const q = (sel) => Query.from(input).select(sel).groupby(pixel, cols);
   return Query.union(
     q([{ [x3]: min(x3), [y3]: argmin(y3, x3) }, ...cols]),
     q([{ [x3]: max(x3), [y3]: argmax(y3, x3) }, ...cols]),
@@ -40231,6 +40334,120 @@ function m4(input, bx, x3, y3, lo, hi, width, cols = []) {
   ).orderby(cols, x3);
 }
 
+// src/marks/util/grid.js
+function arrayType(values2, name = "density") {
+  if (isArrowTable(values2)) {
+    const type2 = values2.getChild(name).type;
+    switch (type2.typeId) {
+      case INTEGER:
+      case FLOAT:
+      case DECIMAL:
+        return Float64Array;
+      default:
+        return Array;
+    }
+  } else {
+    return typeof values2[0][name] === "number" ? Float64Array : Array;
+  }
+}
+function grid1d(n, values2) {
+  const Type3 = arrayType(values2);
+  return valuesToGrid(new Type3(n), values2);
+}
+function grid2d(m, n, values2, aggr, groupby = []) {
+  if (groupby.length) {
+    return groupedValuesToGrids(m * n, values2, aggr, groupby);
+  } else {
+    const cell2 = {};
+    aggr.forEach((name) => {
+      const Type3 = arrayType(values2, name);
+      cell2[name] = valuesToGrid(new Type3(m * n), values2, name);
+    });
+    return [cell2];
+  }
+}
+function valuesToGrid(grid, values2, name = "density") {
+  if (isArrowTable(values2)) {
+    const numRows = values2.numRows;
+    if (numRows === 0)
+      return grid;
+    const index2 = values2.getChild("index").toArray();
+    const value = values2.getChild(name).toArray();
+    for (let row = 0; row < numRows; ++row) {
+      grid[index2[row]] = value[row];
+    }
+  } else {
+    for (const row of values2) {
+      grid[row.index] = row[name];
+    }
+  }
+  return grid;
+}
+function groupedValuesToGrids(size, values2, aggr, groupby) {
+  const Types = aggr.map((name) => arrayType(values2, name));
+  const numAggr = aggr.length;
+  const cellMap = {};
+  const getCell = (key) => {
+    let cell2 = cellMap[key];
+    if (!cell2) {
+      cell2 = cellMap[key] = {};
+      groupby.forEach((name, i) => cell2[name] = key[i]);
+      aggr.forEach((name, i) => cell2[name] = new Types[i](size));
+    }
+    return cell2;
+  };
+  if (isArrowTable(values2)) {
+    const numRows = values2.numRows;
+    if (numRows === 0)
+      return [];
+    const index2 = values2.getChild("index").toArray();
+    const value = aggr.map((name) => values2.getChild(name).toArray());
+    const groups2 = groupby.map((name) => values2.getChild(name));
+    for (let row = 0; row < numRows; ++row) {
+      const key = groups2.map((vec2) => vec2.get(row));
+      const cell2 = getCell(key);
+      for (let i = 0; i < numAggr; ++i) {
+        cell2[aggr[i]][index2[row]] = value[i][row];
+      }
+    }
+  } else {
+    for (const row of values2) {
+      const key = groupby.map((col) => row[col]);
+      const cell2 = getCell(key);
+      for (let i = 0; i < numAggr; ++i) {
+        cell2[aggr[i]][row.index] = row[aggr[i]];
+      }
+    }
+  }
+  return Object.values(cellMap);
+}
+function gridDomainContinuous(grids, prop) {
+  let lo = 0, hi = 0;
+  grids.forEach((cell2) => {
+    const grid = cell2[prop];
+    const n = grid.length;
+    for (let i = 0; i < n; ++i) {
+      const v2 = grid[i];
+      if (v2 < lo)
+        lo = v2;
+      if (v2 > hi)
+        hi = v2;
+    }
+  });
+  return lo === 0 && hi === 0 ? [0, 1] : [lo, hi];
+}
+function gridDomainDiscrete(grids, prop) {
+  const values2 = new InternSet();
+  grids.forEach((cell2) => {
+    const grid = cell2[prop];
+    const n = grid.length;
+    for (let i = 0; i < n; ++i) {
+      values2.add(grid[i]);
+    }
+  });
+  return Array.from(values2).sort(ascending);
+}
+
 // src/marks/util/handle-param.js
 function handleParam(client, key, param, update2) {
   if (isParam(param)) {
@@ -40415,64 +40632,17 @@ function dericheInitZeroPad(dest, src, N, stride, b, p, a2, q, sum5, h) {
   return;
 }
 
-// src/marks/util/grid.js
-function grid1d(n, values2) {
-  return valuesToGrid(new Float64Array(n), values2);
-}
-function grid2d(m, n, values2, groupby = []) {
-  return groupby.length ? Object.values(groupedValuesToGrids(m * n, values2, groupby)) : [{ grid: valuesToGrid(new Float64Array(m * n), values2) }];
-}
-function valuesToGrid(grid, values2) {
-  if (isArrowTable(values2)) {
-    const numRows = values2.numRows;
-    if (numRows === 0)
-      return grid;
-    const index2 = values2.getChild("index").toArray();
-    const value = values2.getChild("value").toArray();
-    for (let row = 0; row < numRows; ++row) {
-      grid[index2[row]] = value[row];
-    }
-  } else {
-    for (const row of values2) {
-      grid[row.index] = row.value;
-    }
-  }
-  return grid;
-}
-function groupedValuesToGrids(size, values2, groupby) {
-  const grids = {};
-  const getGrid = (key) => {
-    const cell2 = grids[key] || (grids[key] = { key, grid: new Float64Array(size) });
-    return cell2.grid;
-  };
-  if (isArrowTable(values2)) {
-    const numRows = values2.numRows;
-    if (numRows === 0)
-      return grids;
-    const index2 = values2.getChild("index").toArray();
-    const value = values2.getChild("value").toArray();
-    const groups2 = groupby.map((name) => values2.getChild(name));
-    for (let row = 0; row < numRows; ++row) {
-      const key = groups2.map((vec2) => vec2.get(row));
-      getGrid(key)[index2[row]] = value[row];
-    }
-  } else {
-    for (const row of values2) {
-      const key = groupby.map((col) => row[col]);
-      getGrid(key)[row.index] = row.value;
-    }
-  }
-  return grids;
-}
-
 // src/marks/Grid2DMark.js
+var DENSITY = "density";
 var Grid2DMark = class extends Mark2 {
   constructor(type2, source, options) {
     const {
-      bandwidth = 20,
-      binType = "linear",
-      binWidth = 2,
-      binPad = 1,
+      bandwidth = 0,
+      interpolate = "none",
+      pixelSize = 1,
+      pad: pad3 = 1,
+      width,
+      height,
       ...channels
     } = options;
     const densityMap = createDensityMap(channels);
@@ -40481,9 +40651,11 @@ var Grid2DMark = class extends Mark2 {
     handleParam(this, "bandwidth", bandwidth, () => {
       return this.grids ? this.convolve().update() : null;
     });
-    handleParam(this, "binWidth", binWidth);
-    handleParam(this, "binType", binType);
-    handleParam(this, "binPad", binPad);
+    handleParam(this, "pixelSize", pixelSize);
+    handleParam(this, "interpolate", interpolate);
+    handleParam(this, "pad", pad3);
+    handleParam(this, "width", width);
+    handleParam(this, "height", height);
   }
   setPlot(plot2, index2) {
     const update2 = () => {
@@ -40500,64 +40672,80 @@ var Grid2DMark = class extends Mark2 {
     return xdom && ydom && !xdom[Transient] && !ydom[Transient];
   }
   query(filter3 = []) {
-    const { plot: plot2, binType, binPad, channels, densityMap, source } = this;
+    const { interpolate, pad: pad3, channels, densityMap, source } = this;
     const [x06, x12] = this.extentX = extentX(this, filter3);
     const [y06, y12] = this.extentY = extentY(this, filter3);
     const [nx, ny] = this.bins = this.binDimensions(this);
-    const bx = binField(this, "x");
-    const by = binField(this, "y");
-    const rx = !!plot2.getAttribute("xReverse");
-    const ry = !!plot2.getAttribute("yReverse");
-    const x3 = bin1d2(bx, x06, x12, nx, rx, this.binPad);
-    const y3 = bin1d2(by, y06, y12, ny, ry, this.binPad);
-    const bounds = binPad ? [isBetween(bx, [x06, x12]), isBetween(by, [y06, y12])] : [lte(x06, bx), lt(bx, x12), lte(y06, by), lt(by, y12)];
+    const [x3, bx] = binExpr(this, "x", nx, [x06, x12], pad3);
+    const [y3, by] = binExpr(this, "y", ny, [y06, y12], pad3);
+    const bounds = pad3 ? [isBetween(bx, [+x06, +x12]), isBetween(by, [+y06, +y12])] : [lte(+x06, bx), lt(bx, +x12), lte(+y06, by), lt(by, +y12)];
     const q = Query.from(source.table).where(filter3.concat(bounds));
     const groupby = this.groupby = [];
-    let agg2 = count();
+    const aggrMap = {};
     for (const c4 of channels) {
       if (Object.hasOwn(c4, "field")) {
         const { as, channel, field: field2 } = c4;
         if (field2.aggregate) {
-          agg2 = field2;
+          aggrMap[channel] = field2;
           densityMap[channel] = true;
         } else if (channel === "weight") {
-          agg2 = sum2(field2);
+          aggrMap[DENSITY] = sum2(field2);
         } else if (channel !== "x" && channel !== "y") {
           q.select({ [as]: field2 });
           groupby.push(as);
         }
       }
     }
-    return binType === "linear" ? binLinear2d(q, x3, y3, agg2, nx, groupby) : bin2d(q, x3, y3, agg2, nx, groupby);
+    const aggr = this.aggr = Object.keys(aggrMap);
+    if (aggrMap.density && aggr.length > 1) {
+      throw new Error("Weight option can not be used with custom aggregates.");
+    }
+    if (!aggr.length) {
+      aggr.push(DENSITY);
+      aggrMap.density = count();
+    }
+    if (interpolate === "linear") {
+      if (aggr.length > 1) {
+        throw new Error("Linear binning not applicable to multiple aggregates.");
+      }
+      if (!aggrMap.density) {
+        throw new Error("Linear binning not applicable to custom aggregates.");
+      }
+      return binLinear2d(q, x3, y3, aggrMap[DENSITY], nx, groupby);
+    } else {
+      return bin2d(q, x3, y3, aggrMap, nx, groupby);
+    }
   }
   binDimensions() {
-    const { plot: plot2, binWidth } = this;
+    const { plot: plot2, pixelSize, width, height } = this;
     return [
-      Math.round(plot2.innerWidth() / binWidth),
-      Math.round(plot2.innerHeight() / binWidth)
+      width ?? Math.round(plot2.innerWidth() / pixelSize),
+      height ?? Math.round(plot2.innerHeight() / pixelSize)
     ];
   }
   queryResult(data) {
     const [nx, ny] = this.bins;
-    this.grids = grid2d(nx, ny, data, this.groupby);
+    this.grids = grid2d(nx, ny, data, this.aggr, this.groupby);
     return this.convolve();
   }
   convolve() {
-    const { bandwidth, bins: bins2, grids, plot: plot2 } = this;
-    if (bandwidth <= 0) {
-      this.kde = this.grids.map(({ key, grid }) => {
-        return grid.key = key, grid;
-      });
-    } else {
+    const { aggr, bandwidth, bins: bins2, grids, plot: plot2 } = this;
+    this.kde = this.grids;
+    if (bandwidth > 0) {
+      const gridProp = aggr.length === 1 ? aggr[0] : aggr.includes(DENSITY) ? DENSITY : null;
+      if (!gridProp) {
+        console.warn("No compatible grid found for smoothing.");
+        return this;
+      }
       const w = plot2.innerWidth();
       const h = plot2.innerHeight();
       const [nx, ny] = bins2;
-      const neg = grids.some(({ grid }) => grid.some((v2) => v2 < 0));
+      const neg = grids.some((cell2) => cell2[gridProp].some((v2) => v2 < 0));
       const configX = dericheConfig(bandwidth * (nx - 1) / w, neg);
       const configY = dericheConfig(bandwidth * (ny - 1) / h, neg);
-      this.kde = this.grids.map(({ key, grid }) => {
-        const k2 = dericheConv2d(configX, configY, grid, bins2);
-        return k2.key = key, k2;
+      this.kde = this.grids.map((grid) => {
+        const density2 = dericheConv2d(configX, configY, grid[gridProp], bins2);
+        return { ...grid, [gridProp]: density2 };
       });
     }
     return this;
@@ -40576,19 +40764,14 @@ function createDensityMap(channels) {
   }
   return densityMap;
 }
-function bin1d2(x3, x06, x12, n, reverse3, pad3) {
-  const d = (n - pad3) / (x12 - x06);
-  const f = d !== 1 ? ` * ${d}::DOUBLE` : "";
-  return reverse3 ? sql`(${x12} - ${x3}::DOUBLE)${f}` : sql`(${x3}::DOUBLE - ${x06})${f}`;
-}
-function bin2d(q, xp, yp, value, xn, groupby) {
+function bin2d(q, xp, yp, aggs, xn, groupby) {
   return q.select({
     index: sql`FLOOR(${xp})::INTEGER + FLOOR(${yp})::INTEGER * ${xn}`,
-    value
+    ...aggs
   }).groupby("index", groupby);
 }
-function binLinear2d(q, xp, yp, value, xn, groupby) {
-  const w = value.column ? `* ${value.column}` : "";
+function binLinear2d(q, xp, yp, density2, xn, groupby) {
+  const w = density2?.column ? `* ${density2.column}` : "";
   const subq = (i, w2) => q.clone().select({ xp, yp, i, w: w2 });
   const a2 = subq(
     sql`FLOOR(xp)::INTEGER + FLOOR(yp)::INTEGER * ${xn}`,
@@ -40606,14 +40789,19 @@ function binLinear2d(q, xp, yp, value, xn, groupby) {
     sql`FLOOR(xp)::INTEGER + 1 + (FLOOR(yp)::INTEGER + 1) * ${xn}`,
     sql`(xp - FLOOR(xp)::INTEGER) * (yp - FLOOR(yp)::INTEGER)${w}`
   );
-  return Query.from(Query.unionAll(a2, b, c4, d)).select({ index: "i", value: sum2("w") }, groupby).groupby("index", groupby).having(gt("value", 0));
+  return Query.from(Query.unionAll(a2, b, c4, d)).select({ index: "i", density: sum2("w") }, groupby).groupby("index", groupby).having(neq("density", 0));
 }
 
 // src/marks/ContourMark.js
 var ContourMark = class extends Grid2DMark {
   constructor(source, options) {
     const { thresholds = 10, ...channels } = options;
-    super("geo", source, channels);
+    super("geo", source, {
+      bandwidth: 20,
+      interpolate: "linear",
+      pixelSize: 2,
+      ...channels
+    });
     handleParam(this, "thresholds", thresholds, () => {
       return this.grids ? this.contours().update() : null;
     });
@@ -40622,11 +40810,11 @@ var ContourMark = class extends Grid2DMark {
     return super.convolve().contours();
   }
   contours() {
-    const { bins: bins2, densityMap, kde, thresholds, groupby, plot: plot2 } = this;
+    const { bins: bins2, densityMap, kde, thresholds, plot: plot2 } = this;
     let tz = thresholds;
     if (!Array.isArray(tz)) {
-      const scale3 = max2(kde.map((k2) => max2(k2)));
-      tz = Array.from({ length: tz - 1 }, (_, i) => scale3 * (i + 1) / tz);
+      const [, hi] = gridDomainContinuous(kde, "density");
+      tz = Array.from({ length: tz - 1 }, (_, i) => hi * (i + 1) / tz);
     }
     if (densityMap.fill || densityMap.stroke) {
       if (this.plot.getAttribute("colorScale") !== "log") {
@@ -40643,11 +40831,11 @@ var ContourMark = class extends Grid2DMark {
     const x3 = (v2) => xo + v2 * sx;
     const y3 = (v2) => yo + v2 * sy;
     const contour2 = contours_default().size(bins2);
-    this.data = kde.flatMap((k2) => tz.map((t) => {
-      const c4 = transform2(contour2.contour(k2, t), x3, y3);
-      groupby.forEach((name, i) => c4[name] = k2.key[i]);
-      c4.density = t;
-      return c4;
+    this.data = kde.flatMap((cell2) => tz.map((t) => {
+      return Object.assign(
+        transform2(contour2.contour(cell2.density, t), x3, y3),
+        { ...cell2, density: t }
+      );
     }));
     return this;
   }
@@ -40683,23 +40871,95 @@ function transform2(geometry, x3, y3) {
 }
 
 // src/marks/util/raster.js
-function raster2(grid, data, w, h, scale3, scheme28) {
-  const n = (scheme28.length >> 2) - 1;
-  for (let j = 0, k2 = 0; j < h; ++j) {
-    for (let i = 0, row = (h - j - 1) * w; i < w; ++i, k2 += 4) {
-      const c4 = n * scale3(grid[i + row]) << 2;
-      data[k2 + 0] = scheme28[c4 + 0];
-      data[k2 + 1] = scheme28[c4 + 1];
-      data[k2 + 2] = scheme28[c4 + 2];
-      data[k2 + 3] = scheme28[c4 + 3];
-    }
+function createCanvas(w, h) {
+  if (typeof document !== "undefined") {
+    const c4 = document.createElement("canvas");
+    c4.setAttribute("width", w);
+    c4.setAttribute("height", h);
+    return c4;
   }
+  throw new Error("Can not create a canvas instance.");
+}
+function alphaConstant(v2 = 1) {
+  const a2 = 255 * v2 | 0;
+  return (data, w, h) => {
+    for (let j = 0, k2 = 0; j < h; ++j) {
+      for (let i = 0; i < w; ++i, k2 += 4) {
+        data[k2 + 3] = a2;
+      }
+    }
+  };
+}
+function alphaScheme(scale3) {
+  const { apply: apply2 } = scale3;
+  return (data, w, h, grid) => {
+    for (let j = 0, k2 = 0; j < h; ++j) {
+      for (let i = 0, row = (h - j - 1) * w; i < w; ++i, k2 += 4) {
+        data[k2 + 3] = 255 * apply2(grid[i + row]) | 0;
+      }
+    }
+  };
+}
+function colorConstant(v2 = {}) {
+  const { r = 0, g = 0, b = 0, opacity: opacity2 = 1 } = typeof v2 === "string" ? rgb(v2) : v2;
+  const c4 = new Uint8ClampedArray([r, g, b, 255 * opacity2 | 0]);
+  return (data, w, h) => {
+    for (let j = 0, k2 = 0; j < h; ++j) {
+      for (let i = 0; i < w; ++i, k2 += 4) {
+        data[k2 + 0] = c4[0];
+        data[k2 + 1] = c4[1];
+        data[k2 + 2] = c4[2];
+        data[k2 + 3] = c4[3];
+      }
+    }
+  };
 }
-function palette(size, interp) {
+function colorCategory(scale3) {
+  const { domain, range: range3 } = scale3;
+  const idx = /* @__PURE__ */ Object.create(null);
+  const p = new Uint8ClampedArray(4 * domain.length);
+  const n = domain.length - 1;
+  const m = range3.length;
+  for (let i = 0; i <= n; ++i) {
+    const v2 = range3[i % m];
+    const { r, g, b, opacity: opacity2 = 1 } = typeof v2 === "string" ? rgb(v2) : v2;
+    const k2 = i << 2;
+    p[k2 + 0] = r;
+    p[k2 + 1] = g;
+    p[k2 + 2] = b;
+    p[k2 + 3] = 255 * opacity2 | 0;
+    idx[domain[i]] = k2;
+  }
+  return (data, w, h, grid) => {
+    if (grid.map) {
+      for (let j = 0, k2 = 0; j < h; ++j) {
+        for (let i = 0, row = (h - j - 1) * w; i < w; ++i, k2 += 4) {
+          const c4 = idx[grid[i + row]];
+          data[k2 + 0] = p[c4 + 0];
+          data[k2 + 1] = p[c4 + 1];
+          data[k2 + 2] = p[c4 + 2];
+          data[k2 + 3] = p[c4 + 3];
+        }
+      }
+    } else {
+      const c4 = idx[grid];
+      for (let j = 0, k2 = 0; j < h; ++j) {
+        for (let i = 0; i < w; ++i, k2 += 4) {
+          data[k2 + 0] = p[c4 + 0];
+          data[k2 + 1] = p[c4 + 1];
+          data[k2 + 2] = p[c4 + 2];
+          data[k2 + 3] = p[c4 + 3];
+        }
+      }
+    }
+  };
+}
+function colorScheme(size, scale3, frac) {
+  const { interpolate } = scale3;
   const p = new Uint8ClampedArray(4 * size);
   const n = size - 1;
   for (let i = 0; i <= n; ++i) {
-    const v2 = interp(i / n);
+    const v2 = interpolate(i / n);
     const { r, g, b, opacity: opacity2 = 1 } = typeof v2 === "string" ? rgb(v2) : v2;
     const k2 = i << 2;
     p[k2 + 0] = r;
@@ -40707,20 +40967,17 @@ function palette(size, interp) {
     p[k2 + 2] = b;
     p[k2 + 3] = 255 * opacity2 | 0;
   }
-  return p;
-}
-function createCanvas(w, h) {
-  if (typeof document !== "undefined") {
-    const c4 = document.createElement("canvas");
-    c4.setAttribute("width", w);
-    c4.setAttribute("height", h);
-    return c4;
-  }
-  throw new Error("Can not create a canvas instance.");
-}
-function opacityMap(color3 = "black") {
-  const { r, g, b } = rgb(color3);
-  return (opacity2) => ({ r, g, b, opacity: opacity2 });
+  return (data, w, h, grid) => {
+    for (let j = 0, k2 = 0; j < h; ++j) {
+      for (let i = 0, row = (h - j - 1) * w; i < w; ++i, k2 += 4) {
+        const c4 = n * frac(grid[i + row]) << 2;
+        data[k2 + 0] = p[c4 + 0];
+        data[k2 + 1] = p[c4 + 1];
+        data[k2 + 2] = p[c4 + 2];
+        data[k2 + 3] = p[c4 + 3];
+      }
+    }
+  };
 }
 
 // src/marks/RasterMark.js
@@ -40740,15 +40997,13 @@ var RasterMark = class extends Grid2DMark {
     return super.convolve().rasterize();
   }
   rasterize() {
-    const { bins: bins2, kde, groupby } = this;
+    const { bins: bins2, kde } = this;
     const [w, h] = bins2;
     const { canvas, ctx, img } = imageData(this, w, h);
-    const s2 = imageScale(this);
-    const idx = groupby.indexOf(this.channelField("fill")?.as);
-    const domain = idx < 0 ? [] : kde.map(({ key }) => key[idx]);
-    this.data = kde.map((grid) => {
-      const palette2 = imagePalette(this, domain, grid.key?.[idx]);
-      raster2(grid, img.data, w, h, s2, palette2);
+    const { alpha, alphaProp, color: color3, colorProp } = rasterEncoding(this);
+    this.data = kde.map((cell2) => {
+      color3?.(img.data, w, h, cell2[colorProp]);
+      alpha?.(img.data, w, h, cell2[alphaProp]);
       ctx.putImageData(img, 0, 0);
       return { src: canvas.toDataURL() };
     });
@@ -40767,6 +41022,128 @@ var RasterMark = class extends Grid2DMark {
     return [{ type: type2, data, options }];
   }
 };
+var HeatmapMark = class extends RasterMark {
+  constructor(source, options) {
+    super(source, {
+      bandwidth: 20,
+      interpolate: "linear",
+      pixelSize: 2,
+      ...options
+    });
+  }
+};
+function rasterEncoding(mark) {
+  const { aggr, densityMap, groupby, plot: plot2 } = mark;
+  const hasDensity = aggr.includes(DENSITY);
+  const hasFillOpacity = aggr.includes("fillOpacity");
+  const fillEntry = mark.channel("fill");
+  const opacEntry = mark.channel("fillOpacity");
+  if (aggr.length > 2 || hasDensity && hasFillOpacity) {
+    throw new Error("Invalid raster encodings. Try dropping an aggregate?");
+  }
+  if (groupby.includes(opacEntry?.as)) {
+    throw new Error("Raster fillOpacity must be an aggregate or constant.");
+  }
+  const fill = densityMap.fill || aggr.includes("fill") ? "grid" : groupby.includes(fillEntry?.as) ? "group" : isColor2(fillEntry?.value) ? fillEntry.value : hasDensity && plot2.getAttribute("colorScheme") ? "grid" : void 0;
+  const opac = densityMap.fillOpacity || aggr.includes("fillOpacity") ? "grid" : typeof opacEntry?.value === "number" ? opacEntry.value : hasDensity && fill !== "grid" ? "grid" : void 0;
+  if (fill !== "grid" && opac !== "grid") {
+    throw new Error("Raster mark missing density values.");
+  }
+  const colorProp = fillEntry?.as ?? (fill === "grid" ? DENSITY : null);
+  const alphaProp = opacEntry?.as ?? (opac === "grid" ? DENSITY : null);
+  const color3 = fill !== "grid" && fill !== "group" ? colorConstant(fill) : colorScale(mark, colorProp);
+  const alpha = opac !== "grid" ? alphaConstant(opac) : alphaScale(mark, alphaProp);
+  return { alphaProp, colorProp, alpha, color: color3 };
+}
+function alphaScale(mark, prop) {
+  const { plot: plot2, kde: grids } = mark;
+  const domainAttr = plot2.getAttribute("opacityDomain");
+  const domainFixed = domainAttr === Fixed;
+  const domainTransient = domainAttr?.[Transient];
+  const domain = !domainFixed && !domainTransient && domainAttr || gridDomainContinuous(grids, prop);
+  if (domainFixed || domainTransient) {
+    if (domainTransient)
+      domain[Transient] = true;
+    plot2.setAttribute("colorDomain", domain);
+  }
+  const s2 = scale2({
+    opacity: {
+      type: plot2.getAttribute("opacityScale"),
+      domain,
+      clamp: plot2.getAttribute("opacityClamp"),
+      nice: plot2.getAttribute("opacityNice"),
+      reverse: plot2.getAttribute("opacityReverse"),
+      zero: plot2.getAttribute("opacityZero"),
+      base: plot2.getAttribute("opacityBase"),
+      exponent: plot2.getAttribute("opacityExponent"),
+      constant: plot2.getAttribute("opacityConstant")
+    }
+  });
+  return alphaScheme(s2);
+}
+function colorScale(mark, prop) {
+  const { plot: plot2, kde: grids } = mark;
+  const flat = !grids[0][prop]?.map;
+  const discrete = flat || Array.isArray(grids[0][prop]);
+  const domainAttr = plot2.getAttribute("colorDomain");
+  const domainFixed = domainAttr === Fixed;
+  const domainTransient = domainAttr?.[Transient];
+  const domain = !domainFixed && !domainTransient && domainAttr || (flat ? grids.map((cell2) => cell2[prop]).sort(ascending) : discrete ? gridDomainDiscrete(grids, prop) : gridDomainContinuous(grids, prop));
+  if (domainFixed || domainTransient) {
+    if (domainTransient)
+      domain[Transient] = true;
+    plot2.setAttribute("colorDomain", domain);
+  }
+  const s2 = scale2({
+    color: {
+      type: plot2.getAttribute("colorScale"),
+      domain,
+      range: plot2.getAttribute("colorRange"),
+      clamp: plot2.getAttribute("colorClamp"),
+      n: plot2.getAttribute("colorN"),
+      nice: plot2.getAttribute("colorNice"),
+      reverse: plot2.getAttribute("colorReverse"),
+      scheme: plot2.getAttribute("colorScheme"),
+      interpolate: plot2.getAttribute("colorInterpolate"),
+      pivot: plot2.getAttribute("colorPivot"),
+      symmetric: plot2.getAttribute("colorSymmetric"),
+      zero: plot2.getAttribute("colorZero"),
+      base: plot2.getAttribute("colorBase"),
+      exponent: plot2.getAttribute("colorExponent"),
+      constant: plot2.getAttribute("colorConstant")
+    }
+  });
+  if (discrete) {
+    return colorCategory(s2);
+  } else {
+    const frac = scale2({
+      x: {
+        type: inferScaleType2(s2.type),
+        domain: s2.domain,
+        reverse: s2.reverse,
+        range: [0, 1],
+        clamp: s2.clamp,
+        base: s2.base,
+        exponent: s2.exponent,
+        constant: s2.constant
+      }
+    });
+    return colorScheme(1024, s2, frac.apply);
+  }
+}
+function inferScaleType2(type2) {
+  if (type2.endsWith("symlog"))
+    return "symlog";
+  if (type2.endsWith("log"))
+    return "log";
+  if (type2.endsWith("pow"))
+    return "pow";
+  if (type2.endsWith("sqrt"))
+    return "sqrt";
+  if (type2 === "diverging")
+    return "linear";
+  return type2;
+}
 function imageData(mark, w, h) {
   if (!mark.image || mark.image.w !== w || mark.image.h !== h) {
     const canvas = createCanvas(w, h);
@@ -40776,71 +41153,21 @@ function imageData(mark, w, h) {
   }
   return mark.image;
 }
-function imageScale(mark) {
-  const { densityMap, kde, plot: plot2 } = mark;
-  let domain = densityMap.fill && plot2.getAttribute("colorDomain");
-  if (!domain) {
-    let lo = 0, hi = 0;
-    kde.forEach((grid) => {
-      for (const v2 of grid) {
-        if (v2 < lo)
-          lo = v2;
-        if (v2 > hi)
-          hi = v2;
-      }
-    });
-    domain = lo === 0 && hi === 0 ? [0, 1] : [lo, hi];
-  }
-  const type2 = plot2.getAttribute("colorScale");
-  return scale2({ x: { type: type2, domain, range: [0, 1] } }).apply;
-}
-function imagePalette(mark, domain, value, steps = 1024) {
-  const { densityMap, plot: plot2 } = mark;
-  const scheme28 = plot2.getAttribute("colorScheme");
-  const fill = mark.channel("fill");
-  let color3 = isColor2(fill?.value) ? fill.value : void 0;
-  if (densityMap.fill || scheme28 && !color3) {
-    if (scheme28) {
-      try {
-        return palette(
-          steps,
-          scale2({ color: { scheme: scheme28, domain: [0, 1] } }).interpolate
-        );
-      } catch (err) {
-        console.warn(err);
-      }
-    }
-  } else if (domain.length) {
-    const range3 = plot2.getAttribute("colorRange");
-    const spec = {
-      domain,
-      range: range3,
-      scheme: scheme28 || (range3 ? void 0 : "tableau10")
-    };
-    color3 = scale2({ color: spec }).apply(value);
-  }
-  return palette(steps, opacityMap(color3));
-}
 
 // src/marks/DenseLineMark.js
 var DenseLineMark = class extends RasterMark {
   constructor(source, options) {
     const { normalize: normalize4 = true, ...rest } = options;
-    super(source, { bandwidth: 0, ...rest });
+    super(source, rest);
     handleParam(this, "normalize", normalize4);
   }
   query(filter3 = []) {
-    const { plot: plot2, channels, normalize: normalize4, source } = this;
-    const [x06, x12] = extentX(this, filter3);
-    const [y06, y12] = extentY(this, filter3);
+    const { channels, normalize: normalize4, source, binPad } = this;
     const [nx, ny] = this.bins = this.binDimensions(this);
-    const bx = binField(this, "x");
-    const by = binField(this, "y");
-    const rx = !!plot2.getAttribute("xReverse");
-    const ry = !!plot2.getAttribute("yReverse");
-    const x3 = bin1d(bx, x06, x12, nx, rx, this.binPad);
-    const y3 = bin1d(by, y06, y12, ny, ry, this.binPad);
+    const [x3] = binExpr(this, "x", nx, extentX(this, filter3), binPad);
+    const [y3] = binExpr(this, "y", ny, extentY(this, filter3), binPad);
     const q = Query.from(source.table).where(stripXY(this, filter3));
+    this.aggr = ["density"];
     const groupby = this.groupby = [];
     const z = [];
     for (const c4 of channels) {
@@ -40887,7 +41214,7 @@ function lineDensity(q, x3, y3, z, xn, yn, groupby = [], normalize4 = true) {
   ));
   const num = Query.select({ x: sql`GREATEST(MAX(ABS(dx)), MAX(ABS(dy)))` }).from("pairs");
   const indices = Query.select({ i: sql`UNNEST(range((${num})))::INTEGER` });
-  const raster3 = Query.unionAll(
+  const raster2 = Query.unionAll(
     Query.select(groups2, {
       x: sql`x0 + i`,
       y: sql`y0 + ROUND(i * dy / dx::FLOAT)::INTEGER`
@@ -40904,10 +41231,10 @@ function lineDensity(q, x3, y3, z, xn, yn, groupby = [], normalize4 = true) {
     "x",
     "y",
     normalize4 ? { w: sql`1.0 / COUNT(*) OVER (PARTITION BY ${pointPart})` } : null
-  ).where(and(isBetween("x", [0, xn]), isBetween("y", [0, yn])));
-  return Query.with({ pairs: pairs2, indices, raster: raster3, points: points2 }).from("points").select(groupby, {
+  ).where(and(isBetween("x", [0, xn], true), isBetween("y", [0, yn], true)));
+  return Query.with({ pairs: pairs2, indices, raster: raster2, points: points2 }).from("points").select(groupby, {
     index: sql`x + y * ${xn}::INTEGER`,
-    value: normalize4 ? sum2("w") : count()
+    density: normalize4 ? sum2("w") : count()
   }).groupby("index", groupby);
 }
 
@@ -40932,13 +41259,11 @@ var Density1DMark = class extends Mark2 {
     if (this.hasOwnData())
       throw new Error("Density1DMark requires a data source");
     const { bins: bins2, channels, dim, source: { table } } = this;
-    const [lo, hi] = this.extent = (dim === "x" ? extentX : extentY)(this, filter3);
-    const bx = binField(this, dim);
-    return binLinear1d(
-      markQuery(channels, table, [dim]).where(filter3.concat(isBetween(bx, [lo, hi]))),
-      bin1d(bx, lo, hi, bins2),
-      this.channelField("weight") ? "weight" : null
-    );
+    const extent4 = this.extent = (dim === "x" ? extentX : extentY)(this, filter3);
+    const [x3, bx] = binExpr(this, dim, bins2, extent4);
+    const q = markQuery(channels, table, [dim]).where(filter3.concat(isBetween(bx, extent4)));
+    const v2 = this.channelField("weight") ? "weight" : null;
+    return binLinear1d(q, x3, v2);
   }
   queryResult(data) {
     this.grid = grid1d(this.bins, data);
@@ -40973,8 +41298,8 @@ var Density1DMark = class extends Mark2 {
     return [{ type: type2, data, options }];
   }
 };
-function binLinear1d(q, p, value) {
-  const w = value ? `* ${value}` : "";
+function binLinear1d(q, p, density2) {
+  const w = density2 ? `* ${density2}` : "";
   const u4 = q.clone().select({
     p,
     i: sql`FLOOR(p)::INTEGER`,
@@ -40985,37 +41310,45 @@ function binLinear1d(q, p, value) {
     i: sql`FLOOR(p)::INTEGER + 1`,
     w: sql`(p - FLOOR(p))${w}`
   });
-  return Query.from(Query.unionAll(u4, v2)).select({ index: "i", value: sum2("w") }).groupby("index").having(gt("value", 0));
+  return Query.from(Query.unionAll(u4, v2)).select({ index: "i", density: sum2("w") }).groupby("index").having(gt("density", 0));
 }
 
 // src/marks/Density2DMark.js
 var Density2DMark = class extends Grid2DMark {
   constructor(source, options) {
-    const { type: type2 = "dot", binsX, binsY, ...channels } = options;
-    channels.binPad = channels.binPad ?? 0;
-    super(type2, source, channels);
-    handleParam(this, "binsX", binsX);
-    handleParam(this, "binsY", binsY);
+    const { type: type2 = "dot", ...channels } = options;
+    super(type2, source, {
+      bandwidth: 20,
+      interpolate: "linear",
+      pad: 0,
+      pixelSize: 2,
+      ...channels
+    });
   }
   convolve() {
     super.convolve();
-    const { bins: bins2, binPad, extentX: extentX2, extentY: extentY2 } = this;
+    const { bins: bins2, pad: pad3, extentX: extentX2, extentY: extentY2 } = this;
     const [nx, ny] = bins2;
-    const [x06, x12] = extentX2;
-    const [y06, y12] = extentY2;
-    const deltaX = (x12 - x06) / (nx - binPad);
-    const deltaY = (y12 - y06) / (ny - binPad);
-    const offset2 = binPad ? 0 : 0.5;
-    this.data = points(this.kde, bins2, x06, y06, deltaX, deltaY, offset2);
+    const scaleX = channelScale(this, "x");
+    const scaleY = channelScale(this, "y");
+    const [x06, x12] = extentX2.map((v2) => scaleX.apply(v2));
+    const [y06, y12] = extentY2.map((v2) => scaleY.apply(v2));
+    const deltaX = (x12 - x06) / (nx - pad3);
+    const deltaY = (y12 - y06) / (ny - pad3);
+    const offset2 = pad3 ? 0 : 0.5;
+    this.data = points(
+      this.kde,
+      bins2,
+      x06,
+      y06,
+      deltaX,
+      deltaY,
+      scaleX.invert,
+      scaleY.invert,
+      offset2
+    );
     return this;
   }
-  binDimensions() {
-    const { plot: plot2, binWidth, binsX, binsY } = this;
-    return [
-      binsX ?? Math.round(plot2.innerWidth() / binWidth),
-      binsY ?? Math.round(plot2.innerHeight() / binWidth)
-    ];
-  }
   plotSpecs() {
     const { type: type2, channels, densityMap, data } = this;
     const options = {};
@@ -41031,16 +41364,18 @@ var Density2DMark = class extends Grid2DMark {
     return [{ type: type2, data, options }];
   }
 };
-function points(kde, bins2, x06, y06, deltaX, deltaY, offset2) {
+function points(kde, bins2, x06, y06, deltaX, deltaY, invertX, invertY, offset2) {
   const scale3 = 1 / (deltaX * deltaY);
   const [nx, ny] = bins2;
   const data = [];
-  for (const grid of kde) {
+  for (const cell2 of kde) {
+    const grid = cell2.density;
     for (let k2 = 0, j = 0; j < ny; ++j) {
       for (let i = 0; i < nx; ++i, ++k2) {
         data.push({
-          x: x06 + (i + offset2) * deltaX,
-          y: y06 + (j + offset2) * deltaY,
+          ...cell2,
+          x: invertX(x06 + (i + offset2) * deltaX),
+          y: invertY(y06 + (j + offset2) * deltaY),
           density: grid[k2] * scale3
         });
       }
@@ -41158,34 +41493,48 @@ var RasterTileMark = class extends Grid2DMark {
     return null;
   }
   tileQuery(extent4) {
-    const { plot: plot2, binType, binPad, channels, densityMap, source } = this;
+    const { binType, binPad, channels, densityMap, source } = this;
     const [[x06, x12], [y06, y12]] = extent4;
     const [nx, ny] = this.bins;
-    const bx = binField(this, "x");
-    const by = binField(this, "y");
-    const rx = !!plot2.getAttribute("xReverse");
-    const ry = !!plot2.getAttribute("yReverse");
-    const x3 = bin1d3(bx, x06, x12, nx, rx, binPad);
-    const y3 = bin1d3(by, y06, y12, ny, ry, binPad);
-    const bounds = binPad ? [isBetween(bx, [x06, x12]), isBetween(by, [y06, y12])] : [lte(x06, bx), lt(bx, x12), lte(y06, by), lt(by, y12)];
+    const [x3, bx] = binExpr(this, "x", nx, [x06, x12], binPad);
+    const [y3, by] = binExpr(this, "y", ny, [y06, y12], binPad);
+    const bounds = binPad ? [isBetween(bx, [+x06, +x12]), isBetween(by, [+y06, +y12])] : [lte(+x06, bx), lt(bx, +x12), lte(+y06, by), lt(by, +y12)];
     const q = Query.from(source.table).where(bounds);
     const groupby = this.groupby = [];
-    let agg2 = count();
+    const aggrMap = {};
     for (const c4 of channels) {
       if (Object.hasOwn(c4, "field")) {
-        const { channel, field: field2 } = c4;
+        const { as, channel, field: field2 } = c4;
         if (field2.aggregate) {
-          agg2 = field2;
+          aggrMap[channel] = field2;
           densityMap[channel] = true;
         } else if (channel === "weight") {
-          agg2 = sum2(field2);
+          aggrMap.density = sum2(field2);
         } else if (channel !== "x" && channel !== "y") {
-          q.select({ [channel]: field2 });
-          groupby.push(channel);
+          q.select({ [as]: field2 });
+          groupby.push(as);
         }
       }
     }
-    return binType === "linear" ? binLinear2d2(q, x3, y3, agg2, nx, groupby) : bin2d2(q, x3, y3, agg2, nx, groupby);
+    const aggr = this.aggr = Object.keys(aggrMap);
+    if (aggrMap.density && aggr.length > 1) {
+      throw new Error("Weight option can not be used with custom aggregates.");
+    }
+    if (!aggr.length) {
+      aggr.push("density");
+      aggrMap.density = count();
+    }
+    if (binType === "linear") {
+      if (aggr.length > 1) {
+        throw new Error("Linear binning not applicable to multiple aggregates.");
+      }
+      if (!aggrMap.density) {
+        throw new Error("Linear binning not applicable to custom aggregates.");
+      }
+      return binLinear2d2(q, x3, y3, aggrMap.density, nx, groupby);
+    } else {
+      return bin2d2(q, x3, y3, aggrMap, nx, groupby);
+    }
   }
   async requestTiles() {
     const mc = coordinator();
@@ -41235,22 +41584,20 @@ var RasterTileMark = class extends Grid2DMark {
       ([i, j]) => mc.prefetch(this.tileQuery(tileExtent(i, j)))
     );
     const tiles = await Promise.all(queries);
-    this.grids = [{ grid: processTiles(m, n, xx, yy, coords, tiles) }];
+    this.grids = [{ density: processTiles(m, n, xx, yy, coords, tiles) }];
     this.convolve().update();
   }
   convolve() {
     return super.convolve().rasterize();
   }
   rasterize() {
-    const { bins: bins2, kde, groupby } = this;
+    const { bins: bins2, kde } = this;
     const [w, h] = bins2;
     const { canvas, ctx, img } = imageData2(this, w, h);
-    const s2 = imageScale2(this);
-    const idx = groupby.indexOf(this.channelField("fill")?.as);
-    const domain = idx < 0 ? [] : kde.map(({ key }) => key[idx]);
-    this.data = kde.map((grid) => {
-      const palette2 = imagePalette2(this, domain, grid.key?.[idx]);
-      raster2(grid, img.data, w, h, s2, palette2);
+    const { alpha, alphaProp, color: color3, colorProp } = rasterEncoding(this);
+    this.data = kde.map((cell2) => {
+      color3?.(img.data, w, h, cell2[colorProp]);
+      alpha?.(img.data, w, h, cell2[alphaProp]);
       ctx.putImageData(img, 0, 0);
       return { src: canvas.toDataURL() };
     });
@@ -41284,7 +41631,7 @@ function copy3(m, n, grid, values2, tx, ty) {
   if (num === 0)
     return;
   const index2 = values2.getChild("index").toArray();
-  const value = values2.getChild("value").toArray();
+  const value = values2.getChild("density").toArray();
   for (let row = 0; row < num; ++row) {
     const idx = index2[row];
     const i = tx + idx % m;
@@ -41303,60 +41650,10 @@ function imageData2(mark, w, h) {
   }
   return mark.image;
 }
-function imageScale2(mark) {
-  const { densityMap, kde, plot: plot2 } = mark;
-  let domain = densityMap.fill && plot2.getAttribute("colorDomain");
-  if (!domain) {
-    let lo = 0, hi = 0;
-    kde.forEach((grid) => {
-      for (const v2 of grid) {
-        if (v2 < lo)
-          lo = v2;
-        if (v2 > hi)
-          hi = v2;
-      }
-    });
-    domain = lo === 0 && hi === 0 ? [0, 1] : [lo, hi];
-  }
-  const type2 = plot2.getAttribute("colorScale");
-  return scale2({ x: { type: type2, domain, range: [0, 1] } }).apply;
-}
-function imagePalette2(mark, domain, value, steps = 1024) {
-  const { densityMap, plot: plot2 } = mark;
-  const scheme28 = plot2.getAttribute("colorScheme");
-  const fill = mark.channel("fill");
-  let color3 = isColor2(fill?.value) ? fill.value : void 0;
-  if (densityMap.fill || scheme28 && !color3) {
-    if (scheme28) {
-      try {
-        return palette(
-          steps,
-          scale2({ color: { scheme: scheme28, domain: [0, 1] } }).interpolate
-        );
-      } catch (err) {
-        console.warn(err);
-      }
-    }
-  } else if (domain.length) {
-    const range3 = plot2.getAttribute("colorRange");
-    const spec = {
-      domain,
-      range: range3,
-      scheme: scheme28 || (range3 ? void 0 : "tableau10")
-    };
-    color3 = scale2({ color: spec }).apply(value);
-  }
-  return palette(steps, opacityMap(color3));
-}
-function bin1d3(x3, x06, x12, n, reverse3, pad3) {
-  const d = (n - pad3) / (x12 - x06);
-  const f = d !== 1 ? ` * ${d}::DOUBLE` : "";
-  return reverse3 ? sql`(${x12} - ${x3}::DOUBLE)${f}` : sql`(${x3}::DOUBLE - ${x06})${f}`;
-}
-function bin2d2(q, xp, yp, value, xn, groupby) {
+function bin2d2(q, xp, yp, aggs, xn, groupby) {
   return q.select({
     index: sql`FLOOR(${xp})::INTEGER + FLOOR(${yp})::INTEGER * ${xn}`,
-    value
+    ...aggs
   }).groupby("index", groupby);
 }
 function binLinear2d2(q, xp, yp, value, xn, groupby) {
@@ -41378,7 +41675,7 @@ function binLinear2d2(q, xp, yp, value, xn, groupby) {
     sql`FLOOR(xp)::INTEGER + 1 + (FLOOR(yp)::INTEGER + 1) * ${xn}`,
     sql`(xp - FLOOR(xp)::INTEGER) * (yp - FLOOR(yp)::INTEGER)${w}`
   );
-  return Query.from(Query.unionAll(a2, b, c4, d)).select({ index: "i", value: sum2("w") }, groupby).groupby("index", groupby).having(neq("value", 0));
+  return Query.from(Query.unionAll(a2, b, c4, d)).select({ index: "i", density: sum2("w") }, groupby).groupby("index", groupby).having(neq("density", 0));
 }
 function tileFloor(value) {
   const floored = Math.floor(value);
@@ -42209,28 +42506,24 @@ function findMark({ marks: marks2 }, channel) {
 }
 
 // src/transforms/bin.js
-var EXTENT = [
-  "rectY-x",
-  "rectX-y",
-  "rect-x",
-  "rect-y"
-];
-function hasExtent(channel, type2) {
-  return EXTENT.includes(`${type2}-${channel}`);
-}
+var EXTENT = /* @__PURE__ */ new Set(["rectY-x", "rectX-y", "rect-x", "rect-y"]);
 function bin2(field2, options = { steps: 25 }) {
   const fn = (mark, channel) => {
-    return hasExtent(channel, mark.type) ? {
-      [`${channel}1`]: binField2(mark, field2, options),
-      [`${channel}2`]: binField2(mark, field2, { ...options, offset: 1 })
-    } : {
-      [channel]: binField2(mark, field2, options)
-    };
+    if (EXTENT.has(`${mark.type}-${channel}`)) {
+      return {
+        [`${channel}1`]: binField(mark, channel, field2, options),
+        [`${channel}2`]: binField(mark, channel, field2, { ...options, offset: 1 })
+      };
+    } else {
+      return {
+        [channel]: binField(mark, channel, field2, options)
+      };
+    }
   };
   fn[Transform] = true;
   return fn;
 }
-function binField2(mark, column3, options) {
+function binField(mark, channel, column3, options) {
   return {
     column: column3,
     label: column3,
@@ -42244,13 +42537,15 @@ function binField2(mark, column3, options) {
       return column3;
     },
     toString() {
+      const { apply: apply2, sqlApply, sqlInvert } = channelScale(mark, channel);
       const { min: min5, max: max4 } = mark.stats[column3];
-      const b = bins(min5, max4, options);
-      const col = asColumn(column3);
+      const b = bins(apply2(min5), apply2(max4), options);
+      const col = sqlApply(column3);
       const base = b.min === 0 ? col : `(${col} - ${b.min})`;
       const alpha = `${(b.max - b.min) / b.steps}::DOUBLE`;
       const off = options.offset ? `${options.offset} + ` : "";
-      return `${b.min} + ${alpha} * (${off}FLOOR(${base} / ${alpha})::INTEGER)`;
+      const expr = `${b.min} + ${alpha} * (${off}FLOOR(${base} / ${alpha}))`;
+      return `${sqlInvert(expr)}`;
     }
   };
 }
@@ -42294,6 +42589,7 @@ export {
   Fixed,
   GeoMark,
   Grid2DMark,
+  HeatmapMark,
   HexbinMark,
   Highlight,
   Interval1D,