react-native-unistyles 3.0.0-beta.4 → 3.0.0-beta.6

package/nitrogen/generated/shared/c++/HybridUnistylesStyleSheetSpec.hpp

@@ -2,7 +2,7 @@
 /// HybridUnistylesStyleSheetSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2024 Marc Rousavy @ Margelo
+/// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/shared/c++/Insets.hpp

@@ -2,7 +2,7 @@
 /// Insets.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2024 Marc Rousavy @ Margelo
+/// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/shared/c++/Orientation.hpp

@@ -2,7 +2,7 @@
 /// Orientation.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2024 Marc Rousavy @ Margelo
+/// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/shared/c++/UnistyleDependency.hpp

@@ -2,7 +2,7 @@
 /// UnistyleDependency.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2024 Marc Rousavy @ Margelo
+/// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -59,7 +59,7 @@ namespace margelo::nitro {
       int enumValue = static_cast<int>(arg);
       return JSIConverter<int>::toJSI(runtime, enumValue);
     }
-    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+    static inline bool canConvert(jsi::Runtime&, const jsi::Value& value) {
       if (!value.isNumber()) {
         return false;
       }

package/nitrogen/generated/shared/c++/UnistylesCxxMiniRuntime.hpp

@@ -2,7 +2,7 @@
 /// UnistylesCxxMiniRuntime.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2024 Marc Rousavy @ Margelo
+/// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/nitrogen/generated/shared/c++/UnistylesNativeMiniRuntime.hpp

@@ -2,7 +2,7 @@
 /// UnistylesNativeMiniRuntime.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2024 Marc Rousavy @ Margelo
+/// Copyright © 2025 Marc Rousavy @ Margelo
 ///
 
 #pragma once

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.6",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",
@@ -11,15 +11,15 @@
     "precommit": "concurrently 'yarn tsc' 'yarn lint' 'yarn test'",
     "release": "release-it"
   },
-  "main": "lib/commonjs/index",
-  "module": "lib/module/index",
+  "main": "lib/commonjs/index.js",
+  "module": "lib/module/index.js",
   "types": "lib/typescript/src/index.d.ts",
   "source": "src/index",
   "exports": {
     ".": {
       "types": "./lib/typescript/src/index.d.ts",
-      "module": "./lib/module/index",
-      "default": "./lib/commonjs/index",
+      "module": "./lib/module/index.js",
+      "default": "./lib/commonjs/index.js",
       "react-native": "./src/index"
     },
     "./components/native/*": {
@@ -31,7 +31,13 @@
       "module": "./plugin/index.js",
       "default": "./plugin/index.js"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./server": {
+      "types": "./lib/typescript/src/server/index.d.ts",
+      "module": "./lib/module/server/index.js",
+      "default": "./lib/commonjs/server/index.js",
+      "react-native": "./src/server"
+    }
   },
   "files": [
     "src",
@@ -76,27 +82,29 @@
   },
   "devDependencies": {
     "@babel/plugin-syntax-jsx": "7.25.9",
+    "@babel/preset-flow": "7.25.9",
+    "@babel/preset-typescript": "7.26.0",
     "@biomejs/biome": "1.9.4",
     "@commitlint/config-conventional": "19.6.0",
-    "@react-native/normalize-colors": "0.76.3",
+    "@react-native/normalize-colors": "0.77.0",
     "@release-it/conventional-changelog": "8.0.2",
     "@types/jest": "29.5.14",
     "@types/react": "18.3.12",
     "babel-plugin-tester": "11.0.4",
-    "commitlint": "19.6.0",
-    "concurrently": "9.1.0",
+    "commitlint": "19.6.1",
+    "concurrently": "9.1.2",
     "husky": "9.1.7",
     "jest": "29.7.0",
     "metro-react-native-babel-preset": "0.77.0",
-    "nitro-codegen": "0.18.2",
+    "nitro-codegen": "0.21.0",
     "react": "18.3.1",
-    "react-native": "0.76.3",
+    "react-native": "0.77.0",
     "react-native-builder-bob": "0.33.1",
-    "react-native-nitro-modules": "0.18.2",
+    "react-native-nitro-modules": "0.21.0",
     "react-native-web": "0.19.13",
     "react-test-renderer": "18.3.1",
     "release-it": "17.6.0",
-    "typescript": "5.7.2"
+    "typescript": "5.7.3"
   },
   "peerDependencies": {
     "@react-native/normalize-colors": "*",
@@ -107,7 +115,8 @@
   },
   "workspaces": [
     "example",
-    "docs"
+    "docs",
+    "expo-example"
   ],
   "packageManager": "yarn@3.6.1",
   "engines": {

package/plugin/consts.js

@@ -0,0 +1,63 @@
+const REACT_NATIVE_COMPONENT_NAMES = [
+    'ActivityIndicator',
+    'View',
+    'Text',
+    'Image',
+    'ImageBackground',
+    'KeyboardAvoidingView',
+    'Pressable',
+    'ScrollView',
+    'FlatList',
+    'SectionList',
+    'Switch',
+    'TextInput',
+    'RefreshControl',
+    'TouchableHighlight',
+    'TouchableOpacity',
+    'VirtualizedList',
+    'Animated'
+    // Modal - there is no exposed native handle
+    // TouchableWithoutFeedback - can't accept a ref
+]
+
+// auto replace RN imports to Unistyles imports under these paths
+// our implementation simply borrows 'ref' to register it in ShadowRegistry
+// so we won't affect anyone's implementation
+const REPLACE_WITH_UNISTYLES_PATHS = [
+    'react-native-reanimated/src/component',
+    'react-native-gesture-handler/src/components'
+]
+
+// this is more powerful API as it allows to convert unmatched imports to Unistyles
+// { path: string, imports: Array<{ name: string, isDefault: boolean, path: string, mapTo: string }> }
+// path => node_modules path
+// imports:
+// name? <- target import name if isDefault is false
+// isDefault <- is the import default?
+// path <- path to the target import
+// mapTo <- name of the Unistyles component
+const REPLACE_WITH_UNISTYLES_EXOTIC_PATHS = []
+
+// this list will additionally detect React Native direct imports
+const NATIVE_COMPONENTS_PATHS = {
+    imports: [
+        {
+            name: 'NativeText',
+            isDefault: false,
+            path: 'react-native/Libraries/Text/TextNativeComponent',
+            mapTo: 'NativeText'
+        },
+        {
+            isDefault: true,
+            path: 'react-native/Libraries/Components/View/ViewNativeComponent',
+            mapTo: 'NativeView'
+        }
+    ]
+}
+
+module.exports = {
+    NATIVE_COMPONENTS_PATHS,
+    REACT_NATIVE_COMPONENT_NAMES,
+    REPLACE_WITH_UNISTYLES_PATHS,
+    REPLACE_WITH_UNISTYLES_EXOTIC_PATHS
+}

package/plugin/exotic.js

@@ -0,0 +1,54 @@
+function handleExoticImport(t, path, state, exoticImport) {
+    const specifiers = path.node.specifiers
+    const source = path.node.source
+
+    if (path.node.importKind !== 'value') {
+        return
+    }
+
+    specifiers.forEach(specifier => {
+        for (const rule of exoticImport.imports) {
+            const hasMatchingImportType = (!rule.isDefault && t.isImportSpecifier(specifier)) || (rule.isDefault && t.isImportDefaultSpecifier(specifier))
+            const hasMatchingImportName = rule.isDefault || (!rule.isDefault && rule.name === specifier.local.name)
+            const hasMatchingPath = rule.path === source.value
+
+            if (!hasMatchingImportType || !hasMatchingImportName || !hasMatchingPath) {
+                continue
+            }
+
+            if (t.isImportDefaultSpecifier(specifier)) {
+                const newImport = t.importDeclaration(
+                    [t.importDefaultSpecifier(t.identifier(specifier.local.name))],
+                    t.stringLiteral(state.opts.isLocal
+                        ? state.file.opts.filename.split('react-native-unistyles').at(0).concat(`react-native-unistyles/components/native/${rule.mapTo}`)
+                        : `react-native-unistyles/components/native/${rule.mapTo}`
+                    )
+                )
+
+                path.replaceWith(newImport)
+            } else {
+                const newImport = t.importDeclaration(
+                    [t.importSpecifier(t.identifier(rule.mapTo), t.identifier(rule.mapTo))],
+                    t.stringLiteral(state.opts.isLocal
+                        ? state.file.opts.filename.split('react-native-unistyles').at(0).concat(`react-native-unistyles/components/native/${rule.mapTo}`)
+                        : `react-native-unistyles/components/native/${rule.mapTo}`
+                    )
+                )
+
+                path.node.specifiers = specifiers.filter(s => s !== specifier)
+
+                if (path.node.specifiers.length === 0) {
+                    path.replaceWith(newImport)
+                } else {
+                    path.insertBefore(newImport)
+                }
+            }
+
+            return
+        }
+    })
+}
+
+module.exports = {
+    handleExoticImport
+}

package/plugin/import.js

@@ -1,3 +1,4 @@
+/** @param {import('./index').UnistylesPluginPass} state */
 function addUnistylesImport(t, path, state) {
     const localNames = Object.keys(state.reactNativeImports)
     const names = Object.values(state.reactNativeImports)
@@ -38,27 +39,6 @@ function addUnistylesImport(t, path, state) {
         path.node.body.unshift(newImport)
     })
 
-    // import variants
-    if (state.file.hasVariants) {
-        const unistylesImport = path.node.body
-            .find(node => t.isImportDeclaration(node) && node.source.value === 'react-native-unistyles')
-
-        if (unistylesImport) {
-            // prevent duplications
-            if (!unistylesImport.specifiers.some(specifier => specifier.local.name === 'Variants')) {
-                unistylesImport.specifiers.push(t.importSpecifier(t.identifier('Variants'), t.identifier('Variants')))
-            }
-        } else {
-            // Add a new import declaration for "Variants" from "react-native-unistyles"
-            const newImport = t.importDeclaration(
-                [t.importSpecifier(t.identifier('Variants'), t.identifier('Variants'))],
-                t.stringLiteral('react-native-unistyles')
-            )
-
-            path.node.body.unshift(newImport)
-        }
-    }
-
     // cleanup
     nodesToRemove.forEach(node => path.node.body.splice(path.node.body.indexOf(node), 1))
 }

package/plugin/index.d.ts

@@ -0,0 +1,89 @@
+type RemapImport = {
+    name?: string,
+    isDefault: boolean,
+    path: string,
+    mapTo: string
+}
+
+type RemapConfig = {
+    path: string,
+    imports: Array<RemapImport>
+}
+
+export interface UnistylesPluginOptions {
+    /**
+     * Example: "src" or "apps/mobile"
+     * Add this option if some of your components don't have `react-native-unistyles` import.
+     * Babel plugin will automatically process all files under this root.
+     */
+    autoProcessRoot?: string,
+
+    /**
+    * Example: ['@codemask/styles']
+    * Enable this option if you want to process only files containing specific imports.
+    */
+    autoProcessImports?: Array<string>,
+
+    /**
+     * Example: [{
+     *     path: "node_modules/custom-library/components",
+     *     imports: [
+     *         {
+     *             name: "NativeText",
+     *             isDefault: false,
+     *             path: "react-native/Libraries/Text/TextNativeComponent",
+     *             mapTo: "NativeText"
+     *         },
+     *         {
+     *             isDefault: true,
+     *             path: "react-native/Libraries/Components/View/ViewNativeComponent",
+     *             mapTo: "NativeView"
+     *         }
+     *     ]
+     * }]
+     *
+     * Will map:
+     *      import { NativeText } from "react-native/Libraries/Text/TextNativeComponent"
+     *      to Unistyles "NativeText"
+     *
+     *      import View from "react-native/Libraries/Components/View/ViewNativeComponent"
+     *      to Unistyles "NativeView"
+     *
+     * This is the most powerful way of remapping imports. If 3rd party library uses imports different from `react-native` we can remap them to `react-native-unistyles` factories.
+     * Internally we do that for raw RCTView and RCTText components.
+     *
+     * path -> must be within node_modules folder
+     * imports.name is Optional if library used export default
+     * imports.mapTo - name of the component from react-native-unistyles/src/components/native
+     */
+    autoRemapImports?: Array<RemapConfig>,
+
+    /**
+    * Example: ['external-library/components']
+    * Enable this option to process some 3rd party components under `node_modules`.
+    * Under these paths we will replace `react-native` imports with `react-native-unistyles` factories that will borrow components refs [read more](https://www.unistyl.es/v3/other/babel-plugin#3-component-factory-borrowing-ref).
+    *
+    * Defaults to:
+    *
+    * ```ts
+    * ['react-native-reanimated/src/component', 'react-native-gesture-handler/src/components']
+    * ```
+    */
+    autoProcessPaths?: Array<string>,
+
+    /**
+    * In order to list detected dependencies by the Babel plugin you can enable the `debug` flag.
+    * It will `console.log` name of the file and component with Unistyles dependencies.
+    */
+    debug?: boolean,
+
+    /**
+    * Only applicable for Unistyles monorepo for
+    * path resolution, don't use it!
+    */
+    isLocal?: boolean
+}
+
+export interface UnistylesPluginPass {
+    opts: UnistylesPluginOptions
+}

package/plugin/index.js

@@ -1,57 +1,45 @@
 const { addUnistylesImport, isInsideNodeModules } = require('./import')
-const { getStyleMetadata, getStyleAttribute, styleAttributeToArray, handlePressable } = require('./style')
 const { hasStringRef } = require('./ref')
-const { isUnistylesStyleSheet, analyzeDependencies, addStyleSheetTag, getUnistyles } = require('./stylesheet')
-const { isUsingVariants, extractVariants, addJSXVariants } = require('./variants')
-
-const reactNativeComponentNames = [
-    'ActivityIndicator',
-    'View',
-    'Text',
-    'Image',
-    'ImageBackground',
-    'KeyboardAvoidingView',
-    'Pressable',
-    'ScrollView',
-    'FlatList',
-    'SectionList',
-    'Switch',
-    'TextInput',
-    'RefreshControl',
-    'TouchableHighlight',
-    'TouchableOpacity',
-    'VirtualizedList'
-]
-
-// Modal - there is no exposed native handle
-// TouchableWithoutFeedback - can't accept a ref
+const { isUnistylesStyleSheet, analyzeDependencies, addStyleSheetTag, getUnistyles, isKindOfStyleSheet, addThemeDependencyToMemberExpression } = 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')
 
 module.exports = function ({ types: t }) {
     return {
         name: 'babel-react-native-unistyles',
         visitor: {
             Program: {
+                /** @param {import('./index').UnistylesPluginPass} state */
                 enter(path, state) {
-                    if (isInsideNodeModules(state)) {
-                        return
-                    }
+                    state.file.replaceWithUnistyles = REPLACE_WITH_UNISTYLES_PATHS
+                        .concat(state.opts.autoProcessPaths ?? [])
+                        .some(path => state.filename.includes(path))
 
                     state.file.hasAnyUnistyle = false
-                    state.file.hasUnistylesImport = false
-                    state.file.shouldIncludePressable = false
                     state.file.hasVariants = false
                     state.file.styleSheetLocalName = ''
                     state.file.tagNumber = 0
-                    state.file.isClassComponent = false
                     state.reactNativeImports = {}
+                    state.file.forceProcessing = state.opts.autoProcessRoot
+                        ? state.filename.includes(`${state.file.opts.root}/${state.opts.autoProcessRoot}/`)
+                        : false
                 },
                 exit(path, state) {
-                    if (state.file.hasAnyUnistyle || state.file.hasVariants) {
+                    if (isInsideNodeModules(state) && !state.file.replaceWithUnistyles) {
+                        return
+                    }
+
+                    if (state.file.hasAnyUnistyle || state.file.hasVariants || state.file.replaceWithUnistyles || state.file.forceProcessing) {
                         addUnistylesImport(t, path, state)
                     }
                 }
             },
             FunctionDeclaration(path, state) {
+                if (isInsideNodeModules(state)) {
+                    return
+                }
+
                 const componentName = path.node.id
                     ? path.node.id.name
                     : null
@@ -61,13 +49,16 @@ module.exports = function ({ types: t }) {
                 }
             },
             ClassDeclaration(path, state) {
+                if (isInsideNodeModules(state)) {
+                    return
+                }
+
                 const componentName = path.node.id
                     ? path.node.id.name
                     : null
 
                 if (componentName) {
                     state.file.hasVariants = false
-                    state.file.isClassComponent = true
                 }
             },
             VariableDeclaration(path, state) {
@@ -87,16 +78,23 @@ module.exports = function ({ types: t }) {
                     }
                 })
             },
+            /** @param {import('./index').UnistylesPluginPass} state */
             ImportDeclaration(path, state) {
-                if (isInsideNodeModules(state)) {
+                const exoticImport = REPLACE_WITH_UNISTYLES_EXOTIC_PATHS
+                    .concat(state.opts.autoRemapImports ?? [])
+                    .find(exotic => state.filename.includes(exotic.path))
+
+                if (exoticImport) {
+                    return handleExoticImport(t, path, state, exoticImport)
+                }
+
+                if (isInsideNodeModules(state) && !state.file.replaceWithUnistyles) {
                     return
                 }
 
                 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
@@ -104,20 +102,20 @@ module.exports = function ({ types: t }) {
                     })
                 }
 
-                if (importSource.includes('react-native')) {
+                if (importSource === 'react-native') {
                     path.node.specifiers.forEach(specifier => {
-                        if (specifier.imported && specifier.imported.name === 'Pressable' && specifier.local.name !== 'NativePressableReactNative') {
-                            state.file.shouldIncludePressable = true
-                        }
-
-                        if (specifier.imported && reactNativeComponentNames.includes(specifier.imported.name)) {
+                        if (specifier.imported && REACT_NATIVE_COMPONENT_NAMES.includes(specifier.imported.name)) {
                             state.reactNativeImports[specifier.local.name] = specifier.imported.name
                         }
                     })
                 }
 
-                if (importSource.includes('react-native-web/dist/exports/Pressable')) {
-                    state.file.shouldIncludePressable = true
+                if (importSource.includes('react-native/Libraries')) {
+                    handleExoticImport(t, path, state, NATIVE_COMPONENTS_PATHS)
+                }
+
+                if (!state.file.forceProcessing && Array.isArray(state.opts.autoProcessImports)) {
+                    state.file.forceProcessing = state.opts.autoProcessImports.includes(importSource)
                 }
             },
             JSXElement(path, state) {
@@ -125,63 +123,28 @@ module.exports = function ({ types: t }) {
                     return
                 }
 
-                if (state.file.isClassComponent) {
-                    return
-                }
-
-                const openingElement = path.node.openingElement
-                const openingElementName = openingElement.name.name
-                const isReactNativeComponent = Boolean(state.reactNativeImports[openingElementName])
-                const isAnimatedComponent = (
-                    !isReactNativeComponent &&
-                    openingElement.name.object &&
-                    openingElement.name.object.name === 'Animated'
-                )
-
-                if (!isReactNativeComponent && !isAnimatedComponent) {
-                    return
-                }
-
-                const styleAttr = getStyleAttribute(t, path)
-
-                // component has no style prop
-                if (!styleAttr) {
-                    return
-                }
-
-                const metadata = getStyleMetadata(t, styleAttr.value.expression, null, state)
-
-                if (openingElementName === 'Pressable') {
-                    return handlePressable(t, path, styleAttr, metadata, state)
-                }
-
-                // style prop is using unexpected expression
-                if (metadata.length === 0) {
-                    return
-                }
-
-                styleAttributeToArray(t, path)
-
-                // to add import
-                state.file.hasAnyUnistyle = true
-
                 if (hasStringRef(t, path)) {
                     throw new Error("Detected string based ref which is not supported by Unistyles.")
                 }
             },
-            CallExpression(path, state) {
+            BlockStatement(path, state) {
                 if (isInsideNodeModules(state)) {
                     return
                 }
 
-                if (isUsingVariants(t, path)) {
-                    extractVariants(t, path, state)
+                extractVariants(t, path, state)
+            },
+            CallExpression(path, state) {
+                if (isInsideNodeModules(state)) {
+                    return
                 }
 
-                if (!isUnistylesStyleSheet(t, path, state)) {
+                if (!isUnistylesStyleSheet(t, path, state) && !isKindOfStyleSheet(t, path, state)) {
                     return
                 }
 
+                state.file.hasAnyUnistyle = true
+
                 addStyleSheetTag(t, path, state)
 
                 const arg = path.node.arguments[0]
@@ -220,6 +183,13 @@ module.exports = function ({ types: t }) {
                             if (t.isObjectProperty(property)) {
                                 const propertyValues = getUnistyles(t, property)
 
+                                // maybe user used inlined theme? ({ container: theme.components.container })
+                                if (propertyValues.length === 0 && t.isMemberExpression(property.value)) {
+                                    if (property.value.object.object.name === themeLocalName) {
+                                        addThemeDependencyToMemberExpression(t, property)
+                                    }
+                                }
+
                                 propertyValues.forEach(propertyValue => {
                                     analyzeDependencies(t, state, property.key.name, propertyValue, themeLocalName, miniRuntimeLocalName)
                                 })
@@ -227,14 +197,6 @@ module.exports = function ({ types: t }) {
                         })
                     }
                 }
-            },
-            ReturnStatement(path, state) {
-                // ignore nested returns in JSX elements
-                const hasJSXParent = path.findParent(p => p.isJSXElement())
-
-                if (!hasJSXParent && state.file.hasVariants) {
-                    addJSXVariants(t, path, state)
-                }
             }
         }
     }