@shopify/react-native-skia 0.1.155 → 0.1.157

package/cpp/api/third_party/CSSColorParser.h

@@ -24,111 +24,187 @@
 
 #pragma once
 
+#include <algorithm>
+#include <cmath>
 #include <cstdint>
-#include <vector>
 #include <sstream>
-#include <algorithm>
 #include <string>
-#include <cmath>
+#include <vector>
 
 namespace CSSColorParser {
 
-    struct Color {
-        inline Color() {
-        }
-        inline Color(unsigned char r_, unsigned char g_, unsigned char b_, float a_)
-                : r(r_), g(g_), b(b_), a(a_ > 1 ? 1 : a_ < 0 ? 0 : a_) {
-        }
-        unsigned char r = 0, g = 0, b = 0;
-        float a = -1.0f;
-    };
+struct Color {
+  inline Color() {}
+  inline Color(unsigned char r_, unsigned char g_, unsigned char b_, float a_)
+      : r(r_), g(g_), b(b_), a(a_ > 1   ? 1
+                               : a_ < 0 ? 0
+                                        : a_) {}
+  unsigned char r = 0, g = 0, b = 0;
+  float a = -1.0f;
+};
 
-    struct NamedColor { const char *const name; const Color color; };
+struct NamedColor {
+  const char *const name;
+  const Color color;
+};
 
-    const NamedColor namedColors[] = {
-            { "transparent", { 0, 0, 0, 0 } }, { "aliceblue", { 240, 248, 255, 1 } },
-            { "antiquewhite", { 250, 235, 215, 1 } }, { "aqua", { 0, 255, 255, 1 } },
-            { "aquamarine", { 127, 255, 212, 1 } }, { "azure", { 240, 255, 255, 1 } },
-            { "beige", { 245, 245, 220, 1 } }, { "bisque", { 255, 228, 196, 1 } },
-            { "black", { 0, 0, 0, 1 } }, { "blanchedalmond", { 255, 235, 205, 1 } },
-            { "blue", { 0, 0, 255, 1 } }, { "blueviolet", { 138, 43, 226, 1 } },
-            { "brown", { 165, 42, 42, 1 } }, { "burlywood", { 222, 184, 135, 1 } },
-            { "cadetblue", { 95, 158, 160, 1 } }, { "chartreuse", { 127, 255, 0, 1 } },
-            { "chocolate", { 210, 105, 30, 1 } }, { "coral", { 255, 127, 80, 1 } },
-            { "cornflowerblue", { 100, 149, 237, 1 } }, { "cornsilk", { 255, 248, 220, 1 } },
-            { "crimson", { 220, 20, 60, 1 } }, { "cyan", { 0, 255, 255, 1 } },
-            { "darkblue", { 0, 0, 139, 1 } }, { "darkcyan", { 0, 139, 139, 1 } },
-            { "darkgoldenrod", { 184, 134, 11, 1 } }, { "darkgray", { 169, 169, 169, 1 } },
-            { "darkgreen", { 0, 100, 0, 1 } }, { "darkgrey", { 169, 169, 169, 1 } },
-            { "darkkhaki", { 189, 183, 107, 1 } }, { "darkmagenta", { 139, 0, 139, 1 } },
-            { "darkolivegreen", { 85, 107, 47, 1 } }, { "darkorange", { 255, 140, 0, 1 } },
-            { "darkorchid", { 153, 50, 204, 1 } }, { "darkred", { 139, 0, 0, 1 } },
-            { "darksalmon", { 233, 150, 122, 1 } }, { "darkseagreen", { 143, 188, 143, 1 } },
-            { "darkslateblue", { 72, 61, 139, 1 } }, { "darkslategray", { 47, 79, 79, 1 } },
-            { "darkslategrey", { 47, 79, 79, 1 } }, { "darkturquoise", { 0, 206, 209, 1 } },
-            { "darkviolet", { 148, 0, 211, 1 } }, { "deeppink", { 255, 20, 147, 1 } },
-            { "deepskyblue", { 0, 191, 255, 1 } }, { "dimgray", { 105, 105, 105, 1 } },
-            { "dimgrey", { 105, 105, 105, 1 } }, { "dodgerblue", { 30, 144, 255, 1 } },
-            { "firebrick", { 178, 34, 34, 1 } }, { "floralwhite", { 255, 250, 240, 1 } },
-            { "forestgreen", { 34, 139, 34, 1 } }, { "fuchsia", { 255, 0, 255, 1 } },
-            { "gainsboro", { 220, 220, 220, 1 } }, { "ghostwhite", { 248, 248, 255, 1 } },
-            { "gold", { 255, 215, 0, 1 } }, { "goldenrod", { 218, 165, 32, 1 } },
-            { "gray", { 128, 128, 128, 1 } }, { "green", { 0, 128, 0, 1 } },
-            { "greenyellow", { 173, 255, 47, 1 } }, { "grey", { 128, 128, 128, 1 } },
-            { "honeydew", { 240, 255, 240, 1 } }, { "hotpink", { 255, 105, 180, 1 } },
-            { "indianred", { 205, 92, 92, 1 } }, { "indigo", { 75, 0, 130, 1 } },
-            { "ivory", { 255, 255, 240, 1 } }, { "khaki", { 240, 230, 140, 1 } },
-            { "lavender", { 230, 230, 250, 1 } }, { "lavenderblush", { 255, 240, 245, 1 } },
-            { "lawngreen", { 124, 252, 0, 1 } }, { "lemonchiffon", { 255, 250, 205, 1 } },
-            { "lightblue", { 173, 216, 230, 1 } }, { "lightcoral", { 240, 128, 128, 1 } },
-            { "lightcyan", { 224, 255, 255, 1 } }, { "lightgoldenrodyellow", { 250, 250, 210, 1 } },
-            { "lightgray", { 211, 211, 211, 1 } }, { "lightgreen", { 144, 238, 144, 1 } },
-            { "lightgrey", { 211, 211, 211, 1 } }, { "lightpink", { 255, 182, 193, 1 } },
-            { "lightsalmon", { 255, 160, 122, 1 } }, { "lightseagreen", { 32, 178, 170, 1 } },
-            { "lightskyblue", { 135, 206, 250, 1 } }, { "lightslategray", { 119, 136, 153, 1 } },
-            { "lightslategrey", { 119, 136, 153, 1 } }, { "lightsteelblue", { 176, 196, 222, 1 } },
-            { "lightyellow", { 255, 255, 224, 1 } }, { "lime", { 0, 255, 0, 1 } },
-            { "limegreen", { 50, 205, 50, 1 } }, { "linen", { 250, 240, 230, 1 } },
-            { "magenta", { 255, 0, 255, 1 } }, { "maroon", { 128, 0, 0, 1 } },
-            { "mediumaquamarine", { 102, 205, 170, 1 } }, { "mediumblue", { 0, 0, 205, 1 } },
-            { "mediumorchid", { 186, 85, 211, 1 } }, { "mediumpurple", { 147, 112, 219, 1 } },
-            { "mediumseagreen", { 60, 179, 113, 1 } }, { "mediumslateblue", { 123, 104, 238, 1 } },
-            { "mediumspringgreen", { 0, 250, 154, 1 } }, { "mediumturquoise", { 72, 209, 204, 1 } },
-            { "mediumvioletred", { 199, 21, 133, 1 } }, { "midnightblue", { 25, 25, 112, 1 } },
-            { "mintcream", { 245, 255, 250, 1 } }, { "mistyrose", { 255, 228, 225, 1 } },
-            { "moccasin", { 255, 228, 181, 1 } }, { "navajowhite", { 255, 222, 173, 1 } },
-            { "navy", { 0, 0, 128, 1 } }, { "oldlace", { 253, 245, 230, 1 } },
-            { "olive", { 128, 128, 0, 1 } }, { "olivedrab", { 107, 142, 35, 1 } },
-            { "orange", { 255, 165, 0, 1 } }, { "orangered", { 255, 69, 0, 1 } },
-            { "orchid", { 218, 112, 214, 1 } }, { "palegoldenrod", { 238, 232, 170, 1 } },
-            { "palegreen", { 152, 251, 152, 1 } }, { "paleturquoise", { 175, 238, 238, 1 } },
-            { "palevioletred", { 219, 112, 147, 1 } }, { "papayawhip", { 255, 239, 213, 1 } },
-            { "peachpuff", { 255, 218, 185, 1 } }, { "peru", { 205, 133, 63, 1 } },
-            { "pink", { 255, 192, 203, 1 } }, { "plum", { 221, 160, 221, 1 } },
-            { "powderblue", { 176, 224, 230, 1 } }, { "purple", { 128, 0, 128, 1 } },
-            { "red", { 255, 0, 0, 1 } }, { "rosybrown", { 188, 143, 143, 1 } },
-            { "royalblue", { 65, 105, 225, 1 } }, { "saddlebrown", { 139, 69, 19, 1 } },
-            { "salmon", { 250, 128, 114, 1 } }, { "sandybrown", { 244, 164, 96, 1 } },
-            { "seagreen", { 46, 139, 87, 1 } }, { "seashell", { 255, 245, 238, 1 } },
-            { "sienna", { 160, 82, 45, 1 } }, { "silver", { 192, 192, 192, 1 } },
-            { "skyblue", { 135, 206, 235, 1 } }, { "slateblue", { 106, 90, 205, 1 } },
-            { "slategray", { 112, 128, 144, 1 } }, { "slategrey", { 112, 128, 144, 1 } },
-            { "snow", { 255, 250, 250, 1 } }, { "springgreen", { 0, 255, 127, 1 } },
-            { "steelblue", { 70, 130, 180, 1 } }, { "tan", { 210, 180, 140, 1 } },
-            { "teal", { 0, 128, 128, 1 } }, { "thistle", { 216, 191, 216, 1 } },
-            { "tomato", { 255, 99, 71, 1 } }, { "turquoise", { 64, 224, 208, 1 } },
-            { "violet", { 238, 130, 238, 1 } }, { "wheat", { 245, 222, 179, 1 } },
-            { "white", { 255, 255, 255, 1 } }, { "whitesmoke", { 245, 245, 245, 1 } },
-            { "yellow", { 255, 255, 0, 1 } }, { "yellowgreen", { 154, 205, 50, 1 } }
-    };
+const NamedColor namedColors[] = {{"transparent", {0, 0, 0, 0}},
+                                  {"aliceblue", {240, 248, 255, 1}},
+                                  {"antiquewhite", {250, 235, 215, 1}},
+                                  {"aqua", {0, 255, 255, 1}},
+                                  {"aquamarine", {127, 255, 212, 1}},
+                                  {"azure", {240, 255, 255, 1}},
+                                  {"beige", {245, 245, 220, 1}},
+                                  {"bisque", {255, 228, 196, 1}},
+                                  {"black", {0, 0, 0, 1}},
+                                  {"blanchedalmond", {255, 235, 205, 1}},
+                                  {"blue", {0, 0, 255, 1}},
+                                  {"blueviolet", {138, 43, 226, 1}},
+                                  {"brown", {165, 42, 42, 1}},
+                                  {"burlywood", {222, 184, 135, 1}},
+                                  {"cadetblue", {95, 158, 160, 1}},
+                                  {"chartreuse", {127, 255, 0, 1}},
+                                  {"chocolate", {210, 105, 30, 1}},
+                                  {"coral", {255, 127, 80, 1}},
+                                  {"cornflowerblue", {100, 149, 237, 1}},
+                                  {"cornsilk", {255, 248, 220, 1}},
+                                  {"crimson", {220, 20, 60, 1}},
+                                  {"cyan", {0, 255, 255, 1}},
+                                  {"darkblue", {0, 0, 139, 1}},
+                                  {"darkcyan", {0, 139, 139, 1}},
+                                  {"darkgoldenrod", {184, 134, 11, 1}},
+                                  {"darkgray", {169, 169, 169, 1}},
+                                  {"darkgreen", {0, 100, 0, 1}},
+                                  {"darkgrey", {169, 169, 169, 1}},
+                                  {"darkkhaki", {189, 183, 107, 1}},
+                                  {"darkmagenta", {139, 0, 139, 1}},
+                                  {"darkolivegreen", {85, 107, 47, 1}},
+                                  {"darkorange", {255, 140, 0, 1}},
+                                  {"darkorchid", {153, 50, 204, 1}},
+                                  {"darkred", {139, 0, 0, 1}},
+                                  {"darksalmon", {233, 150, 122, 1}},
+                                  {"darkseagreen", {143, 188, 143, 1}},
+                                  {"darkslateblue", {72, 61, 139, 1}},
+                                  {"darkslategray", {47, 79, 79, 1}},
+                                  {"darkslategrey", {47, 79, 79, 1}},
+                                  {"darkturquoise", {0, 206, 209, 1}},
+                                  {"darkviolet", {148, 0, 211, 1}},
+                                  {"deeppink", {255, 20, 147, 1}},
+                                  {"deepskyblue", {0, 191, 255, 1}},
+                                  {"dimgray", {105, 105, 105, 1}},
+                                  {"dimgrey", {105, 105, 105, 1}},
+                                  {"dodgerblue", {30, 144, 255, 1}},
+                                  {"firebrick", {178, 34, 34, 1}},
+                                  {"floralwhite", {255, 250, 240, 1}},
+                                  {"forestgreen", {34, 139, 34, 1}},
+                                  {"fuchsia", {255, 0, 255, 1}},
+                                  {"gainsboro", {220, 220, 220, 1}},
+                                  {"ghostwhite", {248, 248, 255, 1}},
+                                  {"gold", {255, 215, 0, 1}},
+                                  {"goldenrod", {218, 165, 32, 1}},
+                                  {"gray", {128, 128, 128, 1}},
+                                  {"green", {0, 128, 0, 1}},
+                                  {"greenyellow", {173, 255, 47, 1}},
+                                  {"grey", {128, 128, 128, 1}},
+                                  {"honeydew", {240, 255, 240, 1}},
+                                  {"hotpink", {255, 105, 180, 1}},
+                                  {"indianred", {205, 92, 92, 1}},
+                                  {"indigo", {75, 0, 130, 1}},
+                                  {"ivory", {255, 255, 240, 1}},
+                                  {"khaki", {240, 230, 140, 1}},
+                                  {"lavender", {230, 230, 250, 1}},
+                                  {"lavenderblush", {255, 240, 245, 1}},
+                                  {"lawngreen", {124, 252, 0, 1}},
+                                  {"lemonchiffon", {255, 250, 205, 1}},
+                                  {"lightblue", {173, 216, 230, 1}},
+                                  {"lightcoral", {240, 128, 128, 1}},
+                                  {"lightcyan", {224, 255, 255, 1}},
+                                  {"lightgoldenrodyellow", {250, 250, 210, 1}},
+                                  {"lightgray", {211, 211, 211, 1}},
+                                  {"lightgreen", {144, 238, 144, 1}},
+                                  {"lightgrey", {211, 211, 211, 1}},
+                                  {"lightpink", {255, 182, 193, 1}},
+                                  {"lightsalmon", {255, 160, 122, 1}},
+                                  {"lightseagreen", {32, 178, 170, 1}},
+                                  {"lightskyblue", {135, 206, 250, 1}},
+                                  {"lightslategray", {119, 136, 153, 1}},
+                                  {"lightslategrey", {119, 136, 153, 1}},
+                                  {"lightsteelblue", {176, 196, 222, 1}},
+                                  {"lightyellow", {255, 255, 224, 1}},
+                                  {"lime", {0, 255, 0, 1}},
+                                  {"limegreen", {50, 205, 50, 1}},
+                                  {"linen", {250, 240, 230, 1}},
+                                  {"magenta", {255, 0, 255, 1}},
+                                  {"maroon", {128, 0, 0, 1}},
+                                  {"mediumaquamarine", {102, 205, 170, 1}},
+                                  {"mediumblue", {0, 0, 205, 1}},
+                                  {"mediumorchid", {186, 85, 211, 1}},
+                                  {"mediumpurple", {147, 112, 219, 1}},
+                                  {"mediumseagreen", {60, 179, 113, 1}},
+                                  {"mediumslateblue", {123, 104, 238, 1}},
+                                  {"mediumspringgreen", {0, 250, 154, 1}},
+                                  {"mediumturquoise", {72, 209, 204, 1}},
+                                  {"mediumvioletred", {199, 21, 133, 1}},
+                                  {"midnightblue", {25, 25, 112, 1}},
+                                  {"mintcream", {245, 255, 250, 1}},
+                                  {"mistyrose", {255, 228, 225, 1}},
+                                  {"moccasin", {255, 228, 181, 1}},
+                                  {"navajowhite", {255, 222, 173, 1}},
+                                  {"navy", {0, 0, 128, 1}},
+                                  {"oldlace", {253, 245, 230, 1}},
+                                  {"olive", {128, 128, 0, 1}},
+                                  {"olivedrab", {107, 142, 35, 1}},
+                                  {"orange", {255, 165, 0, 1}},
+                                  {"orangered", {255, 69, 0, 1}},
+                                  {"orchid", {218, 112, 214, 1}},
+                                  {"palegoldenrod", {238, 232, 170, 1}},
+                                  {"palegreen", {152, 251, 152, 1}},
+                                  {"paleturquoise", {175, 238, 238, 1}},
+                                  {"palevioletred", {219, 112, 147, 1}},
+                                  {"papayawhip", {255, 239, 213, 1}},
+                                  {"peachpuff", {255, 218, 185, 1}},
+                                  {"peru", {205, 133, 63, 1}},
+                                  {"pink", {255, 192, 203, 1}},
+                                  {"plum", {221, 160, 221, 1}},
+                                  {"powderblue", {176, 224, 230, 1}},
+                                  {"purple", {128, 0, 128, 1}},
+                                  {"red", {255, 0, 0, 1}},
+                                  {"rosybrown", {188, 143, 143, 1}},
+                                  {"royalblue", {65, 105, 225, 1}},
+                                  {"saddlebrown", {139, 69, 19, 1}},
+                                  {"salmon", {250, 128, 114, 1}},
+                                  {"sandybrown", {244, 164, 96, 1}},
+                                  {"seagreen", {46, 139, 87, 1}},
+                                  {"seashell", {255, 245, 238, 1}},
+                                  {"sienna", {160, 82, 45, 1}},
+                                  {"silver", {192, 192, 192, 1}},
+                                  {"skyblue", {135, 206, 235, 1}},
+                                  {"slateblue", {106, 90, 205, 1}},
+                                  {"slategray", {112, 128, 144, 1}},
+                                  {"slategrey", {112, 128, 144, 1}},
+                                  {"snow", {255, 250, 250, 1}},
+                                  {"springgreen", {0, 255, 127, 1}},
+                                  {"steelblue", {70, 130, 180, 1}},
+                                  {"tan", {210, 180, 140, 1}},
+                                  {"teal", {0, 128, 128, 1}},
+                                  {"thistle", {216, 191, 216, 1}},
+                                  {"tomato", {255, 99, 71, 1}},
+                                  {"turquoise", {64, 224, 208, 1}},
+                                  {"violet", {238, 130, 238, 1}},
+                                  {"wheat", {245, 222, 179, 1}},
+                                  {"white", {255, 255, 255, 1}},
+                                  {"whitesmoke", {245, 245, 245, 1}},
+                                  {"yellow", {255, 255, 0, 1}},
+                                  {"yellowgreen", {154, 205, 50, 1}}};
 
-    inline bool operator==(const Color& lhs, const Color& rhs) {
-        return lhs.r == rhs.r && lhs.g == rhs.g && lhs.b == rhs.b && ::fabs(lhs.a - rhs.a) < 0.0001f;
-    }
+inline bool operator==(const Color &lhs, const Color &rhs) {
+  return lhs.r == rhs.r && lhs.g == rhs.g && lhs.b == rhs.b &&
+         ::fabs(lhs.a - rhs.a) < 0.0001f;
+}
 
-    inline bool operator!=(const Color& lhs, const Color& rhs) {
-        return !(lhs == rhs);
-    }
+inline bool operator!=(const Color &lhs, const Color &rhs) {
+  return !(lhs == rhs);
+}
 
-    Color parse(const std::string& css_str);
+Color parse(const std::string &css_str);
 } // namespace CSSColorParser

package/cpp/jsi/JsiHostObject.cpp

@@ -33,7 +33,7 @@ JsiHostObject::~JsiHostObject() {
 
 void JsiHostObject::set(jsi::Runtime &rt, const jsi::PropNameID &name,
                         const jsi::Value &value) {
-  
+
   auto nameVal = name.utf8(rt);
   auto nameStr = nameVal.c_str();
 
@@ -56,7 +56,7 @@ jsi::Value JsiHostObject::get(jsi::Runtime &runtime,
                               const jsi::PropNameID &name) {
   auto nameVal = name.utf8(runtime);
   auto nameStr = nameVal.c_str();
-  
+
   // Check the static getters map
   const JsiPropertyGettersMap &getters = getExportedPropertyGettersMap();
   auto getter = getters.find(nameStr);
@@ -86,9 +86,10 @@ jsi::Value JsiHostObject::get(jsi::Runtime &runtime,
   const JsiFunctionMap &funcs = getExportedFunctionMap();
   auto func = funcs.find(nameStr);
   if (func != funcs.end()) {
-    auto dispatcher = std::bind(func->second, (JsiHostObject *)this,
-                                std::placeholders::_1, std::placeholders::_2,
-                                std::placeholders::_3, std::placeholders::_4);
+    auto dispatcher =
+        std::bind(func->second, reinterpret_cast<JsiHostObject *>(this),
+                  std::placeholders::_1, std::placeholders::_2,
+                  std::placeholders::_3, std::placeholders::_4);
 
     // Add to cache
     currentCache->emplace(nameStr, std::make_unique<jsi::Function>(
@@ -115,16 +116,17 @@ jsi::Value JsiHostObject::get(jsi::Runtime &runtime,
 std::vector<jsi::PropNameID>
 JsiHostObject::getPropertyNames(jsi::Runtime &runtime) {
   // statically exported functions
-  const auto& funcs = getExportedFunctionMap();
+  const auto &funcs = getExportedFunctionMap();
 
   // Statically exported property getters
-  const auto& getters = getExportedPropertyGettersMap();
+  const auto &getters = getExportedPropertyGettersMap();
 
   // Statically exported property setters
-  const auto& setters = getExportedPropertySettersMap();
+  const auto &setters = getExportedPropertySettersMap();
 
   std::vector<jsi::PropNameID> propNames;
-  propNames.reserve(funcs.size() + getters.size() + setters.size() + _funcMap.size() + _propMap.size());
+  propNames.reserve(funcs.size() + getters.size() + setters.size() +
+                    _funcMap.size() + _propMap.size());
 
   for (auto it = funcs.cbegin(); it != funcs.cend(); ++it) {
     propNames.push_back(jsi::PropNameID::forAscii(runtime, it->first));

package/cpp/jsi/JsiHostObject.h

@@ -3,9 +3,10 @@
 #include <jsi/jsi.h>
 
 #include <functional>
-#include <unordered_map>
 #include <memory>
 #include <string>
+#include <unordered_map>
+#include <vector>
 
 #define STR_CAT_NX(A, B) A##B
 #define STR_CAT(A, B) STR_CAT_NX(A, B)
@@ -44,7 +45,7 @@
  */
 #define JSI_EXPORT_FUNC(CLASS, FUNCTION)                                       \
   {                                                                            \
-#FUNCTION, (jsi::Value(JsiHostObject::*)(                                      \
+#FUNCTION, (jsi::Value(JsiHostObject::*)(                                  \
                    jsi::Runtime & runtime, const jsi::Value &thisValue,        \
                    const jsi::Value *arguments, size_t)) &                     \
                    CLASS::FUNCTION                                             \
@@ -54,8 +55,8 @@
  * Creates a JSI export functions statement
  */
 #define JSI_EXPORT_FUNCTIONS(...)                                              \
-  const JsiFunctionMap &getExportedFunctionMap() override {                    \
-    static JsiFunctionMap map = {__VA_ARGS__};                                 \
+  const RNJsi::JsiFunctionMap &getExportedFunctionMap() override {             \
+    static RNJsi::JsiFunctionMap map = {__VA_ARGS__};                          \
     return map;                                                                \
   }
 
@@ -64,7 +65,7 @@
  */
 #define JSI_EXPORT_PROP_GET(CLASS, FUNCTION)                                   \
   {                                                                            \
-#FUNCTION, (jsi::Value(JsiHostObject::*)(jsi::Runtime & runtime)) &            \
+#FUNCTION, (jsi::Value(JsiHostObject::*)(jsi::Runtime & runtime)) &        \
                    CLASS::STR_CAT(STR_GET, FUNCTION)                           \
   }
 
@@ -72,17 +73,18 @@
  * Creates a JSI export getters statement
  */
 #define JSI_EXPORT_PROPERTY_GETTERS(...)                                       \
-  const JsiPropertyGettersMap &getExportedPropertyGettersMap() override {      \
-  static JsiPropertyGettersMap map = {__VA_ARGS__};                            \
-  return map;                                                                  \
-}
+  const RNJsi::JsiPropertyGettersMap &getExportedPropertyGettersMap()          \
+      override {                                                               \
+    static RNJsi::JsiPropertyGettersMap map = {__VA_ARGS__};                   \
+    return map;                                                                \
+  }
 
 /**
  * Creates a JSI export setter declaration
  */
 #define JSI_EXPORT_PROP_SET(CLASS, FUNCTION)                                   \
   {                                                                            \
-#FUNCTION,                                                                     \
+#FUNCTION,                                                                 \
         (void(JsiHostObject::*)(jsi::Runtime & runtime, const jsi::Value &)) & \
             CLASS::STR_CAT(STR_SET, FUNCTION)                                  \
   }
@@ -91,14 +93,15 @@
  * Creates a JSI export setters statement
  */
 #define JSI_EXPORT_PROPERTY_SETTERS(...)                                       \
-  const JsiPropertySettersMap &getExportedPropertySettersMap() override {      \
-    static JsiPropertySettersMap map = {__VA_ARGS__};                          \
+  const RNJsi::JsiPropertySettersMap &getExportedPropertySettersMap()          \
+      override {                                                               \
+    static RNJsi::JsiPropertySettersMap map = {__VA_ARGS__};                   \
     return map;                                                                \
   }
 
 namespace RNJsi {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 using JsPropertyType = struct {
   std::function<jsi::Value(jsi::Runtime &)> get;
@@ -107,14 +110,18 @@ using JsPropertyType = struct {
 
 class JsiHostObject;
 
-using JsiFunctionMap = std::unordered_map<std::string,
-  jsi::Value (JsiHostObject::*)(jsi::Runtime &, const jsi::Value &, const jsi::Value *, size_t)>;
+using JsiFunctionMap =
+    std::unordered_map<std::string, jsi::Value (JsiHostObject::*)(
+                                        jsi::Runtime &, const jsi::Value &,
+                                        const jsi::Value *, size_t)>;
 
-using JsiPropertyGettersMap = std::unordered_map<std::string,
-  jsi::Value (JsiHostObject::*)(jsi::Runtime &)>;
+using JsiPropertyGettersMap =
+    std::unordered_map<std::string,
+                       jsi::Value (JsiHostObject::*)(jsi::Runtime &)>;
 
-using JsiPropertySettersMap = std::unordered_map<std::string,
-  void (JsiHostObject::*)(jsi::Runtime &, const jsi::Value &)>;
+using JsiPropertySettersMap =
+    std::unordered_map<std::string, void (JsiHostObject::*)(
+                                        jsi::Runtime &, const jsi::Value &)>;
 
 using JsiHostFunctionCache =
     std::unordered_map<std::string, std::unique_ptr<jsi::Function>>;
@@ -134,10 +141,10 @@ protected:
   /**
    Override to return map of name/functions
    */
-  virtual const JsiFunctionMap &getExportedFunctionMap() {
-    static const JsiFunctionMap empty;
+  virtual const RNJsi::JsiFunctionMap &getExportedFunctionMap() {
+    static const RNJsi::JsiFunctionMap empty;
     return empty;
-  };
+  }
 
   /**
    Override to get property getters map of name/functions
@@ -145,7 +152,7 @@ protected:
   virtual const JsiPropertyGettersMap &getExportedPropertyGettersMap() {
     static const JsiPropertyGettersMap empty;
     return empty;
-  };
+  }
 
   /**
    Override to get property setters map of name/functions
@@ -153,7 +160,7 @@ protected:
   virtual const JsiPropertySettersMap &getExportedPropertySettersMap() {
     static const JsiPropertySettersMap empty;
     return empty;
-  };
+  }
 
   /**
    * Overridden jsi::HostObject set property method