Merge branch 'nitro' into rename-to-nitro-sqlite

Author: chrispader

bun.lockb

@@ -24,23 +24,23 @@ def add_nitrogen_files(spec)
 
   spec.dependency "NitroModules"
 
-  current_source_files = spec.attributes_hash['source_files'] || []
+  current_source_files = Array(spec.attributes_hash['source_files'])
   spec.source_files = current_source_files + [
     # Generated cross-platform specs
     "nitrogen/generated/shared/**/*.{h,hpp,c,cpp,swift}",
     # Generated bridges for the cross-platform specs
     "nitrogen/generated/ios/**/*.{h,hpp,c,cpp,mm,swift}",
   ]
 
-  current_public_header_files = spec.attributes_hash['public_header_files'] || []
+  current_public_header_files = Array(spec.attributes_hash['public_header_files'])
   spec.public_header_files = current_public_header_files + [
     # Generated specs
     "nitrogen/generated/shared/**/*.{h,hpp}",
     # Swift to C++ bridging helpers
     "nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Bridge.hpp"
   ]
 
-  current_private_header_files = spec.attributes_hash['private_header_files'] || []
+  current_private_header_files = Array(spec.attributes_hash['private_header_files'])
   spec.private_header_files = current_private_header_files + [
     # iOS specific specs
     "nitrogen/generated/ios/c++/**/*.{h,hpp}",
@@ -52,5 +52,7 @@ def add_nitrogen_files(spec)
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
     # Enables C++ <-> Swift interop (by default it's only C)
     "SWIFT_OBJC_INTEROP_MODE" => "objcxx",
+    # Enables stricter modular headers
+    "DEFINES_MODULE" => "YES",
   })
 end

package/nitrogen/generated/ios/RNNitroSQLite+autolinking.rb

@@ -6,3 +6,12 @@
 ///
 
 #include "RNNitroSQLite-Swift-Cxx-Bridge.hpp"
+
+// Include C++ implementation defined types
+
+
+namespace margelo::nitro::rnnitrosqlite::bridge::swift {
+
+  
+
+} // namespace margelo::nitro::rnnitrosqlite::bridge::swift

package/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Bridge.cpp

@@ -8,39 +8,10 @@
 #pragma once
 
 // Forward declarations of C++ defined types
-// Forward declaration of `ArrayBuffer` to properly resolve imports.
-namespace NitroModules { class ArrayBuffer; }
-// Forward declaration of `BatchQueryCommand` to properly resolve imports.
-namespace margelo::nitro::rnnitrosqlite { struct BatchQueryCommand; }
-// Forward declaration of `BatchQueryResult` to properly resolve imports.
-namespace margelo::nitro::rnnitrosqlite { struct BatchQueryResult; }
-// Forward declaration of `ColumnType` to properly resolve imports.
-namespace margelo::nitro::rnnitrosqlite { enum class ColumnType; }
-// Forward declaration of `FileLoadResult` to properly resolve imports.
-namespace margelo::nitro::rnnitrosqlite { struct FileLoadResult; }
-// Forward declaration of `HybridNativeQueryResultSpec` to properly resolve imports.
-namespace margelo::nitro::rnnitrosqlite { class HybridNativeQueryResultSpec; }
-// Forward declaration of `HybridNitroSQLiteSpec` to properly resolve imports.
-namespace margelo::nitro::rnnitrosqlite { class HybridNitroSQLiteSpec; }
-// Forward declaration of `SQLiteQueryColumnMetadata` to properly resolve imports.
-namespace margelo::nitro::rnnitrosqlite { struct SQLiteQueryColumnMetadata; }
+
 
 // Include C++ defined types
-#include "BatchQueryCommand.hpp"
-#include "BatchQueryResult.hpp"
-#include "ColumnType.hpp"
-#include "FileLoadResult.hpp"
-#include "HybridNativeQueryResultSpec.hpp"
-#include "HybridNitroSQLiteSpec.hpp"
-#include "SQLiteQueryColumnMetadata.hpp"
-#include <NitroModules/ArrayBuffer.hpp>
-#include <future>
-#include <memory>
-#include <optional>
-#include <string>
-#include <unordered_map>
-#include <variant>
-#include <vector>
+
 
 // C++ helpers for Swift
 #include "RNNitroSQLite-Swift-Cxx-Bridge.hpp"
@@ -52,10 +23,7 @@ namespace margelo::nitro::rnnitrosqlite { struct SQLiteQueryColumnMetadata; }
 #include <NitroModules/PromiseHolder.hpp>
 
 // Forward declarations of Swift defined types
-// Forward declaration of `HybridNativeQueryResultSpecCxx` to properly resolve imports.
-namespace RNNitroSQLite { class HybridNativeQueryResultSpecCxx; }
-// Forward declaration of `HybridNitroSQLiteSpecCxx` to properly resolve imports.
-namespace RNNitroSQLite { class HybridNitroSQLiteSpecCxx; }
+
 
 // Include Swift defined types
 #if __has_include("RNNitroSQLite-Swift.h")

package/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Bridge.hpp

@@ -6,5 +6,7 @@
 ///
 
 public final class RNNitroSQLiteAutolinking {
+  public typealias bridge = margelo.nitro.rnnitrosqlite.bridge.swift
+
 
 }

package/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Umbrella.hpp

@@ -56,7 +56,7 @@
   "devDependencies": {
     "@react-native/typescript-config": "0.75.2",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "nitro-codegen": "^0.11.0",
+    "nitro-codegen": "^0.13.0",
     "react": "18.3.1",
     "react-native": "0.75.2",
     "react-native-builder-bob": "^0.18.2"