react-native-yolo 0.0.2 → 0.0.4

package/package.json

@@ -1,122 +1,127 @@
-{
-  "name": "react-native-yolo",
-  "version": "0.0.2",
-  "description": "react-native-yolo is a react native package built with Nitro",
-  "main": "./lib/commonjs/index.js",
-  "module": "./lib/module/index.js",
-  "types": "./lib/typescript/src/index.d.ts",
-  "react-native": "src/index",
-  "source": "src/index",
-  "scripts": {
-    "typecheck": "tsc --noEmit",
-    "clean": "git clean -dfX",
-    "release": "semantic-release",
-    "build": "npm run typecheck && bob build",
-    "codegen": "nitrogen --logLevel=\"debug\" && npm run build && node post-script.js"
-  },
-  "keywords": [
-    "react-native",
-    "react-native-yolo"
-  ],
-  "files": [
-    "src",
-    "react-native.config.js",
-    "lib",
-    "nitrogen",
-    "cpp",
-    "nitro.json",
-    "android/build.gradle",
-    "android/fix-prefab.gradle",
-    "android/gradle.properties",
-    "android/CMakeLists.txt",
-    "android/src",
-    "ios/**/*.h",
-    "ios/**/*.m",
-    "ios/**/*.mm",
-    "ios/**/*.cpp",
-    "ios/**/*.swift",
-    "app.plugin.js",
-    "*.podspec",
-    "README.md"
-  ],
-  "workspaces": [
-    "example"
-  ],
-  "repository": "https://github.com/khaoula-ghalimi/react-native-yolo.git",
-  "author": "Khaoula-Ghalimi",
-  "license": "MIT",
-  "bugs": "https://github.com/khaoula-ghalimi/react-native-yolo/issues",
-  "homepage": "https://github.com/khaoula-ghalimi/react-native-yolo#readme",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "devDependencies": {
-    "@jamesacarr/eslint-formatter-github-actions": "^0.2.0",
-    "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/git": "^10.0.1",
-    "@types/jest": "^29.5.12",
-    "@types/react": "19.2.0",
-    "nitrogen": "0.35.9",
-    "react": "19.2.3",
-    "react-native": "0.84.1",
-    "react-native-builder-bob": "^0.40.18",
-    "react-native-nitro-modules": "0.35.9",
-    "conventional-changelog-conventionalcommits": "^9.1.0",
-    "semantic-release": "^25.0.3",
-    "typescript": "^5.8.3"
-  },
-  "peerDependencies": {
-    "react": "*",
-    "react-native": "*",
-    "react-native-nitro-modules": "*"
-  },
-  "eslintConfig": {
-    "root": true,
-    "extends": [
-      "@react-native",
-      "prettier"
-    ],
-    "plugins": [
-      "prettier"
-    ],
-    "rules": {
-      "prettier/prettier": [
-        "warn",
-        {
-          "quoteProps": "consistent",
-          "singleQuote": true,
-          "tabWidth": 2,
-          "trailingComma": "es5",
-          "useTabs": false
-        }
-      ]
-    }
-  },
-  "eslintIgnore": [
-    "node_modules/",
-    "lib/"
-  ],
-  "prettier": {
-    "quoteProps": "consistent",
-    "singleQuote": true,
-    "tabWidth": 2,
-    "trailingComma": "es5",
-    "useTabs": false,
-    "semi": false
-  },
-  "react-native-builder-bob": {
-    "source": "src",
-    "output": "lib",
-    "targets": [
-      "commonjs",
-      "module",
-      [
-        "typescript",
-        {
-          "project": "tsconfig.json"
-        }
-      ]
-    ]
-  }
-}
+{
+  "name": "react-native-yolo",
+  "version": "0.0.4",
+  "description": "react-native-yolo is a react native package built with Nitro",
+  "main": "./lib/commonjs/index.js",
+  "module": "./lib/module/index.js",
+  "types": "./lib/typescript/src/index.d.ts",
+  "react-native": "src/index",
+  "source": "src/index",
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "clean": "git clean -dfX",
+    "release": "semantic-release",
+    "build": "npm run typecheck && bob build",
+    "codegen": "nitrogen --logLevel=\"debug\" && npm run build && node post-script.js"
+  },
+  "keywords": [
+    "react-native",
+    "react-native-yolo"
+  ],
+  "files": [
+    "src",
+    "react-native.config.js",
+    "lib",
+    "nitrogen",
+    "cpp",
+    "nitro.json",
+    "android/build.gradle",
+    "android/fix-prefab.gradle",
+    "android/gradle.properties",
+    "android/CMakeLists.txt",
+    "android/src",
+    "ios/**/*.h",
+    "ios/**/*.m",
+    "ios/**/*.mm",
+    "ios/**/*.cpp",
+    "ios/**/*.swift",
+    "app.plugin.js",
+    "*.podspec",
+    "README.md"
+  ],
+  "repository": "https://github.com/khaoula-ghalimi/react-native-yolo.git",
+  "author": "Khaoula-Ghalimi",
+  "license": "MIT",
+  "bugs": "https://github.com/khaoula-ghalimi/react-native-yolo/issues",
+  "homepage": "https://github.com/khaoula-ghalimi/react-native-yolo#readme",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "devDependencies": {
+    "@jamesacarr/eslint-formatter-github-actions": "^0.2.0",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/git": "^10.0.1",
+    "@types/jest": "^29.5.12",
+    "@types/react": "19.2.0",
+    "conventional-changelog-conventionalcommits": "^9.1.0",
+    "nitrogen": "0.35.9",
+    "react": "19.2.3",
+    "react-native": "0.84.1",
+    "react-native-builder-bob": "^0.40.18",
+    "react-native-nitro-image": "^0.15.1",
+    "react-native-nitro-modules": "0.35.9",
+    "react-native-vision-camera": "^5.0.11",
+    "react-native-vision-camera-worklets": "^5.0.11",
+    "react-native-reanimated": "4.3.1",
+    "react-native-safe-area-context": "~5.7.0",
+    "react-native-worklets": "0.8.3",
+    "semantic-release": "^25.0.3",
+    "typescript": "^5.8.3"
+  },
+  "peerDependencies": {
+    "react": "*",
+    "react-native": "*",
+    "react-native-nitro-image": "^0.15.1",
+    "react-native-nitro-modules": "*",
+    "react-native-vision-camera": ">= 5.0"
+  },
+  "eslintConfig": {
+    "root": true,
+    "extends": [
+      "@react-native",
+      "prettier"
+    ],
+    "plugins": [
+      "prettier"
+    ],
+    "rules": {
+      "prettier/prettier": [
+        "warn",
+        {
+          "quoteProps": "consistent",
+          "singleQuote": true,
+          "tabWidth": 2,
+          "trailingComma": "es5",
+          "useTabs": false
+        }
+      ]
+    }
+  },
+  "eslintIgnore": [
+    "node_modules/",
+    "lib/"
+  ],
+  "prettier": {
+    "quoteProps": "consistent",
+    "singleQuote": true,
+    "tabWidth": 2,
+    "trailingComma": "es5",
+    "useTabs": false,
+    "semi": false
+  },
+  "react-native-builder-bob": {
+    "source": "src",
+    "output": "lib",
+    "targets": [
+      "commonjs",
+      "module",
+      [
+        "typescript",
+        {
+          "project": "tsconfig.json"
+        }
+      ]
+    ]
+  }
+}

package/src/index.ts

@@ -1,14 +1,12 @@
-import { getHostComponent, type HybridRef } from 'react-native-nitro-modules'
-import YoloConfig from '../nitrogen/generated/shared/json/YoloConfig.json'
-import type {
-  YoloProps,
-  YoloMethods,
-} from './specs/yolo.nitro'
-
-
-export const Yolo = getHostComponent<YoloProps, YoloMethods>(
-  'Yolo',
-  () => YoloConfig
-)
-
-export type YoloRef = HybridRef<YoloProps, YoloMethods>
+import { NitroModules } from 'react-native-nitro-modules'
+import type { Yolo as YoloSpec } from './specs/yolo.nitro'
+import { Image } from 'react-native'
+
+const NativeYolo = NitroModules.createHybridObject<YoloSpec>('Yolo')
+
+export const Yolo = Object.assign(NativeYolo, {
+  loadModelTest(modelAssetId: number){
+    const { uri } = Image.resolveAssetSource(modelAssetId);
+    return NativeYolo.loadModel(uri)
+  },
+})

package/src/specs/yolo.nitro.ts

@@ -1,13 +1,8 @@
-import type {
-  HybridView,
-  HybridViewProps,
-  HybridViewMethods,
-} from 'react-native-nitro-modules'
-
-export interface YoloProps extends HybridViewProps {
-   isRed: boolean
-}
-
-export interface YoloMethods extends HybridViewMethods {}
-
-export type Yolo = HybridView<YoloProps, YoloMethods, { ios: 'swift', android: 'kotlin' }>
+import type { HybridObject } from 'react-native-nitro-modules'
+import type { Frame } from 'react-native-vision-camera'
+
+export interface Yolo extends HybridObject<{ ios: 'swift', android: 'kotlin' }> {
+  sum(num1: number, num2: number): number
+  loadModel(modelPath: string): void
+  frameToBase64(frame: Frame): string
+}

package/nitrogen/generated/android/c++/views/JHybridYoloStateUpdater.cpp

@@ -1,56 +0,0 @@
-///
-/// JHybridYoloStateUpdater.cpp
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © Marc Rousavy @ Margelo
-///
-
-#include "JHybridYoloStateUpdater.hpp"
-#include "views/HybridYoloComponent.hpp"
-#include <NitroModules/NitroDefines.hpp>
-#include <react/fabric/StateWrapperImpl.h>
-
-namespace margelo::nitro::yolo::views {
-
-using namespace facebook;
-using ConcreteStateData = react::ConcreteState<HybridYoloState>;
-
-void JHybridYoloStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                                           jni::alias_ref<JHybridYoloSpec::JavaPart> javaView,
-                                           jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
-  std::shared_ptr<JHybridYoloSpec> hybridView = javaView->getJHybridYoloSpec();
-
-  // Get concrete StateWrapperImpl from passed StateWrapper interface object
-  jobject rawStateWrapper = stateWrapperInterface.get();
-  if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
-      throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
-  }
-  auto stateWrapper = jni::alias_ref<react::StateWrapperImpl::javaobject>{
-            static_cast<react::StateWrapperImpl::javaobject>(rawStateWrapper)};
-  std::shared_ptr<const react::State> state = stateWrapper->cthis()->getState();
-  auto concreteState = std::static_pointer_cast<const ConcreteStateData>(state);
-  const HybridYoloState& data = concreteState->getData();
-  const std::shared_ptr<HybridYoloProps>& props = data.getProps();
-  if (props == nullptr) [[unlikely]] {
-    // Props aren't set yet!
-    throw std::runtime_error("HybridYoloState's data doesn't contain any props!");
-  }
-
-  // Update all props if they are dirty
-  if (props->isRed.isDirty) {
-    hybridView->setIsRed(props->isRed.value);
-    props->isRed.isDirty = false;
-  }
-
-  // Update hybridRef if it changed
-  if (props->hybridRef.isDirty) {
-    // hybridRef changed - call it with new this
-    const auto& maybeFunc = props->hybridRef.value;
-    if (maybeFunc.has_value()) {
-      maybeFunc.value()(hybridView);
-    }
-    props->hybridRef.isDirty = false;
-  }
-}
-
-} // namespace margelo::nitro::yolo::views

package/nitrogen/generated/android/c++/views/JHybridYoloStateUpdater.hpp

@@ -1,49 +0,0 @@
-///
-/// JHybridYoloStateUpdater.hpp
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © Marc Rousavy @ Margelo
-///
-
-#pragma once
-
-#ifndef RN_SERIALIZABLE_STATE
-#error Yolo was compiled without the 'RN_SERIALIZABLE_STATE' flag. This flag is required for Nitro Views - set it in your CMakeLists!
-#endif
-
-#include <fbjni/fbjni.h>
-#include <react/fabric/CoreComponentsRegistry.h>
-#include <react/fabric/StateWrapperImpl.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <NitroModules/NitroDefines.hpp>
-#include <NitroModules/JStateWrapper.hpp>
-#include "JHybridYoloSpec.hpp"
-#include "views/HybridYoloComponent.hpp"
-
-namespace margelo::nitro::yolo::views {
-
-using namespace facebook;
-
-class JHybridYoloStateUpdater final: public jni::JavaClass<JHybridYoloStateUpdater> {
-public:
-  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/yolo/views/HybridYoloStateUpdater;";
-
-public:
-  static void updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                              jni::alias_ref<JHybridYoloSpec::JavaPart> view,
-                              jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface);
-
-public:
-  static void registerNatives() {
-    // Register JNI calls
-    javaClassStatic()->registerNatives({
-      makeNativeMethod("updateViewProps", JHybridYoloStateUpdater::updateViewProps),
-    });
-    // Register React Native view component descriptor
-    auto provider = react::concreteComponentDescriptorProvider<HybridYoloComponentDescriptor>();
-    auto providerRegistry = react::CoreComponentsRegistry::sharedProviderRegistry();
-    providerRegistry->add(provider);
-  }
-};
-
-} // namespace margelo::nitro::yolo::views

package/nitrogen/generated/android/kotlin/com/margelo/nitro/yolo/views/HybridYoloManager.kt

@@ -1,80 +0,0 @@
-///
-/// HybridYoloManager.kt
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © Marc Rousavy @ Margelo
-///
-
-package com.margelo.nitro.yolo.views
-
-import android.view.View
-import com.facebook.react.uimanager.ReactStylesDiffMap
-import com.facebook.react.uimanager.SimpleViewManager
-import com.facebook.react.uimanager.StateWrapper
-import com.facebook.react.uimanager.ThemedReactContext
-import com.margelo.nitro.R.id.associated_hybrid_view_tag
-import com.margelo.nitro.views.RecyclableView
-import com.yolo.*
-
-/**
- * Represents the React Native `ViewManager` for the "Yolo" Nitro HybridView.
- */
-public class HybridYoloManager: SimpleViewManager<View>() {
-  init {
-    if (RecyclableView::class.java.isAssignableFrom(HybridYolo::class.java)) {
-      // Enable view recycling
-      super.setupViewRecycling()
-    }
-  }
-
-  override fun getName(): String {
-    return "Yolo"
-  }
-
-  override fun createViewInstance(reactContext: ThemedReactContext): View {
-    val hybridView = HybridYolo(reactContext)
-    val view = hybridView.view
-    view.setTag(associated_hybrid_view_tag, hybridView)
-    return view
-  }
-
-  override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
-    val hybridView = getHybridView(view)
-      ?: throw Error("Couldn't find view $view in local views table!")
-
-    // 1. Update each prop individually
-    hybridView.beforeUpdate()
-    HybridYoloStateUpdater.updateViewProps(hybridView, stateWrapper)
-    hybridView.afterUpdate()
-
-    // 2. Continue in base View props
-    return super.updateState(view, props, stateWrapper)
-  }
-
-  override fun onDropViewInstance(view: View) {
-    val hybridView = getHybridView(view)
-    hybridView?.onDropView()
-    return super.onDropViewInstance(view)
-  }
-
-  protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
-    super.prepareToRecycleView(reactContext, view)
-    val hybridView = getHybridView(view)
-      ?: return null
-
-    @Suppress("USELESS_IS_CHECK")
-    if (hybridView is RecyclableView) {
-      // Recycle in it's implementation
-      hybridView.prepareForRecycle()
-
-      // Maybe update the view if it changed
-      return hybridView.view
-    } else {
-      return null
-    }
-  }
-
-  private fun getHybridView(view: View): HybridYolo? {
-    return view.getTag(associated_hybrid_view_tag) as? HybridYolo
-  }
-}

package/nitrogen/generated/android/kotlin/com/margelo/nitro/yolo/views/HybridYoloStateUpdater.kt

@@ -1,23 +0,0 @@
-///
-/// HybridYoloStateUpdater.kt
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © Marc Rousavy @ Margelo
-///
-
-package com.margelo.nitro.yolo.views
-
-import com.facebook.react.uimanager.StateWrapper
-import com.margelo.nitro.yolo.*
-
-internal class HybridYoloStateUpdater {
-  companion object {
-    /**
-     * Updates the props for [view] through C++.
-     * The [state] prop is expected to contain [view]'s props as wrapped Fabric state.
-     */
-    @Suppress("KotlinJniMissingFunction")
-    @JvmStatic
-    external fun updateViewProps(view: HybridYoloSpec, state: StateWrapper)
-  }
-}

package/nitrogen/generated/ios/c++/views/HybridYoloComponent.mm

@@ -1,122 +0,0 @@
-///
-/// HybridYoloComponent.mm
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © Marc Rousavy @ Margelo
-///
-
-#import "HybridYoloComponent.hpp"
-#import <memory>
-#import <react/renderer/componentregistry/ComponentDescriptorProvider.h>
-#import <React/RCTViewComponentView.h>
-#import <React/RCTComponentViewFactory.h>
-#import <React/UIView+ComponentViewProtocol.h>
-#import <NitroModules/NitroDefines.hpp>
-#import <UIKit/UIKit.h>
-
-#import "HybridYoloSpecSwift.hpp"
-#import "Yolo-Swift-Cxx-Umbrella.hpp"
-
-#if __has_include(<cxxreact/ReactNativeVersion.h>)
-#include <cxxreact/ReactNativeVersion.h>
-#if REACT_NATIVE_VERSION_MINOR >= 82
-#define ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
-#endif
-#endif
-
-using namespace facebook;
-using namespace margelo::nitro::yolo;
-using namespace margelo::nitro::yolo::views;
-
-/**
- * Represents the React Native View holder for the Nitro "Yolo" HybridView.
- */
-@interface HybridYoloComponent: RCTViewComponentView
-+ (BOOL)shouldBeRecycled;
-@end
-
-@implementation HybridYoloComponent {
-  std::shared_ptr<HybridYoloSpecSwift> _hybridView;
-}
-
-+ (void) load {
-  [super load];
-  [RCTComponentViewFactory.currentComponentViewFactory registerComponentViewClass:[HybridYoloComponent class]];
-}
-
-+ (react::ComponentDescriptorProvider) componentDescriptorProvider {
-  return react::concreteComponentDescriptorProvider<HybridYoloComponentDescriptor>();
-}
-
-- (instancetype) init {
-  if (self = [super init]) {
-    std::shared_ptr<HybridYoloSpec> hybridView = Yolo::YoloAutolinking::createYolo();
-    _hybridView = std::dynamic_pointer_cast<HybridYoloSpecSwift>(hybridView);
-    [self updateView];
-  }
-  return self;
-}
-
-- (void) updateView {
-  // 1. Get Swift part
-  Yolo::HybridYoloSpec_cxx& swiftPart = _hybridView->getSwiftPart();
-
-  // 2. Get UIView*
-  void* viewUnsafe = swiftPart.getView();
-  UIView* view = (__bridge_transfer UIView*) viewUnsafe;
-
-  // 3. Update RCTViewComponentView's [contentView]
-  [self setContentView:view];
-}
-
-- (void) updateProps:(const std::shared_ptr<const react::Props>&)props
-            oldProps:(const std::shared_ptr<const react::Props>&)oldProps {
-  // 1. Downcast props
-  const auto& newViewPropsConst = *std::static_pointer_cast<HybridYoloProps const>(props);
-  auto& newViewProps = const_cast<HybridYoloProps&>(newViewPropsConst);
-  Yolo::HybridYoloSpec_cxx& swiftPart = _hybridView->getSwiftPart();
-
-  // 2. Update each prop individually
-  swiftPart.beforeUpdate();
-
-  // isRed: boolean
-  if (newViewProps.isRed.isDirty) {
-    swiftPart.setIsRed(newViewProps.isRed.value);
-    newViewProps.isRed.isDirty = false;
-  }
-
-  swiftPart.afterUpdate();
-
-  // 3. Update hybridRef if it changed
-  if (newViewProps.hybridRef.isDirty) {
-    // hybridRef changed - call it with new this
-    const auto& maybeFunc = newViewProps.hybridRef.value;
-    if (maybeFunc.has_value()) {
-      maybeFunc.value()(_hybridView);
-    }
-    newViewProps.hybridRef.isDirty = false;
-  }
-
-  // 4. Continue in base class
-  [super updateProps:props oldProps:oldProps];
-}
-
-+ (BOOL)shouldBeRecycled {
-  return Yolo::YoloAutolinking::isYoloRecyclable();
-}
-
-- (void)prepareForRecycle {
-  [super prepareForRecycle];
-  Yolo::HybridYoloSpec_cxx& swiftPart = _hybridView->getSwiftPart();
-  swiftPart.maybePrepareForRecycle();
-}
-
-#ifdef ENABLE_RCT_COMPONENT_VIEW_INVALIDATE
-- (void)invalidate {
-  Yolo::HybridYoloSpec_cxx& swiftPart = _hybridView->getSwiftPart();
-  swiftPart.onDropView();
-  [super invalidate];
-}
-#endif
-
-@end