okchroma 0.9.1 → 0.9.2

package/dist-lib/index.cjs

@@ -597,14 +597,11 @@ var RED_SOLVE = {
   brickCoolGold: -3,
   brickDesat: 0.85,
   brickExtraDeep: 0.02,
-  // red's usable zones (her density map, error-range-checks.json): deep core or the light
-  // edge tier — the .50-.58 middle is ring territory, canonical itself lives there, so a
-  // lightened brand ALWAYS gets a deep-core red. Cool-first beside warm brands.
-  coreL: [0.49, 0.47, 0.45],
-  edgeL: [0.65, 0.68, 0.71, 0.75],
-  redHuesWarmBrand: [28, 24, 33.3, 38],
-  redHuesMagentaBrand: [33.3, 38, 28],
-  redHueMagentaDh: -15
+  // the red complement's hue sets (resolve.ts redComplementVariant): the canonical hue and
+  // the two ends of the error band the field ships, read through this engine (the cool end
+  // near Primer's danger, the gold side near USWDS's error). The set furthest from the brand
+  // stamp by the side-by-side measure ships.
+  setHues: { true: 33.3, cool: 24, "gold-side": 38 }
 };
 function redSolveDist(c, red) {
   const dh = (c.H - red.H + 540) % 360 - 180;
@@ -3112,63 +3109,61 @@ function hueCollisionPending(scale, sigScales) {
 }
 var blackLcAt = (L, C2, H2) => Math.abs(apcaLc(apcaYAt(0, 0, 0), apcaYAt(L, clampChromaToGamut(L, C2, H2), H2)));
 var redCleanBeside = (brandCta, c) => p2Diff(brandCta, c) >= (c.L < brandCta.L ? P2_D : P2_D_UP) && redSolveDist(brandCta, c) >= RED_GATE.G + RED_SOLVE.ring;
-function redComplementVariant(brandCta, seed, brandWentUp, red, contrastProfile) {
-  const rctx = buildContext(red.def.hex, {
-    darkChromaCurve,
-    darkCtaC: "signal",
-    darkFillMinL: red.def.darkFillMinL,
-    enforceOnFillContrast: true,
-    suppressRedCool: true,
-    goldBoost: true,
-    signalWarmDrift: true,
-    contrastProfile
-  });
+var redSetsCache = /* @__PURE__ */ new Map();
+var redSetKey = (set, band) => `${set}:${band}`;
+var bandBelow = (band) => {
+  const i = ARCHETYPES.findIndex((a) => a.name === band);
+  return ARCHETYPES[Math.max(0, i - 1)].name;
+};
+function redSetsFor(red, contrastProfile) {
+  const cacheKey = contrastProfile ?? "wcag";
+  const hit = redSetsCache.get(cacheKey);
+  if (hit) return hit;
+  const own = classifyArchetype(red.scale.cta.L);
+  const sets = /* @__PURE__ */ new Map();
+  for (const [set, hue] of Object.entries(RED_SOLVE.setHues)) for (const band of [own, bandBelow(own)]) {
+    sets.set(redSetKey(set, band), generateScale(red.def.hex, red.def.name, band === own ? void 0 : band, {
+      hueShiftDeg: hue - red.def.H,
+      darkChromaCurve,
+      darkCtaC: "signal",
+      darkFillMinL: red.def.darkFillMinL,
+      enforceOnFillContrast: true,
+      suppressRedCool: true,
+      goldBoost: true,
+      signalWarmDrift: true,
+      contrastProfile,
+      apcaClearance: true,
+      apcaClearanceLc: CRITICAL_CLEARANCE_LC
+    }));
+  }
+  redSetsCache.set(cacheKey, sets);
+  return sets;
+}
+function redComplementVariant(brandCta, brandWentUp, red, contrastProfile) {
   const redCta = red.scale.cta;
-  const at = (L, H2) => ({ L, C: clampChromaToGamut(L, rctx.cAt("light", L, rctx.brandC), H2), H: H2 });
   const fireLc = CRITICAL_CLEARANCE_LC + APCA_ENFORCE_MARGIN_LC;
-  const shipsWhite = (c) => onFillIsWhiteDarkAt(c.L, c.C, c.H, true, contrastProfile === "apca" ? void 0 : 4.5);
   const poleOk = (c) => {
-    const white = shipsWhite(c);
+    const white = onFillIsWhiteDarkAt(c.L, c.C, c.H, true, contrastProfile === "apca" ? void 0 : 4.5);
     const lc = white ? whiteTextLcAt(c.L, c.C, c.H) : blackLcAt(c.L, c.C, c.H);
     const legal = contrastProfile === "apca" || legalRatio(c.L, c.C, c.H, white ? 1 : 0) >= 4.5;
     return legal && lc >= fireLc;
   };
-  const slideToBar = (c) => {
-    if (poleOk(c)) return c;
-    const L2 = shipsWhite(c) ? findLForWhiteTextLc(c.L, c.C, c.H, fireLc + APCA_SOLVE_MARGIN_LC) : findLForBlackTextLc(c.L, c.C, c.H, fireLc + APCA_SOLVE_MARGIN_LC, 0.92);
-    const c2 = at(L2, c.H);
-    return poleOk(c2) ? c2 : null;
-  };
-  const clean = (c) => redCleanBeside(brandCta, c) && poleOk(c);
-  if (!brandWentUp && clean(redCta)) return null;
-  const hues = hueDelta(seed.H, redCta.H) <= RED_SOLVE.redHueMagentaDh ? RED_SOLVE.redHuesMagentaBrand : RED_SOLVE.redHuesWarmBrand;
-  const wantLighter = brandCta.L <= redCta.L;
-  const tiers = wantLighter ? [[...RED_SOLVE.edgeL], RED_SOLVE.coreL.filter((l) => l > brandCta.L)] : [[...RED_SOLVE.coreL], [...RED_SOLVE.edgeL]];
+  if (!brandWentUp && redCleanBeside(brandCta, redCta) && poleOk(redCta)) return null;
+  const own = classifyArchetype(redCta.L);
+  const band = classifyArchetype(brandCta.L) === own ? bandBelow(own) : own;
+  const sets = redSetsFor(red, contrastProfile);
   let pick = null;
-  outer: for (const tier of tiers) {
-    const ls = [...tier].sort((a, b) => wantLighter ? a - b : b - a);
-    for (const L of ls) for (const H2 of hues) {
-      const c = slideToBar(at(L, H2));
-      if (!c) continue;
-      const onSide = wantLighter ? c.L > brandCta.L : c.L < brandCta.L;
-      if (!onSide || !clean(c)) continue;
-      pick = c;
-      break outer;
-    }
-  }
-  if (!pick) return null;
-  const cta = makeStop(redCta.stop, pick.L, rctx.cAt("light", pick.L, rctx.brandC), pick.H);
-  const vCFor = (L) => rctx.cAt("light", L, rctx.brandC);
-  const hL = stateFillL(pick.L, "light", 1);
-  const ctaHover = makeStop(red.scale.ctaHover.stop, hL, vCFor(hL), pick.H);
-  const pL = stateFillL(pick.L, "light", 2);
-  const ctaPressed = makeStop(red.scale.ctaPressed.stop, pL, vCFor(pL), pick.H);
-  const onFillTextIsWhite = onFillIsWhiteDarkAt(cta.L, cta.C, cta.H, true, contrastProfile === "apca" ? void 0 : 4.5);
+  for (const set of Object.keys(RED_SOLVE.setHues)) {
+    const scale = sets.get(redSetKey(set, band));
+    const d = p2Diff(brandCta, scale.cta);
+    if (!pick || d > pick.d) pick = { set, scale, d };
+  }
+  const { cta, ctaHover, ctaPressed, onFillTextIsWhite } = pick.scale;
   return {
     scale: { ...red.scale, cta, ctaHover, ctaPressed, onFillTextIsWhite },
-    // naming candidates only — the identity name is the owner's call at bless. No hue suffix:
-    // the plugin's note parser mints Figma variable paths from this string.
-    note: `red \u2192 ${pick.L < redCta.L ? "rich" : "coral"} L${pick.L.toFixed(2)}`
+    // the community plugin shows the part after the arrow as a display label; the hex is
+    // the variant's identity there, so the note carries no value
+    note: `red \u2192 ${pick.set} at ${band}`
   };
 }
 function resolveBrand(hex, name, opts) {
@@ -3214,7 +3209,7 @@ function resolveBrand(hex, name, opts) {
   const signalOverrides = [];
   if (solving || opts?.exact && signalMoves && !opts?.archetypeOverride) {
     const brandWentUp = !!scale.ctaRepelled?.light && scale.cta.L > seedO.L + 1e-6;
-    const v2 = redComplementVariant(scale.cta, seedO, brandWentUp, sigScales.get("red"), opts?.contrastProfile);
+    const v2 = redComplementVariant(scale.cta, brandWentUp, sigScales.get("red"), opts?.contrastProfile);
     if (v2) signalOverrides.push({ name: "red", scale: v2.scale, note: v2.note });
   }
   let warnVariant = null;
@@ -3376,7 +3371,7 @@ function resolveTheme(input) {
     const red = sigScales.get("red");
     const primaryRed = mergedOverrides.find((o) => o.name === "red");
     if (!primaryRed) {
-      const v2 = redComplementVariant(secScale.cta, hexToOklch(secSeedHex), false, red, cp2);
+      const v2 = redComplementVariant(secScale.cta, false, red, cp2);
       if (v2 && redCleanBeside(primary.scale.cta, v2.scale.cta)) adopt("red", v2.scale, `${v2.note} (for the secondary)`);
     }
     for (const sigName of ["yellow", "green", "blue"]) {

package/dist-lib/index.mjs

@@ -504,14 +504,11 @@ var RED_SOLVE = {
   brickCoolGold: -3,
   brickDesat: 0.85,
   brickExtraDeep: 0.02,
-  // red's usable zones (her density map, error-range-checks.json): deep core or the light
-  // edge tier — the .50-.58 middle is ring territory, canonical itself lives there, so a
-  // lightened brand ALWAYS gets a deep-core red. Cool-first beside warm brands.
-  coreL: [0.49, 0.47, 0.45],
-  edgeL: [0.65, 0.68, 0.71, 0.75],
-  redHuesWarmBrand: [28, 24, 33.3, 38],
-  redHuesMagentaBrand: [33.3, 38, 28],
-  redHueMagentaDh: -15
+  // the red complement's hue sets (resolve.ts redComplementVariant): the canonical hue and
+  // the two ends of the error band the field ships, read through this engine (the cool end
+  // near Primer's danger, the gold side near USWDS's error). The set furthest from the brand
+  // stamp by the side-by-side measure ships.
+  setHues: { true: 33.3, cool: 24, "gold-side": 38 }
 };
 function redSolveDist(c, red) {
   const dh = (c.H - red.H + 540) % 360 - 180;
@@ -3019,63 +3016,61 @@ function hueCollisionPending(scale, sigScales) {
 }
 var blackLcAt = (L, C2, H2) => Math.abs(apcaLc(apcaYAt(0, 0, 0), apcaYAt(L, clampChromaToGamut(L, C2, H2), H2)));
 var redCleanBeside = (brandCta, c) => p2Diff(brandCta, c) >= (c.L < brandCta.L ? P2_D : P2_D_UP) && redSolveDist(brandCta, c) >= RED_GATE.G + RED_SOLVE.ring;
-function redComplementVariant(brandCta, seed, brandWentUp, red, contrastProfile) {
-  const rctx = buildContext(red.def.hex, {
-    darkChromaCurve,
-    darkCtaC: "signal",
-    darkFillMinL: red.def.darkFillMinL,
-    enforceOnFillContrast: true,
-    suppressRedCool: true,
-    goldBoost: true,
-    signalWarmDrift: true,
-    contrastProfile
-  });
+var redSetsCache = /* @__PURE__ */ new Map();
+var redSetKey = (set, band) => `${set}:${band}`;
+var bandBelow = (band) => {
+  const i = ARCHETYPES.findIndex((a) => a.name === band);
+  return ARCHETYPES[Math.max(0, i - 1)].name;
+};
+function redSetsFor(red, contrastProfile) {
+  const cacheKey = contrastProfile ?? "wcag";
+  const hit = redSetsCache.get(cacheKey);
+  if (hit) return hit;
+  const own = classifyArchetype(red.scale.cta.L);
+  const sets = /* @__PURE__ */ new Map();
+  for (const [set, hue] of Object.entries(RED_SOLVE.setHues)) for (const band of [own, bandBelow(own)]) {
+    sets.set(redSetKey(set, band), generateScale(red.def.hex, red.def.name, band === own ? void 0 : band, {
+      hueShiftDeg: hue - red.def.H,
+      darkChromaCurve,
+      darkCtaC: "signal",
+      darkFillMinL: red.def.darkFillMinL,
+      enforceOnFillContrast: true,
+      suppressRedCool: true,
+      goldBoost: true,
+      signalWarmDrift: true,
+      contrastProfile,
+      apcaClearance: true,
+      apcaClearanceLc: CRITICAL_CLEARANCE_LC
+    }));
+  }
+  redSetsCache.set(cacheKey, sets);
+  return sets;
+}
+function redComplementVariant(brandCta, brandWentUp, red, contrastProfile) {
   const redCta = red.scale.cta;
-  const at = (L, H2) => ({ L, C: clampChromaToGamut(L, rctx.cAt("light", L, rctx.brandC), H2), H: H2 });
   const fireLc = CRITICAL_CLEARANCE_LC + APCA_ENFORCE_MARGIN_LC;
-  const shipsWhite = (c) => onFillIsWhiteDarkAt(c.L, c.C, c.H, true, contrastProfile === "apca" ? void 0 : 4.5);
   const poleOk = (c) => {
-    const white = shipsWhite(c);
+    const white = onFillIsWhiteDarkAt(c.L, c.C, c.H, true, contrastProfile === "apca" ? void 0 : 4.5);
     const lc = white ? whiteTextLcAt(c.L, c.C, c.H) : blackLcAt(c.L, c.C, c.H);
     const legal = contrastProfile === "apca" || legalRatio(c.L, c.C, c.H, white ? 1 : 0) >= 4.5;
     return legal && lc >= fireLc;
   };
-  const slideToBar = (c) => {
-    if (poleOk(c)) return c;
-    const L2 = shipsWhite(c) ? findLForWhiteTextLc(c.L, c.C, c.H, fireLc + APCA_SOLVE_MARGIN_LC) : findLForBlackTextLc(c.L, c.C, c.H, fireLc + APCA_SOLVE_MARGIN_LC, 0.92);
-    const c2 = at(L2, c.H);
-    return poleOk(c2) ? c2 : null;
-  };
-  const clean = (c) => redCleanBeside(brandCta, c) && poleOk(c);
-  if (!brandWentUp && clean(redCta)) return null;
-  const hues = hueDelta(seed.H, redCta.H) <= RED_SOLVE.redHueMagentaDh ? RED_SOLVE.redHuesMagentaBrand : RED_SOLVE.redHuesWarmBrand;
-  const wantLighter = brandCta.L <= redCta.L;
-  const tiers = wantLighter ? [[...RED_SOLVE.edgeL], RED_SOLVE.coreL.filter((l) => l > brandCta.L)] : [[...RED_SOLVE.coreL], [...RED_SOLVE.edgeL]];
+  if (!brandWentUp && redCleanBeside(brandCta, redCta) && poleOk(redCta)) return null;
+  const own = classifyArchetype(redCta.L);
+  const band = classifyArchetype(brandCta.L) === own ? bandBelow(own) : own;
+  const sets = redSetsFor(red, contrastProfile);
   let pick = null;
-  outer: for (const tier of tiers) {
-    const ls = [...tier].sort((a, b) => wantLighter ? a - b : b - a);
-    for (const L of ls) for (const H2 of hues) {
-      const c = slideToBar(at(L, H2));
-      if (!c) continue;
-      const onSide = wantLighter ? c.L > brandCta.L : c.L < brandCta.L;
-      if (!onSide || !clean(c)) continue;
-      pick = c;
-      break outer;
-    }
-  }
-  if (!pick) return null;
-  const cta = makeStop(redCta.stop, pick.L, rctx.cAt("light", pick.L, rctx.brandC), pick.H);
-  const vCFor = (L) => rctx.cAt("light", L, rctx.brandC);
-  const hL = stateFillL(pick.L, "light", 1);
-  const ctaHover = makeStop(red.scale.ctaHover.stop, hL, vCFor(hL), pick.H);
-  const pL = stateFillL(pick.L, "light", 2);
-  const ctaPressed = makeStop(red.scale.ctaPressed.stop, pL, vCFor(pL), pick.H);
-  const onFillTextIsWhite = onFillIsWhiteDarkAt(cta.L, cta.C, cta.H, true, contrastProfile === "apca" ? void 0 : 4.5);
+  for (const set of Object.keys(RED_SOLVE.setHues)) {
+    const scale = sets.get(redSetKey(set, band));
+    const d = p2Diff(brandCta, scale.cta);
+    if (!pick || d > pick.d) pick = { set, scale, d };
+  }
+  const { cta, ctaHover, ctaPressed, onFillTextIsWhite } = pick.scale;
   return {
     scale: { ...red.scale, cta, ctaHover, ctaPressed, onFillTextIsWhite },
-    // naming candidates only — the identity name is the owner's call at bless. No hue suffix:
-    // the plugin's note parser mints Figma variable paths from this string.
-    note: `red \u2192 ${pick.L < redCta.L ? "rich" : "coral"} L${pick.L.toFixed(2)}`
+    // the community plugin shows the part after the arrow as a display label; the hex is
+    // the variant's identity there, so the note carries no value
+    note: `red \u2192 ${pick.set} at ${band}`
   };
 }
 function resolveBrand(hex, name, opts) {
@@ -3121,7 +3116,7 @@ function resolveBrand(hex, name, opts) {
   const signalOverrides = [];
   if (solving || opts?.exact && signalMoves && !opts?.archetypeOverride) {
     const brandWentUp = !!scale.ctaRepelled?.light && scale.cta.L > seedO.L + 1e-6;
-    const v2 = redComplementVariant(scale.cta, seedO, brandWentUp, sigScales.get("red"), opts?.contrastProfile);
+    const v2 = redComplementVariant(scale.cta, brandWentUp, sigScales.get("red"), opts?.contrastProfile);
     if (v2) signalOverrides.push({ name: "red", scale: v2.scale, note: v2.note });
   }
   let warnVariant = null;
@@ -3283,7 +3278,7 @@ function resolveTheme(input) {
     const red = sigScales.get("red");
     const primaryRed = mergedOverrides.find((o) => o.name === "red");
     if (!primaryRed) {
-      const v2 = redComplementVariant(secScale.cta, hexToOklch(secSeedHex), false, red, cp2);
+      const v2 = redComplementVariant(secScale.cta, false, red, cp2);
       if (v2 && redCleanBeside(primary.scale.cta, v2.scale.cta)) adopt("red", v2.scale, `${v2.note} (for the secondary)`);
     }
     for (const sigName of ["yellow", "green", "blue"]) {

package/dist-lib/types/engine/colorMath.d.ts

@@ -66,11 +66,11 @@ export declare const RED_SOLVE: {
     readonly brickCoolGold: -3;
     readonly brickDesat: 0.85;
     readonly brickExtraDeep: 0.02;
-    readonly coreL: readonly [0.49, 0.47, 0.45];
-    readonly edgeL: readonly [0.65, 0.68, 0.71, 0.75];
-    readonly redHuesWarmBrand: readonly [28, 24, 33.3, 38];
-    readonly redHuesMagentaBrand: readonly [33.3, 38, 28];
-    readonly redHueMagentaDh: -15;
+    readonly setHues: {
+        readonly true: 33.3;
+        readonly cool: 24;
+        readonly 'gold-side': 38;
+    };
 };
 export declare function redSolveDist(c: {
     L: number;

package/dist-lib/types/engine/p2.d.ts

@@ -1,6 +1,5 @@
 export declare const P2_D = 0.12;
 export declare const P2_D_UP = 0.11;
-export declare const P2_D_FALLBACK = 0.115;
 export declare function p2Diff(a: {
     L: number;
     C: number;

package/dist-lib/types/engine/resolve.d.ts

@@ -1,5 +1,5 @@
 import { type GeneratedScale, type ContrastProfile, type ColorStop } from './colorEngine';
-import type { Archetype } from './archetypes';
+import { type Archetype } from './archetypes';
 import { type SignalDef } from './signals';
 type SignalScales = Map<SignalDef['name'], {
     def: SignalDef;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "okchroma",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "license": "MIT",
   "description": "Color-system engine: one brand hex in, a light and dark set of color primitives out, with the contrast requirements solved during generation; emitted as CSS custom properties, DTCG documents, and Figma variables",
   "repository": {