graphein 0.16.1 → 0.16.2

package/dist/index.js

@@ -219,35 +219,43 @@ function fixedDuration(interval) {
   }
 }
 function floorFixed(value, interval) {
-  const duration = fixedDuration(interval);
-  if (interval.unit !== "week") {
-    return Math.floor(value / duration) * duration;
-  }
   const date = new Date(value);
-  const midnight = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate());
-  const day = new Date(midnight).getUTCDay();
-  const weekStart = midnight - day * DAY;
-  return weekStart - Math.floor((weekStart % duration + duration) % duration);
+  if (interval.unit === "day") {
+    return new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime();
+  }
+  if (interval.unit === "week") {
+    const day = date.getDay();
+    return new Date(date.getFullYear(), date.getMonth(), date.getDate() - day).getTime();
+  }
+  const duration = fixedDuration(interval);
+  return Math.floor(value / duration) * duration;
 }
 function addFixed(value, interval) {
+  const date = new Date(value);
+  if (interval.unit === "day") {
+    return new Date(date.getFullYear(), date.getMonth(), date.getDate() + interval.step).getTime();
+  }
+  if (interval.unit === "week") {
+    return new Date(date.getFullYear(), date.getMonth(), date.getDate() + 7 * interval.step).getTime();
+  }
   return value + fixedDuration(interval);
 }
 function floorMonth(value, step) {
   const date = new Date(value);
-  const month = Math.floor(date.getUTCMonth() / step) * step;
-  return Date.UTC(date.getUTCFullYear(), month, 1);
+  const month = Math.floor(date.getMonth() / step) * step;
+  return new Date(date.getFullYear(), month, 1).getTime();
 }
 function floorYear(value, step) {
   const date = new Date(value);
-  const year = Math.floor(date.getUTCFullYear() / step) * step;
-  return Date.UTC(year, 0, 1);
+  const year = Math.floor(date.getFullYear() / step) * step;
+  return new Date(year, 0, 1).getTime();
 }
 function addCalendar(value, interval) {
   const date = new Date(value);
   if (interval.unit === "month") {
-    return Date.UTC(date.getUTCFullYear(), date.getUTCMonth() + interval.step, 1);
+    return new Date(date.getFullYear(), date.getMonth() + interval.step, 1).getTime();
   }
-  return Date.UTC(date.getUTCFullYear() + interval.step, 0, 1);
+  return new Date(date.getFullYear() + interval.step, 0, 1).getTime();
 }
 function floorTime(value, interval) {
   if (interval.unit === "month") {
@@ -295,17 +303,17 @@ function timeTickFormat(values) {
   const span = ordered.length > 1 ? Math.abs(ordered[1] - ordered[0]) : 0;
   return (time) => {
     const date = new Date(time);
-    const year = date.getUTCFullYear();
-    const month = MONTH_NAMES[date.getUTCMonth()];
-    const day = date.getUTCDate();
-    const hours = pad2(date.getUTCHours());
-    const minutes = pad2(date.getUTCMinutes());
-    const seconds = pad2(date.getUTCSeconds());
+    const year = date.getFullYear();
+    const month = MONTH_NAMES[date.getMonth()];
+    const day = date.getDate();
+    const hours = pad2(date.getHours());
+    const minutes = pad2(date.getMinutes());
+    const seconds = pad2(date.getSeconds());
     if (span >= YEAR * 0.8) {
       return String(year);
     }
     if (span >= MONTH * 0.8) {
-      return ordered.some((tick) => new Date(tick).getUTCFullYear() !== year) ? `${month} ${year}` : month;
+      return ordered.some((tick) => new Date(tick).getFullYear() !== year) ? `${month} ${year}` : month;
     }
     if (span >= DAY * 0.8) {
       return `${month} ${day}`;