@nocobase/utils 1.9.53 → 1.9.55

package/lib/dateRangeUtils.d.ts

@@ -6,12 +6,13 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-type DateUnit = 'day' | 'week' | 'isoWeek' | 'month' | 'quarter' | 'year';
+type DateUnit = 'minute' | 'hour' | 'day' | 'week' | 'isoWeek' | 'month' | 'quarter' | 'year';
 type RangeType = 'today' | 'yesterday' | 'tomorrow' | 'thisWeek' | 'lastWeek' | 'nextWeek' | 'thisMonth' | 'lastMonth' | 'nextMonth' | 'thisQuarter' | 'lastQuarter' | 'nextQuarter' | 'thisYear' | 'lastYear' | 'nextYear' | 'past' | 'next';
 interface RangeParams {
     type: RangeType;
     unit?: DateUnit;
     number?: number;
+    includeCurrent?: boolean;
     timezone?: string;
 }
 export declare const getOffsetRangeByParams: (params: RangeParams) => [string, string];

package/lib/dateRangeUtils.js

@@ -42,19 +42,31 @@ const getNow = /* @__PURE__ */ __name((tz) => {
   return (0, import_dayjs2.dayjs)().tz(tz);
 }, "getNow");
 const getOffsetRangeByParams = /* @__PURE__ */ __name((params) => {
-  const { type, unit = "day", number = 1, timezone } = params;
+  const { type, unit = "day", number = 1, includeCurrent, timezone } = params;
   const now = getNow(timezone);
   const actualUnit = unit === "week" ? "isoWeek" : unit;
+  const shouldIncludeCurrent = includeCurrent && ["minute", "hour", "day", "week", "isoWeek", "month", "quarter", "year"].includes(unit);
+  const safeNumber = typeof number === "number" && Number.isFinite(number) ? Math.max(number, 1) : 1;
   let start;
   let end;
   if (type === "past") {
     const base = now.startOf(actualUnit);
-    start = base.subtract(number, unit).startOf(actualUnit);
-    end = base.subtract(1, unit).endOf(actualUnit);
+    if (shouldIncludeCurrent) {
+      start = base.subtract(safeNumber, unit).startOf(actualUnit);
+      end = base.endOf(actualUnit);
+    } else {
+      start = base.subtract(safeNumber, unit).startOf(actualUnit);
+      end = base.subtract(1, unit).endOf(actualUnit);
+    }
   } else if (type === "next") {
     const base = now.startOf(actualUnit);
-    start = base.add(1, unit).startOf(actualUnit);
-    end = start.add(number - 1, unit).endOf(actualUnit);
+    if (shouldIncludeCurrent) {
+      start = base.startOf(actualUnit);
+      end = start.add(safeNumber, unit).endOf(actualUnit);
+    } else {
+      start = base.add(1, unit).startOf(actualUnit);
+      end = start.add(safeNumber - 1, unit).endOf(actualUnit);
+    }
   } else {
     throw new Error(`Unsupported type: ${type}`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.9.53",
+  "version": "1.9.55",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -18,5 +18,5 @@
     "object-path": "^0.11.8",
     "ses": "^1.14.0"
   },
-  "gitHead": "ab201568dfb1845ac984b15dd4432b448738d097"
+  "gitHead": "d711c7711a473bebc182d80e40e920059e31235e"
 }