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

package/lib/typescript/src/web/registry.d.ts

@@ -1,14 +1,27 @@
-import { TypeStyle } from 'typestyle';
-import type { UnistylesValues } from '../types';
+import type { UnistylesTheme, UnistylesValues } from '../types';
 import type { StyleSheet, StyleSheetWithSuperPowers } from '../types/stylesheet';
+import type { UnistyleDependency } from '../specs/NativePlatform';
+import type { UnistylesMiniRuntime } from '../specs';
+type AddProps = {
+    value: UnistylesValues;
+    stylesheet: StyleSheetWithSuperPowers<StyleSheet>;
+    key: string;
+    args: Array<any>;
+    variants: Record<string, any>;
+};
 declare class UnistylesRegistryBuilder {
-    private stylesheets;
+    #private;
+    private readonly stylesheets;
+    private readonly stylesCounter;
+    private readonly disposeListenersMap;
+    private readonly dependenciesMap;
+    private get styleTag();
     getComputedStylesheet: (stylesheet: StyleSheetWithSuperPowers<StyleSheet>) => StyleSheet;
-    createStyles: (stylesheet: UnistylesValues, key: string) => {
-        className: string;
-        unistyles: TypeStyle;
-    };
-    updateStyles: (unistyles: TypeStyle, stylesheet: UnistylesValues, className: string) => void;
+    addDependenciesToStylesheet: (stylesheet: (theme: UnistylesTheme, miniRuntime: UnistylesMiniRuntime) => StyleSheet, dependencies: Array<UnistyleDependency>) => void;
+    add: ({ key, value, stylesheet, args, variants }: AddProps) => string;
+    private applyStyles;
+    private applyRule;
+    remove: (value: UnistylesValues) => void;
 }
 export declare const UnistylesRegistry: UnistylesRegistryBuilder;
 export {};

package/lib/typescript/src/web/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../src/web/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,SAAS,EAAE,MAAM,WAAW,CAAA;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE/C,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAKhF,cAAM,wBAAwB;IAC1B,OAAO,CAAC,WAAW,CAA+D;IAElF,qBAAqB,eAAgB,yBAAyB,CAAC,UAAU,CAAC,gBAwBzE;IAED,YAAY,eAAgB,eAAe,OAAO,MAAM;;;MAYvD;IAED,YAAY,cAAe,SAAS,cAAc,eAAe,aAAa,MAAM,UAKnF;CACJ;AAED,eAAO,MAAM,iBAAiB,0BAAiC,CAAA"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../src/web/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAA;AAKhF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAGpD,KAAK,QAAQ,GAAG;IACZ,KAAK,EAAE,eAAe,CAAC;IACvB,UAAU,EAAE,yBAAyB,CAAC,UAAU,CAAC,CAAC;IAClD,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAChC,CAAA;AAWD,cAAM,wBAAwB;;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA+D;IAC3F,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IAExE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAkC;IACtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA4E;IAE5G,OAAO,KAAK,QAAQ,GAcnB;IAED,qBAAqB,eAAgB,yBAAyB,CAAC,UAAU,CAAC,gBAkBzE;IAED,2BAA2B,eAAgB,CAAC,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,oBAAoB,KAAK,UAAU,gBAAgB,KAAK,CAAC,kBAAkB,CAAC,UAe3J;IAED,GAAG,+CAAgD,QAAQ,YAoC1D;IAED,OAAO,CAAC,WAAW,CAwElB;IAED,OAAO,CAAC,SAAS,CAmBhB;IAED,MAAM,UAAW,eAAe,UAe/B;CACJ;AAED,eAAO,MAAM,iBAAiB,0BAAiC,CAAA"}

package/lib/typescript/src/web/shadowRegistry.d.ts

@@ -6,11 +6,10 @@ declare class UnistylesShadowRegistryBuilder {
     equals: () => boolean;
     toString: () => string;
     dispose: () => void;
-    private readonly webUnistylesMap;
-    private readonly disposeMap;
-    private readonly stylesMap;
+    private resultsMap;
+    private classNamesMap;
     add: (ref: any, _style?: Style | Array<Style>, _variants?: Record<string, any>, _args?: Array<any>) => void;
-    remove: (ref: HTMLElement, style: Style) => void;
+    remove: () => void;
 }
 export declare const UnistylesShadowRegistry: UnistylesShadowRegistryBuilder;
 export {};

package/lib/typescript/src/web/shadowRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shadowRegistry.d.ts","sourceRoot":"","sources":["../../../../src/web/shadowRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAQ/C,KAAK,KAAK,GAAG,eAAe,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,eAAe,CAAC,CAAA;AAEzE,cAAM,8BAA8B;IAEhC,IAAI,SAA4B;IAChC,MAAM,SAAQ;IACd,MAAM,gBAAa;IACnB,QAAQ,eAAkC;IAC1C,OAAO,aAAW;IAGlB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAsD;IACtF,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmE;IAC9F,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA2D;IAErF,GAAG,QAAS,GAAG,WAAW,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,KAAK,CAAC,GAAG,CAAC,UAuFlG;IAED,MAAM,QAAS,WAAW,SAAS,KAAK,UAQvC;CACJ;AAED,eAAO,MAAM,uBAAuB,gCAAuC,CAAA"}
+{"version":3,"file":"shadowRegistry.d.ts","sourceRoot":"","sources":["../../../../src/web/shadowRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAK/C,KAAK,KAAK,GAAG,eAAe,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,eAAe,CAAC,CAAA;AAEzE,cAAM,8BAA8B;IAEhC,IAAI,SAA4B;IAChC,MAAM,SAAQ;IACd,MAAM,gBAAa;IACnB,QAAQ,eAAkC;IAC1C,OAAO,aAAW;IAGlB,OAAO,CAAC,UAAU,CAA0D;IAC5E,OAAO,CAAC,aAAa,CAAwD;IAE7E,GAAG,QAAS,GAAG,WAAW,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,KAAK,CAAC,GAAG,CAAC,UAmGlG;IAED,MAAM,aAAW;CACpB;AAED,eAAO,MAAM,uBAAuB,gCAAuC,CAAA"}

package/lib/typescript/src/web/state.d.ts

@@ -3,10 +3,10 @@ import type { UnistylesConfig } from '../specs/StyleSheet';
 import type { AppBreakpoint, AppThemeName } from '../specs/types';
 import type { UnistylesBreakpoints } from '../global';
 declare class UnistylesStateBuilder {
-    private readonly isSSR;
     themes: Map<string, UnistylesTheme>;
     themeName?: AppThemeName;
-    breakpoint?: AppBreakpoint;
+    private matchingBreakpoints;
+    get breakpoint(): AppBreakpoint | undefined;
     breakpoints?: UnistylesBreakpoints;
     hasAdaptiveThemes: boolean;
     init: (config: UnistylesConfig) => void;

package/lib/typescript/src/web/state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../../../src/web/state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAmB,MAAM,WAAW,CAAA;AAMtE,cAAM,qBAAqB;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IAEnC,MAAM,8BAAoC;IAC1C,SAAS,CAAC,EAAE,YAAY,CAAA;IAExB,UAAU,CAAC,EAAE,aAAa,CAAA;IAC1B,WAAW,CAAC,EAAE,oBAAoB,CAAA;IAElC,iBAAiB,UAAQ;IAEzB,IAAI,WAAY,eAAe,UAU9B;IAED,OAAO,CAAC,UAAU,CAIjB;IAED,OAAO,CAAC,YAAY,CAyBnB;IAED,OAAO,CAAC,eAAe,CAmCtB;CACJ;AAED,eAAO,MAAM,cAAc,uBAA8B,CAAA"}
+{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../../../src/web/state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAmB,MAAM,WAAW,CAAA;AAMtE,cAAM,qBAAqB;IACvB,MAAM,8BAAoC;IAC1C,SAAS,CAAC,EAAE,YAAY,CAAA;IAExB,OAAO,CAAC,mBAAmB,CAA6B;IAExD,IAAI,UAAU,IAKkB,aAAa,GAAG,SAAS,CACxD;IAED,WAAW,CAAC,EAAE,oBAAoB,CAAA;IAElC,iBAAiB,UAAQ;IAEzB,IAAI,WAAY,eAAe,UAU9B;IAED,OAAO,CAAC,UAAU,CAIjB;IAED,OAAO,CAAC,YAAY,CAyBnB;IAED,OAAO,CAAC,eAAe,CAkBtB;CACJ;AAED,eAAO,MAAM,cAAc,uBAA8B,CAAA"}

package/lib/typescript/src/web/{utils.d.ts → utils/common.d.ts}

@@ -1,9 +1,5 @@
-import { ColorScheme, type AppThemeName } from '../specs/types';
-import type { StyleSheet, StyleSheetWithSuperPowers, UnistylesValues } from '../types/stylesheet';
 export declare const reduceObject: <TObj extends Record<string, any>, TReducer>(obj: TObj, reducer: (value: TObj[keyof TObj], key: keyof TObj) => TReducer) => { [K in keyof TObj]: TReducer; };
 export declare const keyInObject: <T extends Record<string, any>>(obj: T, key: PropertyKey) => key is keyof T;
-export declare const schemeToTheme: (scheme: ColorScheme) => AppThemeName;
-export declare const hexToRGBA: (hex: string, opacity: number) => string;
 export declare const isServer: () => boolean;
 /**
 * Deeply merges properties of passed object
@@ -11,25 +7,11 @@ export declare const isServer: () => boolean;
 export declare const deepMergeObjects: <T extends Record<PropertyKey, any>>(...sources: Array<T>) => T;
 export declare const warn: (message: string) => void;
 export declare const equal: <T>(a: T, b: T) => boolean;
-type UnistyleSecrets = {
-    __uni__stylesheet: StyleSheetWithSuperPowers<StyleSheet>;
-    __uni__key: string;
-    __uni__refs: Set<HTMLElement>;
-    __uni__variants: Record<string, any>;
-    __uni__args?: Array<any>;
-};
-export declare const assignSecrets: <T>(object: T, secrets: UnistyleSecrets) => T;
-export declare const extractSecrets: (object: any) => UnistyleSecrets[];
-export declare const getStyles: (values: UnistylesValues) => {};
+export declare const generateHash: (value: any) => string;
 export declare const createDoubleMap: <TKey, TSecondKey, TValue>() => {
     get: (key: TKey, secondKey: TSecondKey) => TValue | undefined;
     set: (key: TKey, secondKey: TSecondKey, value: TValue) => void;
     delete: (key: TKey, secondKey: TSecondKey) => void;
     forEach: (callback: (key: TKey, secondKey: TSecondKey, value: TValue) => void) => void;
 };
-export declare const extractHiddenProperties: (object: any) => {
-    [k: string]: any;
-};
-export declare const isInDocument: (element: HTMLElement) => boolean;
-export {};
-//# sourceMappingURL=utils.d.ts.map
+//# sourceMappingURL=common.d.ts.map

package/lib/typescript/src/web/utils/common.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../../src/web/utils/common.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,GAAI,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,QAAQ,OAC9D,IAAI,WACA,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,GAAG,EAAE,MAAM,IAAI,KAAK,QAAQ,KACmD,GAAG,CAAe,IAAV,MAAM,IAAI,GAAG,QAAQ,GAAE,CAAA;AAErJ,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,WAAW,KAAG,GAAG,IAAI,MAAM,CAAe,CAAA;AAElH,eAAO,MAAM,QAAQ,eAAsC,CAAA;AAE3D;;EAEE;AACF,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,cAAc,KAAK,CAAC,CAAC,CAAC,MAqBxF,CAAA;AAED,eAAO,MAAM,IAAI,YAAa,MAAM,SAA2D,CAAA;AAE/F,eAAO,MAAM,KAAK,GAAI,CAAC,KAAK,CAAC,KAAK,CAAC,YAqBlC,CAAA;AAED,eAAO,MAAM,YAAY,UAAW,GAAG,WAQtC,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,IAAI,EAAE,UAAU,EAAE,MAAM;eAIrC,IAAI,aAAa,UAAU;eAS3B,IAAI,aAAa,UAAU,SAAS,MAAM;kBAMvC,IAAI,aAAa,UAAU;wBASrB,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI;CAQpF,CAAA"}

package/lib/typescript/src/web/utils/index.d.ts

@@ -0,0 +1,3 @@
+export * from './common';
+export * from './unistyle';
+//# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/web/utils/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/web/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA"}

package/lib/typescript/src/web/utils/unistyle.d.ts

@@ -0,0 +1,20 @@
+import type { UnistyleDependency } from '../../specs/NativePlatform';
+import { ColorScheme, type AppThemeName } from '../../specs/types';
+import type { StyleSheet, StyleSheetWithSuperPowers, UnistylesValues } from '../../types/stylesheet';
+export declare const schemeToTheme: (scheme: ColorScheme) => AppThemeName;
+export declare const hexToRGBA: (hex: string, opacity: number) => string;
+export type UnistyleSecrets = {
+    __uni__stylesheet: StyleSheetWithSuperPowers<StyleSheet>;
+    __uni__key: string;
+    __uni__refs: Set<HTMLElement>;
+    __uni__variants: Record<string, any>;
+    __uni__args?: Array<any>;
+};
+export declare const assignSecrets: <T>(object: T, secrets: UnistyleSecrets) => T;
+export declare const extractSecrets: (object: any) => UnistyleSecrets[];
+export declare const getStyles: (values: UnistylesValues) => {};
+export declare const isInDocument: (element: HTMLElement) => boolean;
+export declare const extractMediaQueryValue: (query: string) => number | undefined;
+export declare const getMediaQuery: (query: string) => string;
+export declare const extractUnistyleDependencies: (value: any) => UnistyleDependency[];
+//# sourceMappingURL=unistyle.d.ts.map

package/lib/typescript/src/web/utils/unistyle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unistyle.d.ts","sourceRoot":"","sources":["../../../../../src/web/utils/unistyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAe,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAC/E,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAKpG,eAAO,MAAM,aAAa,WAAY,WAAW,KAAG,YAQnD,CAAA;AAED,eAAO,MAAM,SAAS,QAAS,MAAM,WAAW,MAAM,WAM5B,CAAA;AAE1B,MAAM,MAAM,eAAe,GAAG;IAC1B,iBAAiB,EAAE,yBAAyB,CAAC,UAAU,CAAC,CAAC;IACzD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC,CAAA;IAC7B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,WAAW,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,CAAC,UAAU,CAAC,WAAW,eAAe,MAKnE,CAAA;AAED,eAAO,MAAM,cAAc,WAAY,GAAG,sBAUzC,CAAA;AAED,eAAO,MAAM,SAAS,WAAY,eAAe,OAUhD,CAAA;AAED,eAAO,MAAM,YAAY,YAAa,WAAW,YAAoC,CAAA;AAErF,eAAO,MAAM,sBAAsB,UAAW,MAAM,uBAUnD,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAmB1C,CAAA;AAED,eAAO,MAAM,2BAA2B,UAAW,GAAG,yBAIrD,CAAA"}

package/nitrogen/generated/android/c++/JColorScheme.hpp

@@ -53,7 +53,7 @@ namespace margelo::nitro::unistyles {
           return clazz->getStaticFieldValue(fieldUNSPECIFIED);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
-          throw std::runtime_error("Invalid enum value (" + stringValue + "!");
+          throw std::invalid_argument("Invalid enum value (" + stringValue + "!");
       }
     }
   };

package/nitrogen/generated/android/c++/JFunc_void_std__vector_UnistyleDependency_.hpp

@@ -30,16 +30,16 @@ namespace margelo::nitro::unistyles {
     }
 
   public:
-    void call(const jni::alias_ref<jni::JArrayClass<JUnistyleDependency>>& dependencies) {
+    void call(jni::alias_ref<jni::JArrayClass<JUnistyleDependency>> dependencies) {
       return _func([&]() {
-        size_t size = dependencies->size();
-        std::vector<UnistyleDependency> vector;
-        vector.reserve(size);
-        for (size_t i = 0; i < size; i++) {
-          auto element = dependencies->getElement(i);
-          vector.push_back(element->toCpp());
+        size_t __size = dependencies->size();
+        std::vector<UnistyleDependency> __vector;
+        __vector.reserve(__size);
+        for (size_t __i = 0; __i < __size; __i++) {
+          auto __element = dependencies->getElement(__i);
+          __vector.push_back(__element->toCpp());
         }
-        return vector;
+        return __vector;
       }());
     }
 

package/nitrogen/generated/android/c++/JHybridNativePlatformSpec.cpp

@@ -60,53 +60,53 @@ namespace margelo::nitro::unistyles {
   // Methods
   Insets JHybridNativePlatformSpec::getInsets() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JInsets>()>("getInsets");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   ColorScheme JHybridNativePlatformSpec::getColorScheme() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JColorScheme>()>("getColorScheme");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   double JHybridNativePlatformSpec::getFontScale() {
     static const auto method = _javaPart->getClass()->getMethod<double()>("getFontScale");
-    auto result = method(_javaPart);
-    return result;
+    auto __result = method(_javaPart);
+    return __result;
   }
   double JHybridNativePlatformSpec::getPixelRatio() {
     static const auto method = _javaPart->getClass()->getMethod<double()>("getPixelRatio");
-    auto result = method(_javaPart);
-    return result;
+    auto __result = method(_javaPart);
+    return __result;
   }
   Orientation JHybridNativePlatformSpec::getOrientation() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JOrientation>()>("getOrientation");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   std::string JHybridNativePlatformSpec::getContentSizeCategory() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<jni::JString>()>("getContentSizeCategory");
-    auto result = method(_javaPart);
-    return result->toStdString();
+    auto __result = method(_javaPart);
+    return __result->toStdString();
   }
   Dimensions JHybridNativePlatformSpec::getScreenDimensions() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JDimensions>()>("getScreenDimensions");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   Dimensions JHybridNativePlatformSpec::getStatusBarDimensions() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JDimensions>()>("getStatusBarDimensions");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   Dimensions JHybridNativePlatformSpec::getNavigationBarDimensions() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JDimensions>()>("getNavigationBarDimensions");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   bool JHybridNativePlatformSpec::getPrefersRtlDirection() {
     static const auto method = _javaPart->getClass()->getMethod<jboolean()>("getPrefersRtlDirection");
-    auto result = method(_javaPart);
-    return result;
+    auto __result = method(_javaPart);
+    return __result;
   }
   void JHybridNativePlatformSpec::setRootViewBackgroundColor(double color) {
     static const auto method = _javaPart->getClass()->getMethod<void(double /* color */)>("setRootViewBackgroundColor");
@@ -134,8 +134,8 @@ namespace margelo::nitro::unistyles {
   }
   UnistylesNativeMiniRuntime JHybridNativePlatformSpec::getMiniRuntime() {
     static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JUnistylesNativeMiniRuntime>()>("getMiniRuntime");
-    auto result = method(_javaPart);
-    return result->toCpp();
+    auto __result = method(_javaPart);
+    return __result->toCpp();
   }
   void JHybridNativePlatformSpec::registerPlatformListener(const std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>& callback) {
     static const auto method = _javaPart->getClass()->getMethod<void(jni::alias_ref<JFunc_void_std__vector_UnistyleDependency_::javaobject> /* callback */)>("registerPlatformListener");

package/nitrogen/generated/android/c++/JOrientation.hpp

@@ -50,7 +50,7 @@ namespace margelo::nitro::unistyles {
           return clazz->getStaticFieldValue(fieldLANDSCAPE);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
-          throw std::runtime_error("Invalid enum value (" + stringValue + "!");
+          throw std::invalid_argument("Invalid enum value (" + stringValue + "!");
       }
     }
   };

package/nitrogen/generated/android/c++/JUnistyleDependency.hpp

@@ -86,7 +86,7 @@ namespace margelo::nitro::unistyles {
           return clazz->getStaticFieldValue(fieldNAVIGATIONBAR);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));
-          throw std::runtime_error("Invalid enum value (" + stringValue + "!");
+          throw std::invalid_argument("Invalid enum value (" + stringValue + "!");
       }
     }
   };

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/HybridNativePlatformSpec.kt

@@ -116,8 +116,8 @@ abstract class HybridNativePlatformSpec: HybridObject() {
   @DoNotStrip
   @Keep
   private fun registerPlatformListener(callback: Func_void_std__vector_UnistyleDependency_): Unit {
-    val result = registerPlatformListener(callback.toLambda())
-    return result
+    val __result = registerPlatformListener(callback.toLambda())
+    return __result
   }
 
   private external fun initHybrid(): HybridData

package/nitrogen/generated/android/{UnistylesOnLoad.cpp → unistylesOnLoad.cpp}

@@ -1,11 +1,11 @@
 ///
-/// UnistylesOnLoad.cpp
+/// unistylesOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2024 Marc Rousavy @ Margelo
 ///
 
-#include "UnistylesOnLoad.hpp"
+#include "unistylesOnLoad.hpp"
 
 #include <jni.h>
 #include <fbjni/fbjni.h>

package/nitrogen/generated/android/{UnistylesOnLoad.hpp → unistylesOnLoad.hpp}

@@ -1,5 +1,5 @@
 ///
-/// UnistylesOnLoad.hpp
+/// unistylesOnLoad.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2024 Marc Rousavy @ Margelo

package/nitrogen/generated/ios/Unistyles+autolinking.rb

@@ -24,7 +24,7 @@ def add_nitrogen_files(spec)
 
   spec.dependency "NitroModules"
 
-  current_source_files = spec.attributes_hash['source_files'] || []
+  current_source_files = Array(spec.attributes_hash['source_files'])
   spec.source_files = current_source_files + [
     # Generated cross-platform specs
     "nitrogen/generated/shared/**/*.{h,hpp,c,cpp,swift}",
@@ -32,7 +32,7 @@ def add_nitrogen_files(spec)
     "nitrogen/generated/ios/**/*.{h,hpp,c,cpp,mm,swift}",
   ]
 
-  current_public_header_files = spec.attributes_hash['public_header_files'] || []
+  current_public_header_files = Array(spec.attributes_hash['public_header_files'])
   spec.public_header_files = current_public_header_files + [
     # Generated specs
     "nitrogen/generated/shared/**/*.{h,hpp}",
@@ -40,7 +40,7 @@ def add_nitrogen_files(spec)
     "nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.hpp"
   ]
 
-  current_private_header_files = spec.attributes_hash['private_header_files'] || []
+  current_private_header_files = Array(spec.attributes_hash['private_header_files'])
   spec.private_header_files = current_private_header_files + [
     # iOS specific specs
     "nitrogen/generated/ios/c++/**/*.{h,hpp}",
@@ -52,5 +52,7 @@ def add_nitrogen_files(spec)
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
     # Enables C++ <-> Swift interop (by default it's only C)
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
+    # Enables stricter modular headers
+    "DEFINES_MODULE" => "YES",
   })
 end

package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.cpp

@@ -6,3 +6,28 @@
 ///
 
 #include "Unistyles-Swift-Cxx-Bridge.hpp"
+
+// Include C++ implementation defined types
+#include "HybridNativePlatformSpecSwift.hpp"
+#include "Unistyles-Swift-Cxx-Umbrella.hpp"
+#include <NitroModules/HybridContext.hpp>
+
+namespace margelo::nitro::unistyles::bridge::swift {
+
+  // pragma MARK: std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>
+  std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec> create_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(void* _Nonnull swiftUnsafePointer) {
+    Unistyles::HybridNativePlatformSpecCxx swiftPart = Unistyles::HybridNativePlatformSpecCxxUnsafe::fromUnsafe(swiftUnsafePointer);
+    return HybridContext::getOrCreate<margelo::nitro::unistyles::HybridNativePlatformSpecSwift>(swiftPart);
+  }
+  void* _Nonnull get_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_ cppType) {
+    std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpecSwift> swiftWrapper = std::dynamic_pointer_cast<margelo::nitro::unistyles::HybridNativePlatformSpecSwift>(cppType);
+  #ifdef NITRO_DEBUG
+    if (swiftWrapper == nullptr) [[unlikely]] {
+      throw std::runtime_error("Class \"HybridNativePlatformSpec\" is not implemented in Swift!");
+    }
+  #endif
+    Unistyles::HybridNativePlatformSpecCxx swiftPart = swiftWrapper->getSwiftPart();
+    return Unistyles::HybridNativePlatformSpecCxxUnsafe::toUnsafe(swiftPart);
+  }
+
+} // namespace margelo::nitro::unistyles::bridge::swift

package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Bridge.hpp

@@ -7,29 +7,28 @@
 
 #pragma once
 
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
 // Forward declarations of C++ defined types
+// Forward declaration of `HybridNativePlatformSpec` to properly resolve imports.
+namespace margelo::nitro::unistyles { class HybridNativePlatformSpec; }
 // Forward declaration of `UnistyleDependency` to properly resolve imports.
 namespace margelo::nitro::unistyles { enum class UnistyleDependency; }
 
+// Forward declarations of Swift defined types
+// Forward declaration of `HybridNativePlatformSpecCxx` to properly resolve imports.
+namespace Unistyles { class HybridNativePlatformSpecCxx; }
+
 // Include C++ defined types
-#if __has_include("UnistyleDependency.hpp")
- #include "UnistyleDependency.hpp"
-#endif
-#if __has_include(<functional>)
- #include <functional>
-#endif
-#if __has_include(<memory>)
- #include <memory>
-#endif
-#if __has_include(<optional>)
- #include <optional>
-#endif
-#if __has_include(<string>)
- #include <string>
-#endif
-#if __has_include(<vector>)
- #include <vector>
-#endif
+#include "HybridNativePlatformSpec.hpp"
+#include "UnistyleDependency.hpp"
+#include <functional>
+#include <memory>
+#include <vector>
 
 /**
  * Contains specialized versions of C++ templated types so they can be accessed from Swift,
@@ -37,6 +36,7 @@ namespace margelo::nitro::unistyles { enum class UnistyleDependency; }
  */
 namespace margelo::nitro::unistyles::bridge::swift {
 
+  // pragma MARK: std::vector<UnistyleDependency>
   /**
    * Specialized version of `std::vector<UnistyleDependency>`.
    */
@@ -47,6 +47,7 @@ namespace margelo::nitro::unistyles::bridge::swift {
     return vector;
   }
   
+  // pragma MARK: std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>
   /**
    * Specialized version of `std::function<void(const std::vector<UnistyleDependency>&)>`.
    */
@@ -54,18 +55,17 @@ namespace margelo::nitro::unistyles::bridge::swift {
   /**
    * Wrapper class for a `std::function<void(const std::vector<UnistyleDependency>& / * dependencies * /)>`, this can be used from Swift.
    */
-  class Func_void_std__vector_UnistyleDependency__Wrapper {
+  class Func_void_std__vector_UnistyleDependency__Wrapper final {
   public:
-    explicit Func_void_std__vector_UnistyleDependency__Wrapper(const std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>& func): function(func) {}
-    explicit Func_void_std__vector_UnistyleDependency__Wrapper(std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>&& func): function(std::move(func)) {}
-  
-    void call(std::vector<UnistyleDependency> dependencies) const {
-      function(dependencies);
+    explicit Func_void_std__vector_UnistyleDependency__Wrapper(const std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>& func): _function(func) {}
+    explicit Func_void_std__vector_UnistyleDependency__Wrapper(std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)>&& func): _function(std::move(func)) {}
+    inline void call(std::vector<UnistyleDependency> dependencies) const {
+      _function(dependencies);
     }
-  
-    std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)> function;
+  private:
+    std::function<void(const std::vector<UnistyleDependency>& /* dependencies */)> _function;
   };
-  inline Func_void_std__vector_UnistyleDependency_ create_Func_void_std__vector_UnistyleDependency_(void* closureHolder, void(*call)(void* /* closureHolder */, std::vector<UnistyleDependency>), void(*destroy)(void*)) {
+  inline Func_void_std__vector_UnistyleDependency_ create_Func_void_std__vector_UnistyleDependency_(void* _Nonnull closureHolder, void(* _Nonnull call)(void* _Nonnull /* closureHolder */, std::vector<UnistyleDependency>), void(* _Nonnull destroy)(void* _Nonnull)) {
     std::shared_ptr<void> sharedClosureHolder(closureHolder, destroy);
     return Func_void_std__vector_UnistyleDependency_([sharedClosureHolder, call](const std::vector<UnistyleDependency>& dependencies) -> void {
       call(sharedClosureHolder.get(), dependencies);
@@ -75,12 +75,12 @@ namespace margelo::nitro::unistyles::bridge::swift {
     return std::make_shared<Func_void_std__vector_UnistyleDependency__Wrapper>(value);
   }
   
+  // pragma MARK: std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>
   /**
-   * Specialized version of `std::optional<std::string>`.
+   * Specialized version of `std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>`.
    */
-  using std__optional_std__string_ = std::optional<std::string>;
-  inline std::optional<std::string> create_std__optional_std__string_(const std::string& value) {
-    return std::optional<std::string>(value);
-  }
+  using std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_ = std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec>;
+  std::shared_ptr<margelo::nitro::unistyles::HybridNativePlatformSpec> create_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(void* _Nonnull swiftUnsafePointer);
+  void* _Nonnull get_std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_(std__shared_ptr_margelo__nitro__unistyles__HybridNativePlatformSpec_ cppType);
 
 } // namespace margelo::nitro::unistyles::bridge::swift

package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Umbrella.hpp

@@ -14,24 +14,12 @@ namespace margelo::nitro::unistyles { enum class ColorScheme; }
 namespace margelo::nitro::unistyles { struct Dimensions; }
 // Forward declaration of `HybridNativePlatformSpec` to properly resolve imports.
 namespace margelo::nitro::unistyles { class HybridNativePlatformSpec; }
-// Forward declaration of `HybridUnistylesNavigationBarSpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesNavigationBarSpec; }
-// Forward declaration of `HybridUnistylesRuntimeSpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesRuntimeSpec; }
-// Forward declaration of `HybridUnistylesShadowRegistrySpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesShadowRegistrySpec; }
-// Forward declaration of `HybridUnistylesStatusBarSpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesStatusBarSpec; }
-// Forward declaration of `HybridUnistylesStyleSheetSpec` to properly resolve imports.
-namespace margelo::nitro::unistyles { class HybridUnistylesStyleSheetSpec; }
 // Forward declaration of `Insets` to properly resolve imports.
 namespace margelo::nitro::unistyles { struct Insets; }
 // Forward declaration of `Orientation` to properly resolve imports.
 namespace margelo::nitro::unistyles { enum class Orientation; }
 // Forward declaration of `UnistyleDependency` to properly resolve imports.
 namespace margelo::nitro::unistyles { enum class UnistyleDependency; }
-// Forward declaration of `UnistylesCxxMiniRuntime` to properly resolve imports.
-namespace margelo::nitro::unistyles { struct UnistylesCxxMiniRuntime; }
 // Forward declaration of `UnistylesNativeMiniRuntime` to properly resolve imports.
 namespace margelo::nitro::unistyles { struct UnistylesNativeMiniRuntime; }
 
@@ -39,19 +27,12 @@ namespace margelo::nitro::unistyles { struct UnistylesNativeMiniRuntime; }
 #include "ColorScheme.hpp"
 #include "Dimensions.hpp"
 #include "HybridNativePlatformSpec.hpp"
-#include "HybridUnistylesNavigationBarSpec.hpp"
-#include "HybridUnistylesRuntimeSpec.hpp"
-#include "HybridUnistylesShadowRegistrySpec.hpp"
-#include "HybridUnistylesStatusBarSpec.hpp"
-#include "HybridUnistylesStyleSheetSpec.hpp"
 #include "Insets.hpp"
 #include "Orientation.hpp"
 #include "UnistyleDependency.hpp"
-#include "UnistylesCxxMiniRuntime.hpp"
 #include "UnistylesNativeMiniRuntime.hpp"
 #include <functional>
 #include <memory>
-#include <optional>
 #include <string>
 #include <vector>
 
@@ -67,16 +48,6 @@ namespace margelo::nitro::unistyles { struct UnistylesNativeMiniRuntime; }
 // Forward declarations of Swift defined types
 // Forward declaration of `HybridNativePlatformSpecCxx` to properly resolve imports.
 namespace Unistyles { class HybridNativePlatformSpecCxx; }
-// Forward declaration of `HybridUnistylesNavigationBarSpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesNavigationBarSpecCxx; }
-// Forward declaration of `HybridUnistylesRuntimeSpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesRuntimeSpecCxx; }
-// Forward declaration of `HybridUnistylesShadowRegistrySpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesShadowRegistrySpecCxx; }
-// Forward declaration of `HybridUnistylesStatusBarSpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesStatusBarSpecCxx; }
-// Forward declaration of `HybridUnistylesStyleSheetSpecCxx` to properly resolve imports.
-namespace Unistyles { class HybridUnistylesStyleSheetSpecCxx; }
 
 // Include Swift defined types
 #if __has_include("Unistyles-Swift.h")

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

@@ -51,15 +51,3 @@ public protocol HybridNativePlatformSpec: AnyObject, HybridObjectSpec {
   func getMiniRuntime() throws -> UnistylesNativeMiniRuntime
   func registerPlatformListener(callback: @escaping ((_ dependencies: [UnistyleDependency]) -> Void)) throws -> Void
 }
-
-public extension HybridNativePlatformSpec {
-  /**
-   * Create a new instance of HybridNativePlatformSpecCxx for the given HybridNativePlatformSpec.
-   *
-   * Instances of HybridNativePlatformSpecCxx can be accessed from C++, and contain
-   * additional required bridging code for C++ <> Swift interop.
-   */
-  func createCxxBridge() -> HybridNativePlatformSpecCxx {
-    return HybridNativePlatformSpecCxx(self)
-  }
-}