@uwdata/mosaic-plot 0.18.0 → 0.19.1

package/dist/src/marks/Grid2DMark.d.ts

@@ -40,7 +40,7 @@ export class Grid2DMark extends Mark {
     } | {
         numRows: number;
         columns: {
-            [x: string]: import("./util/grid.js").Arrayish | Uint8Array<ArrayBuffer> | Int8Array<ArrayBuffer> | Uint8ClampedArray<ArrayBuffer> | Int16Array<ArrayBuffer> | Uint16Array<ArrayBuffer> | Int32Array<ArrayBuffer> | Uint32Array<ArrayBuffer> | Float32Array<ArrayBuffer> | Float64Array<ArrayBuffer>;
+            [x: string]: import("./util/grid.js").Arrayish | Int32Array<ArrayBuffer> | Uint8Array<ArrayBuffer> | Int8Array<ArrayBuffer> | Uint8ClampedArray<ArrayBuffer> | Int16Array<ArrayBuffer> | Uint16Array<ArrayBuffer> | Uint32Array<ArrayBuffer> | Float32Array<ArrayBuffer> | Float64Array<ArrayBuffer>;
         };
     };
 }

package/dist/src/marks/RasterTileMark.d.ts

@@ -10,7 +10,7 @@ export class RasterTileMark extends Grid2DMark {
     _filter: any[];
     tileQuery(extent: any): any;
     requestTiles(): Promise<void>;
-    prefetch: import("@uwdata/mosaic-core").QueryResult<unknown>[];
+    prefetch: import("@uwdata/mosaic-core").QueryResult<import("@uwdata/flechette").Table<import("@uwdata/flechette").TypeMap>>[];
     convolve(): this;
     rasterize(): this;
     plotSpecs(): {

package/dist/src/marks/RasterTileMark.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RasterTileMark.d.ts","sourceRoot":"","sources":["../../../src/marks/RasterTileMark.js"],"names":[],"mappings":"AASA;IACE,uCASC;IANC,WAAiB;IAGjB,YAAoB;IACpB,WAA4C;IAC5C,WAA4C;IAG9C,qCAIC;IAED,8BAEC;IAED,2BAIC;IAHC,eAAqB;IAKvB,4BA6DC;IAED,8BAiEC;IAZC,+DAEC;IAYH,iBAEC;IAED,kBAgCC;IAED;;;;;;;;;;;;;QAYC;CACF;2BApN0B,iBAAiB"}
+{"version":3,"file":"RasterTileMark.d.ts","sourceRoot":"","sources":["../../../src/marks/RasterTileMark.js"],"names":[],"mappings":"AASA;IACE,uCASC;IANC,WAAiB;IAGjB,YAAoB;IACpB,WAA4C;IAC5C,WAA4C;IAG9C,qCAIC;IAED,8BAEC;IAED,2BAIC;IAHC,eAAqB;IAKvB,4BA6DC;IAED,8BAiEC;IAZC,8HAEC;IAYH,iBAEC;IAED,kBAgCC;IAED;;;;;;;;;;;;;QAYC;CACF;2BApN0B,iBAAiB"}

package/dist/src/marks/util/grid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid.d.ts","sourceRoot":"","sources":["../../../../src/marks/util/grid.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AAEH;;;;;;GAMG;AACH,4BALW,MAAM,UACN,QAAQ,GAEN,QAAQ,CAKpB;AAED;;;;;;;;;;;GAWG;AACH,6BAVW,MAAM,SACN,QAAQ,SACR,QAAQ,WACR,MAAM,CAAC,MAAM,EAAC,QAAQ,CAAC,WACvB,MAAM,EAAE,GACN;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QAAE,CAAC,GAAG,EAAC,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAA;CACnC,CAiCH;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,0BAdW,MAAM,KACN,MAAM,SACN,QAAQ,WAER,MAAM,CAAC,MAAM,EAAC,QAAQ,CAAC,cACvB,MAAM,EAAE,WACR,MAAM,EAAE,2BAGN;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QAAE,CAAC,GAAG,EAAC,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAA;CACnC,CAkDH;AAED,2DAWC;AAED,sDAUC;;;;uBAzJY,QAAQ,SAAS,GAAG,UAAU,GAAG,iBAAiB,GACzD,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,WAAW,GACnD,YAAY,GAAG,YAAY"}
+{"version":3,"file":"grid.d.ts","sourceRoot":"","sources":["../../../../src/marks/util/grid.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AAEH;;;;;;GAMG;AACH,4BALW,MAAM,UACN,QAAQ,GAEN,QAAQ,CAKpB;AAED;;;;;;;;;;;GAWG;AACH,6BAVW,MAAM,SACN,QAAQ,SACR,QAAQ,WACR,MAAM,CAAC,MAAM,EAAC,QAAQ,CAAC,WACvB,MAAM,EAAE,GACN;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QAAE,CAAC,GAAG,EAAC,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAA;CACnC,CAkCH;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,0BAdW,MAAM,KACN,MAAM,SACN,QAAQ,WAER,MAAM,CAAC,MAAM,EAAC,QAAQ,CAAC,cACvB,MAAM,EAAE,WACR,MAAM,EAAE,2BAGN;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE;QAAE,CAAC,GAAG,EAAC,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAA;CACnC,CAmDH;AAED,2DAWC;AAED,sDAUC;;;;uBA3JY,QAAQ,SAAS,GAAG,UAAU,GAAG,iBAAiB,GACzD,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,WAAW,GACnD,YAAY,GAAG,YAAY"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uwdata/mosaic-plot",
-  "version": "0.18.0",
+  "version": "0.19.1",
   "description": "A Mosaic-powered plotting framework based on Observable Plot.",
   "keywords": [
     "data",
@@ -34,9 +34,9 @@
   },
   "dependencies": {
     "@observablehq/plot": "^0.6.17",
-    "@uwdata/mosaic-core": "^0.18.0",
-    "@uwdata/mosaic-sql": "^0.18.0",
+    "@uwdata/mosaic-core": "^0.19.1",
+    "@uwdata/mosaic-sql": "^0.19.0",
     "d3": "^7.9.0"
   },
-  "gitHead": "dfb9ded0b0307754e3185ca34cc49a1384fe8455"
+  "gitHead": "64ac2aaeefe9ff469edfeed417414a0a7866863f"
 }

package/src/marks/Grid2DMark.js

@@ -170,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
@@ -194,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/RasterMark.js

@@ -195,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/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 };
 }