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

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

@@ -6,6 +6,7 @@ import type { ILineLikeLabelSpec, ILineLikeSeriesTheme } from '../mixin/line-mix
 import type { IAnimationSpec } from '../../animation/spec';
 import type { AreaAppearPreset } from './animation';
 import type { IDataSamping, IMarkOverlap, IMarkProgressiveConfig } from '../../mark/interface';
+import type { ILabelSpec } from '../../component';
 export interface IAreaSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<string, AreaAppearPreset>, IMarkProgressiveConfig, IDataSamping, IMarkOverlap {
     type: 'area';
     xField: string | string[];
@@ -14,6 +15,9 @@ export interface IAreaSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<st
     [SeriesMarkNameEnum.line]?: IMarkSpec<ILineMarkSpec>;
     [SeriesMarkNameEnum.area]?: IMarkSpec<IAreaMarkSpec>;
     [SeriesMarkNameEnum.label]?: ILineLikeLabelSpec;
+    [SeriesMarkNameEnum.areaLabel]?: Omit<ILabelSpec, 'position'> & {
+        position?: 'start' | 'end';
+    };
     seriesMark?: 'point' | 'line' | 'area';
     activePoint?: boolean;
 }

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

@@ -12,6 +12,9 @@ import type { StatisticOperations } from '../../data/transforms/dimension-statis
 import { SeriesData } from './series-data';
 import type { IGroupMark } from '../../mark/group';
 import type { ISeriesMarkAttributeContext } from '../../compile/mark';
+import type { ILabelSpec } from '../../component';
+import type { ILabelMark } from '../../mark/label';
+import type { TransformedLabelSpec } from '../../component/label';
 export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseModel<T> implements ISeries {
     readonly specKey: string;
     readonly type: string;
@@ -192,4 +195,5 @@ export declare abstract class BaseSeries<T extends ISeriesSpec> extends BaseMode
     getMarkInfoList(): import("../../model/interface").IModelMarkInfo[];
     protected _getInvalidConnectType(): "none" | "zero" | "connect";
     protected _getInvalidDefined: (datum: Datum) => boolean;
+    protected _preprocessLabelSpec(spec: ILabelSpec, styleHandler?: (mark: ILabelMark) => void, hasAnimation?: boolean): TransformedLabelSpec;
 }

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

@@ -76,7 +76,9 @@ export declare abstract class CartesianSeries<T extends ICartesianSeriesSpec = I
     protected _axisPosition(helper: IAxisHelper, value: StringOrNumber | StringOrNumber[], datum?: any): number;
     valueToPositionX(value: StringOrNumber | StringOrNumber[], datum?: any): number;
     valueToPositionY(value: StringOrNumber | StringOrNumber[], datum?: any): number;
+    protected _positionXEncoder?: (datum: Datum) => number;
     dataToPositionX(datum: Datum): number;
+    protected _positionYEncoder?: (datum: Datum) => number;
     dataToPositionY(datum: Datum): number;
     dataToPositionZ(datum: Datum): number;
     dataToPositionX1(datum: Datum): number;
@@ -92,4 +94,5 @@ export declare abstract class CartesianSeries<T extends ICartesianSeriesSpec = I
     viewDataUpdate(d: DataView): void;
     _sortDataInAxisDomain(): void;
     protected _getInvalidDefined: (datum: Datum) => boolean;
+    reInit(theme?: any, lastSpec?: any): void;
 }

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

@@ -25,7 +25,6 @@ export declare class GaugeSeries<T extends IGaugeSeriesSpec = IGaugeSeriesSpec>
     protected _getAngleValueEndWithoutMask(datum: Datum): number;
     protected _getAngleValueStartWithoutPadAngle(datum: Datum): number;
     protected _getAngleValueEndWithoutPadAngle(datum: Datum): number;
-    protected _preprocessLabelSpec(): import("../..").ILabelSpec;
     initAnimation(): void;
     getDefaultShapeType(): string;
     getActiveMarks(): IMark[];

package/types/series/index.d.ts

@@ -63,8 +63,8 @@ import type { IProgressLikeSeriesSpec } from './polar/progress-like';
 import { ProgressLikeSeries } from './polar/progress-like';
 import type { IRoseLikeSeriesSpec } from './polar/rose-like';
 import { RoseLikeSeries } from './polar/rose-like';
-import type { ISeries } from './interface';
+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 };
 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 };
-export type { ISeries, 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 };
+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 };
 export * from './interface';

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

@@ -7,7 +7,7 @@ import type { RenderMode } from '../../typings/spec/common';
 import type { ISeries } from './series';
 import type { IMarkProgressiveConfig } from '../../mark/interface';
 import type { StringOrNumber } from '../../typings';
-import type { ILabelSpec } from '../../component/label';
+import type { TransformedLabelSpec } from '../../component/label';
 import type { SeriesMarkNameEnum } from './type';
 export interface ISeriesSeriesInfo {
     key: string;
@@ -64,7 +64,7 @@ export interface ISeriesMarkInitOption {
     dataProductId?: string;
     seriesId?: number;
     progressive?: IMarkProgressiveConfig;
-    label?: ILabelSpec;
+    label?: TransformedLabelSpec;
     support3d?: boolean;
 }
 export interface ISeriesMarkInfo extends IModelMarkInfo {

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

@@ -94,6 +94,7 @@ export interface ISeries extends IModel {
     getTrigger: () => ITrigger;
     getDefaultShapeType: () => string;
     initLabelMarkStyle?: (labelMark: ILabelMark) => void;
+    getGroupFields: () => string[];
 }
 export interface ICartesianSeries extends ISeries {
     readonly coordinate: 'cartesian';

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

@@ -86,6 +86,8 @@ export declare enum SeriesMarkNameEnum {
     ripplePoint = "ripplePoint",
     centerPoint = "centerPoint",
     centerLabel = "centerLabel",
-    barBackground = "barBackground"
+    barBackground = "barBackground",
+    lineLabel = "lineLabel",
+    areaLabel = "areaLabel"
 }
 export declare const seriesMarkNameSet: Set<string>;

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

@@ -6,6 +6,7 @@ import type { LineAppearPreset } from './animation';
 import type { ILineLikeLabelSpec, ILineLikeSeriesTheme } from '../mixin/line-mixin';
 import type { IDataSamping, IMarkOverlap, IMarkProgressiveConfig } from '../../mark/interface';
 import type { SeriesMarkNameEnum } from '../interface/type';
+import type { ILabelSpec } from '../../component';
 type LineMarks = 'point' | 'line';
 export interface ILineSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<LineMarks, LineAppearPreset>, IMarkProgressiveConfig, IDataSamping, IMarkOverlap {
     type: 'line';
@@ -14,6 +15,9 @@ export interface ILineSeriesSpec extends ICartesianSeriesSpec, IAnimationSpec<Li
     [SeriesMarkNameEnum.point]?: IMarkSpec<ISymbolMarkSpec>;
     [SeriesMarkNameEnum.line]?: IMarkSpec<ILineMarkSpec>;
     [SeriesMarkNameEnum.label]?: ILineLikeLabelSpec;
+    [SeriesMarkNameEnum.lineLabel]?: Omit<ILabelSpec, 'position'> & {
+        position: 'start' | 'end';
+    };
     seriesMark?: 'line' | 'point';
     activePoint?: boolean;
 }

package/types/series/line/line.d.ts

@@ -2,7 +2,7 @@ import { CartesianSeries } from '../cartesian/cartesian';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface/type';
 import { LineLikeSeriesMixin } from '../mixin/line-mixin';
-import { type Datum, type Maybe } from '../../typings';
+import type { Datum, Maybe } from '../../typings';
 import type { ILineSeriesSpec, ILineSeriesTheme } from './interface';
 import type { IMark } from '../../mark/interface';
 export interface LineSeries<T extends ILineSeriesSpec = ILineSeriesSpec> extends Pick<LineLikeSeriesMixin, 'initLineMark' | 'initSymbolMark' | 'initLabelMarkStyle' | 'initLineMarkStyle' | 'initSymbolMarkStyle' | '_lineMark' | '_symbolMark' | 'addSamplingCompile' | 'addOverlapCompile' | 'reCompileSampling'>, CartesianSeries<T> {

package/types/series/mixin/line-mixin.d.ts

@@ -7,7 +7,7 @@ import type { ISymbolMark } from '../../mark/symbol';
 import type { ITextMark } from '../../mark/text';
 import type { DirectionType, IInvalidType, InterpolateType, ILineMarkSpec, ISymbolMarkSpec, Maybe, Datum, IMarkTheme, ILayoutRect } from '../../typings';
 import type { ISeriesMarkInfo, ISeriesMarkInitOption, ISeriesTooltipHelper } from '../interface';
-import type { ILabelSpec } from '../../component/label';
+import type { ILabelSpec, TransformedLabelSpec } from '../../component/label';
 import { type DimensionEventParams } from '../../event/events/dimension';
 import type { ILabelMark } from '../../mark/label';
 import type { Functional } from '@visactor/vrender-components';
@@ -45,6 +45,7 @@ export interface LineLikeSeriesMixin extends ISeries {
     _getInvalidDefined: () => boolean;
     _getInvalidConnectType: () => IInvalidType;
     getLayoutRect: () => ILayoutRect;
+    _preprocessLabelSpec: (label: ILabelSpec, styleHandler?: (mark: ILabelMark) => void, hasAnimation?: boolean) => TransformedLabelSpec;
 }
 export declare class LineLikeSeriesMixin {
     addSamplingCompile(): void;
@@ -57,5 +58,6 @@ export declare class LineLikeSeriesMixin {
     initSymbolMark(progressive?: IMarkProgressiveConfig, isSeriesMark?: boolean): ISymbolMark;
     initSymbolMarkStyle(): ISymbolMark;
     initLabelMarkStyle(labelMark?: ILabelMark): void;
+    initLineLabelMarkStyle(labelMark?: ILabelMark): void;
     encodeDefined(mark: IMark, attr: string): void;
 }

package/types/series/rose/rose.d.ts

@@ -5,6 +5,7 @@ import type { IRoseSeriesSpec, IRoseSeriesTheme } from './interface';
 import { RoseLikeSeries } from '../polar/rose-like';
 import type { ITextMark } from '../../mark/text';
 import type { IMark } from '../../mark/interface';
+import type { ILabelMark } from '../../mark/label';
 export declare const DefaultBandWidth = 0.5;
 export declare class RoseSeries<T extends IRoseSeriesSpec = IRoseSeriesSpec> extends RoseLikeSeries<T> {
     static readonly type: string;
@@ -20,7 +21,7 @@ export declare class RoseSeries<T extends IRoseSeriesSpec = IRoseSeriesSpec> ext
     private getRoseAngle;
     private initRoseMarkStyle;
     protected initTooltip(): void;
-    initLabelMarkStyle(textMark: ITextMark): void;
+    initLabelMarkStyle(textMark: ILabelMark): void;
     initAnimation(): void;
     getDefaultShapeType(): string;
     getActiveMarks(): IMark[];

package/types/series/sankey/sankey.d.ts

@@ -53,7 +53,12 @@ export declare class SankeySeries<T extends ISankeySeriesSpec = ISankeySeriesSpe
     extractNamesFromTree(tree: any, categoryName: string): Set<unknown>;
     getDimensionField(): string[];
     getMeasureField(): string[];
-    getSeriesKeys(): string[];
+    getRawDataStatisticsByField(field: string, isNumeric?: boolean): {
+        values?: any[];
+        min?: number;
+        max?: number;
+    };
+    private _collectByField;
     onLayoutEnd(ctx: any): void;
     getDefaultShapeType(): string;
     protected _noAnimationDataKey(datum: Datum, index: number): unknown | undefined;

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

@@ -32,6 +32,7 @@ export declare class BaseWordCloudSeries<T extends IBaseWordCloudSeriesSpec = IB
     protected _wordCloudConfig?: WordCloudConfigType;
     protected _wordCloudShapeConfig?: WordCloudShapeConfigType;
     protected _padding?: IPadding;
+    protected _defaultFontFamily: string;
     setAttrFromSpec(): void;
     protected _wordMark: ITextMark;
     protected _fillingWordMark: ITextMark;

package/types/theme/builtin/common/component/tooltip.d.ts

@@ -1,2 +1,3 @@
 import type { ITooltipTheme } from '../../../../component/tooltip/interface';
-export declare const tooltip: ITooltipTheme;
+import type { IColorKey } from '../../../color-scheme';
+export declare const tooltip: ITooltipTheme<string | IColorKey>;

package/types/theme/builtin/index.d.ts

@@ -1,15 +1,13 @@
 export * from './light';
+export * from './dark';
 export * from './common/legacy';
-import type { IChartLevelTheme } from '../../core/interface';
 import type { ITheme } from '../interface';
 export declare const builtinThemes: Record<string, ITheme>;
-export declare const getDefaultThemeName: (type?: ITheme['type']) => string;
 export declare const defaultThemeName: string;
 export declare const themes: Map<string, ITheme>;
 export declare const hasThemeMerged: Map<string, boolean>;
 export declare const registerTheme: (name: string, theme: Partial<ITheme>) => void;
-export declare const getTheme: (name: string) => ITheme;
+export declare const getTheme: (name?: string, transformed?: boolean) => ITheme;
 export declare const removeTheme: (name: string) => boolean;
 export declare const themeExist: (name: any) => boolean;
 export declare const getMergedTheme: (theme: Partial<ITheme>) => ITheme;
-export declare const defaultChartLevelTheme: IChartLevelTheme;

package/types/theme/color-scheme/builtin/interface.d.ts

@@ -3,19 +3,28 @@ export type BuiltinColorPalette = IColorSchemeStruct['palette'] & {
     backgroundColor: string;
     borderColor: string;
     shadowColor: string;
+    hoverBackgroundColor: string;
+    sliderRailColor: string;
+    sliderHandleColor: string;
+    sliderTrackColor: string;
+    popupBackgroundColor: string;
     primaryFontColor: string;
     secondaryFontColor: string;
-    axisFontColor: string;
+    tertiaryFontColor: string;
+    axisLabelFontColor: string;
     disableFontColor: string;
-    labelReverseFontColor: string;
+    axisMarkerFontColor: string;
     axisGridColor: string;
     axisDomainColor: string;
-    dataZoomHandlerStrokeColor: string;
-    dataZoomHandlerFillColor: string;
-    dataZoomBackgroundColor: string;
+    dataZoomHandleStrokeColor: string;
     dataZoomChartColor: string;
-    dataZoomSelectedColor: string;
+    playerControllerColor: string;
     scrollBarSliderColor: string;
-    tooltipBackgroundColor: string;
+    axisMarkerBackgroundColor: string;
     markLabelBackgroundColor: string;
+    markLineStrokeColor: string;
+    dangerColor: string;
+    warningColor: string;
+    successColor: string;
+    infoColor: string;
 };

package/types/theme/theme-manager.d.ts

@@ -3,7 +3,7 @@ export declare class ThemeManager {
     static readonly themes: Map<string, ITheme>;
     private static _currentThemeName;
     static registerTheme(name: string, theme: Partial<ITheme>): void;
-    static getTheme(name: string): ITheme;
+    static getTheme(name: string, transformed?: boolean): ITheme;
     static removeTheme(name: string): boolean;
     static themeExist(name: any): boolean;
     static getDefaultTheme(): ITheme;

package/types/typings/spec/common.d.ts

@@ -22,7 +22,6 @@ import type { ITitleSpec } from '../../component/title/interface';
 import type { IBrushSpec } from '../../component/brush';
 import type { ITotalLabelSpec } from '../../component/label';
 import type { ILegendSpec } from '../../component/legend';
-import type { IColorKey } from '../../theme/color-scheme/interface';
 import type { ILayoutOrientPadding, ILayoutPaddingSpec } from '../layout';
 export type IChartPadding = ILayoutOrientPadding | number;
 export interface IInitOption extends Omit<IRenderOption, 'pluginList'> {
@@ -56,7 +55,7 @@ export interface IChartSpec {
     height?: number;
     autoFit?: boolean;
     padding?: ILayoutPaddingSpec;
-    color?: string[] | Omit<IVisualSpecScale<unknown, string | IColorKey>, 'id'>;
+    color?: string[] | Omit<IVisualSpecScale<unknown, string>, 'id'>;
     series?: ISeriesSpec[];
     seriesStyle?: ISeriesStyle;
     animationThreshold?: number;

package/types/typings/visual.d.ts

@@ -55,7 +55,7 @@ export interface ICommonSpec {
     x?: number;
     y?: number;
     z?: number;
-    stroke?: string | IGradient | IColorKey | false | (number | boolean)[];
+    stroke?: string | IGradient | false | (number | boolean)[] | IColorKey;
     strokeOpacity?: number;
     opacity?: number;
     lineWidth?: number;

package/types/util/spec/common.d.ts

@@ -2,4 +2,4 @@ import { DataView } from '@visactor/vdataset';
 import { type ITheme } from '../../theme';
 export declare function isDataView(obj: any): obj is DataView;
 export declare function isHTMLElement(obj: any): obj is Element;
-export declare function getThemeObject(theme?: string | ITheme): ITheme;
+export declare function getThemeObject(theme?: string | ITheme, transformed?: boolean): ITheme;

package/types/util/spec/preprocess.d.ts

@@ -1,3 +1,3 @@
 import type { IThemeColorScheme } from '../../theme/color-scheme/interface';
 import type { ISeriesSpec } from '../../typings';
-export declare function preprocessSpecOrTheme(type: 'spec' | 'theme' | 'mark-spec' | 'mark-theme', obj: any, colorScheme?: IThemeColorScheme, seriesSpec?: ISeriesSpec): any;
+export declare function preprocessTheme(obj: any, colorScheme?: IThemeColorScheme, seriesSpec?: ISeriesSpec): any;

package/types/util/spec/transform.d.ts

@@ -1,3 +1,5 @@
+import type { ISeriesSpec } from '../../typings';
 export declare function specTransform(spec: unknown, special?: {
     [key: string]: (v: unknown) => unknown;
 }): unknown;
+export declare function functionTransform(spec: ISeriesSpec, VChart: any): any;

package/types/vchart-simple.d.ts

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