@tenphi/glaze 0.16.2 → 0.18.0

package/dist/index.cjs

@@ -1087,6 +1087,15 @@ const APCA_PRESETS = {
 	min: 15
 };
 /**
+* APCA-W3 "Enhanced Level" delta added to a bare APCA target in high-contrast
+* mode when no explicit HC value is provided (analogous to WCAG AAA over AA).
+* Only applied when neither the outer `contrast` pair nor the inner `apca`
+* pair carries an explicit HC entry.
+*/
+const APCA_HC_ENHANCEMENT = 15;
+/** Upper bound for an APCA Lc target after HC enhancement. */
+const APCA_MAX_LC = 106;
+/**
 * Resolve an APCA target — a raw Lc number (kept as-is) or an `ApcaPreset`
 * keyword mapped to its Lc value. The magnitude is forced non-negative.
 */
@@ -1100,10 +1109,35 @@ const CONTRAST_PRESETS = {
 	"AA-large": 3,
 	"AAA-large": 4.5
 };
+/**
+* WCAG high-contrast auto-promotion (analog of APCA's Enhanced Level). A bare
+* AA / AA-large preset is promoted to its spec-defined "Enhanced" successor
+* (SC 1.4.3 → SC 1.4.6) in high-contrast mode. AAA / AAA-large are already
+* the top WCAG tier and are left unchanged. Bare numeric targets have no
+* defined successor tier and are also left unchanged. An explicit HC value
+* (outer or inner pair) always overrides.
+*/
+const WCAG_HC_PROMOTION = {
+	AA: "AAA",
+	"AA-large": "AAA-large"
+};
 function resolveMinContrast(value) {
 	if (typeof value === "number") return Math.max(1, value);
 	return CONTRAST_PRESETS[value];
 }
+/**
+* Resolve a WCAG target (number or preset) for a mode, applying the
+* high-contrast auto-promotion when `explicitHC` is false and the value is an
+* AA-family preset. Bare numbers and AAA-family presets pass through.
+*/
+function resolveWcagTarget(value, isHighContrast, explicitHC) {
+	if (typeof value === "number") return resolveMinContrast(value);
+	if (isHighContrast && !explicitHC) {
+		const promoted = WCAG_HC_PROMOTION[value];
+		if (promoted !== void 0) return resolveMinContrast(promoted);
+	}
+	return resolveMinContrast(value);
+}
 function pickPair(p, isHighContrast) {
 	return Array.isArray(p) ? isHighContrast ? p[1] : p[0] : p;
 }
@@ -1112,20 +1146,35 @@ function pickPair(p, isHighContrast) {
 * given mode into `{ metric, target }`. Handles the inner metric HC pair and
 * preset resolution. `polarity` is passed through to the result for the APCA
 * branch (it controls argument order in the solver); WCAG ignores it.
-*/
-function resolveContrastForMode(spec, isHighContrast, polarity) {
+*
+* `outerExplicitHC` indicates whether the caller selected this `spec` from an
+* explicit high-contrast entry of the outer `contrast` pair. Together with the
+* inner metric pair, it decides whether the HC auto-enhancement fires:
+*  - APCA: +15 Lc "Enhanced Level" boost when neither level is explicit.
+*  - WCAG: AA → AAA / AA-large → AAA-large promotion (SC 1.4.3 → 1.4.6) when
+*    neither level is explicit. AAA-family presets and bare numbers are left
+*    unchanged (AAA is the top WCAG tier).
+* Defaults to `false` (correct for direct callers, which pass a single
+* selected spec rather than an outer pair).
+*/
+function resolveContrastForMode(spec, isHighContrast, polarity, outerExplicitHC) {
 	if (typeof spec === "number" || typeof spec === "string") return {
 		metric: "wcag",
-		target: resolveMinContrast(spec)
-	};
-	if ("apca" in spec) return {
-		metric: "apca",
-		target: resolveApcaTarget(pickPair(spec.apca, isHighContrast)),
-		polarity: polarity ?? "fg"
+		target: resolveWcagTarget(spec, isHighContrast, !!outerExplicitHC)
 	};
+	if ("apca" in spec) {
+		const baseTarget = resolveApcaTarget(pickPair(spec.apca, isHighContrast));
+		const innerExplicitHC = Array.isArray(spec.apca);
+		return {
+			metric: "apca",
+			target: isHighContrast && !outerExplicitHC && !innerExplicitHC ? Math.min(baseTarget + APCA_HC_ENHANCEMENT, APCA_MAX_LC) : baseTarget,
+			polarity: polarity ?? "fg"
+		};
+	}
+	const innerExplicitHC = Array.isArray(spec.wcag);
 	return {
 		metric: "wcag",
-		target: resolveMinContrast(pickPair(spec.wcag, isHighContrast))
+		target: resolveWcagTarget(pickPair(spec.wcag, isHighContrast), isHighContrast, !!outerExplicitHC || innerExplicitHC)
 	};
 }
 const APCA_EXPONENTS = {
@@ -1827,7 +1876,8 @@ function resolveRole(name, def, ctx) {
 	return resolveRoleInMap(name, def, ctx.defs, ctx.config.inferRole, ctx.roles);
 }
 function resolveContrastSpec(spec, isHighContrast, polarity) {
-	return resolveContrastForMode(isHighContrast ? pairHC(spec) : pairNormal(spec), isHighContrast, polarity);
+	const outerExplicitHC = Array.isArray(spec);
+	return resolveContrastForMode(isHighContrast ? pairHC(spec) : pairNormal(spec), isHighContrast, polarity, outerExplicitHC);
 }
 /**
 * Apply the relative-tone delta against a base, honoring `flip`.
@@ -1855,7 +1905,7 @@ function resolveDependentColor(name, def, ctx, isHighContrast, isDark, effective
 	if (!baseResolved) throw new Error(`glaze: base "${baseName}" not yet resolved for "${name}".`);
 	const mode = def.mode ?? "auto";
 	const satFactor = clamp(def.saturation ?? 1, 0, 1);
-	const flip = def.flip ?? ctx.config.autoFlip;
+	const flip = def.autoFlip ?? ctx.config.autoFlip;
 	const pastel = effectivePastel;
 	const baseVariant = getSchemeVariant(baseResolved, isDark, isHighContrast);
 	const baseTone = baseVariant.t * 100;
@@ -2932,7 +2982,7 @@ function buildStandaloneValueDefs(main, options) {
 		tone: toneOption ?? seedTone,
 		contrast: options?.contrast,
 		mode: options?.mode ?? "auto",
-		flip: options?.flip,
+		autoFlip: options?.autoFlip,
 		opacity: options?.opacity,
 		pastel: options?.pastel,
 		role: options?.role,
@@ -3074,7 +3124,7 @@ function createColorToken(input, configOverride) {
 		tone: input.tone,
 		saturation: input.saturationFactor,
 		mode: input.mode ?? "auto",
-		flip: input.flip,
+		autoFlip: input.autoFlip,
 		contrast: input.contrast,
 		opacity: input.opacity,
 		pastel: input.pastel,
@@ -3124,7 +3174,7 @@ function buildOverridesExport(options) {
 	if (options.tone !== void 0) out.tone = options.tone;
 	if (options.saturationFactor !== void 0) out.saturationFactor = options.saturationFactor;
 	if (options.mode !== void 0) out.mode = options.mode;
-	if (options.flip !== void 0) out.flip = options.flip;
+	if (options.autoFlip !== void 0) out.autoFlip = options.autoFlip;
 	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;
@@ -3141,7 +3191,7 @@ function buildStructuredInputExport(input) {
 	};
 	if (input.saturationFactor !== void 0) out.saturationFactor = input.saturationFactor;
 	if (input.mode !== void 0) out.mode = input.mode;
-	if (input.flip !== void 0) out.flip = input.flip;
+	if (input.autoFlip !== void 0) out.autoFlip = input.autoFlip;
 	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;
@@ -3163,7 +3213,7 @@ function rehydrateOverrides(data) {
 	if (data.tone !== void 0) out.tone = data.tone;
 	if (data.saturationFactor !== void 0) out.saturationFactor = data.saturationFactor;
 	if (data.mode !== void 0) out.mode = data.mode;
-	if (data.flip !== void 0) out.flip = data.flip;
+	if (data.autoFlip !== void 0) out.autoFlip = data.autoFlip;
 	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;
@@ -3180,7 +3230,7 @@ function rehydrateStructuredInput(data) {
 	};
 	if (data.saturationFactor !== void 0) out.saturationFactor = data.saturationFactor;
 	if (data.mode !== void 0) out.mode = data.mode;
-	if (data.flip !== void 0) out.flip = data.flip;
+	if (data.autoFlip !== void 0) out.autoFlip = data.autoFlip;
 	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;
@@ -3719,6 +3769,9 @@ glaze.resetConfig = function resetConfig$1() {
 };
 
 //#endregion
+exports.APCA_HC_ENHANCEMENT = APCA_HC_ENHANCEMENT;
+exports.APCA_MAX_LC = APCA_MAX_LC;
+exports.APCA_PRESETS = APCA_PRESETS;
 exports.REF_EPS = REF_EPS;
 exports.apcaContrast = apcaContrast;
 exports.assertAllPastel = assertAllPastel;