From 1a5d406c35b06c3879aa9343d6ee469db7a72c2d Mon Sep 17 00:00:00 2001
From: Andrew Michael McNutt <mcnutt.andrew@gmail.com>
Date: Wed, 10 Jan 2024 16:54:02 -0800
Subject: [PATCH] fix tests

---
 .github/workflows/test.yml                    | 17 ++++++++++
 package.json                                  |  5 +--
 src/components/DoubleRangeSlider.svelte       |  1 +
 src/components/Tooltip.svelte                 |  1 +
 .../VerticalDoubleRangeSlider.svelte          |  1 +
 src/content-modules/Background.svelte         |  5 +--
 .../SwatchTooltipContent.svelte               |  5 +--
 src/lib/Color.ts                              | 12 +++----
 src/lib/ColorLint.test.ts                     | 21 +++---------
 src/lib/__snapshots__/ColorLint.test.ts.snap  | 32 +++++++------------
 src/lib/lints/ColorLint.ts                    | 10 ++----
 src/lib/lints/background-differentiability.ts |  3 +-
 12 files changed, 51 insertions(+), 62 deletions(-)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..e32a25e7
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,17 @@
+name: Test
+on: [push]
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v2.3.1
+
+      - name: Install and test
+        run: |
+          yarn
+
+      - name: Test
+        run: |
+          yarn test
+          npm run check
diff --git a/package.json b/package.json
index a9449eda..527c9e59 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
     "check": "svelte-check --tsconfig ./tsconfig.json",
     "types": "tsc --noEmit --watch",
     "prep-data": "cp node_modules/vega-datasets/data/* public/data/",
-    "test": "vitest"
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^3.0.0",
@@ -49,4 +50,4 @@
     "vega-embed": "^6.23.0",
     "vega-lite": "^5.16.3"
   }
-}
+}
\ No newline at end of file
diff --git a/src/components/DoubleRangeSlider.svelte b/src/components/DoubleRangeSlider.svelte
index 0cc8341c..a043c723 100644
--- a/src/components/DoubleRangeSlider.svelte
+++ b/src/components/DoubleRangeSlider.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  // @ts-nocheck
   import { draggable, clamp } from "../lib/utils";
   // from https://svelte.dev/repl/75d34e46cbe64bb68b7c2ac2c61931ce?version=4.2.8
   export let start = 0;
diff --git a/src/components/Tooltip.svelte b/src/components/Tooltip.svelte
index e1fa865f..786c8647 100644
--- a/src/components/Tooltip.svelte
+++ b/src/components/Tooltip.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  // @ts-nocheck
   import Portal from "svelte-portal";
   export let top: string = "2rem";
   export let onClose: () => void = () => {};
diff --git a/src/components/VerticalDoubleRangeSlider.svelte b/src/components/VerticalDoubleRangeSlider.svelte
index abbf47cc..5d4b0529 100644
--- a/src/components/VerticalDoubleRangeSlider.svelte
+++ b/src/components/VerticalDoubleRangeSlider.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  // @ts-nocheck
   import { draggable, clamp } from "../lib/utils";
   // from https://github.com/mhkeller/svelte-double-range-slider/tree/master
   export let start = 0;
diff --git a/src/content-modules/Background.svelte b/src/content-modules/Background.svelte
index 4201c763..f4c0d33b 100644
--- a/src/content-modules/Background.svelte
+++ b/src/content-modules/Background.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import colorStore from "../stores/color-store";
   import chroma from "chroma-js";
-  import { Color } from "../lib/Color";
+  import { Color, colorFromHex } from "../lib/Color";
   import ColorChannelPicker from "../components/ColorChannelPicker.svelte";
   import Tooltip from "../components/Tooltip.svelte";
   $: bg = $colorStore.currentPal.background;
+  $: colorSpace = $colorStore.currentPal.colors[0].spaceName || "lab";
   function onChange(color: Color) {
     colorStore.setBackground(color);
   }
@@ -22,7 +23,7 @@
           on:change={(e) => {
             // @ts-ignore
             const newColor = chroma(e.target.value);
-            colorStore.setBackground(bg.fromChroma(newColor));
+            colorStore.setBackground(colorFromHex(newColor.hex(), colorSpace));
           }}
         />
         <ColorChannelPicker color={bg} onColorChange={onChange} />
diff --git a/src/content-modules/SwatchTooltipContent.svelte b/src/content-modules/SwatchTooltipContent.svelte
index 65be811a..7ddb2986 100644
--- a/src/content-modules/SwatchTooltipContent.svelte
+++ b/src/content-modules/SwatchTooltipContent.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import ColorChannelPicker from "../components/ColorChannelPicker.svelte";
   import chroma from "chroma-js";
-  import { Color } from "../lib/Color";
+  import { Color, colorFromHex } from "../lib/Color";
   import colorStore from "../stores/color-store";
   import focusStore from "../stores/focus-store";
   import { buttonStyle } from "../lib/styles";
@@ -9,6 +9,7 @@
   export let color: Color;
   export let closeTooltip: () => void;
   $: colors = $colorStore.currentPal.colors;
+  $: colorSpace = colors[0].spaceName || "lab";
 
   function updateColor(color: Color) {
     const updatedColors = [...colors];
@@ -24,7 +25,7 @@
     on:change={(e) => {
       // @ts-ignore
       const newColor = chroma(e.target.value);
-      updateColor(color.fromChroma(newColor));
+      updateColor(colorFromHex(newColor.hex(), colorSpace));
     }}
   />
 
diff --git a/src/lib/Color.ts b/src/lib/Color.ts
index 8e2d3f01..6a369dbd 100644
--- a/src/lib/Color.ts
+++ b/src/lib/Color.ts
@@ -36,11 +36,6 @@ export class Color {
   toChannels(): [number, number, number] {
     return Object.values(this.channels) as [number, number, number];
   }
-  fromChroma(color: ChromaColor): Color {
-    // @ts-ignore
-    const channels = color[this.spaceName]();
-    return this.fromChannels(channels);
-  }
   setChannel(channel: keyof typeof this.channels, value: number) {
     this.channels[channel] = value;
   }
@@ -84,6 +79,9 @@ export class Color {
   symmetricDeltaE(color: Color): number {
     return 0.5 * (this.deltaE(color) + color.deltaE(this));
   }
+  copy(): Color {
+    return this.fromChannels(this.toChannels());
+  }
 }
 
 export class CIELAB extends Color {
@@ -178,14 +176,12 @@ export function colorFromHex(
   colorSpace: keyof typeof colorDirectory
 ): Color {
   if (colorHexCache.has(hex)) {
-    return { ...colorHexCache.get(hex) } as Color;
+    return colorHexCache.get(hex)!.copy() as Color;
   }
   const color = new ColorIO(hex).to(colorSpace);
   const outColor = new colorDirectory[colorSpace]().fromChannels(color.coords);
   colorHexCache.set(hex, outColor);
   return outColor;
-  // const color = chroma(hex);
-  // return new colorDirectory[colorSpace]().fromChroma(color);
 }
 
 export function colorFromChannels(
diff --git a/src/lib/ColorLint.test.ts b/src/lib/ColorLint.test.ts
index 1ca6b3c1..1da84cf2 100644
--- a/src/lib/ColorLint.test.ts
+++ b/src/lib/ColorLint.test.ts
@@ -21,11 +21,11 @@ function makePalFromHexes(hexes: string[]): Palette {
 const unique = <T>(arr: T[]): T[] => [...new Set(arr)];
 
 test("ColorLint - ColorNameDiscriminability", async () => {
-  const examplePal = makePalFromHexes(["#006cc6", "#005ebe"]);
+  const examplePal = makePalFromHexes(["#5260d1", "#005ebe"]);
   const exampleLint = new ColorNameDiscriminability(examplePal);
   expect(exampleLint.passes).toBe(false);
   expect(exampleLint.message).toBe(
-    "Color Name discriminability check failed. The following color names are repeated: Denim (#006cc6, #005ebe)"
+    "Color Name discriminability check failed. The following color names are repeated: Royalblue (#5260d1, #005ebe)"
   );
   const fix = await exampleLint.suggestFix();
   const oldColorNames = unique<string>(
@@ -34,7 +34,6 @@ test("ColorLint - ColorNameDiscriminability", async () => {
   expect(oldColorNames.length).toBe(1);
   const colorNames = unique<string>(fix.colors.map((x) => getName(x)));
   expect(colorNames.length).toBe(2);
-  expect(exampleLint.suggestVisualAnnotation()).toStrictEqual([]);
 });
 
 test("ColorLint - MaxColors", async () => {
@@ -46,7 +45,6 @@ test("ColorLint - MaxColors", async () => {
   );
   const fix = await exampleLint.suggestFix();
   expect(fix.colors.length).toBe(9);
-  expect(exampleLint.suggestVisualAnnotation()).toStrictEqual([]);
 });
 
 test("ColorLint - ColorBlind", async () => {
@@ -76,18 +74,7 @@ test("ColorLint - ColorBlind", async () => {
   expect(exampleLint3.message).toMatchSnapshot();
 });
 
-const ughWhat = [
-  "#00ffff",
-  "#ffb282",
-  "#ffebc7",
-  "#ffaa8a",
-  "#00faff",
-  "#ffc7c3",
-  "#00e4ff",
-  "#fdfdfc",
-  "#ffc89e",
-  "#00ffff",
-];
+const ughWhat = ["#00ffff", "#00faff", "#00e4ff", "#fdfdfc", "#00ffff"];
 test("ColorLint - BackgroundDifferentiability", async () => {
   const examplePal = makePalFromHexes(ughWhat);
   const exampleLint = new BackgroundDifferentiability(examplePal);
@@ -102,7 +89,7 @@ test("ColorLint - BackgroundDifferentiability", async () => {
   const exampleLint2 = new BackgroundDifferentiability(examplePal);
   expect(exampleLint2.passes).toBe(false);
   expect(exampleLint2.message).toBe(
-    "This palette has some colors (#00faff, #00e4ff) that are close to the background color"
+    "This palette has some colors (#0ff, #00faff, #00e4ff, #0ff) that are close to the background color"
   );
   const fix2 = await exampleLint2.suggestFix();
   expect(fix2.colors.map((x) => x.toHex())).toMatchSnapshot();
diff --git a/src/lib/__snapshots__/ColorLint.test.ts.snap b/src/lib/__snapshots__/ColorLint.test.ts.snap
index 749f5760..42bfd4bf 100644
--- a/src/lib/__snapshots__/ColorLint.test.ts.snap
+++ b/src/lib/__snapshots__/ColorLint.test.ts.snap
@@ -2,36 +2,26 @@
 
 exports[`ColorLint - BackgroundDifferentiability 1`] = `
 [
-  "#00ffff",
-  "#ffb282",
-  "#ffebc7",
-  "#ffaa8a",
+  "#0ff",
   "#00faff",
-  "#ffc7c3",
   "#00e4ff",
-  "#fffffe",
-  "#ffc89e",
-  "#00ffff",
+  "#777776",
+  "#0ff",
 ]
 `;
 
 exports[`ColorLint - BackgroundDifferentiability 2`] = `
 [
-  "#00ffff",
-  "#ffb282",
-  "#ffebc7",
-  "#ffaa8a",
-  "#00ebf1",
-  "#ffc7c3",
-  "#34f2ff",
-  "#fffffe",
-  "#ffc89e",
-  "#00ffff",
+  "#007070",
+  "#006f72",
+  "#006e7e",
+  "#fdfdfc",
+  "#007070",
 ]
 `;
 
-exports[`ColorLint - ColorBlind 1`] = `"This palette is not colorblind friendly for deuteranopia color blindness. The following pairs are undifferentiable: (#0078b4 and #8c69bc), (#ff7e0e and #c4bc27), (#e179c1 and #00becf)"`;
+exports[`ColorLint - ColorBlind 1`] = `"This palette is not colorblind friendly for deuteranopia color blindness (ie can't see green). The following pairs are undifferentiable: (#0078b4 and #8c69bc), (#ff7e0e and #3d9f2f)"`;
 
-exports[`ColorLint - ColorBlind 2`] = `"This palette is not colorblind friendly for protanopia color blindness. The following pairs are undifferentiable: (#0078b4 and #8c69bc), (#ff7e0e and #3d9f2f), (#ff7e0e and #c4bc27)"`;
+exports[`ColorLint - ColorBlind 2`] = `"This palette is not colorblind friendly for protanopia color blindness (ie can't see red). The following pairs are undifferentiable: (#ff7e0e and #c4bc27), (#da2827 and #8e564b), (#8c69bc and #00becf)"`;
 
-exports[`ColorLint - ColorBlind 3`] = `"This palette is not colorblind friendly for tritanopia color blindness. The following pairs are undifferentiable: (#ff7e0e and #e179c1), (#8c69bc and #7f7f7f)"`;
+exports[`ColorLint - ColorBlind 3`] = `"This palette is not colorblind friendly for tritanopia color blindness (ie can't see blue). The following pairs are undifferentiable: (#8c69bc and #7f7f7f)"`;
diff --git a/src/lib/lints/ColorLint.ts b/src/lib/lints/ColorLint.ts
index dbc868b9..6627d7fb 100644
--- a/src/lib/lints/ColorLint.ts
+++ b/src/lib/lints/ColorLint.ts
@@ -25,8 +25,8 @@ function AIFix(palette: Palette, message: string, engine: string) {
 }
 
 export class ColorLint<CheckData, ParamType> {
-  name: string;
-  taskTypes: TaskType[];
+  name: string = "";
+  taskTypes: TaskType[] = [];
   passes: boolean;
   checkData: CheckData;
   palette: Palette;
@@ -36,8 +36,6 @@ export class ColorLint<CheckData, ParamType> {
   level: "error" | "warning" = "error";
 
   constructor(Palette: Palette) {
-    this.name = "";
-    this.taskTypes = [];
     this.palette = Palette;
     const { passCheck, data } = this._runCheck();
     this.passes = passCheck;
@@ -53,10 +51,6 @@ export class ColorLint<CheckData, ParamType> {
     return "";
   }
 
-  suggestVisualAnnotation(): Annotation[] {
-    return [];
-  }
-
   increaseParam() {
     if (!this.hasParam) {
       throw new Error("Cannot increase param on lint without param");
diff --git a/src/lib/lints/background-differentiability.ts b/src/lib/lints/background-differentiability.ts
index f8e71cf3..3b5e7d42 100644
--- a/src/lib/lints/background-differentiability.ts
+++ b/src/lib/lints/background-differentiability.ts
@@ -1,6 +1,5 @@
 import { ColorLint } from "./ColorLint";
 import type { TaskType } from "./ColorLint";
-import chroma from "chroma-js";
 import { Color, toColorSpace } from "../Color";
 
 const hexJoin = (colors: Color[]) => colors.map((x) => x.toHex()).join(", ");
@@ -14,7 +13,7 @@ export default class BackgroundDifferentiability extends ColorLint<
   _runCheck() {
     const { colors, background } = this.palette;
     const colorsCloseToBackground = colors.reduce((acc, x, idx) => {
-      const pass = chroma.deltaE(x.toChroma(), background.toChroma()) < 10;
+      const pass = x.symmetricDeltaE(background) < 15;
       return pass ? [...acc, idx] : acc;
     }, [] as number[]);