@csszyx/compiler 0.10.8 → 0.10.9

package/dist/index.cjs

@@ -390,6 +390,17 @@ function transformSourceCode(source, filename, options) {
                     transformed = true;
                     return;
                   }
+                  const hoistedNested = tryHoistNestedConditional(
+                    flatExpression,
+                    getBinding
+                  );
+                  if (hoistedNested !== null) {
+                    path.node.name.name = "className";
+                    path.node.value = createMergedClassNameValue(hoistedNested);
+                    collectFromExpr(hoistedNested, collectedClasses);
+                    transformed = true;
+                    return;
+                  }
                   const partial = evaluatePartialObject$1(flatExpression);
                   if (partial !== null && !partial.hasSpread && (partial.dynamicProps.size > 0 || partial.conditionalClasses.length > 0)) {
                     const staticClasses = [];
@@ -878,6 +889,101 @@ function tryStaticTransformNode(node, getBinding) {
   }
   return null;
 }
+function scanNestedConditionals(node) {
+  let topLevel = 0;
+  let nested = 0;
+  let test = null;
+  for (const prop of node.properties) {
+    if (!t__namespace.isObjectProperty(prop)) {
+      continue;
+    }
+    const value = prop.value;
+    if (t__namespace.isConditionalExpression(value)) {
+      topLevel++;
+    } else if (t__namespace.isObjectExpression(value)) {
+      nested += countAllConditionals(value);
+      test ??= firstConditionalTest(value);
+    }
+  }
+  return { topLevel, nested, test };
+}
+function countAllConditionals(node) {
+  let count = 0;
+  for (const prop of node.properties) {
+    if (!t__namespace.isObjectProperty(prop)) {
+      continue;
+    }
+    const value = prop.value;
+    if (t__namespace.isConditionalExpression(value)) {
+      count++;
+    } else if (t__namespace.isObjectExpression(value)) {
+      count += countAllConditionals(value);
+    }
+  }
+  return count;
+}
+function firstConditionalTest(node) {
+  for (const prop of node.properties) {
+    if (!t__namespace.isObjectProperty(prop)) {
+      continue;
+    }
+    const value = prop.value;
+    if (t__namespace.isConditionalExpression(value)) {
+      return value.test;
+    }
+    if (t__namespace.isObjectExpression(value)) {
+      const inner = firstConditionalTest(value);
+      if (inner) {
+        return inner;
+      }
+    }
+  }
+  return null;
+}
+function cloneObjectPickingBranch(node, pick) {
+  return t__namespace.objectExpression(
+    node.properties.map((prop) => {
+      if (!t__namespace.isObjectProperty(prop)) {
+        return t__namespace.cloneNode(prop);
+      }
+      const value = prop.value;
+      let nextValue = t__namespace.cloneNode(value);
+      if (t__namespace.isConditionalExpression(value)) {
+        nextValue = t__namespace.cloneNode(value[pick]);
+      } else if (t__namespace.isObjectExpression(value)) {
+        nextValue = cloneObjectPickingBranch(value, pick);
+      }
+      return t__namespace.objectProperty(
+        t__namespace.cloneNode(prop.key),
+        nextValue,
+        prop.computed,
+        prop.shorthand
+      );
+    })
+  );
+}
+function tryHoistNestedConditional(node, getBinding) {
+  const { topLevel, nested, test } = scanNestedConditionals(node);
+  if (topLevel !== 0 || nested !== 1 || test === null) {
+    return null;
+  }
+  const consequent = tryStaticTransformNode(
+    cloneObjectPickingBranch(node, "consequent"),
+    getBinding
+  );
+  const alternate = tryStaticTransformNode(
+    cloneObjectPickingBranch(node, "alternate"),
+    getBinding
+  );
+  if (!consequent || !alternate || !t__namespace.isStringLiteral(consequent) || !t__namespace.isStringLiteral(alternate)) {
+    return null;
+  }
+  return t__namespace.conditionalExpression(
+    test,
+    emptyClassToUndefined(consequent),
+    emptyClassToUndefined(alternate)
+  );
+}
 function tryHoistConditionalSpread(node, getBinding) {
   let conditionalSpreadIdx = -1;
   let conditionalExpr = null;
@@ -1536,6 +1642,10 @@ class CsszyxCompiler {
   }
 }
 
+function sortStrings(values) {
+  return [...values].sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
+}
+
 const CSS_VAR_REFERENCE_RE = /var\(\s*(--[\w-]+)/g;
 function scanGlobalVarUsages(source, filename = "file.tsx", options = {}) {
   if (!source.includes("--") && !source.includes("var(")) {
@@ -1745,7 +1855,7 @@ function extractVarReferences(value) {
   for (const match of value.matchAll(CSS_VAR_REFERENCE_RE)) {
     refs.add(match[1]);
   }
-  return [...refs].sort();
+  return sortStrings(refs);
 }
 function shouldReportToken(name, tokenFilter) {
   return tokenFilter === null || tokenFilter.has(name);
@@ -2019,7 +2129,7 @@ class ManifestBuilder {
    * @returns {string} SHA-256 checksum
    */
   computeChecksum(tokens) {
-    const sortedKeys = Object.keys(tokens).sort();
+    const sortedKeys = sortStrings(Object.keys(tokens));
     const sortedTokens = {};
     for (const key of sortedKeys) {
       sortedTokens[key] = tokens[key];
@@ -2645,6 +2755,29 @@ function transformOxc(source, filename, options) {
             transformed = true;
             return;
           }
+          const nestedConditionalClassExpr = buildNestedConditionalClassExpression(
+            expression,
+            effectiveFilename,
+            objectBindings,
+            source,
+            classes,
+            globalVarAliases,
+            cssVariableMap
+          );
+          if (nestedConditionalClassExpr) {
+            if (classNameAttr || szAttrs.length > 1) {
+              runtimeFallbackExpr = expression;
+              runtimeFallbackAttr = szAttr;
+              break;
+            }
+            edits.overwrite(
+              szAttr.start,
+              szAttr.end,
+              `className={${nestedConditionalClassExpr}}`
+            );
+            transformed = true;
+            return;
+          }
           const partial = buildPartialObjectTransform(
             expression,
             effectiveFilename,
@@ -2881,7 +3014,7 @@ function extractElementName(nameNode) {
   }
   return "<unknown>";
 }
-function astObjectToSzObject(node, filename, bindings) {
+function astObjectToSzObject(node, filename, bindings, branchPick) {
   const result = {};
   for (const propRaw of node.properties) {
     if (propRaw.type === "SpreadElement") {
@@ -2918,7 +3051,7 @@ function astObjectToSzObject(node, filename, bindings) {
         `unsupported key shape ${prop.key.type} at ${filename}:${prop.key.start}`
       );
     }
-    result[key] = astValueToSzValue(prop.value, filename, bindings);
+    result[key] = astValueToSzValue(prop.value, filename, bindings, branchPick);
   }
   return result;
 }
@@ -3350,6 +3483,80 @@ function resolveObjectExpression(node, bindings) {
   }
   return null;
 }
+function countOxcConditionals(node) {
+  let count = 0;
+  for (const propRaw of node.properties) {
+    if (propRaw.type !== "Property") {
+      continue;
+    }
+    const value = propRaw.value;
+    if (value.type === "ConditionalExpression") {
+      count++;
+    } else if (value.type === "ObjectExpression") {
+      count += countOxcConditionals(value);
+    }
+  }
+  return count;
+}
+function firstOxcConditional(node) {
+  for (const propRaw of node.properties) {
+    if (propRaw.type !== "Property") {
+      continue;
+    }
+    const value = propRaw.value;
+    if (value.type === "ConditionalExpression") {
+      return value;
+    }
+    if (value.type === "ObjectExpression") {
+      const found = firstOxcConditional(value);
+      if (found) {
+        return found;
+      }
+    }
+  }
+  return null;
+}
+function buildNestedConditionalClassExpression(node, filename, bindings, source, classes, globalVarAliases, cssVariableMap) {
+  let topLevel = 0;
+  for (const propRaw of node.properties) {
+    if (propRaw.type === "Property" && propRaw.value.type === "ConditionalExpression") {
+      topLevel++;
+    }
+  }
+  const first = firstOxcConditional(node);
+  if (topLevel !== 0 || countOxcConditionals(node) !== 1 || !first) {
+    return null;
+  }
+  const compileBranch = (pick) => {
+    try {
+      return transformCore.transform(
+        applyGlobalVarAliasesToSzObject(
+          astObjectToSzObject(node, filename, bindings, pick),
+          globalVarAliases,
+          cssVariableMap
+        )
+      ).className;
+    } catch (err) {
+      if (err instanceof OxcNotImplementedError) {
+        return null;
+      }
+      throw err;
+    }
+  };
+  const consequent = compileBranch("consequent");
+  const alternate = compileBranch("alternate");
+  if (consequent === null || alternate === null) {
+    return null;
+  }
+  for (const cls of `${consequent} ${alternate}`.split(/\s+/)) {
+    if (cls) {
+      classes.add(cls);
+    }
+  }
+  const testSource = source.slice(first.test.start, first.test.end);
+  const branch = (cls) => cls === "" ? "undefined" : JSON.stringify(cls);
+  return `${testSource} ? ${branch(consequent)} : ${branch(alternate)}`;
+}
 function buildConditionalSpreadClassExpression(node, filename, bindings, source, classes, globalVarAliases, cssVariableMap) {
   let conditionalSpread = null;
   const otherProps = [];
@@ -4134,7 +4341,15 @@ function extractKeyName(key) {
   }
   return null;
 }
-function astValueToSzValue(node, filename, bindings) {
+function astValueToSzValue(node, filename, bindings, branchPick) {
+  if (branchPick && node.type === "ConditionalExpression") {
+    return astValueToSzValue(
+      node[branchPick],
+      filename,
+      bindings,
+      branchPick
+    );
+  }
   if (node.type === "Literal") {
     const value = node.value;
     if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
@@ -4160,7 +4375,7 @@ function astValueToSzValue(node, filename, bindings) {
     );
   }
   if (node.type === "ObjectExpression") {
-    return astObjectToSzObject(node, filename, bindings);
+    return astObjectToSzObject(node, filename, bindings, branchPick);
   }
   if (node.type === "Identifier" || node.type === "MemberExpression") {
     throw new OxcNotImplementedError(
@@ -4431,6 +4646,7 @@ exports.mergeOptions = mergeOptions;
 exports.parseManifest = parseManifest;
 exports.scanGlobalVarUsages = scanGlobalVarUsages;
 exports.serializeManifest = serializeManifest;
+exports.sortStrings = sortStrings;
 exports.transformOxc = transformOxc;
 exports.transformRust = transformRust;
 exports.transformRustBatch = transformRustBatch;

package/dist/index.d.cts

@@ -581,6 +581,28 @@ declare const COLOR_PROPERTIES: Set<string>;
  */
 declare function getCSSVariableName(property: string, variantPrefix?: string): string;
 
+/**
+ * Deterministic, locale-independent ascending sort for string collections.
+ *
+ * A bare `Array.prototype.sort()` coerces elements to strings, so it silently
+ * mis-orders numbers (`[10, 9]` → `[10, 9]`). Every ordered collection in this
+ * codebase is a set of identifiers — class names, mangle tokens, filenames,
+ * variant names, CSS-variable references — so the correct sort is lexicographic
+ * AND locale-independent (a locale-aware `localeCompare` would make build output
+ * order depend on the runner's locale and break reproducibility).
+ *
+ * This helper encodes exactly that, and its `T extends string` bound makes the
+ * intent compiler-checked: passing a `number[]` (or a `(string | number)[]`) is a
+ * type error, so a future numeric sort cannot slip through as a bare `.sort()`.
+ * The `no-restricted-syntax` lint rule forbids bare `.sort()` to route every sort
+ * through here or an explicit comparator.
+ *
+ * @template T - the (string) element type.
+ * @param values - the strings to sort (any iterable; not mutated).
+ * @returns a new array sorted ascending by UTF-16 code unit.
+ */
+declare function sortStrings<T extends string>(values: Iterable<T>): T[];
+
 /**
  * Phase D production transform — `transformOxc()` is the oxc-parser +
  * magic-string replacement for `transformSourceCode()` (Babel). The
@@ -13639,5 +13661,5 @@ declare const DEFAULT_COMPILER_OPTIONS: Required<CompilerOptions>;
  */
 declare function mergeOptions(options?: Partial<CompilerOptions>): Required<CompilerOptions>;
 
-export { COLOR_PROPERTIES, CsszyxCompiler, DEFAULT_COMPILER_OPTIONS, ManifestBuilder, OxcNotImplementedError, OxcRustNotImplementedError, PROPERTY_CATEGORY_MAP, PropertyCategory, SzObject, VERSION, buildParentMap, createRecoveryToken, ensureRustTransformAvailable, generateRecoveryToken, getCSSVariableName, getPropertyCategory, hoistCSSVariables, injectRecoveryToken, isRustTransformAvailable, isValidRecoveryMode, mergeOptions, parseManifest, scanGlobalVarUsages, serializeManifest, transformOxc, transformRust, transformRustBatch, transformSourceCode, validateManifest, validateSzRecover };
+export { COLOR_PROPERTIES, CsszyxCompiler, DEFAULT_COMPILER_OPTIONS, ManifestBuilder, OxcNotImplementedError, OxcRustNotImplementedError, PROPERTY_CATEGORY_MAP, PropertyCategory, SzObject, VERSION, buildParentMap, createRecoveryToken, ensureRustTransformAvailable, generateRecoveryToken, getCSSVariableName, getPropertyCategory, hoistCSSVariables, injectRecoveryToken, isRustTransformAvailable, isValidRecoveryMode, mergeOptions, parseManifest, scanGlobalVarUsages, serializeManifest, sortStrings, transformOxc, transformRust, transformRustBatch, transformSourceCode, validateManifest, validateSzRecover };
 export type { BackgroundProps, BorderProps, BorderRadiusValue, CSSVarUsage, ColorName, ColorObjectValue, ColorPropValue, ColorShade, ColorValue, CompilerOptions, ContainerSize, CssVariableMangleValue, CustomTheme, EffectsProps, FilterProps, FlexboxGridProps, FractionValue, GlobalVarAliasTableInput, GlobalVarUsageDiagnostic, GlobalVarUsageKind, GlobalVarUsageLocation, InteractivityProps, LayoutProps, NegativeSpacingValue, RecoveryManifest, RecoveryMode, RecoveryToken, ScanGlobalVarUsagesOptions, ShadowValue, SizingProps, SourceTransformResult, SpacingProps, SpacingScale, SpacingValue, SvgProps, SzPropValue, SzProps, SzPropsBase, TableProps, TokenData, TokenMetadata, TransformOxcResult, TransformProps, TransformRustFile, TransformSourceCodeOptions, TransitionAnimationProps, TypographyProps, VariantModifiers };

package/dist/index.d.mts

@@ -581,6 +581,28 @@ declare const COLOR_PROPERTIES: Set<string>;
  */
 declare function getCSSVariableName(property: string, variantPrefix?: string): string;
 
+/**
+ * Deterministic, locale-independent ascending sort for string collections.
+ *
+ * A bare `Array.prototype.sort()` coerces elements to strings, so it silently
+ * mis-orders numbers (`[10, 9]` → `[10, 9]`). Every ordered collection in this
+ * codebase is a set of identifiers — class names, mangle tokens, filenames,
+ * variant names, CSS-variable references — so the correct sort is lexicographic
+ * AND locale-independent (a locale-aware `localeCompare` would make build output
+ * order depend on the runner's locale and break reproducibility).
+ *
+ * This helper encodes exactly that, and its `T extends string` bound makes the
+ * intent compiler-checked: passing a `number[]` (or a `(string | number)[]`) is a
+ * type error, so a future numeric sort cannot slip through as a bare `.sort()`.
+ * The `no-restricted-syntax` lint rule forbids bare `.sort()` to route every sort
+ * through here or an explicit comparator.
+ *
+ * @template T - the (string) element type.
+ * @param values - the strings to sort (any iterable; not mutated).
+ * @returns a new array sorted ascending by UTF-16 code unit.
+ */
+declare function sortStrings<T extends string>(values: Iterable<T>): T[];
+
 /**
  * Phase D production transform — `transformOxc()` is the oxc-parser +
  * magic-string replacement for `transformSourceCode()` (Babel). The
@@ -13639,5 +13661,5 @@ declare const DEFAULT_COMPILER_OPTIONS: Required<CompilerOptions>;
  */
 declare function mergeOptions(options?: Partial<CompilerOptions>): Required<CompilerOptions>;
 
-export { COLOR_PROPERTIES, CsszyxCompiler, DEFAULT_COMPILER_OPTIONS, ManifestBuilder, OxcNotImplementedError, OxcRustNotImplementedError, PROPERTY_CATEGORY_MAP, PropertyCategory, SzObject, VERSION, buildParentMap, createRecoveryToken, ensureRustTransformAvailable, generateRecoveryToken, getCSSVariableName, getPropertyCategory, hoistCSSVariables, injectRecoveryToken, isRustTransformAvailable, isValidRecoveryMode, mergeOptions, parseManifest, scanGlobalVarUsages, serializeManifest, transformOxc, transformRust, transformRustBatch, transformSourceCode, validateManifest, validateSzRecover };
+export { COLOR_PROPERTIES, CsszyxCompiler, DEFAULT_COMPILER_OPTIONS, ManifestBuilder, OxcNotImplementedError, OxcRustNotImplementedError, PROPERTY_CATEGORY_MAP, PropertyCategory, SzObject, VERSION, buildParentMap, createRecoveryToken, ensureRustTransformAvailable, generateRecoveryToken, getCSSVariableName, getPropertyCategory, hoistCSSVariables, injectRecoveryToken, isRustTransformAvailable, isValidRecoveryMode, mergeOptions, parseManifest, scanGlobalVarUsages, serializeManifest, sortStrings, transformOxc, transformRust, transformRustBatch, transformSourceCode, validateManifest, validateSzRecover };
 export type { BackgroundProps, BorderProps, BorderRadiusValue, CSSVarUsage, ColorName, ColorObjectValue, ColorPropValue, ColorShade, ColorValue, CompilerOptions, ContainerSize, CssVariableMangleValue, CustomTheme, EffectsProps, FilterProps, FlexboxGridProps, FractionValue, GlobalVarAliasTableInput, GlobalVarUsageDiagnostic, GlobalVarUsageKind, GlobalVarUsageLocation, InteractivityProps, LayoutProps, NegativeSpacingValue, RecoveryManifest, RecoveryMode, RecoveryToken, ScanGlobalVarUsagesOptions, ShadowValue, SizingProps, SourceTransformResult, SpacingProps, SpacingScale, SpacingValue, SvgProps, SzPropValue, SzProps, SzPropsBase, TableProps, TokenData, TokenMetadata, TransformOxcResult, TransformProps, TransformRustFile, TransformSourceCodeOptions, TransitionAnimationProps, TypographyProps, VariantModifiers };

package/dist/index.mjs

@@ -371,6 +371,17 @@ function transformSourceCode(source, filename, options) {
                     transformed = true;
                     return;
                   }
+                  const hoistedNested = tryHoistNestedConditional(
+                    flatExpression,
+                    getBinding
+                  );
+                  if (hoistedNested !== null) {
+                    path.node.name.name = "className";
+                    path.node.value = createMergedClassNameValue(hoistedNested);
+                    collectFromExpr(hoistedNested, collectedClasses);
+                    transformed = true;
+                    return;
+                  }
                   const partial = evaluatePartialObject$1(flatExpression);
                   if (partial !== null && !partial.hasSpread && (partial.dynamicProps.size > 0 || partial.conditionalClasses.length > 0)) {
                     const staticClasses = [];
@@ -859,6 +870,101 @@ function tryStaticTransformNode(node, getBinding) {
   }
   return null;
 }
+function scanNestedConditionals(node) {
+  let topLevel = 0;
+  let nested = 0;
+  let test = null;
+  for (const prop of node.properties) {
+    if (!t.isObjectProperty(prop)) {
+      continue;
+    }
+    const value = prop.value;
+    if (t.isConditionalExpression(value)) {
+      topLevel++;
+    } else if (t.isObjectExpression(value)) {
+      nested += countAllConditionals(value);
+      test ??= firstConditionalTest(value);
+    }
+  }
+  return { topLevel, nested, test };
+}
+function countAllConditionals(node) {
+  let count = 0;
+  for (const prop of node.properties) {
+    if (!t.isObjectProperty(prop)) {
+      continue;
+    }
+    const value = prop.value;
+    if (t.isConditionalExpression(value)) {
+      count++;
+    } else if (t.isObjectExpression(value)) {
+      count += countAllConditionals(value);
+    }
+  }
+  return count;
+}
+function firstConditionalTest(node) {
+  for (const prop of node.properties) {
+    if (!t.isObjectProperty(prop)) {
+      continue;
+    }
+    const value = prop.value;
+    if (t.isConditionalExpression(value)) {
+      return value.test;
+    }
+    if (t.isObjectExpression(value)) {
+      const inner = firstConditionalTest(value);
+      if (inner) {
+        return inner;
+      }
+    }
+  }
+  return null;
+}
+function cloneObjectPickingBranch(node, pick) {
+  return t.objectExpression(
+    node.properties.map((prop) => {
+      if (!t.isObjectProperty(prop)) {
+        return t.cloneNode(prop);
+      }
+      const value = prop.value;
+      let nextValue = t.cloneNode(value);
+      if (t.isConditionalExpression(value)) {
+        nextValue = t.cloneNode(value[pick]);
+      } else if (t.isObjectExpression(value)) {
+        nextValue = cloneObjectPickingBranch(value, pick);
+      }
+      return t.objectProperty(
+        t.cloneNode(prop.key),
+        nextValue,
+        prop.computed,
+        prop.shorthand
+      );
+    })
+  );
+}
+function tryHoistNestedConditional(node, getBinding) {
+  const { topLevel, nested, test } = scanNestedConditionals(node);
+  if (topLevel !== 0 || nested !== 1 || test === null) {
+    return null;
+  }
+  const consequent = tryStaticTransformNode(
+    cloneObjectPickingBranch(node, "consequent"),
+    getBinding
+  );
+  const alternate = tryStaticTransformNode(
+    cloneObjectPickingBranch(node, "alternate"),
+    getBinding
+  );
+  if (!consequent || !alternate || !t.isStringLiteral(consequent) || !t.isStringLiteral(alternate)) {
+    return null;
+  }
+  return t.conditionalExpression(
+    test,
+    emptyClassToUndefined(consequent),
+    emptyClassToUndefined(alternate)
+  );
+}
 function tryHoistConditionalSpread(node, getBinding) {
   let conditionalSpreadIdx = -1;
   let conditionalExpr = null;
@@ -1517,6 +1623,10 @@ class CsszyxCompiler {
   }
 }
 
+function sortStrings(values) {
+  return [...values].sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
+}
+
 const CSS_VAR_REFERENCE_RE = /var\(\s*(--[\w-]+)/g;
 function scanGlobalVarUsages(source, filename = "file.tsx", options = {}) {
   if (!source.includes("--") && !source.includes("var(")) {
@@ -1726,7 +1836,7 @@ function extractVarReferences(value) {
   for (const match of value.matchAll(CSS_VAR_REFERENCE_RE)) {
     refs.add(match[1]);
   }
-  return [...refs].sort();
+  return sortStrings(refs);
 }
 function shouldReportToken(name, tokenFilter) {
   return tokenFilter === null || tokenFilter.has(name);
@@ -2000,7 +2110,7 @@ class ManifestBuilder {
    * @returns {string} SHA-256 checksum
    */
   computeChecksum(tokens) {
-    const sortedKeys = Object.keys(tokens).sort();
+    const sortedKeys = sortStrings(Object.keys(tokens));
     const sortedTokens = {};
     for (const key of sortedKeys) {
       sortedTokens[key] = tokens[key];
@@ -2626,6 +2736,29 @@ function transformOxc(source, filename, options) {
             transformed = true;
             return;
           }
+          const nestedConditionalClassExpr = buildNestedConditionalClassExpression(
+            expression,
+            effectiveFilename,
+            objectBindings,
+            source,
+            classes,
+            globalVarAliases,
+            cssVariableMap
+          );
+          if (nestedConditionalClassExpr) {
+            if (classNameAttr || szAttrs.length > 1) {
+              runtimeFallbackExpr = expression;
+              runtimeFallbackAttr = szAttr;
+              break;
+            }
+            edits.overwrite(
+              szAttr.start,
+              szAttr.end,
+              `className={${nestedConditionalClassExpr}}`
+            );
+            transformed = true;
+            return;
+          }
           const partial = buildPartialObjectTransform(
             expression,
             effectiveFilename,
@@ -2862,7 +2995,7 @@ function extractElementName(nameNode) {
   }
   return "<unknown>";
 }
-function astObjectToSzObject(node, filename, bindings) {
+function astObjectToSzObject(node, filename, bindings, branchPick) {
   const result = {};
   for (const propRaw of node.properties) {
     if (propRaw.type === "SpreadElement") {
@@ -2899,7 +3032,7 @@ function astObjectToSzObject(node, filename, bindings) {
         `unsupported key shape ${prop.key.type} at ${filename}:${prop.key.start}`
       );
     }
-    result[key] = astValueToSzValue(prop.value, filename, bindings);
+    result[key] = astValueToSzValue(prop.value, filename, bindings, branchPick);
   }
   return result;
 }
@@ -3331,6 +3464,80 @@ function resolveObjectExpression(node, bindings) {
   }
   return null;
 }
+function countOxcConditionals(node) {
+  let count = 0;
+  for (const propRaw of node.properties) {
+    if (propRaw.type !== "Property") {
+      continue;
+    }
+    const value = propRaw.value;
+    if (value.type === "ConditionalExpression") {
+      count++;
+    } else if (value.type === "ObjectExpression") {
+      count += countOxcConditionals(value);
+    }
+  }
+  return count;
+}
+function firstOxcConditional(node) {
+  for (const propRaw of node.properties) {
+    if (propRaw.type !== "Property") {
+      continue;
+    }
+    const value = propRaw.value;
+    if (value.type === "ConditionalExpression") {
+      return value;
+    }
+    if (value.type === "ObjectExpression") {
+      const found = firstOxcConditional(value);
+      if (found) {
+        return found;
+      }
+    }
+  }
+  return null;
+}
+function buildNestedConditionalClassExpression(node, filename, bindings, source, classes, globalVarAliases, cssVariableMap) {
+  let topLevel = 0;
+  for (const propRaw of node.properties) {
+    if (propRaw.type === "Property" && propRaw.value.type === "ConditionalExpression") {
+      topLevel++;
+    }
+  }
+  const first = firstOxcConditional(node);
+  if (topLevel !== 0 || countOxcConditionals(node) !== 1 || !first) {
+    return null;
+  }
+  const compileBranch = (pick) => {
+    try {
+      return transform(
+        applyGlobalVarAliasesToSzObject(
+          astObjectToSzObject(node, filename, bindings, pick),
+          globalVarAliases,
+          cssVariableMap
+        )
+      ).className;
+    } catch (err) {
+      if (err instanceof OxcNotImplementedError) {
+        return null;
+      }
+      throw err;
+    }
+  };
+  const consequent = compileBranch("consequent");
+  const alternate = compileBranch("alternate");
+  if (consequent === null || alternate === null) {
+    return null;
+  }
+  for (const cls of `${consequent} ${alternate}`.split(/\s+/)) {
+    if (cls) {
+      classes.add(cls);
+    }
+  }
+  const testSource = source.slice(first.test.start, first.test.end);
+  const branch = (cls) => cls === "" ? "undefined" : JSON.stringify(cls);
+  return `${testSource} ? ${branch(consequent)} : ${branch(alternate)}`;
+}
 function buildConditionalSpreadClassExpression(node, filename, bindings, source, classes, globalVarAliases, cssVariableMap) {
   let conditionalSpread = null;
   const otherProps = [];
@@ -4115,7 +4322,15 @@ function extractKeyName(key) {
   }
   return null;
 }
-function astValueToSzValue(node, filename, bindings) {
+function astValueToSzValue(node, filename, bindings, branchPick) {
+  if (branchPick && node.type === "ConditionalExpression") {
+    return astValueToSzValue(
+      node[branchPick],
+      filename,
+      bindings,
+      branchPick
+    );
+  }
   if (node.type === "Literal") {
     const value = node.value;
     if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
@@ -4141,7 +4356,7 @@ function astValueToSzValue(node, filename, bindings) {
     );
   }
   if (node.type === "ObjectExpression") {
-    return astObjectToSzObject(node, filename, bindings);
+    return astObjectToSzObject(node, filename, bindings, branchPick);
   }
   if (node.type === "Identifier" || node.type === "MemberExpression") {
     throw new OxcNotImplementedError(
@@ -4380,4 +4595,4 @@ function mergeOptions(options = {}) {
   };
 }
 
-export { COLOR_PROPERTIES, CsszyxCompiler, DEFAULT_COMPILER_OPTIONS, KNOWN_VARIANTS, ManifestBuilder, OxcNotImplementedError, OxcRustNotImplementedError, PROPERTY_MAP, PropertyCategory, VERSION, buildParentMap, createRecoveryToken, ensureRustTransformAvailable, generateRecoveryToken, getCSSVariableName, getPropertyCategory, hoistCSSVariables, injectRecoveryToken, isRustTransformAvailable, isValidRecoveryMode, mergeOptions, parseManifest, scanGlobalVarUsages, serializeManifest, transform, transformOxc, transformRust, transformRustBatch, transformSourceCode, validateManifest, validateSzRecover };
+export { COLOR_PROPERTIES, CsszyxCompiler, DEFAULT_COMPILER_OPTIONS, KNOWN_VARIANTS, ManifestBuilder, OxcNotImplementedError, OxcRustNotImplementedError, PROPERTY_MAP, PropertyCategory, VERSION, buildParentMap, createRecoveryToken, ensureRustTransformAvailable, generateRecoveryToken, getCSSVariableName, getPropertyCategory, hoistCSSVariables, injectRecoveryToken, isRustTransformAvailable, isValidRecoveryMode, mergeOptions, parseManifest, scanGlobalVarUsages, serializeManifest, sortStrings, transform, transformOxc, transformRust, transformRustBatch, transformSourceCode, validateManifest, validateSzRecover };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@csszyx/compiler",
-  "version": "0.10.8",
+  "version": "0.10.9",
   "description": "Core compiler and transformation logic for csszyx",
   "keywords": [
     "csszyx",
@@ -65,7 +65,7 @@
     "@babel/types": "^7.23.6",
     "magic-string": "0.30.21",
     "oxc-parser": "0.131.0",
-    "@csszyx/core": "0.10.8"
+    "@csszyx/core": "0.10.9"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -74,7 +74,7 @@
     "csstype": "^3.0.0",
     "typescript": "^6.0.3",
     "unbuild": "^3.6.1",
-    "vitest": "^4.1.6"
+    "vitest": "^4.1.9"
   },
   "sideEffects": false,
   "engines": {