@visionaris-bruno/vs-echarts 9.0.3 → 9.0.6

package/index.d.ts

@@ -6,14 +6,14 @@ import { CategoryAxisBaseOption, ValueAxisBaseOption } from 'echarts/types/src/c
 import { TooltipOption } from 'echarts/types/dist/shared';
 import * as _visionaris_bruno_vs_echarts from '@visionaris-bruno/vs-echarts';
 
-interface ISeriesLayoutOpts {
+type ChartKey = keyof Omit<IOptionsOverridesWrapper, "axis" | "tooltip">;
+type ISeriesLayoutOpts = {
     coordinateSystem?: 'cartesian2d' | 'polar';
     axisTypes?: {
         x: 'category' | 'value';
         y: 'category' | 'value';
     };
-}
-type ChartKey = keyof Omit<IOptionsOverridesWrapper, "axis" | "tooltip">;
+};
 /** los recibira el director
  *
  */
@@ -21,12 +21,12 @@ type VSEChartProduct = {
     chartKey: ChartKey;
     baseOptions: EChartsOption;
 };
-interface IEChartBuilder<SeriesType = SeriesOption, OptsType = any, DatasetConfigOptions = any> {
+interface IEChartBuilder<SeriesType = SeriesOption, SeriesConfigOptions = any, DatasetConfigOptions = any> {
     /** producto base */
     baseProduct: VSEChartProduct;
     reset(): void;
     addDataset(data: IEChartData, opts?: DatasetConfigOptions): void;
-    addSeries(data: IEChartData, overrides: SeriesType, opts?: OptsType): void;
+    addSeries(data: IEChartData, overrides: SeriesType, opts?: SeriesConfigOptions): void;
     addTooltip(data: IEChartData, overrides: ITooltipOptionsOverrides): void;
     addPolar(): void;
     addXAxis(data: IEChartData, overrides: IOptionsOverrides["axis"], type?: 'category' | 'value'): void;
@@ -37,9 +37,9 @@ interface IEChartBuilder<SeriesType = SeriesOption, OptsType = any, DatasetConfi
     addCommons(): void;
     addGraphic(): void;
     addDataZoom(): void;
-    setValueFormatter(formatter: EChartValueFormatter | undefined): void;
-    setPalette(palette: string[] | undefined): void;
-    setColorResolver(resolver: ChartColorResolver | undefined): void;
+    setValueFormatter(formatter: ChartValueFormatter): void;
+    setPalette(palette: string[]): void;
+    setColorResolver(resolver: ChartColorResolver): void;
     getResult(): EChartsOption;
 }
 type EChartClickType = 'cross-filter';
@@ -169,11 +169,11 @@ interface IEChartData {
     source: IEChartDataNode[];
 }
 /**
- * EChartValueFormatter
+ * ChartValueFormatter
  *
  * Callback para formatear los valores numéricos de las celdas/series.
  */
-type EChartValueFormatter = (value: number, key: string) => string;
+type ChartValueFormatter = (value: number, key: string) => string;
 /**
  * ChartColorResolver
  *
@@ -212,7 +212,7 @@ declare class VSEchartsConfigService {
 }
 
 type MakeOpts = {
-    valueFormatter?: EChartValueFormatter;
+    valueFormatter?: ChartValueFormatter;
     palette?: string[];
     colorResolver?: ChartColorResolver;
     axisTypes?: {
@@ -229,7 +229,7 @@ type MakeBoxplotOpts = MakeOpts & {};
  */
 declare class VSECDirector {
     private builder;
-    constructor(builder: IEChartBuilder<any, ISeriesLayoutOpts>);
+    constructor(builder: IEChartBuilder);
     makeBar(data: IEChartData, overrides: IOptionsOverridesWrapper, opts?: MakeBarOpts): void;
     makeBarRadial(data: IEChartData, overrides: IOptionsOverridesWrapper, opts?: MakeBarOpts): void;
     makeLine(data: IEChartData, overrides: IOptionsOverridesWrapper, opts?: MakeLineOpts): void;
@@ -248,11 +248,11 @@ declare abstract class BaseEchartsComponent implements OnChanges, OnDestroy {
     data: IEChartData;
     optionsOverrides: IOptionsOverridesWrapper;
     /** Paleta de colores básica */
-    palette?: string[];
+    palette: string[];
     /** Resolver de colores dinámico (Callback) */
     colorResolver?: ChartColorResolver;
     /** Formateador de valores para etiquetas y tooltips */
-    valueFormatter?: EChartValueFormatter;
+    valueFormatter: ChartValueFormatter;
     chartClick: EventEmitter<{
         type: EChartClickType;
         data: any;
@@ -287,7 +287,7 @@ declare abstract class BaseEchartsComponent implements OnChanges, OnDestroy {
      * NgxEchartsDirective.initOpts
      */
     initOptions: {
-        renderer: "canvas" | "svg";
+        renderer: "svg" | "canvas";
         locale: _visionaris_bruno_vs_echarts.VSEchartsLocale | undefined;
     };
     constructor();
@@ -348,7 +348,7 @@ declare abstract class BaseEchartsComponent implements OnChanges, OnDestroy {
  */
 declare class RingBuilder implements IEChartBuilder<PieSeriesOption> {
     baseProduct: VSEChartProduct;
-    protected valueFormatter: EChartValueFormatter;
+    protected valueFormatter: ChartValueFormatter;
     protected palette: string[];
     protected colorResolver?: ChartColorResolver;
     protected result: EChartsOption;
@@ -366,11 +366,10 @@ declare class RingBuilder implements IEChartBuilder<PieSeriesOption> {
     addAngleAxis(data: IEChartData, overrides: IOptionsOverrides["axis"]): void;
     addDataZoom(): void;
     addDataset(data: IEChartData, opts?: any): void;
-    setValueFormatter(formatter: EChartValueFormatter | undefined): void;
-    setPalette(palette: string[] | undefined): void;
-    setColorResolver(resolver: ChartColorResolver | undefined): void;
+    setValueFormatter(formatter: ChartValueFormatter): void;
+    setPalette(palette: string[]): void;
+    setColorResolver(resolver: ChartColorResolver): void;
     getResult(): EChartsOption;
-    private formatCellValue;
 }
 
 /**
@@ -414,7 +413,7 @@ declare class EchartsRingComponent extends BaseEchartsComponent {
  */
 declare class PieBuilder implements IEChartBuilder<PieSeriesOption> {
     baseProduct: VSEChartProduct;
-    protected valueFormatter: EChartValueFormatter;
+    protected valueFormatter: ChartValueFormatter;
     protected palette: string[];
     protected colorResolver?: ChartColorResolver;
     protected result: EChartsOption;
@@ -432,11 +431,10 @@ declare class PieBuilder implements IEChartBuilder<PieSeriesOption> {
     addGraphic(): void;
     addDataZoom(): void;
     addDataset(data: IEChartData, opts?: any): void;
-    setValueFormatter(formatter: EChartValueFormatter | undefined): void;
-    setPalette(palette: string[] | undefined): void;
-    setColorResolver(resolver: ChartColorResolver | undefined): void;
+    setValueFormatter(formatter: ChartValueFormatter): void;
+    setPalette(palette: string[]): void;
+    setColorResolver(resolver: ChartColorResolver): void;
     getResult(): EChartsOption;
-    private formatCellValue;
 }
 
 /**
@@ -464,7 +462,7 @@ declare class EchartsPieComponent extends BaseEchartsComponent {
  */
 declare class FunnelBuilder implements IEChartBuilder<FunnelSeriesOption> {
     baseProduct: VSEChartProduct;
-    protected valueFormatter: EChartValueFormatter;
+    protected valueFormatter: ChartValueFormatter;
     protected palette: string[];
     protected colorResolver?: ChartColorResolver;
     protected result: EChartsOption;
@@ -482,11 +480,10 @@ declare class FunnelBuilder implements IEChartBuilder<FunnelSeriesOption> {
     addGraphic(): void;
     addDataZoom(): void;
     addDataset(data: IEChartData, opts?: any): void;
-    setValueFormatter(formatter: EChartValueFormatter | undefined): void;
+    setValueFormatter(formatter: ChartValueFormatter | undefined): void;
     setPalette(palette: string[] | undefined): void;
     setColorResolver(resolver: ChartColorResolver | undefined): void;
     getResult(): EChartsOption;
-    private formatCellValue;
 }
 
 /**
@@ -505,6 +502,7 @@ declare class EchartsFunnelComponent extends BaseEchartsComponent {
     static ɵcmp: i0.ɵɵComponentDeclaration<EchartsFunnelComponent, "vs-echarts-funnel", never, {}, {}, never, never, true, never>;
 }
 
+type EChartBuilderSeriesConfigOpts = ISeriesLayoutOpts & {};
 /**
  * Builder principal.
  *
@@ -512,9 +510,9 @@ declare class EchartsFunnelComponent extends BaseEchartsComponent {
  *
  * Puede verse utilizado en graficos como Lineas y Bars. Siempre que se pueda priorizar utilizar este.
  */
-declare class EChartBuilder implements IEChartBuilder<SeriesOption & BarSeriesOption & LineSeriesOption & ScatterSeriesOption, ISeriesLayoutOpts> {
+declare class EChartBuilder implements IEChartBuilder<SeriesOption & BarSeriesOption & LineSeriesOption & ScatterSeriesOption, EChartBuilderSeriesConfigOpts> {
     baseProduct: VSEChartProduct;
-    protected valueFormatter: EChartValueFormatter;
+    protected valueFormatter: ChartValueFormatter;
     protected palette: string[];
     protected colorResolver?: ChartColorResolver;
     protected result: EChartsOption;
@@ -527,7 +525,7 @@ declare class EChartBuilder implements IEChartBuilder<SeriesOption & BarSeriesOp
      * @param overrides
      * @returns
      */
-    addSeries(data: IEChartData, overrides: SeriesOption & BarSeriesOption & LineSeriesOption & ScatterSeriesOption, opts?: ISeriesLayoutOpts): void;
+    addSeries(data: IEChartData, overrides: BarSeriesOption & LineSeriesOption & ScatterSeriesOption, opts?: ISeriesLayoutOpts): void;
     /**
      * TODO: Mejorar funcion, no me convence como se implemento el tooltip formatter.
      * @param data
@@ -541,17 +539,13 @@ declare class EChartBuilder implements IEChartBuilder<SeriesOption & BarSeriesOp
     addAngleAxis(data: IEChartData, overrides: IOptionsOverrides["axis"]): void;
     addLegend(): void;
     addGraphic(): void;
-    addDataset(data: IEChartData, opts?: any): void;
+    addDataset(data: IEChartData): void;
     addDataZoom(): void;
     getResult(): EChartsOption;
-    /**
-     * Formatea un valor utilizando el callback inyectado.
-     */
-    private formatCellValue;
     /**
      * Permite inyectar un formateador de valores externo.
      */
-    setValueFormatter(formatter: EChartValueFormatter): void;
+    setValueFormatter(formatter: ChartValueFormatter): void;
     /**
      * Permite inyectar una paleta de colores básica.
      */
@@ -560,8 +554,8 @@ declare class EChartBuilder implements IEChartBuilder<SeriesOption & BarSeriesOp
      * Permite inyectar un resolver de colores dinámico.
      */
     setColorResolver(resolver: ChartColorResolver): void;
-    protected getCategoryAxisOptions(data: IEChartData, overrides: IOptionsOverrides["axis"]): CategoryAxisBaseOption;
-    protected getValueAxisOptions(data: IEChartData, overrides: IOptionsOverrides["axis"]): any;
+    private getCategoryAxisOptions;
+    private getValueAxisOptions;
 }
 
 declare abstract class EchartsBarComponent extends BaseEchartsComponent {
@@ -677,7 +671,7 @@ declare abstract class EchartsScatterComponent extends BaseEchartsComponent {
 
 declare class SunburstBuilder implements IEChartBuilder<SunburstSeriesOption> {
     baseProduct: VSEChartProduct;
-    protected valueFormatter: EChartValueFormatter;
+    protected valueFormatter: ChartValueFormatter;
     protected palette: string[];
     protected colorResolver?: ChartColorResolver;
     protected result: EChartsOption;
@@ -686,7 +680,6 @@ declare class SunburstBuilder implements IEChartBuilder<SunburstSeriesOption> {
     addSeries(data: IEChartData, overrides: SunburstSeriesOption): void;
     addTooltip(data: IEChartData, overrides: ITooltipOptionsOverrides): void;
     addCommons(): void;
-    addGraphic(): void;
     getResult(): EChartsOption;
     addPolar(): void;
     addXAxis(data: IEChartData, overrides: IOptionsOverrides["axis"], type: "category" | "value"): void;
@@ -696,10 +689,11 @@ declare class SunburstBuilder implements IEChartBuilder<SunburstSeriesOption> {
     addLegend(): void;
     addDataZoom(): void;
     addDataset(data: IEChartData, opts?: any): void;
+    addGraphic(): void;
     /**
      * Permite inyectar un formateador de valores externo.
      */
-    setValueFormatter(formatter: EChartValueFormatter): void;
+    setValueFormatter(formatter: ChartValueFormatter): void;
     /**
      * Permite inyectar una paleta de colores básica.
      */
@@ -727,7 +721,7 @@ declare class EChartsSunburstComponent extends BaseEchartsComponent {
  */
 declare class SankeyBuilder implements IEChartBuilder<SankeySeriesOption> {
     baseProduct: VSEChartProduct;
-    protected valueFormatter: EChartValueFormatter;
+    protected valueFormatter: ChartValueFormatter;
     protected palette: string[];
     protected colorResolver?: ChartColorResolver;
     protected result: EChartsOption;
@@ -746,9 +740,9 @@ declare class SankeyBuilder implements IEChartBuilder<SankeySeriesOption> {
     addCommons(): void;
     addGraphic(): void;
     getResult(): EChartsOption;
-    setValueFormatter(formatter: EChartValueFormatter | undefined): void;
-    setPalette(palette: string[] | undefined): void;
-    setColorResolver(resolver: ChartColorResolver | undefined): void;
+    setValueFormatter(formatter: ChartValueFormatter): void;
+    setPalette(palette: string[]): void;
+    setColorResolver(resolver: ChartColorResolver): void;
 }
 
 declare class EchartsSankeyComponent extends BaseEchartsComponent {
@@ -772,4 +766,4 @@ declare class EChartsHBoxplotComponent extends BaseEchartsComponent {
 }
 
 export { BaseEchartsComponent, EChartsAreaComponent, EChartsAreaStackComponent, EChartsBarStackedComponent, EChartsBarStackedRadialComponent, EChartsHBarComponent, EChartsHBarStackedComponent, EChartsHBoxplotComponent, EChartsSunburstComponent, EchartsBarComponent, EchartsFunnelComponent, EchartsLineComponent, EchartsPieComponent, EchartsRingComponent, EchartsSankeyComponent, EchartsScatterComponent, VSEchartsConfigService, defaultOptionsOverrides, provideVSEcharts };
-export type { ChartColorResolver, ChartOrientation, EChartClickType, EChartValueFormatter, IAreaOptionsOverrides, IAreaStackOptionsOverrides, IAxisOptionsOverrides, IBarOptionsOverrides, IBarStackedOptionsOverrides, IBarStackedRadialOptionsOverrides, IBoxplotOptionsOverrides, IEChartBuilder, IEChartData, IEChartDataNode, IEChartDimension, IFunnelOptionsOverrides, IHBarOptionsOverrides, IHBarStackedOptionsOverrides, IHBoxplotOptionsOverrides, ILineOptionsOverrides, IOptionsOverrides, IOptionsOverridesWrapper, IPieOptionsOverrides, IRingOptionsOverrides, ISankeyOptionsOverrides, IScatterOptionsOverrides, ISeriesLayoutOpts, ISunburstOptionsOverrides, ITooltipOptionsOverrides, NGXEchartsSelectChangeEventData, VSEChartProduct, VSEchartsConfig, VSEchartsLocale };
+export type { ChartColorResolver, ChartOrientation, ChartValueFormatter, EChartClickType, IAreaOptionsOverrides, IAreaStackOptionsOverrides, IAxisOptionsOverrides, IBarOptionsOverrides, IBarStackedOptionsOverrides, IBarStackedRadialOptionsOverrides, IBoxplotOptionsOverrides, IEChartBuilder, IEChartData, IEChartDataNode, IEChartDimension, IFunnelOptionsOverrides, IHBarOptionsOverrides, IHBarStackedOptionsOverrides, IHBoxplotOptionsOverrides, ILineOptionsOverrides, IOptionsOverrides, IOptionsOverridesWrapper, IPieOptionsOverrides, IRingOptionsOverrides, ISankeyOptionsOverrides, IScatterOptionsOverrides, ISeriesLayoutOpts, ISunburstOptionsOverrides, ITooltipOptionsOverrides, NGXEchartsSelectChangeEventData, VSEChartProduct, VSEchartsConfig, VSEchartsLocale };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visionaris-bruno/vs-echarts",
-  "version": "9.0.3",
+  "version": "9.0.6",
   "peerDependencies": {
     "@angular/common": "^20.3.0",
     "@angular/core": "^20.3.0",