refactor(ios): grouped the project-owned ios engine adapters

Author: Preeternal

CHANGELOG.md

@@ -22,7 +22,8 @@
   the build-time `ZFH_ENGINE` setting.
 - Updated `@react-native-documents/picker` to v12.0.2 in example and patched its SwiftPM
   manifest.
-- Moved the iOS Swift, C/C++, and React Native sources into separate directories.
+- Grouped the project-owned iOS engine adapters under `ios/Engines/Native` and
+  `ios/Engines/Zig`. The upstream implementations remain under `third_party`.
 - Removed the old iOS bridge registration. `FileHash` is now registered through
   its generated TurboModule spec.
 - Android now relies solely on the generated `NativeFileHashSpec` methods.

FileHash.podspec

@@ -30,26 +30,26 @@ zig_source_files = [
   "ios/ReactNative/FileHashBridgeHelpers.h",
   "ios/ReactNative/FileHashPromiseTypes.h",
   "ios/ReactNative/FileHashBridgeHelpers.mm",
-  "ios/FileHashBridgeZig.h",
-  "ios/FileHashBridgeZig.mm",
-  "ios/FileHashZigHelpers.h",
-  "ios/FileHashZigHelpers.mm"
+  "ios/Engines/Zig/FileHashBridgeZig.h",
+  "ios/Engines/Zig/FileHashBridgeZig.mm",
+  "ios/Engines/Zig/FileHashZigHelpers.h",
+  "ios/Engines/Zig/FileHashZigHelpers.mm"
 ]
 
 zig_private_header_files = [
   "ios/ReactNative/FileHash.h",
   "ios/ReactNative/FileHashBridgeHelpers.h",
   "ios/ReactNative/FileHashPromiseTypes.h",
-  "ios/FileHashBridgeZig.h",
-  "ios/FileHashZigHelpers.h"
+  "ios/Engines/Zig/FileHashBridgeZig.h",
+  "ios/Engines/Zig/FileHashZigHelpers.h"
 ]
 
 native_source_files = [
   "ios/ReactNative/FileHash.h",
   "ios/ReactNative/FileHash.mm",
-  "ios/NativeSwift/FileHash.swift",
-  "ios/NativeCore/HashNative.h",
-  "ios/NativeCore/HashNative.mm",
+  "ios/Engines/Native/Swift/FileHash.swift",
+  "ios/Engines/Native/Core/HashNative.h",
+  "ios/Engines/Native/Core/HashNative.mm",
   "ios/ReactNative/FileHashBridgeHelpers.h",
   "ios/ReactNative/FileHashPromiseTypes.h",
   "ios/ReactNative/FileHashBridgeHelpers.mm",
@@ -76,8 +76,8 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/Preeternal/react-native-file-hash.git", :tag => "#{s.version}" }
 
   s.swift_version = "5.9"
-  native_header_search_paths = "$(inherited) $(PODS_TARGET_SRCROOT)/ios/NativeCore $(PODS_TARGET_SRCROOT)/third_party/xxhash $(PODS_TARGET_SRCROOT)/third_party/blake3/c"
-  zig_header_search_paths = "$(inherited) $(PODS_TARGET_SRCROOT)/third_party/zig-files-hash/src"
+  native_header_search_paths = "$(inherited) $(PODS_TARGET_SRCROOT)/ios/Engines/Native/Core $(PODS_TARGET_SRCROOT)/third_party/xxhash $(PODS_TARGET_SRCROOT)/third_party/blake3/c"
+  zig_header_search_paths = "$(inherited) $(PODS_TARGET_SRCROOT)/ios $(PODS_TARGET_SRCROOT)/ios/Engines/Zig $(PODS_TARGET_SRCROOT)/third_party/zig-files-hash/src"
 
   ios_header_search_paths = if is_zig
     zig_header_search_paths
@@ -132,7 +132,7 @@ Pod::Spec.new do |s|
     # FileHash.h imports the C++ codegen spec and must not be pulled into the
     # Swift module. FileHash.swift only needs this C API from HashNative.h.
     s.ios.public_header_files = [
-      "ios/NativeCore/HashNative.h"
+      "ios/Engines/Native/Core/HashNative.h"
     ]
     s.ios.private_header_files = [
       "ios/ReactNative/FileHash.h",

Package.swift

@@ -17,26 +17,26 @@ let package = Package(
   ],
   dependencies: [
     // These paths are supplied by React Native's SPM autolinker under
-    // ios/build/generated/autolinking/libs/ReactNativeFileHash.
+    // ios/build/generated/autolinking/plugins/ReactNativeFileHash.
     .package(name: "ReactNative", path: "../../../../xcframeworks"),
     .package(name: "React-GeneratedCode", path: "../../../ios"),
   ],
   targets: [
     .target(
       name: "FileHashNativeCore",
-      path: "ios/NativeCore",
+      path: "ios/Engines/Native/Core",
       publicHeadersPath: ".",
       cSettings: [
-        .headerSearchPath("../../third_party/xxhash"),
-        .headerSearchPath("../../third_party/blake3/c"),
+        .headerSearchPath("../../../../third_party/xxhash"),
+        .headerSearchPath("../../../../third_party/blake3/c"),
         .define("BLAKE3_NO_SSE2", to: "1"),
         .define("BLAKE3_NO_SSE41", to: "1"),
         .define("BLAKE3_NO_AVX2", to: "1"),
         .define("BLAKE3_NO_AVX512", to: "1"),
       ],
       cxxSettings: [
-        .headerSearchPath("../../third_party/xxhash"),
-        .headerSearchPath("../../third_party/blake3/c"),
+        .headerSearchPath("../../../../third_party/xxhash"),
+        .headerSearchPath("../../../../third_party/blake3/c"),
         .define("BLAKE3_NO_SSE2", to: "1"),
         .define("BLAKE3_NO_SSE41", to: "1"),
         .define("BLAKE3_NO_AVX2", to: "1"),
@@ -46,7 +46,7 @@ let package = Package(
     .target(
       name: "FileHashNative",
       dependencies: ["FileHashNativeCore"] + reactHeaders,
-      path: "ios/NativeSwift",
+      path: "ios/Engines/Native/Swift",
       linkerSettings: [
         .linkedFramework("CryptoKit"),
         .linkedFramework("Foundation"),

example/ios/Podfile.lock

@@ -2098,7 +2098,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FBLazyVector: c00c20551d40126351a6783c47ce75f5b374851b
-  FileHash: e7bdffc3e08a18048480bf9011437cfbe83edc7f
+  FileHash: a8d3b7f77663840fc08a988c3d42742cbf52ea92
   hermes-engine: 0ea749613fa10e2b07a40044df86ae2c78ed7e30
   RCTDeprecation: 3bb167081b134461cfeb875ff7ae1945f8635257
   RCTRequired: 74839f55d5058a133a0bc4569b0afec750957f64

examples/macos/macos/Podfile.lock

@@ -2489,7 +2489,7 @@ SPEC CHECKSUMS:
   DoubleConversion: d31b1eb37f6d6f456530c4fd9124b857d6889cab
   fast_float: 20817c22759af6ac8d4d67e6e059b8b499953656
   FBLazyVector: 3cde5aa3abeda29fd70560e5a3e3199e6add163f
-  FileHash: 88ed28afbe9ff67fbec77fa472261b69b7d84760
+  FileHash: e13abd0a118468fddde98891cef48ebc7d48dd73
   fmt: 4cf0c5ec5864511c96d8d4bd7b03c3c69040af06
   glog: 0b31c25149b9d350b2666c7d459229861a00ec07
   hermes-engine: 7219f6e751ad6ec7f3d7ec121830ee34dae40749

ios/Engines/Native/Core/Blake3.c

@@ -0,0 +1,2 @@
+// SwiftPM source shim; the upstream implementation lives in third_party.
+#include "../../../../third_party/blake3/c/blake3.c"

ios/Engines/Native/Core/Blake3Dispatch.c

@@ -0,0 +1,2 @@
+// SwiftPM source shim; the upstream implementation lives in third_party.
+#include "../../../../third_party/blake3/c/blake3_dispatch.c"

ios/NativeCore/Blake3Neon.c ios/Engines/Native/Core/Blake3Neon.cios/NativeCore/Blake3Neon.c renamed to ios/Engines/Native/Core/Blake3Neon.c

@@ -1,6 +1,7 @@
+// SwiftPM source shim; the upstream implementation lives in third_party.
 // BLAKE3's NEON implementation includes <arm_neon.h>, which is unavailable
 // when an iOS Simulator build also targets x86_64. The dispatcher enables this
 // object only on AArch64, where BLAKE3_USE_NEON is auto-detected as 1.
 #if defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
-#include "../../third_party/blake3/c/blake3_neon.c"
+#include "../../../../third_party/blake3/c/blake3_neon.c"
 #endif

ios/Engines/Native/Core/Blake3Portable.c

@@ -0,0 +1,2 @@
+// SwiftPM source shim; the upstream implementation lives in third_party.
+#include "../../../../third_party/blake3/c/blake3_portable.c"

ios/NativeCore/HashNative.h ios/Engines/Native/Core/HashNative.hios/NativeCore/HashNative.h renamed to ios/Engines/Native/Core/HashNative.h

@@ -1,3 +1,4 @@
+// Swift-facing adapter for the native BLAKE3 and xxHash implementations.
 #ifndef HASH_NATIVE_H
 #define HASH_NATIVE_H