fix: errors after rebase

Author: NorbertKlockiewicz

packages/react-native-executorch/common/rnexecutorch/host_objects/JsiConversions.h

@@ -360,16 +360,6 @@ inline jsi::Value getJsiValue(uint64_t val, jsi::Runtime &runtime) {
   return {runtime, bigInt};
 }
 
-inline jsi::Value getJsiValue(const std::vector<uint64_t> &vec,
-                              jsi::Runtime &runtime) {
-  jsi::Array array(runtime, vec.size());
-  for (size_t i = 0; i < vec.size(); i++) {
-    // JS numbers are doubles. Large uint64s > 2^53 will lose precision.
-    array.setValueAtIndex(runtime, i, jsi::Value(static_cast<double>(vec[i])));
-  }
-  return {runtime, array};
-}
-
 inline jsi::Value getJsiValue(const std::vector<int64_t> &vec,
                               jsi::Runtime &runtime) {
   jsi::Array array(runtime, vec.size());

packages/react-native-executorch/common/rnexecutorch/host_objects/ModelHostObject.h

@@ -17,6 +17,7 @@
 #include <rnexecutorch/metaprogramming/FunctionHelpers.h>
 #include <rnexecutorch/metaprogramming/TypeConcepts.h>
 #include <rnexecutorch/models/BaseModel.h>
+#include <rnexecutorch/models/VisionModel.h>
 #include <rnexecutorch/models/llm/LLM.h>
 #include <rnexecutorch/models/ocr/OCR.h>
 #include <rnexecutorch/models/speech_to_text/SpeechToText.h>
@@ -158,10 +159,10 @@ template <typename Model> class ModelHostObject : public JsiHostObject {
                                        "stream"));
     }
 
-    if constexpr (meta::DerivedFromOrSameAs<Model, models::VisionModel>) {
+    if constexpr (meta::HasGenerateFromFrame<Model>) {
       addFunctions(JSI_EXPORT_FUNCTION(
-          ModelHostObject<Model>, synchronousHostFunction<&Model::streamStop>,
-          "streamStop"));
+          ModelHostObject<Model>, visionHostFunction<&Model::generateFromFrame>,
+          "generateFromFrame"));
     }
 
     if constexpr (meta::HasGenerateFromPixels<Model>) {

packages/react-native-executorch/common/rnexecutorch/metaprogramming/FunctionHelpers.h

@@ -3,12 +3,39 @@
 #include <cstddef>
 #include <jsi/jsi.h>
 #include <tuple>
+#include <type_traits>
 
 #include <rnexecutorch/host_objects/JsiConversions.h>
 
 namespace rnexecutorch::meta {
 using namespace facebook;
 
+// =========================================================================
+// 1. Function Traits (Extracts Arity, Return Type, Args)
+// =========================================================================
+
+template <typename T> struct FunctionTraits;
+
+// Specialization for Member Functions
+template <typename R, typename C, typename... Args>
+struct FunctionTraits<R (C::*)(Args...)> {
+  static constexpr std::size_t arity = sizeof...(Args);
+  using return_type = R;
+  using args_tuple = std::tuple<Args...>;
+};
+
+// Specialization for const Member Functions
+template <typename R, typename C, typename... Args>
+struct FunctionTraits<R (C::*)(Args...) const> {
+  static constexpr std::size_t arity = sizeof...(Args);
+  using return_type = R;
+  using args_tuple = std::tuple<Args...>;
+};
+
+// =========================================================================
+// 2. Argument Counting Helpers
+// =========================================================================
+
 template <typename Model, typename R, typename... Types>
 constexpr std::size_t getArgumentCount(R (Model::*f)(Types...)) {
   return sizeof...(Types);
@@ -19,6 +46,10 @@ constexpr std::size_t getArgumentCount(R (Model::*f)(Types...) const) {
   return sizeof...(Types);
 }
 
+// =========================================================================
+// 3. JSI -> Tuple Conversion Logic
+// =========================================================================
+
 template <typename... Types, std::size_t... I>
 std::tuple<Types...> fillTupleFromArgs(std::index_sequence<I...>,
                                        const jsi::Value *args,
@@ -31,7 +62,6 @@ std::tuple<Types...> fillTupleFromArgs(std::index_sequence<I...>,
  * arguments for method supplied with a pointer. The types in the tuple are
  * inferred from the method pointer.
  */
-
 template <typename Model, typename R, typename... Types>
 std::tuple<Types...> createArgsTupleFromJsi(R (Model::*f)(Types...),
                                             const jsi::Value *args,
@@ -47,4 +77,37 @@ std::tuple<Types...> createArgsTupleFromJsi(R (Model::*f)(Types...) const,
   return fillTupleFromArgs<Types...>(std::index_sequence_for<Types...>{}, args,
                                      runtime);
 }
-} // namespace rnexecutorch::meta
+
+// Overload for free functions (used by TailSignature dummy)
+template <typename... Types>
+std::tuple<Types...> createArgsTupleFromJsi(void (*f)(Types...),
+                                            const jsi::Value *args,
+                                            jsi::Runtime &runtime) {
+  return fillTupleFromArgs<Types...>(std::index_sequence_for<Types...>{}, args,
+                                     runtime);
+}
+
+// =========================================================================
+// 4. Tail Signature Helper (Crucial for Vision Functions)
+// =========================================================================
+
+// Extracts the "Tail" arguments of a function signature, skipping the first
+// two arguments (Runtime and FrameValue).
+template <typename T> struct TailSignature;
+
+// Non-const member function specialization
+template <typename R, typename C, typename Arg1, typename Arg2,
+          typename... Rest>
+struct TailSignature<R (C::*)(Arg1, Arg2, Rest...)> {
+  // A dummy function that has the signature of just the "Rest" arguments.
+  static void dummy(Rest...) {}
+};
+
+// Const member function specialization
+template <typename R, typename C, typename Arg1, typename Arg2,
+          typename... Rest>
+struct TailSignature<R (C::*)(Arg1, Arg2, Rest...) const> {
+  static void dummy(Rest...) {}
+};
+
+} // namespace rnexecutorch::meta

packages/react-native-executorch/common/rnexecutorch/metaprogramming/TypeConcepts.h

@@ -21,6 +21,11 @@ concept HasGenerateFromPixels = requires(T t) {
   { &T::generateFromPixels };
 };
 
+template <typename T>
+concept HasGenerateFromFrame = requires(T t) {
+  { &T::generateFromFrame };
+};
+
 template <typename T>
 concept HasEncode = requires(T t) {
   { &T::encode };

yarn.lock

@@ -4325,9 +4325,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@shopify/react-native-skia@npm:2.4.14":
-  version: 2.4.14
-  resolution: "@shopify/react-native-skia@npm:2.4.14"
+"@shopify/react-native-skia@npm:2.2.12":
+  version: 2.2.12
+  resolution: "@shopify/react-native-skia@npm:2.2.12"
   dependencies:
     canvaskit-wasm: "npm:0.40.0"
     react-reconciler: "npm:0.31.0"
@@ -4342,7 +4342,7 @@ __metadata:
       optional: true
   bin:
     setup-skia-web: scripts/setup-canvaskit.js
-  checksum: 10/cb0274dadb89046b357fb9cf071349f2e6c348ca3ea18360a791e084a1456c729de862d2cda3c0b81b306faebbbf2b63a91380ca2de3298266f0aa248f12d434
+  checksum: 10/2543664085470267a9a6491ee90760f01d258cdd97cda5955d0c9f980ad57d647dffa5670f9d5d5f8cd6180ff46fe1df6f4281ae2e0b5c3632c703479b6a7608
   languageName: node
   linkType: hard
 
@@ -4692,7 +4692,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:~19.1.0, @types/react@npm:~19.1.10":
+"@types/react@npm:~19.1.10":
   version: 19.1.17
   resolution: "@types/react@npm:19.1.17"
   dependencies:
@@ -4701,6 +4701,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/react@npm:~19.2.0":
+  version: 19.2.14
+  resolution: "@types/react@npm:19.2.14"
+  dependencies:
+    csstype: "npm:^3.2.2"
+  checksum: 10/fbff239089ee64b6bd9b00543594db498278b06de527ef1b0f71bb0eb09cc4445a71b5dd3c0d3d0257255c4eed94406be40a74ad4a987ade8a8d5dd65c82bc5f
+  languageName: node
+  linkType: hard
+
 "@types/semver@npm:^7.3.12":
   version: 7.7.1
   resolution: "@types/semver@npm:7.7.1"
@@ -6286,15 +6295,14 @@ __metadata:
   resolution: "computer-vision@workspace:apps/computer-vision"
   dependencies:
     "@babel/core": "npm:^7.25.2"
-    "@expo/config-plugins": "npm:~54.0.4"
     "@react-native-executorch/expo-resource-fetcher": "workspace:*"
     "@react-native/metro-config": "npm:^0.81.5"
     "@react-navigation/drawer": "npm:^7.3.9"
     "@react-navigation/native": "npm:^7.1.6"
-    "@shopify/react-native-skia": "npm:2.4.14"
+    "@shopify/react-native-skia": "npm:2.2.12"
     "@types/pngjs": "npm:^6.0.5"
-    "@types/react": "npm:~19.1.0"
-    expo: "npm:~54.0.33"
+    "@types/react": "npm:~19.2.0"
+    expo: "npm:^54.0.27"
     expo-build-properties: "npm:~1.0.10"
     expo-constants: "npm:~18.0.11"
     expo-font: "npm:~14.0.10"
@@ -6303,21 +6311,19 @@ __metadata:
     expo-status-bar: "npm:~3.0.9"
     metro-config: "npm:^0.81.5"
     react: "npm:19.1.0"
-    react-dom: "npm:19.1.0"
     react-native: "npm:0.81.5"
     react-native-device-info: "npm:^14.0.4"
     react-native-executorch: "workspace:*"
-    react-native-gesture-handler: "npm:~2.30.0"
+    react-native-gesture-handler: "npm:~2.28.0"
     react-native-image-picker: "npm:^7.2.2"
     react-native-loading-spinner-overlay: "npm:^3.0.1"
     react-native-nitro-image: "npm:0.10.2"
     react-native-nitro-modules: "npm:0.33.4"
     react-native-reanimated: "npm:~4.2.1"
     react-native-safe-area-context: "npm:~5.6.0"
-    react-native-screens: "npm:~4.22.0"
-    react-native-svg: "npm:15.15.1"
+    react-native-screens: "npm:~4.16.0"
+    react-native-svg: "npm:15.12.1"
     react-native-svg-transformer: "npm:^1.5.0"
-    react-native-vision-camera: "portal:../../../react-native-vision-camera-v5/packages/react-native-vision-camera"
     react-native-worklets: "npm:^0.7.2"
   languageName: unknown
   linkType: soft
@@ -6661,7 +6667,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"csstype@npm:^3.0.2":
+"csstype@npm:^3.0.2, csstype@npm:^3.2.2":
   version: 3.2.3
   resolution: "csstype@npm:3.2.3"
   checksum: 10/ad41baf7e2ffac65ab544d79107bf7cd1a4bb9bab9ac3302f59ab4ba655d5e30942a8ae46e10ba160c6f4ecea464cc95b975ca2fefbdeeacd6ac63f12f99fe1f
@@ -7935,7 +7941,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expo@npm:^54.0.0, expo@npm:^54.0.27, expo@npm:~54.0.33":
+"expo@npm:^54.0.0, expo@npm:^54.0.27":
   version: 54.0.33
   resolution: "expo@npm:54.0.33"
   dependencies:
@@ -12454,17 +12460,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-dom@npm:19.1.0":
-  version: 19.1.0
-  resolution: "react-dom@npm:19.1.0"
-  dependencies:
-    scheduler: "npm:^0.26.0"
-  peerDependencies:
-    react: ^19.1.0
-  checksum: 10/c5b58605862c7b0bb044416b01c73647bb8e89717fb5d7a2c279b11815fb7b49b619fe685c404e59f55eb52c66831236cc565c25ee1c2d042739f4a2cc538aa2
-  languageName: node
-  linkType: hard
-
 "react-fast-compare@npm:^3.2.2":
   version: 3.2.2
   resolution: "react-fast-compare@npm:3.2.2"
@@ -12502,9 +12497,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-audio-api@npm:0.6.5":
-  version: 0.6.5
-  resolution: "react-native-audio-api@npm:0.6.5"
+"react-native-audio-api@npm:0.11.3":
+  version: 0.11.3
+  resolution: "react-native-audio-api@npm:0.11.3"
+  dependencies:
+    semver: "npm:^7.7.3"
   peerDependencies:
     react: "*"
     react-native: "*"
@@ -12586,7 +12583,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "react-native-executorch-monorepo@workspace:."
   dependencies:
-    "@babel/plugin-transform-export-namespace-from": "npm:^7.27.1"
     "@cspell/eslint-plugin": "npm:^8.19.0"
     "@evilmartians/lefthook": "npm:^1.5.0"
     "@react-native/eslint-config": "npm:^0.79.0"
@@ -12646,20 +12642,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-gesture-handler@npm:~2.30.0":
-  version: 2.30.0
-  resolution: "react-native-gesture-handler@npm:2.30.0"
-  dependencies:
-    "@egjs/hammerjs": "npm:^2.0.17"
-    hoist-non-react-statics: "npm:^3.3.0"
-    invariant: "npm:^2.2.4"
-  peerDependencies:
-    react: "*"
-    react-native: "*"
-  checksum: 10/242b1eb29202bc9fc7bf0271c3da102559adc9f2810441465b6d78c1a8ed8f65bdd91335957c841a4716f796be3e7b87d1d55629d6803ea12e1be832d89c946c
-  languageName: node
-  linkType: hard
-
 "react-native-image-picker@npm:^7.2.2":
   version: 7.2.3
   resolution: "react-native-image-picker@npm:7.2.3"
@@ -12789,19 +12771,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-screens@npm:~4.22.0":
-  version: 4.22.0
-  resolution: "react-native-screens@npm:4.22.0"
-  dependencies:
-    react-freeze: "npm:^1.0.0"
-    warn-once: "npm:^0.1.0"
-  peerDependencies:
-    react: "*"
-    react-native: "*"
-  checksum: 10/42be14f2de0bfe7b76e3e8fccffa8843fc558cda70aa182c8cb7ed2697826a684cd83abb0a8647dbd1e01a0710960a120b706f01502a4206819d6f54ef3d3fce
-  languageName: node
-  linkType: hard
-
 "react-native-svg-transformer@npm:^1.5.0":
   version: 1.5.3
   resolution: "react-native-svg-transformer@npm:1.5.3"
@@ -12831,32 +12800,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-svg@npm:15.15.1":
-  version: 15.15.1
-  resolution: "react-native-svg@npm:15.15.1"
-  dependencies:
-    css-select: "npm:^5.1.0"
-    css-tree: "npm:^1.1.3"
-    warn-once: "npm:0.1.1"
-  peerDependencies:
-    react: "*"
-    react-native: "*"
-  checksum: 10/3a5dbbee0c6a81b3feb2b91a5a617a1a25e01c908686af479fab4fe6661376253ba0e0e1d3eda36f27eab9b2cd2c4c17b68423cfca465df255f20cacc1ba384d
-  languageName: node
-  linkType: hard
-
-"react-native-vision-camera@portal:../../../react-native-vision-camera-v5/packages/react-native-vision-camera::locator=computer-vision%40workspace%3Aapps%2Fcomputer-vision":
-  version: 0.0.0-use.local
-  resolution: "react-native-vision-camera@portal:../../../react-native-vision-camera-v5/packages/react-native-vision-camera::locator=computer-vision%40workspace%3Aapps%2Fcomputer-vision"
-  peerDependencies:
-    react: "*"
-    react-native: "*"
-    react-native-nitro-image: "*"
-    react-native-nitro-modules: "*"
-    react-native-worklets: "*"
-  languageName: node
-  linkType: soft
-
 "react-native-worklets@npm:0.5.1":
   version: 0.5.1
   resolution: "react-native-worklets@npm:0.5.1"
@@ -13387,7 +13330,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scheduler@npm:0.26.0, scheduler@npm:^0.26.0":
+"scheduler@npm:0.26.0":
   version: 0.26.0
   resolution: "scheduler@npm:0.26.0"
   checksum: 10/1ecf2e5d7de1a7a132796834afe14a2d589ba7e437615bd8c06f3e0786a3ac3434655e67aac8755d9b14e05754c177e49c064261de2673aaa3c926bc98caa002
@@ -13428,7 +13371,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.1.3, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.7.1":
+"semver@npm:^7.1.3, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.7.1, semver@npm:^7.7.3":
   version: 7.7.4
   resolution: "semver@npm:7.7.4"
   bin:
@@ -15148,4 +15091,4 @@ __metadata:
   resolution: "zod@npm:3.25.76"
   checksum: 10/f0c963ec40cd96858451d1690404d603d36507c1fc9682f2dae59ab38b578687d542708a7fdbf645f77926f78c9ed558f57c3d3aa226c285f798df0c4da16995
   languageName: node
-  linkType: hard
+  linkType: hard