@tooee/themes 0.12.0 → 0.13.0

package/src/types.ts

@@ -1,5 +1,7 @@
 import type { ColorMode } from "@tooee/config";
 
+import { mixColors } from "./color-mix.js";
+
 // ---------------------------------------------------------------------------
 // Theme JSON format (OpenCode-compatible)
 // ---------------------------------------------------------------------------
@@ -8,6 +10,7 @@ interface Variant {
   dark: string;
   light: string;
 }
+
 type ColorValue = string | Variant;
 
 export interface ThemeJSON {
@@ -68,6 +71,15 @@ export interface ResolvedTheme {
   // Cursor/Selection
   cursorLine: string;
   selection: string;
+  // Search
+  /** Row background for every search match. */
+  searchMatchBg: string;
+  /** Row background for the current search match. */
+  searchCurrentMatchBg: string;
+  /** Gutter sign colour for every search match. */
+  searchMatchFg: string;
+  /** Gutter sign colour for the current search match. */
+  searchCurrentMatchFg: string;
   // Syntax
   syntaxComment: string;
   syntaxKeyword: string;
@@ -119,6 +131,10 @@ export const FALLBACKS = {
   markdownStrong: "#808080",
   markdownText: "#d4d4d4",
   primary: "#808080",
+  searchCurrentMatchBg: "#4a4a4a",
+  searchCurrentMatchFg: "#808080",
+  searchMatchBg: "#3a3a3a",
+  searchMatchFg: "#808080",
   secondary: "#808080",
   selection: "#1e1e1e",
   success: "#808080",
@@ -145,6 +161,12 @@ export const RESOLVED_KEYS =
 // Resolution
 // ---------------------------------------------------------------------------
 
+/** Share of `warning` blended over `background` for a derived `searchMatchBg`. */
+const SEARCH_MATCH_TINT = 0.22;
+
+/** Share of `primary` blended over `background` for a derived `searchCurrentMatchBg`. */
+const SEARCH_CURRENT_MATCH_TINT = 0.35;
+
 /** A mode-specific colour pair is an object; a single colour is a string. */
 const isVariant = function isVariant(value: ColorValue): value is Variant {
   return value instanceof Object;
@@ -157,38 +179,70 @@ export const resolveTheme = function resolveTheme(json: ThemeJSON, mode: ColorMo
     if (isVariant(c)) {
       return resolveColor(c[mode], seen);
     }
+
     if (c === "transparent" || c === "none") {
       return "#00000000";
     }
+
     if (c.startsWith("#")) {
       return c;
     }
+
     if (seen.has(c)) {
       return "#808080";
     }
+
     if (defs[c] !== undefined && defs[c] !== null) {
       return resolveColor(defs[c], new Set(seen).add(c));
     }
+
     if (json.theme[c] !== undefined) {
       return resolveColor(json.theme[c], new Set(seen).add(c));
     }
+
     return "#808080";
   };
 
   // Start from the complete fallback theme, then resolve every key the JSON defines.
   const result: ResolvedTheme = { ...FALLBACKS };
+
   for (const key of RESOLVED_KEYS) {
     const val = json.theme[key];
+
     if (val !== undefined) {
       result[key] = resolveColor(val);
     }
   }
+
   // Dynamic fallbacks that reference other resolved keys
   if (json.theme.cursorLine === undefined) {
     result.cursorLine = result.backgroundElement;
   }
+
   if (json.theme.selection === undefined) {
     result.selection = result.backgroundPanel;
   }
+
+  // Search highlights tint the background, so matched text stays readable.
+  if (json.theme.searchMatchBg === undefined) {
+    result.searchMatchBg = mixColors(result.background, result.warning, SEARCH_MATCH_TINT);
+  }
+
+  if (json.theme.searchCurrentMatchBg === undefined) {
+    result.searchCurrentMatchBg = mixColors(
+      result.background,
+      result.primary,
+      SEARCH_CURRENT_MATCH_TINT
+    );
+  }
+
+  if (json.theme.searchMatchFg === undefined) {
+    result.searchMatchFg = result.warning;
+  }
+
+  if (json.theme.searchCurrentMatchFg === undefined) {
+    result.searchCurrentMatchFg = result.primary;
+  }
+
   return result;
 };

package/themes/aura.json

@@ -64,6 +64,10 @@
     "syntaxNumber": "green",
     "syntaxType": "purple",
     "syntaxOperator": "pink",
-    "syntaxPunctuation": "darkFg"
+    "syntaxPunctuation": "darkFg",
+    "searchMatchBg": "#443829",
+    "searchCurrentMatchBg": "#423363",
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/ayu.json

@@ -75,6 +75,10 @@
     "syntaxNumber": "darkConstant",
     "syntaxType": "darkSpecial",
     "syntaxOperator": "darkOperator",
-    "syntaxPunctuation": "darkFg"
+    "syntaxPunctuation": "darkFg",
+    "searchMatchBg": "#3b3329",
+    "searchCurrentMatchBg": "#264d66",
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/catppuccin-frappe.json

@@ -228,6 +228,10 @@
     "syntaxPunctuation": {
       "dark": "frappeText",
       "light": "frappeText"
-    }
+    },
+    "searchMatchBg": "#585556",
+    "searchCurrentMatchBg": "#515b7d",
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/catppuccin-macchiato.json

@@ -228,6 +228,10 @@
     "syntaxPunctuation": {
       "dark": "macText",
       "light": "macText"
-    }
+    },
+    "searchMatchBg": "#504d50",
+    "searchCurrentMatchBg": "#48567b",
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/catppuccin.json

@@ -107,6 +107,10 @@
     "syntaxNumber": { "dark": "darkPeach", "light": "lightPeach" },
     "syntaxType": { "dark": "darkYellow", "light": "lightYellow" },
     "syntaxOperator": { "dark": "darkSky", "light": "lightSky" },
-    "syntaxPunctuation": { "dark": "darkText", "light": "lightText" }
+    "syntaxPunctuation": { "dark": "darkText", "light": "lightText" },
+    "searchMatchBg": { "dark": "#4e494a", "light": "#ebdbc5" },
+    "searchCurrentMatchBg": { "dark": "#435375", "light": "#a6c0f5" },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/cobalt2.json

@@ -223,6 +223,16 @@
     "syntaxPunctuation": {
       "dark": "foreground",
       "light": "#193549"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#4c5539",
+      "light": "#ffe8c7"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#105289",
+      "light": "#a6c9ed"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/cursor.json

@@ -244,6 +244,16 @@
     "syntaxPunctuation": {
       "dark": "darkFg",
       "light": "lightFg"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#483a29",
+      "light": "#f5ddd5"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#3f5358",
+      "light": "#cbdade"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/dracula.json

@@ -214,6 +214,16 @@
     "syntaxPunctuation": {
       "dark": "foreground",
       "light": "#282a36"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#545849",
+      "light": "#f6f8dc"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#5c4f7a",
+      "light": "#e3d5f4"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/everforest.json

@@ -236,6 +236,16 @@
     "syntaxPunctuation": {
       "dark": "darkStep12",
       "light": "lightStep12"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#564b48",
+      "light": "#fbdbb9"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#586653",
+      "light": "#d6d894"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/flexoki.json

@@ -232,6 +232,16 @@
     "syntaxPunctuation": {
       "dark": "base300",
       "light": "base600"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#3c2415",
+      "light": "#f0d7c0"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#573119",
+      "light": "#b1c5d6"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/github-light.json

@@ -51,6 +51,10 @@
     "syntaxNumber": "cyan",
     "syntaxType": "orange",
     "syntaxOperator": "red",
-    "syntaxPunctuation": "fg"
+    "syntaxPunctuation": "fg",
+    "searchMatchBg": "#e9dec7",
+    "searchCurrentMatchBg": "#a9cbf2",
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/github.json

@@ -228,6 +228,16 @@
     "syntaxPunctuation": {
       "dark": "darkFg",
       "light": "lightFg"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#3c3520",
+      "light": "#e9dec7"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#274568",
+      "light": "#a9cbf2"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/gruvbox.json

@@ -90,6 +90,10 @@
     "syntaxNumber": { "dark": "darkPurpleBright", "light": "lightPurple" },
     "syntaxType": { "dark": "darkAquaBright", "light": "lightAqua" },
     "syntaxOperator": { "dark": "darkOrangeBright", "light": "lightOrange" },
-    "syntaxPunctuation": { "dark": "darkFg1", "light": "lightFg1" }
+    "syntaxPunctuation": { "dark": "darkFg1", "light": "lightFg1" },
+    "searchMatchBg": { "dark": "#573b25", "light": "#eac99c" },
+    "searchCurrentMatchBg": { "dark": "#48544f", "light": "#a6c0ab" },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/kanagawa.json

@@ -72,6 +72,10 @@
     "syntaxNumber": { "dark": "roninYellow", "light": "roninYellow" },
     "syntaxType": { "dark": "carpYellow", "light": "carpYellow" },
     "syntaxOperator": { "dark": "sakuraPink", "light": "sakuraPink" },
-    "syntaxPunctuation": { "dark": "fujiWhite", "light": "lightText" }
+    "syntaxPunctuation": { "dark": "fujiWhite", "light": "lightText" },
+    "searchMatchBg": { "dark": "#473d32", "light": "#ecdac0" },
+    "searchCurrentMatchBg": { "dark": "#404b66", "light": "#adb3b4" },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/lucent-orng.json

@@ -222,6 +222,10 @@
     "syntaxPunctuation": {
       "dark": "darkStep12",
       "light": "lightStep12"
-    }
+    },
+    "searchMatchBg": "#ec5b2b38",
+    "searchCurrentMatchBg": "#ec5b2b59",
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/material.json

@@ -230,6 +230,16 @@
     "syntaxPunctuation": {
       "dark": "darkFg",
       "light": "lightFg"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#565443",
+      "light": "#fbeac3"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#465c7e",
+      "light": "#c4d0e3"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/matrix.json

@@ -72,6 +72,10 @@
     "syntaxNumber": { "dark": "rainOrange", "light": "rainOrange" },
     "syntaxType": { "dark": "alertYellow", "light": "alertYellow" },
     "syntaxOperator": { "dark": "rainTeal", "light": "rainTeal" },
-    "syntaxPunctuation": { "dark": "rainGreenHi", "light": "lightText" }
+    "syntaxPunctuation": { "dark": "rainGreenHi", "light": "lightText" },
+    "searchMatchBg": { "dark": "#3a431b", "light": "#ecf6ca" },
+    "searchCurrentMatchBg": { "dark": "#17622c", "light": "#a5e2b2" },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/mercury.json

@@ -247,6 +247,16 @@
     "syntaxPunctuation": {
       "light": "neutral-700",
       "dark": "neutral-200"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#493432",
+      "light": "#ebd5c7"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#40486b",
+      "light": "#c2c9f8"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/monokai.json

@@ -216,6 +216,16 @@
     "syntaxPunctuation": {
       "dark": "foreground",
       "light": "#272822"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#514f34",
+      "light": "#fbe4ca"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#3d666a",
+      "light": "#c6eef6"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/nightowl.json

@@ -216,6 +216,10 @@
     "syntaxPunctuation": {
       "dark": "nightOwlFg",
       "light": "nightOwlFg"
-    }
+    },
+    "searchMatchBg": "#353c3d",
+    "searchCurrentMatchBg": "#2e4a73",
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/nord.json

@@ -218,6 +218,16 @@
     "syntaxPunctuation": {
       "dark": "nord4",
       "light": "nord0"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#52464b",
+      "light": "#e6d8d7"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#4e6572",
+      "light": "#bac9db"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/one-dark.json

@@ -79,6 +79,10 @@
     "syntaxNumber": { "dark": "darkOrange", "light": "lightOrange" },
     "syntaxType": { "dark": "darkYellow", "light": "lightYellow" },
     "syntaxOperator": { "dark": "darkCyan", "light": "lightCyan" },
-    "syntaxPunctuation": { "dark": "darkFg", "light": "lightFg" }
+    "syntaxPunctuation": { "dark": "darkFg", "light": "lightFg" },
+    "searchMatchBg": { "dark": "#524d44", "light": "#ede0c3" },
+    "searchCurrentMatchBg": { "dark": "#3c5a75", "light": "#b9cdf7" },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/opencode-light.json

@@ -57,6 +57,10 @@
     "syntaxNumber": "orange",
     "syntaxType": "yellow",
     "syntaxOperator": "cyan",
-    "syntaxPunctuation": "step12"
+    "syntaxPunctuation": "step12",
+    "searchMatchBg": "#f6e6cf",
+    "searchCurrentMatchBg": "#bad2f1",
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/opencode.json

@@ -240,6 +240,16 @@
     "syntaxPunctuation": {
       "dark": "darkStep12",
       "light": "lightStep12"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#3e2d16",
+      "light": "#f6e6cf"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#5e4534",
+      "light": "#bad2f1"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/orng.json

@@ -240,6 +240,16 @@
     "syntaxPunctuation": {
       "dark": "darkStep12",
       "light": "lightStep12"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#3c1c11",
+      "light": "#fbdbd0"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#592616",
+      "light": "#f8c6b5"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/osaka-jade.json

@@ -88,6 +88,10 @@
     "syntaxNumber": { "dark": "darkMagenta", "light": "lightMagenta" },
     "syntaxType": { "dark": "darkGreen", "light": "lightGreen" },
     "syntaxOperator": { "dark": "darkYellow", "light": "lightYellow" },
-    "syntaxPunctuation": { "dark": "darkFg0", "light": "lightFg0" }
+    "syntaxPunctuation": { "dark": "darkFg0", "light": "lightFg0" },
+    "searchMatchBg": { "dark": "#40421f", "light": "#e8e2b3" },
+    "searchCurrentMatchBg": { "dark": "#1b5d50", "light": "#abdbc2" },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/palenight.json

@@ -217,6 +217,16 @@
     "syntaxPunctuation": {
       "dark": "foreground",
       "light": "#292d3e"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#585048",
+      "light": "#fbeac3"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#485982",
+      "light": "#bcccf5"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/rosepine.json

@@ -229,6 +229,16 @@
     "syntaxPunctuation": {
       "dark": "subtle",
       "light": "dawnSubtle"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#4a3c36",
+      "light": "#f6e1c4"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#475763",
+      "light": "#b4c7cc"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/solarized.json

@@ -218,6 +218,16 @@
     "syntaxPunctuation": {
       "dark": "base0",
       "light": "base00"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#28402a",
+      "light": "#eddeb1"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#0d4d6d",
+      "light": "#b2d1dd"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/synthwave84.json

@@ -221,6 +221,16 @@
     "syntaxPunctuation": {
       "dark": "foreground",
       "light": "#262335"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#564c3e",
+      "light": "#fbe4c3"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#2c6e79",
+      "light": "#a3e4ed"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/tokyonight.json

@@ -238,6 +238,16 @@
     "syntaxPunctuation": {
       "dark": "darkStep12",
       "light": "lightStep12"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#4c3635",
+      "light": "#d6c5b4"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#3e4d72",
+      "light": "#a2bfe8"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }

package/themes/vercel.json

@@ -240,6 +240,16 @@
     "syntaxPunctuation": {
       "dark": "gray1000",
       "light": "lightGray1000"
-    }
+    },
+    "searchMatchBg": {
+      "dark": "#382708",
+      "light": "#ffe8c7"
+    },
+    "searchCurrentMatchBg": {
+      "dark": "#002755",
+      "light": "#a6cdfb"
+    },
+    "searchMatchFg": "warning",
+    "searchCurrentMatchFg": "primary"
   }
 }