@visactor/vchart-types 1.7.0-alpha.0 → 1.7.0-alpha.2

package/types/component/label/base-label.d.ts

@@ -5,12 +5,11 @@ import type { IRegion } from '../../region/interface';
 import type { IModelRenderOption } from '../../model/interface';
 import type { ILabelSpec } from './interface';
 import type { IGraphic } from '@visactor/vrender-core';
-import type { ILayoutType } from '../../typings/layout';
 export declare abstract class BaseLabelComponent<T extends ILabelSpec = ILabelSpec> extends BaseComponent<T> {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
-    layoutType: ILayoutType;
+    layoutType: 'none';
     layoutZIndex: number;
     constructor(spec: T, options: IComponentOption);
     protected _interactiveConfig(labelSpec: ILabelSpec): {

package/types/component/label/interface.d.ts

@@ -2,6 +2,7 @@ import type { BaseLabelAttrs } from '@visactor/vrender-components';
 import type { ConvertToMarkStyleSpec, Datum, ITextMarkSpec } from '../../typings';
 import type { IComponentSpec } from '../base/interface';
 import type { ISeries } from '../..';
+import type { ILabelMark } from '../../mark/label';
 export interface ILabelFormatMethodContext {
     series?: ISeries;
 }
@@ -9,6 +10,7 @@ export interface ILabelSpec extends IComponentSpec {
     visible?: boolean;
     interactive?: boolean;
     formatMethod?: (text: string | string[], datum?: Datum, ctx?: ILabelFormatMethodContext) => string | string[];
+    formatter?: string;
     offset?: number;
     position?: string;
     style?: ConvertToMarkStyleSpec<ITextMarkSpec>;
@@ -33,4 +35,7 @@ export type ITotalLabelSpec = Pick<ILabelSpec, 'visible' | 'formatMethod' | 'int
 export interface ITotalLabelTheme extends Pick<ILabelSpec, 'visible' | 'interactive' | 'offset' | 'overlap' | 'smartInvert' | 'animation'> {
     style?: ITextMarkSpec;
 }
+export type TransformedLabelSpec = ILabelSpec & {
+    styleHandler: (mark?: ILabelMark) => void;
+};
 export {};

package/types/component/label/label.d.ts

@@ -3,19 +3,18 @@ import { ComponentTypeEnum } from '../interface/type';
 import type { IRegion } from '../../region/interface';
 import type { IModelInitOption } from '../../model/interface';
 import type { ISeries } from '../../series/interface';
-import { type ILabel, type IMark } from '@visactor/vgrammar-core';
+import type { ILabel, IMark as IVGrammarMark } from '@visactor/vgrammar-core';
 import { type IComponentMark } from '../../mark/component';
 import { BaseLabelComponent } from './base-label';
 import type { IGroup } from '@visactor/vrender-core';
-import type { ILabelSpec } from './interface';
+import type { ILabelSpec, TransformedLabelSpec } from './interface';
 import { type ILabelMark } from '../../mark/label';
 import type { ICompilableMark } from '../../compile/mark';
-import type { ILayoutType } from '../../typings/layout';
 export interface ILabelInfo {
     baseMark: ICompilableMark;
     labelMark: ILabelMark;
     series: ISeries;
-    labelSpec: ILabelSpec;
+    labelSpec: TransformedLabelSpec;
 }
 export interface ILabelComponentContext {
     region: IRegion;
@@ -25,7 +24,6 @@ export declare class Label<T extends ILabelSpec = ILabelSpec> extends BaseLabelC
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
-    layoutType: ILayoutType;
     layoutZIndex: number;
     protected _labelInfoMap: Map<IRegion, ILabelInfo[]>;
     protected _labelComponentMap: Map<IComponentMark, ILabelInfo | ILabelInfo[]>;
@@ -41,7 +39,7 @@ export declare class Label<T extends ILabelSpec = ILabelSpec> extends BaseLabelC
     updateLayoutAttribute(): void;
     protected _updateMultiLabelAttribute(labelInfo: ILabelInfo[], labelComponent: IComponentMark): void;
     protected _updateSingleLabelAttribute(labelInfo: ILabelInfo, labelComponent: IComponentMark): void;
-    protected _updateLabelComponentAttribute(component: ILabel, target: IMark | IMark[], labelInfos: ILabelInfo[]): void;
+    protected _updateLabelComponentAttribute(component: ILabel, target: IVGrammarMark | IVGrammarMark[], labelInfos: ILabelInfo[]): void;
     compileMarks(): void;
 }
 export declare const registerLabel: () => void;

package/types/component/label/totalLabel.d.ts

@@ -5,12 +5,10 @@ import type { ISeries } from '../../series/interface';
 import { BaseLabelComponent } from './base-label';
 import type { ITotalLabelSpec, ITotalLabelTheme } from './interface';
 import type { IModelInitOption } from '../../model/interface';
-import type { ILayoutType } from '../../typings';
 export declare class TotalLabel extends BaseLabelComponent {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
-    layoutType: ILayoutType;
     layoutZIndex: number;
     private _textMark?;
     private _baseMark?;

package/types/component/label/util.d.ts

@@ -7,17 +7,20 @@ export declare const labelRuleMap: {
     symbol: typeof symbolLabel;
     arc: typeof pieLabel;
     point: typeof pointLabel;
-    lineData: typeof lineDataLabel;
+    'line-data': typeof lineDataLabel;
     stackLabel: typeof stackLabel;
+    line: typeof LineLabel;
+    area: typeof LineLabel;
 };
 export declare enum LabelRule {
     rect = "rect",
     symbol = "symbol",
     arc = "arc",
     point = "point",
-    stackLabel = "stackLabel"
+    stackLabel = "stackLabel",
+    line = "line"
 }
-export declare function textAttribute(labelInfo: ILabelInfo, datum: Datum, formatMethod?: ILabelSpec['formatMethod']): any;
+export declare function textAttribute(labelInfo: ILabelInfo, datum: Datum, formatMethod?: ILabelSpec['formatMethod'], formatter?: ILabelSpec['formatter']): any;
 export declare function symbolLabel(labelInfo: ILabelInfo): {
     position: string | ((datum: Datum) => any);
     overlap: boolean | {
@@ -56,3 +59,7 @@ export declare function stackLabel(labelInfo: ILabelInfo): {
         strategy: any;
     };
 };
+export declare function LineLabel(labelInfo: ILabelInfo): {
+    position: string;
+    data: any;
+};

package/types/component/legend/util.d.ts

@@ -23,4 +23,4 @@ export declare function transformLegendTitleAttributes(title: ITitle): {
     space?: number;
     align?: "center" | "start" | "end";
 };
-export declare function getLayout(spec: ILegendCommonSpec): "vertical" | "horizontal";
+export declare function getLayout(spec: ILegendCommonSpec): "horizontal" | "vertical";

package/types/component/map-label/component.d.ts

@@ -5,7 +5,7 @@ import { ComponentTypeEnum } from '../interface/type';
 import { LayoutZIndex } from '../../constant';
 import type { IMapLabelSpec, MapLabelSceneNodeMap } from './interface';
 import type { ICartesianSeries, IGeoSeries } from '../../series/interface';
-import type { IPoint, Datum, ILayoutType } from '../../typings';
+import type { IPoint, Datum } from '../../typings';
 import type { IPairInfo } from './layout';
 import { MarkPoint } from '@visactor/vrender-components';
 import type { IGraphic } from '@visactor/vrender-core';
@@ -14,7 +14,7 @@ export declare class MapLabelComponent extends BaseComponent<IMapLabelSpec> {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
-    layoutType: ILayoutType;
+    layoutType: 'none';
     layoutZIndex: LayoutZIndex;
     protected nameField: string;
     protected valueField?: string;

package/types/component/marker/base-marker.d.ts

@@ -2,17 +2,20 @@ import type { DataView } from '@visactor/vdataset';
 import type { IModelRenderOption } from '../../model/interface';
 import type { IRegion } from '../../region/interface';
 import type { ICartesianSeries } from '../../series/interface';
-import type { ILayoutType, StringOrNumber } from '../../typings';
+import type { ILayoutRect, ILayoutType, IRect, StringOrNumber } from '../../typings';
 import { BaseComponent } from '../base/base-component';
 import type { IAggrType, IDataPos, IDataPosCallback, IMarkerAxisSpec, IMarkerSpec } from './interface';
 import type { IGraphic } from '@visactor/vrender-core';
 export declare abstract class BaseMarker<T extends IMarkerSpec & IMarkerAxisSpec> extends BaseComponent<T> {
-    layoutType: ILayoutType;
+    layoutType: ILayoutType | 'none';
     protected _startRelativeSeries: ICartesianSeries;
     protected _endRelativeSeries: ICartesianSeries;
     protected _relativeSeries: ICartesianSeries;
+    getRelativeSeries(): ICartesianSeries;
     protected _markerData: DataView;
     protected _markerComponent: any;
+    protected _layoutOffsetX: number;
+    protected _layoutOffsetY: number;
     created(): void;
     private _isSpecAggr;
     private _getAllRelativeSeries;
@@ -44,6 +47,7 @@ export declare abstract class BaseMarker<T extends IMarkerSpec & IMarkerAxisSpec
         getEndRelativeSeries: () => ICartesianSeries;
         y: IDataPos | IDataPosCallback;
     };
+    protected _processSpecXY(specX: IDataPos | IDataPosCallback, specY: IDataPos | IDataPosCallback): any;
     protected _processSpecCoo(spec: any): any;
     updateLayoutAttribute(): void;
     protected _getSeriesByIdOrIndex(seriesUserId: StringOrNumber, seriesIndex: number): ICartesianSeries;
@@ -62,4 +66,5 @@ export declare abstract class BaseMarker<T extends IMarkerSpec & IMarkerAxisSpec
     changeRegions(regions: IRegion[]): void;
     protected getFirstSeries(): ICartesianSeries;
     getVRenderComponents(): IGraphic[];
+    onLayoutStart(layoutRect: IRect, chartViewRect: ILayoutRect, ctx: any): void;
 }

package/types/component/marker/interface.d.ts

@@ -1,18 +1,27 @@
-import type { IPadding, IPointLike } from '@visactor/vutils';
+import type { IPadding } from '@visactor/vutils';
 import type { SymbolType } from '@visactor/vrender-core';
 import type { IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec, StringOrNumber } from '../../typings';
 import type { IComponentSpec } from '../base/interface';
 import type { Datum } from '@visactor/vrender-components';
 export type IAggrType = 'sum' | 'average' | 'min' | 'max' | 'variance' | 'standardDeviation' | 'median';
-export type IDataPos = string | number | IAggrType;
+export type IDataPos = StringOrNumber | IAggrType;
 export type IDataPosCallback = (relativeSeriesData: any, startRelativeSeriesData: any, endRelativeSeriesData: any) => IDataPos;
 export type IDataPointSpec = {
     [key: string]: IDataPos;
     refRelativeSeriesIndex?: number;
     refRelativeSeriesId?: StringOrNumber;
+    xFieldIndex?: number;
+    xFieldDim?: string;
+    yFieldIndex?: number;
+    yFieldDim?: string;
+};
+type Point = {
+    x: number;
+    y: number;
 };
 export type IMarkerPositionsSpec = {
-    positions: IPointLike[];
+    positions: Point[];
+    regionRelative?: boolean;
 };
 export type IMarkerLabelWithoutRefSpec = {
     visible?: boolean;
@@ -56,6 +65,7 @@ export interface IMarkerSpec extends IComponentSpec {
     interactive?: boolean;
     autoRange?: boolean;
     clip?: boolean;
+    name?: string;
 }
 export interface IMarkerSymbol extends IMarkerRef {
     visible: boolean;
@@ -63,3 +73,4 @@ export interface IMarkerSymbol extends IMarkerRef {
     size?: number;
     style?: Omit<ISymbolMarkSpec, 'visible'>;
 }
+export {};

package/types/component/marker/mark-area/interface/spec.d.ts

@@ -3,7 +3,7 @@ import type { IMarkerPositionsSpec, IDataPointSpec, IDataPos, IMarkerSpec, IMark
 import type { IMarkAreaTheme } from './theme';
 export type IMarkArea = IComponent;
 export type IRegressType = 'regression';
-export type IMarkAreaSpec = IMarkerSpec & (IMarkAreaXSpec | IMarkAreaYSpec | IMarkAreaCoordinateSpec | IMarkAreaPositionsSpec) & IMarkAreaTheme;
+export type IMarkAreaSpec = IMarkerSpec & (IMarkAreaXSpec | IMarkAreaYSpec | (IMarkAreaXSpec & IMarkAreaYSpec) | IMarkAreaCoordinateSpec | IMarkAreaPositionsSpec) & IMarkAreaTheme;
 export interface IMarkAreaXSpec extends IMarkerAxisSpec {
     x: IDataPos | IDataPosCallback;
     x1: IDataPos | IDataPosCallback;

package/types/component/marker/mark-line/interface/spec.d.ts

@@ -2,8 +2,7 @@ import type { IComponent } from '../../../interface';
 import type { IAggrType, IMarkerPositionsSpec, IDataPointSpec, IMarkerSpec, IMarkerAxisSpec, IDataPos, IDataPosCallback, IMarkerLabelSpec } from '../../interface';
 import type { IRegressType } from '../../mark-area/interface';
 import type { IMarkLineTheme } from './theme';
-import type { ILineMarkSpec } from '../../../../typings';
-import type { IPointLike } from '@visactor/vutils';
+import type { ILineMarkSpec, IPoint } from '../../../../typings';
 export type IMarkLine = IComponent;
 export type IMarkLineSpec = (IMarkerSpec & (IMarkLineXSpec | IMarkLineYSpec | IMarkLineCoordinateSpec | IMarkLinePositionsSpec) & IMarkLineTheme) | IStepMarkLineSpec;
 export interface IMarkLineXSpec extends IMarkerAxisSpec {
@@ -32,7 +31,7 @@ export type IMarkLinePositionsSpec = IMarkerPositionsSpec;
 export type IStepMarkLineSpec = IMarkerSpec & {
     type: 'type-step';
     connectDirection: 'top' | 'bottom' | 'left' | 'right';
-    expandDistance?: number;
+    expandDistance?: number | string;
     label?: IMarkerLabelSpec;
     line?: {
         multiSegment?: boolean;
@@ -49,5 +48,5 @@ export type IStepMarkLineSpec = IMarkerSpec & {
         xy: IRegressType;
     };
 } | {
-    positions: [IPointLike, IPointLike];
+    positions: [IPoint, IPoint];
 });

package/types/component/marker/mark-line/util.d.ts

@@ -1,6 +1,6 @@
-import type { IPointLike } from '@visactor/vutils';
-export declare function getInsertPoints(start: IPointLike, end: IPointLike, direction: 'top' | 'bottom' | 'left' | 'right', offset?: number): IPointLike[];
-export declare function getTextOffset(start: IPointLike, end: IPointLike, direction: 'top' | 'bottom' | 'left' | 'right', offset?: number): {
+import type { IPoint } from '../../../typings';
+export declare function getInsertPoints(start: IPoint, end: IPoint, direction: 'top' | 'bottom' | 'left' | 'right', offset?: number): IPoint[];
+export declare function getTextOffset(start: IPoint, end: IPoint, direction: 'top' | 'bottom' | 'left' | 'right', offset?: number): {
     dx: number;
     dy: number;
 } | {

package/types/component/marker/mark-point/interface/spec.d.ts

@@ -1,14 +1,15 @@
-import type { IPointLike } from '@visactor/vutils';
+import type { IPoint } from '../../../../typings';
 import type { IComponent } from '../../../interface';
-import type { IDataPointSpec, IMarkerSpec } from '../../interface';
+import type { IDataPointSpec, IMarkerSpec, IMarkerSymbol } from '../../interface';
 import type { IMarkPointTheme } from './theme';
 export type IMarkPoint = IComponent;
-export type IMarkPointSpec = IMarkerSpec & (IMarkPointCoordinateSpec | IMarkPointPositionsSpec) & IMarkPointTheme;
+export type IMarkPointSpec = IMarkerSpec & (IMarkPointCoordinateSpec | IMarkPointPositionsSpec) & IMarkPointTheme<IMarkerSymbol>;
 export type IMarkPointCoordinateSpec = {
     coordinates: IDataPointSpec;
     relativeRelativeSeriesIndex?: number;
     relativeRelativeSeriesId?: string;
 };
 export type IMarkPointPositionsSpec = {
-    position: IPointLike;
+    position: IPoint;
+    regionRelative?: boolean;
 };

package/types/component/marker/mark-point/interface/theme.d.ts

@@ -18,20 +18,20 @@ export interface IItemContent extends IMarkerRef {
         style?: IRichTextGraphicAttribute;
     };
 }
-export type IItemLine = {
+export type IItemLine<T extends Partial<IMarkerSymbol> = IMarkerSymbol> = {
     type?: 'type-s' | 'type-do' | 'type-po' | 'type-op';
     visible?: boolean;
     decorativeLine?: {
         visible?: boolean;
         length?: number;
     };
-    startSymbol?: IMarkerSymbol;
-    endSymbol?: IMarkerSymbol;
+    startSymbol?: T;
+    endSymbol?: T;
     line?: {
         style?: Omit<ILineMarkSpec, 'visible'>;
     };
 };
-export interface IMarkPointTheme {
-    itemLine?: IItemLine;
+export interface IMarkPointTheme<T extends Partial<IMarkerSymbol> = Partial<IMarkerSymbol>> {
+    itemLine?: IItemLine<T>;
     itemContent?: IItemContent;
 }

package/types/component/marker/utils.d.ts

@@ -1,6 +1,5 @@
 import type { ICartesianSeries } from '../../series/interface';
 import type { DataView } from '@visactor/vdataset';
-import type { IPointLike } from '@visactor/vutils';
-export declare function xLayout(data: DataView, startRelativeSeries: ICartesianSeries, endRelativeSeries: ICartesianSeries, relativeSeries: ICartesianSeries, autoRange: boolean): [IPointLike, IPointLike][];
-export declare function yLayout(data: DataView, startRelativeSeries: ICartesianSeries, endRelativeSeries: ICartesianSeries, relativeSeries: ICartesianSeries, autoRange: boolean): [IPointLike, IPointLike][];
-export declare function coordinateLayout(data: DataView, relativeSeries: ICartesianSeries, autoRange: boolean): IPointLike[];
+import type { IPoint } from '../../typings';
+export declare function xyLayout(data: DataView, startRelativeSeries: ICartesianSeries, endRelativeSeries: ICartesianSeries, relativeSeries: ICartesianSeries, autoRange: boolean): IPoint[][];
+export declare function coordinateLayout(data: DataView, relativeSeries: ICartesianSeries, autoRange: boolean): IPoint[];

package/types/component/tooltip/handler/utils/attribute.d.ts

@@ -3,7 +3,7 @@ import type { IToolTipActual } from '../../../../typings';
 import type { ITooltipTextStyle } from '../interface';
 import type { ITooltipSpec } from '../../interface/spec';
 import type { ITooltipTextTheme, ITooltipTheme } from '../../interface/theme';
-import type { IChartLevelTheme } from '../../../../core/interface';
-export declare function getTextAttributes(style?: ITooltipTextTheme, globalTheme?: IChartLevelTheme, defaultAttributes?: Partial<ITooltipTextStyle>): ITooltipTextStyle;
+import type { ITheme } from '../../../../theme';
+export declare function getTextAttributes(style?: ITooltipTextTheme, globalTheme?: ITheme, defaultAttributes?: Partial<ITooltipTextStyle>): ITooltipTextStyle;
 export declare const getPanelAttributes: (style: ITooltipTheme['panel']) => TooltipPanelAttrs;
-export declare const getTooltipAttributes: (actualTooltip: IToolTipActual, spec: ITooltipSpec, globalTheme: IChartLevelTheme) => TooltipAttributes;
+export declare const getTooltipAttributes: (actualTooltip: IToolTipActual, spec: ITooltipSpec, globalTheme: ITheme) => TooltipAttributes;

package/types/component/tooltip/interface/spec.d.ts

@@ -6,7 +6,7 @@ export interface ITooltipSpec extends Partial<ITooltipActiveTypeAsKeys<ITooltipP
     activeType?: TooltipActiveType | TooltipActiveType[];
     trigger?: 'hover' | 'click' | 'none';
     triggerOff?: 'hover' | 'click' | 'none';
-    style?: Omit<ITooltipTheme, 'offset'>;
+    style?: Omit<ITooltipTheme<string>, 'offset'>;
     handler?: Partial<ITooltipHandlerSpec>;
     renderMode?: 'html' | 'canvas';
     confine?: boolean;

package/types/component/tooltip/interface/theme.d.ts

@@ -1,12 +1,11 @@
 import type { RichTextWordBreak } from '@visactor/vrender-core';
 import type { StringOrNumber, TextAlign, TextBaseLine } from '../../../typings';
-import type { IColorKey } from '../../../theme/color-scheme/interface';
 import type { Padding } from '@visactor/vrender-components/es/core/type';
-export interface ITooltipTextTheme {
+export interface ITooltipTextTheme<ColorType = string> {
     fontFamily?: string;
     fontSize?: number;
-    fill?: string | IColorKey;
-    fontColor?: string | IColorKey;
+    fill?: ColorType;
+    fontColor?: ColorType;
     fontWeight?: StringOrNumber;
     textAlign?: TextAlign;
     textBaseline?: TextBaseLine;
@@ -17,12 +16,12 @@ export interface ITooltipTextTheme {
     wordBreak?: RichTextWordBreak;
     autoWidth?: boolean;
 }
-export interface ITooltipTheme {
+export interface ITooltipTheme<ColorType = string> {
     panel?: {
         padding?: Padding;
-        backgroundColor?: string | IColorKey;
+        backgroundColor?: ColorType;
         border?: {
-            color?: string | IColorKey;
+            color?: ColorType;
             width?: number;
             radius?: number;
         };
@@ -31,16 +30,16 @@ export interface ITooltipTheme {
             y: number;
             blur: number;
             spread: number;
-            color: string | IColorKey;
+            color: ColorType;
         };
     };
     shape?: {
         size?: number;
         spacing?: number;
     };
-    titleLabel?: ITooltipTextTheme;
-    keyLabel?: Omit<ITooltipTextTheme, 'autoWidth'>;
-    valueLabel?: ITooltipTextTheme;
+    titleLabel?: ITooltipTextTheme<ColorType>;
+    keyLabel?: Omit<ITooltipTextTheme<ColorType>, 'autoWidth'>;
+    valueLabel?: ITooltipTextTheme<ColorType>;
     spaceRow?: number;
     offset?: {
         x?: number;

package/types/component/tooltip/tooltip.d.ts

@@ -5,7 +5,7 @@ import type { IRegion } from '../../region/interface';
 import { BaseComponent } from '../base/base-component';
 import type { BaseEventParams, EventCallback, EventQuery, EventType } from '../../event/interface';
 import type { ITooltipHandler, IToolTipLineActual, TooltipActiveType } from '../../typings/tooltip';
-import type { Datum, ILayoutType, IShowTooltipOption } from '../../typings';
+import type { Datum, IShowTooltipOption } from '../../typings';
 import type { ITooltip, ITooltipActiveTypeAsKeys, ITooltipSpec, ITooltipTheme, TooltipHandlerParams, TotalMouseEventData } from './interface';
 import { TooltipResult } from './interface/common';
 import { DimensionTooltipProcessor } from './processor/dimension-tooltip';
@@ -20,7 +20,7 @@ export declare class Tooltip extends BaseComponent<any> implements ITooltip {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
-    layoutType: ILayoutType;
+    layoutType: 'none';
     protected _spec: ITooltipSpec;
     static createComponent(spec: any, options: IComponentOption): Tooltip | Tooltip[];
     tooltipHandler?: ITooltipHandler;

package/types/component/util.d.ts

@@ -1,4 +1,2 @@
 import type { IModelOption } from '../model/interface';
-import type { ComponentTypeEnum } from './interface';
-import type { IComponentTheme } from './interface/theme';
-export declare function getComponentThemeFromOption(type: keyof IComponentTheme | ComponentTypeEnum, option: Partial<IModelOption>): any;
+export declare function getComponentThemeFromOption(type: string, option: Partial<IModelOption>): any;

package/types/core/expression-function.d.ts

@@ -0,0 +1,12 @@
+export declare class ExpressionFunction {
+    functions: {
+        [key: string]: Function;
+    };
+    static instance_: ExpressionFunction;
+    static instance(): ExpressionFunction;
+    constructor();
+    registerFunction(name: string, fun: Function): void;
+    unregisterFunction(name: string): void;
+    getFunction(name: string): Function | null;
+    getFunctionNameList(): string[] | null;
+}

package/types/core/index.d.ts

@@ -7,6 +7,7 @@ export type { IStateSpec, StateValueType } from '../compile/mark';
 export * from '../typings/spec/common';
 export * from '../event/interface';
 export * from '../theme/interface';
+export * from '../constant';
 export * from '../typings/spec/index';
 export * from '../theme/index';
 export { vglobal } from '@visactor/vrender-core';

package/types/core/interface.d.ts

@@ -33,6 +33,7 @@ export interface IVChart {
     }[]) => Promise<IVChart>;
     updateDataSync: (id: StringOrNumber, data: Datum[], options?: IParserOptions) => IVChart;
     updateSpec: (spec: ISpec, forceMerge?: boolean, morphConfig?: IMorphConfig) => Promise<IVChart>;
+    updateSpecSync: (spec: ISpec, forceMerge?: boolean, morphConfig?: IMorphConfig) => void;
     updateModelSpecSync: (filter: string | {
         type: string;
         index: number;
@@ -81,6 +82,10 @@ export interface IVChart {
     stopAnimation: () => void;
     pauseAnimation: () => void;
     resumeAnimation: () => void;
+    registerFunction: (key: string, fun: Function) => void;
+    unregisterFunction: (key: string) => void;
+    getFunction: (key: string) => Function | null;
+    getFunctionList: () => string[] | null;
 }
 export interface IGlobalConfig {
     uniqueTooltip?: boolean;

package/types/core/vchart.d.ts

@@ -31,6 +31,10 @@ export declare class VChart implements IVChart {
     static useMark(marks: MarkConstructor[]): void;
     static useLayout(layouts: ILayoutConstructor[]): void;
     static registerDataSetTransform(name: string, transform: Transform): void;
+    static registerFunction(key: string, fun: Function): void;
+    static unregisterFunction(key: string): void;
+    static getFunction(key: string): Function | null;
+    static getFunctionList(): string[] | null;
     static registerMap(key: string, source: GeoSourceType, option?: GeoSourceOption): void;
     static unregisterMap(key: string): void;
     static getMap(key: string): GeoSourceType;
@@ -59,7 +63,7 @@ export declare class VChart implements IVChart {
     private _curSize;
     private _observer;
     private _currentThemeName;
-    private _currentChartLevelTheme;
+    private _currentTheme;
     private _onError?;
     private _context;
     private _isReleased;
@@ -146,5 +150,9 @@ export declare class VChart implements IVChart {
     convertDatumToPosition(datum: Datum, dataLinkInfo?: DataLinkSeries, isRelativeToCanvas?: boolean): IPoint | null;
     convertValueToPosition(value: StringOrNumber, dataLinkInfo: DataLinkAxis, isRelativeToCanvas?: boolean): number | null;
     convertValueToPosition(value: [StringOrNumber, StringOrNumber], dataLinkInfo: DataLinkSeries, isRelativeToCanvas?: boolean): IPoint | null;
+    getFunction(key: string): Function | null;
+    registerFunction(key: string, fun: Function): void;
+    unregisterFunction(key: string): void;
+    getFunctionList(): string[];
 }
 export declare const registerVChartCore: () => void;

package/types/data/transforms/aggregation.d.ts

@@ -1,6 +1,7 @@
 import type { DataView } from '@visactor/vdataset';
 import type { IAggrType } from '../../component/marker/interface';
 import type { ICartesianSeries } from '../../series/interface';
+import type { StringOrNumber } from '../../typings';
 export type IOption = {
     field: string;
 };
@@ -8,7 +9,7 @@ export type IOptionAggrField = {
     field: string;
     aggrType: IAggrType;
 };
-export type IOptionPos = IOptionAggrField | string | number;
+export type IOptionPos = IOptionAggrField | string | number | StringOrNumber[];
 export type IOptionSeries = {
     getRelativeSeries: () => ICartesianSeries;
     getStartRelativeSeries: () => ICartesianSeries;
@@ -28,6 +29,6 @@ export declare function markerVariance(_data: Array<DataView>, opt: IOption): nu
 export declare function markerStandardDeviation(_data: Array<DataView>, opt: IOption): number;
 export declare function markerMedian(_data: Array<DataView>, opt: IOption): number;
 export declare function markerAggregation(_data: Array<DataView>, options: IOptionAggr[]): {
-    x: string | number | null;
-    y: string | number | null;
+    x: StringOrNumber[] | StringOrNumber | null;
+    y: StringOrNumber[] | StringOrNumber | null;
 }[];

package/types/data/transforms/sankey.d.ts

@@ -10,12 +10,9 @@ export interface ISankeyOpt extends SankeyOptions {
         y1: number;
     };
 }
-export declare const sankey: (data: SankeyData, op: ISankeyOpt) => {
-    nodes?: import("@visactor/vgrammar-sankey").SankeyNodeDatum[];
-    links: import("@visactor/vgrammar-sankey").SankeyLinkDatum[];
-} | {
-    nodes: import("@visactor/vgrammar-sankey").HierarchyNodeDatum[];
-} | {
+export declare const collectHierarchyField: (set: Set<any>, data: any[], field: string) => void;
+export declare const sankeyFormat: (data: any[]) => SankeyData[];
+export declare const sankeyLayout: (data: SankeyData[], op: ISankeyOpt) => {
     nodes: import("@visactor/vgrammar-sankey").SankeyNodeElement[];
     links: import("@visactor/vgrammar-sankey").SankeyLinkElement[];
     columns: import("@visactor/vgrammar-sankey").SankeyNodeElement[][];

package/types/event/events/dimension/base.d.ts

@@ -10,6 +10,7 @@ export declare class DimensionEvent implements IComposedEvent {
     protected _callback: (params: BaseEventParams) => void;
     protected _chart: Maybe<IChart>;
     constructor(eventDispatcher: IEventDispatcher, mode: RenderMode);
+    private get chart();
     register<Evt extends string>(eType: Evt, handler: EventHandler<EventParamsDefinition[Evt]>): void;
     unregister(): void;
     protected getTargetDimensionInfo(x: number, y: number): IDimensionInfo[] | null;

package/types/event/interface.d.ts

@@ -12,7 +12,7 @@ import type { TooltipEventParams } from '../component/tooltip/interface/event';
 import type { ILayoutItem } from '../layout/interface';
 export type EventType = 'pointerdown' | 'pointerup' | 'pointerupoutside' | 'pointertap' | 'pointerover' | 'pointermove' | 'pointerenter' | 'pointerleave' | 'pointerout' | 'mousedown' | 'mouseup' | 'mouseupoutside' | 'rightdown' | 'rightup' | 'rightupoutside' | 'click' | 'dblclick' | 'mousemove' | 'mouseover' | 'mouseout' | 'mouseenter' | 'mouseleave' | 'wheel' | 'touchstart' | 'touchend' | 'touchendoutside' | 'touchmove' | 'touchcancel' | 'tap' | 'dragstart' | 'drag' | 'dragenter' | 'dragleave' | 'dragover' | 'dragend' | 'drop' | 'pan' | 'panstart' | 'panend' | 'press' | 'pressup' | 'pressend' | 'pinch' | 'pinchstart' | 'pinchend' | 'swipe' | keyof typeof ChartEvent | keyof typeof VGRAMMAR_HOOK_EVENT | string;
 export type EventBubbleLevel = keyof typeof Event_Bubble_Level;
-export type ComponentType = 'axis' | 'dataZoom' | 'indicator' | 'legend' | 'mapLabel' | 'markLine' | 'tooltip' | 'title' | 'label';
+export type ComponentType = 'axis' | 'dataZoom' | 'indicator' | 'legend' | 'mapLabel' | 'markLine' | 'markArea' | 'markPoint' | 'tooltip' | 'title' | 'label';
 export type EventTargetType = MarkType | ComponentType | SeriesType;
 export type EventSourceType = keyof typeof Event_Source_Type;
 export type EventQuery = {

package/types/index-wx-simple.d.ts

@@ -0,0 +1,4 @@
+import { VChart } from './core';
+export * from './core';
+export { VChart };
+export default VChart;

package/types/interaction/config.d.ts

@@ -3,7 +3,7 @@ export declare function getDefaultInteractionConfigByMode(mode: RenderMode): {
     hover: {
         enable: boolean;
         trigger: string;
-        triggerOff: string[];
+        triggerOff: string;
     };
     select: {
         enable: boolean;
@@ -13,7 +13,7 @@ export declare function getDefaultInteractionConfigByMode(mode: RenderMode): {
     hover: {
         enable: boolean;
         trigger: string[];
-        triggerOff: string[];
+        triggerOff: string;
     };
     select: {
         enable: boolean;

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

@@ -29,8 +29,8 @@ export declare class BaseMark<T extends ICommonSpec> extends CompilableMark impl
     setAttribute<U extends keyof T>(attr: U, style: MarkInputStyle<T[U]>, state?: StateValueType, level?: number, stateStyle?: IMarkStateStyle<T>): void;
     protected _getDefaultStyle(): IMarkStyle<T>;
     protected _styleConvert<U extends keyof T>(style?: MarkInputStyle<T[U]>): StyleConvert<T[U]> | undefined;
-    protected _computeAttribute<U extends keyof T>(key: U, datum: Datum, state: StateValueType, opt: IAttributeOpt): any;
-    protected _computeStateAttribute<U extends keyof T>(stateStyle: any, key: U, datum: Datum, state: StateValueType, opt: IAttributeOpt): any;
+    protected _computeAttribute<U extends keyof T>(key: U, state: StateValueType): any;
+    protected _computeStateAttribute<U extends keyof T>(stateStyle: any, key: U, state: StateValueType): any;
     private _initStyle;
     private _initSpecStyle;
     private _computeGradientAttr;

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

@@ -71,7 +71,6 @@ export declare abstract class BaseModel<T extends IModelSpec> extends Compilable
     protected _getDefaultSpecFromChart(chartSpec: any): Partial<T>;
     protected _shouldMergeThemeToSpec(): boolean;
     protected _prepareSpecBeforeMergingTheme(obj?: any): any;
-    protected _prepareSpecAfterMergingTheme(obj?: any): any;
     setCurrentTheme(noRender?: boolean): Promise<void>;
     updateLayoutAttribute(): void;
     setAttrFromSpec(): void;
@@ -84,5 +83,4 @@ export declare abstract class BaseModel<T extends IModelSpec> extends Compilable
     protected _createMark<T extends IMark>(markInfo: IModelMarkInfo, option?: Partial<IMarkOption>): T;
     protected _getDataIdKey(): string | ((datum: Datum) => string) | undefined;
     getColorScheme(): import("..").IThemeColorScheme;
-    protected _getChartLevelTheme(): import("../core/interface").IChartLevelTheme;
 }