dtable-statistic 4.3.3 → 4.3.4

package/es/calculator/workers/mirror-calculator-worker.js

@@ -1,16 +1,9 @@
-"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 _utils = require("../../utils");
-var _commonUtils = require("../../utils/common-utils");
-var _rowUtils = require("../../utils/row-utils");
-var _constants = require("../../constants");
-var _statUtils = _interopRequireDefault(require("../../utils/stat-utils"));
+import { isNumber, TableUtils, Views } from 'dtable-store';
+import { getClientCellValueDisplayString } from '../../utils';
+import { getSummaryResult } from '../../utils/common-utils';
+import { getCellValue } from '../../utils/row-utils';
+import { SUMMARY_TYPE } from '../../constants';
+import StatUtils from '../../utils/stat-utils';
 function calculateStatItem(chart, dtableValue, username, userId) {
   const {
     table_id,
@@ -21,23 +14,23 @@ function calculateStatItem(chart, dtableValue, username, userId) {
     summary_method,
     group_column
   } = chart;
-  const table = _dtableStore.TableUtils.getTableById(dtableValue.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
-  const columnItem = _dtableStore.TableUtils.getTableColumnByKey(table, column);
-  const rows = _dtableStore.Views.getViewRows(view, table, dtableValue, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, rows, dtableValue);
-  const groupColumn = _dtableStore.TableUtils.getTableColumnByKey(table, group_column);
-  const numericColumn = summary_column && _dtableStore.TableUtils.getTableColumnByKey(table, summary_column);
+  const table = TableUtils.getTableById(dtableValue.tables, table_id);
+  const view = table && Views.getViewById(table.views, view_id);
+  const columnItem = TableUtils.getTableColumnByKey(table, column);
+  const rows = Views.getViewRows(view, table, dtableValue, username, userId);
+  const formulaRows = Views.getTableFormulaResults(table, rows, dtableValue);
+  const groupColumn = TableUtils.getTableColumnByKey(table, group_column);
+  const numericColumn = summary_column && TableUtils.getTableColumnByKey(table, summary_column);
   const groupItems = getGroupItems(rows, groupColumn);
   if (groupColumn.length === 0) return;
   let result = {};
   groupItems.forEach(groupValue => {
     result[groupValue] = {};
   });
-  if (summary_type === _constants.SUMMARY_TYPE.COUNT) {
+  if (summary_type === SUMMARY_TYPE.COUNT) {
     groupItems.forEach(groupItem => {
       rows.forEach(row => {
-        let value = (0, _utils.getClientCellValueDisplayString)(row, columnItem.type, columnItem.key, {
+        let value = getClientCellValueDisplayString(row, columnItem.type, columnItem.key, {
           collaborators: dtableValue.collaborators,
           data: columnItem.data,
           formulaRows
@@ -63,7 +56,7 @@ function calculateStatItem(chart, dtableValue, username, userId) {
   } else {
     groupItems.forEach(groupItem => {
       rows.forEach(row => {
-        let value = (0, _utils.getClientCellValueDisplayString)(row, columnItem.type, columnItem.key, {
+        let value = getClientCellValueDisplayString(row, columnItem.type, columnItem.key, {
           collaborators: dtableValue.collaborators,
           data: columnItem.data,
           formulaRows
@@ -73,8 +66,8 @@ function calculateStatItem(chart, dtableValue, username, userId) {
         if (groupItems.includes(groupValue)) {
           const list = result[groupItem][value];
           const formulaRow = formulaRows[row._id];
-          let cellValue = (0, _rowUtils.getCellValue)(row, formulaRow, numericColumn);
-          cellValue = (0, _dtableStore.isNumber)(cellValue) ? cellValue : 0;
+          let cellValue = getCellValue(row, formulaRow, numericColumn);
+          cellValue = isNumber(cellValue) ? cellValue : 0;
           if (groupItem === groupValue) {
             if (!list) {
               result[groupItem][value] = [cellValue];
@@ -102,7 +95,7 @@ function summaryResult(result, summaryMethod, precision) {
     newResult[groupId] = {};
     Object.keys(result[groupId]).forEach(key => {
       const currentValue = result[groupId][key];
-      newResult[groupId][key] = (0, _commonUtils.getSummaryResult)(currentValue, summaryMethod, precision);
+      newResult[groupId][key] = getSummaryResult(currentValue, summaryMethod, precision);
     });
   });
   return newResult;
@@ -117,8 +110,8 @@ function normalizeResult(result, groupColumn, summaryColumn, summaryType, summar
     Object.keys(result[groupId]).forEach(name => {
       const value = result[groupId][name];
       let formattedValue = value;
-      if (summaryType === _constants.SUMMARY_TYPE.ADVANCED) {
-        formattedValue = _statUtils.default.getFormattedValue(value, summaryColumn, summaryMethod);
+      if (summaryType === SUMMARY_TYPE.ADVANCED) {
+        formattedValue = StatUtils.getFormattedValue(value, summaryColumn, summaryMethod);
       }
       data.push({
         name,
@@ -145,4 +138,4 @@ function getGroupItems(rows, groupColumn) {
   }
   return items;
 }
-var _default = exports.default = calculateStatItem;
+export default calculateStatItem;

package/es/calculator/workers/pivot-table-calculator-worker.js

@@ -1,16 +1,9 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = calculateStatItem;
-var _dtableStore = require("dtable-store");
-var _constants = require("../../constants");
-var _commonUtils = require("../../utils/common-utils");
-var _rowUtils = require("../../utils/row-utils");
-var _statUtils = _interopRequireDefault(require("../../utils/stat-utils"));
-function calculateStatItem(chart, value, username, userId) {
+import { FORMULA_COLUMN_TYPES_MAP, isNumber, TableUtils, Views, isDateColumn, isNumericColumn } from 'dtable-store';
+import { SUMMARY_METHOD_MAP, SUMMARY_TYPE } from '../../constants';
+import { isArrayCellValue } from '../../utils/common-utils';
+import { getFormattedLabel, isValidRow } from '../../utils/row-utils';
+import StatUtils from '../../utils/stat-utils';
+export default function calculateStatItem(chart, value, username, userId) {
   const {
     groupby_column_key,
     column_groupby_column_key
@@ -36,21 +29,21 @@ function calculateOneDimensionTable(chart, value, username, userId) {
     groupby_geolocation_granularity,
     summary_columns_option
   } = chart;
-  const table = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
-  const column = _dtableStore.TableUtils.getTableColumnByKey(table, groupby_column_key);
+  const table = TableUtils.getTableById(value.tables, table_id);
+  const view = table && Views.getViewById(table.views, view_id);
+  const column = TableUtils.getTableColumnByKey(table, groupby_column_key);
   if (!column) return {};
-  const isColumnDataAsAnArray = (0, _commonUtils.isArrayCellValue)(column);
-  const statRows = _dtableStore.Views.getViewRows(view, table, value, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, statRows, value);
+  const isColumnDataAsAnArray = isArrayCellValue(column);
+  const statRows = Views.getViewRows(view, table, value, username, userId);
+  const formulaRows = Views.getTableFormulaResults(table, statRows, value);
   let pivot_rows = [];
   statRows.forEach(row => {
     const {
       _id: rowId
     } = row;
     const formulaRow = formulaRows[rowId];
-    if ((0, _rowUtils.isValidRow)(row, formulaRow, column, include_empty)) {
-      const name = _statUtils.default.getGroupLabel(row[column.key], formulaRow, column, groupby_date_granularity, groupby_geolocation_granularity, value);
+    if (isValidRow(row, formulaRow, column, include_empty)) {
+      const name = StatUtils.getGroupLabel(row[column.key], formulaRow, column, groupby_date_granularity, groupby_geolocation_granularity, value);
       let pivotRowIndex;
       if (isColumnDataAsAnArray) {
         if (name.length === 0 && include_empty) {
@@ -74,7 +67,7 @@ function calculateOneDimensionTable(chart, value, username, userId) {
   const statisticColumnKeys = [summary_column_key, ...summary_columns_option_keys];
   const validStatisticColumnKeys = statisticColumnKeys;
   let statisticColumns = validStatisticColumnKeys.map(key => {
-    const column = _dtableStore.TableUtils.getTableColumnByKey(table, key);
+    const column = TableUtils.getTableColumnByKey(table, key);
     return column ? {
       ...column
     } : null;
@@ -90,16 +83,16 @@ function calculateOneDimensionTable(chart, value, username, userId) {
   const {
     pivot_columns_total
   } = getOneDimensionTotal(statisticColumns, summary_type, formulaRows, pivot_rows);
-  _statUtils.default.sortStatistics(pivot_rows, column, 'name');
-  const pivot_columns = summary_type === _constants.SUMMARY_TYPE.COUNT ? [] : statisticColumns.map(column => {
+  StatUtils.sortStatistics(pivot_rows, column, 'name');
+  const pivot_columns = summary_type === SUMMARY_TYPE.COUNT ? [] : statisticColumns.map(column => {
     return {
       key: column.key,
       method: column.method
     };
-  }).filter(item => _dtableStore.TableUtils.getTableColumnByKey(table, item.key));
+  }).filter(item => TableUtils.getTableColumnByKey(table, item.key));
   pivot_rows.forEach(row => {
     row.original_name = row.name;
-    row.name = (0, _rowUtils.getFormattedLabel)(column, row.name, value.collaborators);
+    row.name = getFormattedLabel(column, row.name, value.collaborators);
   });
   return {
     pivot_columns_total,
@@ -128,7 +121,7 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
   let dateColumnsTotalArr = {};
   if (Array.isArray(columns) && columns.length > 0) {
     columns.forEach(column => {
-      if (column && (0, _dtableStore.isDateColumn)(column)) {
+      if (column && isDateColumn(column)) {
         dateColumnsTotalArr[column.key] = [];
       }
     });
@@ -141,7 +134,7 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
       ...item
     };
     let totalMap = {};
-    if (summary_type === _constants.SUMMARY_TYPE.COUNT) {
+    if (summary_type === SUMMARY_TYPE.COUNT) {
       totalMap['total'] = rows.length;
       pivot_columns_total.total = (pivot_columns_total['total'] || 0) + rows.length;
     } else {
@@ -153,8 +146,8 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
             method
           } = summaryColumn;
           const total = getTotal(summaryColumn, summary_type, method, rows, formula_rows);
-          if (summaryColumn && (0, _dtableStore.isDateColumn)(summaryColumn)) {
-            if (method === _constants.SUMMARY_METHOD_MAP.Distinct_values) {
+          if (summaryColumn && isDateColumn(summaryColumn)) {
+            if (method === SUMMARY_METHOD_MAP.Distinct_values) {
               totalMap['total'] = total;
             } else {
               totalMap['total'] = total === 0 ? 0 : total.date;
@@ -162,11 +155,11 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
                 dateColumnsTotalArr[key].push(total);
               }
             }
-            if (method === _constants.SUMMARY_METHOD_MAP.Max) {
-              pivot_columns_total['total'] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], _constants.SUMMARY_METHOD_MAP.Max).date;
-            } else if (method === _constants.SUMMARY_METHOD_MAP.Min) {
-              pivot_columns_total['total'] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], _constants.SUMMARY_METHOD_MAP.Min).date;
-            } else if (method === _constants.SUMMARY_METHOD_MAP.Distinct_values) {
+            if (method === SUMMARY_METHOD_MAP.Max) {
+              pivot_columns_total['total'] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], SUMMARY_METHOD_MAP.Max).date;
+            } else if (method === SUMMARY_METHOD_MAP.Min) {
+              pivot_columns_total['total'] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], SUMMARY_METHOD_MAP.Min).date;
+            } else if (method === SUMMARY_METHOD_MAP.Distinct_values) {
               const pivotColumnTotal = (pivot_columns_total['total'] ? pivot_columns_total['total'] - 0 : 0) + total;
               pivot_columns_total['total'] = Number.parseFloat(pivotColumnTotal.toFixed(8));
             }
@@ -184,8 +177,8 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
             } = column;
             const totalKey = key + method;
             const total = getTotal(column, summary_type, method, rows, formula_rows);
-            if (column && (0, _dtableStore.isDateColumn)(column)) {
-              if (method === _constants.SUMMARY_METHOD_MAP.Distinct_values) {
+            if (column && isDateColumn(column)) {
+              if (method === SUMMARY_METHOD_MAP.Distinct_values) {
                 totalMap[totalKey] = total;
               } else {
                 totalMap[totalKey] = total === 0 ? 0 : total.date;
@@ -193,11 +186,11 @@ function getOneDimensionTotal(columns, summary_type, formula_rows) {
                   dateColumnsTotalArr[key].push(total);
                 }
               }
-              if (method === _constants.SUMMARY_METHOD_MAP.Max) {
-                pivot_columns_total[totalKey] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], _constants.SUMMARY_METHOD_MAP.Max).date;
-              } else if (method === _constants.SUMMARY_METHOD_MAP.Min) {
-                pivot_columns_total[totalKey] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], _constants.SUMMARY_METHOD_MAP.Min).date;
-              } else if (method === _constants.SUMMARY_METHOD_MAP.Distinct_values) {
+              if (method === SUMMARY_METHOD_MAP.Max) {
+                pivot_columns_total[totalKey] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], SUMMARY_METHOD_MAP.Max).date;
+              } else if (method === SUMMARY_METHOD_MAP.Min) {
+                pivot_columns_total[totalKey] = dateColumnsTotalArr[key].length === 0 ? 0 : getDateMaxOrMinTotal(dateColumnsTotalArr[key], SUMMARY_METHOD_MAP.Min).date;
+              } else if (method === SUMMARY_METHOD_MAP.Distinct_values) {
                 const pivotColumnTotal = (pivot_columns_total[totalKey] ? pivot_columns_total[totalKey] - 0 : 0) + total;
                 pivot_columns_total[totalKey] = Number.parseFloat(pivotColumnTotal.toFixed(8));
               }
@@ -234,24 +227,24 @@ function calculateTwoDimensionTable(chart, value, username, userId) {
     column_groupby_geolocation_granularity,
     summary_columns_option
   } = chart;
-  const table = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
+  const table = TableUtils.getTableById(value.tables, table_id);
+  const view = table && Views.getViewById(table.views, view_id);
   if (!view) return;
-  const groupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, groupby_column_key);
+  const groupbyColumn = TableUtils.getTableColumnByKey(table, groupby_column_key);
   if (!groupbyColumn) return;
-  const isGroupbyColumnDataAsAnArray = (0, _commonUtils.isArrayCellValue)(groupbyColumn);
-  const rowGroupbyColumn = _dtableStore.TableUtils.getTableColumnByKey(table, column_groupby_column_key);
+  const isGroupbyColumnDataAsAnArray = isArrayCellValue(groupbyColumn);
+  const rowGroupbyColumn = TableUtils.getTableColumnByKey(table, column_groupby_column_key);
   if (!rowGroupbyColumn) {
     return calculateOneDimensionTable(chart, value);
   }
-  const isRowGroupbyColumnDataAsAnArray = (0, _commonUtils.isArrayCellValue)(rowGroupbyColumn);
-  const summaryColumn = _dtableStore.TableUtils.getTableColumnByKey(table, summary_column_key);
-  const statRows = _dtableStore.Views.getViewRows(view, table, value, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, statRows, value);
+  const isRowGroupbyColumnDataAsAnArray = isArrayCellValue(rowGroupbyColumn);
+  const summaryColumn = TableUtils.getTableColumnByKey(table, summary_column_key);
+  const statRows = Views.getViewRows(view, table, value, username, userId);
+  const formulaRows = Views.getTableFormulaResults(table, statRows, value);
   const pivot_summary_multiple_columns = [];
   summary_columns_option.forEach(item => {
-    const column = _dtableStore.TableUtils.getTableColumnByKey(table, item.key);
-    if (column && (0, _dtableStore.isNumericColumn)(column)) {
+    const column = TableUtils.getTableColumnByKey(table, item.key);
+    if (column && isNumericColumn(column)) {
       pivot_summary_multiple_columns.push({
         key: item.key,
         type: column.type,
@@ -282,12 +275,12 @@ function calculateTwoDimensionTable(chart, value, username, userId) {
       _id: rowId
     } = row;
     const formulaRow = formulaRows[rowId];
-    const cellValueForColumn = _statUtils.default.getGroupLabel(row[rowGroupbyColumn.key], formulaRow, rowGroupbyColumn, column_groupby_date_granularity, column_groupby_geolocation_granularity, value);
-    if ((0, _rowUtils.isValidRow)(row, formulaRow, rowGroupbyColumn, include_empty)) {
+    const cellValueForColumn = StatUtils.getGroupLabel(row[rowGroupbyColumn.key], formulaRow, rowGroupbyColumn, column_groupby_date_granularity, column_groupby_geolocation_granularity, value);
+    if (isValidRow(row, formulaRow, rowGroupbyColumn, include_empty)) {
       updateTwoDimensionColumns(value, pivot_columns, rowGroupbyColumn, row, formulaRow, include_empty, column_groupby_date_granularity, column_groupby_geolocation_granularity, isRowGroupbyColumnDataAsAnArray);
     }
-    if ((0, _rowUtils.isValidRow)(row, formulaRow, groupbyColumn, include_empty)) {
-      const name = _statUtils.default.getGroupLabel(row[groupbyColumn.key], formulaRow, groupbyColumn, groupby_date_granularity, groupby_geolocation_granularity, value);
+    if (isValidRow(row, formulaRow, groupbyColumn, include_empty)) {
+      const name = StatUtils.getGroupLabel(row[groupbyColumn.key], formulaRow, groupbyColumn, groupby_date_granularity, groupby_geolocation_granularity, value);
       let pivotRowIndex;
       if (isGroupbyColumnDataAsAnArray) {
         if (name.length === 0 && include_empty) {
@@ -311,18 +304,18 @@ function calculateTwoDimensionTable(chart, value, username, userId) {
     pivot_columns_total,
     pivot_table_total
   } = getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formulaRows, pivot_rows, pivot_columns);
-  _statUtils.default.sortStatistics(pivot_rows, groupbyColumn, 'name');
-  _statUtils.default.sortStatistics(pivot_columns, rowGroupbyColumn, 'key');
+  StatUtils.sortStatistics(pivot_rows, groupbyColumn, 'name');
+  StatUtils.sortStatistics(pivot_columns, rowGroupbyColumn, 'key');
 
   // format shown label(name)
   const map = {};
   pivot_columns.forEach(column => {
-    const name = (0, _rowUtils.getFormattedLabel)(rowGroupbyColumn, column.key, value.collaborators);
+    const name = getFormattedLabel(rowGroupbyColumn, column.key, value.collaborators);
     map[column.key] = name;
     column.key = name;
   });
   pivot_rows.forEach(row => {
-    row.name = (0, _rowUtils.getFormattedLabel)(groupbyColumn, row.name, value.collaborators);
+    row.name = getFormattedLabel(groupbyColumn, row.name, value.collaborators);
     const cells = {};
     Object.keys(row.cells).forEach(key => {
       cells[map[key]] = row.cells[key];
@@ -343,7 +336,7 @@ function calculateTwoDimensionTable(chart, value, username, userId) {
   };
 }
 function updateTwoDimensionColumns(value, pivot_columns, column, row, formulaRow, isIncludeEmpty, dateGranularity, geolocationGranularity, isRowGroupbyColumnDataAsAnArray) {
-  let key = _statUtils.default.getGroupLabel(row[column.key], formulaRow, column, dateGranularity, geolocationGranularity, value);
+  let key = StatUtils.getGroupLabel(row[column.key], formulaRow, column, dateGranularity, geolocationGranularity, value);
   let pivotColumnIndex;
   if (isRowGroupbyColumnDataAsAnArray) {
     if (key.length === 0 && isIncludeEmpty) {
@@ -420,7 +413,7 @@ function updateTwoDimensionRows(pivot_rows, pivot_columns, index, name, row, isC
   }
 }
 function isSameName(prevName, currName) {
-  if ((0, _dtableStore.isNumber)(prevName) && (0, _dtableStore.isNumber)(currName)) {
+  if (isNumber(prevName) && isNumber(currName)) {
     return prevName === currName;
   }
   if (!prevName && !currName) {
@@ -443,7 +436,7 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
   let {
     type: summary_column_type
   } = summaryColumn || {};
-  const isSummaryDateColumn = summaryColumn && (0, _dtableStore.isDateColumn)(summaryColumn);
+  const isSummaryDateColumn = summaryColumn && isDateColumn(summaryColumn);
   let date_summary_column_format = isSummaryDateColumn ? summaryColumn.data.format : '';
   Array.isArray(pivot_rows) && pivot_rows.forEach(pivotRow => {
     let {
@@ -482,8 +475,8 @@ function getTwoDimensionTotal(summaryColumn, summary_type, summary_method, formu
       pivot_table_total += total;
     }
   });
-  if (summaryColumn && (0, _dtableStore.isDateColumn)(summaryColumn)) {
-    if (summary_method === _constants.SUMMARY_METHOD_MAP.Distinct_values) {
+  if (summaryColumn && isDateColumn(summaryColumn)) {
+    if (summary_method === SUMMARY_METHOD_MAP.Distinct_values) {
       pivot_columns_total = Number.parseFloat(pivot_table_total.toFixed(8));
     } else {
       pivot_columns_total = showTwoDimensionDateColumnsAndRowsTotal(dateColumnsTotalArr, pivot_rows, date_summary_column_format, pivot_columns, summary_method);
@@ -508,15 +501,15 @@ function getTotal(summary_column, summary_type, summary_method) {
   const summary_column_type = summary_column ? summary_column.type : '';
   const rowsLength = rows.length;
   let total;
-  if (summary_type === _constants.SUMMARY_TYPE.COUNT) {
+  if (summary_type === SUMMARY_TYPE.COUNT) {
     total = rowsLength;
-  } else if (summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
-    if (summary_method === _constants.SUMMARY_METHOD_MAP.Distinct_values) {
+  } else if (summary_type === SUMMARY_TYPE.ADVANCED) {
+    if (summary_method === SUMMARY_METHOD_MAP.Distinct_values) {
       total = 0;
       let existMap = {};
       rows.forEach(row => {
         let num;
-        if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+        if (FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
           const formulaRow = formula_rows[row._id] || {};
           num = formulaRow[summary_column_key];
           num = Array.isArray(num) ? num[0] : num;
@@ -537,14 +530,14 @@ function getTotal(summary_column, summary_type, summary_method) {
       });
       return total;
     }
-    if (summary_column && (0, _dtableStore.isDateColumn)(summary_column)) {
+    if (summary_column && isDateColumn(summary_column)) {
       if (rowsLength === 0) return;
       let dateArr = [];
       rows.forEach(r => {
         let formatDate = {};
         let formatDateData;
         let value = r[summary_column_key];
-        if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+        if (FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
           let formulaRow = formula_rows[r._id] || {};
           value = formulaRow[summary_column_key];
         }
@@ -561,21 +554,21 @@ function getTotal(summary_column, summary_type, summary_method) {
         formatDate.value = Date.parse(formatDateData);
         dateArr.push(formatDate);
       });
-      if (summary_method === _constants.SUMMARY_METHOD_MAP.Max) {
-        total = getDateMaxOrMinTotal(dateArr, _constants.SUMMARY_METHOD_MAP.Max);
-      } else if (summary_method === _constants.SUMMARY_METHOD_MAP.Min) {
-        total = getDateMaxOrMinTotal(dateArr, _constants.SUMMARY_METHOD_MAP.Min);
+      if (summary_method === SUMMARY_METHOD_MAP.Max) {
+        total = getDateMaxOrMinTotal(dateArr, SUMMARY_METHOD_MAP.Max);
+      } else if (summary_method === SUMMARY_METHOD_MAP.Min) {
+        total = getDateMaxOrMinTotal(dateArr, SUMMARY_METHOD_MAP.Min);
       }
     } else {
       switch (summary_method) {
-        case _constants.SUMMARY_METHOD_MAP.Sum:
-        case _constants.SUMMARY_METHOD_MAP.Mean:
+        case SUMMARY_METHOD_MAP.Sum:
+        case SUMMARY_METHOD_MAP.Mean:
           {
             let sum = 0;
             let validNumbersCount = 0;
             rows.forEach(r => {
               let num;
-              if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+              if (FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                 let formulaRow = formula_rows[r._id] || {};
                 if (formulaRow[summary_column_key] && typeof formulaRow[summary_column_key] === 'object') {
                   num = formulaRow[summary_column_key][0];
@@ -585,7 +578,7 @@ function getTotal(summary_column, summary_type, summary_method) {
               } else {
                 num = r[summary_column_key];
               }
-              if ((0, _dtableStore.isNumber)(num)) {
+              if (isNumber(num)) {
                 validNumbersCount++;
                 sum += num;
               }
@@ -597,13 +590,13 @@ function getTotal(summary_column, summary_type, summary_method) {
             }
             break;
           }
-        case _constants.SUMMARY_METHOD_MAP.Max:
-        case _constants.SUMMARY_METHOD_MAP.Min:
+        case SUMMARY_METHOD_MAP.Max:
+        case SUMMARY_METHOD_MAP.Min:
           {
             if (rowsLength > 0) {
               let result = rows.reduce((current, next) => {
                 let currentValue, nextValue;
-                if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+                if (FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                   let currentFormulaRow = formula_rows[current._id] || {};
                   let nextFormulaRow = formula_rows[next._id] || {};
                   currentValue = currentFormulaRow[summary_column_key];
@@ -622,7 +615,7 @@ function getTotal(summary_column, summary_type, summary_method) {
                   return isNextGreater ? next : current;
                 }
               });
-              if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
+              if (FORMULA_COLUMN_TYPES_MAP[summary_column_type]) {
                 let formulaRow = formula_rows[result._id];
                 if (formulaRow) {
                   if (formulaRow[summary_column_key] && typeof formulaRow[summary_column_key] === 'object') {

package/es/calculator/workers/scatter-calculator-worker.js

@@ -1,15 +1,8 @@
-"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 _statUtils = _interopRequireDefault(require("../../utils/stat-utils"));
-var _commonUtils = require("../../utils/common-utils");
-var _rowUtils = require("../../utils/row-utils");
-var _constants = require("../../constants");
+import { isNumber, TableUtils, Views } from 'dtable-store';
+import StatUtils from '../../utils/stat-utils';
+import { isArrayCellValue } from '../../utils/common-utils';
+import { getCellValue, getFormattedLabel } from '../../utils/row-utils';
+import { DATE_GRANULARITY } from '../../constants';
 function calculateResult(chart, value, username, userId) {
   const {
     table_id,
@@ -18,26 +11,26 @@ function calculateResult(chart, value, username, userId) {
     y_axis_column,
     group_column
   } = chart;
-  const table = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const view = table && _dtableStore.Views.getViewById(table.views, view_id);
+  const table = TableUtils.getTableById(value.tables, table_id);
+  const view = table && Views.getViewById(table.views, view_id);
   if (!view) {
     return [];
   }
-  const selectedXAxisColumn = _dtableStore.TableUtils.getTableColumnByKey(table, x_axis_column);
-  const selectedYAxisColumn = _dtableStore.TableUtils.getTableColumnByKey(table, y_axis_column);
-  const selectedGroupColumn = _dtableStore.TableUtils.getTableColumnByKey(table, group_column);
-  const statRows = _dtableStore.Views.getViewRows(view, table, value, username, userId);
-  const formulaRows = _dtableStore.Views.getTableFormulaResults(table, statRows, value);
+  const selectedXAxisColumn = TableUtils.getTableColumnByKey(table, x_axis_column);
+  const selectedYAxisColumn = TableUtils.getTableColumnByKey(table, y_axis_column);
+  const selectedGroupColumn = TableUtils.getTableColumnByKey(table, group_column);
+  const statRows = Views.getViewRows(view, table, value, username, userId);
+  const formulaRows = Views.getTableFormulaResults(table, statRows, value);
   const data = [];
   statRows.forEach(row => {
     const {
       _id: rowId
     } = row;
     const formulaRow = formulaRows[rowId] || {};
-    let x_axis = (0, _rowUtils.getCellValue)(row, formulaRow, selectedXAxisColumn);
-    let y_axis = (0, _rowUtils.getCellValue)(row, formulaRow, selectedYAxisColumn);
-    x_axis = (0, _dtableStore.isNumber)(x_axis) ? x_axis : 0;
-    y_axis = (0, _dtableStore.isNumber)(y_axis) ? y_axis : 0;
+    let x_axis = getCellValue(row, formulaRow, selectedXAxisColumn);
+    let y_axis = getCellValue(row, formulaRow, selectedYAxisColumn);
+    x_axis = isNumber(x_axis) ? x_axis : 0;
+    y_axis = isNumber(y_axis) ? y_axis : 0;
     const name = getColumnValue(row, formulaRow, selectedGroupColumn, value);
     const nameIndex = data.findIndex(r => r.name === name && r.x_axis === x_axis && r.y_axis === y_axis);
     const dataItem = {
@@ -66,11 +59,11 @@ function updateBasicChartRows(results, index, name, dataItem, row) {
 }
 function getColumnValue(data, formulaRow, column, dtableValue) {
   const tempValue = data[column.key];
-  let value = _statUtils.default.getGroupLabel(tempValue, formulaRow, column, _constants.DATE_GRANULARITY.DAY, '', dtableValue);
-  if ((0, _commonUtils.isArrayCellValue)(column)) {
+  let value = StatUtils.getGroupLabel(tempValue, formulaRow, column, DATE_GRANULARITY.DAY, '', dtableValue);
+  if (isArrayCellValue(column)) {
     value = value[0];
   }
-  value = (0, _rowUtils.getFormattedLabel)(column, value, dtableValue.collaborators);
+  value = getFormattedLabel(column, value, dtableValue.collaborators);
   return value;
 }
-var _default = exports.default = calculateResult;
+export default calculateResult;

package/es/calculator/workers/trend-calculator-worker.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 _dayjs = _interopRequireDefault(require("dayjs"));
-var _quarterOfYear = _interopRequireDefault(require("dayjs/plugin/quarterOfYear"));
-var _dtableStore = require("dtable-store");
-var _constants = require("../../constants");
-var _statUtils = _interopRequireDefault(require("../../utils/stat-utils"));
-var _rowUtils = require("../../utils/row-utils");
-var _commonUtils = require("../../utils/common-utils");
-var _trendUtils = require("../../utils/trend-utils");
-_dayjs.default.extend(_quarterOfYear.default);
+import dayjs from 'dayjs';
+import quarterOfYear from 'dayjs/plugin/quarterOfYear';
+import { FORMULA_COLUMN_TYPES_MAP, isNumber, TableUtils, Views } from 'dtable-store';
+import { SUMMARY_TYPE } from '../../constants';
+import StatUtils from '../../utils/stat-utils';
+import { getCellValue } from '../../utils/row-utils';
+import { getSummaryResult } from '../../utils/common-utils';
+import { getCompareDate, summaryDurationResult } from '../../utils/trend-utils';
+dayjs.extend(quarterOfYear);
 function calculateStatItem(chart, value, username, userId) {
   const {
     table_id,
@@ -24,16 +17,16 @@ function calculateStatItem(chart, value, username, userId) {
     summary_type,
     summary_method
   } = chart;
-  const selectedTable = _dtableStore.TableUtils.getTableById(value.tables, table_id);
-  const selectedView = selectedTable && _dtableStore.Views.getViewById(selectedTable.views, view_id);
-  const selectedColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, date_column);
+  const selectedTable = TableUtils.getTableById(value.tables, table_id);
+  const selectedView = selectedTable && Views.getViewById(selectedTable.views, view_id);
+  const selectedColumn = TableUtils.getTableColumnByKey(selectedTable, date_column);
   const resultMap = new Map();
   let formulaRows = {};
-  const rows = _dtableStore.Views.getViewRows(selectedView, selectedTable, value, username, userId);
-  const numericColumn = _dtableStore.TableUtils.getTableColumnByKey(selectedTable, summary_column);
-  if (summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
-    if (_dtableStore.FORMULA_COLUMN_TYPES_MAP[numericColumn.type]) {
-      formulaRows = _dtableStore.Views.getTableFormulaResults(selectedTable, rows, value);
+  const rows = Views.getViewRows(selectedView, selectedTable, value, username, userId);
+  const numericColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
+  if (summary_type === SUMMARY_TYPE.ADVANCED) {
+    if (FORMULA_COLUMN_TYPES_MAP[numericColumn.type]) {
+      formulaRows = Views.getTableFormulaResults(selectedTable, rows, value);
     }
   }
   let granularity = date_granularity;
@@ -42,16 +35,16 @@ function calculateStatItem(chart, value, username, userId) {
   }
   rows.forEach(row => {
     const dateValue = row[selectedColumn.key];
-    const label = _statUtils.default.getGroupLabel(dateValue, {}, selectedColumn, granularity, '', value);
+    const label = StatUtils.getGroupLabel(dateValue, {}, selectedColumn, granularity, '', value);
     if (dateValue) {
-      if (summary_type === _constants.SUMMARY_TYPE.COUNT) {
+      if (summary_type === SUMMARY_TYPE.COUNT) {
         const currentCount = resultMap.get(label) || 0;
         resultMap.set(label, currentCount + 1);
       } else {
         const formulaRow = formulaRows[row._id];
-        const numericValue = (0, _rowUtils.getCellValue)(row, formulaRow, numericColumn);
+        const numericValue = getCellValue(row, formulaRow, numericColumn);
         const currentList = resultMap.get(label) || [];
-        if ((0, _dtableStore.isNumber)(numericValue)) {
+        if (isNumber(numericValue)) {
           currentList.push(numericValue);
         }
         resultMap.set(label, currentList);
@@ -63,22 +56,22 @@ function calculateStatItem(chart, value, username, userId) {
     const {
       compareValue: value1,
       comparedValue: value2
-    } = (0, _trendUtils.summaryDurationResult)(resultMap, date_granularity, summary_type, summary_column, false);
+    } = summaryDurationResult(resultMap, date_granularity, summary_type, summary_column, false);
     currentValues = value1;
     previousValues = value2;
   } else {
     const {
       compareDate,
       comparedDate
-    } = (0, _trendUtils.getCompareDate)(date_granularity);
+    } = getCompareDate(date_granularity);
     currentValues = resultMap.get(compareDate);
     previousValues = resultMap.get(comparedDate);
-    if (summary_type === _constants.SUMMARY_TYPE.ADVANCED) {
+    if (summary_type === SUMMARY_TYPE.ADVANCED) {
       if (currentValues) {
-        currentValues = (0, _commonUtils.getSummaryResult)(currentValues, summary_method);
+        currentValues = getSummaryResult(currentValues, summary_method);
       }
       if (previousValues) {
-        previousValues = (0, _commonUtils.getSummaryResult)(previousValues, summary_method);
+        previousValues = getSummaryResult(previousValues, summary_method);
       }
     }
   }
@@ -101,4 +94,4 @@ function calculateStatItem(chart, value, username, userId) {
     type: currentValues > previousValues ? 'up' : 'down'
   };
 }
-var _default = exports.default = calculateStatItem;
+export default calculateStatItem;