Incorrect ordering while using singleEvent as true #405

Author: EddyVerbruggen

demo/app/main-view-model.ts

@@ -1556,10 +1556,11 @@ export class HelloWorldModel extends Observable {
           limit: {
             type: firebase.QueryLimitType.LAST,
             value: 2
-          }
+          },
+          singleEvent: true
         }
     ).then(
-        result => console.log("firebase.doQueryBulgarianCompanies done; added a listener"),
+        result => console.log("firebase.doQueryBulgarianCompanies done; added a listener, result: " + JSON.stringify(result)),
         errorMessage => {
           alert({
             title: "Query error",
@@ -1595,7 +1596,8 @@ export class HelloWorldModel extends Observable {
         {
           singleEvent: true,
           orderBy: {
-            type: firebase.QueryOrderByType.KEY
+            type: firebase.QueryOrderByType.CHILD,
+            value: "first"
           }
         }
     ).then(

src/firebase.android.ts

@@ -1681,7 +1681,7 @@ firebase.query = (updateCallback, path, options) => {
       if (options.singleEvent) {
         const listener = new com.google.firebase.database.ValueEventListener({
           onDataChange: snapshot => {
-            const data = firebase.getCallbackData('ValueChanged', snapshot);
+            const data = firebase.getCallbackData("ValueChanged", snapshot);
             if (updateCallback) updateCallback(data);
             // resolve promise with data in case of single event, see https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/126
             resolve(data);

src/firebase.ios.ts

@@ -1359,7 +1359,7 @@ firebase.query = (updateCallback, path, options) => {
   return new Promise((resolve, reject) => {
     try {
       const where = path === undefined ? FIRDatabase.database().reference() : FIRDatabase.database().reference().childByAppendingPath(path);
-      let query;
+      let query: FIRDatabaseQuery;
 
       // orderBy
       if (options.orderBy.type === firebase.QueryOrderByType.KEY) {
@@ -1437,9 +1437,19 @@ firebase.query = (updateCallback, path, options) => {
 
       if (options.singleEvent) {
         query.observeSingleEventOfTypeWithBlock(FIRDataEventType.Value, snapshot => {
-          if (updateCallback) updateCallback(firebase.getCallbackData('ValueChanged', snapshot));
+          const result = {
+            type: "ValueChanged",
+            key: snapshot.key,
+            value: {}
+          };
+          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);
+          }
+
+          if (updateCallback) updateCallback(result);
           // resolve promise with data in case of single event, see https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/126
-          resolve(firebase.getCallbackData('ValueChanged', snapshot));
+          resolve(result);
         });
       } else {
         resolve({