@stylexjs/stylex 0.18.1 → 0.18.3

package/lib/es/types/StyleXTypes.d.ts

@@ -252,12 +252,17 @@ export type IDFromVarGroup<T extends VarGroup<{}>> = T['__opaqueId'];
 
 type TTokens = Readonly<{
   [key: string]:
-    | NestedVarObject<null | string | number>
-    | StyleXVar<null | string | number>
+    | NestedVarObject<
+        null | string | number | StyleXVar<null | string | number>
+      >
     | CSSType<null | string | number>;
 }>;
 
-type UnwrapVars<T> = T extends StyleXVar<infer U> ? U : T;
+type UnwrapVars<T> = T extends () => infer U
+  ? UnwrapVars<U>
+  : T extends StyleXVar<infer U>
+    ? U
+    : T;
 export type FlattenTokens<T extends TTokens> = Readonly<{
   [Key in keyof T]: T[Key] extends { [key: string]: infer X }
     ? UnwrapVars<X>
@@ -266,6 +271,7 @@ export type FlattenTokens<T extends TTokens> = Readonly<{
 
 type NestedVarObject<T> =
   | T
+  | (() => T)
   | Readonly<{
       default: NestedVarObject<T>;
       [key: AtRuleStr]: NestedVarObject<T>;
@@ -354,3 +360,56 @@ export type StyleX$When = {
     // @ts-expect-error - Trying to use a symbol in a string is not normally allowed
   ) => `:where-any-sibling(${Pseudo}, ${MarkerSymbol})`;
 };
+
+export interface Register {}
+
+export type StyleX$Env = Register extends { env: infer TEnv }
+  ? TEnv
+  : Readonly<{ [key: string]: unknown }>;
+
+// === Nested API Types ===
+
+export type NestedVarsValue =
+  | string
+  | CSSType<string | number>
+  | { readonly [key: string]: NestedVarsValue };
+
+export type NestedConstsValue =
+  | string
+  | number
+  | { readonly [key: string]: NestedConstsValue };
+
+export type NestedStringValue =
+  | string
+  | { readonly [key: string]: NestedStringValue };
+
+// unstable_defineVarsNested: preserves nested key structure in output.
+// Uses generic <T> to give consumers key-level autocomplete.
+// Leaf values are replaced with var(--hash) strings at compile time.
+export type StyleX$DefineVarsNested = <
+  const T extends { [key: string]: NestedVarsValue },
+>(
+  tokens: T,
+) => T;
+
+// unstable_defineConstsNested: same as input — values inlined at compile time.
+export type StyleX$DefineConstsNested = <
+  const T extends { [key: string]: NestedConstsValue },
+>(
+  tokens: T,
+) => T;
+
+// unstable_createThemeNested: returns a flat theme object like createTheme.
+export type StyleX$CreateThemeNested = (
+  baseTokens: { readonly [key: string]: NestedStringValue },
+  overrides: { readonly [key: string]: NestedVarsValue },
+) => CompiledStyles;
+
+// unstable_conditional: identity function for type disambiguation.
+// Marks a conditional @media/@supports value so the type system can
+// distinguish it from namespace objects in nested token definitions.
+export type StyleX$Conditional = <
+  const T extends { default: unknown; [key: `@${string}`]: unknown },
+>(
+  value: T,
+) => T;

package/lib/es/types/StyleXTypes.js.flow

@@ -54,8 +54,9 @@ export type XStyle<+T = NestedCSSPropTypes> = StyleXArray<
   false | ?Readonly<{ ...T, $$css: true }>,
 >;
 
-export type XStyleWithout<+T: { +[_K in keyof NestedCSSPropTypes]?: unknown }> =
-  XStyle<Readonly<Omit<NestedCSSPropTypes, keyof T>>>;
+export type XStyleWithout<
+  +T extends { +[_K in keyof NestedCSSPropTypes]?: unknown },
+> = XStyle<Readonly<Omit<NestedCSSPropTypes, keyof T>>>;
 
 export type Keyframes = Readonly<{ [name: string]: CSSProperties, ... }>;
 
@@ -131,19 +132,19 @@ type ComplexStyleValueType<+T> =
           ? ComplexStyleValueType<A> | ComplexStyleValueType<B>
           : Readonly<T>;
 
-type _MapNamespace<+CSS: { +[string]: unknown }> = Readonly<{
+type _MapNamespace<+CSS extends { +[string]: unknown }> = Readonly<{
   [Key in keyof CSS]: StyleXClassNameFor<Key, ComplexStyleValueType<CSS[Key]>>,
 }>;
-export type MapNamespace<+CSS: { +[string]: unknown }> = Readonly<{
+export type MapNamespace<+CSS extends { +[string]: unknown }> = Readonly<{
   ..._MapNamespace<CSS>,
   $$css: true,
 }>;
-export type MapNamespaces<+S: { +[string]: unknown }> = Readonly<{
+export type MapNamespaces<+S extends { +[string]: unknown }> = Readonly<{
   [Key in keyof S]: S[Key] extends (...args: infer Args) => infer Obj
     ? (...args: Args) => Readonly<[MapNamespace<Obj>, InlineStyles]>
     : MapNamespace<S[Key]>,
 }>;
-export type StyleX$Create = <const S: { +[string]: { ... } }>(
+export type StyleX$Create = <const S extends { +[string]: { ... } }>(
   styles: S,
 ) => MapNamespaces<S>;
 
@@ -156,51 +157,53 @@ export type InlineStyles = Readonly<{
   [key: string]: string,
 }>;
 
-type _GenStylePropType<+CSS: { +[string]: unknown }> = Readonly<{
+type _GenStylePropType<+CSS extends { +[string]: unknown }> = Readonly<{
   [Key in keyof CSS]: CSS[Key] extends { +[string]: unknown }
     ? StyleXClassNameFor<Key, Readonly<CSS[Key]>>
     : StyleXClassNameFor<Key, CSS[Key]>,
 }>;
-type GenStylePropType<+CSS: { +[string]: unknown }> = Readonly<{
+type GenStylePropType<+CSS extends { +[string]: unknown }> = Readonly<{
   ..._GenStylePropType<CSS>,
   $$css: true,
 }>;
 
 // Replace `XStyle` with this.
 export type StaticStyles<
-  +CSS: { +[string]: unknown } = CSSPropertiesWithExtras,
+  +CSS extends { +[string]: unknown } = CSSPropertiesWithExtras,
 > = StyleXArray<false | ?GenStylePropType<Readonly<CSS>>>;
 
-export type StaticStylesWithout<+CSS: { +[string]: unknown }> = StaticStyles<
-  Omit<CSSPropertiesWithExtras, keyof CSS>,
->;
+export type StaticStylesWithout<+CSS extends { +[string]: unknown }> =
+  StaticStyles<Omit<CSSPropertiesWithExtras, keyof CSS>>;
 
 export type StyleXStyles<
-  +CSS: { +[string]: unknown } = CSSPropertiesWithExtras,
+  +CSS extends { +[string]: unknown } = CSSPropertiesWithExtras,
 > = StyleXArray<
   | ?false
   | GenStylePropType<Readonly<CSS>>
   | Readonly<[GenStylePropType<Readonly<CSS>>, InlineStyles]>,
 >;
 
-export type StyleXStylesWithout<+CSS: { +[string]: unknown }> = StyleXStyles<
-  Omit<CSSPropertiesWithExtras, keyof CSS>,
->;
+export type StyleXStylesWithout<+CSS extends { +[string]: unknown }> =
+  StyleXStyles<Omit<CSSPropertiesWithExtras, keyof CSS>>;
 
-export type VarGroup<+Tokens: { +[string]: unknown }, +_ID: string = string> = {
+export type VarGroup<
+  +Tokens extends { +[string]: unknown },
+  +_ID extends string = string,
+> = {
   +[Key in keyof Tokens]: StyleXVar<Tokens[Key]>,
 };
 
-export type TokensFromVarGroup<+T: VarGroup<{ +[string]: unknown }>> =
+export type TokensFromVarGroup<+T extends VarGroup<{ +[string]: unknown }>> =
   Readonly<{
     [Key in keyof T]: UnwrapVar<T[Key]>,
   }>;
 
-type IDFromVarGroup<+T: VarGroup<{ +[string]: unknown }>> =
+type IDFromVarGroup<+T extends VarGroup<{ +[string]: unknown }>> =
   T extends VarGroup<{ +[string]: unknown }, infer ID> ? ID : empty;
 
 type NestedVarObject<+T> =
   | T
+  | (() => T)
   | Readonly<{
       default: NestedVarObject<T>,
       [string]: NestedVarObject<T>,
@@ -208,13 +211,31 @@ type NestedVarObject<+T> =
 
 type TTokens = Readonly<{
   [string]:
-    | NestedVarObject<null | string | number>
-    | StyleXVar<null | string | number>
+    | NestedVarObject<
+        null | string | number | StyleXVar<null | string | number>,
+      >
     | CSSType<null | string | number>,
 }>;
 
-type UnwrapVar<+T> = T extends StyleXVar<infer U> ? U : T;
-export type FlattenTokens<+T: TTokens> = {
+export type NestedVarsValue =
+  | string
+  | CSSType<string | number>
+  | { +[string]: NestedVarsValue };
+
+export type NestedConstsValue =
+  | string
+  | number
+  | { +[string]: NestedConstsValue };
+
+export type NestedStringValue = string | { +[string]: NestedStringValue };
+
+type UnwrapVar<+T> = T extends () => infer U
+  ? UnwrapVar<U>
+  : T extends StyleXVar<infer U>
+    ? U
+    : T;
+
+export type FlattenTokens<+T extends TTokens> = {
   +[Key in keyof T]: T[Key] extends CSSType<string | number>
     ? UnwrapVar<T[Key]>
     : T[Key] extends { +default: infer X, +[string]: infer Y }
@@ -222,32 +243,35 @@ export type FlattenTokens<+T: TTokens> = {
       : UnwrapVar<T[Key]>,
 };
 
-export type StyleX$DefineVars = <DefaultTokens: TTokens, ID: string = string>(
+export type StyleX$DefineVars = <
+  DefaultTokens extends TTokens,
+  ID extends string = string,
+>(
   tokens: DefaultTokens,
 ) => VarGroup<FlattenTokens<DefaultTokens>, ID>;
 
 export type StyleX$DefineConsts = <
-  const DefaultTokens: { +[string]: number | string },
+  const DefaultTokens extends { +[string]: number | string },
 >(
   tokens: DefaultTokens,
 ) => DefaultTokens;
 
 // opaque type ThemeKey<+_VG: VarGroup<{ +[string]: unknown }>>: string = string;
 declare export opaque type Theme<
-  +T: VarGroup<{ +[string]: unknown }, string>,
-  +_Tag: string = string,
+  +T extends VarGroup<{ +[string]: unknown }, string>,
+  +_Tag extends string = string,
 >: Readonly<{
   $$css: true,
   theme: StyleXClassNameFor<'theme', IDFromVarGroup<T>>,
 }>;
 
-export type OverridesForTokenType<+Config: { +[string]: unknown }> = {
+export type OverridesForTokenType<+Config extends { +[string]: unknown }> = {
   [Key in keyof Config]?: NestedVarObject<Config[Key]>,
 };
 
 export type StyleX$CreateTheme = <
-  BaseTokens: VarGroup<{ +[string]: unknown }>,
-  ID: string = string,
+  BaseTokens extends VarGroup<{ +[string]: unknown }>,
+  ID extends string = string,
 >(
   baseTokens: BaseTokens,
   overrides: OverridesForTokenType<TokensFromVarGroup<BaseTokens>>,
@@ -279,3 +303,5 @@ export type StyleX$When = {
     _customMarker?: MapNamespace<{ +marker: 'custom-marker' }>,
   ) => ':where-any-sibling',
 };
+
+export type StyleX$Env = Readonly<{ [string]: unknown }>;

package/lib/es/types/VarTypes.js.flow

@@ -29,64 +29,70 @@ export type CSSSyntax =
 type CSSSyntaxType = CSSSyntax;
 type InnerValue = null | string | number;
 
-interface ICSSType<+_T: InnerValue> {
+interface ICSSType<+_T extends InnerValue> {
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
-declare export class Angle<+T: InnerValue> implements ICSSType<T> {
+declare export class Angle<+T extends InnerValue> implements ICSSType<T> {
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
-declare export class Color<+T: InnerValue> implements ICSSType<T> {
+declare export class Color<+T extends InnerValue> implements ICSSType<T> {
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
-declare export class Url<+T: InnerValue> implements ICSSType<T> {
+declare export class Url<+T extends InnerValue> implements ICSSType<T> {
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
-declare export class Image<+T: InnerValue> implements ICSSType<T> {
+declare export class Image<+T extends InnerValue> implements ICSSType<T> {
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
-declare export class Integer<+T: InnerValue> implements ICSSType<T> {
+declare export class Integer<+T extends InnerValue> implements ICSSType<T> {
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
-declare export class LengthPercentage<+T: InnerValue> implements ICSSType<T> {
+declare export class LengthPercentage<+T extends InnerValue>
+  implements ICSSType<T>
+{
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
-declare export class Length<+T: InnerValue> implements ICSSType<T> {
+declare export class Length<+T extends InnerValue> implements ICSSType<T> {
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
-declare export class Percentage<+T: InnerValue> implements ICSSType<T> {
+declare export class Percentage<+T extends InnerValue> implements ICSSType<T> {
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
-declare export class Num<+T: InnerValue> implements ICSSType<T> {
+declare export class Num<+T extends InnerValue> implements ICSSType<T> {
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
-declare export class Resolution<+T: InnerValue> implements ICSSType<T> {
+declare export class Resolution<+T extends InnerValue> implements ICSSType<T> {
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
-declare export class Time<+T: InnerValue> implements ICSSType<T> {
+declare export class Time<+T extends InnerValue> implements ICSSType<T> {
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
-declare export class TransformFunction<+T: InnerValue> implements ICSSType<T> {
+declare export class TransformFunction<+T extends InnerValue>
+  implements ICSSType<T>
+{
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
-declare export class TransformList<+T: InnerValue> implements ICSSType<T> {
+declare export class TransformList<+T extends InnerValue>
+  implements ICSSType<T>
+{
   +value: ValueWithDefault<string>;
   +syntax: CSSSyntaxType;
 }
 
-export type CSSType<+T: InnerValue> =
+export type CSSType<+T extends InnerValue> =
   | Angle<T>
   | Color<T>
   | Url<T>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stylexjs/stylex",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "description": "A library for defining styles for optimized user interfaces.",
   "main": "./lib/cjs/stylex.js",
   "module": "./lib/es/stylex.mjs",
@@ -60,9 +60,10 @@
     "babel-plugin-syntax-hermes-parser": "^0.32.1",
     "cross-env": "^10.1.0",
     "rollup": "^4.59.0",
-    "scripts": "0.18.1"
+    "scripts": "0.18.3"
   },
   "files": [
     "lib/*"
-  ]
+  ],
+  "sideEffects": false
 }