@visactor/vchart-types 1.8.0-alpha.0 → 1.8.0-beta.0

package/types/series/pie/pie.d.ts

@@ -1,4 +1,4 @@
-import type { Maybe, IPoint, Datum, StateValueType } from '../../typings';
+import type { IPoint, Datum, StateValueType } from '../../typings';
 import type { IModelLayoutOption } from '../../model/interface';
 import { PolarSeries } from '../polar/polar';
 import type { IMark } from '../../mark/interface';
@@ -8,12 +8,12 @@ import type { ITextMark } from '../../mark/text';
 import type { IPathMark } from '../../mark/path';
 import type { IArcSeries, SeriesMarkMap } from '../interface';
 import { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type';
-import type { IArcLabelSpec, IPieSeriesSpec, IPieSeriesTheme } from './interface';
+import type { IBasePieSeriesSpec, IPieSeriesSpec } from './interface';
 import { SeriesData } from '../base/series-data';
-type IBasePieSeriesSpec = Omit<IPieSeriesSpec, 'type'> & {
-    type: string;
-};
+import { PieSeriesSpecTransformer } from './pie-transformer';
 export declare class BasePieSeries<T extends IBasePieSeriesSpec> extends PolarSeries<T> implements IArcSeries {
+    static readonly transformerConstructor: any;
+    readonly transformerConstructor: typeof PieSeriesSpecTransformer;
     protected _pieMarkName: SeriesMarkNameEnum;
     protected _pieMarkType: MarkTypeEnum;
     static readonly mark: SeriesMarkMap;
@@ -28,7 +28,6 @@ export declare class BasePieSeries<T extends IBasePieSeriesSpec> extends PolarSe
     protected _pieMark: IArcMark | null;
     protected _labelMark: ITextMark | null;
     protected _labelLineMark: IPathMark | null;
-    protected _theme: Maybe<IPieSeriesTheme>;
     protected _buildMarkAttributeContext(): void;
     setAttrFromSpec(): void;
     initData(): void;
@@ -49,15 +48,11 @@ export declare class BasePieSeries<T extends IBasePieSeriesSpec> extends PolarSe
     protected generateRadiusStyle(spec: any): any;
     protected computeLayoutRadius(): number;
     computeCenter(datum: Datum): IPoint;
-    protected generateLinePath(state: StateValueType): {
-        path: (datum: Datum) => string;
-    };
     getRadius(state?: StateValueType): number;
     getInnerRadius(state?: StateValueType): number;
-    getLabelConfig(): IArcLabelSpec;
     computeRadius(r: number, k?: number): number;
     computeDatumRadius(datum: Datum, state?: string): number;
-    _compareSpec(ignoreCheckKeys?: {
+    _compareSpec(spec: T, prevSpec: T, ignoreCheckKeys?: {
         [key: string]: true;
     }): {
         change: boolean;
@@ -76,11 +71,9 @@ export declare class BasePieSeries<T extends IBasePieSeriesSpec> extends PolarSe
     getStackValueField(): string;
     protected _noAnimationDataKey(datum: Datum, index: number): number;
     getActiveMarks(): IMark[];
-    protected _mergeThemeToSpec(): void;
 }
 export declare class PieSeries<T extends IPieSeriesSpec = IPieSeriesSpec> extends BasePieSeries<T> implements IArcSeries {
     static readonly type: string;
     type: SeriesTypeEnum;
 }
 export declare const registerPieSeries: () => void;
-export {};

package/types/series/polar/index.d.ts

@@ -0,0 +1,3 @@
+export * from './polar';
+export * from './progress-like';
+export * from './rose-like';

package/types/series/polar/polar.d.ts

@@ -47,8 +47,6 @@ export declare abstract class PolarSeries<T extends IPolarSeriesSpec = IPolarSer
         key: string;
         operations: Array<'max' | 'min' | 'values'>;
     }[];
-    protected _getDefaultSpecFromChart(chartSpec: any): Partial<T>;
-    protected _mergeThemeToSpec(): void;
     setAttrFromSpec(): void;
     onRadiusAxisHelperUpdate(): void;
     onAngleAxisHelperUpdate(): void;

package/types/series/progress/circular/circular.d.ts

@@ -1,14 +1,13 @@
-import type { Maybe, Datum } from '../../../typings';
+import type { Datum } from '../../../typings';
 import type { SeriesMarkMap } from '../../interface';
 import { SeriesTypeEnum } from '../../interface/type';
-import type { ICircularProgressSeriesSpec, ICircularProgressSeriesTheme } from './interface';
+import type { ICircularProgressSeriesSpec } from './interface';
 import { ProgressLikeSeries } from '../../polar/progress-like/progress-like';
 import type { IMark } from '../../../mark/interface';
 export declare class CircularProgressSeries<T extends ICircularProgressSeriesSpec = ICircularProgressSeriesSpec> extends ProgressLikeSeries<T> {
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
-    protected _theme: Maybe<ICircularProgressSeriesTheme>;
     private _progressMark;
     private _trackMark;
     getStackGroupFields(): string[];

package/types/series/progress/linear/linear.d.ts

@@ -1,14 +1,12 @@
 import { CartesianSeries } from '../../cartesian/cartesian';
 import type { SeriesMarkMap } from '../../interface';
 import { SeriesTypeEnum } from '../../interface/type';
-import type { Maybe } from '../../../typings';
-import type { ILinearProgressSeriesSpec, ILinearProgressSeriesTheme } from './interface';
+import type { ILinearProgressSeriesSpec } from './interface';
 import type { IMark } from '../../../mark/interface';
 export declare class LinearProgressSeries<T extends ILinearProgressSeriesSpec = ILinearProgressSeriesSpec> extends CartesianSeries<T> {
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
-    protected _theme: Maybe<ILinearProgressSeriesTheme>;
     private _progressMark;
     private _trackMark;
     private _progressGroupMark;

package/types/series/radar/radar.d.ts

@@ -1,17 +1,19 @@
 import { LineLikeSeriesMixin } from '../mixin/line-mixin';
 import type { IMark, IMarkProgressiveConfig } from '../../mark/interface';
-import type { Datum, Maybe } from '../../typings';
+import type { Datum } from '../../typings';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface/type';
-import type { IRadarSeriesSpec, IRadarSeriesTheme } from './interface';
+import type { IRadarSeriesSpec } from './interface';
 import { RoseLikeSeries } from '../polar/rose-like';
+import { LineLikeSeriesSpecTransformer } from '../mixin/line-mixin-transformer';
 export interface RadarSeries<T extends IRadarSeriesSpec> extends Pick<LineLikeSeriesMixin, 'initLineMark' | 'initSymbolMark' | 'initLabelMarkStyle' | 'initLineMarkStyle' | 'initSymbolMarkStyle' | 'encodeDefined' | '_lineMark' | '_symbolMark' | 'addOverlapCompile'>, RoseLikeSeries<T> {
 }
 export declare class RadarSeries<T extends IRadarSeriesSpec = IRadarSeriesSpec> extends RoseLikeSeries<T> {
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
-    protected _theme: Maybe<IRadarSeriesTheme>;
+    static readonly transformerConstructor: any;
+    readonly transformerConstructor: typeof LineLikeSeriesSpecTransformer;
     private _areaMark;
     protected _sortDataByAxis: boolean;
     initGroups(): void;

package/types/series/range-column/3d/index.d.ts

@@ -0,0 +1,2 @@
+export * from './range-column-3d';
+export * from './range-column-3d-transformer';

package/types/series/range-column/3d/range-column-3d-transformer.d.ts

@@ -0,0 +1,5 @@
+import type { IRangeColumn3dSeriesSpec, IRangeColumnSeriesTheme } from '../interface';
+import { RangeColumnSeriesSpecTransformer } from '../range-column-transformer';
+export declare class RangeColumn3dSeriesSpecTransformer<T extends IRangeColumn3dSeriesSpec = IRangeColumn3dSeriesSpec, K extends IRangeColumnSeriesTheme = IRangeColumnSeriesTheme> extends RangeColumnSeriesSpecTransformer<any, K> {
+    protected _transformLabelSpec(spec: T): void;
+}

package/types/series/range-column/3d/range-column-3d.d.ts

@@ -0,0 +1,15 @@
+import { MarkTypeEnum } from '../../../mark/interface/type';
+import type { SeriesMarkMap } from '../../interface';
+import { SeriesTypeEnum } from '../../interface/type';
+import { RangeColumnSeries } from '../range-column';
+import type { AdaptiveSpec } from '../../../typings';
+import type { IRangeColumn3dSeriesSpec } from '../interface';
+export declare const DefaultBandWidth = 6;
+export declare class RangeColumn3dSeries<T extends IRangeColumn3dSeriesSpec = IRangeColumn3dSeriesSpec> extends RangeColumnSeries<AdaptiveSpec<T, 'type'>> {
+    static readonly type: string;
+    type: SeriesTypeEnum;
+    protected _barMarkType: MarkTypeEnum;
+    protected _barName: string;
+    static readonly mark: SeriesMarkMap;
+}
+export declare const registerRangeColumn3dSeries: () => void;

package/types/series/range-column/range-column-transformer.d.ts

@@ -0,0 +1,5 @@
+import { BarSeriesSpecTransformer } from '../bar/bar-transformer';
+import { type IRangeColumnSeriesSpec, type IRangeColumnSeriesTheme } from './interface';
+export declare class RangeColumnSeriesSpecTransformer<T extends IRangeColumnSeriesSpec = IRangeColumnSeriesSpec, K extends IRangeColumnSeriesTheme = IRangeColumnSeriesTheme> extends BarSeriesSpecTransformer<any, K> {
+    protected _transformLabelSpec(spec: T): void;
+}

package/types/series/range-column/range-column.d.ts

@@ -12,6 +12,8 @@ export declare class RangeColumnSeries<T extends IRangeColumnSeriesSpec = IRange
     protected _barName: string;
     protected _spec: T;
     static readonly mark: SeriesMarkMap;
+    static readonly transformerConstructor: any;
+    readonly transformerConstructor: any;
     protected _stack: boolean;
     private _minLabelMark?;
     private _maxLabelMark?;

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

@@ -0,0 +1,5 @@
+import { BaseSeriesSpecTransformer } from '../base';
+import type { IRoseSeriesSpec, IRoseSeriesTheme } from './interface';
+export declare class RoseSeriesSpecTransformer<T extends IRoseSeriesSpec = IRoseSeriesSpec, K extends IRoseSeriesTheme = IRoseSeriesTheme> extends BaseSeriesSpecTransformer<T, K> {
+    protected _transformLabelSpec(spec: T): void;
+}

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

@@ -1,17 +1,18 @@
-import type { Maybe } from '../../typings';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface/type';
-import type { IRoseSeriesSpec, IRoseSeriesTheme } from './interface';
+import type { IRoseSeriesSpec } 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';
+import { RoseSeriesSpecTransformer } from './rose-transformer';
 export declare const DefaultBandWidth = 0.5;
 export declare class RoseSeries<T extends IRoseSeriesSpec = IRoseSeriesSpec> extends RoseLikeSeries<T> {
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
-    protected _theme: Maybe<IRoseSeriesTheme>;
+    static readonly transformerConstructor: any;
+    readonly transformerConstructor: typeof RoseSeriesSpecTransformer;
     protected _supportStack: boolean;
     private _roseMark;
     protected _labelMark: ITextMark | null;

package/types/series/scatter/scatter-transformer.d.ts

@@ -0,0 +1,5 @@
+import { BaseSeriesSpecTransformer } from '../base';
+import type { IScatterSeriesSpec, IScatterSeriesTheme } from './interface';
+export declare class ScatterSeriesSpecTransformer<T extends IScatterSeriesSpec = IScatterSeriesSpec, K extends IScatterSeriesTheme = IScatterSeriesTheme> extends BaseSeriesSpecTransformer<T, K> {
+    protected _transformLabelSpec(spec: T): void;
+}

package/types/series/scatter/scatter.d.ts

@@ -1,16 +1,18 @@
 import type { DataView } from '@visactor/vdataset';
-import type { Maybe, IScatterInvalidType } from '../../typings';
-import type { IScatterSeriesSpec, IScatterSeriesTheme } from './interface';
+import type { IScatterInvalidType } from '../../typings';
+import type { IScatterSeriesSpec } from './interface';
 import { CartesianSeries } from '../cartesian/cartesian';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface/type';
 import type { ILabelMark } from '../../mark/label';
 import type { IMark } from '../../mark/interface';
+import { ScatterSeriesSpecTransformer } from './scatter-transformer';
 export declare class ScatterSeries<T extends IScatterSeriesSpec = IScatterSeriesSpec> extends CartesianSeries<T> {
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
-    protected _theme: Maybe<IScatterSeriesTheme>;
+    static readonly transformerConstructor: any;
+    readonly transformerConstructor: typeof ScatterSeriesSpecTransformer;
     private _symbolMark;
     private _labelMark;
     private _size;

package/types/series/sunburst/sunburst.d.ts

@@ -36,7 +36,7 @@ export declare class SunburstSeries extends PolarSeries<any> {
     protected initData(): void;
     getStatisticFields(): {
         key: string;
-        operations: ("values" | "max" | "min")[];
+        operations: ("max" | "min" | "values")[];
     }[];
     protected _addDataIndexAndKey(): void;
     initMark(): void;

package/types/series/waterfall/waterfall-transformer.d.ts

@@ -0,0 +1,5 @@
+import { BarSeriesSpecTransformer } from '../bar/bar-transformer';
+import type { IWaterfallSeriesSpec, IWaterfallSeriesTheme } from './interface';
+export declare class WaterfallSeriesSpecTransformer<T extends IWaterfallSeriesSpec = IWaterfallSeriesSpec, K extends IWaterfallSeriesTheme = IWaterfallSeriesTheme> extends BarSeriesSpecTransformer<any, K> {
+    protected _transformLabelSpec(spec: T): void;
+}

package/types/series/waterfall/waterfall.d.ts

@@ -1,21 +1,22 @@
 import type { IRuleMark } from '../../mark/rule';
 import { BarSeries } from '../bar/bar';
-import type { IWaterfallSeriesSpec, IWaterfallSeriesTheme } from './interface';
+import type { IWaterfallSeriesSpec } from './interface';
 import type { SeriesMarkMap } from '../interface';
 import { SeriesTypeEnum } from '../interface/type';
 import type { ITransformOptions, DataView } from '@visactor/vdataset';
 import { SeriesData } from '../base/series-data';
 import type { ITextMark } from '../../mark/text';
 import type { IModelEvaluateOption } from '../../model/interface';
-import type { Datum, Maybe } from '../../typings';
+import type { Datum } from '../../typings';
 import type { ILabelMark } from '../../mark/label';
 export declare const DefaultBandWidth = 6;
 export declare class WaterfallSeries<T extends IWaterfallSeriesSpec = IWaterfallSeriesSpec> extends BarSeries<any> {
     static readonly type: string;
     type: SeriesTypeEnum;
     static readonly mark: SeriesMarkMap;
+    static readonly transformerConstructor: any;
+    readonly transformerConstructor: any;
     protected _stack: boolean;
-    protected _theme: Maybe<IWaterfallSeriesTheme>;
     protected _totalData?: SeriesData;
     getTotalData(): any;
     protected _spec: T;

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

@@ -24,6 +24,7 @@ import type { ITotalLabelSpec } from '../../component/label';
 import type { ILegendSpec } from '../../component/legend';
 import type { ILayoutOrientPadding, ILayoutPaddingSpec } from '../layout';
 import type { ICustomPath2D } from '@visactor/vrender-core';
+import type { ICommonAxisSpec } from '../../component/axis';
 export type IChartPadding = ILayoutOrientPadding | number;
 export interface IInitOption extends Omit<IRenderOption, 'pluginList'> {
     dom?: string | HTMLElement;
@@ -74,6 +75,7 @@ export interface IChartSpec {
     brush?: IBrushSpec;
     scales?: IVisualSpecScale<unknown, unknown>[];
     customMark?: ICustomMarkSpec<EnableMarkType>[];
+    axes?: ICommonAxisSpec[];
     theme?: Omit<ITheme, 'name'> | string;
     background?: IBackgroundSpec;
     stackInverse?: boolean;

package/types/util/color.d.ts

@@ -1,3 +1 @@
-import { ColorUtil } from '@visactor/vutils';
-declare const Color: typeof ColorUtil.Color;
-export { Color };
+export { Color } from '@visactor/vutils';