@shopify/react-native-skia 2.9.1 → 2.10.1

package/cpp/api/JsiSkPicture.h

@@ -1,11 +1,13 @@
 #pragma once
 
 #include <memory>
+#include <optional>
 
+#include "JsiSkConverters.h"
 #include "JsiSkData.h"
 #include "JsiSkDispatcher.h"
-#include "JsiSkHostObjects.h"
 #include "JsiSkMatrix.h"
+#include "JsiSkNativeObjects.h"
 #include "JsiSkRect.h"
 #include "JsiSkShader.h"
 
@@ -20,14 +22,18 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkPicture : public JsiSkWrappingSkPtrHostObject<SkPicture> {
+class JsiSkPicture
+    : public JsiSkWrappingSkPtrNativeObject<JsiSkPicture, SkPicture> {
 private:
   std::shared_ptr<Dispatcher> _dispatcher;
 
 public:
+  static constexpr const char *CLASS_NAME = "Picture";
+
   JsiSkPicture(std::shared_ptr<RNSkPlatformContext> context,
                const sk_sp<SkPicture> picture)
-      : JsiSkWrappingSkPtrHostObject<SkPicture>(context, picture) {
+      : JsiSkWrappingSkPtrNativeObject<JsiSkPicture, SkPicture>(context,
+                                                                picture) {
     // Get the dispatcher for the current thread
     _dispatcher = Dispatcher::getDispatcher();
     // Process any pending operations
@@ -52,23 +58,15 @@ public:
     }
   }
 
-  JSI_HOST_FUNCTION(makeShader) {
-    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;
-
-    // Create shader
-    auto shader = getObject()->makeShader(tmx, tmy, fm, m, tr);
-    auto shaderObj = std::make_shared<JsiSkShader>(getContext(), shader);
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, shaderObj,
-                                                       getContext());
+  std::shared_ptr<JsiSkShader>
+  makeShader(double tmx, double tmy, double fm,
+             std::optional<std::shared_ptr<SkMatrix>> m,
+             std::optional<std::shared_ptr<SkRect>> tr) {
+    auto shader = getObject()->makeShader(
+        static_cast<SkTileMode>(tmx), static_cast<SkTileMode>(tmy),
+        static_cast<SkFilterMode>(fm), m.has_value() ? m->get() : nullptr,
+        tr.has_value() ? tr->get() : nullptr);
+    return std::make_shared<JsiSkShader>(getContext(), shader);
   }
 
   JSI_HOST_FUNCTION(serialize) {
@@ -90,13 +88,22 @@ public:
     return array;
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkPicture, Picture)
+  /**
+    Returns the underlying object from a host object of this type
+   */
+  static sk_sp<SkPicture> fromValue(jsi::Runtime &runtime,
+                                    const jsi::Value &obj) {
+    return getJsiObject<JsiSkPicture>(runtime, obj)->getObject();
+  }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPicture, makeShader),
-                       JSI_EXPORT_FUNC(JsiSkPicture, serialize),
-                       JSI_EXPORT_FUNC(JsiSkPicture, dispose))
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+    installMethod(runtime, prototype, "makeShader", &JsiSkPicture::makeShader);
+    installHostMethod(runtime, prototype, "serialize",
+                      &JsiSkPicture::serialize);
+  }
 
-  size_t getMemoryPressure() const override {
+  size_t getMemoryPressure() override {
     if (isDisposed()) {
       return 0;
     }
@@ -108,7 +115,5 @@ public:
     auto bytesUsed = picture->approximateBytesUsed();
     return bytesUsed;
   }
-
-  std::string getObjectType() const override { return "JsiSkPicture"; }
 };
 } // namespace RNSkia

package/cpp/api/JsiSkPictureFactory.h

@@ -4,7 +4,7 @@
 
 #include "JsiSkColorFilter.h"
 #include "JsiSkData.h"
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 #include "JsiSkPicture.h"
 
 #pragma clang diagnostic push
@@ -19,15 +19,15 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkPictureFactory : public JsiSkHostObject {
+class JsiSkPictureFactory : public JsiSkNativeObject<JsiSkPictureFactory> {
 public:
+  static constexpr const char *CLASS_NAME = "PictureFactory";
+
   JSI_HOST_FUNCTION(MakePicture) {
     // Handle null case - create JsiSkPicture with nullptr
     if (arguments[0].isNull() || arguments[0].isUndefined()) {
-      auto hostObjectInstance =
-          std::make_shared<JsiSkPicture>(getContext(), nullptr);
-      return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
-          runtime, hostObjectInstance, getContext());
+      return makeJsiObject(
+          runtime, std::make_shared<JsiSkPicture>(getContext(), nullptr));
     }
 
     if (!arguments[0].isObject()) {
@@ -36,18 +36,14 @@ public:
     auto obj = arguments[0].asObject(runtime);
 
     // Check if it's a JsiSkData object first
-    if (obj.isHostObject(runtime)) {
-      if (auto jsiData = obj.asHostObject<JsiSkData>(runtime)) {
-        auto data = jsiData->getObject();
-        auto picture = SkPicture::MakeFromData(data.get());
-        if (picture != nullptr) {
-          auto hostObjectInstance =
-              std::make_shared<JsiSkPicture>(getContext(), std::move(picture));
-          return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
-              runtime, hostObjectInstance, getContext());
-        }
-        return jsi::Value::undefined();
+    if (auto jsiData = tryGetJsiObject<JsiSkData>(runtime, obj)) {
+      auto data = jsiData->getObject();
+      auto picture = SkPicture::MakeFromData(data.get());
+      if (picture != nullptr) {
+        return makeJsiObject(runtime, std::make_shared<JsiSkPicture>(
+                                          getContext(), std::move(picture)));
       }
+      return jsi::Value::undefined();
     }
 
     // Get ArrayBuffer - try buffer property first (Uint8Array, etc.), then
@@ -64,23 +60,22 @@ public:
         SkData::MakeWithCopy(buffer.data(runtime), buffer.size(runtime));
     auto picture = SkPicture::MakeFromData(data.get());
     if (picture != nullptr) {
-      auto hostObjectInstance =
-          std::make_shared<JsiSkPicture>(getContext(), std::move(picture));
-      return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
-          runtime, hostObjectInstance, getContext());
+      return makeJsiObject(runtime, std::make_shared<JsiSkPicture>(
+                                        getContext(), std::move(picture)));
     } else {
       return jsi::Value::undefined();
     }
   }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPictureFactory, MakePicture))
+  size_t getMemoryPressure() override { return 1024; }
 
-  size_t getMemoryPressure() const override { return 1024; }
-
-  std::string getObjectType() const override { return "JsiSkPictureFactory"; }
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installHostMethod(runtime, prototype, "MakePicture",
+                      &JsiSkPictureFactory::MakePicture);
+  }
 
   explicit JsiSkPictureFactory(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiSkHostObject(std::move(context)) {}
+      : JsiSkNativeObject<JsiSkPictureFactory>(std::move(context)) {}
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkPictureRecorder.h

@@ -3,7 +3,8 @@
 #include <memory>
 
 #include "JsiSkCanvas.h"
-#include "JsiSkHostObjects.h"
+#include "JsiSkConverters.h"
+#include "JsiSkNativeObjects.h"
 #include "JsiSkPicture.h"
 #include "JsiSkRect.h"
 
@@ -20,53 +21,50 @@ namespace RNSkia {
 namespace jsi = facebook::jsi;
 
 class JsiSkPictureRecorder
-    : public JsiSkWrappingSharedPtrHostObject<SkPictureRecorder> {
+    : public JsiSkWrappingSharedPtrNativeObject<JsiSkPictureRecorder,
+                                                SkPictureRecorder> {
 public:
+  static constexpr const char *CLASS_NAME = "PictureRecorder";
+
   explicit JsiSkPictureRecorder(std::shared_ptr<RNSkPlatformContext> context)
-      : JsiSkWrappingSharedPtrHostObject<SkPictureRecorder>(
+      : JsiSkWrappingSharedPtrNativeObject<JsiSkPictureRecorder,
+                                           SkPictureRecorder>(
             context, std::make_shared<SkPictureRecorder>()) {}
 
-  JSI_HOST_FUNCTION(beginRecording) {
+  std::shared_ptr<JsiSkCanvas>
+  beginRecording(JsiOptional<std::shared_ptr<SkRect>> rect) {
     SkCanvas *canvas;
-    if (count > 0 && !arguments[0].isUndefined()) {
-      auto rect = JsiSkRect::fromValue(runtime, arguments[0]);
+    if (rect.has_value()) {
       SkRTreeFactory factory;
-      canvas = getObject()->beginRecording(*rect, &factory);
+      canvas = getObject()->beginRecording(**rect, &factory);
     } else {
       SkISize size = SkISize::Make(2'000'000, 2'000'000);
-      SkRect rect = SkRect::Make(size);
-      canvas = getObject()->beginRecording(rect, nullptr);
+      SkRect bounds = SkRect::Make(size);
+      canvas = getObject()->beginRecording(bounds, nullptr);
     }
-    auto canvasObj = std::make_shared<JsiSkCanvas>(getContext(), canvas);
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, canvasObj,
-                                                       getContext());
+    return std::make_shared<JsiSkCanvas>(getContext(), canvas);
   }
 
-  JSI_HOST_FUNCTION(finishRecordingAsPicture) {
+  std::shared_ptr<JsiSkPicture> finishRecordingAsPicture() {
     auto picture = getObject()->finishRecordingAsPicture();
-    auto hostObjectInstance =
-        std::make_shared<JsiSkPicture>(getContext(), std::move(picture));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(
-        runtime, hostObjectInstance, getContext());
+    return std::make_shared<JsiSkPicture>(getContext(), std::move(picture));
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkPictureRecorder, PictureRecorder)
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPictureRecorder, beginRecording),
-                       JSI_EXPORT_FUNC(JsiSkPictureRecorder,
-                                       finishRecordingAsPicture),
-                       JSI_EXPORT_FUNC(JsiSkPictureRecorder, dispose))
-
-  size_t getMemoryPressure() const override { return 1024 * 1024; }
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+    installMethod(runtime, prototype, "beginRecording",
+                  &JsiSkPictureRecorder::beginRecording);
+    installMethod(runtime, prototype, "finishRecordingAsPicture",
+                  &JsiSkPictureRecorder::finishRecordingAsPicture);
+  }
 
-  std::string getObjectType() const override { return "JsiSkPictureRecorder"; }
+  size_t getMemoryPressure() override { return 1024 * 1024; }
 
   static const jsi::HostFunctionType
   createCtor(std::shared_ptr<RNSkPlatformContext> context) {
     return JSI_HOST_FUNCTION_LAMBDA {
-      auto recorder = std::make_shared<JsiSkPictureRecorder>(context);
-      return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, recorder,
-                                                         context);
+      return makeJsiObject(runtime,
+                           std::make_shared<JsiSkPictureRecorder>(context));
     };
   }
 };

package/cpp/api/JsiSkPoint.h

@@ -5,7 +5,7 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -18,22 +18,23 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkPoint : public JsiSkWrappingSharedPtrHostObject<SkPoint> {
+class JsiSkPoint
+    : public JsiSkWrappingSharedPtrNativeObject<JsiSkPoint, SkPoint> {
 public:
-  JSI_PROPERTY_GET(x) { return static_cast<double>(getObject()->x()); }
+  static constexpr const char *CLASS_NAME = "Point";
 
-  JSI_PROPERTY_GET(y) { return static_cast<double>(getObject()->y()); }
+  double getX() { return static_cast<double>(getObject()->x()); }
 
-  JSI_API_TYPENAME("Point");
+  double getY() { return static_cast<double>(getObject()->y()); }
 
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkPoint, x),
-                              JSI_EXPORT_PROP_GET(JsiSkPoint, y),
-                              JSI_EXPORT_PROP_GET(JsiSkPoint, __typename__))
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPoint, dispose))
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+    installGetter(runtime, prototype, "x", &JsiSkPoint::getX);
+    installGetter(runtime, prototype, "y", &JsiSkPoint::getY);
+  }
 
   JsiSkPoint(std::shared_ptr<RNSkPlatformContext> context, const SkPoint &point)
-      : JsiSkWrappingSharedPtrHostObject<SkPoint>(
+      : JsiSkWrappingSharedPtrNativeObject<JsiSkPoint, SkPoint>(
             std::move(context), std::make_shared<SkPoint>(point)) {}
 
   /**
@@ -42,8 +43,9 @@ public:
   static std::shared_ptr<SkPoint> fromValue(jsi::Runtime &runtime,
                                             const jsi::Value &obj) {
     const auto &object = obj.asObject(runtime);
-    if (object.isHostObject(runtime)) {
-      return object.asHostObject<JsiSkPoint>(runtime)->getObject();
+    auto point = tryGetJsiObject<JsiSkPoint>(runtime, object);
+    if (point) {
+      return point->getObject();
     } else {
       auto x = object.getProperty(runtime, "x").asNumber();
       auto y = object.getProperty(runtime, "y").asNumber();
@@ -57,17 +59,14 @@ public:
   static jsi::Value toValue(jsi::Runtime &runtime,
                             std::shared_ptr<RNSkPlatformContext> context,
                             const SkPoint &point) {
-    auto pointObj = std::make_shared<JsiSkPoint>(std::move(context), point);
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, pointObj,
-                                                       context);
+    return makeJsiObject(
+        runtime, std::make_shared<JsiSkPoint>(std::move(context), point));
   }
 
-  size_t getMemoryPressure() const override {
+  size_t getMemoryPressure() override {
     return std::max(sizeof(SkPoint), kMinMemoryPressure);
   }
 
-  std::string getObjectType() const override { return "JsiSkPoint"; }
-
   /**
    * Creates the function for construction a new instance of the SkPoint
    * wrapper
@@ -82,10 +81,8 @@ public:
           SkPoint::Make(arguments[0].asNumber(), arguments[1].asNumber());
 
       // Return the newly constructed object
-      auto pointObj =
-          std::make_shared<JsiSkPoint>(std::move(context), std::move(point));
-      return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, pointObj,
-                                                         context);
+      return makeJsiObject(runtime, std::make_shared<JsiSkPoint>(
+                                        std::move(context), std::move(point)));
     };
   }
 };

package/cpp/api/JsiSkRRect.h

@@ -6,7 +6,7 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -21,32 +21,30 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkRRect : public JsiSkWrappingSharedPtrHostObject<SkRRect> {
+class JsiSkRRect
+    : public JsiSkWrappingSharedPtrNativeObject<JsiSkRRect, SkRRect> {
 public:
-  JSI_PROPERTY_GET(rx) {
+  static constexpr const char *CLASS_NAME = "RRect";
+
+  double getRx() {
     return static_cast<double>(getObject()->getSimpleRadii().x());
   }
-  JSI_PROPERTY_GET(ry) {
+  double getRy() {
     return static_cast<double>(getObject()->getSimpleRadii().y());
   }
-  JSI_PROPERTY_GET(rect) {
-    auto rectObj =
-        std::make_shared<JsiSkRect>(getContext(), getObject()->getBounds());
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, rectObj,
-                                                       getContext());
+  std::shared_ptr<JsiSkRect> getRect() {
+    return std::make_shared<JsiSkRect>(getContext(), getObject()->getBounds());
   }
 
-  JSI_API_TYPENAME("RRect");
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkRRect, rx),
-                              JSI_EXPORT_PROP_GET(JsiSkRRect, ry),
-                              JSI_EXPORT_PROP_GET(JsiSkRRect, rect),
-                              JSI_EXPORT_PROP_GET(JsiSkRRect, __typename__))
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRRect, dispose))
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+    installGetter(runtime, prototype, "rx", &JsiSkRRect::getRx);
+    installGetter(runtime, prototype, "ry", &JsiSkRRect::getRy);
+    installGetter(runtime, prototype, "rect", &JsiSkRRect::getRect);
+  }
 
   JsiSkRRect(std::shared_ptr<RNSkPlatformContext> context, const SkRRect &rect)
-      : JsiSkWrappingSharedPtrHostObject<SkRRect>(
+      : JsiSkWrappingSharedPtrNativeObject<JsiSkRRect, SkRRect>(
             std::move(context), std::make_shared<SkRRect>(rect)) {}
 
   /**
@@ -56,10 +54,9 @@ public:
                                             const jsi::Value &obj) {
 
     const auto &object = obj.asObject(runtime);
-    if (object.isHostObject(runtime)) {
-      return obj.asObject(runtime)
-          .asHostObject<JsiSkRRect>(runtime)
-          ->getObject();
+    auto rrect = tryGetJsiObject<JsiSkRRect>(runtime, object);
+    if (rrect) {
+      return rrect->getObject();
     } else {
       auto rect =
           JsiSkRect::fromValue(runtime, object.getProperty(runtime, "rect"));
@@ -101,17 +98,14 @@ public:
   static jsi::Value toValue(jsi::Runtime &runtime,
                             std::shared_ptr<RNSkPlatformContext> context,
                             const SkRRect &rect) {
-    auto rrectObj = std::make_shared<JsiSkRRect>(std::move(context), rect);
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, rrectObj,
-                                                       context);
+    return makeJsiObject(
+        runtime, std::make_shared<JsiSkRRect>(std::move(context), rect));
   }
 
-  size_t getMemoryPressure() const override {
+  size_t getMemoryPressure() override {
     return std::max(sizeof(SkRRect), kMinMemoryPressure);
   }
 
-  std::string getObjectType() const override { return "JsiSkRRect"; }
-
   /**
    * Creates the function for construction a new instance of the SkRect
    * wrapper
@@ -128,10 +122,8 @@ public:
       auto ry = arguments[2].asNumber();
       auto rrect = SkRRect::MakeRectXY(*rect, rx, ry);
       // Return the newly constructed object
-      auto rrectObj =
-          std::make_shared<JsiSkRRect>(std::move(context), std::move(rrect));
-      return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, rrectObj,
-                                                         context);
+      return makeJsiObject(runtime, std::make_shared<JsiSkRRect>(
+                                        std::move(context), std::move(rrect)));
     };
   }
 };

package/cpp/api/JsiSkRSXform.h

@@ -5,7 +5,7 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
@@ -18,48 +18,36 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkRSXform : public JsiSkWrappingSharedPtrHostObject<SkRSXform> {
+class JsiSkRSXform
+    : public JsiSkWrappingSharedPtrNativeObject<JsiSkRSXform, SkRSXform> {
 public:
+  static constexpr const char *CLASS_NAME = "RSXform";
+
   JsiSkRSXform(std::shared_ptr<RNSkPlatformContext> context,
                const SkRSXform &rsxform)
-      : JsiSkWrappingSharedPtrHostObject<SkRSXform>(
+      : JsiSkWrappingSharedPtrNativeObject<JsiSkRSXform, SkRSXform>(
             std::move(context), std::make_shared<SkRSXform>(rsxform)) {}
 
-  JSI_API_TYPENAME("RSXform");
-
-  JSI_PROPERTY_GET(scos) {
-    return jsi::Value(SkScalarToDouble(getObject()->fSCos));
-  }
-  JSI_PROPERTY_GET(ssin) {
-    return jsi::Value(SkScalarToDouble(getObject()->fSSin));
-  }
-  JSI_PROPERTY_GET(tx) {
-    return jsi::Value(SkScalarToDouble(getObject()->fTx));
-  }
-  JSI_PROPERTY_GET(ty) {
-    return jsi::Value(SkScalarToDouble(getObject()->fTy));
-  }
+  double getScos() { return SkScalarToDouble(getObject()->fSCos); }
+  double getSsin() { return SkScalarToDouble(getObject()->fSSin); }
+  double getTx() { return SkScalarToDouble(getObject()->fTx); }
+  double getTy() { return SkScalarToDouble(getObject()->fTy); }
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Woverloaded-virtual"
-  JSI_HOST_FUNCTION(set) {
-    auto scos = arguments[0].asNumber();
-    auto ssin = arguments[1].asNumber();
-    auto tx = arguments[2].asNumber();
-    auto ty = arguments[3].asNumber();
+  void set(double scos, double ssin, double tx, double ty) {
     getObject()->set(scos, ssin, tx, ty);
-    return jsi::Value::undefined();
   }
 #pragma clang diagnostic pop
 
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkRSXform, __typename__),
-                              JSI_EXPORT_PROP_GET(JsiSkRSXform, scos),
-                              JSI_EXPORT_PROP_GET(JsiSkRSXform, ssin),
-                              JSI_EXPORT_PROP_GET(JsiSkRSXform, tx),
-                              JSI_EXPORT_PROP_GET(JsiSkRSXform, ty))
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRSXform, set),
-                       JSI_EXPORT_FUNC(JsiSkRSXform, dispose))
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+    installGetter(runtime, prototype, "scos", &JsiSkRSXform::getScos);
+    installGetter(runtime, prototype, "ssin", &JsiSkRSXform::getSsin);
+    installGetter(runtime, prototype, "tx", &JsiSkRSXform::getTx);
+    installGetter(runtime, prototype, "ty", &JsiSkRSXform::getTy);
+    installMethod(runtime, prototype, "set", &JsiSkRSXform::set);
+  }
 
   /**
   Returns the underlying object from a host object of this type
@@ -67,8 +55,9 @@ public:
   static std::shared_ptr<SkRSXform> fromValue(jsi::Runtime &runtime,
                                               const jsi::Value &obj) {
     const auto &object = obj.asObject(runtime);
-    if (object.isHostObject(runtime)) {
-      return object.asHostObject<JsiSkRSXform>(runtime)->getObject();
+    auto rsxform = tryGetJsiObject<JsiSkRSXform>(runtime, object);
+    if (rsxform) {
+      return rsxform->getObject();
     } else {
       auto scos = object.getProperty(runtime, "scos").asNumber();
       auto ssin = object.getProperty(runtime, "ssin").asNumber();
@@ -84,10 +73,8 @@ public:
   static jsi::Value toValue(jsi::Runtime &runtime,
                             std::shared_ptr<RNSkPlatformContext> context,
                             const SkRSXform &rsxform) {
-    auto rsxformObj =
-        std::make_shared<JsiSkRSXform>(std::move(context), rsxform);
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, rsxformObj,
-                                                       context);
+    return makeJsiObject(
+        runtime, std::make_shared<JsiSkRSXform>(std::move(context), rsxform));
   }
 
   /**
@@ -105,18 +92,15 @@ public:
           arguments[2].asNumber(), arguments[3].asNumber(),
           arguments[4].asNumber(), arguments[5].asNumber());
       // Return the newly constructed object
-      auto rsxformObj = std::make_shared<JsiSkRSXform>(std::move(context),
-                                                       std::move(rsxform));
-      return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, rsxformObj,
-                                                         context);
+      return makeJsiObject(runtime,
+                           std::make_shared<JsiSkRSXform>(std::move(context),
+                                                          std::move(rsxform)));
     };
   }
-  size_t getMemoryPressure() const override {
+  size_t getMemoryPressure() override {
     return std::max(sizeof(SkRSXform), kMinMemoryPressure);
   }
 
-  std::string getObjectType() const override { return "JsiSkRSXform"; }
-
   /**
    * Creates the function for construction a new instance of the SkRSXform
    * wrapper
@@ -131,10 +115,9 @@ public:
           SkRSXform::Make(arguments[0].asNumber(), arguments[1].asNumber(),
                           arguments[2].asNumber(), arguments[3].asNumber());
       // Return the newly constructed object
-      auto rsxformObj = std::make_shared<JsiSkRSXform>(std::move(context),
-                                                       std::move(rsxform));
-      return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, rsxformObj,
-                                                         context);
+      return makeJsiObject(runtime,
+                           std::make_shared<JsiSkRSXform>(std::move(context),
+                                                          std::move(rsxform)));
     };
   }
 };