@nocobase/database 2.1.0-alpha.4 → 2.1.0-alpha.45

package/README.md

@@ -1,17 +1,24 @@
 # NocoBase
 
 <video width="100%" controls>
-      <source src="https://static-docs.nocobase.com/NocoBase0510.mp4" type="video/mp4">
+  <source src="https://github.com/user-attachments/assets/4d11a87b-00e2-48f3-9bf7-389d21072d13" type="video/mp4">
 </video>
 
+<p align="center">
+<a href="https://trendshift.io/repositories/4112" target="_blank"><img src="https://trendshift.io/api/badge/repositories/4112" alt="nocobase%2Fnocobase | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+<a href="https://www.producthunt.com/posts/nocobase?embed=true&utm_source=badge-top-post-topic-badge&utm_medium=badge&utm_souce=badge-nocobase" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-topic-badge.svg?post_id=456520&theme=light&period=weekly&topic_id=267" alt="NocoBase - Scalability&#0045;first&#0044;&#0032;open&#0045;source&#0032;no&#0045;code&#0032;platform | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+</p>
 
 ## What is NocoBase
 
-NocoBase is a scalability-first, open-source no-code development platform.  
-Instead of investing years of time and millions of dollars in research and development, deploy NocoBase in a few minutes and you'll have a private, controllable, and extremely scalable no-code development platform!
+NocoBase is the most extensible AI-powered no-code platform.   
+Total control. Infinite extensibility. AI collaboration.  
+Enable your team to adapt quickly and cut costs dramatically.  
+No years of development. No millions wasted.  
+Deploy NocoBase in minutes — and take control of everything.
 
 Homepage:  
-https://www.nocobase.com/
+https://www.nocobase.com/  
 
 Online Demo:  
 https://demo.nocobase.com/new
@@ -19,12 +26,74 @@ https://demo.nocobase.com/new
 Documents:  
 https://docs.nocobase.com/
 
-Commericial license & plugins:  
-https://www.nocobase.com/en/commercial
+Forum:  
+https://forum.nocobase.com/
 
-License agreement:   
-https://www.nocobase.com/en/agreement
+Use Cases:  
+https://www.nocobase.com/en/blog/tags/customer-stories
 
+## Release Notes
 
-## Contact Us:  
-hello@nocobase.com
+Our [blog](https://www.nocobase.com/en/blog/timeline) is regularly updated with release notes and provides a weekly summary.
+
+## Distinctive features
+
+### 1. Data model-driven, not form/table–driven
+
+Instead of being constrained by forms or tables, NocoBase adopts a data model–driven approach, separating data structure from user interface to unlock unlimited possibilities.
+
+- UI and data structure are fully decoupled
+- Multiple blocks and actions can be created for the same table or record in any quantity or form
+- Supports the main database, external databases, and third-party APIs as data sources
+
+![model](https://static-docs.nocobase.com/model.png)
+
+### 2. AI employees, integrated into your business systems
+Unlike standalone AI demos, NocoBase allows you to embed AI capabilities seamlessly into your interfaces, workflows, and data context, making AI truly useful in real business scenarios.
+
+- Define AI employees for roles such as translator, analyst, researcher, or assistant
+- Seamless AI–human collaboration in interfaces and workflows
+- Ensure AI usage is secure, transparent, and customizable for your business needs
+
+![AI-employee](https://static-docs.nocobase.com/ai-employee-home.png)
+
+### 3. What you see is what you get, incredibly easy to use
+
+While enabling the development of complex business systems, NocoBase keeps the experience simple and intuitive.
+
+- One-click switch between usage mode and configuration mode
+- Pages serve as a canvas to arrange blocks and actions, similar to Notion
+- Configuration mode is designed for ordinary users, not just programmers
+
+![wysiwyg](https://static-docs.nocobase.com/wysiwyg.gif)
+
+### 4. Everything is a plugin, designed for extension
+Adding more no-code features will never cover every business case. NocoBase is built for extension through its plugin-based microkernel architecture.
+
+- All functionalities are plugins, similar to WordPress
+- Plugins are ready to use upon installation
+- Pages, blocks, actions, APIs, and data sources can all be extended through custom plugins
+
+![plugins](https://static-docs.nocobase.com/plugins.png)
+
+## Installation
+
+NocoBase supports three installation methods:
+
+- <a target="_blank" href="https://docs.nocobase.com/welcome/getting-started/installation/docker-compose">Installing With Docker (👍Recommended)</a>
+
+  Suitable for no-code scenarios, no code to write. When upgrading, just download the latest image and reboot.
+
+- <a target="_blank" href="https://docs.nocobase.com/welcome/getting-started/installation/create-nocobase-app">Installing from create-nocobase-app CLI</a>
+
+  The business code of the project is completely independent and supports low-code development.
+
+- <a target="_blank" href="https://docs.nocobase.com/welcome/getting-started/installation/git-clone">Installing from Git source code</a>
+
+  If you want to experience the latest unreleased version, or want to participate in the contribution, you need to make changes and debug on the source code, it is recommended to choose this installation method, which requires a high level of development skills, and if the code has been updated, you can git pull the latest code.
+
+## How NocoBase works
+
+<video width="100%" controls>
+  <source src="https://github.com/user-attachments/assets/8d183b44-9bb5-4792-b08f-bc08fe8dfaaf" type="video/mp4">
+</video>

package/lib/database.d.ts

@@ -45,6 +45,7 @@ export interface IDatabaseOptions extends Options {
     migrator?: any;
     usingBigIntForId?: boolean;
     underscored?: boolean;
+    rawTimezone?: string;
     logger?: LoggerOptions | Logger;
     customHooks?: any;
     instanceId?: string;

package/lib/database.js

@@ -213,6 +213,9 @@ const _Database = class _Database extends import_events.EventEmitter {
     this.migrations = new import_migration.Migrations(context);
     this.sequelize.beforeDefine((model, opts2) => {
       if (this.options.tablePrefix) {
+        if (opts2.tableName && opts2["from"] === "dbsync") {
+          return;
+        }
         if (opts2.tableName && opts2.tableName.startsWith(this.options.tablePrefix)) {
           return;
         }

package/lib/eager-loading/eager-loading-tree.js

@@ -75,16 +75,20 @@ const queryParentSQL = /* @__PURE__ */ __name((options) => {
   const targetKeyField = collection.model.rawAttributes[targetKey].field;
   const queryInterface = db.sequelize.getQueryInterface();
   const q = queryInterface.quoteIdentifier.bind(queryInterface);
-  return `WITH RECURSIVE cte AS (
+  const placeholders = nodeIds.map((_, index) => `$${index + 1}`).join(", ");
+  return {
+    sql: `WITH RECURSIVE cte AS (
       SELECT ${q(targetKeyField)}, ${q(foreignKeyField)}
       FROM ${tableName}
-      WHERE ${q(targetKeyField)} IN ('${nodeIds.join("','")}')
+      WHERE ${q(targetKeyField)} IN (${placeholders})
       UNION ALL
       SELECT t.${q(targetKeyField)}, t.${q(foreignKeyField)}
       FROM ${tableName} AS t
       INNER JOIN cte ON t.${q(targetKeyField)} = cte.${q(foreignKeyField)}
       )
-      SELECT ${q(targetKeyField)} AS ${q(targetKey)}, ${q(foreignKeyField)} AS ${q(foreignKey)} FROM cte`;
+      SELECT ${q(targetKeyField)} AS ${q(targetKey)}, ${q(foreignKeyField)} AS ${q(foreignKey)} FROM cte`,
+    bind: nodeIds
+  };
 }, "queryParentSQL");
 const _EagerLoadingTree = class _EagerLoadingTree {
   root;
@@ -149,6 +153,11 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           const { sourceKey } = association;
           pushAttribute(eagerLoadingTreeParent, sourceKey);
         }
+        if (associationType == "BelongsToArray") {
+          const { foreignKey, targetKey } = association;
+          pushAttribute(eagerLoadingTreeParent, foreignKey);
+          pushAttribute(child, targetKey);
+        }
         eagerLoadingTreeParent.children.push(child);
         if (include.include) {
           traverseIncludeOption(include.include, child);
@@ -300,7 +309,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           });
           if (node.includeOption.recursively && instances.length > 0) {
             const targetKey = association.targetKey;
-            const sql = queryParentSQL({
+            const { sql, bind } = queryParentSQL({
               db: this.db,
               collection: collection2,
               foreignKey,
@@ -308,6 +317,7 @@ const _EagerLoadingTree = class _EagerLoadingTree {
               nodeIds: instances.map((instance) => instance.get(targetKey))
             });
             const results = await this.db.sequelize.query(sql, {
+              bind,
               type: "SELECT",
               transaction
             });

package/lib/errors/association-not-found-error.d.ts

@@ -0,0 +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.
+ */
+export declare class AssociationNotFoundError extends Error {
+    constructor(message: string);
+}

package/lib/errors/association-not-found-error.js

@@ -0,0 +1,44 @@
+/**
+ * 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 association_not_found_error_exports = {};
+__export(association_not_found_error_exports, {
+  AssociationNotFoundError: () => AssociationNotFoundError
+});
+module.exports = __toCommonJS(association_not_found_error_exports);
+const _AssociationNotFoundError = class _AssociationNotFoundError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "AssociationNotFoundError";
+  }
+};
+__name(_AssociationNotFoundError, "AssociationNotFoundError");
+let AssociationNotFoundError = _AssociationNotFoundError;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AssociationNotFoundError
+});

package/lib/fields/relation-field.js

@@ -43,7 +43,7 @@ const _RelationField = class _RelationField extends import_field.Field {
     return this.options.foreignKey;
   }
   get sourceKey() {
-    return this.options.sourceKey || this.collection.model.primaryKeyAttribute;
+    return this.options.sourceKey || this.collection.filterTargetKey;
   }
   get targetKey() {
     return this.options.targetKey || this.TargetModel.primaryKeyAttribute;

package/lib/index.d.ts

@@ -32,6 +32,9 @@ export * from './relation-repository/hasmany-repository';
 export * from './relation-repository/hasone-repository';
 export * from './relation-repository/multiple-relation-repository';
 export * from './relation-repository/single-relation-repository';
+export * from './query/builder';
+export * from './query/formatter';
+export * from './query/types';
 export * from './repository';
 export * from './relation-repository/relation-repository';
 export { default as sqlParser, SQLParserTypes } from './sql-parser';

package/lib/index.js

@@ -93,6 +93,9 @@ __reExport(src_exports, require("./relation-repository/hasmany-repository"), mod
 __reExport(src_exports, require("./relation-repository/hasone-repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/multiple-relation-repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/single-relation-repository"), module.exports);
+__reExport(src_exports, require("./query/builder"), module.exports);
+__reExport(src_exports, require("./query/formatter"), module.exports);
+__reExport(src_exports, require("./query/types"), module.exports);
 __reExport(src_exports, require("./repository"), module.exports);
 __reExport(src_exports, require("./relation-repository/relation-repository"), module.exports);
 var import_sql_parser = __toESM(require("./sql-parser"));
@@ -157,6 +160,9 @@ var import_filter_include = require("./utils/filter-include");
   ...require("./relation-repository/hasone-repository"),
   ...require("./relation-repository/multiple-relation-repository"),
   ...require("./relation-repository/single-relation-repository"),
+  ...require("./query/builder"),
+  ...require("./query/formatter"),
+  ...require("./query/types"),
   ...require("./repository"),
   ...require("./relation-repository/relation-repository"),
   ...require("./update-associations"),

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/lib/interfaces/to-one-interface.js

@@ -42,7 +42,7 @@ const _ToOneInterface = class _ToOneInterface extends import_base_interface.Base
     const { filterKey, associationField, targetCollection, transaction } = ctx;
     const targetInstance = await targetCollection.repository.findOne({
       filter: {
-        [filterKey]: str
+        [filterKey]: str.toString()
       },
       transaction
     });

package/lib/operators/date.js

@@ -47,6 +47,14 @@ function isDate(input) {
   return input instanceof Date || Object.prototype.toString.call(input) === "[object Date]";
 }
 __name(isDate, "isDate");
+function isDatetimeNoTzField(field) {
+  return (field == null ? void 0 : field.type) === "datetimeNoTz" || (field == null ? void 0 : field.constructor.name) === "DatetimeNoTzField";
+}
+__name(isDatetimeNoTzField, "isDatetimeNoTzField");
+function isDateOnlyField(field) {
+  return (field == null ? void 0 : field.type) === "dateOnly" || (field == null ? void 0 : field.constructor.name) === "DateOnlyField";
+}
+__name(isDateOnlyField, "isDateOnlyField");
 const toDate = /* @__PURE__ */ __name((date, options = {}) => {
   const { ctx } = options;
   let val = isDate(date) ? date : new Date(date);
@@ -57,10 +65,10 @@ const toDate = /* @__PURE__ */ __name((date, options = {}) => {
   if (field.constructor.name === "UnixTimestampField") {
     val = field.dateToValue(val);
   }
-  if (field.constructor.name === "DatetimeNoTzField") {
+  if (isDatetimeNoTzField(field)) {
     val = (0, import_moment.default)(val).utcOffset("+00:00").format("YYYY-MM-DD HH:mm:ss");
   }
-  if (field.constructor.name === "DateOnlyField") {
+  if (isDateOnlyField(field)) {
     val = import_moment.default.utc(val).format("YYYY-MM-DD HH:mm:ss");
   }
   const eventObj = {
@@ -75,10 +83,10 @@ function parseDateTimezone(ctx) {
   if (!field) {
     return ctx.db.options.timezone;
   }
-  if (field.constructor.name === "DatetimeNoTzField") {
+  if (isDatetimeNoTzField(field)) {
     return "+00:00";
   }
-  if (field.constructor.name === "DateOnlyField") {
+  if (isDateOnlyField(field)) {
     return "+00:00";
   }
   return ctx.db.options.timezone;

package/lib/options-parser.d.ts

@@ -22,6 +22,7 @@ export declare class OptionsParser {
     model: ModelStatic<any>;
     filterParser: FilterParser;
     context: OptionsParserContext;
+    associationNotFoundWarnings: string[];
     constructor(options: FindOptions, context: OptionsParserContext);
     static appendInheritInspectAttribute(include: any, collection: any): any;
     isAssociation(key: string): boolean;