@formant/ava 3.4.21-formant → 3.5.0-formant

package/lib/insight/chart/constants.js

@@ -1,29 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PIE_RADIUS_STYLE = exports.ChartTypeMap = exports.TEXT_STYLE = exports.BOLD_FONT_WEIGHT = exports.INSIGHT_COLOR_PLATTE = void 0;
-exports.INSIGHT_COLOR_PLATTE = {
-    highlight: '#f89973',
-    outlier: '#ea719d',
-    font: '#bac4e2',
-    defaultPointColor: '#fff',
-};
-exports.BOLD_FONT_WEIGHT = 500;
-exports.TEXT_STYLE = {
-    textAlign: 'center',
-    fill: exports.INSIGHT_COLOR_PLATTE.font,
-    fontFamily: 'Moderat',
-    opacity: 0.85,
-};
-exports.ChartTypeMap = {
-    category_outlier: 'column_chart',
-    trend: 'line_chart',
-    change_point: 'line_chart',
-    time_series_outlier: 'line_chart',
-    majority: 'pie_chart',
-    low_variance: 'column_chart',
-    correlation: 'scatter_plot',
-};
-exports.PIE_RADIUS_STYLE = {
+exports.PIE_RADIUS = void 0;
+/** pie radii as fractions of the available radius */
+exports.PIE_RADIUS = {
     innerRadius: 0.25,
     outerRadius: 0.8,
 };

package/lib/insight/chart/generator/index.d.ts

@@ -1,2 +1 @@
-export * from './homogeneous';
 export * from './insights';

package/lib/insight/chart/generator/index.js

@@ -1,5 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./homogeneous"), exports);
 tslib_1.__exportStar(require("./insights"), exports);

package/lib/insight/chart/generator/insights.d.ts

@@ -1,3 +1,3 @@
-import { G2Spec } from '@antv/g2';
 import { InsightInfo, PatternInfo } from '../../types';
-export declare function generateInsightChartSpec(insight: InsightInfo<PatternInfo>): G2Spec;
+import { InsightChartSpec } from '../types';
+export declare function generateInsightChartSpec(insight: InsightInfo<PatternInfo>): InsightChartSpec;

package/lib/insight/chart/generator/insights.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateInsightChartSpec = void 0;
 var strategy_1 = require("../strategy");
 function generateInsightChartSpec(insight) {
-    var _a;
+    var _a, _b;
     var insightType = insight.patterns[0].type;
     var insightType2Strategy = {
         trend: strategy_1.trendStrategy,
@@ -14,7 +14,7 @@ function generateInsightChartSpec(insight) {
         majority: strategy_1.majorityStrategy,
         correlation: strategy_1.correlationStrategy,
     };
-    var marks = (_a = insightType2Strategy[insightType]) === null || _a === void 0 ? void 0 : _a.call(insightType2Strategy, insight);
+    var marks = (_b = (_a = insightType2Strategy[insightType]) === null || _a === void 0 ? void 0 : _a.call(insightType2Strategy, insight)) !== null && _b !== void 0 ? _b : [];
     return (0, strategy_1.viewSpecStrategy)(marks, insight);
 }
 exports.generateInsightChartSpec = generateInsightChartSpec;

package/lib/insight/chart/index.d.ts

@@ -1,4 +1,3 @@
-export * from './generator/homogeneous';
 export * from './generator/insights';
 export * from './strategy/augmentedMarks';
 export * from './types';

package/lib/insight/chart/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./generator/homogeneous"), exports);
 tslib_1.__exportStar(require("./generator/insights"), exports);
 tslib_1.__exportStar(require("./strategy/augmentedMarks"), exports);
 tslib_1.__exportStar(require("./types"), exports);

package/lib/insight/chart/strategy/augmentedMarks/categoryOutlier.d.ts

@@ -1,5 +1,4 @@
-import { Mark } from '@antv/g2';
 import { InsightInfo, CategoryOutlierInfo } from '../../../types';
-import { CategoryOutlierMark } from '../../types';
+import { CategoryOutlierMark, InsightChartMark } from '../../types';
 export declare const categoryOutlierAugmentedMarksStrategy: (insight: InsightInfo<CategoryOutlierInfo>) => CategoryOutlierMark[];
-export declare const categoryOutlierStrategy: (insight: InsightInfo<CategoryOutlierInfo>) => Mark[];
+export declare const categoryOutlierStrategy: (insight: InsightInfo<CategoryOutlierInfo>) => InsightChartMark[];

package/lib/insight/chart/strategy/augmentedMarks/categoryOutlier.js

@@ -10,20 +10,14 @@ var categoryOutlierAugmentedMarksStrategy = function (insight) {
     var patterns = insight.patterns;
     if (!(0, lodash_1.size)(patterns))
         return [];
-    var categoryOutlierMarks = [];
-    patterns.forEach(function (pattern) {
-        var rectMark = (0, commonMarks_1.intervalMarkStrategy)([pattern]);
-        categoryOutlierMarks.push({
-            categoryOutlier: [rectMark],
-        });
-    });
-    return categoryOutlierMarks;
+    return patterns.map(function (pattern) { return ({
+        categoryOutlier: [(0, commonMarks_1.barMarkStrategy)([pattern], { role: 'outlier', name: 'outlier' })],
+    }); });
 };
 exports.categoryOutlierAugmentedMarksStrategy = categoryOutlierAugmentedMarksStrategy;
 var categoryOutlierStrategy = function (insight) {
     var chart = (0, chart_1.insight2ChartStrategy)(insight);
-    var categoryOutlierMarks = (0, exports.categoryOutlierAugmentedMarksStrategy)(insight);
-    var marks = (0, utils_1.augmentedMarks2Marks)(categoryOutlierMarks);
+    var marks = (0, utils_1.augmentedMarks2Marks)((0, exports.categoryOutlierAugmentedMarksStrategy)(insight));
     return tslib_1.__spreadArray([chart], tslib_1.__read(marks), false);
 };
 exports.categoryOutlierStrategy = categoryOutlierStrategy;

package/lib/insight/chart/strategy/augmentedMarks/changePoint.d.ts

@@ -1,5 +1,4 @@
-import { Mark } from '@antv/g2';
 import { ChangePointInfo, InsightInfo } from '../../../types';
-import { ChangePointMark } from '../../types';
+import { ChangePointMark, InsightChartMark } from '../../types';
 export declare const changePointAugmentedMarksStrategy: (insight: InsightInfo<ChangePointInfo>) => ChangePointMark[];
-export declare const changePointStrategy: (insight: InsightInfo<ChangePointInfo>) => Mark[];
+export declare const changePointStrategy: (insight: InsightInfo<ChangePointInfo>) => InsightChartMark[];

package/lib/insight/chart/strategy/augmentedMarks/changePoint.js

@@ -3,45 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.changePointStrategy = exports.changePointAugmentedMarksStrategy = void 0;
 var tslib_1 = require("tslib");
 var lodash_1 = require("lodash");
-var constants_1 = require("../../constants");
 var utils_1 = require("../../../../utils");
-var pointMark_1 = require("../commonMarks/pointMark");
-var textMark_1 = require("../commonMarks/textMark");
+var commonMarks_1 = require("../commonMarks");
 var chart_1 = require("../chart");
 var utils_2 = require("../../utils");
 var changePointAugmentedMarksStrategy = function (insight) {
     var patterns = insight.patterns;
-    var color = constants_1.INSIGHT_COLOR_PLATTE.highlight;
     if (!(0, lodash_1.size)(patterns))
         return [];
     var measure = patterns[0].measure;
-    var changePointMarks = [];
-    patterns.forEach(function (pattern) {
-        var pointMark = (0, pointMark_1.pointMarkStrategy)([pattern], { style: { fill: color } });
-        var textMark = (0, textMark_1.textMarkStrategy)([pattern], {
-            formatter: utils_1.dataFormat,
-            label: function (pt) { return "".concat(pt.x, ", ").concat(measure, ": ").concat(pt.y); },
-            style: {
-                dy: -20,
-                background: true,
-                backgroundRadius: 2,
-                connector: true,
-                startMarker: true,
-                startMarkerFill: '#1c1e2d',
-                startMarkerFillOpacity: 0.65,
-            },
-        });
-        changePointMarks.push({
-            changePoint: [pointMark, textMark],
-        });
-    });
-    return changePointMarks;
+    return patterns.map(function (pattern) { return ({
+        changePoint: [
+            (0, commonMarks_1.pointMarkStrategy)([pattern], {
+                role: 'highlight',
+                name: 'change point',
+                label: function (pt) { return "".concat(pt.x, ", ").concat(measure, ": ").concat((0, utils_1.dataFormat)(pt.y)); },
+            }),
+        ],
+    }); });
 };
 exports.changePointAugmentedMarksStrategy = changePointAugmentedMarksStrategy;
 var changePointStrategy = function (insight) {
     var chart = (0, chart_1.insight2ChartStrategy)(insight);
-    var changePointMarks = (0, exports.changePointAugmentedMarksStrategy)(insight);
-    var marks = (0, utils_2.augmentedMarks2Marks)(changePointMarks);
+    var marks = (0, utils_2.augmentedMarks2Marks)((0, exports.changePointAugmentedMarksStrategy)(insight));
     return tslib_1.__spreadArray([chart], tslib_1.__read(marks), false);
 };
 exports.changePointStrategy = changePointStrategy;

package/lib/insight/chart/strategy/augmentedMarks/correlation.d.ts

@@ -1,3 +1,3 @@
-import { Mark } from '@antv/g2';
 import { CorrelationInfo, InsightInfo } from '../../../types';
-export declare const correlationStrategy: (insight: InsightInfo<CorrelationInfo>) => Mark[];
+import { InsightChartMark } from '../../types';
+export declare const correlationStrategy: (insight: InsightInfo<CorrelationInfo>) => InsightChartMark[];

package/lib/insight/chart/strategy/augmentedMarks/correlation.js

@@ -4,7 +4,6 @@ exports.correlationStrategy = void 0;
 var chart_1 = require("../chart");
 var correlationStrategy = function (insight) {
     // todo add correlation regression line and value
-    var chartMark = (0, chart_1.insight2ChartStrategy)(insight);
-    return [chartMark];
+    return [(0, chart_1.insight2ChartStrategy)(insight)];
 };
 exports.correlationStrategy = correlationStrategy;

package/lib/insight/chart/strategy/augmentedMarks/index.d.ts

@@ -4,5 +4,4 @@ export { categoryOutlierStrategy, categoryOutlierAugmentedMarksStrategy } from '
 export { changePointStrategy, changePointAugmentedMarksStrategy } from './changePoint';
 export { majorityStrategy } from './majority';
 export { correlationStrategy } from './correlation';
-export { homogeneousStrategy } from './homogeneous';
 export { timeSeriesOutlierStrategy, timeSeriesOutlierStrategyAugmentedMarksStrategy } from './timeSeriesOutlier';

package/lib/insight/chart/strategy/augmentedMarks/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timeSeriesOutlierStrategyAugmentedMarksStrategy = exports.timeSeriesOutlierStrategy = exports.homogeneousStrategy = exports.correlationStrategy = exports.majorityStrategy = exports.changePointAugmentedMarksStrategy = exports.changePointStrategy = exports.categoryOutlierAugmentedMarksStrategy = exports.categoryOutlierStrategy = exports.lowVarianceAugmentedMarkStrategy = exports.lowVarianceStrategy = exports.trendAugmentedMarksStrategy = exports.trendStrategy = void 0;
+exports.timeSeriesOutlierStrategyAugmentedMarksStrategy = exports.timeSeriesOutlierStrategy = exports.correlationStrategy = exports.majorityStrategy = exports.changePointAugmentedMarksStrategy = exports.changePointStrategy = exports.categoryOutlierAugmentedMarksStrategy = exports.categoryOutlierStrategy = exports.lowVarianceAugmentedMarkStrategy = exports.lowVarianceStrategy = exports.trendAugmentedMarksStrategy = exports.trendStrategy = void 0;
 var trend_1 = require("./trend");
 Object.defineProperty(exports, "trendStrategy", { enumerable: true, get: function () { return trend_1.trendStrategy; } });
 Object.defineProperty(exports, "trendAugmentedMarksStrategy", { enumerable: true, get: function () { return trend_1.trendAugmentedMarksStrategy; } });
@@ -17,8 +17,6 @@ var majority_1 = require("./majority");
 Object.defineProperty(exports, "majorityStrategy", { enumerable: true, get: function () { return majority_1.majorityStrategy; } });
 var correlation_1 = require("./correlation");
 Object.defineProperty(exports, "correlationStrategy", { enumerable: true, get: function () { return correlation_1.correlationStrategy; } });
-var homogeneous_1 = require("./homogeneous");
-Object.defineProperty(exports, "homogeneousStrategy", { enumerable: true, get: function () { return homogeneous_1.homogeneousStrategy; } });
 var timeSeriesOutlier_1 = require("./timeSeriesOutlier");
 Object.defineProperty(exports, "timeSeriesOutlierStrategy", { enumerable: true, get: function () { return timeSeriesOutlier_1.timeSeriesOutlierStrategy; } });
 Object.defineProperty(exports, "timeSeriesOutlierStrategyAugmentedMarksStrategy", { enumerable: true, get: function () { return timeSeriesOutlier_1.timeSeriesOutlierStrategyAugmentedMarksStrategy; } });

package/lib/insight/chart/strategy/augmentedMarks/lowVariance.d.ts

@@ -1,5 +1,4 @@
-import { Mark } from '@antv/g2';
 import { LowVarianceInfo, InsightInfo } from '../../../types';
-import { LowVarianceMark } from '../../types';
+import { InsightChartMark, LowVarianceMark } from '../../types';
 export declare const lowVarianceAugmentedMarkStrategy: (insight: InsightInfo<LowVarianceInfo>) => LowVarianceMark[];
-export declare const lowVarianceStrategy: (insight: InsightInfo<LowVarianceInfo>) => Mark[];
+export declare const lowVarianceStrategy: (insight: InsightInfo<LowVarianceInfo>) => InsightChartMark[];

package/lib/insight/chart/strategy/augmentedMarks/lowVariance.js

@@ -7,22 +7,17 @@ var chart_1 = require("../chart");
 var utils_1 = require("../../utils");
 var utils_2 = require("../../../../utils");
 var lowVarianceAugmentedMarkStrategy = function (insight) {
-    var patterns = insight.patterns;
-    var marks = [];
-    patterns.forEach(function (pattern) {
-        var mean = pattern.mean;
-        var meanLineMark = (0, commonMarks_1.lineMarkStrategy)({ y: mean }, { label: "mean: ".concat((0, utils_2.dataFormat)(mean)) });
-        marks.push({
-            meanLine: [meanLineMark],
+    return insight.patterns.map(function (_a) {
+        var mean = _a.mean;
+        return ({
+            meanLine: [(0, commonMarks_1.ruleYMarkStrategy)(mean, { role: 'mean', name: 'mean', label: "mean: ".concat((0, utils_2.dataFormat)(mean)) })],
         });
     });
-    return marks;
 };
 exports.lowVarianceAugmentedMarkStrategy = lowVarianceAugmentedMarkStrategy;
 var lowVarianceStrategy = function (insight) {
     var chartMark = (0, chart_1.insight2ChartStrategy)(insight);
-    var lowVarianceMarks = (0, exports.lowVarianceAugmentedMarkStrategy)(insight);
-    var marks = (0, utils_1.augmentedMarks2Marks)(lowVarianceMarks);
+    var marks = (0, utils_1.augmentedMarks2Marks)((0, exports.lowVarianceAugmentedMarkStrategy)(insight));
     return tslib_1.__spreadArray([chartMark], tslib_1.__read(marks), false);
 };
 exports.lowVarianceStrategy = lowVarianceStrategy;

package/lib/insight/chart/strategy/augmentedMarks/majority.d.ts

@@ -1,3 +1,3 @@
-import { Mark } from '@antv/g2';
 import { MajorityInfo, InsightInfo } from '../../../types';
-export declare const majorityStrategy: (insight: InsightInfo<MajorityInfo>) => Mark[];
+import { InsightChartMark } from '../../types';
+export declare const majorityStrategy: (insight: InsightInfo<MajorityInfo>) => InsightChartMark[];

package/lib/insight/chart/strategy/augmentedMarks/majority.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.majorityStrategy = void 0;
 var chart_1 = require("../chart");
 var majorityStrategy = function (insight) {
-    var chartMark = (0, chart_1.insight2ChartStrategy)(insight);
-    return [chartMark];
+    return [(0, chart_1.insight2ChartStrategy)(insight)];
 };
 exports.majorityStrategy = majorityStrategy;

package/lib/insight/chart/strategy/augmentedMarks/timeSeriesOutlier.d.ts

@@ -1,5 +1,4 @@
-import { Mark } from '@antv/g2';
 import { TimeSeriesOutlierInfo, InsightInfo } from '../../../types';
-import { TimeSeriesOutlierMark } from '../../types';
+import { InsightChartMark, TimeSeriesOutlierMark } from '../../types';
 export declare const timeSeriesOutlierStrategyAugmentedMarksStrategy: (insight: InsightInfo<TimeSeriesOutlierInfo>) => TimeSeriesOutlierMark[];
-export declare const timeSeriesOutlierStrategy: (insight: InsightInfo<TimeSeriesOutlierInfo>) => Mark[];
+export declare const timeSeriesOutlierStrategy: (insight: InsightInfo<TimeSeriesOutlierInfo>) => InsightChartMark[];

package/lib/insight/chart/strategy/augmentedMarks/timeSeriesOutlier.js

@@ -4,84 +4,27 @@ exports.timeSeriesOutlierStrategy = exports.timeSeriesOutlierStrategyAugmentedMa
 var tslib_1 = require("tslib");
 var chart_1 = require("../chart");
 var commonMarks_1 = require("../commonMarks");
-var BASELINE = 'baseline';
-var INTERVAL = 'interval';
-var OUTLIER = 'outlier';
 var timeSeriesOutlierStrategyAugmentedMarksStrategy = function (insight) {
     var chartData = insight.data, _a = tslib_1.__read(insight.dimensions, 1), dimensionName = _a[0].fieldName, patterns = insight.patterns;
     var _b = patterns[0], baselines = _b.baselines, thresholds = _b.thresholds;
-    var data = chartData.map(function (datum, index) {
-        var baseline = baselines[index];
-        var interval = [baseline - Math.abs(thresholds[0]), baseline + thresholds[1]];
-        return {
-            baseline: {
-                x: datum[dimensionName],
-                y: baseline,
-            },
-            interval: {
-                x: datum[dimensionName],
-                y: interval,
-            },
-        };
-    });
-    var intervalData = data.map(function (datum) { return datum[INTERVAL]; });
-    var intervalMark = (0, commonMarks_1.areaMarkStrategy)(intervalData, {
-        encode: {
-            shape: 'smooth',
-        },
-        style: {
-            fillOpacity: 0.3,
-            fill: '#ffd8b8',
-        },
-        tooltip: {
-            title: '',
-            items: [
-                function (_d, i, _data, column) { return ({
-                    name: INTERVAL,
-                    value: "".concat(column.y.value[i], "-").concat(column.y1.value[i]),
-                    color: '#ffd8b8',
-                }); },
-            ],
-        },
-    });
-    var baselineData = data.map(function (datum) { return datum[BASELINE]; });
-    var baselineMark = (0, commonMarks_1.lineMarkStrategy)({ points: baselineData }, {
-        encode: {
-            shape: 'smooth',
-        },
-        style: {
-            lineWidth: 1,
-            stroke: '#ffa45c',
-            lineDash: undefined,
-        },
-        tooltip: {
-            title: '',
-            items: [{ name: BASELINE, channel: 'y' }],
-        },
-    });
-    var outlierMark = (0, commonMarks_1.pointMarkStrategy)(patterns, {
-        style: {
-            fill: '#f4664a',
-            stroke: '#f4664a',
-        },
-        tooltip: {
-            title: '',
-            items: [{ name: OUTLIER, channel: 'y' }],
-        },
-    });
+    var intervalData = chartData.map(function (datum, index) { return ({
+        x: datum[dimensionName],
+        y0: baselines[index] - Math.abs(thresholds[0]),
+        y1: baselines[index] + thresholds[1],
+    }); });
+    var baselineData = chartData.map(function (datum, index) { return ({ x: datum[dimensionName], y: baselines[index] }); });
     return [
         {
-            trendLine: [baselineMark],
-            anomalyArea: [intervalMark],
-            outliers: [outlierMark],
+            trendLine: [(0, commonMarks_1.lineMarkStrategy)(baselineData, { role: 'baseline', name: 'baseline', smooth: true })],
+            anomalyArea: [(0, commonMarks_1.areaMarkStrategy)(intervalData, { role: 'band', name: 'interval', smooth: true })],
+            outliers: [(0, commonMarks_1.pointMarkStrategy)(patterns, { role: 'outlier', name: 'outlier' })],
         },
     ];
 };
 exports.timeSeriesOutlierStrategyAugmentedMarksStrategy = timeSeriesOutlierStrategyAugmentedMarksStrategy;
 var timeSeriesOutlierStrategy = function (insight) {
-    // Should to support marks free combination
     var chartMark = (0, chart_1.insight2ChartStrategy)(insight);
-    var _a = (0, exports.timeSeriesOutlierStrategyAugmentedMarksStrategy)(insight)[0] || {}, _b = _a.trendLine, trendLine = _b === void 0 ? [] : _b, _c = _a.anomalyArea, anomalyArea = _c === void 0 ? [] : _c, _e = _a.outliers, outliers = _e === void 0 ? [] : _e;
+    var _a = (0, exports.timeSeriesOutlierStrategyAugmentedMarksStrategy)(insight)[0] || {}, _b = _a.trendLine, trendLine = _b === void 0 ? [] : _b, _c = _a.anomalyArea, anomalyArea = _c === void 0 ? [] : _c, _d = _a.outliers, outliers = _d === void 0 ? [] : _d;
     return tslib_1.__spreadArray(tslib_1.__spreadArray(tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(anomalyArea), false), tslib_1.__read(trendLine), false), [chartMark], false), tslib_1.__read(outliers), false);
 };
 exports.timeSeriesOutlierStrategy = timeSeriesOutlierStrategy;

package/lib/insight/chart/strategy/augmentedMarks/trend.d.ts

@@ -1,5 +1,4 @@
-import { Mark } from '@antv/g2';
 import { InsightInfo, TrendInfo } from '../../../types';
-import { TrendMark } from '../../types';
+import { InsightChartMark, TrendMark } from '../../types';
 export declare const trendAugmentedMarksStrategy: (insight: InsightInfo<TrendInfo>) => TrendMark[];
-export declare const trendStrategy: (insight: InsightInfo<TrendInfo>) => Mark[];
+export declare const trendStrategy: (insight: InsightInfo<TrendInfo>) => InsightChartMark[];

package/lib/insight/chart/strategy/augmentedMarks/trend.js

@@ -7,17 +7,17 @@ var chart_1 = require("../chart");
 var utils_1 = require("../../../../utils");
 var trendAugmentedMarksStrategy = function (insight) {
     var chartData = insight.data, _a = tslib_1.__read(insight.dimensions, 1), dimensionName = _a[0].fieldName, patterns = insight.patterns;
-    var points = chartData.map(function (datum, index) {
-        var points = patterns[0].regression.points;
-        var point = points[index];
-        return [datum[dimensionName], point];
-    });
-    var _b = tslib_1.__read(patterns[0].regression.equation, 2), m = _b[0], c = _b[1];
-    var lineData = points.map(function (point) { return ({ x: point[0], y: point[1] }); });
-    var regressionLineMark = (0, commonMarks_1.lineMarkStrategy)({ points: lineData }, { label: "y=".concat((0, utils_1.dataFormat)(m), "x").concat(c < 0 ? '' : '+').concat((0, utils_1.dataFormat)(c)) });
+    var _b = patterns[0].regression, points = _b.points, _c = tslib_1.__read(_b.equation, 2), m = _c[0], c = _c[1];
+    var lineData = chartData.map(function (datum, index) { return ({ x: datum[dimensionName], y: points[index] }); });
     return [
         {
-            trendLine: [regressionLineMark],
+            trendLine: [
+                (0, commonMarks_1.lineMarkStrategy)(lineData, {
+                    role: 'trend',
+                    name: 'trend',
+                    label: "y=".concat((0, utils_1.dataFormat)(m), "x").concat(c < 0 ? '' : '+').concat((0, utils_1.dataFormat)(c)),
+                }),
+            ],
         },
     ];
 };

package/lib/insight/chart/strategy/chart.d.ts

@@ -1,7 +1,10 @@
-import { Mark } from '@antv/g2';
 import { InsightInfo, InsightType } from '../../types';
-export declare const insight2ChartStrategy: (insight: Omit<InsightInfo<import("../../types").PatternInfo>, "patterns" | "visualizationSpecs"> & {
+import { InsightChartMark } from '../types';
+type ChartInsight = Omit<InsightInfo, 'visualizationSpecs' | 'patterns'> & {
     patterns: {
         type: InsightType;
     }[];
-}) => Mark;
+};
+/** the mark that draws the insight data itself */
+export declare const insight2ChartStrategy: (insight: ChartInsight) => InsightChartMark;
+export {};

package/lib/insight/chart/strategy/chart.js

@@ -3,46 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.insight2ChartStrategy = void 0;
 var tslib_1 = require("tslib");
 var constants_1 = require("../constants");
+/** the mark that draws the insight data itself */
 var insight2ChartStrategy = function (insight) {
-    var _a, _b;
+    var _a, _b, _c;
     var data = insight.data, patterns = insight.patterns, dimensions = insight.dimensions, measures = insight.measures;
     var insightType = patterns[0].type;
-    var commonSpec = {
-        data: data,
-        encode: {
-            x: dimensions[0].fieldName,
-            y: measures[0].fieldName,
-        },
-    };
+    var dimension = (_a = dimensions[0]) === null || _a === void 0 ? void 0 : _a.fieldName;
+    var measure = (_b = measures[0]) === null || _b === void 0 ? void 0 : _b.fieldName;
+    var points = function () { return data.map(function (datum) { return ({ x: datum[dimension], y: Number(datum[measure]) }); }); };
     // pie
     if (insightType === 'majority') {
-        return tslib_1.__assign(tslib_1.__assign({}, commonSpec), { type: 'interval', encode: {
-                color: dimensions[0].fieldName,
-                y: measures[0].fieldName,
-            }, transform: [{ type: 'stackY' }], coordinate: {
-                type: 'theta',
-                innerRadius: constants_1.PIE_RADIUS_STYLE.innerRadius,
-                outerRadius: constants_1.PIE_RADIUS_STYLE.outerRadius,
-            }, tooltip: {
-                items: [{ field: dimensions[0].fieldName }, { field: measures[0].fieldName }],
-            } });
+        return tslib_1.__assign({ type: 'arc', role: 'primary', name: measure, data: data.map(function (datum) { return ({ name: String(datum[dimension]), value: Number(datum[measure]) }); }) }, constants_1.PIE_RADIUS);
     }
     // line
     if (insightType === 'trend' || insightType === 'time_series_outlier' || insightType === 'change_point') {
-        return tslib_1.__assign(tslib_1.__assign({}, commonSpec), { type: 'line', style: {
-                lineWidth: 2,
-            } });
+        return { type: 'line', role: 'primary', name: measure, data: points() };
     }
     // bar
     if (insightType === 'category_outlier' || insightType === 'low_variance') {
-        return tslib_1.__assign(tslib_1.__assign({}, commonSpec), { type: 'interval' });
+        return { type: 'bar', role: 'primary', name: measure, data: points() };
     }
     // scatter
     if (insightType === 'correlation') {
-        return tslib_1.__assign(tslib_1.__assign({}, commonSpec), { type: 'point', encode: {
-                x: (_a = measures[0]) === null || _a === void 0 ? void 0 : _a.fieldName,
-                y: (_b = measures[1]) === null || _b === void 0 ? void 0 : _b.fieldName,
-            } });
+        var yMeasure_1 = (_c = measures[1]) === null || _c === void 0 ? void 0 : _c.fieldName;
+        return {
+            type: 'point',
+            role: 'primary',
+            name: "".concat(measure, " / ").concat(yMeasure_1),
+            data: data.map(function (datum) { return ({ x: Number(datum[measure]), y: Number(datum[yMeasure_1]) }); }),
+        };
     }
     return null;
 };

package/lib/insight/chart/strategy/commonMarks/areaMark.d.ts

@@ -1,3 +1,2 @@
-import { AreaMark } from '@antv/g2';
-import { AreaMarkData, AreaMarkConfig } from '../../types';
-export declare const areaMarkStrategy: (data: AreaMarkData, { encode, style, tooltip }: AreaMarkConfig) => AreaMark;
+import type { InsightAreaMark } from '../../types';
+export declare const areaMarkStrategy: (data: InsightAreaMark['data'], config: Omit<InsightAreaMark, 'type' | 'data'>) => InsightAreaMark;

package/lib/insight/chart/strategy/commonMarks/areaMark.js

@@ -2,15 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.areaMarkStrategy = void 0;
 var tslib_1 = require("tslib");
-var areaMarkStrategy = function (data, _a) {
-    var encode = _a.encode, style = _a.style, tooltip = _a.tooltip;
-    var common = {
-        style: style,
-        tooltip: tooltip,
-    };
-    if (data) {
-        return tslib_1.__assign(tslib_1.__assign({}, common), { type: 'area', data: data, encode: tslib_1.__assign({ x: 'x', y: 'y' }, encode) });
-    }
-    return null;
-};
+var areaMarkStrategy = function (data, config) { return (tslib_1.__assign({ type: 'area', data: data }, config)); };
 exports.areaMarkStrategy = areaMarkStrategy;

package/lib/insight/chart/strategy/commonMarks/barMark.d.ts

@@ -0,0 +1,4 @@
+import type { PointPatternInfo } from '../../../types';
+import type { InsightBarMark } from '../../types';
+/** get mark for point patterns, the patterns should have same dimension and measure */
+export declare const barMarkStrategy: (patterns: PointPatternInfo[], config: Omit<InsightBarMark, 'type' | 'data'>) => InsightBarMark;

package/lib/insight/chart/strategy/commonMarks/barMark.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.barMarkStrategy = void 0;
+var tslib_1 = require("tslib");
+/** get mark for point patterns, the patterns should have same dimension and measure */
+var barMarkStrategy = function (patterns, config) { return (tslib_1.__assign({ type: 'bar', data: patterns.map(function (_a) {
+        var x = _a.x, y = _a.y;
+        return ({ x: x, y: y });
+    }) }, config)); };
+exports.barMarkStrategy = barMarkStrategy;

package/lib/insight/chart/strategy/commonMarks/index.d.ts

@@ -1,5 +1,5 @@
 export { lineMarkStrategy } from './lineMark';
 export { pointMarkStrategy } from './pointMark';
-export { textMarkStrategy } from './textMark';
 export { areaMarkStrategy } from './areaMark';
-export { intervalMarkStrategy } from './intervalMark';
+export { barMarkStrategy } from './barMark';
+export { ruleYMarkStrategy } from './ruleMark';

package/lib/insight/chart/strategy/commonMarks/index.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.intervalMarkStrategy = exports.areaMarkStrategy = exports.textMarkStrategy = exports.pointMarkStrategy = exports.lineMarkStrategy = void 0;
+exports.ruleYMarkStrategy = exports.barMarkStrategy = exports.areaMarkStrategy = exports.pointMarkStrategy = exports.lineMarkStrategy = void 0;
 var lineMark_1 = require("./lineMark");
 Object.defineProperty(exports, "lineMarkStrategy", { enumerable: true, get: function () { return lineMark_1.lineMarkStrategy; } });
 var pointMark_1 = require("./pointMark");
 Object.defineProperty(exports, "pointMarkStrategy", { enumerable: true, get: function () { return pointMark_1.pointMarkStrategy; } });
-var textMark_1 = require("./textMark");
-Object.defineProperty(exports, "textMarkStrategy", { enumerable: true, get: function () { return textMark_1.textMarkStrategy; } });
 var areaMark_1 = require("./areaMark");
 Object.defineProperty(exports, "areaMarkStrategy", { enumerable: true, get: function () { return areaMark_1.areaMarkStrategy; } });
-var intervalMark_1 = require("./intervalMark");
-Object.defineProperty(exports, "intervalMarkStrategy", { enumerable: true, get: function () { return intervalMark_1.intervalMarkStrategy; } });
+var barMark_1 = require("./barMark");
+Object.defineProperty(exports, "barMarkStrategy", { enumerable: true, get: function () { return barMark_1.barMarkStrategy; } });
+var ruleMark_1 = require("./ruleMark");
+Object.defineProperty(exports, "ruleYMarkStrategy", { enumerable: true, get: function () { return ruleMark_1.ruleYMarkStrategy; } });

package/lib/insight/chart/strategy/commonMarks/lineMark.d.ts

@@ -1,3 +1,2 @@
-import { LineMark } from '@antv/g2';
-import { LineMarkConfig, LineMarkData } from '../../types';
-export declare const lineMarkStrategy: ({ points, x, y }: LineMarkData, { encode, style, label, tooltip }: LineMarkConfig) => LineMark;
+import type { InsightChartPoint, InsightLineMark } from '../../types';
+export declare const lineMarkStrategy: (data: InsightChartPoint[], config: Omit<InsightLineMark, 'type' | 'data'>) => InsightLineMark;