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

package/nitrogen/generated/ios/c++/HybridNativePlatformSpecSwift.hpp

@@ -58,7 +58,9 @@ namespace margelo::nitro::unistyles {
 
   public:
     // Get the Swift part
-    inline Unistyles::HybridNativePlatformSpec_cxx getSwiftPart() noexcept { return _swiftPart; }
+    inline Unistyles::HybridNativePlatformSpec_cxx& getSwiftPart() noexcept {
+      return _swiftPart;
+    }
 
   public:
     // Get memory pressure

package/nitrogen/generated/ios/swift/HybridNativePlatformSpec.swift

@@ -9,7 +9,7 @@ import Foundation
 import NitroModules
 
 /// See ``HybridNativePlatformSpec``
-public protocol HybridNativePlatformSpec_protocol: AnyObject {
+public protocol HybridNativePlatformSpec_protocol: HybridObject {
   // Properties
   
 
@@ -35,7 +35,7 @@ public protocol HybridNativePlatformSpec_protocol: AnyObject {
 }
 
 /// See ``HybridNativePlatformSpec``
-public class HybridNativePlatformSpec_base: HybridObjectSpec {
+public class HybridNativePlatformSpec_base {
   private weak var cxxWrapper: HybridNativePlatformSpec_cxx? = nil
   public func getCxxWrapper() -> HybridNativePlatformSpec_cxx {
   #if DEBUG
@@ -51,7 +51,6 @@ public class HybridNativePlatformSpec_base: HybridObjectSpec {
       return cxxWrapper
     }
   }
-  public var memorySize: Int { return 0 }
 }
 
 /**

package/nitrogen/generated/ios/swift/HybridNativePlatformSpec_cxx.swift

@@ -101,7 +101,7 @@ public class HybridNativePlatformSpec_cxx {
 
   // Methods
   @inline(__always)
-  public func getInsets() -> bridge.Result_Insets_ {
+  public final func getInsets() -> bridge.Result_Insets_ {
     do {
       let __result = try self.__implementation.getInsets()
       let __resultCpp = __result
@@ -113,7 +113,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getColorScheme() -> bridge.Result_ColorScheme_ {
+  public final func getColorScheme() -> bridge.Result_ColorScheme_ {
     do {
       let __result = try self.__implementation.getColorScheme()
       let __resultCpp = __result
@@ -125,7 +125,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getFontScale() -> bridge.Result_double_ {
+  public final func getFontScale() -> bridge.Result_double_ {
     do {
       let __result = try self.__implementation.getFontScale()
       let __resultCpp = __result
@@ -137,7 +137,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getPixelRatio() -> bridge.Result_double_ {
+  public final func getPixelRatio() -> bridge.Result_double_ {
     do {
       let __result = try self.__implementation.getPixelRatio()
       let __resultCpp = __result
@@ -149,7 +149,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getOrientation() -> bridge.Result_Orientation_ {
+  public final func getOrientation() -> bridge.Result_Orientation_ {
     do {
       let __result = try self.__implementation.getOrientation()
       let __resultCpp = __result
@@ -161,7 +161,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getContentSizeCategory() -> bridge.Result_std__string_ {
+  public final func getContentSizeCategory() -> bridge.Result_std__string_ {
     do {
       let __result = try self.__implementation.getContentSizeCategory()
       let __resultCpp = std.string(__result)
@@ -173,7 +173,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getScreenDimensions() -> bridge.Result_Dimensions_ {
+  public final func getScreenDimensions() -> bridge.Result_Dimensions_ {
     do {
       let __result = try self.__implementation.getScreenDimensions()
       let __resultCpp = __result
@@ -185,7 +185,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getStatusBarDimensions() -> bridge.Result_Dimensions_ {
+  public final func getStatusBarDimensions() -> bridge.Result_Dimensions_ {
     do {
       let __result = try self.__implementation.getStatusBarDimensions()
       let __resultCpp = __result
@@ -197,7 +197,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getNavigationBarDimensions() -> bridge.Result_Dimensions_ {
+  public final func getNavigationBarDimensions() -> bridge.Result_Dimensions_ {
     do {
       let __result = try self.__implementation.getNavigationBarDimensions()
       let __resultCpp = __result
@@ -209,7 +209,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getPrefersRtlDirection() -> bridge.Result_bool_ {
+  public final func getPrefersRtlDirection() -> bridge.Result_bool_ {
     do {
       let __result = try self.__implementation.getPrefersRtlDirection()
       let __resultCpp = __result
@@ -221,7 +221,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func setRootViewBackgroundColor(color: Double) -> bridge.Result_void_ {
+  public final func setRootViewBackgroundColor(color: Double) -> bridge.Result_void_ {
     do {
       try self.__implementation.setRootViewBackgroundColor(color: color)
       return bridge.create_Result_void_()
@@ -232,7 +232,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func setNavigationBarHidden(isHidden: Bool) -> bridge.Result_void_ {
+  public final func setNavigationBarHidden(isHidden: Bool) -> bridge.Result_void_ {
     do {
       try self.__implementation.setNavigationBarHidden(isHidden: isHidden)
       return bridge.create_Result_void_()
@@ -243,7 +243,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func setStatusBarHidden(isHidden: Bool) -> bridge.Result_void_ {
+  public final func setStatusBarHidden(isHidden: Bool) -> bridge.Result_void_ {
     do {
       try self.__implementation.setStatusBarHidden(isHidden: isHidden)
       return bridge.create_Result_void_()
@@ -254,7 +254,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func setImmersiveMode(isEnabled: Bool) -> bridge.Result_void_ {
+  public final func setImmersiveMode(isEnabled: Bool) -> bridge.Result_void_ {
     do {
       try self.__implementation.setImmersiveMode(isEnabled: isEnabled)
       return bridge.create_Result_void_()
@@ -265,7 +265,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func getMiniRuntime() -> bridge.Result_UnistylesNativeMiniRuntime_ {
+  public final func getMiniRuntime() -> bridge.Result_UnistylesNativeMiniRuntime_ {
     do {
       let __result = try self.__implementation.getMiniRuntime()
       let __resultCpp = __result
@@ -277,7 +277,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func registerPlatformListener(callback: bridge.Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime) -> bridge.Result_void_ {
+  public final func registerPlatformListener(callback: bridge.Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime) -> bridge.Result_void_ {
     do {
       try self.__implementation.registerPlatformListener(callback: { () -> ([UnistyleDependency], UnistylesNativeMiniRuntime) -> Void in
         let __wrappedFunction = bridge.wrap_Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime(callback)
@@ -299,7 +299,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func registerImeListener(callback: bridge.Func_void_UnistylesNativeMiniRuntime) -> bridge.Result_void_ {
+  public final func registerImeListener(callback: bridge.Func_void_UnistylesNativeMiniRuntime) -> bridge.Result_void_ {
     do {
       try self.__implementation.registerImeListener(callback: { () -> (UnistylesNativeMiniRuntime) -> Void in
         let __wrappedFunction = bridge.wrap_Func_void_UnistylesNativeMiniRuntime(callback)
@@ -315,7 +315,7 @@ public class HybridNativePlatformSpec_cxx {
   }
   
   @inline(__always)
-  public func unregisterPlatformListeners() -> bridge.Result_void_ {
+  public final func unregisterPlatformListeners() -> bridge.Result_void_ {
     do {
       try self.__implementation.unregisterPlatformListeners()
       return bridge.create_Result_void_()

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

@@ -42,7 +42,7 @@ namespace margelo::nitro {
 
   // C++ ColorScheme <> JS ColorScheme (union)
   template <>
-  struct JSIConverter<ColorScheme> {
+  struct JSIConverter<ColorScheme> final {
     static inline ColorScheme fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       std::string unionValue = JSIConverter<std::string>::fromJSI(runtime, arg);
       switch (hashString(unionValue.c_str(), unionValue.size())) {

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

@@ -44,7 +44,7 @@ namespace margelo::nitro {
 
   // C++ Dimensions <> JS Dimensions (object)
   template <>
-  struct JSIConverter<Dimensions> {
+  struct JSIConverter<Dimensions> final {
     static inline Dimensions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return Dimensions(

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

@@ -59,7 +59,7 @@ namespace margelo::nitro::unistyles {
       explicit HybridNativePlatformSpec(): HybridObject(TAG) { }
 
       // Destructor
-      virtual ~HybridNativePlatformSpec() { }
+      ~HybridNativePlatformSpec() override = default;
 
     public:
       // Properties

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

@@ -40,7 +40,7 @@ namespace margelo::nitro::unistyles {
       explicit HybridUnistylesNavigationBarSpec(): HybridObject(TAG) { }
 
       // Destructor
-      virtual ~HybridUnistylesNavigationBarSpec() { }
+      ~HybridUnistylesNavigationBarSpec() override = default;
 
     public:
       // Properties

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

@@ -56,7 +56,7 @@ namespace margelo::nitro::unistyles {
       explicit HybridUnistylesRuntimeSpec(): HybridObject(TAG) { }
 
       // Destructor
-      virtual ~HybridUnistylesRuntimeSpec() { }
+      ~HybridUnistylesRuntimeSpec() override = default;
 
     public:
       // Properties

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

@@ -40,7 +40,7 @@ namespace margelo::nitro::unistyles {
       explicit HybridUnistylesShadowRegistrySpec(): HybridObject(TAG) { }
 
       // Destructor
-      virtual ~HybridUnistylesShadowRegistrySpec() { }
+      ~HybridUnistylesShadowRegistrySpec() override = default;
 
     public:
       // Properties

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

@@ -40,7 +40,7 @@ namespace margelo::nitro::unistyles {
       explicit HybridUnistylesStatusBarSpec(): HybridObject(TAG) { }
 
       // Destructor
-      virtual ~HybridUnistylesStatusBarSpec() { }
+      ~HybridUnistylesStatusBarSpec() override = default;
 
     public:
       // Properties

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

@@ -43,7 +43,7 @@ namespace margelo::nitro::unistyles {
       explicit HybridUnistylesStyleSheetSpec(): HybridObject(TAG) { }
 
       // Destructor
-      virtual ~HybridUnistylesStyleSheetSpec() { }
+      ~HybridUnistylesStyleSheetSpec() override = default;
 
     public:
       // Properties

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

@@ -47,7 +47,7 @@ namespace margelo::nitro {
 
   // C++ Insets <> JS Insets (object)
   template <>
-  struct JSIConverter<Insets> {
+  struct JSIConverter<Insets> final {
     static inline Insets fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return Insets(

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

@@ -41,7 +41,7 @@ namespace margelo::nitro {
 
   // C++ Orientation <> JS Orientation (union)
   template <>
-  struct JSIConverter<Orientation> {
+  struct JSIConverter<Orientation> final {
     static inline Orientation fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       std::string unionValue = JSIConverter<std::string>::fromJSI(runtime, arg);
       switch (hashString(unionValue.c_str(), unionValue.size())) {

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

@@ -50,7 +50,7 @@ namespace margelo::nitro {
 
   // C++ UnistyleDependency <> JS UnistyleDependency (enum)
   template <>
-  struct JSIConverter<UnistyleDependency> {
+  struct JSIConverter<UnistyleDependency> final {
     static inline UnistyleDependency fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       int enumValue = JSIConverter<int>::fromJSI(runtime, arg);
       return static_cast<UnistyleDependency>(enumValue);

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

@@ -65,7 +65,7 @@ namespace margelo::nitro {
 
   // C++ UnistylesCxxMiniRuntime <> JS UnistylesCxxMiniRuntime (object)
   template <>
-  struct JSIConverter<UnistylesCxxMiniRuntime> {
+  struct JSIConverter<UnistylesCxxMiniRuntime> final {
     static inline UnistylesCxxMiniRuntime fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return UnistylesCxxMiniRuntime(

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

@@ -61,7 +61,7 @@ namespace margelo::nitro {
 
   // C++ UnistylesNativeMiniRuntime <> JS UnistylesNativeMiniRuntime (object)
   template <>
-  struct JSIConverter<UnistylesNativeMiniRuntime> {
+  struct JSIConverter<UnistylesNativeMiniRuntime> final {
     static inline UnistylesNativeMiniRuntime fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return UnistylesNativeMiniRuntime(

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-beta.6",
+  "version": "3.0.0-beta.7",
   "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",
@@ -96,11 +98,11 @@
     "husky": "9.1.7",
     "jest": "29.7.0",
     "metro-react-native-babel-preset": "0.77.0",
-    "nitro-codegen": "0.21.0",
+    "nitro-codegen": "0.22.1",
     "react": "18.3.1",
     "react-native": "0.77.0",
     "react-native-builder-bob": "0.33.1",
-    "react-native-nitro-modules": "0.21.0",
+    "react-native-nitro-modules": "0.22.1",
     "react-native-web": "0.19.13",
     "react-test-renderer": "18.3.1",
     "release-it": "17.6.0",

package/plugin/import.js

@@ -31,7 +31,7 @@ function addUnistylesImport(t, path, state) {
         const newImport = t.importDeclaration(
             [t.importSpecifier(t.identifier(localName), t.identifier(name))],
             t.stringLiteral(state.opts.isLocal
-                ? state.file.opts.filename.split('react-native-unistyles').at(0).concat(`react-native-unistyles/components/native/${name}`)
+                ? state.file.opts.filename.split('react-native-unistyles').at(0).concat(`react-native-unistyles/src/components/native/${name}`)
                 : `react-native-unistyles/components/native/${name}`
             )
         )

package/plugin/index.js

@@ -1,6 +1,6 @@
 const { addUnistylesImport, isInsideNodeModules } = require('./import')
 const { hasStringRef } = require('./ref')
-const { isUnistylesStyleSheet, analyzeDependencies, addStyleSheetTag, getUnistyles, isKindOfStyleSheet, addThemeDependencyToMemberExpression } = 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,52 +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.hasOwnProperty(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 params = arg.params
-                    const hasTheme = params.length >= 1
-                    const hasMiniRuntime = params.length === 2
-                    const themeLocalName = hasTheme
-                        ? params[0].name
-                        : undefined
-                    const miniRuntimeLocalName = hasMiniRuntime
-                        ? params[1].name
-                        : undefined
-                    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)
-
-                                // 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)
-                                    }
+                    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.hasOwnProperty(property.key.name)) {
+                                    addDependencies(t, state, property.key.name, property, detectedDependencies[property.key.name])
                                 }
-
-                                propertyValues.forEach(propertyValue => {
-                                    analyzeDependencies(t, state, property.key.name, propertyValue, themeLocalName, miniRuntimeLocalName)
-                                })
-                            }
-                        })
+                            })
+                        }
                     }
                 }
             }