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

package/Ariel.podspec

@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/rinfi/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}", "ios\generated/**/*.{h,m,mm}", "cpp/**/*.{hpp,cpp,c,h}", "cpp\generated/**/*.{hpp,cpp,c,h}"
   s.vendored_frameworks = "ArielFramework.xcframework"
   s.dependency    "uniffi-bindgen-react-native", "0.31.0-2"
 

package/android/CMakeLists.txt

@@ -40,9 +40,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 # Set linker flags for 16KB page size alignment (required for Android 15+)
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384")
 
+# ARIEL_DIR is passed from build.gradle via -DARIEL_DIR=${projectDir}
+# This avoids using CMAKE_SOURCE_DIR which resolves to the app root when
+# the library is linked via add_subdirectory.
 cmake_path(
   SET MY_RUST_LIB
-  ${CMAKE_SOURCE_DIR}/src/main/jniLibs/${ANDROID_ABI}/libmermaid_wrapper.a
+  ${ARIEL_DIR}/src/main/jniLibs/${ANDROID_ABI}/libmermaid_wrapper.a
   NORMALIZE
 )
 add_library(my_rust_lib STATIC IMPORTED)

package/android/build.gradle

@@ -74,7 +74,9 @@ android {
     }
     externalNativeBuild {
       cmake {
-        arguments '-DANDROID_STL=c++_shared'
+        // ARIEL_DIR passes the library root to CMake so Rust libs can be found.
+        // Cannot use CMAKE_SOURCE_DIR in CMake — it resolves to the app when linked via add_subdirectory.
+        arguments '-DANDROID_STL=c++_shared', "-DARIEL_DIR=${projectDir}"
         abiFilters (*reactNativeArchitectures())
       }
     }

package/lib/module/index.web.js

@@ -3,6 +3,10 @@
 // Generated by uniffi-bindgen-react-native
 // Export the generated bindings to the app.
 export * from "./generated/web/mermaid_wrapper.js";
+
+// Now import the bindings so we can:
+// - intialize them
+// - export them as namespaced objects as the default export.
 import * as mermaid_wrapper from "./generated/web/mermaid_wrapper.js";
 import initAsync from './generated/web/wasm-bindgen/react_native_ariel.js';
 import wasmPath from './generated/web/wasm-bindgen/react_native_ariel_bg.wasm';
@@ -10,12 +14,6 @@ export async function uniffiInitAsync() {
   await initAsync({
     module_or_path: wasmPath
   });
-  mermaid_wrapper.default.initialize();
-}
-export default {
-  mermaid_wrapper
-};
-//# sourceMappingURL=index.web.js.map});
 
   // Initialize the generated bindings: mostly checksums, but also callbacks.
   // - the boolean flag ensures this loads exactly once, even if the JS code

package/lib/module/index.web.js.map

@@ -1,2 +1 @@
-{"version":3,"names":["mermaid_wrapper","initAsync","wasmPath","uniffiInitAsync","module_or_path","default","initialize"],"sourceRoot":"../../src","sources":["index.web.tsx"],"mappings":";;AAAA;AACA;AACA,cAAc,oCAAiC;AAE/C,OAAO,KAAKA,eAAe,MAAM,oCAAiC;AAElE,OAAOC,SAAS,MAAM,oDAAoD;AAC1E,OAAOC,QAAQ,MAAM,yDAAyD;AAE9E,OAAO,eAAeC,eAAeA,CAAA,EAAG;EACtC,MAAMF,SAAS,CAAC;IAAEG,cAAc,EAAEF;EAAS,CAAC,CAAC;EAC7CF,eAAe,CAACK,OAAO,CAACC,UAAU,CAAC,CAAC;AACtC;AAEA,eAAe;EACbN;AACF,CAAC","ignoreList":[]}
-Ae;EACbN;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["mermaid_wrapper","initAsync","wasmPath","uniffiInitAsync","module_or_path","default","initialize"],"sourceRoot":"../../src","sources":["index.web.ts"],"mappings":";;AAAA;AACA;AACA,cAAc,oCAAiC;;AAE/C;AACA;AACA;AACA,OAAO,KAAKA,eAAe,MAAM,oCAAiC;AAElE,OAAOC,SAAS,MAAM,oDAAoD;AAC1E,OAAOC,QAAQ,MAAM,yDAAyD;AAE9E,OAAO,eAAeC,eAAeA,CAAA,EAAG;EACtC,MAAMF,SAAS,CAAC;IAAEG,cAAc,EAAEF;EAAS,CAAC,CAAC;;EAE7C;EACA;EACA;EACAF,eAAe,CAACK,OAAO,CAACC,UAAU,CAAC,CAAC;AACtC;;AAEA;AACA,eAAe;EACbN;AACF,CAAC","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ariel",
-  "version": "0.1.0-dev.5",
+  "version": "0.1.0-dev.7",
   "description": "Mermaid diagrams for React Native and React Native Web. No DOM. No WebView. Pure Rust.",
   "main": "./lib/module/index.js",
   "source": "./src/index.tsx",

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

@@ -1,43 +0,0 @@
-// Generated by uniffi-bindgen-react-native
-package com.ariel
-
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder
-
-@ReactModule(name = ArielModule.NAME)
-class ArielModule(reactContext: ReactApplicationContext) :
-  NativeArielSpec(reactContext) {
-
-  override fun getName(): String {
-    return NAME
-  }
-
-  // Two native methods implemented in cpp-adapter.cpp, and ultimately
-  // react-native-ariel.cpp
-
-  external fun nativeInstallRustCrate(runtimePointer: Long, callInvoker: CallInvokerHolder): Boolean
-  external fun nativeCleanupRustCrate(runtimePointer: Long): Boolean
-
-  override fun installRustCrate(): Boolean {
-    val context = this.reactApplicationContext
-    return nativeInstallRustCrate(
-      context.javaScriptContextHolder!!.get(),
-      context.jsCallInvokerHolder!!
-    )
-  }
-
-  override fun cleanupRustCrate(): Boolean {
-    return nativeCleanupRustCrate(
-      this.reactApplicationContext.javaScriptContextHolder!!.get()
-    )
-  }
-
-  companion object {
-    const val NAME = "Ariel"
-
-    init {
-      System.loadLibrary("react-native-ariel")
-    }
-  }
-}

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

@@ -1,34 +0,0 @@
-// Generated by uniffi-bindgen-react-native
-package com.ariel
-
-import com.facebook.react.TurboReactPackage
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.module.model.ReactModuleInfo
-import com.facebook.react.module.model.ReactModuleInfoProvider
-import java.util.HashMap
-
-class ArielPackage : TurboReactPackage() {
-  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
-    return if (name == ArielModule.NAME) {
-      ArielModule(reactContext)
-    } else {
-      null
-    }
-  }
-
-  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
-    return ReactModuleInfoProvider {
-      val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
-      moduleInfos[ArielModule.NAME] = ReactModuleInfo(
-        ArielModule.NAME,
-        ArielModule.NAME,
-        false,  // canOverrideExistingModule
-        false,  // needsEagerInit
-        false,  // isCxxModule
-        true // isTurboModule
-      )
-      moduleInfos
-    }
-  }
-}