@visactor/vchart 1.7.5 → 1.8.0-beta.0

package/cjs/chart/base/base-chart-transformer.js

@@ -0,0 +1,134 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.BaseChartSpecTransformer = void 0;
+
+const vutils_1 = require("@visactor/vutils"), core_1 = require("../../core"), interface_1 = require("../../component/interface"), vutils_extension_1 = require("@visactor/vutils-extension");
+
+class BaseChartSpecTransformer {
+    constructor(option) {
+        this._option = option, this.type = option.type, this.seriesType = option.seriesType;
+    }
+    initChartSpec(chartSpec) {
+        return this.transformSpec(chartSpec), this.transformModelSpec(chartSpec);
+    }
+    transformSpec(chartSpec) {
+        chartSpec.region && 0 !== chartSpec.region.length || (chartSpec.region = [ {} ]), 
+        (0, vutils_1.has)(chartSpec, "tooltip") || (chartSpec.tooltip = {}), (0, vutils_1.isValid)(chartSpec.stackInverse) && chartSpec.region.forEach((r => !(0, 
+        vutils_1.isValid)(r.stackInverse) && (r.stackInverse = chartSpec.stackInverse)));
+    }
+    transformModelSpec(chartSpec) {
+        return this.createSpecInfo(chartSpec, ((constructor, specInfo, chartSpecInfo) => {
+            const {spec: spec, specPath: specPath, type: type} = specInfo, transformResult = new constructor.transformerConstructor({
+                type: type,
+                getTheme: this._option.getTheme
+            }).transformSpec(spec, chartSpec, chartSpecInfo);
+            (0, vutils_extension_1.setProperty)(chartSpec, specPath, transformResult.spec), 
+            (0, vutils_extension_1.setProperty)(chartSpecInfo, null != specPath ? specPath : [ type ], Object.assign(Object.assign({}, specInfo), transformResult));
+        }));
+    }
+    createSpecInfo(chartSpec, transform) {
+        var _a;
+        transform || (transform = (constructor, specInfo, chartSpecInfo) => (0, vutils_extension_1.setProperty)(chartSpecInfo, specInfo.specPath, specInfo));
+        const currentChartSpecInfo = {};
+        let region;
+        return this.forEachRegionInSpec(chartSpec, transform, currentChartSpecInfo), this.forEachSeriesInSpec(chartSpec, transform, currentChartSpecInfo), 
+        null === (_a = currentChartSpecInfo.series) || void 0 === _a || _a.forEach((({spec: {regionId: regionId, regionIndex: regionIndex}}, i) => {
+            var _a, _b, _c;
+            (0, vutils_1.isValid)(regionId) ? region = null === (_a = currentChartSpecInfo.region) || void 0 === _a ? void 0 : _a.find((({spec: spec}) => spec.id === regionId)) : (0, 
+            vutils_1.isValid)(regionIndex) && (region = null === (_b = currentChartSpecInfo.region) || void 0 === _b ? void 0 : _b[regionIndex]), 
+            (region || (region = null === (_c = currentChartSpecInfo.region) || void 0 === _c ? void 0 : _c[0])) && (region.seriesIndexes || (region.seriesIndexes = []), 
+            region.seriesIndexes.push(i));
+        })), this.forEachComponentInSpec(chartSpec, transform, currentChartSpecInfo), currentChartSpecInfo;
+    }
+    _isValidSeries(seriesType) {
+        return !0;
+    }
+    _getDefaultSeriesSpec(chartSpec) {
+        var _a, _b, _c;
+        return {
+            dataKey: chartSpec.dataKey,
+            hover: chartSpec.hover,
+            select: chartSpec.select,
+            label: chartSpec.label,
+            seriesStyle: chartSpec.seriesStyle,
+            animation: chartSpec.animation,
+            animationThreshold: null !== (_a = chartSpec.animationThreshold) && void 0 !== _a ? _a : null === (_c = (_b = this._option).getTheme) || void 0 === _c ? void 0 : _c.call(_b).animationThreshold,
+            animationAppear: chartSpec.animationAppear,
+            animationDisappear: chartSpec.animationDisappear,
+            animationEnter: chartSpec.animationEnter,
+            animationUpdate: chartSpec.animationUpdate,
+            animationExit: chartSpec.animationExit,
+            animationNormal: chartSpec.animationNormal,
+            extensionMark: chartSpec.extensionMark,
+            large: chartSpec.large,
+            largeThreshold: chartSpec.largeThreshold,
+            progressiveStep: chartSpec.progressiveStep,
+            progressiveThreshold: chartSpec.progressiveThreshold,
+            background: chartSpec.seriesBackground,
+            invalidType: chartSpec.invalidType,
+            seriesField: chartSpec.seriesField,
+            morph: chartSpec.morph
+        };
+    }
+    forEachRegionInSpec(chartSpec, callbackfn, chartSpecInfo) {
+        var _a;
+        return (null !== (_a = chartSpec.region) && void 0 !== _a ? _a : []).map(((spec, index) => callbackfn(core_1.Factory.getRegionInType("region"), {
+            spec: spec,
+            specIndex: index,
+            specPath: [ "region", index ],
+            type: "region"
+        }, chartSpecInfo)));
+    }
+    forEachSeriesInSpec(chartSpec, callbackfn, chartSpecInfo) {
+        var _a;
+        return (null !== (_a = chartSpec.series) && void 0 !== _a ? _a : []).map(((spec, index) => callbackfn(core_1.Factory.getSeriesInType(spec.type), {
+            spec: spec,
+            specIndex: index,
+            specPath: [ "series", index ],
+            type: spec.type
+        }, chartSpecInfo)));
+    }
+    forEachComponentInSpec(chartSpec, callbackfn, chartSpecInfo) {
+        var _a, _b, _c, _d;
+        const results = [], components = core_1.Factory.getComponents();
+        let cartesianAxis, polarAxis, geoCoordinate, label, totalLabel;
+        const noAxisComponents = [];
+        for (let index = 0; index < components.length; index++) {
+            const {cmp: cmp, alwaysCheck: alwaysCheck} = components[index];
+            cmp.type.startsWith(interface_1.ComponentTypeEnum.cartesianAxis) ? cartesianAxis = cmp : cmp.type.startsWith(interface_1.ComponentTypeEnum.polarAxis) ? polarAxis = cmp : cmp.type === interface_1.ComponentTypeEnum.geoCoordinate ? geoCoordinate = cmp : (alwaysCheck || chartSpec[null !== (_a = cmp.specKey) && void 0 !== _a ? _a : cmp.type]) && (cmp.type === interface_1.ComponentTypeEnum.label ? label = cmp : cmp.type === interface_1.ComponentTypeEnum.totalLabel && (totalLabel = cmp), 
+            noAxisComponents.push(cmp));
+        }
+        let hasInitAxis = !1;
+        if (cartesianAxis) {
+            const infoList = cartesianAxis.getSpecInfo(chartSpec);
+            (null == infoList ? void 0 : infoList.length) > 0 && (hasInitAxis = !0, infoList.forEach((info => {
+                const cmp = core_1.Factory.getComponentInKey(info.type);
+                results.push(callbackfn(cmp, info, chartSpecInfo));
+            })));
+        }
+        if (polarAxis && !hasInitAxis) {
+            const infoList = polarAxis.getSpecInfo(chartSpec);
+            (null == infoList ? void 0 : infoList.length) > 0 && (hasInitAxis = !0, infoList.forEach((info => {
+                const cmp = core_1.Factory.getComponentInKey(info.type);
+                results.push(callbackfn(cmp, info, chartSpecInfo));
+            })));
+        }
+        return geoCoordinate && !hasInitAxis && (null === (_b = geoCoordinate.getSpecInfo(chartSpec)) || void 0 === _b || _b.forEach((info => {
+            results.push(callbackfn(geoCoordinate, info, chartSpecInfo));
+        }))), label && chartSpecInfo && (null === (_c = label.getSpecInfo(chartSpec, chartSpecInfo)) || void 0 === _c || _c.forEach((info => {
+            results.push(callbackfn(label, info, chartSpecInfo));
+        }))), totalLabel && chartSpecInfo && (null === (_d = totalLabel.getSpecInfo(chartSpec, chartSpecInfo)) || void 0 === _d || _d.forEach((info => {
+            results.push(callbackfn(totalLabel, info, chartSpecInfo));
+        }))), noAxisComponents.forEach((C => {
+            var _a;
+            null === (_a = C.getSpecInfo(chartSpec)) || void 0 === _a || _a.forEach((info => {
+                results.push(callbackfn(C, info, chartSpecInfo));
+            }));
+        })), results;
+    }
+}
+
+exports.BaseChartSpecTransformer = BaseChartSpecTransformer;
+//# sourceMappingURL=base-chart-transformer.js.map

package/cjs/chart/base/base-chart-transformer.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/chart/base/base-chart-transformer.ts"],"names":[],"mappings":"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","file":"base-chart-transformer.js","sourcesContent":["import { has, isValid } from '@visactor/vutils';\nimport type { IChartSpec, IRegionSpec, ISeriesSpec } from '../../typings';\nimport type { IChartSpecInfo, IChartSpecTransformer, IChartSpecTransformerOption } from '../interface';\nimport type { IModelConstructor, IModelSpecInfo } from '../../model/interface';\nimport type { IRegionConstructor, IRegionSpecInfo } from '../../region/interface';\nimport { Factory } from '../../core';\nimport type { ISeriesConstructor } from '../../series';\nimport type { IComponentConstructor } from '../../component/interface/common';\nimport { ComponentTypeEnum } from '../../component/interface';\nimport { setProperty } from '@visactor/vutils-extension';\n\nexport class BaseChartSpecTransformer<T extends IChartSpec> implements IChartSpecTransformer {\n  readonly type: string;\n  readonly seriesType: string;\n\n  protected _option: IChartSpecTransformerOption;\n\n  constructor(option: IChartSpecTransformerOption) {\n    this._option = option;\n    this.type = option.type;\n    this.seriesType = option.seriesType;\n  }\n\n  /** 此方法不建议重写 */\n  initChartSpec(chartSpec: T): IChartSpecInfo {\n    this.transformSpec(chartSpec);\n    return this.transformModelSpec(chartSpec);\n  }\n\n  /** 将图表 spec 统一转换为 common chart spec */\n  transformSpec(chartSpec: T): void {\n    if (!chartSpec.region || chartSpec.region.length === 0) {\n      chartSpec.region = [{}];\n    }\n    if (!has(chartSpec, 'tooltip')) {\n      chartSpec.tooltip = {};\n    }\n    if (isValid(chartSpec.stackInverse)) {\n      chartSpec.region.forEach(\n        (r: IRegionSpec) => !isValid(r.stackInverse) && (r.stackInverse = chartSpec.stackInverse)\n      );\n    }\n  }\n\n  /** 转换 model spec，应用主题 */\n  transformModelSpec(chartSpec: T): IChartSpecInfo {\n    const transform = (constructor: IModelConstructor, specInfo: IModelSpecInfo, chartSpecInfo?: IChartSpecInfo) => {\n      const { spec, specPath, type } = specInfo;\n      const transformer = new constructor.transformerConstructor({\n        type,\n        getTheme: this._option.getTheme\n      });\n      const transformResult = transformer.transformSpec(spec, chartSpec, chartSpecInfo);\n      setProperty(chartSpec, specPath, transformResult.spec);\n      setProperty(chartSpecInfo, specPath ?? [type], {\n        ...specInfo,\n        ...transformResult\n      });\n    };\n    return this.createSpecInfo(chartSpec, transform);\n  }\n\n  /** 根据图表 spec 生成 spec info */\n  createSpecInfo(\n    chartSpec: T,\n    transform?: (constructor: IModelConstructor, specInfo: IModelSpecInfo, chartSpecInfo?: IChartSpecInfo) => void\n  ): IChartSpecInfo {\n    if (!transform) {\n      transform = (constructor: IModelConstructor, specInfo: IModelSpecInfo, chartSpecInfo?: IChartSpecInfo) =>\n        setProperty(chartSpecInfo, specInfo.specPath, specInfo);\n    }\n\n    const currentChartSpecInfo: IChartSpecInfo = {};\n\n    // 预处理 region\n    this.forEachRegionInSpec(chartSpec, transform, currentChartSpecInfo);\n    // 预处理 series\n    this.forEachSeriesInSpec(chartSpec, transform, currentChartSpecInfo);\n    // 记录每个 region 包含哪些 series\n    let region: IRegionSpecInfo;\n    currentChartSpecInfo.series?.forEach(({ spec: { regionId, regionIndex } }, i) => {\n      if (isValid(regionId)) {\n        region = currentChartSpecInfo.region?.find(({ spec }) => spec.id === regionId);\n      } else if (isValid(regionIndex)) {\n        region = currentChartSpecInfo.region?.[regionIndex];\n      }\n      if (region || (region = currentChartSpecInfo.region?.[0])) {\n        if (!region.seriesIndexes) {\n          region.seriesIndexes = [];\n        }\n        region.seriesIndexes.push(i);\n      }\n    });\n    // 预处理 component\n    this.forEachComponentInSpec(chartSpec, transform, currentChartSpecInfo);\n    return currentChartSpecInfo;\n  }\n\n  protected _isValidSeries(seriesType: string): boolean {\n    return true;\n  }\n\n  protected _getDefaultSeriesSpec(chartSpec: any) {\n    const series: any = {\n      dataKey: chartSpec.dataKey,\n\n      hover: chartSpec.hover,\n      select: chartSpec.select,\n\n      label: chartSpec.label,\n\n      seriesStyle: chartSpec.seriesStyle,\n\n      animation: chartSpec.animation,\n      animationThreshold: chartSpec.animationThreshold ?? this._option.getTheme?.().animationThreshold,\n      animationAppear: chartSpec.animationAppear,\n      animationDisappear: chartSpec.animationDisappear,\n      animationEnter: chartSpec.animationEnter,\n      animationUpdate: chartSpec.animationUpdate,\n      animationExit: chartSpec.animationExit,\n      animationNormal: chartSpec.animationNormal,\n\n      extensionMark: chartSpec.extensionMark,\n\n      large: chartSpec.large,\n      largeThreshold: chartSpec.largeThreshold,\n      progressiveStep: chartSpec.progressiveStep,\n      progressiveThreshold: chartSpec.progressiveThreshold,\n      background: chartSpec.seriesBackground,\n\n      invalidType: chartSpec.invalidType,\n\n      seriesField: chartSpec.seriesField,\n\n      morph: chartSpec.morph\n    };\n    return series;\n  }\n\n  /** 枚举 spec 中每个有效的 region */\n  forEachRegionInSpec<K>(\n    chartSpec: T,\n    callbackfn: (constructor: IRegionConstructor, specInfo: IModelSpecInfo, chartSpecInfo?: IChartSpecInfo) => K,\n    chartSpecInfo?: IChartSpecInfo\n  ): K[] {\n    const regionSpec = (chartSpec.region as IRegionSpec[]) ?? [];\n    return regionSpec.map((spec, index) =>\n      callbackfn(\n        Factory.getRegionInType('region'),\n        {\n          spec,\n          specIndex: index,\n          specPath: ['region', index],\n          type: 'region'\n        },\n        chartSpecInfo\n      )\n    );\n  }\n\n  /** 枚举 spec 中每个有效的 series */\n  forEachSeriesInSpec<K>(\n    chartSpec: T,\n    callbackfn: (constructor: ISeriesConstructor, specInfo: IModelSpecInfo, chartSpecInfo?: IChartSpecInfo) => K,\n    chartSpecInfo?: IChartSpecInfo\n  ): K[] {\n    const seriesSpec = (chartSpec.series as ISeriesSpec[]) ?? [];\n    return seriesSpec.map((spec, index) =>\n      callbackfn(\n        Factory.getSeriesInType(spec.type),\n        {\n          spec,\n          specIndex: index,\n          specPath: ['series', index],\n          type: spec.type\n        },\n        chartSpecInfo\n      )\n    );\n  }\n\n  /** 枚举 spec 中每个有效的 component */\n  forEachComponentInSpec<K>(\n    chartSpec: T,\n    callbackfn: (constructor: IComponentConstructor, specInfo: IModelSpecInfo, chartSpecInfo?: IChartSpecInfo) => K,\n    chartSpecInfo?: IChartSpecInfo\n  ): K[] {\n    const results: K[] = [];\n    const components = Factory.getComponents();\n\n    // 坐标轴组件只需要调用一次\n    let cartesianAxis: IComponentConstructor;\n    let polarAxis: IComponentConstructor;\n    let geoCoordinate: IComponentConstructor;\n    let label: IComponentConstructor;\n    let totalLabel: IComponentConstructor;\n    const noAxisComponents = [];\n    for (let index = 0; index < components.length; index++) {\n      const { cmp, alwaysCheck } = components[index];\n      if (cmp.type.startsWith(ComponentTypeEnum.cartesianAxis)) {\n        cartesianAxis = cmp;\n      } else if (cmp.type.startsWith(ComponentTypeEnum.polarAxis)) {\n        polarAxis = cmp;\n      } else if (cmp.type === ComponentTypeEnum.geoCoordinate) {\n        geoCoordinate = cmp;\n      } else if (alwaysCheck || chartSpec[cmp.specKey ?? cmp.type]) {\n        if (cmp.type === ComponentTypeEnum.label) {\n          label = cmp;\n        } else if (cmp.type === ComponentTypeEnum.totalLabel) {\n          totalLabel = cmp;\n        }\n        noAxisComponents.push(cmp);\n      }\n    }\n\n    let hasInitAxis = false;\n    // NOTE: 坐标轴组件需要在其他组件之前创建\n    if (cartesianAxis) {\n      const infoList = cartesianAxis.getSpecInfo(chartSpec);\n      if (infoList?.length > 0) {\n        hasInitAxis = true;\n        infoList.forEach(info => {\n          const cmp = Factory.getComponentInKey(info.type);\n          results.push(callbackfn(cmp, info, chartSpecInfo));\n        });\n      }\n    }\n\n    if (polarAxis && !hasInitAxis) {\n      const infoList = polarAxis.getSpecInfo(chartSpec);\n      if (infoList?.length > 0) {\n        hasInitAxis = true;\n        infoList.forEach(info => {\n          const cmp = Factory.getComponentInKey(info.type);\n          results.push(callbackfn(cmp, info, chartSpecInfo));\n        });\n      }\n    }\n\n    if (geoCoordinate && !hasInitAxis) {\n      geoCoordinate.getSpecInfo(chartSpec)?.forEach(info => {\n        results.push(callbackfn(geoCoordinate, info, chartSpecInfo));\n      });\n    }\n\n    if (label && chartSpecInfo) {\n      label.getSpecInfo(chartSpec, chartSpecInfo)?.forEach(info => {\n        results.push(callbackfn(label, info, chartSpecInfo));\n      });\n    }\n    if (totalLabel && chartSpecInfo) {\n      totalLabel.getSpecInfo(chartSpec, chartSpecInfo)?.forEach(info => {\n        results.push(callbackfn(totalLabel, info, chartSpecInfo));\n      });\n    }\n\n    noAxisComponents.forEach(C => {\n      C.getSpecInfo(chartSpec)?.forEach(info => {\n        results.push(callbackfn(C, info, chartSpecInfo));\n      });\n    });\n\n    return results;\n  }\n}\n"]}

package/{esm/chart → cjs/chart/base}/base-chart.d.ts

@@ -1,28 +1,32 @@
-import { ChartData } from './chart-meta/data';
-import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec, IDataValues, ILayoutRect, ILayoutOrientPadding } from '../typings';
-import type { ILayoutItem, LayoutCallBack } from '../layout/interface';
-import type { ILayoutModelState, IModel, IModelOption, IUpdateSpecResult } from '../model/interface';
-import type { IChart, IChartLayoutOption, IChartRenderOption, IChartOption, IChartEvaluateOption, ILayoutParams, DimensionIndexOption } from './interface';
-import type { ISeries } from '../series/interface';
-import type { IRegion } from '../region/interface';
-import type { IComponent } from '../component/interface';
-import { type IMark } from '../mark/interface';
-import type { IEvent } from '../event/interface';
+import type { IRegionConstructor } from '../../region/interface';
+import { ChartData } from '../chart-meta/data';
+import type { Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec, IDataValues, ILayoutRect, ILayoutOrientPadding } from '../../typings';
+import type { ILayoutItem, LayoutCallBack } from '../../layout/interface';
+import type { ILayoutModelState, IModel, IModelOption, IModelSpecInfo, IUpdateSpecResult } from '../../model/interface';
+import type { IChart, IChartLayoutOption, IChartRenderOption, IChartOption, IChartEvaluateOption, ILayoutParams, DimensionIndexOption, IChartSpecTransformerOption, IChartSpecTransformer } from '../interface';
+import type { ISeries, ISeriesConstructor } from '../../series/interface';
+import type { IRegion } from '../../region/interface';
+import type { IComponent, IComponentConstructor } from '../../component/interface';
+import { type IMark } from '../../mark/interface';
+import type { IEvent } from '../../event/interface';
 import type { DataView } from '@visactor/vdataset';
 import type { DataSet } from '@visactor/vdataset/es/data-set';
-import { Stack } from './stack';
+import { Stack } from '../stack';
 import type { IParserOptions } from '@visactor/vdataset/es/parser';
 import type { IBoundsLike } from '@visactor/vutils';
 import type { IRunningConfig as IMorphConfig, IView } from '@visactor/vgrammar-core';
-import { CompilableBase } from '../compile/compilable-base';
-import type { IGlobalScale } from '../scale/interface';
-import type { IRectMark } from '../mark/rect';
-export declare class BaseChart extends CompilableBase implements IChart {
+import { CompilableBase } from '../../compile/compilable-base';
+import type { IGlobalScale } from '../../scale/interface';
+import type { IRectMark } from '../../mark/rect';
+export declare class BaseChart<T extends IChartSpec> extends CompilableBase implements IChart {
     readonly type: string;
+    readonly seriesType: string;
+    readonly transformerConstructor: new (option: IChartSpecTransformerOption) => IChartSpecTransformer;
     readonly id: number;
-    protected _spec: any;
-    getSpec(): any;
-    setSpec(s: any): void;
+    protected _transformer: IChartSpecTransformer;
+    protected _spec: T;
+    getSpec(): T;
+    setSpec(s: T): void;
     getOption(): IChartOption;
     protected _regions: IRegion[];
     protected _series: ISeries[];
@@ -52,20 +56,18 @@ export declare class BaseChart extends CompilableBase implements IChart {
     protected _paddingSpec: ILayoutOrientPadding;
     protected _canvasRect: ILayoutRect;
     protected _backgroundMark: IRectMark;
-    constructor(spec: any, option: IChartOption);
+    constructor(spec: T, option: IChartOption);
     created(): void;
-    transformSpec(spec: any): void;
     init(): void;
     reDataFlow(): void;
-    onResize(width: number, height: number): void;
+    onResize(width: number, height: number, reRender?: boolean): void;
     updateViewBox(viewBox: IBoundsLike, reLayout: boolean): void;
     private _createBackground;
-    private _createRegion;
-    protected _createSeries(seriesSpec: ISeriesSpec[]): void;
+    protected _createRegion(constructor: IRegionConstructor, specInfo: IModelSpecInfo): void;
+    protected _createSeries(constructor: ISeriesConstructor, specInfo: IModelSpecInfo): void;
     getAllSeries: () => ISeries[];
     getSeriesById(id: number): ISeries | undefined;
-    private _createComponent;
-    private _createComponents;
+    protected _createComponent(constructor: IComponentConstructor, specInfo: IModelSpecInfo): void;
     getAllComponents(): IComponent[];
     getAllModels(): IModel[];
     getModelInFilter(filter: string | {
@@ -109,7 +111,7 @@ export declare class BaseChart extends CompilableBase implements IChart {
     updateGlobalScaleDomain(): void;
     updateGlobalScale(result: IUpdateSpecResult): void;
     updateGlobalScaleTheme(): void;
-    updateSpec(spec: any): {
+    updateSpec(spec: T): {
         change: boolean;
         reMake: boolean;
         reRender: boolean;
@@ -122,8 +124,6 @@ export declare class BaseChart extends CompilableBase implements IChart {
     updateComponentSpec(result: IUpdateSpecResult): void;
     updateSeriesSpec(result: IUpdateSpecResult): void;
     getCanvas(): HTMLCanvasElement;
-    protected isValidSeries(seriesType: string): boolean;
-    protected _getDefaultSeriesSpec(spec: any): any;
     private _updateLayoutRect;
     setCurrentTheme(): void;
     clear(): void;
@@ -144,5 +144,5 @@ export declare class BaseChart extends CompilableBase implements IChart {
     protected _disableMarkAnimation(states: string | string[]): void;
     protected _setStateInDatum(stateKey: string, checkReverse: boolean, datum: MaybeArray<Datum> | null, filter?: (series: ISeries, mark: IMark) => boolean, region?: IRegionQuerier): void;
     setDimensionIndex(value: StringOrNumber, opt: DimensionIndexOption): void;
-    getColorScheme(): import("..").IThemeColorScheme;
+    getColorScheme(): import("../..").IThemeColorScheme;
 }

package/cjs/chart/{base-chart.js → base/base-chart.js}

@@ -1,17 +1,27 @@
 "use strict";
 
+var __rest = this && this.__rest || function(s, e) {
+    var t = {};
+    for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
+    if (null != s && "function" == typeof Object.getOwnPropertySymbols) {
+        var i = 0;
+        for (p = Object.getOwnPropertySymbols(s); i < p.length; i++) e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]) && (t[p[i]] = s[p[i]]);
+    }
+    return t;
+};
+
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseChart = void 0;
 
-const data_1 = require("./chart-meta/data"), global_scale_1 = require("../scale/global-scale"), interface_1 = require("../component/interface"), interface_2 = require("../mark/interface"), factory_1 = require("../core/factory"), event_1 = require("../event/event"), util_1 = require("../util"), stack_1 = require("./stack"), base_model_1 = require("../model/base-model"), base_mark_1 = require("../mark/base/base-mark"), base_1 = require("../constant/base"), vutils_1 = require("@visactor/vutils"), util_2 = require("../theme/color-scheme/util"), compilable_base_1 = require("../compile/compilable-base"), interface_3 = require("../compile/mark/interface"), constant_1 = require("../constant"), dimension_1 = require("../event/events/dimension"), util_3 = require("./util"), vscale_1 = require("@visactor/vscale"), initialize_1 = require("../data/initialize");
+const data_1 = require("../chart-meta/data"), global_scale_1 = require("../../scale/global-scale"), interface_1 = require("../../component/interface"), interface_2 = require("../../mark/interface"), factory_1 = require("../../core/factory"), event_1 = require("../../event/event"), util_1 = require("../../util"), stack_1 = require("../stack"), base_model_1 = require("../../model/base-model"), base_mark_1 = require("../../mark/base/base-mark"), base_1 = require("../../constant/base"), vutils_1 = require("@visactor/vutils"), util_2 = require("../../theme/color-scheme/util"), compilable_base_1 = require("../../compile/compilable-base"), interface_3 = require("../../compile/mark/interface"), constant_1 = require("../../constant"), dimension_1 = require("../../event/events/dimension"), util_3 = require("../util"), vscale_1 = require("@visactor/vscale"), initialize_1 = require("../../data/initialize");
 
 class BaseChart extends compilable_base_1.CompilableBase {
     getSpec() {
         return this._spec;
     }
     setSpec(s) {
-        this.transformSpec(s), this._spec = s;
+        this._spec = s;
     }
     getOption() {
         return this._option;
@@ -75,15 +85,10 @@ class BaseChart extends compilable_base_1.CompilableBase {
             if (userId) return this._series.find((r => r.userId === userId));
         }, this.getSeriesInUserIdOrIndex = (user_ids, index) => this.getAllSeries().filter((s => (null == user_ids ? void 0 : user_ids.length) ? s.userId && user_ids.includes(s.userId) : !(null == index ? void 0 : index.length) || index.includes(s.getSpecIndex()))), 
         this.getComponentByIndex = (key, index) => {
-            const components = this._components.filter((c => {
-                var _a;
-                return (null !== (_a = c.specKey) && void 0 !== _a ? _a : c.type) === key;
-            }));
+            const components = this._components.filter((c => (c.specKey || c.type) === key));
             if (components && 0 !== components.length) return components[index];
-        }, this.getComponentsByKey = key => this._components.filter((c => {
-            var _a;
-            return (null !== (_a = c.specKey) && void 0 !== _a ? _a : c.type) === key;
-        })), this.getComponentByUserId = userId => {
+        }, this.getComponentsByKey = key => this._components.filter((c => (c.specKey || c.type) === key)), 
+        this.getComponentByUserId = userId => {
             const component = this._components.find((s => s.userId === userId));
             if (component) return component;
         }, this._paddingSpec = (0, util_1.normalizeLayoutPaddingSpec)(null !== (_a = spec.padding) && void 0 !== _a ? _a : option.getTheme().padding), 
@@ -101,14 +106,14 @@ class BaseChart extends compilable_base_1.CompilableBase {
         }), this._spec = spec;
     }
     created() {
-        this.transformSpec(this._spec), this._chartData.parseData(this._spec.data), this._createGlobalScale(), 
-        this._spec.background && "object" == typeof this._spec.background && this._createBackground(), 
-        this._createLayout(), this._spec.region && this._spec.region.length && this._createRegion(), 
-        this._createSeries(this._spec.series), this._createComponents(this._spec);
-    }
-    transformSpec(spec) {
-        spec.region && 0 !== spec.region.length || (spec.region = [ {} ]), (0, vutils_1.has)(spec, "tooltip") || (spec.tooltip = {}), 
-        (0, util_1.isValid)(spec.stackInverse) && spec.region.forEach((r => !(0, util_1.isValid)(r.stackInverse) && (r.stackInverse = spec.stackInverse)));
+        this._transformer = new this.transformerConstructor({
+            type: this.type,
+            seriesType: this.seriesType,
+            getTheme: this._option.getTheme
+        }), this._chartData.parseData(this._spec.data), this._createGlobalScale(), this._spec.background && "object" == typeof this._spec.background && this._createBackground(), 
+        this._createLayout(), this._transformer.forEachRegionInSpec(this._spec, this._createRegion.bind(this)), 
+        this._transformer.forEachSeriesInSpec(this._spec, this._createSeries.bind(this)), 
+        this._transformer.forEachComponentInSpec(this._spec, this._createComponent.bind(this), this._option.getSpecInfo());
     }
     init() {
         this._regions.forEach((r => r.init({}))), this._series.forEach((s => s.init({}))), 
@@ -123,12 +128,12 @@ class BaseChart extends compilable_base_1.CompilableBase {
             return null === (_a = s.getRawData()) || void 0 === _a ? void 0 : _a.markRunning();
         })), this._series.forEach((s => s.fillData())), this.updateGlobalScaleDomain();
     }
-    onResize(width, height) {
+    onResize(width, height, reRender = !0) {
         const canvasRect = {
             width: width,
             height: height
         };
-        this._canvasRect = canvasRect, this._updateLayoutRect(this._option.viewBox), this.setLayoutTag(!0);
+        this._canvasRect = canvasRect, this._updateLayoutRect(this._option.viewBox), this.setLayoutTag(!0, null, reRender);
     }
     updateViewBox(viewBox, reLayout) {
         this._option.viewBox = viewBox, this._updateLayoutRect(viewBox), this.setLayoutTag(!0, null, reLayout);
@@ -147,36 +152,32 @@ class BaseChart extends compilable_base_1.CompilableBase {
             height: () => this._viewBox.y2 - this._viewBox.y1
         })));
     }
-    _createRegion() {
-        this._spec.region.forEach(((s, i) => {
-            const region = factory_1.Factory.createRegion("region", s, Object.assign(Object.assign({}, this._modelOption), {
-                specIndex: i
-            }));
-            region && (region.created(), this._regions.push(region));
-        }));
-    }
-    _createSeries(seriesSpec) {
-        seriesSpec.forEach(((spec, index) => {
-            let region;
-            if (!1 === this._option.animation && (spec.animation = !1), (0, util_1.isValid)(spec.regionId) ? region = this.getRegionsInUserId(spec.regionId) : (0, 
-            util_1.isValid)(spec.regionIndex) && (region = this.getRegionsInIndex([ spec.regionIndex ])[0]), 
-            region || (region = this._regions[0]), !region) return;
-            const series = factory_1.Factory.createSeries(spec.type, spec, Object.assign(Object.assign({}, this._modelOption), {
-                type: spec.type,
-                region: region,
-                specIndex: index,
-                globalScale: this._globalScale,
-                sourceDataList: this._chartData.dataList
-            }));
-            series && (series.created(), this._series.push(series), region.addSeries(series));
+    _createRegion(constructor, specInfo) {
+        if (!constructor) return;
+        const {spec: spec} = specInfo, others = __rest(specInfo, [ "spec" ]), region = new constructor(spec, Object.assign(Object.assign({}, this._modelOption), others));
+        region && (region.created(), this._regions.push(region));
+    }
+    _createSeries(constructor, specInfo) {
+        if (!constructor) return;
+        const {spec: spec} = specInfo, others = __rest(specInfo, [ "spec" ]);
+        let region;
+        if (!1 === this._option.animation && (spec.animation = !1), (0, util_1.isValid)(spec.regionId) ? region = this.getRegionsInUserId(spec.regionId) : (0, 
+        util_1.isValid)(spec.regionIndex) && (region = this.getRegionsInIndex([ spec.regionIndex ])[0]), 
+        !region && !(region = this._regions[0])) return;
+        const series = new constructor(spec, Object.assign(Object.assign(Object.assign({}, this._modelOption), others), {
+            type: spec.type,
+            region: region,
+            globalScale: this._globalScale,
+            sourceDataList: this._chartData.dataList
         }));
+        series && (series.created(), this._series.push(series), region.addSeries(series));
     }
     getSeriesById(id) {
         return this._series.find((x => x.id === id));
     }
-    _createComponent(Component, spec) {
-        const component = Component.createComponent(spec, Object.assign(Object.assign({}, this._modelOption), {
-            type: Component.type,
+    _createComponent(constructor, specInfo) {
+        const component = constructor.createComponent(specInfo, Object.assign(Object.assign({}, this._modelOption), {
+            type: constructor.type,
             getAllRegions: this.getAllRegions,
             getRegionsInIndex: this.getRegionsInIndex,
             getRegionsInIds: this.getRegionsInIds,
@@ -190,26 +191,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
             getComponentByUserId: this.getComponentByUserId,
             getComponentsByKey: this.getComponentsByKey
         }));
-        if (!component) return !1;
-        const components = (0, util_1.isArray)(component) ? component : [ component ];
-        return !!components.length && (components.forEach((c => {
-            c.created(), this._components.push(c);
-        })), !0);
-    }
-    _createComponents(spec) {
-        var _a;
-        const components = factory_1.Factory.getComponents();
-        let cartesianAxis, polarAxis, geoCoordinate;
-        const noAxisComponents = [];
-        for (let index = 0; index < components.length; index++) {
-            const {cmp: cmp, alwaysCheck: alwaysCheck} = components[index];
-            cmp.type.startsWith(interface_1.ComponentTypeEnum.cartesianAxis) ? cartesianAxis = cmp : cmp.type.startsWith(interface_1.ComponentTypeEnum.polarAxis) ? polarAxis = cmp : cmp.type === interface_1.ComponentTypeEnum.geoCoordinate ? geoCoordinate = cmp : (alwaysCheck || spec[null !== (_a = cmp.specKey) && void 0 !== _a ? _a : cmp.type]) && noAxisComponents.push(cmp);
-        }
-        let hasInitAxis = !1;
-        cartesianAxis && (hasInitAxis = this._createComponent(cartesianAxis, spec)), polarAxis && !hasInitAxis && (hasInitAxis = this._createComponent(polarAxis, spec)), 
-        geoCoordinate && !hasInitAxis && this._createComponent(geoCoordinate, spec), noAxisComponents.forEach((C => {
-            this._createComponent(C, spec);
-        }));
+        component && (component.created(), this._components.push(component));
     }
     getAllComponents() {
         return this._components;
@@ -379,7 +361,6 @@ class BaseChart extends compilable_base_1.CompilableBase {
         };
         if (this.setLayoutTag(!0, null, !1), spec.type !== this.type) return result.reMake = !0, 
         result;
-        this.transformSpec(spec);
         const currentKeys = Object.keys(this._spec).sort(), nextKeys = Object.keys(spec).sort();
         if (JSON.stringify(currentKeys) !== JSON.stringify(nextKeys)) return result.reMake = !0, 
         result;
@@ -406,8 +387,8 @@ class BaseChart extends compilable_base_1.CompilableBase {
     updateComponentSpec(result) {
         const componentCache = {};
         this._components.forEach((c => {
-            var _a, _b;
-            const compSpecKey = null !== (_a = c.specKey) && void 0 !== _a ? _a : c.type, cmpSpec = null !== (_b = this._spec[compSpecKey]) && void 0 !== _b ? _b : {};
+            var _a;
+            const compSpecKey = c.specKey || c.type, cmpSpec = null !== (_a = this._spec[compSpecKey]) && void 0 !== _a ? _a : {};
             (0, util_1.isArray)(cmpSpec) ? (componentCache[compSpecKey] = componentCache[compSpecKey] || {
                 specCount: cmpSpec.length,
                 componentCount: 0
@@ -429,36 +410,6 @@ class BaseChart extends compilable_base_1.CompilableBase {
         var _a, _b;
         return null !== (_b = null === (_a = this.getCompiler()) || void 0 === _a ? void 0 : _a.getCanvas()) && void 0 !== _b ? _b : null;
     }
-    isValidSeries(seriesType) {
-        return !0;
-    }
-    _getDefaultSeriesSpec(spec) {
-        var _a, _b;
-        return {
-            dataKey: spec.dataKey,
-            hover: spec.hover,
-            select: spec.select,
-            label: spec.label,
-            seriesStyle: spec.seriesStyle,
-            animation: spec.animation,
-            animationThreshold: null !== (_a = spec.animationThreshold) && void 0 !== _a ? _a : null === (_b = this._option) || void 0 === _b ? void 0 : _b.getTheme().animationThreshold,
-            animationAppear: spec.animationAppear,
-            animationDisappear: spec.animationDisappear,
-            animationEnter: spec.animationEnter,
-            animationUpdate: spec.animationUpdate,
-            animationExit: spec.animationExit,
-            animationNormal: spec.animationNormal,
-            extensionMark: spec.extensionMark,
-            large: spec.large,
-            largeThreshold: spec.largeThreshold,
-            progressiveStep: spec.progressiveStep,
-            progressiveThreshold: spec.progressiveThreshold,
-            background: spec.seriesBackground,
-            invalidType: spec.invalidType,
-            seriesField: spec.seriesField,
-            morph: spec.morph
-        };
-    }
     _updateLayoutRect(viewBox) {
         let viewRect = this.getCanvasRect();
         if (viewBox) {
@@ -483,9 +434,9 @@ class BaseChart extends compilable_base_1.CompilableBase {
         this.updateChartConfig({
             change: !0,
             reMake: !1
-        }, this._spec), this.setLayoutTag(!0, null, !1), this.transformSpec(this._spec), 
-        this.updateGlobalScaleTheme(), this._regions.forEach((r => r.setCurrentTheme())), 
-        this._series.forEach((s => s.setCurrentTheme())), this._components.forEach((c => c.setCurrentTheme()));
+        }, this._spec), this.setLayoutTag(!0, null, !1), this.updateGlobalScaleTheme(), 
+        this._regions.forEach((r => r.reInit(r.getSpecInfo().spec))), this._series.forEach((s => s.reInit(s.getSpecInfo().spec))), 
+        this._components.forEach((c => c.reInit(c.getSpecInfo().spec)));
     }
     clear() {
         this.getAllModels().forEach((i => {
@@ -676,4 +627,4 @@ class BaseChart extends compilable_base_1.CompilableBase {
 }
 
 exports.BaseChart = BaseChart;
-//# sourceMappingURL=base-chart.js.map
+//# sourceMappingURL=base-chart.js.map