feat: stateless variants

components/native/ActivityIndicator/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/ActivityIndicator.js",
-  "module": "../../../lib/module/components/native/ActivityIndicator.js"
+  "module": "../../../lib/module/components/native/ActivityIndicator.js",
+  "react-native": "../../../src/components/native/ActivityIndicator.tsx"
 }

components/native/FlatList/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/FlatList.js",
-  "module": "../../../lib/module/components/native/FlatList.js"
+  "module": "../../../lib/module/components/native/FlatList.js",
+  "react-native": "../../../src/components/native/FlatList.tsx"
 }

components/native/Image/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/Image.js",
-  "module": "../../../lib/module/components/native/Image.js"
+  "module": "../../../lib/module/components/native/Image.js",
+  "react-native": "../../../src/components/native/Image.tsx"
 }

components/native/ImageBackground/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/ImageBackground.js",
-  "module": "../../../lib/module/components/native/ImageBackground.js"
+  "module": "../../../lib/module/components/native/ImageBackground.js",
+  "react-native": "../../../src/components/native/ImageBackground.native.tsx"
 }

components/native/KeyboardAvoidingView/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/KeyboardAvoidingView.js",
-  "module": "../../../lib/module/components/native/KeyboardAvoidingView.js"
+  "module": "../../../lib/module/components/native/KeyboardAvoidingView.js",
+  "react-native": "../../../src/components/native/KeyboardAvoidingView.tsx"
 }

components/native/Pressable/package.json

@@ -1,5 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/Pressable.js",
   "module": "../../../lib/module/components/native/Pressable.js",
-  "react-native": "../../../lib/commonjs/components/native/Pressable.native.js"
+  "react-native": "../../../src/components/native/Pressable.native.tsx"
 }

components/native/RefreshControl/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/RefreshControl.js",
-  "module": "../../../lib/module/components/native/RefreshControl.js"
+  "module": "../../../lib/module/components/native/RefreshControl.js",
+  "react-native": "../../../src/components/native/RefreshControl.tsx"
 }

components/native/ScrollView/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/ScrollView.js",
-  "module": "../../../lib/module/components/native/ScrollView.js"
+  "module": "../../../lib/module/components/native/ScrollView.js",
+  "react-native": "../../../src/components/native/ScrollView.tsx"
 }

components/native/SectionList/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/SectionList.js",
-  "module": "../../../lib/module/components/native/SectionList.js"
+  "module": "../../../lib/module/components/native/SectionList.js",
+  "react-native": "../../../src/components/native/SectionList.tsx"
 }

components/native/Switch/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/Switch.js",
-  "module": "../../../lib/module/components/native/Switch.js"
+  "module": "../../../lib/module/components/native/Switch.js",
+  "react-native": "../../../src/components/native/Switch.tsx"
 }

components/native/Text/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/Text.js",
-  "module": "../../../lib/module/components/native/Text.js"
+  "module": "../../../lib/module/components/native/Text.js",
+  "react-native": "../../../src/components/native/Text.tsx"
 }

components/native/TextInput/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/TextInput.js",
-  "module": "../../../lib/module/components/native/TextInput.js"
+  "module": "../../../lib/module/components/native/TextInput.js",
+  "react-native": "../../../src/components/native/TextInput.tsx"
 }

components/native/TouchableHighlight/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/TouchableHighlight.js",
-  "module": "../../../lib/module/components/native/TouchableHighlight.js"
+  "module": "../../../lib/module/components/native/TouchableHighlight.js",
+  "react-native": "../../../src/components/native/TouchableHighlight.tsx"
 }

components/native/TouchableOpacity/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/TouchableOpacity.js",
-  "module": "../../../lib/module/components/native/TouchableOpacity.js"
+  "module": "../../../lib/module/components/native/TouchableOpacity.js",
+  "react-native": "../../../src/components/native/TouchableOpacity.tsx"
 }

components/native/View/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/View.js",
-  "module": "../../../lib/module/components/native/View.js"
+  "module": "../../../lib/module/components/native/View.js",
+  "react-native": "../../../src/components/native/View.tsx"
 }

components/native/VirtualizedList/package.json

@@ -1,4 +1,5 @@
 {
   "main": "../../../lib/commonjs/components/native/VirtualizedList.js",
-  "module": "../../../lib/module/components/native/VirtualizedList.js"
+  "module": "../../../lib/module/components/native/VirtualizedList.js",
+  "react-native": "../../../src/components/native/VirtualizedList.tsx"
 }

cxx/common/Constants.h

@@ -2,14 +2,14 @@
 
 namespace margelo::nitro::unistyles::helpers {
 
-static const std::string UNISTYLES_ID = "__unid";
+static const std::string STYLESHEET_ID = "__stylesheetID";
+static const std::string UNISTYLE_ID = "__unistyleID";
 static const std::string ADD_VARIANTS_FN = "useVariants";
 static const std::string STYLE_DEPENDENCIES = "uni__dependencies";
-static const std::string STYLE_VARIANTS = "uni__variants";
+static const std::string STYLESHEET_VARIANTS = "__stylesheetVariants";
 static const std::string WEB_STYLE_KEY = "_web";
 static const std::string EXOTIC_STYLE_KEY = "_exotic";
-static const std::string NAME_STYLE_KEY = "__unistyles_name";
-static const std::string SECRETS = "__uni__secrets";
 static const std::string ARGUMENTS = "__uni__args";
+static const std::string GET_STYLES = "uni__getStyles";
 
 }

cxx/common/Helpers.h

@@ -147,7 +147,7 @@ inline jsi::Object variantsToValue(jsi::Runtime& rt, Variants& variants) {
     return rawVariants;
 }
 
-inline std::vector<folly::dynamic> parseDynamicFunctionArguments(jsi::Runtime& rt, jsi::Array&& arguments) {
+inline std::vector<folly::dynamic> parseDynamicFunctionArguments(jsi::Runtime& rt, jsi::Array& arguments) {
     std::vector<folly::dynamic> parsedArgument{};
     size_t count = arguments.size(rt);
 

cxx/core/HashGenerator.h

@@ -0,0 +1,30 @@
+#include <string>
+#include <sstream>
+#include <iomanip>
+#include <atomic>
+#include <iostream>
+#include <functional>
+
+namespace margelo::nitro::unistyles::helpers {
+
+
+struct HashGenerator {
+    static std::atomic<unsigned int> count;
+
+    static std::string generateHash(const std::string& input) {
+        std::hash<std::string> stringHasher;
+        uint64_t inputHash = stringHasher(input);
+
+        unsigned int counterValue = count.fetch_add(1, std::memory_order_relaxed);
+        uint64_t combinedHash = inputHash ^ (static_cast<uint64_t>(counterValue) << 32);
+
+        std::stringstream ss;
+        ss << std::hex << std::setfill('0') << std::setw(8) << (combinedHash & 0xFFFFFFFF);
+
+        return "unistyles-" + ss.str();
+    }
+};
+
+std::atomic<unsigned int> HashGenerator::count(0);
+
+}

cxx/core/HostUnistyle.cpp

@@ -0,0 +1,73 @@
+#include "HostUnistyle.h"
+
+using namespace margelo::nitro::unistyles::core;
+using namespace facebook;
+
+std::vector<jsi::PropNameID> HostUnistyle::getPropertyNames(jsi::Runtime& rt) {
+    auto propertyNames = std::vector<jsi::PropNameID> {};
+
+    propertyNames.reserve(8);
+
+    for (const auto& pair : this->_stylesheet->unistyles) {
+        propertyNames.emplace_back(jsi::PropNameID::forUtf8(rt, pair.first));
+    }
+
+    propertyNames.emplace_back(jsi::PropNameID::forUtf8(rt, helpers::ADD_VARIANTS_FN.c_str()));
+
+    return propertyNames;
+}
+
+jsi::Value HostUnistyle::get(jsi::Runtime& rt, const jsi::PropNameID& propNameId) {
+    auto propertyName = propNameId.utf8(rt);
+
+    if (propertyName == helpers::STYLESHEET_ID.c_str()) {
+        return jsi::Value(this->_stylesheet->tag);
+    }
+
+    if (propertyName == helpers::STYLESHEET_VARIANTS.c_str()) {
+        return helpers::variantsToValue(rt, this->_variants);
+    }
+
+    if (propertyName == helpers::ADD_VARIANTS_FN.c_str()) {
+        return this->createAddVariantsProxyFunction(rt);
+    }
+
+    if (!this->_stylesheet->unistyles.contains(propertyName)) {
+        return jsi::Value::undefined();
+    }
+
+    return valueFromUnistyle(rt, this->_unistylesRuntime, this->_stylesheet->unistyles[propertyName], this->_variants);
+}
+
+void HostUnistyle::set(jsi::Runtime& rt, const jsi::PropNameID& propNameId, const jsi::Value& value) {}
+
+jsi::Function HostUnistyle::createAddVariantsProxyFunction(jsi::Runtime& rt) {
+    auto useVariantsFnName = jsi::PropNameID::forUtf8(rt, helpers::ADD_VARIANTS_FN);
+    auto parser = parser::Parser(this->_unistylesRuntime);
+
+    return jsi::Function::createFromHostFunction(rt, useVariantsFnName, 1, [this, &parser](jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count){
+        helpers::assertThat(rt, count == 1, "Unistyles: useVariants expected to be called with one argument.");
+        helpers::assertThat(rt, arguments[0].isObject(), "Unistyles: useVariants expected to be called with object.");
+
+        Variants variants = helpers::variantsToPairs(rt, arguments[0].asObject(rt));
+
+        helpers::enumerateJSIObject(rt, thisVal.asObject(rt), [this, &parser, &rt, &variants](const std::string& name, jsi::Value& value){
+            if (name == helpers::ADD_VARIANTS_FN || !this->_stylesheet->unistyles.contains(name)) {
+                return;
+            }
+
+            auto unistyle = this->_stylesheet->unistyles[name];
+
+            if (unistyle->dependsOn(UnistyleDependency::VARIANTS)) {
+                parser.rebuildUnistyle(rt, unistyle, variants, std::nullopt);
+            }
+        });
+
+        this->_variants = variants;
+
+        auto style = std::make_shared<core::HostUnistyle>(this->_stylesheet, this->_unistylesRuntime, variants);
+        auto styleHostObject = jsi::Object::createFromHostObject(rt, style);
+
+        return styleHostObject;
+    });
+}

cxx/core/HostUnistyle.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <jsi/jsi.h>
+#include "Parser.h"
+#include "UnistyleWrapper.h"
+
+namespace margelo::nitro::unistyles::core {
+
+using Variants = std::vector<std::pair<std::string, std::string>>;
+
+struct JSI_EXPORT HostUnistyle : public jsi::HostObject {
+    HostUnistyle(std::shared_ptr<StyleSheet> stylesheet, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime, Variants& variants)
+        : _stylesheet(stylesheet), _unistylesRuntime{unistylesRuntime}, _variants{std::move(variants)} {};
+
+    std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& rt);
+    jsi::Value get(jsi::Runtime& rt, const jsi::PropNameID& propNameId);
+    void set(jsi::Runtime& rt, const jsi::PropNameID& propNameId, const jsi::Value& value);
+
+    jsi::Function createAddVariantsProxyFunction(jsi::Runtime& rt);
+
+private:
+    Variants _variants;
+    std::shared_ptr<StyleSheet> _stylesheet;
+    std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;
+};
+
+}