@orbcharts/core 3.0.0-alpha.25 → 3.0.0-alpha.26

package/dist/src/types/ChartParams.d.ts

@@ -13,7 +13,7 @@ export interface ChartParams {
     transitionDuration: number;
     transitionEase: string;
 }
-export type ChartParamsPartial = Partial<ChartParams> & Partial<{
+export type ChartParamsPartial = Partial<ChartParams | {
     padding: Partial<Padding>;
     colors: Partial<{
         light: Partial<ColorScheme>;

package/dist/src/types/DataFormatterGrid.d.ts

@@ -1,5 +1,5 @@
 import { DataGridDatum, DataGridValue } from './DataGrid';
-import { DataFormatterBase, DataFormatterValueAxis, DataFormatterGroupAxis, DataFormatterContext } from './DataFormatter';
+import { DataFormatterBase, DataFormatterBasePartial, DataFormatterValueAxis, DataFormatterGroupAxis, DataFormatterContext } from './DataFormatter';
 
 export type SeriesType = 'row' | 'column';
 export interface DataFormatterGrid extends DataFormatterBase<'grid'> {
@@ -8,11 +8,12 @@ export interface DataFormatterGrid extends DataFormatterBase<'grid'> {
     groupAxis: DataFormatterGroupAxis;
     colorsPredicate: (datum: DataGridDatum | DataGridValue, rowIndex: number, columnIndex: number, context: DataFormatterContext<'grid'>) => string;
 }
-export type DataFormatterGridPartial = Partial<DataFormatterGrid> & Partial<{
-    grid: Partial<DataFormatterGridGrid>;
-    valueAxis: Partial<DataFormatterValueAxis>;
-    groupAxis: Partial<DataFormatterGroupAxis>;
-}>;
+export interface DataFormatterGridPartial extends DataFormatterBasePartial<'grid'> {
+    grid?: Partial<DataFormatterGridGrid>;
+    valueAxis?: Partial<DataFormatterValueAxis>;
+    groupAxis?: Partial<DataFormatterGroupAxis>;
+    colorsPredicate?: (datum: DataGridDatum | DataGridValue, rowIndex: number, columnIndex: number, context: DataFormatterContext<'grid'>) => string;
+}
 export interface DataFormatterGridGrid {
     rowLabels: string[];
     columnLabels: string[];

package/dist/src/types/DataFormatterMultiGrid.d.ts

@@ -1,13 +1,13 @@
 import { DataGridDatum, DataGridValue } from './DataGrid';
 import { DataFormatterGridGrid } from './DataFormatterGrid';
-import { DataFormatterBase, DataFormatterValueAxis, DataFormatterGroupAxis, DataFormatterContext } from './DataFormatter';
+import { DataFormatterBase, DataFormatterBasePartial, DataFormatterValueAxis, DataFormatterGroupAxis, DataFormatterContext } from './DataFormatter';
 
 export interface DataFormatterMultiGrid extends DataFormatterBase<'multiGrid'> {
     multiGrid: Array<DataFormatterMultiGridMultiGrid>;
 }
-export type DataFormatterMultiGridPartial = Partial<DataFormatterMultiGrid> & Partial<{
-    multiGrid: Array<Partial<DataFormatterMultiGridMultiGrid>>;
-}>;
+export interface DataFormatterMultiGridPartial extends DataFormatterBasePartial<'multiGrid'> {
+    multiGrid?: Array<Partial<DataFormatterMultiGridMultiGrid>>;
+}
 export interface DataFormatterMultiGridMultiGrid {
     grid: DataFormatterGridGrid;
     valueAxis: DataFormatterValueAxis;

package/dist/src/types/DataFormatterMultiValue.d.ts

@@ -1,13 +1,15 @@
-import { DataFormatterBase, DataFormatterValueAxis } from './DataFormatter';
+import { DataFormatterBase, DataFormatterBasePartial, DataFormatterValueAxis } from './DataFormatter';
 
 export interface DataFormatterMultiValue extends DataFormatterBase<'multiValue'> {
     multiValue: Array<DataFormatterMultiValueMultiValue>;
     xAxis: DataFormatterValueAxis;
     yAxis: DataFormatterValueAxis;
 }
-export type DataFormatterMultiValuePartial = Partial<DataFormatterMultiValue> & Partial<{
-    multiValue: Array<Partial<DataFormatterMultiValueMultiValue>>;
-}>;
+export interface DataFormatterMultiValuePartial extends DataFormatterBasePartial<'multiValue'> {
+    multiValue?: Array<Partial<DataFormatterMultiValueMultiValue>>;
+    xAxis?: Partial<DataFormatterValueAxis>;
+    yAxis?: Partial<DataFormatterValueAxis>;
+}
 export interface DataFormatterMultiValueMultiValue {
     unitLabel: string;
 }

package/dist/src/types/DataFormatterRelationship.d.ts

@@ -1,5 +1,6 @@
-import { DataFormatterBase } from './DataFormatter';
+import { DataFormatterBase, DataFormatterBasePartial } from './DataFormatter';
 
 export interface DataFormatterRelationship extends DataFormatterBase<'relationship'> {
 }
-export type DataFormatterRelationshipPartial = Partial<DataFormatterRelationship> & Partial<{}>;
+export interface DataFormatterRelationshipPartial extends DataFormatterBasePartial<'relationship'> {
+}

package/dist/src/types/DataFormatterSeries.d.ts

@@ -1,5 +1,5 @@
 import { DataSeriesDatum, DataSeriesValue } from './DataSeries';
-import { DataFormatterBase, DataFormatterContext } from './DataFormatter';
+import { DataFormatterBase, DataFormatterBasePartial, DataFormatterContext } from './DataFormatter';
 
 export interface DataFormatterSeries extends DataFormatterBase<'series'> {
     unitLabel: string;
@@ -7,4 +7,9 @@ export interface DataFormatterSeries extends DataFormatterBase<'series'> {
     colorsPredicate: (datum: DataSeriesDatum | DataSeriesValue, rowIndex: number, columnIndex: number, context: DataFormatterContext<'series'>) => string;
     sort: ((a: DataSeriesDatum | DataSeriesValue, b: DataSeriesDatum | number) => number) | null;
 }
-export type DataFormatterSeriesPartial = Partial<DataFormatterSeries> & Partial<{}>;
+export interface DataFormatterSeriesPartial extends DataFormatterBasePartial<'series'> {
+    unitLabel?: string;
+    seriesLabels?: string[];
+    colorsPredicate?: (datum: DataSeriesDatum | DataSeriesValue, rowIndex: number, columnIndex: number, context: DataFormatterContext<'series'>) => string;
+    sort?: ((a: DataSeriesDatum | DataSeriesValue, b: DataSeriesDatum | number) => number) | null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbcharts/core",
-  "version": "3.0.0-alpha.25",
+  "version": "3.0.0-alpha.26",
   "description": "OrbCharts is an open source chart library based on d3.js and rx.js",
   "author": "Blue Planet Inc.",
   "license": "Apache-2.0",

package/src/types/ChartParams.ts

@@ -15,7 +15,7 @@ export interface ChartParams {
   // [key: string]: any
 }
 
-export type ChartParamsPartial = Partial<ChartParams> & Partial<{
+export type ChartParamsPartial = Partial<ChartParams | {
   padding: Partial<Padding>,
   colors: Partial<{
     light: Partial<ColorScheme>
@@ -24,6 +24,15 @@ export type ChartParamsPartial = Partial<ChartParams> & Partial<{
   styles: Partial<Styles>
 }>
 
+function test (): ChartParamsPartial {
+  return {
+    colorScheme: 'dark',
+    padding: {
+      top: 10
+    }
+  }
+}
+
 export type HighlightTarget = 'series' | 'group' | 'datum' | 'none'
 
 export interface Styles {

package/src/types/DataFormatterGrid.ts

@@ -4,8 +4,7 @@ import type { DataFormatterBase, DataFormatterBasePartial, DataFormatterValueAxi
 
 export type SeriesType = 'row' | 'column' // default: 'row'
 
-export interface DataFormatterGrid
-  extends DataFormatterBase<'grid'> {
+export interface DataFormatterGrid extends DataFormatterBase<'grid'> {
   grid: DataFormatterGridGrid
   valueAxis: DataFormatterValueAxis
   groupAxis: DataFormatterGroupAxis
@@ -13,11 +12,12 @@ export interface DataFormatterGrid
   colorsPredicate: (datum: DataGridDatum | DataGridValue, rowIndex: number, columnIndex: number, context: DataFormatterContext<'grid'>) => string
 }
 
-export type DataFormatterGridPartial = Partial<DataFormatterGrid> & Partial<{
-  grid: Partial<DataFormatterGridGrid>
-  valueAxis: Partial<DataFormatterValueAxis>
-  groupAxis: Partial<DataFormatterGroupAxis>
-}>
+export interface DataFormatterGridPartial extends DataFormatterBasePartial<'grid'> {
+  grid?: Partial<DataFormatterGridGrid>
+  valueAxis?: Partial<DataFormatterValueAxis>
+  groupAxis?: Partial<DataFormatterGroupAxis>
+  colorsPredicate?: (datum: DataGridDatum | DataGridValue, rowIndex: number, columnIndex: number, context: DataFormatterContext<'grid'>) => string
+}
 
 // grid欄位
 export interface DataFormatterGridGrid {

package/src/types/DataFormatterMultiGrid.ts

@@ -1,17 +1,21 @@
 import { DataGridDatum, DataGridValue } from './DataGrid'
 import { DataFormatterGridGrid } from './DataFormatterGrid'
-import { DataFormatterBase, DataFormatterValueAxis, DataFormatterGroupAxis, DataFormatterContext } from './DataFormatter'
+import {
+  DataFormatterBase,
+  DataFormatterBasePartial,
+  DataFormatterValueAxis,
+  DataFormatterGroupAxis,
+  DataFormatterContext } from './DataFormatter'
 import { AxisPosition } from './Axis'
 
-export interface DataFormatterMultiGrid
-  extends DataFormatterBase<'multiGrid'> {
+export interface DataFormatterMultiGrid extends DataFormatterBase<'multiGrid'> {
   multiGrid: Array<DataFormatterMultiGridMultiGrid>
   // visibleGroupRange: [number, number] | null
 }
 
-export type DataFormatterMultiGridPartial = Partial<DataFormatterMultiGrid> & Partial<{
-  multiGrid: Array<Partial<DataFormatterMultiGridMultiGrid>>
-}>
+export interface DataFormatterMultiGridPartial extends DataFormatterBasePartial<'multiGrid'> {
+  multiGrid?: Array<Partial<DataFormatterMultiGridMultiGrid>>
+}
 
 // multiGrid欄位
 export interface DataFormatterMultiGridMultiGrid {

package/src/types/DataFormatterMultiValue.ts

@@ -1,17 +1,18 @@
 import { DataMultiValueDatum, DataMultiValue } from './DataMultiValue'
-import { DataFormatterBase, DataFormatterValueAxis } from './DataFormatter'
+import { DataFormatterBase, DataFormatterBasePartial, DataFormatterValueAxis } from './DataFormatter'
 
-export interface DataFormatterMultiValue
-  extends DataFormatterBase<'multiValue'> {
+export interface DataFormatterMultiValue extends DataFormatterBase<'multiValue'> {
   // labelFormat: (datum: unknown) => string
   multiValue: Array<DataFormatterMultiValueMultiValue>
   xAxis: DataFormatterValueAxis
   yAxis: DataFormatterValueAxis
 }
 
-export type DataFormatterMultiValuePartial = Partial<DataFormatterMultiValue> & Partial<{
-  multiValue: Array<Partial<DataFormatterMultiValueMultiValue>>
-}>
+export interface DataFormatterMultiValuePartial extends DataFormatterBasePartial<'multiValue'> {
+  multiValue?: Array<Partial<DataFormatterMultiValueMultiValue>>
+  xAxis?: Partial<DataFormatterValueAxis>
+  yAxis?: Partial<DataFormatterValueAxis>
+}
 
 // multiValue欄位
 export interface DataFormatterMultiValueMultiValue {

package/src/types/DataFormatterRelationship.ts

@@ -1,16 +1,15 @@
 import { Node, Edge, DataRelationship } from './DataRelationship'
-import { DataFormatterBase } from './DataFormatter'
+import { DataFormatterBase, DataFormatterBasePartial } from './DataFormatter'
 
-export interface DataFormatterRelationship
-  extends DataFormatterBase<'relationship'> {
+export interface DataFormatterRelationship extends DataFormatterBase<'relationship'> {
   // node: DataFormatterRelationshipNode
   // edge: DataFormatterRelationshipEdge
 }
 
-export type DataFormatterRelationshipPartial = Partial<DataFormatterRelationship> & Partial<{
+export interface DataFormatterRelationshipPartial extends DataFormatterBasePartial<'relationship'> {
   // node: Partial<DataFormatterRelationshipNode>
   // edge: Partial<DataFormatterRelationshipEdge>
-}>
+}
 
 // export interface DataFormatterRelationshipNode {
 //   labelFormat: (node: unknown) => string

package/src/types/DataFormatterSeries.ts

@@ -1,9 +1,8 @@
 import { DataSeriesDatum, DataSeriesValue, DataSeries } from './DataSeries'
-import { DataFormatterBase, DataFormatterContext } from './DataFormatter'
+import { DataFormatterBase, DataFormatterBasePartial, DataFormatterContext } from './DataFormatter'
 // import { ComputedDatumSeries } from './ComputedDataSeries'
 
-export interface DataFormatterSeries
-  extends DataFormatterBase<'series'> {
+export interface DataFormatterSeries extends DataFormatterBase<'series'> {
   // series: DataFormatterSeriesSeries
   unitLabel: string
   seriesLabels: string[]
@@ -14,9 +13,13 @@ export interface DataFormatterSeries
   // colors: Colors
 }
 
-export type DataFormatterSeriesPartial = Partial<DataFormatterSeries> & Partial<{
+export interface DataFormatterSeriesPartial extends DataFormatterBasePartial<'series'> {
   // series: Partial<DataFormatterSeriesSeries>
-}>
+  unitLabel?: string
+  seriesLabels?: string[]
+  colorsPredicate?: (datum: DataSeriesDatum | DataSeriesValue, rowIndex: number, columnIndex: number, context: DataFormatterContext<'series'>) => string
+  sort?: ((a: DataSeriesDatum | DataSeriesValue, b: DataSeriesDatum | number) => number) | null
+}
 
 // export interface DataFormatterSeriesSeries {
 //   unitLabel: string