dtable-statistic 4.3.3 → 4.3.4

package/es/api/dtable-db-api.js

@@ -1,11 +1,4 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _axios = _interopRequireDefault(require("axios"));
+import axios from 'axios';
 class DTableDbAPI {
   constructor() {
     this.req = null;
@@ -16,7 +9,7 @@ class DTableDbAPI {
       accessToken,
       dtableDb
     } = window.dtable;
-    this.req = _axios.default.create({
+    this.req = axios.create({
       baseURL: dtableDb,
       headers: {
         'Authorization': 'Token ' + accessToken
@@ -41,4 +34,4 @@ class DTableDbAPI {
   }
 }
 const dtableDbAPI = new DTableDbAPI();
-var _default = exports.default = dtableDbAPI;
+export default dtableDbAPI;

package/es/calculator/base-calculator.js

@@ -1,16 +1,8 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var ComLink = _interopRequireWildcard(require("comlink"));
-var _dtableStore = require("dtable-store");
-var _dtableDbApi = _interopRequireDefault(require("../api/dtable-db-api"));
-var _calculatorWorker = _interopRequireDefault(require("./workers/calculator.worker.js"));
-var _copyValue = _interopRequireDefault(require("./copy-value"));
+import * as ComLink from 'comlink';
+import { TableUtils, Views } from 'dtable-store';
+import dtableDbAPI from '../api/dtable-db-api';
+import CalculatorWorker from './workers/calculator.worker.js';
+import copyValue from './copy-value';
 class BaseCalculator {
   constructor(_ref) {
     let {
@@ -43,27 +35,27 @@ class BaseCalculator {
     } = chart;
     const table = this.getTableById(table_id);
     const view = this.getViewById(view_id, table);
-    return _dtableStore.Views.isArchiveView(view);
+    return Views.isArchiveView(view);
   }
   getTableById(tableId) {
-    return _dtableStore.TableUtils.getTableById(this.value.tables, tableId);
+    return TableUtils.getTableById(this.value.tables, tableId);
   }
   getViewById(viewId, table) {
-    return table && _dtableStore.Views.getViewById(table.views, viewId);
+    return table && Views.getViewById(table.views, viewId);
   }
   async calculateWithWorker(chart) {
     const {
       _id: chartId
     } = chart;
-    const calculatorWorker = await this.statisticThreadManager.applyThread(chartId, _calculatorWorker.default);
+    const calculatorWorker = await this.statisticThreadManager.applyThread(chartId, CalculatorWorker);
     const calculateChart = ComLink.wrap(calculatorWorker);
-    const newValue = (0, _copyValue.default)(this.value);
+    const newValue = copyValue(this.value);
     const result = await calculateChart(chart, newValue, this.username, this.userId);
     this.statisticThreadManager.removeThread(chartId);
     return result;
   }
   async sqlQuery(sql) {
-    return _dtableDbApi.default.sqlQuery(sql);
+    return dtableDbAPI.sqlQuery(sql);
   }
 }
-var _default = exports.default = BaseCalculator;
+export default BaseCalculator;

package/es/calculator/basic-chart-calculator.js

@@ -1,19 +1,12 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _dtableStore = require("dtable-store");
-var _baseCalculator = _interopRequireDefault(require("./base-calculator"));
-var _constants = require("../constants");
-var _sqlUtils = require("../utils/sql-utils");
-var _commonUtils = require("../utils/common-utils");
-var _statUtils = _interopRequireDefault(require("../utils/stat-utils"));
-var _columnUtils = require("../utils/column-utils");
-var _rowUtils = require("../utils/row-utils");
-class BasicChartCalculator extends _baseCalculator.default {
+import { CellType, filter2SqlCondition, TableUtils } from 'dtable-store';
+import BaseCalculator from './base-calculator';
+import { DTABLE_DB_SUMMARY_METHOD, STAT_TYPE, SUMMARY_TYPE, TIME_COLUMN_LIST, Y_AXIS_TYPE_PREFIX } from '../constants';
+import { getSqlGroup, getSqlOrder } from '../utils/sql-utils';
+import { formatNumericValue, getSummaryColumnMethod } from '../utils/common-utils';
+import StatUtils from '../utils/stat-utils';
+import { getColorFromSingleSelectColumn } from '../utils/column-utils';
+import { getFormattedLabel } from '../utils/row-utils';
+class BasicChartCalculator extends BaseCalculator {
   constructor(_ref) {
     let {
       value,
@@ -32,7 +25,7 @@ class BasicChartCalculator extends _baseCalculator.default {
     if (!this.validateBaseConfigs(chart)) {
       return false;
     }
-    if (chart.type === _constants.STAT_TYPE.CUSTOM_BAR) {
+    if (chart.type === STAT_TYPE.CUSTOM_BAR) {
       return this.isValidCustomBar(chart);
     }
     const {
@@ -44,11 +37,11 @@ class BasicChartCalculator extends _baseCalculator.default {
     } = chart;
     const table = this.getTableById(table_id);
     const groupbyColumnKey = groupby_column_key || x_axis_column_key;
-    if (!groupbyColumnKey || !_dtableStore.TableUtils.getTableColumnByKey(table, groupbyColumnKey)) {
+    if (!groupbyColumnKey || !TableUtils.getTableColumnByKey(table, groupbyColumnKey)) {
       return false;
     }
     const summaryColumnKey = summary_column_key || y_axis_column_key;
-    if (summaryColumnKey && !_dtableStore.TableUtils.getTableColumnByKey(table, summaryColumnKey)) {
+    if (summaryColumnKey && !TableUtils.getTableColumnByKey(table, summaryColumnKey)) {
       return false;
     }
     return true;
@@ -73,7 +66,7 @@ class BasicChartCalculator extends _baseCalculator.default {
     return await this.calculateWithWorker(chart);
   }
   async queryDb(chart) {
-    if (chart.type === _constants.STAT_TYPE.CUSTOM_BAR) {
+    if (chart.type === STAT_TYPE.CUSTOM_BAR) {
       return this.queryDbFromCustomBar(chart);
     }
     const {
@@ -84,7 +77,7 @@ class BasicChartCalculator extends _baseCalculator.default {
     let groupby_column_key, summary_type, summary_method, summary_column_key, groupby_date_granularity, include_empty, groupby_geolocation_granularity;
     const column_groupby_column_key = chart.column_groupby_column_key;
     const sortType = chart.sort_type;
-    if (chart.type === _constants.STAT_TYPE.PIE || chart.type === _constants.STAT_TYPE.RING || chart.type === _constants.STAT_TYPE.TREEMAP) {
+    if (chart.type === STAT_TYPE.PIE || chart.type === STAT_TYPE.RING || chart.type === STAT_TYPE.TREEMAP) {
       groupby_column_key = chart.groupby_column_key;
       summary_type = chart.summary_type;
       summary_method = chart.summary_method;
@@ -107,14 +100,14 @@ class BasicChartCalculator extends _baseCalculator.default {
     if (!selectedView) {
       return [];
     }
-    const groupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, groupby_column_key);
-    const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
+    const groupbyColumn = TableUtils.getTableColumnByKey(selectedTable, groupby_column_key);
+    const sqlCondition = filter2SqlCondition(selectedTable, selectedView);
     let groupbyName = "`".concat(groupbyColumn.name, "`");
-    const isTimeColumn = _constants.TIME_COLUMN_LIST.includes(groupbyColumn.type);
+    const isTimeColumn = TIME_COLUMN_LIST.includes(groupbyColumn.type);
     if (isTimeColumn) {
-      groupbyName = (0, _sqlUtils.getSqlGroup)(groupby_date_granularity, groupbyColumn);
-    } else if (groupbyColumn.type === _dtableStore.CellType.GEOLOCATION) {
-      groupbyName = (0, _sqlUtils.getSqlGroup)(groupby_geolocation_granularity, groupbyColumn);
+      groupbyName = getSqlGroup(groupby_date_granularity, groupbyColumn);
+    } else if (groupbyColumn.type === CellType.GEOLOCATION) {
+      groupbyName = getSqlGroup(groupby_geolocation_granularity, groupbyColumn);
     }
     let results;
     if (!column_groupby_column_key && !column_groupby_multiple_numeric_column) {
@@ -123,7 +116,7 @@ class BasicChartCalculator extends _baseCalculator.default {
       const {
         column_groupby_numeric_columns
       } = chart;
-      const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, summary_column_key);
+      const summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column_key);
       if (!summaryColumn) return [];
       results = await this.getGroupbyMultipleNumericColumnsResults(groupbyName, groupbyColumn, groupby_date_granularity, groupby_geolocation_granularity, include_empty, summary_type, summaryColumn, summary_method, column_groupby_numeric_columns, sqlCondition, selectedTable, yAxisType);
     } else {
@@ -133,7 +126,7 @@ class BasicChartCalculator extends _baseCalculator.default {
       } = chart;
       results = await this.getGroupbyOneColumnResults(groupbyName, groupbyColumn, groupby_date_granularity, groupby_geolocation_granularity, include_empty, summary_type, summary_column_key, summary_method, column_groupby_column_key, column_groupby_date_granularity, column_groupby_geolocation_granularity, sqlCondition, selectedTable, yAxisType);
     }
-    sortType && _statUtils.default.sortStatisticData(results, sortType);
+    sortType && StatUtils.sortStatisticData(results, sortType);
     return results;
   }
   async queryDbFromCustomBar(chart) {
@@ -152,19 +145,19 @@ class BasicChartCalculator extends _baseCalculator.default {
     if (!selectedView || !x_axis_column_key || !Array.isArray(y_axises) || y_axises.length === 0) {
       return [];
     }
-    const groupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
+    const groupbyColumn = TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
     if (!groupbyColumn) {
       return [];
     }
-    const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
-    const isTimeColumn = _constants.TIME_COLUMN_LIST.includes(groupbyColumn.type);
+    const sqlCondition = filter2SqlCondition(selectedTable, selectedView);
+    const isTimeColumn = TIME_COLUMN_LIST.includes(groupbyColumn.type);
     let groupbyName = "`".concat(groupbyColumn.name, "`");
     if (isTimeColumn) {
-      groupbyName = (0, _sqlUtils.getSqlGroup)(x_axis_date_granularity, groupbyColumn);
-    } else if (groupbyColumn.type === _dtableStore.CellType.GEOLOCATION) {
-      groupbyName = (0, _sqlUtils.getSqlGroup)(x_axis_geolocation_granularity, groupbyColumn);
+      groupbyName = getSqlGroup(x_axis_date_granularity, groupbyColumn);
+    } else if (groupbyColumn.type === CellType.GEOLOCATION) {
+      groupbyName = getSqlGroup(x_axis_geolocation_granularity, groupbyColumn);
     }
-    const summaryType = _constants.SUMMARY_TYPE.ADVANCED;
+    const summaryType = SUMMARY_TYPE.ADVANCED;
     const yAxisSummaryColumn = null;
     const yAxisSummaryMethod = null;
     let results = [];
@@ -174,31 +167,31 @@ class BasicChartCalculator extends _baseCalculator.default {
         type: yAxisType,
         column_groupby_numeric_columns
       } = stack;
-      if (yAxisType === _constants.STAT_TYPE.BAR_STACK) {
+      if (yAxisType === STAT_TYPE.BAR_STACK) {
         // just support summary numeric columns.
         if (!Array.isArray(column_groupby_numeric_columns) || column_groupby_numeric_columns.length === 0) {
           continue;
         }
-        const yAxisType = "".concat(_constants.Y_AXIS_TYPE_PREFIX).concat(i);
+        const yAxisType = "".concat(Y_AXIS_TYPE_PREFIX).concat(i);
         const currentResults = await this.getGroupbyMultipleNumericColumnsResults(groupbyName, groupbyColumn, x_axis_date_granularity, x_axis_geolocation_granularity, x_axis_include_empty, summaryType, yAxisSummaryColumn, yAxisSummaryMethod, column_groupby_numeric_columns, sqlCondition, selectedTable, yAxisType);
         results = results.concat(currentResults);
       }
     }
-    sort_type && _statUtils.default.sortStatisticData(results, sort_type);
+    sort_type && StatUtils.sortStatisticData(results, sort_type);
     return results;
   }
   async getNoneGroupbyResults(groupbyName, groupbyColumn, groupbyDateGranularity, groupbyGeolocationGranularity, includeEmpty, summaryType, summaryColumnKey, summaryMethod, sortType, sqlCondition, table, yAxisType) {
-    const isAdvanced = summaryType === _constants.SUMMARY_TYPE.ADVANCED;
+    const isAdvanced = summaryType === SUMMARY_TYPE.ADVANCED;
     let selectedSummaryColumn;
     let summaryColumnName = "`".concat(groupbyColumn.name, "`");
     if (isAdvanced) {
-      selectedSummaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summaryColumnKey);
+      selectedSummaryColumn = TableUtils.getTableColumnByKey(table, summaryColumnKey);
       if (!selectedSummaryColumn) return [];
       summaryColumnName = selectedSummaryColumn.name;
     }
-    const method = isAdvanced ? _constants.DTABLE_DB_SUMMARY_METHOD[summaryMethod] : 'COUNT';
-    const summaryColumnMethod = (0, _commonUtils.getSummaryColumnMethod)(method, summaryColumnName);
-    const sqlOrder = (0, _sqlUtils.getSqlOrder)(sortType, groupbyName);
+    const method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summaryMethod] : 'COUNT';
+    const summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
+    const sqlOrder = getSqlOrder(sortType, groupbyName);
     const sqlString = "select ".concat(groupbyName, ", ").concat(summaryColumnMethod, " from `").concat(table.name, "` ").concat(sqlCondition, " group by ").concat(groupbyName, " ").concat(sqlOrder, " limit 5000");
     const queryResult = await this.sqlQuery(sqlString);
     if (queryResult.status !== 200 || !queryResult.data.success) {
@@ -216,8 +209,8 @@ class BasicChartCalculator extends _baseCalculator.default {
       let value = item[valueKey] || 0;
       let formatted_value = value;
       if (isAdvanced) {
-        value = (0, _commonUtils.formatNumericValue)(value, selectedSummaryColumn);
-        formatted_value = _statUtils.default.getFormattedValue(value, selectedSummaryColumn, summaryMethod);
+        value = formatNumericValue(value, selectedSummaryColumn);
+        formatted_value = StatUtils.getFormattedValue(value, selectedSummaryColumn, summaryMethod);
       }
       newResult.push({
         name: label,
@@ -230,23 +223,23 @@ class BasicChartCalculator extends _baseCalculator.default {
     return newResult;
   }
   async getGroupbyOneColumnResults(groupbyName, groupbyColumn, groupbyDateGranularity, groupbyGeolocationGranularity, includeEmpty, summaryType, summaryColumnKey, summaryMethod, columnGroupbyColumnKey, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, sqlCondition, table, yAxisType) {
-    const isAdvanced = summaryType === _constants.SUMMARY_TYPE.ADVANCED;
+    const isAdvanced = summaryType === SUMMARY_TYPE.ADVANCED;
     let selectedSummaryColumn;
     let summaryColumnName = "`".concat(groupbyColumn.name, "`");
     if (isAdvanced) {
-      selectedSummaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summaryColumnKey);
+      selectedSummaryColumn = TableUtils.getTableColumnByKey(table, summaryColumnKey);
       if (!selectedSummaryColumn) return [];
       summaryColumnName = selectedSummaryColumn.name;
     }
-    const columnGroupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, columnGroupbyColumnKey);
+    const columnGroupbyColumn = TableUtils.getTableColumnByKey(table, columnGroupbyColumnKey);
     let columnGroupbyColumnName = "`".concat(columnGroupbyColumn.name, "`");
-    if (_constants.TIME_COLUMN_LIST.includes(columnGroupbyColumn.type)) {
-      columnGroupbyColumnName = (0, _sqlUtils.getSqlGroup)(columnGroupbyDateGranularity, columnGroupbyColumn);
-    } else if (columnGroupbyColumn.type === _dtableStore.CellType.GEOLOCATION) {
-      columnGroupbyColumnName = (0, _sqlUtils.getSqlGroup)(columnGroupbyGeolocationGranularity, columnGroupbyColumn);
+    if (TIME_COLUMN_LIST.includes(columnGroupbyColumn.type)) {
+      columnGroupbyColumnName = getSqlGroup(columnGroupbyDateGranularity, columnGroupbyColumn);
+    } else if (columnGroupbyColumn.type === CellType.GEOLOCATION) {
+      columnGroupbyColumnName = getSqlGroup(columnGroupbyGeolocationGranularity, columnGroupbyColumn);
     }
-    const method = isAdvanced ? _constants.DTABLE_DB_SUMMARY_METHOD[summaryMethod] : 'COUNT';
-    const summaryColumnMethod = (0, _commonUtils.getSummaryColumnMethod)(method, summaryColumnName);
+    const method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summaryMethod] : 'COUNT';
+    const summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
     const sqlString = "select ".concat(groupbyName, ", ").concat(columnGroupbyColumnName, ", ").concat(summaryColumnMethod, " from `").concat(table.name, "` ").concat(sqlCondition, " group by ").concat(groupbyName, ", ").concat(columnGroupbyColumnName, " order by ").concat(groupbyName, " limit 5000");
     const queryResult = await this.sqlQuery(sqlString);
     if (queryResult.status !== 200 || !queryResult.data.success) {
@@ -264,13 +257,13 @@ class BasicChartCalculator extends _baseCalculator.default {
       let value = item[valueKey] || 0;
       let formatted_value = value;
       if (isAdvanced) {
-        value = (0, _commonUtils.formatNumericValue)(value, selectedSummaryColumn);
-        formatted_value = _statUtils.default.getFormattedValue(value, selectedSummaryColumn, summaryMethod);
+        value = formatNumericValue(value, selectedSummaryColumn);
+        formatted_value = StatUtils.getFormattedValue(value, selectedSummaryColumn, summaryMethod);
       }
       let color;
-      if (columnGroupbyColumn.type === _dtableStore.CellType.SINGLE_SELECT) {
-        const tempValue = _statUtils.default.getGroupLabel(item[columnGroupbyColumn.key], item, columnGroupbyColumn, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, this.value);
-        color = (0, _columnUtils.getColorFromSingleSelectColumn)(columnGroupbyColumn, tempValue);
+      if (columnGroupbyColumn.type === CellType.SINGLE_SELECT) {
+        const tempValue = StatUtils.getGroupLabel(item[columnGroupbyColumn.key], item, columnGroupbyColumn, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, this.value);
+        color = getColorFromSingleSelectColumn(columnGroupbyColumn, tempValue);
       }
       const groupLabel = this.getLabel(columnGroupbyColumn, columnGroupbyColumnName, item, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity);
       newResult.push({
@@ -287,26 +280,26 @@ class BasicChartCalculator extends _baseCalculator.default {
     return newResult;
   }
   async getGroupbyMultipleNumericColumnsResults(groupbyName, groupbyColumn, groupbyDateGranularity, groupbyGeolocationGranularity, includeEmpty, summaryType, summaryColumn, summaryMethod, columnGroupbyNumericColumns, sqlCondition, table, yAxisType) {
-    const isAdvanced = summaryType === _constants.SUMMARY_TYPE.ADVANCED;
+    const isAdvanced = summaryType === SUMMARY_TYPE.ADVANCED;
     let numericColumns = [];
     let groupColumnNames = [];
     let groupMethods = [];
     let originalMethods = [];
     if (summaryColumn) {
       const summaryColumnName = isAdvanced ? summaryColumn.name : "`".concat(groupbyColumn.name, "`");
-      const method = isAdvanced ? _constants.DTABLE_DB_SUMMARY_METHOD[summaryMethod] : 'COUNT';
-      const summaryColumnMethod = (0, _commonUtils.getSummaryColumnMethod)(method, summaryColumnName);
+      const method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summaryMethod] : 'COUNT';
+      const summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
       numericColumns.push(summaryColumn);
       groupColumnNames.push(summaryColumnName);
       groupMethods.push(summaryColumnMethod);
       originalMethods.push(summaryMethod);
     }
     columnGroupbyNumericColumns.forEach(item => {
-      const numericColumn = _dtableStore.TableUtils.getTableColumnByKey(table, item.column_key);
+      const numericColumn = TableUtils.getTableColumnByKey(table, item.column_key);
       const groupColumnName = numericColumn.name;
       numericColumns.push(numericColumn);
       groupColumnNames.push(groupColumnName);
-      groupMethods.push((0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[item.summary_method], groupColumnName));
+      groupMethods.push(getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[item.summary_method], groupColumnName));
       originalMethods.push(item.summary_method);
     });
     const sqlString = "select ".concat(groupbyName, ", ").concat(groupMethods.join(','), " from `").concat(table.name, "` ").concat(sqlCondition, " group by ").concat(groupbyName, " order by ").concat(groupbyName, " limit 5000");
@@ -328,8 +321,8 @@ class BasicChartCalculator extends _baseCalculator.default {
         let value = item[groupMethods[index]] || 0;
         let formatted_value = value;
         if (isAdvanced) {
-          value = (0, _commonUtils.formatNumericValue)(value, numericColumns[index]);
-          formatted_value = _statUtils.default.getFormattedValue(value, numericColumns[index], originalMethods[index]);
+          value = formatNumericValue(value, numericColumns[index]);
+          formatted_value = StatUtils.getFormattedValue(value, numericColumns[index], originalMethods[index]);
         }
         groupItems.push({
           name: label,
@@ -345,14 +338,14 @@ class BasicChartCalculator extends _baseCalculator.default {
     return newResult;
   }
   getLabel(groupColumn, groupName, item, groupby_date_granularity, groupby_geolocation_granularity) {
-    const isTimeColumn = _constants.TIME_COLUMN_LIST.includes(groupColumn.type);
+    const isTimeColumn = TIME_COLUMN_LIST.includes(groupColumn.type);
     let label;
-    if (isTimeColumn || groupColumn.type === _dtableStore.CellType.GEOLOCATION) {
+    if (isTimeColumn || groupColumn.type === CellType.GEOLOCATION) {
       label = item[groupName];
     } else {
       const currentGroupLabel = item[groupColumn.key];
-      label = _statUtils.default.getGroupLabel(currentGroupLabel, item, groupColumn, groupby_date_granularity, groupby_geolocation_granularity, this.value);
-      label = (0, _rowUtils.getFormattedLabel)(groupColumn, label, this.value.collaborators);
+      label = StatUtils.getGroupLabel(currentGroupLabel, item, groupColumn, groupby_date_granularity, groupby_geolocation_granularity, this.value);
+      label = getFormattedLabel(groupColumn, label, this.value.collaborators);
     }
     return label;
   }
@@ -360,4 +353,4 @@ class BasicChartCalculator extends _baseCalculator.default {
     return !label;
   }
 }
-var _default = exports.default = BasicChartCalculator;
+export default BasicChartCalculator;

package/es/calculator/combination-calculator.js

@@ -1,18 +1,11 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _dtableStore = require("dtable-store");
-var _baseCalculator = _interopRequireDefault(require("./base-calculator"));
-var _statUtils = _interopRequireDefault(require("../utils/stat-utils"));
-var _commonUtils = require("../utils/common-utils");
-var _rowUtils = require("../utils/row-utils");
-var _sqlUtils = require("../utils/sql-utils");
-var _constants = require("../constants");
-class CombinationCalculator extends _baseCalculator.default {
+import { CellType, filter2SqlCondition, TableUtils } from 'dtable-store';
+import BaseCalculator from './base-calculator';
+import StatUtils from '../utils/stat-utils';
+import { getSummaryColumnMethod, formatNumericValue } from '../utils/common-utils';
+import { getFormattedLabel } from '../utils/row-utils';
+import { getSqlGroup } from '../utils/sql-utils';
+import { DTABLE_DB_SUMMARY_METHOD, LABEL_COLORS, SUMMARY_TYPE, TIME_COLUMN_LIST } from '../constants';
+class CombinationCalculator extends BaseCalculator {
   constructor(_ref) {
     let {
       value,
@@ -45,14 +38,14 @@ class CombinationCalculator extends _baseCalculator.default {
       y_axis_left_summary_type
     } = chart;
     const table = this.getTableById(table_id);
-    if (x_axis_column_key && !_dtableStore.TableUtils.getTableColumnByKey(table, x_axis_column_key)) {
+    if (x_axis_column_key && !TableUtils.getTableColumnByKey(table, x_axis_column_key)) {
       return false;
     }
     if (!y_axis_left_summary_type || !y_axis_right_summary_type) return false;
-    if (y_axis_left_summary_type === _constants.SUMMARY_TYPE.ADVANCED && y_axis_left_summary_method && !_dtableStore.TableUtils.getTableColumnByKey(table, y_axis_left_summary_column)) {
+    if (y_axis_left_summary_type === SUMMARY_TYPE.ADVANCED && y_axis_left_summary_method && !TableUtils.getTableColumnByKey(table, y_axis_left_summary_column)) {
       return false;
     }
-    if (y_axis_right_summary_type === _constants.SUMMARY_TYPE.ADVANCED && y_axis_right_summary_method && !_dtableStore.TableUtils.getTableColumnByKey(table, y_axis_right_summary_column)) {
+    if (y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED && y_axis_right_summary_method && !TableUtils.getTableColumnByKey(table, y_axis_right_summary_column)) {
       return false;
     }
     return true;
@@ -81,13 +74,13 @@ class CombinationCalculator extends _baseCalculator.default {
       y_axis_left_group_by_numeric_columns
     } = chart;
     const selectedTable = this.getTableById(table_id);
-    const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
+    const selectedColumn = TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
     if (!selectedColumn) return [];
     let groupName = "`".concat(selectedColumn.name, "`");
-    if (_constants.TIME_COLUMN_LIST.includes(selectedColumn.type)) {
-      groupName = (0, _sqlUtils.getSqlGroup)(groupby_date_granularity, selectedColumn);
-    } else if (selectedColumn.type === _dtableStore.CellType.GEOLOCATION) {
-      groupName = (0, _sqlUtils.getSqlGroup)(groupby_geolocation_granularity, selectedColumn);
+    if (TIME_COLUMN_LIST.includes(selectedColumn.type)) {
+      groupName = getSqlGroup(groupby_date_granularity, selectedColumn);
+    } else if (selectedColumn.type === CellType.GEOLOCATION) {
+      groupName = getSqlGroup(groupby_geolocation_granularity, selectedColumn);
     }
     let sqlString = this.getSqlString(chart, groupName);
     const result = await this.sqlQuery(sqlString);
@@ -100,14 +93,14 @@ class CombinationCalculator extends _baseCalculator.default {
       if (!y_axis_left_group_by_multiple_numeric_column) {
         let value1Key = "COUNT(".concat(selectedColumn.name, ")");
         let leftSummaryColumn, rightSummaryColumn;
-        if (y_axis_left_summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
-          leftSummaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_left_summary_column);
-          value1Key = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[y_axis_left_summary_method], leftSummaryColumn.name);
+        if (y_axis_left_summary_type === SUMMARY_TYPE.ADVANCED) {
+          leftSummaryColumn = TableUtils.getTableColumnByKey(selectedTable, y_axis_left_summary_column);
+          value1Key = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[y_axis_left_summary_method], leftSummaryColumn.name);
         }
         let value2Key = "COUNT(".concat(selectedColumn.name, ")");
-        if (y_axis_right_summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
-          rightSummaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_right_summary_column);
-          value2Key = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[y_axis_right_summary_method], rightSummaryColumn.name);
+        if (y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED) {
+          rightSummaryColumn = TableUtils.getTableColumnByKey(selectedTable, y_axis_right_summary_column);
+          value2Key = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[y_axis_right_summary_method], rightSummaryColumn.name);
         }
         data.forEach(item => {
           let label = this.getLabel(selectedColumn, groupName, item, groupby_date_granularity, groupby_geolocation_granularity);
@@ -115,13 +108,13 @@ class CombinationCalculator extends _baseCalculator.default {
           let value2 = item[value2Key] || 0;
           let formattedValueLeft = value1;
           let formattedValueRight = value2;
-          if (y_axis_left_summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
-            value1 = (0, _commonUtils.formatNumericValue)(value1, leftSummaryColumn);
-            formattedValueLeft = _statUtils.default.getFormattedValue(value1, leftSummaryColumn, y_axis_left_summary_method);
+          if (y_axis_left_summary_type === SUMMARY_TYPE.ADVANCED) {
+            value1 = formatNumericValue(value1, leftSummaryColumn);
+            formattedValueLeft = StatUtils.getFormattedValue(value1, leftSummaryColumn, y_axis_left_summary_method);
           }
-          if (y_axis_right_summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
-            value2 = (0, _commonUtils.formatNumericValue)(value2, rightSummaryColumn);
-            formattedValueRight = _statUtils.default.getFormattedValue(value2, rightSummaryColumn, y_axis_right_summary_method);
+          if (y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED) {
+            value2 = formatNumericValue(value2, rightSummaryColumn);
+            formattedValueRight = StatUtils.getFormattedValue(value2, rightSummaryColumn, y_axis_right_summary_method);
           }
           if (!this.isEmptyLabel(label) || x_axis_include_empty) {
             newResult.push({
@@ -137,14 +130,14 @@ class CombinationCalculator extends _baseCalculator.default {
       } else {
         let rightSummaryColumn;
         let value2Key = "COUNT(".concat(selectedColumn.name, ")");
-        if (y_axis_right_summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
-          rightSummaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_right_summary_column);
-          value2Key = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[y_axis_right_summary_method], rightSummaryColumn.name);
+        if (y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED) {
+          rightSummaryColumn = TableUtils.getTableColumnByKey(selectedTable, y_axis_right_summary_column);
+          value2Key = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[y_axis_right_summary_method], rightSummaryColumn.name);
         }
         const groupItems = [];
         let summaries = [];
-        let leftSummaryColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_left_summary_column);
-        const groupItem = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[y_axis_left_summary_method], leftSummaryColumn.name);
+        let leftSummaryColumn = TableUtils.getTableColumnByKey(selectedTable, y_axis_left_summary_column);
+        const groupItem = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[y_axis_left_summary_method], leftSummaryColumn.name);
         if (leftSummaryColumn && !groupItems.includes(groupItem)) {
           groupItems.push(groupItem);
           summaries.push({
@@ -153,10 +146,10 @@ class CombinationCalculator extends _baseCalculator.default {
           });
         }
         y_axis_left_group_by_numeric_columns.forEach((item, index) => {
-          const column = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, item.column_key);
+          const column = TableUtils.getTableColumnByKey(selectedTable, item.column_key);
           if (column) {
             const method = item.summary_method;
-            const groupItem = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[method], column.name);
+            const groupItem = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[method], column.name);
             if (!groupItems.includes(groupItem)) {
               groupItems.push(groupItem);
               summaries.push({
@@ -170,9 +163,9 @@ class CombinationCalculator extends _baseCalculator.default {
           let label = this.getLabel(selectedColumn, groupName, item, groupby_date_granularity, groupby_geolocation_granularity);
           let value2 = item[value2Key] || 0;
           let formattedValueRight = value2;
-          if (y_axis_right_summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
-            value2 = (0, _commonUtils.formatNumericValue)(value2, rightSummaryColumn);
-            formattedValueRight = _statUtils.default.getFormattedValue(value2, rightSummaryColumn, y_axis_right_summary_method);
+          if (y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED) {
+            value2 = formatNumericValue(value2, rightSummaryColumn);
+            formattedValueRight = StatUtils.getFormattedValue(value2, rightSummaryColumn, y_axis_right_summary_method);
           }
           groupItems.forEach((groupItem, index) => {
             if (!this.isEmptyLabel(label) || x_axis_include_empty) {
@@ -181,15 +174,15 @@ class CombinationCalculator extends _baseCalculator.default {
                 method,
                 column
               } = summary;
-              let value = (0, _commonUtils.formatNumericValue)(item[groupItems[index]] || 0, column);
-              let formattedValueLeft = _statUtils.default.getFormattedValue(value, column, method);
+              let value = formatNumericValue(item[groupItems[index]] || 0, column);
+              let formattedValueLeft = StatUtils.getFormattedValue(value, column, method);
               newResult.push({
                 name: label,
                 value_left: value,
                 value_right: value2,
                 formatted_value_left: formattedValueLeft,
                 formatted_value_right: formattedValueRight,
-                color: _constants.LABEL_COLORS[index % 12],
+                color: LABEL_COLORS[index % 12],
                 original_name: item[selectedColumn.key]
               });
             }
@@ -215,27 +208,27 @@ class CombinationCalculator extends _baseCalculator.default {
     } = chart;
     const selectedTable = this.getTableById(table_id);
     let selectedView = this.getViewById(view_id, selectedTable);
-    const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
-    const column1 = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_left_summary_column);
-    const column2 = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, y_axis_right_summary_column);
+    const selectedColumn = TableUtils.getTableColumnByKey(selectedTable, x_axis_column_key);
+    const column1 = TableUtils.getTableColumnByKey(selectedTable, y_axis_left_summary_column);
+    const column2 = TableUtils.getTableColumnByKey(selectedTable, y_axis_right_summary_column);
     if (!selectedColumn) return [];
-    const sqlCondition = (0, _dtableStore.filter2SqlCondition)(selectedTable, selectedView);
+    const sqlCondition = filter2SqlCondition(selectedTable, selectedView);
     const sqlItems = [];
-    if (y_axis_left_summary_type === _constants.SUMMARY_TYPE.COUNT || y_axis_right_summary_type === _constants.SUMMARY_TYPE.COUNT) {
+    if (y_axis_left_summary_type === SUMMARY_TYPE.COUNT || y_axis_right_summary_type === SUMMARY_TYPE.COUNT) {
       sqlItems.push("COUNT(`".concat(selectedColumn.name, "`)"));
     }
-    if (y_axis_right_summary_type === _constants.SUMMARY_TYPE.ADVANCED && column2) {
-      const rightSummaryColumnMethod = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[y_axis_right_summary_method], column2.name);
+    if (y_axis_right_summary_type === SUMMARY_TYPE.ADVANCED && column2) {
+      const rightSummaryColumnMethod = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[y_axis_right_summary_method], column2.name);
       sqlItems.push("".concat(rightSummaryColumnMethod));
     }
-    if (y_axis_left_summary_type === _constants.SUMMARY_TYPE.ADVANCED && column1) {
-      let groupItem = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[y_axis_left_summary_method], column1.name);
+    if (y_axis_left_summary_type === SUMMARY_TYPE.ADVANCED && column1) {
+      let groupItem = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[y_axis_left_summary_method], column1.name);
       !sqlItems.includes(groupItem) && sqlItems.push(groupItem);
       if (y_axis_left_group_by_multiple_numeric_column) {
         y_axis_left_group_by_numeric_columns.forEach((item, index) => {
-          const column = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, item.column_key);
+          const column = TableUtils.getTableColumnByKey(selectedTable, item.column_key);
           if (column) {
-            groupItem = (0, _commonUtils.getSummaryColumnMethod)(_constants.DTABLE_DB_SUMMARY_METHOD[item.summary_method], column.name);
+            groupItem = getSummaryColumnMethod(DTABLE_DB_SUMMARY_METHOD[item.summary_method], column.name);
             !sqlItems.includes(groupItem) && sqlItems.push(groupItem);
           }
         });
@@ -245,16 +238,16 @@ class CombinationCalculator extends _baseCalculator.default {
     return "select ".concat(groupName, ", ").concat(sqlColumn, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by ").concat(groupName, " order by ").concat(groupName, " limit 5000");
   }
   getLabel(groupColumn, groupName, item, groupby_date_granularity, groupby_geolocation_granularity) {
-    const isTimeColumn = _constants.TIME_COLUMN_LIST.includes(groupColumn.type);
+    const isTimeColumn = TIME_COLUMN_LIST.includes(groupColumn.type);
     let label;
-    if (isTimeColumn || groupColumn.type === _dtableStore.CellType.GEOLOCATION) {
+    if (isTimeColumn || groupColumn.type === CellType.GEOLOCATION) {
       label = item[groupName];
     } else {
       const currentGroupLabel = item[groupColumn.key];
-      label = _statUtils.default.getGroupLabel(currentGroupLabel, item, groupColumn, groupby_date_granularity, groupby_geolocation_granularity, this.value);
-      label = (0, _rowUtils.getFormattedLabel)(groupColumn, label);
+      label = StatUtils.getGroupLabel(currentGroupLabel, item, groupColumn, groupby_date_granularity, groupby_geolocation_granularity, this.value);
+      label = getFormattedLabel(groupColumn, label);
     }
     return label;
   }
 }
-var _default = exports.default = CombinationCalculator;
+export default CombinationCalculator;