@tachybase/utils 1.6.11 → 1.6.13-alpha.2

package/lib/parse-filter.js

@@ -209,22 +209,34 @@ function getDayRange(options) {
   ];
 }
 __name(getDayRange, "getDayRange");
-function toMoment(value, unit = "") {
+function toMoment(value) {
   if (!value) {
-    return unit === "isoWeek" ? (0, import_dayjs.default)().isoWeekday(1) : (0, import_dayjs.default)();
+    return (0, import_dayjs.default)();
   }
   if (import_dayjs.default.isDayjs(value)) {
     return value;
   }
-  return unit === "isoWeek" ? (0, import_dayjs.default)(value).isoWeekday(1) : (0, import_dayjs.default)(value);
+  return (0, import_dayjs.default)(value);
 }
 __name(toMoment, "toMoment");
+function toIsoWeekLabel(m) {
+  const [year, month, day] = m.format("YYYY-MM-DD").split("-").map(Number);
+  const date = new Date(Date.UTC(year, month - 1, day));
+  date.setUTCDate(date.getUTCDate() + 4 - (date.getUTCDay() || 7));
+  const isoYear = date.getUTCFullYear();
+  const yearStart = new Date(Date.UTC(isoYear, 0, 1));
+  const isoWeek = Math.ceil(((date.getTime() - yearStart.getTime()) / 864e5 + 1) / 7);
+  return `${isoYear}W${String(isoWeek).padStart(2, "0")}`;
+}
+__name(toIsoWeekLabel, "toIsoWeekLabel");
 function utc2unit(options) {
   var _a;
   const { now, unit, timezone = "+00:00", offset } = options;
-  let m = toMoment(now, unit);
+  let m = toMoment(now);
   m = m.utcOffset((0, import_date.offsetFromString)(timezone));
-  m = m.startOf(unit);
+  if (unit !== "isoWeek") {
+    m = m.startOf(unit);
+  }
   if (offset > 0) {
     m = m.add(offset, unit === "isoWeek" ? "week" : unit);
   } else if (offset < 0) {
@@ -235,7 +247,7 @@ function utc2unit(options) {
     quarter: /* @__PURE__ */ __name(() => m.format("YYYY[Q]Q"), "quarter"),
     month: /* @__PURE__ */ __name(() => m.format("YYYY-MM"), "month"),
     week: /* @__PURE__ */ __name(() => m.format("gggg[w]ww"), "week"),
-    isoWeek: /* @__PURE__ */ __name(() => m.format("GGGG[W]WW"), "isoWeek"),
+    isoWeek: /* @__PURE__ */ __name(() => toIsoWeekLabel(m), "isoWeek"),
     day: /* @__PURE__ */ __name(() => m.format("YYYY-MM-DD"), "day")
   };
   const r = (_a = fn[unit]) == null ? void 0 : _a.call(fn);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/utils",
-  "version": "1.6.11",
+  "version": "1.6.13-alpha.2",
   "homepage": "https://github.com/tegojs/tego#readme",
   "bugs": {
     "url": "https://github.com/tegojs/tego/issues"