@tooee/themes 0.7.3 → 0.8.0

package/src/loader.ts

@@ -1,6 +1,7 @@
 import type { SyntaxStyle } from "@opentui/core";
 import { readFileSync, readdirSync, existsSync } from "node:fs";
 import path from "node:path";
+import type { ColorMode } from "@tooee/config";
 import { resolveTheme } from "./types.js";
 import type { ThemeJSON, ResolvedTheme } from "./types.js";
 import { buildSyntaxStyle } from "./syntax-rules.js";
@@ -11,7 +12,7 @@ import { buildSyntaxStyle } from "./syntax-rules.js";
 
 export interface Theme {
   name: string;
-  mode: "dark" | "light";
+  mode: ColorMode;
   colors: ResolvedTheme;
   syntax: SyntaxStyle;
 }
@@ -34,8 +35,13 @@ const loadJsonThemesFromDir = function loadJsonThemesFromDir(
       const name = path.basename(file, ".json");
       try {
         const content = readFileSync(path.join(dir, file), "utf-8");
-        // Deferred(lint-sweep): replace with schema-based validation of untrusted JSON
-        // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- untrusted external JSON, validated in a later sweep
+        // SAFETY: the file is not validated here on purpose. Its only consumer is
+        // `resolveTheme`, which reads each key with a per-key fallback, and
+        // `buildTheme` catches every malformed value and returns the hardcoded
+        // theme, so a document that is not a ThemeJSON cannot escape this module.
+        // A strict decoder would also drop malformed files from `getThemeNames`,
+        // which is a behaviour change reserved for a separate decision.
+        // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- tolerant consumer boundary; see the SAFETY note
         target.set(name, JSON.parse(content) as ThemeJSON);
       } catch {
         // skip invalid files
@@ -89,85 +95,38 @@ export const getThemeNames = function getThemeNames(): string[] {
 // ---------------------------------------------------------------------------
 
 export const DEFAULT_THEME_NAME = "tokyonight";
-export const DEFAULT_MODE: "dark" | "light" = "dark";
-
-const hardcodedDefaultTheme: Theme = (() => {
-  const colors: ResolvedTheme = {
-    accent: "#7dcfff",
-    background: "#1a1b26",
-    backgroundElement: "#222436",
-    backgroundPanel: "#1e2030",
-    border: "#565f89",
-    borderActive: "#737aa2",
-    borderSubtle: "#414868",
-    cursorLine: "#222436",
-    diffAdded: "#4fd6be",
-    diffAddedBg: "#20303b",
-    diffAddedLineNumberBg: "#1b2b34",
-    diffContext: "#828bb8",
-    diffContextBg: "#1e2030",
-    diffHighlightAdded: "#b8db87",
-    diffHighlightRemoved: "#e26a75",
-    diffHunkHeader: "#828bb8",
-    diffLineNumber: "#222436",
-    diffRemoved: "#c53b53",
-    diffRemovedBg: "#37222c",
-    diffRemovedLineNumberBg: "#2d1f26",
-    error: "#f7768e",
-    info: "#7aa2f7",
-    markdownBlockQuote: "#e0af68",
-    markdownCode: "#9ece6a",
-    markdownCodeBlock: "#c0caf5",
-    markdownEmph: "#e0af68",
-    markdownHeading: "#bb9af7",
-    markdownHorizontalRule: "#565f89",
-    markdownImage: "#7aa2f7",
-    markdownImageText: "#7dcfff",
-    markdownLink: "#7aa2f7",
-    markdownLinkText: "#7dcfff",
-    markdownListEnumeration: "#7dcfff",
-    markdownListItem: "#7aa2f7",
-    markdownStrong: "#ff966c",
-    markdownText: "#c0caf5",
-    primary: "#7aa2f7",
-    secondary: "#bb9af7",
-    selection: "#1e2030",
-    success: "#9ece6a",
-    syntaxComment: "#565f89",
-    syntaxFunction: "#7aa2f7",
-    syntaxKeyword: "#bb9af7",
-    syntaxNumber: "#ff9e64",
-    syntaxOperator: "#89ddff",
-    syntaxPunctuation: "#a9b1d6",
-    syntaxString: "#9ece6a",
-    syntaxType: "#2ac3de",
-    syntaxVariable: "#c0caf5",
-    text: "#c0caf5",
-    textMuted: "#565f89",
-    warning: "#e0af68",
-  };
-  return { colors, mode: DEFAULT_MODE, name: DEFAULT_THEME_NAME, syntax: buildSyntaxStyle(colors) };
-})();
-
-export const defaultTheme: Theme = hardcodedDefaultTheme;
-
-export const buildTheme = function buildTheme(name: string, mode: "dark" | "light"): Theme {
+export const DEFAULT_MODE: ColorMode = "dark";
+
+// SAFETY: this package owns the bundled theme document. resolveTheme validates
+// every consumed color and fills every omitted key from FALLBACKS.
+// oxlint-disable-next-line typescript/no-unsafe-type-assertion -- trusted package-owned JSON boundary
+const bundledDefaultThemeJson = JSON.parse(
+  readFileSync(new URL("../themes/tokyonight.json", import.meta.url), "utf-8"),
+) as ThemeJSON;
+
+const buildBundledDefaultTheme = function buildBundledDefaultTheme(mode: ColorMode): Theme {
+  const colors = resolveTheme(bundledDefaultThemeJson, mode);
+  return { colors, mode, name: DEFAULT_THEME_NAME, syntax: buildSyntaxStyle(colors) };
+};
+
+export const defaultTheme: Theme = buildBundledDefaultTheme(DEFAULT_MODE);
+
+export const buildTheme = function buildTheme(name: string, mode: ColorMode): Theme {
   const themes = loadThemes();
   const json = themes.get(name);
   if (!json) {
-    // Fall back to tokyonight, then first available, then hardcoded
+    // Fall back to tokyonight, then first available, then the bundled default.
     const fallbackJson = themes.get(DEFAULT_THEME_NAME) ?? themes.values().next().value;
     if (fallbackJson) {
       const resolved = resolveTheme(fallbackJson, mode);
       return { colors: resolved, mode, name, syntax: buildSyntaxStyle(resolved) };
     }
-    // Absolute fallback — hardcoded Tokyo Night colors
-    return hardcodedDefaultTheme;
+    return buildBundledDefaultTheme(mode);
   }
   try {
     const resolved = resolveTheme(json, mode);
     return { colors: resolved, mode, name, syntax: buildSyntaxStyle(resolved) };
   } catch {
-    return hardcodedDefaultTheme;
+    return buildBundledDefaultTheme(mode);
   }
 };

package/src/types.ts

@@ -1,3 +1,5 @@
+import type { ColorMode } from "@tooee/config";
+
 // ---------------------------------------------------------------------------
 // Theme JSON format (OpenCode-compatible)
 // ---------------------------------------------------------------------------
@@ -78,64 +80,8 @@ export interface ResolvedTheme {
   syntaxPunctuation: string;
 }
 
-// All keys of ResolvedTheme for iteration
-export const RESOLVED_KEYS: (keyof ResolvedTheme)[] = [
-  "primary",
-  "secondary",
-  "accent",
-  "error",
-  "warning",
-  "success",
-  "info",
-  "text",
-  "textMuted",
-  "background",
-  "backgroundPanel",
-  "backgroundElement",
-  "border",
-  "borderActive",
-  "borderSubtle",
-  "cursorLine",
-  "selection",
-  "diffAdded",
-  "diffRemoved",
-  "diffContext",
-  "diffHunkHeader",
-  "diffHighlightAdded",
-  "diffHighlightRemoved",
-  "diffAddedBg",
-  "diffRemovedBg",
-  "diffContextBg",
-  "diffLineNumber",
-  "diffAddedLineNumberBg",
-  "diffRemovedLineNumberBg",
-  "markdownText",
-  "markdownHeading",
-  "markdownLink",
-  "markdownLinkText",
-  "markdownCode",
-  "markdownBlockQuote",
-  "markdownEmph",
-  "markdownStrong",
-  "markdownHorizontalRule",
-  "markdownListItem",
-  "markdownListEnumeration",
-  "markdownImage",
-  "markdownImageText",
-  "markdownCodeBlock",
-  "syntaxComment",
-  "syntaxKeyword",
-  "syntaxFunction",
-  "syntaxVariable",
-  "syntaxString",
-  "syntaxNumber",
-  "syntaxType",
-  "syntaxOperator",
-  "syntaxPunctuation",
-];
-
-// Fallbacks used when a theme key is missing
-export const FALLBACKS: Record<string, string> = {
+// Fallbacks used when a theme key is missing: a complete theme in its own right.
+export const FALLBACKS = {
   accent: "#808080",
   background: "#1e1e1e",
   backgroundElement: "#1e1e1e",
@@ -188,44 +134,54 @@ export const FALLBACKS: Record<string, string> = {
   text: "#d4d4d4",
   textMuted: "#808080",
   warning: "#808080",
-};
+} satisfies Record<keyof ResolvedTheme, string>;
+
+export const RESOLVED_KEYS =
+  // SAFETY: FALLBACKS satisfies a complete ResolvedTheme Record, so Object.keys contains only its keys.
+  // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- Object.keys does not preserve Record key types
+  Object.keys(FALLBACKS) as (keyof ResolvedTheme)[];
 
 // ---------------------------------------------------------------------------
 // Resolution
 // ---------------------------------------------------------------------------
 
-export const resolveTheme = function resolveTheme(
-  json: ThemeJSON,
-  mode: "dark" | "light",
-): ResolvedTheme {
+/** 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;
+};
+
+export const resolveTheme = function resolveTheme(json: ThemeJSON, mode: ColorMode): ResolvedTheme {
   const defs = json.defs ?? {};
 
   const resolveColor = function resolveColor(c: ColorValue, seen = new Set<string>()): string {
-    if (typeof c === "string") {
-      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));
-      }
+    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";
     }
-    return resolveColor(c[mode], seen);
+    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";
   };
 
-  const result = {} as Record<string, string>;
+  // 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];
-    result[key] = val === undefined ? (FALLBACKS[key] ?? "#808080") : resolveColor(val);
+    if (val !== undefined) {
+      result[key] = resolveColor(val);
+    }
   }
   // Dynamic fallbacks that reference other resolved keys
   if (json.theme.cursorLine === undefined) {
@@ -234,7 +190,5 @@ export const resolveTheme = function resolveTheme(
   if (json.theme.selection === undefined) {
     result.selection = result.backgroundPanel;
   }
-  // Deferred(lint-sweep): replace with a typed exhaustive key map for compile-time completeness
-  // oxlint-disable-next-line typescript/no-unsafe-type-assertion -- RESOLVED_KEYS drives every required key and defaults missing values
-  return result as unknown as ResolvedTheme;
+  return result;
 };

package/dist/close-button.d.ts

@@ -1,17 +0,0 @@
-interface CloseButtonProps {
-    /** Called when the button is clicked (left mouse button). */
-    onClose: () => void;
-    /** Glyph to render (default "✕"). */
-    glyph?: string;
-    /** Foreground colour (defaults to theme.textMuted). */
-    color?: string;
-}
-/**
- * Reusable clickable close control for overlays.
- *
- * Renders a small themed glyph that calls `onClose` on left-click. Purely
- * additive — overlays keep their existing Escape / cancel keyboard paths.
- */
-export declare const CloseButton: ({ onClose, glyph, color, }: CloseButtonProps) => React.ReactNode;
-export {};
-//# sourceMappingURL=close-button.d.ts.map

package/dist/close-button.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"close-button.d.ts","sourceRoot":"","sources":["../src/close-button.tsx"],"names":[],"mappings":"AAIA,UAAU,gBAAgB;IACxB,6DAA6D;IAC7D,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,qCAAqC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uDAAuD;IACvD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;GAKG;AACH,eAAO,MAAM,WAAW,+BAIrB,gBAAgB,KAAG,KAAK,CAAC,SAqB3B,CAAC"}

package/dist/close-button.js

@@ -1,23 +0,0 @@
-import { jsx as _jsx } from "@opentui/react/jsx-runtime";
-import { useCallback } from "react";
-import { useTheme } from "./context.js";
-/**
- * Reusable clickable close control for overlays.
- *
- * Renders a small themed glyph that calls `onClose` on left-click. Purely
- * additive — overlays keep their existing Escape / cancel keyboard paths.
- */
-export const CloseButton = function CloseButton({ onClose, glyph = "✕", color, }) {
-    const { theme } = useTheme();
-    const handleMouseDown = useCallback((event) => {
-        // Left button only; let other buttons bubble.
-        if (event.button !== 0) {
-            return;
-        }
-        event.preventDefault();
-        event.stopPropagation();
-        onClose();
-    }, [onClose]);
-    return (_jsx("box", { flexShrink: 0, paddingLeft: 1, onMouseDown: handleMouseDown, children: _jsx("text", { content: glyph, fg: color ?? theme.textMuted }) }));
-};
-//# sourceMappingURL=close-button.js.map

package/dist/close-button.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"close-button.js","sourceRoot":"","sources":["../src/close-button.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEpC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAWxC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,WAAW,CAAC,EAC9C,OAAO,EACP,KAAK,GAAG,GAAG,EACX,KAAK,GACY;IACjB,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAC;IAE7B,MAAM,eAAe,GAAG,WAAW,CACjC,CAAC,KAAiB,EAAE,EAAE;QACpB,8CAA8C;QAC9C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QACD,KAAK,CAAC,cAAc,EAAE,CAAC;QACvB,KAAK,CAAC,eAAe,EAAE,CAAC;QACxB,OAAO,EAAE,CAAC;IACZ,CAAC,EACD,CAAC,OAAO,CAAC,CACV,CAAC;IAEF,OAAO,CACL,cAAK,UAAU,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,EAAE,eAAe,YAC9D,eAAM,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,IAAI,KAAK,CAAC,SAAS,GAAI,GAClD,CACP,CAAC;AACJ,CAAC,CAAC"}

package/dist/theme-picker.d.ts

@@ -1,14 +0,0 @@
-export interface ThemePickerEntry {
-    id: string;
-    title: string;
-}
-interface ThemePickerProps {
-    entries: ThemePickerEntry[];
-    currentTheme: string;
-    onSelect: (name: string) => void;
-    onClose: () => void;
-    onNavigate: (name: string) => void;
-}
-export declare const ThemePicker: ({ entries, currentTheme, onSelect, onClose, onNavigate, }: ThemePickerProps) => React.ReactNode;
-export {};
-//# sourceMappingURL=theme-picker.d.ts.map

package/dist/theme-picker.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"theme-picker.d.ts","sourceRoot":"","sources":["../src/theme-picker.tsx"],"names":[],"mappings":"AAMA,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAED,eAAO,MAAM,WAAW,8DAMrB,gBAAgB,KAAG,KAAK,CAAC,SAmK3B,CAAC"}

package/dist/theme-picker.js

@@ -1,109 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "@opentui/react/jsx-runtime";
-import { useState, useMemo, useCallback } from "react";
-import { useCommand } from "@tooee/commands";
-import { fuzzyMatch } from "@tooee/fuzzy";
-import { useTheme } from "./context.js";
-import { CloseButton } from "./close-button.js";
-export const ThemePicker = function ThemePicker({ entries, currentTheme, onSelect, onClose, onNavigate, }) {
-    const { theme } = useTheme();
-    const [filter, setFilter] = useState("");
-    const [activeIndex, setActiveIndex] = useState(() => {
-        const idx = entries.findIndex((e) => e.id === currentTheme);
-        return Math.max(idx, 0);
-    });
-    const filtered = useMemo(() => {
-        if (!filter) {
-            return entries;
-        }
-        const results = [];
-        for (const entry of entries) {
-            const score = fuzzyMatch(filter, entry.title);
-            if (score !== null) {
-                results.push({ entry, score });
-            }
-        }
-        results.sort((a, b) => b.score - a.score);
-        return results.map((r) => r.entry);
-    }, [entries, filter]);
-    const handleSelect = useCallback(() => {
-        const item = filtered[activeIndex];
-        if (item !== undefined) {
-            onSelect(item.id);
-        }
-    }, [filtered, activeIndex, onSelect]);
-    const navigateTo = useCallback((index) => {
-        setActiveIndex(index);
-        const item = filtered[index];
-        if (item !== undefined) {
-            onNavigate(item.id);
-        }
-    }, [filtered, onNavigate]);
-    const moveUp = useCallback(() => {
-        navigateTo(Math.max(0, activeIndex - 1));
-    }, [activeIndex, navigateTo]);
-    const moveDown = useCallback(() => {
-        navigateTo(Math.min(filtered.length - 1, activeIndex + 1));
-    }, [activeIndex, filtered.length, navigateTo]);
-    useCommand({
-        handler: onClose,
-        hidden: true,
-        hotkey: "Escape",
-        id: "theme-picker:close",
-        modes: ["insert", "cursor"],
-        title: "Close theme picker",
-    });
-    useCommand({
-        handler: handleSelect,
-        hidden: true,
-        hotkey: "Enter",
-        id: "theme-picker:select",
-        modes: ["insert", "cursor"],
-        title: "Select theme",
-    });
-    useCommand({
-        handler: moveUp,
-        hidden: true,
-        hotkey: "up",
-        id: "theme-picker:move-up",
-        modes: ["insert", "cursor"],
-        title: "Move up",
-    });
-    useCommand({
-        handler: moveDown,
-        hidden: true,
-        hotkey: "down",
-        id: "theme-picker:move-down",
-        modes: ["insert", "cursor"],
-        title: "Move down",
-    });
-    return (_jsxs("box", { position: "absolute", left: "20%", right: "20%", top: 2, maxHeight: "60%", flexDirection: "column", backgroundColor: theme.backgroundPanel, border: true, borderColor: theme.border, children: [_jsxs("box", { flexDirection: "row", paddingLeft: 1, paddingRight: 1, height: 1, children: [_jsx("text", { content: "\uD83C\uDFA8 ", fg: theme.accent }), _jsx("input", { focused: true, placeholder: "Filter themes...", onSubmit: handleSelect, onInput: (value) => {
-                            setFilter(value);
-                            setActiveIndex(0);
-                            // Preview first match
-                            if (value) {
-                                const results = [];
-                                for (const entry of entries) {
-                                    const score = fuzzyMatch(value, entry.title);
-                                    if (score !== null) {
-                                        results.push({ entry, score });
-                                    }
-                                }
-                                results.sort((a, b) => b.score - a.score);
-                                if (results.length > 0) {
-                                    onNavigate(results[0].entry.id);
-                                }
-                            }
-                            else if (entries.length > 0) {
-                                onNavigate(entries[0].id);
-                            }
-                        }, backgroundColor: "transparent", focusedBackgroundColor: "transparent", textColor: theme.text, placeholderColor: theme.textMuted, cursorColor: theme.accent, style: { flexGrow: 1 } }), _jsx("text", { content: ` ${filtered.length}`, fg: theme.textMuted }), _jsx(CloseButton, { onClose: onClose })] }), _jsx("box", { height: 1, width: "100%", backgroundColor: theme.border }), _jsx("scrollbox", { focused: false, style: { flexGrow: 1 }, children: filtered.map((entry, i) => (_jsx("box", { flexDirection: "row", paddingLeft: 1, paddingRight: 1, height: 1, backgroundColor: i === activeIndex ? theme.backgroundElement : undefined, onMouseDown: (event) => {
-                        // Left-click applies the theme — same code path as Enter.
-                        if (event.button !== 0) {
-                            return;
-                        }
-                        event.preventDefault();
-                        event.stopPropagation();
-                        onSelect(entry.id);
-                    }, children: _jsx("text", { content: entry.title, fg: theme.text, style: { flexGrow: 1 } }) }, entry.id))) })] }));
-};
-//# sourceMappingURL=theme-picker.js.map

package/dist/theme-picker.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"theme-picker.js","sourceRoot":"","sources":["../src/theme-picker.tsx"],"names":[],"mappings":"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"}

package/src/close-button.tsx

@@ -1,45 +0,0 @@
-import { useCallback } from "react";
-import type { MouseEvent } from "@opentui/core";
-import { useTheme } from "./context.js";
-
-interface CloseButtonProps {
-  /** Called when the button is clicked (left mouse button). */
-  onClose: () => void;
-  /** Glyph to render (default "✕"). */
-  glyph?: string;
-  /** Foreground colour (defaults to theme.textMuted). */
-  color?: string;
-}
-
-/**
- * Reusable clickable close control for overlays.
- *
- * Renders a small themed glyph that calls `onClose` on left-click. Purely
- * additive — overlays keep their existing Escape / cancel keyboard paths.
- */
-export const CloseButton = function CloseButton({
-  onClose,
-  glyph = "✕",
-  color,
-}: CloseButtonProps): React.ReactNode {
-  const { theme } = useTheme();
-
-  const handleMouseDown = useCallback(
-    (event: MouseEvent) => {
-      // Left button only; let other buttons bubble.
-      if (event.button !== 0) {
-        return;
-      }
-      event.preventDefault();
-      event.stopPropagation();
-      onClose();
-    },
-    [onClose],
-  );
-
-  return (
-    <box flexShrink={0} paddingLeft={1} onMouseDown={handleMouseDown}>
-      <text content={glyph} fg={color ?? theme.textMuted} />
-    </box>
-  );
-};