@shopify/react-native-skia 0.1.190 → 0.1.192

package/cpp/api/JsiSkColorFilter.h

@@ -23,23 +23,8 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkColorFilter>(std::move(context),
                                                     std::move(colorFilter)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "ColorFilter");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkColorFilter,
-                                                  __typename__))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkColorFilter> fromValue(jsi::Runtime &runtime,
-                                        const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkColorFilter>(runtime)
-        ->getObject();
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkColorFilter, "ColorFilter")
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkColorFilter, dispose))
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkContourMeasure.h

@@ -68,26 +68,12 @@ public:
     return JsiSkPath::toValue(runtime, getContext(), std::move(path));
   }
 
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "ContourMeasure");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkContourMeasure,
-                                                  __typename__))
+  EXPORT_JSI_API_TYPENAME(JsiSkContourMeasure, "ContourMeasure")
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkContourMeasure, getPosTan),
                        JSI_EXPORT_FUNC(JsiSkContourMeasure, length),
                        JSI_EXPORT_FUNC(JsiSkContourMeasure, isClosed),
-                       JSI_EXPORT_FUNC(JsiSkContourMeasure, getSegment))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkContourMeasure> fromValue(jsi::Runtime &runtime,
-                                           const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkContourMeasure>(runtime)
-        ->getObject();
-  }
+                       JSI_EXPORT_FUNC(JsiSkContourMeasure, getSegment),
+                       JSI_EXPORT_FUNC(JsiSkContourMeasure, dispose))
 };
 } // namespace RNSkia

package/cpp/api/JsiSkContourMeasureIter.h

@@ -29,14 +29,6 @@ public:
             std::move(context), std::make_shared<SkContourMeasureIter>(
                                     path, forceClosed, resScale)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "ContourMeasureIter");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkContourMeasureIter,
-                                                  __typename__), )
-
   JSI_HOST_FUNCTION(next) {
     auto next = getObject()->next();
     if (next == nullptr) {
@@ -48,17 +40,10 @@ public:
     return jsi::Object::createFromHostObject(runtime, std::move(nextObject));
   }
 
-  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkContourMeasureIter, next))
+  EXPORT_JSI_API_TYPENAME(JsiSkContourMeasureIter, "ContourMeasureIter")
 
-  /**
-  Returns the underlying object from a host object of this type
- */
-  static std::shared_ptr<SkContourMeasureIter>
-  fromValue(jsi::Runtime &runtime, const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkContourMeasureIter>(runtime)
-        ->getObject();
-  }
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkContourMeasureIter, next),
+                       JSI_EXPORT_FUNC(JsiSkContourMeasureIter, dispose))
 
   /**
    * Creates the function for construction a new instance of the

package/cpp/api/JsiSkData.h

@@ -24,24 +24,7 @@ public:
   JsiSkData(std::shared_ptr<RNSkPlatformContext> context, sk_sp<SkData> asset)
       : JsiSkWrappingSkPtrHostObject(std::move(context), std::move(asset)) {}
 
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Data");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkData, __typename__))
-
-  JSI_HOST_FUNCTION(dispose) {
-    setObject(nullptr);
-    return jsi::Value::undefined();
-  }
-
+  EXPORT_JSI_API_TYPENAME(JsiSkData, "Data")
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkData, dispose))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkData> fromValue(jsi::Runtime &runtime, const jsi::Value &obj) {
-    return obj.asObject(runtime).asHostObject<JsiSkData>(runtime)->getObject();
-  }
 };
 } // namespace RNSkia

package/cpp/api/JsiSkFont.h

@@ -28,11 +28,6 @@ namespace jsi = facebook::jsi;
 
 class JsiSkFont : public JsiSkWrappingSharedPtrHostObject<SkFont> {
 public:
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Font");
-  }
-
   JSI_HOST_FUNCTION(getGlyphWidths) {
     auto jsiGlyphs = arguments[0].asObject(runtime).asArray(runtime);
     std::vector<SkGlyphID> glyphs;
@@ -244,6 +239,8 @@ public:
     return jsi::Value::undefined();
   }
 
+  EXPORT_JSI_API_TYPENAME(JsiSkFont, "Font")
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkFont, getSize),
                        JSI_EXPORT_FUNC(JsiSkFont, getMetrics),
                        JSI_EXPORT_FUNC(JsiSkFont, getGlyphIDs),
@@ -262,20 +259,13 @@ public:
                        JSI_EXPORT_FUNC(JsiSkFont, setSubpixel),
                        JSI_EXPORT_FUNC(JsiSkFont, setTypeface),
                        JSI_EXPORT_FUNC(JsiSkFont, getGlyphWidths),
-                       JSI_EXPORT_FUNC(JsiSkFont, getTextWidth))
+                       JSI_EXPORT_FUNC(JsiSkFont, getTextWidth),
+                       JSI_EXPORT_FUNC(JsiSkFont, dispose))
 
   JsiSkFont(std::shared_ptr<RNSkPlatformContext> context, const SkFont &font)
       : JsiSkWrappingSharedPtrHostObject(std::move(context),
                                          std::make_shared<SkFont>(font)) {}
 
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static std::shared_ptr<SkFont> fromValue(jsi::Runtime &runtime,
-                                           const jsi::Value &obj) {
-    return obj.asObject(runtime).asHostObject<JsiSkFont>(runtime)->getObject();
-  }
-
   /**
    * Creates the function for construction a new instance of the SkFont
    * wrapper

package/cpp/api/JsiSkHostObjects.h

@@ -11,7 +11,8 @@ namespace RNSkia {
 namespace jsi = facebook::jsi;
 
 /**
- * Base class for jsi host objects
+ * Base class for jsi host objects - these are all implemented as JsiHostObjects
+ * and has a pointer to the platform context.
  */
 class JsiSkHostObject : public RNJsi::JsiHostObject {
 public:
@@ -32,6 +33,15 @@ private:
   std::shared_ptr<RNSkPlatformContext> _context;
 };
 
+#define JSI_API_TYPENAME(A)                                                    \
+  JSI_PROPERTY_GET(__typename__) {                                             \
+    return jsi::String::createFromUtf8(runtime, #A);                           \
+  }
+
+#define EXPORT_JSI_API_TYPENAME(CLASS, TYPENAME)                               \
+  JSI_API_TYPENAME(TYPENAME)                                                   \
+  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(CLASS, __typename__))
+
 template <typename T> class JsiSkWrappingHostObject : public JsiSkHostObject {
 public:
   /**
@@ -39,32 +49,65 @@ public:
    * @param context Platform context
    */
   JsiSkWrappingHostObject(std::shared_ptr<RNSkPlatformContext> context,
-                          T &&object)
+                          T object)
       : JsiSkHostObject(std::move(context)), _object(std::move(object)) {}
 
-  JsiSkWrappingHostObject(std::shared_ptr<RNSkPlatformContext> context,
-                          const T &object)
-      : JsiSkHostObject(std::move(context)), _object(object) {}
-
   /**
    * Returns the underlying object exposed by this host object. This object
    * should be wrapped in a shared pointer of some kind
    * @return Underlying object
    */
-  T &getObject() { return _object; }
-  const T &getObject() const { return _object; }
+  T getObject() { return _object; }
+  const T getObject() const { return _object; }
 
   /**
    Updates the inner object with a new version of the object.
    */
-  void setObject(T &object) { _object = object; }
-  void setObject(const T &object) { _object = object; }
+  void setObject(T object) { _object = object; }
+
+  /**
+   Dispose function that can be exposed to JS by using the JSI_API_TYPENAME
+   macro
+   */
+  JSI_HOST_FUNCTION(dispose) {
+    safeDispose();
+    return jsi::Value::undefined();
+  }
+
+protected:
+  /**
+   Override to implement disposale of allocated resources like smart pointers
+   etc. This method will only be called once for each instance of this class.
+   */
+  virtual void releaseResources() = 0;
+
+  /**
+   Throws a runtime error if this method is called after the object has been
+   disposed.
+   */
+  void ensureNotDisposed() {
+    if (_isDisposed) {
+      throw std::runtime_error("API Object accessed after it was disposed");
+    }
+  }
 
 private:
+  void safeDispose() {
+    if (!_isDisposed) {
+      _isDisposed = true;
+      releaseResources();
+    }
+  }
+
   /**
    * Wrapped object
    */
   T _object;
+
+  /**
+   Resource disposed flag
+   */
+  std::atomic<bool> _isDisposed = {false};
 };
 
 template <typename T>
@@ -75,6 +118,22 @@ public:
                                    std::shared_ptr<T> object)
       : JsiSkWrappingHostObject<std::shared_ptr<T>>(std::move(context),
                                                     std::move(object)) {}
+
+  /**
+    Returns the underlying object from a host object of this type
+   */
+  static std::shared_ptr<T> fromValue(jsi::Runtime &runtime,
+                                      const jsi::Value &obj) {
+    return std::static_pointer_cast<JsiSkWrappingSharedPtrHostObject>(
+               obj.asObject(runtime).asHostObject(runtime))
+        ->getObject();
+  }
+
+protected:
+  void releaseResources() override {
+    // Clear internally allocated objects
+    this->setObject(nullptr);
+  }
 };
 
 template <typename T>
@@ -84,5 +143,21 @@ public:
                                sk_sp<T> object)
       : JsiSkWrappingHostObject<sk_sp<T>>(std::move(context),
                                           std::move(object)) {}
+
+  /**
+    Returns the underlying object from a host object of this type
+   */
+  static sk_sp<T> fromValue(jsi::Runtime &runtime, const jsi::Value &obj) {
+    return std::static_pointer_cast<JsiSkWrappingSkPtrHostObject>(
+               obj.asObject(runtime).asHostObject(runtime))
+        ->getObject();
+  }
+
+protected:
+  void releaseResources() override {
+    // Clear internally allocated objects
+    this->setObject(nullptr);
+  }
 };
+
 } // namespace RNSkia

package/cpp/api/JsiSkImage.h

@@ -110,10 +110,7 @@ public:
         runtime, std::make_shared<JsiSkImage>(getContext(), std::move(image)));
   }
 
-  JSI_HOST_FUNCTION(dispose) {
-    setObject(nullptr);
-    return jsi::Value::undefined();
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkImage, "Image")
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkImage, width),
                        JSI_EXPORT_FUNC(JsiSkImage, height),
@@ -128,14 +125,6 @@ public:
              const sk_sp<SkImage> image)
       : JsiSkWrappingSkPtrHostObject<SkImage>(std::move(context),
                                               std::move(image)) {}
-
-  /**
-  Returns the underlying object from a host object of this type
- */
-  static sk_sp<SkImage> fromValue(jsi::Runtime &runtime,
-                                  const jsi::Value &obj) {
-    return obj.asObject(runtime).asHostObject<JsiSkImage>(runtime)->getObject();
-  }
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkImageFilter.h

@@ -25,23 +25,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkImageFilter>(std::move(context),
                                                     std::move(imageFilter)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "ImageFilter");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkImageFilter,
-                                                  __typename__))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkImageFilter> fromValue(jsi::Runtime &runtime,
-                                        const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkImageFilter>(runtime)
-        ->getObject();
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkImageFilter, "ImageFilter")
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkMaskFilter.h

@@ -25,23 +25,7 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkMaskFilter>(std::move(context),
                                                    std::move(maskFilter)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "MaskFilter");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkMaskFilter,
-                                                  __typename__))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkMaskFilter> fromValue(jsi::Runtime &runtime,
-                                       const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkMaskFilter>(runtime)
-        ->getObject();
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkMaskFilter, "MaskFilter")
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkMatrix.h

@@ -40,10 +40,6 @@ public:
                              pers0, pers1, pers2);
   }
 
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Matrix");
-  }
-
   JSI_HOST_FUNCTION(concat) {
     auto m3 = JsiSkMatrix::fromValue(runtime, arguments[0]);
     getObject()->preConcat(*m3);
@@ -90,7 +86,7 @@ public:
     return values;
   }
 
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkMatrix, __typename__))
+  EXPORT_JSI_API_TYPENAME(JsiSkMatrix, "Matrix")
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkMatrix, concat),
                        JSI_EXPORT_FUNC(JsiSkMatrix, translate),
@@ -98,7 +94,8 @@ public:
                        JSI_EXPORT_FUNC(JsiSkMatrix, skew),
                        JSI_EXPORT_FUNC(JsiSkMatrix, rotate),
                        JSI_EXPORT_FUNC(JsiSkMatrix, identity),
-                       JSI_EXPORT_FUNC(JsiSkMatrix, get), )
+                       JSI_EXPORT_FUNC(JsiSkMatrix, get),
+                       JSI_EXPORT_FUNC(JsiSkMatrix, dispose))
 
   /**
    * Returns the underlying object from a host object of this type

package/cpp/api/JsiSkPaint.h

@@ -25,12 +25,7 @@ namespace jsi = facebook::jsi;
 
 class JsiSkPaint : public JsiSkWrappingSharedPtrHostObject<SkPaint> {
 public:
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Paint");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkPaint, __typename__))
+  EXPORT_JSI_API_TYPENAME(JsiSkPaint, "Paint")
 
   JSI_HOST_FUNCTION(copy) {
     const auto *paint = getObject().get();
@@ -183,7 +178,8 @@ public:
                        JSI_EXPORT_FUNC(JsiSkPaint, setStrokeWidth),
                        JSI_EXPORT_FUNC(JsiSkPaint, setStyle),
                        JSI_EXPORT_FUNC(JsiSkPaint, setColor),
-                       JSI_EXPORT_FUNC(JsiSkPaint, setAlphaf))
+                       JSI_EXPORT_FUNC(JsiSkPaint, setAlphaf),
+                       JSI_EXPORT_FUNC(JsiSkPaint, dispose))
 
   JsiSkPaint(std::shared_ptr<RNSkPlatformContext> context, SkPaint paint)
       : JsiSkWrappingSharedPtrHostObject<SkPaint>(
@@ -196,14 +192,6 @@ public:
     setObject(std::make_shared<SkPaint>(std::move(paint)));
   }
 
-  /**
-   Returns the underlying object from a host object of this type
- */
-  static std::shared_ptr<SkPaint> fromValue(jsi::Runtime &runtime,
-                                            const jsi::Value &obj) {
-    return obj.asObject(runtime).asHostObject<JsiSkPaint>(runtime)->getObject();
-  }
-
   /**
    * Creates the function for construction a new instance of the SkPaint
    * wrapper

package/cpp/api/JsiSkPath.h

@@ -36,11 +36,6 @@ namespace jsi = facebook::jsi;
 class JsiSkPath : public JsiSkWrappingSharedPtrHostObject<SkPath> {
 
 public:
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Path");
-  }
-
   JSI_HOST_FUNCTION(addPath) {
     auto src = JsiSkPath::fromValue(runtime, arguments[0]);
     auto matrix =
@@ -526,7 +521,7 @@ public:
     return cmds;
   }
 
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkPath, __typename__))
+  EXPORT_JSI_API_TYPENAME(JsiSkPath, "Path")
 
   JSI_EXPORT_FUNCTIONS(
       JSI_EXPORT_FUNC(JsiSkPath, addPath), JSI_EXPORT_FUNC(JsiSkPath, addArc),
@@ -562,20 +557,12 @@ public:
       JSI_EXPORT_FUNC(JsiSkPath, op),
       JSI_EXPORT_FUNC(JsiSkPath, isInterpolatable),
       JSI_EXPORT_FUNC(JsiSkPath, interpolate),
-      JSI_EXPORT_FUNC(JsiSkPath, toCmds), )
+      JSI_EXPORT_FUNC(JsiSkPath, toCmds), JSI_EXPORT_FUNC(JsiSkPath, dispose))
 
   JsiSkPath(std::shared_ptr<RNSkPlatformContext> context, SkPath path)
       : JsiSkWrappingSharedPtrHostObject<SkPath>(
             std::move(context), std::make_shared<SkPath>(std::move(path))) {}
 
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static std::shared_ptr<SkPath> fromValue(jsi::Runtime &runtime,
-                                           const jsi::Value &obj) {
-    return obj.asObject(runtime).asHostObject<JsiSkPath>(runtime)->getObject();
-  }
-
   static jsi::Value toValue(jsi::Runtime &runtime,
                             std::shared_ptr<RNSkPlatformContext> context,
                             const SkPath &path) {

package/cpp/api/JsiSkPathEffect.h

@@ -25,23 +25,8 @@ public:
       : JsiSkWrappingSkPtrHostObject<SkPathEffect>(std::move(context),
                                                    std::move(pathEffect)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "PathEffect");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkPathEffect,
-                                                  __typename__))
-
-  /**
-    Returns the underlying object from a host object of this type
-   */
-  static sk_sp<SkPathEffect> fromValue(jsi::Runtime &runtime,
-                                       const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkPathEffect>(runtime)
-        ->getObject();
-  }
+  EXPORT_JSI_API_TYPENAME(JsiSkPathEffect, "PathEffect")
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkColorFilter, dispose))
 };
 
 } // namespace RNSkia

package/cpp/api/JsiSkPicture.h

@@ -23,12 +23,6 @@ public:
                const sk_sp<SkPicture> picture)
       : JsiSkWrappingSkPtrHostObject<SkPicture>(context, picture) {}
 
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "Picture");
-  }
-
-  JSI_EXPORT_PROPERTY_GETTERS(JSI_EXPORT_PROP_GET(JsiSkPicture, __typename__))
-
   JSI_HOST_FUNCTION(makeShader) {
     auto tmx = (SkTileMode)arguments[0].asNumber();
     auto tmy = (SkTileMode)arguments[1].asNumber();
@@ -66,18 +60,10 @@ public:
     return array;
   }
 
+  EXPORT_JSI_API_TYPENAME(JsiSkPicture, "Picture")
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPicture, makeShader),
-                       JSI_EXPORT_FUNC(JsiSkPicture, serialize))
-
-  /**
-   Returns the underlying object from a host object of this type
-  */
-  static sk_sp<SkPicture> fromValue(jsi::Runtime &runtime,
-                                    const jsi::Value &obj) {
-    return obj.asObject(runtime)
-        .asHostObject<JsiSkPicture>(runtime)
-        .get()
-        ->getObject();
-  }
+                       JSI_EXPORT_FUNC(JsiSkPicture, serialize),
+                       JSI_EXPORT_FUNC(JsiSkPicture, dispose))
 };
 } // namespace RNSkia

package/cpp/api/JsiSkPictureRecorder.h

@@ -40,9 +40,12 @@ public:
         runtime, std::make_shared<JsiSkPicture>(getContext(), picture));
   }
 
+  EXPORT_JSI_API_TYPENAME(JsiSkPictureRecorder, "PictureRecorder")
+
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPictureRecorder, beginRecording),
                        JSI_EXPORT_FUNC(JsiSkPictureRecorder,
-                                       finishRecordingAsPicture))
+                                       finishRecordingAsPicture),
+                       JSI_EXPORT_FUNC(JsiSkPictureRecorder, dispose))
 
   static const jsi::HostFunctionType
   createCtor(std::shared_ptr<RNSkPlatformContext> context) {

package/cpp/api/JsiSkPoint.h

@@ -24,8 +24,13 @@ public:
 
   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, y),
+                              JSI_EXPORT_PROP_GET(JsiSkPoint, __typename__))
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkPoint, dispose))
 
   JsiSkPoint(std::shared_ptr<RNSkPlatformContext> context, const SkPoint &point)
       : JsiSkWrappingSharedPtrHostObject<SkPoint>(

package/cpp/api/JsiSkRRect.h

@@ -34,9 +34,14 @@ public:
         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, rect),
+                              JSI_EXPORT_PROP_GET(JsiSkRRect, __typename__))
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRRect, dispose))
 
   JsiSkRRect(std::shared_ptr<RNSkPlatformContext> context, const SkRRect &rect)
       : JsiSkWrappingSharedPtrHostObject<SkRRect>(

package/cpp/api/JsiSkRSXform.h

@@ -25,11 +25,7 @@ public:
       : JsiSkWrappingSharedPtrHostObject<SkRSXform>(
             std::move(context), std::make_shared<SkRSXform>(rsxform)) {}
 
-  // TODO: declare in JsiSkWrappingSkPtrHostObject via extra template parameter?
-
-  JSI_PROPERTY_GET(__typename__) {
-    return jsi::String::createFromUtf8(runtime, "RSXform");
-  }
+  JSI_API_TYPENAME("RSXform");
 
   JSI_PROPERTY_GET(scos) {
     return jsi::Value(SkScalarToDouble(getObject()->fSCos));
@@ -48,7 +44,9 @@ public:
                               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_PROP_GET(JsiSkRSXform, ty))
+
+  JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRSXform, dispose))
 
   /**
   Returns the underlying object from a host object of this type

package/cpp/api/JsiSkRect.h

@@ -33,10 +33,13 @@ 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, height),
+                              JSI_EXPORT_PROP_GET(JsiSkRect, __typename__))
 
   JSI_HOST_FUNCTION(setXYWH) {
     getObject()->setXYWH(arguments[0].asNumber(), arguments[1].asNumber(),
@@ -51,7 +54,8 @@ public:
   }
 
   JSI_EXPORT_FUNCTIONS(JSI_EXPORT_FUNC(JsiSkRect, setXYWH),
-                       JSI_EXPORT_FUNC(JsiSkRect, setLTRB), )
+                       JSI_EXPORT_FUNC(JsiSkRect, setLTRB),
+                       JSI_EXPORT_FUNC(JsiSkRect, dispose))
 
   /**
    Constructor