@uwdata/mosaic-plot 0.13.0 → 0.14.0

package/package.json

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

package/src/transforms/bin.js

@@ -1,8 +1,6 @@
-import { ExprNode, add, dateBin, div, float64, floor, interval, mul, sub } from '@uwdata/mosaic-sql';
+import { ExprNode, binDate, binHistogram } from '@uwdata/mosaic-sql';
 import { Transform } from '../symbols.js';
 import { channelScale } from '../marks/util/channel-scale.js';
-import { bins } from './bin-step.js';
-import { timeInterval } from './time-interval.js';
 
 const EXTENT = new Set([
   'rectY-x', 'rectX-y', 'rect-x', 'rect-y', 'ruleY-x', 'ruleX-y'
@@ -54,29 +52,12 @@ class BinTransformNode extends ExprNode {
   toString() {
     const { mark, channel, column, options } = this;
     const { type, min, max } = mark.channelField(channel);
-    const { interval: i, steps, offset = 0 } = options;
-    const ival = i ?? (
-      type === 'date' || hasTimeScale(mark, channel) ? 'date' : 'number'
-    );
-
-    let result;
-    if (ival === 'number') {
-      // perform number binning
-      const { apply, sqlApply, sqlInvert } = channelScale(mark, channel);
-      const b = bins(apply(min), apply(max), options);
-      const col = sqlApply(column);
-      const alpha = float64((b.max - b.min) / b.steps);
-      const bin = floor(div(b.min === 0 ? col : sub(col, b.min), alpha));
-      const expr = add(b.min, mul(alpha, offset ? add(offset, bin) : bin));
-      result = sqlInvert(expr);
-    } else {
-      // perform date/time binning
-      const { interval: unit, step = 1 } = ival === 'date'
-        ? timeInterval(min, max, steps || 40)
-        : options;
-      const bin = dateBin(column, unit, step);
-      result = offset ? add(bin, interval(unit, offset * step)) : bin;
-    }
+    const isDate = options.interval
+      || type === 'date'
+      || hasTimeScale(mark, channel);
+    const result = isDate
+      ? binDate(column, [min, max], options)
+      : binHistogram(column, [min, max], options, channelScale(mark, channel));
     return `${result}`;
   }
 }

package/src/transforms/bin-step.js

@@ -1,43 +0,0 @@
-export function binStep(span, steps, minstep = 0, logb = Math.LN10) {
-  let v;
-
-  const level = Math.ceil(Math.log(steps) / logb);
-  let step = Math.max(
-    minstep,
-    Math.pow(10, Math.round(Math.log(span) / logb) - level)
-  );
-
-  // increase step size if too many bins
-  while (Math.ceil(span / step) > steps) { step *= 10; }
-
-  // decrease step size if allowed
-  const div = [5, 2];
-  for (let i = 0, n = div.length; i < n; ++i) {
-    v = step / div[i];
-    if (v >= minstep && span / v <= steps) step = v;
-  }
-
-  return step;
-}
-
-export function bins(min, max, options) {
-  let { step, steps, minstep = 0, nice = true } = options;
-
-  if (nice !== false) {
-    // use span to determine step size
-    const span = max - min;
-    const logb = Math.LN10;
-    step = step || binStep(span, steps || 25, minstep, logb);
-
-    // adjust min/max relative to step
-    let v = Math.log(step);
-    const precision = v >= 0 ? 0 : ~~(-v / logb) + 1;
-    const eps = Math.pow(10, -precision - 1);
-    v = Math.floor(min / step + eps) * step;
-    min = min < v ? v - step : v;
-    max = Math.ceil(max / step) * step;
-    steps = Math.round((max - min) / step);
-  }
-
-  return { min, max, steps };
-}

package/src/transforms/time-interval.js

@@ -1,53 +0,0 @@
-import { bisector } from 'd3';
-import { binStep } from './bin-step.js';
-
-const YEAR = 'year';
-const MONTH = 'month';
-const DAY = 'day';
-const HOUR = 'hour';
-const MINUTE = 'minute';
-const SECOND = 'second';
-const MILLISECOND = 'millisecond';
-
-const durationSecond = 1000;
-const durationMinute = durationSecond * 60;
-const durationHour = durationMinute * 60;
-const durationDay = durationHour * 24;
-const durationWeek = durationDay * 7;
-const durationMonth = durationDay * 30;
-const durationYear = durationDay * 365;
-
-/** @type {[string, number, number][]} */
-const intervals = [
-  [SECOND,  1,      durationSecond],
-  [SECOND,  5,  5 * durationSecond],
-  [SECOND, 15, 15 * durationSecond],
-  [SECOND, 30, 30 * durationSecond],
-  [MINUTE,  1,      durationMinute],
-  [MINUTE,  5,  5 * durationMinute],
-  [MINUTE, 15, 15 * durationMinute],
-  [MINUTE, 30, 30 * durationMinute],
-  [  HOUR,  1,      durationHour  ],
-  [  HOUR,  3,  3 * durationHour  ],
-  [  HOUR,  6,  6 * durationHour  ],
-  [  HOUR, 12, 12 * durationHour  ],
-  [   DAY,  1,      durationDay   ],
-  [   DAY,  7,      durationWeek  ],
-  [ MONTH,  1,      durationMonth ],
-  [ MONTH,  3,  3 * durationMonth ],
-  [  YEAR,  1,      durationYear  ]
-];
-
-export function timeInterval(min, max, steps) {
-  const span = max - min;
-  const target = span / steps;
-  let i = bisector(i => i[2]).right(intervals, target);
-  if (i === intervals.length) {
-    return { interval: YEAR, step: binStep(span / durationYear, steps) };
-  } else if (i) {
-    i = intervals[target / intervals[i - 1][2] < intervals[i][2] / target ? i - 1 : i];
-    return { interval: i[0], step: i[1] };
-  } else {
-    return { interval: MILLISECOND, step: binStep(span, steps, 1) };
-  }
-}