@nocobase/utils 1.7.0-beta.31 → 1.7.0-beta.33

package/lib/client.d.ts

@@ -28,4 +28,5 @@ export * from './parseHTML';
 export * from './uid';
 export * from './url';
 export * from './transformMultiColumnToSingleColumn';
+export * from './dateRangeUtils';
 export { dayjs, lodash };

package/lib/client.js

@@ -63,6 +63,7 @@ __reExport(client_exports, require("./parseHTML"), module.exports);
 __reExport(client_exports, require("./uid"), module.exports);
 __reExport(client_exports, require("./url"), module.exports);
 __reExport(client_exports, require("./transformMultiColumnToSingleColumn"), module.exports);
+__reExport(client_exports, require("./dateRangeUtils"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   dayjs,
@@ -86,5 +87,6 @@ __reExport(client_exports, require("./transformMultiColumnToSingleColumn"), modu
   ...require("./parseHTML"),
   ...require("./uid"),
   ...require("./url"),
-  ...require("./transformMultiColumnToSingleColumn")
+  ...require("./transformMultiColumnToSingleColumn"),
+  ...require("./dateRangeUtils")
 });

package/lib/dateRangeUtils.d.ts

@@ -0,0 +1,22 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 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;
+    timezone?: string;
+}
+export declare const getOffsetRangeByParams: (params: RangeParams) => [string, string];
+/**
+ * 获取某个时间范围的起止时间（字符串格式）
+ */
+export declare const getDayRangeByParams: (params: RangeParams) => [string, string];
+export {};

package/lib/dateRangeUtils.js

@@ -0,0 +1,102 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var dateRangeUtils_exports = {};
+__export(dateRangeUtils_exports, {
+  getDayRangeByParams: () => getDayRangeByParams,
+  getOffsetRangeByParams: () => getOffsetRangeByParams
+});
+module.exports = __toCommonJS(dateRangeUtils_exports);
+var import_dayjs2 = require("./dayjs");
+const getNow = /* @__PURE__ */ __name((tz) => {
+  if (!tz) return (0, import_dayjs2.dayjs)();
+  if (/^[+-]\d{2}:\d{2}$/.test(tz)) {
+    const [sign, hour, minute] = tz.match(/([+-])(\d{2}):(\d{2})/).slice(1);
+    const offset = (parseInt(hour) * 60 + parseInt(minute)) * (sign === "+" ? 1 : -1);
+    return (0, import_dayjs2.dayjs)().utcOffset(offset);
+  }
+  return (0, import_dayjs2.dayjs)().tz(tz);
+}, "getNow");
+const getOffsetRangeByParams = /* @__PURE__ */ __name((params) => {
+  const { type, unit = "day", number = 1, timezone } = params;
+  const now = getNow(timezone);
+  const actualUnit = unit === "week" ? "isoWeek" : unit;
+  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);
+  } else if (type === "next") {
+    const base = now.startOf(actualUnit);
+    start = base.add(1, unit).startOf(actualUnit);
+    end = start.add(number - 1, unit).endOf(actualUnit);
+  } else {
+    throw new Error(`Unsupported type: ${type}`);
+  }
+  return [start.format("YYYY-MM-DD HH:mm:ss"), end.format("YYYY-MM-DD HH:mm:ss")];
+}, "getOffsetRangeByParams");
+const getStart = /* @__PURE__ */ __name((offset, unit, tz) => {
+  const actualUnit = unit === "isoWeek" ? "week" : unit;
+  return getNow(tz).add(offset, actualUnit).startOf(unit);
+}, "getStart");
+const getEnd = /* @__PURE__ */ __name((offset, unit, tz) => {
+  const actualUnit = unit === "isoWeek" ? "week" : unit;
+  return getNow(tz).add(offset, actualUnit).endOf(unit);
+}, "getEnd");
+const strategies = {
+  today: /* @__PURE__ */ __name((params) => [getStart(0, "day", params == null ? void 0 : params.timezone), getEnd(0, "day", params == null ? void 0 : params.timezone)], "today"),
+  yesterday: /* @__PURE__ */ __name((params) => [getStart(-1, "day", params == null ? void 0 : params.timezone), getEnd(-1, "day", params == null ? void 0 : params.timezone)], "yesterday"),
+  tomorrow: /* @__PURE__ */ __name((params) => [getStart(1, "day", params == null ? void 0 : params.timezone), getEnd(1, "day", params == null ? void 0 : params.timezone)], "tomorrow"),
+  thisWeek: /* @__PURE__ */ __name((params) => [getStart(0, "isoWeek", params == null ? void 0 : params.timezone), getEnd(0, "isoWeek", params == null ? void 0 : params.timezone)], "thisWeek"),
+  lastWeek: /* @__PURE__ */ __name((params) => [getStart(-1, "isoWeek", params == null ? void 0 : params.timezone), getEnd(-1, "isoWeek", params == null ? void 0 : params.timezone)], "lastWeek"),
+  nextWeek: /* @__PURE__ */ __name((params) => [getStart(1, "isoWeek", params == null ? void 0 : params.timezone), getEnd(1, "isoWeek", params == null ? void 0 : params.timezone)], "nextWeek"),
+  thisMonth: /* @__PURE__ */ __name((params) => [getStart(0, "month", params == null ? void 0 : params.timezone), getEnd(0, "month", params == null ? void 0 : params.timezone)], "thisMonth"),
+  lastMonth: /* @__PURE__ */ __name((params) => [getStart(-1, "month", params == null ? void 0 : params.timezone), getEnd(-1, "month", params == null ? void 0 : params.timezone)], "lastMonth"),
+  nextMonth: /* @__PURE__ */ __name((params) => [getStart(1, "month", params == null ? void 0 : params.timezone), getEnd(1, "month", params == null ? void 0 : params.timezone)], "nextMonth"),
+  thisQuarter: /* @__PURE__ */ __name((params) => [getStart(0, "quarter", params == null ? void 0 : params.timezone), getEnd(0, "quarter", params == null ? void 0 : params.timezone)], "thisQuarter"),
+  lastQuarter: /* @__PURE__ */ __name((params) => [getStart(-1, "quarter", params == null ? void 0 : params.timezone), getEnd(-1, "quarter", params == null ? void 0 : params.timezone)], "lastQuarter"),
+  nextQuarter: /* @__PURE__ */ __name((params) => [getStart(1, "quarter", params == null ? void 0 : params.timezone), getEnd(1, "quarter", params == null ? void 0 : params.timezone)], "nextQuarter"),
+  thisYear: /* @__PURE__ */ __name((params) => [getStart(0, "year", params == null ? void 0 : params.timezone), getEnd(0, "year", params == null ? void 0 : params.timezone)], "thisYear"),
+  lastYear: /* @__PURE__ */ __name((params) => [getStart(-1, "year", params == null ? void 0 : params.timezone), getEnd(-1, "year", params == null ? void 0 : params.timezone)], "lastYear"),
+  nextYear: /* @__PURE__ */ __name((params) => [getStart(1, "year", params == null ? void 0 : params.timezone), getEnd(1, "year", params == null ? void 0 : params.timezone)], "nextYear")
+};
+const getDayRangeByParams = /* @__PURE__ */ __name((params) => {
+  console.log(params);
+  if (params.type === "past" || params.type === "next") {
+    return getOffsetRangeByParams(params);
+  }
+  const fn = strategies[params.type];
+  if (!fn) throw new Error(`Unsupported type: ${params.type}`);
+  const [start, end] = fn(params);
+  return [start.format("YYYY-MM-DD HH:mm:ss"), end.format("YYYY-MM-DD HH:mm:ss")];
+}, "getDayRangeByParams");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getDayRangeByParams,
+  getOffsetRangeByParams
+});

package/lib/index.d.ts

@@ -37,4 +37,5 @@ export * from './url';
 export * from './i18n';
 export * from './wrap-middleware';
 export * from './object-to-cli-args';
+export * from './dateRangeUtils';
 export { Schema } from '@formily/json-schema';

package/lib/index.js

@@ -72,6 +72,7 @@ __reExport(src_exports, require("./url"), module.exports);
 __reExport(src_exports, require("./i18n"), module.exports);
 __reExport(src_exports, require("./wrap-middleware"), module.exports);
 __reExport(src_exports, require("./object-to-cli-args"), module.exports);
+__reExport(src_exports, require("./dateRangeUtils"), module.exports);
 var import_json_schema = require("@formily/json-schema");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -105,5 +106,6 @@ var import_json_schema = require("@formily/json-schema");
   ...require("./url"),
   ...require("./i18n"),
   ...require("./wrap-middleware"),
-  ...require("./object-to-cli-args")
+  ...require("./object-to-cli-args"),
+  ...require("./dateRangeUtils")
 });

package/lib/parse-date.js

@@ -33,14 +33,16 @@ __export(parse_date_exports, {
 module.exports = __toCommonJS(parse_date_exports);
 var import_date = require("./date");
 var import_dayjs = require("./dayjs");
+var import_dateRangeUtils = require("./dateRangeUtils");
 function parseUTC(value) {
+  var _a;
   if (value instanceof Date || import_dayjs.dayjs.isDayjs(value)) {
     return {
       unit: "utc",
       start: value.toISOString()
     };
   }
-  if (value.endsWith("Z")) {
+  if ((_a = value == null ? void 0 : value.endsWith) == null ? void 0 : _a.call(value, "Z")) {
     return {
       unit: "utc",
       start: value
@@ -186,6 +188,9 @@ function parseDate(value, options = {}) {
   if (!value) {
     return;
   }
+  if (value.type) {
+    value = (0, import_dateRangeUtils.getDayRangeByParams)({ ...value, ...options });
+  }
   if (Array.isArray(value)) {
     return parseDateBetween(value, options);
   }

package/lib/parse-filter.js

@@ -53,6 +53,7 @@ var import_moment = __toESM(require("moment"));
 var import_date = require("./date");
 var import_dayjs = require("./dayjs");
 var import_getValuesByPath = require("./getValuesByPath");
+var import_dateRangeUtils = require("./dateRangeUtils");
 const re = /^\s*\{\{([\s\S]*)\}\}\s*$/;
 function isBuffer(obj) {
   return obj && obj.constructor && typeof obj.constructor.isBuffer === "function" && obj.constructor.isBuffer(obj);
@@ -131,6 +132,9 @@ const dateValueWrapper = /* @__PURE__ */ __name((value, timezone) => {
   if (!value) {
     return null;
   }
+  if (value.type) {
+    value = (0, import_dateRangeUtils.getDayRangeByParams)({ ...value, timezone });
+  }
   if (Array.isArray(value)) {
     if (value.length === 2) {
       value.push("[]", timezone);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.7.0-beta.31",
+  "version": "1.7.0-beta.33",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -16,5 +16,5 @@
     "multer": "^1.4.5-lts.2",
     "object-path": "^0.11.8"
   },
-  "gitHead": "84bf8bcfeeaf3a05086e24cef00507ca209ac3c5"
+  "gitHead": "6fede035f813a48250c3e94e755618ea54be61c3"
 }