@orbcharts/core 3.0.0-alpha.68 → 3.0.0-beta.10

package/dist/src/defaults.d.ts

@@ -1,24 +1,25 @@
-import { ChartOptionsPartial, DataSeries, DataGrid, DataMultiGrid, DataMultiValue, DataTree, DataRelationship, DataFormatterValueAxis, DataFormatterGroupAxis, DataFormatterContainer, DataFormatterSeries, DataFormatterGrid, DataFormatterGridGrid, DataFormatterMultiGrid, DataFormatterMultiGridGrid, DataFormatterMultiValue, DataFormatterTree, DataFormatterRelationship, ChartParams, Padding } from '../lib/core-types';
+import { ChartOptionsPartial, DataSeries, DataGrid, DataMultiGrid, DataMultiValue, DataTree, DataRelationship, DataFormatterValueAxis, DataFormatterGroupAxis, DataFormatterAxis, DataFormatterContainer, DataFormatterSeries, DataFormatterGrid, DataFormatterGridGrid, DataFormatterMultiGrid, DataFormatterMultiGridGrid, DataFormatterMultiValue, DataFormatterTree, DataFormatterRelationship, ChartParams, Padding } from '../lib/core-types';
 
-export declare const CHART_OPTIONS_DEFAULT: ChartOptionsPartial<any>;
-export declare const PADDING_DEFAULT: Padding;
-export declare const CHART_PARAMS_DEFAULT: ChartParams;
-export declare const CHART_WIDTH_DEFAULT = 800;
-export declare const CHART_HEIGHT_DEFAULT = 500;
-export declare const DATA_SERIES_DEFAULT: DataSeries;
-export declare const DATA_GRID_DEFAULT: DataGrid;
-export declare const DATA_MULTI_GRID_DEFAULT: DataMultiGrid;
-export declare const DATA_MULTI_VALUE_DEFAULT: DataMultiValue;
-export declare const DATA_TREE_DEFAULT: DataTree;
-export declare const DATA_RELATIONA_DEFAULTL: DataRelationship;
-export declare const DATA_FORMATTER_VALUE_AXIS_DEFAULT: DataFormatterValueAxis;
-export declare const DATA_FORMATTER_GROUP_AXIS_DEFAULT: DataFormatterGroupAxis;
-export declare const DATA_FORMATTER_CONTAINER_DEFAULT: DataFormatterContainer;
-export declare const DATA_FORMATTER_SERIES_DEFAULT: DataFormatterSeries;
-export declare const DATA_FORMATTER_GRID_GRID_DEFAULT: DataFormatterGridGrid;
-export declare const DATA_FORMATTER_GRID_DEFAULT: DataFormatterGrid;
-export declare const DATA_FORMATTER_MULTI_GRID_GRID_DEFAULT: DataFormatterMultiGridGrid;
-export declare const DATA_FORMATTER_MULTI_GRID_DEFAULT: DataFormatterMultiGrid;
-export declare const DATA_FORMATTER_MULTI_VALUE_DEFAULT: DataFormatterMultiValue;
-export declare const DATA_FORMATTER_TREE_DEFAULT: DataFormatterTree;
-export declare const DATA_FORMATTER_RELATIONAL_DEFAULT: DataFormatterRelationship;
+export declare const DEFAULT_CHART_OPTIONS: ChartOptionsPartial<any>;
+export declare const DEFAULT_PADDING: Padding;
+export declare const DEFAULT_CHART_PARAMS: ChartParams;
+export declare const DEFAULT_CHART_WIDTH = 800;
+export declare const DEFAULT_CHART_HEIGHT = 500;
+export declare const DEFAULT_DATA_SERIES: DataSeries;
+export declare const DEFAULT_DATA_GRID: DataGrid;
+export declare const DEFAULT_DATA_MULTI_GRID: DataMultiGrid;
+export declare const DEFAULT_DATA_MULTI_VALUE: DataMultiValue;
+export declare const DEFAULT_DATA_TREE: DataTree;
+export declare const DEFAULTL_DATA_RELATIONA: DataRelationship;
+export declare const DEFAULT_DATA_FORMATTER_VALUE_AXIS: DataFormatterValueAxis;
+export declare const DEFAULT_DATA_FORMATTER_GROUP_AXIS: DataFormatterGroupAxis;
+export declare const DEFAULT_DATA_FORMATTER_AXIS: DataFormatterAxis;
+export declare const DEFAULT_DATA_FORMATTER_CONTAINER: DataFormatterContainer;
+export declare const DEFAULT_DATA_FORMATTER_SERIES: DataFormatterSeries;
+export declare const DEFAULT_DATA_FORMATTER_GRID_GRID: DataFormatterGridGrid;
+export declare const DEFAULT_DATA_FORMATTER_GRID: DataFormatterGrid;
+export declare const DEFAULT_DATA_FORMATTER_MULTI_GRID_GRID: DataFormatterMultiGridGrid;
+export declare const DEFAULT_DATA_FORMATTER_MULTI_GRID: DataFormatterMultiGrid;
+export declare const DEFAULT_DATA_FORMATTER_MULTI_VALUE: DataFormatterMultiValue;
+export declare const DEFAULT_DATA_FORMATTER_TREE: DataFormatterTree;
+export declare const DEFAULT_DATA_FORMATTER_RELATIONSHIP: DataFormatterRelationship;

package/dist/src/utils/d3Scale.d.ts

@@ -0,0 +1,28 @@
+import * as d3 from 'd3';
+export declare const createValueToAxisScale: ({ maxValue, minValue, axisWidth, scaleDomain, scaleRange, reverse }: {
+    maxValue: number;
+    minValue: number;
+    axisWidth: number;
+    scaleDomain: [number | "min" | "auto", number | "max" | "auto"];
+    scaleRange: [number, number];
+    reverse?: boolean;
+}) => d3.ScaleLinear<number, number, never>;
+export declare const createAxisToValueScale: ({ maxValue, minValue, axisWidth, scaleDomain, scaleRange, reverse }: {
+    maxValue: number;
+    minValue: number;
+    axisWidth: number;
+    scaleDomain: [number | "min" | "auto", number | "max" | "auto"];
+    scaleRange: [number, number];
+    reverse?: boolean;
+}) => d3.ScaleLinear<number, number, never>;
+export declare const createLabelToAxisScale: ({ axisLabels, axisWidth, padding }: {
+    axisLabels: string[];
+    axisWidth: number;
+    padding?: number;
+}) => d3.ScalePoint<string>;
+export declare const createAxisToLabelIndexScale: ({ axisLabels, axisWidth, padding, reverse }: {
+    axisLabels: string[] | Date[];
+    axisWidth: number;
+    padding?: number;
+    reverse?: boolean;
+}) => d3.ScaleQuantize<number, never>;

package/dist/src/utils/gridObservables.d.ts

@@ -1,28 +1,11 @@
 import { Observable } from 'rxjs';
-import { ComputedDataTypeMap, ComputedDataGrid, ComputedDatumGrid, DataFormatterTypeMap, DataFormatterGrid, ComputedLayoutDatumGrid, ComputedLayoutDataGrid, GridContainerPosition, Layout, TransformData } from '../../lib/core-types';
+import { ComputedDataTypeMap, ComputedDataGrid, ComputedDatumGrid, DataFormatterTypeMap, DataFormatterGrid, ComputedLayoutDatumGrid, ComputedLayoutDataGrid, ContainerPositionScaled, Layout, TransformData } from '../../lib/core-types';
 
 export declare const gridComputedLayoutDataObservable: ({ computedData$, fullDataFormatter$, layout$ }: {
     computedData$: Observable<ComputedDataTypeMap<"grid">>;
     fullDataFormatter$: Observable<DataFormatterTypeMap<"grid">>;
     layout$: Observable<Layout>;
 }) => Observable<ComputedLayoutDatumGrid[][]>;
-export declare const gridAxesTransformObservable: ({ fullDataFormatter$, layout$ }: {
-    fullDataFormatter$: Observable<DataFormatterTypeMap<"grid">>;
-    layout$: Observable<Layout>;
-}) => Observable<TransformData>;
-export declare const gridAxesReverseTransformObservable: ({ gridAxesTransform$ }: {
-    gridAxesTransform$: Observable<TransformData>;
-}) => Observable<TransformData>;
-export declare const gridGraphicTransformObservable: ({ computedData$, fullDataFormatter$, layout$ }: {
-    computedData$: Observable<ComputedDataTypeMap<"grid">>;
-    fullDataFormatter$: Observable<DataFormatterTypeMap<"grid">>;
-    layout$: Observable<Layout>;
-}) => Observable<TransformData>;
-export declare const gridGraphicReverseScaleObservable: ({ gridContainerPosition$, gridAxesTransform$, gridGraphicTransform$ }: {
-    gridContainerPosition$: Observable<GridContainerPosition[]>;
-    gridAxesTransform$: Observable<TransformData>;
-    gridGraphicTransform$: Observable<TransformData>;
-}) => Observable<[number, number][]>;
 export declare const gridAxesSizeObservable: ({ fullDataFormatter$, layout$ }: {
     fullDataFormatter$: Observable<DataFormatterGrid>;
     layout$: Observable<Layout>;
@@ -43,8 +26,35 @@ export declare const gridContainerPositionObservable: ({ computedData$, fullData
     computedData$: Observable<ComputedDataTypeMap<"grid">>;
     fullDataFormatter$: Observable<DataFormatterTypeMap<"grid">>;
     layout$: Observable<Layout>;
-}) => Observable<GridContainerPosition[]>;
+}) => Observable<ContainerPositionScaled[]>;
 export declare const computedStackedDataObservables: ({ isSeriesSeprate$, computedData$ }: {
     isSeriesSeprate$: Observable<boolean>;
     computedData$: Observable<ComputedDataGrid>;
 }) => Observable<ComputedDataGrid>;
+export declare const groupScaleDomainValueObservable: ({ computedData$, fullDataFormatter$ }: {
+    computedData$: Observable<ComputedDataGrid>;
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"grid">>;
+}) => Observable<[number, number]>;
+export declare const filteredMinMaxValueObservable: ({ computedData$, groupScaleDomainValue$ }: {
+    computedData$: Observable<ComputedDataGrid>;
+    groupScaleDomainValue$: Observable<[number, number]>;
+}) => Observable<[number, number]>;
+export declare const gridAxesTransformObservable: ({ fullDataFormatter$, layout$ }: {
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"grid">>;
+    layout$: Observable<Layout>;
+}) => Observable<TransformData>;
+export declare const gridAxesReverseTransformObservable: ({ gridAxesTransform$ }: {
+    gridAxesTransform$: Observable<TransformData>;
+}) => Observable<TransformData>;
+export declare const gridGraphicTransformObservable: ({ computedData$, groupScaleDomainValue$, filteredMinMaxValue$, fullDataFormatter$, layout$ }: {
+    computedData$: Observable<ComputedDataTypeMap<"grid">>;
+    groupScaleDomainValue$: Observable<[number, number]>;
+    filteredMinMaxValue$: Observable<[number, number]>;
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"grid">>;
+    layout$: Observable<Layout>;
+}) => Observable<TransformData>;
+export declare const gridGraphicReverseScaleObservable: ({ gridContainerPosition$, gridAxesTransform$, gridGraphicTransform$ }: {
+    gridContainerPosition$: Observable<ContainerPositionScaled[]>;
+    gridAxesTransform$: Observable<TransformData>;
+    gridGraphicTransform$: Observable<TransformData>;
+}) => Observable<[number, number][]>;

package/dist/src/utils/index.d.ts

@@ -1,5 +1,5 @@
 export * from './commonUtils';
-export * from './d3Utils';
+export * from './d3Scale';
 export * from './gridObservables';
 export * from './multiGridObservables';
 export * from './observables';

package/dist/src/utils/multiGridObservables.d.ts

@@ -1,5 +1,5 @@
 import { Subject, Observable } from 'rxjs';
-import { ChartParams, ComputedDataTypeMap, ContextObserverMultiGridDetail, DataFormatterTypeMap, EventMultiGrid, GridContainerPosition, Layout } from '../../lib/core-types';
+import { ChartParams, ComputedDataTypeMap, ContextObserverMultiGridDetail, DataFormatterTypeMap, EventMultiGrid, ContainerPositionScaled, Layout } from '../../lib/core-types';
 
 export declare const multiGridEachDetailObservable: ({ fullDataFormatter$, computedData$, layout$, fullChartParams$, event$ }: {
     fullDataFormatter$: Observable<DataFormatterTypeMap<"multiGrid">>;
@@ -12,4 +12,4 @@ export declare const multiGridContainerObservable: ({ computedData$, fullDataFor
     computedData$: Observable<ComputedDataTypeMap<"multiGrid">>;
     fullDataFormatter$: Observable<DataFormatterTypeMap<"multiGrid">>;
     layout$: Observable<Layout>;
-}) => Observable<GridContainerPosition[][]>;
+}) => Observable<ContainerPositionScaled[][]>;

package/dist/src/utils/multiValueObservables.d.ts

@@ -0,0 +1,73 @@
+import { Observable } from 'rxjs';
+import { ComputedDataTypeMap, ComputedDatumMultiValue, DataFormatterTypeMap, ComputedLayoutDatumMultiValue, ComputedLayoutDataMultiValue, ContainerPositionScaled, Layout, TransformData } from '../../lib/core-types';
+
+export declare const minMaxXYObservable: ({ computedData$ }: {
+    computedData$: Observable<ComputedDataTypeMap<"multiValue">>;
+}) => Observable<{
+    minX: number;
+    maxX: number;
+    minY: number;
+    maxY: number;
+}>;
+export declare const multiValueComputedLayoutDataObservable: ({ computedData$, minMaxXY$, fullDataFormatter$, layout$ }: {
+    computedData$: Observable<ComputedDataTypeMap<"multiValue">>;
+    minMaxXY$: Observable<{
+        minX: number;
+        maxX: number;
+        minY: number;
+        maxY: number;
+    }>;
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"multiValue">>;
+    layout$: Observable<Layout>;
+}) => Observable<ComputedLayoutDataMultiValue>;
+export declare const multiValueCategoryLabelsObservable: ({ computedData$, fullDataFormatter$ }: {
+    computedData$: Observable<ComputedDataTypeMap<"multiValue">>;
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"multiValue">>;
+}) => Observable<string[]>;
+export declare const multiValueVisibleComputedDataObservable: ({ computedData$ }: {
+    computedData$: Observable<ComputedDataTypeMap<"multiValue">>;
+}) => Observable<ComputedDatumMultiValue[][]>;
+export declare const multiValueVisibleComputedLayoutDataObservable: ({ computedLayoutData$ }: {
+    computedLayoutData$: Observable<ComputedLayoutDataMultiValue>;
+}) => Observable<ComputedLayoutDatumMultiValue[][]>;
+export declare const multiValueContainerPositionObservable: ({ computedData$, fullDataFormatter$, layout$ }: {
+    computedData$: Observable<ComputedDataTypeMap<"multiValue">>;
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"multiValue">>;
+    layout$: Observable<Layout>;
+}) => Observable<ContainerPositionScaled[]>;
+export declare const filteredMinMaxXYDataObservable: ({ visibleComputedLayoutData$, minMaxXY$, fullDataFormatter$ }: {
+    visibleComputedLayoutData$: Observable<ComputedLayoutDataMultiValue>;
+    minMaxXY$: Observable<{
+        minX: number;
+        maxX: number;
+        minY: number;
+        maxY: number;
+    }>;
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"multiValue">>;
+}) => Observable<{
+    datumList: ComputedLayoutDatumMultiValue[];
+    minXDatum: ComputedLayoutDatumMultiValue;
+    maxXDatum: ComputedLayoutDatumMultiValue;
+    minYDatum: ComputedLayoutDatumMultiValue;
+    maxYDatum: ComputedLayoutDatumMultiValue;
+}>;
+export declare const multiValueGraphicTransformObservable: ({ minMaxXY$, filteredMinMaxXYData$, fullDataFormatter$, layout$ }: {
+    minMaxXY$: Observable<{
+        minX: number;
+        maxX: number;
+        minY: number;
+        maxY: number;
+    }>;
+    filteredMinMaxXYData$: Observable<{
+        minXDatum: ComputedLayoutDatumMultiValue;
+        maxXDatum: ComputedLayoutDatumMultiValue;
+        minYDatum: ComputedLayoutDatumMultiValue;
+        maxYDatum: ComputedLayoutDatumMultiValue;
+    }>;
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"multiValue">>;
+    layout$: Observable<Layout>;
+}) => Observable<TransformData>;
+export declare const multiValueGraphicReverseScaleObservable: ({ multiValueContainerPosition$, multiValueGraphicTransform$ }: {
+    multiValueContainerPosition$: Observable<ContainerPositionScaled[]>;
+    multiValueGraphicTransform$: Observable<TransformData>;
+}) => Observable<[number, number][]>;

package/dist/src/utils/orbchartsUtils.d.ts

@@ -1,9 +1,10 @@
-import { ChartType, ChartParams, DatumValue, DataSeries, DataGrid, DataGridDatum, DataMultiGrid, DataMultiValue, DataFormatterContainer, SeriesDirection, DataFormatterGridGrid, SeriesContainerPosition, GridContainerPosition, Layout } from '../../lib/core-types';
+import { ChartType, ChartParams, DatumValue, DataSeries, DataGrid, DataGridDatum, DataMultiGrid, DataMultiValue, ComputedLayoutDatumMultiValue, DataFormatterContainer, SeriesDirection, DataFormatterGridGrid, ContainerPosition, ContainerPositionScaled, Layout } from '../../lib/core-types';
 import * as d3 from 'd3';
 export declare function formatValueToLabel(value: any, valueFormatter: string | ((text: d3.NumberValue) => string)): string;
-export declare function createDefaultDatumId(chartTypeOrPrefix: string, levelOneIndex: number, levelTwoIndex: number, levelThreeIndex?: number): string;
+export declare function createDefaultDatumId(chartTypeOrPrefix: string, levelOneIndex: number, levelTwoIndex?: number, levelThreeIndex?: number): string;
 export declare function createDefaultSeriesLabel(chartTypeOrPrefix: string, seriesIndex: number): string;
 export declare function createDefaultGroupLabel(chartTypeOrPrefix: string, groupIndex: number): string;
+export declare function createDefaultCategoryLabel(): string;
 export declare function createGridSeriesLabels({ transposedDataGrid, dataFormatterGrid, chartType }: {
     transposedDataGrid: DataGridDatum[][];
     dataFormatterGrid: DataFormatterGridGrid;
@@ -26,13 +27,26 @@ export declare function createMultiGridGroupLabels({ transposedDataGrid, dataFor
     chartType?: ChartType;
     gridIndex?: number;
 }): string[];
-export declare function getMinAndMax(data: number[]): [number, number];
-export declare function getMinAndMaxValue(data: DatumValue[]): [number, number];
-export declare function getMinAndMaxSeries(data: DataSeries): [number, number];
-export declare function getMinAndMaxGrid(data: DataGrid): [number, number];
-export declare function getMinAndMaxMultiGrid(data: DataMultiGrid): [number, number];
-export declare function getMinAndMaxMultiValue(data: DataMultiValue, valueIndex?: number): [number, number];
+export declare function getMinMax(data: number[]): [number, number];
+export declare function getMinMaxValue(data: DatumValue[]): [number, number];
+export declare function getMinMaxSeries(data: DataSeries): [number, number];
+export declare function getMinMaxGrid(data: DataGrid): [number, number];
+export declare function getMinMaxMultiGrid(data: DataMultiGrid): [number, number];
+export declare function getMinMaxMultiValue(data: DataMultiValue, valueIndex: number): [number, number];
+export declare function getMinMaxMultiValueXY({ data, minX, maxX, minY, maxY }: {
+    data: ComputedLayoutDatumMultiValue[][];
+    minX: number;
+    maxX: number;
+    minY: number;
+    maxY: number;
+}): {
+    minXDatum: ComputedLayoutDatumMultiValue;
+    maxXDatum: ComputedLayoutDatumMultiValue;
+    minYDatum: ComputedLayoutDatumMultiValue;
+    maxYDatum: ComputedLayoutDatumMultiValue;
+    filteredData: ComputedLayoutDatumMultiValue[][];
+};
 export declare function transposeData<T>(seriesDirection: SeriesDirection, data: T[][]): T[][];
 export declare function seriesColorPredicate(seriesIndex: number, chartParams: ChartParams): string;
-export declare function calcSeriesContainerLayout(layout: Layout, container: DataFormatterContainer, amount: number): SeriesContainerPosition[];
-export declare function calcGridContainerLayout(layout: Layout, container: DataFormatterContainer, amount: number): GridContainerPosition[];
+export declare function calcSeriesContainerLayout(layout: Layout, container: DataFormatterContainer, amount: number): ContainerPosition[];
+export declare function calcGridContainerLayout(layout: Layout, container: DataFormatterContainer, amount: number): ContainerPositionScaled[];

package/dist/src/utils/relationshipObservables.d.ts

@@ -0,0 +1,13 @@
+import { Observable } from 'rxjs';
+import { ComputedDataRelationship, ComputedNode, ComputedEdge } from '../../lib/core-types';
+
+export declare const categoryLabelsObservable: (CategoryNodeMap$: Observable<Map<string, ComputedNode[]>>, CategoryEdgeMap$: Observable<Map<string, ComputedEdge[]>>) => Observable<string[]>;
+export declare const NodeMapObservable: (computedData$: Observable<ComputedDataRelationship>) => Observable<Map<string, ComputedNode>>;
+export declare const EdgeMapObservable: (computedData$: Observable<ComputedDataRelationship>) => Observable<Map<string, ComputedEdge>>;
+export declare const relationshipVisibleComputedDataObservable: ({ computedData$, NodeMap$ }: {
+    computedData$: Observable<ComputedDataRelationship>;
+    NodeMap$: Observable<Map<string, ComputedNode>>;
+}) => Observable<{
+    nodes: ComputedNode[];
+    edges: ComputedEdge[];
+}>;

package/dist/src/utils/seriesObservables.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { ComputedDatumSeries, ComputedDataTypeMap, DataFormatterTypeMap, SeriesContainerPosition, Layout } from '../../lib/core-types';
+import { ComputedDatumSeries, ComputedDataTypeMap, DataFormatterTypeMap, ContainerPosition, Layout } from '../../lib/core-types';
 
 export declare const separateSeriesObservable: ({ fullDataFormatter$ }: {
     fullDataFormatter$: Observable<DataFormatterTypeMap<"series">>;
@@ -18,9 +18,9 @@ export declare const seriesContainerPositionObservable: ({ computedData$, fullDa
     computedData$: Observable<ComputedDataTypeMap<"series">>;
     fullDataFormatter$: Observable<DataFormatterTypeMap<"series">>;
     layout$: Observable<Layout>;
-}) => Observable<SeriesContainerPosition[]>;
+}) => Observable<ContainerPosition[]>;
 export declare const seriesContainerPositionMapObservable: ({ seriesContainerPosition$, seriesLabels$, separateSeries$ }: {
-    seriesContainerPosition$: Observable<SeriesContainerPosition[]>;
+    seriesContainerPosition$: Observable<ContainerPosition[]>;
     seriesLabels$: Observable<string[]>;
     separateSeries$: Observable<boolean>;
-}) => Observable<Map<string, SeriesContainerPosition>>;
+}) => Observable<Map<string, ContainerPosition>>;

package/dist/src/utils/treeObservables.d.ts

@@ -1,13 +1,10 @@
 import { Observable } from 'rxjs';
-import { ComputedDataTree, DataFormatterTree } from '../../lib/core-types';
+import { ComputedDataTree } from '../../lib/core-types';
 
 export declare const nodeListObservable: ({ computedData$ }: {
     computedData$: Observable<ComputedDataTree>;
 }) => Observable<ComputedDataTree[]>;
-export declare const existCategoryLabelsObservable: ({ nodeList$, fullDataFormatter$ }: {
-    nodeList$: Observable<ComputedDataTree[]>;
-    fullDataFormatter$: Observable<DataFormatterTree>;
-}) => Observable<string[]>;
+export declare const categoryLabelsObservable: (CategoryDataMap$: Observable<Map<string, ComputedDataTree[]>>) => Observable<string[]>;
 export declare const treeVisibleComputedDataObservable: ({ computedData$ }: {
     computedData$: Observable<ComputedDataTree>;
 }) => Observable<ComputedDataTree>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbcharts/core",
-  "version": "3.0.0-alpha.68",
+  "version": "3.0.0-beta.10",
   "description": "OrbCharts is an open source chart library based on d3.js and rx.js",
   "author": "Blue Planet Inc.",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
     "vite-plugin-dts": "^3.7.3"
   },
   "dependencies": {
-    "@orbcharts/core-types": "^3.0.0-alpha.3",
+    "@orbcharts/core-types": "^3.0.0-beta.7",
     "d3": "^7.8.5",
     "rxjs": "^7.8.1"
   }

package/src/GridChart.ts

@@ -1,7 +1,7 @@
 import type {
   ChartEntity,
   ChartOptionsPartial } from '../lib/core-types'
-import { DATA_FORMATTER_GRID_DEFAULT } from './defaults'
+import { DEFAULT_DATA_FORMATTER_GRID } from './defaults'
 import { dataFormatterValidator } from './grid/dataFormatterValidator'
 import { computedDataFn } from './grid/computedDataFn'
 import { dataValidator } from './grid/dataValidator'
@@ -12,7 +12,7 @@ export class GridChart extends AbstractChart<'grid'> implements ChartEntity<'gri
   constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'grid'>) {
     super(
       {
-        defaultDataFormatter: DATA_FORMATTER_GRID_DEFAULT,
+        defaultDataFormatter: DEFAULT_DATA_FORMATTER_GRID,
         dataFormatterValidator,
         computedDataFn,
         dataValidator,

package/src/MultiGridChart.ts

@@ -1,7 +1,7 @@
 import type {
   ChartEntity,
   ChartOptionsPartial } from '../lib/core-types'
-import { DATA_FORMATTER_MULTI_GRID_DEFAULT } from './defaults'
+import { DEFAULT_DATA_FORMATTER_MULTI_GRID } from './defaults'
 import { dataFormatterValidator } from './multiGrid/dataFormatterValidator'
 import { computedDataFn } from './multiGrid/computedDataFn'
 import { dataValidator } from './multiGrid/dataValidator'
@@ -12,7 +12,7 @@ export class MultiGridChart extends AbstractChart<'multiGrid'> implements ChartE
   constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'multiGrid'>) {
     super(
       {
-        defaultDataFormatter: DATA_FORMATTER_MULTI_GRID_DEFAULT,
+        defaultDataFormatter: DEFAULT_DATA_FORMATTER_MULTI_GRID,
         dataFormatterValidator,
         computedDataFn,
         dataValidator,

package/src/MultiValueChart.ts

@@ -1,7 +1,7 @@
 import type {
   ChartEntity,
   ChartOptionsPartial } from '../lib/core-types'
-import { DATA_FORMATTER_MULTI_VALUE_DEFAULT } from './defaults'
+import { DEFAULT_DATA_FORMATTER_MULTI_VALUE } from './defaults'
 import { dataFormatterValidator } from './multiValue/dataFormatterValidator'
 import { computedDataFn } from './multiValue/computedDataFn'
 import { dataValidator } from './multiValue/dataValidator'
@@ -12,7 +12,7 @@ export class MultiValueChart extends AbstractChart<'multiValue'> implements Char
   constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'multiValue'>) {
     super(
       {
-        defaultDataFormatter: DATA_FORMATTER_MULTI_VALUE_DEFAULT,
+        defaultDataFormatter: DEFAULT_DATA_FORMATTER_MULTI_VALUE,
         dataFormatterValidator,
         computedDataFn,
         dataValidator,

package/src/RelationshipChart.ts

@@ -1,7 +1,7 @@
 import type {
   ChartEntity,
   ChartOptionsPartial } from '../lib/core-types'
-import { DATA_FORMATTER_RELATIONAL_DEFAULT} from './defaults'
+import { DEFAULT_DATA_FORMATTER_RELATIONSHIP} from './defaults'
 import { dataFormatterValidator } from './relationship/dataFormatterValidator'
 import { computedDataFn } from './relationship/computedDataFn'
 import { dataValidator } from './relationship/dataValidator'
@@ -12,7 +12,7 @@ export class RelationshipChart extends AbstractChart<'relationship'> implements
   constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'relationship'>) {
     super(
       {
-        defaultDataFormatter: DATA_FORMATTER_RELATIONAL_DEFAULT,
+        defaultDataFormatter: DEFAULT_DATA_FORMATTER_RELATIONSHIP,
         dataFormatterValidator,
         computedDataFn,
         dataValidator,

package/src/SeriesChart.ts

@@ -1,7 +1,7 @@
 import type {
   ChartEntity,
   ChartOptionsPartial } from '../lib/core-types'
-import { DATA_FORMATTER_SERIES_DEFAULT } from './defaults'
+import { DEFAULT_DATA_FORMATTER_SERIES } from './defaults'
 import { dataFormatterValidator } from './series/dataFormatterValidator'
 import { computedDataFn } from './series/computedDataFn'
 import { dataValidator } from './series/dataValidator'
@@ -12,7 +12,7 @@ export class SeriesChart extends AbstractChart<'series'> implements ChartEntity<
   constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'series'>) {
     super(
       {
-        defaultDataFormatter: DATA_FORMATTER_SERIES_DEFAULT,
+        defaultDataFormatter: DEFAULT_DATA_FORMATTER_SERIES,
         dataFormatterValidator,
         computedDataFn,
         dataValidator,

package/src/TreeChart.ts

@@ -1,7 +1,7 @@
 import type {
   ChartEntity,
   ChartOptionsPartial } from '../lib/core-types'
-import { DATA_FORMATTER_TREE_DEFAULT } from './defaults'
+import { DEFAULT_DATA_FORMATTER_TREE } from './defaults'
 import { dataFormatterValidator } from './tree/dataFormatterValidator'
 import { computedDataFn } from './tree/computedDataFn'
 import { dataValidator } from './tree/dataValidator'
@@ -12,7 +12,7 @@ export class TreeChart extends AbstractChart<'tree'> implements ChartEntity<'tre
   constructor (element: HTMLElement | Element, options?: ChartOptionsPartial<'tree'>) {
     super(
       {
-        defaultDataFormatter: DATA_FORMATTER_TREE_DEFAULT,
+        defaultDataFormatter: DEFAULT_DATA_FORMATTER_TREE,
         dataFormatterValidator,
         computedDataFn,
         dataValidator,

package/src/base/createBaseChart.ts

@@ -61,11 +61,11 @@ import { elementValidator } from './validators/elementValidator'
 import { chartParamsValidator } from './validators/chartParamsValidator'
 import { pluginsValidator } from './validators/pluginsValidator'
 import {
-  CHART_OPTIONS_DEFAULT,
-  PADDING_DEFAULT,
-  CHART_PARAMS_DEFAULT,
-  CHART_WIDTH_DEFAULT,
-  CHART_HEIGHT_DEFAULT } from '../defaults'
+  DEFAULT_CHART_OPTIONS,
+  DEFAULT_PADDING,
+  DEFAULT_CHART_PARAMS,
+  DEFAULT_CHART_WIDTH,
+  DEFAULT_CHART_HEIGHT } from '../defaults'
 
 // 判斷dataFormatter是否需要size參數
 // const isAxesTypeMap: {[key in ChartType]: Boolean} = {
@@ -174,15 +174,15 @@ export const createBaseChart: CreateBaseChart = <T extends ChartType>({
 
     // options
     const mergedPresetWithDefault: Preset<T, any> = ((options) => {
-      const _options = options ? options : CHART_OPTIONS_DEFAULT as ChartOptionsPartial<T>
+      const _options = options ? options : DEFAULT_CHART_OPTIONS as ChartOptionsPartial<T>
       const preset = _options.preset ? _options.preset : {} as PresetPartial<T, any>
 
       return {
         name: preset.name ?? '',
         description: preset.description ?? '',
         chartParams: preset.chartParams
-          ? mergeOptionsWithDefault(preset.chartParams, CHART_PARAMS_DEFAULT)
-          : CHART_PARAMS_DEFAULT,
+          ? mergeOptionsWithDefault(preset.chartParams, DEFAULT_CHART_PARAMS)
+          : DEFAULT_CHART_PARAMS,
         dataFormatter: preset.dataFormatter
           // ? mergeOptionsWithDefault(preset.dataFormatter, defaultDataFormatter)
           ? mergeDataFormatter(preset.dataFormatter, defaultDataFormatter, chartType)
@@ -270,7 +270,7 @@ export const createBaseChart: CreateBaseChart = <T extends ChartType>({
         takeUntil(destroy$),
         startWith({}),
         map((d: any) => {
-          return mergeOptionsWithDefault(d.padding ?? {}, PADDING_DEFAULT)
+          return mergeOptionsWithDefault(d.padding ?? {}, DEFAULT_PADDING)
         })
       )
     mergedPadding$
@@ -290,8 +290,8 @@ export const createBaseChart: CreateBaseChart = <T extends ChartType>({
 
     // 監聽外層的element尺寸
     const rootSize$: Observable<{ width: number; height: number }> = of({
-      width: options?.width ?? CHART_OPTIONS_DEFAULT.width,
-      height: options?.height ?? CHART_OPTIONS_DEFAULT.height
+      width: options?.width ?? DEFAULT_CHART_OPTIONS.width,
+      height: options?.height ?? DEFAULT_CHART_OPTIONS.height
     }).pipe(
         switchMap(size => {
           return iif(
@@ -334,10 +334,10 @@ export const createBaseChart: CreateBaseChart = <T extends ChartType>({
       switchMap(async (d) => {
         const rootWidth = d.rootSize.width > 0
           ? d.rootSize.width
-          : CHART_WIDTH_DEFAULT
+          : DEFAULT_CHART_WIDTH
         const rootHeight = d.rootSize.height > 0
           ? d.rootSize.height
-          : CHART_HEIGHT_DEFAULT
+          : DEFAULT_CHART_HEIGHT
         return {
           width: rootWidth - d.mergedPadding.left - d.mergedPadding.right,
           height: rootHeight - d.mergedPadding.top - d.mergedPadding.bottom,

package/src/base/validators/chartParamsValidator.ts

@@ -83,7 +83,7 @@ export function chartParamsValidator (chartType: ChartType, chartParamsPartial:
 
     if (chartParamsPartial.colors.light) {
       const lightResult = validateColumns(chartParamsPartial.colors.light, {
-        series: {
+        label: {
           toBeTypes: ['string[]'],
         },
         primary: {
@@ -92,8 +92,8 @@ export function chartParamsValidator (chartType: ChartType, chartParamsPartial:
         secondary: {
           toBeTypes: ['string'],
         },
-        white: {
-          toBeTypes: ['string'],
+        labelContrast: {
+          toBeTypes: ['string[]'],
         },
         background: {
           toBeTypes: ['string'],
@@ -107,7 +107,7 @@ export function chartParamsValidator (chartType: ChartType, chartParamsPartial:
 
     if (chartParamsPartial.colors.dark) {
       const darkResult = validateColumns(chartParamsPartial.colors.dark, {
-        series: {
+        label: {
           toBeTypes: ['string[]'],
         },
         primary: {
@@ -116,8 +116,8 @@ export function chartParamsValidator (chartType: ChartType, chartParamsPartial:
         secondary: {
           toBeTypes: ['string'],
         },
-        white: {
-          toBeTypes: ['string'],
+        labelContrast: {
+          toBeTypes: ['string[]'],
         },
         background: {
           toBeTypes: ['string'],