@opencode/theme 2.0.14 → 2.0.15

package/dist/tui/resolve.js

@@ -1,9 +1,10 @@
 import { RGBA } from "@opentui/core";
 import { Schema } from "effect";
 import { expandTheme, mergeTheme } from "./expand.js";
-import { ActionState, ActionVariant, BaseHue, HueAlias, HueStep, SurfaceName, ThemeDefinition, ThemeDocument, } from "./schema.js";
-import { selectThemeMode } from "./select.js";
+import { ActionState, ActionVariant, HueStep, SurfaceName, ThemeDefinition, ThemeDocument, } from "./schema.js";
+import { selectThemeMode, themeModes } from "./select.js";
 const decodeThemeDefinitionSchema = Schema.decodeUnknownSync(ThemeDefinition, { reportInput: true });
+const decodeThemeDocumentSchema = Schema.decodeUnknownSync(ThemeDocument, { reportInput: true });
 function decodeThemeDefinition(input) {
     try {
         return decodeThemeDefinitionSchema(input);
@@ -17,6 +18,16 @@ export function themeDecodeError(error, name) {
     const value = /got ("[^"]*"|\S+)/.exec(message)?.[1] ?? "value";
     return new Error(`Invalid theme: ${name} ${value} is an invalid value`, { cause: error });
 }
+export function parseThemeDocument(input, name = "theme") {
+    try {
+        const document = decodeThemeDocumentSchema(input);
+        themeModes(document).forEach((mode) => resolveThemeDocument(document, mode));
+        return document;
+    }
+    catch (error) {
+        throw themeDecodeError(error, name);
+    }
+}
 export function resolveThemeDocument(document, mode) {
     const selected = selectThemeMode(document, mode);
     const definition = expandTheme(selected.theme);
@@ -27,7 +38,12 @@ export function resolveTheme(definition) {
 }
 function resolveExpandedTheme(definition) {
     const hue = resolveHue(definition.hue);
-    const categorical = definition.categorical.map((name) => hue[name]);
+    const categorical = definition.categorical.map((name) => {
+        const scale = hue[name];
+        if (!scale)
+            throw new Error(`Categorical hue "${name}" was not found`);
+        return scale;
+    });
     const hueSteps = compileHueSteps(hue);
     const base = tokens(definition);
     const views = {};
@@ -132,11 +148,6 @@ function compileHueSteps(hue) {
 function resolveHue(definition) {
     const source = definition;
     const cache = new Map();
-    const expected = new Set([...BaseHue.literals, ...HueAlias.literals]);
-    for (const name of Object.keys(source)) {
-        if (!expected.has(name))
-            throw new Error(`Unknown hue "${name}"`);
-    }
     function resolve(name, stack) {
         const hit = cache.get(name);
         if (hit)
@@ -145,9 +156,11 @@ function resolveHue(definition) {
             throw new Error(`Circular hue reference: ${[...stack, name].join(" -> ")}`);
         const value = source[name];
         if (typeof value === "string") {
-            const match = /^\$hue\.([^.]+)$/.exec(value);
+            const match = /^\$hue\.(.+)$/.exec(value);
             if (!match?.[1])
                 throw new Error(`Hue alias "${value}" must reference a hue scale`);
+            if (source[match[1]] === undefined)
+                throw new Error(`Hue alias "${value}" references a missing hue`);
             const target = resolve(match[1], [...stack, name]);
             const result = Object.fromEntries(HueStep.literals.map((step) => [step, RGBA.clone(target[step])]));
             cache.set(name, result);
@@ -168,7 +181,7 @@ function resolveHue(definition) {
         cache.set(name, result);
         return result;
     }
-    return Object.fromEntries([...BaseHue.literals, ...HueAlias.literals].map((name) => [name, resolve(name, [])]));
+    return Object.fromEntries(Object.keys(source).map((name) => [name, resolve(name, [])]));
 }
 function createResolver(source) {
     const cache = new Map();
@@ -196,7 +209,7 @@ function createResolver(source) {
             return hit;
         if (stack.includes(target))
             throw new Error(`Circular theme reference: ${[...stack, target].join(" -> ")}`);
-        const result = resolve(read(source, target), target, [...stack, target]);
+        const result = resolve(readColor(source, target), target, [...stack, target]);
         if (!(result instanceof RGBA))
             throw new Error(`Theme reference "${value}" at "${path}" is not a color`);
         cache.set(target, result);
@@ -204,6 +217,17 @@ function createResolver(source) {
     }
     return (value, path) => resolve(value, path);
 }
+function readColor(source, path) {
+    const match = /^hue\.(.+)\.(100|200|300|400|500|600|700|800|900)$/.exec(path);
+    if (!match?.[1] || !match[2])
+        return read(source, path);
+    const scales = source.hue;
+    const scale = isRecord(scales) ? scales[match[1]] : undefined;
+    const color = isRecord(scale) ? scale[match[2]] : undefined;
+    if (color === undefined)
+        throw new Error(`Theme reference "$${path}" was not found`);
+    return color;
+}
 function resolvedKey(key) {
     if (!key.startsWith("$"))
         return key;