@yahoo/uds-v5-wip 1.24.0 → 1.26.0

package/dist/foundational-presets/dist/warmOrganic.d.ts

@@ -2,7 +2,49 @@ import { UdsConfig } from "../../config/dist/createConfig.js";
 import * as _$_uds_types0 from "@uds/types";
 
 //#region ../foundational-presets/dist/warmOrganic.d.ts
+//#region src/warmOrganic.d.ts
 declare const warmOrganicFoundationPreset: UdsConfig<_$_uds_types0.ModifierProp | "_light" | "_dark" | "_sm" | "_md" | "_lg" | "_xl" | "_2xl", {
+  opacity: {
+    0: string;
+    5: string;
+    10: string;
+    20: string;
+    40: string;
+    60: string;
+    80: string;
+    25: string;
+    30: string;
+    50: string;
+    70: string;
+    75: string;
+    90: string;
+    95: string;
+    100: string;
+  };
+  scale: {
+    0: string;
+    50: string;
+    75: string;
+    90: string;
+    95: string;
+    100: string;
+    105: string;
+    110: string;
+    125: string;
+    150: string;
+    200: string;
+  };
+  rotate: {
+    0: string;
+    2: string;
+    1: string;
+    3: string;
+    6: string;
+    12: string;
+    90: string;
+    45: string;
+    180: string;
+  };
   color: {
     inherit: string;
     current: string;
@@ -28,23 +70,7 @@ declare const warmOrganicFoundationPreset: UdsConfig<_$_uds_types0.ModifierProp
     inverse: string;
     "on-inverse": string;
   };
-  fontFamily: {
-    sans: string;
-    serif: string;
-    mono: string;
-  };
-  fontWeight: {
-    bold: string;
-    light: string;
-    thin: string;
-    medium: string;
-    extralight: string;
-    normal: string;
-    semibold: string;
-    extrabold: string;
-    black: string;
-  };
-  bg: {
+  borderColor: {
     brand: string;
     accent: string;
     alert: string;
@@ -55,17 +81,51 @@ declare const warmOrganicFoundationPreset: UdsConfig<_$_uds_types0.ModifierProp
     tertiary: string;
     inverse: string;
     surface: string;
-    "elevation-1": string;
-    "elevation-2": string;
-    "elevation-3": string;
     "brand-wash": string;
     "accent-wash": string;
     "alert-wash": string;
     "positive-wash": string;
     "warning-wash": string;
-    overlay: string;
   };
-  borderColor: {
+  position: {
+    auto: string;
+    full: string;
+    "1/2": string;
+    "1/3": string;
+    "2/3": string;
+    "1/4": string;
+    "2/4": string;
+    "3/4": string;
+  };
+  size: {
+    auto: string;
+    full: string;
+    max: string;
+    min: string;
+    "1/2": string;
+    "1/3": string;
+    "2/3": string;
+    "1/4": string;
+    "2/4": string;
+    "3/4": string;
+    fit: string;
+    "1/5": string;
+    "2/5": string;
+    "3/5": string;
+    "4/5": string;
+    "1/6": string;
+    "2/6": string;
+    "3/6": string;
+    "4/6": string;
+    "5/6": string;
+  };
+  animation: {
+    none: string;
+    ping: string;
+    spin: string;
+  };
+  bg: {
+    overlay: string;
     brand: string;
     accent: string;
     alert: string;
@@ -76,6 +136,9 @@ declare const warmOrganicFoundationPreset: UdsConfig<_$_uds_types0.ModifierProp
     tertiary: string;
     inverse: string;
     surface: string;
+    "elevation-1": string;
+    "elevation-2": string;
+    "elevation-3": string;
     "brand-wash": string;
     "accent-wash": string;
     "alert-wash": string;
@@ -88,63 +151,50 @@ declare const warmOrganicFoundationPreset: UdsConfig<_$_uds_types0.ModifierProp
     medium: string;
     thick: string;
   };
-  outlineWidth: {
+  divideWidth: {
     0: string;
-    2: string;
-    1: string;
     4: string;
-    8: string;
-  };
-  outlineOffset: {
-    0: string;
+    reverse: string;
     2: string;
-    1: string;
-    4: string;
     8: string;
   };
-  divideWidth: {
-    0: string;
-    2: string;
-    reverse: string;
-    4: string;
-    8: string;
+  flex: {
+    none: string;
+    initial: string;
+    auto: string;
+    1: string;
   };
-  ringWidth: {
+  flexGrow: {
     0: string;
-    2: string;
     1: string;
-    inset: string;
-    4: string;
-    8: string;
   };
-  ringOffsetWidth: {
+  flexShrink: {
     0: string;
-    2: string;
-    1: string;
-    4: string;
-    8: string;
   };
-  lineHeight: {
-    none: string;
-    normal: string;
-    tight: string;
-    relaxed: string;
+  aspectRatio: {
+    square: string;
+    landscape: string;
+    portrait: string;
+    widescreen: string;
+    ultrawide: string;
+    golden: string;
   };
-  letterSpacing: {
-    normal: string;
-    tight: string;
-    tighter: string;
-    wide: string;
-    wider: string;
-    widest: string;
+  zIndex: {
+    0: string;
+    auto: string;
+    10: string;
+    20: string;
+    40: string;
+    30: string;
+    50: string;
   };
   spacing: {
     0: string;
+    4: string;
     2: string;
     5: string;
     1: string;
     px: string;
-    4: string;
     8: string;
     0.5: string;
     1.5: string;
@@ -175,183 +225,116 @@ declare const warmOrganicFoundationPreset: UdsConfig<_$_uds_types0.ModifierProp
     80: string;
     96: string;
   };
-  position: {
-    auto: string;
-    full: string;
-    "1/2": string;
-    "1/3": string;
-    "2/3": string;
-    "1/4": string;
-    "2/4": string;
-    "3/4": string;
-  };
-  aspectRatio: {
-    square: string;
-    landscape: string;
-    portrait: string;
-    widescreen: string;
-    ultrawide: string;
-    golden: string;
+  w: {
+    screen: string;
+    svw: string;
+    lvw: string;
+    dvw: string;
   };
-  flex: {
+  outlineWidth: {
+    0: string;
+    4: string;
+    2: string;
     1: string;
-    none: string;
-    auto: string;
-    initial: string;
+    8: string;
   };
-  flexGrow: {
+  outlineOffset: {
     0: string;
+    4: string;
+    2: string;
     1: string;
+    8: string;
   };
-  flexShrink: {
+  ringWidth: {
     0: string;
+    4: string;
+    inset: string;
+    2: string;
+    1: string;
+    8: string;
   };
-  opacity: {
+  ringOffsetWidth: {
     0: string;
-    5: string;
-    10: string;
-    20: string;
-    40: string;
-    60: string;
-    80: string;
-    25: string;
-    30: string;
-    50: string;
-    70: string;
-    75: string;
-    90: string;
-    95: string;
-    100: string;
+    4: string;
+    2: string;
+    1: string;
+    8: string;
   };
-  radius: {
+  shadow: {
+    none: string;
     sm: string;
     md: string;
     lg: string;
     xl: string;
-    none: string;
-    full: string;
+    "2xl": string;
+    "2xs": string;
     xs: string;
+    inner: string;
   };
-  animation: {
+  strokeWidth: {
+    0: string;
+    2: string;
+    1: string;
+  };
+  fontFamily: {
+    sans: string;
+    serif: string;
+    mono: string;
+  };
+  fontWeight: {
+    normal: string;
+    thin: string;
+    bold: string;
+    light: string;
+    medium: string;
+    extralight: string;
+    semibold: string;
+    extrabold: string;
+    black: string;
+  };
+  letterSpacing: {
+    normal: string;
+    tight: string;
+    tighter: string;
+    wide: string;
+    wider: string;
+    widest: string;
+  };
+  lineHeight: {
     none: string;
-    spin: string;
-    ping: string;
+    normal: string;
+    tight: string;
+    relaxed: string;
   };
-  shadow: {
+  textShadow: {
+    none: string;
     sm: string;
     md: string;
     lg: string;
-    xl: string;
-    "2xl": string;
-    none: string;
-    xs: string;
     "2xs": string;
-    inner: string;
+    xs: string;
   };
   blur: {
+    none: string;
     sm: string;
     md: string;
     lg: string;
     xl: string;
     "2xl": string;
-    none: string;
     "3xl": string;
   };
-  textShadow: {
-    sm: string;
-    md: string;
-    lg: string;
-    none: string;
-    xs: string;
-    "2xs": string;
-  };
-  zIndex: {
-    0: string;
-    auto: string;
-    10: string;
-    20: string;
-    40: string;
-    30: string;
-    50: string;
-  };
-  size: {
-    auto: string;
-    full: string;
-    "1/2": string;
-    "1/3": string;
-    "2/3": string;
-    "1/4": string;
-    "2/4": string;
-    "3/4": string;
-    min: string;
-    max: string;
-    fit: string;
-    "1/5": string;
-    "2/5": string;
-    "3/5": string;
-    "4/5": string;
-    "1/6": string;
-    "2/6": string;
-    "3/6": string;
-    "4/6": string;
-    "5/6": string;
-  };
-  w: {
-    screen: string;
-    svw: string;
-    lvw: string;
-    dvw: string;
-  };
-  h: {
-    screen: string;
-    svh: string;
-    lvh: string;
-    dvh: string;
-  };
-  rotate: {
-    0: string;
-    2: string;
-    1: string;
-    3: string;
-    6: string;
-    12: string;
-    90: string;
-    45: string;
-    180: string;
-  };
-  scale: {
-    0: string;
-    50: string;
-    75: string;
-    90: string;
-    95: string;
-    100: string;
-    105: string;
-    110: string;
-    125: string;
-    150: string;
-    200: string;
-  };
-  skew: {
-    0: string;
-    2: string;
-    1: string;
-    3: string;
-    6: string;
-    12: string;
-  };
   translate: {
     0: string;
+    4: string;
+    full: string;
     2: string;
     5: string;
     1: string;
-    full: string;
     "1/2": string;
     "1/3": string;
     "2/3": string;
     "1/4": string;
     "3/4": string;
-    4: string;
     8: string;
     0.5: string;
     1.5: string;
@@ -382,10 +365,28 @@ declare const warmOrganicFoundationPreset: UdsConfig<_$_uds_types0.ModifierProp
     80: string;
     96: string;
   };
-  strokeWidth: {
+  radius: {
+    none: string;
+    sm: string;
+    md: string;
+    lg: string;
+    xl: string;
+    xs: string;
+    full: string;
+  };
+  h: {
+    screen: string;
+    svh: string;
+    lvh: string;
+    dvh: string;
+  };
+  skew: {
     0: string;
     2: string;
     1: string;
+    3: string;
+    6: string;
+    12: string;
   };
 }, {}, {}, {}, "_light" | "_dark" | "_sm" | "_md" | "_lg" | "_xl" | "_2xl", {
   readonly color: {

package/dist/loader/dist/loader/style-transform.js

@@ -2,7 +2,7 @@ import { applyComponentStyleDefaults } from "../../../utils/dist/component-style
 import { kebabCase } from "../../../utils/dist/string-utils/kebabCase.js";
 import { componentVariantClass } from "../../../utils/dist/string-utils/componentClassName.js";
 import "../../../utils/dist/index.js";
-import { expandMacros } from "../packages/core/dist/macros.js";
+import { expandCompositeStyles } from "../packages/core/dist/compositeStyles.js";
 import { colorPropToOpacityProp, propMappings } from "../packages/core/dist/propMappings.js";
 import { toCamelCase } from "../packages/core/dist/getStyles.js";
 import "../packages/core/dist/index.js";
@@ -155,21 +155,21 @@ function createStyleTransformRuntime(transformData, manifest) {
 		return styleAndModifierPropSet.has(propName) || propName.startsWith("_");
 	}
 	function compileStyleClassName(styleProps, modifierPrefix = "") {
-		const macroConf = transformData?.macroConfig ?? {};
+		const compositeStylesConf = transformData?.compositeStylesConfig ?? {};
 		let effectiveProps = styleProps;
-		if (Object.keys(macroConf).length > 0 && !modifierPrefix) {
-			const { expanded, markerClasses } = expandMacros(styleProps, macroConf);
+		if (Object.keys(compositeStylesConf).length > 0 && !modifierPrefix) {
+			const { expanded, markerClasses } = expandCompositeStyles(styleProps, compositeStylesConf);
 			effectiveProps = expanded;
-			if (markerClasses.length > 0) effectiveProps.__macroMarkers = markerClasses;
+			if (markerClasses.length > 0) effectiveProps.__compositeStyleMarkers = markerClasses;
 		}
 		for (const [colorProp, opacityPropName] of Object.entries(colorPropToOpacityProp)) if (effectiveProps[opacityPropName] !== void 0 && effectiveProps[colorProp] !== void 0) {
 			effectiveProps[colorProp] = `${effectiveProps[colorProp]}_${effectiveProps[opacityPropName]}`;
 			delete effectiveProps[opacityPropName];
 		}
 		const classParts = [];
-		if (Array.isArray(effectiveProps.__macroMarkers)) {
-			classParts.push(...effectiveProps.__macroMarkers);
-			delete effectiveProps.__macroMarkers;
+		if (Array.isArray(effectiveProps.__compositeStyleMarkers)) {
+			classParts.push(...effectiveProps.__compositeStyleMarkers);
+			delete effectiveProps.__compositeStyleMarkers;
 		}
 		for (const key in effectiveProps) {
 			if (!Object.hasOwn(effectiveProps, key)) continue;

package/dist/loader/dist/packages/core/dist/compositeStyles.js

@@ -0,0 +1,43 @@
+import { safeTokenName } from "../../../../../utils/dist/string-utils/cssVar.js";
+import "../../../../../utils/dist/index.js";
+//#region ../loader/dist/packages/core/dist/compositeStyles.js
+/**
+* Runtime composite-styles config — set by the loader/codegen at build time.
+* Maps composite-style group names to a `{ label, description?, styles }`
+* definition where `styles` holds variant id -> style bag.
+*/
+let compositeStylesConfig = {};
+/**
+* Expand composite-style props into their constituent style props + marker classes.
+*
+* - Composite styles are lowest priority: explicit props always win
+* - Nested composite styles are supported (a style bag can reference another group)
+* - Circular references are detected and throw
+* - Marker classes (e.g. "elevation-0") are returned for modifier targeting
+*/
+function expandCompositeStyles(props, config = compositeStylesConfig) {
+	const expanded = {};
+	const markers = [];
+	const seen = /* @__PURE__ */ new Set();
+	function expand(key, value) {
+		const def = config[key];
+		if (def && typeof value === "string") {
+			if (seen.has(key)) throw new Error(`Circular composite style: ${[...seen, key].join(" → ")}`);
+			seen.add(key);
+			markers.push(`${key}-${safeTokenName(value)}`);
+			const bag = def.styles[value];
+			if (bag) {
+				for (const [k, v] of Object.entries(bag)) if (!(k in expanded)) expand(k, v);
+			}
+			seen.delete(key);
+		} else if (!(key in expanded)) expanded[key] = value;
+	}
+	for (const [key, value] of Object.entries(props)) if (key in config) expand(key, value);
+	for (const [key, value] of Object.entries(props)) if (!(key in config)) expanded[key] = value;
+	return {
+		expanded,
+		markerClasses: markers
+	};
+}
+//#endregion
+export { expandCompositeStyles };

package/dist/loader/dist/packages/core/dist/getStyles.js

@@ -1,5 +1,5 @@
 import "../../../../../utils/dist/index.js";
-import "./macros.js";
+import "./compositeStyles.js";
 import { colorPropToOpacityProp, modifierMappings, propMappings } from "./propMappings.js";
 import { stylePropsTwMap } from "./generated/stylePropsTwMap.js";
 //#region ../loader/dist/packages/core/dist/getStyles.js

package/dist/loader/dist/packages/core/dist/index.js

@@ -1,4 +1,4 @@
-import "./macros.js";
+import "./compositeStyles.js";
 import "./getStyles.js";
 import "./getComponentStyles.js";
 import "./createComponent.js";