@uwdata/mosaic-plot 0.12.0 → 0.12.2

package/README.md

@@ -1,5 +1,7 @@
 # mosaic-plot
 
+[![npm version](https://img.shields.io/npm/v/@uwdata/mosaic-plot.svg)](https://www.npmjs.com/package/@uwdata/mosaic-plot)
+
 A Mosaic-powered grammar of graphics based on [Observable Plot](https://github.com/observablehq/plot). Mmarks (plot layers) serve as individual Mosaic clients. These marks can push data processing (binning, hex binning, regression) and optimizations (such as M4 for line/area charts) down to the database. This package also provides interactors for linked selection, filtering, and highlighting using Mosaic Params and Selections.
 
 The `mosaic-plot` package is included as part of the [vgplot](https://github.com/uwdata/mosaic/tree/main/packages/vgplot) API.

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);
       }
     };
   }
@@ -568,14 +568,15 @@ var MosaicClient = class {
   }
   /**
    * Return an array of fields queried by this client.
-   * @returns {object[]|null} The fields to retrieve info for.
+   * @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 {*} info The field info result.
+   * @param {import('./types.js').FieldInfo[]} info The field info result.
    * @returns {this}
    */
   fieldInfo(info) {
@@ -3456,6 +3457,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 +4881,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 +4925,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));
@@ -5665,7 +5669,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 +5680,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 +5689,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,
@@ -6310,7 +6314,10 @@ var Coordinator = class {
    *  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.
@@ -7030,7 +7037,7 @@ function clausePoint(field3, value, {
   source,
   clients = source ? /* @__PURE__ */ new Set([source]) : void 0
 }) {
-  const predicate = value !== void 0 ? isNotDistinct(field3, literal(value)) : null;
+  const predicate = value !== void 0 ? isIn(field3, [literal(value)]) : null;
   return {
     meta: { type: "point" },
     source,
@@ -31148,7 +31155,9 @@ function isColor2(value) {
 
 // src/marks/util/is-constant-option.js
 var constantOptions = /* @__PURE__ */ new Set([
+  "offset",
   "order",
+  "reverse",
   "sort",
   "label",
   "anchor",
@@ -31220,7 +31229,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 +31325,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]));
@@ -31514,13 +31527,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 +32411,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 +32429,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 +32450,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 {
@@ -32811,13 +32882,16 @@ var HexbinMark = class extends Mark2 {
         float642(x12),
         div(add(mul(add(x3, mul(0.5, bitAnd(y3, 1))), dx), ox2), xr)
       ),
-      [yc.as]: sub(float642(y22), div(add(mul(y3, dy), oy2), yr)),
+      [yc.as]: sub(
+        float642(y22),
+        div(add(mul(y3, dy), oy2), yr)
+      ),
       ...cols
     }).groupby(x3, y3, ...dims).from(
       // Subquery performs hex binning in screen space and also passes
       // original columns through (the DB should optimize this).
       Query.select({
-        [py]: div(mul(yr, sub(sub(y22, yc.field), oy2)), dy),
+        [py]: div(sub(mul(yr, sub(y22, yc.field)), oy2), dy),
         [pj]: int322(round(py)),
         [px]: sub(
           div(sub(mul(xr, sub(xc.field, x12)), ox2), dx),