@nocobase/database 1.5.0-beta.6 → 1.5.0-beta.8

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

@@ -8,6 +8,29 @@
  */
 import { BaseInterface } from './base-interface';
 export declare class DatetimeInterface extends BaseInterface {
+    protected parseDateString(value: string): {
+        year: string;
+        month: string;
+        day: string;
+        hour: string;
+        minute: string;
+        second: string;
+    } | {
+        year: string;
+        month: string;
+        day: string;
+        hour?: undefined;
+        minute?: undefined;
+        second?: undefined;
+    };
+    protected formatDateTimeToISO(dateInfo: {
+        year: string;
+        month: string;
+        day: string;
+        hour?: string;
+        minute?: string;
+        second?: string;
+    }): string;
     toValue(value: any, ctx?: any): Promise<any>;
     toString(value: any, ctx?: any): any;
 }

package/lib/interfaces/datetime-interface.js

@@ -62,15 +62,32 @@ function resolveTimeZoneFromCtx(ctx) {
 }
 __name(resolveTimeZoneFromCtx, "resolveTimeZoneFromCtx");
 const _DatetimeInterface = class _DatetimeInterface extends import_base_interface.BaseInterface {
+  parseDateString(value) {
+    const dateOnlyMatch = /^(\d{4})[-/]?(\d{2})[-/]?(\d{2})$/.exec(value);
+    const dateTimeMatch = /^(\d{4})(\d{2})(\d{2})\s+(\d{2}):(\d{2}):(\d{2})$/.exec(value);
+    if (dateTimeMatch) {
+      const [_, year, month, day, hour, minute, second] = dateTimeMatch;
+      return { year, month, day, hour, minute, second };
+    }
+    if (dateOnlyMatch) {
+      const [_, year, month, day] = dateOnlyMatch;
+      return { year, month, day };
+    }
+    return null;
+  }
+  formatDateTimeToISO(dateInfo) {
+    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();
+  }
   async toValue(value, ctx = {}) {
     if (!value) {
       return null;
     }
     if (typeof value === "string") {
-      const match = /^(\d{4})[-/]?(\d{2})[-/]?(\d{2})$/.exec(value);
-      if (match) {
-        const m = (0, import_dayjs.default)(`${match[1]}-${match[2]}-${match[3]} 00:00:00.000`);
-        return m.toISOString();
+      const dateInfo = this.parseDateString(value);
+      if (dateInfo) {
+        return this.formatDateTimeToISO(dateInfo);
       }
     }
     if (import_dayjs.default.isDayjs(value)) {

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

@@ -1,5 +1,13 @@
 import { DatetimeInterface } from './datetime-interface';
 export declare class DatetimeNoTzInterface extends DatetimeInterface {
+    protected formatDateTimeToString(dateInfo: {
+        year: string;
+        month: string;
+        day: string;
+        hour?: string;
+        minute?: string;
+        second?: string;
+    }): string;
     toValue(value: any, ctx?: any): Promise<any>;
     toString(value: any, ctx?: any): any;
 }

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

@@ -55,14 +55,21 @@ function isNumeric(str) {
 }
 __name(isNumeric, "isNumeric");
 const _DatetimeNoTzInterface = class _DatetimeNoTzInterface extends import_datetime_interface.DatetimeInterface {
+  formatDateTimeToString(dateInfo) {
+    const { year, month, day, hour, minute, second } = dateInfo;
+    if (hour !== void 0 && minute !== void 0 && second !== void 0) {
+      return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+    }
+    return `${year}-${month}-${day}`;
+  }
   async toValue(value, ctx = {}) {
     if (!value) {
       return null;
     }
     if (typeof value === "string") {
-      const match = /^(\d{4})[-/]?(\d{2})[-/]?(\d{2})$/.exec(value);
-      if (match) {
-        return `${match[1]}-${match[2]}-${match[3]}`;
+      const dateInfo = this.parseDateString(value);
+      if (dateInfo) {
+        return this.formatDateTimeToString(dateInfo);
       }
     }
     if (import_dayjs.default.isDayjs(value)) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.5.0-beta.6",
+  "version": "1.5.0-beta.8",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.5.0-beta.6",
-    "@nocobase/utils": "1.5.0-beta.6",
+    "@nocobase/logger": "1.5.0-beta.8",
+    "@nocobase/utils": "1.5.0-beta.8",
     "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": "bc2521a48eb8f31af9a6c6fb5daefe218bf04798"
+  "gitHead": "eb7db7301ac5eed305e73540884611832bc761f6"
 }