@orbcharts/core 3.0.6 → 3.0.7

package/src/tree/computedDataFn.ts

@@ -1,129 +1,129 @@
-import type { DataTree, DataTreeObj, DataTreeDatum, ComputedDataFn, ComputedDataTree } from '../../lib/core-types'
-import { isPlainObject } from '../utils/commonUtils'
-import { seriesColorPredicate, createDefaultCategoryLabel } from '../utils/orbchartsUtils'
-
-export const computedDataFn: ComputedDataFn<'tree'> = (context) => {
-  const { data = [], dataFormatter, chartParams } = context
-
-  const defaultCategoryLabel = createDefaultCategoryLabel()
-
-  // <categoryLabel, categoryIndex>
-  const CategoryIndexMap = new Map<string, number>(
-    dataFormatter.categoryLabels.map((label, index) => [label, index])
-  )
-
-  let computedBranchData: ComputedDataTree = {
-    id: '',
-    index: 0,
-    label: '',
-    description: '',
-    categoryIndex: -1,
-    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 ?? defaultCategoryLabel,
-          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 = branch.categoryLabel ?? defaultCategoryLabel
-      if (!CategoryIndexMap.has(categoryLabel)) {
-        CategoryIndexMap.set(categoryLabel, CategoryIndexMap.size)
-      }
-      const 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, createDefaultCategoryLabel } from '../utils/orbchartsUtils'
+
+export const computedDataFn: ComputedDataFn<'tree'> = (context) => {
+  const { data = [], dataFormatter, chartParams } = context
+
+  const defaultCategoryLabel = createDefaultCategoryLabel()
+
+  // <categoryLabel, categoryIndex>
+  const CategoryIndexMap = new Map<string, number>(
+    dataFormatter.categoryLabels.map((label, index) => [label, index])
+  )
+
+  let computedBranchData: ComputedDataTree = {
+    id: '',
+    index: 0,
+    label: '',
+    description: '',
+    categoryIndex: -1,
+    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 ?? defaultCategoryLabel,
+          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 = branch.categoryLabel ?? defaultCategoryLabel
+      if (!CategoryIndexMap.has(categoryLabel)) {
+        CategoryIndexMap.set(categoryLabel, CategoryIndexMap.size)
+      }
+      const 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/contextObserverCallback.ts

@@ -1,58 +1,58 @@
-import { map, shareReplay } from 'rxjs'
-import type { ContextObserverCallback } from '../../lib/core-types'
-import { highlightObservable, categoryDataMapObservable, textSizePxObservable } from '../utils/observables'
-import {
-  nodeListObservable,
-  categoryLabelsObservable,
-  treeVisibleComputedDataObservable
-} from './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 CategoryDataMap$ = categoryDataMapObservable({
-    datumList$: nodeList$
-  }).pipe(
-    shareReplay(1)
-  )
-  
-  const categoryLabels$ = categoryLabelsObservable(CategoryDataMap$).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$,
-    categoryLabels$,
-    CategoryDataMap$,
-    visibleComputedData$
-  }
-}
+import { map, shareReplay } from 'rxjs'
+import type { ContextObserverCallback } from '../../lib/core-types'
+import { highlightObservable, categoryDataMapObservable, textSizePxObservable } from '../utils/observables'
+import {
+  nodeListObservable,
+  categoryLabelsObservable,
+  treeVisibleComputedDataObservable
+} from './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 CategoryDataMap$ = categoryDataMapObservable({
+    datumList$: nodeList$
+  }).pipe(
+    shareReplay(1)
+  )
+  
+  const categoryLabels$ = categoryLabelsObservable(CategoryDataMap$).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$,
+    categoryLabels$,
+    CategoryDataMap$,
+    visibleComputedData$
+  }
+}

package/src/tree/dataFormatterValidator.ts

@@ -1,14 +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
+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
 }

package/src/tree/dataValidator.ts

@@ -1,14 +1,14 @@
-import type { DataValidator, DataTypeMap } from '../../lib/core-types'
-import { validateColumns } from '../utils/validator'
-import { isPlainObject } from '../utils'
-
-export const dataValidator: DataValidator<'tree'> = (data: DataTypeMap<'tree'>) => {
-  const result = validateColumns({ data }, {
-    data: {
-      toBe: 'DataTreeObj | DataTreeDatum[]',
-      // 畢免資料量過大檢查不完，不深度檢查
-      test: (value) => (isPlainObject(value) && value.id !== undefined) || Array.isArray(value)
-    }
-  })
-  return result
+import type { DataValidator, DataTypeMap } from '../../lib/core-types'
+import { validateColumns } from '../utils/validator'
+import { isPlainObject } from '../utils'
+
+export const dataValidator: DataValidator<'tree'> = (data: DataTypeMap<'tree'>) => {
+  const result = validateColumns({ data }, {
+    data: {
+      toBe: 'DataTreeObj | DataTreeDatum[]',
+      // 畢免資料量過大檢查不完，不深度檢查
+      test: (value) => (isPlainObject(value) && value.id !== undefined) || Array.isArray(value)
+    }
+  })
+  return result
 }

package/src/tree/treeObservables.ts

@@ -1,106 +1,106 @@
-import {
-  combineLatest,
-  distinctUntilChanged,
-  filter,
-  map,
-  merge,
-  takeUntil,
-  shareReplay,
-  switchMap,
-  Subject,
-  Observable } from 'rxjs'
-import type {
-  ChartParams,
-  ComputedDataTree,
-  ComputedDataTypeMap,
-  DataFormatterTree } from '../../lib/core-types'
-
-
-// 所有節點list結構
-export const nodeListObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTree> }) => {
-  return computedData$.pipe(
-    map(data => {
-      function setNodeList (accNodeList: ComputedDataTree[], branch: ComputedDataTree) {
-        accNodeList.push(branch)
-        if (branch.children) {
-          branch.children.forEach(childBranch => {
-            accNodeList = setNodeList(accNodeList, childBranch) // 遞迴子節點
-          })
-        }
-        return accNodeList
-      }
-      return setNodeList([], data)
-    })
-  )
-}
-
-// export const categoryLabelsObservable = ({ nodeList$, fullDataFormatter$ }: {
-//   nodeList$: Observable<ComputedDataTree[]>
-//   fullDataFormatter$: Observable<DataFormatterTree>
-// }) => {
-
-//   const categoryLabels$ = fullDataFormatter$.pipe(
-//     map(d => d.categoryLabels),
-//     distinctUntilChanged((a, b) => {
-//       return JSON.stringify(a) === JSON.stringify(b)
-//     }),
-//   )
-
-//   return combineLatest({
-//     nodeList: nodeList$,
-//     categoryLabels: categoryLabels$
-//   }).pipe(
-//     switchMap(async d => d),
-//     map(data => {
-//       const CurrentLabelSet = new Set(data.categoryLabels)
-//       const ExistLabelSet = new Set(
-//         data.nodeList.filter(node => node.visible).map(node => node.categoryLabel)
-//       )
-//       // 加入已存在的label（data.nodeList有，但是dataFormatter.categoryLabels沒有）
-//       Array.from(ExistLabelSet).forEach(label => {
-//         if (!CurrentLabelSet.has(label)) {
-//           CurrentLabelSet.add(label)
-//         }
-//       })
-//       // 移除不存在的label（dataFormatter.categoryLabels有，但是data.nodeList沒有）
-//       Array.from(CurrentLabelSet).forEach(label => {
-//         if (!ExistLabelSet.has(label)) {
-//           ExistLabelSet.delete(label)
-//         }
-//       })
-
-//       return Array.from(CurrentLabelSet)
-//     }),
-//     distinctUntilChanged((a, b) => {
-//       return JSON.stringify(a) === JSON.stringify(b)
-//     }),
-//   )
-// }
-
-export const categoryLabelsObservable = (CategoryDataMap$: Observable<Map<string, ComputedDataTree[]>>) => {
-  return CategoryDataMap$.pipe(
-    map(data => {
-      return Array.from(data.keys())
-    }),
-    distinctUntilChanged((a, b) => {
-      return JSON.stringify(a) === JSON.stringify(b)
-    }),
-  )
-}
-
-// 所有可見的節點
-export const treeVisibleComputedDataObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTree> }) => {
-  return computedData$.pipe(
-    map(data => {
-      function filterChildren (accTree: ComputedDataTree) {
-        if (accTree.children) {
-          accTree.children = accTree.children
-            .filter(child => child.visible) // 篩選visible
-            .map(child => filterChildren(child)) // 遞迴子節點
-        }
-        return accTree
-      }
-      return filterChildren(data)
-    })
-  )
+import {
+  combineLatest,
+  distinctUntilChanged,
+  filter,
+  map,
+  merge,
+  takeUntil,
+  shareReplay,
+  switchMap,
+  Subject,
+  Observable } from 'rxjs'
+import type {
+  ChartParams,
+  ComputedDataTree,
+  ComputedDataTypeMap,
+  DataFormatterTree } from '../../lib/core-types'
+
+
+// 所有節點list結構
+export const nodeListObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTree> }) => {
+  return computedData$.pipe(
+    map(data => {
+      function setNodeList (accNodeList: ComputedDataTree[], branch: ComputedDataTree) {
+        accNodeList.push(branch)
+        if (branch.children) {
+          branch.children.forEach(childBranch => {
+            accNodeList = setNodeList(accNodeList, childBranch) // 遞迴子節點
+          })
+        }
+        return accNodeList
+      }
+      return setNodeList([], data)
+    })
+  )
+}
+
+// export const categoryLabelsObservable = ({ nodeList$, fullDataFormatter$ }: {
+//   nodeList$: Observable<ComputedDataTree[]>
+//   fullDataFormatter$: Observable<DataFormatterTree>
+// }) => {
+
+//   const categoryLabels$ = fullDataFormatter$.pipe(
+//     map(d => d.categoryLabels),
+//     distinctUntilChanged((a, b) => {
+//       return JSON.stringify(a) === JSON.stringify(b)
+//     }),
+//   )
+
+//   return combineLatest({
+//     nodeList: nodeList$,
+//     categoryLabels: categoryLabels$
+//   }).pipe(
+//     switchMap(async d => d),
+//     map(data => {
+//       const CurrentLabelSet = new Set(data.categoryLabels)
+//       const ExistLabelSet = new Set(
+//         data.nodeList.filter(node => node.visible).map(node => node.categoryLabel)
+//       )
+//       // 加入已存在的label（data.nodeList有，但是dataFormatter.categoryLabels沒有）
+//       Array.from(ExistLabelSet).forEach(label => {
+//         if (!CurrentLabelSet.has(label)) {
+//           CurrentLabelSet.add(label)
+//         }
+//       })
+//       // 移除不存在的label（dataFormatter.categoryLabels有，但是data.nodeList沒有）
+//       Array.from(CurrentLabelSet).forEach(label => {
+//         if (!ExistLabelSet.has(label)) {
+//           ExistLabelSet.delete(label)
+//         }
+//       })
+
+//       return Array.from(CurrentLabelSet)
+//     }),
+//     distinctUntilChanged((a, b) => {
+//       return JSON.stringify(a) === JSON.stringify(b)
+//     }),
+//   )
+// }
+
+export const categoryLabelsObservable = (CategoryDataMap$: Observable<Map<string, ComputedDataTree[]>>) => {
+  return CategoryDataMap$.pipe(
+    map(data => {
+      return Array.from(data.keys())
+    }),
+    distinctUntilChanged((a, b) => {
+      return JSON.stringify(a) === JSON.stringify(b)
+    }),
+  )
+}
+
+// 所有可見的節點
+export const treeVisibleComputedDataObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTree> }) => {
+  return computedData$.pipe(
+    map(data => {
+      function filterChildren (accTree: ComputedDataTree) {
+        if (accTree.children) {
+          accTree.children = accTree.children
+            .filter(child => child.visible) // 篩選visible
+            .map(child => filterChildren(child)) // 遞迴子節點
+        }
+        return accTree
+      }
+      return filterChildren(data)
+    })
+  )
 }