okchroma 0.2.0 → 0.2.2

package/dist-lib/index.cjs

@@ -2358,6 +2358,8 @@ function solveDarkCtaExit(cur, cFor, darkH, redDark, enforceLc, coLc) {
 var oklchToSrgb = (L, C2, H2) => Object.values(srgbEmitChannels({ L, C: C2, H: H2 })).map((c) => Math.max(0, Math.min(1, c)));
 var toHex = (rgb) => "#" + rgb.map((c) => Math.round(c * 255).toString(16).padStart(2, "0")).join("");
 var CTA_CLEARANCE_CAPS = [0.05, 0.92];
+var CHROMATIC_W80_WORST_SHIP_Y = { light: 0.459357, dark: 0.074936 };
+var CHROMATIC_P3_WORST_SHIP_Y = { light: 0.836007, dark: 0.016041 };
 function resolveRamp(hex, mode, spec, opts) {
   const o = hexToOklch(hex);
   const seed = { hex, ...o };
@@ -2501,11 +2503,18 @@ function resolveRamp(hex, mode, spec, opts) {
         const own = contrastRatio(y2, anchorShipY);
         return paperBound ? Math.min(own, contrastRatio(y2, crossBoundY)) : own;
       };
-      if (shipRatio(placed.L) < sp.require.target) {
+      const highlighterBoundY = ctx.opts?.crossHighlighterBoundY && sp.stop >= 10 && !textGround ? ctx.opts.crossHighlighterBoundY[mode] : void 0;
+      const highlighterRatio = (L) => highlighterBoundY === void 0 ? Infinity : contrastRatio(shippedY(L, placed.C, placed.H), highlighterBoundY);
+      const paperBoundY = ctx.opts?.crossPaperBoundY && sp.stop >= 8 && !textGround ? ctx.opts.crossPaperBoundY[mode] : void 0;
+      const paperBar = sp.stop === 8 ? STOP_8_NONTEXT_CONTRAST : sp.stop === 9 ? PENCIL_9_CONTRAST : PEN_10_CONTRAST;
+      const paperRatio = (L) => paperBoundY === void 0 ? Infinity : contrastRatio(shippedY(L, placed.C, placed.H), paperBoundY);
+      const target = sp.require.target;
+      const clears = (L) => shipRatio(L) >= target && highlighterRatio(L) >= PEN_10_CONTRAST && paperRatio(L) >= paperBar;
+      if (!clears(placed.L)) {
         const away = shippedY(placed.L, placed.C, placed.H) < anchorShipY ? -1 : 1;
         let L2 = placed.L;
-        for (let i = 0; i < 100 && shipRatio(L2) < sp.require.target; i++) L2 += away * 1e-3;
-        if (shipRatio(L2) >= sp.require.target) {
+        for (let i = 0; i < 100 && !clears(L2); i++) L2 += away * 1e-3;
+        if (clears(L2)) {
           placed = { ...placed, L: L2 };
           clamped = true;
         }
@@ -2516,6 +2525,8 @@ function resolveRamp(hex, mode, spec, opts) {
         shipRatio(placed.L)
       );
       if (got < sp.require.target - 1e-3) unresolvable = `stop ${sp.stop}: contrast ${got.toFixed(2)} < required ${sp.require.target}`;
+      else if (highlighterRatio(placed.L) < PEN_10_CONTRAST - 1e-3) unresolvable = `stop ${sp.stop}: contrast ${highlighterRatio(placed.L).toFixed(2)} < required ${PEN_10_CONTRAST} on the worst chromatic highlighter-20`;
+      else if (paperRatio(placed.L) < paperBar - 1e-3) unresolvable = `stop ${sp.stop}: contrast ${paperRatio(placed.L).toFixed(2)} < required ${paperBar} on the worst chromatic paper-5`;
     } else if (sp.require?.metric === "apca") {
       const ga = apcaGroundOf(sp.require, sp.stop);
       const refA = apcaYAt(ga.L, ga.C, ga.H);
@@ -2715,7 +2726,11 @@ function generateNeutralScale(brandH, level = "default", contrastProfile) {
   const scale = generateScale(grayHex, "neutral", "light", {
     chromaCurve: curve,
     enforceOnFillContrast: true,
-    contrastProfile
+    contrastProfile,
+    // T13: the neutral's pens clear every chromatic family's highlighter-20 (the symmetric
+    // pen guarantee); the chromatic ramps clear the neutral's through NEUTRAL_W80_WORST_SHIP_Y
+    crossHighlighterBoundY: CHROMATIC_W80_WORST_SHIP_Y,
+    crossPaperBoundY: CHROMATIC_P3_WORST_SHIP_Y
   });
   const asCta = (stop, src) => makeStop(stop, src.L, src.C, src.H);
   scale.cta = asCta(9, scale.light[3]);

package/dist-lib/index.mjs

@@ -2279,6 +2279,8 @@ function solveDarkCtaExit(cur, cFor, darkH, redDark, enforceLc, coLc) {
 var oklchToSrgb = (L, C2, H2) => Object.values(srgbEmitChannels({ L, C: C2, H: H2 })).map((c) => Math.max(0, Math.min(1, c)));
 var toHex = (rgb) => "#" + rgb.map((c) => Math.round(c * 255).toString(16).padStart(2, "0")).join("");
 var CTA_CLEARANCE_CAPS = [0.05, 0.92];
+var CHROMATIC_W80_WORST_SHIP_Y = { light: 0.459357, dark: 0.074936 };
+var CHROMATIC_P3_WORST_SHIP_Y = { light: 0.836007, dark: 0.016041 };
 function resolveRamp(hex, mode, spec, opts) {
   const o = hexToOklch(hex);
   const seed = { hex, ...o };
@@ -2422,11 +2424,18 @@ function resolveRamp(hex, mode, spec, opts) {
         const own = contrastRatio(y2, anchorShipY);
         return paperBound ? Math.min(own, contrastRatio(y2, crossBoundY)) : own;
       };
-      if (shipRatio(placed.L) < sp.require.target) {
+      const highlighterBoundY = ctx.opts?.crossHighlighterBoundY && sp.stop >= 10 && !textGround ? ctx.opts.crossHighlighterBoundY[mode] : void 0;
+      const highlighterRatio = (L) => highlighterBoundY === void 0 ? Infinity : contrastRatio(shippedY(L, placed.C, placed.H), highlighterBoundY);
+      const paperBoundY = ctx.opts?.crossPaperBoundY && sp.stop >= 8 && !textGround ? ctx.opts.crossPaperBoundY[mode] : void 0;
+      const paperBar = sp.stop === 8 ? STOP_8_NONTEXT_CONTRAST : sp.stop === 9 ? PENCIL_9_CONTRAST : PEN_10_CONTRAST;
+      const paperRatio = (L) => paperBoundY === void 0 ? Infinity : contrastRatio(shippedY(L, placed.C, placed.H), paperBoundY);
+      const target = sp.require.target;
+      const clears = (L) => shipRatio(L) >= target && highlighterRatio(L) >= PEN_10_CONTRAST && paperRatio(L) >= paperBar;
+      if (!clears(placed.L)) {
         const away = shippedY(placed.L, placed.C, placed.H) < anchorShipY ? -1 : 1;
         let L2 = placed.L;
-        for (let i = 0; i < 100 && shipRatio(L2) < sp.require.target; i++) L2 += away * 1e-3;
-        if (shipRatio(L2) >= sp.require.target) {
+        for (let i = 0; i < 100 && !clears(L2); i++) L2 += away * 1e-3;
+        if (clears(L2)) {
           placed = { ...placed, L: L2 };
           clamped = true;
         }
@@ -2437,6 +2446,8 @@ function resolveRamp(hex, mode, spec, opts) {
         shipRatio(placed.L)
       );
       if (got < sp.require.target - 1e-3) unresolvable = `stop ${sp.stop}: contrast ${got.toFixed(2)} < required ${sp.require.target}`;
+      else if (highlighterRatio(placed.L) < PEN_10_CONTRAST - 1e-3) unresolvable = `stop ${sp.stop}: contrast ${highlighterRatio(placed.L).toFixed(2)} < required ${PEN_10_CONTRAST} on the worst chromatic highlighter-20`;
+      else if (paperRatio(placed.L) < paperBar - 1e-3) unresolvable = `stop ${sp.stop}: contrast ${paperRatio(placed.L).toFixed(2)} < required ${paperBar} on the worst chromatic paper-5`;
     } else if (sp.require?.metric === "apca") {
       const ga = apcaGroundOf(sp.require, sp.stop);
       const refA = apcaYAt(ga.L, ga.C, ga.H);
@@ -2636,7 +2647,11 @@ function generateNeutralScale(brandH, level = "default", contrastProfile) {
   const scale = generateScale(grayHex, "neutral", "light", {
     chromaCurve: curve,
     enforceOnFillContrast: true,
-    contrastProfile
+    contrastProfile,
+    // T13: the neutral's pens clear every chromatic family's highlighter-20 (the symmetric
+    // pen guarantee); the chromatic ramps clear the neutral's through NEUTRAL_W80_WORST_SHIP_Y
+    crossHighlighterBoundY: CHROMATIC_W80_WORST_SHIP_Y,
+    crossPaperBoundY: CHROMATIC_P3_WORST_SHIP_Y
   });
   const asCta = (stop, src) => makeStop(stop, src.L, src.C, src.H);
   scale.cta = asCta(9, scale.light[3]);

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

@@ -89,6 +89,14 @@ export interface GenerateOptions {
             H: number;
         };
     };
+    crossHighlighterBoundY?: {
+        light: number;
+        dark: number;
+    };
+    crossPaperBoundY?: {
+        light: number;
+        dark: number;
+    };
     deltaHKPlace?: boolean;
     deltaChromaEq?: boolean;
     deltaLiftFloor?: boolean;

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

@@ -43,4 +43,12 @@ export type ResolvedRamp = {
     };
 };
 export type { ResolveOpts };
+export declare const CHROMATIC_W80_WORST_SHIP_Y: {
+    readonly light: 0.459357;
+    readonly dark: 0.074936;
+};
+export declare const CHROMATIC_P3_WORST_SHIP_Y: {
+    readonly light: 0.836007;
+    readonly dark: 0.016041;
+};
 export declare function resolveRamp(hex: string, mode: 'light' | 'dark', spec?: ModeSpec, opts?: ResolveOpts): ResolvedRamp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "okchroma",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "license": "MIT",
   "description": "Color token engine: one brand hex in, a full WCAG-enforced light+dark token system out (CSS variables, DTCG JSON, Figma variables)",
   "repository": {