You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2021/07/15 04:23:45 UTC
[echarts] branch dataset-perf updated: test(ut): add path alias for
root dir
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch dataset-perf
in repository https://gitbox.apache.org/repos/asf/echarts.git
The following commit(s) were added to refs/heads/dataset-perf by this push:
new 23548b8 test(ut): add path alias for root dir
23548b8 is described below
commit 23548b87a5a1cb527663e029c9b7d6d466ec03bb
Author: pissang <bm...@gmail.com>
AuthorDate: Thu Jul 15 12:19:41 2021 +0800
test(ut): add path alias for root dir
---
test/ut/jest.config.js | 8 +++++++-
test/ut/spec/data/SeriesData.test.ts | 12 ++++++------
test/ut/spec/data/createDimensions.test.ts | 8 ++++----
test/ut/spec/data/dataTransform.test.ts | 6 +++---
test/ut/spec/data/dataValueHelper.test.ts | 2 +-
test/ut/spec/model/Global.test.ts | 12 ++++++------
test/ut/spec/model/componentDependency.test.ts | 4 ++--
test/ut/spec/model/componentMissing.test.ts | 10 +++++-----
test/ut/spec/model/timelineMediaOptions.test.ts | 12 ++++++------
test/ut/spec/scale/interval.test.ts | 10 +++++-----
test/ut/spec/series/custom.test.ts | 6 +++---
test/ut/spec/util/graphic.test.ts | 2 +-
test/ut/spec/util/layout.test.ts | 4 ++--
test/ut/spec/util/model.test.ts | 2 +-
test/ut/spec/util/number.test.ts | 2 +-
test/ut/tsconfig.json | 7 ++++++-
16 files changed, 59 insertions(+), 48 deletions(-)
diff --git a/test/ut/jest.config.js b/test/ut/jest.config.js
index 9946de2..5ca8031 100644
--- a/test/ut/jest.config.js
+++ b/test/ut/jest.config.js
@@ -17,6 +17,9 @@
* under the License.
*/
+const { pathsToModuleNameMapper } = require('ts-jest/utils');
+const { compilerOptions } = require('./tsconfig')
+
module.exports = {
preset: 'ts-jest',
testEnvironment: 'jsdom',
@@ -44,5 +47,8 @@ module.exports = {
'**/spec/model/*.test.ts',
'**/spec/scale/*.test.ts',
'**/spec/util/*.test.ts'
- ]
+ ],
+ moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, {
+ prefix: '<rootDir>/'
+ })
};
diff --git a/test/ut/spec/data/SeriesData.test.ts b/test/ut/spec/data/SeriesData.test.ts
index 30b321d..b9600de 100644
--- a/test/ut/spec/data/SeriesData.test.ts
+++ b/test/ut/spec/data/SeriesData.test.ts
@@ -20,12 +20,12 @@
/* global Float32Array */
-import SeriesData from '../../../../src/data/SeriesData';
-import Model from '../../../../src/model/Model';
-import { createSourceFromSeriesDataOption, Source, createSource } from '../../../../src/data/Source';
-import { OptionDataItemObject, OptionDataValue, SOURCE_FORMAT_ARRAY_ROWS } from '../../../../src/util/types';
-import DataDimensionInfo from '../../../../src/data/DataDimensionInfo';
-import OrdinalMeta from '../../../../src/data/OrdinalMeta';
+import SeriesData from '@/src/data/SeriesData';
+import Model from '@/src/model/Model';
+import { createSourceFromSeriesDataOption, Source, createSource } from '@/src/data/Source';
+import { OptionDataItemObject, OptionDataValue, SOURCE_FORMAT_ARRAY_ROWS } from '@/src/util/types';
+import DataDimensionInfo from '@/src/data/DataDimensionInfo';
+import OrdinalMeta from '@/src/data/OrdinalMeta';
const ID_PREFIX = 'e\0\0';
diff --git a/test/ut/spec/data/createDimensions.test.ts b/test/ut/spec/data/createDimensions.test.ts
index 717a081..bf69e07 100644
--- a/test/ut/spec/data/createDimensions.test.ts
+++ b/test/ut/spec/data/createDimensions.test.ts
@@ -18,10 +18,10 @@
*/
-import DataDimensionInfo from '../../../../src/data/DataDimensionInfo';
-import createDimensions from '../../../../src/data/helper/createDimensions';
-import { createSource } from '../../../../src/data/Source';
-import { SOURCE_FORMAT_ARRAY_ROWS, SERIES_LAYOUT_BY_COLUMN } from '../../../../src/util/types';
+import DataDimensionInfo from '@/src/data/DataDimensionInfo';
+import createDimensions from '@/src/data/helper/createDimensions';
+import { createSource } from '@/src/data/Source';
+import { SOURCE_FORMAT_ARRAY_ROWS, SERIES_LAYOUT_BY_COLUMN } from '@/src/util/types';
type ParametersOfCreateDimensions = Parameters<typeof createDimensions>;
diff --git a/test/ut/spec/data/dataTransform.test.ts b/test/ut/spec/data/dataTransform.test.ts
index 316064f..04cc20e 100644
--- a/test/ut/spec/data/dataTransform.test.ts
+++ b/test/ut/spec/data/dataTransform.test.ts
@@ -17,10 +17,10 @@
* under the License.
*/
-import { EChartsType } from '../../../../src/echarts';
+import { EChartsType } from '@/src/echarts';
import { createChart, removeChart, getECModel } from '../../core/utHelper';
-import { EChartsOption } from '../../../../src/export/option';
-import { retrieveRawValue } from '../../../../src/data/helper/dataProvider';
+import { EChartsOption } from '@/src/export/option';
+import { retrieveRawValue } from '@/src/data/helper/dataProvider';
describe('dataTransform', function () {
diff --git a/test/ut/spec/data/dataValueHelper.test.ts b/test/ut/spec/data/dataValueHelper.test.ts
index 729395c..a1d971a 100644
--- a/test/ut/spec/data/dataValueHelper.test.ts
+++ b/test/ut/spec/data/dataValueHelper.test.ts
@@ -18,7 +18,7 @@
*/
-import * as dataValueHelper from '../../../../src/data/helper/dataValueHelper';
+import * as dataValueHelper from '@/src/data/helper/dataValueHelper';
const NO_SUCH_CASE = 'NO_SUCH_CASE';
diff --git a/test/ut/spec/model/Global.test.ts b/test/ut/spec/model/Global.test.ts
index 632f7f1..a115b99 100755
--- a/test/ut/spec/model/Global.test.ts
+++ b/test/ut/spec/model/Global.test.ts
@@ -18,13 +18,13 @@
* under the License.
*/
-import { EChartsType } from '../../../../src/echarts';
+import { EChartsType } from '@/src/echarts';
import { createChart, getECModel } from '../../core/utHelper';
-import { ComponentMainType, ParsedValue } from '../../../../src/util/types';
-import SeriesModel from '../../../../src/model/Series';
-import ComponentModel from '../../../../src/model/Component';
-import ChartView from '../../../../src/view/Chart';
-import { EChartsOption } from '../../../../src/export/option';
+import { ComponentMainType, ParsedValue } from '@/src/util/types';
+import SeriesModel from '@/src/model/Series';
+import ComponentModel from '@/src/model/Component';
+import ChartView from '@/src/view/Chart';
+import { EChartsOption } from '@/src/export/option';
type OriginModelView = {
model: SeriesModel;
diff --git a/test/ut/spec/model/componentDependency.test.ts b/test/ut/spec/model/componentDependency.test.ts
index 31e2f6b..b86cf90 100755
--- a/test/ut/spec/model/componentDependency.test.ts
+++ b/test/ut/spec/model/componentDependency.test.ts
@@ -18,8 +18,8 @@
* under the License.
*/
-import ComponentModel, { ComponentModelConstructor } from '../../../../src/model/Component';
-import { ComponentMainType } from '../../../../src/util/types';
+import ComponentModel, { ComponentModelConstructor } from '@/src/model/Component';
+import { ComponentMainType } from '@/src/util/types';
const componentModelConstructor = ComponentModel as ComponentModelConstructor;
diff --git a/test/ut/spec/model/componentMissing.test.ts b/test/ut/spec/model/componentMissing.test.ts
index 67e1932..bfbe58a 100644
--- a/test/ut/spec/model/componentMissing.test.ts
+++ b/test/ut/spec/model/componentMissing.test.ts
@@ -18,18 +18,18 @@
* under the License.
*/
-import { init, use, EChartsType } from '../../../../src/export/core';
+import { init, use, EChartsType } from '@/src/export/core';
import {
PieChart
-} from '../../../../src/export/charts';
+} from '@/src/export/charts';
import {
TitleComponent
-} from '../../../../src/export/components';
+} from '@/src/export/components';
import {
CanvasRenderer
-} from '../../../../src/export/renderers';
+} from '@/src/export/renderers';
use([PieChart, TitleComponent, CanvasRenderer]);
-import { EChartsOption } from '../../../../src/export/option';
+import { EChartsOption } from '@/src/export/option';
function createChart(theme?: object): EChartsType {
diff --git a/test/ut/spec/model/timelineMediaOptions.test.ts b/test/ut/spec/model/timelineMediaOptions.test.ts
index d0bf402..0b2d436 100755
--- a/test/ut/spec/model/timelineMediaOptions.test.ts
+++ b/test/ut/spec/model/timelineMediaOptions.test.ts
@@ -18,13 +18,13 @@
* under the License.
*/
-import { EChartsType } from '../../../../src/echarts';
-import SeriesModel from '../../../../src/model/Series';
-import { ParsedValue } from '../../../../src/util/types';
-import { LegendOption } from '../../../../src/component/legend/LegendModel';
-import TimelineModel from '../../../../src/component/timeline/TimelineModel';
+import { EChartsType } from '@/src/echarts';
+import SeriesModel from '@/src/model/Series';
+import { ParsedValue } from '@/src/util/types';
+import { LegendOption } from '@/src/component/legend/LegendModel';
+import TimelineModel from '@/src/component/timeline/TimelineModel';
import { createChart, getECModel } from '../../core/utHelper';
-import { EChartsOption } from '../../../../src/export/option';
+import { EChartsOption } from '@/src/export/option';
describe('timelineMediaOptions', function () {
diff --git a/test/ut/spec/scale/interval.test.ts b/test/ut/spec/scale/interval.test.ts
index aec5999..67965d7 100755
--- a/test/ut/spec/scale/interval.test.ts
+++ b/test/ut/spec/scale/interval.test.ts
@@ -19,11 +19,11 @@
*/
import { createChart, getECModel } from '../../core/utHelper';
-import { EChartsType } from '../../../../src/echarts';
-import CartesianAxisModel from '../../../../src/coord/cartesian/AxisModel';
-import IntervalScale from '../../../../src/scale/Interval';
-import { intervalScaleNiceTicks } from '../../../../src/scale/helper';
-import { getPrecisionSafe } from '../../../../src/util/number';
+import { EChartsType } from '@/src/echarts';
+import CartesianAxisModel from '@/src/coord/cartesian/AxisModel';
+import IntervalScale from '@/src/scale/Interval';
+import { intervalScaleNiceTicks } from '@/src/scale/helper';
+import { getPrecisionSafe } from '@/src/util/number';
describe('scale_interval', function () {
diff --git a/test/ut/spec/series/custom.test.ts b/test/ut/spec/series/custom.test.ts
index e6083fd..ec0af57 100644
--- a/test/ut/spec/series/custom.test.ts
+++ b/test/ut/spec/series/custom.test.ts
@@ -17,10 +17,10 @@
* under the License.
*/
-import { EChartsType } from '../../../../src/echarts';
+import { EChartsType } from '@/src/echarts';
import { createChart } from '../../core/utHelper';
-import { ZRColor } from '../../../../src/util/types';
-import { CustomSeriesRenderItemAPI, CustomSeriesRenderItemParams } from '../../../../src/chart/custom/CustomSeries';
+import { ZRColor } from '@/src/util/types';
+import { CustomSeriesRenderItemAPI, CustomSeriesRenderItemParams } from '@/src/chart/custom/CustomSeries';
describe('custom_series', function () {
diff --git a/test/ut/spec/util/graphic.test.ts b/test/ut/spec/util/graphic.test.ts
index 5a3b196..f6856ff 100755
--- a/test/ut/spec/util/graphic.test.ts
+++ b/test/ut/spec/util/graphic.test.ts
@@ -21,7 +21,7 @@
import {
subPixelOptimize, subPixelOptimizeLine, subPixelOptimizeRect
} from 'zrender/src/graphic/helper/subPixelOptimize';
-import { lineLineIntersect } from '../../../../src/util/graphic';
+import { lineLineIntersect } from '@/src/util/graphic';
describe('util/graphic', function () {
diff --git a/test/ut/spec/util/layout.test.ts b/test/ut/spec/util/layout.test.ts
index 4c43ceb..7006229 100644
--- a/test/ut/spec/util/layout.test.ts
+++ b/test/ut/spec/util/layout.test.ts
@@ -19,8 +19,8 @@
*/
// import { Dictionary } from 'zrender/src/core/types';
-import { mergeLayoutParam } from '../../../../src/util/layout';
-import { BoxLayoutOptionMixin } from '../../../../src/util/types';
+import { mergeLayoutParam } from '@/src/util/layout';
+import { BoxLayoutOptionMixin } from '@/src/util/types';
describe('util/number', function () {
diff --git a/test/ut/spec/util/model.test.ts b/test/ut/spec/util/model.test.ts
index bde8882..40f7890 100755
--- a/test/ut/spec/util/model.test.ts
+++ b/test/ut/spec/util/model.test.ts
@@ -18,7 +18,7 @@
* under the License.
*/
-import { compressBatches } from '../../../../src/util/model';
+import { compressBatches } from '@/src/util/model';
describe('util/model', function () {
diff --git a/test/ut/spec/util/number.test.ts b/test/ut/spec/util/number.test.ts
index ae96c38..e7e06f1 100755
--- a/test/ut/spec/util/number.test.ts
+++ b/test/ut/spec/util/number.test.ts
@@ -22,7 +22,7 @@ import {
linearMap, parseDate, reformIntervals, getPrecisionSafe, getPrecision,
getPercentWithPrecision, quantityExponent, quantity, nice,
isNumeric, numericToNumber, addSafe
-} from '../../../../src/util/number';
+} from '@/src/util/number';
describe('util/number', function () {
diff --git a/test/ut/tsconfig.json b/test/ut/tsconfig.json
index 0cdbc3d..63885f0 100644
--- a/test/ut/tsconfig.json
+++ b/test/ut/tsconfig.json
@@ -6,7 +6,12 @@
"noImplicitThis": true,
"strictBindCallApply": true,
- "esModuleInterop": true
+ "esModuleInterop": true,
+
+ "baseUrl": "./",
+ "paths": {
+ "@/*": ["../../*"]
+ }
},
"include": [
"**/*.ts"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org