@uwdata/mosaic-plot 0.14.1 → 0.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uwdata/mosaic-plot",
-  "version": "0.14.1",
+  "version": "0.16.1",
   "description": "A Mosaic-powered plotting framework based on Observable Plot.",
   "keywords": [
     "data",
@@ -26,10 +26,9 @@
   },
   "dependencies": {
     "@observablehq/plot": "^0.6.17",
-    "@uwdata/mosaic-core": "^0.14.1",
-    "@uwdata/mosaic-sql": "^0.14.1",
-    "d3": "^7.9.0",
-    "isoformat": "^0.2.1"
+    "@uwdata/mosaic-core": "^0.16.1",
+    "@uwdata/mosaic-sql": "^0.16.1",
+    "d3": "^7.9.0"
   },
-  "gitHead": "5959cb169e95bd8467e1e5d7a9b98954f09474f3"
+  "gitHead": "e12af9927b0a35a0e3194850ef569d0d24a022ce"
 }

package/src/marks/Grid2DMark.js

@@ -1,6 +1,7 @@
+/** @import { ExprNode } from '@uwdata/mosaic-sql' */
 import { interpolatorBarycentric, interpolateNearest, interpolatorRandomWalk } from '@observablehq/plot';
 import { toDataColumns } from '@uwdata/mosaic-core';
-import { ExprNode, Query, bin2d, binLinear2d, collectColumns, count, isAggregateExpression, isBetween, lt, lte, sum } from '@uwdata/mosaic-sql';
+import { Query, bin2d, binLinear2d, collectColumns, count, isAggregateExpression, isBetween, lt, lte, sum } from '@uwdata/mosaic-sql';
 import { Transient } from '../symbols.js';
 import { binExpr } from './util/bin-expr.js';
 import { dericheConfig, dericheConv2d } from './util/density.js';

package/src/marks/Mark.js

@@ -1,5 +1,6 @@
-import { isParam, MosaicClient, toDataColumns } from '@uwdata/mosaic-core';
-import { Query, SelectQuery, collectParams, column, isAggregateExpression, isColumnParam, isColumnRef, isNode, isParamLike } from '@uwdata/mosaic-sql';
+/** @import { SelectQuery } from '@uwdata/mosaic-sql' */
+import { isParam, MosaicClient, queryFieldInfo, toDataColumns } from '@uwdata/mosaic-core';
+import { Query, collectParams, column, isAggregateExpression, isColumnParam, isColumnRef, isNode, isParamLike } from '@uwdata/mosaic-sql';
 import { isColor } from './util/is-color.js';
 import { isConstantOption } from './util/is-constant-option.js';
 import { isSymbol } from './util/is-symbol.js';
@@ -121,7 +122,7 @@ export class Mark extends MosaicClient {
     return c?.field ? c : null;
   }
 
-  fields() {
+  async prepare() {
     if (this.hasOwnData()) return null;
 
     const { channels, reqs } = this;
@@ -136,14 +137,11 @@ export class Mark extends MosaicClient {
     }
 
     const table = this.sourceTable();
-    return Array.from(fields, ([c, s]) => ({
-      table,
-      column: c,
-      stats: Array.from(s)
-    }));
-  }
+    const info = await queryFieldInfo(
+      this.coordinator,
+      Array.from(fields, ([c, s]) => ({ table, column: c, stats: Array.from(s) }))
+    );
 
-  fieldInfo(info) {
     const lookup = Object.fromEntries(info.map(x => [x.column, x]));
     for (const entry of this.channels) {
       const { field } = entry;
@@ -152,7 +150,6 @@ export class Mark extends MosaicClient {
       }
     }
     this._fieldInfo = true;
-    return this;
   }
 
   /**