@stylexjs/babel-plugin 0.7.3 → 0.7.5

package/lib/index.js

@@ -2158,11 +2158,11 @@ longHandLogical.add('border-block-width');
 shorthandsOfLonghands.add('border-block-start');
 shorthandsOfLonghands.add('border-top');
 longHandLogical.add('border-block-start-color');
-longHandLogical.add('border-top-color');
+longHandPhysical.add('border-top-color');
 longHandLogical.add('border-block-start-style');
-longHandLogical.add('border-top-style');
+longHandPhysical.add('border-top-style');
 longHandLogical.add('border-block-start-width');
-longHandLogical.add('border-top-width');
+longHandPhysical.add('border-top-width');
 shorthandsOfLonghands.add('border-block-end');
 shorthandsOfLonghands.add('border-bottom');
 longHandLogical.add('border-block-end-color');
@@ -3494,11 +3494,25 @@ Object.defineProperty(stylexFirstThatWorks$1, "__esModule", {
   value: true
 });
 stylexFirstThatWorks$1.default = stylexFirstThatWorks;
+const isVar = arg => typeof arg === 'string' && arg.match(/^var\(--[a-zA-Z0-9-_]+\)$/);
 function stylexFirstThatWorks() {
   for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
     args[_key] = arguments[_key];
   }
-  return [...args].reverse();
+  const firstVar = args.findIndex(isVar);
+  if (firstVar === -1) {
+    return [...args].reverse();
+  }
+  const priorities = args.slice(0, firstVar).reverse();
+  const rest = args.slice(firstVar);
+  const firstNonVar = rest.findIndex(arg => !isVar(arg));
+  const varParts = rest.slice(0, firstNonVar === -1 ? rest.length : firstNonVar + 1).reverse();
+  const vars = varParts.map(arg => isVar(arg) ? arg.slice(4, -1) : arg);
+  const returnValue = [vars.reduce((soFar, varName) => soFar ? `var(${varName}, ${String(soFar)})` : varName.startsWith('--') ? `var(${varName})` : varName, ''), ...priorities];
+  if (returnValue.length === 1) {
+    return returnValue[0];
+  }
+  return returnValue;
 }
 
 var fileBasedIdentifier = {};
@@ -3660,10 +3674,13 @@ function evaluateImportedFile(filePath, namedExport, state) {
 }
 function evaluateThemeRef(fileName, exportName, state) {
   const resolveKey = key => {
+    if (key.startsWith('--')) {
+      return `var(${key})`;
+    }
     const strToHash = key === '__themeName__' ? utils_1.genFileBasedIdentifier({
       fileName,
       exportName
-    }) : key.startsWith('--') ? `var(${key})` : utils_1.genFileBasedIdentifier({
+    }) : utils_1.genFileBasedIdentifier({
       fileName,
       exportName,
       key
@@ -4059,6 +4076,9 @@ function _evaluate(path, state) {
       if ((isStringLiteral(object) || isNumericLiteral(object)) && isIdentifier(property)) {
         const val = object.node.value;
         func = val[property.node.name];
+        if (typeof val === 'string') {
+          context = object.node.value;
+        }
       }
       if (func == null) {
         const parsedObj = evaluate(object, state.traversalState, state.functions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stylexjs/babel-plugin",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "description": "StyleX babel plugin.",
   "main": "lib/index.js",
   "repository": "https://github.com/facebook/stylex",
@@ -14,8 +14,8 @@
   },
   "dependencies": {
     "@babel/helper-module-imports": "^7.22.15",
-    "@stylexjs/shared": "0.7.3",
-    "@stylexjs/stylex": "0.7.3",
+    "@stylexjs/shared": "0.7.5",
+    "@stylexjs/stylex": "0.7.5",
     "@babel/core": "^7.23.6",
     "@babel/traverse": "^7.23.6",
     "@babel/types": "^7.23.6"