@nocobase/plugin-data-visualization 1.4.0-alpha.20241020033334 → 1.4.0-alpha.20241024133132

package/dist/externalVersion.js

@@ -8,24 +8,24 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.4.0-alpha.20241020033334",
+  "@nocobase/client": "1.4.0-alpha.20241024133132",
   "dayjs": "1.11.10",
   "@formily/react": "2.3.0",
   "@formily/shared": "2.3.0",
   "lodash": "4.17.21",
   "react": "18.2.0",
-  "@nocobase/cache": "1.4.0-alpha.20241020033334",
-  "@nocobase/server": "1.4.0-alpha.20241020033334",
-  "@nocobase/test": "1.4.0-alpha.20241020033334",
+  "@nocobase/cache": "1.4.0-alpha.20241024133132",
+  "@nocobase/server": "1.4.0-alpha.20241024133132",
+  "@nocobase/test": "1.4.0-alpha.20241024133132",
   "@emotion/css": "11.13.0",
   "@ant-design/icons": "5.2.6",
   "ahooks": "3.7.8",
   "antd": "5.12.8",
   "@formily/antd-v5": "1.1.9",
   "@formily/core": "2.3.0",
-  "@nocobase/utils": "1.4.0-alpha.20241020033334",
+  "@nocobase/utils": "1.4.0-alpha.20241024133132",
   "react-i18next": "11.18.6",
-  "@nocobase/actions": "1.4.0-alpha.20241020033334",
-  "@nocobase/database": "1.4.0-alpha.20241020033334",
+  "@nocobase/actions": "1.4.0-alpha.20241024133132",
+  "@nocobase/database": "1.4.0-alpha.20241024133132",
   "sequelize": "6.35.2"
 };

package/dist/node_modules/koa-compose/package.json

@@ -1 +1 @@
-{"name":"koa-compose","description":"compose Koa middleware","repository":"koajs/compose","version":"4.1.0","keywords":["koa","middleware","compose"],"files":["index.js"],"dependencies":{},"devDependencies":{"codecov":"^3.0.0","jest":"^21.0.0","matcha":"^0.7.0","standard":"^10.0.3"},"scripts":{"bench":"matcha bench/bench.js","lint":"standard --fix .","test":"jest --forceExit --coverage"},"jest":{"testEnvironment":"node"},"license":"MIT","_lastModified":"2024-10-20T03:45:07.039Z"}
+{"name":"koa-compose","description":"compose Koa middleware","repository":"koajs/compose","version":"4.1.0","keywords":["koa","middleware","compose"],"files":["index.js"],"dependencies":{},"devDependencies":{"codecov":"^3.0.0","jest":"^21.0.0","matcha":"^0.7.0","standard":"^10.0.3"},"scripts":{"bench":"matcha bench/bench.js","lint":"standard --fix .","test":"jest --forceExit --coverage"},"jest":{"testEnvironment":"node"},"license":"MIT","_lastModified":"2024-10-24T13:44:06.837Z"}

package/dist/node_modules/moment-timezone/package.json

@@ -1 +1 @@
-{"name":"moment-timezone","version":"0.5.43","description":"Parse and display moments in any timezone.","homepage":"http://momentjs.com/timezone/","author":"Tim Wood <washwithcare@gmail.com> (http://timwoodcreates.com/)","keywords":["moment","date","time","timezone","olson","iana","zone","tz"],"main":"./index.js","typings":"./index.d.ts","engines":{"node":"*"},"repository":{"type":"git","url":"https://github.com/moment/moment-timezone.git"},"bugs":{"url":"https://github.com/moment/moment-timezone/issues"},"license":"MIT","dependencies":{"moment":"^2.29.4"},"devDependencies":{"grunt":"^1.5.3","grunt-contrib-clean":"^2.0.1","grunt-contrib-jshint":"^3.2.0","grunt-contrib-nodeunit":"^4.0.0","grunt-contrib-uglify":"^5.2.2","grunt-exec":"^3.0.0","typescript":"^3.5.1"},"jspm":{"main":"builds/moment-timezone-with-data","shim":{"moment-timezone":{"deps":["moment"]}}},"scripts":{"test":"grunt"},"_lastModified":"2024-10-20T03:45:07.723Z"}
+{"name":"moment-timezone","version":"0.5.43","description":"Parse and display moments in any timezone.","homepage":"http://momentjs.com/timezone/","author":"Tim Wood <washwithcare@gmail.com> (http://timwoodcreates.com/)","keywords":["moment","date","time","timezone","olson","iana","zone","tz"],"main":"./index.js","typings":"./index.d.ts","engines":{"node":"*"},"repository":{"type":"git","url":"https://github.com/moment/moment-timezone.git"},"bugs":{"url":"https://github.com/moment/moment-timezone/issues"},"license":"MIT","dependencies":{"moment":"^2.29.4"},"devDependencies":{"grunt":"^1.5.3","grunt-contrib-clean":"^2.0.1","grunt-contrib-jshint":"^3.2.0","grunt-contrib-nodeunit":"^4.0.0","grunt-contrib-uglify":"^5.2.2","grunt-exec":"^3.0.0","typescript":"^3.5.1"},"jspm":{"main":"builds/moment-timezone-with-data","shim":{"moment-timezone":{"deps":["moment"]}}},"scripts":{"test":"grunt"},"_lastModified":"2024-10-24T13:44:07.644Z"}

package/dist/server/actions/query.d.ts

@@ -9,7 +9,6 @@
 import { Context, Next } from '@nocobase/actions';
 export declare const postProcess: (ctx: Context, next: Next) => Promise<void>;
 export declare const queryData: (ctx: Context, next: Next) => Promise<void>;
-export declare const parseBuilder: (ctx: Context, next: Next) => Promise<void>;
 export declare const parseFieldAndAssociations: (ctx: Context, next: Next) => Promise<void>;
 export declare const parseVariables: (ctx: Context, next: Next) => Promise<void>;
 export declare const cacheMiddleware: (ctx: Context, next: Next) => Promise<void>;

package/dist/server/actions/query.js

@@ -38,7 +38,6 @@ var query_exports = {};
 __export(query_exports, {
   cacheMiddleware: () => cacheMiddleware,
   checkPermission: () => checkPermission,
-  parseBuilder: () => parseBuilder,
   parseFieldAndAssociations: () => parseFieldAndAssociations,
   parseVariables: () => parseVariables,
   postProcess: () => postProcess,
@@ -49,8 +48,7 @@ module.exports = __toCommonJS(query_exports);
 var import_database = require("@nocobase/database");
 var import_koa_compose = __toESM(require("koa-compose"));
 var import_server = require("@nocobase/server");
-var import_formatter = require("../formatter");
-const AllowedAggFuncs = ["sum", "count", "avg", "min", "max"];
+var import_query_parser = require("../query-parser");
 const getDB = (ctx, dataSource) => {
   const ds = ctx.app.dataSourceManager.dataSources.get(dataSource);
   return ds == null ? void 0 : ds.collectionManager.db;
@@ -88,74 +86,6 @@ const queryData = async (ctx, next) => {
   };
   await next();
 };
-const parseBuilder = async (ctx, next) => {
-  const { dataSource, measures, dimensions, orders, include, where, limit } = ctx.action.params.values;
-  const db = getDB(ctx, dataSource) || ctx.db;
-  const { sequelize } = db;
-  const attributes = [];
-  const group = [];
-  const order = [];
-  const fieldMap = {};
-  let hasAgg = false;
-  measures.forEach((measure) => {
-    const { field, aggregation, alias, distinct } = measure;
-    const attribute = [];
-    const col = sequelize.col(field);
-    if (aggregation) {
-      if (!AllowedAggFuncs.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;
-  });
-  dimensions.forEach((dimension) => {
-    const { field, format, alias, type, options } = dimension;
-    const attribute = [];
-    const col = sequelize.col(field);
-    if (format) {
-      const formatter = (0, import_formatter.createFormatter)(sequelize);
-      attribute.push(formatter.format({ type, field, format, timezone: ctx.timezone, options }));
-    } else {
-      attribute.push(col);
-    }
-    if (alias) {
-      attribute.push(alias);
-    }
-    attributes.push(attribute.length > 1 ? attribute : attribute[0]);
-    if (hasAgg) {
-      group.push(attribute[0]);
-    }
-    fieldMap[alias || field] = dimension;
-  });
-  orders.forEach((item) => {
-    const alias = sequelize.getQueryInterface().quoteIdentifier(item.alias);
-    const name = hasAgg ? sequelize.literal(alias) : sequelize.col(item.field);
-    order.push([name, item.order || "ASC"]);
-  });
-  ctx.action.params.values = {
-    ...ctx.action.params.values,
-    queryParams: {
-      where,
-      attributes,
-      include,
-      group,
-      order,
-      limit: limit || 2e3,
-      subQuery: false,
-      raw: true
-    },
-    fieldMap
-  };
-  await next();
-};
 const parseFieldAndAssociations = async (ctx, next) => {
   const {
     dataSource,
@@ -288,13 +218,16 @@ const checkPermission = (ctx, next) => {
   return next();
 };
 const query = async (ctx, next) => {
+  const { dataSource } = ctx.action.params.values;
+  const db = getDB(ctx, dataSource) || ctx.db;
+  const queryParser = (0, import_query_parser.createQueryParser)(db);
   try {
     await (0, import_koa_compose.default)([
       checkPermission,
       cacheMiddleware,
       parseVariables,
       parseFieldAndAssociations,
-      parseBuilder,
+      queryParser.parse(),
       queryData,
       postProcess
     ])(ctx, next);
@@ -306,7 +239,6 @@ const query = async (ctx, next) => {
 0 && (module.exports = {
   cacheMiddleware,
   checkPermission,
-  parseBuilder,
   parseFieldAndAssociations,
   parseVariables,
   postProcess,

package/dist/server/formatter/oracle-formatter.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 { Col, Formatter } from './formatter';
+export declare class OracleFormatter extends Formatter {
+    convertFormat(format: string): string;
+    formatDate(field: Col, format: string, timezoneOffset?: string): import("sequelize/types/utils").Fn;
+    formatUnixTimeStamp(field: string, format: string, accuracy?: 'second' | 'millisecond', timezoneOffset?: string): import("sequelize/types/utils").Fn;
+}

package/dist/server/formatter/oracle-formatter.js

@@ -0,0 +1,74 @@
+/**
+ * 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 __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_formatter_exports = {};
+__export(oracle_formatter_exports, {
+  OracleFormatter: () => OracleFormatter
+});
+module.exports = __toCommonJS(oracle_formatter_exports);
+var import_formatter = require("./formatter");
+class OracleFormatter extends import_formatter.Formatter {
+  convertFormat(format) {
+    return format.replace(/hh/g, "HH24").replace(/mm/g, "MI").replace(/ss/g, "SS");
+  }
+  formatDate(field, format, timezoneOffset) {
+    format = this.convertFormat(format);
+    const timezone = this.getTimezoneByOffset(timezoneOffset);
+    if (timezone) {
+      const col = this.sequelize.getQueryInterface().quoteIdentifiers(field.col);
+      const fieldWithTZ = this.sequelize.literal(`(${col} AT TIME ZONE '${timezone}')`);
+      return this.sequelize.fn("to_char", fieldWithTZ, format);
+    }
+    return this.sequelize.fn("to_char", field, format);
+  }
+  formatUnixTimeStamp(field, format, accuracy = "second", timezoneOffset) {
+    format = this.convertFormat(format);
+    const col = this.sequelize.getQueryInterface().quoteIdentifiers(field);
+    const timezone = this.getTimezoneByOffset(timezoneOffset);
+    if (timezone) {
+      if (accuracy === "millisecond") {
+        return this.sequelize.fn(
+          "to_char",
+          this.sequelize.literal(`to_timestamp(ROUND(${col} / 1000)) AT TIME ZONE '${timezone}'`),
+          format
+        );
+      }
+      return this.sequelize.fn(
+        "to_char",
+        this.sequelize.literal(`to_timestamp(${col}) AT TIME ZONE '${timezone}'`),
+        format
+      );
+    }
+    if (accuracy === "millisecond") {
+      return this.sequelize.fn("to_char", this.sequelize.literal(`to_timestamp(ROUND(${col} / 1000)`), format);
+    }
+    return this.sequelize.fn("to_char", this.sequelize.literal(`to_timestamp(${col})`), format);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  OracleFormatter
+});

package/dist/server/plugin.js

@@ -37,7 +37,7 @@ class PluginDataVisualizationServer extends import_server.Plugin {
   afterAdd() {
   }
   beforeLoad() {
-    this.app.resource({
+    this.app.resourceManager.define({
       name: "charts",
       actions: {
         query: import_query.query

package/dist/server/query-parser/index.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.
+ */
+import { Database } from '@nocobase/database';
+import { QueryParser } from './query-parser';
+export declare const createQueryParser: (db: Database) => QueryParser;

package/dist/server/query-parser/index.js

@@ -0,0 +1,56 @@
+/**
+ * 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 __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 query_parser_exports = {};
+__export(query_parser_exports, {
+  createQueryParser: () => createQueryParser
+});
+module.exports = __toCommonJS(query_parser_exports);
+var import_sqlite_query_parser = require("./sqlite-query-parser");
+var import_postgres_query_parser = require("./postgres-query-parser");
+var import_mysql_query_parser = require("./mysql-query-parser");
+var import_query_parser = require("./query-parser");
+var import_oracle_query_parser = require("./oracle-query-parser");
+const createQueryParser = (db) => {
+  const dialect = db.sequelize.getDialect();
+  switch (dialect) {
+    case "sqlite":
+      return new import_sqlite_query_parser.SQLiteQueryParser(db);
+    case "postgres":
+      return new import_postgres_query_parser.PostgresQueryParser(db);
+    case "mysql":
+    case "mariadb":
+      return new import_mysql_query_parser.MySQLQueryParser(db);
+    case "oracle":
+      return new import_oracle_query_parser.OracleQueryParser(db);
+    default:
+      return new import_query_parser.QueryParser(db);
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createQueryParser
+});

package/dist/server/query-parser/mysql-query-parser.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 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 { Database } from '@nocobase/database';
+import { MySQLFormatter } from '../formatter/mysql-formatter';
+import { QueryParser } from './query-parser';
+export declare class MySQLQueryParser extends QueryParser {
+    formatter: MySQLFormatter;
+    constructor(db: Database);
+}

package/dist/server/{formatter/index.js → query-parser/mysql-query-parser.js}

@@ -24,27 +24,20 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var formatter_exports = {};
-__export(formatter_exports, {
-  createFormatter: () => createFormatter
+var mysql_query_parser_exports = {};
+__export(mysql_query_parser_exports, {
+  MySQLQueryParser: () => MySQLQueryParser
 });
-module.exports = __toCommonJS(formatter_exports);
-var import_sqlite_formatter = require("./sqlite-formatter");
-var import_postgres_formatter = require("./postgres-formatter");
-var import_mysql_formatter = require("./mysql-formatter");
-const createFormatter = (sequelize) => {
-  const dialect = sequelize.getDialect();
-  switch (dialect) {
-    case "sqlite":
-      return new import_sqlite_formatter.SQLiteFormatter(sequelize);
-    case "postgres":
-      return new import_postgres_formatter.PostgresFormatter(sequelize);
-    case "mysql":
-    case "mariadb":
-      return new import_mysql_formatter.MySQLFormatter(sequelize);
+module.exports = __toCommonJS(mysql_query_parser_exports);
+var import_mysql_formatter = require("../formatter/mysql-formatter");
+var import_query_parser = require("./query-parser");
+class MySQLQueryParser extends import_query_parser.QueryParser {
+  constructor(db) {
+    super(db);
+    this.formatter = new import_mysql_formatter.MySQLFormatter(db.sequelize);
   }
-};
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createFormatter
+  MySQLQueryParser
 });

package/dist/server/query-parser/oracle-query-parser.d.ts

@@ -0,0 +1,18 @@
+/**
+ * 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 { QueryParser } from './query-parser';
+import { OrderProps } from '../types';
+import { Context } from '@nocobase/actions';
+import { OracleFormatter } from '../formatter/oracle-formatter';
+import { Database } from '@nocobase/database';
+export declare class OracleQueryParser extends QueryParser {
+    formatter: OracleFormatter;
+    constructor(db: Database);
+    parseOrders(ctx: Context, orders: OrderProps[], hasAgg: boolean): any[];
+}

package/dist/server/query-parser/oracle-query-parser.js

@@ -0,0 +1,60 @@
+/**
+ * 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 __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_query_parser_exports = {};
+__export(oracle_query_parser_exports, {
+  OracleQueryParser: () => OracleQueryParser
+});
+module.exports = __toCommonJS(oracle_query_parser_exports);
+var import_query_parser = require("./query-parser");
+var import_oracle_formatter = require("../formatter/oracle-formatter");
+class OracleQueryParser extends import_query_parser.QueryParser {
+  constructor(db) {
+    super(db);
+    this.formatter = new import_oracle_formatter.OracleFormatter(db.sequelize);
+  }
+  parseOrders(ctx, orders, hasAgg) {
+    const { collection: collectionName, dimensions } = ctx.action.params.values;
+    const collection = this.db.getCollection(collectionName);
+    if (!orders.length) {
+      if (dimensions.length) {
+        orders.push(dimensions[0]);
+      } else {
+        let filterTks = collection.filterTargetKey;
+        if (!Array.isArray(filterTks)) {
+          filterTks = [filterTks];
+        }
+        orders.push(...filterTks.map((field) => ({ field, alias: field })));
+      }
+    }
+    const order = super.parseOrders(ctx, orders, hasAgg);
+    return order;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  OracleQueryParser
+});

package/dist/server/query-parser/postgres-query-parser.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 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 { Database } from '@nocobase/database';
+import { PostgresFormatter } from '../formatter/postgres-formatter';
+import { QueryParser } from './query-parser';
+export declare class PostgresQueryParser extends QueryParser {
+    formatter: PostgresFormatter;
+    constructor(db: Database);
+}

package/dist/server/query-parser/postgres-query-parser.js

@@ -0,0 +1,43 @@
+/**
+ * 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 __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_query_parser_exports = {};
+__export(postgres_query_parser_exports, {
+  PostgresQueryParser: () => PostgresQueryParser
+});
+module.exports = __toCommonJS(postgres_query_parser_exports);
+var import_postgres_formatter = require("../formatter/postgres-formatter");
+var import_query_parser = require("./query-parser");
+class PostgresQueryParser extends import_query_parser.QueryParser {
+  constructor(db) {
+    super(db);
+    this.formatter = new import_postgres_formatter.PostgresFormatter(db.sequelize);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  PostgresQueryParser
+});

package/dist/server/query-parser/query-parser.d.ts

@@ -0,0 +1,31 @@
+/**
+ * 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 { Context, Next } from '@nocobase/actions';
+import { DimensionProps, MeasureProps, OrderProps } from '../types';
+import { Formatter } from '../formatter/formatter';
+import { Database } from '@nocobase/database';
+export declare class QueryParser {
+    db: Database;
+    formatter: Formatter;
+    constructor(db: Database);
+    parseMeasures(ctx: Context, measures: MeasureProps[]): {
+        attributes: any[];
+        fieldMap: {};
+        hasAgg: boolean;
+    };
+    parseDimensions(ctx: Context, dimensions: (DimensionProps & {
+        field: string;
+    })[], hasAgg: boolean, timezone: string): {
+        attributes: any[];
+        group: any[];
+        fieldMap: {};
+    };
+    parseOrders(ctx: Context, orders: OrderProps[], hasAgg: boolean): any[];
+    parse(): (ctx: Context, next: Next) => Promise<void>;
+}

package/dist/server/query-parser/query-parser.js

@@ -0,0 +1,134 @@
+/**
+ * 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 __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 query_parser_exports = {};
+__export(query_parser_exports, {
+  QueryParser: () => QueryParser
+});
+module.exports = __toCommonJS(query_parser_exports);
+const AllowedAggFuncs = ["sum", "count", "avg", "min", "max"];
+class QueryParser {
+  db;
+  formatter;
+  constructor(db) {
+    this.db = db;
+    this.formatter = {
+      format: ({ field }) => db.sequelize.col(field)
+    };
+  }
+  parseMeasures(ctx, measures) {
+    let hasAgg = false;
+    const sequelize = this.db.sequelize;
+    const attributes = [];
+    const fieldMap = {};
+    measures.forEach((measure) => {
+      const { field, aggregation, alias, distinct } = measure;
+      const attribute = [];
+      const col = sequelize.col(field);
+      if (aggregation) {
+        if (!AllowedAggFuncs.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;
+    });
+    return { attributes, fieldMap, hasAgg };
+  }
+  parseDimensions(ctx, dimensions, hasAgg, timezone) {
+    const sequelize = this.db.sequelize;
+    const attributes = [];
+    const group = [];
+    const fieldMap = {};
+    dimensions.forEach((dimension) => {
+      const { field, format, alias, type, options } = dimension;
+      const attribute = [];
+      const col = sequelize.col(field);
+      if (format) {
+        attribute.push(this.formatter.format({ type, field, format, timezone, options }));
+      } else {
+        attribute.push(col);
+      }
+      if (alias) {
+        attribute.push(alias);
+      }
+      attributes.push(attribute.length > 1 ? attribute : attribute[0]);
+      if (hasAgg) {
+        group.push(attribute[0]);
+      }
+      fieldMap[alias || field] = dimension;
+    });
+    return { attributes, group, fieldMap };
+  }
+  parseOrders(ctx, orders, hasAgg) {
+    const sequelize = this.db.sequelize;
+    const order = [];
+    orders.forEach((item) => {
+      const alias = sequelize.getQueryInterface().quoteIdentifier(item.alias);
+      const name = hasAgg ? sequelize.literal(alias) : sequelize.col(item.field);
+      order.push([name, item.order || "ASC"]);
+    });
+    return order;
+  }
+  parse() {
+    return async (ctx, next) => {
+      const { measures, dimensions, orders, include, where, limit } = ctx.action.params.values;
+      const { attributes: measureAttributes, fieldMap: measureFieldMap, hasAgg } = this.parseMeasures(ctx, measures);
+      const {
+        attributes: dimensionAttributes,
+        group,
+        fieldMap: dimensionFieldMap
+      } = this.parseDimensions(ctx, dimensions, hasAgg, ctx.timezone);
+      const order = this.parseOrders(ctx, orders, hasAgg);
+      ctx.action.params.values = {
+        ...ctx.action.params.values,
+        queryParams: {
+          where,
+          attributes: [...measureAttributes, ...dimensionAttributes],
+          include,
+          group,
+          order,
+          limit: limit || 2e3,
+          subQuery: false,
+          raw: true
+        },
+        fieldMap: { ...measureFieldMap, ...dimensionFieldMap }
+      };
+      await next();
+    };
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  QueryParser
+});

package/dist/server/query-parser/sqlite-query-parser.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 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 { Database } from '@nocobase/database';
+import { SQLiteFormatter } from '../formatter/sqlite-formatter';
+import { QueryParser } from './query-parser';
+export declare class SQLiteQueryParser extends QueryParser {
+    formatter: SQLiteFormatter;
+    constructor(db: Database);
+}

package/dist/server/query-parser/sqlite-query-parser.js

@@ -0,0 +1,43 @@
+/**
+ * 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 __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_query_parser_exports = {};
+__export(sqlite_query_parser_exports, {
+  SQLiteQueryParser: () => SQLiteQueryParser
+});
+module.exports = __toCommonJS(sqlite_query_parser_exports);
+var import_sqlite_formatter = require("../formatter/sqlite-formatter");
+var import_query_parser = require("./query-parser");
+class SQLiteQueryParser extends import_query_parser.QueryParser {
+  constructor(db) {
+    super(db);
+    this.formatter = new import_sqlite_formatter.SQLiteFormatter(db.sequelize);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SQLiteQueryParser
+});

package/dist/server/types.d.ts

@@ -0,0 +1,46 @@
+/**
+ * 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 MeasureProps = {
+    field: string | string[];
+    type?: string;
+    aggregation?: string;
+    alias?: string;
+    distinct?: boolean;
+};
+export type DimensionProps = {
+    field: string | string[];
+    type?: string;
+    alias?: string;
+    format?: string;
+    options?: any;
+};
+export type OrderProps = {
+    field: string | string[];
+    alias?: string;
+    order?: 'asc' | 'desc';
+};
+export type QueryParams = Partial<{
+    uid: string;
+    dataSource: string;
+    collection: string;
+    measures: MeasureProps[];
+    dimensions: DimensionProps[];
+    orders: OrderProps[];
+    filter: any;
+    limit: number;
+    sql: {
+        fields?: string;
+        clauses?: string;
+    };
+    cache: {
+        enabled: boolean;
+        ttl: number;
+    };
+    refresh: boolean;
+}>;

package/dist/server/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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "1.4.0-alpha.20241020033334",
+  "version": "1.4.0-alpha.20241024133132",
   "displayName": "Data visualization",
   "displayName.zh-CN": "数据可视化",
   "description": "Provides data visualization feature, including chart block and chart filter block, support line charts, area charts, bar charts and more than a dozen kinds of charts, you can also extend more chart types.",
@@ -34,7 +34,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "e99a8cf94fd0cf26db7fe7f82745d6345d80c48b",
+  "gitHead": "d127161994b06678d2d41f406fe73221242a1a05",
   "keywords": [
     "Blocks"
   ]

package/dist/server/formatter/index.d.ts

@@ -1,13 +0,0 @@
-/**
- * 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';
-import { SQLiteFormatter } from './sqlite-formatter';
-import { PostgresFormatter } from './postgres-formatter';
-import { MySQLFormatter } from './mysql-formatter';
-export declare const createFormatter: (sequelize: Sequelize) => SQLiteFormatter | PostgresFormatter | MySQLFormatter;