@uwdata/mosaic-plot 0.17.0 → 0.19.0

package/dist/src/transforms/bin.d.ts

@@ -0,0 +1,22 @@
+export function hasExtent(mark: any, channel: any): boolean;
+export function bin(field: any, options?: {}): {
+    (mark: any, channel: any): {
+        [x: string]: BinTransformNode;
+    };
+    [Transform]: boolean;
+};
+declare class BinTransformNode extends ExprNode {
+    constructor(column: any, mark: any, channel: any, options: any);
+    column: any;
+    mark: any;
+    channel: any;
+    options: any;
+    get stats(): {
+        column: any;
+        stats: string[];
+    };
+}
+import { Transform } from '../symbols.js';
+import { ExprNode } from '@uwdata/mosaic-sql';
+export {};
+//# sourceMappingURL=bin.d.ts.map

package/dist/src/transforms/bin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bin.d.ts","sourceRoot":"","sources":["../../../src/transforms/bin.js"],"names":[],"mappings":"AAQA,4DAEC;AAED;;;;;EAeC;AAWD;IACE,gEAMC;IAJC,YAAoB;IACpB,UAAgB;IAChB,aAAsB;IACtB,aAAsB;IAGxB;;;MAEC;CAaF;0BA7DyB,eAAe;yBADO,oBAAoB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uwdata/mosaic-plot",
-  "version": "0.17.0",
+  "version": "0.19.0",
   "description": "A Mosaic-powered plotting framework based on Observable Plot.",
   "keywords": [
     "data",
@@ -16,20 +16,27 @@
     "types": "./dist/src/index.d.ts",
     "default": "./src/index.js"
   },
+  "files": [
+    "dist",
+    "!dist/tsconfig.tsbuildinfo",
+    "src"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/uwdata/mosaic.git"
   },
   "scripts": {
-    "prebuild": "rimraf dist && mkdir dist",
+    "clean": "rimraf dist && mkdir dist",
+    "prebuild": "npm run clean",
     "lint": "eslint src test",
-    "test": "vitest run && tsc",
-    "prepublishOnly": "npm run test && npm run lint && tsc"
+    "test": "vitest run",
+    "prepublishOnly": "npm run test && npm run lint && tsc --build"
   },
   "dependencies": {
     "@observablehq/plot": "^0.6.17",
-    "@uwdata/mosaic-core": "^0.17.0",
-    "@uwdata/mosaic-sql": "^0.17.0",
+    "@uwdata/mosaic-core": "^0.19.0",
+    "@uwdata/mosaic-sql": "^0.19.0",
     "d3": "^7.9.0"
-  }
+  },
+  "gitHead": "0ba4f2d710ca2fa53da7ff02a370e39a32dc2ce4"
 }

package/src/interactors/Nearest.js

@@ -1,3 +1,4 @@
+/** @import { ClauseSource } from '@uwdata/mosaic-core' */
 import { clausePoint, clausePoints, isSelection } from '@uwdata/mosaic-core';
 import { select, pointer, min } from 'd3';
 import { getField } from './util/get-field.js';
@@ -28,7 +29,7 @@ export class Nearest {
 
   clause(value) {
     const { clients, fields } = this;
-    const opt = { source: this, clients };
+    const opt = { source: /** @type {ClauseSource} */(this), clients };
     // if only one field, use a simpler clause that passes the value
     // this allows a single field selection value to act like a param
     return fields.length > 1
@@ -37,6 +38,7 @@ export class Nearest {
   }
 
   init(svg) {
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
     const that = this;
     const { mark, channels, selection, maxRadius } = this;
     const { data: { columns } } = mark;

package/src/interactors/PanZoom.js

@@ -1,3 +1,4 @@
+/** @import { ClauseSource } from '@uwdata/mosaic-core' */
 import { Selection, clauseInterval } from '@uwdata/mosaic-core';
 import { select, zoom, ZoomTransform } from 'd3';
 import { getField } from './util/get-field.js';
@@ -53,7 +54,7 @@ export class PanZoom {
 
   clause(value, field, scale) {
     return clauseInterval(field, value, {
-      source: this,
+      source: /** @type {ClauseSource} */(this),
       clients: this.mark.plot.markSet,
       scale
     });

package/src/interactors/Toggle.js

@@ -1,3 +1,4 @@
+/** @import { ClauseSource } from '@uwdata/mosaic-core' */
 import { clausePoints } from '@uwdata/mosaic-core';
 import { getDatum } from './util/get-datum.js';
 import { neq, neqSome } from './util/neq.js';
@@ -42,7 +43,7 @@ export class Toggle {
   clause(value) {
     const { fields, mark } = this;
     return clausePoints(fields, value, {
-      source: this,
+      source: /** @type {ClauseSource} */(this),
       clients: this.peers ? mark.plot.markSet : new Set().add(mark)
     });
   }

package/src/marks/Density1DMark.js

@@ -68,6 +68,7 @@ export class Density1DMark extends Mark {
   }
 
   queryResult(data) {
+    // @ts-expect-error Correct the data column type
     const c = toDataColumns(data).columns;
     this.grids = grid1d(this.bins, c.index, c.density, c, this.groupby);
     return this.convolve();
@@ -114,6 +115,7 @@ export class Density1DMark extends Mark {
   }
 
   plotSpecs() {
+    // @ts-expect-error Correct the data column type
     const { type, data: { numRows: length, columns }, channels, dim, stack } = this;
 
     // control if Plot's implicit stack transform is applied

package/src/marks/Density2DMark.js

@@ -33,6 +33,7 @@ export class Density2DMark extends Grid2DMark {
   }
 
   plotSpecs() {
+    // @ts-expect-error Correct the data column type
     const { type, channels, densityMap, data: { numRows: length, columns } } = this;
     const options = {};
     for (const c of channels) {

package/src/marks/ErrorBarMark.js

@@ -38,6 +38,7 @@ export class ErrorBarMark extends Mark {
 
     // compute confidence interval channels
     const p = Math.SQRT2 * erfinv(ci);
+    // @ts-expect-error Correct the data column type
     const { columns: { __avg__: u, __se__: s } } = data;
     const options = {
       [`${dim}1`]: u.map((u, i) => u - p * s[i]),

package/src/marks/GeoMark.js

@@ -23,6 +23,7 @@ export class GeoMark extends Mark {
     // look for an explicit geometry field
     const geom = this.channelField('geometry')?.as;
     if (geom) {
+      // @ts-expect-error Correct the data column type
       const { columns } = this.data;
       if (typeof columns[geom][0] === 'string') {
         columns[geom] = columns[geom].map(s => JSON.parse(s));

package/src/marks/Grid2DMark.js

@@ -158,6 +158,7 @@ export class Grid2DMark extends Mark {
   queryResult(data) {
     const [w, h] = this.bins;
     const interp = maybeInterpolate(this.interpolate);
+    // @ts-expect-error Correct the data column type
     const { columns } = toDataColumns(data);
     this.grids0 = grid2d(w, h, columns.index, columns, this.aggr, this.groupby, interp);
     return this.convolve();
@@ -169,7 +170,7 @@ export class Grid2DMark extends Mark {
     // no smoothing as default fallback
     this.grids = grids0;
 
-    if (bandwidth > 0) {
+    if (bandwidth > 0 && grids0.numRows > 0) {
       // determine which grid to smooth
       const prop = aggr.length === 1 ? aggr[0]
         : aggr.includes(DENSITY) ? DENSITY
@@ -193,7 +194,7 @@ export class Grid2DMark extends Mark {
         numRows: grids0.numRows,
         columns: {
           ...grids0.columns,
-          // @ts-ignore
+          // @ts-expect-error array types
           [prop]: g.map(grid => dericheConv2d(configX, configY, grid, bins))
         }
       };

package/src/marks/Mark.js

@@ -21,7 +21,7 @@ const fieldEntry = (channel, field) => ({
 const valueEntry = (channel, value) => ({ channel, value });
 
 // checks if a data source is an explicit array of values
-// as opposed to a database table refernece
+// as opposed to a database table reference
 export const isDataArray = source => Array.isArray(source);
 
 export class Mark extends MosaicClient {
@@ -67,6 +67,7 @@ export class Mark extends MosaicClient {
       } else if (isParamLike(entry)) {
         const c = valueEntry(channel, entry.value);
         channels.push(c);
+        // @ts-expect-error FIXME
         entry.addEventListener('value', value => {
           // update immediately, the value is simply passed to Plot
           c.value = value;

package/src/marks/RasterMark.js

@@ -69,6 +69,7 @@ export class RasterMark extends Grid2DMark {
   }
 
   plotSpecs() {
+    // @ts-expect-error Correct the data column type
     const { type, plot, data: { numRows: length, columns } } = this;
     const options = {
       src: columns.src,
@@ -194,7 +195,7 @@ function alphaScale(mark, prop) {
  */
 function colorScale(mark, prop) {
   const { plot, grids } = mark;
-  const data = grids.columns[prop];
+  const data = grids.columns[prop] ?? [];
   const flat = !data[0]?.map; // not array-like
   const discrete = flat || Array.isArray(data[0]);
 

package/src/marks/RasterTileMark.js

@@ -204,6 +204,7 @@ export class RasterTileMark extends Grid2DMark {
   }
 
   plotSpecs() {
+    // @ts-expect-error Correct the data column type
     const { type, plot, data: { numRows: length, columns } } = this;
     const options = {
       src: columns.src,

package/src/marks/util/grid.js

@@ -15,7 +15,7 @@ import { InternSet, ascending } from 'd3';
  * @returns {Arrayish} The generated array.
  */
 export function array(size, proto = []) {
-  // @ts-ignore
+  // @ts-expect-error dynamic instantiation
   return new proto.constructor(size);
 }
 
@@ -32,7 +32,9 @@ export function array(size, proto = []) {
  * }} Named column arrays of generated grid values.
  */
 export function grid1d(size, index, value, columns, groupby) {
+  if (!index?.length) return { numRows: 0, columns: {} };
   const numRows = index.length;
+  /** @type {{ [key:string]: Arrayish }} */
   const result = {};
   const cells = [];
 
@@ -60,7 +62,6 @@ export function grid1d(size, index, value, columns, groupby) {
     }
   }
 
-  // @ts-ignore
   return { numRows: cells.length, columns: result };
 }
 
@@ -82,9 +83,11 @@ export function grid1d(size, index, value, columns, groupby) {
  * }} Named column arrays of generated grid values.
  */
 export function grid2d(w, h, index, columns, aggregates, groupby, interpolate) {
+  if (!index?.length) return { numRows: 0, columns: {} };
   const numRows = index.length;
   const size = w * h;
   const values = aggregates.map(name => columns[name]);
+  /** @type {{ [key:string]: Arrayish }} */
   const result = {};
   const cells = [];
   const group = new Int32Array(numRows);
@@ -127,7 +130,6 @@ export function grid2d(w, h, index, columns, aggregates, groupby, interpolate) {
     });
   }
 
-  // @ts-ignore
   return { numRows: cells.length, columns: result };
 }
 

package/src/plot.js

@@ -1,4 +1,4 @@
-import { distinct, synchronizer } from '@uwdata/mosaic-core';
+import { distinct, Synchronizer } from '@uwdata/mosaic-core';
 import { plotRenderer } from './plot-renderer.js';
 
 const DEFAULT_ATTRIBUTES = {
@@ -26,8 +26,8 @@ export class Plot {
     this.markset = null;
     /** @type {Map<import('@uwdata/mosaic-core').Param, import('./marks/Mark.js').Mark[]>} */
     this.params = new Map;
-    /** @type {ReturnType<synchronizer>} */
-    this.synch = synchronizer();
+    /** @type {Synchronizer} */
+    this.synch = new Synchronizer();
 
     /** @type {HTMLElement} */
     this.element = element || document.createElement('div');

package/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "include": ["src/**/*"],
-  "compilerOptions": {
-    "emitDeclarationOnly": true,
-    "outDir": "dist"
-  },
-  "references": [{ "path": "../core" }, { "path": "../sql" }]
-}

package/vitest.config.ts

@@ -1,3 +0,0 @@
-import { defineConfig } from 'vite';
-
-export default defineConfig({});