feat: improve NITRO_SQLITE_NULL handling

Author: chrispader

example/src/tests/unitTests.spec.ts

@@ -4,7 +4,6 @@ import {
   type BatchQueryCommand,
   NITRO_SQLITE_NULL,
   enableSimpleNullHandling,
-  isSimpleNullHandlingEnabled,
 } from 'react-native-nitro-sqlite'
 import { beforeEach, describe, it } from './MochaRNAdapter'
 import chai from 'chai'

package/nitrogen/generated/shared/c++/SQLiteNullValue.hpp

@@ -29,10 +29,10 @@ namespace margelo::nitro::rnnitrosqlite {
    */
   struct SQLiteNullValue {
   public:
-    bool isNull     SWIFT_PRIVATE;
+    bool isNitroSQLiteNull     SWIFT_PRIVATE;
 
   public:
-    explicit SQLiteNullValue(bool isNull): isNull(isNull) {}
+    explicit SQLiteNullValue(bool isNitroSQLiteNull): isNitroSQLiteNull(isNitroSQLiteNull) {}
   };
 
 } // namespace margelo::nitro::rnnitrosqlite
@@ -47,20 +47,20 @@ namespace margelo::nitro {
     static inline SQLiteNullValue fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
       return SQLiteNullValue(
-        JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "isNull"))
+        JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, "isNitroSQLiteNull"))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const SQLiteNullValue& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, "isNull", JSIConverter<bool>::toJSI(runtime, arg.isNull));
+      obj.setProperty(runtime, "isNitroSQLiteNull", JSIConverter<bool>::toJSI(runtime, arg.isNitroSQLiteNull));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
       if (!value.isObject()) {
         return false;
       }
       jsi::Object obj = value.getObject(runtime);
-      if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "isNull"))) return false;
+      if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, "isNitroSQLiteNull"))) return false;
       return true;
     }
   };

package/src/index.ts

@@ -36,4 +36,10 @@ export function isSimpleNullHandlingEnabled() {
   return ENABLE_SIMPLE_NULL_HANDLING
 }
 
-export const NITRO_SQLITE_NULL: SQLiteNullValue = { isNull: true }
+export const NITRO_SQLITE_NULL: SQLiteNullValue = { isNitroSQLiteNull: true }
+export function isNitroSQLiteNull(value: any): value is SQLiteNullValue {
+  if (typeof value === 'object' && 'isNitroSQLiteNull' in value) {
+    return true
+  }
+  return false
+}

package/src/operations/execute.ts

@@ -1,4 +1,8 @@
-import { NITRO_SQLITE_NULL, isSimpleNullHandlingEnabled } from '..'
+import {
+  NITRO_SQLITE_NULL,
+  isNitroSQLiteNull,
+  isSimpleNullHandlingEnabled,
+} from '..'
 import { HybridNitroSQLite } from '../nitro'
 import type { NativeQueryResult } from '../specs/NativeQueryResult.nitro'
 import type {
@@ -62,7 +66,7 @@ function buildJsQueryResult<Row extends QueryResultRow = never>({
     data = results.map((row) =>
       Object.fromEntries(
         Object.entries(row).map(([key, value]) => {
-          if (typeof value === 'object' && 'isNull' in value) {
+          if (isNitroSQLiteNull(value)) {
             return [key, null]
           }
           return [key, value]

package/src/types.ts

@@ -28,7 +28,7 @@ export enum ColumnType {
 
 // Passing null/undefined in array types is not possible, so we us a special struct as a workaround.
 export type SQLiteNullValue = {
-  isNull: true
+  isNitroSQLiteNull: true
 }
 export type SQLiteValue =
   | boolean