chore: Upgrade Nitro to v18 (#92)

Author: chrispader

bun.lockb

@@ -1,88 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion="1210"
-   version="1.3">
+   LastUpgradeVersion = "1210"
+   version = "1.3">
    <BuildAction
-      parallelizeBuildables="YES"
-      buildImplicitDependencies="YES">
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForTesting="YES"
-            buildForRunning="YES"
-            buildForProfiling="YES"
-            buildForArchiving="YES"
-            buildForAnalyzing="YES">
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
-               BuildableIdentifier="primary"
-               BlueprintIdentifier="13B07F861A680F5B00A75B9A"
-               BuildableName="NitroSQLiteExample.app"
-               BlueprintName="NitroSQLiteExample"
-               ReferencedContainer="container:NitroSQLiteExample.xcodeproj">
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+               BuildableName = "NitroSQLiteExample.app"
+               BlueprintName = "NitroSQLiteExample"
+               ReferencedContainer = "container:NitroSQLiteExample.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration="Debug"
-      selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv="YES">
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
-            skipped="NO">
+            skipped = "NO">
             <BuildableReference
-               BuildableIdentifier="primary"
-               BlueprintIdentifier="00E356ED1AD99517003FC87E"
-               BuildableName="NitroSQLiteExampleTests.xctest"
-               BlueprintName="NitroSQLiteExampleTests"
-               ReferencedContainer="container:NitroSQLiteExample.xcodeproj">
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "00E356ED1AD99517003FC87E"
+               BuildableName = "NitroSQLiteExampleTests.xctest"
+               BlueprintName = "NitroSQLiteExampleTests"
+               ReferencedContainer = "container:NitroSQLiteExample.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration="Debug"
-      selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle="0"
-      useCustomWorkingDirectory="NO"
-      ignoresPersistentStateOnLaunch="NO"
-      debugDocumentVersioning="YES"
-      debugServiceExtension="internal"
-      allowLocationSimulation="YES">
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
       <BuildableProductRunnable
-         runnableDebuggingMode="0">
+         runnableDebuggingMode = "0">
          <BuildableReference
-            BuildableIdentifier="primary"
-            BlueprintIdentifier="13B07F861A680F5B00A75B9A"
-            BuildableName="NitroSQLiteExample.app"
-            BlueprintName="NitroSQLiteExample"
-            ReferencedContainer="container:NitroSQLiteExample.xcodeproj">
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "NitroSQLiteExample.app"
+            BlueprintName = "NitroSQLiteExample"
+            ReferencedContainer = "container:NitroSQLiteExample.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration="Release"
-      shouldUseLaunchSchemeArgsEnv="YES"
-      savedToolIdentifier=""
-      useCustomWorkingDirectory="NO"
-      debugDocumentVersioning="YES">
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
       <BuildableProductRunnable
-         runnableDebuggingMode="0">
+         runnableDebuggingMode = "0">
          <BuildableReference
-            BuildableIdentifier="primary"
-            BlueprintIdentifier="13B07F861A680F5B00A75B9A"
-            BuildableName="NitroSQLiteExample.app"
-            BlueprintName="NitroSQLiteExample"
-            ReferencedContainer="container:NitroSQLiteExample.xcodeproj">
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "NitroSQLiteExample.app"
+            BlueprintName = "NitroSQLiteExample"
+            ReferencedContainer = "container:NitroSQLiteExample.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
-      buildConfiguration="Debug">
+      buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration="Release"
-      revealArchiveInOrganizer="YES">
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

example/ios/NitroSQLiteExample.xcodeproj/xcshareddata/xcschemes/NitroSQLiteExample.xcscheme

@@ -7,19 +7,21 @@ PODS:
   - hermes-engine (0.76.1):
     - hermes-engine/Pre-built (= 0.76.1)
   - hermes-engine/Pre-built (0.76.1)
-  - NitroModules (0.16.1):
+  - NitroModules (0.18.1):
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
+    - React-callinvoker
     - React-Core
     - React-debug
     - React-Fabric
     - React-featureflags
     - React-graphics
     - React-ImageManager
+    - React-jsi
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
@@ -1885,7 +1887,7 @@ SPEC CHECKSUMS:
   fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
   glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
   hermes-engine: 46f1ffbf0297f4298862068dd4c274d4ac17a1fd
-  NitroModules: 69af449f389d4c548848a400e1270f672a64e5a3
+  NitroModules: 1301dc53a33ca73ada1479a3dda1141032d8e597
   RCT-Folly: bf5c0376ffe4dd2cf438dcf86db385df9fdce648
   RCTDeprecation: fde92935b3caa6cb65cbff9fbb7d3a9867ffb259
   RCTRequired: 75c6cee42d21c1530a6f204ba32ff57335d19007

example/ios/Podfile.lock

@@ -6,6 +6,7 @@ import type {
 import { beforeEach, describe, it } from './MochaRNAdapter'
 import chai from 'chai'
 import { testDb as testDbInternal, resetTestDb } from './db'
+import { User } from '../model/User'
 
 function isError(e: unknown): e is Error {
   return e instanceof Error

example/src/tests/unitTests.spec.ts

@@ -31,7 +31,7 @@
     "patch-package": "^8.0.0",
     "react": "18.3.1",
     "react-native": "0.76.1",
-    "react-native-nitro-modules": "^0.16.1"
+    "react-native-nitro-modules": "^0.18.1"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
@@ -57,7 +57,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "jest": "^29.7.0",
-    "nitro-codegen": "^0.16.1",
+    "nitro-codegen": "^0.17.0",
     "prettier": "^3.3.3",
     "release-it": "^17.10.0",
     "typescript": "~5.5.4",

package.json

@@ -34,7 +34,7 @@ class NitroSQLiteException : public std::exception {
   explicit NitroSQLiteException(const std::string& message): NitroSQLiteException(NitroSQLiteExceptionType::UnknownError, message) {}
   NitroSQLiteException(const NitroSQLiteExceptionType& type, const char* message) : NitroSQLiteException(type, std::string(message)) {}
   NitroSQLiteException(const NitroSQLiteExceptionType& type, const std::string& message)
-    : _exceptionString("[react-native-nitro-sqlite] " + typeToString(type) + ": " + message) {}
+    : _exceptionString("[" + typeToString(type) + "] " + message) {}
 
 private:
   const std::string _exceptionString;

package/cpp/NitroSQLiteException.hpp

@@ -5,6 +5,7 @@ namespace margelo::nitro::rnnitrosqlite {
 std::optional<double> HybridNativeQueryResult::getInsertId() {
   return this->_insertId;
 }
+
 double HybridNativeQueryResult::getRowsAffected() {
   return this->_rowsAffected;
 }

package/cpp/ThreadPool.cpp

@@ -27,8 +27,11 @@ class HybridNativeQueryResult : public HybridNativeQueryResultSpec {
 public:
   // Properties
   std::optional<double> getInsertId() override;
+  
   double getRowsAffected() override;
+  
   SQLiteQueryResults getResults() override;
+  
   std::optional<SQLiteQueryTableMetadata> getMetadata() override;
 };