react-native-ariel 0.1.0-dev.5 → 0.1.0-dev.50

package/Ariel.podspec

@@ -13,9 +13,9 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
 
   s.platforms    = { :ios => min_ios_version_supported }
-  s.source       = { :git => "https://github.com/rinfi/ariel.git", :tag => "#{s.version}" }
+  s.source       = { :git => "https://github.com/rinfimate/ariel.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm,swift}", "ios/generated/**/*.{h,m,mm}", "cpp/**/*.{hpp,cpp,c,h}", "cpp/generated/**/*.{hpp,cpp,c,h}"
+  s.source_files = "ios/**/*.{h,m,mm,swift}", "cpp/**/*.{hpp,cpp,c,h}"
   s.vendored_frameworks = "ArielFramework.xcframework"
   s.dependency    "uniffi-bindgen-react-native", "0.31.0-2"
 

package/README.md

@@ -29,7 +29,7 @@ Every other Mermaid solution for React Native requires a DOM, a WebView, or a he
 yarn add react-native-ariel react-native-svg
 ```
 
-> **Note:** Ariel uses custom native code and requires [Expo Dev Client](https://docs.expo.dev/develop/development-builds/introduction/) — it does not work with Expo Go.
+> **Requirements:** React Native **≥ 0.73** with **New Architecture enabled**. On RN 0.73–0.75 you must set `newArchEnabled=true` in `android/gradle.properties` and enable it in your iOS Podfile — New Architecture became the default in RN 0.76.
 
 ---
 
@@ -199,7 +199,7 @@ rustup target add wasm32-unknown-unknown
 ### Clone and install
 
 ```sh
-git clone https://github.com/rinfi/ariel.git
+git clone https://github.com/rinfimate/ariel.git
 cd ariel
 yarn
 ```
@@ -269,72 +269,17 @@ yarn ubrn:clean
 
 ---
 
-## Running the example app
-
-The `example/` directory is an Expo app with a live Mermaid editor — type a diagram, see the SVG update in real time with timing stats.
-
-### Step 1 — Generate bindings (all platforms, run once)
-
-```sh
-yarn ubrn:generate
-```
-
-### Step 2 — Build native libs for your target platform
-
-```sh
-# Android
-yarn ubrn:android
-
-# iOS (macOS only)
-yarn ubrn:ios
-
-# Web — compile WASM bundle
-yarn ubrn:web
-```
-
-### Step 3 — Run the example
-
-**Web** (no emulator needed — opens in your browser):
-```sh
-yarn example:web
-```
-
-**Android** (emulator or USB device with debugging enabled):
-```sh
-yarn example:android
-```
-
-**iOS** (macOS only):
-```sh
-yarn example:ios
-```
-
-### With Expo Dev Client (install on device)
-
-For a shareable installable build that includes the Ariel native module:
-
-```sh
-# Install EAS CLI
-npm install -g eas-cli
-
-# Build dev client (free for public repos)
-eas build --profile development
-
-# Install the .apk / .ipa on your device, then run:
-yarn example:android   # or example:ios
-```
-
----
-
 ## CI
 
-Three GitHub Actions workflows run on every push to `main`:
+On every push to `main` and on pull requests, `ci.yml` runs:
 
-| Workflow | Runner | What it does |
+| Job | Runner | What it does |
 |---|---|---|
-| `build-android.yml` | `ubuntu-latest` | Runs Rust unit tests, builds Android `.so` libs |
-| `build-ios.yml` | `macos-latest` | Builds iOS `.xcframework` |
-| `build-web.yml` | `ubuntu-latest` | Builds WASM bindings |
+| `test-rust` | `ubuntu-latest` | Rust unit tests |
+| `build-android` | `ubuntu-latest` | Cross-compiles Rust for all Android ABIs |
+| `build-ios` | `macos-latest` | Builds iOS xcframework |
+| `build-web` | `ubuntu-latest` | Builds WASM bundle |
+| `publish` | `ubuntu-latest` | Publishes to npm (push to main or release only) |
 
 iOS uses GitHub's free `macos-latest` runner (unlimited minutes on public repos).
 
@@ -342,7 +287,7 @@ iOS uses GitHub's free `macos-latest` runner (unlimited minutes on public repos)
 
 ## License
 
-MIT © 2026 [Rochanglien Infimate](https://github.com/rinfi)
+MIT © 2026 [Rochanglien Infimate](https://github.com/rinfimate)
 
 ---
 

package/android/CMakeLists.txt

@@ -5,22 +5,22 @@ project(Ariel)
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 17)
 
-# Resolve the path to the uniffi-bindgen-react-native package
-execute_process(
-    COMMAND node -p "require.resolve('uniffi-bindgen-react-native/package.json')"
-    OUTPUT_VARIABLE UNIFFI_BINDGEN_PATH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-# Get the directory; get_filename_component and cmake_path will normalize
-# paths with Windows path separators.
-get_filename_component(UNIFFI_BINDGEN_PATH "${UNIFFI_BINDGEN_PATH}" DIRECTORY)
+# Resolve uniffi-bindgen-react-native includes.
+# When building the library locally: ../node_modules/ (workspace root)
+# When installed as npm dependency: ../../ (npm hoists to consumer's node_modules)
+set(_UNIFFI_LOCAL  "${CMAKE_CURRENT_LIST_DIR}/../node_modules/uniffi-bindgen-react-native/cpp/includes")
+set(_UNIFFI_HOISTED "${CMAKE_CURRENT_LIST_DIR}/../../uniffi-bindgen-react-native/cpp/includes")
+if(EXISTS "${_UNIFFI_LOCAL}")
+  cmake_path(SET UNIFFI_INCLUDES "${_UNIFFI_LOCAL}" NORMALIZE)
+else()
+  cmake_path(SET UNIFFI_INCLUDES "${_UNIFFI_HOISTED}" NORMALIZE)
+endif()
 
-# Specifies a path to native header files.
 include_directories(
     ../cpp
     ../cpp/generated
 
-    ${UNIFFI_BINDGEN_PATH}/cpp/includes
+    ${UNIFFI_INCLUDES}
 )
 
 add_library(react-native-ariel            SHARED
@@ -42,7 +42,7 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size
 
 cmake_path(
   SET MY_RUST_LIB
-  ${CMAKE_SOURCE_DIR}/src/main/jniLibs/${ANDROID_ABI}/libmermaid_wrapper.a
+  ${CMAKE_CURRENT_LIST_DIR}/src/main/jniLibs/${ANDROID_ABI}/libmermaid_wrapper.a
   NORMALIZE
 )
 add_library(my_rust_lib STATIC IMPORTED)

package/android/build.gradle

@@ -28,9 +28,7 @@ def isNewArchitectureEnabled() {
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
+apply plugin: "com.facebook.react"
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["Ariel_" + name]
@@ -120,6 +118,12 @@ android {
   }
 }
 
+android {
+  packagingOptions {
+    excludes += ['lib/*/libjsi.so', 'lib/*/libturbomodulejsijni.so', 'lib/*/libreact_nativemodule_core.so']
+  }
+}
+
 repositories {
   mavenCentral()
   google()
@@ -135,10 +139,8 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "Ariel"
-    codegenJavaPackageName = "com.ariel"
-  }
+react {
+  jsRootDir = file("../src/")
+  libraryName = "Ariel"
+  codegenJavaPackageName = "com.ariel"
 }

package/android/generated/{android/app/build/generated/source/codegen/java/com/facebook/fbreact/specs → java/com/ariel}/NativeArielSpec.java

@@ -10,7 +10,7 @@
  * @nolint
  */
 
-package com.facebook.fbreact.specs;
+package com.ariel;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactApplicationContext;

package/android/generated/{android/app/build/generated/source/codegen/jni → jni}/CMakeLists.txt

@@ -25,4 +25,12 @@ target_link_libraries(
   reactnative
 )
 
-target_compile_reactnative_options(react_codegen_ArielSpec PRIVATE)
+target_compile_options(
+  react_codegen_ArielSpec
+  PRIVATE
+  -DLOG_TAG=\"ReactNative\"
+  -fexceptions
+  -frtti
+  -std=c++20
+  -Wall
+)

package/android/generated/jni/react/renderer/components/ArielSpec/ArielSpecJSI-generated.cpp

@@ -0,0 +1,32 @@
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleCpp.js
+ */
+
+#include "ArielSpecJSI.h"
+
+namespace facebook::react {
+
+static jsi::Value __hostFunction_NativeArielCxxSpecJSI_installRustCrate(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeArielCxxSpecJSI *>(&turboModule)->installRustCrate(
+    rt
+  );
+}
+static jsi::Value __hostFunction_NativeArielCxxSpecJSI_cleanupRustCrate(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeArielCxxSpecJSI *>(&turboModule)->cleanupRustCrate(
+    rt
+  );
+}
+
+NativeArielCxxSpecJSI::NativeArielCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
+  : TurboModule("Ariel", jsInvoker) {
+  methodMap_["installRustCrate"] = MethodMetadata {0, __hostFunction_NativeArielCxxSpecJSI_installRustCrate};
+  methodMap_["cleanupRustCrate"] = MethodMetadata {0, __hostFunction_NativeArielCxxSpecJSI_cleanupRustCrate};
+}
+
+
+} // namespace facebook::react

package/android/generated/jni/react/renderer/components/ArielSpec/ArielSpecJSI.h

@@ -0,0 +1,80 @@
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleH.js
+ */
+
+#pragma once
+
+#include <ReactCommon/TurboModule.h>
+#include <react/bridging/Bridging.h>
+
+namespace facebook::react {
+
+
+  class JSI_EXPORT NativeArielCxxSpecJSI : public TurboModule {
+protected:
+  NativeArielCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
+
+public:
+  virtual bool installRustCrate(jsi::Runtime &rt) = 0;
+  virtual bool cleanupRustCrate(jsi::Runtime &rt) = 0;
+
+};
+
+template <typename T>
+class JSI_EXPORT NativeArielCxxSpec : public TurboModule {
+public:
+  jsi::Value create(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
+    return delegate_.create(rt, propName);
+  }
+
+  std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& runtime) override {
+    return delegate_.getPropertyNames(runtime);
+  }
+
+  static constexpr std::string_view kModuleName = "Ariel";
+
+protected:
+  NativeArielCxxSpec(std::shared_ptr<CallInvoker> jsInvoker)
+    : TurboModule(std::string{NativeArielCxxSpec::kModuleName}, jsInvoker),
+      delegate_(reinterpret_cast<T*>(this), jsInvoker) {}
+
+
+private:
+  class Delegate : public NativeArielCxxSpecJSI {
+  public:
+    Delegate(T *instance, std::shared_ptr<CallInvoker> jsInvoker) :
+      NativeArielCxxSpecJSI(std::move(jsInvoker)), instance_(instance) {
+
+    }
+
+    bool installRustCrate(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::installRustCrate) == 1,
+          "Expected installRustCrate(...) to have 1 parameters");
+
+      return bridging::callFromJs<bool>(
+          rt, &T::installRustCrate, jsInvoker_, instance_);
+    }
+    bool cleanupRustCrate(jsi::Runtime &rt) override {
+      static_assert(
+          bridging::getParameterCount(&T::cleanupRustCrate) == 1,
+          "Expected cleanupRustCrate(...) to have 1 parameters");
+
+      return bridging::callFromJs<bool>(
+          rt, &T::cleanupRustCrate, jsInvoker_, instance_);
+    }
+
+  private:
+    friend class NativeArielCxxSpec;
+    T *instance_;
+  };
+
+  Delegate delegate_;
+};
+
+} // namespace facebook::react

package/android/proguard-rules.pro

@@ -0,0 +1,4 @@
+# Generated by uniffi-bindgen-react-native
+-dontwarn java.awt.*
+-keep class com.sun.jna.* { *; }
+-keepclassmembers class * extends com.sun.jna.* { public *; }

package/android/src/main/java/com/ariel/ArielModule.kt

@@ -23,10 +23,20 @@ class ArielModule(reactContext: ReactApplicationContext) :
     val context = this.reactApplicationContext
     return nativeInstallRustCrate(
       context.javaScriptContextHolder!!.get(),
-      context.jsCallInvokerHolder!!
+      resolveCallInvokerHolder(context)
     )
   }
 
+  private fun resolveCallInvokerHolder(context: ReactApplicationContext): CallInvokerHolder {
+    // RN 0.74+ exposes getJSCallInvokerHolder() on ReactContext directly.
+    // RN 0.73 only has it on CatalystInstance — use reflection to handle both.
+    val direct = context.javaClass.methods.firstOrNull { it.name == "getJSCallInvokerHolder" }
+    if (direct != null) return direct.invoke(context) as CallInvokerHolder
+    @Suppress("DEPRECATION")
+    val ci = checkNotNull(context.catalystInstance) { "No CatalystInstance" }
+    return ci.javaClass.methods.first { it.name == "getJSCallInvokerHolder" }.invoke(ci) as CallInvokerHolder
+  }
+
   override fun cleanupRustCrate(): Boolean {
     return nativeCleanupRustCrate(
       this.reactApplicationContext.javaScriptContextHolder!!.get()