@tenphi/glaze 0.15.0 → 0.15.1

package/dist/index.d.cts

@@ -217,6 +217,13 @@ interface RegularColorDef {
    * should not be combined (a console.warn is emitted).
    */
   opacity?: number;
+  /**
+   * Per-color override for the hue-independent "safe" chroma limit used in
+   * OKHSL↔sRGB conversions (luminance, contrast solving, output formatting).
+   * Falls through to the global / per-theme `pastel` config when omitted.
+   * @see GlazeConfig.pastel
+   */
+  pastel?: boolean;
   /**
    * Whether this color is inherited by child themes created via `extend()`.
    * Default: true. Set to false to make this color local to the current theme.
@@ -266,6 +273,13 @@ interface ShadowColorDef {
   intensity: HCPair<number>;
   /** Override default tuning. Merged field-by-field with global `shadowTuning`. */
   tuning?: ShadowTuning;
+  /**
+   * Per-color override for the hue-independent "safe" chroma limit used in
+   * OKHSL↔sRGB conversions (luminance, contrast solving, output formatting).
+   * Falls through to the global / per-theme `pastel` config when omitted.
+   * @see GlazeConfig.pastel
+   */
+  pastel?: boolean;
   /**
    * Whether this color is inherited by child themes created via `extend()`.
    * Default: true. Set to false to make this color local to the current theme.
@@ -306,6 +320,13 @@ interface MixColorDef {
    * metric. Supports [normal, highContrast] pair.
    */
   contrast?: HCPair<ContrastSpec>;
+  /**
+   * Per-color override for the hue-independent "safe" chroma limit used in
+   * OKHSL↔sRGB conversions (luminance, contrast solving, output formatting).
+   * Falls through to the global / per-theme `pastel` config when omitted.
+   * @see GlazeConfig.pastel
+   */
+  pastel?: boolean;
   /**
    * Whether this color is inherited by child themes created via `extend()`.
    * Default: true. Set to false to make this color local to the current theme.
@@ -330,6 +351,12 @@ interface ResolvedColorVariant {
   t: number;
   /** Opacity (0–1). Default: 1. */
   alpha: number;
+  /**
+   * Effective `pastel` flag used while resolving this variant (author def or
+   * config fallback). Carried on the variant so output formatting matches the
+   * gamut mapping applied during resolution.
+   */
+  pastel?: boolean;
 }
 /** Fully resolved color across all scheme variants. */
 interface ResolvedColor {
@@ -493,6 +520,13 @@ interface GlazeColorInput {
    * used). Does not affect output keys.
    */
   name?: string;
+  /**
+   * Per-color override for the hue-independent "safe" chroma limit used in
+   * OKHSL↔sRGB conversions (luminance, contrast solving, output formatting).
+   * Falls through to the global / per-theme `pastel` config when omitted.
+   * @see GlazeConfig.pastel
+   */
+  pastel?: boolean;
 }
 /**
  * Any single-color input form accepted by the value-shorthand
@@ -593,6 +627,13 @@ interface GlazeColorOverrides {
    * used). Does not affect output keys.
    */
   name?: string;
+  /**
+   * Per-color override for the hue-independent "safe" chroma limit used in
+   * OKHSL↔sRGB conversions (luminance, contrast solving, output formatting).
+   * Falls through to the global / per-theme `pastel` config when omitted.
+   * @see GlazeConfig.pastel
+   */
+  pastel?: boolean;
 }
 /**
  * Object input for `glaze.color()` that carries a raw color value plus
@@ -689,6 +730,7 @@ interface GlazeColorInputExport {
   base?: GlazeColorTokenExport | GlazeColorValue;
   contrast?: HCPair<ContrastSpec>;
   name?: string;
+  pastel?: boolean;
 }
 /**
  * Serializable shape of `GlazeColorOverrides`. `base` is replaced by
@@ -705,6 +747,7 @@ interface GlazeColorOverridesExport {
   base?: GlazeColorTokenExport | GlazeColorValue;
   opacity?: number;
   name?: string;
+  pastel?: boolean;
 }
 interface GlazeTheme {
   /** The hue seed (0–360). */

package/dist/index.d.mts

@@ -217,6 +217,13 @@ interface RegularColorDef {
    * should not be combined (a console.warn is emitted).
    */
   opacity?: number;
+  /**
+   * Per-color override for the hue-independent "safe" chroma limit used in
+   * OKHSL↔sRGB conversions (luminance, contrast solving, output formatting).
+   * Falls through to the global / per-theme `pastel` config when omitted.
+   * @see GlazeConfig.pastel
+   */
+  pastel?: boolean;
   /**
    * Whether this color is inherited by child themes created via `extend()`.
    * Default: true. Set to false to make this color local to the current theme.
@@ -266,6 +273,13 @@ interface ShadowColorDef {
   intensity: HCPair<number>;
   /** Override default tuning. Merged field-by-field with global `shadowTuning`. */
   tuning?: ShadowTuning;
+  /**
+   * Per-color override for the hue-independent "safe" chroma limit used in
+   * OKHSL↔sRGB conversions (luminance, contrast solving, output formatting).
+   * Falls through to the global / per-theme `pastel` config when omitted.
+   * @see GlazeConfig.pastel
+   */
+  pastel?: boolean;
   /**
    * Whether this color is inherited by child themes created via `extend()`.
    * Default: true. Set to false to make this color local to the current theme.
@@ -306,6 +320,13 @@ interface MixColorDef {
    * metric. Supports [normal, highContrast] pair.
    */
   contrast?: HCPair<ContrastSpec>;
+  /**
+   * Per-color override for the hue-independent "safe" chroma limit used in
+   * OKHSL↔sRGB conversions (luminance, contrast solving, output formatting).
+   * Falls through to the global / per-theme `pastel` config when omitted.
+   * @see GlazeConfig.pastel
+   */
+  pastel?: boolean;
   /**
    * Whether this color is inherited by child themes created via `extend()`.
    * Default: true. Set to false to make this color local to the current theme.
@@ -330,6 +351,12 @@ interface ResolvedColorVariant {
   t: number;
   /** Opacity (0–1). Default: 1. */
   alpha: number;
+  /**
+   * Effective `pastel` flag used while resolving this variant (author def or
+   * config fallback). Carried on the variant so output formatting matches the
+   * gamut mapping applied during resolution.
+   */
+  pastel?: boolean;
 }
 /** Fully resolved color across all scheme variants. */
 interface ResolvedColor {
@@ -493,6 +520,13 @@ interface GlazeColorInput {
    * used). Does not affect output keys.
    */
   name?: string;
+  /**
+   * Per-color override for the hue-independent "safe" chroma limit used in
+   * OKHSL↔sRGB conversions (luminance, contrast solving, output formatting).
+   * Falls through to the global / per-theme `pastel` config when omitted.
+   * @see GlazeConfig.pastel
+   */
+  pastel?: boolean;
 }
 /**
  * Any single-color input form accepted by the value-shorthand
@@ -593,6 +627,13 @@ interface GlazeColorOverrides {
    * used). Does not affect output keys.
    */
   name?: string;
+  /**
+   * Per-color override for the hue-independent "safe" chroma limit used in
+   * OKHSL↔sRGB conversions (luminance, contrast solving, output formatting).
+   * Falls through to the global / per-theme `pastel` config when omitted.
+   * @see GlazeConfig.pastel
+   */
+  pastel?: boolean;
 }
 /**
  * Object input for `glaze.color()` that carries a raw color value plus
@@ -689,6 +730,7 @@ interface GlazeColorInputExport {
   base?: GlazeColorTokenExport | GlazeColorValue;
   contrast?: HCPair<ContrastSpec>;
   name?: string;
+  pastel?: boolean;
 }
 /**
  * Serializable shape of `GlazeColorOverrides`. `base` is replaced by
@@ -705,6 +747,7 @@ interface GlazeColorOverridesExport {
   base?: GlazeColorTokenExport | GlazeColorValue;
   opacity?: number;
   name?: string;
+  pastel?: boolean;
 }
 interface GlazeTheme {
   /** The hue seed (0–360). */

package/dist/index.mjs

@@ -1539,7 +1539,8 @@ function toOkhslVariant(v) {
 		h: c.h,
 		s: c.s,
 		l: c.l,
-		alpha: v.alpha
+		alpha: v.alpha,
+		pastel: v.pastel
 	};
 }
 /** Edge adapter: OKHSL-lightness variant → resolved variant (`t`). */
@@ -1586,6 +1587,7 @@ function resolveDependentColor(name, def, ctx, isHighContrast, isDark, effective
 	const mode = def.mode ?? "auto";
 	const satFactor = clamp(def.saturation ?? 1, 0, 1);
 	const flip = def.flip ?? ctx.config.autoFlip;
+	const pastel = def.pastel ?? ctx.config.pastel;
 	const baseVariant = getSchemeVariant(baseResolved, isDark, isHighContrast);
 	const baseTone = baseVariant.t * 100;
 	let preferredTone;
@@ -1604,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, ctx.config.pastel);
+		const baseLinearRgb = okhslToLinearSrgb(baseOkhsl.h, baseOkhsl.s, baseOkhsl.l, baseVariant.pastel ?? ctx.config.pastel);
 		const toneRange = schemeToneRange(isDark, mode, isHighContrast, ctx.config);
 		let initialDirection;
 		if (preferredTone < baseTone) initialDirection = "darker";
@@ -1618,7 +1620,7 @@ function resolveDependentColor(name, def, ctx, isHighContrast, isDark, effective
 			toneRange: [0, 1],
 			initialDirection,
 			flip,
-			pastel: ctx.config.pastel
+			pastel
 		});
 		if (!result.met) warnContrastUnmet(name, isDark, isHighContrast, resolvedContrast, result.contrast);
 		return {
@@ -1638,6 +1640,7 @@ function resolveColorForScheme(name, def, ctx, isDark, isHighContrast) {
 	const mode = regDef.mode ?? "auto";
 	const isRoot = isAbsoluteTone(regDef.tone) && !regDef.base;
 	const effectiveHue = resolveEffectiveHue(ctx.hue, regDef.hue);
+	const pastel = regDef.pastel ?? ctx.config.pastel;
 	let finalTone;
 	let satFactor;
 	if (isRoot) {
@@ -1656,7 +1659,8 @@ function resolveColorForScheme(name, def, ctx, isDark, isHighContrast) {
 		h: effectiveHue,
 		s: clamp(finalSat, 0, 1),
 		t: toneFraction,
-		alpha: regDef.opacity ?? 1
+		alpha: regDef.opacity ?? 1,
+		pastel
 	};
 }
 function resolveShadowForScheme(def, ctx, isDark, isHighContrast) {
@@ -1665,7 +1669,10 @@ function resolveShadowForScheme(def, ctx, isDark, isHighContrast) {
 	if (def.fg) fgVariant = toOkhslVariant(getSchemeVariant(ctx.resolved.get(def.fg), isDark, isHighContrast));
 	const intensity = isHighContrast ? pairHC(def.intensity) : pairNormal(def.intensity);
 	const tuning = resolveShadowTuning(def.tuning, ctx.config.shadowTuning);
-	return toToneVariant(computeShadow(bgVariant, fgVariant, intensity, tuning));
+	return {
+		...toToneVariant(computeShadow(bgVariant, fgVariant, intensity, tuning)),
+		pastel: def.pastel ?? ctx.config.pastel
+	};
 }
 function okhslVariantToLinearRgb(v, pastel) {
 	return okhslToLinearSrgb(v.h, v.s, v.l, pastel);
@@ -1712,15 +1719,16 @@ 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, ctx.config.pastel);
-	const targetLinear = okhslVariantToLinearRgb(targetVariant, ctx.config.pastel);
+	const pastel = def.pastel ?? ctx.config.pastel;
+	const baseLinear = okhslVariantToLinearRgb(baseVariant, baseVariant.pastel ?? ctx.config.pastel);
+	const targetLinear = okhslVariantToLinearRgb(targetVariant, targetVariant.pastel ?? 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, ctx.config.pastel));
+			return metricLuminance(metric, okhslToLinearSrgb(mixHue(baseVariant, targetVariant, v), baseVariant.s + (targetVariant.s - baseVariant.s) * v, baseVariant.l + (targetVariant.l - baseVariant.l) * v, pastel));
 		};
 		t = findValueForMixContrast({
 			preferredValue: t,
@@ -1731,19 +1739,28 @@ function resolveMixForScheme(def, ctx, isDark, isHighContrast) {
 			flip: ctx.config.autoFlip
 		}).value;
 	}
-	if (blend === "transparent") return toToneVariant({
-		h: targetVariant.h,
-		s: targetVariant.s,
-		l: targetVariant.l,
-		alpha: clamp(t, 0, 1)
-	});
-	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),
-		l: clamp(baseVariant.l + (targetVariant.l - baseVariant.l) * t, 0, 1),
-		alpha: 1
-	});
+	if (blend === "transparent") return {
+		...toToneVariant({
+			h: targetVariant.h,
+			s: targetVariant.s,
+			l: targetVariant.l,
+			alpha: clamp(t, 0, 1)
+		}),
+		pastel
+	};
+	if (space === "srgb") return {
+		...linearRgbToToneVariant(linearSrgbLerp(baseLinear, targetLinear, t), pastel),
+		pastel
+	};
+	return {
+		...toToneVariant({
+			h: mixHue(baseVariant, targetVariant, t),
+			s: clamp(baseVariant.s + (targetVariant.s - baseVariant.s) * t, 0, 1),
+			l: clamp(baseVariant.l + (targetVariant.l - baseVariant.l) * t, 0, 1),
+			alpha: 1
+		}),
+		pastel
+	};
 }
 function defMode(def) {
 	if (isShadowDef(def) || isMixDef(def)) return void 0;
@@ -1794,7 +1811,7 @@ function seedField(order, ctx, field, source) {
 * resolved with a `base` + `contrast` may land slightly under the contrast
 * its tone implies because chromatic luminance drifts from the gray tone.
 */
-function verifyContrastDrift(order, defs, result) {
+function verifyContrastDrift(order, defs, result, config) {
 	for (const name of order) {
 		const def = defs[name];
 		if (isShadowDef(def) || isMixDef(def)) continue;
@@ -1830,8 +1847,10 @@ function verifyContrastDrift(order, defs, result) {
 			const bVariant = base[s.field];
 			const cOkhsl = toOkhslVariant(cVariant);
 			const bOkhsl = toOkhslVariant(bVariant);
-			const yC = metricLuminance(spec.metric, okhslToLinearSrgb(cOkhsl.h, cOkhsl.s, cOkhsl.l));
-			const yB = metricLuminance(spec.metric, okhslToLinearSrgb(bOkhsl.h, bOkhsl.s, bOkhsl.l));
+			const cPastel = cVariant.pastel ?? config.pastel;
+			const bPastel = bVariant.pastel ?? config.pastel;
+			const yC = metricLuminance(spec.metric, okhslToLinearSrgb(cOkhsl.h, cOkhsl.s, cOkhsl.l, cPastel));
+			const yB = metricLuminance(spec.metric, okhslToLinearSrgb(bOkhsl.h, bOkhsl.s, bOkhsl.l, bPastel));
 			warnContrastDrift(name, s.isDark, s.isHighContrast, spec, yC, yB);
 		}
 	}
@@ -1864,7 +1883,7 @@ function resolveAllColors(hue, saturation, defs, config, externalBases) {
 		darkContrast: darkHCMap.get(name),
 		mode: defMode(defs[name])
 	});
-	verifyContrastDrift(order, defs, result);
+	verifyContrastDrift(order, defs, result, config);
 	return result;
 }
 
@@ -1890,8 +1909,9 @@ function fmt(value, decimals) {
 	return parseFloat(value.toFixed(decimals)).toString();
 }
 function formatVariant(v, format = "okhsl", pastel = false) {
+	const effectivePastel = v.pastel ?? pastel;
 	const { l } = variantToOkhsl(v);
-	const base = formatters[format](v.h, v.s * 100, l * 100, pastel);
+	const base = formatters[format](v.h, v.s * 100, l * 100, effectivePastel);
 	if (v.alpha >= 1) return base;
 	const closing = base.lastIndexOf(")");
 	return `${base.slice(0, closing)} / ${fmt(v.alpha, 4)})`;
@@ -2304,6 +2324,7 @@ function buildStandaloneValueDefs(main, options) {
 		mode: options?.mode ?? "auto",
 		flip: options?.flip,
 		opacity: options?.opacity,
+		pastel: options?.pastel,
 		base: hasExternalBase ? STANDALONE_BASE : needsSeedAnchor ? STANDALONE_SEED : void 0
 	};
 	const defs = { [primary]: valueDef };
@@ -2404,6 +2425,7 @@ function createColorToken(input, configOverride) {
 		flip: input.flip,
 		contrast: input.contrast,
 		opacity: input.opacity,
+		pastel: input.pastel,
 		base: hasExternalBase ? STANDALONE_BASE : needsSeedAnchor ? STANDALONE_SEED : void 0
 	} };
 	if (needsSeedAnchor) {
@@ -2453,6 +2475,7 @@ function buildOverridesExport(options) {
 	if (options.contrast !== void 0) out.contrast = options.contrast;
 	if (options.opacity !== void 0) out.opacity = options.opacity;
 	if (options.name !== void 0) out.name = options.name;
+	if (options.pastel !== void 0) out.pastel = options.pastel;
 	if (options.base !== void 0) out.base = isGlazeColorToken(options.base) ? options.base.export() : options.base;
 	return out;
 }
@@ -2468,6 +2491,7 @@ function buildStructuredInputExport(input) {
 	if (input.opacity !== void 0) out.opacity = input.opacity;
 	if (input.contrast !== void 0) out.contrast = input.contrast;
 	if (input.name !== void 0) out.name = input.name;
+	if (input.pastel !== void 0) out.pastel = input.pastel;
 	if (input.base !== void 0) out.base = isGlazeColorToken(input.base) ? input.base.export() : input.base;
 	return out;
 }
@@ -2488,6 +2512,7 @@ function rehydrateOverrides(data) {
 	if (data.contrast !== void 0) out.contrast = data.contrast;
 	if (data.opacity !== void 0) out.opacity = data.opacity;
 	if (data.name !== void 0) out.name = data.name;
+	if (data.pastel !== void 0) out.pastel = data.pastel;
 	if (data.base !== void 0) out.base = isExportedToken(data.base) ? colorFromExport(data.base) : data.base;
 	return out;
 }
@@ -2503,6 +2528,7 @@ function rehydrateStructuredInput(data) {
 	if (data.opacity !== void 0) out.opacity = data.opacity;
 	if (data.contrast !== void 0) out.contrast = data.contrast;
 	if (data.name !== void 0) out.name = data.name;
+	if (data.pastel !== void 0) out.pastel = data.pastel;
 	if (data.base !== void 0) out.base = isExportedToken(data.base) ? colorFromExport(data.base) : data.base;
 	return out;
 }