@brimveyn/aimux 1.5.0 → 1.6.0

package/src/ui/themes.ts

@@ -1,279 +1,73 @@
-export interface ThemeColors {
-  background: string
-  panel: string
-  panelMuted: string
-  panelHighlight: string
-  overlay: string
-  border: string
-  borderActive: string
-  text: string
-  textMuted: string
-  accent: string
-  accentAlt: string
-  warning: string
-  danger: string
-  success: string
-  dim: string
-  diffAddBg: string
-  diffRemoveBg: string
+import type { BundledTheme } from 'shiki'
+
+import {
+  AIMUX_COLOR_KEYS,
+  type AimuxColorKey,
+  type NamedTheme,
+  type NamedThemeDefinition,
+  type Theme,
+  type ThemeColorMap,
+  type ThemeSettings,
+  type ThemeTokenRule,
+} from '@brimveyn/aimux-config'
+
+import { HOUSE_THEME_IDS, HOUSE_THEMES } from './house-themes'
+import { GENERATED_THEME_IDS, GENERATED_THEMES } from './themes.generated'
+
+export type {
+  AimuxColorKey,
+  NamedTheme,
+  NamedThemeDefinition,
+  Theme,
+  ThemeColorMap,
+  ThemeSettings,
+  ThemeTokenRule,
+}
+export { AIMUX_COLOR_KEYS }
+
+export type ThemeId = BundledTheme | (string & {})
+
+export const THEMES: Record<string, Theme> = { ...GENERATED_THEMES, ...HOUSE_THEMES }
+export const THEME_IDS: ThemeId[] = [...GENERATED_THEME_IDS, ...HOUSE_THEME_IDS]
+
+const DEFAULT_THEME_ID: ThemeId = 'aimux'
+
+/**
+ * Merge user-declared themes into the registry. Themes declared via
+ * `themes.full(...)` arrive as complete `NamedTheme` objects; themes declared
+ * via `themes.define(...)` arrive as `NamedThemeDefinition` (partial overrides
+ * over a base) and are expanded here.
+ */
+export function registerUserThemes(
+  defs: Record<string, NamedTheme | NamedThemeDefinition> | undefined
+): void {
+  if (!defs) return
+  const fallback = THEMES[DEFAULT_THEME_ID]
+  if (!fallback) return
+  for (const [id, def] of Object.entries(defs)) {
+    THEMES[id] = isFullTheme(def) ? def : expandDefinition(id, def, fallback)
+    if (!THEME_IDS.includes(id)) THEME_IDS.push(id)
+  }
 }
 
-export type ThemeId =
-  | 'aimux'
-  | 'dracula'
-  | 'dracula-at-night'
-  | 'everforest'
-  | 'tokyo-night'
-  | 'gruvbox-dark'
-  | 'catppuccin-mocha'
-  | 'nord'
-  | 'solarized-dark'
-  | 'one-dark'
-  | 'kanagawa'
+function isFullTheme(def: NamedTheme | NamedThemeDefinition): def is NamedTheme {
+  return 'settings' in def && Array.isArray((def as Theme).settings)
+}
 
-export const THEMES: Record<ThemeId, { name: string; colors: ThemeColors }> = {
-  'aimux': {
-    colors: {
-      accent: '#7cd1b8',
-      accentAlt: '#c4a7e7',
-      background: '#11151b',
-      border: '#2d3f52',
-      borderActive: '#7cd1b8',
-      danger: '#f38ba8',
-      diffAddBg: '#1e3d2b',
-      diffRemoveBg: '#3b1e27',
-      dim: '#243242',
-      overlay: '#0b1016',
-      panel: '#16202b',
-      panelHighlight: '#1f3344',
-      panelMuted: '#1c2734',
-      success: '#8bd5ca',
-      text: '#edf4ff',
-      textMuted: '#6b829a',
-      warning: '#f6c177',
-    },
-    name: 'Aimux',
-  },
-  'catppuccin-mocha': {
-    colors: {
-      accent: '#cba6f7',
-      accentAlt: '#f5c2e7',
-      background: '#1e1e2e',
-      border: '#45475a',
-      borderActive: '#cba6f7',
-      danger: '#f38ba8',
-      diffAddBg: '#273c32',
-      diffRemoveBg: '#3b2838',
-      dim: '#313244',
-      overlay: '#181825',
-      panel: '#232334',
-      panelHighlight: '#313244',
-      panelMuted: '#2a2a3c',
-      success: '#a6e3a1',
-      text: '#cdd6f4',
-      textMuted: '#6c7086',
-      warning: '#f9e2af',
-    },
-    name: 'Catppuccin Mocha',
-  },
-  'dracula': {
-    colors: {
-      accent: '#bd93f9',
-      accentAlt: '#ff79c6',
-      background: '#282a36',
-      border: '#44475a',
-      borderActive: '#bd93f9',
-      danger: '#ff5555',
-      diffAddBg: '#2f4630',
-      diffRemoveBg: '#4a2f3b',
-      dim: '#383a4a',
-      overlay: '#1f2029',
-      panel: '#2d2f3d',
-      panelHighlight: '#3d4056',
-      panelMuted: '#343746',
-      success: '#50fa7b',
-      text: '#f8f8f2',
-      textMuted: '#6272a4',
-      warning: '#f1fa8c',
-    },
-    name: 'Dracula',
-  },
-  'dracula-at-night': {
-    colors: {
-      accent: '#bd93f9',
-      accentAlt: '#ff79c6',
-      background: '#0e1419',
-      border: '#2a3440',
-      borderActive: '#bd93f9',
-      danger: '#ff5555',
-      diffAddBg: '#162b1d',
-      diffRemoveBg: '#2a1820',
-      dim: '#1e2630',
-      overlay: '#090d11',
-      panel: '#131920',
-      panelHighlight: '#222a33',
-      panelMuted: '#1a2129',
-      success: '#50fa7b',
-      text: '#f8f8f2',
-      textMuted: '#6272a4',
-      warning: '#f1fa8c',
-    },
-    name: 'Dracula At Night',
-  },
-  'everforest': {
-    colors: {
-      accent: '#a7c080',
-      accentAlt: '#d699b6',
-      background: '#2d353b',
-      border: '#4f585e',
-      borderActive: '#a7c080',
-      danger: '#e67e80',
-      diffAddBg: '#35473a',
-      diffRemoveBg: '#45353a',
-      dim: '#3d484d',
-      overlay: '#232a2e',
-      panel: '#343f44',
-      panelHighlight: '#475258',
-      panelMuted: '#3d484d',
-      success: '#a7c080',
-      text: '#d3c6aa',
-      textMuted: '#859289',
-      warning: '#dbbc7f',
-    },
-    name: 'Everforest',
-  },
-  'gruvbox-dark': {
-    colors: {
-      accent: '#b8bb26',
-      accentAlt: '#d3869b',
-      background: '#282828',
-      border: '#504945',
-      borderActive: '#b8bb26',
-      danger: '#fb4934',
-      diffAddBg: '#2f3a28',
-      diffRemoveBg: '#3a2828',
-      dim: '#3c3836',
-      overlay: '#1f1d1b',
-      panel: '#2e2e2e',
-      panelHighlight: '#504945',
-      panelMuted: '#3c3836',
-      success: '#b8bb26',
-      text: '#ebdbb2',
-      textMuted: '#928374',
-      warning: '#fabd2f',
-    },
-    name: 'Gruvbox Dark',
-  },
-  'kanagawa': {
-    colors: {
-      accent: '#7e9cd8',
-      accentAlt: '#957fb8',
-      background: '#1f1f28',
-      border: '#363646',
-      borderActive: '#7e9cd8',
-      danger: '#e82424',
-      diffAddBg: '#28332a',
-      diffRemoveBg: '#35252b',
-      dim: '#2a2a37',
-      overlay: '#171720',
-      panel: '#24242e',
-      panelHighlight: '#363646',
-      panelMuted: '#2a2a37',
-      success: '#76946a',
-      text: '#dcd7ba',
-      textMuted: '#727169',
-      warning: '#e6c384',
-    },
-    name: 'Kanagawa',
-  },
-  'nord': {
-    colors: {
-      accent: '#88c0d0',
-      accentAlt: '#b48ead',
-      background: '#2e3440',
-      border: '#434c5e',
-      borderActive: '#88c0d0',
-      danger: '#bf616a',
-      diffAddBg: '#2f3d38',
-      diffRemoveBg: '#3d3035',
-      dim: '#3b4252',
-      overlay: '#252a33',
-      panel: '#333a47',
-      panelHighlight: '#434c5e',
-      panelMuted: '#3b4252',
-      success: '#a3be8c',
-      text: '#eceff4',
-      textMuted: '#7b88a1',
-      warning: '#ebcb8b',
-    },
-    name: 'Nord',
-  },
-  'one-dark': {
-    colors: {
-      accent: '#61afef',
-      accentAlt: '#c678dd',
-      background: '#282c34',
-      border: '#3e4452',
-      borderActive: '#61afef',
-      danger: '#e06c75',
-      diffAddBg: '#2c3b2f',
-      diffRemoveBg: '#3d2c33',
-      dim: '#3b4048',
-      overlay: '#1f2329',
-      panel: '#2c313a',
-      panelHighlight: '#3b4048',
-      panelMuted: '#333842',
-      success: '#98c379',
-      text: '#abb2bf',
-      textMuted: '#636d83',
-      warning: '#e5c07b',
-    },
-    name: 'One Dark',
-  },
-  'solarized-dark': {
-    colors: {
-      accent: '#268bd2',
-      accentAlt: '#d33682',
-      background: '#002b36',
-      border: '#2e5560',
-      borderActive: '#268bd2',
-      danger: '#dc322f',
-      diffAddBg: '#1a3a30',
-      diffRemoveBg: '#3a1f28',
-      dim: '#073642',
-      overlay: '#00242c',
-      panel: '#003340',
-      panelHighlight: '#0a4050',
-      panelMuted: '#073642',
-      success: '#859900',
-      text: '#fdf6e3',
-      textMuted: '#657b83',
-      warning: '#b58900',
-    },
-    name: 'Solarized Dark',
-  },
-  'tokyo-night': {
-    colors: {
-      accent: '#7aa2f7',
-      accentAlt: '#bb9af7',
-      background: '#1a1b26',
-      border: '#3b4261',
-      borderActive: '#7aa2f7',
-      danger: '#f7768e',
-      diffAddBg: '#22362d',
-      diffRemoveBg: '#362330',
-      dim: '#292e42',
-      overlay: '#141722',
-      panel: '#1f2335',
-      panelHighlight: '#292e42',
-      panelMuted: '#24283b',
-      success: '#9ece6a',
-      text: '#c0caf5',
-      textMuted: '#565f89',
-      warning: '#e0af68',
-    },
-    name: 'Tokyo Night',
-  },
+function expandDefinition(id: string, def: NamedThemeDefinition, fallback: Theme): Theme {
+  const base = def.base ? (THEMES[def.base] ?? fallback) : fallback
+  const colors: ThemeColorMap = { ...base.colors }
+  for (const [k, v] of Object.entries(def.colors ?? {})) {
+    if (typeof v === 'string') colors[k] = v
+  }
+  return {
+    ...base,
+    colors,
+    displayName: def.name,
+    name: id,
+  }
 }
 
-export const THEME_IDS = Object.keys(THEMES) as ThemeId[]
+export function isKnownThemeId(id: string): boolean {
+  return id in THEMES
+}

package/src/ui/syntax.ts

@@ -1,102 +0,0 @@
-import { getTreeSitterClient, SyntaxStyle, type ThemeTokenStyle } from '@opentui/core'
-
-import { onThemeChange, theme } from './theme'
-
-let cachedStyle: SyntaxStyle | null = null
-let clientInitPromise: Promise<void> | null = null
-
-onThemeChange(() => {
-  cachedStyle = null
-})
-
-function buildTokens(): ThemeTokenStyle[] {
-  return [
-    {
-      scope: ['comment', 'spell'],
-      style: { dim: true, foreground: theme.textMuted, italic: true },
-    },
-    { scope: ['comment.documentation'], style: { foreground: theme.textMuted, italic: true } },
-
-    {
-      scope: ['string', 'character', 'character.special', 'string.special'],
-      style: { foreground: theme.warning },
-    },
-    {
-      scope: ['string.escape', 'string.regexp', 'string.special.url'],
-      style: { foreground: theme.accentAlt },
-    },
-
-    {
-      scope: ['number', 'boolean', 'constant.builtin', 'constant.numeric'],
-      style: { foreground: theme.danger },
-    },
-    { scope: ['constant', 'constant.character'], style: { foreground: theme.danger } },
-
-    { scope: ['keyword'], style: { bold: true, foreground: theme.accentAlt } },
-    {
-      scope: [
-        'keyword.conditional',
-        'keyword.exception',
-        'keyword.import',
-        'keyword.modifier',
-        'keyword.repeat',
-      ],
-      style: { bold: true, foreground: theme.accentAlt },
-    },
-    {
-      scope: [
-        'keyword.coroutine',
-        'keyword.directive',
-        'keyword.function',
-        'keyword.return',
-        'keyword.type',
-      ],
-      style: { bold: true, foreground: theme.accentAlt, italic: true },
-    },
-    { scope: ['keyword.operator', 'operator'], style: { foreground: theme.accent } },
-
-    {
-      scope: ['function', 'function.call', 'function.method', 'function.method.call'],
-      style: { foreground: theme.success },
-    },
-    { scope: ['function.builtin'], style: { foreground: theme.success, italic: true } },
-    { scope: ['constructor'], style: { bold: true, foreground: theme.success } },
-
-    { scope: ['type', 'type.definition'], style: { foreground: theme.accent, italic: true } },
-    { scope: ['type.builtin'], style: { bold: true, foreground: theme.accent } },
-
-    { scope: ['variable'], style: { foreground: theme.text } },
-    { scope: ['variable.builtin'], style: { foreground: theme.danger, italic: true } },
-    { scope: ['variable.parameter', 'parameter'], style: { foreground: theme.text, italic: true } },
-    { scope: ['variable.member', 'property', 'field'], style: { foreground: theme.accent } },
-
-    { scope: ['attribute'], style: { foreground: theme.warning, italic: true } },
-    { scope: ['tag'], style: { foreground: theme.danger } },
-    { scope: ['tag.attribute'], style: { foreground: theme.warning, italic: true } },
-
-    { scope: ['label'], style: { foreground: theme.warning } },
-    { scope: ['module', 'namespace'], style: { foreground: theme.accentAlt, italic: true } },
-    { scope: ['module.builtin'], style: { bold: true, foreground: theme.accentAlt, italic: true } },
-
-    {
-      scope: ['punctuation.bracket', 'punctuation.delimiter'],
-      style: { foreground: theme.textMuted },
-    },
-    { scope: ['punctuation.special'], style: { foreground: theme.warning } },
-  ]
-}
-
-export function getSyntaxStyle(): SyntaxStyle {
-  if (!cachedStyle) {
-    cachedStyle = SyntaxStyle.fromTheme(buildTokens())
-  }
-  return cachedStyle
-}
-
-export function getSyntaxClient() {
-  const client = getTreeSitterClient()
-  if (!clientInitPromise) {
-    clientInitPromise = client.initialize().catch(() => {})
-  }
-  return client
-}