react-native-terra-ui 0.7.2 → 0.8.0

package/lib/module/utils/accent-generator.js

@@ -0,0 +1,476 @@
+"use strict";
+
+/**
+ * Pure, deterministic accent generation from a single seed color.
+ *
+ * Consumed by the resolver (`theme/resolve-config.ts`) for startup, runtime
+ * accent changes and `createTerraThemes`, and by the `normalizeAccent`
+ * compatibility wrapper. Must not import the registry, provider, Unistyles,
+ * or renderers — only `#theme/types` and the colour maths in `./color-utils`.
+ *
+ * ## Algorithm
+ *
+ * Every role is derived in OKLCH (Björn Ottosson's OKLab, in-house
+ * implementation in `./color-utils`): the seed's hue is kept for every role,
+ * chroma is capped per role and reduced further by sRGB gamut mapping, and
+ * perceptual lightness is *solved* per role against the scheme's actual
+ * ordinary surfaces so that WCAG 2.x targets are met (4.5:1 for text and
+ * solid/soft labels, 3:1 for the accent border). Contrast is evaluated with
+ * sRGB alpha compositing over each of the four surfaces and, for solid
+ * controls, additionally with the pressed opacity applied to the whole control.
+ *
+ * - `accent.solid.bg` keeps the seed exactly when black or white text reads on
+ *   it at both opacities; otherwise the fill is moved the smallest lightness
+ *   distance (ties prefer darker in light, lighter in dark) until a readable
+ *   label exists — so the fill MAY differ from the seed. Pin `accent.solid.bg`
+ *   through overrides for an exact fill.
+ * - `accent.solid.fg` is a tinted near-black or near-white (pure black/white
+ *   when the tint would not reach 4.5:1) picked by contrast, not brightness.
+ * - Hover/pressed fills darken in light and lighten in dark (mirroring the
+ *   built-in tokens); the direction flips only where following the scheme
+ *   would break the label contrast or leave the lightness range.
+ * - `accent.soft.bg` is a light tint in light / dark tint in dark, placed
+ *   relative to the surfaces; `accent.soft.fg` is solved on all three soft
+ *   states. `accent.text` (and `text.link`, the existing shorthand) is solved
+ *   on every surface; `accent.border` is solved to 3:1 on every surface.
+ * - Disabled fills are desaturated and low-contrast-but-visible, in the
+ *   spirit of the default `slate.200`/`slate.700`-like tokens.
+ *
+ * Unsatisfiable pairs (e.g. one very light and one very dark surface) are
+ * reported as `unsatisfied` diagnostics with the best deterministic colour
+ * kept; unparseable surfaces are excluded from solving and reported as
+ * `unsupported`. Nothing ever falls back to white silently.
+ *
+ */
+
+import { compositedContrast, oklchToRgb, parseColor, rgbToHex, rgbToOklch } from "./color-utils.js";
+
+/** Every canonical role a seed generates. `text.link` is kept for the existing shorthand behaviour. */
+
+export const GENERATED_ACCENT_ROLES = ["accent.text", "accent.border", "accent.solid.bg", "accent.solid.bg.hover", "accent.solid.bg.pressed", "accent.solid.bg.disabled", "accent.solid.fg", "accent.soft.bg", "accent.soft.bg.hover", "accent.soft.bg.pressed", "accent.soft.bg.disabled", "accent.soft.fg", "text.link"];
+/** The four ordinary surfaces every accent pair is evaluated over, in a fixed order. */
+export const ACCENT_SURFACE_ROLES = ["surface.canvas", "surface.default", "surface.raised", "surface.sunken"];
+
+/**
+ * The resolved scheme context a generator needs: the scheme's actual ordinary
+ * surfaces (after defaults, shared and scheme patches) and the opacity that
+ * components apply to a whole pressed control.
+ */
+
+/**
+ * `unsatisfied` — the pair was evaluated and fell below `required`.
+ * `unsupported` — a colour could not be evaluated (non-sRGB/opaque format);
+ * `ratio` is `null` and no accessibility claim is made.
+ */
+
+/** Whether `value` is an opaque six-digit sRGB hex seed (`#rrggbb`, case-insensitive). */
+export function isSupportedAccentSeed(value) {
+  return typeof value === "string" && /^#[0-9a-f]{6}$/i.test(value.trim());
+}
+
+// ─── Targets and tuning ───────────────────────────────────────────────────────
+
+/** WCAG 2.x minimum for normal text and solid/soft labels. */
+export const ACCENT_TEXT_CONTRAST = 4.5;
+/** WCAG 2.x minimum for a meaningful accent boundary on an ordinary surface. */
+export const ACCENT_BORDER_CONTRAST = 3;
+
+/** Lightness resolution of the per-role solver (OKLCH L units). */
+const L_STEP = 0.005;
+const TUNING = {
+  light: {
+    dir: -1,
+    solidStep: 0.06,
+    softBase: {
+      offset: 0.01,
+      min: 0.86,
+      max: 0.965
+    },
+    softStep: -0.04,
+    softChroma: 0.08,
+    solidDisabled: {
+      l: 0.93,
+      c: 0.02
+    },
+    softDisabled: {
+      l: 0.97,
+      c: 0.01
+    },
+    darkLabelL: 0.15,
+    lightLabelL: 0.985,
+    fallbackSurface: {
+      r: 255,
+      g: 255,
+      b: 255
+    }
+  },
+  dark: {
+    dir: 1,
+    solidStep: 0.06,
+    softBase: {
+      offset: 0.03,
+      min: 0.24,
+      max: 0.5
+    },
+    softStep: 0.06,
+    softChroma: 0.06,
+    solidDisabled: {
+      l: 0.4,
+      c: 0.04
+    },
+    softDisabled: {
+      l: 0.22,
+      c: 0.01
+    },
+    darkLabelL: 0.15,
+    lightLabelL: 0.985,
+    fallbackSurface: {
+      r: 0,
+      g: 0,
+      b: 0
+    }
+  }
+};
+const LABEL_CHROMA = 0.03;
+
+// ─── Internal helpers ─────────────────────────────────────────────────────────
+
+const opaque = rgb => ({
+  ...rgb,
+  a: 1
+});
+
+/** OKLCH → sRGB rounded to the 0-255 grid, so scores match the emitted hex exactly. */
+const toRgb = color => {
+  const rgb = oklchToRgb(color);
+  return {
+    r: Math.round(rgb.r),
+    g: Math.round(rgb.g),
+    b: Math.round(rgb.b)
+  };
+};
+
+/** A pressed opacity outside (0, 1] is not a usable multiplier; evaluate at 1 instead. */
+function normalizeOpacity(value) {
+  return Number.isFinite(value) && value > 0 && value <= 1 ? value : 1;
+}
+
+/** Parses a surface as an opaque sRGB colour; translucent or unparseable surfaces are not evaluable. */
+function parseSurface(value) {
+  const parsed = parseColor(value);
+  return parsed && parsed.a >= 1 ? parsed : null;
+}
+const clamp01 = n => Math.max(0, Math.min(1, n));
+
+/** Rounds to the solver grid so equal inputs always visit identical candidates. */
+const snap = l => Math.round(l / L_STEP) * L_STEP;
+
+/**
+ * Yields candidate lightness values starting at `start`: only in `dir` when
+ * `both` is false, otherwise alternating outward with `dir` visited first at
+ * each distance. Stops once every remaining candidate is outside [0, 1].
+ */
+function* lightnessCandidates(start, dir, both) {
+  const origin = clamp01(snap(start));
+  yield origin;
+  for (let k = 1; k <= Math.ceil(1 / L_STEP); k += 1) {
+    const forward = origin + dir * k * L_STEP;
+    const backward = origin - dir * k * L_STEP;
+    const forwardOk = forward >= -1e-9 && forward <= 1 + 1e-9;
+    const backwardOk = both && backward >= -1e-9 && backward <= 1 + 1e-9;
+    if (!forwardOk && !backwardOk) return;
+    if (forwardOk) yield clamp01(forward);
+    if (backwardOk) yield clamp01(backward);
+  }
+}
+/**
+ * Finds the first candidate colour (hue/chroma fixed, lightness varied) whose
+ * `score` — min(ratio / required) over every pair it must satisfy — reaches 1.
+ * When nothing reaches 1, returns the best-scoring candidate (deterministic).
+ */
+function solveLightness(base, start, dir, both, score) {
+  let best = null;
+  let bestScore = Number.NEGATIVE_INFINITY;
+  for (const l of lightnessCandidates(start, dir, both)) {
+    const rgb = toRgb({
+      l,
+      c: base.c,
+      h: base.h
+    });
+    const s = score(rgb);
+    if (s >= 1) return {
+      l,
+      rgb,
+      satisfied: true
+    };
+    if (s > bestScore) {
+      bestScore = s;
+      best = {
+        l,
+        rgb,
+        satisfied: false
+      };
+    }
+  }
+  return best ?? {
+    l: clamp01(start),
+    rgb: toRgb({
+      l: clamp01(start),
+      c: base.c,
+      h: base.h
+    }),
+    satisfied: false
+  };
+}
+const min = values => values.reduce((acc, v) => Math.min(acc, v), Number.POSITIVE_INFINITY);
+
+/** min over surfaces of contrast(fg on bg over surface) at each opacity, normalised by `required`. */
+function pairScore(fg, bgs, surfaces, opacities, required) {
+  const ratios = [];
+  for (const bg of bgs) {
+    for (const surface of surfaces) {
+      for (const opacity of opacities) ratios.push(compositedContrast(fg, bg, surface, opacity) / required);
+    }
+  }
+  return min(ratios);
+}
+
+/** Contrast of a standalone colour (text/border) against each surface, normalised by `required`. */
+function surfaceScore(color, surfaces, required) {
+  return min(surfaces.map(surface => compositedContrast(opaque(color), opaque(surface), surface, 1) / required));
+}
+
+// ─── Generation ───────────────────────────────────────────────────────────────
+
+/**
+ * Generates every {@link GeneratedAccentRole} for `seed` in the given scheme
+ * context. Pure and deterministic: same inputs → same output. Callers must
+ * validate the seed with {@link isSupportedAccentSeed} first.
+ */
+export function generateAccentColors(seed, context) {
+  if (!isSupportedAccentSeed(seed)) {
+    throw new Error(`generateAccentColors: unsupported seed ${JSON.stringify(seed)}; expected an opaque #rrggbb sRGB hex.`);
+  }
+  const seedHex = seed.trim().toLowerCase();
+  const seedRgb = parseColor(seedHex);
+  const seedLch = rgbToOklch(seedRgb);
+  const tuning = TUNING[context.scheme];
+  const {
+    dir
+  } = tuning;
+  const pressedOpacity = normalizeOpacity(context.pressedOpacity);
+  const opacities = pressedOpacity < 1 ? [1, pressedOpacity] : [1];
+  const evaluable = ACCENT_SURFACE_ROLES.map(role => parseSurface(context.surfaces[role])).filter(surface => surface !== null);
+  const surfaces = evaluable.length > 0 ? evaluable : [tuning.fallbackSurface];
+  const surfaceLs = surfaces.map(surface => rgbToOklch(surface).l);
+  const hue = {
+    c: seedLch.c,
+    h: seedLch.h
+  };
+  const black = {
+    r: 0,
+    g: 0,
+    b: 0,
+    a: 1
+  };
+  const white = {
+    r: 255,
+    g: 255,
+    b: 255,
+    a: 1
+  };
+
+  // ── Solid fill: keep the seed when black or white reads on it at every opacity.
+  const fillScore = (fill, fg) => pairScore(fg, [opaque(fill)], surfaces, opacities, ACCENT_TEXT_CONTRAST);
+  const readable = fill => fillScore(fill, black) >= 1 || fillScore(fill, white) >= 1;
+  let fillRgb = seedRgb;
+  let fillL = seedLch.l;
+  if (!readable(seedRgb)) {
+    const solved = solveLightness(hue, seedLch.l, dir, true, rgb => Math.max(fillScore(rgb, black), fillScore(rgb, white)));
+    fillRgb = solved.rgb;
+    fillL = solved.l;
+  }
+  const fillHex = fillRgb === seedRgb ? seedHex : rgbToHex(fillRgb);
+
+  // Label polarity by contrast, never by perceived brightness.
+  const polarity = fillScore(fillRgb, black) >= fillScore(fillRgb, white) ? "dark" : "light";
+  const pureLabel = polarity === "dark" ? black : white;
+
+  // ── Solid states: follow the scheme, flip when that would break the label or leave [0, 1].
+  const statesFor = direction => [1, 2].map(k => toRgb({
+    l: clamp01(fillL + direction * k * tuning.solidStep),
+    c: hue.c,
+    h: hue.h
+  }));
+  const statesFit = direction => {
+    const far = fillL + direction * 2 * tuning.solidStep;
+    return far >= 0.06 && far <= 0.94;
+  };
+  const statesReadable = states => pairScore(pureLabel, states.map(opaque), surfaces, opacities, ACCENT_TEXT_CONTRAST) >= 1;
+  const statesOk = direction => statesFit(direction) && statesReadable(statesFor(direction));
+  const flipped = -dir;
+  let stateDir = dir;
+  if (!statesOk(dir)) {
+    // Prefer a direction that keeps the label readable; otherwise at least stay in range.
+    if (statesOk(flipped) || !statesFit(dir) && statesFit(flipped)) stateDir = flipped;
+  }
+  const [hoverRgb, pressedRgb] = statesFor(stateDir);
+  const solidBgs = [fillRgb, hoverRgb, pressedRgb].map(opaque);
+
+  // ── Solid label: tinted near-black/near-white when it still reads everywhere, else pure.
+  const tinted = opaque(toRgb({
+    l: polarity === "dark" ? tuning.darkLabelL : tuning.lightLabelL,
+    c: Math.min(seedLch.c, LABEL_CHROMA),
+    h: seedLch.h
+  }));
+  const solidFg = pairScore(tinted, solidBgs, surfaces, opacities, ACCENT_TEXT_CONTRAST) >= 1 ? tinted : pureLabel;
+
+  // ── Standalone text and border against every surface.
+  const text = solveLightness(hue, seedLch.l, dir, false, rgb => surfaceScore(rgb, surfaces, ACCENT_TEXT_CONTRAST));
+  const border = solveLightness(hue, seedLch.l, dir, false, rgb => surfaceScore(rgb, surfaces, ACCENT_BORDER_CONTRAST));
+
+  // ── Soft tint relative to the surfaces, with its own solved foreground.
+  const softAnchor = dir === -1 ? min(surfaceLs) : Math.max(...surfaceLs);
+  const softL = Math.max(tuning.softBase.min, Math.min(tuning.softBase.max, softAnchor + tuning.softBase.offset));
+  const softChroma = Math.min(seedLch.c, tuning.softChroma);
+  const softBgs = [0, 1, 2].map(k => toRgb({
+    l: clamp01(softL + k * tuning.softStep),
+    c: softChroma,
+    h: seedLch.h
+  }));
+  const softFg = solveLightness(hue, text.l, dir, false, rgb => pairScore(opaque(rgb), softBgs.map(opaque), surfaces, [1], ACCENT_TEXT_CONTRAST));
+
+  // ── Disabled: desaturated, low-contrast-but-visible.
+  const solidDisabled = toRgb({
+    l: tuning.solidDisabled.l,
+    c: Math.min(seedLch.c, tuning.solidDisabled.c),
+    h: seedLch.h
+  });
+  const softDisabled = toRgb({
+    l: tuning.softDisabled.l,
+    c: Math.min(seedLch.c, tuning.softDisabled.c),
+    h: seedLch.h
+  });
+  const textHex = rgbToHex(text.rgb);
+  const colors = {
+    "accent.text": textHex,
+    "accent.border": rgbToHex(border.rgb),
+    "accent.solid.bg": fillHex,
+    "accent.solid.bg.hover": rgbToHex(hoverRgb),
+    "accent.solid.bg.pressed": rgbToHex(pressedRgb),
+    "accent.solid.bg.disabled": rgbToHex(solidDisabled),
+    "accent.solid.fg": rgbToHex(solidFg),
+    "accent.soft.bg": rgbToHex(softBgs[0]),
+    "accent.soft.bg.hover": rgbToHex(softBgs[1]),
+    "accent.soft.bg.pressed": rgbToHex(softBgs[2]),
+    "accent.soft.bg.disabled": rgbToHex(softDisabled),
+    "accent.soft.fg": rgbToHex(softFg.rgb),
+    "text.link": textHex
+  };
+  return {
+    colors,
+    diagnostics: checkAccentContrast(colors, context)
+  };
+}
+
+// ─── Diagnostics ──────────────────────────────────────────────────────────────
+
+function contrastPairs(pressedOpacity) {
+  const pairs = [];
+  const opacities = pressedOpacity < 1 ? [1, pressedOpacity] : [1];
+  for (const background of ["accent.solid.bg", "accent.solid.bg.hover", "accent.solid.bg.pressed"]) {
+    for (const opacity of opacities) {
+      pairs.push({
+        role: "accent.solid.fg",
+        background,
+        opacity,
+        required: ACCENT_TEXT_CONTRAST
+      });
+    }
+  }
+  for (const background of ["accent.soft.bg", "accent.soft.bg.hover", "accent.soft.bg.pressed"]) {
+    pairs.push({
+      role: "accent.soft.fg",
+      background,
+      opacity: 1,
+      required: ACCENT_TEXT_CONTRAST
+    });
+  }
+  pairs.push({
+    role: "accent.text",
+    background: "surface",
+    opacity: 1,
+    required: ACCENT_TEXT_CONTRAST
+  });
+  pairs.push({
+    role: "text.link",
+    background: "surface",
+    opacity: 1,
+    required: ACCENT_TEXT_CONTRAST
+  });
+  pairs.push({
+    role: "accent.border",
+    background: "surface",
+    opacity: 1,
+    required: ACCENT_BORDER_CONTRAST
+  });
+  return pairs;
+}
+const show = value => typeof value === "string" ? JSON.stringify(value) : String(value);
+
+/**
+ * Evaluates the final accent roles (after explicit overrides) against their
+ * intended backgrounds in the supported domain and returns the failing or
+ * unevaluable pairs. Never repairs a colour.
+ */
+export function checkAccentContrast(colors, context) {
+  const diagnostics = [];
+  const pairs = contrastPairs(normalizeOpacity(context.pressedOpacity));
+  const values = colors;
+  for (const surfaceRole of ACCENT_SURFACE_ROLES) {
+    const surfaceValue = context.surfaces[surfaceRole];
+    const surface = parseSurface(surfaceValue);
+    for (const pair of pairs) {
+      const backgroundRole = pair.background === "surface" ? surfaceRole : pair.background;
+      const where = `${pair.role} on ${backgroundRole} over ${surfaceRole} at opacity ${pair.opacity}`;
+      const fgValue = values[pair.role];
+      const fg = parseColor(fgValue);
+      const bgValue = pair.background === "surface" ? surfaceValue : values[pair.background];
+      const bg = pair.background === "surface" ? surface ? opaque(surface) : null : parseColor(bgValue);
+      const unsupported = [];
+      if (!surface) unsupported.push(`${surfaceRole} ${show(surfaceValue)} is not an opaque sRGB colour`);
+      if (!fg) unsupported.push(`${pair.role} ${show(fgValue)} is not an sRGB colour`);
+      if (!bg && pair.background !== "surface") {
+        unsupported.push(`${pair.background} ${show(bgValue)} is not an sRGB colour`);
+      }
+      if (!surface || !fg || !bg) {
+        diagnostics.push({
+          kind: "unsupported",
+          role: pair.role,
+          background: backgroundRole,
+          surface: surfaceRole,
+          opacity: pair.opacity,
+          ratio: null,
+          required: pair.required,
+          message: `${where} cannot be evaluated: ${unsupported.join("; ")}.`
+        });
+        continue;
+      }
+      const ratio = compositedContrast(fg, bg, surface, pair.opacity);
+      if (ratio < pair.required) {
+        diagnostics.push({
+          kind: "unsatisfied",
+          role: pair.role,
+          background: backgroundRole,
+          surface: surfaceRole,
+          opacity: pair.opacity,
+          ratio,
+          required: pair.required,
+          message: `${where} is ${ratio.toFixed(2)}:1, below the ${pair.required}:1 target.`
+        });
+      }
+    }
+  }
+  return diagnostics;
+}
+//# sourceMappingURL=accent-generator.js.map

package/lib/module/utils/accent-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["compositedContrast","oklchToRgb","parseColor","rgbToHex","rgbToOklch","GENERATED_ACCENT_ROLES","ACCENT_SURFACE_ROLES","isSupportedAccentSeed","value","test","trim","ACCENT_TEXT_CONTRAST","ACCENT_BORDER_CONTRAST","L_STEP","TUNING","light","dir","solidStep","softBase","offset","min","max","softStep","softChroma","solidDisabled","l","c","softDisabled","darkLabelL","lightLabelL","fallbackSurface","r","g","b","dark","LABEL_CHROMA","opaque","rgb","a","toRgb","color","Math","round","normalizeOpacity","Number","isFinite","parseSurface","parsed","clamp01","n","snap","lightnessCandidates","start","both","origin","k","ceil","forward","backward","forwardOk","backwardOk","solveLightness","base","score","best","bestScore","NEGATIVE_INFINITY","h","s","satisfied","values","reduce","acc","v","POSITIVE_INFINITY","pairScore","fg","bgs","surfaces","opacities","required","ratios","bg","surface","opacity","push","surfaceScore","map","generateAccentColors","seed","context","Error","JSON","stringify","seedHex","toLowerCase","seedRgb","seedLch","tuning","scheme","pressedOpacity","evaluable","role","filter","length","surfaceLs","hue","black","white","fillScore","fill","readable","fillRgb","fillL","solved","fillHex","polarity","pureLabel","statesFor","direction","statesFit","far","statesReadable","states","statesOk","flipped","stateDir","hoverRgb","pressedRgb","solidBgs","tinted","solidFg","text","border","softAnchor","softL","softBgs","softFg","textHex","colors","diagnostics","checkAccentContrast","contrastPairs","pairs","background","show","String","surfaceRole","surfaceValue","pair","backgroundRole","where","fgValue","bgValue","unsupported","kind","ratio","message","join","toFixed"],"sourceRoot":"../../../src","sources":["utils/accent-generator.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/utils/accent-utils.js

@@ -1,52 +1,69 @@
 "use strict";
 
-import { readableOn, shade, withAlpha } from "./color-utils.js";
-const isShorthand = accent => typeof accent.light === "string" || typeof accent.dark === "string";
+import { normalizeTokenOverride } from "../theme/legacy-tokens.js";
+import { normalizeAccentScheme } from "../theme/resolve-config.js";
+import { defaultDarkTheme, defaultLightTheme } from "../theme/theme.js";
+import { ACCENT_SURFACE_ROLES, generateAccentColors } from "./accent-generator.js";
+/**
+ * The generation context of a built-in default theme: its four ordinary
+ * surfaces and pressed opacity. Used by the {@link normalizeAccent}
+ * compatibility wrapper, which has no access to shared/scheme patches.
+ */
+export function defaultAccentContext(scheme) {
+  const theme = scheme === "light" ? defaultLightTheme : defaultDarkTheme;
+  const surfaces = {};
+  for (const role of ACCENT_SURFACE_ROLES) surfaces[role] = theme.color[role];
+  return {
+    scheme,
+    surfaces,
+    pressedOpacity: theme.opacity.pressed
+  };
+}
 
 /**
- * Expands a single hue into a fuller per-scheme patch so primary AND subtle
- * actions (plus accent text) all recolor consistently:
- * - primary: solid hue with derived hover/active and a legible foreground,
- * - subtle: soft translucent tint of the hue with the hue as foreground,
- * - text.accent / text.link / text.on-accent.
- *
- * On `light` the hover/active darken; on `dark` they lighten.
+ * Generated accent colours for `seed` with `overrides` applied last. Within
+ * the override patch canonical names beat their legacy aliases, while an
+ * alias-only key still beats the generated canonical value.
  */
-function hueToPartial(hue, scheme) {
-  if (!hue) return {};
-  const dir = scheme === "light" ? -1 : 1;
-  const isLight = scheme === "light";
-  const fg = readableOn(hue);
-  // Flat color keys to patch — deepMerge replaces string leaves directly.
+function seedToColorPatch(seed, overrides, scheme) {
+  const generated = generateAccentColors(seed, defaultAccentContext(scheme)).colors;
   const color = {
-    "action.bg.primary": hue,
-    "action.fg.primary": fg,
-    "action.bg.primary.hover": shade(hue, dir * 0.12),
-    "action.bg.primary.active": shade(hue, dir * 0.24),
-    "action.bg.primary.subtle": withAlpha(hue, isLight ? 0.12 : 0.2),
-    "action.fg.primary.subtle": hue,
-    "action.bg.primary.subtle.hover": withAlpha(hue, isLight ? 0.18 : 0.28),
-    "action.bg.primary.subtle.active": withAlpha(hue, isLight ? 0.24 : 0.36),
-    "text.accent": hue,
-    "text.link": hue,
-    "text.on-accent": fg
+    ...generated
   };
+  const normalized = normalizeTokenOverride({
+    color: overrides
+  })?.color;
+  if (normalized) {
+    for (const [key, value] of Object.entries(normalized)) {
+      if (value !== undefined) color[key] = value;
+    }
+  }
   return {
     color
   };
 }
+function normalizeSchemeInput(input, scheme) {
+  const normalized = normalizeAccentScheme(input, `accents.<accent>.${scheme}`);
+  if (normalized.kind === "none") return {};
+  if (normalized.kind === "seed") {
+    return seedToColorPatch(normalized.seed, normalized.overrides, scheme);
+  }
+  // Preserve the compatibility helper's identity contract for full patches;
+  // the resolver itself uses the sanitized copy in `normalized.patch`.
+  return input;
+}
 
-/** Normalizes any accent input into per-scheme partial-theme overrides. */
+/**
+ * Compatibility wrapper: normalizes any accent input into per-scheme
+ * partial-theme overrides. Strings and `{ seed, overrides }` are generated
+ * against the DEFAULT themes' surfaces and pressed opacity (the resolver
+ * pipeline uses the actual resolved surfaces instead); full theme patches
+ * pass through unchanged. Pure and independent of the registry.
+ */
 export function normalizeAccent(accent) {
-  if (isShorthand(accent)) {
-    return {
-      light: hueToPartial(accent.light, "light"),
-      dark: hueToPartial(accent.dark, "dark")
-    };
-  }
   return {
-    light: accent.light ?? {},
-    dark: accent.dark ?? {}
+    light: normalizeSchemeInput(accent.light, "light"),
+    dark: normalizeSchemeInput(accent.dark, "dark")
   };
 }
 //# sourceMappingURL=accent-utils.js.map

package/lib/module/utils/accent-utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["readableOn","shade","withAlpha","isShorthand","accent","light","dark","hueToPartial","hue","scheme","dir","isLight","fg","color","normalizeAccent"],"sourceRoot":"../../../src","sources":["utils/accent-utils.ts"],"mappings":";;AACA,SAASA,UAAU,EAAEC,KAAK,EAAEC,SAAS;AAGrC,MAAMC,WAAW,GAAIC,MAAc,IACjC,OAAQA,MAAM,CAAqBC,KAAK,KAAK,QAAQ,IACrD,OAAQD,MAAM,CAAqBE,IAAI,KAAK,QAAQ;;AAEtD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASC,YAAYA,CAACC,GAAuB,EAAEC,MAAwB,EAA2B;EAChG,IAAI,CAACD,GAAG,EAAE,OAAO,CAAC,CAAC;EACnB,MAAME,GAAG,GAAGD,MAAM,KAAK,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC;EACvC,MAAME,OAAO,GAAGF,MAAM,KAAK,OAAO;EAClC,MAAMG,EAAE,GAAGZ,UAAU,CAACQ,GAAG,CAAC;EAC1B;EACA,MAAMK,KAAK,GAAG;IACZ,mBAAmB,EAAEL,GAAG;IACxB,mBAAmB,EAAEI,EAAE;IACvB,yBAAyB,EAAEX,KAAK,CAACO,GAAG,EAAEE,GAAG,GAAG,IAAI,CAAC;IACjD,0BAA0B,EAAET,KAAK,CAACO,GAAG,EAAEE,GAAG,GAAG,IAAI,CAAC;IAClD,0BAA0B,EAAER,SAAS,CAACM,GAAG,EAAEG,OAAO,GAAG,IAAI,GAAG,GAAG,CAAC;IAChE,0BAA0B,EAAEH,GAAG;IAC/B,gCAAgC,EAAEN,SAAS,CAACM,GAAG,EAAEG,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC;IACvE,iCAAiC,EAAET,SAAS,CAACM,GAAG,EAAEG,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC;IACxE,aAAa,EAAEH,GAAG;IAClB,WAAW,EAAEA,GAAG;IAChB,gBAAgB,EAAEI;EACpB,CAAC;EACD,OAAO;IAAEC;EAAM,CAAC;AAClB;;AAEA;AACA,OAAO,SAASC,eAAeA,CAACV,MAAc,EAAoB;EAChE,IAAID,WAAW,CAACC,MAAM,CAAC,EAAE;IACvB,OAAO;MACLC,KAAK,EAAEE,YAAY,CAACH,MAAM,CAACC,KAAK,EAAE,OAAO,CAAC;MAC1CC,IAAI,EAAEC,YAAY,CAACH,MAAM,CAACE,IAAI,EAAE,MAAM;IACxC,CAAC;EACH;EACA,OAAO;IAAED,KAAK,EAAED,MAAM,CAACC,KAAK,IAAI,CAAC,CAAC;IAAEC,IAAI,EAAEF,MAAM,CAACE,IAAI,IAAI,CAAC;EAAE,CAAC;AAC/D","ignoreList":[]}
+{"version":3,"names":["normalizeTokenOverride","normalizeAccentScheme","defaultDarkTheme","defaultLightTheme","ACCENT_SURFACE_ROLES","generateAccentColors","defaultAccentContext","scheme","theme","surfaces","role","color","pressedOpacity","opacity","pressed","seedToColorPatch","seed","overrides","generated","colors","normalized","key","value","Object","entries","undefined","normalizeSchemeInput","input","kind","normalizeAccent","accent","light","dark"],"sourceRoot":"../../../src","sources":["utils/accent-utils.ts"],"mappings":";;AAAA,SAASA,sBAAsB;AAC/B,SAASC,qBAAqB;AAC9B,SAASC,gBAAgB,EAAEC,iBAAiB;AAS5C,SACEC,oBAAoB,EAGpBC,oBAAoB;AAItB;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,oBAAoBA,CAACC,MAAc,EAA2B;EAC5E,MAAMC,KAAK,GAAGD,MAAM,KAAK,OAAO,GAAGJ,iBAAiB,GAAGD,gBAAgB;EACvE,MAAMO,QAAQ,GAAG,CAAC,CAAsC;EACxD,KAAK,MAAMC,IAAI,IAAIN,oBAAoB,EAAEK,QAAQ,CAACC,IAAI,CAAC,GAAGF,KAAK,CAACG,KAAK,CAACD,IAAI,CAAC;EAC3E,OAAO;IAAEH,MAAM;IAAEE,QAAQ;IAAEG,cAAc,EAAEJ,KAAK,CAACK,OAAO,CAACC;EAAQ,CAAC;AACpE;;AAEA;AACA;AACA;AACA;AACA;AACA,SAASC,gBAAgBA,CACvBC,IAAY,EACZC,SAA0C,EAC1CV,MAAc,EACW;EACzB,MAAMW,SAAS,GAAGb,oBAAoB,CAACW,IAAI,EAAEV,oBAAoB,CAACC,MAAM,CAAC,CAAC,CAACY,MAAM;EACjF,MAAMR,KAA6B,GAAG;IAAE,GAAGO;EAAU,CAAC;EACtD,MAAME,UAAU,GAAGpB,sBAAsB,CAAC;IAAEW,KAAK,EAAEM;EAAU,CAAC,CAAC,EAAEN,KAAK;EACtE,IAAIS,UAAU,EAAE;IACd,KAAK,MAAM,CAACC,GAAG,EAAEC,KAAK,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACJ,UAAU,CAAC,EAAE;MACrD,IAAIE,KAAK,KAAKG,SAAS,EAAEd,KAAK,CAACU,GAAG,CAAC,GAAGC,KAAe;IACvD;EACF;EACA,OAAO;IAAEX;EAAM,CAAC;AAClB;AAEA,SAASe,oBAAoBA,CAACC,KAAoC,EAAEpB,MAAc,EAA2B;EAC3G,MAAMa,UAAU,GAAGnB,qBAAqB,CAAC0B,KAAK,EAAE,oBAAoBpB,MAAM,EAAE,CAAC;EAC7E,IAAIa,UAAU,CAACQ,IAAI,KAAK,MAAM,EAAE,OAAO,CAAC,CAAC;EACzC,IAAIR,UAAU,CAACQ,IAAI,KAAK,MAAM,EAAE;IAC9B,OAAOb,gBAAgB,CAACK,UAAU,CAACJ,IAAI,EAAEI,UAAU,CAACH,SAAS,EAAEV,MAAM,CAAC;EACxE;EACA;EACA;EACA,OAAOoB,KAAK;AACd;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASE,eAAeA,CAACC,MAAc,EAAoB;EAChE,OAAO;IACLC,KAAK,EAAEL,oBAAoB,CAACI,MAAM,CAACC,KAAK,EAAE,OAAO,CAAC;IAClDC,IAAI,EAAEN,oBAAoB,CAACI,MAAM,CAACE,IAAI,EAAE,MAAM;EAChD,CAAC;AACH","ignoreList":[]}