@orbcharts/core 3.0.0-beta.7 → 3.0.0-beta.8

package/src/utils/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).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 categoryLabelsObservable = (CategoryDataMap$: Observable<Map<string, ComputedDataTree[]>>) => {
-  return CategoryDataMap$.pipe(
-    map(data => {
-      return Array.from(data.keys())
-    }),
-    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 categoryLabelsObservable = ({ 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 categoryLabelsObservable = (CategoryDataMap$: Observable<Map<string, ComputedDataTree[]>>) => {
+  return CategoryDataMap$.pipe(
+    map(data => {
+      return Array.from(data.keys())
+    }),
+    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

@@ -1,127 +1,127 @@
-import type {
-  ColorType,
-  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: ColorType) => {
-      return value === 'none'
-        || value === 'label'
-        || 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: '',
-    }
-  }
+import type {
+  ColorType,
+  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: ColorType) => {
+      return value === 'none'
+        || value === 'label'
+        || 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: '',
+    }
+  }
 }

package/tsconfig.base.json

@@ -1,14 +1,14 @@
-{
-  "compilerOptions": {
-    "outDir": "./dist/",
-    "sourceMap": true,
-    "noImplicitAny": true,
-    "module": "esnext",
-    "target": "es5",
-    "jsx": "react",
-    "allowJs": true,
-    "moduleResolution": "node",
-    "allowSyntheticDefaultImports" : true,
-    "esModuleInterop" : true
-  }
+{
+  "compilerOptions": {
+    "outDir": "./dist/",
+    "sourceMap": true,
+    "noImplicitAny": true,
+    "module": "esnext",
+    "target": "es5",
+    "jsx": "react",
+    "allowJs": true,
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports" : true,
+    "esModuleInterop" : true
+  }
 }

package/tsconfig.json

@@ -1,3 +1,3 @@
-{
-  "extends": "./tsconfig.base.json"
+{
+  "extends": "./tsconfig.base.json"
 }

package/vite-env.d.ts

@@ -1,7 +1,7 @@
-interface ImportMetaEnv {
-  readonly MODE: 'development' | 'production'
-} 
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
+interface ImportMetaEnv {
+  readonly MODE: 'development' | 'production'
+} 
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
 }

package/vite.config.js

@@ -1,23 +1,23 @@
-import { defineConfig } from 'vite'
-import dts from 'vite-plugin-dts'
-
-export default defineConfig(({ command, mode }) => {
-  return {
-    plugins: [
-      dts({
-        insertTypesEntry: true
-      })
-    ],
-    compilerOptions: {
-      composite: true
-    },
-    build: {
-      lib: {
-        entry: "src/index.ts",
-        name: 'orbcharts-core',
-        formats: ["es", "umd"],
-        fileName: format => `orbcharts-core.${format}.js`
-      },
-    }
-  }
+import { defineConfig } from 'vite'
+import dts from 'vite-plugin-dts'
+
+export default defineConfig(({ command, mode }) => {
+  return {
+    plugins: [
+      dts({
+        insertTypesEntry: true
+      })
+    ],
+    compilerOptions: {
+      composite: true
+    },
+    build: {
+      lib: {
+        entry: "src/index.ts",
+        name: 'orbcharts-core',
+        formats: ["es", "umd"],
+        fileName: format => `orbcharts-core.${format}.js`
+      },
+    }
+  }
 })