feat(firestore): fix iOS Long/Double conversion #3004

invertase · Nov 25, 2021 · 88a8259 · 88a8259
1 parent 3d5d00d
commit 88a8259
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 22 deletions.
diff --git a/...actnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreSerialize.java b/...actnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreSerialize.java
@@ -60,7 +60,7 @@ public class ReactNativeFirebaseFirestoreSerialize {
   private static final int INT_DOCUMENTID = 4;
   private static final int INT_BOOLEAN_TRUE = 5;
   private static final int INT_BOOLEAN_FALSE = 6;
-  private static final int INT_NUMBER = 7;
+  private static final int INT_DOUBLE = 7;
   private static final int INT_STRING = 8;
   private static final int INT_STRING_EMPTY = 9;
   private static final int INT_ARRAY = 10;
@@ -70,6 +70,7 @@ public class ReactNativeFirebaseFirestoreSerialize {
   private static final int INT_BLOB = 14;
   private static final int INT_FIELDVALUE = 15;
   private static final int INT_OBJECT = 16;
+  private static final int INT_INTEGER = 17;
   private static final int INT_UNKNOWN = -999;
 
   // Keys
@@ -300,7 +301,7 @@ private static WritableArray buildTypeMap(Object value) {
     }
 
     if (value instanceof Integer) {
-      typeArray.pushInt(INT_NUMBER);
+      typeArray.pushInt(INT_DOUBLE);
       typeArray.pushDouble(((Integer) value).doubleValue());
       return typeArray;
     }
@@ -325,19 +326,19 @@ private static WritableArray buildTypeMap(Object value) {
         return typeArray;
       }
 
-      typeArray.pushInt(INT_NUMBER);
+      typeArray.pushInt(INT_DOUBLE);
       typeArray.pushDouble(doubleValue);
       return typeArray;
     }
 
     if (value instanceof Float) {
-      typeArray.pushInt(INT_NUMBER);
+      typeArray.pushInt(INT_DOUBLE);
       typeArray.pushDouble(((Float) value).doubleValue());
       return typeArray;
     }
 
     if (value instanceof Long) {
-      typeArray.pushInt(INT_NUMBER);
+      typeArray.pushInt(INT_DOUBLE);
       typeArray.pushDouble(((Long) value).doubleValue());
       return typeArray;
     }
@@ -461,14 +462,10 @@ static Object parseTypeMap(FirebaseFirestore firestore, ReadableArray typeArray)
         return true;
       case INT_BOOLEAN_FALSE:
         return false;
-      case INT_NUMBER:
-        // https://github.com/invertase/react-native-firebase/issues/3004
-        // Number values come from JS as Strings on Android so we can check for floating points
-        String numberStringValue = Objects.requireNonNull(typeArray.getString(1));
-        if (numberStringValue.contains(".")) {
-          return Double.valueOf(numberStringValue);
-        }
-        return Long.valueOf(numberStringValue, 10);
+      case INT_INTEGER:
+        return typeArray.getInt(1);
+      case INT_DOUBLE:
+        return typeArray.getDouble(1);
       case INT_STRING:
         return typeArray.getString(1);
       case INT_STRING_EMPTY:

diff --git a/packages/firestore/ios/RNFBFirestore/RNFBFirestoreSerialize.m b/packages/firestore/ios/RNFBFirestore/RNFBFirestoreSerialize.m
@@ -46,7 +46,7 @@ @implementation RNFBFirestoreSerialize
   INT_DOCUMENTID,
   INT_BOOLEAN_TRUE,
   INT_BOOLEAN_FALSE,
-  INT_NUMBER,
+  INT_DOUBLE,
   INT_STRING,
   INT_STRING_EMPTY,
   INT_ARRAY,
@@ -56,6 +56,7 @@ @implementation RNFBFirestoreSerialize
   INT_BLOB,
   INT_FIELDVALUE,
   INT_OBJECT,
+  INT_INTEGER,
   INT_UNKNOWN = -999,
 };
 
@@ -336,7 +337,7 @@ + (NSArray *)buildTypeMap:(id)value {
     }
 
     // Number
-    typeArray[0] = @(INT_NUMBER);
+    typeArray[0] = @(INT_DOUBLE);
     typeArray[1] = value;
     return typeArray;
   }
@@ -400,7 +401,9 @@ + (id)parseTypeMap:(FIRFirestore *)firestore typeMap:(NSArray *)typeMap {
       return @(YES);
     case INT_BOOLEAN_FALSE:
       return @(NO);
-    case INT_NUMBER:
+    case INT_INTEGER:
+      return @([typeMap[1] longLongValue]);
+    case INT_DOUBLE:
       return @([typeMap[1] doubleValue]);
     case INT_STRING:
       return typeMap[1];

diff --git a/packages/firestore/lib/utils/serialize.js b/packages/firestore/lib/utils/serialize.js
@@ -16,7 +16,6 @@
  */
 
 import {
-  isAndroid,
   isArray,
   isBoolean,
   isDate,
@@ -139,10 +138,13 @@ export function generateNativeData(value, ignoreUndefined) {
   }
 
   if (isNumber(value)) {
-    if (isAndroid) {
-      return getTypeMapInt('number', value.toString());
+    // mirror the JS SDK's integer detection algorithm
+    // https://github.com/firebase/firebase-js-sdk/blob/086df7c7e0299cedd9f3cff9080f46ca25cab7cd/packages/firestore/src/remote/number_serializer.ts#L56
+    const isNegativeZero = value === 0 && 1 / value === -Infinity;
+    if (Number.isSafeInteger(value) && !isNegativeZero) {
+      return getTypeMapInt('integer', value);
     }
-    return getTypeMapInt('number', value);
+    return getTypeMapInt('double', value);
   }
 
   if (isString(value)) {
@@ -254,7 +256,8 @@ export function parseNativeData(firestore, nativeArray) {
       return true;
     case 'booleanFalse':
       return false;
-    case 'number':
+    case 'double':
+    case 'integer':
     case 'string':
       return value;
     case 'stringEmpty':

diff --git a/packages/firestore/lib/utils/typemap.js b/packages/firestore/lib/utils/typemap.js
@@ -25,7 +25,7 @@ const MAP = {
   documentid: 4, // to native only
   booleanTrue: 5,
   booleanFalse: 6,
-  number: 7,
+  double: 7,
   string: 8,
   stringEmpty: 9,
   array: 10,
@@ -35,6 +35,7 @@ const MAP = {
   blob: 14,
   fieldvalue: 15,
   object: 16,
+  integer: 17,
   unknown: -999,
 };