@orbcharts/core 4.0.0-alpha.0 → 4.0.0-beta.0

package/src/chart/createGridData.ts

@@ -1,247 +1,247 @@
-import type { RawData, RawDataColumn, Encoding, ModelDataGrid, ModelDatumGrid, Theme } from '../types'
-import { aggregate } from '../utils/aggregateUtils'
-import { getColorByFrom } from '../utils/colorUtils'
-
-export const createGridData = (rawData: RawData, encoding: Encoding, theme: Theme): ModelDataGrid[] => {
-  // 依據 dataset 欄位將資料分組
-  const datasetMap = new Map<string, RawDataColumn[]>()
-  
-  // 判斷是一維陣列還是二維陣列
-  const is2DArray = Array.isArray(rawData[0])
-  
-  if (is2DArray) {
-    // 二維陣列：每個子陣列代表一個 dataset
-    (rawData as RawDataColumn[][]).forEach((datasetArray, datasetIndex) => {
-      datasetArray.forEach((d) => {
-        const datasetKey = (d as any)[encoding.dataset.from] || `dataset-${datasetIndex}`
-        if (!datasetMap.has(datasetKey)) {
-          datasetMap.set(datasetKey, [])
-        }
-        datasetMap.get(datasetKey)!.push(d)
-      })
-    })
-  } else {
-    // 一維陣列：依據 dataset 欄位分組
-    (rawData as RawDataColumn[]).forEach((d) => {
-      const datasetKey = (d as any)[encoding.dataset.from] || 'default'
-      if (!datasetMap.has(datasetKey)) {
-        datasetMap.set(datasetKey, [])
-      }
-      datasetMap.get(datasetKey)!.push(d)
-    })
-  }
-
-  // 建立排序後的 dataset 名稱陣列
-  let sortedDatasetNames: string[] = Array.from(datasetMap.keys())
-  if (Array.isArray(encoding.dataset.sort)) {
-    sortedDatasetNames = encoding.dataset.sort.filter(name => datasetMap.has(name))
-      .concat(sortedDatasetNames.filter(name => !encoding.dataset.sort.includes(name)))
-  } else if (encoding.dataset.sort === 'original') {
-    // original 排序：依照原始資料中 dataset 名稱出現的順序
-    const datasetOrder: string[] = []
-    if (is2DArray) {
-      (rawData as RawDataColumn[][]).forEach((datasetArray, datasetIndex) => {
-        datasetArray.forEach((d) => {
-          const datasetKey = (d as any)[encoding.dataset.from] || `dataset-${datasetIndex}`
-          if (!datasetOrder.includes(datasetKey)) {
-            datasetOrder.push(datasetKey)
-          }
-        })
-      })
-    } else {
-      (rawData as RawDataColumn[]).forEach((d) => {
-        const datasetKey = (d as any)[encoding.dataset.from] || 'default'
-        if (!datasetOrder.includes(datasetKey)) {
-          datasetOrder.push(datasetKey)
-        }
-      })
-    }
-    sortedDatasetNames = datasetOrder
-  } else if (encoding.dataset.sort === 'alphabetical') {
-    // alphabetical 排序：依照字母順序
-    sortedDatasetNames.sort((a, b) => a.localeCompare(b, undefined, { numeric: true }))
-  }
-
-  // 對每個 dataset 進行 grid 資料的處理
-  const result: ModelDataGrid[] = []
-  sortedDatasetNames.forEach((datasetName, datasetIndex) => {
-    const data = datasetMap.get(datasetName)!
-    
-    // 依據 series 欄位將資料分組
-    const seriesMap = new Map<string, RawDataColumn[]>()
-    data.forEach((d) => {
-      const seriesKey = (d as any)[encoding.series.from] || 'default'
-      if (!seriesMap.has(seriesKey)) {
-        seriesMap.set(seriesKey, [])
-      }
-      seriesMap.get(seriesKey)!.push(d)
-    })
-
-    // 建立排序後的系列名稱陣列
-    let sortedSeriesNames: string[] = Array.from(seriesMap.keys())
-    if (Array.isArray(encoding.series.sort)) {
-      sortedSeriesNames = encoding.series.sort.filter(name => seriesMap.has(name))
-        .concat(sortedSeriesNames.filter(name => !encoding.series.sort.includes(name)))
-    } else if (encoding.series.sort === 'original') {
-      // original 排序：依照原始資料中 series 名稱出現的順序
-      const seriesOrder: string[] = []
-      data.forEach((d) => {
-        const seriesKey = (d as any)[encoding.series.from] || 'default'
-        if (!seriesOrder.includes(seriesKey)) {
-          seriesOrder.push(seriesKey)
-        }
-      })
-      sortedSeriesNames = seriesOrder
-    } else if (encoding.series.sort === 'alphabetical') {
-      // alphabetical 排序：依照字母順序
-      sortedSeriesNames.sort((a, b) => a.localeCompare(b, undefined, { numeric: true }))
-    }
-
-    // 建立全局的 category 排序（跨該 dataset 下所有 series）
-    const globalCategoryOrder: string[] = []
-    data.forEach((d) => {
-      const categoryKey = (d as any)[encoding.category.from] || 'default'
-      if (!globalCategoryOrder.includes(categoryKey)) {
-        globalCategoryOrder.push(categoryKey)
-      }
-    })
-    const globalCategorySet = new Set<string>(globalCategoryOrder)
-    let globalSortedCategoryNames: string[] = Array.from(globalCategorySet)
-    if (Array.isArray(encoding.category.sort)) {
-      globalSortedCategoryNames = (encoding.category.sort as string[]).filter(name => globalCategorySet.has(name))
-        .concat(globalSortedCategoryNames.filter(name => !(encoding.category.sort as string[]).includes(name)))
-    } else if (encoding.category.sort === 'original') {
-      // original 排序：依照原始資料中 category 名稱出現的順序
-      globalSortedCategoryNames = globalCategoryOrder
-    } else if (encoding.category.sort === 'alphabetical') {
-      // alphabetical 排序：依照字母順序
-      globalSortedCategoryNames.sort((a, b) => a.localeCompare(b, undefined, { numeric: true }))
-    }
-
-    // 依據排序後的系列名稱來建立最終的資料結構
-    const gridData: ModelDatumGrid[][] = []
-    sortedSeriesNames.forEach((seriesName, seriesIndex) => {
-      const seriesItems = seriesMap.get(seriesName)!
-      
-      // 依據 category 欄位將 series 內的資料分組
-      const categoryMap = new Map<string, RawDataColumn[]>()
-      seriesItems.forEach((d) => {
-        const categoryKey = (d as any)[encoding.category.from] || 'default'
-        if (!categoryMap.has(categoryKey)) {
-          categoryMap.set(categoryKey, [])
-        }
-        categoryMap.get(categoryKey)!.push(d)
-      })
-
-      // 處理每個 category（使用全局排序後的 category 名稱，確保所有 series 的 category 順序一致）
-      const seriesData: ModelDatumGrid[] = []
-      globalSortedCategoryNames.forEach((categoryName, categoryIndex) => {
-        const categoryItems = categoryMap.get(categoryName)
-
-        if (!categoryItems) {
-          // 該 series 缺少此 category，以 value 為 null 的預設資料補上
-          seriesData.push({
-            id: `${datasetName}-${seriesName}-${categoryName}-null`,
-            index: categoryIndex,
-            modelType: 'grid',
-            name: categoryName,
-            data: undefined,
-            value: null,
-            color: getColorByFrom(encoding.color.from, {
-              index: categoryIndex,
-              seriesIndex,
-              categoryIndex,
-              datasetIndex
-            }, theme),
-            series: seriesName,
-            seriesIndex,
-            category: categoryName,
-            categoryIndex,
-          })
-        } else if (encoding.value.aggregate === 'none') {
-          // 不聚合，保持原始資料結構
-          let modelData: ModelDatumGrid[] = categoryItems.map((d, index) => {
-            const value = (d as any)[encoding.value.from]
-            return {
-              id: d.id || `${datasetName}-${seriesName}-${categoryName}-${index}`,
-              index: categoryIndex, // Grid 模式下 index 對應 categoryIndex
-              modelType: 'grid',
-              name: d.name || '',
-              data: d.data,
-              value: typeof value === 'number' ? value : null,
-              color: getColorByFrom(encoding.color.from, { 
-                index: categoryIndex, 
-                seriesIndex,
-                categoryIndex,
-                datasetIndex
-              }, theme),
-              series: seriesName,
-              seriesIndex,
-              category: categoryName,
-              categoryIndex,
-            }
-          })
-          
-          // 根據 value.sort 進行排序
-          if (encoding.value.sort === 'asc') {
-            modelData.sort((a, b) => {
-              if (a.value === null && b.value === null) return 0
-              if (a.value === null) return 1
-              if (b.value === null) return -1
-              return a.value - b.value
-            })
-          } else if (encoding.value.sort === 'desc') {
-            modelData.sort((a, b) => {
-              if (a.value === null && b.value === null) return 0
-              if (a.value === null) return 1
-              if (b.value === null) return -1
-              return b.value - a.value
-            })
-          }
-          // 'original' 不需要額外排序，保持原始順序
-          
-          seriesData.push(...modelData)
-        } else {
-          // 進行聚合，將相同 dataset, series, category 的資料合併為一筆
-          const values: (number | null)[] = categoryItems.map(d => {
-            if (encoding.value.aggregate === 'count') {
-              return 1 // count 聚合時每筆資料計為 1
-            }
-            const value = (d as any)[encoding.value.from]
-            return typeof value === 'number' ? value : null
-          })
-          
-          const aggregatedValue = aggregate(values, encoding.value.aggregate)
-          
-          // 合併其他欄位（使用第一筆資料的值）
-          const firstItem = categoryItems[0]
-          const modelData: ModelDatumGrid = {
-            id: firstItem.id || `${datasetName}-${seriesName}-${categoryName}-aggregated`,
-            index: categoryIndex, // Grid 模式下 index 對應 categoryIndex
-            modelType: 'grid',
-            name: firstItem.name || categoryName,
-            data: firstItem.data,
-            value: aggregatedValue,
-            color: getColorByFrom(encoding.color.from, { 
-              index: categoryIndex, 
-              seriesIndex,
-              categoryIndex,
-              datasetIndex
-            }, theme),
-            series: seriesName,
-            seriesIndex,
-            category: categoryName,
-            categoryIndex,
-          }
-          seriesData.push(modelData)
-        }
-      })
-
-      gridData.push(seriesData)
-    })
-
-    result.push(gridData)
-  })
-
-  return result
-}
+import type { RawData, RawDataColumn, Encoding, ModelDataGrid, ModelDatumGrid, Theme } from '../types'
+import { aggregate } from '../utils/aggregateUtils'
+import { getColorByFrom } from '../utils/colorUtils'
+
+export const createGridData = (rawData: RawData, encoding: Encoding, theme: Theme): ModelDataGrid[] => {
+  // 依據 dataset 欄位將資料分組
+  const datasetMap = new Map<string, RawDataColumn[]>()
+  
+  // 判斷是一維陣列還是二維陣列
+  const is2DArray = Array.isArray(rawData[0])
+  
+  if (is2DArray) {
+    // 二維陣列：每個子陣列代表一個 dataset
+    (rawData as RawDataColumn[][]).forEach((datasetArray, datasetIndex) => {
+      datasetArray.forEach((d) => {
+        const datasetKey = (d as any)[encoding.dataset.from] || `dataset-${datasetIndex}`
+        if (!datasetMap.has(datasetKey)) {
+          datasetMap.set(datasetKey, [])
+        }
+        datasetMap.get(datasetKey)!.push(d)
+      })
+    })
+  } else {
+    // 一維陣列：依據 dataset 欄位分組
+    (rawData as RawDataColumn[]).forEach((d) => {
+      const datasetKey = (d as any)[encoding.dataset.from] || 'default'
+      if (!datasetMap.has(datasetKey)) {
+        datasetMap.set(datasetKey, [])
+      }
+      datasetMap.get(datasetKey)!.push(d)
+    })
+  }
+
+  // 建立排序後的 dataset 名稱陣列
+  let sortedDatasetNames: string[] = Array.from(datasetMap.keys())
+  if (Array.isArray(encoding.dataset.sort)) {
+    sortedDatasetNames = encoding.dataset.sort.filter(name => datasetMap.has(name))
+      .concat(sortedDatasetNames.filter(name => !encoding.dataset.sort.includes(name)))
+  } else if (encoding.dataset.sort === 'original') {
+    // original 排序：依照原始資料中 dataset 名稱出現的順序
+    const datasetOrder: string[] = []
+    if (is2DArray) {
+      (rawData as RawDataColumn[][]).forEach((datasetArray, datasetIndex) => {
+        datasetArray.forEach((d) => {
+          const datasetKey = (d as any)[encoding.dataset.from] || `dataset-${datasetIndex}`
+          if (!datasetOrder.includes(datasetKey)) {
+            datasetOrder.push(datasetKey)
+          }
+        })
+      })
+    } else {
+      (rawData as RawDataColumn[]).forEach((d) => {
+        const datasetKey = (d as any)[encoding.dataset.from] || 'default'
+        if (!datasetOrder.includes(datasetKey)) {
+          datasetOrder.push(datasetKey)
+        }
+      })
+    }
+    sortedDatasetNames = datasetOrder
+  } else if (encoding.dataset.sort === 'alphabetical') {
+    // alphabetical 排序：依照字母順序
+    sortedDatasetNames.sort((a, b) => a.localeCompare(b, undefined, { numeric: true }))
+  }
+
+  // 對每個 dataset 進行 grid 資料的處理
+  const result: ModelDataGrid[] = []
+  sortedDatasetNames.forEach((datasetName, datasetIndex) => {
+    const data = datasetMap.get(datasetName)!
+    
+    // 依據 series 欄位將資料分組
+    const seriesMap = new Map<string, RawDataColumn[]>()
+    data.forEach((d) => {
+      const seriesKey = (d as any)[encoding.series.from] || 'default'
+      if (!seriesMap.has(seriesKey)) {
+        seriesMap.set(seriesKey, [])
+      }
+      seriesMap.get(seriesKey)!.push(d)
+    })
+
+    // 建立排序後的系列名稱陣列
+    let sortedSeriesNames: string[] = Array.from(seriesMap.keys())
+    if (Array.isArray(encoding.series.sort)) {
+      sortedSeriesNames = encoding.series.sort.filter(name => seriesMap.has(name))
+        .concat(sortedSeriesNames.filter(name => !encoding.series.sort.includes(name)))
+    } else if (encoding.series.sort === 'original') {
+      // original 排序：依照原始資料中 series 名稱出現的順序
+      const seriesOrder: string[] = []
+      data.forEach((d) => {
+        const seriesKey = (d as any)[encoding.series.from] || 'default'
+        if (!seriesOrder.includes(seriesKey)) {
+          seriesOrder.push(seriesKey)
+        }
+      })
+      sortedSeriesNames = seriesOrder
+    } else if (encoding.series.sort === 'alphabetical') {
+      // alphabetical 排序：依照字母順序
+      sortedSeriesNames.sort((a, b) => a.localeCompare(b, undefined, { numeric: true }))
+    }
+
+    // 建立全局的 category 排序（跨該 dataset 下所有 series）
+    const globalCategoryOrder: string[] = []
+    data.forEach((d) => {
+      const categoryKey = (d as any)[encoding.category.from] || 'default'
+      if (!globalCategoryOrder.includes(categoryKey)) {
+        globalCategoryOrder.push(categoryKey)
+      }
+    })
+    const globalCategorySet = new Set<string>(globalCategoryOrder)
+    let globalSortedCategoryNames: string[] = Array.from(globalCategorySet)
+    if (Array.isArray(encoding.category.sort)) {
+      globalSortedCategoryNames = (encoding.category.sort as string[]).filter(name => globalCategorySet.has(name))
+        .concat(globalSortedCategoryNames.filter(name => !(encoding.category.sort as string[]).includes(name)))
+    } else if (encoding.category.sort === 'original') {
+      // original 排序：依照原始資料中 category 名稱出現的順序
+      globalSortedCategoryNames = globalCategoryOrder
+    } else if (encoding.category.sort === 'alphabetical') {
+      // alphabetical 排序：依照字母順序
+      globalSortedCategoryNames.sort((a, b) => a.localeCompare(b, undefined, { numeric: true }))
+    }
+
+    // 依據排序後的系列名稱來建立最終的資料結構
+    const gridData: ModelDatumGrid[][] = []
+    sortedSeriesNames.forEach((seriesName, seriesIndex) => {
+      const seriesItems = seriesMap.get(seriesName)!
+      
+      // 依據 category 欄位將 series 內的資料分組
+      const categoryMap = new Map<string, RawDataColumn[]>()
+      seriesItems.forEach((d) => {
+        const categoryKey = (d as any)[encoding.category.from] || 'default'
+        if (!categoryMap.has(categoryKey)) {
+          categoryMap.set(categoryKey, [])
+        }
+        categoryMap.get(categoryKey)!.push(d)
+      })
+
+      // 處理每個 category（使用全局排序後的 category 名稱，確保所有 series 的 category 順序一致）
+      const seriesData: ModelDatumGrid[] = []
+      globalSortedCategoryNames.forEach((categoryName, categoryIndex) => {
+        const categoryItems = categoryMap.get(categoryName)
+
+        if (!categoryItems) {
+          // 該 series 缺少此 category，以 value 為 null 的預設資料補上
+          seriesData.push({
+            id: `${datasetName}-${seriesName}-${categoryName}-null`,
+            index: categoryIndex,
+            modelType: 'grid',
+            name: categoryName,
+            data: undefined,
+            value: null,
+            color: getColorByFrom(encoding.color.from, {
+              index: categoryIndex,
+              seriesIndex,
+              categoryIndex,
+              datasetIndex
+            }, theme),
+            series: seriesName,
+            seriesIndex,
+            category: categoryName,
+            categoryIndex,
+          })
+        } else if (encoding.value.aggregate === 'none') {
+          // 不聚合，保持原始資料結構
+          let modelData: ModelDatumGrid[] = categoryItems.map((d, index) => {
+            const value = (d as any)[encoding.value.from]
+            return {
+              id: d.id || `${datasetName}-${seriesName}-${categoryName}-${index}`,
+              index: categoryIndex, // Grid 模式下 index 對應 categoryIndex
+              modelType: 'grid',
+              name: d.name || '',
+              data: d.data,
+              value: typeof value === 'number' ? value : null,
+              color: getColorByFrom(encoding.color.from, { 
+                index: categoryIndex, 
+                seriesIndex,
+                categoryIndex,
+                datasetIndex
+              }, theme),
+              series: seriesName,
+              seriesIndex,
+              category: categoryName,
+              categoryIndex,
+            }
+          })
+          
+          // 根據 value.sort 進行排序
+          if (encoding.value.sort === 'asc') {
+            modelData.sort((a, b) => {
+              if (a.value === null && b.value === null) return 0
+              if (a.value === null) return 1
+              if (b.value === null) return -1
+              return a.value - b.value
+            })
+          } else if (encoding.value.sort === 'desc') {
+            modelData.sort((a, b) => {
+              if (a.value === null && b.value === null) return 0
+              if (a.value === null) return 1
+              if (b.value === null) return -1
+              return b.value - a.value
+            })
+          }
+          // 'original' 不需要額外排序，保持原始順序
+          
+          seriesData.push(...modelData)
+        } else {
+          // 進行聚合，將相同 dataset, series, category 的資料合併為一筆
+          const values: (number | null)[] = categoryItems.map(d => {
+            if (encoding.value.aggregate === 'count') {
+              return 1 // count 聚合時每筆資料計為 1
+            }
+            const value = (d as any)[encoding.value.from]
+            return typeof value === 'number' ? value : null
+          })
+          
+          const aggregatedValue = aggregate(values, encoding.value.aggregate)
+          
+          // 合併其他欄位（使用第一筆資料的值）
+          const firstItem = categoryItems[0]
+          const modelData: ModelDatumGrid = {
+            id: firstItem.id || `${datasetName}-${seriesName}-${categoryName}-aggregated`,
+            index: categoryIndex, // Grid 模式下 index 對應 categoryIndex
+            modelType: 'grid',
+            name: firstItem.name || categoryName,
+            data: firstItem.data,
+            value: aggregatedValue,
+            color: getColorByFrom(encoding.color.from, { 
+              index: categoryIndex, 
+              seriesIndex,
+              categoryIndex,
+              datasetIndex
+            }, theme),
+            series: seriesName,
+            seriesIndex,
+            category: categoryName,
+            categoryIndex,
+          }
+          seriesData.push(modelData)
+        }
+      })
+
+      gridData.push(seriesData)
+    })
+
+    result.push(gridData)
+  })
+
+  return result
+}