@texel/color 1.1.2 → 1.1.3

package/README.md

@@ -85,7 +85,7 @@ The return value is the new coordinates in the destination space; such as `[r,g,
 
 #### `output = gamutMapOKLCH(oklch, gamut = sRGBGamut, targetSpace = gamut.space, out = [0, 0, 0], mapping = MapToCuspL, [cusp])`
 
-Performs fast gamut mapping in OKLCH as [described by Björn Ottoson](https://bottosson.github.io/posts/gamutclipping/) (2021). This takes an input `[l,c,h]` coords in OKLCH space, and ensures the final result will lie within the specified color `gamut` (default `sRGBGamut`). You can further specify a different target space (which default's to the gamut's space), for example to get a linear-light sRGB and avoid the transfer function, or to keep the result in OKLCH:
+Performs fast gamut mapping in OKLCH as [described by Björn Ottosson](https://bottosson.github.io/posts/gamutclipping/) (2021). This takes an input `[l,c,h]` coords in OKLCH space, and ensures the final result will lie within the specified color `gamut` (default `sRGBGamut`). You can further specify a different target space (which default's to the gamut's space), for example to get a linear-light sRGB and avoid the transfer function, or to keep the result in OKLCH:
 
 ```js
 import { gamutMapOKLCH, sRGBGamut, sRGBLinear, OKLCH } from "@texel/color";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@texel/color",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "a minimal and modern color library",
   "type": "module",
   "main": "./src/index.js",

package/src/gamut.js

@@ -182,13 +182,15 @@ export const findGamutIntersectionOKLCH = (a, b, l1, c1, l0, cusp, gamut) => {
 
   // Find the intersection for upper and lower half separately
   if ((l1 - l0) * cusp[1] - (cusp[0] - l0) * c1 <= 0.0) {
+    const denom = (c1 * cusp[0] + cusp[1] * (l0 - l1));
     // Lower half
-    t = (cusp[1] * l0) / (c1 * cusp[0] + cusp[1] * (l0 - l1));
+    t = denom === 0 ? 0 : (cusp[1] * l0) / denom;
   } else {
     // Upper half
 
     // First intersect with triangle
-    t = (cusp[1] * (l0 - 1.0)) / (c1 * (cusp[0] - 1.0) + cusp[1] * (l0 - l1));
+    const denom = (c1 * (cusp[0] - 1.0) + cusp[1] * (l0 - l1));
+    t = denom === 0 ? 0 : (cusp[1] * (l0 - 1.0)) / denom;
 
     // Then one step Halley's method
     let dl = l1 - l0;

package/test/test.js

@@ -44,6 +44,7 @@ import {
   DisplayP3Gamut,
   deserialize,
   parse,
+  MapToL,
 } from "../src/index.js";
 
 test("should convert XYZ in different whitepoints", async (t) => {
@@ -282,7 +283,6 @@ test("should serialize", async (t) => {
 // });
 
 test("should deserialize color string information", async (t) => {
-  
   t.deepEqual(deserialize("rgb(0, 128, 255)"), {
     coords: [0, 128 / 0xff, 255 / 0xff],
     id: "srgb",
@@ -307,6 +307,10 @@ test("should deserialize color string information", async (t) => {
     coords: [0, 128 / 0xff, 255 / 0xff, 0.5],
     id: "srgb",
   });
+  t.deepEqual(deserialize("rgb(0 128 255 / 1e-2)"), {
+    coords: [0, 128 / 0xff, 255 / 0xff, 1e-2],
+    id: "srgb",
+  });
   t.deepEqual(deserialize("rgb(0 128 255 / 50%)"), {
     coords: [0, 128 / 0xff, 255 / 0xff, 0.5],
     id: "srgb",
@@ -343,6 +347,10 @@ test("should deserialize color string information", async (t) => {
     id: "srgb-linear",
     coords: [0, 0.5, 1],
   });
+  t.deepEqual(deserialize("color(srgb-linear 0 1e-2 1)"), {
+    id: "srgb-linear",
+    coords: [0, 1e-2, 1],
+  });
   t.deepEqual(deserialize("color(srgb-linear 0 0.5 1/0.25)"), {
     id: "srgb-linear",
     coords: [0, 0.5, 1, 0.25],
@@ -443,6 +451,28 @@ test("should handle problematic coords", async (t) => {
     ),
     true
   );
+
+  t.deepEqual(
+    convert([1, 0, 0], OKLCH, OKLab, undefined),
+    [1, 0, 0],
+    "handles [1,0,0] OKLCH to OKLab gamut map"
+  );
+
+  t.deepEqual(
+    arrayAlmostEqual(convert([1, 0, 0], OKLCH, sRGBLinear), [1, 1, 1]),
+    true,
+    "handles [1,1,1] OKLCH to sRGBLinear"
+  );
+  t.deepEqual(
+    gamutMapOKLCH([1, 0, 0], sRGBGamut, OKLCH, undefined, MapToL),
+    [1, 0, 0],
+    "handles [1,0,0] OKLCH to sRGB gamut map"
+  );
+  t.deepEqual(
+    gamutMapOKLCH([0, 0, 0], sRGBGamut, OKLCH, undefined, MapToL),
+    [0, 0, 0],
+    "handles [0,0,0] OKLCH to sRGB gamut map"
+  );
 });
 
 function roundToNDecimals(value, digits) {