@visactor/vchart-types 1.13.1 → 1.13.2

package/types/mark/symbol.d.ts

@@ -1,8 +1,7 @@
 import type { ISymbolMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
-import type { IMarkRaw, IMarkStyle } from './interface';
+import type { IMarkStyle, ISymbolMark } from './interface';
 import { MarkTypeEnum } from './interface/type';
-export type ISymbolMark = IMarkRaw<ISymbolMarkSpec>;
 export declare class BaseSymbolMark<T extends ISymbolMarkSpec> extends BaseMark<T> {
     protected _getDefaultStyle(): IMarkStyle<T>;
 }

package/types/mark/text.d.ts

@@ -1,14 +1,8 @@
 import type { IComposedTextMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
-import type { IMarkOption, IMarkRaw, IMarkStyle } from './interface';
+import type { IMarkOption, IMarkStyle } from './interface';
 import { MarkTypeEnum } from './interface';
-import { IMarkSpec } from '../typings/spec/common';
-export type ITextMark = IMarkRaw<IComposedTextMarkSpec> & {
-    getTextType: () => 'text' | 'rich';
-};
-export type ITextSpec<T> = IMarkSpec<T> & {
-    textType?: 'rich' | 'text';
-};
+import type { ITextMark, ITextSpec } from './interface/mark';
 export declare class TextMark extends BaseMark<IComposedTextMarkSpec> implements ITextMark {
     static readonly type = MarkTypeEnum.text;
     readonly type = MarkTypeEnum.text;

package/types/model/interface.d.ts

@@ -3,25 +3,25 @@ import type { DataSet, DataView } from '@visactor/vdataset';
 import type { IEvent, IEventDispatcher } from '../event/interface';
 import type { IMark, IMarkRaw, IMarkStyle, MarkTypeEnum } from '../mark/interface';
 import type { RenderMode } from '../typings/spec/common';
-import type { VChart } from '../vchart-all';
 import type { IData } from '@visactor/vgrammar-core';
 import type { StringOrNumber } from '../typings/common';
 import type { IGroupMarkSpec, ConvertToMarkStyleSpec, ICommonSpec } from '../typings/visual';
 import type { IRect } from '../typings/space';
 import type { IPoint, CoordinateType } from '../typings/coordinate';
-import type { ITheme } from '../theme';
+import type { ITheme } from '../theme/interface';
 import type { StateValueType } from '../typings/spec';
 import type { ICompilable, ICompilableInitOption } from '../compile/interface';
-import type { ICompilableData } from '../compile/data';
+import type { ICompilableData } from '../compile/data/interface';
 import type { IGlobalScale } from '../scale/interface';
 import type { IChart, IChartSpecInfo, IChartSpecTransformerOption } from '../chart/interface';
 import type { IThemeColorScheme } from '../theme/color-scheme/interface';
 import type { ILayoutItem, ILayoutItemSpec } from '../layout/interface';
 import type { ILayoutPoint, ILayoutRect } from '../typings/layout';
 import type { ComponentTypeEnum } from '../component/interface';
-import type { SeriesTypeEnum } from '../series';
+import type { SeriesTypeEnum } from '../series/interface';
 import type { ITooltipSpec } from '../component/tooltip/interface';
 import type { TooltipActiveType } from '../typings';
+import type { IVChart } from '../core/interface';
 export interface IModelInitOption {
 }
 export interface IModelLayoutOption {
@@ -106,7 +106,7 @@ export interface IModelOption extends ICompilableInitOption {
     dataSet: DataSet;
     map: Map<StringOrNumber, IModel | IMark>;
     mode: RenderMode;
-    globalInstance: VChart;
+    globalInstance: IVChart;
     regionIndexes?: Array<number>;
     specKey?: string;
     specPath?: Array<string | number>;

package/types/plugin/chart/interface.d.ts

@@ -1,6 +1,5 @@
 import type { IChartSpecInfo } from '../../chart/interface';
-import type { IVChart } from '../../core';
-import type { VChartRenderActionSource } from '../../core/interface';
+import type { VChartRenderActionSource, IVChart } from '../../core/interface';
 import type { IBasePlugin, IBasePluginService, MaybePromise } from '../base/interface';
 export interface IChartPlugin<T extends IChartPluginService = any> extends IBasePlugin<T> {
     specKey?: string;

package/types/plugin/chart/media-query/interface/common.d.ts

@@ -1,7 +1,7 @@
 import type { ComponentTypeEnum } from '../../../../component/interface';
-import type { IVChart } from '../../../../core';
+import type { IVChart } from '../../../../core/interface';
 import type { IModelSpecInfo } from '../../../../model/interface';
-import type { SeriesTypeEnum } from '../../../../series';
+import type { SeriesTypeEnum } from '../../../../series/interface';
 import type { IChartSpec } from '../../../../typings';
 export interface IMediaQueryActionFilterResult<T extends Record<string, unknown> = any> {
     isChart?: boolean;

package/types/plugin/components/tooltip-handler/base.d.ts

@@ -1,7 +1,6 @@
 import type { Maybe, RenderMode } from '../../../typings';
 import type { TooltipData, ITooltipActual, TooltipActiveType, ITooltipHandler, ITooltipPositionActual } from '../../../typings/tooltip';
 import type { IGroup } from '@visactor/vrender-core';
-import type { Compiler } from '../../../compile/compiler';
 import type { IContainerSize } from '@visactor/vrender-components';
 import type { IChartOption } from '../../../chart/interface';
 import type { ITooltipSpec, Tooltip, TooltipHandlerParams } from '../../../component/tooltip';
@@ -9,6 +8,7 @@ import { TooltipResult } from '../../../component/tooltip';
 import type { IComponentPlugin, IComponentPluginService } from '../interface';
 import { BasePlugin } from '../../base/base-plugin';
 import type { ITooltipHandlerOptions } from './interface';
+import type { ICompiler } from '../../../compile/interface/compilable-item';
 type ChangeTooltipFunc = (visible: boolean, params: TooltipHandlerParams, data?: TooltipData) => TooltipResult;
 type ChangeTooltipPositionFunc = (params: TooltipHandlerParams, data: TooltipData) => TooltipResult;
 export declare abstract class BaseTooltipHandler extends BasePlugin implements ITooltipHandler, IComponentPlugin {
@@ -19,10 +19,10 @@ export declare abstract class BaseTooltipHandler extends BasePlugin implements I
     protected _option: ITooltipHandlerOptions;
     protected _chartOption: IChartOption;
     protected _env: RenderMode;
-    get env(): "desktop-browser" | "mobile-browser" | "node" | "worker" | "miniApp" | "wx" | "tt" | "harmony" | "desktop-miniApp" | "lynx";
+    get env(): "node" | "desktop-browser" | "mobile-browser" | "worker" | "miniApp" | "wx" | "tt" | "harmony" | "desktop-miniApp" | "lynx";
     protected _component: Tooltip;
     protected _chartContainer: Maybe<HTMLElement>;
-    protected _compiler: Compiler;
+    protected _compiler: ICompiler;
     protected _container: Maybe<IGroup | HTMLElement>;
     protected _isReleased: boolean;
     onAdd(service: IComponentPluginService<any>): void;

package/types/region/interface.d.ts

@@ -1,4 +1,4 @@
-import type { IMark } from '../mark/interface';
+import type { IMark, IGroupMark } from '../mark/interface';
 import type { ILayoutModel, IModelConstructor, IModelOption, IModelSpecInfo } from '../model/interface';
 import type { ISeries, SeriesType } from '../series/interface';
 import type { CoordinateType } from '../typings/coordinate';
@@ -6,7 +6,6 @@ import type { IInteraction } from '../interaction/interface';
 import type { IProjectionSpec } from '../component/geo/interface';
 import type { ConvertToMarkStyleSpec, IRectMarkSpec } from '../typings/visual';
 import type { IAnimate } from '../animation/interface';
-import type { IGroupMark } from '../mark/group';
 import type { StringOrNumber } from '../typings';
 import type { ILayoutItemSpec } from '../layout/interface';
 export interface IRegion extends ILayoutModel {

package/types/region/region.d.ts

@@ -3,13 +3,12 @@ import type { ISeries } from '../series/interface';
 import type { IModelOption } from '../model/interface';
 import type { CoordinateType } from '../typings/coordinate';
 import type { IRegion, IRegionSpec, IRegionSpecInfo } from './interface';
-import type { IGroupMark } from '../mark/group';
 import type { IInteraction, ITrigger } from '../interaction/interface';
-import type { IRectMark } from '../mark/rect';
 import type { IAnimate } from '../animation/interface';
 import type { ILayoutType, StringOrNumber } from '../typings';
 import { LayoutModel } from '../model/layout-model';
 import { RegionSpecTransformer } from './region-transformer';
+import type { IGroupMark, IRectMark } from '../mark/interface/mark';
 export declare class Region<T extends IRegionSpec = IRegionSpec> extends LayoutModel<T> implements IRegion {
     static type: string;
     static readonly transformerConstructor: typeof RegionSpecTransformer;

package/types/scale/global-scale.d.ts

@@ -3,7 +3,7 @@ import type { IBaseScale } from '@visactor/vscale';
 import type { IChart } from '../chart/interface';
 import type { IChartSpec } from '../typings/spec';
 import type { IVisualScale, IVisualSpecScale } from '../typings';
-import type { StatisticOperations } from '../data/transforms/dimension-statistics';
+import type { StatisticOperations } from '../data/transforms/interface';
 export declare class GlobalScale implements IGlobalScale {
     private _scaleSpecMap;
     private _scaleMap;

package/types/scale/interface.d.ts

@@ -1,5 +1,5 @@
 import type { IBaseScale } from '@visactor/vscale';
-import type { StatisticOperations } from '../data/transforms/dimension-statistics';
+import type { StatisticOperations } from '../data/transforms/interface';
 import type { IChartSpec, IVisualScale, IVisualSpecScale } from '../typings';
 import type { IUpdateSpecResult } from '../model/interface';
 export interface IGlobalScale {

package/types/series/area/animation.d.ts

@@ -1,8 +1,4 @@
-import type { DirectionType } from '../../typings';
 import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';
-export interface IAreaAnimationParams {
-    direction: DirectionType;
-}
-export type AreaAppearPreset = 'clipIn' | 'fadeIn' | 'grow';
+import type { AreaAppearPreset, IAreaAnimationParams } from './interface';
 export declare function areaPresetAnimation(params: IAreaAnimationParams, preset: AreaAppearPreset | boolean): IAnimationTypeConfig;
 export declare const registerAreaSeriesAnimation: () => void;

package/types/series/area/area.d.ts

@@ -1,12 +1,11 @@
 import type { DataView } from '@visactor/vdataset';
 import { LineLikeSeriesMixin } from '../mixin/line-mixin';
-import type { IAreaMark } from '../../mark/area';
 import { CartesianSeries } from '../cartesian/cartesian';
 import type { Datum } from '../../typings';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface/type';
 import type { IAreaSeriesSpec } from './interface';
-import type { IMark } from '../../mark/interface';
+import type { IMark, IAreaMark } from '../../mark/interface';
 import { AreaSeriesSpecTransformer } from './area-transformer';
 export interface AreaSeries<T extends IAreaSeriesSpec = IAreaSeriesSpec> extends Pick<LineLikeSeriesMixin, 'initLineMark' | 'initSymbolMark' | 'initLabelMarkStyle' | 'initLineMarkStyle' | 'initSymbolMarkStyle' | 'encodeDefined' | '_lineMark' | '_symbolMark' | 'addSamplingCompile' | 'addOverlapCompile' | 'reCompileSampling' | 'initLineLabelMarkStyle'>, CartesianSeries<T> {
 }

package/types/series/area/interface.d.ts

@@ -2,12 +2,15 @@ import type { ICartesianSeriesSpec } from '../cartesian/interface';
 import type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';
 import type { ISymbolMarkSpec, ILineMarkSpec, IAreaMarkSpec } from '../../typings/visual';
 import type { SeriesMarkNameEnum } from '../interface/type';
-import type { ILineLikeLabelSpec, ILineLikeSeriesTheme } from '../mixin/line-mixin';
+import type { ILineLikeLabelSpec, ILineLikeSeriesTheme } from '../mixin/interface';
 import type { IAnimationSpec } from '../../animation/spec';
-import type { AreaAppearPreset } from './animation';
 import type { IDataSamping, IMarkOverlap, IMarkProgressiveConfig } from '../../mark/interface';
-import type { ILabelSpec } from '../../component';
-import type { IMultiLabelSpec } from '../../component/label';
+import type { IMultiLabelSpec, ILabelSpec } from '../../component/label/interface';
+import type { DirectionType } from '../../typings/space';
+export interface IAreaAnimationParams {
+    direction: DirectionType;
+}
+export type AreaAppearPreset = 'clipIn' | 'fadeIn' | 'grow';
 export interface IAreaSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<string, AreaAppearPreset>, IMarkProgressiveConfig, IDataSamping, IMarkOverlap {
     type: 'area';
     xField?: string | string[];

package/types/series/bar/animation.d.ts

@@ -1,12 +1,5 @@
-import type { DirectionType } from '../../typings';
 import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';
-export interface IBarAnimationParams {
-    xField: string;
-    yField: string;
-    direction: DirectionType;
-    growFrom: () => number;
-}
-export type BarAppearPreset = 'grow' | 'fadeIn' | 'scaleIn';
+import type { BarAppearPreset, IBarAnimationParams } from './interface';
 export declare const barGrowIn: (params: IBarAnimationParams, isOverall?: boolean) => IAnimationTypeConfig;
 export declare const barGrowOut: (params: IBarAnimationParams, isOverall?: boolean) => IAnimationTypeConfig;
 export declare function barPresetAnimation(params: IBarAnimationParams, preset: BarAppearPreset | boolean): IAnimationTypeConfig;

package/types/series/bar/bar.d.ts

@@ -1,13 +1,11 @@
 import type { IBaseScale } from '@visactor/vscale';
 import { CartesianSeries } from '../cartesian/cartesian';
-import type { IMark } from '../../mark/interface';
+import type { IMark, IRectMark, ITextMark } from '../../mark/interface';
 import { MarkTypeEnum } from '../../mark/interface/type';
 import type { Datum, DirectionType } from '../../typings';
 import type { IBarSeriesSpec } from './interface';
 import type { IAxisHelper } from '../../component/axis/cartesian/interface';
-import type { IRectMark } from '../../mark/rect';
 import type { IModelInitOption } from '../../model/interface';
-import type { ITextMark } from '../../mark/text';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';
 import { SeriesData } from '../base/series-data';

package/types/series/bar/interface.d.ts

@@ -2,15 +2,21 @@ import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/i
 import type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';
 import type { IRect3dMarkSpec, IRectMarkSpec } from '../../typings/visual';
 import type { IAnimationSpec } from '../../animation/spec';
-import type { BarAppearPreset } from './animation';
-import type { ILabelSpec, IMultiLabelSpec } from '../../component/label';
+import type { ILabelSpec, IMultiLabelSpec } from '../../component/label/interface';
 import type { IDataSamping, IMarkProgressiveConfig } from '../../mark/interface';
 import type { SeriesMarkNameEnum } from '../interface/type';
 import type { Functional } from '@visactor/vrender-components';
 import type { IRectGraphicAttribute } from '@visactor/vrender-core';
-import type { Datum } from '../../typings';
-import type { ISeriesMarkAttributeContext } from '../../compile/mark';
+import type { Datum, DirectionType } from '../../typings';
+import type { ISeriesMarkAttributeContext } from '../../compile/mark/interface';
 type BarMarks = 'bar';
+export interface IBarAnimationParams {
+    xField: string;
+    yField: string;
+    direction: DirectionType;
+    growFrom: () => number;
+}
+export type BarAppearPreset = 'grow' | 'fadeIn' | 'scaleIn';
 export type IStackCornerRadiusCallback = (attr: IRectGraphicAttribute, datum: Datum, ctx: ISeriesMarkAttributeContext) => number | number[];
 export interface IBarSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<BarMarks, BarAppearPreset>, IMarkProgressiveConfig, IDataSamping {
     type: 'bar';

package/types/series/base/base-series.d.ts

@@ -1,21 +1,20 @@
 import { DataView } from '@visactor/vdataset';
 import type { DataSet, ITransformOptions } from '@visactor/vdataset';
 import type { IRegion } from '../../region/interface';
-import type { ICompileMarkConfig, IMark } from '../../mark/interface';
+import type { ICompileMarkConfig, IGroupMark, IMark } from '../../mark/interface';
 import type { CoordinateType, IInvalidType, IPoint, DataKeyType, Datum, Maybe, ISeriesSpec, IExtensionMarkSpec, IExtensionGroupMarkSpec, EnableMarkType, IGroup, ILayoutType, ILayoutPoint, ILayoutRect } from '../../typings';
 import { BaseModel } from '../../model/base-model';
 import type { ISeriesOption, ISeries, ISeriesMarkInitOption, ISeriesStackData, ISeriesTooltipHelper, SeriesMarkMap, ISeriesMarkInfo, ISeriesSpecInfo, ISeriesStackDataLeaf, ISeriesStackDataMeta, ISeriesSeriesInfo } from '../interface';
 import type { IModelEvaluateOption, IModelRenderOption, IUpdateSpecResult } from '../../model/interface';
 import type { AddVChartPropertyContext } from '../../data/transforms/add-property';
 import type { IBaseInteractionSpec, IHoverSpec, ISelectSpec } from '../../interaction/interface';
-import type { StatisticOperations } from '../../data/transforms/dimension-statistics';
 import { SeriesData } from './series-data';
-import type { IGroupMark } from '../../mark/group';
 import type { ISeriesMarkAttributeContext } from '../../compile/mark';
 import { STATE_VALUE_ENUM } from '../../compile/mark';
 import { BaseSeriesSpecTransformer } from './base-series-transformer';
 import type { EventType } from '@visactor/vgrammar-core';
 import type { ILabelSpec } from '../../component/label/interface';
+import type { StatisticOperations } from '../../data/transforms/interface';
 export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseModel<T> implements ISeries {
     readonly specKey: string;
     readonly type: string;

package/types/series/box-plot/box-plot.d.ts

@@ -54,7 +54,7 @@ export declare class BoxPlotSeries<T extends IBoxPlotSeriesSpec = IBoxPlotSeries
     protected initTooltip(): void;
     getStatisticFields(): {
         key: string;
-        operations: import("../../data/transforms/dimension-statistics").StatisticOperations;
+        operations: import("../../data/transforms/interface").StatisticOperations;
     }[];
     onEvaluateEnd(ctx: IModelEvaluateOption): void;
     getDefaultShapeType(): string;

package/types/series/cartesian/cartesian.d.ts

@@ -5,9 +5,9 @@ import type { IBaseScale } from '@visactor/vscale';
 import type { IAxisHelper } from '../../component/axis/cartesian/interface';
 import type { DirectionType } from '../../typings/space';
 import type { Datum, StringOrNumber } from '../../typings';
-import type { StatisticOperations } from '../../data/transforms/dimension-statistics';
 import type { ICartesianSeriesSpec } from './interface';
 import type { IAxisLocationCfg } from '../../component/axis';
+import type { StatisticOperations } from '../../data/transforms/interface';
 export declare abstract class CartesianSeries<T extends ICartesianSeriesSpec = ICartesianSeriesSpec> extends BaseSeries<T> implements ICartesianSeries {
     readonly coordinate: 'cartesian';
     protected _bandPosition: number;
@@ -31,7 +31,7 @@ export declare abstract class CartesianSeries<T extends ICartesianSeriesSpec = I
     protected _specXField: string[];
     protected _specYField: string[];
     protected _direction: DirectionType;
-    get direction(): "horizontal" | "vertical";
+    get direction(): "vertical" | "horizontal";
     protected _scaleX: IBaseScale;
     get scaleX(): IBaseScale;
     setScaleX(s: IBaseScale): void;

package/types/series/cartesian/interface.d.ts

@@ -1,6 +1,6 @@
 import type { ISeriesSpec } from '../../typings/spec/common';
 import type { DirectionType } from '../../typings';
-import type { ILabelSpec } from '../../component/label';
+import type { ILabelSpec } from '../../component/label/interface';
 export interface ICartesianSeriesSpec extends ISeriesSpec {
     direction?: DirectionType;
     xField?: string | string[];

package/types/series/circle-packing/animation.d.ts

@@ -1,5 +1,4 @@
 import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';
-export type CirclePackingMark = 'leaf' | 'nonLeaf' | 'label' | 'nonLeafLabel';
-export type CirclePackingAppearPreset = 'growIn' | 'fadeIn';
+import type { CirclePackingAppearPreset } from './interface';
 export declare const circlePackingPresetAnimation: (preset: CirclePackingAppearPreset) => IAnimationTypeConfig;
 export declare const registerCirclePackingAnimation: () => void;

package/types/series/circle-packing/circle-packing.d.ts

@@ -33,7 +33,7 @@ export declare class CirclePackingSeries<T extends ICirclePackingSeriesSpec = IC
     private _initLabelMarkStyle;
     getStatisticFields(): {
         key: string;
-        operations: import("../../data/transforms/dimension-statistics").StatisticOperations;
+        operations: import("../../data/transforms/interface").StatisticOperations;
     }[];
     protected initTooltip(): void;
     initAnimation(): void;

package/types/series/circle-packing/interface.d.ts

@@ -2,7 +2,8 @@ import type { IAnimationSpec } from '../../animation/spec';
 import type { IArcMarkSpec, ITextMarkSpec, IMarkSpec, IMarkTheme, ISeriesSpec } from '../../typings';
 import type { SeriesMarkNameEnum } from '../interface/type';
 import type { IPolarSeriesTheme } from '../polar/interface';
-import type { CirclePackingAppearPreset, CirclePackingMark } from './animation';
+export type CirclePackingMark = 'leaf' | 'nonLeaf' | 'label' | 'nonLeafLabel';
+export type CirclePackingAppearPreset = 'growIn' | 'fadeIn';
 export interface ICirclePackingSeriesSpec extends ISeriesSpec, IAnimationSpec<CirclePackingMark, CirclePackingAppearPreset> {
     type: 'circlePacking';
     categoryField: string;

package/types/series/correlation/animation.d.ts

@@ -1,8 +1,4 @@
 import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';
-export type CorrelationMarks = 'point' | 'label';
-export type CorrelationAppearPreset = 'scaleIn' | 'fadeIn';
-export interface ICorrelationAnimationParams {
-    [key: string]: object;
-}
+import type { CorrelationAppearPreset, ICorrelationAnimationParams } from './interface';
 export declare const correlationPresetAnimation: (_params: ICorrelationAnimationParams, preset: CorrelationAppearPreset) => IAnimationTypeConfig;
 export declare const registerCorrelationAnimation: () => void;

package/types/series/correlation/correlation.d.ts

@@ -4,8 +4,7 @@ import { SeriesTypeEnum } from '../interface/type';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesData } from '../base/series-data';
 import type { AdaptiveSpec } from '../../typings';
-import type { ILabelMark } from '../../mark/label';
-import type { IMark } from '../../mark/interface';
+import type { ILabelMark, IMark } from '../../mark/interface';
 import { CorrelationSeriesSpecTransformer } from './correlation-transformer';
 export declare class CorrelationSeries<T extends ICorrelationSeriesSpec = ICorrelationSeriesSpec> extends PolarSeries<AdaptiveSpec<T, 'outerRadius' | 'innerRadius'>> {
     static readonly type: string;

package/types/series/correlation/interface.d.ts

@@ -1,10 +1,13 @@
-import type { IMarkTheme, IMarkSpec } from '../../typings';
-import type { ILabelSpec, IMultiLabelSpec } from '../../component/label';
-import type { ISymbolMarkSpec, IRippleMarkSpec } from '../../typings';
+import type { IMarkTheme, IMarkSpec, ISymbolMarkSpec, IRippleMarkSpec } from '../../typings';
+import type { ILabelSpec, IMultiLabelSpec } from '../../component/label/interface';
 import type { SeriesMarkNameEnum } from '../interface/type';
 import type { IPolarSeriesSpec } from '../polar/interface';
 import type { IAnimationSpec } from '../../animation/spec';
-import type { CorrelationAppearPreset, CorrelationMarks } from './animation';
+export type CorrelationMarks = 'point' | 'label';
+export type CorrelationAppearPreset = 'scaleIn' | 'fadeIn';
+export interface ICorrelationAnimationParams {
+    [key: string]: object;
+}
 export interface ICorrelationSeriesSpec extends Omit<IPolarSeriesSpec, 'innerRadius' | 'outerRadius'>, IAnimationSpec<CorrelationMarks, CorrelationAppearPreset> {
     type: 'correlation';
     categoryField: string;

package/types/series/dot/dot.d.ts

@@ -63,7 +63,7 @@ export declare class DotSeries<T extends IDotSeriesSpec = IDotSeriesSpec> extend
     protected initTooltip(): void;
     onEvaluateEnd(ctx: IModelEvaluateOption): void;
     protected onMarkTreePositionUpdate(marks: IMark[]): void;
-    getDotData(): import("../../compile/mark/mark-data").MarkData;
+    getDotData(): import("../../compile/mark").IMarkData;
     protected _getDataIdKey(): any;
     getStackValueField(): string;
     getActiveMarks(): IMark[];

package/types/series/funnel/3d/funnel-3d.d.ts

@@ -4,7 +4,7 @@ import { SeriesTypeEnum, SeriesMarkNameEnum } from '../../interface/type';
 import { FunnelSeries } from '../funnel';
 import type { IFunnel3dSeriesSpec } from '../interface';
 import type { AdaptiveSpec } from '../../../typings';
-import type { ILabelMark } from '../../../mark/label';
+import type { ILabelMark } from '../../../mark/interface';
 export declare class Funnel3dSeries<T extends IFunnel3dSeriesSpec = IFunnel3dSeriesSpec> extends FunnelSeries<AdaptiveSpec<T, 'type'>> {
     static readonly type: string;
     type: SeriesTypeEnum;

package/types/series/funnel/funnel.d.ts

@@ -2,15 +2,11 @@ import type { IFunnelSeries, SeriesMarkMap } from '../interface';
 import { SeriesMarkNameEnum } from '../interface/type';
 import type { IOrientType, Datum, StringOrNumber } from '../../typings';
 import { SeriesTypeEnum } from '../interface/type';
-import type { IPolygonMark } from '../../mark/polygon/polygon';
 import { BaseSeries } from '../base/base-series';
-import type { IMark } from '../../mark/interface';
+import type { ILabelMark, IMark, IPolygonMark, IRuleMark, ITextMark } from '../../mark/interface';
 import { MarkTypeEnum } from '../../mark/interface/type';
-import type { ITextMark } from '../../mark/text';
 import type { IFunnelSeriesSpec } from './interface';
-import type { IRuleMark } from '../../mark/rule';
 import { SeriesData } from '../base/series-data';
-import type { ILabelMark } from '../../mark/label';
 import { FunnelSeriesSpecTransformer } from './funnel-transformer';
 export declare class FunnelSeries<T extends IFunnelSeriesSpec = IFunnelSeriesSpec> extends BaseSeries<T> implements IFunnelSeries {
     static readonly type: string;

package/types/series/funnel/interface.d.ts

@@ -1,7 +1,7 @@
 import type { Datum, IMarkSpec, IMarkTheme, ISeriesSpec, IOrientType, IPathMarkSpec, IPolygonMarkSpec, IRuleMarkSpec, ITextMarkSpec, IPyramid3dMarkSpec, IPercent, IComposedTextMarkSpec, IFormatMethod } from '../../typings';
 import type { IAnimationSpec } from '../../animation/spec';
 import type { SeriesMarkNameEnum } from '../interface/type';
-import { ILabelSpec } from '../../component';
+import type { ILabelSpec } from '../../component/label/interface';
 type FunnelMarks = 'funnel';
 export type FunnelAppearPreset = 'clipIn' | 'fadeIn';
 export interface IFunnelSeriesSpec extends ISeriesSpec, IAnimationSpec<FunnelMarks, FunnelAppearPreset> {

package/types/series/gauge/gauge.d.ts

@@ -19,6 +19,8 @@ export declare class GaugeSeries<T extends IGaugeSeriesSpec = IGaugeSeriesSpec>
     initMark(): void;
     initMarkStyle(): void;
     private initSegmentMarkStyle;
+    protected generateRadiusStyle(spec: any): any;
+    initMarkStyleWithSpec(mark?: IMark, spec?: any, key?: string): void;
     protected initTooltip(): void;
     private initTrackMarkStyle;
     protected _getAngleValueStartWithoutMask(datum: Datum): number;

package/types/series/gauge/interface.d.ts

@@ -1,8 +1,7 @@
 import type { IMarkSpec, IMarkTheme } from '../../typings/spec';
 import type { IArcMarkSpec, IPathMarkSpec, IRectMarkSpec } from '../../typings/visual';
-import type { IProgressLikeSeriesSpec, IProgressLikeSeriesTheme } from '../polar/progress-like/interface';
+import type { IProgressLikeSeriesSpec, IProgressLikeSeriesTheme, ProgressLikeAppearPreset } from '../polar/progress-like/interface';
 import type { IAnimationSpec } from '../../animation/spec';
-import type { ProgressLikeAppearPreset } from '../polar/progress-like';
 import type { SeriesMarkNameEnum } from '../interface/type';
 import type { ILabelSpec } from '../../component/label/interface';
 export type GaugePointerMarks = 'pointer' | 'pin' | 'pinBackground';

package/types/series/heatmap/animation.d.ts

@@ -1,4 +1,4 @@
 import type { IAnimationTypeConfig } from '@visactor/vgrammar-core';
-export type HeatmapAppearPreset = 'fadeIn';
+import type { HeatmapAppearPreset } from './interface';
 export declare function heatmapPresetAnimation(preset: HeatmapAppearPreset | boolean): IAnimationTypeConfig;
 export declare const registerHeatmapAnimation: () => void;

package/types/series/heatmap/heatmap.d.ts

@@ -1,11 +1,9 @@
 import { CartesianSeries } from '../cartesian/cartesian';
 import type { IHeatmapSeriesSpec } from './interface';
 import type { IAxisHelper } from '../../component/axis/cartesian/interface';
-import type { ITextMark } from '../../mark/text';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface/type';
-import type { ICellMark } from '../../mark/cell';
-import type { IMark } from '../../mark/interface';
+import type { ICellMark, IMark, ITextMark } from '../../mark/interface';
 import { HeatmapSeriesSpecTransformer } from './heatmap-transformer';
 export declare const DefaultBandWidth = 6;
 export declare class HeatmapSeries<T extends IHeatmapSeriesSpec = IHeatmapSeriesSpec> extends CartesianSeries<T> {

package/types/series/heatmap/interface.d.ts

@@ -2,10 +2,10 @@ import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/i
 import type { IMarkSpec, IMarkTheme } from '../../typings/spec/common';
 import type { IRectMarkSpec } from '../../typings/visual';
 import type { IAnimationSpec } from '../../animation/spec';
-import type { HeatmapAppearPreset } from './animation';
-import type { ILabelSpec } from '../../component/label';
+import type { ILabelSpec } from '../../component/label/interface';
 import type { IMarkProgressiveConfig } from '../../mark/interface';
 import type { SeriesMarkNameEnum } from '../interface/type';
+export type HeatmapAppearPreset = 'fadeIn';
 type HeatmapMarks = 'cell' | 'background' | 'label';
 export interface IHeatmapSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<HeatmapMarks, HeatmapAppearPreset>, IMarkProgressiveConfig {
     type: 'heatmap';

package/types/series/index.d.ts

@@ -67,8 +67,12 @@ import type { ILiquidSeriesSpec } from './liquid/interface';
 import { LiquidSeries, registerLiquidSeries } from './liquid/liquid';
 import type { IVennSeriesSpec } from './venn/interface';
 import { VennSeries, registerVennSeries } from './venn/venn';
+import type { IMosaicSeriesSpec } from './mosaic/interface';
+import { MosaicSeries, registerMosaicSeries } from './mosaic/mosaic';
+import type { IPictogramSeriesSpec } from './pictogram/interface';
+import { PictogramSeries, registerPictogramSeries } from './pictogram/pictogram';
 import type { ISeries, ICartesianSeries, IPolarSeries, IGeoSeries } from './interface';
-export { WaterfallSeries, Bar3dSeries, BarSeries, BoxPlotSeries, LineSeries, RadarSeries, RangeAreaSeries, RangeColumn3dSeries, RangeColumnSeries, MapSeries, Pie3dSeries, PieSeries, SankeySeries, ScatterSeries, SunburstSeries, RoseLikeSeries, RoseSeries, AreaSeries, DotSeries, LinearProgressSeries, LinkSeries, CirclePackingSeries, CircularProgressSeries, WordCloud3dSeries, WordCloudSeries, Funnel3dSeries, FunnelSeries, TreemapSeries, GaugePointerSeries, GaugeSeries, HeatmapSeries, BaseSeries, CartesianSeries, PolarSeries, ProgressLikeSeries, CorrelationSeries, LiquidSeries, VennSeries };
-export { registerAreaSeries, registerBar3dSeries, registerBarSeries, registerBoxplotSeries, registerCirclePackingSeries, registerCircularProgressSeries, registerDotSeries, registerFunnel3dSeries, registerFunnelSeries, registerGaugePointerSeries, registerGaugeSeries, registerHeatmapSeries, registerLineSeries, registerLinearProgressSeries, registerLinkSeries, registerMapSeries, registerPie3dSeries, registerPieSeries, registerRadarSeries, registerRangeAreaSeries, registerRangeColumn3dSeries, registerRangeColumnSeries, registerRoseSeries, registerSankeySeries, registerScatterSeries, registerSunBurstSeries, registerTreemapSeries, registerWaterfallSeries, registerWordCloud3dSeries, registerWordCloudSeries, registerLiquidSeries, registerVennSeries };
-export type { ISeries, ICartesianSeries, IPolarSeries, IGeoSeries, IRoseLikeSeriesSpec, IAreaSeriesSpec, IBar3dSeriesSpec, IBarSeriesSpec, IBoxPlotSeriesSpec, ICartesianSeriesSpec, ICirclePackingSeriesSpec, ICircularProgressSeriesSpec, IDotSeriesSpec, IFunnel3dSeriesSpec, IFunnelSeriesSpec, IGaugePointerSeriesSpec, IGaugeSeriesSpec, IHeatmapSeriesSpec, ILineSeriesSpec, ILinearProgressSeriesSpec, ILinkSeriesSpec, IMapSeriesSpec, IPie3dSeriesSpec, IPieSeriesSpec, IPolarSeriesSpec, IProgressLikeSeriesSpec, IRadarSeriesSpec, IRangeAreaSeriesSpec, IRangeColumn3dSeriesSpec, IRangeColumnSeriesSpec, IRoseSeriesSpec, ISankeySeriesSpec, IScatterSeriesSpec, ISunburstSeriesSpec, ITreemapSeriesSpec, IWaterfallSeriesSpec, IWordCloud3dSeriesSpec, IWordCloudSeriesSpec, ICorrelationSeriesSpec, ILiquidSeriesSpec, IVennSeriesSpec };
+export { WaterfallSeries, Bar3dSeries, BarSeries, BoxPlotSeries, LineSeries, RadarSeries, RangeAreaSeries, RangeColumn3dSeries, RangeColumnSeries, MapSeries, Pie3dSeries, PieSeries, SankeySeries, ScatterSeries, SunburstSeries, RoseLikeSeries, RoseSeries, AreaSeries, DotSeries, LinearProgressSeries, LinkSeries, CirclePackingSeries, CircularProgressSeries, WordCloud3dSeries, WordCloudSeries, Funnel3dSeries, FunnelSeries, TreemapSeries, GaugePointerSeries, GaugeSeries, HeatmapSeries, BaseSeries, CartesianSeries, PolarSeries, ProgressLikeSeries, CorrelationSeries, LiquidSeries, VennSeries, PictogramSeries, MosaicSeries };
+export { registerAreaSeries, registerBar3dSeries, registerBarSeries, registerBoxplotSeries, registerCirclePackingSeries, registerCircularProgressSeries, registerDotSeries, registerFunnel3dSeries, registerFunnelSeries, registerGaugePointerSeries, registerGaugeSeries, registerHeatmapSeries, registerLineSeries, registerLinearProgressSeries, registerLinkSeries, registerMapSeries, registerPie3dSeries, registerPieSeries, registerRadarSeries, registerRangeAreaSeries, registerRangeColumn3dSeries, registerRangeColumnSeries, registerRoseSeries, registerSankeySeries, registerScatterSeries, registerSunBurstSeries, registerTreemapSeries, registerWaterfallSeries, registerWordCloud3dSeries, registerWordCloudSeries, registerLiquidSeries, registerVennSeries, registerMosaicSeries, registerPictogramSeries };
+export type { ISeries, ICartesianSeries, IPolarSeries, IGeoSeries, IRoseLikeSeriesSpec, IAreaSeriesSpec, IBar3dSeriesSpec, IBarSeriesSpec, IBoxPlotSeriesSpec, ICartesianSeriesSpec, ICirclePackingSeriesSpec, ICircularProgressSeriesSpec, IDotSeriesSpec, IFunnel3dSeriesSpec, IFunnelSeriesSpec, IGaugePointerSeriesSpec, IGaugeSeriesSpec, IHeatmapSeriesSpec, ILineSeriesSpec, ILinearProgressSeriesSpec, ILinkSeriesSpec, IMapSeriesSpec, IPie3dSeriesSpec, IPieSeriesSpec, IPolarSeriesSpec, IProgressLikeSeriesSpec, IRadarSeriesSpec, IRangeAreaSeriesSpec, IRangeColumn3dSeriesSpec, IRangeColumnSeriesSpec, IRoseSeriesSpec, ISankeySeriesSpec, IScatterSeriesSpec, ISunburstSeriesSpec, ITreemapSeriesSpec, IWaterfallSeriesSpec, IWordCloud3dSeriesSpec, IWordCloudSeriesSpec, ICorrelationSeriesSpec, ILiquidSeriesSpec, IVennSeriesSpec, IMosaicSeriesSpec, IPictogramSeriesSpec };
 export * from './interface';

package/types/series/interface/common.d.ts

@@ -1,13 +1,12 @@
 import type { DataView } from '@visactor/vdataset';
 import type { IGrammarItem } from '../../compile/interface';
-import type { IGroupMark } from '../../mark/group';
 import type { IBaseModelSpecTransformerResult, IModelConstructor, IModelMarkInfo, IModelOption, IModelSpecInfo } from '../../model/interface';
 import type { IRegion } from '../../region/interface';
 import type { RenderMode } from '../../typings/spec/common';
 import type { ISeries } from './series';
-import type { IMarkOption } from '../../mark/interface';
+import type { IGroupMark, IMarkOption } from '../../mark/interface';
 import type { ISeriesSpec, StringOrNumber } from '../../typings';
-import type { TransformedLabelSpec } from '../../component/label';
+import type { TransformedLabelSpec } from '../../component/label/interface';
 import type { SeriesMarkNameEnum, SeriesTypeEnum } from './type';
 export interface ISeriesSeriesInfo {
     key: string;

package/types/series/interface/series.d.ts

@@ -1,8 +1,7 @@
-import type { ILabelInfo } from './../../component/label/label';
 import type { PanEventParam, ZoomEventParam } from '../../event/interface';
 import type { IModel } from '../../model/interface';
 import type { DataSet, DataView, ITransformOptions } from '@visactor/vdataset';
-import type { IMark } from '../../mark/interface';
+import type { IGroupMark, ILabelMark, IMark } from '../../mark/interface';
 import type { CoordinateType, IPoint, IPolarPoint } from '../../typings/coordinate';
 import type { IRegion } from '../../region/interface';
 import type { IBaseScale } from '@visactor/vscale';
@@ -11,13 +10,11 @@ import type { IPolarAxisHelper } from '../../component/axis/polar/interface';
 import type { ISeriesSeriesInfo, ISeriesSpecInfo, ISeriesStackData } from './common';
 import type { ISeriesTooltipHelper } from './tooltip-helper';
 import type { IInvalidType, Datum, DirectionType, IGroup, StringOrNumber } from '../../typings';
-import type { ISeriesMarkAttributeContext, StateValueType } from '../../compile/mark';
-import type { StatisticOperations } from '../../data/transforms/dimension-statistics';
-import type { IGroupMark } from '../../mark/group';
+import type { ISeriesMarkAttributeContext, StateValueType } from '../../compile/mark/interface';
 import type { IGeoCoordinateHelper } from '../../component/geo/interface';
-import type { ILabelMark } from '../../mark/label';
-import type { BaseLegend } from '../../component/legend/base-legend';
-import type { ILabelSpec } from '../../component/label/interface';
+import type { ILabelSpec, ILabelInfo } from '../../component/label/interface';
+import type { StatisticOperations } from '../../data/transforms/interface';
+import type { ILegend } from '../../component/legend/interface';
 export interface ISeries extends IModel {
     readonly type: string;
     readonly name?: string;
@@ -105,7 +102,7 @@ export interface ISeries extends IModel {
     getSpecInfo: () => ISeriesSpecInfo;
     getMarkAttributeContext: () => ISeriesMarkAttributeContext;
     getSeriesFieldValue: (datum: Datum, seriesField?: string) => any;
-    legendSelectedFilter?: (component: BaseLegend<any>, selectedKeys: StringOrNumber[]) => StringOrNumber[];
+    legendSelectedFilter?: (component: ILegend, selectedKeys: StringOrNumber[]) => StringOrNumber[];
     parseLabelStyle?: (labelStyle: any, labelSpec: any, labelMark?: ILabelMark) => any;
 }
 export interface ICartesianSeries extends ISeries {