@nocobase/database 2.1.0-alpha.2 → 2.1.0-alpha.21

package/lib/query/formatter.d.ts

@@ -0,0 +1,29 @@
+/**
+ * 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 { Sequelize } from 'sequelize';
+export type Col = ReturnType<typeof Sequelize.col>;
+export type Literal = ReturnType<typeof Sequelize.literal>;
+export type Fn = ReturnType<typeof Sequelize.fn>;
+export declare abstract class QueryFormatter {
+    sequelize: Sequelize;
+    rawTimezone?: string;
+    constructor(sequelize: Sequelize, rawTimezone?: string);
+    abstract formatDate(field: Col, format: string, timezone?: string, preserveLocalTime?: boolean): Fn | Col;
+    abstract formatUnixTimestamp(field: string, format: string, accuracy?: 'second' | 'millisecond', timezone?: string): Fn | Literal | Col;
+    convertFormat(format: string): string;
+    protected getTimezoneByOffset(offset?: string): string;
+    protected getOffsetExpression(timezone: string): string;
+    format(options: {
+        type: string;
+        field: string;
+        format: string;
+        timezone?: string;
+        fieldOptions?: any;
+    }): import("sequelize/types/utils").Fn | import("sequelize/types/utils").Col | import("sequelize/types/utils").Literal;
+}

package/lib/query/formatter.js

@@ -0,0 +1,103 @@
+/**
+ * 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 __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var formatter_exports = {};
+__export(formatter_exports, {
+  QueryFormatter: () => QueryFormatter
+});
+module.exports = __toCommonJS(formatter_exports);
+var import_moment_timezone = __toESM(require("moment-timezone"));
+const _QueryFormatter = class _QueryFormatter {
+  sequelize;
+  rawTimezone;
+  constructor(sequelize, rawTimezone) {
+    this.sequelize = sequelize;
+    this.rawTimezone = rawTimezone;
+  }
+  convertFormat(format) {
+    return format;
+  }
+  getTimezoneByOffset(offset) {
+    if (!offset) {
+      return;
+    }
+    if (import_moment_timezone.default.tz.zone(offset)) {
+      return offset;
+    }
+    if (!/^[+-]\d{1,2}:\d{2}$/.test(offset)) {
+      return;
+    }
+    const offsetMinutes = import_moment_timezone.default.duration(offset).asMinutes();
+    return import_moment_timezone.default.tz.names().find((timezone) => {
+      return import_moment_timezone.default.tz(timezone).utcOffset() === offsetMinutes;
+    });
+  }
+  getOffsetExpression(timezone) {
+    const sign = timezone.charAt(0);
+    const value = timezone.slice(1);
+    const [hours, minutes] = value.split(":").map(Number);
+    return `${sign}${hours * 60 + minutes} minutes`;
+  }
+  format(options) {
+    var _a, _b;
+    const { type, field, format, timezone, fieldOptions } = options;
+    const col = this.sequelize.col(field);
+    switch (type) {
+      case "date":
+      case "datetime":
+      case "datetimeTz":
+        return this.formatDate(col, format, timezone);
+      case "datetimeNoTz":
+        return this.formatDate(col, format, void 0, true);
+      case "dateOnly":
+      case "time":
+        return this.formatDate(col, format);
+      case "unixTimestamp": {
+        const accuracy = ((_b = (_a = fieldOptions == null ? void 0 : fieldOptions.uiSchema) == null ? void 0 : _a["x-component-props"]) == null ? void 0 : _b.accuracy) || (fieldOptions == null ? void 0 : fieldOptions.accuracy) || "second";
+        return this.formatUnixTimestamp(field, format, accuracy, timezone);
+      }
+      default:
+        return col;
+    }
+  }
+};
+__name(_QueryFormatter, "QueryFormatter");
+let QueryFormatter = _QueryFormatter;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  QueryFormatter
+});

package/lib/query/formatters/mysql.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 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 { QueryFormatter, Col } from '../formatter';
+export declare class MySQLQueryFormatter extends QueryFormatter {
+    convertFormat(format: string): string;
+    formatDate(field: Col, format: string, timezone?: string, _preserveLocalTime?: boolean): import("sequelize/types/utils").Fn;
+    formatUnixTimestamp(field: string, format: string, accuracy?: 'second' | 'millisecond', timezone?: string): import("sequelize/types/utils").Fn;
+}

package/lib/query/formatters/mysql.js

@@ -0,0 +1,70 @@
+/**
+ * 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 mysql_exports = {};
+__export(mysql_exports, {
+  MySQLQueryFormatter: () => MySQLQueryFormatter
+});
+module.exports = __toCommonJS(mysql_exports);
+var import_formatter = require("../formatter");
+const _MySQLQueryFormatter = class _MySQLQueryFormatter extends import_formatter.QueryFormatter {
+  convertFormat(format) {
+    return format.replace(/YYYY/g, "%Y").replace(/MM/g, "%m").replace(/DD/g, "%d").replace(/hh/g, "%H").replace(/mm/g, "%i").replace(/ss/g, "%S");
+  }
+  formatDate(field, format, timezone, _preserveLocalTime) {
+    const fmt = this.convertFormat(format);
+    const resolvedTimezone = this.getTimezoneByOffset(timezone);
+    if (resolvedTimezone) {
+      return this.sequelize.fn(
+        "date_format",
+        this.sequelize.fn("convert_tz", field, process.env.TZ || "UTC", resolvedTimezone),
+        fmt
+      );
+    }
+    return this.sequelize.fn("date_format", field, fmt);
+  }
+  formatUnixTimestamp(field, format, accuracy = "second", timezone) {
+    const fmt = this.convertFormat(format);
+    const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field);
+    const resolvedTimezone = this.getTimezoneByOffset(timezone);
+    const timestamp = accuracy === "millisecond" ? this.sequelize.fn("from_unixtime", this.sequelize.literal(`ROUND(${quoted} / 1000)`)) : this.sequelize.fn("from_unixtime", this.sequelize.col(field));
+    if (resolvedTimezone) {
+      return this.sequelize.fn(
+        "date_format",
+        this.sequelize.fn("convert_tz", timestamp, process.env.TZ || "UTC", resolvedTimezone),
+        fmt
+      );
+    }
+    return accuracy === "millisecond" ? this.sequelize.fn("from_unixtime", this.sequelize.literal(`ROUND(${quoted} / 1000)`), fmt) : this.sequelize.fn("from_unixtime", this.sequelize.col(field), fmt);
+  }
+};
+__name(_MySQLQueryFormatter, "MySQLQueryFormatter");
+let MySQLQueryFormatter = _MySQLQueryFormatter;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  MySQLQueryFormatter
+});

package/lib/query/formatters/oracle.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 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 { QueryFormatter, Col } from '../formatter';
+export declare class OracleQueryFormatter extends QueryFormatter {
+    convertFormat(format: string): string;
+    formatDate(field: Col, format: string, timezone?: string, _preserveLocalTime?: boolean): import("sequelize/types/utils").Fn;
+    formatUnixTimestamp(field: string, format: string, accuracy?: 'second' | 'millisecond', timezone?: string): import("sequelize/types/utils").Fn;
+}

package/lib/query/formatters/oracle.js

@@ -0,0 +1,64 @@
+/**
+ * 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 oracle_exports = {};
+__export(oracle_exports, {
+  OracleQueryFormatter: () => OracleQueryFormatter
+});
+module.exports = __toCommonJS(oracle_exports);
+var import_formatter = require("../formatter");
+const _OracleQueryFormatter = class _OracleQueryFormatter extends import_formatter.QueryFormatter {
+  convertFormat(format) {
+    return format.replace(/hh/g, "HH24").replace(/mm/g, "MI").replace(/ss/g, "SS");
+  }
+  formatDate(field, format, timezone, _preserveLocalTime) {
+    const fmt = this.convertFormat(format);
+    const resolvedTimezone = this.getTimezoneByOffset(timezone);
+    if (resolvedTimezone) {
+      const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field.col);
+      return this.sequelize.fn(
+        "to_char",
+        this.sequelize.literal(`(${quoted} AT TIME ZONE '${resolvedTimezone}')`),
+        fmt
+      );
+    }
+    return this.sequelize.fn("to_char", field, fmt);
+  }
+  formatUnixTimestamp(field, format, accuracy = "second", timezone) {
+    const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field);
+    const timestamp = accuracy === "millisecond" ? `to_timestamp(ROUND(${quoted} / 1000))` : `to_timestamp(${quoted})`;
+    const resolvedTimezone = this.getTimezoneByOffset(timezone);
+    const literal = resolvedTimezone ? `${timestamp} AT TIME ZONE '${resolvedTimezone}'` : timestamp;
+    return this.sequelize.fn("to_char", this.sequelize.literal(literal), this.convertFormat(format));
+  }
+};
+__name(_OracleQueryFormatter, "OracleQueryFormatter");
+let OracleQueryFormatter = _OracleQueryFormatter;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  OracleQueryFormatter
+});

package/lib/query/formatters/postgres.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 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 { QueryFormatter, Col } from '../formatter';
+export declare class PostgresQueryFormatter extends QueryFormatter {
+    convertFormat(format: string): string;
+    formatDate(field: Col, format: string, timezone?: string, _preserveLocalTime?: boolean): import("sequelize/types/utils").Fn;
+    formatUnixTimestamp(field: string, format: string, accuracy?: 'second' | 'millisecond', timezone?: string): import("sequelize/types/utils").Fn;
+}

package/lib/query/formatters/postgres.js

@@ -0,0 +1,64 @@
+/**
+ * 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 postgres_exports = {};
+__export(postgres_exports, {
+  PostgresQueryFormatter: () => PostgresQueryFormatter
+});
+module.exports = __toCommonJS(postgres_exports);
+var import_formatter = require("../formatter");
+const _PostgresQueryFormatter = class _PostgresQueryFormatter extends import_formatter.QueryFormatter {
+  convertFormat(format) {
+    return format.replace(/hh/g, "HH24").replace(/mm/g, "MI").replace(/ss/g, "SS");
+  }
+  formatDate(field, format, timezone, _preserveLocalTime) {
+    const fmt = this.convertFormat(format);
+    const resolvedTimezone = this.getTimezoneByOffset(timezone);
+    if (resolvedTimezone) {
+      const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field.col);
+      return this.sequelize.fn(
+        "to_char",
+        this.sequelize.literal(`(${quoted} AT TIME ZONE '${resolvedTimezone}')`),
+        fmt
+      );
+    }
+    return this.sequelize.fn("to_char", field, fmt);
+  }
+  formatUnixTimestamp(field, format, accuracy = "second", timezone) {
+    const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field);
+    const timestamp = accuracy === "millisecond" ? `to_timestamp(ROUND(${quoted} / 1000))` : `to_timestamp(${quoted})`;
+    const resolvedTimezone = this.getTimezoneByOffset(timezone);
+    const literal = resolvedTimezone ? `${timestamp} AT TIME ZONE '${resolvedTimezone}'` : timestamp;
+    return this.sequelize.fn("to_char", this.sequelize.literal(literal), this.convertFormat(format));
+  }
+};
+__name(_PostgresQueryFormatter, "PostgresQueryFormatter");
+let PostgresQueryFormatter = _PostgresQueryFormatter;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  PostgresQueryFormatter
+});

package/lib/query/formatters/sqlite.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 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 { QueryFormatter, Col } from '../formatter';
+export declare class SQLiteQueryFormatter extends QueryFormatter {
+    convertFormat(format: string): string;
+    formatDate(field: Col, format: string, timezone?: string, preserveLocalTime?: boolean): import("sequelize/types/utils").Fn;
+    formatUnixTimestamp(field: string, format: string, accuracy?: 'second' | 'millisecond', timezone?: string): import("sequelize/types/utils").Fn;
+}

package/lib/query/formatters/sqlite.js

@@ -0,0 +1,63 @@
+/**
+ * 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 sqlite_exports = {};
+__export(sqlite_exports, {
+  SQLiteQueryFormatter: () => SQLiteQueryFormatter
+});
+module.exports = __toCommonJS(sqlite_exports);
+var import_formatter = require("../formatter");
+const _SQLiteQueryFormatter = class _SQLiteQueryFormatter extends import_formatter.QueryFormatter {
+  convertFormat(format) {
+    return format.replace(/YYYY/g, "%Y").replace(/MM/g, "%m").replace(/DD/g, "%d").replace(/hh/g, "%H").replace(/mm/g, "%M").replace(/ss/g, "%S");
+  }
+  formatDate(field, format, timezone, preserveLocalTime) {
+    const fmt = this.convertFormat(format);
+    if (timezone && /^[+-]\d{1,2}:\d{2}$/.test(timezone)) {
+      return this.sequelize.fn("strftime", fmt, field, this.getOffsetExpression(timezone));
+    }
+    if (preserveLocalTime && this.rawTimezone && /^[+-]\d{1,2}:\d{2}$/.test(this.rawTimezone)) {
+      return this.sequelize.fn("strftime", fmt, field, this.getOffsetExpression(this.rawTimezone));
+    }
+    return this.sequelize.fn("strftime", fmt, field);
+  }
+  formatUnixTimestamp(field, format, accuracy = "second", timezone) {
+    const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field);
+    const base = accuracy === "millisecond" ? this.sequelize.literal(`ROUND(${quoted} / 1000)`) : this.sequelize.col(field);
+    const args = [base, "unixepoch"];
+    if (timezone && /^[+-]\d{1,2}:\d{2}$/.test(timezone)) {
+      args.push(this.getOffsetExpression(timezone));
+    }
+    return this.sequelize.fn("strftime", this.convertFormat(format), this.sequelize.fn("DATETIME", ...args));
+  }
+};
+__name(_SQLiteQueryFormatter, "SQLiteQueryFormatter");
+let SQLiteQueryFormatter = _SQLiteQueryFormatter;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SQLiteQueryFormatter
+});

package/lib/query/having.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.
+ */
+import { WhereOptions } from 'sequelize';
+import { Database } from '../database';
+import { QueryFormatter } from './formatter';
+type QueryFieldMeta = {
+    field: string;
+    alias?: string;
+    aggregation?: string;
+    distinct?: boolean;
+    format?: string;
+    type?: string;
+    options?: any;
+};
+export declare function buildHaving(database: Database, formatter: QueryFormatter, fieldMap: Record<string, QueryFieldMeta>, having?: any, timezone?: string): WhereOptions;
+export {};

package/lib/query/having.js

@@ -0,0 +1,112 @@
+/**
+ * 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 having_exports = {};
+__export(having_exports, {
+  buildHaving: () => buildHaving
+});
+module.exports = __toCommonJS(having_exports);
+var import_lodash = require("lodash");
+var import_sequelize = require("sequelize");
+function buildFieldExpression(database, formatter, fieldMap, key, timezone) {
+  const meta = fieldMap[key];
+  if (!meta) {
+    throw new Error(`Invalid having field: ${key}`);
+  }
+  const col = database.sequelize.col(meta.field);
+  if (meta.aggregation) {
+    return database.sequelize.fn(meta.aggregation, meta.distinct ? database.sequelize.fn("DISTINCT", col) : col);
+  }
+  if (meta.format) {
+    return formatter.format({
+      type: meta.type,
+      field: meta.field,
+      format: meta.format,
+      timezone,
+      fieldOptions: meta.options
+    });
+  }
+  return col;
+}
+__name(buildFieldExpression, "buildFieldExpression");
+function isOperatorCondition(database, value) {
+  return (0, import_lodash.isPlainObject)(value) && Object.keys(value).some((key) => database.operators.has(key));
+}
+__name(isOperatorCondition, "isOperatorCondition");
+function buildFieldCondition(database, formatter, fieldMap, key, value, timezone) {
+  const field = buildFieldExpression(database, formatter, fieldMap, key, timezone);
+  if (!isOperatorCondition(database, value)) {
+    return database.sequelize.where(field, { [import_sequelize.Op.eq]: value });
+  }
+  const condition = {};
+  for (const [operatorKey, operatorValue] of Object.entries(value)) {
+    const operator = database.operators.get(operatorKey);
+    if (typeof operator !== "symbol") {
+      throw new Error(`Unsupported having operator: ${operatorKey}`);
+    }
+    condition[operator] = operatorValue;
+  }
+  return database.sequelize.where(field, condition);
+}
+__name(buildFieldCondition, "buildFieldCondition");
+function buildHavingNode(database, formatter, fieldMap, node, timezone) {
+  if (!(0, import_lodash.isPlainObject)(node)) {
+    throw new Error("Having must be an object");
+  }
+  const conditions = [];
+  for (const [key, value] of Object.entries(node)) {
+    if ((key === "$and" || key === "$or") && Array.isArray(value)) {
+      const operator = database.operators.get(key);
+      if (typeof operator !== "symbol") {
+        throw new Error(`Unsupported having operator: ${key}`);
+      }
+      conditions.push({
+        [operator]: value.map((item) => buildHavingNode(database, formatter, fieldMap, item, timezone))
+      });
+      continue;
+    }
+    conditions.push(buildFieldCondition(database, formatter, fieldMap, key, value, timezone));
+  }
+  if (conditions.length === 1) {
+    return conditions[0];
+  }
+  return {
+    [import_sequelize.Op.and]: conditions
+  };
+}
+__name(buildHavingNode, "buildHavingNode");
+function buildHaving(database, formatter, fieldMap, having, timezone) {
+  if (!having) {
+    return void 0;
+  }
+  return buildHavingNode(database, formatter, fieldMap, having, timezone);
+}
+__name(buildHaving, "buildHaving");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildHaving
+});

package/lib/query/types.d.ts

@@ -0,0 +1,40 @@
+/**
+ * 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 type QueryField = string | string[];
+export interface QueryMeasure {
+    field: QueryField;
+    type?: string;
+    aggregation?: string;
+    alias?: string;
+    distinct?: boolean;
+}
+export interface QueryDimension {
+    field: QueryField;
+    type?: string;
+    alias?: string;
+    format?: string;
+    options?: any;
+}
+export interface QueryOrder {
+    field: QueryField;
+    alias?: string;
+    order?: 'asc' | 'desc';
+    nulls?: 'default' | 'first' | 'last';
+}
+export interface QueryOptions {
+    measures?: QueryMeasure[];
+    dimensions?: QueryDimension[];
+    orders?: QueryOrder[];
+    filter?: any;
+    having?: any;
+    limit?: number;
+    offset?: number;
+    timezone?: string;
+    context?: any;
+}

package/lib/query/types.js

@@ -0,0 +1,24 @@
+/**
+ * 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 __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 types_exports = {};
+module.exports = __toCommonJS(types_exports);