@weasel-js/theme 1.9.3 → 1.9.4

package/dist/{definition-DACR1H4A.d.ts → definition-GS7_Kz9D.d.ts}

@@ -247,8 +247,8 @@ declare const THEMES: {
                 readonly '--wzl-slider-thumb-size': "8px";
                 readonly '--wzl-slider-track-slop': "6px";
                 readonly '--wzl-slider-thumb-slop': "6px";
-                readonly '--wzl-slider-track-mix': "18%";
-                readonly '--wzl-slider-thumb-mix': "70%";
+                readonly '--wzl-slider-track-mix': "40%";
+                readonly '--wzl-slider-thumb-mix': "100%";
                 readonly '--wzl-handle-size': "9px";
                 readonly '--wzl-handle-size-sm': "7px";
                 readonly '--wzl-handle-size-lg': "10px";
@@ -425,8 +425,8 @@ declare const THEMES: {
                 readonly '--wzl-slider-thumb-size': "8px";
                 readonly '--wzl-slider-track-slop': "6px";
                 readonly '--wzl-slider-thumb-slop': "6px";
-                readonly '--wzl-slider-track-mix': "18%";
-                readonly '--wzl-slider-thumb-mix': "70%";
+                readonly '--wzl-slider-track-mix': "40%";
+                readonly '--wzl-slider-thumb-mix': "100%";
                 readonly '--wzl-handle-size': "9px";
                 readonly '--wzl-handle-size-sm': "7px";
                 readonly '--wzl-handle-size-lg': "10px";
@@ -603,8 +603,8 @@ declare const THEMES: {
                 readonly '--wzl-slider-thumb-size': "8px";
                 readonly '--wzl-slider-track-slop': "6px";
                 readonly '--wzl-slider-thumb-slop': "6px";
-                readonly '--wzl-slider-track-mix': "18%";
-                readonly '--wzl-slider-thumb-mix': "70%";
+                readonly '--wzl-slider-track-mix': "40%";
+                readonly '--wzl-slider-thumb-mix': "100%";
                 readonly '--wzl-handle-size': "9px";
                 readonly '--wzl-handle-size-sm': "7px";
                 readonly '--wzl-handle-size-lg': "10px";
@@ -1221,7 +1221,8 @@ declare function themeAxes(theme: Theme): AxisDefs;
 /**
  * Merge the extends chain at a selection, resolve every alias, and key the
  * result by CSS custom-property name. A missing or unknown axis value takes the
- * axis default.
+ * axis default, and a theme in the chain reads a value it never declared at its
+ * own default for that axis.
  *
  * Pure — no DOM. An unresolvable reference throws rather than falling back.
  */

package/dist/engine.d.ts

@@ -1,12 +1,12 @@
 import { OklchDeg, oklchDegToHex } from '@weasel-js/paint';
-import { T as ThemeDefinition, L as Lookup, F as FlatTokens, R as RawToken, S as Selection, B as BakedTheme, A as AxisDefs, a as Theme } from './definition-DACR1H4A.js';
-export { C as CategoricalRampDef, b as ContrastRule, c as LightnessRampDef, d as LiteralRule, N as NumberParam, O as OffsetRule, P as PinObject, e as PinValue, f as RampDef, g as RefRule, h as ScaleDef, i as SemanticRule, j as StepRule, k as bake, l as bakeChain, m as mergeChain } from './definition-DACR1H4A.js';
+import { T as ThemeDefinition, L as Lookup, F as FlatTokens, R as RawToken, S as Selection, B as BakedTheme, A as AxisDefs, a as Theme } from './definition-GS7_Kz9D.js';
+export { C as CategoricalRampDef, b as ContrastRule, c as LightnessRampDef, d as LiteralRule, N as NumberParam, O as OffsetRule, P as PinObject, e as PinValue, f as RampDef, g as RefRule, h as ScaleDef, i as SemanticRule, j as StepRule, k as bake, l as bakeChain, m as mergeChain } from './definition-GS7_Kz9D.js';
 
 /** A color in OKLCH: lightness 0–1, chroma, hue in degrees. paint's own type,
  *  under the name this engine has always called it. */
 type Lch = OklchDeg;
-/** `#rrggbb` to 0–255 channels. */
-declare function hexToRgb(hex: string): [number, number, number];
+/** A hex color to 0–255 channels, its alpha dropped. Throws on anything else. */
+declare const hexToRgb: (hex: string) => [number, number, number];
 /** OKLCH (lightness 0–1, chroma, hue in degrees) to `#rrggbb`. Chroma past the gamut is clipped at constant lightness. */
 declare const toHex: typeof oklchDegToHex;
 /** `#rrggbb` to OKLCH, hue in 0–360. */

package/dist/engine.js

@@ -1,6 +1,7 @@
 import { overrideKey, AXES_EXT, ALPHA_EXT } from './chunk-Z675UQ26.js';
-import { mergeAxes, toLch, toHex, generate, DEFAULT_CONSTRAINTS, fullSelection, pick, enumerateSelections, resolveTokens, pickAll, themeAxes, selectionKey, isByAxis, contrast } from './chunk-NUILKH2Z.js';
-export { CHROMA_WEIGHT, DEFAULT_CONSTRAINTS, anchorFromHex, chromaCap, contrast, deltaE, floorDegrees, generate, hexToRgb, hueGap, hueName, luminance, toHex, toHexPreview, toLab, toLch, vividAt } from './chunk-NUILKH2Z.js';
+import { mergeAxes, toLch, toHex, generate, DEFAULT_CONSTRAINTS, fullSelection, pick, enumerateSelections, resolveTokens, mixAlpha, pickAll, themeAxes, tokensAt, selectionKey, isByAxis, contrast, tokenAt } from './chunk-7LCRXZDY.js';
+export { CHROMA_WEIGHT, DEFAULT_CONSTRAINTS, anchorFromHex, chromaCap, contrast, deltaE, floorDegrees, generate, hexToRgb, hueGap, hueName, luminance, toHex, toHexPreview, toLab, toLch, vividAt } from './chunk-7LCRXZDY.js';
+import { isPlainObject } from '@weasel-js/registry';
 
 // src/engine/steps.ts
 var stepList = (x) => Array.isArray(x) ? [...new Set(x.filter((s) => typeof s === "string"))] : [];
@@ -217,6 +218,20 @@ function axisDependencies(definition, lookup) {
   return result;
 }
 
+// src/engine/axisIssues.ts
+function axisIssues(axes) {
+  const issues = [];
+  for (const [name, def] of Object.entries(axes)) {
+    const values = Object.keys(def.values ?? {});
+    if (values.length === 0) {
+      issues.push({ kind: "invalid", path: `axes.${name}`, message: `axis "${name}" has no values` });
+    } else if (!values.includes(def.default)) {
+      issues.push({ kind: "invalid", path: `axes.${name}`, message: `axis "${name}" defaults to "${def.default}", which is not one of its values (${values.join(", ")})` });
+    }
+  }
+  return issues;
+}
+
 // src/engine/ramps.ts
 var MAX_CHROMA = 0.4;
 var smoothstep = (t) => t * t * (3 - 2 * t);
@@ -290,12 +305,10 @@ function scale(steps, p) {
   });
   return out;
 }
-
-// src/engine/semantics.ts
 var TOKEN_REF2 = /^\{([^}.]+)\}$/;
 var HEX = /^#[0-9a-f]{6}$/i;
 var MAX_DEPTH = 32;
-var isRecord = (x) => typeof x === "object" && x !== null && !Array.isArray(x);
+var isRecord = isPlainObject;
 var refTarget = (value) => typeof value === "string" ? TOKEN_REF2.exec(value.trim())?.[1] : void 0;
 function deriveSemantics(rules, ctx) {
   const done = /* @__PURE__ */ new Map();
@@ -577,12 +590,12 @@ var Reader = class {
   }
   record(x, path) {
     if (x === void 0) return {};
-    if (typeof x === "object" && x !== null && !Array.isArray(x)) return x;
+    if (isPlainObject(x)) return x;
     this.fail(path, "expected an object");
     return {};
   }
 };
-var isRecord2 = (x) => typeof x === "object" && x !== null && !Array.isArray(x);
+var isRecord2 = isPlainObject;
 var stepNames = (x) => Array.isArray(x) && x.every((s) => typeof s === "string") ? x : void 0;
 function rampColors(name, r, steps, ctx) {
   const path = `ramps.${name}`;
@@ -726,7 +739,7 @@ function inferTypes(tokens, provenance, failed, issues) {
     issues.push({ kind: "untyped-pin", token: name });
   }
 }
-var isPinObject = (v) => typeof v === "object" && v !== null && !Array.isArray(v) && "value" in v;
+var isPinObject = (v) => isPlainObject(v) && "value" in v;
 var NAMED_LAYERS = ["ramps", "scales", "semantics", "components", "pins"];
 var SAFE_NAME = /^[A-Za-z0-9_-]+$/;
 var isSafeName = (name) => SAFE_NAME.test(name);
@@ -746,6 +759,7 @@ function withoutUnsafeNames(def, issues) {
 function derive(definition, selection = {}, lookup) {
   const issues = [];
   const def = withoutUnsafeNames(mergeChain(definition, lookup), issues);
+  issues.push(...axisIssues(def.axes ?? {}));
   const sel = fullSelection(def.axes ?? {}, selection);
   const seeds = {};
   for (const [k, v] of Object.entries(def.seeds ?? {})) {
@@ -937,23 +951,14 @@ function bakeOver(definition, merged, above, lookup) {
   const axes = merged.axes ?? {};
   const own = table(definition, axes, lookup);
   const at = (sel, name) => own.get(selectionKey(axes, sel))?.[name];
-  const inherited = (sel, name) => {
-    const full = fullSelection(axes, sel);
-    for (let i = above.length - 1; i >= 0; i--) {
-      const tokens2 = above[i].tokens;
-      if (!Object.hasOwn(tokens2, name)) continue;
-      const picked = pick(tokens2[name], full);
-      if (picked.ok) return picked.value;
-    }
-    return void 0;
-  };
+  const inherited = (sel, name) => tokenAt(above, name, fullSelection(axes, sel));
   const produced = new Set([...own.values()].flatMap((t) => Object.keys(t)));
   const ordered = definitionOrder(merged).filter((n) => produced.has(n));
   const names = [...ordered, ...[...produced].filter((n) => !ordered.includes(n))];
   const selections = enumerateSelections(axes);
   const tokens = {};
   for (const name of names) {
-    if (selections.every((sel) => same(at(sel, name), inherited(sel, name)))) continue;
+    if (selections.every((sel) => at(sel, name) === void 0 || same(at(sel, name), inherited(sel, name)))) continue;
     const varying = Object.keys(axes).filter(
       (axis) => selections.some((sel) => Object.keys(axes[axis].values).some((v) => !same(at(sel, name), at({ ...sel, [axis]: v }, name))))
     );
@@ -998,7 +1003,7 @@ function cssValue(name, token) {
   const target = refTarget2(token);
   if (target === null) return resolveTokens({ [name]: token })[name];
   if (token.alpha === void 0) return `var(--wzl-${target})`;
-  return `color-mix(in srgb, var(--wzl-${target}) ${Math.round(token.alpha * 100)}%, transparent)`;
+  return mixAlpha(`var(--wzl-${target})`, token.alpha);
 }
 function axisSets(axes) {
   const names = Object.keys(axes);
@@ -1030,21 +1035,16 @@ function combineAxes(own, other) {
 var Resolved = class {
   axes;
   names;
+  /** Root first. */
   chain;
   memo = /* @__PURE__ */ new Map();
   constructor(axes, chain) {
     this.axes = axes;
     this.chain = chain;
-    this.names = [...new Set([...chain].reverse().flatMap((t) => Object.keys(t.tokens)))];
+    this.names = [...new Set(chain.flatMap((t) => Object.keys(t.tokens)))];
   }
   token(name, sel) {
-    const full = fullSelection(this.axes, sel);
-    for (const t of this.chain) {
-      if (!Object.hasOwn(t.tokens, name)) continue;
-      const picked = pick(t.tokens[name], full);
-      if (picked.ok) return picked.value;
-    }
-    return void 0;
+    return tokenAt(this.chain, name, fullSelection(this.axes, sel));
   }
   /** What a browser computes: every `var()` substituted, down to literals. */
   expanded(name, sel, stack = []) {
@@ -1064,7 +1064,7 @@ function chainOf(baked, byName) {
   if (!baked.extends) return [baked];
   const parent = byName.get(baked.extends);
   if (!parent) throw new Error(`Theme "${baked.name}" extends "${baked.extends}", which is not being emitted`);
-  return [baked, ...chainOf(parent, byName)];
+  return [...chainOf(parent, byName), baked];
 }
 var union = (axes, ...sets) => {
   const all = new Set(sets.flatMap((s) => s ?? []));
@@ -1380,6 +1380,48 @@ var TOKEN_HOOKS = [
     type: "dimension",
     value: "calc(var(--wzl-control-h-xs) + var(--wzl-space-2))",
     description: "Indent of each Tree level. Unset, it is one twisty and one gap, so a child\u2019s twisty sits under its parent\u2019s label."
+  },
+  {
+    name: "tree-font-size",
+    type: "dimension",
+    value: "var(--wzl-font-size-sm)",
+    description: "Size of a Tree row\u2019s text."
+  },
+  {
+    name: "tree-fold-size",
+    type: "dimension",
+    value: "16px",
+    description: "Size of the leading glyph a Tree folds a branch by, where its branches fold by their glyphs."
+  },
+  {
+    name: "tree-guide",
+    type: "color",
+    value: "var(--wzl-fg-subtle)",
+    description: "Color of the bracket a Tree draws down a branch."
+  },
+  {
+    name: "dialog-max-width",
+    type: "dimension",
+    value: "900px",
+    description: "Widest a Dialog grows, modal or inline, before its contents wrap or scroll."
+  },
+  {
+    name: "prefs-across-gap",
+    type: "dimension",
+    value: "28px",
+    description: "Gap between the two columns of rows a PrefsForm pane sets side by side."
+  },
+  {
+    name: "prefs-control-min",
+    type: "dimension",
+    value: "80px",
+    description: "Narrowest a PrefsForm row\u2019s control gets in a two-across pane before the row wraps it under its label."
+  },
+  {
+    name: "prop-panel-actions-basis",
+    type: "dimension",
+    value: "auto",
+    description: "Width a PropertyPanel\u2019s title row gives its actions. Set, it holds that width whatever the actions are."
   }
 ];
 
@@ -1434,9 +1476,6 @@ function chainOf2(baked, byName) {
   if (baked.extends && !parent) throw new Error(`Theme "${baked.name}" extends "${baked.extends}", which is not in themes/`);
   return [...parent ? chainOf2(parent, byName) : [], baked];
 }
-function tokensAt(chain, sel) {
-  return Object.assign({}, ...chain.map((t) => pickAll(t.tokens, sel)));
-}
 function emitThemes(themes) {
   const byName = new Map(themes.map((t) => [t.baked.name, t.baked]));
   const names = /* @__PURE__ */ new Set();
@@ -1506,11 +1545,12 @@ function generateTokens(definitions) {
   const roots = definitions.filter((d) => !d.extends);
   if (roots.length !== 1) throw new Error(`themes/ needs exactly one theme that extends nothing; found ${roots.length}`);
   const ordered = [roots[0], ...definitions.filter((d) => d.extends)];
-  const problems = ordered.flatMap(
-    (def) => enumerateSelections(mergeChain(def, lookup).axes ?? {}).flatMap(
+  const problems = ordered.flatMap((def) => {
+    const selections = enumerateSelections(mergeChain(def, lookup).axes ?? {});
+    return (selections.length > 0 ? selections : [{}]).flatMap(
       (sel) => derive(def, sel, lookup).issues.map((issue) => `${def.name} ${JSON.stringify(sel)}: ${JSON.stringify(issue)}`)
-    )
-  );
+    );
+  });
   if (problems.length > 0) return { ok: false, problems };
   const themes = ordered.map((definition) => ({
     definition,