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

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/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/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/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;

package/lib/options-parser.js

@@ -44,6 +44,7 @@ var import_lodash = __toESM(require("lodash"));
 var import_sequelize = require("sequelize");
 var import_filter_parser = __toESM(require("./filter-parser"));
 var import_qs = __toESM(require("qs"));
+var import_association_not_found_error = require("./errors/association-not-found-error");
 const debug = require("debug")("noco-database");
 const _OptionsParser = class _OptionsParser {
   options;
@@ -52,6 +53,7 @@ const _OptionsParser = class _OptionsParser {
   model;
   filterParser;
   context;
+  associationNotFoundWarnings = [];
   constructor(options, context) {
     const { collection } = context;
     this.collection = collection;
@@ -301,7 +303,7 @@ const _OptionsParser = class _OptionsParser {
     }
     const sortedAppends = import_lodash.default.sortBy(appendList, (append) => append.split(".").length);
     const setInclude = /* @__PURE__ */ __name((model, queryParams, append, parentAs) => {
-      var _a;
+      var _a, _b;
       const appendWithOptions = this.parseAppendWithOptions(append);
       append = appendWithOptions.name;
       const appendFields = append.split(".");
@@ -314,7 +316,7 @@ const _OptionsParser = class _OptionsParser {
       if (appendFields.length == 2) {
         const association = associations[appendFields[0]];
         if (!association) {
-          throw new Error(`association ${appendFields[0]} in ${model.name} not found`);
+          throw new import_association_not_found_error.AssociationNotFoundError(`association ${appendFields[0]} in ${model.name} not found`);
         }
         const associationModel = associations[appendFields[0]].target;
         if (associationModel.rawAttributes[appendFields[1]]) {
@@ -341,7 +343,13 @@ const _OptionsParser = class _OptionsParser {
       if (existIncludeIndex == -1) {
         const association = associations[appendAssociation];
         if (!association) {
-          throw new Error(`association ${appendAssociation} in ${model.name} not found`);
+          throw new import_association_not_found_error.AssociationNotFoundError(`association ${appendAssociation} in ${model.name} not found`);
+        }
+        const targetCollectionName = (_b = this.database.getCollectionByModelName(association.target.name)) == null ? void 0 : _b.name;
+        if (!targetCollectionName) {
+          throw new import_association_not_found_error.AssociationNotFoundError(
+            `target collection for association ${appendAssociation} in ${model.name} not found`
+          );
         }
         let includeOptions = {
           association: appendAssociation,
@@ -394,7 +402,15 @@ const _OptionsParser = class _OptionsParser {
       }
     }, "setInclude");
     for (const append of sortedAppends) {
-      setInclude(this.model, filterParams, append);
+      try {
+        setInclude(this.model, filterParams, append);
+      } catch (error) {
+        if (error instanceof import_association_not_found_error.AssociationNotFoundError) {
+          this.associationNotFoundWarnings.push(error.message);
+          continue;
+        }
+        throw error;
+      }
     }
     debug("filter params: %o", filterParams);
     return filterParams;

package/lib/query/builder.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 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 { FindOptions as SequelizeFindOptions } from 'sequelize';
+import { Collection } from '../collection';
+import { Database } from '../database';
+import { QueryOptions } from './types';
+export declare function buildQuery(database: Database, collection: Collection, options?: QueryOptions): {
+    queryOptions: SequelizeFindOptions<any>;
+    fieldMap: Record<string, any>;
+};
+export declare function normalizeQueryResult(data: any[], fieldMap: Record<string, any>): any[];

package/lib/query/builder.js

@@ -0,0 +1,268 @@
+/**
+ * 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 builder_exports = {};
+__export(builder_exports, {
+  buildQuery: () => buildQuery,
+  normalizeQueryResult: () => normalizeQueryResult
+});
+module.exports = __toCommonJS(builder_exports);
+var import_filter_parser = __toESM(require("../filter-parser"));
+var import_formatter = require("./formatter");
+var import_mysql = require("./formatters/mysql");
+var import_oracle = require("./formatters/oracle");
+var import_postgres = require("./formatters/postgres");
+var import_sqlite = require("./formatters/sqlite");
+var import_having = require("./having");
+const ALLOWED_AGG_FUNCS = ["sum", "count", "avg", "min", "max"];
+const ALLOWED_ORDER_DIRECTIONS = ["ASC", "DESC"];
+function createQueryFormatter(database) {
+  switch (database.sequelize.getDialect()) {
+    case "sqlite":
+      return new import_sqlite.SQLiteQueryFormatter(database.sequelize, database.options.rawTimezone);
+    case "postgres":
+      return new import_postgres.PostgresQueryFormatter(database.sequelize, database.options.rawTimezone);
+    case "mysql":
+    case "mariadb":
+      return new import_mysql.MySQLQueryFormatter(database.sequelize, database.options.rawTimezone);
+    case "oracle":
+      return new import_oracle.OracleQueryFormatter(database.sequelize, database.options.rawTimezone);
+    default:
+      return new class extends import_formatter.QueryFormatter {
+        formatDate(field, _format, _timezone, _preserveLocalTime) {
+          return field;
+        }
+        formatUnixTimestamp(field, _format, _accuracy, _timezone) {
+          return this.sequelize.col(field);
+        }
+      }(database.sequelize, database.options.rawTimezone);
+  }
+}
+__name(createQueryFormatter, "createQueryFormatter");
+function parseSelectedField(database, collection, selected) {
+  var _a, _b, _c, _d, _e;
+  const collectionName = collection.name;
+  const fields = collection.fields;
+  let target;
+  let name;
+  const fieldPath = Array.isArray(selected.field) ? selected.field : selected.field.split(".").filter(Boolean);
+  if (fieldPath.length === 1) {
+    name = fieldPath[0];
+  } else {
+    [target, name] = fieldPath;
+  }
+  const rawAttributes = collection.model.getAttributes();
+  let field = ((_a = rawAttributes[name]) == null ? void 0 : _a.field) || name;
+  let fieldType = (_b = fields.get(name)) == null ? void 0 : _b.type;
+  let fieldOptions = (_c = fields.get(name)) == null ? void 0 : _c.options;
+  if (target) {
+    const targetField = fields.get(target);
+    const targetCollection = database.getCollection(targetField.target);
+    const targetFields = targetCollection.fields;
+    fieldType = (_d = targetFields.get(name)) == null ? void 0 : _d.type;
+    fieldOptions = (_e = targetFields.get(name)) == null ? void 0 : _e.options;
+    field = `${target}.${field}`;
+    name = `${target}.${name}`;
+  } else {
+    field = `${collectionName}.${field}`;
+  }
+  return {
+    ...selected,
+    field,
+    name,
+    type: fieldType,
+    options: fieldOptions,
+    alias: selected.alias || name,
+    target
+  };
+}
+__name(parseSelectedField, "parseSelectedField");
+function buildQuery(database, collection, options = {}) {
+  var _a;
+  const sequelize = database.sequelize;
+  const formatter = createQueryFormatter(database);
+  const measures = (options.measures || []).map((measure) => parseSelectedField(database, collection, measure));
+  const dimensions = (options.dimensions || []).map((dimension) => parseSelectedField(database, collection, dimension));
+  const orders = (options.orders || []).map((order2) => parseSelectedField(database, collection, order2));
+  const models = {};
+  [...measures, ...dimensions, ...orders].forEach((item) => {
+    var _a2;
+    if (item.target && !models[item.target]) {
+      models[item.target] = { type: (_a2 = collection.fields.get(item.target)) == null ? void 0 : _a2.type };
+    }
+  });
+  const include = Object.entries(models).map(([target, { type }]) => {
+    let includeOptions = {
+      association: target,
+      attributes: []
+    };
+    if (type === "belongsToMany") {
+      includeOptions.through = { attributes: [] };
+    }
+    if (type === "belongsToArray") {
+      const association = collection.model.associations[target];
+      if (association) {
+        includeOptions = {
+          ...includeOptions,
+          ...association.generateInclude()
+        };
+      }
+    }
+    return includeOptions;
+  });
+  const filterParser = new import_filter_parser.default(options.filter, { collection });
+  const { where, include: filterInclude } = filterParser.toSequelizeParams();
+  if (filterInclude) {
+    const stack = [...filterInclude];
+    while (stack.length) {
+      const item = stack.pop();
+      const parentCollection = database.getCollection(item.parentCollection || collection.name);
+      const field = parentCollection.fields.get(item.association);
+      if ((field == null ? void 0 : field.type) === "belongsToMany") {
+        item.through = { attributes: [] };
+      }
+      if ((field == null ? void 0 : field.target) && ((_a = item.include) == null ? void 0 : _a.length)) {
+        for (const child of item.include) {
+          child.parentCollection = field.target;
+          stack.push(child);
+        }
+      }
+    }
+  }
+  let hasAgg = false;
+  const attributes = [];
+  const fieldMap = {};
+  const projectedFieldMap = {};
+  measures.forEach((measure) => {
+    const { field, aggregation, alias, distinct } = measure;
+    const col = sequelize.col(field);
+    const attribute = [];
+    if (aggregation) {
+      if (!ALLOWED_AGG_FUNCS.includes(aggregation)) {
+        throw new Error(`Invalid aggregation function: ${aggregation}`);
+      }
+      hasAgg = true;
+      attribute.push(sequelize.fn(aggregation, distinct ? sequelize.fn("DISTINCT", col) : col));
+    } else {
+      attribute.push(col);
+    }
+    if (alias) {
+      attribute.push(alias);
+    }
+    attributes.push(attribute.length > 1 ? attribute : attribute[0]);
+    fieldMap[alias || field] = measure;
+    projectedFieldMap[alias || field] = attribute[0];
+  });
+  const group = [];
+  dimensions.forEach((dimension) => {
+    const { field, format, alias, type, options: fieldOptions } = dimension;
+    const attribute = [];
+    if (format) {
+      attribute.push(formatter.format({ type, field, format, timezone: options.timezone, fieldOptions }));
+    } else {
+      attribute.push(sequelize.col(field));
+    }
+    if (alias) {
+      attribute.push(alias);
+    }
+    attributes.push(attribute.length > 1 ? attribute : attribute[0]);
+    if (hasAgg) {
+      group.push(attribute[0]);
+    }
+    fieldMap[alias || field] = dimension;
+    projectedFieldMap[alias || field] = attribute[0];
+  });
+  const order = orders.map((item) => {
+    var _a2;
+    const alias = sequelize.getQueryInterface().quoteIdentifier(item.alias);
+    const projectedField = projectedFieldMap[item.alias] || projectedFieldMap[item.name] || projectedFieldMap[item.field];
+    const name = hasAgg ? projectedField || sequelize.literal(alias) : sequelize.col(item.field);
+    let sort = ALLOWED_ORDER_DIRECTIONS.includes((_a2 = item.order) == null ? void 0 : _a2.toUpperCase()) ? item.order.toUpperCase() : "ASC";
+    if (item.nulls === "first") {
+      sort += " NULLS FIRST";
+    }
+    if (item.nulls === "last") {
+      sort += " NULLS LAST";
+    }
+    return [name, sort];
+  });
+  const queryOptions = {
+    where,
+    having: (0, import_having.buildHaving)(database, formatter, fieldMap, options.having, options.timezone),
+    attributes,
+    include: [...include, ...filterInclude || []],
+    group,
+    order,
+    subQuery: false,
+    raw: true
+  };
+  if (!hasAgg || dimensions.length) {
+    queryOptions.limit = options.limit || 2e3;
+    queryOptions.offset = options.offset || 0;
+  }
+  return { queryOptions, fieldMap };
+}
+__name(buildQuery, "buildQuery");
+function normalizeQueryResult(data, fieldMap) {
+  const dateTimeTypes = ["date", "datetime", "datetimeTz", "datetimeNoTz"];
+  return data.map((record) => {
+    Object.entries(record).forEach(([key, value]) => {
+      if (value === null || value === void 0) {
+        return;
+      }
+      const field = fieldMap[key];
+      const type = field == null ? void 0 : field.type;
+      if (["bigInt", "integer", "float", "double", "decimal"].includes(type)) {
+        record[key] = Number(value);
+        return;
+      }
+      if (!(field == null ? void 0 : field.format) && dateTimeTypes.includes(type) && !(value instanceof Date)) {
+        const dateValue = new Date(value);
+        if (!Number.isNaN(dateValue.getTime())) {
+          record[key] = dateValue;
+        }
+      }
+    });
+    return record;
+  });
+}
+__name(normalizeQueryResult, "normalizeQueryResult");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildQuery,
+  normalizeQueryResult
+});