@almadar/evaluator 2.37.0 → 2.39.0

package/dist/index.js

@@ -1780,6 +1780,104 @@ var MS_PER_MINUTE = 60 * MS_PER_SECOND;
 var MS_PER_HOUR = 60 * MS_PER_MINUTE;
 var MS_PER_DAY = 24 * MS_PER_HOUR;
 var MS_PER_WEEK = 7 * MS_PER_DAY;
+var TIME_UNIT_ALIASES = {
+  ms: "ms",
+  millisecond: "ms",
+  milliseconds: "ms",
+  s: "second",
+  second: "second",
+  seconds: "second",
+  m: "minute",
+  minute: "minute",
+  minutes: "minute",
+  h: "hour",
+  hour: "hour",
+  hours: "hour",
+  d: "day",
+  day: "day",
+  days: "day",
+  w: "week",
+  week: "week",
+  weeks: "week",
+  month: "month",
+  months: "month",
+  year: "year",
+  years: "year"
+};
+var TIME_UNIT_VOCABULARY = "ms|millisecond(s), s|second(s), m|minute(s), h|hour(s), d|day(s), w|week(s), month(s), year(s)";
+function parseTimeUnit(unit) {
+  const resolved = TIME_UNIT_ALIASES[String(unit)];
+  if (resolved === void 0) {
+    throw new TypeError(
+      `Type mismatch: expected time unit (${TIME_UNIT_VOCABULARY}), got ${String(unit)}`
+    );
+  }
+  return resolved;
+}
+var FIXED_UNIT_MS = {
+  ms: 1,
+  second: MS_PER_SECOND,
+  minute: MS_PER_MINUTE,
+  hour: MS_PER_HOUR,
+  day: MS_PER_DAY,
+  week: MS_PER_WEEK
+};
+function daysInMonth(year, month) {
+  return new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
+}
+function addCalendarMonths(ts, months) {
+  const date = new Date(ts);
+  const y = date.getUTCFullYear();
+  const m = date.getUTCMonth();
+  const total = y * 12 + m + months;
+  const ny = Math.floor(total / 12);
+  const nm = (total % 12 + 12) % 12;
+  const nd = Math.min(date.getUTCDate(), daysInMonth(ny, nm));
+  const shifted = new Date(ts);
+  shifted.setUTCFullYear(ny, nm, nd);
+  return shifted.getTime();
+}
+function shiftTime(ts, amount, unit) {
+  const fixed = FIXED_UNIT_MS[unit];
+  if (fixed !== void 0) return ts + amount * fixed;
+  return addCalendarMonths(ts, unit === "year" ? Math.trunc(amount) * 12 : Math.trunc(amount));
+}
+function startOf(ts, unit) {
+  switch (unit) {
+    case "ms":
+      return Math.floor(ts);
+    case "second":
+      return Math.floor(ts / MS_PER_SECOND) * MS_PER_SECOND;
+    case "minute":
+      return Math.floor(ts / MS_PER_MINUTE) * MS_PER_MINUTE;
+    case "hour":
+      return Math.floor(ts / MS_PER_HOUR) * MS_PER_HOUR;
+    case "day":
+      return Math.floor(ts / MS_PER_DAY) * MS_PER_DAY;
+    case "week": {
+      const days = Math.floor(ts / MS_PER_DAY);
+      const dow = ((days + 3) % 7 + 7) % 7;
+      return (days - dow) * MS_PER_DAY;
+    }
+    case "month": {
+      const d = new Date(ts);
+      return Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), 1);
+    }
+    case "year":
+      return Date.UTC(new Date(ts).getUTCFullYear(), 0, 1);
+  }
+}
+function wholeMonthsBetween(from, to) {
+  const lo = new Date(Math.min(from, to));
+  const hi = new Date(Math.max(from, to));
+  let months = (hi.getUTCFullYear() - lo.getUTCFullYear()) * 12 + (hi.getUTCMonth() - lo.getUTCMonth());
+  const loRest = [lo.getUTCDate(), lo.getTime() - startOf(lo.getTime(), "day")];
+  const hiRest = [hi.getUTCDate(), hi.getTime() - startOf(hi.getTime(), "day")];
+  if (hiRest[0] < loRest[0] || hiRest[0] === loRest[0] && hiRest[1] < loRest[1]) {
+    months -= 1;
+  }
+  return to < from ? -months : months;
+}
 function evalTimeNow() {
   return Date.now();
 }
@@ -1862,136 +1960,39 @@ function evalTimeSecond(args, evaluate2, ctx) {
   const timestamp = evaluate2(args[0], ctx);
   return new Date(timestamp).getSeconds();
 }
-function addTime(date, amount, unit) {
-  const result = new Date(date);
-  switch (unit) {
-    case "year":
-      result.setFullYear(result.getFullYear() + amount);
-      break;
-    case "month":
-      result.setMonth(result.getMonth() + amount);
-      break;
-    case "week":
-      result.setDate(result.getDate() + amount * 7);
-      break;
-    case "day":
-      result.setDate(result.getDate() + amount);
-      break;
-    case "hour":
-      result.setHours(result.getHours() + amount);
-      break;
-    case "minute":
-      result.setMinutes(result.getMinutes() + amount);
-      break;
-    case "second":
-      result.setSeconds(result.getSeconds() + amount);
-      break;
-    case "ms":
-      result.setMilliseconds(result.getMilliseconds() + amount);
-      break;
-  }
-  return result;
-}
 function evalTimeAdd(args, evaluate2, ctx) {
   const timestamp = evaluate2(args[0], ctx);
   const amount = evaluate2(args[1], ctx);
-  const unit = evaluate2(args[2], ctx);
-  const date = new Date(timestamp);
-  return addTime(date, amount, unit).getTime();
+  const unit = parseTimeUnit(evaluate2(args[2], ctx));
+  return shiftTime(timestamp, amount, unit);
 }
 function evalTimeSubtract(args, evaluate2, ctx) {
   const timestamp = evaluate2(args[0], ctx);
   const amount = evaluate2(args[1], ctx);
-  const unit = evaluate2(args[2], ctx);
-  const date = new Date(timestamp);
-  return addTime(date, -amount, unit).getTime();
+  const unit = parseTimeUnit(evaluate2(args[2], ctx));
+  return shiftTime(timestamp, -amount, unit);
 }
 function evalTimeDiff(args, evaluate2, ctx) {
   const a = evaluate2(args[0], ctx);
   const b = evaluate2(args[1], ctx);
-  const unit = args.length > 2 ? evaluate2(args[2], ctx) : "ms";
   const diffMs = a - b;
-  switch (unit) {
-    case "year":
-      return Math.floor(diffMs / (MS_PER_DAY * 365.25));
-    case "month":
-      return Math.floor(diffMs / (MS_PER_DAY * 30.44));
-    case "week":
-      return Math.floor(diffMs / MS_PER_WEEK);
-    case "day":
-      return Math.floor(diffMs / MS_PER_DAY);
-    case "hour":
-      return Math.floor(diffMs / MS_PER_HOUR);
-    case "minute":
-      return Math.floor(diffMs / MS_PER_MINUTE);
-    case "second":
-      return Math.floor(diffMs / MS_PER_SECOND);
-    case "ms":
-    default:
-      return diffMs;
-  }
+  if (args.length <= 2) return diffMs;
+  const unit = parseTimeUnit(evaluate2(args[2], ctx));
+  const fixed = FIXED_UNIT_MS[unit];
+  if (fixed !== void 0) return Math.trunc(diffMs / fixed);
+  const months = wholeMonthsBetween(b, a);
+  return unit === "year" ? Math.trunc(months / 12) : months;
 }
 function evalTimeStartOf(args, evaluate2, ctx) {
   const timestamp = evaluate2(args[0], ctx);
-  const unit = evaluate2(args[1], ctx);
-  const date = new Date(timestamp);
-  switch (unit) {
-    case "year":
-      date.setMonth(0, 1);
-      date.setHours(0, 0, 0, 0);
-      break;
-    case "month":
-      date.setDate(1);
-      date.setHours(0, 0, 0, 0);
-      break;
-    case "week": {
-      const day = date.getDay();
-      date.setDate(date.getDate() - day);
-      date.setHours(0, 0, 0, 0);
-      break;
-    }
-    case "day":
-      date.setHours(0, 0, 0, 0);
-      break;
-    case "hour":
-      date.setMinutes(0, 0, 0);
-      break;
-    case "minute":
-      date.setSeconds(0, 0);
-      break;
-  }
-  return date.getTime();
+  const unit = parseTimeUnit(evaluate2(args[1], ctx));
+  return startOf(timestamp, unit);
 }
 function evalTimeEndOf(args, evaluate2, ctx) {
   const timestamp = evaluate2(args[0], ctx);
-  const unit = evaluate2(args[1], ctx);
-  const date = new Date(timestamp);
-  switch (unit) {
-    case "year":
-      date.setMonth(11, 31);
-      date.setHours(23, 59, 59, 999);
-      break;
-    case "month":
-      date.setMonth(date.getMonth() + 1, 0);
-      date.setHours(23, 59, 59, 999);
-      break;
-    case "week": {
-      const day = date.getDay();
-      date.setDate(date.getDate() + (6 - day));
-      date.setHours(23, 59, 59, 999);
-      break;
-    }
-    case "day":
-      date.setHours(23, 59, 59, 999);
-      break;
-    case "hour":
-      date.setMinutes(59, 59, 999);
-      break;
-    case "minute":
-      date.setSeconds(59, 999);
-      break;
-  }
-  return date.getTime();
+  const unit = parseTimeUnit(evaluate2(args[1], ctx));
+  if (unit === "ms") return Math.floor(timestamp);
+  return shiftTime(startOf(timestamp, unit), 1, unit) - 1;
 }
 function evalTimeIsBefore(args, evaluate2, ctx) {
   const a = evaluate2(args[0], ctx);
@@ -2012,28 +2013,11 @@ function evalTimeIsBetween(args, evaluate2, ctx) {
 function evalTimeIsSame(args, evaluate2, ctx) {
   const a = evaluate2(args[0], ctx);
   const b = evaluate2(args[1], ctx);
-  const unit = args.length > 2 ? evaluate2(args[2], ctx) : void 0;
-  if (!unit) {
+  if (args.length <= 2) {
     return a === b;
   }
-  const dateA = new Date(a);
-  const dateB = new Date(b);
-  switch (unit) {
-    case "year":
-      return dateA.getFullYear() === dateB.getFullYear();
-    case "month":
-      return dateA.getFullYear() === dateB.getFullYear() && dateA.getMonth() === dateB.getMonth();
-    case "day":
-      return dateA.getFullYear() === dateB.getFullYear() && dateA.getMonth() === dateB.getMonth() && dateA.getDate() === dateB.getDate();
-    case "hour":
-      return dateA.getFullYear() === dateB.getFullYear() && dateA.getMonth() === dateB.getMonth() && dateA.getDate() === dateB.getDate() && dateA.getHours() === dateB.getHours();
-    case "minute":
-      return Math.floor(a / MS_PER_MINUTE) === Math.floor(b / MS_PER_MINUTE);
-    case "second":
-      return Math.floor(a / MS_PER_SECOND) === Math.floor(b / MS_PER_SECOND);
-    default:
-      return a === b;
-  }
+  const unit = parseTimeUnit(evaluate2(args[2], ctx));
+  return startOf(a, unit) === startOf(b, unit);
 }
 function evalTimeIsPast(args, evaluate2, ctx) {
   const timestamp = evaluate2(args[0], ctx);