@opencode/theme 2.0.8 → 2.0.10

package/dist/tui/categorical.d.ts

@@ -0,0 +1 @@
+export declare const DEFAULT_CATEGORICAL: readonly ["blue", "purple", "green", "orange", "red", "cyan"];

package/dist/tui/categorical.js

@@ -0,0 +1 @@
+export const DEFAULT_CATEGORICAL = ["blue", "purple", "green", "orange", "red", "cyan"];

package/dist/tui/expand.js

@@ -3,9 +3,7 @@ export function expandTheme(definition) {
     return {
         ...definition,
         ...expandTokens(definition),
-        ...Object.fromEntries(Object.entries(definition)
-            .filter(([key]) => key.startsWith("@context:"))
-            .map(([key, value]) => [key, expandTokens(value)])),
+        ...(definition["@dialog"] ? { "@dialog": expandTokens(definition["@dialog"]) } : {}),
     };
 }
 export function expandTokens(definition) {
@@ -20,7 +18,7 @@ export function mergeTheme(...values) {
         if (!isRecord(value))
             return result;
         return Object.entries(value).reduce((next, [key, item]) => {
-            if (item === undefined || key === "mergeMode")
+            if (item === undefined)
                 return next;
             return {
                 ...next,
@@ -34,7 +32,7 @@ function expandText(definition) {
         return;
     return {
         ...definition,
-        subdued: definition.subdued ?? (definition.default ? "$text.default" : undefined),
+        muted: definition.muted ?? (definition.base ? "$text.base" : undefined),
         action: expandActions(definition.action, "text.action"),
         formfield: expandFormfield(definition.formfield, "text.formfield"),
         feedback: definition.feedback
@@ -43,7 +41,7 @@ function expandText(definition) {
                     kind,
                     {
                         ...feedback,
-                        subdued: feedback.subdued ?? (feedback.default ? `$text.feedback.${kind}.default` : undefined),
+                        muted: feedback.muted ?? (feedback.base ? `$text.feedback.${kind}.base` : undefined),
                     },
                 ];
             }))
@@ -60,24 +58,24 @@ function expandBackground(definition) {
     };
 }
 function expandFormfield(definition, path) {
-    if (!definition?.default)
+    if (!definition?.base)
         return definition;
     return {
         ...definition,
-        ...Object.fromEntries(ActionState.literals.map((state) => [`$${state}`, definition[`$${state}`] ?? `$${path}.default`])),
+        ...Object.fromEntries(ActionState.literals.map((state) => [`$${state}`, definition[`$${state}`] ?? `$${path}.base`])),
     };
 }
 function expandActions(definition, path) {
     if (!definition)
         return;
     return Object.fromEntries(Object.entries(definition).map(([variant, value]) => {
-        if (!value?.default)
+        if (!value?.base)
             return [variant, value];
         return [
             variant,
             {
                 ...value,
-                ...Object.fromEntries(ActionState.literals.map((state) => [`$${state}`, value[`$${state}`] ?? `$${path}.${variant}.default`])),
+                ...Object.fromEntries(ActionState.literals.map((state) => [`$${state}`, value[`$${state}`] ?? `$${path}.${variant}.base`])),
             },
         ];
     }));

package/dist/tui/index.d.ts

@@ -1,6 +1,6 @@
-export { ActionState, type ActionStateKey, ActionVariant, BaseHue, CategoricalDefinition, FeedbackKind, FormfieldState, type FormfieldStateKey, HueAlias, HueName, HueStep, MarkdownDefinition, MarkdownToken, ModeDefinition, SyntaxDefinition, SyntaxToken, ThemeDefinition, ThemeDocument, type BackgroundDefinition, type DiffDefinition, type FileThemeDefinition, type FormfieldColorDefinition, type HueDefinition, type HueOverrideDefinition, type MergeModeDefinition, type Mode, type StatefulColorDefinition, type ContextKey, type TextDefinition, type ThemeTokensDefinition, } from "./schema.js";
-export type { Categorical, ContextName, FormfieldColor, Hue, HueSource, HueScale, ResolvedActionState, ResolvedFormfieldState, ResolvedTheme, ResolvedThemeTokens, StatefulColor, } from "./types.js";
-export { DEFAULT_CATEGORICAL, DEFAULT_THEME } from "./defaults.js";
+export { ActionState, type ActionStateKey, ActionVariant, BaseHue, BaseThemeDefinition, CategoricalDefinition, FeedbackKind, FormfieldState, type FormfieldStateKey, HueAlias, HueName, HueStep, MarkdownDefinition, MarkdownToken, ModeDefinition, SurfaceName, SyntaxDefinition, SyntaxToken, ThemeDefinition, ThemeDocument, type BackgroundDefinition, type DiffDefinition, type FormfieldColorDefinition, type HueDefinition, type Mode, type StatefulColorDefinition, type TextDefinition, type ThemeTokensDefinition, } from "./schema.js";
+export type { ActionStates, Categorical, FormfieldColor, Hue, HueSource, HueScale, ResolvedActionState, ResolvedFormfieldState, ResolvedTheme, ResolvedThemeTokens, StatefulColor, } from "./types.js";
+export { DEFAULT_CATEGORICAL } from "./categorical.js";
 export { expandTheme } from "./expand.js";
 export { migrateV1 } from "./v1-migrate.js";
 export { resolveTheme, resolveThemeDocument, themeDecodeError } from "./resolve.js";

package/dist/tui/index.js

@@ -1,5 +1,5 @@
-export { ActionState, ActionVariant, BaseHue, CategoricalDefinition, FeedbackKind, FormfieldState, HueAlias, HueName, HueStep, MarkdownDefinition, MarkdownToken, ModeDefinition, SyntaxDefinition, SyntaxToken, ThemeDefinition, ThemeDocument, } from "./schema.js";
-export { DEFAULT_CATEGORICAL, DEFAULT_THEME } from "./defaults.js";
+export { ActionState, ActionVariant, BaseHue, BaseThemeDefinition, CategoricalDefinition, FeedbackKind, FormfieldState, HueAlias, HueName, HueStep, MarkdownDefinition, MarkdownToken, ModeDefinition, SurfaceName, SyntaxDefinition, SyntaxToken, ThemeDefinition, ThemeDocument, } from "./schema.js";
+export { DEFAULT_CATEGORICAL } from "./categorical.js";
 export { expandTheme } from "./expand.js";
 export { migrateV1 } from "./v1-migrate.js";
 export { resolveTheme, resolveThemeDocument, themeDecodeError } from "./resolve.js";

package/dist/tui/resolve.d.ts

@@ -1,5 +1,5 @@
 import { ThemeDefinition, ThemeDocument } from "./schema.js";
-import type { ResolvedTheme } from "./index.js";
+import type { Mode, ResolvedTheme } from "./index.js";
 export declare function themeDecodeError(error: unknown, name: string): Error;
-export declare function resolveThemeDocument(document: ThemeDocument, mode?: "light" | "dark"): ResolvedTheme;
+export declare function resolveThemeDocument(document: ThemeDocument, mode?: Mode): ResolvedTheme;
 export declare function resolveTheme(definition: ThemeDefinition): ResolvedTheme;

package/dist/tui/resolve.js

@@ -1,10 +1,8 @@
 import { RGBA } from "@opentui/core";
 import { Schema } from "effect";
-import { DEFAULT_CATEGORICAL, DEFAULT_THEME } from "./defaults.js";
-import { expandTheme, expandTokens, mergeTheme } from "./expand.js";
-import { fallback } from "./fallback.js";
-import { ActionState, ActionVariant, BaseHue, FeedbackKind, HueAlias, HueStep, ThemeDefinition, ThemeDocument, } from "./schema.js";
-import { selectTheme, selectThemeMode } from "./select.js";
+import { expandTheme, mergeTheme } from "./expand.js";
+import { ActionState, ActionVariant, BaseHue, HueAlias, HueStep, SurfaceName, ThemeDefinition, ThemeDocument, } from "./schema.js";
+import { selectThemeMode } from "./select.js";
 const decodeThemeDefinitionSchema = Schema.decodeUnknownSync(ThemeDefinition, { reportInput: true });
 function decodeThemeDefinition(input) {
     try {
@@ -21,37 +19,24 @@ export function themeDecodeError(error, name) {
 }
 export function resolveThemeDocument(document, mode) {
     const selected = selectThemeMode(document, mode);
-    const definition = selected.expanded ? selected.theme : expandTheme(selected.theme);
-    const defaults = expandTheme(selectTheme(DEFAULT_THEME, selected.mode));
-    const core = expandTokens(fallback(selected.mode));
-    const merged = document.standalone ? mergeTheme(core, definition) : mergeTheme(core, defaults, definition);
-    if (!merged["hue"])
-        throw new Error("Standalone themes must provide hues");
-    return resolveExpandedTheme({
-        ...merged,
-        categorical: merged["categorical"] ?? DEFAULT_CATEGORICAL,
-    });
+    const definition = expandTheme(selected.theme);
+    return resolveExpandedTheme(definition);
 }
 export function resolveTheme(definition) {
     return resolveExpandedTheme(expandTheme(decodeThemeDefinition(definition)));
 }
 function resolveExpandedTheme(definition) {
     const hue = resolveHue(definition.hue);
-    const categorical = (definition.categorical ?? DEFAULT_CATEGORICAL).map((name) => hue[name]);
+    const categorical = definition.categorical.map((name) => hue[name]);
     const hueSteps = compileHueSteps(hue);
     const base = tokens(definition);
-    const resolved = resolveView(base, hue, categorical, hueSteps);
-    const context = (name) => {
-        const override = definition[`@context:${name}`];
-        if (!override)
-            return resolved;
-        return resolveView(contextualize(base, override), hue, categorical, hueSteps);
-    };
-    const contextual = {
-        elevated: context("elevated"),
-        overlay: context("overlay"),
-    };
-    return { ...resolved, contextual };
+    const views = {};
+    const view = (tokens) => ({
+        ...resolveView(tokens, hue, categorical, hueSteps),
+        surface: (name) => views[name],
+    });
+    views.dialog = definition["@dialog"] ? view(contextualize(base, definition["@dialog"])) : view(base);
+    return view(base);
 }
 function tokens(definition) {
     return {
@@ -66,32 +51,28 @@ function tokens(definition) {
 }
 function contextualize(base, override) {
     const result = mergeTheme(base, override);
-    const baseText = base.text?.action;
-    const contextText = override.text?.action;
-    const baseBackground = base.background?.action;
-    const contextBackground = override.background?.action;
     const text = result["text"];
     const background = result["background"];
     return {
         ...result,
-        text: { ...text, action: contextualActions(baseText, contextText) },
-        background: { ...background, action: contextualActions(baseBackground, contextBackground) },
+        text: { ...text, action: contextualActions(base.text?.action, override.text?.action) },
+        background: { ...background, action: contextualActions(base.background?.action, override.background?.action) },
     };
 }
-function contextualActions(base, context) {
+function contextualActions(base, surface) {
     return Object.fromEntries(ActionVariant.literals.map((variant) => {
         const baseVariant = base?.[variant];
-        const contextVariant = context?.[variant];
+        const surfaceVariant = surface?.[variant];
         return [
             variant,
-            Object.fromEntries(["default", ...ActionState.literals].map((state) => {
-                const key = state === "default" ? undefined : `$${state}`;
+            Object.fromEntries(["base", ...ActionState.literals].map((state) => {
+                const key = state === "base" ? undefined : `$${state}`;
                 return [
-                    key ?? "default",
-                    (key ? contextVariant?.[key] : undefined) ??
-                        contextVariant?.default ??
+                    key ?? "base",
+                    (key ? surfaceVariant?.[key] : undefined) ??
+                        surfaceVariant?.base ??
                         (key ? baseVariant?.[key] : undefined) ??
-                        baseVariant?.default,
+                        baseVariant?.base,
                 ];
             })),
         ];
@@ -99,7 +80,32 @@ function contextualActions(base, context) {
 }
 function resolveView(definition, hue, categorical, hueSteps) {
     const source = { hue, ...definition };
-    return { ...createResolver(source)(source, "theme"), hue, categorical, ...hueSteps };
+    const resolved = createResolver(source)(source, "theme");
+    return {
+        ...resolved,
+        hue,
+        categorical,
+        text: {
+            ...resolved.text,
+            action: statefulActions(resolved.text.action),
+            formfield: statefulColor(resolved.text.formfield),
+        },
+        background: {
+            ...resolved.background,
+            action: statefulActions(resolved.background.action),
+            formfield: statefulColor(resolved.background.formfield),
+        },
+        ...hueSteps,
+    };
+}
+function statefulActions(actions) {
+    return Object.fromEntries(ActionVariant.literals.map((variant) => [variant, statefulColor(actions[variant])]));
+}
+function statefulColor(color) {
+    return {
+        ...color,
+        state: (states) => color[ActionState.literals.find((state) => states[state]) ?? "base"],
+    };
 }
 function compileHueSteps(hue) {
     const index = new WeakMap();