Merge pull request #108 from VisActor/fix/isvalid-scale-include-thres…

…hold

Fix/isvalid scale include threshold

common/changes/@visactor/vscale/fix-isvalid-scale-include-threshold_2023-09-20-06-44.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: fix isValidScale did not include threshold scale\n\n",
+      "type": "none",
+      "packageName": "@visactor/vscale"
+    }
+  ],
+  "packageName": "@visactor/vscale",
+  "email": "lixuef1313@163.com"
+}

packages/vscale/__tests__/common.test.ts

@@ -0,0 +1,23 @@
+import { isValidScaleType, ScaleEnum } from '../src/type';
+
+test('scaleLinear() has the expected defaults', function () {
+  expect(isValidScaleType(ScaleEnum.Identity)).toBe(true);
+
+  expect(isValidScaleType(ScaleEnum.Linear)).toBe(true);
+  expect(isValidScaleType(ScaleEnum.Log)).toBe(true);
+  expect(isValidScaleType(ScaleEnum.Pow)).toBe(true);
+  expect(isValidScaleType(ScaleEnum.Sqrt)).toBe(true);
+  expect(isValidScaleType(ScaleEnum.Symlog)).toBe(true);
+  expect(isValidScaleType(ScaleEnum.Time)).toBe(true);
+
+  expect(isValidScaleType(ScaleEnum.Quantile)).toBe(true);
+  expect(isValidScaleType(ScaleEnum.Quantize)).toBe(true);
+  expect(isValidScaleType(ScaleEnum.Threshold)).toBe(true);
+
+  expect(isValidScaleType(ScaleEnum.Ordinal)).toBe(true);
+  expect(isValidScaleType(ScaleEnum.Point)).toBe(true);
+  expect(isValidScaleType(ScaleEnum.Band)).toBe(true);
+
+  expect(isValidScaleType('unknown')).toBe(false);
+  expect(isValidScaleType('aaaaa')).toBe(false);
+});

packages/vscale/src/type.ts

@@ -28,6 +28,11 @@ export enum ScaleEnum {
   // BinOrdinal = 'bin-ordinal',
 }
 
+const EnableScaleMap = {};
+Object.values(ScaleEnum).forEach(v => {
+  EnableScaleMap[v] = true;
+});
+
 export function isContinuous(type: string) {
   switch (type) {
     case ScaleEnum.Linear:
@@ -43,20 +48,7 @@ export function isContinuous(type: string) {
 }
 
 export function isValidScaleType(type: string) {
-  switch (type) {
-    case ScaleEnum.Linear:
-    case ScaleEnum.Log:
-    case ScaleEnum.Pow:
-    case ScaleEnum.Sqrt:
-    case ScaleEnum.Symlog:
-    case ScaleEnum.Time:
-    case ScaleEnum.Ordinal:
-    case ScaleEnum.Point:
-    case ScaleEnum.Band:
-      return true;
-    default:
-      return false;
-  }
+  return !!EnableScaleMap[type];
 }
 
 export function isDiscrete(type: string) {