@uwdata/mosaic-plot 0.5.0 → 0.6.1

package/src/plot.js

@@ -39,9 +39,14 @@ export class Plot {
     return this.getAttribute('width') - left - right;
   }
 
-  innerHeight() {
+  innerHeight(defaultValue = 400) {
     const { top, bottom } = this.margins();
-    return this.getAttribute('height') - top - bottom;
+    let h = this.getAttribute('height');
+    if (h == null && defaultValue != null) {
+      h = defaultValue; // TODO could apply more nuanced logic here
+      this.setAttribute('height', h, { silent: true });
+    }
+    return h - top - bottom;
   }
 
   pending(mark) {

package/src/transforms/bin.js

@@ -1,30 +1,26 @@
-import { asColumn } from '@uwdata/mosaic-sql';
 import { Transform } from '../symbols.js';
+import { channelScale } from '../marks/util/channel-scale.js';
 
-const EXTENT = [
-  'rectY-x', 'rectX-y', 'rect-x', 'rect-y'
-];
-
-function hasExtent(channel, type) {
-  return EXTENT.includes(`${type}-${channel}`);
-}
+const EXTENT = new Set(['rectY-x', 'rectX-y', 'rect-x', 'rect-y']);
 
 export function bin(field, options = { steps: 25 }) {
   const fn = (mark, channel) => {
-    return hasExtent(channel, mark.type)
-      ? {
-          [`${channel}1`]: binField(mark, field, options),
-          [`${channel}2`]: binField(mark, field, { ...options, offset: 1 })
-        }
-      : {
-          [channel]: binField(mark, field, options)
-        };
+    if (EXTENT.has(`${mark.type}-${channel}`)) {
+      return {
+        [`${channel}1`]: binField(mark, channel, field, options),
+        [`${channel}2`]: binField(mark, channel, field, { ...options, offset: 1 })
+      };
+    } else {
+      return {
+        [channel]: binField(mark, channel, field, options)
+      };
+    }
   };
   fn[Transform] = true;
   return fn;
 }
 
-function binField(mark, column, options) {
+function binField(mark, channel, column, options) {
   return {
     column,
     label: column,
@@ -32,13 +28,15 @@ function binField(mark, column, options) {
     get columns() { return [column]; },
     get basis() { return column; },
     toString() {
+      const { apply, sqlApply, sqlInvert } = channelScale(mark, channel);
       const { min, max } = mark.stats[column];
-      const b = bins(min, max, options);
-      const col = asColumn(column);
+      const b = bins(apply(min), apply(max), options);
+      const col = sqlApply(column);
       const base = b.min === 0 ? col : `(${col} - ${b.min})`;
       const alpha = `${(b.max - b.min) / b.steps}::DOUBLE`;
       const off = options.offset ? `${options.offset} + ` : '';
-      return `${b.min} + ${alpha} * (${off}FLOOR(${base} / ${alpha})::INTEGER)`;
+      const expr = `${b.min} + ${alpha} * (${off}FLOOR(${base} / ${alpha}))`;
+      return `${sqlInvert(expr)}`;
     }
   };
 }

package/src/marks/util/bin-field.js

@@ -1,17 +0,0 @@
-import { epoch_ms, sql } from '@uwdata/mosaic-sql';
-
-export function binField(mark, channel, expr) {
-  if (!mark.stats) return field;
-  const { field } = mark.channelField(channel);
-  const { type } = mark.stats[field.column];
-  expr = expr ?? field;
-  return type === 'date' ? epoch_ms(expr) : expr;
-}
-
-export function bin1d(x, x0, x1, n, reverse = false, pad = 1) {
-  const d = (n - pad) / (x1 - x0);
-  const f = d !== 1 ? ` * ${d}::DOUBLE` : '';
-  return reverse
-    ? sql`(${+x1} - ${x}::DOUBLE)${f}`
-    : sql`(${x}::DOUBLE - ${+x0})${f}`;
-}

package/src/marks/util/is-arrow-table.js

@@ -1,3 +0,0 @@
-export function isArrowTable(values) {
-  return typeof values?.getChild === 'function';
-}