@shopify/react-native-skia 2.9.1 → 2.10.0

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:
+  static constexpr const char *CLASS_NAME = "Point";
+
   JSI_PROPERTY_GET(x) { return static_cast<double>(getObject()->x()); }
 
   JSI_PROPERTY_GET(y) { return static_cast<double>(getObject()->y()); }
 
-  JSI_API_TYPENAME("Point");
-
-  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);
+    installHostGetter(runtime, prototype, "x", &JsiSkPoint::get_x);
+    installHostGetter(runtime, prototype, "y", &JsiSkPoint::get_y);
+  }
 
   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,8 +21,11 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkRRect : public JsiSkWrappingSharedPtrHostObject<SkRRect> {
+class JsiSkRRect
+    : public JsiSkWrappingSharedPtrNativeObject<JsiSkRRect, SkRRect> {
 public:
+  static constexpr const char *CLASS_NAME = "RRect";
+
   JSI_PROPERTY_GET(rx) {
     return static_cast<double>(getObject()->getSimpleRadii().x());
   }
@@ -30,23 +33,19 @@ public:
     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());
+    return makeJsiObject(runtime, 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);
+    installHostGetter(runtime, prototype, "rx", &JsiSkRRect::get_rx);
+    installHostGetter(runtime, prototype, "ry", &JsiSkRRect::get_ry);
+    installHostGetter(runtime, prototype, "rect", &JsiSkRRect::get_rect);
+  }
 
   JsiSkRRect(std::shared_ptr<RNSkPlatformContext> context, const SkRRect &rect)
-      : JsiSkWrappingSharedPtrHostObject<SkRRect>(
+      : JsiSkWrappingSharedPtrNativeObject<JsiSkRRect, SkRRect>(
             std::move(context), std::make_shared<SkRRect>(rect)) {}
 
   /**
@@ -56,10 +55,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 +99,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 +123,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,15 +18,16 @@ 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));
   }
@@ -52,14 +53,14 @@ public:
   }
 #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);
+    installHostGetter(runtime, prototype, "scos", &JsiSkRSXform::get_scos);
+    installHostGetter(runtime, prototype, "ssin", &JsiSkRSXform::get_ssin);
+    installHostGetter(runtime, prototype, "tx", &JsiSkRSXform::get_tx);
+    installHostGetter(runtime, prototype, "ty", &JsiSkRSXform::get_ty);
+    installHostMethod(runtime, prototype, "set", &JsiSkRSXform::set);
+  }
 
   /**
   Returns the underlying object from a host object of this type
@@ -67,8 +68,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 +86,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 +105,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 +128,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)));
     };
   }
 };

package/cpp/api/JsiSkRect.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,8 +18,10 @@ namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkRect : public JsiSkWrappingSharedPtrHostObject<SkRect> {
+class JsiSkRect : public JsiSkWrappingSharedPtrNativeObject<JsiSkRect, SkRect> {
 public:
+  static constexpr const char *CLASS_NAME = "Rect";
+
   JSI_PROPERTY_GET(x) { return static_cast<double>(getObject()->x()); }
   JSI_PROPERTY_GET(y) { return static_cast<double>(getObject()->y()); }
   JSI_PROPERTY_GET(width) { return static_cast<double>(getObject()->width()); }
@@ -33,14 +35,6 @@ public:
     return static_cast<double>(getObject()->bottom());
   }
 
-  JSI_API_TYPENAME("Rect");
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkRect, x),
-                              JSI_EXPORT_PROP_GET(JsiSkRect, y),
-                              JSI_EXPORT_PROP_GET(JsiSkRect, width),
-                              JSI_EXPORT_PROP_GET(JsiSkRect, height),
-                              JSI_EXPORT_PROP_GET(JsiSkRect, __typename__))
-
   JSI_HOST_FUNCTION(setXYWH) {
     getObject()->setXYWH(arguments[0].asNumber(), arguments[1].asNumber(),
                          arguments[2].asNumber(), arguments[3].asNumber());
@@ -53,15 +47,25 @@ public:
     return jsi::Value::undefined();
   }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRect, setXYWH),
-                       JSI_EXPORT_FUNC(JsiSkRect, setLTRB),
-                       JSI_EXPORT_FUNC(JsiSkRect, dispose))
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+    installHostGetter(runtime, prototype, "x", &JsiSkRect::get_x);
+    installHostGetter(runtime, prototype, "y", &JsiSkRect::get_y);
+    installHostGetter(runtime, prototype, "width", &JsiSkRect::get_width);
+    installHostGetter(runtime, prototype, "height", &JsiSkRect::get_height);
+    installHostGetter(runtime, prototype, "left", &JsiSkRect::get_left);
+    installHostGetter(runtime, prototype, "top", &JsiSkRect::get_top);
+    installHostGetter(runtime, prototype, "right", &JsiSkRect::get_right);
+    installHostGetter(runtime, prototype, "bottom", &JsiSkRect::get_bottom);
+    installHostMethod(runtime, prototype, "setXYWH", &JsiSkRect::setXYWH);
+    installHostMethod(runtime, prototype, "setLTRB", &JsiSkRect::setLTRB);
+  }
 
   /**
    Constructor
    */
   JsiSkRect(std::shared_ptr<RNSkPlatformContext> context, const SkRect &rect)
-      : JsiSkWrappingSharedPtrHostObject<SkRect>(
+      : JsiSkWrappingSharedPtrNativeObject<JsiSkRect, SkRect>(
             std::move(context), std::make_shared<SkRect>(rect)) {}
 
   /**
@@ -70,8 +74,9 @@ public:
   static std::shared_ptr<SkRect> fromValue(jsi::Runtime &runtime,
                                            const jsi::Value &obj) {
     const auto &object = obj.asObject(runtime);
-    if (object.isHostObject(runtime)) {
-      return object.asHostObject<JsiSkRect>(runtime)->getObject();
+    auto rect = tryGetJsiObject<JsiSkRect>(runtime, object);
+    if (rect) {
+      return rect->getObject();
     } else {
       auto x = object.getProperty(runtime, "x").asNumber();
       auto y = object.getProperty(runtime, "y").asNumber();
@@ -87,25 +92,20 @@ public:
   static jsi::Value toValue(jsi::Runtime &runtime,
                             std::shared_ptr<RNSkPlatformContext> context,
                             const SkRect &rect) {
-    auto rectObj = std::make_shared<JsiSkRect>(std::move(context), rect);
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, rectObj,
-                                                       context);
+    return makeJsiObject(runtime,
+                         std::make_shared<JsiSkRect>(std::move(context), rect));
   }
   static jsi::Value toValue(jsi::Runtime &runtime,
                             std::shared_ptr<RNSkPlatformContext> context,
                             SkRect &&rect) {
-    auto rectObj =
-        std::make_shared<JsiSkRect>(std::move(context), std::move(rect));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, rectObj,
-                                                       context);
+    return makeJsiObject(runtime, std::make_shared<JsiSkRect>(
+                                      std::move(context), std::move(rect)));
   }
 
-  size_t getMemoryPressure() const override {
+  size_t getMemoryPressure() override {
     return std::max(sizeof(SkRect), kMinMemoryPressure);
   }
 
-  std::string getObjectType() const override { return "JsiSkRect"; }
-
   /**
    * Creates the function for construction a new instance of the SkRect
    * wrapper
@@ -122,10 +122,8 @@ public:
                            arguments[2].asNumber(), arguments[3].asNumber());
 
       // Return the newly constructed object
-      auto rectObj =
-          std::make_shared<JsiSkRect>(std::move(context), std::move(rect));
-      return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, rectObj,
-                                                         context);
+      return makeJsiObject(runtime, std::make_shared<JsiSkRect>(
+                                        std::move(context), std::move(rect)));
     };
   }
 };

package/cpp/api/JsiSkRuntimeEffect.h

@@ -5,8 +5,8 @@
 #include <utility>
 #include <vector>
 
-#include "JsiSkHostObjects.h"
 #include "JsiSkMatrix.h"
+#include "JsiSkNativeObjects.h"
 #include "JsiSkShader.h"
 
 #include <jsi/jsi.h>
@@ -37,8 +37,11 @@ struct RuntimeEffectUniform {
 };
 
 class JsiSkRuntimeEffect
-    : public JsiSkWrappingSkPtrHostObject<SkRuntimeEffect> {
+    : public JsiSkWrappingSkPtrNativeObject<JsiSkRuntimeEffect,
+                                            SkRuntimeEffect> {
 public:
+  static constexpr const char *CLASS_NAME = "RuntimeEffect";
+
   JSI_HOST_FUNCTION(makeShader) {
     auto uniforms = castUniforms(runtime, arguments[0]);
 
@@ -51,10 +54,8 @@ public:
     auto shader =
         getObject()->makeShader(std::move(uniforms), nullptr, 0, matrix);
 
-    auto shaderObj =
-        std::make_shared<JsiSkShader>(getContext(), std::move(shader));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, shaderObj,
-                                                       getContext());
+    return makeJsiObject(runtime, std::make_shared<JsiSkShader>(
+                                      getContext(), std::move(shader)));
   }
 
   JSI_HOST_FUNCTION(makeShaderWithChildren) {
@@ -66,9 +67,8 @@ public:
     auto jsiChildCount = jsiChildren.size(runtime);
     children.reserve(jsiChildCount);
     for (int i = 0; i < jsiChildCount; i++) {
-      auto shader = jsiChildren.getValueAtIndex(runtime, i)
-                        .asObject(runtime)
-                        .asHostObject<JsiSkShader>(runtime)
+      auto shader = getJsiObject<JsiSkShader>(
+                        runtime, jsiChildren.getValueAtIndex(runtime, i))
                         ->getObject();
       children.push_back(shader);
     }
@@ -82,10 +82,8 @@ public:
     auto shader = getObject()->makeShader(std::move(uniforms), children.data(),
                                           children.size(), matrix);
 
-    auto shaderObj =
-        std::make_shared<JsiSkShader>(getContext(), std::move(shader));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, shaderObj,
-                                                       getContext());
+    return makeJsiObject(runtime, std::make_shared<JsiSkShader>(
+                                      getContext(), std::move(shader)));
   }
 
   JSI_HOST_FUNCTION(getUniformCount) {
@@ -124,27 +122,38 @@ public:
     return jsi::String::createFromAscii(runtime, getObject()->source());
   }
 
-  EXPORT_JSI_API_TYPENAME(JsiSkRuntimeEffect, RuntimeEffect)
-
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRuntimeEffect, makeShader),
-                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect,
-                                       makeShaderWithChildren),
-                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniformCount),
-                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect,
-                                       getUniformFloatCount),
-                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniformName),
-                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, getUniform),
-                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, source),
-                       JSI_EXPORT_FUNC(JsiSkRuntimeEffect, dispose))
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installCommon(runtime, prototype);
+    installHostMethod(runtime, prototype, "makeShader",
+                      &JsiSkRuntimeEffect::makeShader);
+    installHostMethod(runtime, prototype, "makeShaderWithChildren",
+                      &JsiSkRuntimeEffect::makeShaderWithChildren);
+    installHostMethod(runtime, prototype, "getUniformCount",
+                      &JsiSkRuntimeEffect::getUniformCount);
+    installHostMethod(runtime, prototype, "getUniformFloatCount",
+                      &JsiSkRuntimeEffect::getUniformFloatCount);
+    installHostMethod(runtime, prototype, "getUniformName",
+                      &JsiSkRuntimeEffect::getUniformName);
+    installHostMethod(runtime, prototype, "getUniform",
+                      &JsiSkRuntimeEffect::getUniform);
+    installHostMethod(runtime, prototype, "source",
+                      &JsiSkRuntimeEffect::source);
+  }
 
   JsiSkRuntimeEffect(std::shared_ptr<RNSkPlatformContext> context,
                      sk_sp<SkRuntimeEffect> rt)
-      : JsiSkWrappingSkPtrHostObject<SkRuntimeEffect>(std::move(context),
-                                                      std::move(rt)) {}
-
-  size_t getMemoryPressure() const override { return 4096; }
+      : JsiSkWrappingSkPtrNativeObject<JsiSkRuntimeEffect, SkRuntimeEffect>(
+            std::move(context), std::move(rt)) {}
+
+  /**
+    Returns the underlying object from a host object of this type
+   */
+  static sk_sp<SkRuntimeEffect> fromValue(jsi::Runtime &runtime,
+                                          const jsi::Value &obj) {
+    return getJsiObject<JsiSkRuntimeEffect>(runtime, obj)->getObject();
+  }
 
-  std::string getObjectType() const override { return "JsiSkRuntimeEffect"; }
+  size_t getMemoryPressure() override { return 4096; }
 
   static RuntimeEffectUniform fromUniform(const SkRuntimeEffect::Uniform &u) {
     RuntimeEffectUniform su;

package/cpp/api/JsiSkRuntimeEffectFactory.h

@@ -6,15 +6,18 @@
 
 #include <jsi/jsi.h>
 
-#include "JsiSkHostObjects.h"
+#include "JsiSkNativeObjects.h"
 #include "JsiSkRuntimeEffect.h"
 
 namespace RNSkia {
 
 namespace jsi = facebook::jsi;
 
-class JsiSkRuntimeEffectFactory : public JsiSkHostObject {
+class JsiSkRuntimeEffectFactory
+    : public JsiSkNativeObject<JsiSkRuntimeEffectFactory> {
 public:
+  static constexpr const char *CLASS_NAME = "RuntimeEffectFactory";
+
   JSI_HOST_FUNCTION(Make) {
     auto sksl = arguments[0].asString(runtime).utf8(runtime);
     auto result = SkRuntimeEffect::MakeForShader(SkString(sksl));
@@ -26,23 +29,20 @@ public:
                                       .c_str());
       return jsi::Value::null();
     }
-    auto runtimeEffect =
-        std::make_shared<JsiSkRuntimeEffect>(getContext(), std::move(effect));
-    return JSI_CREATE_HOST_OBJECT_WITH_MEMORY_PRESSURE(runtime, runtimeEffect,
-                                                       getContext());
+    return makeJsiObject(runtime, std::make_shared<JsiSkRuntimeEffect>(
+                                      getContext(), std::move(effect)));
   }
 
-  size_t getMemoryPressure() const override { return 1024; }
+  size_t getMemoryPressure() override { return 1024; }
 
-  std::string getObjectType() const override {
-    return "JsiSkRuntimeEffectFactory";
+  static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {
+    installHostMethod(runtime, prototype, "Make",
+                      &JsiSkRuntimeEffectFactory::Make);
   }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRuntimeEffectFactory, Make))
-
   explicit JsiSkRuntimeEffectFactory(
       std::shared_ptr<RNSkPlatformContext> context)
-      : JsiSkHostObject(std::move(context)) {}
+      : JsiSkNativeObject<JsiSkRuntimeEffectFactory>(std::move(context)) {}
 };
 
 } // namespace RNSkia