everything is running again

mcnuttandrew · Mar 11, 2024 · 754aa58 · 754aa58
1 parent 57ad5c4
commit 754aa58
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/src/controls/NewPal.svelte b/src/controls/NewPal.svelte
@@ -26,7 +26,7 @@
   function newPal(newPal: StringPalette) {
     const colors = newPal.colors.map((x) => {
       const color = Color.colorFromString(x.color, colorSpace);
-      return { ...x, color };
+      return wrapInBlankSemantics(color);
     });
     const pal = {
       ...newPal,

diff --git a/src/lib/api-calls.ts b/src/lib/api-calls.ts
@@ -169,7 +169,10 @@ export function lint(pal: Palette, computeMessage: boolean) {
     content: JSON.stringify({
       ...pal,
       background: pal.background.toString(),
-      colors: pal.colors.map((x) => x.color.toString()),
+      colors: pal.colors.map((x) => ({
+        ...x,
+        color: x.color.toString(),
+      })),
     }),
   }).then((x) => {
     return x as unknown as any[];

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -249,7 +249,7 @@ export function newGenericPal(name: string): StringPalette {
   return {
     ...defaultHexPal,
     name,
-    colors: pick(outfits),
+    colors: pick(outfits).map((x: string) => wrapInBlankStringSemantics(x)),
   };
 }
 export function makePalFromString(

diff --git a/src/stores/color-store.ts b/src/stores/color-store.ts
@@ -1,6 +1,6 @@
 import { writable } from "svelte/store";
 import { Color } from "../lib/Color";
-import { deDup, newGenericPal, wrapInBlankStringSemantics } from "../lib/utils";
+import { deDup, newGenericPal, wrapInBlankSemantics } from "../lib/utils";
 
 import type {
   Palette,
@@ -27,12 +27,11 @@ function stringPalToColorPal(pal: StringPalette): Palette {
     ...pal,
     background: Color.colorFromString(pal.background, pal.colorSpace),
     colors: pal.colors.map((x) => {
-      let colorWrap = x;
-      const color = Color.colorFromString(x.color, pal.colorSpace);
       // catch old versions
       if (typeof x === "string") {
-        colorWrap = wrapInBlankStringSemantics(x);
+        return wrapInBlankSemantics(Color.colorFromString(x, pal.colorSpace));
       }
+      const color = Color.colorFromString(x.color, pal.colorSpace);
       return { ...x, color };
     }),
   };

diff --git a/src/stores/lint-store.ts b/src/stores/lint-store.ts
@@ -41,7 +41,7 @@ function serializePalette(pal: Palette): StringPalette {
     background: pal.background.toString(),
     colors: pal.colors.map((x) => ({
       ...x,
-      color: x.toString(),
+      color: x.color.toString(),
     })),
   };
 }
@@ -51,10 +51,10 @@ function deserializePalette(pal: StringPalette): Palette {
     ...pal,
     background: Color.colorFromString(pal.background, pal.colorSpace),
     colors: pal.colors.map((x) => {
-      const color = Color.colorFromString(x.color, pal.colorSpace);
-      if (typeof x.color === "string") {
-        return wrapInBlankSemantics(color);
+      if (typeof x === "string") {
+        return wrapInBlankSemantics(Color.colorFromString(x, pal.colorSpace));
       }
+      const color = Color.colorFromString(x.color, pal.colorSpace);
       return { ...x, color };
     }),
   };