@tenphi/glaze 0.0.0-snapshot.7e2a1da → 0.0.0-snapshot.7f7cab2

package/dist/index.d.cts

@@ -133,6 +133,11 @@ interface RegularColorDef {
    * should not be combined (a console.warn is emitted).
    */
   opacity?: number;
+  /**
+   * 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.
+   */
+  inherit?: boolean;
 }
 /** Shadow tuning knobs. All values use the 0–1 scale (OKHSL). */
 interface ShadowTuning {
@@ -177,6 +182,11 @@ interface ShadowColorDef {
   intensity: HCPair<number>;
   /** Override default tuning. Merged field-by-field with global `shadowTuning`. */
   tuning?: ShadowTuning;
+  /**
+   * 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.
+   */
+  inherit?: boolean;
 }
 interface MixColorDef {
   type: 'mix';
@@ -211,6 +221,11 @@ interface MixColorDef {
    * Supports [normal, highContrast] pair.
    */
   contrast?: HCPair<MinContrast>;
+  /**
+   * 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.
+   */
+  inherit?: boolean;
 }
 type ColorDef = RegularColorDef | ShadowColorDef | MixColorDef;
 type ColorMap = Record<string, ColorDef>;
@@ -243,11 +258,12 @@ interface GlazeConfig {
   /** Saturation reduction factor for dark scheme (0–1). Default: 0.1. */
   darkDesaturation?: number;
   /**
-   * Power-curve exponent for dark auto-inversion (0–1).
+   * Möbius beta for dark auto-inversion (0–1).
    * Lower values expand subtle near-white distinctions in dark mode.
    * Set to 1 for linear (legacy) behavior. Default: 0.5.
+   * Accepts [normal, highContrast] pair for separate HC tuning.
    */
-  darkCurve?: number;
+  darkCurve?: HCPair<number>;
   /** State alias names for token export. */
   states?: {
     dark?: string;
@@ -262,7 +278,7 @@ interface GlazeConfigResolved {
   lightLightness: [number, number];
   darkLightness: [number, number];
   darkDesaturation: number;
-  darkCurve: number;
+  darkCurve: HCPair<number>;
   states: {
     dark: string;
     highContrast: string;
@@ -392,35 +408,47 @@ 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>;
+/** Options for `glaze.palette()` creation. */
+interface GlazePaletteOptions {
   /**
    * Name of the primary theme. The primary theme's tokens are duplicated
-   * without prefix, providing convenient short aliases alongside the
-   * prefixed versions.
+   * without prefix in all exports, providing convenient short aliases
+   * alongside the prefixed versions. Can be overridden per-export.
    *
    * @example
    * ```ts
-   * palette.tokens({ primary: 'brand' })
+   * const palette = glaze.palette({ brand, accent }, { primary: 'brand' });
+   * palette.tokens()
    * // → { light: { 'brand-surface': '...', 'surface': '...', 'accent-surface': '...' } }
    * ```
    */
   primary?: 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. Colliding keys
+   * produce a console.warn and the first-written value wins.
+   */
+  prefix?: boolean | Record<string, string>;
+  /**
+   * Override the palette-level primary theme for this export.
+   * Pass a theme name to set/change the primary, or `false` to disable it.
+   * When omitted, inherits the palette-level `primary`.
+   */
+  primary?: string | false;
+}
 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.
+   * Inherits the palette-level `primary`; override per-call or pass `false` to disable.
    *
    * ```ts
-   * palette.tokens({ primary: 'brand' })
+   * const palette = glaze.palette({ brand, accent }, { primary: 'brand' });
+   * palette.tokens()
    * // → { light: { 'brand-surface': '...', 'surface': '...', 'accent-surface': '...' } }
    * ```
    */
@@ -428,12 +456,10 @@ interface GlazePalette {
   /**
    * Export all themes as tasty style-to-state bindings.
    * Uses `#name` color token keys and state aliases (`''`, `@dark`, etc.).
-   * Prefix defaults to `true`. Use `primary` to duplicate one theme without prefix.
+   * Prefix defaults to `true`. Inherits the palette-level `primary`.
    * @see https://cube-ui-kit.vercel.app/?path=/docs/tasty-documentation--docs
    */
-  tasty(options?: GlazeTokenOptions & {
-    primary?: string;
-  }): Record<string, Record<string, string>>;
+  tasty(options?: GlazeTokenOptions & GlazePaletteExportOptions): Record<string, Record<string, string>>;
   /** Export all themes as plain JSON grouped by theme name. */
   json(options?: GlazeJsonOptions & {
     prefix?: boolean | Record<string, string>;
@@ -460,11 +486,9 @@ declare function glaze(hueOrOptions: number | {
 }, saturation?: number): GlazeTheme;
 declare namespace glaze {
   var configure: (config: GlazeConfig) => void;
-  var palette: (themes: PaletteInput) => {
+  var palette: (themes: PaletteInput, options?: GlazePaletteOptions) => {
     tokens(options?: GlazeJsonOptions & GlazePaletteExportOptions): Record<string, Record<string, string>>;
-    tasty(options?: GlazeTokenOptions & {
-      primary?: string;
-    }): Record<string, Record<string, string>>;
+    tasty(options?: GlazeTokenOptions & GlazePaletteExportOptions): Record<string, Record<string, string>>;
     json(options?: GlazeJsonOptions & {
       prefix?: boolean | Record<string, string>;
     }): Record<string, Record<string, Record<string, string>>>;
@@ -548,5 +572,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 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 };
+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 GlazePaletteOptions, 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

@@ -133,6 +133,11 @@ interface RegularColorDef {
    * should not be combined (a console.warn is emitted).
    */
   opacity?: number;
+  /**
+   * 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.
+   */
+  inherit?: boolean;
 }
 /** Shadow tuning knobs. All values use the 0–1 scale (OKHSL). */
 interface ShadowTuning {
@@ -177,6 +182,11 @@ interface ShadowColorDef {
   intensity: HCPair<number>;
   /** Override default tuning. Merged field-by-field with global `shadowTuning`. */
   tuning?: ShadowTuning;
+  /**
+   * 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.
+   */
+  inherit?: boolean;
 }
 interface MixColorDef {
   type: 'mix';
@@ -211,6 +221,11 @@ interface MixColorDef {
    * Supports [normal, highContrast] pair.
    */
   contrast?: HCPair<MinContrast>;
+  /**
+   * 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.
+   */
+  inherit?: boolean;
 }
 type ColorDef = RegularColorDef | ShadowColorDef | MixColorDef;
 type ColorMap = Record<string, ColorDef>;
@@ -243,11 +258,12 @@ interface GlazeConfig {
   /** Saturation reduction factor for dark scheme (0–1). Default: 0.1. */
   darkDesaturation?: number;
   /**
-   * Power-curve exponent for dark auto-inversion (0–1).
+   * Möbius beta for dark auto-inversion (0–1).
    * Lower values expand subtle near-white distinctions in dark mode.
    * Set to 1 for linear (legacy) behavior. Default: 0.5.
+   * Accepts [normal, highContrast] pair for separate HC tuning.
    */
-  darkCurve?: number;
+  darkCurve?: HCPair<number>;
   /** State alias names for token export. */
   states?: {
     dark?: string;
@@ -262,7 +278,7 @@ interface GlazeConfigResolved {
   lightLightness: [number, number];
   darkLightness: [number, number];
   darkDesaturation: number;
-  darkCurve: number;
+  darkCurve: HCPair<number>;
   states: {
     dark: string;
     highContrast: string;
@@ -392,35 +408,47 @@ 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>;
+/** Options for `glaze.palette()` creation. */
+interface GlazePaletteOptions {
   /**
    * Name of the primary theme. The primary theme's tokens are duplicated
-   * without prefix, providing convenient short aliases alongside the
-   * prefixed versions.
+   * without prefix in all exports, providing convenient short aliases
+   * alongside the prefixed versions. Can be overridden per-export.
    *
    * @example
    * ```ts
-   * palette.tokens({ primary: 'brand' })
+   * const palette = glaze.palette({ brand, accent }, { primary: 'brand' });
+   * palette.tokens()
    * // → { light: { 'brand-surface': '...', 'surface': '...', 'accent-surface': '...' } }
    * ```
    */
   primary?: 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. Colliding keys
+   * produce a console.warn and the first-written value wins.
+   */
+  prefix?: boolean | Record<string, string>;
+  /**
+   * Override the palette-level primary theme for this export.
+   * Pass a theme name to set/change the primary, or `false` to disable it.
+   * When omitted, inherits the palette-level `primary`.
+   */
+  primary?: string | false;
+}
 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.
+   * Inherits the palette-level `primary`; override per-call or pass `false` to disable.
    *
    * ```ts
-   * palette.tokens({ primary: 'brand' })
+   * const palette = glaze.palette({ brand, accent }, { primary: 'brand' });
+   * palette.tokens()
    * // → { light: { 'brand-surface': '...', 'surface': '...', 'accent-surface': '...' } }
    * ```
    */
@@ -428,12 +456,10 @@ interface GlazePalette {
   /**
    * Export all themes as tasty style-to-state bindings.
    * Uses `#name` color token keys and state aliases (`''`, `@dark`, etc.).
-   * Prefix defaults to `true`. Use `primary` to duplicate one theme without prefix.
+   * Prefix defaults to `true`. Inherits the palette-level `primary`.
    * @see https://cube-ui-kit.vercel.app/?path=/docs/tasty-documentation--docs
    */
-  tasty(options?: GlazeTokenOptions & {
-    primary?: string;
-  }): Record<string, Record<string, string>>;
+  tasty(options?: GlazeTokenOptions & GlazePaletteExportOptions): Record<string, Record<string, string>>;
   /** Export all themes as plain JSON grouped by theme name. */
   json(options?: GlazeJsonOptions & {
     prefix?: boolean | Record<string, string>;
@@ -460,11 +486,9 @@ declare function glaze(hueOrOptions: number | {
 }, saturation?: number): GlazeTheme;
 declare namespace glaze {
   var configure: (config: GlazeConfig) => void;
-  var palette: (themes: PaletteInput) => {
+  var palette: (themes: PaletteInput, options?: GlazePaletteOptions) => {
     tokens(options?: GlazeJsonOptions & GlazePaletteExportOptions): Record<string, Record<string, string>>;
-    tasty(options?: GlazeTokenOptions & {
-      primary?: string;
-    }): Record<string, Record<string, string>>;
+    tasty(options?: GlazeTokenOptions & GlazePaletteExportOptions): Record<string, Record<string, string>>;
     json(options?: GlazeJsonOptions & {
       prefix?: boolean | Record<string, string>;
     }): Record<string, Record<string, Record<string, string>>>;
@@ -548,5 +572,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 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 };
+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 GlazePaletteOptions, 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

@@ -960,31 +960,42 @@ function topoSort(defs) {
 	for (const name of Object.keys(defs)) visit(name);
 	return result;
 }
+function lightnessWindow(isHighContrast, kind) {
+	if (isHighContrast) return [0, 100];
+	return kind === "dark" ? globalConfig.darkLightness : globalConfig.lightLightness;
+}
 function mapLightnessLight(l, mode, isHighContrast) {
-	if (mode === "static" || isHighContrast) return l;
-	const [lo, hi] = globalConfig.lightLightness;
+	if (mode === "static") return l;
+	const [lo, hi] = lightnessWindow(isHighContrast, "light");
 	return l * (hi - lo) / 100 + lo;
 }
+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;
-	if (isHighContrast) {
-		if (mode === "fixed") return l;
-		const t = (100 - l) / 100;
-		return 100 * Math.pow(t, globalConfig.darkCurve);
-	}
-	const [darkLo, darkHi] = globalConfig.darkLightness;
+	const beta = isHighContrast ? pairHC(globalConfig.darkCurve) : pairNormal(globalConfig.darkCurve);
+	const [darkLo, darkHi] = lightnessWindow(isHighContrast, "dark");
 	if (mode === "fixed") return l * (darkHi - darkLo) / 100 + darkLo;
-	const [lightLo, lightHi] = globalConfig.lightLightness;
+	const [lightLo, lightHi] = lightnessWindow(isHighContrast, "light");
 	const t = (lightHi - (l * (lightHi - lightLo) / 100 + lightLo)) / (lightHi - lightLo);
-	return darkLo + (darkHi - darkLo) * Math.pow(t, globalConfig.darkCurve);
+	return darkLo + (darkHi - darkLo) * mobiusCurve(t, beta);
+}
+function lightMappedToDark(lightL, isHighContrast) {
+	const beta = isHighContrast ? pairHC(globalConfig.darkCurve) : pairNormal(globalConfig.darkCurve);
+	const [lightLo, lightHi] = lightnessWindow(isHighContrast, "light");
+	const [darkLo, darkHi] = lightnessWindow(isHighContrast, "dark");
+	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, isHighContrast) {
-	if (mode === "static" || isHighContrast) return [0, 1];
-	const [lo, hi] = isDark ? globalConfig.darkLightness : globalConfig.lightLightness;
+	if (mode === "static") return [0, 1];
+	const [lo, hi] = lightnessWindow(isHighContrast, isDark ? "dark" : "light");
 	return [lo / 100, hi / 100];
 }
 function clamp(v, min, max) {
@@ -1043,9 +1054,9 @@ 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);
+			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);
 	}
@@ -1402,10 +1413,14 @@ function createTheme(hue, saturation, initialColors) {
 			};
 		},
 		extend(options) {
-			return createTheme(options.hue ?? hue, options.saturation ?? saturation, options.colors ? {
-				...colorDefs,
+			const newHue = options.hue ?? hue;
+			const newSat = options.saturation ?? saturation;
+			const inheritedColors = {};
+			for (const [name, def] of Object.entries(colorDefs)) if (def.inherit !== false) inheritedColors[name] = def;
+			return createTheme(newHue, newSat, options.colors ? {
+				...inheritedColors,
 				...options.colors
-			} : { ...colorDefs });
+			} : { ...inheritedColors });
 		},
 		resolve() {
 			return resolveAllColors(hue, saturation, colorDefs);
@@ -1439,40 +1454,74 @@ function validatePrimaryTheme(primary, themes) {
 		throw new Error(`glaze: primary theme "${primary}" not found in palette. Available: ${available}.`);
 	}
 }
-function createPalette(themes) {
+/**
+* Resolve the effective primary for an export call.
+* `false` disables, a string overrides, `undefined` inherits from palette.
+*/
+function resolveEffectivePrimary(exportPrimary, palettePrimary) {
+	if (exportPrimary === false) return void 0;
+	return exportPrimary ?? palettePrimary;
+}
+/**
+* Filter a resolved color map, skipping keys already in `seen`.
+* Warns on collision and keeps the first-written value (first-write-wins).
+* Returns a new map containing only non-colliding entries.
+*/
+function filterCollisions(resolved, prefix, seen, themeName, isPrimary) {
+	const filtered = /* @__PURE__ */ new Map();
+	const label = isPrimary ? `${themeName} (primary)` : themeName;
+	for (const [name, color] of resolved) {
+		const key = `${prefix}${name}`;
+		if (seen.has(key)) {
+			console.warn(`glaze: token "${key}" from theme "${label}" collides with theme "${seen.get(key)}" — skipping.`);
+			continue;
+		}
+		seen.set(key, label);
+		filtered.set(name, color);
+	}
+	return filtered;
+}
+function createPalette(themes, paletteOptions) {
+	validatePrimaryTheme(paletteOptions?.primary, themes);
 	return {
 		tokens(options) {
-			validatePrimaryTheme(options?.primary, themes);
+			const effectivePrimary = resolveEffectivePrimary(options?.primary, paletteOptions?.primary);
+			if (options?.primary !== void 0) validatePrimaryTheme(effectivePrimary, themes);
 			const modes = resolveModes(options?.modes);
 			const allTokens = {};
+			const seen = /* @__PURE__ */ new Map();
 			for (const [themeName, theme] of Object.entries(themes)) {
 				const resolved = theme.resolve();
-				const tokens = buildFlatTokenMap(resolved, resolvePrefix(options, themeName, true), modes, options?.format);
+				const prefix = resolvePrefix(options, themeName, true);
+				const tokens = buildFlatTokenMap(filterCollisions(resolved, prefix, seen, themeName), prefix, 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);
+				if (themeName === effectivePrimary) {
+					const unprefixed = buildFlatTokenMap(filterCollisions(resolved, "", seen, themeName, true), "", 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 effectivePrimary = resolveEffectivePrimary(options?.primary, paletteOptions?.primary);
+			if (options?.primary !== void 0) validatePrimaryTheme(effectivePrimary, themes);
 			const states = {
 				dark: options?.states?.dark ?? globalConfig.states.dark,
 				highContrast: options?.states?.highContrast ?? globalConfig.states.highContrast
 			};
 			const modes = resolveModes(options?.modes);
 			const allTokens = {};
+			const seen = /* @__PURE__ */ new Map();
 			for (const [themeName, theme] of Object.entries(themes)) {
 				const resolved = theme.resolve();
-				const tokens = buildTokenMap(resolved, resolvePrefix(options, themeName, true), states, modes, options?.format);
+				const prefix = resolvePrefix(options, themeName, true);
+				const tokens = buildTokenMap(filterCollisions(resolved, prefix, seen, themeName), prefix, states, modes, options?.format);
 				Object.assign(allTokens, tokens);
-				if (themeName === options?.primary) {
-					const unprefixed = buildTokenMap(resolved, "", states, modes, options?.format);
+				if (themeName === effectivePrimary) {
+					const unprefixed = buildTokenMap(filterCollisions(resolved, "", seen, themeName, true), "", states, modes, options?.format);
 					Object.assign(allTokens, unprefixed);
 				}
 			}
@@ -1485,7 +1534,8 @@ function createPalette(themes) {
 			return result;
 		},
 		css(options) {
-			validatePrimaryTheme(options?.primary, themes);
+			const effectivePrimary = resolveEffectivePrimary(options?.primary, paletteOptions?.primary);
+			if (options?.primary !== void 0) validatePrimaryTheme(effectivePrimary, themes);
 			const suffix = options?.suffix ?? "-color";
 			const format = options?.format ?? "rgb";
 			const allLines = {
@@ -1494,17 +1544,19 @@ function createPalette(themes) {
 				lightContrast: [],
 				darkContrast: []
 			};
+			const seen = /* @__PURE__ */ new Map();
 			for (const [themeName, theme] of Object.entries(themes)) {
 				const resolved = theme.resolve();
-				const css = buildCssMap(resolved, resolvePrefix(options, themeName, true), suffix, format);
+				const prefix = resolvePrefix(options, themeName, true);
+				const css = buildCssMap(filterCollisions(resolved, prefix, seen, themeName), prefix, 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);
+				if (themeName === effectivePrimary) {
+					const unprefixed = buildCssMap(filterCollisions(resolved, "", seen, themeName, true), "", suffix, format);
 					for (const key of [
 						"light",
 						"dark",
@@ -1586,8 +1638,8 @@ glaze.configure = function configure(config) {
 /**
 * Compose multiple themes into a palette.
 */
-glaze.palette = function palette(themes) {
-	return createPalette(themes);
+glaze.palette = function palette(themes, options) {
+	return createPalette(themes, options);
 };
 /**
 * Create a theme from a serialized export.