Wrap all date/time intervals with isoparse

closes #1182

(Note: I considered doing this in d3-time, but it would mean adding d3-time-format as a dependency of d3-time.)

Rebase on main

Co-authored-by: Mike Bostock <[email protected]>

Author: Fil

src/options.js

@@ -1,6 +1,6 @@
 import {parse as isoParse} from "isoformat";
 import {color, descending, range as rangei, quantile} from "d3";
-import {maybeTimeInterval, maybeUtcInterval} from "./time.js";
+import {isoInterval, maybeTimeInterval, maybeUtcInterval} from "./time.js";
 
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray
 export const TypedArray = Object.getPrototypeOf(Uint8Array);
@@ -285,7 +285,7 @@ export function maybeInterval(interval, type) {
   if (typeof interval === "string") return (type === "time" ? maybeTimeInterval : maybeUtcInterval)(interval);
   if (typeof interval.floor !== "function") throw new Error("invalid interval; missing floor method");
   if (typeof interval.offset !== "function") throw new Error("invalid interval; missing offset method");
-  return interval;
+  return isTimeInterval(interval) ? isoInterval(interval) : interval;
 }
 
 // This distinguishes between per-dimension options and a standalone value.
@@ -476,3 +476,11 @@ export function named(things) {
 export function maybeNamed(things) {
   return isIterable(things) ? named(things) : things;
 }
+
+export function isTimeInterval(t) {
+  return isInterval(t) && typeof t === "function" && t() instanceof Date;
+}
+
+export function isInterval(t) {
+  return t ? typeof t.range === "function" : false;
+}

src/time.js

@@ -2,6 +2,7 @@ import {utcSecond, utcMinute, utcHour, utcDay, utcWeek, utcMonth, utcYear} from
 import {utcMonday, utcTuesday, utcWednesday, utcThursday, utcFriday, utcSaturday, utcSunday} from "d3";
 import {timeSecond, timeMinute, timeHour, timeDay, timeWeek, timeMonth, timeYear} from "d3";
 import {timeMonday, timeTuesday, timeWednesday, timeThursday, timeFriday, timeSaturday, timeSunday} from "d3";
+import {coerceDate} from "./options.js";
 
 const timeIntervals = new Map([
   ["second", timeSecond],
@@ -41,14 +42,18 @@ const utcIntervals = new Map([
   ["sunday", utcSunday]
 ]);
 
+export function isoInterval(interval) {
+  return Object.assign((t) => interval(t), {...interval, floor: (t) => interval.floor(coerceDate(t))});
+}
+
 export function maybeTimeInterval(interval) {
   const i = timeIntervals.get(`${interval}`.toLowerCase());
   if (!i) throw new Error(`unknown interval: ${interval}`);
-  return i;
+  return isoInterval(i);
 }
 
 export function maybeUtcInterval(interval) {
   const i = utcIntervals.get(`${interval}`.toLowerCase());
   if (!i) throw new Error(`unknown interval: ${interval}`);
-  return i;
+  return isoInterval(i);
 }

src/transforms/bin.js

@@ -13,6 +13,8 @@ import {
   identity,
   coerceDate,
   coerceNumbers,
+  isInterval,
+  isTimeInterval,
   maybeColumn,
   maybeInterval,
   maybeTuple,
@@ -333,14 +335,6 @@ function isTimeThresholds(t) {
   return isTimeInterval(t) || (isIterable(t) && isTemporal(t));
 }
 
-function isTimeInterval(t) {
-  return isInterval(t) && typeof t === "function" && t() instanceof Date;
-}
-
-function isInterval(t) {
-  return t ? typeof t.range === "function" : false;
-}
-
 function bing(EX, EY) {
   return EX && EY
     ? function* (I) {