@tenphi/glaze 0.6.2 → 0.7.0

package/dist/index.d.cts

@@ -385,33 +385,54 @@ interface GlazeCssResult {
   lightContrast: string;
   darkContrast: string;
 }
+/** Options shared by palette `tokens()`, `tasty()`, and `css()` exports. */
+interface GlazePaletteExportOptions {
+  /**
+   * Prefix mode. `true` uses `"<themeName>-"`, or provide a custom map.
+   * Defaults to `true` for palette export methods.
+   * Set to `false` explicitly to disable prefixing (last-write-wins on collisions).
+   */
+  prefix?: boolean | Record<string, string>;
+  /**
+   * Name of the primary theme. The primary theme's tokens are duplicated
+   * without prefix, providing convenient short aliases alongside the
+   * prefixed versions.
+   *
+   * @example
+   * ```ts
+   * palette.tokens({ primary: 'brand' })
+   * // → { light: { 'brand-surface': '...', 'surface': '...', 'accent-surface': '...' } }
+   * ```
+   */
+  primary?: string;
+}
 interface GlazePalette {
   /**
    * Export all themes as a flat token map grouped by scheme variant.
+   * Prefix defaults to `true` — all tokens are prefixed with the theme name.
+   * Use `primary` to duplicate one theme's tokens without prefix.
    *
    * ```ts
-   * palette.tokens({ prefix: true })
-   * // → { light: { 'primary-surface': 'okhsl(...)' }, dark: { 'primary-surface': 'okhsl(...)' } }
+   * palette.tokens({ primary: 'brand' })
+   * // → { light: { 'brand-surface': '...', 'surface': '...', 'accent-surface': '...' } }
    * ```
    */
-  tokens(options?: GlazeJsonOptions & {
-    prefix?: boolean | Record<string, string>;
-  }): Record<string, Record<string, string>>;
+  tokens(options?: GlazeJsonOptions & GlazePaletteExportOptions): Record<string, Record<string, string>>;
   /**
    * Export all themes as tasty style-to-state bindings.
    * Uses `#name` color token keys and state aliases (`''`, `@dark`, etc.).
-   * Spread into component styles or register as a recipe via `configure({ recipes })`.
+   * Prefix defaults to `true`. Use `primary` to duplicate one theme without prefix.
    * @see https://cube-ui-kit.vercel.app/?path=/docs/tasty-documentation--docs
    */
-  tasty(options?: GlazeTokenOptions): Record<string, Record<string, string>>;
-  /** Export all themes as plain JSON. */
+  tasty(options?: GlazeTokenOptions & {
+    primary?: string;
+  }): Record<string, Record<string, string>>;
+  /** Export all themes as plain JSON grouped by theme name. */
   json(options?: GlazeJsonOptions & {
     prefix?: boolean | Record<string, string>;
   }): Record<string, Record<string, Record<string, string>>>;
   /** Export all themes as CSS custom property declarations. */
-  css(options?: GlazeCssOptions & {
-    prefix?: boolean | Record<string, string>;
-  }): GlazeCssResult;
+  css(options?: GlazeCssOptions & GlazePaletteExportOptions): GlazeCssResult;
 }
 //#endregion
 //#region src/glaze.d.ts
@@ -433,16 +454,14 @@ declare function glaze(hueOrOptions: number | {
 declare namespace glaze {
   var configure: (config: GlazeConfig) => void;
   var palette: (themes: PaletteInput) => {
-    tokens(options?: GlazeJsonOptions & {
-      prefix?: boolean | Record<string, string>;
+    tokens(options?: GlazeJsonOptions & GlazePaletteExportOptions): Record<string, Record<string, string>>;
+    tasty(options?: GlazeTokenOptions & {
+      primary?: string;
     }): Record<string, Record<string, string>>;
-    tasty(options?: GlazeTokenOptions): Record<string, Record<string, string>>;
     json(options?: GlazeJsonOptions & {
       prefix?: boolean | Record<string, string>;
     }): Record<string, Record<string, Record<string, string>>>;
-    css(options?: GlazeCssOptions & {
-      prefix?: boolean | Record<string, string>;
-    }): GlazeCssResult;
+    css(options?: GlazeCssOptions & GlazePaletteExportOptions): GlazeCssResult;
   };
   var from: (data: GlazeThemeExport) => GlazeTheme;
   var color: (input: GlazeColorInput) => GlazeColorToken;
@@ -522,5 +541,5 @@ declare function formatHsl(h: number, s: number, l: number): string;
  */
 declare function formatOklch(h: number, s: number, l: number): string;
 //#endregion
-export { type AdaptationMode, type ColorDef, type ColorMap, type ContrastPreset, type FindLightnessForContrastOptions, type FindLightnessForContrastResult, type FindValueForMixContrastOptions, type FindValueForMixContrastResult, type GlazeColorFormat, type GlazeColorInput, type GlazeColorToken, type GlazeConfig, type GlazeCssOptions, type GlazeCssResult, type GlazeExtendOptions, type GlazeJsonOptions, type GlazeOutputModes, type GlazePalette, type GlazeShadowInput, type GlazeTheme, type GlazeThemeExport, type GlazeTokenOptions, type HCPair, type HexColor, type MinContrast, type MixColorDef, type OkhslColor, type RegularColorDef, type RelativeValue, type ResolvedColor, type ResolvedColorVariant, type ShadowColorDef, type ShadowTuning, contrastRatioFromLuminance, findLightnessForContrast, findValueForMixContrast, formatHsl, formatOkhsl, formatOklch, formatRgb, gamutClampedLuminance, glaze, okhslToLinearSrgb, okhslToOklab, okhslToSrgb, parseHex, relativeLuminanceFromLinearRgb, resolveMinContrast, srgbToOkhsl };
+export { type AdaptationMode, type ColorDef, type ColorMap, type ContrastPreset, type FindLightnessForContrastOptions, type FindLightnessForContrastResult, type FindValueForMixContrastOptions, type FindValueForMixContrastResult, type GlazeColorFormat, type GlazeColorInput, type GlazeColorToken, type GlazeConfig, type GlazeCssOptions, type GlazeCssResult, type GlazeExtendOptions, type GlazeJsonOptions, type GlazeOutputModes, type GlazePalette, type GlazePaletteExportOptions, type GlazeShadowInput, type GlazeTheme, type GlazeThemeExport, type GlazeTokenOptions, type HCPair, type HexColor, type MinContrast, type MixColorDef, type OkhslColor, type RegularColorDef, type RelativeValue, type ResolvedColor, type ResolvedColorVariant, type ShadowColorDef, type ShadowTuning, contrastRatioFromLuminance, findLightnessForContrast, findValueForMixContrast, formatHsl, formatOkhsl, formatOklch, formatRgb, gamutClampedLuminance, glaze, okhslToLinearSrgb, okhslToOklab, okhslToSrgb, parseHex, relativeLuminanceFromLinearRgb, resolveMinContrast, srgbToOkhsl };
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.mts

@@ -385,33 +385,54 @@ interface GlazeCssResult {
   lightContrast: string;
   darkContrast: string;
 }
+/** Options shared by palette `tokens()`, `tasty()`, and `css()` exports. */
+interface GlazePaletteExportOptions {
+  /**
+   * Prefix mode. `true` uses `"<themeName>-"`, or provide a custom map.
+   * Defaults to `true` for palette export methods.
+   * Set to `false` explicitly to disable prefixing (last-write-wins on collisions).
+   */
+  prefix?: boolean | Record<string, string>;
+  /**
+   * Name of the primary theme. The primary theme's tokens are duplicated
+   * without prefix, providing convenient short aliases alongside the
+   * prefixed versions.
+   *
+   * @example
+   * ```ts
+   * palette.tokens({ primary: 'brand' })
+   * // → { light: { 'brand-surface': '...', 'surface': '...', 'accent-surface': '...' } }
+   * ```
+   */
+  primary?: string;
+}
 interface GlazePalette {
   /**
    * Export all themes as a flat token map grouped by scheme variant.
+   * Prefix defaults to `true` — all tokens are prefixed with the theme name.
+   * Use `primary` to duplicate one theme's tokens without prefix.
    *
    * ```ts
-   * palette.tokens({ prefix: true })
-   * // → { light: { 'primary-surface': 'okhsl(...)' }, dark: { 'primary-surface': 'okhsl(...)' } }
+   * palette.tokens({ primary: 'brand' })
+   * // → { light: { 'brand-surface': '...', 'surface': '...', 'accent-surface': '...' } }
    * ```
    */
-  tokens(options?: GlazeJsonOptions & {
-    prefix?: boolean | Record<string, string>;
-  }): Record<string, Record<string, string>>;
+  tokens(options?: GlazeJsonOptions & GlazePaletteExportOptions): Record<string, Record<string, string>>;
   /**
    * Export all themes as tasty style-to-state bindings.
    * Uses `#name` color token keys and state aliases (`''`, `@dark`, etc.).
-   * Spread into component styles or register as a recipe via `configure({ recipes })`.
+   * Prefix defaults to `true`. Use `primary` to duplicate one theme without prefix.
    * @see https://cube-ui-kit.vercel.app/?path=/docs/tasty-documentation--docs
    */
-  tasty(options?: GlazeTokenOptions): Record<string, Record<string, string>>;
-  /** Export all themes as plain JSON. */
+  tasty(options?: GlazeTokenOptions & {
+    primary?: string;
+  }): Record<string, Record<string, string>>;
+  /** Export all themes as plain JSON grouped by theme name. */
   json(options?: GlazeJsonOptions & {
     prefix?: boolean | Record<string, string>;
   }): Record<string, Record<string, Record<string, string>>>;
   /** Export all themes as CSS custom property declarations. */
-  css(options?: GlazeCssOptions & {
-    prefix?: boolean | Record<string, string>;
-  }): GlazeCssResult;
+  css(options?: GlazeCssOptions & GlazePaletteExportOptions): GlazeCssResult;
 }
 //#endregion
 //#region src/glaze.d.ts
@@ -433,16 +454,14 @@ declare function glaze(hueOrOptions: number | {
 declare namespace glaze {
   var configure: (config: GlazeConfig) => void;
   var palette: (themes: PaletteInput) => {
-    tokens(options?: GlazeJsonOptions & {
-      prefix?: boolean | Record<string, string>;
+    tokens(options?: GlazeJsonOptions & GlazePaletteExportOptions): Record<string, Record<string, string>>;
+    tasty(options?: GlazeTokenOptions & {
+      primary?: string;
     }): Record<string, Record<string, string>>;
-    tasty(options?: GlazeTokenOptions): Record<string, Record<string, string>>;
     json(options?: GlazeJsonOptions & {
       prefix?: boolean | Record<string, string>;
     }): Record<string, Record<string, Record<string, string>>>;
-    css(options?: GlazeCssOptions & {
-      prefix?: boolean | Record<string, string>;
-    }): GlazeCssResult;
+    css(options?: GlazeCssOptions & GlazePaletteExportOptions): GlazeCssResult;
   };
   var from: (data: GlazeThemeExport) => GlazeTheme;
   var color: (input: GlazeColorInput) => GlazeColorToken;
@@ -522,5 +541,5 @@ declare function formatHsl(h: number, s: number, l: number): string;
  */
 declare function formatOklch(h: number, s: number, l: number): string;
 //#endregion
-export { type AdaptationMode, type ColorDef, type ColorMap, type ContrastPreset, type FindLightnessForContrastOptions, type FindLightnessForContrastResult, type FindValueForMixContrastOptions, type FindValueForMixContrastResult, type GlazeColorFormat, type GlazeColorInput, type GlazeColorToken, type GlazeConfig, type GlazeCssOptions, type GlazeCssResult, type GlazeExtendOptions, type GlazeJsonOptions, type GlazeOutputModes, type GlazePalette, type GlazeShadowInput, type GlazeTheme, type GlazeThemeExport, type GlazeTokenOptions, type HCPair, type HexColor, type MinContrast, type MixColorDef, type OkhslColor, type RegularColorDef, type RelativeValue, type ResolvedColor, type ResolvedColorVariant, type ShadowColorDef, type ShadowTuning, contrastRatioFromLuminance, findLightnessForContrast, findValueForMixContrast, formatHsl, formatOkhsl, formatOklch, formatRgb, gamutClampedLuminance, glaze, okhslToLinearSrgb, okhslToOklab, okhslToSrgb, parseHex, relativeLuminanceFromLinearRgb, resolveMinContrast, srgbToOkhsl };
+export { type AdaptationMode, type ColorDef, type ColorMap, type ContrastPreset, type FindLightnessForContrastOptions, type FindLightnessForContrastResult, type FindValueForMixContrastOptions, type FindValueForMixContrastResult, type GlazeColorFormat, type GlazeColorInput, type GlazeColorToken, type GlazeConfig, type GlazeCssOptions, type GlazeCssResult, type GlazeExtendOptions, type GlazeJsonOptions, type GlazeOutputModes, type GlazePalette, type GlazePaletteExportOptions, type GlazeShadowInput, type GlazeTheme, type GlazeThemeExport, type GlazeTokenOptions, type HCPair, type HexColor, type MinContrast, type MixColorDef, type OkhslColor, type RegularColorDef, type RelativeValue, type ResolvedColor, type ResolvedColorVariant, type ShadowColorDef, type ShadowTuning, contrastRatioFromLuminance, findLightnessForContrast, findValueForMixContrast, formatHsl, formatOkhsl, formatOklch, formatRgb, gamutClampedLuminance, glaze, okhslToLinearSrgb, okhslToOklab, okhslToSrgb, parseHex, relativeLuminanceFromLinearRgb, resolveMinContrast, srgbToOkhsl };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.mjs

@@ -468,7 +468,7 @@ function formatOklch(h, s, l) {
 	const C = Math.sqrt(a * a + b * b);
 	let hh = Math.atan2(b, a) * (180 / Math.PI);
 	hh = constrainAngle(hh);
-	return `oklch(${fmt$1(L, 4)} ${fmt$1(C, 4)} ${fmt$1(hh, 1)})`;
+	return `oklch(${fmt$1(L, 4)} ${fmt$1(C, 4)} ${fmt$1(hh, 2)})`;
 }
 
 //#endregion
@@ -618,7 +618,7 @@ function coarseScan(h, s, lo, hi, yBase, target, epsilon, maxIter) {
 function findLightnessForContrast(options) {
 	const { hue, saturation, preferredLightness, baseLinearRgb, contrast: contrastInput, lightnessRange = [0, 1], epsilon = 1e-4, maxIterations = 14 } = options;
 	const target = resolveMinContrast(contrastInput);
-	const searchTarget = target * 1.005;
+	const searchTarget = target * 1.007;
 	const yBase = gamutClampedLuminance(baseLinearRgb);
 	const crPref = contrastRatioFromLuminance(cachedLuminance(hue, saturation, preferredLightness), yBase);
 	if (crPref >= searchTarget) return {
@@ -742,7 +742,7 @@ function searchMixBranch(lo, hi, yBase, target, epsilon, maxIter, preferred, lum
 function findValueForMixContrast(options) {
 	const { preferredValue, baseLinearRgb, contrast: contrastInput, luminanceAtValue, epsilon = 1e-4, maxIterations = 20 } = options;
 	const target = resolveMinContrast(contrastInput);
-	const searchTarget = target * 1.005;
+	const searchTarget = target * 1.01;
 	const yBase = gamutClampedLuminance(baseLinearRgb);
 	const crPref = contrastRatioFromLuminance(luminanceAtValue(preferredValue), yBase);
 	if (crPref >= searchTarget) return {
@@ -974,6 +974,11 @@ function mapSaturationDark(s, mode) {
 	if (mode === "static") return s;
 	return s * (1 - globalConfig.darkDesaturation);
 }
+function schemeLightnessRange(isDark, mode) {
+	if (mode === "static") return [0, 1];
+	const [lo, hi] = isDark ? globalConfig.darkLightness : globalConfig.lightLightness;
+	return [lo / 100, hi / 100];
+}
 function clamp(v, min, max) {
 	return Math.max(min, Math.min(max, v));
 }
@@ -1034,20 +1039,22 @@ function resolveDependentColor(name, def, ctx, isHighContrast, isDark, effective
 			if (isDark && mode === "auto") delta = -delta;
 			preferredL = clamp(baseL + delta, 0, 100);
 		} else if (isDark) preferredL = mapLightnessDark(parsed.value, mode);
-		else preferredL = clamp(parsed.value, 0, 100);
+		else preferredL = mapLightnessLight(parsed.value, mode);
 	}
 	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);
 		return {
 			l: findLightnessForContrast({
 				hue: effectiveHue,
 				saturation: effectiveSat,
-				preferredLightness: preferredL / 100,
+				preferredLightness: clamp(preferredL / 100, lightnessRange[0], lightnessRange[1]),
 				baseLinearRgb,
-				contrast: minCr
+				contrast: minCr,
+				lightnessRange
 			}).lightness * 100,
 			satFactor
 		};
@@ -1412,26 +1419,40 @@ function createTheme(hue, saturation, initialColors) {
 		}
 	};
 }
-function resolvePrefix(options, themeName) {
-	if (options?.prefix === true) return `${themeName}-`;
-	if (typeof options?.prefix === "object" && options.prefix !== null) return options.prefix[themeName] ?? `${themeName}-`;
+function resolvePrefix(options, themeName, defaultPrefix = false) {
+	const prefix = options?.prefix ?? defaultPrefix;
+	if (prefix === true) return `${themeName}-`;
+	if (typeof prefix === "object" && prefix !== null) return prefix[themeName] ?? `${themeName}-`;
 	return "";
 }
+function validatePrimaryTheme(primary, themes) {
+	if (primary !== void 0 && !(primary in themes)) {
+		const available = Object.keys(themes).join(", ");
+		throw new Error(`glaze: primary theme "${primary}" not found in palette. Available: ${available}.`);
+	}
+}
 function createPalette(themes) {
 	return {
 		tokens(options) {
+			validatePrimaryTheme(options?.primary, themes);
 			const modes = resolveModes(options?.modes);
 			const allTokens = {};
 			for (const [themeName, theme] of Object.entries(themes)) {
-				const tokens = buildFlatTokenMap(theme.resolve(), resolvePrefix(options, themeName), modes, options?.format);
+				const resolved = theme.resolve();
+				const tokens = buildFlatTokenMap(resolved, resolvePrefix(options, themeName, true), modes, options?.format);
 				for (const variant of Object.keys(tokens)) {
 					if (!allTokens[variant]) allTokens[variant] = {};
 					Object.assign(allTokens[variant], tokens[variant]);
 				}
+				if (themeName === options?.primary) {
+					const unprefixed = buildFlatTokenMap(resolved, "", modes, options?.format);
+					for (const variant of Object.keys(unprefixed)) Object.assign(allTokens[variant], unprefixed[variant]);
+				}
 			}
 			return allTokens;
 		},
 		tasty(options) {
+			validatePrimaryTheme(options?.primary, themes);
 			const states = {
 				dark: options?.states?.dark ?? globalConfig.states.dark,
 				highContrast: options?.states?.highContrast ?? globalConfig.states.highContrast
@@ -1439,8 +1460,13 @@ function createPalette(themes) {
 			const modes = resolveModes(options?.modes);
 			const allTokens = {};
 			for (const [themeName, theme] of Object.entries(themes)) {
-				const tokens = buildTokenMap(theme.resolve(), resolvePrefix(options, themeName), states, modes, options?.format);
+				const resolved = theme.resolve();
+				const tokens = buildTokenMap(resolved, resolvePrefix(options, themeName, true), states, modes, options?.format);
 				Object.assign(allTokens, tokens);
+				if (themeName === options?.primary) {
+					const unprefixed = buildTokenMap(resolved, "", states, modes, options?.format);
+					Object.assign(allTokens, unprefixed);
+				}
 			}
 			return allTokens;
 		},
@@ -1451,6 +1477,7 @@ function createPalette(themes) {
 			return result;
 		},
 		css(options) {
+			validatePrimaryTheme(options?.primary, themes);
 			const suffix = options?.suffix ?? "-color";
 			const format = options?.format ?? "rgb";
 			const allLines = {
@@ -1460,13 +1487,23 @@ function createPalette(themes) {
 				darkContrast: []
 			};
 			for (const [themeName, theme] of Object.entries(themes)) {
-				const css = buildCssMap(theme.resolve(), resolvePrefix(options, themeName), suffix, format);
+				const resolved = theme.resolve();
+				const css = buildCssMap(resolved, resolvePrefix(options, themeName, true), suffix, format);
 				for (const key of [
 					"light",
 					"dark",
 					"lightContrast",
 					"darkContrast"
 				]) if (css[key]) allLines[key].push(css[key]);
+				if (themeName === options?.primary) {
+					const unprefixed = buildCssMap(resolved, "", suffix, format);
+					for (const key of [
+						"light",
+						"dark",
+						"lightContrast",
+						"darkContrast"
+					]) if (unprefixed[key]) allLines[key].push(unprefixed[key]);
+				}
 			}
 			return {
 				light: allLines.light.join("\n"),