@tenphi/glaze 1.3.0 → 1.3.1

package/dist/index.mjs

@@ -2186,9 +2186,12 @@ function applyToneFlip(delta, baseTone, flip) {
 * result is clamped to `[0, 100]` only — crossing the dark tone window is
 * intended, since the author asked for the extreme.
 */
-function extremeDarkTone(authorTone, mode, isHighContrast, baseResolved, baseDarkTone, config) {
-	const delta = mapToneForScheme(authorTone, mode, false, isHighContrast, config) - getSchemeVariant(baseResolved, false, isHighContrast).t * 100;
-	return clamp(baseDarkTone + (mode === "auto" ? -delta : delta), 0, 100);
+function extremeDarkTone(authorTone, mode, isHighContrast, baseResolved, config) {
+	const extremeLightTone = mapToneForScheme(authorTone, mode, false, isHighContrast, config);
+	const lightBase = getSchemeVariant(baseResolved, false, isHighContrast);
+	const darkBase = getSchemeVariant(baseResolved, true, isHighContrast);
+	const shift = extremeLightTone - lightBase.t * 100;
+	return clamp(darkBase.t * 100 + (mode === "auto" ? -shift : shift), 0, 100);
 }
 function resolveRootColor(def, isHighContrast, config) {
 	return clamp(passTone(def.tone, isHighContrast, config).value, 0, 100);
@@ -2241,12 +2244,10 @@ function resolveDependentColor(name, def, ctx, isHighContrast, isDark, channels,
 			const baseLightTone = getSchemeVariant(baseResolved, false, isHighContrast).t * 100;
 			preferredTone = mapToneForScheme(clamp(baseLightTone + applyToneFlip(parsed.value, baseLightTone, flip), 0, 100), "auto", true, isHighContrast, ctx.config);
 		} else preferredTone = clamp(baseTone + applyToneFlip(parsed.value, baseTone, flip), 0, 100);
-		else if (parsed.kind === "extreme" && isDark && mode !== "static") {
-			isExtreme = true;
-			preferredTone = extremeDarkTone(parsed.value, mode, isHighContrast, baseResolved, baseTone, ctx.config);
-		} else {
+		else {
 			isExtreme = parsed.kind === "extreme";
-			preferredTone = mapToneForScheme(parsed.value, mode, isDark, isHighContrast, ctx.config);
+			if (isExtreme && isDark && mode !== "static") preferredTone = extremeDarkTone(parsed.value, mode, isHighContrast, baseResolved, ctx.config);
+			else preferredTone = mapToneForScheme(parsed.value, mode, isDark, isHighContrast, ctx.config);
 		}
 	}
 	const rawContrast = def.contrast;
@@ -2254,15 +2255,14 @@ function resolveDependentColor(name, def, ctx, isHighContrast, isDark, channels,
 		const resolvedContrast = resolveContrastSpec(rawContrast, isHighContrast, ctx.config, polarity);
 		const baseOkhsl = toOkhslVariant(baseVariant);
 		const baseLinearRgb = okhslToLinearSrgb(baseOkhsl.h, baseOkhsl.s, baseOkhsl.l, baseVariant.pastel ?? ctx.config.pastel);
-		const toneRange = schemeToneRange(isDark, mode, isHighContrast, ctx.config);
+		const preferredRange = isExtreme ? [0, 1] : schemeToneRange(isDark, mode, isHighContrast, ctx.config);
 		let initialDirection;
 		if (preferredTone < baseTone) initialDirection = "darker";
 		else if (preferredTone > baseTone) initialDirection = "lighter";
-		const seedTone = isExtreme ? clamp(preferredTone / 100, 0, 1) : clamp(preferredTone / 100, toneRange[0], toneRange[1]);
 		const solve = {
 			hue: channels.hue,
 			saturation: channels.saturation,
-			preferredTone: seedTone,
+			preferredTone: clamp(preferredTone / 100, preferredRange[0], preferredRange[1]),
 			baseLinearRgb,
 			toneRange: [0, 1],
 			flip,
@@ -2559,7 +2559,9 @@ function resolveAllColors(seed, defs, config, externalBases) {
 *
 * Hue is scheme-independent unless the theme or a color authors a dark hue,
 * so declarations are collected per scheme (`'light'` / `'dark'`) and the dark
-* set is emitted only when it actually differs — see `darkHueDeclarations`.
+* set is emitted only when it actually differs — see `buildHueDeclarations`.
+* A color that authors a hue in *either* scheme gets its own var in both, so
+* the shared `var()` reference stays valid.
 */
 const ACHROMATIC_EPSILON = 1e-6;
 function cssProp(prefix, name, suffix) {
@@ -2581,23 +2583,28 @@ function themeHuePlan(name, def, variant, ctx, scheme) {
 	const regDef = def;
 	const baseHueVar = `var(--${ctx.baseName}-hue)`;
 	const prop = cssProp(ctx.prefix, name, "-hue");
-	if ((regDef.mode ?? "auto") === "static" && schemeSeedHue(ctx, "dark") !== ctx.seedHue) {
-		const pinned = resolveEffectiveHue(ctx.seedHue, regDef.hue);
-		return {
-			hueVar: `var(${prop})`,
-			inline: false,
-			declarations: [{
-				prop,
-				value: String(pinned)
-			}]
-		};
-	}
-	const authored = scheme === "dark" ? regDef.darkHue ?? regDef.hue : regDef.hue;
-	if (authored === void 0) return {
+	if ((regDef.mode ?? "auto") === "static" && schemeSeedHue(ctx, "dark") !== ctx.seedHue) return {
+		hueVar: `var(${prop})`,
+		inline: false,
+		declarations: [{
+			prop,
+			value: String(variant.h)
+		}]
+	};
+	if (regDef.hue === void 0 && regDef.darkHue === void 0) return {
 		hueVar: baseHueVar,
 		inline: false,
 		declarations: []
 	};
+	const authored = scheme === "dark" ? regDef.darkHue ?? regDef.hue : regDef.hue;
+	if (authored === void 0) return {
+		hueVar: `var(${prop})`,
+		inline: false,
+		declarations: [{
+			prop,
+			value: baseHueVar
+		}]
+	};
 	const parsed = parseRelativeOrAbsolute(authored);
 	if (parsed.relative) {
 		const sign = parsed.value >= 0 ? "+" : "-";
@@ -2644,7 +2651,7 @@ function buildHuePlan(name, def, variant, ctx, scheme = "light") {
 	return themeHuePlan(name, def, variant, ctx, scheme);
 }
 /** Collect unique hue declarations across all colors (theme + per-color). */
-function collectHueDeclarations(resolved, ctx, scheme = "light") {
+function collectHueDeclarations(resolved, ctx, scheme) {
 	if (ctx.emitDeclarations === false) return [];
 	const seen = /* @__PURE__ */ new Set();
 	const out = [];
@@ -2665,21 +2672,24 @@ function collectHueDeclarations(resolved, ctx, scheme = "light") {
 	return out;
 }
 /**
-* Dark-scheme hue declarations, or `[]` when dark resolves to the same hues as
-* light (the common case — no `darkHue` anywhere).
+* Hue declarations for both schemes. `dark` is empty when it resolves to the
+* same hues as light — the common case, with no `darkHue` anywhere.
 *
-* When they differ, the **whole** set is returned rather than only the entries
-* whose text changed. A relative declaration reads
+* When they differ, the **whole** dark set is returned rather than only the
+* entries whose text changed. A relative declaration reads
 * `calc(var(--theme-hue) + N)` in both schemes even though its resolved value
 * moves with the seed, and custom properties substitute `var()` at
 * computed-value time on the declaring element — so re-declaring
 * `--{baseName}-hue` alone would leave inherited per-color vars still holding
 * the light-substituted value.
 */
-function darkHueDeclarations(resolved, ctx) {
-	const dark = collectHueDeclarations(resolved, ctx, "dark");
+function buildHueDeclarations(resolved, ctx) {
 	const light = collectHueDeclarations(resolved, ctx, "light");
-	return dark.length === light.length && dark.every((decl, i) => decl.prop === light[i].prop && decl.value === light[i].value) ? [] : dark;
+	const dark = collectHueDeclarations(resolved, ctx, "dark");
+	return {
+		light,
+		dark: dark.length === light.length && dark.every((decl, i) => decl.prop === light[i].prop && decl.value === light[i].value) ? [] : dark
+	};
 }
 function buildHuePlans(resolved, ctx) {
 	const plans = /* @__PURE__ */ new Map();
@@ -2769,8 +2779,9 @@ function buildTokenMap(resolved, prefix, states, modes, format = "oklch", pastel
 	const tokens = {};
 	const huePlans = channelCtx !== void 0 && format === "oklch" ? buildHuePlans(resolved, channelCtx) : void 0;
 	if (huePlans !== void 0 && channelCtx !== void 0) {
-		for (const decl of collectHueDeclarations(resolved, channelCtx)) tokens[`$${decl.prop.slice(2)}`] = { "": decl.value };
-		if (modes.dark) for (const decl of darkHueDeclarations(resolved, channelCtx)) {
+		const hueDecls = buildHueDeclarations(resolved, channelCtx);
+		for (const decl of hueDecls.light) tokens[`$${decl.prop.slice(2)}`] = { "": decl.value };
+		if (modes.dark) for (const decl of hueDecls.dark) {
 			const key = `$${decl.prop.slice(2)}`;
 			tokens[key] = {
 				...tokens[key],
@@ -2827,8 +2838,9 @@ function buildCssMap(resolved, prefix, suffix, format, pastel = false, channelCt
 	};
 	const huePlans = channelCtx !== void 0 && format === "oklch" ? buildHuePlans(resolved, channelCtx) : void 0;
 	if (huePlans !== void 0 && channelCtx !== void 0) {
-		for (const decl of collectHueDeclarations(resolved, channelCtx)) lines.light.push(`${decl.prop}: ${decl.value};`);
-		for (const decl of darkHueDeclarations(resolved, channelCtx)) {
+		const hueDecls = buildHueDeclarations(resolved, channelCtx);
+		for (const decl of hueDecls.light) lines.light.push(`${decl.prop}: ${decl.value};`);
+		for (const decl of hueDecls.dark) {
 			lines.dark.push(`${decl.prop}: ${decl.value};`);
 			lines.darkContrast.push(`${decl.prop}: ${decl.value};`);
 		}