diff --git a/Package.swift b/Package.swift index afbfe9f3..f62ac90f 100644 --- a/Package.swift +++ b/Package.swift @@ -191,7 +191,7 @@ var sourceFiles = // excludes (the vendored xcframeworks, and cpp/sqlcipher, cpp/libsql, // cpp/turso below) are reliable; those backend sources were relocated into // their own subdirectories specifically so they can be excluded that way. -// `cpp/sqlite3.c`/`cpp/bridge.{c,cpp,hpp}` are the remaining individual-file +// `cpp/sqlite3.c`/`cpp/OPBridge.{cpp,hpp}` are the remaining individual-file // exclusions (only reachable via the sqlcipher/turso/libsql/phone-version // branches, not the default path) — flagged as a known residual risk in // those configurations rather than moved, to keep this translation close to @@ -237,14 +237,14 @@ if useSqlcipher { excludedDirs.insert("cpp/libsql") } else if useTurso { print("[OP-SQLITE] using Turso SDK kit") - excludedSources.formUnion(["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/bridge.hpp", "cpp/bridge.cpp"]) + excludedSources.formUnion(["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/OPBridge.hpp", "cpp/OPBridge.cpp"]) excludedDirs.formUnion(["cpp/sqlcipher", "cpp/libsql"]) } else if useLibsql { print("[OP-SQLITE] ⚠️ Using libsql. If you have libsql questions please ask in the Turso Discord server.") - // cpp/bridge.cpp is the default (non-libsql) bridge; it and - // cpp/libsql/bridge.cpp both define opsqlite_get_db_path and friends — + // cpp/OPBridge.cpp is the default (non-libsql) bridge; it and + // cpp/libsql/OPLibsqlBridge.cpp both define opsqlite_get_db_path and friends — // compiling both is a duplicate-symbol link error. - excludedSources.formUnion(["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/bridge.cpp", "cpp/bridge.hpp"]) + excludedSources.formUnion(["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/OPBridge.cpp", "cpp/OPBridge.hpp"]) excludedDirs.insert("cpp/sqlcipher") } else { print("[OP-SQLITE] using pure SQLite") @@ -443,7 +443,7 @@ let package = Package( // constructed so everything left under `path` is exactly the wanted // set, and the default auto-scan is the well-trodden SPM code path. exclude: targetExcludes, - // cpp/bridge.cpp reaches SQLite via `#include ` (angle + // cpp/OPBridge.cpp reaches SQLite via `#include ` (angle // form). cpp/sqlite3.h and cpp/sqlcipher/sqlite3.h are two different // files with that same name; CocoaPods disambiguates via its header // map, built fresh from source_files/exclude_files each `pod install`. @@ -459,7 +459,7 @@ let package = Package( // above, in case publicHeadersPath's implicit search isn't given // priority over some other path on a future toolchain. .headerSearchPath(useSqlcipher ? "cpp/sqlcipher" : "cpp"), - // cpp/libsql/bridge.hpp unconditionally `#include`s libsql.h (it's + // cpp/libsql/OPLibsqlBridge.hpp unconditionally `#include`s libsql.h (it's // pulled in from always-compiled files like OPDatabase.hpp, not // just the libsql backend), so libsql.h must resolve regardless of // whether useLibsql links the actual xcframework binary. CocoaPods @@ -470,7 +470,7 @@ let package = Package( // still resolves via this search path regardless. .headerSearchPath("ios/libsql_experimental.xcframework/ios-arm64/libsql_experimental.framework/Headers"), ] - // cpp/turso/turso_bridge.cpp includes — + // cpp/turso/OPTursoBridge.cpp includes — // framework-style angle include. The xcframework ships no module // map, so this only resolves via clang's plain framework-header // lookup, added below via -F (headers are identical across arch diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 6835d167..f9a76cc5 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -42,17 +42,17 @@ add_library( ${PACKAGE_NAME} SHARED ../cpp/OPSqlite.cpp - ../cpp/utils.cpp + ../cpp/OPUtils.cpp ../cpp/OPThreadPool.cpp - ../cpp/SmartHostObject.cpp - ../cpp/PreparedStatementHostObject.cpp - ../cpp/DumbHostObject.cpp + ../cpp/OPSmartHostObject.cpp + ../cpp/OPPreparedStatementHostObject.cpp + ../cpp/OPDumbHostObject.cpp ../cpp/OPDatabase.cpp cpp-adapter.cpp ) if (USE_SQLCIPHER) - target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlcipher/sqlite3.h ../cpp/sqlcipher/sqlite3.c ../cpp/bridge.cpp ../cpp/bridge.hpp) + target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlcipher/sqlite3.h ../cpp/sqlcipher/sqlite3.c ../cpp/OPBridge.cpp ../cpp/OPBridge.hpp) add_definitions( -DOP_SQLITE_USE_SQLCIPHER=1 @@ -64,19 +64,19 @@ if (USE_SQLCIPHER) find_package(openssl REQUIRED CONFIG) elseif (USE_LIBSQL) - target_sources(${PACKAGE_NAME} PRIVATE ../cpp/libsql/bridge.cpp) + target_sources(${PACKAGE_NAME} PRIVATE ../cpp/libsql/OPLibsqlBridge.cpp) add_definitions( -DOP_SQLITE_USE_LIBSQL=1 ) elseif (USE_TURSO) - target_sources(${PACKAGE_NAME} PRIVATE ../cpp/turso/turso_bridge.cpp) + target_sources(${PACKAGE_NAME} PRIVATE ../cpp/turso/OPTursoBridge.cpp) add_definitions( -DOP_SQLITE_USE_TURSO=1 ) else() - target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlite3.c ../cpp/bridge.cpp) + target_sources(${PACKAGE_NAME} PRIVATE ../cpp/sqlite3.c ../cpp/OPBridge.cpp) endif() if (USE_SQLITE_VEC) diff --git a/android/cpp-adapter.cpp b/android/cpp-adapter.cpp index d0ef6588..3f800c49 100644 --- a/android/cpp-adapter.cpp +++ b/android/cpp-adapter.cpp @@ -1,5 +1,5 @@ #include "OPSqlite.hpp" -#include "logs.h" +#include "OPLogs.h" #include #include #include diff --git a/cpp/bridge.cpp b/cpp/OPBridge.cpp similarity index 99% rename from cpp/bridge.cpp rename to cpp/OPBridge.cpp index 861aeb3e..24920535 100644 --- a/cpp/bridge.cpp +++ b/cpp/OPBridge.cpp @@ -2,12 +2,12 @@ // Allows a clear defined boundary between the JSI and the SQLite operations // so that threading operations are safe and contained within OPDatabase -#include "bridge.hpp" +#include "OPBridge.hpp" #include "OPDatabase.hpp" -#include "DumbHostObject.hpp" -#include "SmartHostObject.hpp" -#include "logs.h" -#include "utils.hpp" +#include "OPDumbHostObject.hpp" +#include "OPSmartHostObject.hpp" +#include "OPLogs.h" +#include "OPUtils.hpp" #include #include #include diff --git a/cpp/bridge.hpp b/cpp/OPBridge.hpp similarity index 97% rename from cpp/bridge.hpp rename to cpp/OPBridge.hpp index c6ea221c..16ce9bdf 100644 --- a/cpp/bridge.hpp +++ b/cpp/OPBridge.hpp @@ -1,9 +1,9 @@ #pragma once -#include "DumbHostObject.hpp" -#include "SmartHostObject.hpp" -#include "types.hpp" -#include "utils.hpp" +#include "OPDumbHostObject.hpp" +#include "OPSmartHostObject.hpp" +#include "OPTypes.hpp" +#include "OPUtils.hpp" #ifdef __ANDROID__ #include "sqlite3.h" #else diff --git a/cpp/OPDatabase.cpp b/cpp/OPDatabase.cpp index 7d369139..9f17b567 100644 --- a/cpp/OPDatabase.cpp +++ b/cpp/OPDatabase.cpp @@ -1,13 +1,13 @@ #include "OPDatabase.hpp" -#include "PreparedStatementHostObject.hpp" +#include "OPPreparedStatementHostObject.hpp" #if OP_SQLITE_USE_LIBSQL -#include "libsql/bridge.hpp" +#include "libsql/OPLibsqlBridge.hpp" #else -#include "bridge.hpp" +#include "OPBridge.hpp" #endif -#include "logs.h" -#include "macros.hpp" -#include "utils.hpp" +#include "OPLogs.h" +#include "OPMacros.hpp" +#include "OPUtils.hpp" #include #include #include diff --git a/cpp/OPDatabase.hpp b/cpp/OPDatabase.hpp index 75d32660..9e387a6b 100644 --- a/cpp/OPDatabase.hpp +++ b/cpp/OPDatabase.hpp @@ -1,12 +1,12 @@ #pragma once #include "OPThreadPool.hpp" -#include "types.hpp" +#include "OPTypes.hpp" #include #include #include #ifdef OP_SQLITE_USE_LIBSQL -#include "libsql/bridge.hpp" +#include "libsql/OPLibsqlBridge.hpp" #else #ifdef __ANDROID__ #include "sqlite3.h" diff --git a/cpp/DumbHostObject.cpp b/cpp/OPDumbHostObject.cpp similarity index 95% rename from cpp/DumbHostObject.cpp rename to cpp/OPDumbHostObject.cpp index ec26f080..a38fb504 100644 --- a/cpp/DumbHostObject.cpp +++ b/cpp/OPDumbHostObject.cpp @@ -1,6 +1,6 @@ -#include "DumbHostObject.hpp" -#include "SmartHostObject.hpp" -#include "utils.hpp" +#include "OPDumbHostObject.hpp" +#include "OPSmartHostObject.hpp" +#include "OPUtils.hpp" #include namespace opsqlite { diff --git a/cpp/DumbHostObject.hpp b/cpp/OPDumbHostObject.hpp similarity index 93% rename from cpp/DumbHostObject.hpp rename to cpp/OPDumbHostObject.hpp index d4a5eb92..071e1764 100644 --- a/cpp/DumbHostObject.hpp +++ b/cpp/OPDumbHostObject.hpp @@ -1,7 +1,7 @@ #pragma once -#include "SmartHostObject.hpp" -#include "types.hpp" +#include "OPSmartHostObject.hpp" +#include "OPTypes.hpp" #include #include #include diff --git a/cpp/logs.h b/cpp/OPLogs.h similarity index 100% rename from cpp/logs.h rename to cpp/OPLogs.h diff --git a/cpp/macros.hpp b/cpp/OPMacros.hpp similarity index 100% rename from cpp/macros.hpp rename to cpp/OPMacros.hpp diff --git a/cpp/PreparedStatementHostObject.cpp b/cpp/OPPreparedStatementHostObject.cpp similarity index 95% rename from cpp/PreparedStatementHostObject.cpp rename to cpp/OPPreparedStatementHostObject.cpp index 0bbe0a17..1d40173a 100644 --- a/cpp/PreparedStatementHostObject.cpp +++ b/cpp/OPPreparedStatementHostObject.cpp @@ -1,11 +1,11 @@ -#include "PreparedStatementHostObject.hpp" +#include "OPPreparedStatementHostObject.hpp" #if OP_SQLITE_USE_LIBSQL -#include "libsql/bridge.hpp" +#include "libsql/OPLibsqlBridge.hpp" #else -#include "bridge.hpp" +#include "OPBridge.hpp" #endif -#include "macros.hpp" -#include "utils.hpp" +#include "OPMacros.hpp" +#include "OPUtils.hpp" namespace opsqlite { diff --git a/cpp/PreparedStatementHostObject.hpp b/cpp/OPPreparedStatementHostObject.hpp similarity index 97% rename from cpp/PreparedStatementHostObject.hpp rename to cpp/OPPreparedStatementHostObject.hpp index 38790471..567364a4 100644 --- a/cpp/PreparedStatementHostObject.hpp +++ b/cpp/OPPreparedStatementHostObject.hpp @@ -5,7 +5,7 @@ #include #ifdef OP_SQLITE_USE_LIBSQL #include "libsql.h" -#include "libsql/bridge.hpp" +#include "libsql/OPLibsqlBridge.hpp" #else #ifdef __ANDROID__ #include "sqlite3.h" diff --git a/cpp/SmartHostObject.cpp b/cpp/OPSmartHostObject.cpp similarity index 92% rename from cpp/SmartHostObject.cpp rename to cpp/OPSmartHostObject.cpp index deac3c8c..8d2792c6 100644 --- a/cpp/SmartHostObject.cpp +++ b/cpp/OPSmartHostObject.cpp @@ -1,5 +1,5 @@ -#include "SmartHostObject.hpp" -#include "utils.hpp" +#include "OPSmartHostObject.hpp" +#include "OPUtils.hpp" namespace opsqlite { diff --git a/cpp/SmartHostObject.hpp b/cpp/OPSmartHostObject.hpp similarity index 95% rename from cpp/SmartHostObject.hpp rename to cpp/OPSmartHostObject.hpp index dd1151a9..db500b54 100644 --- a/cpp/SmartHostObject.hpp +++ b/cpp/OPSmartHostObject.hpp @@ -1,6 +1,6 @@ #pragma once -#include "types.hpp" +#include "OPTypes.hpp" #include #include #include diff --git a/cpp/OPSqlite.cpp b/cpp/OPSqlite.cpp index 5bd970b5..7b914f71 100644 --- a/cpp/OPSqlite.cpp +++ b/cpp/OPSqlite.cpp @@ -1,15 +1,15 @@ #include "OPSqlite.hpp" #include "OPDatabase.hpp" -#include "DumbHostObject.hpp" +#include "OPDumbHostObject.hpp" #include "OPThreadPool.hpp" #ifdef OP_SQLITE_USE_LIBSQL -#include "libsql/bridge.hpp" +#include "libsql/OPLibsqlBridge.hpp" #else -#include "bridge.hpp" +#include "OPBridge.hpp" #endif -#include "logs.h" -#include "macros.hpp" -#include "utils.hpp" +#include "OPLogs.h" +#include "OPMacros.hpp" +#include "OPUtils.hpp" #include #include #include diff --git a/cpp/types.hpp b/cpp/OPTypes.hpp similarity index 100% rename from cpp/types.hpp rename to cpp/OPTypes.hpp diff --git a/cpp/utils.cpp b/cpp/OPUtils.cpp similarity index 99% rename from cpp/utils.cpp rename to cpp/OPUtils.cpp index c9a4c5a2..07f47eec 100644 --- a/cpp/utils.cpp +++ b/cpp/OPUtils.cpp @@ -1,12 +1,12 @@ -#include "utils.hpp" -#include "SmartHostObject.hpp" -#include "types.hpp" +#include "OPUtils.hpp" +#include "OPSmartHostObject.hpp" +#include "OPTypes.hpp" #ifndef OP_SQLITE_USE_LIBSQL -#include "bridge.hpp" +#include "OPBridge.hpp" #endif #include "OPThreadPool.hpp" -#include "macros.hpp" +#include "OPMacros.hpp" #include #include #include diff --git a/cpp/utils.hpp b/cpp/OPUtils.hpp similarity index 95% rename from cpp/utils.hpp rename to cpp/OPUtils.hpp index 9b9dda3d..03baada4 100644 --- a/cpp/utils.hpp +++ b/cpp/OPUtils.hpp @@ -1,8 +1,8 @@ #pragma once -#include "DumbHostObject.hpp" -#include "SmartHostObject.hpp" -#include "types.hpp" +#include "OPDumbHostObject.hpp" +#include "OPSmartHostObject.hpp" +#include "OPTypes.hpp" #include #ifdef __ANDROID__ #include "sqlite3.h" diff --git a/cpp/libsql/bridge.cpp b/cpp/libsql/OPLibsqlBridge.cpp similarity index 99% rename from cpp/libsql/bridge.cpp rename to cpp/libsql/OPLibsqlBridge.cpp index e91a0565..9a5b374c 100644 --- a/cpp/libsql/bridge.cpp +++ b/cpp/libsql/OPLibsqlBridge.cpp @@ -1,9 +1,9 @@ -#include "bridge.hpp" -#include "DumbHostObject.hpp" -#include "SmartHostObject.hpp" +#include "OPLibsqlBridge.hpp" +#include "OPDumbHostObject.hpp" +#include "OPSmartHostObject.hpp" #include "libsql.h" -#include "logs.h" -#include "utils.hpp" +#include "OPLogs.h" +#include "OPUtils.hpp" #include #include #include diff --git a/cpp/libsql/bridge.hpp b/cpp/libsql/OPLibsqlBridge.hpp similarity index 96% rename from cpp/libsql/bridge.hpp rename to cpp/libsql/OPLibsqlBridge.hpp index 1b6cf2fa..8feb3807 100644 --- a/cpp/libsql/bridge.hpp +++ b/cpp/libsql/OPLibsqlBridge.hpp @@ -1,10 +1,10 @@ #pragma once -#include "DumbHostObject.hpp" -#include "SmartHostObject.hpp" +#include "OPDumbHostObject.hpp" +#include "OPSmartHostObject.hpp" #include "libsql.h" -#include "types.hpp" -#include "utils.hpp" +#include "OPTypes.hpp" +#include "OPUtils.hpp" #include #define LIBSQL_INT 1 diff --git a/cpp/turso/turso_bridge.cpp b/cpp/turso/OPTursoBridge.cpp similarity index 99% rename from cpp/turso/turso_bridge.cpp rename to cpp/turso/OPTursoBridge.cpp index 7f667353..21b4f6b8 100644 --- a/cpp/turso/turso_bridge.cpp +++ b/cpp/turso/OPTursoBridge.cpp @@ -1,8 +1,8 @@ #include "OPDatabase.hpp" -#include "DumbHostObject.hpp" -#include "SmartHostObject.hpp" -#include "bridge.hpp" -#include "utils.hpp" +#include "OPDumbHostObject.hpp" +#include "OPSmartHostObject.hpp" +#include "OPBridge.hpp" +#include "OPUtils.hpp" #ifdef __APPLE__ extern "C" { diff --git a/op-sqlite.podspec b/op-sqlite.podspec index 1f03a579..197b40c3 100644 --- a/op-sqlite.podspec +++ b/op-sqlite.podspec @@ -108,10 +108,10 @@ Pod::Spec.new do |s| source_files = Dir.glob("ios/**/*.{h,hpp,m,mm}") + Dir.glob("cpp/**/*.{hpp,h,cpp,c}") # Backend bridges are selected explicitly by flags and should not be compiled by default. - source_files.reject! { |path| path == "cpp/turso/turso_bridge.cpp" } unless use_turso + source_files.reject! { |path| path == "cpp/turso/OPTursoBridge.cpp" } unless use_turso # Strictly blocks all headers from being public - s.public_header_files = ["ios/OPSQLite.h", "cpp/sqlite3.h", "cpp/bridge.hpp"] + s.public_header_files = ["ios/OPSQLite.h", "cpp/sqlite3.h", "cpp/OPBridge.hpp"] # Set the path to the `c_sources` directory based on environment if is_user_app @@ -144,18 +144,18 @@ Pod::Spec.new do |s| if use_sqlcipher then log_message.call("[OP-SQLITE] using SQLCipher") - exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/libsql/bridge.cpp", "cpp/libsql/bridge.hpp", "ios/libsql.xcframework/**/*", "ios/libsql_experimental.xcframework/**/*", "ios/turso_sdk_kit.xcframework/**/*"] + exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/libsql/OPLibsqlBridge.cpp", "cpp/libsql/OPLibsqlBridge.hpp", "ios/libsql.xcframework/**/*", "ios/libsql_experimental.xcframework/**/*", "ios/turso_sdk_kit.xcframework/**/*"] xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_SQLCIPHER=1 HAVE_FULLFSYNC=1 SQLITE_HAS_CODEC SQLITE_TEMP_STORE=3 SQLITE_EXTRA_INIT=sqlcipher_extra_init SQLITE_EXTRA_SHUTDOWN=sqlcipher_extra_shutdown" s.dependency "OpenSSL-Universal" elsif use_turso then log_message.call("[OP-SQLITE] using Turso SDK kit") - exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/bridge.hpp", "cpp/bridge.cpp", "cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/libsql/bridge.hpp", "cpp/libsql/bridge.cpp", "ios/libsql_experimental.xcframework/**/*"] + exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/OPBridge.hpp", "cpp/OPBridge.cpp", "cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/libsql/OPLibsqlBridge.hpp", "cpp/libsql/OPLibsqlBridge.cpp", "ios/libsql_experimental.xcframework/**/*"] elsif use_libsql then log_message.call("[OP-SQLITE] ⚠️ Using libsql. If you have libsql questions please ask in the Turso Discord server.") - exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/bridge.h", "cpp/bridge.cpp", "ios/turso_sdk_kit.xcframework/**/*"] + exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/OPBridge.hpp", "cpp/OPBridge.cpp", "ios/turso_sdk_kit.xcframework/**/*"] else log_message.call("[OP-SQLITE] using pure SQLite") - exclude_files += ["cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/libsql/bridge.c", "cpp/libsql/bridge.h", "cpp/libsql/bridge.cpp", "cpp/libsql/libsql.h", "ios/libsql_experimental.xcframework/**/*", "ios/turso_sdk_kit.xcframework/**/*"] + exclude_files += ["cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/libsql/OPLibsqlBridge.hpp", "cpp/libsql/OPLibsqlBridge.cpp", "cpp/libsql/libsql.h", "ios/libsql_experimental.xcframework/**/*", "ios/turso_sdk_kit.xcframework/**/*"] end # Exclude xcframeworks that aren't being used