@orbcharts/core 3.0.0-alpha.41 → 3.0.0-alpha.43

package/src/types/ChartParams.ts

@@ -1,51 +1,51 @@
-import type { Padding } from './Padding'
-
-export interface ChartParams {
-  padding: Padding,
-  highlightTarget: HighlightTarget
-  highlightDefault: string | null
-  colorScheme: 'dark' | 'light'
-  colors: {
-    light: ColorScheme
-    dark: ColorScheme
-  }
-  styles: Styles
-  transitionDuration: number
-  transitionEase: string
-  // [key: string]: any
-}
-
-export type ChartParamsPartial = Partial<ChartParams | {
-  padding: Partial<Padding>,
-  colors: Partial<{
-    light: Partial<ColorScheme>
-    dark: Partial<ColorScheme>
-  }>
-  styles: Partial<Styles>
-}>
-
-function test (): ChartParamsPartial {
-  return {
-    colorScheme: 'dark',
-    padding: {
-      top: 10
-    }
-  }
-}
-
-export type HighlightTarget = 'series' | 'group' | 'category' | 'datum' | 'none'
-
-export interface Styles {
-  textSize: string | number
-  unhighlightedOpacity: number
-}
-
-export interface ColorScheme {
-  series: string[]
-  primary: string
-  secondary: string
-  white: string
-  background: string
-}
-
-export type ColorType = 'none' | keyof ColorScheme
+import type { Padding } from './Padding'
+
+export interface ChartParams {
+  padding: Padding,
+  highlightTarget: HighlightTarget
+  highlightDefault: string | null
+  colorScheme: 'dark' | 'light'
+  colors: {
+    light: ColorScheme
+    dark: ColorScheme
+  }
+  styles: Styles
+  transitionDuration: number
+  transitionEase: string
+  // [key: string]: any
+}
+
+export type ChartParamsPartial = Partial<ChartParams | {
+  padding: Partial<Padding>,
+  colors: Partial<{
+    light: Partial<ColorScheme>
+    dark: Partial<ColorScheme>
+  }>
+  styles: Partial<Styles>
+}>
+
+function test (): ChartParamsPartial {
+  return {
+    colorScheme: 'dark',
+    padding: {
+      top: 10
+    }
+  }
+}
+
+export type HighlightTarget = 'series' | 'group' | 'category' | 'datum' | 'none'
+
+export interface Styles {
+  textSize: string | number
+  unhighlightedOpacity: number
+}
+
+export interface ColorScheme {
+  series: string[]
+  primary: string
+  secondary: string
+  white: string
+  background: string
+}
+
+export type ColorType = 'none' | keyof ColorScheme

package/src/types/ComputedData.ts

@@ -1,83 +1,84 @@
-import type { ChartType } from './Chart'
-import type { ComputedDataSeries, ComputedDatumSeries } from './ComputedDataSeries'
-import type { ComputedDataGrid, ComputedDatumGrid } from './ComputedDataGrid'
-import type { ComputedDataMultiGrid } from './ComputedDataMultiGrid'
-import type { ComputedDataMultiValue, ComputedDatumMultiValue } from './ComputedDataMultiValue'
-import type { ComputedDataRelationship, ComputedNode } from './ComputedDataRelationship'
-import type { ComputedDataTree } from './ComputedDataTree'
-import type { DataFormatterContext } from './DataFormatter'
-
-export interface ComputedDataFn<T extends ChartType> {
-  (dataFormatterContext: DataFormatterContext<T>): ComputedDataTypeMap<T>
-}
-
-// datum - 基本型本
-export interface ComputedDatumBase {
-  id: string
-  index: number
-  label: string
-  value: number | null
-  visible: boolean
-  description: string
-  data: any // 使用者注入的資料
-}
-
-// datum - 單值
-// export interface ComputedDatumValue {
-//   value: number | null
-//   // valueLabel: string
-// }
-
-// datum - 多值
-// export interface ComputedDatumMultiValue {
-//   value: number[]
-//   valueLabels: string[]
-// }
-
-// datum - 圖軸
-// export interface ComputedDatumWithAxis {
-//   axisX: number
-//   axisY: number
-// }
-
-// datum - 序列資料
-export interface ComputedDatumSeriesValue {
-  color: string
-  seriesIndex: number
-  seriesLabel: string
-}
-
-// datum - 矩陣資料
-export interface ComputedDatumGridValue {
-  gridIndex: number
-  color: string
-  seriesIndex: number
-  seriesLabel: string
-  groupIndex: number
-  groupLabel: string
-}
-
-// datum - 類別資料
-export interface ComputedDatumCategoryValue {
-  color: string
-  categoryIndex: number
-  categoryLabel: string | null
-}
-
-// 透過類型選擇ComputedData
-export type ComputedDataTypeMap<T extends ChartType> = T extends 'series' ? ComputedDataSeries
-  : T extends 'grid' ? ComputedDataGrid
-  : T extends 'multiGrid' ? ComputedDataMultiGrid
-  : T extends 'multiValue' ? ComputedDataMultiValue
-  : T extends 'relationship' ? ComputedDataRelationship
-  : T extends 'tree' ? ComputedDataTree
-  : ComputedDatumBase
-
-// 透過類型選擇ComputedDatum
-export type ComputedDatumTypeMap<T extends ChartType> = T extends 'series' ? ComputedDatumSeries
-: T extends 'grid' ? ComputedDatumGrid
-: T extends 'multiGrid' ? ComputedDatumGrid
-: T extends 'multiValue' ? ComputedDatumMultiValue
-: T extends 'relationship' ? ComputedNode
-: T extends 'tree' ? ComputedDataTree
+import type { ChartType } from './Chart'
+import type { ComputedDataSeries, ComputedDatumSeries } from './ComputedDataSeries'
+import type { ComputedDataGrid, ComputedDatumGrid } from './ComputedDataGrid'
+import type { ComputedDataMultiGrid } from './ComputedDataMultiGrid'
+import type { ComputedDataMultiValue, ComputedDatumMultiValue } from './ComputedDataMultiValue'
+import type { ComputedDataRelationship, ComputedNode } from './ComputedDataRelationship'
+import type { ComputedDataTree } from './ComputedDataTree'
+import type { DataFormatterContext } from './DataFormatter'
+
+export interface ComputedDataFn<T extends ChartType> {
+  (dataFormatterContext: DataFormatterContext<T>): ComputedDataTypeMap<T>
+}
+
+// datum - 基本型本
+export interface ComputedDatumBase {
+  id: string
+  index: number
+  label: string
+  value: number | null
+  visible: boolean
+  description: string
+  data: any // 使用者注入的資料
+}
+
+// datum - 單值
+// export interface ComputedDatumValue {
+//   value: number | null
+//   // valueLabel: string
+// }
+
+// datum - 多值
+// export interface ComputedDatumMultiValue {
+//   value: number[]
+//   valueLabels: string[]
+// }
+
+// datum - 圖軸
+// export interface ComputedDatumWithAxis {
+//   axisX: number
+//   axisY: number
+// }
+
+// datum - 序列資料
+export interface ComputedDatumSeriesValue {
+  color: string
+  seriesIndex: number
+  seriesLabel: string
+  seq: number
+}
+
+// datum - 矩陣資料
+export interface ComputedDatumGridValue {
+  gridIndex: number
+  color: string
+  seriesIndex: number
+  seriesLabel: string
+  groupIndex: number
+  groupLabel: string
+}
+
+// datum - 類別資料
+export interface ComputedDatumCategoryValue {
+  color: string
+  categoryIndex: number
+  categoryLabel: string | null
+}
+
+// 透過類型選擇ComputedData
+export type ComputedDataTypeMap<T extends ChartType> = T extends 'series' ? ComputedDataSeries
+  : T extends 'grid' ? ComputedDataGrid
+  : T extends 'multiGrid' ? ComputedDataMultiGrid
+  : T extends 'multiValue' ? ComputedDataMultiValue
+  : T extends 'relationship' ? ComputedDataRelationship
+  : T extends 'tree' ? ComputedDataTree
+  : ComputedDatumBase
+
+// 透過類型選擇ComputedDatum
+export type ComputedDatumTypeMap<T extends ChartType> = T extends 'series' ? ComputedDatumSeries
+: T extends 'grid' ? ComputedDatumGrid
+: T extends 'multiGrid' ? ComputedDatumGrid
+: T extends 'multiValue' ? ComputedDatumMultiValue
+: T extends 'relationship' ? ComputedNode
+: T extends 'tree' ? ComputedDataTree
 : unknown

package/src/types/ComputedDataGrid.ts

@@ -1,14 +1,14 @@
-import { ComputedDatumBase, ComputedDatumGridValue } from './ComputedData'
-
-export interface ComputedDatumGrid
-  extends ComputedDatumBase, ComputedDatumGridValue {
-  // accSeriesIndex: number // 每一個grid累加的seriesIndex
-  // gridIndex: number
-  // groupIndex: number
-  // groupLabel: string
-  axisX: number
-  axisY: number
-  axisYFromZero: number
-}
-
+import { ComputedDatumBase, ComputedDatumGridValue } from './ComputedData'
+
+export interface ComputedDatumGrid
+  extends ComputedDatumBase, ComputedDatumGridValue {
+  // accSeriesIndex: number // 每一個grid累加的seriesIndex
+  // gridIndex: number
+  // groupIndex: number
+  // groupLabel: string
+  // axisX: number
+  // axisY: number
+  // axisYFromZero: number
+}
+
 export type ComputedDataGrid = ComputedDatumGrid[][]

package/src/types/ComputedDataMultiGrid.ts

@@ -1,3 +1,3 @@
-import { ComputedDataGrid } from './ComputedDataGrid'
-
+import { ComputedDataGrid } from './ComputedDataGrid'
+
 export type ComputedDataMultiGrid = ComputedDataGrid[]

package/src/types/ComputedDataMultiValue.ts

@@ -1,9 +1,9 @@
-import type { ComputedDatumBase, ComputedDatumCategoryValue } from './ComputedData'
-
-export type ComputedDataMultiValue = ComputedDatumMultiValue[][]
-
-export interface ComputedDatumMultiValue extends ComputedDatumBase, ComputedDatumCategoryValue {
-  axis: number
-}
-
-
+import type { ComputedDatumBase, ComputedDatumCategoryValue } from './ComputedData'
+
+export type ComputedDataMultiValue = ComputedDatumMultiValue[][]
+
+export interface ComputedDatumMultiValue extends ComputedDatumBase, ComputedDatumCategoryValue {
+  axis: number
+}
+
+

package/src/types/ComputedDataRelationship.ts

@@ -1,20 +1,20 @@
-import type { ComputedDatumBase, ComputedDatumCategoryValue } from './ComputedData'
-
-export type ComputedDataRelationship = {
-  nodes: ComputedNode[]
-  edges: ComputedEdge[]
-}
-
-export interface ComputedNode extends ComputedDatumBase, ComputedDatumCategoryValue {
-  startNodes: ComputedNode[]
-  startNodeIds: string[]
-  endNodes: ComputedNode[]
-  endNodeIds: string[]
-}
-
-export interface ComputedEdge extends ComputedDatumBase {
-  startNode: ComputedNode
-  startNodeId: string
-  endNode: ComputedNode
-  endNodeId: string
+import type { ComputedDatumBase, ComputedDatumCategoryValue } from './ComputedData'
+
+export type ComputedDataRelationship = {
+  nodes: ComputedNode[]
+  edges: ComputedEdge[]
+}
+
+export interface ComputedNode extends ComputedDatumBase, ComputedDatumCategoryValue {
+  startNodes: ComputedNode[]
+  startNodeIds: string[]
+  endNodes: ComputedNode[]
+  endNodeIds: string[]
+}
+
+export interface ComputedEdge extends ComputedDatumBase {
+  startNode: ComputedNode
+  startNodeId: string
+  endNode: ComputedNode
+  endNodeId: string
 }

package/src/types/ComputedDataSeries.ts

@@ -1,8 +1,8 @@
-import { ComputedDatumBase, ComputedDatumSeriesValue } from './ComputedData'
-
-export interface ComputedDatumSeries
-  extends ComputedDatumBase, ComputedDatumSeriesValue {
-  sortedIndex: number
-}
-
-export type ComputedDataSeries = ComputedDatumSeries[]
+import { ComputedDatumBase, ComputedDatumSeriesValue } from './ComputedData'
+
+export interface ComputedDatumSeries
+  extends ComputedDatumBase, ComputedDatumSeriesValue {
+  
+}
+
+export type ComputedDataSeries = ComputedDatumSeries[][]

package/src/types/ComputedDataTree.ts

@@ -1,20 +1,20 @@
-import type { ComputedDatumBase, ComputedDatumCategoryValue } from './ComputedData'
-
-// export type ComputedDataTree = ComputedDataTreeDatum[]
-
-// export interface ComputedDataTreeDatum extends ComputedDatum {
-//   // id: string
-//   children: ComputedDataTreeDatum[]
-//   childrenIds: string[]
-// //   ChildrenMap: Map<string, ComputedDataTreeDatum>
-//   parent: ComputedDataTreeDatum
-//   parentId: string
-//   value?: number
-// }
-
-// 樹狀結構
-export interface ComputedDataTree extends ComputedDatumBase, ComputedDatumCategoryValue {
-  level: number
-  seq: number
-  children?: ComputedDataTree[]
+import type { ComputedDatumBase, ComputedDatumCategoryValue } from './ComputedData'
+
+// export type ComputedDataTree = ComputedDataTreeDatum[]
+
+// export interface ComputedDataTreeDatum extends ComputedDatum {
+//   // id: string
+//   children: ComputedDataTreeDatum[]
+//   childrenIds: string[]
+// //   ChildrenMap: Map<string, ComputedDataTreeDatum>
+//   parent: ComputedDataTreeDatum
+//   parentId: string
+//   value?: number
+// }
+
+// 樹狀結構
+export interface ComputedDataTree extends ComputedDatumBase, ComputedDatumCategoryValue {
+  level: number
+  seq: number
+  children?: ComputedDataTree[]
 }

package/src/types/ContextObserver.ts

@@ -1,38 +1,38 @@
-import { Observable, Subject, BehaviorSubject } from 'rxjs'
-import type { ChartType } from './Chart'
-import type { ChartParams } from './ChartParams'
-import type { DataFormatterTypeMap } from './DataFormatter'
-import type { ComputedDataTypeMap } from './ComputedData'
-import type { Layout } from './Layout'
-import type { ContextObserverGrid } from './ContextObserverGrid'
-import type { ContextObserverMultiGrid } from './ContextObserverMultiGrid'
-import type { ContextObserverMultiValue } from './ContextObserverMultiValue'
-import type { ContextObserverRelationship } from './ContextObserverRelationship'
-import type { ContextObserverSeries } from './ContextObserverSeries'
-import type { ContextObserverTree } from './ContextObserverTree'
-import type { ContextSubject } from './ContextSubject'
-
-export interface ContextObserverFn<T extends ChartType> {
-  ({ subject, observer }: {
-    subject: ContextSubject<T>
-    observer: ContextObserverBase<T, unknown>
-  }): ContextObserverTypeMap<T, unknown>
-}
-
-// ContextObserver
-export type ContextObserverTypeMap<T extends ChartType, PluginParams> = T extends 'series' ? ContextObserverSeries<PluginParams>
-  : T extends 'grid' ? ContextObserverGrid<PluginParams>
-  : T extends 'multiGrid' ? ContextObserverMultiGrid<PluginParams>
-  : T extends 'multiValue' ? ContextObserverMultiValue<PluginParams>
-  : T extends 'relationship' ? ContextObserverRelationship<PluginParams>
-  : T extends 'tree' ? ContextObserverTree<PluginParams>
-  : ContextObserverBase<ChartType, PluginParams>
-
-export interface ContextObserverBase<T extends ChartType, PluginParams> {
-  fullParams$: Observable<PluginParams>
-  fullChartParams$: Observable<ChartParams>
-  fullDataFormatter$: Observable<DataFormatterTypeMap<T>>
-  computedData$: Observable<ComputedDataTypeMap<T>>
-  layout$: Observable<Layout>
-}
-
+import { Observable, Subject, BehaviorSubject } from 'rxjs'
+import type { ChartType } from './Chart'
+import type { ChartParams } from './ChartParams'
+import type { DataFormatterTypeMap } from './DataFormatter'
+import type { ComputedDataTypeMap } from './ComputedData'
+import type { Layout } from './Layout'
+import type { ContextObserverGrid } from './ContextObserverGrid'
+import type { ContextObserverMultiGrid } from './ContextObserverMultiGrid'
+import type { ContextObserverMultiValue } from './ContextObserverMultiValue'
+import type { ContextObserverRelationship } from './ContextObserverRelationship'
+import type { ContextObserverSeries } from './ContextObserverSeries'
+import type { ContextObserverTree } from './ContextObserverTree'
+import type { ContextSubject } from './ContextSubject'
+
+export interface ContextObserverFn<T extends ChartType> {
+  ({ subject, observer }: {
+    subject: ContextSubject<T>
+    observer: ContextObserverBase<T, unknown>
+  }): ContextObserverTypeMap<T, unknown>
+}
+
+// ContextObserver
+export type ContextObserverTypeMap<T extends ChartType, PluginParams> = T extends 'series' ? ContextObserverSeries<PluginParams>
+  : T extends 'grid' ? ContextObserverGrid<PluginParams>
+  : T extends 'multiGrid' ? ContextObserverMultiGrid<PluginParams>
+  : T extends 'multiValue' ? ContextObserverMultiValue<PluginParams>
+  : T extends 'relationship' ? ContextObserverRelationship<PluginParams>
+  : T extends 'tree' ? ContextObserverTree<PluginParams>
+  : ContextObserverBase<ChartType, PluginParams>
+
+export interface ContextObserverBase<T extends ChartType, PluginParams> {
+  fullParams$: Observable<PluginParams>
+  fullChartParams$: Observable<ChartParams>
+  fullDataFormatter$: Observable<DataFormatterTypeMap<T>>
+  computedData$: Observable<ComputedDataTypeMap<T>>
+  layout$: Observable<Layout>
+}
+

package/src/types/ContextObserverGrid.ts

@@ -1,34 +1,42 @@
-import { Observable } from 'rxjs'
-import type { ContextObserverBase } from './ContextObserver'
-import type { ComputedDataGrid, ComputedDatumGrid } from './ComputedDataGrid'
-import type { TransformData } from './TransformData'
-
-export interface ContextObserverGrid<PluginParams>
-  extends
-    ContextObserverBase<'grid', PluginParams>,
-    ContextObserverGridDetail {
-      textSizePx$: Observable<number>
-    }
-
-export interface ContextObserverGridDetail {
-  gridContainer$: Observable<ContainerPosition[]>
-  gridAxesTransform$: Observable<TransformData>
-  gridAxesReverseTransform$: Observable<TransformData>
-  gridGraphicTransform$: Observable<TransformData>
-  gridGraphicReverseScale$: Observable<[number, number][]>
-  gridAxesSize$: Observable<{ width: number; height: number; }>
-  gridHighlight$: Observable<ComputedDatumGrid[]>
-  existSeriesLabels$: Observable<string[]>
-  SeriesDataMap$: Observable<Map<string, ComputedDatumGrid[]>>
-  GroupDataMap$: Observable<Map<string, ComputedDatumGrid[]>>
-  visibleComputedData$: Observable<ComputedDataGrid>
-  isSeriesPositionSeprate$: Observable<boolean>
-}
-
-export interface ContainerPosition {
-  slotIndex: number
-  rowIndex: number
-  columnIndex: number
-  translate: [number, number]
-  scale: [number, number]
+import { Observable } from 'rxjs'
+import type { ContextObserverBase } from './ContextObserver'
+import type { ComputedDataGrid, ComputedDatumGrid } from './ComputedDataGrid'
+import type { TransformData } from './TransformData'
+
+export interface ContextObserverGrid<PluginParams> extends
+ContextObserverBase<'grid', PluginParams>, ContextObserverGridDetail {
+  textSizePx$: Observable<number>
+}
+
+export interface ContextObserverGridDetail {
+  gridContainerPosition$: Observable<GridContainerPosition[]>
+  gridAxesTransform$: Observable<TransformData>
+  gridAxesReverseTransform$: Observable<TransformData>
+  gridGraphicTransform$: Observable<TransformData>
+  gridGraphicReverseScale$: Observable<[number, number][]>
+  gridAxesSize$: Observable<{ width: number; height: number; }>
+  gridHighlight$: Observable<ComputedDatumGrid[]>
+  seriesLabels$: Observable<string[]>
+  SeriesDataMap$: Observable<Map<string, ComputedDatumGrid[]>>
+  GroupDataMap$: Observable<Map<string, ComputedDatumGrid[]>>
+  computedLayoutData$: Observable<ComputedLayoutDataGrid>
+  visibleComputedData$: Observable<ComputedDataGrid>
+  visibleComputedLayoutData$: Observable<ComputedLayoutDataGrid>
+  // isSeriesSeprate$: Observable<boolean>
+}
+
+export type ComputedLayoutDataGrid = ComputedLayoutDatumGrid[][]
+
+export interface ComputedLayoutDatumGrid extends ComputedDatumGrid {
+  axisX: number
+  axisY: number
+  axisYFromZero: number
+}
+
+export interface GridContainerPosition {
+  slotIndex: number
+  rowIndex: number
+  columnIndex: number
+  translate: [number, number]
+  scale: [number, number]
 }

package/src/types/ContextObserverMultiGrid.ts

@@ -1,28 +1,16 @@
-import { Observable } from 'rxjs'
-import type { ContextObserverBase } from './ContextObserver'
-import type { ComputedDataGrid, ComputedDatumGrid } from './ComputedDataGrid'
-import type { ContainerPosition } from './ContextObserverGrid'
-import type { TransformData } from './TransformData'
-import type { ContextObserverGridDetail } from './ContextObserverGrid'
-
-export interface ContextObserverMultiGrid<PluginParams> extends ContextObserverBase<'multiGrid', PluginParams> {
-  textSizePx$: Observable<number>
-  multiGridEachDetail$: Observable<ContextObserverGridDetail[]>
-  multiGridContainer$: Observable<ContainerPosition[][]>
-}
-
-// export interface MultiGridObservableAll {
-//   isSeriesPositionSeprate$: Observable<boolean>
-//   gridContainer$: Observable<ContainerPosition[]>
-//   gridAxesTransform$: Observable<TransformData>
-//   gridAxesReverseTransform$: Observable<TransformData>
-//   gridGraphicTransform$: Observable<TransformData>
-//   gridGraphicReverseScale$: Observable<[number, number][]>
-//   gridAxesSize$: Observable<{ width: number; height: number; }>
-//   gridHighlight$: Observable<string[]>
-//   existSeriesLabels$: Observable<string[]>
-//   SeriesDataMap$: Observable<Map<string, ComputedDatumGrid[]>>
-//   GroupDataMap$: Observable<Map<string, ComputedDatumGrid[]>>
-//   visibleComputedData$: Observable<ComputedDataGrid>
-// }
-
+import { Observable } from 'rxjs'
+import type { ContextObserverBase } from './ContextObserver'
+import type { ComputedDataGrid, ComputedDatumGrid } from './ComputedDataGrid'
+import type { DataFormatterGrid } from './DataFormatterGrid'
+import type { ContextObserverGridDetail } from './ContextObserverGrid'
+
+export interface ContextObserverMultiGrid<PluginParams> extends ContextObserverBase<'multiGrid', PluginParams> {
+  textSizePx$: Observable<number>
+  multiGridEachDetail$: Observable<ContextObserverMultiGridDetail[]>
+}
+
+
+export interface ContextObserverMultiGridDetail extends ContextObserverGridDetail {
+  computedData$: Observable<ComputedDataGrid>
+  dataFormatter$: Observable<DataFormatterGrid>
+}

package/src/types/ContextObserverMultiValue.ts

@@ -1,5 +1,5 @@
-import type { ContextObserverBase } from './ContextObserver'
-
-export interface ContextObserverMultiValue<PluginParams> extends ContextObserverBase<'multiValue', PluginParams> {
-
+import type { ContextObserverBase } from './ContextObserver'
+
+export interface ContextObserverMultiValue<PluginParams> extends ContextObserverBase<'multiValue', PluginParams> {
+
 }

package/src/types/ContextObserverRelationship.ts

@@ -1,5 +1,5 @@
-import type { ContextObserverBase } from './ContextObserver'
-
-export interface ContextObserverRelationship<PluginParams> extends ContextObserverBase<'relationship', PluginParams> {
-
+import type { ContextObserverBase } from './ContextObserver'
+
+export interface ContextObserverRelationship<PluginParams> extends ContextObserverBase<'relationship', PluginParams> {
+
 }