Merge branch 'develop'

Author: ikhvorost

Package.resolved

@@ -40,7 +40,7 @@ let package = Package(
     .library(name: "ReactBridge", targets: ["ReactBridge"])
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.1")
+    .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.2")
   ],
   targets: [
     .macro(
@@ -52,9 +52,9 @@ let package = Package(
     ),
     .target(
       name: "ReactBridge",
-      dependencies: ["ReactBridgeMacros", "RegisterModules"]
+      dependencies: ["ReactBridgeMacros", "ReactBridgeUtils"]
     ),
-    .target(name: "RegisterModules"),
+    .target(name: "ReactBridgeUtils"),
     .testTarget(
       name: "ReactBridgeTests",
       dependencies: [

Package.swift

@@ -24,6 +24,7 @@
 //
 
 import Foundation
+@_exported import ReactBridgeUtils
 
 
 /// The macro exports and registers a class as a native module for React Native.

Sources/ReactBridge/ReactBridge.swift

@@ -27,35 +27,22 @@ import SwiftSyntax
 import SwiftSyntaxMacros
 import SwiftDiagnostics
 
+
 fileprivate extension String {
   var uppercasedFirst: String {
     prefix(1).uppercased() + dropFirst()
   }
 }
 
-
 struct ReactMethod {
 }
 
 extension ReactMethod: PeerMacro {
 
-  private static var nonisolatedUnsafe: String = {
-#if swift(>=5.10)
-    "nonisolated(unsafe) "
-#else
-    ""
-#endif
-  }()
-  
   static func reactExport(funcName: String, jsName: String, objcName: String, isSync: Bool) -> DeclSyntax {
     """
-    @objc static func __rct_export__\(raw: funcName)() -> UnsafePointer<RCTMethodInfo>? {
-      struct Static {
-        static let jsName = strdup(\(raw: jsName))
-        static let objcName = strdup("\(raw: objcName)")
-        \(raw: Self.nonisolatedUnsafe)static var methodInfo = RCTMethodInfo(jsName: jsName, objcName: objcName, isSync: \(raw: isSync))
-      }
-      return withUnsafePointer(to: &Static.methodInfo) { $0 }
+    @objc static func __rct_export__\(raw: funcName)() -> UnsafeRawPointer {
+      ReactBridgeUtils.methodInfo(\(raw: jsName), objcName: "\(raw: objcName)", isSync: \(raw: isSync))
     }
     """
   }

Sources/ReactBridgeMacros/ReactMethod.swift

@@ -1,5 +1,5 @@
 //
-//  RegisterModules.m
+//  ReactBridgeUtils.m
 //
 //  Created by Iurii Khvorost <[email protected]> on 2023/07/24.
 //  Copyright © 2023 Iurii Khvorost. All rights reserved.
@@ -24,9 +24,20 @@
 //
 
 #import <objc/runtime.h>
+#import <Foundation/Foundation.h>
+#import "ReactBridgeUtils.h"
 
-__attribute__((constructor))
-static void registerModules(void) {
+
+// From RCTBridgeModule.h
+typedef struct RCTMethodInfo {
+  const char * jsName;
+  const char * objcName;
+  BOOL isSync;
+} RCTMethodInfo;
+
+@implementation ReactBridgeUtils
+
++ (void)load {
   SEL selector = @selector(_registerModule);
 
   int numClasses = objc_getClassList(NULL, 0);
@@ -50,3 +61,13 @@ static void registerModules(void) {
   }
   free(classes);
 }
+
++ (const void *)methodInfo:(NSString *)jsName objcName:(NSString *)objcName isSync:(BOOL)isSync {
+  RCTMethodInfo* methodInfo = malloc(sizeof(RCTMethodInfo));
+  methodInfo->jsName = strdup([jsName cStringUsingEncoding: NSUTF8StringEncoding]);
+  methodInfo->objcName = strdup([objcName cStringUsingEncoding: NSUTF8StringEncoding]);
+  methodInfo->isSync = isSync;
+  return methodInfo;
+}
+
+@end

Sources/RegisterModules/RegisterModules.m …rces/ReactBridgeUtils/ReactBridgeUtils.mSources/RegisterModules/RegisterModules.m renamed to Sources/ReactBridgeUtils/ReactBridgeUtils.m Sources/RegisterModules/RegisterModules.m renamed to Sources/ReactBridgeUtils/ReactBridgeUtils.m

@@ -0,0 +1,11 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ReactBridgeUtils: NSObject
+
++ (const void *)methodInfo:(NSString *)jsName objcName:(NSString *)objcName isSync:(BOOL)isSync;
+
+@end
+
+NS_ASSUME_NONNULL_END

Sources/ReactBridgeUtils/include/ReactBridgeUtils.h

@@ -0,0 +1,3 @@
+module ReactBridgeUtils {
+  header "ReactBridgeUtils.h"
+}

Sources/ReactBridgeUtils/include/module.modulemap

@@ -25,15 +25,8 @@ final class ReactMethodTests: XCTestCase {
 
   func rct_export(name: String, selector: String, isSync: Bool = false, jsName: String? = nil) -> String {
     """
-    @objc static func __rct_export__\(name)() -> UnsafePointer<RCTMethodInfo>? {
-        struct Static {
-          static let jsName = strdup("\(jsName ?? name)")
-          static let objcName = strdup("\(selector)")
-          \(Self.nonisolatedUnsafe)static var methodInfo = RCTMethodInfo(jsName: jsName, objcName: objcName, isSync: \(isSync))
-        }
-        return withUnsafePointer(to: &Static.methodInfo) {
-            $0
-        }
+    @objc static func __rct_export__\(name)() -> UnsafeRawPointer {
+        ReactBridgeUtils.methodInfo("\(jsName ?? name)", objcName: "\(selector)", isSync: \(isSync))
       }
     """
   }