@nocobase/database 2.1.0-beta.33 → 2.1.0-beta.34

package/lib/interfaces/date-interface.d.ts

@@ -1,4 +1,13 @@
+/**
+ * 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.
+ */
 import { DatetimeInterface } from './datetime-interface';
 export declare class DateInterface extends DatetimeInterface {
+    toValue(value: any, ctx?: any): Promise<any>;
     toString(value: any, ctx?: any): any;
 }

package/lib/interfaces/date-interface.js

@@ -31,7 +31,34 @@ __export(date_interface_exports, {
 });
 module.exports = __toCommonJS(date_interface_exports);
 var import_datetime_interface = require("./datetime-interface");
+function pad2(value) {
+  return String(value).padStart(2, "0");
+}
+__name(pad2, "pad2");
+function formatDateOnlyFromDate(date, timezone) {
+  const offsetMinutes = (0, import_datetime_interface.getTimeZoneOffsetMinutes)(timezone);
+  if (offsetMinutes == null) {
+    return `${date.getFullYear()}-${pad2(date.getMonth() + 1)}-${pad2(date.getDate())}`;
+  }
+  const shifted = new Date(date.getTime() + offsetMinutes * 60 * 1e3);
+  return `${shifted.getUTCFullYear()}-${pad2(shifted.getUTCMonth() + 1)}-${pad2(shifted.getUTCDate())}`;
+}
+__name(formatDateOnlyFromDate, "formatDateOnlyFromDate");
 const _DateInterface = class _DateInterface extends import_datetime_interface.DatetimeInterface {
+  async toValue(value, ctx) {
+    const normalized = await super.toValue(value, ctx);
+    if (!normalized) {
+      return normalized;
+    }
+    if (typeof normalized === "string" && /^\d{4}-\d{2}-\d{2}$/.test(normalized)) {
+      return normalized;
+    }
+    const date = normalized instanceof Date ? normalized : new Date(normalized);
+    if (Number.isNaN(date.getTime())) {
+      return normalized;
+    }
+    return formatDateOnlyFromDate(date, (0, import_datetime_interface.resolveTimeZoneFromCtx)(ctx));
+  }
   toString(value, ctx) {
     return value;
   }

package/lib/interfaces/datetime-interface.d.ts

@@ -7,6 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { BaseInterface } from './base-interface';
+export declare function getTimeZoneOffsetMinutes(timezone: string | number | null | undefined): number;
+export declare function resolveTimeZoneFromCtx(ctx: any): any;
 export declare class DatetimeInterface extends BaseInterface {
     protected parseDateString(value: string): {
         year: string;
@@ -30,7 +32,7 @@ export declare class DatetimeInterface extends BaseInterface {
         hour?: string;
         minute?: string;
         second?: string;
-    }): string;
+    }, ctx?: any): string;
     toValue(value: any, ctx?: any): Promise<any>;
     toString(value: any, ctx?: any): any;
 }

package/lib/interfaces/datetime-interface.js

@@ -37,7 +37,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var datetime_interface_exports = {};
 __export(datetime_interface_exports, {
-  DatetimeInterface: () => DatetimeInterface
+  DatetimeInterface: () => DatetimeInterface,
+  getTimeZoneOffsetMinutes: () => getTimeZoneOffsetMinutes,
+  resolveTimeZoneFromCtx: () => resolveTimeZoneFromCtx
 });
 module.exports = __toCommonJS(datetime_interface_exports);
 var import_base_interface = require("./base-interface");
@@ -54,13 +56,79 @@ function isNumeric(str) {
   return !isNaN(str) && !isNaN(parseFloat(str));
 }
 __name(isNumeric, "isNumeric");
+function getTimeZoneOffsetMinutes(timezone) {
+  if (typeof timezone === "number" && Number.isFinite(timezone)) {
+    return timezone;
+  }
+  if (typeof timezone !== "string") {
+    return null;
+  }
+  const normalized = timezone.trim().toUpperCase();
+  if (!normalized) {
+    return null;
+  }
+  if (normalized === "Z" || normalized === "UTC") {
+    return 0;
+  }
+  const match = normalized.match(/^([+-])(\d{2})(?::?(\d{2}))?$/);
+  if (!match) {
+    return null;
+  }
+  const [, sign, hours, minutes = "00"] = match;
+  const totalMinutes = Number(hours) * 60 + Number(minutes);
+  return sign === "+" ? totalMinutes : -totalMinutes;
+}
+__name(getTimeZoneOffsetMinutes, "getTimeZoneOffsetMinutes");
 function resolveTimeZoneFromCtx(ctx) {
-  if ((ctx == null ? void 0 : ctx.get) && (ctx == null ? void 0 : ctx.get("X-Timezone"))) {
-    return ctx.get("X-Timezone");
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  let timezone;
+  if (typeof (ctx == null ? void 0 : ctx.get) === "function") {
+    timezone = ctx.get("X-Timezone") || ctx.get("x-timezone");
+  } else if (typeof ((_a = ctx == null ? void 0 : ctx.request) == null ? void 0 : _a.get) === "function") {
+    timezone = ctx.request.get("X-Timezone") || ctx.request.get("x-timezone");
+  }
+  timezone = timezone || ((_c = (_b = ctx == null ? void 0 : ctx.request) == null ? void 0 : _b.headers) == null ? void 0 : _c["x-timezone"]) || ((_e = (_d = ctx == null ? void 0 : ctx.request) == null ? void 0 : _d.headers) == null ? void 0 : _e["X-Timezone"]) || ((_g = (_f = ctx == null ? void 0 : ctx.request) == null ? void 0 : _f.header) == null ? void 0 : _g["x-timezone"]) || ((_i = (_h = ctx == null ? void 0 : ctx.request) == null ? void 0 : _h.header) == null ? void 0 : _i["X-Timezone"]) || ((_k = (_j = ctx == null ? void 0 : ctx.req) == null ? void 0 : _j.headers) == null ? void 0 : _k["x-timezone"]) || ((_m = (_l = ctx == null ? void 0 : ctx.req) == null ? void 0 : _l.headers) == null ? void 0 : _m["X-Timezone"]);
+  if (timezone !== void 0 && timezone !== null && timezone !== "") {
+    return timezone;
   }
-  return 0;
+  return null;
 }
 __name(resolveTimeZoneFromCtx, "resolveTimeZoneFromCtx");
+function toISOWithTimezone(dateInfo, timezone) {
+  const offsetMinutes = getTimeZoneOffsetMinutes(timezone);
+  if (offsetMinutes == null) {
+    return null;
+  }
+  const utcMillis = Date.UTC(
+    Number(dateInfo.year),
+    Number(dateInfo.month) - 1,
+    Number(dateInfo.day),
+    Number(dateInfo.hour || "00"),
+    Number(dateInfo.minute || "00"),
+    Number(dateInfo.second || "00"),
+    0
+  ) - offsetMinutes * 60 * 1e3;
+  return new Date(utcMillis).toISOString();
+}
+__name(toISOWithTimezone, "toISOWithTimezone");
+function excelSerialToISO(value, timezone) {
+  const wallClockUtcDate = (0, import_excel_date_to_js.getJsDateFromExcel)(value);
+  const offsetMinutes = getTimeZoneOffsetMinutes(timezone);
+  if (offsetMinutes == null) {
+    return wallClockUtcDate.toISOString();
+  }
+  const utcMillis = Date.UTC(
+    wallClockUtcDate.getUTCFullYear(),
+    wallClockUtcDate.getUTCMonth(),
+    wallClockUtcDate.getUTCDate(),
+    wallClockUtcDate.getUTCHours(),
+    wallClockUtcDate.getUTCMinutes(),
+    wallClockUtcDate.getUTCSeconds(),
+    wallClockUtcDate.getUTCMilliseconds()
+  ) - offsetMinutes * 60 * 1e3;
+  return new Date(utcMillis).toISOString();
+}
+__name(excelSerialToISO, "excelSerialToISO");
 const _DatetimeInterface = class _DatetimeInterface extends import_base_interface.BaseInterface {
   parseDateString(value) {
     const dateOnlyMatch = /^(\d{4})[-/]?(\d{2})[-/]?(\d{2})$/.exec(value);
@@ -75,7 +143,12 @@ const _DatetimeInterface = class _DatetimeInterface extends import_base_interfac
     }
     return null;
   }
-  formatDateTimeToISO(dateInfo) {
+  formatDateTimeToISO(dateInfo, ctx) {
+    const timezone = resolveTimeZoneFromCtx(ctx);
+    const timezoneAwareISO = toISOWithTimezone(dateInfo, timezone);
+    if (timezoneAwareISO) {
+      return timezoneAwareISO;
+    }
     const { year, month, day, hour = "00", minute = "00", second = "00" } = dateInfo;
     const m = (0, import_dayjs.default)(`${year}-${month}-${day} ${hour}:${minute}:${second}.000`);
     return m.toISOString();
@@ -94,7 +167,7 @@ const _DatetimeInterface = class _DatetimeInterface extends import_base_interfac
     if (typeof value === "string") {
       const dateInfo = this.parseDateString(value);
       if (dateInfo) {
-        return this.formatDateTimeToISO(dateInfo);
+        return this.formatDateTimeToISO(dateInfo, ctx);
       }
     }
     if (import_dayjs.default.isDayjs(value)) {
@@ -102,7 +175,7 @@ const _DatetimeInterface = class _DatetimeInterface extends import_base_interfac
     } else if (isDate(value)) {
       return value;
     } else if (isNumeric(value)) {
-      return (0, import_excel_date_to_js.getJsDateFromExcel)(value).toISOString();
+      return excelSerialToISO(value, resolveTimeZoneFromCtx(ctx));
     } else if (typeof value === "string") {
       return value;
     }
@@ -110,7 +183,7 @@ const _DatetimeInterface = class _DatetimeInterface extends import_base_interfac
   }
   toString(value, ctx) {
     var _a, _b;
-    const utcOffset = resolveTimeZoneFromCtx(ctx);
+    const utcOffset = resolveTimeZoneFromCtx(ctx) ?? 0;
     const props = ((_b = (_a = this.options) == null ? void 0 : _a.uiSchema) == null ? void 0 : _b["x-component-props"]) ?? {};
     const format = (0, import_utils.getDefaultFormat)(props);
     const m = (0, import_utils.str2moment)(value, { ...props, utcOffset });
@@ -121,5 +194,7 @@ __name(_DatetimeInterface, "DatetimeInterface");
 let DatetimeInterface = _DatetimeInterface;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  DatetimeInterface
+  DatetimeInterface,
+  getTimeZoneOffsetMinutes,
+  resolveTimeZoneFromCtx
 });

package/lib/interfaces/datetime-no-tz-interface.d.ts

@@ -1,3 +1,11 @@
+/**
+ * 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.
+ */
 import { DatetimeInterface } from './datetime-interface';
 export declare class DatetimeNoTzInterface extends DatetimeInterface {
     protected formatDateTimeToString(dateInfo: {
@@ -8,6 +16,7 @@ export declare class DatetimeNoTzInterface extends DatetimeInterface {
         minute?: string;
         second?: string;
     }): string;
+    protected formatExcelSerialToString(value: number | string): string;
     toValue(value: any, ctx?: any): Promise<any>;
     toString(value: any, ctx?: any): any;
 }

package/lib/interfaces/datetime-no-tz-interface.js

@@ -54,6 +54,10 @@ function isNumeric(str) {
   return !isNaN(str) && !isNaN(parseFloat(str));
 }
 __name(isNumeric, "isNumeric");
+function pad2(value) {
+  return String(value).padStart(2, "0");
+}
+__name(pad2, "pad2");
 const _DatetimeNoTzInterface = class _DatetimeNoTzInterface extends import_datetime_interface.DatetimeInterface {
   formatDateTimeToString(dateInfo) {
     const { year, month, day, hour, minute, second } = dateInfo;
@@ -62,6 +66,17 @@ const _DatetimeNoTzInterface = class _DatetimeNoTzInterface extends import_datet
     }
     return `${year}-${month}-${day}`;
   }
+  formatExcelSerialToString(value) {
+    const date = (0, import_excel_date_to_js.getJsDateFromExcel)(value);
+    return this.formatDateTimeToString({
+      year: String(date.getUTCFullYear()),
+      month: pad2(date.getUTCMonth() + 1),
+      day: pad2(date.getUTCDate()),
+      hour: pad2(date.getUTCHours()),
+      minute: pad2(date.getUTCMinutes()),
+      second: pad2(date.getUTCSeconds())
+    });
+  }
   async toValue(value, ctx = {}) {
     if (!value) {
       return null;
@@ -77,8 +92,7 @@ const _DatetimeNoTzInterface = class _DatetimeNoTzInterface extends import_datet
     } else if (isDate(value)) {
       return value;
     } else if (isNumeric(value)) {
-      const date = (0, import_excel_date_to_js.getJsDateFromExcel)(value);
-      return date.toISOString();
+      return this.formatExcelSerialToString(value);
     } else if (typeof value === "string") {
       return value;
     }

package/lib/interfaces/time-interface.js

@@ -44,8 +44,24 @@ var import_dayjs = __toESM(require("dayjs"));
 var import_utc = __toESM(require("dayjs/plugin/utc"));
 var import_base_interface = require("./base-interface");
 import_dayjs.default.extend(import_utc.default);
+function isNumeric(value) {
+  return typeof value === "number" && Number.isFinite(value);
+}
+__name(isNumeric, "isNumeric");
+function formatExcelTimeSerial(value) {
+  const normalized = (value % 1 + 1) % 1;
+  const totalSeconds = Math.round(normalized * 24 * 60 * 60) % (24 * 60 * 60);
+  const hours = Math.floor(totalSeconds / 3600).toString().padStart(2, "0");
+  const minutes = Math.floor(totalSeconds % 3600 / 60).toString().padStart(2, "0");
+  const seconds = (totalSeconds % 60).toString().padStart(2, "0");
+  return `${hours}:${minutes}:${seconds}`;
+}
+__name(formatExcelTimeSerial, "formatExcelTimeSerial");
 const _TimeInterface = class _TimeInterface extends import_base_interface.BaseInterface {
   toValue(value, ctx) {
+    if (isNumeric(value)) {
+      return formatExcelTimeSerial(value);
+    }
     if (this.validate(value)) {
       const result = (0, import_dayjs.default)(value).format("HH:mm:ss");
       return result;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.1.0-beta.33",
+  "version": "2.1.0-beta.34",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.1.0-beta.33",
-    "@nocobase/utils": "2.1.0-beta.33",
+    "@nocobase/logger": "2.1.0-beta.34",
+    "@nocobase/utils": "2.1.0-beta.34",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "4815c394e80a264fa8ed619246280923c47aeb72"
+  "gitHead": "ca804833299c547f8d49f8d58f73273a4bfcd03c"
 }