vega-time 2.1.0 → 2.1.2

package/build/vega-time.js

@@ -19,8 +19,9 @@
   const UNITS = TIME_UNITS.reduce((o, u, i) => (o[u] = 1 + i, o), {});
   function timeUnits(units) {
     const u = vegaUtil.array(units).slice(),
-          m = {}; // check validity
+      m = {};
 
+    // check validity
     if (!u.length) vegaUtil.error('Missing time unit.');
     u.forEach(unit => {
       if (vegaUtil.hasOwnProperty(UNITS, unit)) {
@@ -30,12 +31,11 @@
       }
     });
     const numTypes = (m[WEEK] || m[DAY] ? 1 : 0) + (m[QUARTER] || m[MONTH] || m[DATE] ? 1 : 0) + (m[DAYOFYEAR] ? 1 : 0);
-
     if (numTypes > 1) {
       vegaUtil.error(`Incompatible time units: ${units}`);
-    } // ensure proper sort order
-
+    }
 
+    // ensure proper sort order
     u.sort((a, b) => UNITS[a] - UNITS[b]);
     return u;
   }
@@ -57,17 +57,15 @@
   };
   function timeUnitSpecifier(units, specifiers) {
     const s = vegaUtil.extend({}, defaultSpecifiers, specifiers),
-          u = timeUnits(units),
-          n = u.length;
+      u = timeUnits(units),
+      n = u.length;
     let fmt = '',
-        start = 0,
-        end,
-        key;
-
+      start = 0,
+      end,
+      key;
     for (start = 0; start < n;) {
       for (end = u.length; end > start; --end) {
         key = u.slice(start, end).join('-');
-
         if (s[key] != null) {
           fmt += s[key];
           start = end;
@@ -75,104 +73,87 @@
         }
       }
     }
-
     return fmt.trim();
   }
 
-  var t0$1 = new Date(),
-      t1 = new Date();
-  function newInterval(floori, offseti, count, field) {
+  const t0$1 = new Date(),
+    t1 = new Date();
+  function timeInterval$1(floori, offseti, count, field) {
     function interval(date) {
       return floori(date = arguments.length === 0 ? new Date() : new Date(+date)), date;
     }
-
-    interval.floor = function (date) {
+    interval.floor = date => {
       return floori(date = new Date(+date)), date;
     };
-
-    interval.ceil = function (date) {
+    interval.ceil = date => {
       return floori(date = new Date(date - 1)), offseti(date, 1), floori(date), date;
     };
-
-    interval.round = function (date) {
-      var d0 = interval(date),
-          d1 = interval.ceil(date);
+    interval.round = date => {
+      const d0 = interval(date),
+        d1 = interval.ceil(date);
       return date - d0 < d1 - date ? d0 : d1;
     };
-
-    interval.offset = function (date, step) {
+    interval.offset = (date, step) => {
       return offseti(date = new Date(+date), step == null ? 1 : Math.floor(step)), date;
     };
-
-    interval.range = function (start, stop, step) {
-      var range = [],
-          previous;
+    interval.range = (start, stop, step) => {
+      const range = [];
       start = interval.ceil(start);
       step = step == null ? 1 : Math.floor(step);
       if (!(start < stop) || !(step > 0)) return range; // also handles Invalid Date
-
+      let previous;
       do range.push(previous = new Date(+start)), offseti(start, step), floori(start); while (previous < start && start < stop);
-
       return range;
     };
-
-    interval.filter = function (test) {
-      return newInterval(function (date) {
+    interval.filter = test => {
+      return timeInterval$1(date => {
         if (date >= date) while (floori(date), !test(date)) date.setTime(date - 1);
-      }, function (date, step) {
+      }, (date, step) => {
         if (date >= date) {
           if (step < 0) while (++step <= 0) {
             while (offseti(date, -1), !test(date)) {} // eslint-disable-line no-empty
-
           } else while (--step >= 0) {
             while (offseti(date, +1), !test(date)) {} // eslint-disable-line no-empty
-
           }
         }
       });
     };
-
     if (count) {
-      interval.count = function (start, end) {
+      interval.count = (start, end) => {
         t0$1.setTime(+start), t1.setTime(+end);
         floori(t0$1), floori(t1);
         return Math.floor(count(t0$1, t1));
       };
-
-      interval.every = function (step) {
+      interval.every = step => {
         step = Math.floor(step);
-        return !isFinite(step) || !(step > 0) ? null : !(step > 1) ? interval : interval.filter(field ? function (d) {
-          return field(d) % step === 0;
-        } : function (d) {
-          return interval.count(0, d) % step === 0;
-        });
+        return !isFinite(step) || !(step > 0) ? null : !(step > 1) ? interval : interval.filter(field ? d => field(d) % step === 0 : d => interval.count(0, d) % step === 0);
       };
     }
-
     return interval;
   }
 
-  var millisecond = newInterval(function () {// noop
-  }, function (date, step) {
+  const millisecond = timeInterval$1(() => {
+    // noop
+  }, (date, step) => {
     date.setTime(+date + step);
-  }, function (start, end) {
+  }, (start, end) => {
     return end - start;
-  }); // An optimized implementation for this simple case.
+  });
 
-  millisecond.every = function (k) {
+  // An optimized implementation for this simple case.
+  millisecond.every = k => {
     k = Math.floor(k);
     if (!isFinite(k) || !(k > 0)) return null;
     if (!(k > 1)) return millisecond;
-    return newInterval(function (date) {
+    return timeInterval$1(date => {
       date.setTime(Math.floor(date / k) * k);
-    }, function (date, step) {
+    }, (date, step) => {
       date.setTime(+date + step * k);
-    }, function (start, end) {
+    }, (start, end) => {
       return (end - start) / k;
     });
   };
-
-  var utcMillisecond = millisecond;
+  millisecond.range;
 
   const durationSecond$1 = 1000;
   const durationMinute$1 = durationSecond$1 * 60;
@@ -180,251 +161,296 @@
   const durationDay$1 = durationHour$1 * 24;
   const durationWeek$1 = durationDay$1 * 7;
 
-  var second = newInterval(function (date) {
+  const second = timeInterval$1(date => {
     date.setTime(date - date.getMilliseconds());
-  }, function (date, step) {
+  }, (date, step) => {
     date.setTime(+date + step * durationSecond$1);
-  }, function (start, end) {
+  }, (start, end) => {
     return (end - start) / durationSecond$1;
-  }, function (date) {
+  }, date => {
     return date.getUTCSeconds();
   });
-  var utcSecond = second;
+  second.range;
 
-  var minute = newInterval(function (date) {
+  const timeMinute = timeInterval$1(date => {
     date.setTime(date - date.getMilliseconds() - date.getSeconds() * durationSecond$1);
-  }, function (date, step) {
+  }, (date, step) => {
     date.setTime(+date + step * durationMinute$1);
-  }, function (start, end) {
+  }, (start, end) => {
     return (end - start) / durationMinute$1;
-  }, function (date) {
+  }, date => {
     return date.getMinutes();
   });
-  var timeMinute = minute;
+  timeMinute.range;
+  const utcMinute = timeInterval$1(date => {
+    date.setUTCSeconds(0, 0);
+  }, (date, step) => {
+    date.setTime(+date + step * durationMinute$1);
+  }, (start, end) => {
+    return (end - start) / durationMinute$1;
+  }, date => {
+    return date.getUTCMinutes();
+  });
+  utcMinute.range;
 
-  var hour = newInterval(function (date) {
+  const timeHour = timeInterval$1(date => {
     date.setTime(date - date.getMilliseconds() - date.getSeconds() * durationSecond$1 - date.getMinutes() * durationMinute$1);
-  }, function (date, step) {
+  }, (date, step) => {
     date.setTime(+date + step * durationHour$1);
-  }, function (start, end) {
+  }, (start, end) => {
     return (end - start) / durationHour$1;
-  }, function (date) {
+  }, date => {
     return date.getHours();
   });
-  var timeHour = hour;
+  timeHour.range;
+  const utcHour = timeInterval$1(date => {
+    date.setUTCMinutes(0, 0, 0);
+  }, (date, step) => {
+    date.setTime(+date + step * durationHour$1);
+  }, (start, end) => {
+    return (end - start) / durationHour$1;
+  }, date => {
+    return date.getUTCHours();
+  });
+  utcHour.range;
 
-  var day = newInterval(date => date.setHours(0, 0, 0, 0), (date, step) => date.setDate(date.getDate() + step), (start, end) => (end - start - (end.getTimezoneOffset() - start.getTimezoneOffset()) * durationMinute$1) / durationDay$1, date => date.getDate() - 1);
-  var timeDay = day;
+  const timeDay = timeInterval$1(date => date.setHours(0, 0, 0, 0), (date, step) => date.setDate(date.getDate() + step), (start, end) => (end - start - (end.getTimezoneOffset() - start.getTimezoneOffset()) * durationMinute$1) / durationDay$1, date => date.getDate() - 1);
+  timeDay.range;
+  const utcDay = timeInterval$1(date => {
+    date.setUTCHours(0, 0, 0, 0);
+  }, (date, step) => {
+    date.setUTCDate(date.getUTCDate() + step);
+  }, (start, end) => {
+    return (end - start) / durationDay$1;
+  }, date => {
+    return date.getUTCDate() - 1;
+  });
+  utcDay.range;
+  const unixDay = timeInterval$1(date => {
+    date.setUTCHours(0, 0, 0, 0);
+  }, (date, step) => {
+    date.setUTCDate(date.getUTCDate() + step);
+  }, (start, end) => {
+    return (end - start) / durationDay$1;
+  }, date => {
+    return Math.floor(date / durationDay$1);
+  });
+  unixDay.range;
 
-  function weekday$1(i) {
-    return newInterval(function (date) {
+  function timeWeekday(i) {
+    return timeInterval$1(date => {
       date.setDate(date.getDate() - (date.getDay() + 7 - i) % 7);
       date.setHours(0, 0, 0, 0);
-    }, function (date, step) {
+    }, (date, step) => {
       date.setDate(date.getDate() + step * 7);
-    }, function (start, end) {
+    }, (start, end) => {
       return (end - start - (end.getTimezoneOffset() - start.getTimezoneOffset()) * durationMinute$1) / durationWeek$1;
     });
   }
-
-  var sunday = weekday$1(0);
-  weekday$1(1);
-  weekday$1(2);
-  weekday$1(3);
-  weekday$1(4);
-  weekday$1(5);
-  weekday$1(6);
-
-  var month = newInterval(function (date) {
+  const timeSunday = timeWeekday(0);
+  const timeMonday = timeWeekday(1);
+  const timeTuesday = timeWeekday(2);
+  const timeWednesday = timeWeekday(3);
+  const timeThursday = timeWeekday(4);
+  const timeFriday = timeWeekday(5);
+  const timeSaturday = timeWeekday(6);
+  timeSunday.range;
+  timeMonday.range;
+  timeTuesday.range;
+  timeWednesday.range;
+  timeThursday.range;
+  timeFriday.range;
+  timeSaturday.range;
+  function utcWeekday(i) {
+    return timeInterval$1(date => {
+      date.setUTCDate(date.getUTCDate() - (date.getUTCDay() + 7 - i) % 7);
+      date.setUTCHours(0, 0, 0, 0);
+    }, (date, step) => {
+      date.setUTCDate(date.getUTCDate() + step * 7);
+    }, (start, end) => {
+      return (end - start) / durationWeek$1;
+    });
+  }
+  const utcSunday = utcWeekday(0);
+  const utcMonday = utcWeekday(1);
+  const utcTuesday = utcWeekday(2);
+  const utcWednesday = utcWeekday(3);
+  const utcThursday = utcWeekday(4);
+  const utcFriday = utcWeekday(5);
+  const utcSaturday = utcWeekday(6);
+  utcSunday.range;
+  utcMonday.range;
+  utcTuesday.range;
+  utcWednesday.range;
+  utcThursday.range;
+  utcFriday.range;
+  utcSaturday.range;
+
+  const timeMonth = timeInterval$1(date => {
     date.setDate(1);
     date.setHours(0, 0, 0, 0);
-  }, function (date, step) {
+  }, (date, step) => {
     date.setMonth(date.getMonth() + step);
-  }, function (start, end) {
+  }, (start, end) => {
     return end.getMonth() - start.getMonth() + (end.getFullYear() - start.getFullYear()) * 12;
-  }, function (date) {
+  }, date => {
     return date.getMonth();
   });
-  var timeMonth = month;
+  timeMonth.range;
+  const utcMonth = timeInterval$1(date => {
+    date.setUTCDate(1);
+    date.setUTCHours(0, 0, 0, 0);
+  }, (date, step) => {
+    date.setUTCMonth(date.getUTCMonth() + step);
+  }, (start, end) => {
+    return end.getUTCMonth() - start.getUTCMonth() + (end.getUTCFullYear() - start.getUTCFullYear()) * 12;
+  }, date => {
+    return date.getUTCMonth();
+  });
+  utcMonth.range;
 
-  var year = newInterval(function (date) {
+  const timeYear = timeInterval$1(date => {
     date.setMonth(0, 1);
     date.setHours(0, 0, 0, 0);
-  }, function (date, step) {
+  }, (date, step) => {
     date.setFullYear(date.getFullYear() + step);
-  }, function (start, end) {
+  }, (start, end) => {
     return end.getFullYear() - start.getFullYear();
-  }, function (date) {
+  }, date => {
     return date.getFullYear();
-  }); // An optimized implementation for this simple case.
+  });
 
-  year.every = function (k) {
-    return !isFinite(k = Math.floor(k)) || !(k > 0) ? null : newInterval(function (date) {
+  // An optimized implementation for this simple case.
+  timeYear.every = k => {
+    return !isFinite(k = Math.floor(k)) || !(k > 0) ? null : timeInterval$1(date => {
       date.setFullYear(Math.floor(date.getFullYear() / k) * k);
       date.setMonth(0, 1);
       date.setHours(0, 0, 0, 0);
-    }, function (date, step) {
+    }, (date, step) => {
       date.setFullYear(date.getFullYear() + step * k);
     });
   };
-
-  var timeYear = year;
-
-  var utcMinute = newInterval(function (date) {
-    date.setUTCSeconds(0, 0);
-  }, function (date, step) {
-    date.setTime(+date + step * durationMinute$1);
-  }, function (start, end) {
-    return (end - start) / durationMinute$1;
-  }, function (date) {
-    return date.getUTCMinutes();
-  });
-  var utcMinute$1 = utcMinute;
-
-  var utcHour = newInterval(function (date) {
-    date.setUTCMinutes(0, 0, 0);
-  }, function (date, step) {
-    date.setTime(+date + step * durationHour$1);
-  }, function (start, end) {
-    return (end - start) / durationHour$1;
-  }, function (date) {
-    return date.getUTCHours();
-  });
-  var utcHour$1 = utcHour;
-
-  var utcDay = newInterval(function (date) {
-    date.setUTCHours(0, 0, 0, 0);
-  }, function (date, step) {
-    date.setUTCDate(date.getUTCDate() + step);
-  }, function (start, end) {
-    return (end - start) / durationDay$1;
-  }, function (date) {
-    return date.getUTCDate() - 1;
-  });
-  var utcDay$1 = utcDay;
-
-  function utcWeekday(i) {
-    return newInterval(function (date) {
-      date.setUTCDate(date.getUTCDate() - (date.getUTCDay() + 7 - i) % 7);
-      date.setUTCHours(0, 0, 0, 0);
-    }, function (date, step) {
-      date.setUTCDate(date.getUTCDate() + step * 7);
-    }, function (start, end) {
-      return (end - start) / durationWeek$1;
-    });
-  }
-
-  var utcSunday = utcWeekday(0);
-  utcWeekday(1);
-  utcWeekday(2);
-  utcWeekday(3);
-  utcWeekday(4);
-  utcWeekday(5);
-  utcWeekday(6);
-
-  var utcMonth = newInterval(function (date) {
-    date.setUTCDate(1);
-    date.setUTCHours(0, 0, 0, 0);
-  }, function (date, step) {
-    date.setUTCMonth(date.getUTCMonth() + step);
-  }, function (start, end) {
-    return end.getUTCMonth() - start.getUTCMonth() + (end.getUTCFullYear() - start.getUTCFullYear()) * 12;
-  }, function (date) {
-    return date.getUTCMonth();
-  });
-  var utcMonth$1 = utcMonth;
-
-  var utcYear = newInterval(function (date) {
+  timeYear.range;
+  const utcYear = timeInterval$1(date => {
     date.setUTCMonth(0, 1);
     date.setUTCHours(0, 0, 0, 0);
-  }, function (date, step) {
+  }, (date, step) => {
     date.setUTCFullYear(date.getUTCFullYear() + step);
-  }, function (start, end) {
+  }, (start, end) => {
     return end.getUTCFullYear() - start.getUTCFullYear();
-  }, function (date) {
+  }, date => {
     return date.getUTCFullYear();
-  }); // An optimized implementation for this simple case.
+  });
 
-  utcYear.every = function (k) {
-    return !isFinite(k = Math.floor(k)) || !(k > 0) ? null : newInterval(function (date) {
+  // An optimized implementation for this simple case.
+  utcYear.every = k => {
+    return !isFinite(k = Math.floor(k)) || !(k > 0) ? null : timeInterval$1(date => {
       date.setUTCFullYear(Math.floor(date.getUTCFullYear() / k) * k);
       date.setUTCMonth(0, 1);
       date.setUTCHours(0, 0, 0, 0);
-    }, function (date, step) {
+    }, (date, step) => {
       date.setUTCFullYear(date.getUTCFullYear() + step * k);
     });
   };
-
-  var utcYear$1 = utcYear;
+  utcYear.range;
 
   function ascending(a, b) {
     return a == null || b == null ? NaN : a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
   }
 
+  function descending(a, b) {
+    return a == null || b == null ? NaN : b < a ? -1 : b > a ? 1 : b >= a ? 0 : NaN;
+  }
+
   function bisector(f) {
-    let delta = f;
-    let compare1 = f;
-    let compare2 = f;
+    let compare1, compare2, delta;
 
+    // If an accessor is specified, promote it to a comparator. In this case we
+    // can test whether the search value is (self-) comparable. We can’t do this
+    // for a comparator (except for specific, known comparators) because we can’t
+    // tell if the comparator is symmetric, and an asymmetric comparator can’t be
+    // used to test whether a single value is comparable.
     if (f.length !== 2) {
-      delta = (d, x) => f(d) - x;
-
       compare1 = ascending;
-
       compare2 = (d, x) => ascending(f(d), x);
+      delta = (d, x) => f(d) - x;
+    } else {
+      compare1 = f === ascending || f === descending ? f : zero;
+      compare2 = f;
+      delta = f;
     }
-
     function left(a, x, lo = 0, hi = a.length) {
       if (lo < hi) {
         if (compare1(x, x) !== 0) return hi;
-
         do {
           const mid = lo + hi >>> 1;
           if (compare2(a[mid], x) < 0) lo = mid + 1;else hi = mid;
         } while (lo < hi);
       }
-
       return lo;
     }
-
     function right(a, x, lo = 0, hi = a.length) {
       if (lo < hi) {
         if (compare1(x, x) !== 0) return hi;
-
         do {
           const mid = lo + hi >>> 1;
           if (compare2(a[mid], x) <= 0) lo = mid + 1;else hi = mid;
         } while (lo < hi);
       }
-
       return lo;
     }
-
     function center(a, x, lo = 0, hi = a.length) {
       const i = left(a, x, lo, hi - 1);
       return i > lo && delta(a[i - 1], x) > -delta(a[i], x) ? i - 1 : i;
     }
-
     return {
       left,
       center,
       right
     };
   }
-
-  var e10 = Math.sqrt(50),
-      e5 = Math.sqrt(10),
-      e2 = Math.sqrt(2);
+  function zero() {
+    return 0;
+  }
+
+  const e10 = Math.sqrt(50),
+    e5 = Math.sqrt(10),
+    e2 = Math.sqrt(2);
+  function tickSpec(start, stop, count) {
+    const step = (stop - start) / Math.max(0, count),
+      power = Math.floor(Math.log10(step)),
+      error = step / Math.pow(10, power),
+      factor = error >= e10 ? 10 : error >= e5 ? 5 : error >= e2 ? 2 : 1;
+    let i1, i2, inc;
+    if (power < 0) {
+      inc = Math.pow(10, -power) / factor;
+      i1 = Math.round(start * inc);
+      i2 = Math.round(stop * inc);
+      if (i1 / inc < start) ++i1;
+      if (i2 / inc > stop) --i2;
+      inc = -inc;
+    } else {
+      inc = Math.pow(10, power) * factor;
+      i1 = Math.round(start / inc);
+      i2 = Math.round(stop / inc);
+      if (i1 * inc < start) ++i1;
+      if (i2 * inc > stop) --i2;
+    }
+    if (i2 < i1 && 0.5 <= count && count < 2) return tickSpec(start, stop, count * 2);
+    return [i1, i2, inc];
+  }
+  function tickIncrement(start, stop, count) {
+    stop = +stop, start = +start, count = +count;
+    return tickSpec(start, stop, count)[2];
+  }
   function tickStep(start, stop, count) {
-    var step0 = Math.abs(stop - start) / Math.max(0, count),
-        step1 = Math.pow(10, Math.floor(Math.log(step0) / Math.LN10)),
-        error = step0 / step1;
-    if (error >= e10) step1 *= 10;else if (error >= e5) step1 *= 5;else if (error >= e2) step1 *= 2;
-    return stop < start ? -step1 : step1;
+    stop = +stop, start = +start, count = +count;
+    const reverse = stop < start,
+      inc = reverse ? tickIncrement(stop, start, count) : tickIncrement(start, stop, count);
+    return (reverse ? -1 : 1) * (inc < 0 ? 1 / -inc : inc);
   }
 
   const t0 = new Date();
-
   function localYear(y) {
     t0.setFullYear(y);
     t0.setMonth(0);
@@ -432,7 +458,6 @@
     t0.setHours(0, 0, 0, 0);
     return t0;
   }
-
   function dayofyear(d) {
     return localDayOfYear(new Date(d));
   }
@@ -443,7 +468,7 @@
     return timeDay.count(localYear(d.getFullYear()) - 1, d);
   }
   function localWeekNum(d) {
-    return sunday.count(localYear(d.getFullYear()) - 1, d);
+    return timeSunday.count(localYear(d.getFullYear()) - 1, d);
   }
   function localFirst(y) {
     return localYear(y).getDay();
@@ -454,7 +479,6 @@
       date.setFullYear(y);
       return date;
     }
-
     return new Date(y, m, d, H, M, S, L);
   }
   function utcdayofyear(d) {
@@ -465,7 +489,7 @@
   }
   function utcDayOfYear(d) {
     const y = Date.UTC(d.getUTCFullYear(), 0, 1);
-    return utcDay$1.count(y - 1, d);
+    return utcDay.count(y - 1, d);
   }
   function utcWeekNum(d) {
     const y = Date.UTC(d.getUTCFullYear(), 0, 1);
@@ -481,45 +505,43 @@
       date.setUTCFullYear(d.y);
       return date;
     }
-
     return new Date(Date.UTC(y, m, d, H, M, S, L));
   }
 
   function floor(units, step, get, inv, newDate) {
     const s = step || 1,
-          b = vegaUtil.peek(units),
-          _ = (unit, p, key) => {
-      key = key || unit;
-      return getUnit(get[key], inv[key], unit === b && s, p);
-    };
-
+      b = vegaUtil.peek(units),
+      _ = (unit, p, key) => {
+        key = key || unit;
+        return getUnit(get[key], inv[key], unit === b && s, p);
+      };
     const t = new Date(),
-          u = vegaUtil.toSet(units),
-          y = u[YEAR] ? _(YEAR) : vegaUtil.constant(2012),
-          m = u[MONTH] ? _(MONTH) : u[QUARTER] ? _(QUARTER) : vegaUtil.zero,
-          d = u[WEEK] && u[DAY] ? _(DAY, 1, WEEK + DAY) : u[WEEK] ? _(WEEK, 1) : u[DAY] ? _(DAY, 1) : u[DATE] ? _(DATE, 1) : u[DAYOFYEAR] ? _(DAYOFYEAR, 1) : vegaUtil.one,
-          H = u[HOURS] ? _(HOURS) : vegaUtil.zero,
-          M = u[MINUTES] ? _(MINUTES) : vegaUtil.zero,
-          S = u[SECONDS] ? _(SECONDS) : vegaUtil.zero,
-          L = u[MILLISECONDS] ? _(MILLISECONDS) : vegaUtil.zero;
+      u = vegaUtil.toSet(units),
+      y = u[YEAR] ? _(YEAR) : vegaUtil.constant(2012),
+      m = u[MONTH] ? _(MONTH) : u[QUARTER] ? _(QUARTER) : vegaUtil.zero,
+      d = u[WEEK] && u[DAY] ? _(DAY, 1, WEEK + DAY) : u[WEEK] ? _(WEEK, 1) : u[DAY] ? _(DAY, 1) : u[DATE] ? _(DATE, 1) : u[DAYOFYEAR] ? _(DAYOFYEAR, 1) : vegaUtil.one,
+      H = u[HOURS] ? _(HOURS) : vegaUtil.zero,
+      M = u[MINUTES] ? _(MINUTES) : vegaUtil.zero,
+      S = u[SECONDS] ? _(SECONDS) : vegaUtil.zero,
+      L = u[MILLISECONDS] ? _(MILLISECONDS) : vegaUtil.zero;
     return function (v) {
       t.setTime(+v);
       const year = y(t);
       return newDate(year, m(t), d(t, year), H(t), M(t), S(t), L(t));
     };
   }
-
   function getUnit(f, inv, step, phase) {
     const u = step <= 1 ? f : phase ? (d, y) => phase + step * Math.floor((f(d, y) - phase) / step) : (d, y) => step * Math.floor(f(d, y) / step);
     return inv ? (d, y) => inv(u(d, y), y) : u;
-  } // returns the day of the year based on week number, day of week,
-  // and the day of the week for the first day of the year
-
+  }
 
+  // returns the day of the year based on week number, day of week,
+  // and the day of the week for the first day of the year
   function weekday(week, day, firstDay) {
     return day + week * 7 - (firstDay + 6) % 7;
-  } // -- LOCAL TIME --
+  }
 
+  // -- LOCAL TIME --
 
   const localGet = {
     [YEAR]: d => d.getFullYear(),
@@ -541,7 +563,9 @@
   };
   function timeFloor(units, step) {
     return floor(units, step || 1, localGet, localInv, localDate);
-  } // -- UTC TIME --
+  }
+
+  // -- UTC TIME --
 
   const utcGet = {
     [YEAR]: d => d.getUTCFullYear(),
@@ -569,27 +593,27 @@
     [YEAR]: timeYear,
     [QUARTER]: timeMonth.every(3),
     [MONTH]: timeMonth,
-    [WEEK]: sunday,
+    [WEEK]: timeSunday,
     [DATE]: timeDay,
     [DAY]: timeDay,
     [DAYOFYEAR]: timeDay,
     [HOURS]: timeHour,
     [MINUTES]: timeMinute,
-    [SECONDS]: utcSecond,
-    [MILLISECONDS]: utcMillisecond
+    [SECONDS]: second,
+    [MILLISECONDS]: millisecond
   };
   const utcIntervals = {
-    [YEAR]: utcYear$1,
-    [QUARTER]: utcMonth$1.every(3),
-    [MONTH]: utcMonth$1,
+    [YEAR]: utcYear,
+    [QUARTER]: utcMonth.every(3),
+    [MONTH]: utcMonth,
     [WEEK]: utcSunday,
-    [DATE]: utcDay$1,
-    [DAY]: utcDay$1,
-    [DAYOFYEAR]: utcDay$1,
-    [HOURS]: utcHour$1,
-    [MINUTES]: utcMinute$1,
-    [SECONDS]: utcSecond,
-    [MILLISECONDS]: utcMillisecond
+    [DATE]: utcDay,
+    [DAY]: utcDay,
+    [DAYOFYEAR]: utcDay,
+    [HOURS]: utcHour,
+    [MINUTES]: utcMinute,
+    [SECONDS]: second,
+    [MILLISECONDS]: millisecond
   };
   function timeInterval(unit) {
     return timeIntervals[unit];
@@ -597,22 +621,18 @@
   function utcInterval(unit) {
     return utcIntervals[unit];
   }
-
   function offset(ival, date, step) {
     return ival ? ival.offset(date, step) : undefined;
   }
-
   function timeOffset(unit, date, step) {
     return offset(timeInterval(unit), date, step);
   }
   function utcOffset(unit, date, step) {
     return offset(utcInterval(unit), date, step);
   }
-
   function sequence(ival, start, stop, step) {
     return ival ? ival.range(start, stop, step) : undefined;
   }
-
   function timeSequence(unit, start, stop, step) {
     return sequence(timeInterval(unit), start, stop, step);
   }
@@ -621,29 +641,28 @@
   }
 
   const durationSecond = 1000,
-        durationMinute = durationSecond * 60,
-        durationHour = durationMinute * 60,
-        durationDay = durationHour * 24,
-        durationWeek = durationDay * 7,
-        durationMonth = durationDay * 30,
-        durationYear = durationDay * 365;
+    durationMinute = durationSecond * 60,
+    durationHour = durationMinute * 60,
+    durationDay = durationHour * 24,
+    durationWeek = durationDay * 7,
+    durationMonth = durationDay * 30,
+    durationYear = durationDay * 365;
   const Milli = [YEAR, MONTH, DATE, HOURS, MINUTES, SECONDS, MILLISECONDS],
-        Seconds = Milli.slice(0, -1),
-        Minutes = Seconds.slice(0, -1),
-        Hours = Minutes.slice(0, -1),
-        Day = Hours.slice(0, -1),
-        Week = [YEAR, WEEK],
-        Month = [YEAR, MONTH],
-        Year = [YEAR];
+    Seconds = Milli.slice(0, -1),
+    Minutes = Seconds.slice(0, -1),
+    Hours = Minutes.slice(0, -1),
+    Day = Hours.slice(0, -1),
+    Week = [YEAR, WEEK],
+    Month = [YEAR, MONTH],
+    Year = [YEAR];
   const intervals = [[Seconds, 1, durationSecond], [Seconds, 5, 5 * durationSecond], [Seconds, 15, 15 * durationSecond], [Seconds, 30, 30 * durationSecond], [Minutes, 1, durationMinute], [Minutes, 5, 5 * durationMinute], [Minutes, 15, 15 * durationMinute], [Minutes, 30, 30 * durationMinute], [Hours, 1, durationHour], [Hours, 3, 3 * durationHour], [Hours, 6, 6 * durationHour], [Hours, 12, 12 * durationHour], [Day, 1, durationDay], [Week, 1, durationWeek], [Month, 1, durationMonth], [Month, 3, 3 * durationMonth], [Year, 1, durationYear]];
   function bin (opt) {
     const ext = opt.extent,
-          max = opt.maxbins || 40,
-          target = Math.abs(vegaUtil.span(ext)) / max;
+      max = opt.maxbins || 40,
+      target = Math.abs(vegaUtil.span(ext)) / max;
     let i = bisector(i => i[2]).right(intervals, target),
-        units,
-        step;
-
+      units,
+      step;
     if (i === intervals.length) {
       units = Year, step = tickStep(ext[0] / durationYear, ext[1] / durationYear, max);
     } else if (i) {
@@ -654,7 +673,6 @@
       units = Milli;
       step = Math.max(tickStep(ext[0], ext[1], max), 1);
     }
-
     return {
       units,
       step
@@ -689,6 +707,4 @@
   exports.utcweek = utcweek;
   exports.week = week;
 
-  Object.defineProperty(exports, '__esModule', { value: true });
-
 }));