react-native-unistyles 3.0.0-alpha.21 → 3.0.0-alpha.23

package/nitrogen/generated/ios/swift/HybridNativePlatformSpecCxx.swift

@@ -8,6 +8,30 @@
 import Foundation
 import NitroModules
 
+/**
+ * Helper class for converting instances of `HybridNativePlatformSpecCxx` from- and to unsafe pointers.
+ * This is useful to pass Swift classes to C++, without having to strongly type the C++ function signature.
+ * The actual Swift type can be included in the .cpp file, without having to forward-declare anything in .hpp.
+ */
+public final class HybridNativePlatformSpecCxxUnsafe {
+  /**
+   * Casts a `HybridNativePlatformSpecCxx` instance to a retained unsafe raw pointer.
+   * This acquires one additional strong reference on the object!
+   */
+  public static func toUnsafe(_ instance: HybridNativePlatformSpecCxx) -> UnsafeMutableRawPointer {
+    return Unmanaged.passRetained(instance).toOpaque()
+  }
+
+  /**
+   * Casts an unsafe pointer to a `HybridNativePlatformSpecCxx`.
+   * The pointer has to be a retained opaque `Unmanaged<HybridNativePlatformSpecCxx>`.
+   * This removes one strong reference from the object!
+   */
+  public static func fromUnsafe(_ pointer: UnsafeMutableRawPointer) -> HybridNativePlatformSpecCxx {
+    return Unmanaged<HybridNativePlatformSpecCxx>.fromOpaque(pointer).takeRetainedValue()
+  }
+}
+
 /**
  * A class implementation that bridges HybridNativePlatformSpec over to C++.
  * In C++, we cannot use Swift protocols - so we need to wrap it in a class to make it strongly defined.
@@ -28,23 +52,23 @@ public class HybridNativePlatformSpecCxx {
   /**
    * Holds an instance of the `HybridNativePlatformSpec` Swift protocol.
    */
-  private var implementation: HybridNativePlatformSpec
+  private var __implementation: any HybridNativePlatformSpec
 
   /**
-   * Get the actual `HybridNativePlatformSpec` instance this class wraps.
+   * Create a new `HybridNativePlatformSpecCxx` that wraps the given `HybridNativePlatformSpec`.
+   * All properties and methods bridge to C++ types.
    */
-  @inline(__always)
-  public func getHybridNativePlatformSpec() -> HybridNativePlatformSpec {
-    return implementation
+  public init(_ implementation: some HybridNativePlatformSpec) {
+    self.__implementation = implementation
+    /* no base class */
   }
 
   /**
-   * Create a new `HybridNativePlatformSpecCxx` that wraps the given `HybridNativePlatformSpec`.
-   * All properties and methods bridge to C++ types.
+   * Get the actual `HybridNativePlatformSpec` instance this class wraps.
    */
-  public init(_ implementation: HybridNativePlatformSpec) {
-    self.implementation = implementation
-    /* no base class */
+  @inline(__always)
+  public func getHybridNativePlatformSpec() -> any HybridNativePlatformSpec {
+    return __implementation
   }
 
   /**
@@ -53,11 +77,11 @@ public class HybridNativePlatformSpecCxx {
   public var hybridContext: margelo.nitro.HybridContext {
     @inline(__always)
     get {
-      return self.implementation.hybridContext
+      return self.__implementation.hybridContext
     }
     @inline(__always)
     set {
-      self.implementation.hybridContext = newValue
+      self.__implementation.hybridContext = newValue
     }
   }
 
@@ -67,219 +91,219 @@ public class HybridNativePlatformSpecCxx {
    */
   @inline(__always)
   public var memorySize: Int {
-    return self.implementation.memorySize
+    return self.__implementation.memorySize
   }
 
   // Properties
-
+  
 
   // Methods
   @inline(__always)
   public func getInsets() -> Insets {
     do {
-      let result = try self.implementation.getInsets()
-      return result
+      let __result = try self.__implementation.getInsets()
+      return __result
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func getColorScheme() -> Int32 {
     do {
-      let result = try self.implementation.getColorScheme()
-      return result.rawValue
+      let __result = try self.__implementation.getColorScheme()
+      return __result.rawValue
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func getFontScale() -> Double {
     do {
-      let result = try self.implementation.getFontScale()
-      return result
+      let __result = try self.__implementation.getFontScale()
+      return __result
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func getPixelRatio() -> Double {
     do {
-      let result = try self.implementation.getPixelRatio()
-      return result
+      let __result = try self.__implementation.getPixelRatio()
+      return __result
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func getOrientation() -> Int32 {
     do {
-      let result = try self.implementation.getOrientation()
-      return result.rawValue
+      let __result = try self.__implementation.getOrientation()
+      return __result.rawValue
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func getContentSizeCategory() -> std.string {
     do {
-      let result = try self.implementation.getContentSizeCategory()
-      return std.string(result)
+      let __result = try self.__implementation.getContentSizeCategory()
+      return std.string(__result)
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func getScreenDimensions() -> Dimensions {
     do {
-      let result = try self.implementation.getScreenDimensions()
-      return result
+      let __result = try self.__implementation.getScreenDimensions()
+      return __result
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func getStatusBarDimensions() -> Dimensions {
     do {
-      let result = try self.implementation.getStatusBarDimensions()
-      return result
+      let __result = try self.__implementation.getStatusBarDimensions()
+      return __result
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func getNavigationBarDimensions() -> Dimensions {
     do {
-      let result = try self.implementation.getNavigationBarDimensions()
-      return result
+      let __result = try self.__implementation.getNavigationBarDimensions()
+      return __result
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func getPrefersRtlDirection() -> Bool {
     do {
-      let result = try self.implementation.getPrefersRtlDirection()
-      return result
+      let __result = try self.__implementation.getPrefersRtlDirection()
+      return __result
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func setRootViewBackgroundColor(color: Double) -> Void {
     do {
-      try self.implementation.setRootViewBackgroundColor(color: color)
-      return
+      try self.__implementation.setRootViewBackgroundColor(color: color)
+      return 
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func setNavigationBarBackgroundColor(color: Double) -> Void {
     do {
-      try self.implementation.setNavigationBarBackgroundColor(color: color)
-      return
+      try self.__implementation.setNavigationBarBackgroundColor(color: color)
+      return 
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func setNavigationBarHidden(isHidden: Bool) -> Void {
     do {
-      try self.implementation.setNavigationBarHidden(isHidden: isHidden)
-      return
+      try self.__implementation.setNavigationBarHidden(isHidden: isHidden)
+      return 
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func setStatusBarHidden(isHidden: Bool) -> Void {
     do {
-      try self.implementation.setStatusBarHidden(isHidden: isHidden)
-      return
+      try self.__implementation.setStatusBarHidden(isHidden: isHidden)
+      return 
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func setStatusBarBackgroundColor(color: Double) -> Void {
     do {
-      try self.implementation.setStatusBarBackgroundColor(color: color)
-      return
+      try self.__implementation.setStatusBarBackgroundColor(color: color)
+      return 
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func setImmersiveMode(isEnabled: Bool) -> Void {
     do {
-      try self.implementation.setImmersiveMode(isEnabled: isEnabled)
-      return
+      try self.__implementation.setImmersiveMode(isEnabled: isEnabled)
+      return 
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func getMiniRuntime() -> UnistylesNativeMiniRuntime {
     do {
-      let result = try self.implementation.getMiniRuntime()
-      return result
+      let __result = try self.__implementation.getMiniRuntime()
+      return __result
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
-
+  
   @inline(__always)
   public func registerPlatformListener(callback: bridge.Func_void_std__vector_UnistyleDependency_) -> Void {
     do {
-      try self.implementation.registerPlatformListener(callback: { () -> (([UnistyleDependency]) -> Void) in
-        let shared = bridge.share_Func_void_std__vector_UnistyleDependency_(callback)
-        return { (dependencies: [UnistyleDependency]) -> Void in
-          shared.pointee.call({ () -> bridge.std__vector_UnistyleDependency_ in
-          var vector = bridge.create_std__vector_UnistyleDependency_(dependencies.count)
-          for item in dependencies {
-            vector.push_back(item)
+      try self.__implementation.registerPlatformListener(callback: { () -> (([UnistyleDependency]) -> Void) in
+        let __sharedClosure = bridge.share_Func_void_std__vector_UnistyleDependency_(callback)
+        return { (__dependencies: [UnistyleDependency]) -> Void in
+          __sharedClosure.pointee.call({ () -> bridge.std__vector_UnistyleDependency_ in
+          var __vector = bridge.create_std__vector_UnistyleDependency_(__dependencies.count)
+          for __item in __dependencies {
+            __vector.push_back(__item)
           }
-          return vector
+          return __vector
         }())
         }
       }())
-      return
+      return 
     } catch {
-      let message = "\(error.localizedDescription)"
-      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(message))")
+      let __message = "\(error.localizedDescription)"
+      fatalError("Swift errors can currently not be propagated to C++! See https://github.com/swiftlang/swift/issues/75290 (Error: \(__message))")
     }
   }
 }

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

@@ -50,7 +50,7 @@ namespace margelo::nitro {
         case hashString("light"): return ColorScheme::LIGHT;
         case hashString("unspecified"): return ColorScheme::UNSPECIFIED;
         default: [[unlikely]]
-          throw std::runtime_error("Cannot convert \"" + unionValue + "\" to enum ColorScheme - invalid value!");
+          throw std::invalid_argument("Cannot convert \"" + unionValue + "\" to enum ColorScheme - invalid value!");
       }
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, ColorScheme arg) {
@@ -59,7 +59,7 @@ namespace margelo::nitro {
         case ColorScheme::LIGHT: return JSIConverter<std::string>::toJSI(runtime, "light");
         case ColorScheme::UNSPECIFIED: return JSIConverter<std::string>::toJSI(runtime, "unspecified");
         default: [[unlikely]]
-          throw std::runtime_error("Cannot convert ColorScheme to JS - invalid value: "
+          throw std::invalid_argument("Cannot convert ColorScheme to JS - invalid value: "
                                     + std::to_string(static_cast<int>(arg)) + "!");
       }
     }

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

@@ -15,7 +15,7 @@ namespace margelo::nitro::unistyles {
     // load custom methods/properties
     registerHybrids(this, [](Prototype& prototype) {
       prototype.registerHybridGetter("hairlineWidth", &HybridUnistylesStyleSheetSpec::getHairlineWidth);
-      prototype.registerHybridGetter("__unid", &HybridUnistylesStyleSheetSpec::get__unid);
+      prototype.registerHybridGetter("unid", &HybridUnistylesStyleSheetSpec::getUnid);
     });
   }
 

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

@@ -45,7 +45,7 @@ namespace margelo::nitro::unistyles {
     public:
       // Properties
       virtual double getHairlineWidth() = 0;
-      virtual double get__unid() = 0;
+      virtual double getUnid() = 0;
 
     public:
       // Methods

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

@@ -48,7 +48,7 @@ namespace margelo::nitro {
         case hashString("portrait"): return Orientation::PORTRAIT;
         case hashString("landscape"): return Orientation::LANDSCAPE;
         default: [[unlikely]]
-          throw std::runtime_error("Cannot convert \"" + unionValue + "\" to enum Orientation - invalid value!");
+          throw std::invalid_argument("Cannot convert \"" + unionValue + "\" to enum Orientation - invalid value!");
       }
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, Orientation arg) {
@@ -56,7 +56,7 @@ namespace margelo::nitro {
         case Orientation::PORTRAIT: return JSIConverter<std::string>::toJSI(runtime, "portrait");
         case Orientation::LANDSCAPE: return JSIConverter<std::string>::toJSI(runtime, "landscape");
         default: [[unlikely]]
-          throw std::runtime_error("Cannot convert Orientation to JS - invalid value: "
+          throw std::invalid_argument("Cannot convert Orientation to JS - invalid value: "
                                     + std::to_string(static_cast<int>(arg)) + "!");
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-alpha.21",
+  "version": "3.0.0-alpha.23",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",
@@ -74,12 +74,11 @@
     "husky": "9.1.5",
     "jest": "29.7.0",
     "metro-react-native-babel-preset": "0.77.0",
-    "nitro-codegen": "0.11.0",
+    "nitro-codegen": "0.13.0",
     "react": "18.3.1",
     "react-native": "0.75.2",
     "react-native-builder-bob": "0.30.0",
-    "react-native-nitro-modules": "0.11.0",
-    "react-native-web": "0.19.12",
+    "react-native-nitro-modules": "0.13.0",
     "react-test-renderer": "18.3.1",
     "release-it": "17.6.0",
     "typescript": "5.5.4",
@@ -88,17 +87,7 @@
   "peerDependencies": {
     "@react-native/normalize-colors": "*",
     "react": "*",
-    "react-native": "*",
-    "react-native-web": "*",
-    "typestyle": ">=2.4.0"
-  },
-  "peerDependenciesMeta": {
-    "react-native-web": {
-      "optional": true
-    },
-    "typestyle": {
-      "optional": true
-    }
+    "react-native": "*"
   },
   "workspaces": [
     "example",

package/src/specs/StyleSheet/UnistylesStyleSheet.nitro.ts

@@ -2,5 +2,5 @@ import type { HybridObject } from 'react-native-nitro-modules'
 
 export interface UnistylesStyleSheet extends HybridObject<{ ios: 'c++', android: 'c++' }> {
     readonly hairlineWidth: number
-    readonly __unid: number
+    readonly unid: number
 }

package/src/types/stylesheet.ts

@@ -5,7 +5,7 @@ import type { UnistylesMiniRuntime } from '../specs'
 import type { ReactNativeStyleSheet } from './breakpoints'
 import type { ExtractVariantNames } from './variants'
 import type { CSSProperties } from 'react'
-import type { Pseudo } from '../web/pseudo'
+import type { Pseudo } from '../web/convert/pseudo'
 
 // these props are treated differently to nest breakpoints and media queries
 type NestedKeys = 'shadowOffset' | 'transform' | 'textShadowOffset'

package/src/web/convert/boxShadow.ts

@@ -1,8 +1,5 @@
-import { media } from 'typestyle'
-import type { NestedCSSProperties } from 'typestyle/lib/types'
 import { deepMergeObjects, warn } from '../utils'
 import { validateShadow } from './shadow'
-import { convertBreakpoint } from './breakpoint'
 import { BOX_SHADOW_STYLES, type BoxShadow } from './types'
 import { extractShadowValue, normalizeColor, normalizeNumericValue } from './utils'
 
@@ -17,7 +14,7 @@ const createBoxShadowValue = (style: BoxShadow) => {
     return `${offsetX} ${offsetY} ${radius} ${color}`
 }
 
-export const getBoxShadowStyle = (styles: Record<string, any>): NestedCSSProperties => {
+export const getBoxShadowStyle = (styles: Record<string, any>) => {
     const missingStyles = BOX_SHADOW_STYLES.filter(key => !(key in styles))
 
     if (missingStyles.length) {
@@ -54,17 +51,19 @@ export const getBoxShadowStyle = (styles: Record<string, any>): NestedCSSPropert
         const radius = extractShadowValue('shadowRadius', breakpoint, styles)
         const opacity = extractShadowValue('shadowOpacity', breakpoint, styles)
 
-        return media(convertBreakpoint(breakpoint), {
-            boxShadow: createBoxShadowValue({
-                shadowColor: color,
-                shadowOffset: {
-                    width,
-                    height
-                },
-                shadowRadius: radius,
-                shadowOpacity: opacity
-            })
-        })
+        return {
+            [breakpoint]: {
+                boxShadow: createBoxShadowValue({
+                    shadowColor: color,
+                    shadowOffset: {
+                        width,
+                        height
+                    },
+                    shadowRadius: radius,
+                    shadowOpacity: opacity
+                })
+            }
+        }
     })
 
     // Merge all breakpoints styles into one

package/src/web/convert/index.ts

@@ -1,8 +1,5 @@
-import type { NestedCSSProperties } from 'typestyle/lib/types'
 import type { UnistylesValues } from '../../types'
-import { media } from 'typestyle'
-import { isPseudo } from '../pseudo'
-import { convertBreakpoint } from './breakpoint'
+import { isPseudo } from './pseudo'
 import { getStyle } from './style'
 import { deepMergeObjects } from '../utils'
 import { getTransformStyle } from './transform'
@@ -10,7 +7,7 @@ import { isBoxShadow, isTextShadow, isTransform } from './utils'
 import { getTextShadowStyle } from './textShadow'
 import { getBoxShadowStyle } from './boxShadow'
 
-export const convertToTypeStyle = (value: UnistylesValues) => {
+export const convertUnistyles = (value: UnistylesValues) => {
     // Flag to mark if textShadow is already created
     let hasTextShadow = false
     // Flag to mark if boxShadow is already created
@@ -27,13 +24,9 @@ export const convertToTypeStyle = (value: UnistylesValues) => {
 
         // Pseudo classes :hover, :before etc.
         if (isPseudo(unistylesKey)) {
-            const typestyleValues = convertToTypeStyle(unistylesValue as UnistylesValues)
+            const flattenValues = convertUnistyles(unistylesValue as UnistylesValues)
 
-            return {
-                $nest: {
-                    [unistylesKey.replace('_', '&:')]: typestyleValues
-                }
-            }
+            return { [unistylesKey]: flattenValues }
         }
 
         // Text shadow
@@ -66,13 +59,13 @@ export const convertToTypeStyle = (value: UnistylesValues) => {
         // Breakpoints
         if (typeof unistylesValue === 'object' && unistylesValue !== null) {
             return Object.entries(unistylesValue).map(([breakpointKey, breakpointValue]) => {
-                return media(convertBreakpoint(breakpointKey), getStyle(unistylesKey, breakpointValue))
+                return { [breakpointKey]: getStyle(unistylesKey, breakpointValue) }
             })
         }
 
         // Regular styles
         return getStyle(unistylesKey, unistylesValue)
-    }) as Array<NestedCSSProperties>
+    }) as Array<Record<string, any>>
 
     return deepMergeObjects(...stylesArray)
 }