pass data to initializer

Author: mbostock

src/plot.js

@@ -75,9 +75,9 @@ export function plot(options = {}) {
       : mark.facet === "include" ? facetsIndex
       : mark.facet === "exclude" ? facetsExclude || (facetsExclude = facetsIndex.map(f => Uint32Array.from(difference(facetIndex, f))))
       : undefined;
-    const {facets, channels} = mark.initialize(markFacets, facetChannels);
+    const {data, facets, channels} = mark.initialize(markFacets, facetChannels);
     applyScaleTransforms(channels, options);
-    stateByMark.set(mark, {facets, channels});
+    stateByMark.set(mark, {data, facets, channels});
   }
 
   // Initalize the scales and axes.
@@ -94,7 +94,7 @@ export function plot(options = {}) {
   const newByScale = new Set();
   for (const [mark, state] of stateByMark) {
     if (mark.reinitialize != null) {
-      const {facets, channels} = mark.reinitialize(state.facets, state.channels, scales);
+      const {facets, channels} = mark.reinitialize(state.data, state.facets, state.channels, scales);
       if (facets !== undefined) state.facets = facets;
       if (channels !== undefined) {
         inferChannelScale(channels, mark);
@@ -278,7 +278,7 @@ export class Mark {
     if (this.transform != null) ({facets, data} = this.transform(data, facets)), data = arrayify(data);
     const channels = channelObject(this.channels, data);
     if (this.sort != null) channelSort(channels, facetChannels, data, this.sort);
-    return {facets, channels};
+    return {data, facets, channels};
   }
   filter(index, channels, values) {
     for (const name in channels) {

src/transforms/hexbin.js

@@ -1,6 +1,5 @@
 import {hexbin as Hexbin} from "d3-hexbin"; // TODO inline
 import {sqrt4_3} from "../symbols.js";
-import {basic} from "./basic.js";
 import {hasOutput, maybeOutputs} from "./group.js";
 
 export function hexbin(outputs = {fill: "count"}, options = {}) {
@@ -19,11 +18,8 @@ function hexbinn(outputs, {radius = 10, ...options}) {
     symbol: "hexagon",
     ...!hasOutput(outputs, "r") && {r: radius},
     ...hasOutput(outputs, "fill") && {stroke: "none"},
-    ...basic(options, (data, facets) => {
-      for (const o of outputs) o.initialize(data);
-      return {data, facets};
-    }),
-    initialize(facets, {x: X, y: Y}, {x, y}) {
+    ...options,
+    initialize(data, facets, {x: X, y: Y}, {x, y}) {
       if (X === undefined) throw new Error("missing channel: x");
       if (Y === undefined) throw new Error("missing channel: y");
       ({value: X} = X);
@@ -33,6 +29,7 @@ function hexbinn(outputs, {radius = 10, ...options}) {
       const BX = [];
       const BY = [];
       let i = 0;
+      for (const o of outputs) o.initialize(data);
       for (const facet of facets) {
         const binFacet = [];
         for (const o of outputs) o.scope("facet", facet);