@opencode/theme 0.0.0-dev-19795 → 0.0.0-dev-19812

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

@@ -18,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,
@@ -32,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
@@ -41,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),
                     },
                 ];
             }))
@@ -58,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, 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 { 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, DEFAULT_THEME } from "./defaults.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, SurfaceName, 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.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 { expandTheme, mergeTheme } from "./expand.js";
 import { ActionState, ActionVariant, BaseHue, HueAlias, HueStep, SurfaceName, ThemeDefinition, ThemeDocument, } from "./schema.js";
-import { selectTheme, selectThemeMode } from "./select.js";
+import { selectThemeMode } from "./select.js";
 const decodeThemeDefinitionSchema = Schema.decodeUnknownSync(ThemeDefinition, { reportInput: true });
 function decodeThemeDefinition(input) {
     try {
@@ -21,23 +19,15 @@ 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 views = {};
@@ -75,14 +65,14 @@ function contextualActions(base, surface) {
         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 ?? "base",
                     (key ? surfaceVariant?.[key] : undefined) ??
-                        surfaceVariant?.default ??
+                        surfaceVariant?.base ??
                         (key ? baseVariant?.[key] : undefined) ??
-                        baseVariant?.default,
+                        baseVariant?.base,
                 ];
             })),
         ];
@@ -114,7 +104,7 @@ function statefulActions(actions) {
 function statefulColor(color) {
     return {
         ...color,
-        state: (states) => color[ActionState.literals.find((state) => states[state]) ?? "default"],
+        state: (states) => color[ActionState.literals.find((state) => states[state]) ?? "base"],
     };
 }
 function compileHueSteps(hue) {