@orbcharts/core 3.0.0-beta.8 → 3.0.0

package/src/multiGrid/dataFormatterValidator.ts

@@ -1,116 +1,116 @@
-import type { DataFormatterValidator, DataFormatterTypeMap, ValidatorResult } from '../../lib/core-types'
-import { validateColumns } from '../utils/validator'
-
-export const dataFormatterValidator: DataFormatterValidator<'multiGrid'> = (dataFormatter: DataFormatterTypeMap<'multiGrid'>) => {
-  const result = validateColumns(dataFormatter, {
-    visibleFilter: {
-      toBeTypes: ['Function']
-    },
-    gridList: {
-      toBeTypes: ['object[]']
-    },
-    container: {
-      toBeTypes: ['object']
-    },
-    separateGrid: {
-      toBeTypes: ['boolean']
-    }
-  })
-  if (dataFormatter.gridList) {
-    const gridListResultArr = dataFormatter.gridList.map((grid, index) => {
-      const gridResult = validateColumns(grid, {
-        seriesDirection: {
-          toBe: '"row" | "column"',
-          test: (value) => value === 'row' || value === 'column'
-        },
-        rowLabels: {
-          toBeTypes: ['string[]']
-        },
-        columnLabels: {
-          toBeTypes: ['string[]']
-        },
-        valueAxis: {
-          toBeTypes: ['object']
-        },
-        groupAxis: {
-          toBeTypes: ['object']
-        },
-        separateSeries: {
-          toBeTypes: ['boolean']
-        }
-      })
-      if (gridResult.status === 'error') {
-        return gridResult
-      } else {
-        if (grid.valueAxis) {
-          const valueAxisResult = validateColumns(grid.valueAxis, {
-            position: {
-              toBe: '"top" | "bottom" | "left" | "right"',
-              test: (value) => value === 'top' || value === 'bottom' || value === 'left' || value === 'right'
-            },
-            scaleDomain: {
-              toBe: '[number | "min" | "auto", number | "max" | "auto"]',
-              test: (value) => Array.isArray(value) && value.length === 2 && (typeof value[0] === 'number' || value[0] === 'min' || value[0] === 'auto') && (typeof value[1] === 'number' || value[1] === 'max' || value[1] === 'auto')
-            },
-            scaleRange: {
-              toBe: '[number, number]',
-              test: (value) => Array.isArray(value) && value.length === 2 && typeof value[0] === 'number' && typeof value[1] === 'number'
-            },
-            label: {
-              toBeTypes: ['string']
-            }
-          })
-          if (valueAxisResult.status === 'error') {
-            return valueAxisResult
-          }
-        } else if (grid.groupAxis) {
-          const groupAxisResult = validateColumns(grid.groupAxis, {
-            position: {
-              toBe: '"top" | "bottom" | "left" | "right"',
-              test: (value) => value === 'top' || value === 'bottom' || value === 'left' || value === 'right'
-            },
-            scaleDomain: {
-              toBe: '[number, number | "max"]',
-              test: (value) => Array.isArray(value) && value.length === 2 && typeof value[0] === 'number' && (typeof value[1] === 'number' || value[1] === 'max')
-            },
-            scalePadding: {
-              toBeTypes: ['number']
-            },
-            label: {
-              toBeTypes: ['string']
-            }
-          })
-          if (groupAxisResult.status === 'error') {
-            return groupAxisResult
-          }
-        }
-        return <ValidatorResult>{
-          status: 'success',
-          columnName: '',
-          expectToBe: ''
-        }
-      }
-    })
-    const gridListResult = gridListResultArr.find((gridResult) => gridResult.status === 'error')
-    if (gridListResult) {
-      return gridListResult
-    }
-  }
-  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
+import type { DataFormatterValidator, DataFormatterTypeMap, ValidatorResult } from '../../lib/core-types'
+import { validateColumns } from '../utils/validator'
+
+export const dataFormatterValidator: DataFormatterValidator<'multiGrid'> = (dataFormatter: DataFormatterTypeMap<'multiGrid'>) => {
+  const result = validateColumns(dataFormatter, {
+    visibleFilter: {
+      toBeTypes: ['Function']
+    },
+    gridList: {
+      toBeTypes: ['object[]']
+    },
+    container: {
+      toBeTypes: ['object']
+    },
+    separateGrid: {
+      toBeTypes: ['boolean']
+    }
+  })
+  if (dataFormatter.gridList) {
+    const gridListResultArr = dataFormatter.gridList.map((grid, index) => {
+      const gridResult = validateColumns(grid, {
+        seriesDirection: {
+          toBe: '"row" | "column"',
+          test: (value) => value === 'row' || value === 'column'
+        },
+        rowLabels: {
+          toBeTypes: ['string[]']
+        },
+        columnLabels: {
+          toBeTypes: ['string[]']
+        },
+        valueAxis: {
+          toBeTypes: ['object']
+        },
+        groupAxis: {
+          toBeTypes: ['object']
+        },
+        separateSeries: {
+          toBeTypes: ['boolean']
+        }
+      })
+      if (gridResult.status === 'error') {
+        return gridResult
+      } else {
+        if (grid.valueAxis) {
+          const valueAxisResult = validateColumns(grid.valueAxis, {
+            position: {
+              toBe: '"top" | "bottom" | "left" | "right"',
+              test: (value) => value === 'top' || value === 'bottom' || value === 'left' || value === 'right'
+            },
+            scaleDomain: {
+              toBe: '[number | "min" | "auto", number | "max" | "auto"]',
+              test: (value) => Array.isArray(value) && value.length === 2 && (typeof value[0] === 'number' || value[0] === 'min' || value[0] === 'auto') && (typeof value[1] === 'number' || value[1] === 'max' || value[1] === 'auto')
+            },
+            scaleRange: {
+              toBe: '[number, number]',
+              test: (value) => Array.isArray(value) && value.length === 2 && typeof value[0] === 'number' && typeof value[1] === 'number'
+            },
+            label: {
+              toBeTypes: ['string']
+            }
+          })
+          if (valueAxisResult.status === 'error') {
+            return valueAxisResult
+          }
+        } else if (grid.groupAxis) {
+          const groupAxisResult = validateColumns(grid.groupAxis, {
+            position: {
+              toBe: '"top" | "bottom" | "left" | "right"',
+              test: (value) => value === 'top' || value === 'bottom' || value === 'left' || value === 'right'
+            },
+            scaleDomain: {
+              toBe: '[number, number | "max"]',
+              test: (value) => Array.isArray(value) && value.length === 2 && typeof value[0] === 'number' && (typeof value[1] === 'number' || value[1] === 'max')
+            },
+            scalePadding: {
+              toBeTypes: ['number']
+            },
+            label: {
+              toBeTypes: ['string']
+            }
+          })
+          if (groupAxisResult.status === 'error') {
+            return groupAxisResult
+          }
+        }
+        return <ValidatorResult>{
+          status: 'success',
+          columnName: '',
+          expectToBe: ''
+        }
+      }
+    })
+    const gridListResult = gridListResultArr.find((gridResult) => gridResult.status === 'error')
+    if (gridListResult) {
+      return gridListResult
+    }
+  }
+  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/multiGrid/dataValidator.ts

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

package/src/multiValue/computedDataFn.ts

@@ -1,110 +1,113 @@
-import type { DataMultiValueDatum, ComputedDataFn, ComputedDatumMultiValue } from '../../lib/core-types'
-import { createDefaultCategoryLabel, createDefaultDatumId, seriesColorPredicate } from '../utils/orbchartsUtils'
-import { isPlainObject } from '../utils'
-
-export const computedDataFn: ComputedDataFn<'multiValue'> = (context) => {
-  const { data, dataFormatter, chartParams } = context
-  if (!data.length) {
-    return []
-  }
-
-  const defaultCategoryLabel = createDefaultCategoryLabel()
-
-  let computedDataMultiValue: ComputedDatumMultiValue[][] = []
-
-  try {
-    const dataMultiValue: DataMultiValueDatum[] = data.map((d, i) => {
-      if (Array.isArray(d)) {
-        return {
-          id: '',
-          label: '',
-          description: '',
-          // tooltipContent: '',
-          data: {},
-          categoryLabel: defaultCategoryLabel,
-          value: d
-        }
-      } else if (isPlainObject(d)) {
-        return {
-          id: d.id ?? '',
-          label: d.label ?? '',
-          description: d.description ?? '',
-          // tooltipContent: _d.tooltipContent ?? '',
-          data: d.data ?? {},
-          categoryLabel: d.categoryLabel ?? defaultCategoryLabel,
-          value: d.value
-        }
-      } else {
-        return {
-          id: '',
-          label: '',
-          description: '',
-          // tooltipContent: '',
-          data: {},
-          categoryLabel: defaultCategoryLabel,
-          value: []
-        }
-      }
-    })
-
-    const categoryLabels = (() => {
-      // 先使用 dataFormatter.categoryLabels
-      const CategoryLabelsSet = new Set(dataFormatter.categoryLabels)
-      // 再加入 datum 中的 categoryLabel
-      for (let datum of dataMultiValue) {
-        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])
-    )
-
-  
-    let index = 0
-  
-    dataMultiValue.forEach((d, i) => {
-      const currentIndex = index
-      index++
-
-      const defaultId = createDefaultDatumId(dataFormatter.type, i)
-
-      const categoryIndex = CategoryIndexMap.get(d.categoryLabel) ?? 0
-
-      const color = seriesColorPredicate(categoryIndex, chartParams)
-
-      const computedDatum: ComputedDatumMultiValue = {
-        id: d.id ? d.id : defaultId,
-        index: currentIndex,
-        label: d.label ? d.label : defaultId,
-        description: d.description ?? '',
-        // tooltipContent: _d.tooltipContent ? _d.tooltipContent : dataFormatter.tooltipContentFormat(_d, i, _i, context),
-        data: d.data,
-        datumIndex: i,
-        value: d.value,
-        categoryIndex,
-        categoryLabel: d.categoryLabel,
-        // valueLabel: formatValueToLabel(_d.value, dataFormatter.multiValue[_i].valueFormat),
-        // axis: _i == 0 ? xScale(_d.value) : yScale(_d.value),
-        visible: true, // 先給預設值
-        color
-      }
-
-      computedDatum.visible = dataFormatter.visibleFilter(computedDatum, context)
-
-      // 依 categoryIndex 分組
-      if (!computedDataMultiValue[categoryIndex]) {
-        computedDataMultiValue[categoryIndex] = []
-      }
-      computedDataMultiValue[categoryIndex].push(computedDatum)
-    })
-  } catch (e) {
-    // console.error(e)
-    throw Error(e)
-  }
-
-  return computedDataMultiValue
-}
+import type { DataMultiValueDatum, ComputedDataFn, ComputedDatumMultiValue } from '../../lib/core-types'
+import { createDefaultCategoryLabel, createDefaultDatumId, seriesColorPredicate } from '../utils/orbchartsUtils'
+import { isPlainObject } from '../utils'
+
+export const computedDataFn: ComputedDataFn<'multiValue'> = (context) => {
+  const { data, dataFormatter, chartParams } = context
+  if (!data.length) {
+    return []
+  }
+
+  const defaultCategoryLabel = createDefaultCategoryLabel()
+
+  let computedDataMultiValue: ComputedDatumMultiValue[][] = []
+
+  try {
+    const dataMultiValue: DataMultiValueDatum[] = data.map((d, i) => {
+      if (Array.isArray(d)) {
+        return {
+          id: '',
+          label: '',
+          description: '',
+          // tooltipContent: '',
+          data: {},
+          categoryLabel: defaultCategoryLabel,
+          value: d
+        }
+      } else if (isPlainObject(d)) {
+        return {
+          id: d.id ?? '',
+          label: d.label ?? '',
+          description: d.description ?? '',
+          // tooltipContent: _d.tooltipContent ?? '',
+          data: d.data ?? {},
+          categoryLabel: d.categoryLabel ?? defaultCategoryLabel,
+          value: d.value
+        }
+      } else {
+        return {
+          id: '',
+          label: '',
+          description: '',
+          // tooltipContent: '',
+          data: {},
+          categoryLabel: defaultCategoryLabel,
+          value: []
+        }
+      }
+    })
+
+    const categoryLabels = (() => {
+      // 先使用 dataFormatter.categoryLabels
+      const CategoryLabelsSet = new Set(dataFormatter.categoryLabels)
+      // 再加入 datum 中的 categoryLabel
+      for (let datum of dataMultiValue) {
+        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])
+    )
+
+  
+    let index = 0
+  
+    dataMultiValue.forEach((d, i) => {
+      const currentIndex = index
+      index++
+
+      const defaultId = createDefaultDatumId(dataFormatter.type, i)
+
+      const categoryIndex = CategoryIndexMap.get(d.categoryLabel) ?? 0
+
+      const color = seriesColorPredicate(categoryIndex, chartParams)
+
+      const computedDatum: ComputedDatumMultiValue = {
+        id: d.id ? d.id : defaultId,
+        index: currentIndex,
+        label: d.label ? d.label : defaultId,
+        description: d.description ?? '',
+        // tooltipContent: _d.tooltipContent ? _d.tooltipContent : dataFormatter.tooltipContentFormat(_d, i, _i, context),
+        data: d.data,
+        datumIndex: i,
+        value: d.value,
+        categoryIndex,
+        categoryLabel: d.categoryLabel,
+        xValueIndex: dataFormatter.xAxis.valueIndex,
+        yValueIndex: dataFormatter.yAxis.valueIndex,
+        // valueLabel: formatValueToLabel(_d.value, dataFormatter.multiValue[_i].valueFormat),
+        // axis: _i == 0 ? xScale(_d.value) : yScale(_d.value),
+        visible: true, // 先給預設值
+        color,
+        _visibleValue: d.value // 預設和value相同
+      }
+
+      computedDatum.visible = dataFormatter.visibleFilter(computedDatum, context)
+
+      // 依 categoryIndex 分組
+      if (!computedDataMultiValue[categoryIndex]) {
+        computedDataMultiValue[categoryIndex] = []
+      }
+      computedDataMultiValue[categoryIndex].push(computedDatum)
+    })
+  } catch (e) {
+    // console.error(e)
+    throw Error(e)
+  }
+
+  return computedDataMultiValue
+}