react-native-yolo 0.0.5 → 0.0.7

package/nitrogen/generated/ios/swift/HybridYoloModelSpec.swift

@@ -0,0 +1,57 @@
+///
+/// HybridYoloModelSpec.swift
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+import VisionCamera
+import NitroModules
+
+/// See ``HybridYoloModelSpec``
+public protocol HybridYoloModelSpec_protocol: HybridObject {
+  // Properties
+  
+
+  // Methods
+  func detect(frame: (any HybridFrameSpec)) throws -> [Detection]
+  func close() throws -> Void
+}
+
+public extension HybridYoloModelSpec_protocol {
+  /// Default implementation of ``HybridObject.toString``
+  func toString() -> String {
+    return "[HybridObject YoloModel]"
+  }
+}
+
+/// See ``HybridYoloModelSpec``
+open class HybridYoloModelSpec_base {
+  private weak var cxxWrapper: HybridYoloModelSpec_cxx? = nil
+  public init() { }
+  public func getCxxWrapper() -> HybridYoloModelSpec_cxx {
+  #if DEBUG
+    guard self is any HybridYoloModelSpec else {
+      fatalError("`self` is not a `HybridYoloModelSpec`! Did you accidentally inherit from `HybridYoloModelSpec_base` instead of `HybridYoloModelSpec`?")
+    }
+  #endif
+    if let cxxWrapper = self.cxxWrapper {
+      return cxxWrapper
+    } else {
+      let cxxWrapper = HybridYoloModelSpec_cxx(self as! any HybridYoloModelSpec)
+      self.cxxWrapper = cxxWrapper
+      return cxxWrapper
+    }
+  }
+}
+
+/**
+ * A Swift base-protocol representing the YoloModel HybridObject.
+ * Implement this protocol to create Swift-based instances of YoloModel.
+ * ```swift
+ * class HybridYoloModel : HybridYoloModelSpec {
+ *   // ...
+ * }
+ * ```
+ */
+public typealias HybridYoloModelSpec = HybridYoloModelSpec_protocol & HybridYoloModelSpec_base

package/nitrogen/generated/ios/swift/HybridYoloModelSpec_cxx.swift

@@ -0,0 +1,160 @@
+///
+/// HybridYoloModelSpec_cxx.swift
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+import NitroModules
+import VisionCamera
+
+/**
+ * A class implementation that bridges HybridYoloModelSpec over to C++.
+ * In C++, we cannot use Swift protocols - so we need to wrap it in a class to make it strongly defined.
+ *
+ * Also, some Swift types need to be bridged with special handling:
+ * - Enums need to be wrapped in Structs, otherwise they cannot be accessed bi-directionally (Swift bug: https://github.com/swiftlang/swift/issues/75330)
+ * - Other HybridObjects need to be wrapped/unwrapped from the Swift TCxx wrapper
+ * - Throwing methods need to be wrapped with a Result<T, Error> type, as exceptions cannot be propagated to C++
+ */
+open class HybridYoloModelSpec_cxx {
+  /**
+   * The Swift <> C++ bridge's namespace (`margelo::nitro::yolo::bridge::swift`)
+   * from `Yolo-Swift-Cxx-Bridge.hpp`.
+   * This contains specialized C++ templates, and C++ helper functions that can be accessed from Swift.
+   */
+  public typealias bridge = margelo.nitro.yolo.bridge.swift
+
+  /**
+   * Holds an instance of the `HybridYoloModelSpec` Swift protocol.
+   */
+  private var __implementation: any HybridYoloModelSpec
+
+  /**
+   * Holds a weak pointer to the C++ class that wraps the Swift class.
+   */
+  private var __cxxPart: bridge.std__weak_ptr_HybridYoloModelSpec_
+
+  /**
+   * Create a new `HybridYoloModelSpec_cxx` that wraps the given `HybridYoloModelSpec`.
+   * All properties and methods bridge to C++ types.
+   */
+  public init(_ implementation: any HybridYoloModelSpec) {
+    self.__implementation = implementation
+    self.__cxxPart = .init()
+    /* no base class */
+  }
+
+  /**
+   * Get the actual `HybridYoloModelSpec` instance this class wraps.
+   */
+  @inline(__always)
+  public func getHybridYoloModelSpec() -> any HybridYoloModelSpec {
+    return __implementation
+  }
+
+  /**
+   * Casts this instance to a retained unsafe raw pointer.
+   * This acquires one additional strong reference on the object!
+   */
+  public func toUnsafe() -> UnsafeMutableRawPointer {
+    return Unmanaged.passRetained(self).toOpaque()
+  }
+
+  /**
+   * Casts an unsafe pointer to a `HybridYoloModelSpec_cxx`.
+   * The pointer has to be a retained opaque `Unmanaged<HybridYoloModelSpec_cxx>`.
+   * This removes one strong reference from the object!
+   */
+  public class func fromUnsafe(_ pointer: UnsafeMutableRawPointer) -> HybridYoloModelSpec_cxx {
+    return Unmanaged<HybridYoloModelSpec_cxx>.fromOpaque(pointer).takeRetainedValue()
+  }
+
+  /**
+   * Gets (or creates) the C++ part of this Hybrid Object.
+   * The C++ part is a `std::shared_ptr<HybridYoloModelSpec>`.
+   */
+  public func getCxxPart() -> bridge.std__shared_ptr_HybridYoloModelSpec_ {
+    let cachedCxxPart = self.__cxxPart.lock()
+    if Bool(fromCxx: cachedCxxPart) {
+      return cachedCxxPart
+    } else {
+      let newCxxPart = bridge.create_std__shared_ptr_HybridYoloModelSpec_(self.toUnsafe())
+      __cxxPart = bridge.weakify_std__shared_ptr_HybridYoloModelSpec_(newCxxPart)
+      return newCxxPart
+    }
+  }
+
+  
+
+  /**
+   * Get the memory size of the Swift class (plus size of any other allocations)
+   * so the JS VM can properly track it and garbage-collect the JS object if needed.
+   */
+  @inline(__always)
+  public var memorySize: Int {
+    return MemoryHelper.getSizeOf(self.__implementation) + self.__implementation.memorySize
+  }
+
+  /**
+   * Compares this object with the given [other] object for reference equality.
+   */
+  @inline(__always)
+  public func equals(other: HybridYoloModelSpec_cxx) -> Bool {
+    return self.__implementation === other.__implementation
+  }
+
+  /**
+   * Call dispose() on the Swift class.
+   * This _may_ be called manually from JS.
+   */
+  @inline(__always)
+  public func dispose() {
+    self.__implementation.dispose()
+  }
+
+  /**
+   * Call toString() on the Swift class.
+   */
+  @inline(__always)
+  public func toString() -> String {
+    return self.__implementation.toString()
+  }
+
+  // Properties
+  
+
+  // Methods
+  @inline(__always)
+  public final func detect(frame: bridge.std__shared_ptr_margelo__nitro__camera__HybridFrameSpec_) -> bridge.Result_std__vector_Detection__ {
+    do {
+      let __result = try self.__implementation.detect(frame: { () -> any HybridFrameSpec in
+        let __unsafePointer = bridge.get_std__shared_ptr_margelo__nitro__camera__HybridFrameSpec_(frame)
+        let __instance = HybridFrameSpec_cxx.fromUnsafe(__unsafePointer)
+        return __instance.getHybridFrameSpec()
+      }())
+      let __resultCpp = { () -> bridge.std__vector_Detection_ in
+        var __vector = bridge.create_std__vector_Detection_(__result.count)
+        for __item in __result {
+          __vector.push_back(__item)
+        }
+        return __vector
+      }()
+      return bridge.create_Result_std__vector_Detection__(__resultCpp)
+    } catch (let __error) {
+      let __exceptionPtr = __error.toCpp()
+      return bridge.create_Result_std__vector_Detection__(__exceptionPtr)
+    }
+  }
+  
+  @inline(__always)
+  public final func close() -> bridge.Result_void_ {
+    do {
+      try self.__implementation.close()
+      return bridge.create_Result_void_()
+    } catch (let __error) {
+      let __exceptionPtr = __error.toCpp()
+      return bridge.create_Result_void_(__exceptionPtr)
+    }
+  }
+}

package/nitrogen/generated/ios/swift/HybridYoloSpec.swift

@@ -14,10 +14,8 @@ public protocol HybridYoloSpec_protocol: HybridObject {
   
 
   // Methods
-  func sum(num1: Double, num2: Double) throws -> Double
-  func loadModel(modelPath: String) throws -> Void
+  func loadModel(modelPath: String) throws -> (any HybridYoloModelSpec)
   func frameToBase64(frame: (any HybridFrameSpec)) throws -> String
-  func detect(frame: (any HybridFrameSpec)) throws -> [Detection]
 }
 
 public extension HybridYoloSpec_protocol {

package/nitrogen/generated/ios/swift/HybridYoloSpec_cxx.swift

@@ -126,25 +126,17 @@ open class HybridYoloSpec_cxx {
 
   // Methods
   @inline(__always)
-  public final func sum(num1: Double, num2: Double) -> bridge.Result_double_ {
+  public final func loadModel(modelPath: std.string) -> bridge.Result_std__shared_ptr_HybridYoloModelSpec__ {
     do {
-      let __result = try self.__implementation.sum(num1: num1, num2: num2)
-      let __resultCpp = __result
-      return bridge.create_Result_double_(__resultCpp)
-    } catch (let __error) {
-      let __exceptionPtr = __error.toCpp()
-      return bridge.create_Result_double_(__exceptionPtr)
-    }
-  }
-  
-  @inline(__always)
-  public final func loadModel(modelPath: std.string) -> bridge.Result_void_ {
-    do {
-      try self.__implementation.loadModel(modelPath: String(modelPath))
-      return bridge.create_Result_void_()
+      let __result = try self.__implementation.loadModel(modelPath: String(modelPath))
+      let __resultCpp = { () -> bridge.std__shared_ptr_HybridYoloModelSpec_ in
+        let __cxxWrapped = __result.getCxxWrapper()
+        return __cxxWrapped.getCxxPart()
+      }()
+      return bridge.create_Result_std__shared_ptr_HybridYoloModelSpec__(__resultCpp)
     } catch (let __error) {
       let __exceptionPtr = __error.toCpp()
-      return bridge.create_Result_void_(__exceptionPtr)
+      return bridge.create_Result_std__shared_ptr_HybridYoloModelSpec__(__exceptionPtr)
     }
   }
   
@@ -163,26 +155,4 @@ open class HybridYoloSpec_cxx {
       return bridge.create_Result_std__string_(__exceptionPtr)
     }
   }
-  
-  @inline(__always)
-  public final func detect(frame: bridge.std__shared_ptr_margelo__nitro__camera__HybridFrameSpec_) -> bridge.Result_std__vector_Detection__ {
-    do {
-      let __result = try self.__implementation.detect(frame: { () -> any HybridFrameSpec in
-        let __unsafePointer = bridge.get_std__shared_ptr_margelo__nitro__camera__HybridFrameSpec_(frame)
-        let __instance = HybridFrameSpec_cxx.fromUnsafe(__unsafePointer)
-        return __instance.getHybridFrameSpec()
-      }())
-      let __resultCpp = { () -> bridge.std__vector_Detection_ in
-        var __vector = bridge.create_std__vector_Detection_(__result.count)
-        for __item in __result {
-          __vector.push_back(__item)
-        }
-        return __vector
-      }()
-      return bridge.create_Result_std__vector_Detection__(__resultCpp)
-    } catch (let __error) {
-      let __exceptionPtr = __error.toCpp()
-      return bridge.create_Result_std__vector_Detection__(__exceptionPtr)
-    }
-  }
 }

package/nitrogen/generated/shared/c++/HybridYoloModelSpec.cpp

@@ -0,0 +1,22 @@
+///
+/// HybridYoloModelSpec.cpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#include "HybridYoloModelSpec.hpp"
+
+namespace margelo::nitro::yolo {
+
+  void HybridYoloModelSpec::loadHybridMethods() {
+    // load base methods/properties
+    HybridObject::loadHybridMethods();
+    // load custom methods/properties
+    registerHybrids(this, [](Prototype& prototype) {
+      prototype.registerHybridMethod("detect", &HybridYoloModelSpec::detect);
+      prototype.registerHybridMethod("close", &HybridYoloModelSpec::close);
+    });
+  }
+
+} // namespace margelo::nitro::yolo

package/nitrogen/generated/shared/c++/HybridYoloModelSpec.hpp

@@ -0,0 +1,69 @@
+///
+/// HybridYoloModelSpec.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/HybridObject.hpp>)
+#include <NitroModules/HybridObject.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+// Forward declaration of `Detection` to properly resolve imports.
+namespace margelo::nitro::yolo { struct Detection; }
+// Forward declaration of `HybridFrameSpec` to properly resolve imports.
+namespace margelo::nitro::camera { class HybridFrameSpec; }
+
+#include "Detection.hpp"
+#include <vector>
+#include <memory>
+#include <VisionCamera/HybridFrameSpec.hpp>
+
+namespace margelo::nitro::yolo {
+
+  using namespace margelo::nitro;
+
+  /**
+   * An abstract base class for `YoloModel`
+   * Inherit this class to create instances of `HybridYoloModelSpec` in C++.
+   * You must explicitly call `HybridObject`'s constructor yourself, because it is virtual.
+   * @example
+   * ```cpp
+   * class HybridYoloModel: public HybridYoloModelSpec {
+   * public:
+   *   HybridYoloModel(...): HybridObject(TAG) { ... }
+   *   // ...
+   * };
+   * ```
+   */
+  class HybridYoloModelSpec: public virtual HybridObject {
+    public:
+      // Constructor
+      explicit HybridYoloModelSpec(): HybridObject(TAG) { }
+
+      // Destructor
+      ~HybridYoloModelSpec() override = default;
+
+    public:
+      // Properties
+      
+
+    public:
+      // Methods
+      virtual std::vector<Detection> detect(const std::shared_ptr<margelo::nitro::camera::HybridFrameSpec>& frame) = 0;
+      virtual void close() = 0;
+
+    protected:
+      // Hybrid Setup
+      void loadHybridMethods() override;
+
+    protected:
+      // Tag for logging
+      static constexpr auto TAG = "YoloModel";
+  };
+
+} // namespace margelo::nitro::yolo

package/nitrogen/generated/shared/c++/HybridYoloSpec.cpp

@@ -14,10 +14,8 @@ namespace margelo::nitro::yolo {
     HybridObject::loadHybridMethods();
     // load custom methods/properties
     registerHybrids(this, [](Prototype& prototype) {
-      prototype.registerHybridMethod("sum", &HybridYoloSpec::sum);
       prototype.registerHybridMethod("loadModel", &HybridYoloSpec::loadModel);
       prototype.registerHybridMethod("frameToBase64", &HybridYoloSpec::frameToBase64);
-      prototype.registerHybridMethod("detect", &HybridYoloSpec::detect);
     });
   }
 

package/nitrogen/generated/shared/c++/HybridYoloSpec.hpp

@@ -13,16 +13,15 @@
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
 
+// Forward declaration of `HybridYoloModelSpec` to properly resolve imports.
+namespace margelo::nitro::yolo { class HybridYoloModelSpec; }
 // Forward declaration of `HybridFrameSpec` to properly resolve imports.
 namespace margelo::nitro::camera { class HybridFrameSpec; }
-// Forward declaration of `Detection` to properly resolve imports.
-namespace margelo::nitro::yolo { struct Detection; }
 
-#include <string>
 #include <memory>
+#include "HybridYoloModelSpec.hpp"
+#include <string>
 #include <VisionCamera/HybridFrameSpec.hpp>
-#include "Detection.hpp"
-#include <vector>
 
 namespace margelo::nitro::yolo {
 
@@ -55,10 +54,8 @@ namespace margelo::nitro::yolo {
 
     public:
       // Methods
-      virtual double sum(double num1, double num2) = 0;
-      virtual void loadModel(const std::string& modelPath) = 0;
+      virtual std::shared_ptr<HybridYoloModelSpec> loadModel(const std::string& modelPath) = 0;
       virtual std::string frameToBase64(const std::shared_ptr<margelo::nitro::camera::HybridFrameSpec>& frame) = 0;
-      virtual std::vector<Detection> detect(const std::shared_ptr<margelo::nitro::camera::HybridFrameSpec>& frame) = 0;
 
     protected:
       // Hybrid Setup

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-yolo",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "react-native-yolo is a react native package built with Nitro",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/module/index.js",

package/src/index.ts

@@ -1,12 +1,22 @@
 import { NitroModules } from 'react-native-nitro-modules'
 import type { Yolo as YoloSpec } from './specs/yolo.nitro'
 import { Image } from 'react-native'
+import type { Frame } from 'react-native-vision-camera';
 
 const NativeYolo = NitroModules.createHybridObject<YoloSpec>('Yolo')
 
-export const Yolo = Object.assign(NativeYolo, {
-  loadModelTest(modelAssetId: number){
-    const { uri } = Image.resolveAssetSource(modelAssetId);
+export const Yolo = {
+  loadModel(modelAssetId: number) {
+    const { uri } = Image.resolveAssetSource(modelAssetId)
     return NativeYolo.loadModel(uri)
   },
-})
+
+  frameToBase64(frame: Frame) {
+    return NativeYolo.frameToBase64(frame)
+  },
+}
+export type {
+  Detection,
+  BoundingBox,
+  YoloModel,
+} from './specs/yolo.nitro'

package/src/specs/yolo.nitro.ts

@@ -13,12 +13,21 @@ export type BoundingBox = {
   y2: number
 }
 
+export interface YoloModel extends HybridObject<{
+  ios: 'swift'
+  android: 'kotlin'
+}> {
+  detect(frame: Frame): Detection[]
+  close(): void
+
+}
+
 export interface Yolo extends HybridObject<{
   ios: 'swift'
   android: 'kotlin'
 }> {
-  sum(num1: number, num2: number): number
-  loadModel(modelPath: string): void
+  loadModel(modelPath: string): YoloModel
   frameToBase64(frame: Frame): string
-  detect(frame: Frame): Detection[]
 }
+
+