feat: resolve unistyle not bound

jpudysz · Dec 21, 2024 · f8a137e · f8a137e
1 parent fcf2354
commit f8a137e
Show file tree

Hide file tree

Showing 33 changed files with 264 additions and 517 deletions.
diff --git a/components/native/ActivityIndicator/package.json b/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"
 }
diff --git a/components/native/FlatList/package.json b/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"
 }
diff --git a/components/native/Image/package.json b/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"
 }
diff --git a/components/native/ImageBackground/package.json b/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"
 }
diff --git a/components/native/KeyboardAvoidingView/package.json b/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"
 }
diff --git a/components/native/Pressable/package.json b/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"
 }
diff --git a/components/native/RefreshControl/package.json b/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"
 }
diff --git a/components/native/ScrollView/package.json b/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"
 }
diff --git a/components/native/SectionList/package.json b/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"
 }
diff --git a/components/native/Switch/package.json b/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"
 }
diff --git a/components/native/Text/package.json b/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"
 }
diff --git a/components/native/TextInput/package.json b/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"
 }
diff --git a/components/native/TouchableHighlight/package.json b/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"
 }
diff --git a/components/native/TouchableOpacity/package.json b/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"
 }
diff --git a/components/native/View/package.json b/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"
 }
diff --git a/components/native/VirtualizedList/package.json b/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"
 }
diff --git a/cxx/common/Constants.h b/cxx/common/Constants.h
@@ -2,13 +2,15 @@
 
 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";
+
+// todo verify it
 static const std::string SECRETS = "__uni__secrets";
 static const std::string ARGUMENTS = "__uni__args";
 

diff --git a/cxx/core/IDGenerator.h b/cxx/core/IDGenerator.h
@@ -0,0 +1,16 @@
+#include <atomic>
+
+namespace margelo::nitro::unistyles::helpers {
+
+struct IDGenerator {
+    IDGenerator(unsigned int start = 1): _currentID(start) {}
+
+    int next() {
+        return _currentID.fetch_add(1, std::memory_order_relaxed);
+    }
+
+private:
+    std::atomic<unsigned int> _currentID;
+};
+
+}
diff --git a/cxx/core/RNStyle.h b/cxx/core/RNStyle.h
@@ -2,38 +2,68 @@
 
 #include <jsi/jsi.h>
 #include "Helpers.h"
+#include "Parser.h"
 #include "UnistyleWrapper.h"
 
 namespace margelo::nitro::unistyles::core {
 
-jsi::Object toRNStyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime, Variants&& variants);
-
 jsi::Function createAddVariantsProxyFunction(jsi::Runtime& rt, std::shared_ptr<StyleSheet> stylesheet, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime) {
     auto useVariantsFnName = jsi::PropNameID::forUtf8(rt, helpers::ADD_VARIANTS_FN);
+    auto parser = parser::Parser(unistylesRuntime);
 
-    return jsi::Function::createFromHostFunction(rt, useVariantsFnName, 1, [stylesheet, unistylesRuntime](jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count){
+    return jsi::Function::createFromHostFunction(rt, useVariantsFnName, 1, [stylesheet, unistylesRuntime, &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.");
 
-        // using variants == cloning stylesheet
-        return toRNStyle(rt, stylesheet, unistylesRuntime, helpers::variantsToPairs(rt, arguments[0].asObject(rt)));
+        jsi::Object rnStyle = jsi::Object(rt);
+        Variants variants = helpers::variantsToPairs(rt, arguments[0].asObject(rt));
+
+        // copy hidden properties as they are not enumerable
+        helpers::defineHiddenProperty(rt, rnStyle, helpers::STYLESHEET_ID.c_str(), jsi::Value(stylesheet->tag));
+        helpers::defineHiddenProperty(rt, rnStyle, helpers::STYLESHEET_VARIANTS.c_str(), arguments[0].asObject(rt));
+
+        // copy unaffected styles, or compute new
+        helpers::enumerateJSIObject(rt, thisVal.asObject(rt), [&, stylesheet](const std::string& name, jsi::Value& value){
+            if (name == helpers::ADD_VARIANTS_FN) {
+                rnStyle.setProperty(rt, helpers::ADD_VARIANTS_FN.c_str(), std::move(value));
+
+                return;
+            }
+
+            if (!stylesheet->unistyles.contains(name)) {
+                return;
+            }
+
+            auto unistyle = stylesheet->unistyles[name];
+
+            if (!unistyle->dependsOn(UnistyleDependency::VARIANTS)) {
+                rnStyle.setProperty(rt, name.c_str(), std::move(value));
+
+                return;
+            }
+
+            // compute new value
+            parser.rebuildUnistyle(rt, stylesheet, unistyle, variants, std::nullopt);
+            rnStyle.setProperty(rt, name.c_str(), valueFromUnistyle(rt, unistylesRuntime, unistyle, variants));
+        });
+
+        return rnStyle;
     });
 }
 
 jsi::Object toRNStyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> stylesheet, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime, Variants&& variants) {
     jsi::Object rnStyle = jsi::Object(rt);
-
-    helpers::defineHiddenProperty(rt, rnStyle, helpers::UNISTYLES_ID.c_str(), jsi::Value(stylesheet->tag));
-    helpers::defineHiddenProperty(rt, rnStyle, helpers::STYLE_VARIANTS.c_str(), helpers::variantsToValue(rt, variants));
-
+
+    helpers::defineHiddenProperty(rt, rnStyle, helpers::STYLESHEET_ID.c_str(), jsi::Value(stylesheet->tag));
+    helpers::defineHiddenProperty(rt, rnStyle, helpers::STYLESHEET_VARIANTS.c_str(), helpers::variantsToValue(rt, variants));
     rnStyle.setProperty(rt, helpers::ADD_VARIANTS_FN.c_str(), createAddVariantsProxyFunction(rt, stylesheet, unistylesRuntime));
 
     for (auto& pair: stylesheet->unistyles) {
         auto [propertyName, unistyle] = pair;
 
         rnStyle.setProperty(rt, propertyName.c_str(), valueFromUnistyle(rt, unistylesRuntime, unistyle, variants));
     }
-    
+
     return rnStyle;
 }
 

diff --git a/cxx/core/Unistyle.h b/cxx/core/Unistyle.h
@@ -19,15 +19,16 @@ enum class UnistyleType {
 struct Unistyle {
     using Shared = std::shared_ptr<Unistyle>;
 
-    Unistyle(UnistyleType type, std::string styleKey, jsi::Object& rawObject, std::shared_ptr<StyleSheet> styleSheet)
-        : styleKey{styleKey}, type{type}, rawValue{std::move(rawObject)}, parent{styleSheet} {}
+    Unistyle(unsigned int unid, UnistyleType type, std::string styleKey, jsi::Object& rawObject, std::shared_ptr<StyleSheet> styleSheet)
+        : unid{unid}, styleKey{styleKey}, type{type}, rawValue{std::move(rawObject)}, parent{styleSheet} {}
     virtual ~Unistyle() = default;
 
     Unistyle(const Unistyle&) = delete;
     Unistyle(Unistyle&& other) = delete;
 
     UnistyleType type;
     std::string styleKey;
+    unsigned int unid;
     jsi::Object rawValue;
     std::optional<jsi::Object> parsedStyle;
     std::vector<UnistyleDependency> dependencies{};
@@ -65,8 +66,8 @@ struct UnistyleDynamicFunction: public Unistyle {
     // unprocessedValue <- object generated after calling proxy and user's original function
     // parsedStyle <- parsed with Unistyle's parser
 
-    UnistyleDynamicFunction(UnistyleType type, std::string styleKey, jsi::Object& rawObject, std::shared_ptr<StyleSheet> styleSheet)
-        : Unistyle(type, styleKey, rawObject, styleSheet) {}
+    UnistyleDynamicFunction(unsigned int unid, UnistyleType type, std::string styleKey, jsi::Object& rawObject, std::shared_ptr<StyleSheet> styleSheet)
+        : Unistyle(unid, type, styleKey, rawObject, styleSheet) {}
 
     UnistyleDynamicFunction(const UnistyleDynamicFunction&) = delete;
     UnistyleDynamicFunction(UnistyleDynamicFunction&& other) = delete;