@shopify/react-native-skia 0.1.155 → 0.1.157

package/cpp/api/JsiSkPathEffectFactory.h

@@ -12,18 +12,18 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
+#include "include/effects/Sk1DPathEffect.h"
+#include "include/effects/Sk2DPathEffect.h"
 #include <SkCornerPathEffect.h>
 #include <SkDashPathEffect.h>
 #include <SkDiscretePathEffect.h>
 #include <SkPathEffect.h>
-#include "include/effects/Sk1DPathEffect.h"
-#include "include/effects/Sk2DPathEffect.h"
 
 #pragma clang diagnostic pop
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 class JsiSkPathEffectFactory : public JsiSkHostObject {
 public:
@@ -36,14 +36,17 @@ public:
 
   JSI_HOST_FUNCTION(MakeDash) {
     auto jsiIntervals = arguments[0].asObject(runtime).asArray(runtime);
-    auto size = (int)jsiIntervals.size(runtime);
+    auto size = static_cast<int>(jsiIntervals.size(runtime));
     std::vector<SkScalar> intervals;
     intervals.reserve(size);
     for (int i = 0; i < size; i++) {
       SkScalar interval = jsiIntervals.getValueAtIndex(runtime, i).asNumber();
       intervals.push_back(interval);
     }
-    int phase = count >= 2 && !arguments[1].isUndefined() && !arguments[1].isNull() ? arguments[1].asNumber() : 0;
+    int phase =
+        count >= 2 && !arguments[1].isUndefined() && !arguments[1].isNull()
+            ? arguments[1].asNumber()
+            : 0;
     return jsi::Object::createFromHostObject(
         runtime, std::make_shared<JsiSkPathEffect>(
                      getContext(),
@@ -65,8 +68,9 @@ public:
     auto inner = JsiSkPathEffect::fromValue(runtime, arguments[1]);
 
     return jsi::Object::createFromHostObject(
-            runtime, std::make_shared<JsiSkPathEffect>(
-                    getContext(),  SkPathEffect::MakeCompose(std::move(outer), std::move(inner))));
+        runtime, std::make_shared<JsiSkPathEffect>(
+                     getContext(), SkPathEffect::MakeCompose(
+                                       std::move(outer), std::move(inner))));
   }
 
   JSI_HOST_FUNCTION(MakeSum) {
@@ -74,26 +78,29 @@ public:
     auto inner = JsiSkPathEffect::fromValue(runtime, arguments[1]);
 
     return jsi::Object::createFromHostObject(
-            runtime, std::make_shared<JsiSkPathEffect>(
-                    getContext(),  SkPathEffect::MakeSum(std::move(outer), std::move(inner))));
+        runtime, std::make_shared<JsiSkPathEffect>(
+                     getContext(), SkPathEffect::MakeSum(std::move(outer),
+                                                         std::move(inner))));
   }
 
   JSI_HOST_FUNCTION(MakePath1D) {
     auto path = JsiSkPath::fromValue(runtime, arguments[0]);
     auto advance = arguments[1].asNumber();
     auto phase = arguments[2].asNumber();
-    auto style = static_cast<SkPath1DPathEffect::Style>(arguments[3].asNumber());
+    auto style =
+        static_cast<SkPath1DPathEffect::Style>(arguments[3].asNumber());
     return jsi::Object::createFromHostObject(
-            runtime, std::make_shared<JsiSkPathEffect>(
-                    getContext(),  SkPath1DPathEffect::Make(*path, advance, phase, style)));
+        runtime, std::make_shared<JsiSkPathEffect>(
+                     getContext(),
+                     SkPath1DPathEffect::Make(*path, advance, phase, style)));
   }
 
   JSI_HOST_FUNCTION(MakePath2D) {
     auto matrix = JsiSkMatrix::fromValue(runtime, arguments[0]);
     auto path = JsiSkPath::fromValue(runtime, arguments[1]);
     return jsi::Object::createFromHostObject(
-            runtime, std::make_shared<JsiSkPathEffect>(
-                    getContext(),  SkPath2DPathEffect::Make(*matrix, *path)));
+        runtime, std::make_shared<JsiSkPathEffect>(
+                     getContext(), SkPath2DPathEffect::Make(*matrix, *path)));
   }
 
   JSI_HOST_FUNCTION(MakeLine2D) {
@@ -101,22 +108,20 @@ public:
     auto matrix = JsiSkMatrix::fromValue(runtime, arguments[1]);
 
     return jsi::Object::createFromHostObject(
-            runtime, std::make_shared<JsiSkPathEffect>(
-                    getContext(),  SkLine2DPathEffect::Make(width, *matrix)));
+        runtime, std::make_shared<JsiSkPathEffect>(
+                     getContext(), SkLine2DPathEffect::Make(width, *matrix)));
   }
 
-  JSI_EXPORT_FUNCTIONS(
-    JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakeCorner),
-    JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakeDash),
-    JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakeDiscrete),
-    JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakeCompose),
-    JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakeSum),
-    JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakeLine2D),
-    JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakePath1D),
-    JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakePath2D),
-   )
-
-  JsiSkPathEffectFactory(std::shared_ptr<RNSkPlatformContext> context)
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakeCorner),
+                       JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakeDash),
+                       JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakeDiscrete),
+                       JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakeCompose),
+                       JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakeSum),
+                       JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakeLine2D),
+                       JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakePath1D),
+                       JSI_EXPORT_FUNC(JsiSkPathEffectFactory, MakePath2D), )
+
+  explicit JsiSkPathEffectFactory(std::shared_ptr<RNSkPlatformContext> context)
       : JsiSkHostObject(std::move(context)) {}
 };
 

package/cpp/api/JsiSkPathFactory.h

@@ -11,15 +11,15 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
+#include <RNSkLog.h>
 #include <SkPath.h>
 #include <SkPathOps.h>
-#include <RNSkLog.h>
 
 #pragma clang diagnostic pop
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 class JsiSkPathFactory : public JsiSkHostObject {
 
@@ -67,84 +67,85 @@ public:
     auto cmds = arguments[0].asObject(runtime).asArray(runtime);
     auto cmdCount = cmds.size(runtime);
     for (int i = 0; i < cmdCount; i++) {
-      auto cmd = cmds.getValueAtIndex(runtime, i).asObject(runtime).asArray(runtime);
+      auto cmd =
+          cmds.getValueAtIndex(runtime, i).asObject(runtime).asArray(runtime);
       if (cmd.size(runtime) < 1) {
         RNSkLogger::logToConsole("Invalid command found (got an empty array)");
         return jsi::Value::null();
       }
       auto verb = static_cast<int>(cmd.getValueAtIndex(runtime, 0).asNumber());
       switch (verb) {
-        case MOVE: {
-          if (cmd.size(runtime) < 3) {
-            RNSkLogger::logToConsole( "Invalid move command found");
-            return jsi::Value::null();
-          }
-          auto x = cmd.getValueAtIndex(runtime, 1).asNumber();
-          auto y = cmd.getValueAtIndex(runtime, 2).asNumber();
-          path.moveTo(x, y);
-          break;
-        }
-        case LINE: {
-          if (cmd.size(runtime) < 3) {
-            RNSkLogger::logToConsole("Invalid line command found");
-            return jsi::Value::null();
-          }
-          auto x = cmd.getValueAtIndex(runtime, 1).asNumber();
-          auto y = cmd.getValueAtIndex(runtime, 2).asNumber();
-          path.lineTo(x, y);
-          break;
-        }
-        case QUAD: {
-          if (cmd.size(runtime) < 5) {
-            RNSkLogger::logToConsole("Invalid line command found");
-            return jsi::Value::null();
-          }
-          auto x1 = cmd.getValueAtIndex(runtime, 1).asNumber();
-          auto y1 = cmd.getValueAtIndex(runtime, 2).asNumber();
-          auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
-          auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
-          path.quadTo(x1, y1, x2, y2);
-          break;
+      case MOVE: {
+        if (cmd.size(runtime) < 3) {
+          RNSkLogger::logToConsole("Invalid move command found");
+          return jsi::Value::null();
         }
-        case CONIC: {
-          if (cmd.size(runtime) < 6) {
-            RNSkLogger::logToConsole("Invalid line command found");
-            return jsi::Value::null();
-          }
-          auto x1 = cmd.getValueAtIndex(runtime, 1).asNumber();
-          auto y1 = cmd.getValueAtIndex(runtime, 2).asNumber();
-          auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
-          auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
-          auto w = cmd.getValueAtIndex(runtime, 5).asNumber();
-          path.conicTo(x1, y1, x2, y2, w);
-          break;
+        auto x = cmd.getValueAtIndex(runtime, 1).asNumber();
+        auto y = cmd.getValueAtIndex(runtime, 2).asNumber();
+        path.moveTo(x, y);
+        break;
+      }
+      case LINE: {
+        if (cmd.size(runtime) < 3) {
+          RNSkLogger::logToConsole("Invalid line command found");
+          return jsi::Value::null();
         }
-        case CUBIC: {
-          if (cmd.size(runtime) < 7) {
-            RNSkLogger::logToConsole("Invalid line command found");
-            return jsi::Value::null();
-          }
-          auto x1 = cmd.getValueAtIndex(runtime, 1).asNumber();
-          auto y1 = cmd.getValueAtIndex(runtime, 2).asNumber();
-          auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
-          auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
-          auto x3 = cmd.getValueAtIndex(runtime, 5).asNumber();
-          auto y3 = cmd.getValueAtIndex(runtime, 6).asNumber();
-          path.cubicTo(x1, y1, x2, y2, x3, y3);
-          break;
+        auto x = cmd.getValueAtIndex(runtime, 1).asNumber();
+        auto y = cmd.getValueAtIndex(runtime, 2).asNumber();
+        path.lineTo(x, y);
+        break;
+      }
+      case QUAD: {
+        if (cmd.size(runtime) < 5) {
+          RNSkLogger::logToConsole("Invalid line command found");
+          return jsi::Value::null();
         }
-        case CLOSE: {
-          path.close();
-          break;
+        auto x1 = cmd.getValueAtIndex(runtime, 1).asNumber();
+        auto y1 = cmd.getValueAtIndex(runtime, 2).asNumber();
+        auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
+        auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
+        path.quadTo(x1, y1, x2, y2);
+        break;
+      }
+      case CONIC: {
+        if (cmd.size(runtime) < 6) {
+          RNSkLogger::logToConsole("Invalid line command found");
+          return jsi::Value::null();
         }
-        default: {
-          RNSkLogger::logToConsole("Found an unknown command");
+        auto x1 = cmd.getValueAtIndex(runtime, 1).asNumber();
+        auto y1 = cmd.getValueAtIndex(runtime, 2).asNumber();
+        auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
+        auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
+        auto w = cmd.getValueAtIndex(runtime, 5).asNumber();
+        path.conicTo(x1, y1, x2, y2, w);
+        break;
+      }
+      case CUBIC: {
+        if (cmd.size(runtime) < 7) {
+          RNSkLogger::logToConsole("Invalid line command found");
           return jsi::Value::null();
         }
+        auto x1 = cmd.getValueAtIndex(runtime, 1).asNumber();
+        auto y1 = cmd.getValueAtIndex(runtime, 2).asNumber();
+        auto x2 = cmd.getValueAtIndex(runtime, 3).asNumber();
+        auto y2 = cmd.getValueAtIndex(runtime, 4).asNumber();
+        auto x3 = cmd.getValueAtIndex(runtime, 5).asNumber();
+        auto y3 = cmd.getValueAtIndex(runtime, 6).asNumber();
+        path.cubicTo(x1, y1, x2, y2, x3, y3);
+        break;
+      }
+      case CLOSE: {
+        path.close();
+        break;
+      }
+      default: {
+        RNSkLogger::logToConsole("Found an unknown command");
+        return jsi::Value::null();
+      }
       }
     }
     return jsi::Object::createFromHostObject(
-            runtime, std::make_shared<JsiSkPath>(getContext(), std::move(path)));
+        runtime, std::make_shared<JsiSkPath>(getContext(), std::move(path)));
   }
 
   JSI_HOST_FUNCTION(MakeFromText) {
@@ -156,7 +157,7 @@ public:
     SkTextUtils::GetPath(text.c_str(), strlen(text.c_str()),
                          SkTextEncoding::kUTF8, x, y, *font, &path);
     return jsi::Object::createFromHostObject(
-            runtime, std::make_shared<JsiSkPath>(getContext(), std::move(path)));;
+        runtime, std::make_shared<JsiSkPath>(getContext(), std::move(path)));
   }
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPathFactory, Make),
@@ -165,7 +166,7 @@ public:
                        JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromCmds),
                        JSI_EXPORT_FUNC(JsiSkPathFactory, MakeFromText))
 
-    JsiSkPathFactory(std::shared_ptr<RNSkPlatformContext> context)
+  explicit JsiSkPathFactory(std::shared_ptr<RNSkPlatformContext> context)
       : JsiSkHostObject(std::move(context)) {}
 };
 

package/cpp/api/JsiSkPicture.h

@@ -1,6 +1,7 @@
-
 #pragma once
 
+#include <memory>
+
 #include "JsiSkHostObjects.h"
 #include <JsiSkData.h>
 #include <JsiSkShader.h>
@@ -14,13 +15,13 @@
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 class JsiSkPicture : public JsiSkWrappingSkPtrHostObject<SkPicture> {
 public:
-
-  JsiSkPicture(std::shared_ptr<RNSkPlatformContext> context, const sk_sp<SkPicture> picture)
-      : JsiSkWrappingSkPtrHostObject<SkPicture>(context, picture) {};
+  JsiSkPicture(std::shared_ptr<RNSkPlatformContext> context,
+               const sk_sp<SkPicture> picture)
+      : JsiSkWrappingSkPtrHostObject<SkPicture>(context, picture) {}
 
   JSI_PROPERTY_GET(__typename__) {
     return jsi::String::createFromUtf8(runtime, "Picture");
@@ -32,34 +33,39 @@ public:
     auto tmx = (SkTileMode)arguments[0].asNumber();
     auto tmy = (SkTileMode)arguments[1].asNumber();
     auto fm = (SkFilterMode)arguments[2].asNumber();
-    auto m = count > 3 && !arguments[3].isUndefined() ?
-      JsiSkMatrix::fromValue(runtime, arguments[3]).get() : nullptr;
-    
-    auto tr = count > 4 && !arguments[4].isUndefined() ?
-      JsiSkRect::fromValue(runtime, arguments[4]).get() : nullptr;
-    
+    auto m = count > 3 && !arguments[3].isUndefined()
+                 ? JsiSkMatrix::fromValue(runtime, arguments[3]).get()
+                 : nullptr;
+
+    auto tr = count > 4 && !arguments[4].isUndefined()
+                  ? JsiSkRect::fromValue(runtime, arguments[4]).get()
+                  : nullptr;
+
     // Create shader
     auto shader = getObject()->makeShader(tmx, tmy, fm, m, tr);
     return jsi::Object::createFromHostObject(
         runtime, std::make_shared<JsiSkShader>(getContext(), shader));
   }
-  
+
   JSI_HOST_FUNCTION(serialize) {
     auto data = getObject()->serialize();
-    auto arrayCtor = runtime.global().getPropertyAsFunction(runtime, "Uint8Array");
+    auto arrayCtor =
+        runtime.global().getPropertyAsFunction(runtime, "Uint8Array");
     size_t size = data->size();
 
-    jsi::Object array = arrayCtor.callAsConstructor(runtime, static_cast<double>(size)).getObject(runtime);
-    jsi::ArrayBuffer buffer = array
-                                  .getProperty(runtime, jsi::PropNameID::forAscii(runtime, "buffer"))
-                                  .asObject(runtime)
-                                  .getArrayBuffer(runtime);
+    jsi::Object array =
+        arrayCtor.callAsConstructor(runtime, static_cast<double>(size))
+            .getObject(runtime);
+    jsi::ArrayBuffer buffer =
+        array.getProperty(runtime, jsi::PropNameID::forAscii(runtime, "buffer"))
+            .asObject(runtime)
+            .getArrayBuffer(runtime);
 
     auto bfrPtr = reinterpret_cast<uint8_t *>(buffer.data(runtime));
     memcpy(bfrPtr, data->bytes(), size);
-    return array;  
+    return array;
   }
-  
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPicture, makeShader),
                        JSI_EXPORT_FUNC(JsiSkPicture, serialize))
 
@@ -67,11 +73,11 @@ public:
    Returns the underlying object from a host object of this type
   */
   static sk_sp<SkPicture> fromValue(jsi::Runtime &runtime,
-                                            const jsi::Value &obj) {
+                                    const jsi::Value &obj) {
     return obj.asObject(runtime)
         .asHostObject<JsiSkPicture>(runtime)
         .get()
         ->getObject();
-  }    
+  }
 };
 } // namespace RNSkia

package/cpp/api/JsiSkPictureFactory.h

@@ -1,41 +1,42 @@
-
 #pragma once
 
+#include <memory>
+
 #include "JsiSkColorFilter.h"
-#include "JsiSkHostObjects.h"
 #include "JsiSkData.h"
+#include "JsiSkHostObjects.h"
 #include "JsiSkPicture.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkPicture.h>
 #include <SkData.h>
+#include <SkPicture.h>
 
 #pragma clang diagnostic pop
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 class JsiSkPictureFactory : public JsiSkHostObject {
 public:
   JSI_HOST_FUNCTION(MakePicture) {
-    if(!arguments[0].isObject()) {
+    if (!arguments[0].isObject()) {
       throw jsi::JSError(runtime, "Expected arraybuffer as first parameter");
     }
     auto array = arguments[0].asObject(runtime);
-    jsi::ArrayBuffer buffer = array
-            .getProperty(runtime, jsi::PropNameID::forAscii(runtime, "buffer"))
+    jsi::ArrayBuffer buffer =
+        array.getProperty(runtime, jsi::PropNameID::forAscii(runtime, "buffer"))
             .asObject(runtime)
             .getArrayBuffer(runtime);
 
-    sk_sp<SkData> data = SkData::MakeWithCopy(buffer.data(runtime), buffer.size(runtime));
+    sk_sp<SkData> data =
+        SkData::MakeWithCopy(buffer.data(runtime), buffer.size(runtime));
     auto picture = SkPicture::MakeFromData(data.get());
-    if(picture != nullptr) {
+    if (picture != nullptr) {
       return jsi::Object::createFromHostObject(
-          runtime,
-          std::make_shared<JsiSkPicture>(getContext(), picture));
+          runtime, std::make_shared<JsiSkPicture>(getContext(), picture));
     } else {
       return jsi::Value::undefined();
     }
@@ -43,7 +44,7 @@ public:
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPictureFactory, MakePicture))
 
-  JsiSkPictureFactory(std::shared_ptr<RNSkPlatformContext> context)
+  explicit JsiSkPictureFactory(std::shared_ptr<RNSkPlatformContext> context)
       : JsiSkHostObject(context) {}
 };
 

package/cpp/api/JsiSkPictureRecorder.h

@@ -1,53 +1,55 @@
-
 #pragma once
 
+#include <memory>
+
+#include "JsiSkCanvas.h"
 #include "JsiSkHostObjects.h"
-#include "JsiSkRect.h"
 #include "JsiSkPicture.h"
-#include "JsiSkCanvas.h"
+#include "JsiSkRect.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 
-#include <SkPictureRecorder.h>
 #include <SkBBHFactory.h>
+#include <SkPictureRecorder.h>
 
 #pragma clang diagnostic pop
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
-class JsiSkPictureRecorder : public JsiSkWrappingSharedPtrHostObject<SkPictureRecorder> {
+class JsiSkPictureRecorder
+    : public JsiSkWrappingSharedPtrHostObject<SkPictureRecorder> {
 public:
-
-  JsiSkPictureRecorder(std::shared_ptr<RNSkPlatformContext> context)
+  explicit JsiSkPictureRecorder(std::shared_ptr<RNSkPlatformContext> context)
       : JsiSkWrappingSharedPtrHostObject<SkPictureRecorder>(
-            context, std::make_shared<SkPictureRecorder>()){};
+            context, std::make_shared<SkPictureRecorder>()) {}
 
   JSI_HOST_FUNCTION(beginRecording) {
     auto rect = JsiSkRect::fromValue(runtime, arguments[0]);
     SkRTreeFactory factory;
     auto canvas = getObject()->beginRecording(*rect, &factory);
     return jsi::Object::createFromHostObject(
-      runtime, std::make_shared<JsiSkCanvas>(getContext(), canvas));
+        runtime, std::make_shared<JsiSkCanvas>(getContext(), canvas));
   }
-  
+
   JSI_HOST_FUNCTION(finishRecordingAsPicture) {
     auto picture = getObject()->finishRecordingAsPicture();
     return jsi::Object::createFromHostObject(
-      runtime, std::make_shared<JsiSkPicture>(getContext(), picture));
+        runtime, std::make_shared<JsiSkPicture>(getContext(), picture));
   }
-  
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPictureRecorder, beginRecording),
-                       JSI_EXPORT_FUNC(JsiSkPictureRecorder, finishRecordingAsPicture))
-  
+                       JSI_EXPORT_FUNC(JsiSkPictureRecorder,
+                                       finishRecordingAsPicture))
+
   static const jsi::HostFunctionType
   createCtor(std::shared_ptr<RNSkPlatformContext> context) {
-      return JSI_HOST_FUNCTION_LAMBDA {
-        return jsi::Object::createFromHostObject(
-                runtime, std::make_shared<JsiSkPictureRecorder>(context));
-      };
+    return JSI_HOST_FUNCTION_LAMBDA {
+      return jsi::Object::createFromHostObject(
+          runtime, std::make_shared<JsiSkPictureRecorder>(context));
+    };
   }
 };
 } // namespace RNSkia

package/cpp/api/JsiSkPoint.h

@@ -16,11 +16,10 @@
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 class JsiSkPoint : public JsiSkWrappingSharedPtrHostObject<SkPoint> {
 public:
-
   JSI_PROPERTY_GET(x) { return static_cast<double>(getObject()->x()); }
 
   JSI_PROPERTY_GET(y) { return static_cast<double>(getObject()->y()); }
@@ -30,18 +29,16 @@ public:
 
   JsiSkPoint(std::shared_ptr<RNSkPlatformContext> context, const SkPoint &point)
       : JsiSkWrappingSharedPtrHostObject<SkPoint>(
-            std::move(context), std::make_shared<SkPoint>(point)){}
+            std::move(context), std::make_shared<SkPoint>(point)) {}
 
   /**
   Returns the underlying object from a host object of this type
  */
   static std::shared_ptr<SkPoint> fromValue(jsi::Runtime &runtime,
                                             const jsi::Value &obj) {
-    const auto& object = obj.asObject(runtime);
+    const auto &object = obj.asObject(runtime);
     if (object.isHostObject(runtime)) {
-      return object
-              .asHostObject<JsiSkPoint>(runtime)
-              ->getObject();
+      return object.asHostObject<JsiSkPoint>(runtime)->getObject();
     } else {
       auto x = object.getProperty(runtime, "x").asNumber();
       auto y = object.getProperty(runtime, "y").asNumber();
@@ -74,7 +71,8 @@ public:
 
       // Return the newly constructed object
       return jsi::Object::createFromHostObject(
-          runtime, std::make_shared<JsiSkPoint>(std::move(context), std::move(point)));
+          runtime,
+          std::make_shared<JsiSkPoint>(std::move(context), std::move(point)));
     };
   }
 };

package/cpp/api/JsiSkRRect.h

@@ -12,11 +12,13 @@
 
 #include <SkRRect.h>
 
+#include "JsiSkRect.h"
+
 #pragma clang diagnostic pop
 
 namespace RNSkia {
 
-using namespace facebook;
+namespace jsi = facebook::jsi;
 
 class JsiSkRRect : public JsiSkWrappingSharedPtrHostObject<SkRRect> {
 public:
@@ -38,7 +40,7 @@ public:
 
   JsiSkRRect(std::shared_ptr<RNSkPlatformContext> context, const SkRRect &rect)
       : JsiSkWrappingSharedPtrHostObject<SkRRect>(
-            std::move(context), std::make_shared<SkRRect>(rect)){}
+            std::move(context), std::make_shared<SkRRect>(rect)) {}
 
   /**
     Returns the underlying object from a host object of this type
@@ -46,13 +48,14 @@ public:
   static std::shared_ptr<SkRRect> fromValue(jsi::Runtime &runtime,
                                             const jsi::Value &obj) {
 
-    const auto& object = obj.asObject(runtime);
+    const auto &object = obj.asObject(runtime);
     if (object.isHostObject(runtime)) {
       return obj.asObject(runtime)
-              .asHostObject<JsiSkRRect>(runtime)
-              ->getObject();
+          .asHostObject<JsiSkRRect>(runtime)
+          ->getObject();
     } else {
-      auto rect = JsiSkRect::fromValue(runtime, object.getProperty(runtime, "rect"));
+      auto rect =
+          JsiSkRect::fromValue(runtime, object.getProperty(runtime, "rect"));
       auto rx = object.getProperty(runtime, "rx").asNumber();
       auto ry = object.getProperty(runtime, "ry").asNumber();
       return std::make_shared<SkRRect>(SkRRect::MakeRectXY(*rect, rx, ry));
@@ -86,7 +89,8 @@ public:
       auto rrect = SkRRect::MakeRectXY(*rect, rx, ry);
       // Return the newly constructed object
       return jsi::Object::createFromHostObject(
-          runtime, std::make_shared<JsiSkRRect>(std::move(context), std::move(rrect)));
+          runtime,
+          std::make_shared<JsiSkRRect>(std::move(context), std::move(rrect)));
     };
   }
 };