@nocobase/plugin-data-visualization 0.13.0-alpha.1 → 0.13.0-alpha.10

package/dist/server/actions/query.js

@@ -1,10 +1,147 @@
-'use strict';
-
-var database = require('@nocobase/database');
-var formatter = require('./formatter');
-
-const parseFieldAndAssociations = (ctx, params) => {
-  const { collection: collectionName, measures, dimensions, orders, filter } = params;
+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 __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 query_exports = {};
+__export(query_exports, {
+  cacheMiddleware: () => cacheMiddleware,
+  parseBuilder: () => parseBuilder,
+  parseFieldAndAssociations: () => parseFieldAndAssociations,
+  parseVariables: () => parseVariables,
+  postProcess: () => postProcess,
+  query: () => query,
+  queryData: () => queryData
+});
+module.exports = __toCommonJS(query_exports);
+var import_database = require("@nocobase/database");
+var import_formatter = require("./formatter");
+var import_koa_compose = __toESM(require("koa-compose"));
+var import_utils = require("@nocobase/utils");
+const postProcess = async (ctx, next) => {
+  const { sequelize } = ctx.db;
+  const dialect = sequelize.getDialect();
+  const { data, fieldMap } = ctx.action.params.values;
+  switch (dialect) {
+    case "postgres":
+      ctx.body = data.map((record) => {
+        const result = {};
+        Object.entries(record).forEach(([key, value]) => {
+          const { type } = fieldMap[key] || {};
+          switch (type) {
+            case "bigInt":
+            case "integer":
+            case "float":
+            case "double":
+              value = Number(value);
+              break;
+          }
+          result[key] = value;
+        });
+        return result;
+      });
+      break;
+    default:
+      ctx.body = data;
+  }
+  await next();
+};
+const queryData = async (ctx, next) => {
+  const { collection, queryParams, fieldMap } = ctx.action.params.values;
+  const model = ctx.db.getModel(collection);
+  const data = await model.findAll(queryParams);
+  ctx.action.params.values = {
+    data,
+    fieldMap
+  };
+  await next();
+};
+const parseBuilder = async (ctx, next) => {
+  const { sequelize } = ctx.db;
+  const { measures, dimensions, orders, include, where, limit } = ctx.action.params.values;
+  const attributes = [];
+  const group = [];
+  const order = [];
+  const fieldMap = {};
+  let hasAgg = false;
+  measures.forEach((measure) => {
+    const { field, aggregation, alias } = measure;
+    const attribute = [];
+    const col = sequelize.col(field);
+    if (aggregation) {
+      hasAgg = true;
+      attribute.push(sequelize.fn(aggregation, 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 } = dimension;
+    const attribute = [];
+    const col = sequelize.col(field);
+    if (format) {
+      attribute.push((0, import_formatter.formatter)(sequelize, type, field, format));
+    } 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 ? 2e3 : limit,
+      raw: true
+    },
+    fieldMap
+  };
+  await next();
+};
+const parseFieldAndAssociations = async (ctx, next) => {
+  const { collection: collectionName, measures, dimensions, orders, filter } = ctx.action.params.values;
   const collection = ctx.db.getCollection(collectionName);
   const fields = collection.fields;
   const underscored = ctx.db.options.underscored;
@@ -20,7 +157,7 @@ const parseFieldAndAssociations = (ctx, params) => {
     } else if (selected.field.length > 1) {
       [target, name] = selected.field;
     }
-    let field = underscored ? database.snakeCase(name) : name;
+    let field = underscored ? (0, import_database.snakeCase)(name) : name;
     let fieldType = (_a = fields.get(name)) == null ? void 0 : _a.type;
     if (target) {
       const targetField = fields.get(target);
@@ -52,7 +189,7 @@ const parseFieldAndAssociations = (ctx, params) => {
     attributes: [],
     ...type === "belongsToMany" ? { through: { attributes: [] } } : {}
   }));
-  const filterParser = new database.FilterParser(filter, {
+  const filterParser = new import_database.FilterParser(filter, {
     collection
   });
   const { where, include: filterInclude } = filterParser.toSequelizeParams();
@@ -63,149 +200,103 @@ const parseFieldAndAssociations = (ctx, params) => {
     }
     return item;
   });
-  return {
+  ctx.action.params.values = {
+    ...ctx.action.params.values,
     where,
     measures: parsedMeasures,
     dimensions: parsedDimensions,
     orders: parsedOrders,
     include: [...include, ...parsedFilterInclude || []]
   };
+  await next();
 };
-const parseBuilder = (ctx, builder) => {
-  const { sequelize } = ctx.db;
-  const { limit } = builder;
-  const { measures, dimensions, orders, include, where } = parseFieldAndAssociations(ctx, builder);
-  const attributes = [];
-  const group = [];
-  const order = [];
-  const fieldMap = {};
-  let hasAgg = false;
-  measures.forEach((measure) => {
-    const { field, aggregation, alias } = measure;
-    const attribute = [];
-    const col = sequelize.col(field);
-    if (aggregation) {
-      hasAgg = true;
-      attribute.push(sequelize.fn(aggregation, 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 } = dimension;
-    const attribute = [];
-    const col = sequelize.col(field);
-    if (format) {
-      attribute.push(formatter.formatter(sequelize, type, field, format));
-    } 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"]);
-  });
-  return {
-    queryParams: {
-      where,
-      attributes,
-      include,
-      group,
-      order,
-      limit: limit > 2e3 ? 2e3 : limit,
-      raw: true
-    },
-    fieldMap
+const parseVariables = async (ctx, next) => {
+  const { filter } = ctx.action.params.values;
+  if (!filter) {
+    return next();
+  }
+  const isNumeric = (str) => {
+    if (typeof str === "number")
+      return true;
+    if (typeof str != "string")
+      return false;
+    return !isNaN(str) && !isNaN(parseFloat(str));
   };
-};
-const processData = (ctx, data, fieldMap) => {
-  const { sequelize } = ctx.db;
-  const dialect = sequelize.getDialect();
-  switch (dialect) {
-    case "postgres":
-      return data.map((record) => {
-        const result = {};
-        Object.entries(record).forEach(([key, value]) => {
-          const { type } = fieldMap[key] || {};
-          switch (type) {
-            case "bigInt":
-            case "integer":
-            case "float":
-            case "double":
-              value = Number(value);
-              break;
-          }
-          result[key] = value;
-        });
-        return result;
+  const getUser = () => {
+    return async ({ fields }) => {
+      var _a, _b;
+      const userFields = fields.filter((f) => f && ctx.db.getFieldByPath("users." + f));
+      (_a = ctx.logger) == null ? void 0 : _a.info("filter-parse: ", { userFields });
+      if (!ctx.state.currentUser) {
+        return;
+      }
+      if (!userFields.length) {
+        return;
+      }
+      const user = await ctx.db.getRepository("users").findOne({
+        filterByTk: ctx.state.currentUser.id,
+        fields: userFields
       });
-    default:
-      return data;
-  }
-};
-const queryData = async (ctx, builder) => {
-  const { collection, measures, dimensions, orders, filter, limit, sql } = builder;
-  const model = ctx.db.getModel(collection);
-  const { queryParams, fieldMap } = parseBuilder(ctx, { collection, measures, dimensions, orders, filter, limit });
-  const data = await model.findAll(queryParams);
-  return processData(ctx, data, fieldMap);
+      (_b = ctx.logger) == null ? void 0 : _b.info("filter-parse: ", {
+        $user: user == null ? void 0 : user.toJSON()
+      });
+      return user;
+    };
+  };
+  ctx.action.params.values.filter = await (0, import_utils.parseFilter)(filter, {
+    timezone: ctx.get("x-timezone"),
+    now: (/* @__PURE__ */ new Date()).toISOString(),
+    getField: (path) => {
+      const fieldPath = path.split(".").filter((p) => !p.startsWith("$") && !isNumeric(p)).join(".");
+      const { resourceName } = ctx.action;
+      return ctx.db.getFieldByPath(`${resourceName}.${fieldPath}`);
+    },
+    vars: {
+      $nDate: (0, import_utils.getDateVars)(),
+      $user: getUser()
+    }
+  });
+  await next();
 };
-const cacheWrap = async (cache, options) => {
-  const { func, key, ttl, useCache, refresh } = options;
+const cacheMiddleware = async (ctx, next) => {
+  const { uid, cache: cacheConfig, refresh } = ctx.action.params.values;
+  const plugin = ctx.app.getPlugin("data-visualization");
+  const cache = plugin.cache;
+  const useCache = (cacheConfig == null ? void 0 : cacheConfig.enabled) && uid;
   if (useCache && !refresh) {
-    const data2 = await cache.get(key);
-    if (data2) {
-      return data2;
+    const data = await cache.get(uid);
+    if (data) {
+      ctx.body = data;
+      return;
     }
   }
-  const data = await func();
+  await next();
   if (useCache) {
-    await cache.set(key, data, ttl);
+    console.log(uid, ctx.body);
+    await cache.set(uid, ctx.body, (cacheConfig == null ? void 0 : cacheConfig.ttl) || 30);
+    console.log(cache.get(uid));
   }
-  return data;
 };
-const query = async (ctx, next) => {
-  const {
-    uid,
-    collection,
-    measures,
-    dimensions,
-    orders,
-    filter,
-    limit,
-    sql,
-    cache: cacheConfig,
-    refresh
-  } = ctx.action.params.values;
+const checkPermission = (ctx, next) => {
+  const { collection } = ctx.action.params.values;
   const roleName = ctx.state.currentRole || "anonymous";
   const can = ctx.app.acl.can({ role: roleName, resource: collection, action: "list" });
   if (!can && roleName !== "root") {
     ctx.throw(403, "No permissions");
   }
-  const plugin = ctx.app.getPlugin("data-visualization");
-  const cache = plugin.cache;
-  const useCache = (cacheConfig == null ? void 0 : cacheConfig.enabled) && uid;
+  return next();
+};
+const query = async (ctx, next) => {
   try {
-    ctx.body = await cacheWrap(cache, {
-      func: async () => await queryData(ctx, { collection, measures, dimensions, orders, filter, limit, sql }),
-      key: uid,
-      ttl: (cacheConfig == null ? void 0 : cacheConfig.ttl) || 30,
-      useCache: useCache ? true : false,
-      refresh
+    await (0, import_koa_compose.default)([
+      checkPermission,
+      cacheMiddleware,
+      parseVariables,
+      parseFieldAndAssociations,
+      parseBuilder,
+      queryData,
+      postProcess
+    ])(ctx, async () => {
     });
   } catch (err) {
     ctx.app.logger.error("charts query: ", err);
@@ -213,10 +304,13 @@ const query = async (ctx, next) => {
   }
   await next();
 };
-
-exports.cacheWrap = cacheWrap;
-exports.parseBuilder = parseBuilder;
-exports.parseFieldAndAssociations = parseFieldAndAssociations;
-exports.processData = processData;
-exports.query = query;
-exports.queryData = queryData;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  cacheMiddleware,
+  parseBuilder,
+  parseFieldAndAssociations,
+  parseVariables,
+  postProcess,
+  query,
+  queryData
+});

package/dist/server/index.js

@@ -1,11 +1,33 @@
-'use strict';
-
-var plugin = require('./plugin');
-
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
-var plugin__default = /*#__PURE__*/_interopDefault(plugin);
-
-
-
-module.exports = plugin__default.default;
+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 __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 server_exports = {};
+__export(server_exports, {
+  default: () => import_plugin.default
+});
+module.exports = __toCommonJS(server_exports);
+var import_plugin = __toESM(require("./plugin"));

package/dist/server/plugin.js

@@ -1,12 +1,30 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var cache = require('@nocobase/cache');
-var server = require('@nocobase/server');
-var query = require('./actions/query');
-
-class DataVisualizationPlugin extends server.Plugin {
+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 plugin_exports = {};
+__export(plugin_exports, {
+  DataVisualizationPlugin: () => DataVisualizationPlugin,
+  default: () => plugin_default
+});
+module.exports = __toCommonJS(plugin_exports);
+var import_cache = require("@nocobase/cache");
+var import_server = require("@nocobase/server");
+var import_query = require("./actions/query");
+class DataVisualizationPlugin extends import_server.Plugin {
   cache;
   afterAdd() {
   }
@@ -14,13 +32,13 @@ class DataVisualizationPlugin extends server.Plugin {
     this.app.resource({
       name: "charts",
       actions: {
-        query: query.query
+        query: import_query.query
       }
     });
     this.app.acl.allow("charts", "query", "loggedIn");
   }
   async load() {
-    this.cache = cache.createCache({
+    this.cache = (0, import_cache.createCache)({
       ttl: 30,
       // seconds
       max: 1e3,
@@ -37,6 +55,7 @@ class DataVisualizationPlugin extends server.Plugin {
   }
 }
 var plugin_default = DataVisualizationPlugin;
-
-exports.DataVisualizationPlugin = DataVisualizationPlugin;
-exports.default = plugin_default;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DataVisualizationPlugin
+});

package/dist/swagger/index.js

@@ -1,5 +1,25 @@
-'use strict';
-
+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 swagger_exports = {};
+__export(swagger_exports, {
+  default: () => swagger_default
+});
+module.exports = __toCommonJS(swagger_exports);
 var swagger_default = {
   info: {
     title: "NocoBase API - Data visualization plugin"
@@ -7,5 +27,3 @@ var swagger_default = {
   tags: [],
   paths: {}
 };
-
-module.exports = swagger_default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "0.13.0-alpha.1",
+  "version": "0.13.0-alpha.10",
   "displayName": "Data Visualization",
   "displayName.zh-CN": "数据可视化",
   "description": "Provides business intelligence and data visualization features",
@@ -17,11 +17,12 @@
     "@testing-library/react": "^14.0.0",
     "antd": "5.x",
     "classnames": "^2.3.1",
+    "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",
     "react": "^18.2.0",
     "react-error-boundary": "^4.0.10",
     "react-i18next": "^11.15.1",
-    "vitest": "^0.33.0"
+    "vitest": "0.x"
   },
   "peerDependencies": {
     "@nocobase/actions": "0.x",
@@ -32,5 +33,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "0ebd4e85a1b0b0d0943768ab6cb5c3d824562239"
+  "gitHead": "5360ed81650f6895f3ed39aede2706467d55862c"
 }