@uwdata/mosaic-plot 0.12.1 → 0.13.0

package/dist/mosaic-plot.js

@@ -103,7 +103,7 @@ var require_search_bounds = __commonJS({
       }
       return -1;
     }
-    function norm(a2, y3, c4, l, h, f) {
+    function norm2(a2, y3, c4, l, h, f) {
       if (typeof c4 === "function") {
         return f(a2, y3, c4, l === void 0 ? 0 : l | 0, h === void 0 ? a2.length - 1 : h | 0);
       }
@@ -111,19 +111,19 @@ var require_search_bounds = __commonJS({
     }
     module.exports = {
       ge: function(a2, y3, c4, l, h) {
-        return norm(a2, y3, c4, l, h, ge);
+        return norm2(a2, y3, c4, l, h, ge);
       },
       gt: function(a2, y3, c4, l, h) {
-        return norm(a2, y3, c4, l, h, gt2);
+        return norm2(a2, y3, c4, l, h, gt2);
       },
       lt: function(a2, y3, c4, l, h) {
-        return norm(a2, y3, c4, l, h, lt2);
+        return norm2(a2, y3, c4, l, h, lt2);
       },
       le: function(a2, y3, c4, l, h) {
-        return norm(a2, y3, c4, l, h, le);
+        return norm2(a2, y3, c4, l, h, le);
       },
       eq: function(a2, y3, c4, l, h) {
-        return norm(a2, y3, c4, l, h, eq2);
+        return norm2(a2, y3, c4, l, h, eq2);
       }
     };
   }
@@ -489,168 +489,9 @@ var Fixed = Symbol("Fixed");
 var Transient = Symbol("Transient");
 var Transform = Symbol("Transform");
 
-// ../core/src/util/throttle.js
-var NIL = {};
-function throttle(callback, debounce = false) {
-  let curr;
-  let next;
-  let pending = NIL;
-  function invoke(event) {
-    curr = callback(event).catch(() => {
-    }).finally(() => {
-      if (next) {
-        const { value } = next;
-        next = null;
-        invoke(value);
-      } else {
-        curr = null;
-      }
-    });
-  }
-  function enqueue(event) {
-    next = { event };
-  }
-  function process(event) {
-    curr ? enqueue(event) : invoke(event);
-  }
-  function delay(event) {
-    if (pending !== event) {
-      requestAnimationFrame(() => {
-        const e = pending;
-        pending = NIL;
-        process(e);
-      });
-    }
-    pending = event;
-  }
-  return debounce ? delay : process;
-}
-
-// ../core/src/MosaicClient.js
-var MosaicClient = class {
-  /**
-   * Constructor.
-   * @param {*} filterSelection An optional selection to interactively filter
-   *  this client's data. If provided, a coordinator will re-query and update
-   *  the client when the selection updates.
-   */
-  constructor(filterSelection) {
-    this._filterBy = filterSelection;
-    this._requestUpdate = throttle(() => this.requestQuery(), true);
-    this._coordinator = null;
-  }
-  /**
-   * Return this client's connected coordinator.
-   */
-  get coordinator() {
-    return this._coordinator;
-  }
-  /**
-   * Set this client's connected coordinator.
-   */
-  set coordinator(coordinator2) {
-    this._coordinator = coordinator2;
-  }
-  /**
-   * Return this client's filter selection.
-   */
-  get filterBy() {
-    return this._filterBy;
-  }
-  /**
-   * Return a boolean indicating if the client query can be sped up with
-   * materialized views of pre-aggregated data. Should return true if changes to
-   * the filterBy selection does not change the groupby domain of the client
-   * query.
-   */
-  get filterStable() {
-    return true;
-  }
-  /**
-   * Return an array of fields queried by this client.
-   * @returns {object[]|null} The fields to retrieve info for.
-   */
-  fields() {
-    return null;
-  }
-  /**
-   * Called by the coordinator to set the field info for this client.
-   * @param {*} info The field info result.
-   * @returns {this}
-   */
-  fieldInfo(info) {
-    return this;
-  }
-  /**
-   * Return a query specifying the data needed by this client.
-   * @param {*} [filter] The filtering criteria to apply in the query.
-   * @returns {*} The client query
-   */
-  query(filter3) {
-    return null;
-  }
-  /**
-   * Called by the coordinator to inform the client that a query is pending.
-   * @returns {this}
-   */
-  queryPending() {
-    return this;
-  }
-  /**
-   * Called by the coordinator to return a query result.
-   * @param {*} data The query result.
-   * @returns {this}
-   */
-  queryResult(data) {
-    return this;
-  }
-  /**
-   * Called by the coordinator to report a query execution error.
-   * @param {*} error
-   * @returns {this}
-   */
-  queryError(error) {
-    return this;
-  }
-  /**
-   * Request the coordinator to execute a query for this client.
-   * If an explicit query is not provided, the client query method will
-   * be called, filtered by the current filterBy selection.
-   * @returns {Promise}
-   */
-  requestQuery(query) {
-    const q = query || this.query(this.filterBy?.predicate(this));
-    return this._coordinator.requestQuery(this, q);
-  }
-  /**
-   * Request that the coordinator perform a throttled update of this client
-   * using the default query. Unlike requestQuery, for which every call will
-   * result in an executed query, multiple calls to requestUpdate may be
-   * consolidated into a single update.
-   */
-  requestUpdate() {
-    this._requestUpdate();
-  }
-  /**
-   * Reset this client, initiating new field info and query requests.
-   * @returns {Promise}
-   */
-  initialize() {
-    return this._coordinator.initializeClient(this);
-  }
-  /**
-   * Requests a client update.
-   * For example to (re-)render an interface component.
-   *
-   * @returns {this | Promise<any>}
-   */
-  update() {
-    return this;
-  }
-};
-
 // ../../node_modules/@uwdata/flechette/src/constants.js
 var MAGIC = Uint8Array.of(65, 82, 82, 79, 87, 49);
+var EOS = Uint8Array.of(255, 255, 255, 255, 0, 0, 0, 0);
 var Version = (
   /** @type {const} */
   {
@@ -3065,7 +2906,7 @@ function literalToSQL(value) {
     case "number":
       return Number.isFinite(value) ? `${value}` : "NULL";
     case "string":
-      return `'${value.replace(`'`, `''`)}'`;
+      return `'${value.replaceAll(`'`, `''`)}'`;
     case "boolean":
       return value ? "TRUE" : "FALSE";
     default:
@@ -3456,6 +3297,9 @@ var ColumnNameRefNode = class extends ColumnRefNode {
 };
 
 // ../sql/src/ast/column-param.js
+function isColumnParam(value) {
+  return value instanceof ColumnParamNode;
+}
 var ColumnParamNode = class extends ColumnRefNode {
   /**
    * Instantiate a column param node.
@@ -4877,7 +4721,7 @@ function collectAggregates(root2) {
 function collectColumns(root2) {
   const cols = {};
   walk(root2, (node) => {
-    if (node.type === COLUMN_REF) {
+    if (node.type === COLUMN_REF || node.type === COLUMN_PARAM) {
       cols[node] = node;
     }
   });
@@ -4921,21 +4765,21 @@ function bin2d(q, xp, yp, aggs, xn, groupby) {
 }
 
 // ../sql/src/transforms/bin-linear-1d.js
-function binLinear1d(query, x3, weight) {
+function binLinear1d(query, x3, weight = void 0, groupby = []) {
   const w = weight ? (x4) => mul(x4, weight) : (x4) => x4;
   const p0 = floor(x3);
   const p1 = add(p0, 1);
   return Query.from(Query.unionAll(
     query.clone().select({ i: int322(p0), w: w(sub(p1, x3)) }),
     query.clone().select({ i: int322(p1), w: w(sub(x3, p0)) })
-  )).select({ index: "i", density: sum("w") }).groupby("index").having(neq("density", 0));
+  )).select({ index: "i", density: sum("w") }, groupby).groupby("index", groupby).having(neq("density", 0));
 }
 
 // ../sql/src/transforms/bin-linear-2d.js
 function identity(x3) {
   return x3;
 }
-function binLinear2d(q, xp, yp, weight, xn, groupby) {
+function binLinear2d(q, xp, yp, weight, xn, groupby = []) {
   const w = weight ? (x3) => mul(x3, weight) : identity;
   const subq = (i, w2) => q.clone().select({ xp, yp, i, w: w2 });
   const index2 = (x3, y3) => add(x3, mul(y3, xn));
@@ -5136,6 +4980,8 @@ function sufficientStatistics(node, preagg, avg2) {
       return sumExpr(preagg, node);
     case "avg":
       return avgExpr(preagg, node);
+    case "geomean":
+      return geomeanExpr(preagg, node);
     case "arg_max":
       return argmaxExpr(preagg, node);
     case "arg_min":
@@ -5219,6 +5065,12 @@ function avgExpr(preagg, node) {
   const { expr, name } = countExpr(preagg, node);
   return div(sum(mul(as, name)), expr);
 }
+function geomeanExpr(preagg, node) {
+  const x3 = node.args[0];
+  const expr = addStat(preagg, sum(ln(x3)), node);
+  const { expr: n } = countExpr(preagg, node);
+  return exp(div(sum(expr), n));
+}
 function argmaxExpr(preagg, node) {
   const expr = addStat(preagg, node);
   const maxy = addStat(preagg, max(node.args[1]), node);
@@ -5665,7 +5517,7 @@ var statMap = {
   [Min]: min,
   [Nulls]: (column3) => count().where(isNull(column3))
 };
-function summarize(table, column3, stats) {
+function summarize({ table, column: column3, stats }) {
   return Query.from(table).select(Array.from(stats, (s2) => ({ [s2]: statMap[s2](column3) })));
 }
 async function queryFieldInfo(mc, fields) {
@@ -5676,7 +5528,7 @@ async function queryFieldInfo(mc, fields) {
   }
 }
 async function getFieldInfo(mc, { table, column: column3, stats }) {
-  const q = Query.from({ source: table }).select({ column: column3 }).groupby(column3.aggregate ? sql`ALL` : []);
+  const q = Query.from({ source: table }).select({ column: column3 }).groupby(isNode(column3) && isAggregateExpression(column3) ? sql`ALL` : []);
   const [desc2] = Array.from(await mc.query(Query.describe(q)));
   const info = {
     table,
@@ -5685,16 +5537,16 @@ async function getFieldInfo(mc, { table, column: column3, stats }) {
     type: jsType(desc2.column_type),
     nullable: desc2.null === "YES"
   };
-  if (!(stats?.length || stats?.size)) return info;
+  if (!stats?.length) return info;
   const [result] = await mc.query(
-    summarize(table, column3, stats),
+    summarize({ table, column: column3, stats }),
     { persist: true }
   );
   return Object.assign(info, result);
 }
 async function getTableInfo(mc, table) {
-  const result = await mc.query(`DESCRIBE ${asTableRef(table)}`);
-  return Array.from(result).map((desc2) => ({
+  const result = Array.from(await mc.query(`DESCRIBE ${asTableRef(table)}`));
+  return result.map((desc2) => ({
     table,
     column: desc2.column_name,
     sqlType: desc2.column_type,
@@ -6291,13 +6143,13 @@ var Coordinator = class {
   }
   /**
    * Issue a query for which no result (return value) is needed.
-   * @param {QueryType | QueryType[]} query The query or an array of queries.
+   * @param { import('./types.js').QueryType[] |
+   *  import('./types.js').QueryType} query The query or an array of queries.
    *  Each query should be either a Query builder object or a SQL string.
    * @param {object} [options] An options object.
    * @param {number} [options.priority] The query priority, defaults to
    *  `Priority.Normal`.
-   * @returns {QueryResult} A query result
-   *  promise.
+   * @returns {QueryResult} A query result promise.
    */
   exec(query, { priority = Priority.Normal } = {}) {
     query = Array.isArray(query) ? query.filter((x3) => x3).join(";\n") : query;
@@ -6306,11 +6158,14 @@ var Coordinator = class {
   /**
    * Issue a query to the backing database. The submitted query may be
    * consolidate with other queries and its results may be cached.
-   * @param {QueryType} query The query as either a Query builder object
-   *  or a SQL string.
+   * @param {import('./types.js').QueryType} query The query as either a Query
+   *  builder object or a SQL string.
    * @param {object} [options] An options object.
    * @param {'arrow' | 'json'} [options.type] The query result format type.
-   * @param {boolean} [options.cache=true] If true, cache the query result.
+   * @param {boolean} [options.cache=true] If true, cache the query result
+   *  client-side within the QueryManager.
+   * @param {boolean} [options.persist] If true, request the database
+   *  server to persist a cached query server-side.
    * @param {number} [options.priority] The query priority, defaults to
    *  `Priority.Normal`.
    * @returns {QueryResult} A query result promise.
@@ -6326,8 +6181,8 @@ var Coordinator = class {
   /**
    * Issue a query to prefetch data for later use. The query result is cached
    * for efficient future access.
-   * @param {QueryType} query The query as either a Query builder object
-   *  or a SQL string.
+   * @param {import('./types.js').QueryType} query The query as either a Query
+   *  builder object or a SQL string.
    * @param {object} [options] An options object.
    * @param {'arrow' | 'json'} [options.type] The query result format type.
    * @returns {QueryResult} A query result promise.
@@ -6362,13 +6217,13 @@ var Coordinator = class {
    * Update client data by submitting the given query and returning the
    * data (or error) to the client.
    * @param {MosaicClient} client A Mosaic client.
-   * @param {QueryType} query The data query.
+   * @param {import('./types.js').QueryType} query The data query.
    * @param {number} [priority] The query priority.
    * @returns {Promise} A Promise that resolves upon completion of the update.
    */
   updateClient(client, query, priority = Priority.Normal) {
     client.queryPending();
-    return this.query(query, { priority }).then(
+    return client._pending = this.query(query, { priority }).then(
       (data) => client.queryResult(data).update(),
       (err) => {
         this._logger.error(err);
@@ -6381,7 +6236,7 @@ var Coordinator = class {
    * the client is simply updated. Otherwise `updateClient` is called. As a
    * side effect, this method clears the current preaggregator state.
    * @param {MosaicClient} client The client to update.
-   * @param {QueryType | null} [query] The query to issue.
+   * @param {import('./types.js').QueryType | null} [query] The query to issue.
    */
   requestQuery(client, query) {
     this.preaggregator.clear();
@@ -6398,7 +6253,7 @@ var Coordinator = class {
     }
     clients.add(client);
     client.coordinator = this;
-    this.initializeClient(client);
+    client._pending = this.initializeClient(client);
     connectSelection(this, client.filterBy, client);
   }
   async initializeClient(client) {
@@ -6406,6 +6261,7 @@ var Coordinator = class {
     if (fields?.length) {
       client.fieldInfo(await queryFieldInfo(this, fields));
     }
+    await client.prepare();
     return client.requestQuery();
   }
   /**
@@ -7025,6 +6881,179 @@ var SelectionResolver = class {
   }
 };
 
+// ../core/src/util/throttle.js
+var NIL = {};
+function throttle(callback, debounce = false) {
+  let curr;
+  let next;
+  let pending = NIL;
+  function invoke(event) {
+    curr = callback(event).catch(() => {
+    }).finally(() => {
+      if (next) {
+        const { value } = next;
+        next = null;
+        invoke(value);
+      } else {
+        curr = null;
+      }
+    });
+  }
+  function enqueue(event) {
+    next = { event };
+  }
+  function process(event) {
+    curr ? enqueue(event) : invoke(event);
+  }
+  function delay(event) {
+    if (pending !== event) {
+      requestAnimationFrame(() => {
+        const e = pending;
+        pending = NIL;
+        process(e);
+      });
+    }
+    pending = event;
+  }
+  return debounce ? delay : process;
+}
+
+// ../core/src/MosaicClient.js
+var MosaicClient = class {
+  /**
+   * Constructor.
+   * @param {*} filterSelection An optional selection to interactively filter
+   *  this client's data. If provided, a coordinator will re-query and update
+   *  the client when the selection updates.
+   */
+  constructor(filterSelection) {
+    this._filterBy = filterSelection;
+    this._requestUpdate = throttle(() => this.requestQuery(), true);
+    this._coordinator = null;
+    this._pending = Promise.resolve();
+  }
+  /**
+   * Return this client's connected coordinator.
+   */
+  get coordinator() {
+    return this._coordinator;
+  }
+  /**
+   * Set this client's connected coordinator.
+   */
+  set coordinator(coordinator2) {
+    this._coordinator = coordinator2;
+  }
+  /**
+   * Return a Promise that resolves once the client has updated.
+   */
+  get pending() {
+    return this._pending;
+  }
+  /**
+   * Return this client's filter selection.
+   */
+  get filterBy() {
+    return this._filterBy;
+  }
+  /**
+   * Return a boolean indicating if the client query can be sped up with
+   * materialized views of pre-aggregated data. Should return true if changes to
+   * the filterBy selection does not change the groupby domain of the client
+   * query.
+   */
+  get filterStable() {
+    return true;
+  }
+  /**
+   * Return an array of fields queried by this client.
+   * @returns {import('./types.js').FieldInfoRequest[] | null}
+   *  The fields to retrieve info for.
+   */
+  fields() {
+    return null;
+  }
+  /**
+   * Called by the coordinator to set the field info for this client.
+   * @param {import('./types.js').FieldInfo[]} info The field info result.
+   * @returns {this}
+   */
+  fieldInfo(info) {
+    return this;
+  }
+  /**
+   * Prepare the client before the query() method is called.
+   */
+  async prepare() {
+  }
+  /**
+   * Return a query specifying the data needed by this client.
+   * @param {*} [filter] The filtering criteria to apply in the query.
+   * @returns {*} The client query
+   */
+  query(filter3) {
+    return null;
+  }
+  /**
+   * Called by the coordinator to inform the client that a query is pending.
+   * @returns {this}
+   */
+  queryPending() {
+    return this;
+  }
+  /**
+   * Called by the coordinator to return a query result.
+   * @param {*} data The query result.
+   * @returns {this}
+   */
+  queryResult(data) {
+    return this;
+  }
+  /**
+   * Called by the coordinator to report a query execution error.
+   * @param {*} error
+   * @returns {this}
+   */
+  queryError(error) {
+    return this;
+  }
+  /**
+   * Request the coordinator to execute a query for this client.
+   * If an explicit query is not provided, the client query method will
+   * be called, filtered by the current filterBy selection.
+   * @returns {Promise}
+   */
+  requestQuery(query) {
+    const q = query || this.query(this.filterBy?.predicate(this));
+    return this._coordinator.requestQuery(this, q);
+  }
+  /**
+   * Request that the coordinator perform a throttled update of this client
+   * using the default query. Unlike requestQuery, for which every call will
+   * result in an executed query, multiple calls to requestUpdate may be
+   * consolidated into a single update.
+   */
+  requestUpdate() {
+    this._requestUpdate();
+  }
+  /**
+   * Reset this client, initiating new field info, call the prepare method, and query requests.
+   * @returns {Promise}
+   */
+  initialize() {
+    return this._coordinator.initializeClient(this);
+  }
+  /**
+   * Requests a client update.
+   * For example to (re-)render an interface component.
+   *
+   * @returns {this | Promise<any>}
+   */
+  update() {
+    return this;
+  }
+};
+
 // ../core/src/SelectionClause.js
 function clausePoint(field3, value, {
   source,
@@ -30992,6 +31021,9 @@ var DEFAULT_ATTRIBUTES = {
   marginBottom: 30
 };
 var Plot = class {
+  /**
+   * @param {HTMLElement} [element]
+   */
   constructor(element) {
     this.attributes = { ...DEFAULT_ATTRIBUTES };
     this.listeners = null;
@@ -30999,12 +31031,12 @@ var Plot = class {
     this.legends = [];
     this.marks = [];
     this.markset = null;
+    this.params = /* @__PURE__ */ new Map();
+    this.synch = synchronizer();
     this.element = element || document.createElement("div");
     this.element.setAttribute("class", "plot");
     this.element.style.display = "flex";
-    this.element.value = this;
-    this.params = /* @__PURE__ */ new Map();
-    this.synch = synchronizer();
+    Object.assign(this.element, { value: this });
   }
   margins() {
     return {
@@ -31148,7 +31180,9 @@ function isColor2(value) {
 
 // src/marks/util/is-constant-option.js
 var constantOptions = /* @__PURE__ */ new Set([
+  "offset",
   "order",
+  "reverse",
   "sort",
   "label",
   "anchor",
@@ -31220,7 +31254,7 @@ var isFieldObject = (channel, field3) => {
 var fieldEntry = (channel, field3) => ({
   channel,
   field: field3,
-  as: isColumnRef(field3) ? field3.column : channel
+  as: isColumnRef(field3) && !isColumnParam(field3) ? field3.column : channel
 });
 var valueEntry = (channel, value) => ({ channel, value });
 var isDataArray = (source) => Array.isArray(source);
@@ -31316,7 +31350,11 @@ var Mark2 = class extends MosaicClient {
       reqs[channel]?.forEach((s2) => entry.add(s2));
     }
     const table = this.sourceTable();
-    return Array.from(fields, ([c4, s2]) => ({ table, column: c4, stats: s2 }));
+    return Array.from(fields, ([c4, s2]) => ({
+      table,
+      column: c4,
+      stats: Array.from(s2)
+    }));
   }
   fieldInfo(info) {
     const lookup = Object.fromEntries(info.map((x3) => [x3.column, x3]));
@@ -31373,7 +31411,7 @@ function markQuery(channels, table, skip = []) {
     const { channel, field: field3, as } = c4;
     if (skip.includes(channel)) continue;
     if (channel === "orderby") {
-      q.orderby(c4.value);
+      q.orderby(c4.value ?? field3);
     } else if (field3) {
       if (isAggregateExpression(field3)) {
         aggr = true;
@@ -31505,7 +31543,7 @@ var ConnectedMark = class extends Mark2 {
       const cols = q._select.map((c4) => c4.alias).filter((c4) => c4 !== as && c4 !== value);
       return m4(q, expr, as, value, cols);
     } else {
-      return q.orderby(field3);
+      return q.orderby(as);
     }
   }
 };
@@ -31514,13 +31552,33 @@ var ConnectedMark = class extends Mark2 {
 function array3(size, proto = []) {
   return new proto.constructor(size);
 }
-function grid1d(size, index2, value) {
-  const G = array3(size, value);
-  const n = value.length;
-  for (let i = 0; i < n; ++i) {
-    G[index2[i]] = value[i];
+function grid1d(size, index2, value, columns, groupby) {
+  const numRows = index2.length;
+  const result = {};
+  const cells = [];
+  if (groupby?.length) {
+    const group3 = new Int32Array(numRows);
+    const gvalues = groupby.map((name) => columns[name]);
+    const cellMap = {};
+    for (let row = 0; row < numRows; ++row) {
+      const key = gvalues.map((group4) => group4[row]);
+      group3[row] = cellMap[key] ??= cells.push(key) - 1;
+    }
+    for (let i = 0; i < groupby.length; ++i) {
+      result[groupby[i]] = cells.map((cell2) => cell2[i]);
+    }
+    const G = result._grid = cells.map(() => array3(size, value));
+    for (let row = 0; row < numRows; ++row) {
+      G[group3[row]][index2[row]] = value[row];
+    }
+  } else {
+    cells.push([]);
+    const [G] = result._grid = [array3(size, value)];
+    for (let row = 0; row < numRows; ++row) {
+      G[index2[row]] = value[row];
+    }
   }
-  return G;
+  return { numRows: cells.length, columns: result };
 }
 function grid2d(w, h, index2, columns, aggregates, groupby, interpolate) {
   const numRows = index2.length;
@@ -32378,9 +32436,16 @@ function stripXY(mark, filter3) {
 }
 
 // src/marks/Density1DMark.js
+var GROUPBY = { fill: 1, stroke: 1, z: 1 };
 var Density1DMark = class extends Mark2 {
   constructor(type2, source, options) {
-    const { bins: bins2 = 1024, bandwidth = 20, ...channels } = options;
+    const {
+      bins: bins2 = 1024,
+      bandwidth = 20,
+      normalize: normalize4 = false,
+      stack: stack2 = false,
+      ...channels
+    } = options;
     const dim = type2.endsWith("X") ? "y" : "x";
     super(type2, source, channels, dim === "x" ? xext : yext);
     this.dim = dim;
@@ -32389,7 +32454,13 @@ var Density1DMark = class extends Mark2 {
     });
     this.bandwidth = handleParam(bandwidth, (value) => {
       this.bandwidth = value;
-      return this.grid ? this.convolve().update() : null;
+      return this.grids ? this.convolve().update() : null;
+    });
+    this.normalize = handleParam(normalize4, (value) => {
+      return this.normalize = value, this.convolve().update();
+    });
+    this.stack = handleParam(stack2, (value) => {
+      return this.stack = value, this.update();
     });
   }
   get filterStable() {
@@ -32404,42 +32475,67 @@ var Density1DMark = class extends Mark2 {
     const [x3, bx] = binExpr(this, dim, bins2, extent4);
     const q = markQuery(channels, this.sourceTable(), [dim]).where(filter3.concat(isBetween(bx, extent4)));
     const v2 = this.channelField("weight") ? "weight" : null;
-    return binLinear1d(q, x3, v2);
+    const g = this.groupby = channels.flatMap((c4) => {
+      return GROUPBY[c4.channel] && c4.field ? c4.as : [];
+    });
+    return binLinear1d(q, x3, v2, g);
   }
   queryResult(data) {
-    const { columns: { index: index2, density: density2 } } = toDataColumns(data);
-    this.grid = grid1d(this.bins, index2, density2);
+    const c4 = toDataColumns(data).columns;
+    this.grids = grid1d(this.bins, c4.index, c4.density, c4, this.groupby);
     return this.convolve();
   }
   convolve() {
-    const { bins: bins2, bandwidth, dim, grid, plot: plot2, extent: [lo, hi] } = this;
-    const neg = grid.some((v3) => v3 < 0);
+    const {
+      bins: bins2,
+      bandwidth,
+      normalize: normalize4,
+      dim,
+      grids,
+      groupby,
+      plot: plot2,
+      extent: [lo, hi]
+    } = this;
+    const cols = grids.columns;
+    const numGrids = grids.numRows;
+    const b = this.channelField(dim).as;
+    const v2 = dim === "x" ? "y" : "x";
     const size = dim === "x" ? plot2.innerWidth() : plot2.innerHeight();
+    const neg = cols._grid.some((grid) => grid.some((v3) => v3 < 0));
     const config = dericheConfig(bandwidth * (bins2 - 1) / size, neg);
-    const result = dericheConv1d(config, grid, bins2);
-    const v2 = dim === "x" ? "y" : "x";
-    const b = this.channelField(dim).as;
     const b0 = +lo;
     const delta = (hi - b0) / (bins2 - 1);
-    const scale3 = 1 / delta;
-    const _b = new Float64Array(bins2);
-    const _v = new Float64Array(bins2);
-    for (let i = 0; i < bins2; ++i) {
-      _b[i] = b0 + i * delta;
-      _v[i] = result[i] * scale3;
-    }
-    this.data = { numRows: bins2, columns: { [b]: _b, [v2]: _v } };
+    const numRows = bins2 * numGrids;
+    const _b = new Float64Array(numRows);
+    const _v = new Float64Array(numRows);
+    const _g = groupby.reduce((m, name) => (m[name] = Array(numRows), m), {});
+    for (let k2 = 0, g = 0; g < numGrids; ++g) {
+      groupby.forEach((name) => _g[name].fill(cols[name][g], k2, k2 + bins2));
+      const grid = cols._grid[g];
+      const result = dericheConv1d(config, grid, bins2);
+      const scale3 = 1 / norm(grid, result, delta, normalize4);
+      for (let i = 0; i < bins2; ++i, ++k2) {
+        _b[k2] = b0 + i * delta;
+        _v[k2] = result[i] * scale3;
+      }
+    }
+    this.data = { numRows, columns: { [b]: _b, [v2]: _v, ..._g } };
     return this;
   }
   plotSpecs() {
-    const { type: type2, data: { numRows: length4, columns }, channels, dim } = this;
-    const options = dim === "x" ? { y: columns.y } : { x: columns.x };
+    const { type: type2, data: { numRows: length4, columns }, channels, dim, stack: stack2 } = this;
+    const _ = type2.startsWith("area") && !stack2 ? "2" : "";
+    const options = dim === "x" ? { [`y${_}`]: columns.y } : { [`x${_}`]: columns.x };
     for (const c4 of channels) {
       options[c4.channel] = channelOption(c4, columns);
     }
     return [{ type: type2, data: { length: length4 }, options }];
   }
 };
+function norm(grid, smoothed, delta, type2) {
+  const value = type2 === true || type2 === "sum" ? sum2(grid) : type2 === "max" ? max2(smoothed) : delta;
+  return value || 1;
+}
 
 // src/marks/Density2DMark.js
 var Density2DMark = class extends Grid2DMark {
@@ -33607,12 +33703,13 @@ var Nearest = class {
       selection2.update(that.clause(void 0));
     });
     svg.addEventListener("pointerenter", (evt) => {
-      if (!evt.buttons) {
-        const v2 = this.channels.map(() => 0);
-        selection2.activate(this.clause(v2));
-      }
+      if (!evt.buttons) this.activate();
     });
   }
+  activate() {
+    const v2 = this.channels.map(() => 0);
+    this.selection.activate(this.clause(v2));
+  }
 };
 function calculateXY(svg, mark) {
   const { data: { columns } } = mark;
@@ -33708,7 +33805,7 @@ var PanZoom = class {
     this.svg = svg;
     if (this.initialized) return;
     else this.initialized = true;
-    const { panx, pany, mark: { plot: { element } }, xsel, ysel } = this;
+    const { panx, pany, mark: { plot: { element } } } = this;
     this.xscale = svg.scale("x");
     this.yscale = svg.scale("y");
     const rx = this.xscale.range.slice().sort(asc2);
@@ -33725,19 +33822,21 @@ var PanZoom = class {
       element.addEventListener("pointerenter", (evt) => {
         if (enter) return;
         else enter = true;
-        if (evt.buttons) return;
-        if (panx) {
-          const { xscale, xfield } = this;
-          xsel.activate(this.clause(xscale.domain, xfield, xscale));
-        }
-        if (pany) {
-          const { yscale, yfield } = this;
-          ysel.activate(this.clause(yscale.domain, yfield, yscale));
-        }
+        if (!evt.buttons) this.activate();
       });
       element.addEventListener("pointerleave", () => enter = false);
     }
   }
+  activate() {
+    if (this.panx) {
+      const { xscale, xfield } = this;
+      this.xsel.activate(this.clause(xscale.domain, xfield, xscale));
+    }
+    if (this.pany) {
+      const { yscale, yfield } = this;
+      this.ysel.activate(this.clause(yscale.domain, yfield, yscale));
+    }
+  }
 };
 function extent3(ext, defaultTrue, defaultFalse) {
   return ext ? Array.isArray(ext) ? ext : defaultTrue : defaultFalse;
@@ -34122,8 +34221,8 @@ var Toggle = class {
     channels,
     peers = true
   }) {
-    this.value = null;
     this.mark = mark;
+    this.value = null;
     this.selection = selection2;
     this.peers = peers;
     const fields = this.fields = [];
@@ -34175,10 +34274,12 @@ var Toggle = class {
       }
     });
     svg.addEventListener("pointerenter", (evt) => {
-      if (evt.buttons) return;
-      this.selection.activate(this.clause([this.fields.map(() => 0)]));
+      if (!evt.buttons) this.activate();
     });
   }
+  activate() {
+    this.selection.activate(this.clause([this.fields.map(() => 0)]));
+  }
 };
 function isTargetElement(groups2, node) {
   return groups2.some((g) => g.contains(node));