@thi.ng/pixel-analysis 0.3.4 → 0.4.1

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2025-07-10T14:20:23Z
+- **Last updated**: 2025-07-15T09:30:47Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -11,6 +11,20 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+### [0.4.1](https://github.com/thi-ng/umbrella/tree/@thi.ng/pixel-analysis@0.4.1) (2025-07-15)
+
+#### ♻️ Refactoring
+
+- extract `derivedColorsResults()` ([c8fb4ed](https://github.com/thi-ng/umbrella/commit/c8fb4ed))
+
+## [0.4.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/pixel-analysis@0.4.0) (2025-07-14)
+
+#### 🚀 Features
+
+- add color channel precision ([beb2c21](https://github.com/thi-ng/umbrella/commit/beb2c21))
+  - add `AnalysisOpts.prec`
+  - update `analyzeColors()`
+
 ## [0.3.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/pixel-analysis@0.3.0) (2025-06-24)
 
 #### 🚀 Features

package/analyze-colors.d.ts

@@ -8,4 +8,11 @@ import type { AnalysisOpts, AnalyzedImage } from "./api.js";
  * @param opts
  */
 export declare const analyzeColors: (img: FloatBuffer | IntBuffer, opts?: Partial<AnalysisOpts>) => AnalyzedImage;
+/**
+ * Computes a number of metrics (partial {@link AnalyzedImage}) derived from
+ * given raw SRGB colors. Helper function for {@link analyzeColors}.
+ *
+ * @param colors
+ */
+export declare const derivedColorsResults: (colors: number[][]) => Pick<AnalyzedImage, "css" | "srgb" | "hsv" | "oklch" | "hueRange" | "satRange" | "chromaRange" | "lumaRange" | "contrast" | "colorContrast">;
 //# sourceMappingURL=analyze-colors.d.ts.map

package/analyze-colors.js

@@ -1,4 +1,4 @@
-import { contrast } from "@thi.ng/color/contrast";
+import { contrast as contrastWCAG } from "@thi.ng/color/contrast";
 import { css } from "@thi.ng/color/css/css";
 import { hsv } from "@thi.ng/color/hsv/hsv";
 import { luminanceSrgb } from "@thi.ng/color/luminance-rgb";
@@ -21,6 +21,7 @@ import { pluck } from "@thi.ng/transducers/pluck";
 import { reduce } from "@thi.ng/transducers/reduce";
 import { transduce } from "@thi.ng/transducers/transduce";
 import { dot } from "@thi.ng/vectors/dot";
+import { roundN } from "@thi.ng/vectors/roundn";
 import { warmIntensityHsv } from "./hues.js";
 const analyzeColors = (img, opts) => {
   let $img = img.format !== FLOAT_RGBA ? img.as(FLOAT_RGBA) : img;
@@ -34,32 +35,51 @@ const analyzeColors = (img, opts) => {
   const imgGray = $img.as(FLOAT_GRAY);
   const imgHsv = $img.as(FLOAT_HSVA);
   const dominantColors = opts?.dominantFn ?? dominantColorsKmeans;
-  const colors = dominantColors($img, opts?.numColors ?? 4).sort(
-    compareByKey("area", compareNumDesc)
-  );
+  const prec = opts?.prec ?? 1e-3;
+  const colors = dominantColors($img, opts?.numColors ?? 4).sort(compareByKey("area", compareNumDesc)).map((x) => {
+    roundN(null, x.color, prec);
+    return x;
+  });
   const colorAreas = colors.map((x) => x.area);
-  const dominantLuma = colors.map((x) => luminanceSrgb(x.color));
-  const dominantSrgb = colors.map((x) => srgb(x.color));
-  const dominantHsv = dominantSrgb.map((x) => hsv(x));
-  const dominantOklch = dominantSrgb.map((x) => oklch(x));
-  const dominantCss = dominantSrgb.map((x) => css(x));
-  const hueRange = transduce(pluck(0), minMax(), dominantHsv);
-  const satRange = transduce(pluck(1), minMax(), dominantHsv);
-  const chromaRange = transduce(pluck(1), minMax(), dominantOklch);
-  const lumaRange = reduce(minMax(), dominantLuma);
+  const derived = derivedColorsResults(colors.map((x) => x.color));
   const lumaRangeImg = reduce(minMax(), imgGray.data);
-  const weightedLuma = dot(dominantLuma, colorAreas);
+  const weightedLuma = dot(derived.lumaRange, colorAreas);
   const weightedChroma = dot(
-    dominantOklch.map((x) => x[1]),
+    derived.oklch.map((x) => x[1]),
     colorAreas
   );
   const weightedSat = dot(
-    dominantHsv.map((x) => x[1]),
+    derived.hsv.map((x) => x[1]),
     colorAreas
   );
+  return {
+    img: $img,
+    imgGray,
+    imgHsv,
+    ...derived,
+    area: colorAreas,
+    warmth: warmIntensityHsv(imgHsv, opts?.minSat),
+    contrastImg: lumaRangeImg[1] - lumaRangeImg[0],
+    lumaRangeImg,
+    weightedSat,
+    weightedLuma,
+    weightedChroma
+  };
+};
+const derivedColorsResults = (colors) => {
+  const dominantLuma = colors.map((x) => luminanceSrgb(x));
+  const dominantSrgb = colors.map((x) => srgb(x));
+  const dominantHsv = dominantSrgb.map((x) => hsv(x));
+  const dominantOklch = dominantSrgb.map((x) => oklch(x));
+  const dominantCss = dominantSrgb.map((x) => css(x));
+  const hueRange = transduce(pluck(0), minMax(), dominantHsv);
+  const satRange = transduce(pluck(1), minMax(), dominantHsv);
+  const chromaRange = transduce(pluck(1), minMax(), dominantOklch);
+  const lumaRange = reduce(minMax(), dominantLuma);
+  const contrast = lumaRange[1] - lumaRange[0];
   const colorContrast = fit(
     transduce(
-      map((pair) => contrast(...pair)),
+      map((pair) => contrastWCAG(...pair)),
       max(),
       permutations(dominantSrgb, dominantSrgb)
     ),
@@ -69,28 +89,19 @@ const analyzeColors = (img, opts) => {
     1
   );
   return {
-    img: $img,
-    imgGray,
-    imgHsv,
     css: dominantCss,
     srgb: dominantSrgb,
     hsv: dominantHsv,
     oklch: dominantOklch,
-    area: colorAreas,
     hueRange,
     satRange,
     chromaRange,
     lumaRange,
-    lumaRangeImg,
-    warmth: warmIntensityHsv(imgHsv, opts?.minSat),
-    contrast: lumaRange[1] - lumaRange[0],
-    contrastImg: lumaRangeImg[1] - lumaRangeImg[0],
-    colorContrast,
-    weightedSat,
-    weightedLuma,
-    weightedChroma
+    contrast,
+    colorContrast
   };
 };
 export {
-  analyzeColors
+  analyzeColors,
+  derivedColorsResults
 };

package/api.d.ts

@@ -20,6 +20,12 @@ export interface AnalysisOpts {
      * Min. saturation to consider for computing {@link warmIntensity}.
      */
     minSat: number;
+    /**
+     * Channel precision for dominant colors.
+     *
+     * @defaultValue 0.001
+     */
+    prec: number;
 }
 export interface AnalyzedImage {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/pixel-analysis",
-  "version": "0.3.4",
+  "version": "0.4.1",
   "description": "Image color & feature analysis utilities",
   "type": "module",
   "module": "./index.js",
@@ -40,13 +40,13 @@
   },
   "dependencies": {
     "@thi.ng/api": "^8.11.30",
-    "@thi.ng/color": "^5.7.46",
+    "@thi.ng/color": "^5.7.47",
     "@thi.ng/compare": "^2.4.22",
     "@thi.ng/math": "^5.11.30",
     "@thi.ng/pixel": "^7.5.2",
     "@thi.ng/pixel-convolve": "^1.1.2",
     "@thi.ng/pixel-dominant-colors": "^2.0.2",
-    "@thi.ng/transducers": "^9.6.0",
+    "@thi.ng/transducers": "^9.6.1",
     "@thi.ng/vectors": "^8.3.3"
   },
   "devDependencies": {
@@ -107,5 +107,5 @@
     "status": "beta",
     "year": 2024
   },
-  "gitHead": "63a8b97642b9c481bb623e8d53e6250749a2cbfb\n"
+  "gitHead": "9ec4a5584ed6e59f2b74f4ca9726daef7e766974\n"
 }