@react-native-firebase/firestore 16.5.0 → 16.5.1

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [16.5.1](https://github.com/invertase/react-native-firebase/compare/v16.5.0...v16.5.1) (2023-01-20)
+
+### Bug Fixes
+
+- **firestore:** correct handling of nested `FieldPath` in `orderBy` clauses ([#6814](https://github.com/invertase/react-native-firebase/issues/6814)) ([84d7bbe](https://github.com/invertase/react-native-firebase/commit/84d7bbe241241c331b7c540bf089adcf603c199e))
+
 ## [16.5.0](https://github.com/invertase/react-native-firebase/compare/v16.4.6...v16.5.0) (2022-12-16)
 
 **Note:** Version bump only for package @react-native-firebase/firestore

package/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreQuery.java

@@ -127,12 +127,21 @@ public class ReactNativeFirebaseFirestoreQuery {
     List<Object> ordersList = toArrayList(orders);
 
     for (Object o : ordersList) {
-      Map<String, String> order = (Map) o;
+      Map<String, Object> order = (Map) o;
 
-      String fieldPath = order.get("fieldPath");
-      String direction = order.get("direction");
+      if (order.get("fieldPath") instanceof List) {
+        ArrayList fieldPathArray = (ArrayList) order.get("fieldPath");
+        String[] segmentArray = (String[]) fieldPathArray.toArray(new String[0]);
+        FieldPath fieldPath = FieldPath.of(segmentArray);
+        String direction = (String) order.get("direction");
 
-      query = query.orderBy(Objects.requireNonNull(fieldPath), Query.Direction.valueOf(direction));
+        query = query.orderBy(Objects.requireNonNull(fieldPath), Query.Direction.valueOf(direction));
+      } else {
+        String fieldPath = (String) order.get("fieldPath");
+        String direction = (String) order.get("direction");
+
+        query = query.orderBy(Objects.requireNonNull(fieldPath), Query.Direction.valueOf(direction));
+      }
     }
   }
 

package/ios/RNFBFirestore/RNFBFirestoreQuery.m

@@ -82,11 +82,22 @@
 
 - (void)applyOrders {
   for (NSDictionary *order in _orders) {
-    NSString *fieldPath = order[@"fieldPath"];
-    NSString *direction = order[@"direction"];
-    bool isDescending = [direction isEqualToString:@"DESCENDING"];
+    if ([order[@"fieldPath"] isKindOfClass:[NSArray class]]) {
+      NSArray *fieldPathArray = order[@"fieldPath"];
+      NSString *direction = order[@"direction"];
+      bool isDescending = [direction isEqualToString:@"DESCENDING"];
 
-    _query = [_query queryOrderedByField:fieldPath descending:isDescending];
+      FIRFieldPath *fieldPath = [[FIRFieldPath alloc] initWithFields:fieldPathArray];
+
+      _query = [_query queryOrderedByFieldPath:fieldPath descending:isDescending];
+
+    } else {
+      NSString *fieldPath = order[@"fieldPath"];
+      NSString *direction = order[@"direction"];
+      bool isDescending = [direction isEqualToString:@"DESCENDING"];
+
+      _query = [_query queryOrderedByField:fieldPath descending:isDescending];
+    }
   }
 }
 

package/lib/FirestoreDocumentSnapshot.js

@@ -15,7 +15,7 @@
  *
  */
 
-import { isString } from '@react-native-firebase/app/lib/common';
+import { isArray, isString } from '@react-native-firebase/app/lib/common';
 import FirestoreDocumentReference, {
   provideDocumentSnapshotClass,
 } from './FirestoreDocumentReference';
@@ -78,9 +78,13 @@ export default class FirestoreDocumentSnapshot {
   get(fieldPath) {
     // TODO: ehesp: How are SnapshotOptions handled?
 
-    if (!isString(fieldPath) && !(fieldPath instanceof FirestoreFieldPath)) {
+    if (
+      !isString(fieldPath) &&
+      !(fieldPath instanceof FirestoreFieldPath) &&
+      !Array.isArray(fieldPath)
+    ) {
       throw new Error(
-        "firebase.firestore() DocumentSnapshot.get(*) 'fieldPath' expected type string or FieldPath.",
+        "firebase.firestore() DocumentSnapshot.get(*) 'fieldPath' expected type string, array or FieldPath.",
       );
     }
 
@@ -92,6 +96,8 @@ export default class FirestoreDocumentSnapshot {
       } catch (e) {
         throw new Error(`firebase.firestore() DocumentSnapshot.get(*) 'fieldPath' ${e.message}.`);
       }
+    } else if (isArray(fieldPath)) {
+      path = new FirestoreFieldPath(...fieldPath);
     } else {
       // Is already field path
       path = fieldPath;

package/lib/FirestoreQuery.js

@@ -23,10 +23,10 @@ import {
   isUndefined,
 } from '@react-native-firebase/app/lib/common';
 import NativeError from '@react-native-firebase/app/lib/internal/NativeFirebaseError';
+import { FirestoreAggregateQuery } from './FirestoreAggregate';
 import FirestoreDocumentSnapshot from './FirestoreDocumentSnapshot';
 import FirestoreFieldPath, { fromDotSeparatedString } from './FirestoreFieldPath';
 import FirestoreQuerySnapshot from './FirestoreQuerySnapshot';
-import { FirestoreAggregateQuery } from './FirestoreAggregate';
 import { parseSnapshotArgs } from './utils';
 
 let _id = 0;

package/lib/FirestoreQueryModifiers.js

@@ -16,8 +16,8 @@
  */
 
 import { isNumber } from '@react-native-firebase/app/lib/common';
+import FirestoreFieldPath, { DOCUMENT_ID } from './FirestoreFieldPath';
 import { buildNativeArray, generateNativeData } from './utils/serialize';
-import { DOCUMENT_ID } from './FirestoreFieldPath';
 
 const OPERATORS = {
   '==': 'EQUAL',
@@ -74,11 +74,17 @@ export default class FirestoreQueryModifiers {
   }
 
   get filters() {
-    return this._filters.map(f => ({ ...f, fieldPath: f.fieldPath._toArray() }));
+    return this._filters.map(f => ({
+      ...f,
+      fieldPath: f.fieldPath instanceof FirestoreFieldPath ? f.fieldPath._toArray() : f.fieldPath,
+    }));
   }
 
   get orders() {
-    return this._orders;
+    return this._orders.map(f => ({
+      ...f,
+      fieldPath: f.fieldPath instanceof FirestoreFieldPath ? f.fieldPath._toArray() : f.fieldPath,
+    }));
   }
 
   get options() {
@@ -337,7 +343,7 @@ export default class FirestoreQueryModifiers {
 
   orderBy(fieldPath, directionStr) {
     const order = {
-      fieldPath: fieldPath._toPath(),
+      fieldPath: fieldPath,
       direction: directionStr ? DIRECTIONS[directionStr.toLowerCase()] : DIRECTIONS.asc,
     };
 
@@ -348,7 +354,7 @@ export default class FirestoreQueryModifiers {
   validateOrderBy() {
     // Ensure order hasn't been called on the same field
     if (this._orders.length > 1) {
-      const orders = this._orders.map($ => $.fieldPath);
+      const orders = this._orders.map($ => $.fieldPath._toPath());
       const set = new Set(orders);
 
       if (set.size !== orders.length) {
@@ -371,7 +377,7 @@ export default class FirestoreQueryModifiers {
         const orderFieldPath = order.fieldPath;
         if (filter.operator === OPERATORS['==']) {
           // Any where() fieldPath parameter cannot match any orderBy() parameter when '==' operand is invoked
-          if (filterFieldPath === orderFieldPath) {
+          if (filterFieldPath === orderFieldPath._toPath()) {
             throw new Error(
               `Invalid query. Query.orderBy() parameter: ${orderFieldPath} cannot be the same as your Query.where() fieldPath parameter: ${filterFieldPath}`,
             );
@@ -386,7 +392,7 @@ export default class FirestoreQueryModifiers {
 
         if (INEQUALITY[filter.operator]) {
           // Initial orderBy() parameter has to match every where() fieldPath parameter when inequality operator is invoked
-          if (filterFieldPath !== this._orders[0].fieldPath) {
+          if (filterFieldPath !== this._orders[0].fieldPath._toPath()) {
             throw new Error(
               `Invalid query. Initial Query.orderBy() parameter: ${orderFieldPath} has to be the same as the Query.where() fieldPath parameter(s): ${filterFieldPath} when an inequality operator is invoked `,
             );

package/lib/utils/index.js

@@ -26,18 +26,18 @@ import {
 } from '@react-native-firebase/app/lib/common';
 import FirestoreFieldPath, { fromDotSeparatedString } from '../FirestoreFieldPath';
 
-export function extractFieldPathData(data, segmenets) {
+export function extractFieldPathData(data, segments) {
   if (!isObject(data)) {
     return undefined;
   }
 
-  const pathValue = data[segmenets[0]];
+  const pathValue = data[segments[0]];
 
-  if (segmenets.length === 1) {
+  if (segments.length === 1) {
     return pathValue;
   }
 
-  return extractFieldPathData(pathValue, segmenets.slice(1));
+  return extractFieldPathData(pathValue, segments.slice(1));
 }
 
 export function parseUpdateArgs(args) {

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-module.exports = '16.5.0';
+module.exports = '16.5.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/firestore",
-  "version": "16.5.0",
+  "version": "16.5.1",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - Cloud Firestore is a NoSQL cloud database to store and sync data between your React Native application and Firebase's database. The API matches the Firebase Web SDK whilst taking advantage of the native SDKs performance and offline capabilities.",
   "main": "lib/index.js",
@@ -27,10 +27,10 @@
     "firestore"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "16.5.0"
+    "@react-native-firebase/app": "16.5.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "54f60128502e25e1026a2e093ef42ae46977cbe6"
+  "gitHead": "fafaf580f384e8c4b47788adfab0b29ee2cfd5c0"
 }