Merge pull request #387 from jpudysz/feature/arrays

feat: correctly detect dependencies in arrays

Author: jpudysz

plugin/__tests__/dependencies.spec.js

@@ -701,5 +701,62 @@ pluginTester({
                 )
             `
         },
+        {
+            title: 'Should correctly detect dependency in square brackets',
+            code: `
+                import { View, Text } from 'react-native'
+                import { StyleSheet } from 'react-native-unistyles'
+
+                export const Example = () => {
+                    return (
+                        <View style={styles.container}>
+                            <Text>Hello world</Text>
+                        </View>
+                    )
+                }
+
+                const styles = StyleSheet.create((theme, rt) => ({
+                    container: {
+                        backgroundColor: theme.palette.purple[500]
+                    },
+                    container2: {
+                        paddingBottom: theme.spacing[rt.breakpoint]
+                    }
+                }))
+            `,
+            output: `
+                import { UnistylesShadowRegistry } from 'react-native-unistyles'
+                import { View, Text } from 'react-native'
+                import { StyleSheet } from 'react-native-unistyles'
+
+                export const Example = () => {
+                    return (
+                        <View
+                            style={[styles.container]}
+                            ref={ref => {
+                                UnistylesShadowRegistry.add(ref, [styles.container], undefined, [[]])
+                                return () => UnistylesShadowRegistry.remove(ref)
+                            }}
+                        >
+                            <Text>Hello world</Text>
+                        </View>
+                    )
+                }
+
+                const styles = StyleSheet.create(
+                    (theme, rt) => ({
+                        container: {
+                            backgroundColor: theme.palette.purple[500],
+                            uni__dependencies: [0]
+                        },
+                        container2: {
+                            paddingBottom: theme.spacing[rt.breakpoint],
+                            uni__dependencies: [0, 3]
+                        }
+                    }),
+                    664955283
+                )
+            `
+        },
     ]
 })

plugin/common.js

@@ -1,7 +1,10 @@
 function getIdentifierNameFromExpression(t, memberExpression) {
     if (t.isMemberExpression(memberExpression)) {
         if (memberExpression.computed) {
-            return getIdentifierNameFromExpression(t, memberExpression.property).flat()
+            return [
+                getIdentifierNameFromExpression(t, memberExpression.property),
+                getIdentifierNameFromExpression(t, memberExpression.object)
+            ].flat()
         }
 
         const object = memberExpression.object
@@ -15,11 +18,6 @@ function getIdentifierNameFromExpression(t, memberExpression) {
         if (t.isMemberExpression(object)) {
             return getIdentifierNameFromExpression(t, object).flat()
         }
-
-        // If the object is a computed property, it may also be an Identifier
-        if (t.isMemberExpression(object) && t.isIdentifier(object.property)) {
-            return [object.object.name]
-        }
     }
 
     if (t.isBinaryExpression(memberExpression)) {