@orbcharts/core 3.0.0-beta.8 → 3.0.0

package/src/relationship/computedDataFn.ts

@@ -1,144 +1,159 @@
-import type {
-  DataRelationshipObj,
-  DataRelationshipList,
-  Node,
-  Edge,
-  ComputedDataFn,
-  ComputedDataRelationship,
-  ComputedNode,
-  ComputedEdge
-} from '../../lib/core-types'
-import { createDefaultCategoryLabel, seriesColorPredicate } from '../utils/orbchartsUtils'
-
-export const computedDataFn: ComputedDataFn<'relationship'> = (context) => {
-  const { data, dataFormatter, chartParams } = context
-
-  const defaultCategoryLabel = createDefaultCategoryLabel()
-
-  let computedNodes: ComputedNode[] = []
-  let computedEdges: ComputedEdge[] = []
-
-  try {
-    // -- 取得nodes和edges資料 --
-    let nodes: Node[] = []
-    let edges: Edge[] = []
-    if ((data as DataRelationshipObj).nodes) {
-      nodes = (data as DataRelationshipObj).nodes
-      edges = (data as DataRelationshipObj).edges
-    } else if ((data as DataRelationshipList)[0]) {
-      nodes = (data as DataRelationshipList)[0]
-      edges = (data as DataRelationshipList)[1]
-    } else {
-      // 無值直接回傳
-      return {
-        nodes: [],
-        edges: []
-      } as ComputedDataRelationship
-    }
-
-    const categoryLabels = (() => {
-      // 先使用 dataFormatter.categoryLabels
-      const CategoryLabelsSet = new Set(dataFormatter.categoryLabels)
-      // 再加入 datum 中的 categoryLabel
-      for (let datum of nodes) {
-        const categoryLabel = datum.categoryLabel ?? defaultCategoryLabel
-        CategoryLabelsSet.add(categoryLabel) // 不重覆
-      }
-      for (let datum of edges) {
-        const categoryLabel = datum.categoryLabel ?? defaultCategoryLabel
-        CategoryLabelsSet.add(categoryLabel) // 不重覆
-      }
-      return Array.from(CategoryLabelsSet)
-    })()
-    
-    // <categoryLabel, categoryIndex>
-    const CategoryIndexMap = new Map<string, number>(
-      categoryLabels.map((label, index) => [label, index])
-    )
-
-    // -- nodes --
-    computedNodes = nodes.map((node, i) => {
-      const categoryLabel = node.categoryLabel ?? defaultCategoryLabel
-      const categoryIndex = CategoryIndexMap.get(categoryLabel) ?? 0
-      
-      const computedNode: ComputedNode = {
-        id: node.id,
-        index: i,
-        label: node.label ?? '',
-        description: node.description ?? '',
-        data: node.data ?? {},
-        value: node.value ?? 0,
-        categoryIndex,
-        categoryLabel,
-        color: seriesColorPredicate(categoryIndex, chartParams),
-        // startNodes: [], // 後面再取得資料
-        // startNodeIds: [], // 後面再取得資料
-        // endNodes: [], // 後面再取得資料
-        // endNodeIds: [], // 後面再取得資料
-        visible: true // 先給預設值
-      }
-      
-      computedNode.visible = dataFormatter.visibleFilter(computedNode, context)
-
-      return computedNode
-    })
-
-    const NodesMap: Map<string, ComputedNode> = new Map(computedNodes.map(d => [d.id, d]))
-
-    // const StartNodesMap: Map<string, ComputedNode[]> = (function () {
-    //   const _StartNodesMap = new Map()
-    //   computedEdges.forEach(edge => {
-    //     const startNodes: ComputedNode[] = _StartNodesMap.get(edge.endNodeId) ?? []
-    //     startNodes.push(edge.startNode)
-    //     _StartNodesMap.set(edge.endNodeId, startNodes)
-    //   })
-    //   return _StartNodesMap
-    // })()
-    
-    // const EndNodesMap: Map<string, ComputedNode[]> = (function () {
-    //   const _EndNodesMap = new Map()
-    //   computedEdges.forEach(edge => {
-    //     const endNodes: ComputedNode[] = _EndNodesMap.get(edge.startNodeId) ?? []
-    //     endNodes.push(edge.endNode)
-    //     _EndNodesMap.set(edge.startNodeId, endNodes)
-    //   })
-    //   return _EndNodesMap
-    // })()
-
-    // -- edges --
-    computedEdges = edges.map((edge, i) => {
-      const categoryLabel = edge.categoryLabel ?? defaultCategoryLabel
-      const startNode = NodesMap.get(edge.start)
-      const endNode = NodesMap.get(edge.end)
-
-      const computedEdge: ComputedEdge = {
-        id: edge.id,
-        index: i,
-        label: edge.label ?? '',
-        description: edge.description ?? '',
-        data: edge.data ?? {},
-        value: edge.value ?? 0,
-        categoryIndex: CategoryIndexMap.get(categoryLabel),
-        categoryLabel,
-        color: seriesColorPredicate(i, chartParams),
-        startNode,
-        // startNodeId: edge.start,
-        endNode,
-        // endNodeId: edge.end,
-        visible: startNode.visible && endNode.visible
-      }
-
-      return computedEdge
-    })
-
-    
-  } catch (e) {
-    // console.error(e)
-    throw Error(e)
-  }
-
-  return {
-    nodes: computedNodes,
-    edges: computedEdges
-  }
-}
+import type {
+  DataRelationshipObj,
+  DataRelationshipList,
+  Node,
+  Edge,
+  ComputedDataFn,
+  ComputedDataRelationship,
+  ComputedNode,
+  ComputedEdge
+} from '../../lib/core-types'
+import { createDefaultCategoryLabel, seriesColorPredicate } from '../utils/orbchartsUtils'
+
+export const computedDataFn: ComputedDataFn<'relationship'> = (context) => {
+  const { data, dataFormatter, chartParams } = context
+
+  const defaultCategoryLabel = createDefaultCategoryLabel()
+
+  let computedNodes: ComputedNode[] = []
+  let computedEdges: ComputedEdge[] = []
+
+  try {
+    // -- 取得nodes和edges資料 --
+    let nodes: Node[] = []
+    let edges: Edge[] = []
+    if ((data as DataRelationshipObj).nodes) {
+      nodes = (data as DataRelationshipObj).nodes
+      edges = (data as DataRelationshipObj).edges
+    } else if ((data as DataRelationshipList)[0]) {
+      nodes = (data as DataRelationshipList)[0]
+      edges = (data as DataRelationshipList)[1]
+    } else {
+      // 無值直接回傳
+      return {
+        nodes: [],
+        edges: []
+      } as ComputedDataRelationship
+    }
+
+    const categoryLabels = (() => {
+      // 先使用 dataFormatter.categoryLabels
+      const CategoryLabelsSet = new Set(dataFormatter.categoryLabels)
+      // 再加入 datum 中的 categoryLabel
+      for (let datum of nodes) {
+        const categoryLabel = datum.categoryLabel ?? defaultCategoryLabel
+        CategoryLabelsSet.add(categoryLabel) // 不重覆
+      }
+      for (let datum of edges) {
+        const categoryLabel = datum.categoryLabel ?? defaultCategoryLabel
+        CategoryLabelsSet.add(categoryLabel) // 不重覆
+      }
+      return Array.from(CategoryLabelsSet)
+    })()
+    
+    // <categoryLabel, categoryIndex>
+    const CategoryIndexMap = new Map<string, number>(
+      categoryLabels.map((label, index) => [label, index])
+    )
+
+    // -- nodes --
+    computedNodes = nodes.map((node, i) => {
+      const categoryLabel = node.categoryLabel ?? defaultCategoryLabel
+      const categoryIndex = CategoryIndexMap.get(categoryLabel) ?? 0
+      
+      const computedNode: ComputedNode = {
+        id: node.id,
+        index: i,
+        label: node.label ?? '',
+        description: node.description ?? '',
+        data: node.data ?? {},
+        value: node.value ?? 0,
+        categoryIndex,
+        categoryLabel,
+        color: seriesColorPredicate(categoryIndex, chartParams),
+        // startNodes: [], // 後面再取得資料
+        // startNodeIds: [], // 後面再取得資料
+        // endNodes: [], // 後面再取得資料
+        // endNodeIds: [], // 後面再取得資料
+        visible: true // 先給預設值
+      }
+      
+      computedNode.visible = dataFormatter.visibleFilter(computedNode, context)
+
+      return computedNode
+    })
+
+    const NodesMap: Map<string, ComputedNode> = new Map(computedNodes.map(d => [d.id, d]))
+
+    // const StartNodesMap: Map<string, ComputedNode[]> = (function () {
+    //   const _StartNodesMap = new Map()
+    //   computedEdges.forEach(edge => {
+    //     const startNodes: ComputedNode[] = _StartNodesMap.get(edge.endNodeId) ?? []
+    //     startNodes.push(edge.startNode)
+    //     _StartNodesMap.set(edge.endNodeId, startNodes)
+    //   })
+    //   return _StartNodesMap
+    // })()
+    
+    // const EndNodesMap: Map<string, ComputedNode[]> = (function () {
+    //   const _EndNodesMap = new Map()
+    //   computedEdges.forEach(edge => {
+    //     const endNodes: ComputedNode[] = _EndNodesMap.get(edge.startNodeId) ?? []
+    //     endNodes.push(edge.endNode)
+    //     _EndNodesMap.set(edge.startNodeId, endNodes)
+    //   })
+    //   return _EndNodesMap
+    // })()
+
+    // -- edges --
+    computedEdges = edges
+      .map((edge, i) => {
+        const startNode = NodesMap.get(edge.start)
+        const endNode = NodesMap.get(edge.end)
+        return {
+          edge,
+          startNode,
+          endNode
+        }
+      })
+      .filter(({ edge }) => {
+        const startNode = NodesMap.get(edge.start)
+        const endNode = NodesMap.get(edge.end)
+        return startNode != null && endNode != null
+      })
+      .map(({ edge, startNode, endNode }, i) => {
+        const categoryLabel = edge.categoryLabel ?? defaultCategoryLabel
+        // const startNode = NodesMap.get(edge.start)
+        // const endNode = NodesMap.get(edge.end)
+
+        const computedEdge: ComputedEdge = {
+          id: edge.id,
+          index: i,
+          label: edge.label ?? '',
+          description: edge.description ?? '',
+          data: edge.data ?? {},
+          value: edge.value ?? 0,
+          categoryIndex: CategoryIndexMap.get(categoryLabel),
+          categoryLabel,
+          color: seriesColorPredicate(i, chartParams),
+          startNode,
+          // startNodeId: edge.start,
+          endNode,
+          // endNodeId: edge.end,
+          visible: startNode.visible && endNode.visible
+        }
+
+        return computedEdge
+      })
+
+    
+  } catch (e) {
+    // console.error(e)
+    throw Error(e)
+  }
+
+  return {
+    nodes: computedNodes,
+    edges: computedEdges
+  }
+}

package/src/relationship/contextObserverCallback.ts

@@ -1,80 +1,80 @@
-import { map, shareReplay } from 'rxjs'
-import type { ContextObserverCallback } from '../../lib/core-types'
-import { highlightObservable, categoryDataMapObservable, textSizePxObservable } from '../utils/observables'
-import {
-  categoryLabelsObservable,
-  NodeMapObservable,
-  EdgeMapObservable,
-  relationshipVisibleComputedDataObservable
-} from '../utils/relationshipObservables'
-
-export const contextObserverCallback: ContextObserverCallback<'relationship'> = ({ subject, observer }) => {
-
-  const textSizePx$ = textSizePxObservable(observer.fullChartParams$).pipe(
-    shareReplay(1)
-  )
-
-  const relationshipHighlightNodes$ = highlightObservable({
-    datumList$: observer.computedData$.pipe(map(data => data.nodes)),
-    fullChartParams$: observer.fullChartParams$,
-    event$: subject.event$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const relationshipHighlightEdges$ = highlightObservable({
-    datumList$: observer.computedData$.pipe(map(data => data.edges)),
-    fullChartParams$: observer.fullChartParams$,
-    event$: subject.event$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const CategoryNodeMap$ = categoryDataMapObservable({
-    datumList$: observer.computedData$.pipe(map(data => data.nodes))
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const CategoryEdgeMap$ = categoryDataMapObservable({
-    datumList$: observer.computedData$.pipe(map(data => data.edges))
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const NodeMap$ = NodeMapObservable(observer.computedData$).pipe(
-    shareReplay(1)
-  )
-
-  const EdgeMap$ = EdgeMapObservable(observer.computedData$).pipe(
-    shareReplay(1)
-  )
-
-  const categoryLabels$ = categoryLabelsObservable(CategoryNodeMap$, CategoryEdgeMap$).pipe(
-    shareReplay(1)
-  )
-
-  const visibleComputedData$ = relationshipVisibleComputedDataObservable({
-    computedData$: observer.computedData$,
-    NodeMap$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  return {
-    fullParams$: observer.fullParams$,
-    fullChartParams$: observer.fullChartParams$,
-    fullDataFormatter$: observer.fullDataFormatter$,
-    computedData$: observer.computedData$,
-    layout$: observer.layout$,
-    textSizePx$,
-    relationshipHighlightNodes$,
-    relationshipHighlightEdges$,
-    categoryLabels$,
-    CategoryNodeMap$,
-    CategoryEdgeMap$,
-    NodeMap$,
-    EdgeMap$,
-    visibleComputedData$
-  }
-}
+import { map, shareReplay } from 'rxjs'
+import type { ContextObserverCallback } from '../../lib/core-types'
+import { highlightObservable, categoryDataMapObservable, textSizePxObservable } from '../utils/observables'
+import {
+  categoryLabelsObservable,
+  NodeMapObservable,
+  EdgeMapObservable,
+  relationshipVisibleComputedDataObservable
+} from '../utils/relationshipObservables'
+
+export const contextObserverCallback: ContextObserverCallback<'relationship'> = ({ subject, observer }) => {
+
+  const textSizePx$ = textSizePxObservable(observer.fullChartParams$).pipe(
+    shareReplay(1)
+  )
+
+  const relationshipHighlightNodes$ = highlightObservable({
+    datumList$: observer.computedData$.pipe(map(data => data.nodes)),
+    fullChartParams$: observer.fullChartParams$,
+    event$: subject.event$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const relationshipHighlightEdges$ = highlightObservable({
+    datumList$: observer.computedData$.pipe(map(data => data.edges)),
+    fullChartParams$: observer.fullChartParams$,
+    event$: subject.event$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const CategoryNodeMap$ = categoryDataMapObservable({
+    datumList$: observer.computedData$.pipe(map(data => data.nodes))
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const CategoryEdgeMap$ = categoryDataMapObservable({
+    datumList$: observer.computedData$.pipe(map(data => data.edges))
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const NodeMap$ = NodeMapObservable(observer.computedData$).pipe(
+    shareReplay(1)
+  )
+
+  const EdgeMap$ = EdgeMapObservable(observer.computedData$).pipe(
+    shareReplay(1)
+  )
+
+  const categoryLabels$ = categoryLabelsObservable(CategoryNodeMap$, CategoryEdgeMap$).pipe(
+    shareReplay(1)
+  )
+
+  const visibleComputedData$ = relationshipVisibleComputedDataObservable({
+    computedData$: observer.computedData$,
+    NodeMap$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  return {
+    fullParams$: observer.fullParams$,
+    fullChartParams$: observer.fullChartParams$,
+    fullDataFormatter$: observer.fullDataFormatter$,
+    computedData$: observer.computedData$,
+    layout$: observer.layout$,
+    textSizePx$,
+    relationshipHighlightNodes$,
+    relationshipHighlightEdges$,
+    categoryLabels$,
+    CategoryNodeMap$,
+    CategoryEdgeMap$,
+    NodeMap$,
+    EdgeMap$,
+    visibleComputedData$
+  }
+}

package/src/relationship/dataFormatterValidator.ts

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

package/src/relationship/dataValidator.ts

@@ -1,10 +1,14 @@
-import type { DataValidator, DataTypeMap } from '../../lib/core-types'
-
-export const dataValidator: DataValidator<'relationship'> = (data: DataTypeMap<'relationship'>) => {
-
-  return {
-    status: 'success',
-    columnName: '',
-    expectToBe: ''
-  }
+import type { DataValidator, DataTypeMap } from '../../lib/core-types'
+import { validateColumns } from '../utils/validator'
+import { isPlainObject } from '../utils'
+
+export const dataValidator: DataValidator<'relationship'> = (data: DataTypeMap<'relationship'>) => {
+  const result = validateColumns({ data }, {
+    data: {
+      toBe: 'DataRelationshipObj | DataRelationshipList',
+      // 畢免資料量過大檢查不完，不深度檢查
+      test: (value) => isPlainObject(value) || Array.isArray(value)
+    }
+  })
+  return result
 }