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

package/src/{series → utils}/seriesObservables.ts

@@ -1,176 +1,176 @@
-import {
-  combineLatest,
-  distinctUntilChanged,
-  filter,
-  map,
-  merge,
-  takeUntil,
-  shareReplay,
-  switchMap,
-  Subject,
-  Observable } from 'rxjs'
-import type {
-  ChartParams,
-  ComputedDatumSeries,
-  ComputedDataTypeMap,
-  DataFormatterTypeMap,
-  SeriesContainerPosition,
-  Layout } from '../types'
-import { calcSeriesContainerLayout } from '../utils/orbchartsUtils'
-
-export const separateSeriesObservable = ({ fullDataFormatter$ }: { fullDataFormatter$: Observable<DataFormatterTypeMap<'series'>> }) => {
-  return fullDataFormatter$.pipe(
-    map(data => data.separateSeries),
-    distinctUntilChanged(),
-  )
-}
-
-export const seriesLabelsObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTypeMap<'series'>> }) => {
-  return computedData$.pipe(
-    map(data => {
-      return data
-        .filter(series => series.length)
-        .map(series => {
-          return series[0].seriesLabel
-        })
-    }),
-    distinctUntilChanged((a, b) => {
-      return JSON.stringify(a).length === JSON.stringify(b).length
-    }),
-  )
-}
-
-export const visibleComputedDataObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTypeMap<'series'>> }) => {
-  return computedData$.pipe(
-    map(data => {
-      return data.map(series => {
-        return series.filter(datum => datum.visible != false)
-      })
-    })
-  )
-}
-
-export const computedLayoutDataObservable = ({ computedData$, fullDataFormatter$ }: {
-  computedData$: Observable<ComputedDataTypeMap<'series'>>,
-  fullDataFormatter$: Observable<DataFormatterTypeMap<'series'>>
-}) => {
-  return combineLatest({
-    computedData: computedData$,
-    fullDataFormatter: fullDataFormatter$
-  }).pipe(
-    switchMap(async (d) => d),
-    map(data => {
-      const sumData: ComputedDatumSeries[][] = data.fullDataFormatter.sumSeries == true
-        ? data.computedData.map(d => {
-            return [
-              // 加總為一筆資料
-              d.reduce((acc, current) => {
-                if (acc == null) {
-                  return current // 取得第一筆資料
-                }
-                acc.value = acc.value + current.value
-                return acc
-              }, null)
-            ]
-          })
-        : data.computedData
-      
-      return data.fullDataFormatter.separateSeries == true
-        // 有拆分的話每個series為一組
-        ? sumData
-          .map(series => {
-            return series.sort((a, b) => a.seq - b.seq)
-          })
-        // 無拆分的話所有資料為一組
-        : [
-          sumData
-            .flat()
-            .sort((a, b) => a.seq - b.seq)
-        ]
-    })
-  )
-}
-
-
-// 所有container位置（對應series）
-export const seriesContainerPositionObservable = ({ computedData$, fullDataFormatter$, layout$ }: {
-  computedData$: Observable<ComputedDataTypeMap<'series'>>
-  fullDataFormatter$: Observable<DataFormatterTypeMap<'series'>>
-  layout$: Observable<Layout>
-}): Observable<SeriesContainerPosition[]> => {
-
-  const gridContainerPosition$ = combineLatest({
-    computedData: computedData$,
-    fullDataFormatter: fullDataFormatter$,
-    layout: layout$,
-  }).pipe(
-    switchMap(async (d) => d),
-    map(data => {
-      
-      if (data.fullDataFormatter.separateSeries) {
-        // -- 依slotIndexes計算 --
-        return calcSeriesContainerLayout(data.layout, data.fullDataFormatter.container, data.computedData.length)
-        // return data.computedData.map((seriesData, seriesIndex) => {
-        //   const columnIndex = seriesIndex % data.fullDataFormatter.container.columnAmount
-        //   const rowIndex = Math.floor(seriesIndex / data.fullDataFormatter.container.columnAmount)
-        //   const { startX, startY, centerX, centerY, width, height } = calcSeriesContainerPosition(data.layout, data.fullDataFormatter.container, rowIndex, columnIndex)
-        //   return {
-        //     slotIndex: seriesIndex,
-        //     rowIndex,
-        //     columnIndex,
-        //     startX,
-        //     startY,
-        //     centerX,
-        //     centerY,
-        //     width,
-        //     height,
-        //   }
-        // })
-      } else {
-        // -- 無拆分 --
-        return calcSeriesContainerLayout(data.layout, data.fullDataFormatter.container, 1)
-        // const columnIndex = 0
-        // const rowIndex = 0
-        // return data.computedData.map((seriesData, seriesIndex) => {
-        //   const { startX, startY, centerX, centerY, width, height } = calcSeriesContainerPosition(data.layout, data.fullDataFormatter.container, rowIndex, columnIndex)
-        //   return {
-        //     slotIndex: 0,
-        //     rowIndex,
-        //     columnIndex,
-        //     startX,
-        //     startY,
-        //     centerX,
-        //     centerY,
-        //     width,
-        //     height,
-        //   }
-        // })
-      }
-    })
-  )
-
-  return gridContainerPosition$
-}
-
-export const seriesContainerPositionMapObservable = ({ seriesContainerPosition$, seriesLabels$, separateSeries$ }: {
-  seriesContainerPosition$: Observable<SeriesContainerPosition[]>
-  seriesLabels$: Observable<string[]>
-  separateSeries$: Observable<boolean>
-}) => {
-  return combineLatest({
-    seriesContainerPosition: seriesContainerPosition$,
-    seriesLabels: seriesLabels$,
-    separateSeries: separateSeries$,
-  }).pipe(
-    switchMap(async (d) => d),
-    map(data => {
-      return data.separateSeries
-        ? new Map<string, SeriesContainerPosition>(data.seriesLabels.map((seriesLabel, seriesIndex) => {
-          return [seriesLabel, data.seriesContainerPosition[seriesIndex] ?? data.seriesContainerPosition[0]]
-        }))
-        : new Map<string, SeriesContainerPosition>(data.seriesLabels.map((seriesLabel, seriesIndex) => {
-          return [seriesLabel, data.seriesContainerPosition[0]]
-        }))
-    })
-  )
+import {
+  combineLatest,
+  distinctUntilChanged,
+  filter,
+  map,
+  merge,
+  takeUntil,
+  shareReplay,
+  switchMap,
+  Subject,
+  Observable } from 'rxjs'
+import type {
+  ChartParams,
+  ComputedDatumSeries,
+  ComputedDataTypeMap,
+  DataFormatterTypeMap,
+  SeriesContainerPosition,
+  Layout } from '../../lib/core-types'
+import { calcSeriesContainerLayout } from './orbchartsUtils'
+
+export const separateSeriesObservable = ({ fullDataFormatter$ }: { fullDataFormatter$: Observable<DataFormatterTypeMap<'series'>> }) => {
+  return fullDataFormatter$.pipe(
+    map(data => data.separateSeries),
+    distinctUntilChanged(),
+  )
+}
+
+export const seriesLabelsObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTypeMap<'series'>> }) => {
+  return computedData$.pipe(
+    map(data => {
+      return data
+        .filter(series => series.length)
+        .map(series => {
+          return series[0].seriesLabel
+        })
+    }),
+    distinctUntilChanged((a, b) => {
+      return JSON.stringify(a).length === JSON.stringify(b).length
+    }),
+  )
+}
+
+export const seriesVisibleComputedDataObservable = ({ computedData$ }: { computedData$: Observable<ComputedDataTypeMap<'series'>> }) => {
+  return computedData$.pipe(
+    map(data => {
+      return data.map(series => {
+        return series.filter(datum => datum.visible != false)
+      })
+    })
+  )
+}
+
+export const seriesComputedLayoutDataObservable = ({ computedData$, fullDataFormatter$ }: {
+  computedData$: Observable<ComputedDataTypeMap<'series'>>,
+  fullDataFormatter$: Observable<DataFormatterTypeMap<'series'>>
+}) => {
+  return combineLatest({
+    computedData: computedData$,
+    fullDataFormatter: fullDataFormatter$
+  }).pipe(
+    switchMap(async (d) => d),
+    map(data => {
+      const sumData: ComputedDatumSeries[][] = data.fullDataFormatter.sumSeries == true
+        ? data.computedData.map(d => {
+            return [
+              // 加總為一筆資料
+              d.reduce((acc, current) => {
+                if (acc == null) {
+                  return current // 取得第一筆資料
+                }
+                acc.value = acc.value + current.value
+                return acc
+              }, null)
+            ]
+          })
+        : data.computedData
+      
+      return data.fullDataFormatter.separateSeries == true
+        // 有拆分的話每個series為一組
+        ? sumData
+          .map(series => {
+            return series.sort((a, b) => a.seq - b.seq)
+          })
+        // 無拆分的話所有資料為一組
+        : [
+          sumData
+            .flat()
+            .sort((a, b) => a.seq - b.seq)
+        ]
+    })
+  )
+}
+
+
+// 所有container位置（對應series）
+export const seriesContainerPositionObservable = ({ computedData$, fullDataFormatter$, layout$ }: {
+  computedData$: Observable<ComputedDataTypeMap<'series'>>
+  fullDataFormatter$: Observable<DataFormatterTypeMap<'series'>>
+  layout$: Observable<Layout>
+}): Observable<SeriesContainerPosition[]> => {
+
+  const gridContainerPosition$ = combineLatest({
+    computedData: computedData$,
+    fullDataFormatter: fullDataFormatter$,
+    layout: layout$,
+  }).pipe(
+    switchMap(async (d) => d),
+    map(data => {
+      
+      if (data.fullDataFormatter.separateSeries) {
+        // -- 依slotIndexes計算 --
+        return calcSeriesContainerLayout(data.layout, data.fullDataFormatter.container, data.computedData.length)
+        // return data.computedData.map((seriesData, seriesIndex) => {
+        //   const columnIndex = seriesIndex % data.fullDataFormatter.container.columnAmount
+        //   const rowIndex = Math.floor(seriesIndex / data.fullDataFormatter.container.columnAmount)
+        //   const { startX, startY, centerX, centerY, width, height } = calcSeriesContainerPosition(data.layout, data.fullDataFormatter.container, rowIndex, columnIndex)
+        //   return {
+        //     slotIndex: seriesIndex,
+        //     rowIndex,
+        //     columnIndex,
+        //     startX,
+        //     startY,
+        //     centerX,
+        //     centerY,
+        //     width,
+        //     height,
+        //   }
+        // })
+      } else {
+        // -- 無拆分 --
+        return calcSeriesContainerLayout(data.layout, data.fullDataFormatter.container, 1)
+        // const columnIndex = 0
+        // const rowIndex = 0
+        // return data.computedData.map((seriesData, seriesIndex) => {
+        //   const { startX, startY, centerX, centerY, width, height } = calcSeriesContainerPosition(data.layout, data.fullDataFormatter.container, rowIndex, columnIndex)
+        //   return {
+        //     slotIndex: 0,
+        //     rowIndex,
+        //     columnIndex,
+        //     startX,
+        //     startY,
+        //     centerX,
+        //     centerY,
+        //     width,
+        //     height,
+        //   }
+        // })
+      }
+    })
+  )
+
+  return gridContainerPosition$
+}
+
+export const seriesContainerPositionMapObservable = ({ seriesContainerPosition$, seriesLabels$, separateSeries$ }: {
+  seriesContainerPosition$: Observable<SeriesContainerPosition[]>
+  seriesLabels$: Observable<string[]>
+  separateSeries$: Observable<boolean>
+}) => {
+  return combineLatest({
+    seriesContainerPosition: seriesContainerPosition$,
+    seriesLabels: seriesLabels$,
+    separateSeries: separateSeries$,
+  }).pipe(
+    switchMap(async (d) => d),
+    map(data => {
+      return data.separateSeries
+        ? new Map<string, SeriesContainerPosition>(data.seriesLabels.map((seriesLabel, seriesIndex) => {
+          return [seriesLabel, data.seriesContainerPosition[seriesIndex] ?? data.seriesContainerPosition[0]]
+        }))
+        : new Map<string, SeriesContainerPosition>(data.seriesLabels.map((seriesLabel, seriesIndex) => {
+          return [seriesLabel, data.seriesContainerPosition[0]]
+        }))
+    })
+  )
 }

package/src/{tree → utils}/treeObservables.ts

@@ -1,95 +1,95 @@
-import {
-  combineLatest,
-  distinctUntilChanged,
-  filter,
-  map,
-  merge,
-  takeUntil,
-  shareReplay,
-  switchMap,
-  Subject,
-  Observable } from 'rxjs'
-import type {
-  ChartParams,
-  ComputedDataTree,
-  ComputedDataTypeMap,
-  DataFormatterTree } from '../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 existCategoryLabelsObservable = ({ nodeList$, fullDataFormatter$ }: {
-  nodeList$: Observable<ComputedDataTree[]>
-  fullDataFormatter$: Observable<DataFormatterTree>
-}) => {
-
-  const categoryLabels$ = fullDataFormatter$.pipe(
-    map(d => d.categoryLabels),
-    distinctUntilChanged((a, b) => {
-      return JSON.stringify(a).length === JSON.stringify(b).length
-    }),
-  )
-
-  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).length === JSON.stringify(b).length
-    }),
-  )
-}
-
-// 所有可見的節點
-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 existCategoryLabelsObservable = ({ nodeList$, fullDataFormatter$ }: {
+  nodeList$: Observable<ComputedDataTree[]>
+  fullDataFormatter$: Observable<DataFormatterTree>
+}) => {
+
+  const categoryLabels$ = fullDataFormatter$.pipe(
+    map(d => d.categoryLabels),
+    distinctUntilChanged((a, b) => {
+      return JSON.stringify(a).length === JSON.stringify(b).length
+    }),
+  )
+
+  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).length === JSON.stringify(b).length
+    }),
+  )
+}
+
+// 所有可見的節點
+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)
+    })
+  )
 }

package/src/utils/validator.ts

@@ -0,0 +1,126 @@
+import type {
+  ValidatorResult,
+  ToBeTypes,
+  ToBeOption,
+  ValidatorRuleToBeTypes,
+  ValidatorRuleToBe,
+  ValidatorRuleToBeOption,
+  ValidatorRule
+} from '../../lib/core-types'
+import { isFunction, isPlainObject } from './commonUtils'
+import { createValidatorErrorMessage } from './errorMessage'
+
+
+
+// let test: ValidatorRule = {
+//   name: {
+//     toBeTypes: ['string']
+//   },
+//   labels: {
+//     toBe: 'string | "auto"',
+//     test: (value: any) => {
+//       return value === 'auto' || typeof value === 'string'
+//     }
+//   }
+// }
+
+function getInvalidColumn<T> (data: T, rules: Partial<ValidatorRule<T>>) {
+  // "toBeTypes" 的測試
+  const testType: {[key in ToBeTypes]: (value: any) => boolean} = {
+    string: (value: any) => typeof value === 'string',
+    number: (value: any) => typeof value === 'number',
+    boolean: (value: any) => typeof value === 'boolean',
+    object: (value: any) => isPlainObject(value), // 嚴格判斷是否為純物件
+    'object[]': (value: any) => Array.isArray(value) && value.every((v: any) => isPlainObject(v)),
+    'string[]': (value: any) => Array.isArray(value) && value.every((v: any) => typeof v === 'string'),
+    'number[]': (value: any) => Array.isArray(value) && value.every((v: any) => typeof v === 'number'),
+    Function: (value: any) => isFunction(value),
+    null: (value: any) => value === null,
+    undefined: (value: any) => value === undefined
+  }
+  // "toBeOption" 的測試
+  const testOption: {[key in ToBeOption]: (value: any) => boolean} = {
+    ColorType: (value: any) => {
+      return value === 'none'
+        || value === 'series'
+        || value === 'primary'
+        || value === 'secondary'
+        || value === 'white'
+        || value === 'background'
+    }
+  }
+
+  const failColumn = Object.keys(data).find((columnName: string) => {
+    // 有定義規則
+    if (rules[columnName as keyof T]) {
+      const rule: ValidatorRuleToBeTypes | ValidatorRuleToBe | ValidatorRuleToBeOption = rules[columnName as keyof T]
+      const value = data[columnName as keyof T]
+      // 測試 "toBeTypes"
+      if ((rule as ValidatorRuleToBeTypes).toBeTypes) {
+        const toBeTypes = (rule as ValidatorRuleToBeTypes).toBeTypes
+        const isCorrect = toBeTypes.some((toBeType) => testType[toBeType](value))
+        if (isCorrect === false) {
+          return true
+        }
+      }
+      // 測試 "toBe"
+      else if ((rule as ValidatorRuleToBe).toBe) {
+        const { toBe, test } = rule as ValidatorRuleToBe
+        const isCorrect = test(value)
+        if (isCorrect === false) {
+          return true
+        }
+      }
+      // 測試 "toBeOption"
+      else if ((rule as ValidatorRuleToBeOption).toBeOption) {
+        const toBeOption = (rule as ValidatorRuleToBeOption).toBeOption
+        const isCorrect = testOption[toBeOption](value)
+        if (isCorrect === false) {
+          return true
+        }
+      }
+    }
+    return false
+  })
+
+  return failColumn
+}
+
+export function validateColumns<T> (data: T, rules: Partial<ValidatorRule<T>>): ValidatorResult {
+  // if (data === undefined || data === null) {
+  //   // orbcharts所有的options都是允許空值的
+  //   return {
+  //     status: 'success',
+  //     columnName: '',
+  //     expectToBe: '',
+  //   }
+  // }
+  const invalidColumn = getInvalidColumn(data, rules)
+  if (invalidColumn) {
+    const rule = rules[invalidColumn as keyof T]
+    const expectToBe = (rule as ValidatorRuleToBeTypes).toBeTypes
+      ? (rule as ValidatorRuleToBeTypes).toBeTypes.join(' | ')
+      : (rule as ValidatorRuleToBe).toBe
+        ? (rule as ValidatorRuleToBe).toBe
+        : (rule as ValidatorRuleToBeOption).toBeOption
+          ? (rule as ValidatorRuleToBeOption).toBeOption
+          : ''
+
+    return {
+      status: 'error',
+      // message: createValidatorErrorMessage({
+      //   columnName: failColumn,
+      //   expect,
+      //   from
+      // })
+      columnName: invalidColumn as string,
+      expectToBe: expectToBe,
+    }
+  } else {
+    return {
+      status: 'success',
+      columnName: '',
+      expectToBe: '',
+    }
+  }
+}