Incorrect ordering while using singleEvent as true #405

Author: EddyVerbruggen

docs/DATABASE.md

@@ -170,7 +170,8 @@ Let's say we have the structure as defined at `setValue`, then use this query to
         if (!result.error) {
             console.log("Event type: " + result.type);
             console.log("Key: " + result.key);
-            console.log("Value: " + JSON.stringify(result.value));
+            console.log("Value: " + JSON.stringify(result.value)); // a JSON object
+            console.log("Children: " + JSON.stringify(result.children)); // an array, added in plugin v 8.0.0
         }
     };
 

src/firebase.android.ts

@@ -3,11 +3,11 @@ import { AndroidActivityResultEventData } from "tns-core-modules/application";
 import lazy from "tns-core-modules/utils/lazy";
 import { ad as AndroidUtils } from "tns-core-modules/utils/utils";
 import {
-  DataSnapshot,
+  DataSnapshot, FBData, FBDataSingleEvent, FBErrorData, FirebaseQueryResult,
   firestore,
   GetAuthTokenOptions,
   GetAuthTokenResult,
-  OnDisconnect as OnDisconnectBase,
+  OnDisconnect as OnDisconnectBase, QueryOptions,
   User
 } from "./firebase";
 import {
@@ -1594,8 +1594,8 @@ firebase.update = (path, val) => {
   });
 };
 
-firebase.query = (updateCallback, path, options) => {
-  return new Promise((resolve, reject) => {
+firebase.query = (updateCallback: (data: FBDataSingleEvent | FBErrorData) => void, path: string, options: QueryOptions): Promise<any> => {
+  return new Promise<any>((resolve, reject) => {
     try {
       if (firebase.instance === null) {
         reject("Run init() first!");
@@ -1681,10 +1681,24 @@ firebase.query = (updateCallback, path, options) => {
       if (options.singleEvent) {
         const listener = new com.google.firebase.database.ValueEventListener({
           onDataChange: snapshot => {
-            const data = firebase.getCallbackData("ValueChanged", snapshot);
-            if (updateCallback) updateCallback(data);
+
+            const result = {
+              type: "ValueChanged",
+              key: snapshot.getKey(),
+              value: {},
+              children: []
+            };
+
+            for (let iterator = snapshot.getChildren().iterator(); iterator.hasNext();) {
+              const snap = iterator.next();
+              const val = firebase.toJsObject(snap.getValue());
+              result.value[snap.getKey()] = val;
+              result.children.push(val);
+            }
+
+            if (updateCallback) updateCallback(result);
             // resolve promise with data in case of single event, see https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/126
-            resolve(data);
+            resolve(result);
           },
           onCancelled: databaseError => {
             if (updateCallback) updateCallback({

src/firebase.d.ts

@@ -400,6 +400,14 @@ export interface FBData {
   value: any;
 }
 
+export interface FBDataSingleEvent extends FBData {
+  children?: Array<any>;
+}
+
+export interface FBErrorData {
+  error: string;
+}
+
 export interface AuthStateData {
   loggedIn?: boolean;
   user?: User;
@@ -545,6 +553,12 @@ export interface DataSnapshot {
   val(): any;
 }
 
+export interface FirebaseQueryResult {
+  type: string;
+  key: string;
+  value: any;
+}
+
 export function transaction(path: string, transactionUpdate: (a: any) => any,
                             onComplete?: (error: Error | null, committed: boolean, dataSnapshot: DataSnapshot) => any): Promise<any>;
 
@@ -558,7 +572,7 @@ export function update(path: string, value: any): Promise<any>;
 
 export function remove(path: string): Promise<any>;
 
-export function query(onValueEvent: (data: FBData) => void, path: string, options: QueryOptions): Promise<any>;
+export function query(onValueEvent: (data: FBData | FBErrorData) => void, path: string, options: QueryOptions): Promise<any>;
 
 export function addChildEventListener(onChildEvent: (data: FBData) => void, path: string): Promise<AddEventListenerResult>;
 

src/firebase.ios.ts

@@ -1,10 +1,10 @@
 import * as application from "tns-core-modules/application/application";
 import {
-  DataSnapshot,
+  DataSnapshot, FBData, FBDataSingleEvent, FirebaseQueryResult,
   firestore,
   GetAuthTokenOptions,
   GetAuthTokenResult,
-  OnDisconnect as OnDisconnectBase,
+  OnDisconnect as OnDisconnectBase, QueryOptions,
   User
 } from "./firebase";
 import {
@@ -1355,8 +1355,8 @@ firebase.update = (path, val) => {
   });
 };
 
-firebase.query = (updateCallback, path, options) => {
-  return new Promise((resolve, reject) => {
+firebase.query = (updateCallback: (data: FBDataSingleEvent) => void, path: string, options: QueryOptions): Promise<any> => {
+  return new Promise<any>((resolve, reject) => {
     try {
       const where = path === undefined ? FIRDatabase.database().reference() : FIRDatabase.database().reference().childByAppendingPath(path);
       let query: FIRDatabaseQuery;
@@ -1440,11 +1440,14 @@ firebase.query = (updateCallback, path, options) => {
           const result = {
             type: "ValueChanged",
             key: snapshot.key,
-            value: {}
+            value: {},
+            children: []
           };
           for (let i = 0; i < snapshot.children.allObjects.count; i++) {
             const snap: FIRDataSnapshot = snapshot.children.allObjects.objectAtIndex(i);
-            result.value[snap.key] = firebaseUtils.toJsObject(snap.value);
+            const val = firebaseUtils.toJsObject(snap.value);
+            result.value[snap.key] = val;
+            result.children.push(val);
           }
 
           if (updateCallback) updateCallback(result);