@opencode/theme 0.0.0-dev-19788 → 0.0.0-dev-19793

package/dist/tui/defaults.d.ts

@@ -253,7 +253,7 @@ export declare const DEFAULT_THEME: {
             imageText: string;
             codeBlock: string;
         };
-        "@context:elevated": {
+        "@dialog": {
             text: {
                 action: {
                     primary: {
@@ -271,23 +271,6 @@ export declare const DEFAULT_THEME: {
                 };
             };
         };
-        "@context:overlay": {
-            text: {
-                action: {
-                    primary: {
-                        default: string;
-                    };
-                };
-            };
-            background: {
-                default: string;
-                action: {
-                    primary: {
-                        default: string;
-                    };
-                };
-            };
-        };
     };
     dark: {
         hue: {
@@ -541,7 +524,7 @@ export declare const DEFAULT_THEME: {
             imageText: string;
             codeBlock: string;
         };
-        "@context:elevated": {
+        "@dialog": {
             text: {
                 action: {
                     primary: {
@@ -559,22 +542,5 @@ export declare const DEFAULT_THEME: {
                 };
             };
         };
-        "@context:overlay": {
-            text: {
-                action: {
-                    primary: {
-                        default: string;
-                    };
-                };
-            };
-            background: {
-                default: string;
-                action: {
-                    primary: {
-                        default: string;
-                    };
-                };
-            };
-        };
     };
 };

package/dist/tui/defaults.js

@@ -215,20 +215,13 @@ export const DEFAULT_THEME = {
             imageText: "$hue.cyan.600",
             codeBlock: "$hue.neutral.900",
         },
-        "@context:elevated": {
+        "@dialog": {
             text: { action: { primary: { default: "$hue.neutral.100" } } },
             background: {
                 default: "$background.raised.base",
                 action: { primary: { default: "$hue.interactive.500", $hovered: "$background.raised.high" } },
             },
         },
-        "@context:overlay": {
-            text: { action: { primary: { default: "$hue.neutral.100" } } },
-            background: {
-                default: "$background.raised.high",
-                action: { primary: { default: "$hue.interactive.500" } },
-            },
-        },
     },
     dark: {
         hue: {
@@ -437,19 +430,12 @@ export const DEFAULT_THEME = {
             imageText: "$hue.cyan.400",
             codeBlock: "$hue.neutral.100",
         },
-        "@context:elevated": {
+        "@dialog": {
             text: { action: { primary: { default: "$hue.neutral.200" } } },
             background: {
                 default: "$background.raised.base",
                 action: { primary: { default: "$hue.interactive.400", $hovered: "$background.raised.high" } },
             },
         },
-        "@context:overlay": {
-            text: { action: { primary: { default: "$hue.neutral.200" } } },
-            background: {
-                default: "$background.raised.high",
-                action: { primary: { default: "$hue.interactive.400" } },
-            },
-        },
     },
 };

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) {

package/dist/tui/index.d.ts

@@ -1,5 +1,5 @@
-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 { ActionState, type ActionStateKey, ActionVariant, BaseHue, CategoricalDefinition, FeedbackKind, FormfieldState, type FormfieldStateKey, HueAlias, HueName, HueStep, MarkdownDefinition, MarkdownToken, ModeDefinition, SurfaceName, SyntaxDefinition, SyntaxToken, ThemeDefinition, ThemeDocument, type BackgroundDefinition, type DiffDefinition, type FileThemeDefinition, type FormfieldColorDefinition, type HueDefinition, type HueOverrideDefinition, type MergeModeDefinition, type Mode, type StatefulColorDefinition, type TextDefinition, type ThemeTokensDefinition, } from "./schema.js";
+export type { Categorical, FormfieldColor, Hue, HueSource, HueScale, ResolvedActionState, ResolvedFormfieldState, ResolvedTheme, ResolvedThemeTokens, StatefulColor, } from "./types.js";
 export { DEFAULT_CATEGORICAL, DEFAULT_THEME } from "./defaults.js";
 export { expandTheme } from "./expand.js";
 export { migrateV1 } from "./v1-migrate.js";

package/dist/tui/index.js

@@ -1,4 +1,4 @@
-export { ActionState, ActionVariant, BaseHue, CategoricalDefinition, FeedbackKind, FormfieldState, HueAlias, HueName, HueStep, MarkdownDefinition, MarkdownToken, ModeDefinition, SyntaxDefinition, SyntaxToken, ThemeDefinition, ThemeDocument, } from "./schema.js";
+export { ActionState, ActionVariant, BaseHue, CategoricalDefinition, FeedbackKind, FormfieldState, HueAlias, HueName, HueStep, MarkdownDefinition, MarkdownToken, ModeDefinition, SurfaceName, SyntaxDefinition, SyntaxToken, ThemeDefinition, ThemeDocument, } from "./schema.js";
 export { DEFAULT_CATEGORICAL, DEFAULT_THEME } from "./defaults.js";
 export { expandTheme } from "./expand.js";
 export { migrateV1 } from "./v1-migrate.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 resolveTheme(definition: ThemeDefinition): ResolvedTheme;
+export declare function resolveThemeDocument(document: ThemeDocument, mode?: Mode): ResolvedTheme;
+export declare function resolveTheme(definition: ThemeDefinition, mode: Mode): ResolvedTheme;

package/dist/tui/resolve.js

@@ -3,7 +3,7 @@ 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 { ActionState, ActionVariant, BaseHue, HueAlias, HueStep, SurfaceName, ThemeDefinition, ThemeDocument, } from "./schema.js";
 import { selectTheme, selectThemeMode } from "./select.js";
 const decodeThemeDefinitionSchema = Schema.decodeUnknownSync(ThemeDefinition, { reportInput: true });
 function decodeThemeDefinition(input) {
@@ -30,28 +30,25 @@ export function resolveThemeDocument(document, mode) {
     return resolveExpandedTheme({
         ...merged,
         categorical: merged["categorical"] ?? DEFAULT_CATEGORICAL,
-    });
+    }, selected.mode);
 }
-export function resolveTheme(definition) {
-    return resolveExpandedTheme(expandTheme(decodeThemeDefinition(definition)));
+export function resolveTheme(definition, mode) {
+    return resolveExpandedTheme(expandTheme(decodeThemeDefinition(definition)), mode);
 }
-function resolveExpandedTheme(definition) {
+function resolveExpandedTheme(definition, mode) {
     const hue = resolveHue(definition.hue);
     const categorical = (definition.categorical ?? DEFAULT_CATEGORICAL).map((name) => hue[name]);
     const hueSteps = compileHueSteps(hue);
+    const raise = (color) => (mode === "light" ? hueSteps.increase(color) : hueSteps.decrease(color));
     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),
+        raise,
+        surface: (name) => views[name],
+    });
+    views.dialog = definition["@dialog"] ? view(contextualize(base, definition["@dialog"])) : view(base);
+    return view(base);
 }
 function tokens(definition) {
     return {
@@ -66,30 +63,26 @@ 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}`;
                 return [
                     key ?? "default",
-                    (key ? contextVariant?.[key] : undefined) ??
-                        contextVariant?.default ??
+                    (key ? surfaceVariant?.[key] : undefined) ??
+                        surfaceVariant?.default ??
                         (key ? baseVariant?.[key] : undefined) ??
                         baseVariant?.default,
                 ];