chore: allow and filter multiple expressions

Author: jpudysz

cxx/core/RNStyle.h

@@ -23,9 +23,10 @@ jsi::Function createAddVariantsProxyFunction(jsi::Runtime& rt, std::shared_ptr<S
 jsi::Object toRNStyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> stylesheet, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime, Variants&& variants) {
     jsi::Object rnStyle = jsi::Object(rt);
 
-    rnStyle.setProperty(rt, helpers::UNISTYLES_ID.c_str(), jsi::Value(stylesheet->tag));
+    helpers::defineHiddenProperty(rt, rnStyle, helpers::UNISTYLES_ID.c_str(), jsi::Value(stylesheet->tag));
+    helpers::defineHiddenProperty(rt, rnStyle, helpers::STYLE_VARIANTS.c_str(), helpers::variantsToValue(rt, variants));
+    
     rnStyle.setProperty(rt, helpers::ADD_VARIANTS_FN.c_str(), createAddVariantsProxyFunction(rt, stylesheet, unistylesRuntime));
-    rnStyle.setProperty(rt, helpers::STYLE_VARIANTS.c_str(), helpers::variantsToValue(rt, variants));
 
     for (auto& pair: stylesheet->unistyles) {
         auto [propertyName, unistyle] = pair;

plugin/variants.js

@@ -1,26 +1,30 @@
 function extractVariants(t, path, state) {
-    const maybeVariants = path.node.body.find(node => (
+    const maybeVariants = path.node.body.filter(node => (
         t.isExpressionStatement(node) &&
         t.isCallExpression(node.expression) &&
         t.isMemberExpression(node.expression.callee)
     ))
 
-    if (!maybeVariants) {
+    if (maybeVariants.length === 0) {
         return
     }
 
-    const calleeName = maybeVariants.expression.callee.object.name
-    const isVariant = (
-        t.isIdentifier(maybeVariants.expression.callee.object, { name: calleeName }) &&
-        t.isIdentifier(maybeVariants.expression.callee.property, { name: 'useVariants' }) &&
-        t.isObjectExpression(maybeVariants.expression.arguments[0])
-    )
+    const targetVariant = maybeVariants.find(variant => {
+        const calleeName = variant.expression.callee.object.name
+
+        return (
+            t.isIdentifier(variant.expression.callee.object, { name: calleeName }) &&
+            t.isIdentifier(variant.expression.callee.property, { name: 'useVariants' }) &&
+            t.isObjectExpression(variant.expression.arguments[0])
+        )
+    })
 
-    if (!isVariant) {
+    if (!targetVariant) {
         return
     }
 
-    const node = maybeVariants.expression
+    const calleeName = targetVariant.expression.callee.object.name
+    const node = targetVariant.expression
     const newUniqueName = path.scope.generateUidIdentifier(calleeName)
 
     // Create shadow declaration eg. const _styles = styles
@@ -39,7 +43,7 @@ function extractVariants(t, path, state) {
 
     // Find the current node's index, we will move everything after to new block
     const pathIndex = path.node.body
-        .findIndex(bodyPath => bodyPath === maybeVariants)
+        .findIndex(bodyPath => bodyPath === targetVariant)
     const rest = path.node.body.slice(pathIndex + 1)
 
     // move rest to new block (scope)