@orbcharts/core 3.0.0-alpha.61 → 3.0.0-alpha.63

package/src/series/{createSeriesContextObserver.ts → contextObserverCallback.ts}

@@ -1,93 +1,100 @@
-import { map, shareReplay } from 'rxjs'
-import type { ContextObserverFn } from '../types'
-import {
-  seriesDataMapObservable,
-  groupDataMapObservable } from '../utils/observables'
-import { highlightObservable, textSizePxObservable } from '../utils/observables'
-
-import { separateSeriesObservable, visibleComputedDataObservable, computedLayoutDataObservable, seriesLabelsObservable, seriesContainerPositionObservable, seriesContainerPositionMapObservable } from './seriesObservables'
-
-export const createSeriesContextObserver: ContextObserverFn<'series'> = ({ subject, observer }) => {
-
-  const textSizePx$ = textSizePxObservable(observer.fullChartParams$).pipe(
-    shareReplay(1)
-  )
-
-  const separateSeries$ = separateSeriesObservable({
-    fullDataFormatter$: observer.fullDataFormatter$
-  })
-
-  const visibleComputedData$ = visibleComputedDataObservable({
-    computedData$: observer.computedData$,
-  })
-
-  const computedLayoutData$ = computedLayoutDataObservable({
-    computedData$: observer.computedData$,
-    fullDataFormatter$: observer.fullDataFormatter$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const visibleComputedLayoutData$ = visibleComputedDataObservable({
-    computedData$: computedLayoutData$,
-  })
-
-  const datumList$ = observer.computedData$.pipe(
-    map(d => d.flat())
-  ).pipe(
-    shareReplay(1)
-  )
-
-  const seriesHighlight$ = highlightObservable({
-    datumList$,
-    fullChartParams$: observer.fullChartParams$,
-    event$: subject.event$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const seriesLabels$ = seriesLabelsObservable({
-    computedData$: observer.computedData$,
-  })
-
-
-  const SeriesDataMap$ = seriesDataMapObservable({
-    datumList$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const seriesContainerPosition$ = seriesContainerPositionObservable({
-    computedData$: observer.computedData$,
-    fullDataFormatter$: observer.fullDataFormatter$,
-    layout$: observer.layout$,
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const SeriesContainerPositionMap$ = seriesContainerPositionMapObservable({
-    seriesContainerPosition$: seriesContainerPosition$,
-    seriesLabels$: seriesLabels$,
-    separateSeries$: separateSeries$,
-  }).pipe(
-    shareReplay(1)
-  )
-
-  return {
-    fullParams$: observer.fullParams$,
-    fullChartParams$: observer.fullChartParams$,
-    fullDataFormatter$: observer.fullDataFormatter$,
-    computedData$: observer.computedData$,
-    layout$: observer.layout$,
-    textSizePx$,
-    visibleComputedData$,
-    visibleComputedLayoutData$,
-    separateSeries$,
-    computedLayoutData$,
-    seriesHighlight$,
-    seriesLabels$,
-    SeriesDataMap$,
-    seriesContainerPosition$,
-    SeriesContainerPositionMap$,
-  }
-}
+import { map, shareReplay } from 'rxjs'
+import type { ContextObserverCallback } from '../../lib/core-types'
+import {
+  seriesDataMapObservable,
+  groupDataMapObservable } from '../utils/observables'
+import { highlightObservable, textSizePxObservable } from '../utils/observables'
+
+import {
+  separateSeriesObservable,
+  seriesVisibleComputedDataObservable,
+  seriesComputedLayoutDataObservable,
+  seriesLabelsObservable,
+  seriesContainerPositionObservable,
+  seriesContainerPositionMapObservable
+} from '../utils/seriesObservables'
+
+export const contextObserverCallback: ContextObserverCallback<'series'> = ({ subject, observer }) => {
+
+  const textSizePx$ = textSizePxObservable(observer.fullChartParams$).pipe(
+    shareReplay(1)
+  )
+
+  const separateSeries$ = separateSeriesObservable({
+    fullDataFormatter$: observer.fullDataFormatter$
+  })
+
+  const visibleComputedData$ = seriesVisibleComputedDataObservable({
+    computedData$: observer.computedData$,
+  })
+
+  const computedLayoutData$ = seriesComputedLayoutDataObservable({
+    computedData$: observer.computedData$,
+    fullDataFormatter$: observer.fullDataFormatter$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const visibleComputedLayoutData$ = seriesVisibleComputedDataObservable({
+    computedData$: computedLayoutData$,
+  })
+
+  const datumList$ = observer.computedData$.pipe(
+    map(d => d.flat())
+  ).pipe(
+    shareReplay(1)
+  )
+
+  const seriesHighlight$ = highlightObservable({
+    datumList$,
+    fullChartParams$: observer.fullChartParams$,
+    event$: subject.event$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const seriesLabels$ = seriesLabelsObservable({
+    computedData$: observer.computedData$,
+  })
+
+
+  const SeriesDataMap$ = seriesDataMapObservable({
+    datumList$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const seriesContainerPosition$ = seriesContainerPositionObservable({
+    computedData$: observer.computedData$,
+    fullDataFormatter$: observer.fullDataFormatter$,
+    layout$: observer.layout$,
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const SeriesContainerPositionMap$ = seriesContainerPositionMapObservable({
+    seriesContainerPosition$: seriesContainerPosition$,
+    seriesLabels$: seriesLabels$,
+    separateSeries$: separateSeries$,
+  }).pipe(
+    shareReplay(1)
+  )
+
+  return {
+    fullParams$: observer.fullParams$,
+    fullChartParams$: observer.fullChartParams$,
+    fullDataFormatter$: observer.fullDataFormatter$,
+    computedData$: observer.computedData$,
+    layout$: observer.layout$,
+    textSizePx$,
+    visibleComputedData$,
+    visibleComputedLayoutData$,
+    separateSeries$,
+    computedLayoutData$,
+    seriesHighlight$,
+    seriesLabels$,
+    SeriesDataMap$,
+    seriesContainerPosition$,
+    SeriesContainerPositionMap$,
+  }
+}

package/src/series/dataFormatterValidator.ts

@@ -0,0 +1,42 @@
+import type { DataFormatterValidator, DataFormatterTypeMap } from '../../lib/core-types'
+import { validateColumns } from '../utils/validator'
+
+export const dataFormatterValidator: DataFormatterValidator<'series'> = (dataFormatter: DataFormatterTypeMap<'series'>) => {
+  const result = validateColumns(dataFormatter, {
+    visibleFilter: {
+      toBeTypes: ['Function']
+    },
+    sort: {
+      toBeTypes: ['Function', 'null']
+    },
+    seriesLabels: {
+      toBeTypes: ['string[]']
+    },
+    container: {
+      toBeTypes: ['object']
+    },
+    separateSeries: {
+      toBeTypes: ['boolean']
+    },
+    sumSeries: {
+      toBeTypes: ['boolean']
+    }
+  })
+  if (dataFormatter.container) {
+    const containerResult = validateColumns(dataFormatter.container, {
+      gap: {
+        toBeTypes: ['number']
+      },
+      rowAmount: {
+        toBeTypes: ['number']
+      },
+      columnAmount: {
+        toBeTypes: ['number']
+      }
+    })
+    if (containerResult.status === 'error') {
+      return containerResult
+    }
+  }
+  return result
+}

package/src/series/dataValidator.ts

@@ -0,0 +1,13 @@
+import type { DataValidator, DataTypeMap } from '../../lib/core-types'
+import { validateColumns } from '../utils/validator'
+
+export const dataValidator: DataValidator<'series'> = (data: DataTypeMap<'series'>) => {
+  const result = validateColumns({ data }, {
+    data: {
+      toBe: '(DataSeriesDatum | DataSeriesValue)[][] | (DataSeriesDatum | DataSeriesValue)[]',
+      // 畢免資料量過大檢查不完，不深度檢查
+      test: (value) => Array.isArray(value)
+    }
+  })
+  return result
+}

package/src/tree/{computeTreeData.ts → computedDataFn.ts}

@@ -1,132 +1,130 @@
-import type { DataTree, DataTreeObj, DataTreeDatum } from '../types/DataTree'
-import type { ComputedDataFn } from '../types/ComputedData'
-import type { ComputedDataTree } from '../types/ComputedDataTree'
-import { isPlainObject } from '../utils/commonUtils'
-import { seriesColorPredicate } from '../utils/orbchartsUtils'
-
-export const computeTreeData: ComputedDataFn<'tree'> = (context) => {
-  const { data = [], dataFormatter, chartParams } = context
-
-  // <categoryLabel, categoryIndex>
-  const CategoryIndexMap = new Map<string, number>(
-    dataFormatter.categoryLabels.map((label, index) => [label, index])
-  )
-
-  let computedBranchData: ComputedDataTree = {
-    id: '',
-    index: 0,
-    label: '',
-    description: '',
-    categoryIndex: 0,
-    categoryLabel: '',
-    color: '',
-    visible: true,
-    // tooltipContent: '',
-    data: {},
-    value: 0,
-    level: 0,
-    seq: 0,
-    children: []
-  }
-
-  try {
-    // 建立樹狀結構資料
-    const dataTreeObj: DataTreeObj = (function () {
-      if (isPlainObject(data) === true) {
-        // 原本就是樹狀結構則直接複製
-        // return structuredClone(data) as DataTreeObj
-        return JSON.parse(JSON.stringify(data)) as DataTreeObj
-      } else if (Array.isArray(data) === false) {
-        return {
-          id: ''
-        }
-      }
-      // -- 陣列格式轉物件 --
-      // let rootId = ''
-      let root: DataTreeDatum | undefined = undefined
-      // const DataMap: Map<string, DataTreeDatum> = new Map()
-      const ChildrenMap: Map<string, DataTreeDatum[]> = new Map()
-      ;(data as DataTreeDatum[]).forEach(d => {
-        // DataMap.set(d.id, d)
-
-        if (!d.parent) {
-          // rootId = d.id
-          root = d
-        } else {
-          const children: DataTreeDatum[] = ChildrenMap.get(d.parent) ?? []
-          children.push(d)
-          ChildrenMap.set(d.parent!, children)
-        }
-      })
-
-      const createBranchData = (root: DataTreeDatum): DataTreeObj => {
-        return {
-          id: root.id,
-          label: root.label,
-          data: root.data,
-          // tooltipContent: root.tooltipContent,
-          value: root.value,
-          categoryLabel: root.categoryLabel,
-          children: (ChildrenMap.get(root.id) ?? []).map(d => {
-            // 遞迴
-            return createBranchData(d)
-          })
-        }
-      }
-      if (root) {
-        return createBranchData(root)
-      } else {
-        return {
-          id: ''
-        }
-      }    
-    })()
-
-    let index = 0
-    
-    const formatBranchData = (branch: DataTreeObj, level: number, seq: number): ComputedDataTree => {
-      const childLayer = level + 1
-      const categoryLabel: string | null = branch.categoryLabel ?? null
-      let categoryIndex = 0
-      if (categoryLabel != null) {
-        if (!CategoryIndexMap.has(categoryLabel)) {
-          CategoryIndexMap.set(categoryLabel, CategoryIndexMap.size)
-        }
-        categoryIndex = CategoryIndexMap.get(categoryLabel) ?? 0
-      }
-
-      const currentIndex = index
-      index++
-      const formattedBranchData: ComputedDataTree = {
-        id: branch.id,
-        index: currentIndex,
-        level,
-        seq,
-        label: branch.label ?? '',
-        description: branch.description ?? '',
-        categoryIndex,
-        categoryLabel,
-        color: seriesColorPredicate(categoryIndex, chartParams),
-        data: branch.data ?? {},
-        // tooltipContent: branch.tooltipContent ? branch.tooltipContent : dataFormatter.tooltipContentFormat(branch, level, seq, context),
-        value: branch.value,
-        visible: true, // 先給預設值
-        children: (branch.children ?? []).map((d, i) => {
-          // 遞迴
-          return formatBranchData(d, childLayer, i)
-        })
-      }
-
-      formattedBranchData.visible = dataFormatter.visibleFilter(formattedBranchData, context)
-
-      return formattedBranchData
-    }
-    computedBranchData = formatBranchData(dataTreeObj, 0, 0)
-  } catch (e) {
-    // console.error(e)
-    throw Error(e)
-  }
-
-  return computedBranchData
-
-}
+import type { DataTree, DataTreeObj, DataTreeDatum, ComputedDataFn, ComputedDataTree } from '../../lib/core-types'
+import { isPlainObject } from '../utils/commonUtils'
+import { seriesColorPredicate } from '../utils/orbchartsUtils'
+
+export const computedDataFn: ComputedDataFn<'tree'> = (context) => {
+  const { data = [], dataFormatter, chartParams } = context
+
+  // <categoryLabel, categoryIndex>
+  const CategoryIndexMap = new Map<string, number>(
+    dataFormatter.categoryLabels.map((label, index) => [label, index])
+  )
+
+  let computedBranchData: ComputedDataTree = {
+    id: '',
+    index: 0,
+    label: '',
+    description: '',
+    categoryIndex: 0,
+    categoryLabel: '',
+    color: '',
+    visible: true,
+    // tooltipContent: '',
+    data: {},
+    value: 0,
+    level: 0,
+    seq: 0,
+    children: []
+  }
+
+  try {
+    // 建立樹狀結構資料
+    const dataTreeObj: DataTreeObj = (function () {
+      if (isPlainObject(data) === true) {
+        // 原本就是樹狀結構則直接複製
+        // return structuredClone(data) as DataTreeObj
+        return JSON.parse(JSON.stringify(data)) as DataTreeObj
+      } else if (Array.isArray(data) === false) {
+        return {
+          id: ''
+        }
+      }
+      // -- 陣列格式轉物件 --
+      // let rootId = ''
+      let root: DataTreeDatum | undefined = undefined
+      // const DataMap: Map<string, DataTreeDatum> = new Map()
+      const ChildrenMap: Map<string, DataTreeDatum[]> = new Map()
+      ;(data as DataTreeDatum[]).forEach(d => {
+        // DataMap.set(d.id, d)
+
+        if (!d.parent) {
+          // rootId = d.id
+          root = d
+        } else {
+          const children: DataTreeDatum[] = ChildrenMap.get(d.parent) ?? []
+          children.push(d)
+          ChildrenMap.set(d.parent!, children)
+        }
+      })
+
+      const createBranchData = (root: DataTreeDatum): DataTreeObj => {
+        return {
+          id: root.id,
+          label: root.label,
+          data: root.data,
+          // tooltipContent: root.tooltipContent,
+          value: root.value,
+          categoryLabel: root.categoryLabel,
+          children: (ChildrenMap.get(root.id) ?? []).map(d => {
+            // 遞迴
+            return createBranchData(d)
+          })
+        }
+      }
+      if (root) {
+        return createBranchData(root)
+      } else {
+        return {
+          id: ''
+        }
+      }    
+    })()
+
+    let index = 0
+    
+    const formatBranchData = (branch: DataTreeObj, level: number, seq: number): ComputedDataTree => {
+      const childLayer = level + 1
+      const categoryLabel: string | null = branch.categoryLabel ?? null
+      let categoryIndex = 0
+      if (categoryLabel != null) {
+        if (!CategoryIndexMap.has(categoryLabel)) {
+          CategoryIndexMap.set(categoryLabel, CategoryIndexMap.size)
+        }
+        categoryIndex = CategoryIndexMap.get(categoryLabel) ?? 0
+      }
+
+      const currentIndex = index
+      index++
+      const formattedBranchData: ComputedDataTree = {
+        id: branch.id,
+        index: currentIndex,
+        level,
+        seq,
+        label: branch.label ?? '',
+        description: branch.description ?? '',
+        categoryIndex,
+        categoryLabel,
+        color: seriesColorPredicate(categoryIndex, chartParams),
+        data: branch.data ?? {},
+        // tooltipContent: branch.tooltipContent ? branch.tooltipContent : dataFormatter.tooltipContentFormat(branch, level, seq, context),
+        value: branch.value,
+        visible: true, // 先給預設值
+        children: (branch.children ?? []).map((d, i) => {
+          // 遞迴
+          return formatBranchData(d, childLayer, i)
+        })
+      }
+
+      formattedBranchData.visible = dataFormatter.visibleFilter(formattedBranchData, context)
+
+      return formattedBranchData
+    }
+    computedBranchData = formatBranchData(dataTreeObj, 0, 0)
+  } catch (e) {
+    // console.error(e)
+    throw Error(e)
+  }
+
+  return computedBranchData
+
+}

package/src/tree/{createTreeContextObserver.ts → contextObserverCallback.ts}

@@ -1,61 +1,61 @@
-import { map, shareReplay } from 'rxjs'
-import type { ContextObserverFn } from '../types'
-import { highlightObservable, categoryDataMapObservable, textSizePxObservable } from '../utils/observables'
-import {
-  nodeListObservable,
-  existCategoryLabelsObservable,
-  treeVisibleComputedDataObservable
-} from './treeObservables'
-
-export const createTreeContextObserver: ContextObserverFn<'tree'> = ({ subject, observer }) => {
-
-  const textSizePx$ = textSizePxObservable(observer.fullChartParams$).pipe(
-    shareReplay(1)
-  )
-
-  const nodeList$ = nodeListObservable({
-    computedData$: observer.computedData$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const treeHighlight$ = highlightObservable({
-    datumList$: nodeList$,
-    fullChartParams$: observer.fullChartParams$,
-    event$: subject.event$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const existCategoryLabels$ = existCategoryLabelsObservable({
-    nodeList$,
-    fullDataFormatter$: observer.fullDataFormatter$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const CategoryDataMap$ = categoryDataMapObservable({
-    datumList$: nodeList$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const visibleComputedData$ = treeVisibleComputedDataObservable({
-    computedData$: observer.computedData$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  return {
-    fullParams$: observer.fullParams$,
-    fullChartParams$: observer.fullChartParams$,
-    fullDataFormatter$: observer.fullDataFormatter$,
-    computedData$: observer.computedData$,
-    layout$: observer.layout$,
-    textSizePx$,
-    treeHighlight$,
-    existCategoryLabels$,
-    CategoryDataMap$,
-    visibleComputedData$
-  }
-}
+import { map, shareReplay } from 'rxjs'
+import type { ContextObserverCallback } from '../../lib/core-types'
+import { highlightObservable, categoryDataMapObservable, textSizePxObservable } from '../utils/observables'
+import {
+  nodeListObservable,
+  existCategoryLabelsObservable,
+  treeVisibleComputedDataObservable
+} from '../utils/treeObservables'
+
+export const contextObserverCallback: ContextObserverCallback<'tree'> = ({ subject, observer }) => {
+
+  const textSizePx$ = textSizePxObservable(observer.fullChartParams$).pipe(
+    shareReplay(1)
+  )
+
+  const nodeList$ = nodeListObservable({
+    computedData$: observer.computedData$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const treeHighlight$ = highlightObservable({
+    datumList$: nodeList$,
+    fullChartParams$: observer.fullChartParams$,
+    event$: subject.event$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const existCategoryLabels$ = existCategoryLabelsObservable({
+    nodeList$,
+    fullDataFormatter$: observer.fullDataFormatter$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const CategoryDataMap$ = categoryDataMapObservable({
+    datumList$: nodeList$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const visibleComputedData$ = treeVisibleComputedDataObservable({
+    computedData$: observer.computedData$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  return {
+    fullParams$: observer.fullParams$,
+    fullChartParams$: observer.fullChartParams$,
+    fullDataFormatter$: observer.fullDataFormatter$,
+    computedData$: observer.computedData$,
+    layout$: observer.layout$,
+    textSizePx$,
+    treeHighlight$,
+    existCategoryLabels$,
+    CategoryDataMap$,
+    visibleComputedData$
+  }
+}

package/src/tree/dataFormatterValidator.ts

@@ -0,0 +1,14 @@
+import type { DataFormatterValidator, DataFormatterTypeMap } from '../../lib/core-types'
+import { validateColumns } from '../utils/validator'
+
+export const dataFormatterValidator: DataFormatterValidator<'tree'> = (dataFormatter: DataFormatterTypeMap<'tree'>) => {
+  const result = validateColumns(dataFormatter, {
+    visibleFilter: {
+      toBeTypes: ['Function']
+    },
+    categoryLabels: {
+      toBeTypes: ['string[]']
+    }
+  })
+  return result
+}