react-native-unistyles 3.0.0-nightly-20250203 → 3.0.0-nightly-20250207

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-nightly-20250203",
+  "version": "3.0.0-nightly-20250207",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",
     "test:coverage": "jest --passWithNoTests --coverage",
     "tsc": "node_modules/typescript/bin/tsc --noEmit",
     "lint": "biome lint",
+    "check": "biome check --write",
+    "check:ci": "biome check",
     "prepare": "husky && bob build",
-    "precommit": "concurrently 'yarn tsc' 'yarn lint' 'yarn test'",
+    "precommit": "concurrently 'yarn tsc' 'yarn lint' 'yarn check' 'yarn test'",
     "release": "release-it"
   },
   "main": "lib/commonjs/index.js",

package/plugin/index.js

@@ -1,6 +1,6 @@
 const { addUnistylesImport, isInsideNodeModules } = require('./import')
 const { hasStringRef } = require('./ref')
-const { isUnistylesStyleSheet, analyzeDependencies, addStyleSheetTag, getUnistyles, isKindOfStyleSheet, maybeAddThemeDependencyToMemberExpression, addThemeDependencyToMemberExpression,  getStyleSheetLocalNames } = require('./stylesheet')
+const { isUnistylesStyleSheet, addStyleSheetTag, isKindOfStyleSheet, getStylesDependenciesFromFunction, addDependencies, getStylesDependenciesFromObject } = require('./stylesheet')
 const { extractVariants } = require('./variants')
 const { REACT_NATIVE_COMPONENT_NAMES, REPLACE_WITH_UNISTYLES_PATHS, REPLACE_WITH_UNISTYLES_EXOTIC_PATHS, NATIVE_COMPONENTS_PATHS } = require('./consts')
 const { handleExoticImport } = require('./exotic')
@@ -17,6 +17,7 @@ module.exports = function ({ types: t }) {
                         .some(path => state.filename.includes(path))
 
                     state.file.hasAnyUnistyle = false
+                    state.file.hasUnistylesImport = false
                     state.file.hasVariants = false
                     state.file.styleSheetLocalName = ''
                     state.file.tagNumber = 0
@@ -95,6 +96,8 @@ module.exports = function ({ types: t }) {
                 const importSource = path.node.source.value
 
                 if (importSource.includes('react-native-unistyles')) {
+                    state.file.hasUnistylesImport = true
+
                     path.node.specifiers.forEach(specifier => {
                         if (specifier.imported && specifier.imported.name === 'StyleSheet') {
                             state.file.styleSheetLocalName = specifier.local.name
@@ -149,43 +152,38 @@ module.exports = function ({ types: t }) {
 
                 const arg = path.node.arguments[0]
 
-                // Object passed to StyleSheet.create
+                // Object passed to StyleSheet.create (may contain variants)
                 if (t.isObjectExpression(arg)) {
-                    arg.properties.forEach(property => {
-                        if (t.isObjectProperty(property)) {
-                            const propertyValues = getUnistyles(t, property)
+                    const detectedDependencies = getStylesDependenciesFromObject(t, path)
 
-                            propertyValues.forEach(propertyValue => {
-                                analyzeDependencies(t, state, property.key.name, propertyValue, [], [])
+                    if (detectedDependencies) {
+                        if (t.isObjectExpression(arg)) {
+                            arg.properties.forEach(property => {
+                                if (detectedDependencies[property.key.name]) {
+                                    addDependencies(t, state, property.key.name, property, detectedDependencies[property.key.name])
+                                }
                             })
                         }
-                    })
+                    }
                 }
 
                 // Function passed to StyleSheet.create (e.g., theme => ({ container: {} }))
                 if (t.isArrowFunctionExpression(arg) || t.isFunctionExpression(arg)) {
-                    const localNames = getStyleSheetLocalNames(t, arg)
-                    const body = t.isBlockStatement(arg.body)
-                        ? arg.body.body.find(statement => t.isReturnStatement(statement)).argument
-                        : arg.body
-
-                    // Ensure the function body returns an object
-                    if (t.isObjectExpression(body)) {
-                        body.properties.forEach(property => {
-                            if (t.isObjectProperty(property)) {
-                                const propertyValues = getUnistyles(t, property)
-
-                                // special case for non object/function properties
-                                // maybe user used inlined theme? ({ container: theme.components.container })
-                                if (propertyValues.length === 0 && maybeAddThemeDependencyToMemberExpression(t, property, localNames.theme)) {
-                                    addThemeDependencyToMemberExpression(t, property)
+                    const detectedDependencies = getStylesDependenciesFromFunction(t, path)
+
+                    if (detectedDependencies) {
+                        const body = t.isBlockStatement(arg.body)
+                            ? arg.body.body.find(statement => t.isReturnStatement(statement)).argument
+                            : arg.body
+
+                        // Ensure the function body returns an object
+                        if (t.isObjectExpression(body)) {
+                            body.properties.forEach(property => {
+                                if (detectedDependencies[property.key.name]) {
+                                    addDependencies(t, state, property.key.name, property, detectedDependencies[property.key.name])
                                 }
-
-                                propertyValues.forEach(propertyValue => {
-                                    analyzeDependencies(t, state, property.key.name, propertyValue, localNames.theme, localNames.miniRuntime)
-                                })
-                            }
-                        })
+                            })
+                        }
                     }
                 }
             }