dtable-statistic 4.3.2 → 4.3.3

package/es/utils/trend-utils.js

@@ -1,43 +1,51 @@
-import dayjs from 'dayjs';
-import quarterOfYear from 'dayjs/plugin/quarterOfYear';
-import { getSummaryResult } from './common-utils';
-import { DATE_GRANULARITY, SUMMARY_TYPE } from '../constants';
-dayjs.extend(quarterOfYear);
-export function getCompareDate(dateGranularity) {
-  const currentDate = dayjs();
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCompareDate = getCompareDate;
+exports.summaryDurationResult = summaryDurationResult;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _quarterOfYear = _interopRequireDefault(require("dayjs/plugin/quarterOfYear"));
+var _commonUtils = require("./common-utils");
+var _constants = require("../constants");
+_dayjs.default.extend(_quarterOfYear.default);
+function getCompareDate(dateGranularity) {
+  const currentDate = (0, _dayjs.default)();
   switch (dateGranularity) {
-    case DATE_GRANULARITY.DAY:
+    case _constants.DATE_GRANULARITY.DAY:
       {
-        const compareDate = dayjs(currentDate).subtract(1, 'days').format('YYYY-MM-DD');
-        const comparedDate = dayjs(currentDate).subtract(2, 'days').format('YYYY-MM-DD');
+        const compareDate = (0, _dayjs.default)(currentDate).subtract(1, 'days').format('YYYY-MM-DD');
+        const comparedDate = (0, _dayjs.default)(currentDate).subtract(2, 'days').format('YYYY-MM-DD');
         return {
           compareDate,
           comparedDate
         };
       }
-    case DATE_GRANULARITY.WEEK:
+    case _constants.DATE_GRANULARITY.WEEK:
       {
-        const currentWeek = dayjs().day(1);
-        const compareDate = dayjs(currentWeek).subtract(1, 'weeks').format('YYYY-MM-DD');
-        const comparedDate = dayjs(currentWeek).subtract(2, 'weeks').format('YYYY-MM-DD');
+        const currentWeek = (0, _dayjs.default)().day(1);
+        const compareDate = (0, _dayjs.default)(currentWeek).subtract(1, 'weeks').format('YYYY-MM-DD');
+        const comparedDate = (0, _dayjs.default)(currentWeek).subtract(2, 'weeks').format('YYYY-MM-DD');
         return {
           compareDate,
           comparedDate
         };
       }
-    case DATE_GRANULARITY.MONTH:
+    case _constants.DATE_GRANULARITY.MONTH:
       {
-        const compareDate = dayjs(currentDate).subtract(1, 'months').format('YYYY-MM');
-        const comparedDate = dayjs(currentDate).subtract(2, 'months').format('YYYY-MM');
+        const compareDate = (0, _dayjs.default)(currentDate).subtract(1, 'months').format('YYYY-MM');
+        const comparedDate = (0, _dayjs.default)(currentDate).subtract(2, 'months').format('YYYY-MM');
         return {
           compareDate,
           comparedDate
         };
       }
-    case DATE_GRANULARITY.QUARTER:
+    case _constants.DATE_GRANULARITY.QUARTER:
       {
-        const currentQuarter = dayjs().quarter();
-        const currentYear = dayjs().year();
+        const currentQuarter = (0, _dayjs.default)().quarter();
+        const currentYear = (0, _dayjs.default)().year();
         let lastQuarter = currentQuarter - 1;
         let compareDate, comparedDate;
         if (lastQuarter < 1) {
@@ -58,9 +66,9 @@ export function getCompareDate(dateGranularity) {
           comparedDate
         };
       }
-    case DATE_GRANULARITY.YEAR:
+    case _constants.DATE_GRANULARITY.YEAR:
       {
-        const currentYear = dayjs().year();
+        const currentYear = (0, _dayjs.default)().year();
         return {
           compareDate: currentYear - 1 + '',
           comparedDate: currentYear - 2 + ''
@@ -72,12 +80,12 @@ export function getCompareDate(dateGranularity) {
       }
   }
 }
-export function summaryDurationResult(result, duration, summaryType, summaryMethod, useDataDb, dbDateKey, valueKey) {
-  const currentTime = dayjs();
+function summaryDurationResult(result, duration, summaryType, summaryMethod, useDataDb, dbDateKey, valueKey) {
+  const currentTime = (0, _dayjs.default)();
   const days = duration === 'days_30' ? 30 : 7;
   const endDate = currentTime.format('YYYY-MM-DD');
   const middleDate = currentTime.subtract(days, 'days').format('YYYY-MM-DD');
-  const startDate = dayjs(middleDate).subtract(days, 'days').format('YYYY-MM-DD');
+  const startDate = (0, _dayjs.default)(middleDate).subtract(days, 'days').format('YYYY-MM-DD');
   let compareValue = [];
   let comparedValue = [];
   if (useDataDb) {
@@ -98,13 +106,13 @@ export function summaryDurationResult(result, duration, summaryType, summaryMeth
     for (let item of result) {
       const key = item[0];
       if (key >= startDate && key < middleDate) {
-        if (summaryType === SUMMARY_TYPE.ADVANCED) {
+        if (summaryType === _constants.SUMMARY_TYPE.ADVANCED) {
           comparedValue = comparedValue.concat(item[1] || []);
         } else {
           comparedValue.push(item[1]);
         }
       } else if (key >= middleDate && key < endDate) {
-        if (summaryType === SUMMARY_TYPE.ADVANCED) {
+        if (summaryType === _constants.SUMMARY_TYPE.ADVANCED) {
           compareValue = compareValue.concat(item[1] || []);
         } else {
           compareValue.push(item[1]);
@@ -112,12 +120,12 @@ export function summaryDurationResult(result, duration, summaryType, summaryMeth
       }
     }
   }
-  if (summaryType === SUMMARY_TYPE.ADVANCED) {
-    comparedValue = getSummaryResult(comparedValue, summaryMethod);
-    compareValue = getSummaryResult(compareValue, summaryMethod);
+  if (summaryType === _constants.SUMMARY_TYPE.ADVANCED) {
+    comparedValue = (0, _commonUtils.getSummaryResult)(comparedValue, summaryMethod);
+    compareValue = (0, _commonUtils.getSummaryResult)(compareValue, summaryMethod);
   } else {
-    compareValue = getSummaryResult(compareValue, 'Sum');
-    comparedValue = getSummaryResult(comparedValue, 'Sum');
+    compareValue = (0, _commonUtils.getSummaryResult)(compareValue, 'Sum');
+    comparedValue = (0, _commonUtils.getSummaryResult)(comparedValue, 'Sum');
   }
   return {
     compareValue,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.3.2",
+  "version": "4.3.3",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -28,6 +28,74 @@
   "peerDependencies": {
     "@antv/scale": "0.3.14"
   },
+  "devDependencies": {
+    "@babel/cli": "7.22.15",
+    "@babel/core": "^7.16.0",
+    "@babel/plugin-proposal-private-property-in-object": "7.21.11",
+    "@babel/plugin-transform-runtime": "7.22.10",
+    "@babel/runtime": "7.22.11",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
+    "@svgr/webpack": "8.1.0",
+    "@testing-library/jest-dom": "5.17.0",
+    "@testing-library/react": "^11.1.0",
+    "@testing-library/user-event": "13.5.0",
+    "autoprefixer": "10.4.5",
+    "babel-eslint": "10.0.1",
+    "babel-jest": "^27.4.2",
+    "babel-loader": "^8.2.3",
+    "babel-plugin-import": "^1.13.6",
+    "babel-plugin-named-asset-import": "^0.3.8",
+    "babel-plugin-on-demand-loading": "^0.0.9",
+    "babel-preset-react-app": "^10.0.1",
+    "bfj": "^7.0.2",
+    "browserslist": "^4.18.1",
+    "camelcase": "^6.2.1",
+    "case-sensitive-paths-webpack-plugin": "^2.4.0",
+    "css-loader": "^6.5.1",
+    "css-minimizer-webpack-plugin": "^3.2.0",
+    "dotenv": "^10.0.0",
+    "dotenv-expand": "^5.1.0",
+    "eslint": "^8.3.0",
+    "eslint-config-react-app": "^7.0.1",
+    "eslint-webpack-plugin": "^3.1.1",
+    "file-loader": "^6.2.0",
+    "fs-extra": "^10.0.0",
+    "html-webpack-plugin": "^5.5.0",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^27.4.3",
+    "jest-resolve": "^27.4.2",
+    "jest-watch-typeahead": "^1.0.0",
+    "less": "^4.2.0",
+    "less-loader": "^11.1.3",
+    "mini-css-extract-plugin": "^2.4.5",
+    "node-polyfill-webpack-plugin": "2.0.1",
+    "postcss": "^8.4.31",
+    "postcss-flexbugs-fixes": "^5.0.2",
+    "postcss-loader": "^6.2.1",
+    "postcss-normalize": "^10.0.1",
+    "postcss-preset-env": "^7.0.1",
+    "prompts": "^2.4.2",
+    "react-app-polyfill": "^3.0.0",
+    "react-dev-utils": "^12.0.1",
+    "react-refresh": "^0.11.0",
+    "resolve": "^1.20.0",
+    "resolve-url-loader": "^4.0.0",
+    "sass-loader": "^12.3.0",
+    "semver": "^7.3.5",
+    "source-map-loader": "^3.0.0",
+    "style-loader": "^3.3.1",
+    "svg-sprite-loader": "^6.0.11",
+    "svgo-loader": "^3.0.1",
+    "tailwindcss": "^3.0.2",
+    "terser-webpack-plugin": "^5.2.5",
+    "url-loader": "^4.1.1",
+    "web-vitals": "^2.1.4",
+    "webpack": "^5.64.4",
+    "webpack-dev-server": "^4.6.0",
+    "webpack-manifest-plugin": "^4.0.2",
+    "workbox-webpack-plugin": "^6.4.1",
+    "worker-loader": "3.0.8"
+  },
   "scripts": {
     "clean:esm": "rm -rf es && mkdir es",
     "clean:lib": "rm -rf lib && mkdir lib",
@@ -47,8 +115,20 @@
     "index.js",
     "package.json"
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/seatable/seatable-plugin-advanced-chart.git"
+  },
+  "keywords": [
+    "statistic",
+    "chart",
+    "pivot table"
+  ],
   "eslintConfig": {
-    "extends": "react-app"
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
   },
   "browserslist": {
     "production": [
@@ -61,128 +141,5 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  },
-  "jest": {
-    "roots": [
-      "<rootDir>/src"
-    ],
-    "collectCoverageFrom": [
-      "src/**/*.{js,jsx,ts,tsx}",
-      "!src/**/*.d.ts"
-    ],
-    "setupFiles": [
-      "react-app-polyfill/jsdom"
-    ],
-    "setupFilesAfterEnv": [
-      "<rootDir>/src/setupTests.js"
-    ],
-    "testMatch": [
-      "<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
-      "<rootDir>/src/**/*.{spec,test}.{js,jsx,ts,tsx}"
-    ],
-    "testEnvironment": "jest-environment-jsdom-fourteen",
-    "transform": {
-      "^.+\\.(js|jsx|ts|tsx)$": "<rootDir>/node_modules/babel-jest",
-      "^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
-      "^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
-    },
-    "transformIgnorePatterns": [
-      "[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$",
-      "^.+\\.module\\.(css|sass|scss)$"
-    ],
-    "modulePaths": [],
-    "moduleNameMapper": {
-      "^react-native$": "react-native-web",
-      "^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy"
-    },
-    "moduleFileExtensions": [
-      "web.js",
-      "js",
-      "web.ts",
-      "ts",
-      "web.tsx",
-      "tsx",
-      "json",
-      "web.jsx",
-      "jsx",
-      "node"
-    ],
-    "watchPlugins": [
-      "jest-watch-typeahead/filename",
-      "jest-watch-typeahead/testname"
-    ]
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.4.4",
-    "@babel/core": "7.4.3",
-    "@babel/plugin-proposal-class-properties": "^7.4.4",
-    "@babel/plugin-proposal-export-default-from": "^7.5.2",
-    "@babel/plugin-proposal-export-namespace-from": "^7.5.2",
-    "@babel/plugin-proposal-object-rest-spread": "^7.5.2",
-    "@babel/plugin-transform-member-expression-literals": "^7.2.0",
-    "@babel/plugin-transform-property-literals": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.4.4",
-    "@babel/preset-env": "^7.4.5",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/runtime": "^7.14.0",
-    "@svgr/webpack": "4.1.0",
-    "@typescript-eslint/eslint-plugin": "1.6.0",
-    "@typescript-eslint/parser": "1.6.0",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "^24.8.0",
-    "babel-loader": "8.0.5",
-    "babel-plugin-named-asset-import": "^0.3.2",
-    "babel-preset-react-app": "^9.0.0",
-    "camelcase": "^5.2.0",
-    "case-sensitive-paths-webpack-plugin": "2.2.0",
-    "css-loader": "^3.0.0",
-    "debug": "^4.1.1",
-    "dotenv": "6.2.0",
-    "dotenv-expand": "4.2.0",
-    "eslint": "^5.16.0",
-    "eslint-config-react-app": "^4.0.1",
-    "eslint-loader": "2.1.2",
-    "eslint-plugin-flowtype": "2.50.1",
-    "eslint-plugin-import": "2.16.0",
-    "eslint-plugin-jsx-a11y": "6.2.1",
-    "eslint-plugin-react": "7.12.4",
-    "eslint-plugin-react-hooks": "^1.5.0",
-    "file-loader": "^4.0.0",
-    "fs-extra": "7.0.1",
-    "html-webpack-plugin": "4.0.0-beta.5",
-    "identity-obj-proxy": "3.0.0",
-    "is-wsl": "^1.1.0",
-    "jest": "24.7.1",
-    "jest-environment-jsdom-fourteen": "0.1.0",
-    "jest-resolve": "24.7.1",
-    "jest-watch-typeahead": "0.3.0",
-    "less": "^3.10.3",
-    "less-loader": "^5.0.0",
-    "mini-css-extract-plugin": "0.5.0",
-    "optimize-css-assets-webpack-plugin": "5.0.1",
-    "pnp-webpack-plugin": "1.2.1",
-    "postcss-flexbugs-fixes": "^4.1.0",
-    "postcss-loader": "^3.0.0",
-    "postcss-normalize": "7.0.1",
-    "postcss-preset-env": "6.6.0",
-    "postcss-safe-parser": "4.0.1",
-    "react-app-polyfill": "^3.0.0",
-    "react-dev-utils": "^9.0.1",
-    "resolve": "1.10.0",
-    "sass-loader": "^7.1.0",
-    "semver": "6.0.0",
-    "style-loader": "^0.23.1",
-    "svg-sprite-loader": "^6.0.11",
-    "svgo-loader": "^3.0.0",
-    "terser-webpack-plugin": "^1.2.3",
-    "ts-pnp": "1.1.2",
-    "url-loader": "^2.0.0",
-    "webpack": "4.29.6",
-    "webpack-bundle-analyzer": "^4.7.0",
-    "webpack-cli": "^3.3.4",
-    "webpack-dev-server": "3.2.1",
-    "webpack-manifest-plugin": "2.0.4",
-    "workbox-webpack-plugin": "4.2.0",
-    "worker-loader": "^3.0.8"
   }
 }