@tenphi/glaze 0.14.0 → 0.15.0

package/README.md

@@ -5,7 +5,7 @@
 <h1 align="center">Glaze</h1>
 
 <p align="center">
-  OKHSL-based color theme generator with WCAG contrast solving
+  OKHST-based color theme generator with WCAG contrast solving
 </p>
 
 <p align="center">

package/dist/index.cjs

@@ -258,10 +258,48 @@ const getCs = (L, a, b, cusp) => {
 		cMax
 	];
 };
+const CYAN_A = Math.cos(199.8 * Math.PI / 180);
+const CYAN_B = Math.sin(199.8 * Math.PI / 180);
+const BLUE_A = Math.cos(267.4 * Math.PI / 180);
+const BLUE_B = Math.sin(267.4 * Math.PI / 180);
+let cyanCusp;
+let blueCusp;
+/**
+* Computes the maximum safe OKLCH chroma that fits inside the sRGB gamut
+* for all possible hues at a given OKLab lightness `L`.
+*/
+function computeSafeChromaOKLCH(L) {
+	if (!cyanCusp) cyanCusp = findCuspOKLCH(CYAN_A, CYAN_B);
+	if (!blueCusp) blueCusp = findCuspOKLCH(BLUE_A, BLUE_B);
+	const c1 = findGamutIntersectionOKLCH(CYAN_A, CYAN_B, L, 1, L, cyanCusp);
+	const c2 = findGamutIntersectionOKLCH(BLUE_A, BLUE_B, L, 1, L, blueCusp);
+	return Math.min(c1, c2);
+}
+/** Per-hue cusp-lightness cache. The cusp is mode-independent, so keying on
+* a rounded hue is safe and keeps the cache small. */
+const cuspLightnessCache = /* @__PURE__ */ new Map();
+/**
+* OKHSL lightness of the gamut cusp for a hue — the lightness where the
+* realizable chroma peaks. Reuses the same `find_cusp` OKHSL already runs for
+* its `s` normalization (no new color math); the OKLab cusp lightness is run
+* through the OKHSL `toe` and clamped to `[0.001, 0.999]` so divisions that
+* key off it stay safe. Cached per (rounded) hue.
+*
+* @param h Hue, 0–360.
+*/
+function cuspLightness(h) {
+	const key = Math.round(constrainAngle(h) * 100) / 100;
+	const cached = cuspLightnessCache.get(key);
+	if (cached !== void 0) return cached;
+	const hNorm = key / 360;
+	const lc = clampVal(toe(findCuspOKLCH(Math.cos(TAU * hNorm), Math.sin(TAU * hNorm))[0]), .001, .999);
+	cuspLightnessCache.set(key, lc);
+	return lc;
+}
 /**
 * Convert OKHSL (h: 0–360, s: 0–1, l: 0–1) to OKLab [L, a, b].
 */
-function okhslToOklab(h, s, l) {
+function okhslToOklab(h, s, l, pastel = false) {
 	const L = toeInv(l);
 	let a = 0;
 	let b = 0;
@@ -269,24 +307,30 @@ function okhslToOklab(h, s, l) {
 	if (L !== 0 && L !== 1 && s !== 0) {
 		const a_ = Math.cos(TAU * hNorm);
 		const b_ = Math.sin(TAU * hNorm);
-		const [c0, cMid, cMax] = getCs(L, a_, b_, findCuspOKLCH(a_, b_));
-		const mid = .8;
-		const midInv = 1.25;
-		let t, k0, k1, k2;
-		if (s < mid) {
-			t = midInv * s;
-			k0 = 0;
-			k1 = mid * c0;
-			k2 = 1 - k1 / cMid;
+		if (pastel) {
+			const c = s * computeSafeChromaOKLCH(L);
+			a = c * a_;
+			b = c * b_;
 		} else {
-			t = 5 * (s - .8);
-			k0 = cMid;
-			k1 = .2 * cMid ** 2 * 1.25 ** 2 / c0;
-			k2 = 1 - k1 / (cMax - cMid);
+			const [c0, cMid, cMax] = getCs(L, a_, b_, findCuspOKLCH(a_, b_));
+			const mid = .8;
+			const midInv = 1.25;
+			let t, k0, k1, k2;
+			if (s < mid) {
+				t = midInv * s;
+				k0 = 0;
+				k1 = mid * c0;
+				k2 = 1 - k1 / cMid;
+			} else {
+				t = 5 * (s - .8);
+				k0 = cMid;
+				k1 = .2 * cMid ** 2 * 1.25 ** 2 / c0;
+				k2 = 1 - k1 / (cMax - cMid);
+			}
+			const c = k0 + t * k1 / (1 - k2 * t);
+			a = c * a_;
+			b = c * b_;
 		}
-		const c = k0 + t * k1 / (1 - k2 * t);
-		a = c * a_;
-		b = c * b_;
 	}
 	return [
 		L,
@@ -298,8 +342,8 @@ function okhslToOklab(h, s, l) {
 * Convert OKHSL (h: 0–360, s: 0–1, l: 0–1) to linear sRGB.
 * Channels may exceed [0, 1] near gamut boundaries — caller must clamp if needed.
 */
-function okhslToLinearSrgb(h, s, l) {
-	return OKLabToLinearSRGB(okhslToOklab(h, s, l));
+function okhslToLinearSrgb(h, s, l, pastel = false) {
+	return OKLabToLinearSRGB(okhslToOklab(h, s, l, pastel));
 }
 /**
 * Compute relative luminance Y from linear sRGB channels.
@@ -329,8 +373,8 @@ const sRGBGammaToLinear = (val) => {
 /**
 * Convert OKHSL to gamma-encoded sRGB (clamped to 0–1).
 */
-function okhslToSrgb(h, s, l) {
-	const lin = okhslToLinearSrgb(h, s, l);
+function okhslToSrgb(h, s, l, pastel = false) {
+	const lin = okhslToLinearSrgb(h, s, l, pastel);
 	return [
 		Math.max(0, Math.min(1, sRGBLinearToGamma(lin[0]))),
 		Math.max(0, Math.min(1, sRGBLinearToGamma(lin[1]))),
@@ -372,7 +416,7 @@ const linearSrgbToOklab = (rgb) => {
 * Input: [L, a, b] where L: 0–1, a/b: roughly -0.5 to 0.5.
 * Returns [h, s, l] where h: 0–360, s: 0–1, l: 0–1.
 */
-const oklabToOkhsl = (lab) => {
+const oklabToOkhsl = (lab, pastel = false) => {
 	const L = lab[0];
 	const a = lab[1];
 	const b = lab[2];
@@ -392,19 +436,22 @@ const oklabToOkhsl = (lab) => {
 	const b_ = b / C;
 	let h = Math.atan2(b, a) * (180 / Math.PI);
 	h = constrainAngle(h);
-	const [c0, cMid, cMax] = getCs(L, a_, b_, findCuspOKLCH(a_, b_));
-	const mid = .8;
-	const midInv = 1.25;
 	let s;
-	if (C < cMid) {
-		const k1 = mid * c0;
-		s = C / (k1 + C * (1 - k1 / cMid)) / midInv;
-	} else {
-		const k0 = cMid;
-		const k1 = .2 * cMid ** 2 * 1.25 ** 2 / c0;
-		const k2 = 1 - k1 / (cMax - cMid);
-		const cDiff = C - k0;
-		s = mid + cDiff / (k1 + cDiff * k2) / 5;
+	if (pastel) s = C / computeSafeChromaOKLCH(L);
+	else {
+		const [c0, cMid, cMax] = getCs(L, a_, b_, findCuspOKLCH(a_, b_));
+		const mid = .8;
+		const midInv = 1.25;
+		if (C < cMid) {
+			const k1 = mid * c0;
+			s = C / (k1 + C * (1 - k1 / cMid)) / midInv;
+		} else {
+			const k0 = cMid;
+			const k1 = .2 * cMid ** 2 * 1.25 ** 2 / c0;
+			const k2 = 1 - k1 / (cMax - cMid);
+			const cDiff = C - k0;
+			s = mid + cDiff / (k1 + cDiff * k2) / 5;
+		}
 	}
 	const l = toe(L);
 	return [
@@ -417,12 +464,12 @@ const oklabToOkhsl = (lab) => {
 * Convert gamma-encoded sRGB (0–1 per channel) to OKHSL.
 * Returns [h, s, l] where h: 0–360, s: 0–1, l: 0–1.
 */
-function srgbToOkhsl(rgb) {
+function srgbToOkhsl(rgb, pastel = false) {
 	return oklabToOkhsl(linearSrgbToOklab([
 		sRGBGammaToLinear(rgb[0]),
 		sRGBGammaToLinear(rgb[1]),
 		sRGBGammaToLinear(rgb[2])
-	]));
+	]), pastel);
 }
 /**
 * Convert CSS HSL (sRGB-based) to gamma-encoded sRGB [r, g, b] in 0–1 range.
@@ -537,24 +584,26 @@ function fmt$1(value, decimals) {
 * Format OKHSL values as a CSS `okhsl(H S% L%)` string.
 * h: 0–360, s: 0–100, l: 0–100 (percentage scale for s and l).
 */
-function formatOkhsl(h, s, l) {
-	return `okhsl(${fmt$1(h, 2)} ${fmt$1(s, 2)}% ${fmt$1(l, 2)}%)`;
+function formatOkhsl(h, s, l, pastel = false) {
+	let outS = s;
+	if (pastel) outS = oklabToOkhsl(okhslToOklab(h, s / 100, l / 100, true), false)[1] * 100;
+	return `okhsl(${fmt$1(h, 2)} ${fmt$1(outS, 2)}% ${fmt$1(l, 2)}%)`;
 }
 /**
 * Format OKHSL values as a CSS `rgb(R G B)` string.
 * Uses 2 decimal places to avoid 8-bit quantization contrast loss.
 * h: 0–360, s: 0–100, l: 0–100 (percentage scale for s and l).
 */
-function formatRgb(h, s, l) {
-	const [r, g, b] = okhslToSrgb(h, s / 100, l / 100);
+function formatRgb(h, s, l, pastel = false) {
+	const [r, g, b] = okhslToSrgb(h, s / 100, l / 100, pastel);
 	return `rgb(${parseFloat((r * 255).toFixed(2))} ${parseFloat((g * 255).toFixed(2))} ${parseFloat((b * 255).toFixed(2))})`;
 }
 /**
 * Format OKHSL values as a CSS `hsl(H S% L%)` string.
 * h: 0–360, s: 0–100, l: 0–100 (percentage scale for s and l).
 */
-function formatHsl(h, s, l) {
-	const [r, g, b] = okhslToSrgb(h, s / 100, l / 100);
+function formatHsl(h, s, l, pastel = false) {
+	const [r, g, b] = okhslToSrgb(h, s / 100, l / 100, pastel);
 	const max = Math.max(r, g, b);
 	const min = Math.min(r, g, b);
 	const delta = max - min;
@@ -573,8 +622,8 @@ function formatHsl(h, s, l) {
 * Format OKHSL values as a CSS `oklch(L C H)` string.
 * h: 0–360, s: 0–100, l: 0–100 (percentage scale for s and l).
 */
-function formatOklch(h, s, l) {
-	const [L, a, b] = okhslToOklab(h, s / 100, l / 100);
+function formatOklch(h, s, l, pastel = false) {
+	const [L, a, b] = okhslToOklab(h, s / 100, l / 100, pastel);
 	const C = Math.sqrt(a * a + b * b);
 	let hh = Math.atan2(b, a) * (180 / Math.PI);
 	hh = constrainAngle(hh);
@@ -600,7 +649,6 @@ function defaultConfig() {
 			eps: .05
 		},
 		darkDesaturation: .1,
-		saturationTaper: .15,
 		states: {
 			dark: "@dark",
 			highContrast: "@high-contrast"
@@ -609,7 +657,8 @@ function defaultConfig() {
 			dark: true,
 			highContrast: false
 		},
-		autoFlip: true
+		autoFlip: true,
+		pastel: false
 	};
 }
 let globalConfig = defaultConfig();
@@ -639,7 +688,6 @@ function configure(config) {
 		lightTone: config.lightTone ?? globalConfig.lightTone,
 		darkTone: config.darkTone ?? globalConfig.darkTone,
 		darkDesaturation: config.darkDesaturation ?? globalConfig.darkDesaturation,
-		saturationTaper: config.saturationTaper ?? globalConfig.saturationTaper,
 		states: {
 			dark: config.states?.dark ?? globalConfig.states.dark,
 			highContrast: config.states?.highContrast ?? globalConfig.states.highContrast
@@ -649,7 +697,8 @@ function configure(config) {
 			highContrast: config.modes?.highContrast ?? globalConfig.modes.highContrast
 		},
 		shadowTuning: config.shadowTuning ?? globalConfig.shadowTuning,
-		autoFlip: config.autoFlip ?? globalConfig.autoFlip
+		autoFlip: config.autoFlip ?? globalConfig.autoFlip,
+		pastel: config.pastel ?? globalConfig.pastel
 	};
 }
 function resetConfig() {
@@ -668,11 +717,11 @@ function mergeConfig(base, override) {
 		lightTone: override.lightTone !== void 0 ? override.lightTone : base.lightTone,
 		darkTone: override.darkTone !== void 0 ? override.darkTone : base.darkTone,
 		darkDesaturation: override.darkDesaturation ?? base.darkDesaturation,
-		saturationTaper: override.saturationTaper ?? base.saturationTaper,
 		states: base.states,
 		modes: base.modes,
 		shadowTuning: override.shadowTuning ?? base.shadowTuning,
-		autoFlip: override.autoFlip ?? base.autoFlip
+		autoFlip: override.autoFlip ?? base.autoFlip,
+		pastel: override.pastel ?? base.pastel
 	};
 }
 
@@ -765,8 +814,8 @@ function isAbsoluteTone(tone) {
 * - the `{ h, s, t }` <-> `{ h, s, l }` color-space converters,
 * - the resolved-variant edge adapter (`variantToOkhsl`),
 * - the per-scheme tone mapping that replaced the Möbius dark curve
-*   (`mapToneForScheme`), the saturation reducers, and the solver's
-*   scheme tone range.
+*   (`mapToneForScheme`), the dark desaturation reducer, and the solver's scheme
+*   tone range.
 *
 * See `docs/okhst.md` for the full specification and the calibrated
 * default constants.
@@ -909,33 +958,6 @@ function mapSaturationDark(s, mode, config) {
 	if (mode === "static") return s;
 	return s * (1 - config.darkDesaturation);
 }
-/** Smoothstep `0..1`. */
-function smoothstep(x) {
-	const t = clamp(x, 0, 1);
-	return t * t * (3 - 2 * t);
-}
-/** Fraction of the tone range over which the taper ramps in, per end. */
-const TAPER_REGION = .15;
-/**
-* Gently taper saturation toward the tone extremes, where in-gamut chroma
-* collapses and high saturation reads as noise. `taper` is the *strength*
-* (0–1): the maximum fraction of saturation removed at the very edges. The
-* rolloff ramps in smoothly over the outer {@link TAPER_REGION} of tone on
-* each end, so mid-tones are untouched and high-tone surfaces keep most of
-* their color. `taper = 0` disables the effect.
-*
-* @param s Saturation (0–1).
-* @param toneFinal Stored canonical tone (0–1).
-* @param taper Strength (0–1); default config is a gentle 0.15.
-*/
-function saturationEnvelope(s, toneFinal, taper) {
-	if (taper <= 0) return s;
-	const t = clamp(toneFinal, 0, 1);
-	const strength = clamp(taper, 0, 1);
-	const edge = Math.min(t, 1 - t);
-	if (edge >= TAPER_REGION) return s;
-	return s * (1 - strength * (1 - smoothstep(edge / TAPER_REGION)));
-}
 /**
 * Tone search range (0–1) for the contrast solver in a given scheme.
 * `static` searches the full range; otherwise the scheme window's tone
@@ -1040,12 +1062,12 @@ const cacheOrder = [];
 * the metric's luminance basis. The metric is part of the cache key because
 * WCAG and APCA derive different luminances from the same color.
 */
-function cachedLuminance(metric, h, s, t) {
+function cachedLuminance(metric, h, s, t, pastel) {
 	const tRounded = Math.round(t * 1e4) / 1e4;
-	const key = `${metric}|${h}|${s}|${tRounded}`;
+	const key = `${metric}|${h}|${s}|${tRounded}|${pastel}`;
 	const cached = luminanceCache.get(key);
 	if (cached !== void 0) return cached;
-	const y = metricLuminance(metric, okhslToLinearSrgb(h, s, fromTone(tRounded * 100, REF_EPS)));
+	const y = metricLuminance(metric, okhslToLinearSrgb(h, s, fromTone(tRounded * 100, REF_EPS), pastel));
 	if (luminanceCache.size >= CACHE_SIZE) {
 		const evict = cacheOrder.shift();
 		luminanceCache.delete(evict);
@@ -1176,14 +1198,11 @@ function solveNearestContrast(opts) {
 * staying as close to `preferredTone` as possible.
 */
 function findToneForContrast(options) {
-	const { hue, saturation, preferredTone, baseLinearRgb, contrast, toneRange = [0, 1], epsilon = 1e-4, maxIterations = 18 } = options;
+	const { hue, saturation, preferredTone, baseLinearRgb, contrast, toneRange = [0, 1], epsilon = 1e-4, maxIterations = 18, pastel = false } = options;
 	const { metric, target } = contrast;
 	const searchTarget = metric === "wcag" ? target * 1.01 : target + .5;
 	const yBase = metricLuminance(metric, baseLinearRgb);
-	const taper = options.saturationTaper ?? 0;
-	const lum = taper > 0 ? (t) => {
-		return metricLuminance(metric, okhslToLinearSrgb(hue, saturationEnvelope(saturation, t, taper), fromTone(t * 100, REF_EPS)));
-	} : (t) => cachedLuminance(metric, hue, saturation, t);
+	const lum = (t) => cachedLuminance(metric, hue, saturation, t, pastel);
 	const scorePref = metricScore(metric, lum(preferredTone), yBase);
 	if (scorePref >= searchTarget) return {
 		tone: preferredTone,
@@ -1587,7 +1606,7 @@ function resolveDependentColor(name, def, ctx, isHighContrast, isDark, effective
 		const resolvedContrast = resolveContrastSpec(rawContrast, isHighContrast);
 		const effectiveSat = isDark ? mapSaturationDark(satFactor * ctx.saturation / 100, mode, ctx.config) : satFactor * ctx.saturation / 100;
 		const baseOkhsl = toOkhslVariant(baseVariant);
-		const baseLinearRgb = okhslToLinearSrgb(baseOkhsl.h, baseOkhsl.s, baseOkhsl.l);
+		const baseLinearRgb = okhslToLinearSrgb(baseOkhsl.h, baseOkhsl.s, baseOkhsl.l, ctx.config.pastel);
 		const toneRange = schemeToneRange(isDark, mode, isHighContrast, ctx.config);
 		let initialDirection;
 		if (preferredTone < baseTone) initialDirection = "darker";
@@ -1601,7 +1620,7 @@ function resolveDependentColor(name, def, ctx, isHighContrast, isDark, effective
 			toneRange: [0, 1],
 			initialDirection,
 			flip,
-			saturationTaper: ctx.config.saturationTaper
+			pastel: ctx.config.pastel
 		});
 		if (!result.met) warnContrastUnmet(name, isDark, isHighContrast, resolvedContrast, result.contrast);
 		return {
@@ -1633,9 +1652,8 @@ function resolveColorForScheme(name, def, ctx, isDark, isHighContrast) {
 		satFactor = dep.satFactor;
 	}
 	const baseSat = satFactor * ctx.saturation / 100;
-	let finalSat = isDark ? mapSaturationDark(baseSat, mode, ctx.config) : baseSat;
+	const finalSat = isDark ? mapSaturationDark(baseSat, mode, ctx.config) : baseSat;
 	const toneFraction = clamp(finalTone / 100, 0, 1);
-	finalSat = saturationEnvelope(finalSat, toneFraction, ctx.config.saturationTaper);
 	return {
 		h: effectiveHue,
 		s: clamp(finalSat, 0, 1),
@@ -1651,8 +1669,8 @@ function resolveShadowForScheme(def, ctx, isDark, isHighContrast) {
 	const tuning = resolveShadowTuning(def.tuning, ctx.config.shadowTuning);
 	return toToneVariant(computeShadow(bgVariant, fgVariant, intensity, tuning));
 }
-function okhslVariantToLinearRgb(v) {
-	return okhslToLinearSrgb(v.h, v.s, v.l);
+function okhslVariantToLinearRgb(v, pastel) {
+	return okhslToLinearSrgb(v.h, v.s, v.l, pastel);
 }
 /**
 * Resolve hue for OKHSL mixing, handling achromatic colors.
@@ -1675,12 +1693,12 @@ function linearSrgbLerp(base, target, t) {
 		base[2] + (target[2] - base[2]) * t
 	];
 }
-function linearRgbToToneVariant(rgb) {
+function linearRgbToToneVariant(rgb, pastel) {
 	const [h, s, l] = srgbToOkhsl([
 		Math.max(0, Math.min(1, sRGBLinearToGamma(rgb[0]))),
 		Math.max(0, Math.min(1, sRGBLinearToGamma(rgb[1]))),
 		Math.max(0, Math.min(1, sRGBLinearToGamma(rgb[2])))
-	]);
+	], pastel);
 	return toToneVariant({
 		h,
 		s,
@@ -1696,15 +1714,15 @@ function resolveMixForScheme(def, ctx, isDark, isHighContrast) {
 	let t = clamp(isHighContrast ? pairHC(def.value) : pairNormal(def.value), 0, 100) / 100;
 	const blend = def.blend ?? "opaque";
 	const space = def.space ?? "okhsl";
-	const baseLinear = okhslVariantToLinearRgb(baseVariant);
-	const targetLinear = okhslVariantToLinearRgb(targetVariant);
+	const baseLinear = okhslVariantToLinearRgb(baseVariant, ctx.config.pastel);
+	const targetLinear = okhslVariantToLinearRgb(targetVariant, ctx.config.pastel);
 	if (def.contrast !== void 0) {
 		const resolvedContrast = resolveContrastSpec(def.contrast, isHighContrast);
 		const metric = resolvedContrast.metric;
 		let luminanceAt;
 		if (blend === "transparent" || space === "srgb") luminanceAt = (v) => metricLuminance(metric, linearSrgbLerp(baseLinear, targetLinear, v));
 		else luminanceAt = (v) => {
-			return metricLuminance(metric, okhslToLinearSrgb(mixHue(baseVariant, targetVariant, v), baseVariant.s + (targetVariant.s - baseVariant.s) * v, baseVariant.l + (targetVariant.l - baseVariant.l) * v));
+			return metricLuminance(metric, okhslToLinearSrgb(mixHue(baseVariant, targetVariant, v), baseVariant.s + (targetVariant.s - baseVariant.s) * v, baseVariant.l + (targetVariant.l - baseVariant.l) * v, ctx.config.pastel));
 		};
 		t = findValueForMixContrast({
 			preferredValue: t,
@@ -1721,7 +1739,7 @@ function resolveMixForScheme(def, ctx, isDark, isHighContrast) {
 		l: targetVariant.l,
 		alpha: clamp(t, 0, 1)
 	});
-	if (space === "srgb") return linearRgbToToneVariant(linearSrgbLerp(baseLinear, targetLinear, t));
+	if (space === "srgb") return linearRgbToToneVariant(linearSrgbLerp(baseLinear, targetLinear, t), ctx.config.pastel);
 	return toToneVariant({
 		h: mixHue(baseVariant, targetVariant, t),
 		s: clamp(baseVariant.s + (targetVariant.s - baseVariant.s) * t, 0, 1),
@@ -1873,9 +1891,9 @@ const formatters = {
 function fmt(value, decimals) {
 	return parseFloat(value.toFixed(decimals)).toString();
 }
-function formatVariant(v, format = "okhsl") {
+function formatVariant(v, format = "okhsl", pastel = false) {
 	const { l } = variantToOkhsl(v);
-	const base = formatters[format](v.h, v.s * 100, l * 100);
+	const base = formatters[format](v.h, v.s * 100, l * 100, pastel);
 	if (v.alpha >= 1) return base;
 	const closing = base.lastIndexOf(")");
 	return `${base.slice(0, closing)} / ${fmt(v.alpha, 4)})`;
@@ -1887,44 +1905,44 @@ function resolveModes(override) {
 		highContrast: override?.highContrast ?? cfg.modes.highContrast
 	};
 }
-function buildTokenMap(resolved, prefix, states, modes, format = "okhsl") {
+function buildTokenMap(resolved, prefix, states, modes, format = "okhsl", pastel = false) {
 	const tokens = {};
 	for (const [name, color] of resolved) {
 		const key = `#${prefix}${name}`;
-		const entry = { "": formatVariant(color.light, format) };
-		if (modes.dark) entry[states.dark] = formatVariant(color.dark, format);
-		if (modes.highContrast) entry[states.highContrast] = formatVariant(color.lightContrast, format);
-		if (modes.dark && modes.highContrast) entry[`${states.dark} & ${states.highContrast}`] = formatVariant(color.darkContrast, format);
+		const entry = { "": formatVariant(color.light, format, pastel) };
+		if (modes.dark) entry[states.dark] = formatVariant(color.dark, format, pastel);
+		if (modes.highContrast) entry[states.highContrast] = formatVariant(color.lightContrast, format, pastel);
+		if (modes.dark && modes.highContrast) entry[`${states.dark} & ${states.highContrast}`] = formatVariant(color.darkContrast, format, pastel);
 		tokens[key] = entry;
 	}
 	return tokens;
 }
-function buildFlatTokenMap(resolved, prefix, modes, format = "okhsl") {
+function buildFlatTokenMap(resolved, prefix, modes, format = "okhsl", pastel = false) {
 	const result = { light: {} };
 	if (modes.dark) result.dark = {};
 	if (modes.highContrast) result.lightContrast = {};
 	if (modes.dark && modes.highContrast) result.darkContrast = {};
 	for (const [name, color] of resolved) {
 		const key = `${prefix}${name}`;
-		result.light[key] = formatVariant(color.light, format);
-		if (modes.dark) result.dark[key] = formatVariant(color.dark, format);
-		if (modes.highContrast) result.lightContrast[key] = formatVariant(color.lightContrast, format);
-		if (modes.dark && modes.highContrast) result.darkContrast[key] = formatVariant(color.darkContrast, format);
+		result.light[key] = formatVariant(color.light, format, pastel);
+		if (modes.dark) result.dark[key] = formatVariant(color.dark, format, pastel);
+		if (modes.highContrast) result.lightContrast[key] = formatVariant(color.lightContrast, format, pastel);
+		if (modes.dark && modes.highContrast) result.darkContrast[key] = formatVariant(color.darkContrast, format, pastel);
 	}
 	return result;
 }
-function buildJsonMap(resolved, modes, format = "okhsl") {
+function buildJsonMap(resolved, modes, format = "okhsl", pastel = false) {
 	const result = {};
 	for (const [name, color] of resolved) {
-		const entry = { light: formatVariant(color.light, format) };
-		if (modes.dark) entry.dark = formatVariant(color.dark, format);
-		if (modes.highContrast) entry.lightContrast = formatVariant(color.lightContrast, format);
-		if (modes.dark && modes.highContrast) entry.darkContrast = formatVariant(color.darkContrast, format);
+		const entry = { light: formatVariant(color.light, format, pastel) };
+		if (modes.dark) entry.dark = formatVariant(color.dark, format, pastel);
+		if (modes.highContrast) entry.lightContrast = formatVariant(color.lightContrast, format, pastel);
+		if (modes.dark && modes.highContrast) entry.darkContrast = formatVariant(color.darkContrast, format, pastel);
 		result[name] = entry;
 	}
 	return result;
 }
-function buildCssMap(resolved, prefix, suffix, format) {
+function buildCssMap(resolved, prefix, suffix, format, pastel = false) {
 	const lines = {
 		light: [],
 		dark: [],
@@ -1933,10 +1951,10 @@ function buildCssMap(resolved, prefix, suffix, format) {
 	};
 	for (const [name, color] of resolved) {
 		const prop = `--${prefix}${name}${suffix}`;
-		lines.light.push(`${prop}: ${formatVariant(color.light, format)};`);
-		lines.dark.push(`${prop}: ${formatVariant(color.dark, format)};`);
-		lines.lightContrast.push(`${prop}: ${formatVariant(color.lightContrast, format)};`);
-		lines.darkContrast.push(`${prop}: ${formatVariant(color.darkContrast, format)};`);
+		lines.light.push(`${prop}: ${formatVariant(color.light, format, pastel)};`);
+		lines.dark.push(`${prop}: ${formatVariant(color.dark, format, pastel)};`);
+		lines.lightContrast.push(`${prop}: ${formatVariant(color.lightContrast, format, pastel)};`);
+		lines.darkContrast.push(`${prop}: ${formatVariant(color.darkContrast, format, pastel)};`);
 	}
 	return {
 		light: lines.light.join("\n"),
@@ -1988,7 +2006,6 @@ function buildValueFormConfigOverride(userOverride) {
 		lightTone: userOverride?.lightTone !== void 0 ? userOverride.lightTone : false,
 		darkTone: userOverride?.darkTone !== void 0 ? userOverride.darkTone : cfg.darkTone,
 		darkDesaturation: userOverride?.darkDesaturation ?? cfg.darkDesaturation,
-		saturationTaper: userOverride?.saturationTaper ?? cfg.saturationTaper,
 		autoFlip: userOverride?.autoFlip ?? cfg.autoFlip,
 		shadowTuning: userOverride?.shadowTuning ?? cfg.shadowTuning
 	};
@@ -2005,7 +2022,6 @@ function buildStructuredConfigOverride(userOverride) {
 		lightTone: userOverride?.lightTone !== void 0 ? userOverride.lightTone : cfg.lightTone,
 		darkTone: userOverride?.darkTone !== void 0 ? userOverride.darkTone : cfg.darkTone,
 		darkDesaturation: userOverride?.darkDesaturation ?? cfg.darkDesaturation,
-		saturationTaper: userOverride?.saturationTaper ?? cfg.saturationTaper,
 		autoFlip: userOverride?.autoFlip ?? cfg.autoFlip,
 		shadowTuning: userOverride?.shadowTuning ?? cfg.shadowTuning
 	};
@@ -2321,7 +2337,7 @@ function createColorTokenFromDefs(seedHue, seedSaturation, defs, primary, effect
 		};
 	};
 	const tokenLike = (options) => {
-		return buildTokenMap(resolveOnce(), "", resolveStates(options), resolveModes(options?.modes), options?.format)[`#${primary}`];
+		return buildTokenMap(resolveOnce(), "", resolveStates(options), resolveModes(options?.modes), options?.format, effectiveConfig.pastel)[`#${primary}`];
 	};
 	return {
 		resolve() {
@@ -2330,10 +2346,10 @@ function createColorTokenFromDefs(seedHue, seedSaturation, defs, primary, effect
 		token: tokenLike,
 		tasty: tokenLike,
 		json(options) {
-			return buildJsonMap(resolveOnce(), resolveModes(options?.modes), options?.format)[primary];
+			return buildJsonMap(resolveOnce(), resolveModes(options?.modes), options?.format, effectiveConfig.pastel)[primary];
 		},
 		css(options) {
-			return buildCssMap(new Map([[options.name, resolveOnce().get(primary)]]), "", options.suffix ?? "-color", options.format ?? "rgb");
+			return buildCssMap(new Map([[options.name, resolveOnce().get(primary)]]), "", options.suffix ?? "-color", options.format ?? "rgb", effectiveConfig.pastel);
 		},
 		export: exportData
 	};
@@ -2573,9 +2589,10 @@ function buildPaletteOutput(themes, paletteOptions, options, buildOne, merge, em
 	const seen = /* @__PURE__ */ new Map();
 	for (const [themeName, theme] of Object.entries(themes)) {
 		const resolved = theme.resolve();
+		const pastel = theme.getConfig().pastel;
 		const prefix = resolvePrefix(options, themeName, true);
-		merge(acc, buildOne(filterCollisions(resolved, prefix, seen, themeName), prefix));
-		if (themeName === effectivePrimary) merge(acc, buildOne(filterCollisions(resolved, "", seen, themeName, true), ""));
+		merge(acc, buildOne(filterCollisions(resolved, prefix, seen, themeName), prefix, pastel));
+		if (themeName === effectivePrimary) merge(acc, buildOne(filterCollisions(resolved, "", seen, themeName, true), "", pastel));
 	}
 	return acc;
 }
@@ -2584,7 +2601,7 @@ function createPalette(themes, paletteOptions) {
 	return {
 		tokens(options) {
 			const modes = resolveModes(options?.modes);
-			return buildPaletteOutput(themes, paletteOptions, options, (filtered, prefix) => buildFlatTokenMap(filtered, prefix, modes, options?.format), (acc, part) => {
+			return buildPaletteOutput(themes, paletteOptions, options, (filtered, prefix, pastel) => buildFlatTokenMap(filtered, prefix, modes, options?.format, pastel), (acc, part) => {
 				for (const variant of Object.keys(part)) {
 					if (!acc[variant]) acc[variant] = {};
 					Object.assign(acc[variant], part[variant]);
@@ -2598,18 +2615,18 @@ function createPalette(themes, paletteOptions) {
 				highContrast: options?.states?.highContrast ?? cfg.states.highContrast
 			};
 			const modes = resolveModes(options?.modes);
-			return buildPaletteOutput(themes, paletteOptions, options, (filtered, prefix) => buildTokenMap(filtered, prefix, states, modes, options?.format), (acc, part) => Object.assign(acc, part), () => ({}));
+			return buildPaletteOutput(themes, paletteOptions, options, (filtered, prefix, pastel) => buildTokenMap(filtered, prefix, states, modes, options?.format, pastel), (acc, part) => Object.assign(acc, part), () => ({}));
 		},
 		json(options) {
 			const modes = resolveModes(options?.modes);
 			const result = {};
-			for (const [themeName, theme] of Object.entries(themes)) result[themeName] = buildJsonMap(theme.resolve(), modes, options?.format);
+			for (const [themeName, theme] of Object.entries(themes)) result[themeName] = buildJsonMap(theme.resolve(), modes, options?.format, theme.getConfig().pastel);
 			return result;
 		},
 		css(options) {
 			const suffix = options?.suffix ?? "-color";
 			const format = options?.format ?? "rgb";
-			const lines = buildPaletteOutput(themes, paletteOptions, options, (filtered, prefix) => buildCssMap(filtered, prefix, suffix, format), (acc, part) => {
+			const lines = buildPaletteOutput(themes, paletteOptions, options, (filtered, prefix, pastel) => buildCssMap(filtered, prefix, suffix, format, pastel), (acc, part) => {
 				for (const key of [
 					"light",
 					"dark",
@@ -2676,6 +2693,9 @@ function createTheme(hue, saturation, initialColors, configOverride) {
 		get saturation() {
 			return saturation;
 		},
+		getConfig() {
+			return getEffectiveConfig();
+		},
 		colors(defs) {
 			colorDefs = {
 				...colorDefs,
@@ -2730,7 +2750,7 @@ function createTheme(hue, saturation, initialColors, configOverride) {
 		},
 		tokens(options) {
 			const modes = resolveModes(options?.modes);
-			return buildFlatTokenMap(resolveCached(), "", modes, options?.format);
+			return buildFlatTokenMap(resolveCached(), "", modes, options?.format, getEffectiveConfig().pastel);
 		},
 		tasty(options) {
 			const cfg = getEffectiveConfig();
@@ -2739,14 +2759,14 @@ function createTheme(hue, saturation, initialColors, configOverride) {
 				highContrast: options?.states?.highContrast ?? cfg.states.highContrast
 			};
 			const modes = resolveModes(options?.modes);
-			return buildTokenMap(resolveCached(), "", states, modes, options?.format);
+			return buildTokenMap(resolveCached(), "", states, modes, options?.format, cfg.pastel);
 		},
 		json(options) {
 			const modes = resolveModes(options?.modes);
-			return buildJsonMap(resolveCached(), modes, options?.format);
+			return buildJsonMap(resolveCached(), modes, options?.format, getEffectiveConfig().pastel);
 		},
 		css(options) {
-			return buildCssMap(resolveCached(), "", options?.suffix ?? "-color", options?.format ?? "rgb");
+			return buildCssMap(resolveCached(), "", options?.suffix ?? "-color", options?.format ?? "rgb", getEffectiveConfig().pastel);
 		}
 	};
 }
@@ -2769,7 +2789,7 @@ function createTheme(hue, saturation, initialColors, configOverride) {
 * Create a single-hue glaze theme.
 *
 * An optional `config` override can be supplied to customize the resolve
-* behavior for this theme (tone windows, saturation taper, etc.). The
+* behavior for this theme (tone windows, etc.). The
 * override is **merged over the live global config at resolve time** —
 * the theme still reacts to later `configure()` calls for fields it
 * didn't override.
@@ -2829,7 +2849,7 @@ glaze.from = function from(data) {
 *
 * // Config override on any form
 * glaze.color('#26fcb2', { darkTone: false, autoFlip: false })
-* glaze.color({ from: '#fff', base: bg }, { saturationTaper: 0 })
+* glaze.color({ from: '#fff', base: bg })
 * ```
 *
 * Defaults: every form defaults to `mode: 'auto'`. Value-shorthand forms
@@ -2883,8 +2903,8 @@ glaze.shadow = function shadow(input) {
 	};
 };
 /** Format a resolved color variant as a CSS string. */
-glaze.format = function format(variant, colorFormat) {
-	return formatVariant(variant, colorFormat);
+glaze.format = function format(variant, colorFormat, pastel) {
+	return formatVariant(variant, colorFormat, pastel);
 };
 /**
 * Create a theme from a hex color string.
@@ -2941,6 +2961,7 @@ glaze.resetConfig = function resetConfig$1() {
 exports.REF_EPS = REF_EPS;
 exports.apcaContrast = apcaContrast;
 exports.contrastRatioFromLuminance = contrastRatioFromLuminance;
+exports.cuspLightness = cuspLightness;
 exports.findToneForContrast = findToneForContrast;
 exports.findValueForMixContrast = findValueForMixContrast;
 exports.formatHsl = formatHsl;