@rojaostudio/ds-core 1.1.0-next.10 → 1.1.0-next.12

package/dist/{chunk-LP6UA4EW.js → chunk-NVYJME6V.js}

@@ -874,6 +874,16 @@ function stateFills(scale, fill, text, preferred) {
     return (_a = ok[i]) != null ? _a : p;
   });
 }
+var carry = (scale, fill, text, value) => contrastRatio(text, value) >= AA ? value : stateFills(scale, fill, text, [value])[0];
+function over(top, below) {
+  const ch = (h, i) => parseInt(h.slice(1 + 2 * i, 3 + 2 * i), 16);
+  const a = top.length === 9 ? ch(top, 3) / 255 : 1;
+  return `#${[0, 1, 2].map((i) => Math.round(ch(top, i) * a + ch(below, i) * (1 - a)).toString(16).padStart(2, "0")).join("")}`;
+}
+var PLATE_MIN = 6;
+function distinct(a, b) {
+  return contrastRatio(a, b) >= 1.5 || Math.abs(hexToHsl(a)[1] - hexToHsl(b)[1]) >= 40;
+}
 var defaultWarn = (m) => {
   var _a;
   return (_a = globalThis.console) == null ? void 0 : _a.warn(m);
@@ -903,7 +913,7 @@ var ROLES = [
   ["text/on/accent", "d", "d"],
   ["text/on/tint", "d", "b"],
   ["colors/state/error", "l", "l"],
-  ["colors/state/error-strong", "d", "d"],
+  ["colors/state/error-strong", "p", "p"],
   ["surface/tint/strong", "d", "b"],
   ["text/on/error", "l", "l"],
   ["surface/action/default", "d", "b"],
@@ -989,7 +999,7 @@ var TINT_DEFAULT = 200;
 var lighterStep = (s) => s - 100 ;
 var roleVar = (role) => `--${role.replaceAll("/", "-")}`;
 function generateRdsTheme(def, opts = {}) {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const warn = (_a = opts.warn) != null ? _a : defaultWarn;
   const where = `generateRdsTheme(${preview(def == null ? void 0 : def.name)})`;
   if (!(def == null ? void 0 : def.brand) || typeof def.brand !== "object") throw new Error(`${where}: brand is missing`);
@@ -1003,13 +1013,13 @@ function generateRdsTheme(def, opts = {}) {
   const L = palette("blue");
   const red = palette("red"), green = palette("green"), orange = palette("orange");
   const teal = palette("teal"), purple = palette("purple");
-  const lightBgs = [WHITE, N[100]];
+  const lightBgs = [WHITE, N[100], N[200], A.scale[200]];
   let heading;
   if (b.heading) {
     heading = ramp(b.heading, own).base;
     if (!readsOn(heading, lightBgs)) {
       const worst = Math.min(...lightBgs.map((bg) => contrastRatio(heading, bg)));
-      warn(`generateRdsTheme(${def.name}): heading ${heading} is ${worst.toFixed(2)}:1 on surface/card or surface/page (AA asks 4.5:1). Kept as given.`);
+      warn(`generateRdsTheme(${def.name}): heading ${heading} is ${worst.toFixed(2)}:1 on surface/card, surface/page, surface/muted-strong or colors/accent/highlight (AA asks 4.5:1). Kept as given.`);
     }
   } else heading = readableFrom(P.base, P.scale, lightBgs, "darker", BLACK);
   const invert = b.invert ? ramp(b.invert, own).base : WHITE;
@@ -1101,6 +1111,16 @@ function generateRdsTheme(def, opts = {}) {
     "logo/inverse-signature": WHITE,
     "social/ink": BLACK
   };
+  const single = !b.secondary;
+  const K = single ? N : P.scale;
+  if (single) {
+    const steps = [900, 800, 700, 600, 500];
+    const k = Math.max(0, steps.findIndex((s) => distinct(N[s], l["colors/secondary/default"])));
+    l["colors/primary/default"] = N[steps[Math.min(k, 2)]];
+    l["colors/primary/dark"] = N[steps[Math.min(k, 2) + 1]];
+    l["colors/primary/active"] = N[steps[Math.min(k, 2) + 2]];
+    l["colors/primary/light"] = N[500];
+  }
   for (const [fill, text] of [
     ["colors/primary/default", "text/on/primary"],
     ["colors/secondary/default", "text/on/secondary"],
@@ -1113,10 +1133,12 @@ function generateRdsTheme(def, opts = {}) {
     ["colors/state/neutral", "text/on/neutral"],
     ["surface/cover", "text/on/cover"],
     ["surface/lift/action", "text/on/lift-action"],
-    ["colors/primary/dark", "text/on/primary-strong"],
+    ["colors/primary/default", "text/on/primary-strong"],
     ["surface/tint/default", "text/on/tint"]
   ]) l[text] = on(l[fill]);
-  [l["colors/primary/active"]] = stateFills(P.scale, l["colors/primary/default"], l["text/on/primary"], [l["colors/primary/active"]]);
+  for (const role of ["colors/primary/dark", "colors/primary/light"])
+    l[role] = carry(K, l["colors/primary/default"], l["text/on/primary-strong"], l[role]);
+  [l["colors/primary/active"]] = stateFills(K, l["colors/primary/default"], l["text/on/primary"], [l["colors/primary/active"]]);
   [l["colors/secondary/hover"], l["colors/secondary/active"]] = stateFills(
     S.scale,
     l["colors/secondary/default"],
@@ -1125,9 +1147,9 @@ function generateRdsTheme(def, opts = {}) {
   );
   [l["colors/accent/hover"]] = stateFills(A.scale, l["colors/accent/default"], l["text/on/accent"], [l["colors/accent/hover"]]);
   l["border/error"] = readableFrom(l["colors/state/error"], red, [l["surface/card"]], awayFrom(l["surface/card"]), BLACK, NON_TEXT);
-  l["chart/series/1"] = readableFrom(P.scale[600], P.scale, [l["surface/card"]], awayFrom(l["surface/card"]), BLACK, NON_TEXT);
-  l["logo/primary"] = l["colors/primary/default"];
-  l["logo/signature"] = l["colors/primary/default"];
+  l["chart/series/1"] = readableFrom(P.scale[600], P.scale, [l["surface/card"], l["surface/page"]], awayFrom(l["surface/card"]), BLACK, NON_TEXT);
+  l["logo/primary"] = readableFrom(P.base, P.scale, [l["surface/card"], l["surface/page"], l["surface/panel"]], "darker", BLACK, NON_TEXT);
+  l["logo/signature"] = l["logo/primary"];
   l["logo/accent"] = l["colors/accent/logo"];
   l["logo/accent-2"] = l["colors/secondary/default"];
   l["logo/accent-3"] = l["colors/accent/default"];
@@ -1176,7 +1198,6 @@ function generateRdsTheme(def, opts = {}) {
     "text/on/action-tonal": readableFrom(P.scale[200], P.scale, [L[900]], "lighter", WHITE),
     "surface/lift/action": P.scale[800],
     "surface/lift/action-strong": P.scale[700],
-    "colors/state/error-strong": red[400],
     "colors/state/success-strong": green[300],
     "colors/state/warning-strong": orange[400],
     "surface/error": red[900],
@@ -1203,16 +1224,29 @@ function generateRdsTheme(def, opts = {}) {
     "colors/state/neutral-strong": N[400],
     "text/on/primary-subtle": black(30)
   };
+  if (single) {
+    const steps = [200, 300, 100, 400];
+    const s = (_b = steps.find((st) => distinct(N[st], d["colors/secondary/default"]))) != null ? _b : 200;
+    d["colors/primary/default"] = N[s];
+    d["colors/primary/dark"] = N[s === 100 ? 50 : s - 100];
+    d["colors/primary/active"] = N[s + 100];
+    d["colors/primary/light"] = N[s + 200];
+  }
+  d["surface/tint/default"] = readableFrom(d["surface/tint/default"], A.scale, [d["text/body"], d["text/muted"], d["colors/primary/default"]], "darker", N[900]);
+  d["surface/tint/subtle"] = d["surface/tint/default"];
+  d["colors/accent/highlight"] = readableFrom(d["colors/accent/highlight"], A.scale, [d["text/heading"]], "darker", N[900]);
   for (const [fill, text] of [
     ["colors/primary/default", "text/on/primary"],
     ["colors/secondary/default", "text/on/secondary"],
     ["colors/accent/default", "text/on/accent"],
     ["colors/accent/mark", "text/on/accent-mark"],
-    ["colors/primary/dark", "text/on/primary-strong"],
+    ["colors/primary/default", "text/on/primary-strong"],
     ["surface/tint/default", "text/on/tint"],
     ["surface/lift/action", "text/on/lift-action"]
   ]) d[text] = on(d[fill]);
-  [d["colors/primary/active"]] = stateFills(P.scale, d["colors/primary/default"], d["text/on/primary"], [d["colors/primary/active"]]);
+  for (const role of ["colors/primary/dark", "colors/primary/light"])
+    d[role] = carry(K, d["colors/primary/default"], d["text/on/primary-strong"], d[role]);
+  [d["colors/primary/active"]] = stateFills(K, d["colors/primary/default"], d["text/on/primary"], [d["colors/primary/active"]]);
   [d["colors/secondary/hover"], d["colors/secondary/active"]] = stateFills(
     S.scale,
     d["colors/secondary/default"],
@@ -1220,16 +1254,25 @@ function generateRdsTheme(def, opts = {}) {
     [d["colors/secondary/hover"], d["colors/secondary/active"]]
   );
   [d["colors/accent/hover"]] = stateFills(A.scale, d["colors/accent/default"], d["text/on/accent"], [d["colors/accent/hover"]]);
-  d["border/error"] = readableFrom(d["colors/state/error-strong"], red, [d["surface/card"]], awayFrom(d["surface/card"]), WHITE, NON_TEXT);
+  d["border/error"] = readableFrom(red[400], red, [d["surface/card"]], awayFrom(d["surface/card"]), WHITE, NON_TEXT);
   d["chart/series/1"] = readableFrom(P.scale[400], P.scale, [d["surface/card"]], awayFrom(d["surface/card"]), WHITE, NON_TEXT);
-  const plate = l["colors/primary/default"];
+  const ink0 = on(P.base);
+  const plate = contrastRatio(ink0, P.base) >= PLATE_MIN ? P.base : readableFrom(P.base, P.scale, [ink0], ink0 === WHITE ? "darker" : "lighter", ink0 === WHITE ? BLACK : WHITE, PLATE_MIN);
   const ink = on(plate);
   const inkA = ink === WHITE ? white : black;
   const antiInk = ink === WHITE ? black : white;
   const lp = relativeLuminance(plate);
   const isPlate = (c) => c.toLowerCase() === plate.toLowerCase();
-  const plateCard = P.scale[800] && !isPlate(P.scale[800]) && contrastRatio(ink, P.scale[800]) >= AA ? P.scale[800] : (_b = SCALE_STEPS.map((st) => P.scale[st]).filter((c) => !!c && isHex(c) && !isPlate(c)).sort((a, b2) => Math.abs(relativeLuminance(a) - lp) - Math.abs(relativeLuminance(b2) - lp)).find((c) => contrastRatio(ink, c) >= AA)) != null ? _b : plate;
-  const onPrimaryStrong = contrastRatio(plate, P.scale[100]) >= AA ? plate : on(P.scale[100]);
+  const plateCard = P.scale[800] && !isPlate(P.scale[800]) && contrastRatio(ink, P.scale[800]) >= PLATE_MIN ? P.scale[800] : (_c = SCALE_STEPS.map((st) => P.scale[st]).filter((c) => !!c && isHex(c) && !isPlate(c)).sort((a, b2) => Math.abs(relativeLuminance(a) - lp) - Math.abs(relativeLuminance(b2) - lp)).find((c) => contrastRatio(ink, c) >= PLATE_MIN)) != null ? _c : plate;
+  const plateBgs = [plate, plateCard];
+  const ov = plateBgs.every((bg) => contrastRatio(ink, over(inkA(20), bg)) >= AA) ? inkA : ink === WHITE ? black : white;
+  const under = [...plateBgs, ...plateBgs.map((bg) => over(ov(10), bg))];
+  const quiet = (pct, min = AA, bgs = under) => {
+    for (let p = pct; p < 100; p += 5) if (bgs.every((bg) => contrastRatio(over(inkA(p), bg), bg) >= min)) return inkA(p);
+    return ink;
+  };
+  const fieldBorder = quiet(60, NON_TEXT, plateBgs);
+  const fieldAlpha = fieldBorder.length === 9 ? Math.round(parseInt(fieldBorder.slice(7), 16) / 255 * 100) : 100;
   const br = {
     "colors/primary/light": P.scale[300],
     "colors/primary/default": ink,
@@ -1246,33 +1289,37 @@ function generateRdsTheme(def, opts = {}) {
     "surface/card": plateCard,
     "surface/panel": plate,
     "border/default": inkA(20),
-    "surface/tint/default": inkA(10),
-    "surface/tint/strong": inkA(20),
-    "surface/tint/subtle": inkA(5),
+    "surface/tint/default": ov(10),
+    "surface/tint/strong": ov(20),
+    "surface/tint/subtle": ov(5),
     "text/on/action-tonal": ink,
     "text/on/primary": plate,
     "text/on/secondary": plate,
     "text/on/tint": ink,
-    "surface/action/default": inkA(10),
-    "surface/action/strong": inkA(20),
+    "surface/action/default": ov(10),
+    "surface/action/strong": ov(20),
     "focus/ring": ink,
     "focus/ring-inset": plate,
     "surface/disabled": inkA(10),
     "text/disabled": inkA(40),
-    "text/muted": inkA(70),
+    "text/muted": quiet(70),
     "text/disabled-invert": antiInk(40),
     "text/action": ink,
-    "surface/lift/action": inkA(10),
+    "surface/lift/action": ov(10),
     "text/on/lift-action": ink,
-    "surface/lift/action-strong": inkA(20),
-    "text/on/primary-strong": onPrimaryStrong,
-    "text/subtle": inkA(60),
-    "surface/muted": inkA(10),
-    "surface/muted-strong": inkA(20),
-    "border/strong": inkA(60),
-    "border/strong-hover": inkA(80),
+    "surface/lift/action-strong": ov(20),
+    // The label of the neutral Button on the plate, whose fill is the ink: the plate colour.
+    "text/on/primary-strong": plate,
+    "text/subtle": quiet(60),
+    "surface/muted": ov(10),
+    "surface/muted-strong": ov(20),
+    "border/strong": fieldBorder,
+    "border/strong-hover": fieldAlpha + 20 < 100 ? inkA(fieldAlpha + 20) : ink,
     "text/on/primary-subtle": inkA(30)
   };
+  for (const role of ["colors/primary/dark", "colors/primary/light"])
+    br[role] = carry(P.scale, br["colors/primary/default"], br["text/on/primary-strong"], br[role]);
+  br["colors/primary/dark"] = readableFrom(br["colors/primary/dark"], P.scale, [plateCard], awayFrom(plateCard), ink, NON_TEXT);
   [br["colors/primary/active"]] = stateFills(P.scale, br["colors/primary/default"], br["text/on/primary"], [br["colors/primary/active"]]);
   [br["colors/secondary/hover"], br["colors/secondary/active"]] = stateFills(
     S.scale,
@@ -1280,11 +1327,24 @@ function generateRdsTheme(def, opts = {}) {
     br["text/on/secondary"],
     [br["colors/secondary/hover"], br["colors/secondary/active"]]
   );
-  const brandError = readableFrom(red[300], red, [plateCard], awayFrom(plateCard), ink, NON_TEXT);
+  const brandError = readableFrom(red[300], red, plateBgs.slice().reverse(), awayFrom(plateCard), ink, NON_TEXT);
+  const lightPlate = ink === BLACK;
+  const plateOwn = {};
+  for (const [st, rampOf] of [["error", red], ["success", green], ["info", L], ["warning", orange], ["neutral", N]]) {
+    const from = lightPlate ? l : d;
+    const soft = [`surface/${st}`, ...st === "error" ? ["surface/error-strong"] : []];
+    for (const s of soft) plateOwn[s] = from[s];
+    plateOwn[`text/${st}`] = readableFrom(from[`text/${st}`], rampOf, [...under, ...soft.map((s) => from[s])], awayFrom(plate), ink);
+  }
+  plateOwn["colors/accent/highlight"] = (_d = [d["colors/accent/highlight"], l["colors/accent/highlight"]].find((c) => contrastRatio(ink, c) >= AA)) != null ? _d : readableFrom(l["colors/accent/highlight"], A.scale, [ink], lightPlate ? "lighter" : "darker", ink === WHITE ? BLACK : WHITE);
+  plateOwn["chart/series/1"] = readableFrom(d["chart/series/1"], P.scale, plateBgs, awayFrom(plate), ink, NON_TEXT);
+  plateOwn["colors/state/neutral-strong"] = readableFrom(d["colors/state/neutral-strong"], N, plateBgs, awayFrom(plate), ink, NON_TEXT);
+  for (const logo of ["logo/primary", "logo/signature", "logo/accent", "logo/mono", "social/ink"]) plateOwn[logo] = ink;
+  const fixed = { "colors/state/error-strong": red[700] };
   const out = { light: {}, dark: {}, brand: {} };
   const pick = (src, role) => {
     var _a2;
-    const table = src === "l" ? l : src === "d" ? d : br;
+    const table = src === "l" ? l : src === "d" ? d : src === "p" ? fixed : br;
     const v = (_a2 = table[role]) != null ? _a2 : l[role];
     if (v === void 0) throw new Error(`rdsTheme: no value for "${role}"`);
     return v;
@@ -1295,6 +1355,7 @@ function generateRdsTheme(def, opts = {}) {
     out.brand[roleVar(role)] = pick(brandSrc, role);
   }
   out.brand[roleVar("border/error")] = brandError;
+  for (const [role, v] of Object.entries(plateOwn)) out.brand[roleVar(role)] = v;
   assertSafeTheme(out, where);
   return out;
 }
@@ -1385,15 +1446,56 @@ var RDS_CONTRAST_PAIRS = [
   ["text/on/info", "colors/state/info"],
   ["text/on/warning", "colors/state/warning"],
   ["text/on/neutral", "colors/state/neutral"],
-  ["text/error", "surface/error"]
+  ["text/error", "surface/error"],
+  // The pairs the components join (packages/ds, styles/rds/components.css): the label of the neutral Button and
+  // Badge on its fill and hovers, the brand ink as text (colors/primary/default) on the card, the pressed outline Button,
+  // the Badge highlight, the selected entry, quiet text and state text where they are placed.
+  ["text/on/primary-strong", "colors/primary/default"],
+  ["text/on/primary-strong", "colors/primary/light"],
+  ["text/on/primary-strong", "colors/primary/active"],
+  ["colors/primary/default", "surface/card"],
+  ["colors/primary/default", "surface/tint/default"],
+  ["text/heading", "surface/muted-strong"],
+  ["text/heading", "colors/accent/highlight"],
+  ["text/body", "surface/tint/default"],
+  ["text/muted", "surface/tint/default"],
+  ["text/on/tint", "surface/tint/subtle"],
+  ["text/action", "surface/action/strong"],
+  ["text/muted", "surface/page"],
+  ["text/muted", "surface/panel"],
+  ["text/subtle", "surface/card"],
+  ["text/subtle", "surface/panel"],
+  ["text/error", "surface/card"],
+  ["text/error", "surface/page"],
+  ["text/error", "surface/error-strong"],
+  ["text/success", "surface/success"],
+  ["text/success", "surface/card"],
+  ["text/info", "surface/info"],
+  ["text/warning", "surface/warning"],
+  ["text/neutral", "surface/neutral"]
+];
+var RDS_NON_TEXT_PAIRS = [
+  ["border/strong", "surface/card"],
+  ["border/strong", "surface/page"],
+  ["border/error", "surface/card"],
+  ["focus/ring", "surface/page"],
+  ["focus/ring", "surface/card"],
+  ["logo/primary", "surface/card"],
+  ["logo/primary", "surface/page"],
+  ["logo/primary", "surface/panel"],
+  ["chart/series/1", "surface/card"],
+  ["chart/series/1", "surface/page"],
+  ["colors/state/neutral-strong", "surface/panel"],
+  ["colors/state/neutral-strong", "surface/card"]
 ];
 function rdsContrastReport(theme) {
   const out = [];
   for (const mode of ["light", "dark", "brand"])
-    for (const [fg, bg] of RDS_CONTRAST_PAIRS) {
-      const ratio = rdsContrast(theme, mode, fg, bg);
-      if (ratio !== null && ratio < AA) out.push({ mode, fg, bg, ratio: Math.round(ratio * 100) / 100 });
-    }
+    for (const [pairs, min] of [[RDS_CONTRAST_PAIRS, AA], [RDS_NON_TEXT_PAIRS, NON_TEXT]])
+      for (const [fg, bg] of pairs) {
+        const ratio = rdsContrast(theme, mode, fg, bg);
+        if (ratio !== null && ratio < min) out.push({ mode, fg, bg, ratio: Math.round(ratio * 100) / 100, min });
+      }
   return out;
 }
 var isColourRef = (v) => /^[a-z][a-z0-9-]*\/[a-z]?\d+$/i.test(v);
@@ -1470,8 +1572,8 @@ function rdsThemeFromTable(table, opts = {}) {
   const fails = rdsContrastReport(out);
   if (fails.length)
     warn(
-      `${where}: ${fails.length} text pair(s) below 4.5:1
-  ` + fails.map((f) => `${f.mode}: ${f.fg} on ${f.bg} ${f.ratio}:1`).join("\n  ")
+      `${where}: ${fails.length} pair(s) below WCAG (4.5:1 text, 3:1 non-text)
+  ` + fails.map((f) => `${f.mode}: ${f.fg} on ${f.bg} ${f.ratio}:1 (min ${f.min}:1)`).join("\n  ")
     );
   return out;
 }
@@ -1553,10 +1655,10 @@ var CSS_FILE = /^[a-z0-9_@./-]+\.css$/i;
 var CSS_URL = /^https?:\/\/[^\s"'`<>()\\]+$/i;
 var INSTALL = /^(?:pnpm add|yarn add|bun add|npm install|npm i) @rojaostudio\/ds(?:@[a-z0-9][a-z0-9.+-]*)?$/;
 var ROLE_DOCS = [
-  { role: "colors/primary/default", use: "primary action, brand fills" },
-  { role: "text/on/primary", use: "text/icon on the primary fill" },
-  { role: "colors/primary/active", use: "pressed primary" },
-  { role: "colors/secondary/default", use: "secondary brand fill (with `--text-on-secondary`)" },
+  { role: "colors/primary/default", use: "neutral ink fill: neutral Button and Badge, bars, Tooltip" },
+  { role: "text/on/primary", use: "text/icon on the neutral ink fill" },
+  { role: "colors/primary/active", use: "pressed neutral ink fill" },
+  { role: "colors/secondary/default", use: "action fill: the default Button, checkbox, switch (with `--text-on-secondary`)" },
   { role: "colors/accent/default", use: "highlight \u2014 sparingly (with `--text-on-accent`)" },
   { role: "surface/page", use: "page background" },
   { role: "surface/card", use: "cards" },
@@ -1665,7 +1767,7 @@ ${themeImport}
 - ${opts.cssUrl ? `The theme is served from \`${opts.cssUrl}\`.` : `\`${cssFile}\` is the brand theme, generated \u2014 a file **you own**; commit it. Regenerate it
   with \`npx rojao-ds init\` instead of editing it by hand.`}
 - Dark mode: \`class="dark"\` on \`<html>\` (or any element). Light AND dark are first-class.
-- Brand plate: \`class="ds-plate"\` on a section paints it with the primary color; the roles inside
+- Brand plate: \`class="ds-plate"\` on a section paints it with the brand color; the roles inside
   flip so text and components stay legible.
 
 ## Components first
@@ -1700,7 +1802,7 @@ Brand's own variables (same value in every mode): ${own.map((v) => `\`${v}\``).j
 - **Font:** \`font-family: var(${f.font})\` \u2014 never substitute.
 
 ## Rules (do / don't)
-- \u2705 Primary action = \`Button\` (it already paints \`--colors-primary-default\` + \`--text-on-primary\`).
+- \u2705 Primary action = \`Button\` (tone action paints \`--colors-secondary-default\` + \`--text-on-secondary\`).
 - \u2705 Page uses \`--surface-page\`; cards \`--surface-card\`; body text \`--text-body\`.
 - \u2705 \`--colors-accent-default\` is the highlight \u2014 use it sparingly.
 - \u2705 Spacing, radius and type come ONLY from the foundation tokens above.
@@ -1718,4 +1820,4 @@ Brand's own variables (same value in every mode): ${own.map((v) => `\`${v}\``).j
   return text;
 }
 
-export { RDS_CONTRAST_PAIRS, RDS_SCOPE_SELECTORS, RDS_TOKEN_SCOPE, ROLES, RdsValidationError, SCALE_STEPS, brandTones, buildScale, contrastRatio, emitClaudeMd, emitCss, emitRdsCss, generateRdsTheme, generateTheme, hexToHsl, hslToHex, isHex, isNeutralBrand, isSafeColor, isSafeFont, isSafeVarName, onColor, rdsContrast, rdsContrastReport, rdsThemeFromTable, refToHex, relativeLuminance, resolveTheme, roleVar };
+export { RDS_CONTRAST_PAIRS, RDS_NON_TEXT_PAIRS, RDS_SCOPE_SELECTORS, RDS_TOKEN_SCOPE, ROLES, RdsValidationError, SCALE_STEPS, brandTones, buildScale, contrastRatio, emitClaudeMd, emitCss, emitRdsCss, generateRdsTheme, generateTheme, hexToHsl, hslToHex, isHex, isNeutralBrand, isSafeColor, isSafeFont, isSafeVarName, onColor, rdsContrast, rdsContrastReport, rdsThemeFromTable, refToHex, relativeLuminance, resolveTheme, roleVar };

package/dist/generate.d.ts

@@ -14,9 +14,10 @@ type RdsThemeOptions = {
 /**
  * Roles of the [RDS] theme collection, in Figma order: [name, dark source, brand source].
  * The light mode always reads the plain base token. In dark and brand, Figma points either to the
- * mode's own variant (`d` = base dark/…, `b` = base brand/…) or back to another one (`l` = plain).
+ * mode's own variant (`d` = base dark/…, `b` = base brand/…) or back to another one (`l` = plain), or straight
+ * to a primitive of the [RDS] Primitives library (`p`: the same colour for every brand, see FIXED in the generator).
  */
-declare const ROLES: ReadonlyArray<readonly [string, "l" | "d", "l" | "d" | "b"]>;
+declare const ROLES: ReadonlyArray<readonly [string, "l" | "d" | "p", "l" | "d" | "b" | "p"]>;
 /** CSS custom property of a role: the Figma path with hyphens (the [RDS] codeSyntax rule). */
 declare const roleVar: (role: string) => string;
 declare function generateRdsTheme(def: BrandDef, opts?: RdsThemeOptions): RdsTheme;
@@ -62,13 +63,23 @@ declare function rdsContrast(theme: RdsTheme, mode: RdsMode, fg: string, bg: str
  * alpha colour is skipped (its contrast depends on what is below).
  */
 declare const RDS_CONTRAST_PAIRS: ReadonlyArray<readonly [string, string]>;
+/**
+ * What is not text but has to be seen (WCAG 1.4.11, 3:1): the border of a field and of a field in error, the focus
+ * ring, the brand's logo and its chart series, on the surfaces they are placed on.
+ */
+declare const RDS_NON_TEXT_PAIRS: ReadonlyArray<readonly [string, string]>;
+/** A pair below its minimum: 4.5:1 for text (RDS_CONTRAST_PAIRS), 3:1 for the rest (RDS_NON_TEXT_PAIRS). */
 type RdsContrastFailure = {
     mode: RdsMode;
     fg: string;
     bg: string;
     ratio: number;
+    min: number;
 };
-/** The pairs of RDS_CONTRAST_PAIRS that fail WCAG AA (4.5:1), mode by mode. Empty means every pair passes. */
+/**
+ * The pairs of RDS_CONTRAST_PAIRS below WCAG AA (4.5:1) and of RDS_NON_TEXT_PAIRS below 3:1, mode by mode. Empty
+ * means every pair passes. A pair with an alpha colour is skipped (rdsContrast).
+ */
 declare function rdsContrastReport(theme: RdsTheme): RdsContrastFailure[];
 /**
  * A brand as drawn in the [RDS] Base Tokens file: for each theme mode, every role points to a primitive of the
@@ -218,4 +229,4 @@ declare function isNeutralBrand(def: {
     palettes?: PaletteDefs;
 }): boolean;
 
-export { BrandDef, type ClaudeMdOptions, type ClaudeMdTarget, RDS_CONTRAST_PAIRS, ROLES as RDS_ROLES, RDS_SCOPE_SELECTORS, RDS_TOKEN_SCOPE, type RdsBrandTable, type RdsContrastFailure, type RdsCssOptions, type RdsMode, type RdsTheme, type RdsThemeOptions, RdsValidationError, SCALE_STEPS, type Scale, type ScaleStep, brandTones, buildScale, contrastRatio, emitClaudeMd, emitCss, emitRdsCss, generateRdsTheme, hexToHsl, hslToHex, isHex, isNeutralBrand, isSafeColor, isSafeFont, isSafeVarName, onColor, rdsContrast, rdsContrastReport, rdsThemeFromTable, refToHex, relativeLuminance, roleVar };
+export { BrandDef, type ClaudeMdOptions, type ClaudeMdTarget, RDS_CONTRAST_PAIRS, RDS_NON_TEXT_PAIRS, ROLES as RDS_ROLES, RDS_SCOPE_SELECTORS, RDS_TOKEN_SCOPE, type RdsBrandTable, type RdsContrastFailure, type RdsCssOptions, type RdsMode, type RdsTheme, type RdsThemeOptions, RdsValidationError, SCALE_STEPS, type Scale, type ScaleStep, brandTones, buildScale, contrastRatio, emitClaudeMd, emitCss, emitRdsCss, generateRdsTheme, hexToHsl, hslToHex, isHex, isNeutralBrand, isSafeColor, isSafeFont, isSafeVarName, onColor, rdsContrast, rdsContrastReport, rdsThemeFromTable, refToHex, relativeLuminance, roleVar };

package/dist/generate.js

@@ -1,3 +1,3 @@
-export { RDS_CONTRAST_PAIRS, ROLES as RDS_ROLES, RDS_SCOPE_SELECTORS, RDS_TOKEN_SCOPE, RdsValidationError, SCALE_STEPS, brandTones, buildScale, contrastRatio, emitClaudeMd, emitCss, emitRdsCss, generateRdsTheme, generateTheme, hexToHsl, hslToHex, isHex, isNeutralBrand, isSafeColor, isSafeFont, isSafeVarName, onColor, rdsContrast, rdsContrastReport, rdsThemeFromTable, refToHex, relativeLuminance, resolveTheme, roleVar } from './chunk-LP6UA4EW.js';
+export { RDS_CONTRAST_PAIRS, RDS_NON_TEXT_PAIRS, ROLES as RDS_ROLES, RDS_SCOPE_SELECTORS, RDS_TOKEN_SCOPE, RdsValidationError, SCALE_STEPS, brandTones, buildScale, contrastRatio, emitClaudeMd, emitCss, emitRdsCss, generateRdsTheme, generateTheme, hexToHsl, hslToHex, isHex, isNeutralBrand, isSafeColor, isSafeFont, isSafeVarName, onColor, rdsContrast, rdsContrastReport, rdsThemeFromTable, refToHex, relativeLuminance, resolveTheme, roleVar } from './chunk-NVYJME6V.js';
 import './chunk-FRWRLCYM.js';
 import './chunk-ORMEWXMH.js';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { G as GenResult, R as ResolvedTheme, T as TokenMap, g as generateTheme, r as resolveTheme } from './generateTheme-CUfNpsKs.js';
-export { ClaudeMdOptions, ClaudeMdTarget, RDS_CONTRAST_PAIRS, RDS_ROLES, RDS_SCOPE_SELECTORS, RDS_TOKEN_SCOPE, RdsBrandTable, RdsContrastFailure, RdsCssOptions, RdsMode, RdsTheme, RdsThemeOptions, RdsValidationError, SCALE_STEPS, Scale, ScaleStep, brandTones, buildScale, contrastRatio, emitClaudeMd, emitCss, emitRdsCss, generateRdsTheme, hexToHsl, hslToHex, isHex, isNeutralBrand, isSafeColor, isSafeFont, isSafeVarName, onColor, rdsContrast, rdsContrastReport, rdsThemeFromTable, refToHex, relativeLuminance, roleVar } from './generate.js';
+export { ClaudeMdOptions, ClaudeMdTarget, RDS_CONTRAST_PAIRS, RDS_NON_TEXT_PAIRS, RDS_ROLES, RDS_SCOPE_SELECTORS, RDS_TOKEN_SCOPE, RdsBrandTable, RdsContrastFailure, RdsCssOptions, RdsMode, RdsTheme, RdsThemeOptions, RdsValidationError, SCALE_STEPS, Scale, ScaleStep, brandTones, buildScale, contrastRatio, emitClaudeMd, emitCss, emitRdsCss, generateRdsTheme, hexToHsl, hslToHex, isHex, isNeutralBrand, isSafeColor, isSafeFont, isSafeVarName, onColor, rdsContrast, rdsContrastReport, rdsThemeFromTable, refToHex, relativeLuminance, roleVar } from './generate.js';
 export { A as Archetype, B as BrandColors, a as BrandDef, C as ColorRef, D as DarkStrategy, F as FontDef, P as PaletteRef, S as ScaleToken, T as TextStyle, b as TextStyleName, c as TypeScale } from './recipe.schema-Cq7e82nx.js';
 export { primitives, tokens } from './tokens.js';
 export { RecipeName, recipes } from './recipes.js';

package/dist/index.js

@@ -1,4 +1,4 @@
 export { recipes } from './chunk-PV6GFEAM.js';
-export { RDS_CONTRAST_PAIRS, ROLES as RDS_ROLES, RDS_SCOPE_SELECTORS, RDS_TOKEN_SCOPE, RdsValidationError, SCALE_STEPS, brandTones, buildScale, contrastRatio, emitClaudeMd, emitCss, emitRdsCss, generateRdsTheme, generateTheme, hexToHsl, hslToHex, isHex, isNeutralBrand, isSafeColor, isSafeFont, isSafeVarName, onColor, rdsContrast, rdsContrastReport, rdsThemeFromTable, refToHex, relativeLuminance, resolveTheme, roleVar } from './chunk-LP6UA4EW.js';
+export { RDS_CONTRAST_PAIRS, RDS_NON_TEXT_PAIRS, ROLES as RDS_ROLES, RDS_SCOPE_SELECTORS, RDS_TOKEN_SCOPE, RdsValidationError, SCALE_STEPS, brandTones, buildScale, contrastRatio, emitClaudeMd, emitCss, emitRdsCss, generateRdsTheme, generateTheme, hexToHsl, hslToHex, isHex, isNeutralBrand, isSafeColor, isSafeFont, isSafeVarName, onColor, rdsContrast, rdsContrastReport, rdsThemeFromTable, refToHex, relativeLuminance, resolveTheme, roleVar } from './chunk-NVYJME6V.js';
 export { primitives, tokens } from './chunk-FRWRLCYM.js';
 import './chunk-ORMEWXMH.js';

package/dist/themes.js

@@ -1,4 +1,4 @@
-import { generateTheme } from './chunk-LP6UA4EW.js';
+import { generateTheme } from './chunk-NVYJME6V.js';
 import './chunk-FRWRLCYM.js';
 import { __spreadValues, __objRest } from './chunk-ORMEWXMH.js';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rojaostudio/ds-core",
-  "version": "1.1.0-next.10",
+  "version": "1.1.0-next.12",
   "description": "O motor do Rojão DS — tokens, derivação de tema e emissores. Sem React, sem Tailwind, sem CSS.",
   "license": "MIT",
   "author": "Rojão Studio (https://rojao.studio)",