@tenphi/glaze 0.7.0 → 0.8.0

package/dist/index.mjs

@@ -812,6 +812,7 @@ let globalConfig = {
 	lightLightness: [10, 100],
 	darkLightness: [15, 95],
 	darkDesaturation: .1,
+	darkCurve: .5,
 	states: {
 		dark: "@dark",
 		highContrast: "@high-contrast"
@@ -959,23 +960,42 @@ function topoSort(defs) {
 	for (const name of Object.keys(defs)) visit(name);
 	return result;
 }
-function mapLightnessLight(l, mode) {
-	if (mode === "static") return l;
+function mapLightnessLight(l, mode, isHighContrast) {
+	if (mode === "static" || isHighContrast) return l;
 	const [lo, hi] = globalConfig.lightLightness;
 	return l * (hi - lo) / 100 + lo;
 }
-function mapLightnessDark(l, mode) {
+function mobiusCurve(t, beta) {
+	if (beta >= 1) return t;
+	return t / (t + beta * (1 - t));
+}
+function mapLightnessDark(l, mode, isHighContrast) {
 	if (mode === "static") return l;
-	const [lo, hi] = globalConfig.darkLightness;
-	if (mode === "fixed") return l * (hi - lo) / 100 + lo;
-	return (100 - l) * (hi - lo) / 100 + lo;
+	const beta = globalConfig.darkCurve;
+	if (isHighContrast) {
+		if (mode === "fixed") return l;
+		return 100 * mobiusCurve((100 - l) / 100, beta);
+	}
+	const [darkLo, darkHi] = globalConfig.darkLightness;
+	if (mode === "fixed") return l * (darkHi - darkLo) / 100 + darkLo;
+	const [lightLo, lightHi] = globalConfig.lightLightness;
+	const t = (lightHi - (l * (lightHi - lightLo) / 100 + lightLo)) / (lightHi - lightLo);
+	return darkLo + (darkHi - darkLo) * mobiusCurve(t, beta);
+}
+function lightMappedToDark(lightL, isHighContrast) {
+	const beta = globalConfig.darkCurve;
+	if (isHighContrast) return 100 * mobiusCurve((100 - lightL) / 100, beta);
+	const [lightLo, lightHi] = globalConfig.lightLightness;
+	const [darkLo, darkHi] = globalConfig.darkLightness;
+	const t = (lightHi - clamp(lightL, lightLo, lightHi)) / (lightHi - lightLo);
+	return darkLo + (darkHi - darkLo) * mobiusCurve(t, beta);
 }
 function mapSaturationDark(s, mode) {
 	if (mode === "static") return s;
 	return s * (1 - globalConfig.darkDesaturation);
 }
-function schemeLightnessRange(isDark, mode) {
-	if (mode === "static") return [0, 1];
+function schemeLightnessRange(isDark, mode, isHighContrast) {
+	if (mode === "static" || isHighContrast) return [0, 1];
 	const [lo, hi] = isDark ? globalConfig.darkLightness : globalConfig.lightLightness;
 	return [lo / 100, hi / 100];
 }
@@ -1035,26 +1055,26 @@ function resolveDependentColor(name, def, ctx, isHighContrast, isDark, effective
 	else {
 		const parsed = parseRelativeOrAbsolute(isHighContrast ? pairHC(rawLightness) : pairNormal(rawLightness));
 		if (parsed.relative) {
-			let delta = parsed.value;
-			if (isDark && mode === "auto") delta = -delta;
-			preferredL = clamp(baseL + delta, 0, 100);
-		} else if (isDark) preferredL = mapLightnessDark(parsed.value, mode);
-		else preferredL = mapLightnessLight(parsed.value, mode);
+			const delta = parsed.value;
+			if (isDark && mode === "auto") preferredL = lightMappedToDark(clamp(getSchemeVariant(baseResolved, false, isHighContrast).l * 100 + delta, 0, 100), isHighContrast);
+			else preferredL = clamp(baseL + delta, 0, 100);
+		} else if (isDark) preferredL = mapLightnessDark(parsed.value, mode, isHighContrast);
+		else preferredL = mapLightnessLight(parsed.value, mode, isHighContrast);
 	}
 	const rawContrast = def.contrast;
 	if (rawContrast !== void 0) {
 		const minCr = isHighContrast ? pairHC(rawContrast) : pairNormal(rawContrast);
 		const effectiveSat = isDark ? mapSaturationDark(satFactor * ctx.saturation / 100, mode) : satFactor * ctx.saturation / 100;
 		const baseLinearRgb = okhslToLinearSrgb(baseVariant.h, baseVariant.s, baseVariant.l);
-		const lightnessRange = schemeLightnessRange(isDark, mode);
+		const windowRange = schemeLightnessRange(isDark, mode, isHighContrast);
 		return {
 			l: findLightnessForContrast({
 				hue: effectiveHue,
 				saturation: effectiveSat,
-				preferredLightness: clamp(preferredL / 100, lightnessRange[0], lightnessRange[1]),
+				preferredLightness: clamp(preferredL / 100, windowRange[0], windowRange[1]),
 				baseLinearRgb,
 				contrast: minCr,
-				lightnessRange
+				lightnessRange: [0, 1]
 			}).lightness * 100,
 			satFactor
 		};
@@ -1091,13 +1111,13 @@ function resolveColorForScheme(name, def, ctx, isDark, isHighContrast) {
 	let finalL;
 	let finalSat;
 	if (isDark && isRoot) {
-		finalL = mapLightnessDark(lightL, mode);
+		finalL = mapLightnessDark(lightL, mode, isHighContrast);
 		finalSat = mapSaturationDark(satFactor * ctx.saturation / 100, mode);
 	} else if (isDark && !isRoot) {
 		finalL = lightL;
 		finalSat = mapSaturationDark(satFactor * ctx.saturation / 100, mode);
 	} else if (isRoot) {
-		finalL = mapLightnessLight(lightL, mode);
+		finalL = mapLightnessLight(lightL, mode, isHighContrast);
 		finalSat = satFactor * ctx.saturation / 100;
 	} else {
 		finalL = lightL;
@@ -1563,6 +1583,7 @@ glaze.configure = function configure(config) {
 		lightLightness: config.lightLightness ?? globalConfig.lightLightness,
 		darkLightness: config.darkLightness ?? globalConfig.darkLightness,
 		darkDesaturation: config.darkDesaturation ?? globalConfig.darkDesaturation,
+		darkCurve: config.darkCurve ?? globalConfig.darkCurve,
 		states: {
 			dark: config.states?.dark ?? globalConfig.states.dark,
 			highContrast: config.states?.highContrast ?? globalConfig.states.highContrast
@@ -1662,6 +1683,7 @@ glaze.resetConfig = function resetConfig() {
 		lightLightness: [10, 100],
 		darkLightness: [15, 95],
 		darkDesaturation: .1,
+		darkCurve: .5,
 		states: {
 			dark: "@dark",
 			highContrast: "@high-contrast"