@tachybase/utils 0.23.20 → 0.23.35

package/lib/parse-date.d.ts

@@ -1,3 +1,7 @@
+export declare function parseWeek(value: any): {
+    unit: string;
+    start: string;
+};
 export declare function parseDate(value: any, options?: {
     timezone?: string;
 }): string | any[];

package/lib/parse-date.js

@@ -18,7 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var parse_date_exports = {};
 __export(parse_date_exports, {
-  parseDate: () => parseDate
+  parseDate: () => parseDate,
+  parseWeek: () => parseWeek
 });
 module.exports = __toCommonJS(parse_date_exports);
 var import_date = require("./date");
@@ -60,13 +61,27 @@ __name(parseQuarter, "parseQuarter");
 function parseWeek(value) {
   if (/^\d\d\d\d[W]\d\d$/.test(value)) {
     const arr = value.split("W");
+    const year = (0, import_dayjs.dayjs)(arr[0], "YYYY").format("GGGG");
+    if (year !== arr[0]) {
+      return {
+        unit: "isoWeek",
+        start: (0, import_dayjs.dayjs)(arr[0], "YYYY").add(1, "week").startOf("isoWeek").isoWeek(Number(arr[1])).format("YYYY-MM-DD HH:mm:ss")
+      };
+    }
     return {
       unit: "isoWeek",
-      start: (0, import_dayjs.dayjs)(arr[0], "YYYY").add(Number(arr[1]), "weeks").format("YYYY-MM-DD HH:mm:ss")
+      start: (0, import_dayjs.dayjs)(arr[0], "YYYY").isoWeek(Number(arr[1])).format("YYYY-MM-DD HH:mm:ss")
     };
   }
   if (/^\d\d\d\d[w]\d\d$/.test(value)) {
     const arr = value.split("w");
+    const year = (0, import_dayjs.dayjs)(arr[0], "YYYY").format("gggg");
+    if (year !== arr[0]) {
+      return {
+        unit: "week",
+        start: (0, import_dayjs.dayjs)(arr[0], "YYYY").add(1, "week").startOf("week").week(Number(arr[1])).format("YYYY-MM-DD HH:mm:ss")
+      };
+    }
     return {
       unit: "week",
       start: (0, import_dayjs.dayjs)(arr[0], "YYYY").week(Number(arr[1])).format("YYYY-MM-DD HH:mm:ss")
@@ -75,7 +90,7 @@ function parseWeek(value) {
 }
 __name(parseWeek, "parseWeek");
 function parseMonth(value) {
-  if (/^\d\d\d\d\-\d\d$/.test(value)) {
+  if (/^\d\d\d\d-\d\d$/.test(value)) {
     return {
       unit: "month",
       start: `${value}-01 00:00:00`
@@ -84,7 +99,7 @@ function parseMonth(value) {
 }
 __name(parseMonth, "parseMonth");
 function parseDay(value) {
-  if (/^\d\d\d\d\-\d\d\-\d\d$/.test(value)) {
+  if (/^\d\d\d\d-\d\d-\d\d$/.test(value)) {
     return {
       unit: "day",
       start: `${value} 00:00:00`
@@ -93,7 +108,7 @@ function parseDay(value) {
 }
 __name(parseDay, "parseDay");
 function parseHour(value) {
-  if (/^\d\d\d\d\-\d\d\-\d\d(\T|\s)\d\d$/.test(value)) {
+  if (/^\d\d\d\d-\d\d-\d\d(T|\s)\d\d$/.test(value)) {
     return {
       unit: "hour",
       start: `${value}:00:00`
@@ -102,7 +117,7 @@ function parseHour(value) {
 }
 __name(parseHour, "parseHour");
 function parseMinute(value) {
-  if (/^\d\d\d\d\-\d\d\-\d\d(\T|\s)\d\d\:\d\d$/.test(value)) {
+  if (/^\d\d\d\d-\d\d-\d\d(T|\s)\d\d:\d\d$/.test(value)) {
     return {
       unit: "minute",
       start: `${value}:00`
@@ -111,7 +126,7 @@ function parseMinute(value) {
 }
 __name(parseMinute, "parseMinute");
 function parseSecond(value) {
-  if (/^\d\d\d\d\-\d\d\-\d\d(\T|\s)\d\d\:\d\d\:\d\d$/.test(value)) {
+  if (/^\d\d\d\d-\d\d-\d\d(T|\s)\d\d:\d\d:\d\d$/.test(value)) {
     return {
       unit: "second",
       start: `${value}`
@@ -120,7 +135,7 @@ function parseSecond(value) {
 }
 __name(parseSecond, "parseSecond");
 function parseMillisecond(value) {
-  if (/^\d\d\d\d\-\d\d\-\d\d(\T|\s)\d\d\:\d\d\:\d\d\.\d\d\d$/.test(value)) {
+  if (/^\d\d\d\d-\d\d-\d\d(T|\s)\d\d:\d\d:\d\d\.\d\d\d$/.test(value)) {
     return {
       unit: "millisecond",
       start: `${value}`
@@ -168,7 +183,7 @@ function parseDate(value, options = {}) {
   let timezone = options.timezone || "+00:00";
   const input = value;
   if (typeof value === "string") {
-    const match = /(.+)((\+|\-)\d\d\:\d\d)$/.exec(value);
+    const match = /(.+)((\+|-)\d\d:\d\d)$/.exec(value);
     if (match) {
       value = match[1];
       timezone = match[2];
@@ -218,13 +233,13 @@ function parseDateBetween(value, options = {}) {
   if (typeof value !== "string") {
     return;
   }
-  const match = /(.+)((\+|\-)\d\d\:\d\d)$/.exec(value);
+  const match = /(.+)((\+|-)\d\d:\d\d)$/.exec(value);
   let timezone = options.timezone || "+00:00";
   if (match) {
     value = match[1];
     timezone = match[2];
   }
-  const m = /^(\(|\[)(.+)\,(.+)(\)|\])$/.exec(value);
+  const m = /^(\(|\[)(.+),(.+)(\)|\])$/.exec(value);
   if (!m) {
     return;
   }
@@ -233,5 +248,6 @@ function parseDateBetween(value, options = {}) {
 __name(parseDateBetween, "parseDateBetween");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  parseDate
+  parseDate,
+  parseWeek
 });

package/lib/parse-filter.js

@@ -209,26 +209,26 @@ function getDayRange(options) {
   ];
 }
 __name(getDayRange, "getDayRange");
-function toMoment(value) {
+function toMoment(value, unit = "") {
   if (!value) {
-    return (0, import_dayjs.dayjs)();
+    return unit === "isoWeek" ? (0, import_dayjs.dayjs)().isoWeekday(1) : (0, import_dayjs.dayjs)();
   }
   if (import_dayjs.dayjs.isDayjs(value)) {
     return value;
   }
-  return (0, import_dayjs.dayjs)(value);
+  return unit === "isoWeek" ? (0, import_dayjs.dayjs)(value).isoWeekday(1) : (0, import_dayjs.dayjs)(value);
 }
 __name(toMoment, "toMoment");
 function utc2unit(options) {
   var _a;
   const { now, unit, timezone = "+00:00", offset } = options;
-  let m = toMoment(now);
+  let m = toMoment(now, unit);
   m = m.utcOffset((0, import_date.offsetFromString)(timezone));
   m = m.startOf(unit);
   if (offset > 0) {
-    m = m.add(offset, unit);
+    m = m.add(offset, unit === "isoWeek" ? "week" : unit);
   } else if (offset < 0) {
-    m = m.subtract(-1 * offset, unit);
+    m = m.subtract(-1 * offset, unit === "isoWeek" ? "week" : unit);
   }
   const fn = {
     year: /* @__PURE__ */ __name(() => m.format("YYYY"), "year"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/utils",
-  "version": "0.23.20",
+  "version": "0.23.35",
   "license": "Apache-2.0",
   "exports": {
     ".": {