@miso.ai/server-commons 0.6.5-beta.15 → 0.6.5-beta.16

package/package.json

@@ -23,5 +23,5 @@
     "uuid": "^9.0.0",
     "yargs": "^17.5.1"
   },
-  "version": "0.6.5-beta.15"
+  "version": "0.6.5-beta.16"
 }

package/src/date.js

@@ -36,57 +36,142 @@ const RE_DATE_EXPR = /^(?:\d{4})|(?:\d{4}-[Qq\d]\d)|(?:\d{4}-\d{2}-[Ww\d]\d)$/;
 // TODO: support hour, minute
 
 export function startOfDate(expr) {
+  return floorDate(expr);
+}
+
+export function endOfDate(expr) {
   if (expr === undefined) {
     return undefined;
   }
-  const parsed = parseDateExpr(expr);
-  switch (parsed.type) {
-    case 'ts':
-      return parsed.ts;
-    case 'year':
-      return Date.UTC(parsed.year);
-    case 'quarter':
-      return Date.UTC(parsed.year, (parsed.quarter - 1) * 3);
-    case 'month':
-      return Date.UTC(parsed.year, parsed.month - 1);
-    case 'week':
-      return Date.UTC(parsed.year, parsed.month - 1, (parsed.week - 1) * 7 + 1);
+  return nextDate(expr) - 1000; // 1 sec
+}
+
+export function floorDate(expr, unit) {
+  validateUnit(unit);
+  if (expr === undefined) {
+    return undefined;
+  }
+  const [_unit, ts] = parseDateExpr(expr);
+  if (unit === undefined || !isGranular(unit, _unit)) {
+    return ts;
+  }
+  return floorTimestamp(ts, unit);
+}
+
+function floorTimestamp(ts, unit) {
+  switch (unit) {
+    case 'millisecond':
+      return ts;
+    case 'second':
+      return ts - ts % TS_PER_UNIT.s;
+    case 'minute':
+      return ts - ts % TS_PER_UNIT.m;
+    case 'hour':
+      return ts - ts % TS_PER_UNIT.h;
     case 'day':
-      return Date.UTC(parsed.year, parsed.month - 1, parsed.day);
+      return ts - ts % TS_PER_UNIT.d;
+  }
+  const d = new Date(ts);
+  const year = d.getUTCFullYear();
+  const month = d.getUTCMonth() + 1;
+  const day = d.getUTCDate();
+  switch (unit) {
+    case 'week':
+      return Date.UTC(year, month - 1, day > 21 ? 22 : day - (day - 1) % 7);
+    case 'month':
+      return Date.UTC(year, month - 1);
+    case 'quarter':
+      return Date.UTC(year, month - month % 3);
+    case 'year':
+      return Date.UTC(year);
     default:
-      throw new Error(`Unrecognized date: ${expr}`);
+      throw new Error(`Unrecognized unit: ${unit}`);
   }
 }
 
-export function nextOfDate(expr) {
+export function ceilDate(expr, unit) {
+  validateUnit(unit);
   if (expr === undefined) {
     return undefined;
   }
-  const parsed = parseDateExpr(expr);
-  switch (parsed.type) {
-    case 'ts':
-      return parsed.ts + 1;
-    case 'year':
-      return Date.UTC(parsed.year + 1);
-    case 'quarter':
-      return Date.UTC(parsed.year, parsed.quarter * 3);
-    case 'month':
-      return Date.UTC(parsed.year, parsed.month);
-    case 'week':
-      // roll over to 1st of next month if week is 4
-      return Date.UTC(parsed.year, parsed.week < 4 ? parsed.month - 1 : parsed.month, (parsed.week % 4) * 7 + 1);
+  const [_unit, ts] = parseDateExpr(expr);
+  return ceilTimestamp(ts, unit || _unit);
+}
+
+function ceilTimestamp(ts, unit) {
+  switch (unit) {
+    case 'millisecond':
+      return ts;
+    case 'second':
+      return ts + TS_PER_UNIT.s - ts % TS_PER_UNIT.s;
+    case 'minute':
+      return ts + TS_PER_UNIT.m - ts % TS_PER_UNIT.m;
+    case 'hour':
+      return ts + TS_PER_UNIT.h - ts % TS_PER_UNIT.h;
     case 'day':
-      return Date.UTC(parsed.year, parsed.month - 1, parsed.day + 1);
+      return ts + TS_PER_UNIT.d - ts % TS_PER_UNIT.d;
+  }
+  const d = new Date(ts);
+  const year = d.getUTCFullYear();
+  const month = d.getUTCMonth() + 1;
+  const day = d.getUTCDate();
+  switch (unit) {
+    case 'week':
+      return day > 21 ? Date.UTC(year, month, 1) : Date.UTC(year, month - 1, day - (day - 1) % 7 + 7);
+    case 'month':
+      return Date.UTC(year, month, 1);
+    case 'quarter':
+      return Date.UTC(year, month - month % 3 + 3);
+    case 'year':
+      return Date.UTC(year + 1);
     default:
-      throw new Error(`Unrecognized date: ${expr}`);
+      throw new Error(`Unrecognized unit: ${unit}`);
   }
 }
 
-export function endOfDate(expr) {
+export function nextDate(expr, unit) {
+  validateUnit(unit);
+  if (expr === undefined) {
+    return undefined;
+  }
+  const [_unit, ts] = parseDateExpr(expr);
+  return ceilTimestamp(ts + 1, unit || _unit);
+}
+
+export function prevDate(expr, unit) {
+  validateUnit(unit);
   if (expr === undefined) {
     return undefined;
   }
-  return nextOfDate(expr) - 1000; // 1 sec
+  const [_unit, ts] = parseDateExpr(expr);
+  return floorTimestamp(ts - 1, unit || _unit);
+}
+
+
+
+const UNIT_GRANULARITY = {
+  'millisecond': 10,
+  'second': 9,
+  'minute': 8,
+  'hour': 7,
+  'day': 6,
+  'week': 5,
+  'month': 4,
+  'quarter': 3,
+  'year': 2,
+};
+
+function validateUnit(unit) {
+  if (unit === undefined) {
+    return;
+  }
+  if (typeof unit !== 'string' || !UNIT_GRANULARITY[unit]) {
+    throw new Error(`Unrecognized unit: ${unit}`);
+  }
+}
+
+function isGranular(unit0, unit1) {
+  return UNIT_GRANULARITY[unit0] > UNIT_GRANULARITY[unit1];
 }
 
 function parseDateExpr(expr) {
@@ -95,7 +180,7 @@ function parseDateExpr(expr) {
       if (expr < 100) {
         throw new Error(`Unrecognized date: ${expr}`);
       }
-      return expr < 10000 ? { type: 'year', year: expr } : { type: 'ts', ts: expr };
+      return expr < 10000 ? ['year', Date.UTC(expr)] : ['millisecond', expr];
     case 'string':
       expr = expr.trim();
       const len = expr.length;
@@ -107,28 +192,28 @@ function parseDateExpr(expr) {
         throw new Error(`Unrecognized date: ${expr}`);
       }
       if (len === 4) {
-        return { type: 'year', year };
+        return ['year', Date.UTC(year)];
       }
       if (len === 7 && (expr.charAt(5) === 'Q' || expr.charAt(5) === 'q')) {
         const quarter = parseInt(expr.charAt(6), 10);
         if (isNaN(quarter) || quarter < 1 || quarter > 4) {
           throw new Error(`Unrecognized date: ${expr}`);
         }
-        return { type: 'quarter', year, quarter };
+        return ['quarter', Date.UTC(year, (quarter - 1) * 3)];
       }
       const month = parseInt(expr.slice(5, 7), 10);
       if (isNaN(month) || month < 1 || month > 12) {
         throw new Error(`Unrecognized date: ${expr}`);
       }
       if (len === 7) {
-        return { type: 'month', year, month };
+        return ['month', Date.UTC(year, month - 1)];
       }
       if (expr.charAt(8) === 'W' || expr.charAt(8) === 'w') {
         const week = parseInt(expr.charAt(9), 10);
         if (isNaN(week) || week < 1 || week > 4) {
           throw new Error(`Unrecognized date: ${expr}`);
         }
-        return { type: 'week', year, month, week };
+        return ['week', Date.UTC(year, month - 1, week * 7 - 6)];
       }
       let date;
       try {
@@ -137,7 +222,7 @@ function parseDateExpr(expr) {
       } catch (_) {
         throw new Error(`Unrecognized date: ${expr}`);
       }
-      return { type: 'day', year, month, day: date.getUTCDate() };
+      return ['day', Date.UTC(year, month - 1, date.getUTCDate())];
     default:
       throw new Error(`Unrecognized date: ${expr}`);
   }

package/test/date.test.js

@@ -2,30 +2,34 @@ import { test } from 'uvu';
 import * as assert from 'uvu/assert';
 import { startOfDate, endOfDate } from '../src/index.js';
 
+function testDateFn(fn, input, output) {
+  assert.equal(new Date(fn(input)).toISOString(), output, `${fn.name}(${input})`);
+}
+
 test('startOfDate', () => {
-  assert.equal(startOfDate('2025'), Date.parse('2025-01-01T00:00:00Z'));
-  assert.equal(startOfDate('2025-Q1'), Date.parse('2025-01-01T00:00:00Z'));
-  assert.equal(startOfDate('2025-q2'), Date.parse('2025-04-01T00:00:00Z'));
-  assert.equal(startOfDate('2025-Q3'), Date.parse('2025-07-01T00:00:00Z'));
-  assert.equal(startOfDate('2025-q4'), Date.parse('2025-10-01T00:00:00Z'));
-  assert.equal(startOfDate('2025-02'), Date.parse('2025-02-01T00:00:00Z'));
-  assert.equal(startOfDate('2025-02-W1'), Date.parse('2025-02-01T00:00:00Z'));
-  assert.equal(startOfDate('2025-02-w2'), Date.parse('2025-02-08T00:00:00Z'));
-  assert.equal(startOfDate('2025-02-03'), Date.parse('2025-02-03T00:00:00Z'));
+  testDateFn(startOfDate, '2025', '2025-01-01T00:00:00.000Z');
+  testDateFn(startOfDate, '2025-Q1', '2025-01-01T00:00:00.000Z');
+  testDateFn(startOfDate, '2025-q2', '2025-04-01T00:00:00.000Z');
+  testDateFn(startOfDate, '2025-Q3', '2025-07-01T00:00:00.000Z');
+  testDateFn(startOfDate, '2025-q4', '2025-10-01T00:00:00.000Z');
+  testDateFn(startOfDate, '2025-02', '2025-02-01T00:00:00.000Z');
+  testDateFn(startOfDate, '2025-02-W1', '2025-02-01T00:00:00.000Z');
+  testDateFn(startOfDate, '2025-02-w2', '2025-02-08T00:00:00.000Z');
+  testDateFn(startOfDate, '2025-02-03', '2025-02-03T00:00:00.000Z');
 });
 
 test('endOfDate', () => {
-  assert.equal(endOfDate('2025'), Date.parse('2025-12-31T23:59:59Z'));
-  assert.equal(endOfDate('2025-Q1'), Date.parse('2025-03-31T23:59:59Z'));
-  assert.equal(endOfDate('2025-q2'), Date.parse('2025-06-30T23:59:59Z'));
-  assert.equal(endOfDate('2025-Q3'), Date.parse('2025-09-30T23:59:59Z'));
-  assert.equal(endOfDate('2025-q4'), Date.parse('2025-12-31T23:59:59Z'));
-  assert.equal(endOfDate('2025-02'), Date.parse('2025-02-28T23:59:59Z'));
-  assert.equal(endOfDate('2025-03-W1'), Date.parse('2025-03-07T23:59:59Z'));
-  assert.equal(endOfDate('2025-03-w2'), Date.parse('2025-03-14T23:59:59Z'));
-  assert.equal(endOfDate('2025-03-W3'), Date.parse('2025-03-21T23:59:59Z'));
-  assert.equal(endOfDate('2025-03-w4'), Date.parse('2025-03-31T23:59:59Z'));
-  assert.equal(endOfDate('2025-03-03'), Date.parse('2025-03-03T23:59:59Z'));
+  testDateFn(endOfDate, '2025', '2025-12-31T23:59:59.000Z');
+  testDateFn(endOfDate, '2025-Q1', '2025-03-31T23:59:59.000Z');
+  testDateFn(endOfDate, '2025-q2', '2025-06-30T23:59:59.000Z');
+  testDateFn(endOfDate, '2025-Q3', '2025-09-30T23:59:59.000Z');
+  testDateFn(endOfDate, '2025-q4', '2025-12-31T23:59:59.000Z');
+  testDateFn(endOfDate, '2025-02', '2025-02-28T23:59:59.000Z');
+  testDateFn(endOfDate, '2025-03-W1', '2025-03-07T23:59:59.000Z');
+  testDateFn(endOfDate, '2025-03-w2', '2025-03-14T23:59:59.000Z');
+  testDateFn(endOfDate, '2025-03-W3', '2025-03-21T23:59:59.000Z');
+  testDateFn(endOfDate, '2025-03-w4', '2025-03-31T23:59:59.000Z');
+  testDateFn(endOfDate, '2025-03-03', '2025-03-03T23:59:59.000Z');
 });
 
 test.run();