@omerdlw/base-framework 1.0.4 → 1.0.6

package/dist/modules/ambient/color.d.ts

@@ -1,13 +1,18 @@
 import type { AmbientPalette, OklchColor } from "./types";
 export declare const COLOR_EXTRACT_CONFIG: Readonly<{
     readonly blackChromaFactor: 0.35;
-    readonly primaryLightness: 0.74;
-    readonly maxBlackChroma: 0.055;
     readonly blackLightness: 0.15;
     readonly cacheLimit: 100;
+    readonly chromaGain: 9.4;
+    readonly hueBins: 36;
+    readonly maxBlackChroma: 0.055;
     readonly maxChroma: 0.28;
-    readonly minChroma: 0.03;
-    readonly sampleSize: 32;
+    readonly maxPrimaryChroma: 0.24;
+    readonly minPixelChroma: 0.03;
+    readonly minPresence: 0.04;
+    readonly neutralChroma: 0.012;
+    readonly primaryLightness: 0.74;
+    readonly sampleSize: 64;
 }>;
 export declare function srgbToLinear(c: number): number;
 export declare function rgbToOklch(r: number, g: number, b: number): OklchColor;

package/dist/modules/ambient/color.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../../../src/modules/ambient/color.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1D,eAAO,MAAM,oBAAoB;;;;;;;;;EAStB,CAAC;AAEZ,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAG9C;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,UAAU,CAyBtE;AAED,wBAAgB,aAAa,CAC3B,CAAC,EAAE,MAAM,GAAG,MAAM,EAClB,CAAC,EAAE,MAAM,GAAG,MAAM,EAClB,CAAC,EAAE,MAAM,GAAG,MAAM,EAClB,KAAK,GAAE,MAAM,GAAG,MAAU,GACzB,MAAM,CASR;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,cAAc,CAuBjE"}
+{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../../../src/modules/ambient/color.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1D,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;EActB,CAAC;AAEZ,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAG9C;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,UAAU,CAyBtE;AAED,wBAAgB,aAAa,CAC3B,CAAC,EAAE,MAAM,GAAG,MAAM,EAClB,CAAC,EAAE,MAAM,GAAG,MAAM,EAClB,CAAC,EAAE,MAAM,GAAG,MAAM,EAClB,KAAK,GAAE,MAAM,GAAG,MAAU,GACzB,MAAM,CASR;AAMD,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,cAAc,CAgCjE"}

package/dist/modules/ambient/extractor.d.ts

@@ -1,4 +1,12 @@
 import type { AmbientExtractOptions, AmbientImageSource, AmbientPalette, OklchColor } from "./types";
+/**
+ * Picks the most representative accent of an image.
+ *
+ * Pixels vote for their hue with a weight that grows with chroma (vivid pixels
+ * beat muddy ones) and fades toward very dark / very light pixels. Images
+ * without meaningful colour resolve to a neutral (`c: 0`) instead of an
+ * invented hue.
+ */
 export declare function sampleImageData(imageData: ImageData): OklchColor;
 export declare function createDefaultPalette(fallback?: AmbientPalette | null): AmbientPalette;
 export declare function extractPaletteFromImage(imageSource: AmbientImageSource, options?: AmbientExtractOptions): Promise<AmbientPalette>;

package/dist/modules/ambient/extractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractor.d.ts","sourceRoot":"","sources":["../../../src/modules/ambient/extractor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,EACd,UAAU,EACX,MAAM,SAAS,CAAC;AAEjB,wBAAgB,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,UAAU,CAsFhE;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI,GAC/B,cAAc,CAKhB;AAsED,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,kBAAkB,EAC/B,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,cAAc,CAAC,CAqBzB"}
+{"version":3,"file":"extractor.d.ts","sourceRoot":"","sources":["../../../src/modules/ambient/extractor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,EACd,UAAU,EACX,MAAM,SAAS,CAAC;AAUjB;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,UAAU,CAsFhE;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI,GAC/B,cAAc,CAKhB;AAsED,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,kBAAkB,EAC/B,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,cAAc,CAAC,CAqBzB"}

package/dist/modules/ambient/index.js

@@ -175,13 +175,18 @@ var ambientTheme = defineThemeSpec("ambient");
 // src/modules/ambient/color.ts
 var COLOR_EXTRACT_CONFIG = Object.freeze({
   blackChromaFactor: 0.35,
-  primaryLightness: 0.74,
-  maxBlackChroma: 0.055,
   blackLightness: 0.15,
   cacheLimit: 100,
+  chromaGain: 9.4,
+  hueBins: 36,
+  maxBlackChroma: 0.055,
   maxChroma: 0.28,
-  minChroma: 0.03,
-  sampleSize: 32
+  maxPrimaryChroma: 0.24,
+  minPixelChroma: 0.03,
+  minPresence: 0.04,
+  neutralChroma: 0.012,
+  primaryLightness: 0.74,
+  sampleSize: 64
 });
 function srgbToLinear(c) {
   const v = c / 255;
@@ -218,100 +223,104 @@ function oklchToString(l, c, h, alpha = 1) {
   }
   return `oklch(${safeL} ${safeC} ${safeH})`;
 }
+function clamp(value, min, max) {
+  return Math.max(min, Math.min(max, value));
+}
 function derivePalette(sampled) {
   const {
     blackChromaFactor,
     blackLightness,
+    chromaGain,
     maxBlackChroma,
     maxChroma,
-    minChroma,
+    maxPrimaryChroma,
+    neutralChroma,
     primaryLightness
   } = COLOR_EXTRACT_CONFIG;
-  const chroma = Math.max(minChroma, Math.min(maxChroma, sampled.c));
-  const blackChroma = Math.min(
-    maxBlackChroma,
-    Math.max(0.025, chroma * blackChromaFactor)
-  );
-  const primaryChroma = Math.max(
-    0.15,
-    Math.min(0.24, Math.max(chroma * 1.15, 0.18))
+  const chroma = sampled.c < neutralChroma ? 0 : clamp(sampled.c, 0, maxChroma);
+  const hue = chroma === 0 ? 0 : sampled.h;
+  const primaryChroma = maxPrimaryChroma * (1 - Math.exp(-chroma * chromaGain));
+  const primaryL = clamp(
+    primaryLightness + (sampled.l - 0.6) * 0.5,
+    0.6,
+    0.86
   );
+  const blackChroma = Math.min(maxBlackChroma, chroma * blackChromaFactor);
+  const blackL = clamp(blackLightness + (sampled.l - 0.6) * 0.06, 0.12, 0.18);
   return {
-    black: oklchToString(blackLightness, blackChroma, sampled.h),
-    primary: oklchToString(primaryLightness, primaryChroma, sampled.h)
+    black: oklchToString(blackL, blackChroma, hue),
+    primary: oklchToString(primaryL, primaryChroma, hue)
   };
 }
 
 // src/modules/ambient/extractor.ts
 function sampleImageData(imageData) {
+  const { hueBins, minPixelChroma, minPresence } = COLOR_EXTRACT_CONFIG;
   const data = imageData.data;
-  const len = data.length;
-  const numBins = 24;
-  const binAngle = 360 / numBins;
-  const bins = Array.from({ length: numBins }, () => ({
-    count: 0,
+  const binAngle = 360 / hueBins;
+  const bins = Array.from({ length: hueBins }, () => ({
+    cos: 0,
+    sin: 0,
     sumC: 0,
-    sumCos: 0,
     sumL: 0,
-    sumSin: 0
+    weight: 0
   }));
-  let neutralCount = 0;
-  let neutralSumL = 0;
+  let opaqueCount = 0;
+  let opaqueSumL = 0;
   let chromaticCount = 0;
-  for (let i = 0; i < len; i += 4) {
-    const alpha = data[i + 3];
-    if (alpha < 128) continue;
-    const r = data[i];
-    const g = data[i + 1];
-    const b = data[i + 2];
-    const oklch = rgbToOklch(r, g, b);
-    if (oklch.l < 0.04 || oklch.l > 0.96 || oklch.c < 0.02) {
-      neutralCount++;
-      neutralSumL += oklch.l;
+  let midNeutralCount = 0;
+  for (let i = 0; i < data.length; i += 4) {
+    if (data[i + 3] < 128) continue;
+    const { c, h, l } = rgbToOklch(data[i], data[i + 1], data[i + 2]);
+    opaqueCount++;
+    opaqueSumL += l;
+    if (l < 0.06 || l > 0.96) continue;
+    if (c < minPixelChroma) {
+      midNeutralCount++;
       continue;
     }
-    const binIndex = Math.floor(oklch.h / binAngle) % numBins;
-    const rad = oklch.h * (Math.PI / 180);
-    const bin = bins[binIndex];
-    bin.count++;
-    bin.sumL += oklch.l;
-    bin.sumC += oklch.c;
-    bin.sumCos += Math.cos(rad);
-    bin.sumSin += Math.sin(rad);
+    const usable = 1 - 0.7 * Math.min(1, Math.abs(l - 0.62) / 0.62);
+    const weight2 = c * c * usable;
+    const rad = h * (Math.PI / 180);
+    const bin = bins[Math.floor(h / binAngle) % hueBins];
+    bin.weight += weight2;
+    bin.sumC += c * weight2;
+    bin.sumL += l * weight2;
+    bin.cos += Math.cos(rad) * weight2;
+    bin.sin += Math.sin(rad) * weight2;
     chromaticCount++;
   }
-  if (chromaticCount === 0) {
-    const avgL2 = neutralCount > 0 ? neutralSumL / neutralCount : 0.55;
-    return { c: 0.03, h: 252, l: avgL2 };
-  }
+  const averageL = opaqueCount > 0 ? opaqueSumL / opaqueCount : 0.5;
+  const neutral = { c: 0, h: 0, l: Number(averageL.toFixed(3)) };
+  const presence = chromaticCount / Math.max(1, chromaticCount + midNeutralCount);
+  if (chromaticCount === 0 || presence < minPresence) return neutral;
   let bestIndex = 0;
-  let maxWindowCount = -1;
-  for (let i = 0; i < numBins; i++) {
-    const prev2 = bins[(i - 1 + numBins) % numBins];
-    const curr2 = bins[i];
-    const next2 = bins[(i + 1) % numBins];
-    const windowCount = prev2.count * 0.5 + curr2.count + next2.count * 0.5;
-    if (windowCount > maxWindowCount) {
-      maxWindowCount = windowCount;
+  let bestScore = -1;
+  for (let i = 0; i < hueBins; i++) {
+    const prev = bins[(i - 1 + hueBins) % hueBins];
+    const next = bins[(i + 1) % hueBins];
+    const score = prev.weight * 0.5 + bins[i].weight + next.weight * 0.5;
+    if (score > bestScore) {
+      bestScore = score;
       bestIndex = i;
     }
   }
-  const prev = bins[(bestIndex - 1 + numBins) % numBins];
-  const curr = bins[bestIndex];
-  const next = bins[(bestIndex + 1) % numBins];
-  const totalCount = prev.count + curr.count + next.count;
-  if (totalCount === 0) {
-    return { c: 0.19, h: 252, l: 0.55 };
-  }
-  const avgL = (prev.sumL + curr.sumL + next.sumL) / totalCount;
-  const avgC = (prev.sumC + curr.sumC + next.sumC) / totalCount;
-  const avgSin = prev.sumSin + curr.sumSin + next.sumSin;
-  const avgCos = prev.sumCos + curr.sumCos + next.sumCos;
-  const avgH = (Math.atan2(avgSin, avgCos) * (180 / Math.PI) + 360) % 360;
+  const window2 = [
+    bins[(bestIndex - 1 + hueBins) % hueBins],
+    bins[bestIndex],
+    bins[(bestIndex + 1) % hueBins]
+  ];
+  const weight = window2.reduce((sum, bin) => sum + bin.weight, 0);
+  if (weight === 0) return neutral;
+  const sumC = window2.reduce((sum, bin) => sum + bin.sumC, 0);
+  const sumL = window2.reduce((sum, bin) => sum + bin.sumL, 0);
+  const sin = window2.reduce((sum, bin) => sum + bin.sin, 0);
+  const cos = window2.reduce((sum, bin) => sum + bin.cos, 0);
+  const dilution = 0.45 + 0.55 * Math.min(1, presence / 0.3);
   return {
-    c: Number(avgC.toFixed(3)),
-    h: Number(avgH.toFixed(1)),
-    l: Number(avgL.toFixed(3))
+    c: Number((sumC / weight * dilution).toFixed(3)),
+    h: Number(((Math.atan2(sin, cos) * (180 / Math.PI) + 360) % 360).toFixed(1)),
+    l: Number((sumL / weight).toFixed(3))
   };
 }
 function createDefaultPalette(fallback) {