fix(firestore): onSnapshot handling

NativeScript · Oct 28, 2022 · c74f67a · c74f67a
1 parent c41c406
commit c74f67a
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 19 deletions.
diff --git a/packages/firebase-firestore/index.android.ts b/packages/firebase-firestore/index.android.ts
@@ -537,25 +537,28 @@ export class Query<T extends DocumentData = DocumentData> implements IQuery<T> {
 								if (error) {
 									onError?.(FirebaseError.fromNative(error));
 								} else {
+									// onError -> onCompletion
 									onCompletion?.();
+									// options -> onNext
 									onNext?.(QuerySnapshot.fromNative(ss));
 								}
 							}
 						} else {
 							if (error) {
-								// onNext -> onError
+								//onError -> onNext
 								onNext?.(FirebaseError.fromNative(error));
 							} else {
-								// onError -> onCompletion
+								// onCompletion ->
 								onError?.();
 								// options -> onNext
 								options?.(QuerySnapshot.fromNative(ss));
 							}
 						}
 					} else {
 						if (typeof arguments[1] === 'function') {
+							// onNext -> options
 							if (!error) {
-								onNext?.(QuerySnapshot.fromNative(ss));
+								options?.(QuerySnapshot.fromNative(ss));
 							}
 						} else {
 							if (error) {
@@ -976,22 +979,28 @@ export class DocumentReference<T extends DocumentData = DocumentData> implements
 								if (error) {
 									onError?.(FirebaseError.fromNative(error));
 								} else {
+									// onError -> onCompletion
 									onCompletion?.();
+									// options -> onNext
 									onNext?.(DocumentSnapshot.fromNative(ss));
 								}
 							}
 						} else {
 							if (error) {
-								onError?.(FirebaseError.fromNative(error));
+								//onError -> onNext
+								onNext?.(FirebaseError.fromNative(error));
 							} else {
-								onCompletion?.();
-								onNext?.(DocumentSnapshot.fromNative(ss));
+								// onCompletion ->
+								onError?.();
+								// options -> onNext
+								options?.(DocumentSnapshot.fromNative(ss));
 							}
 						}
 					} else {
 						if (typeof arguments[1] === 'function') {
+							// onNext -> options
 							if (!error) {
-								onNext?.(DocumentSnapshot.fromNative(ss));
+								options?.(DocumentSnapshot.fromNative(ss));
 							}
 						} else {
 							if (error) {

diff --git a/packages/firebase-firestore/index.ios.ts b/packages/firebase-firestore/index.ios.ts
@@ -476,27 +476,30 @@ export class Query<T extends DocumentData = DocumentData> implements IQuery<T> {
 						}
 					} else {
 						if (error) {
-							// onNext -> onError
-							onNext?.(FirebaseError.fromNative(error));
+							onError?.(FirebaseError.fromNative(error));
 						} else {
 							// onError -> onCompletion
-							onError?.();
+							onCompletion?.();
 							// options -> onNext
-							options?.(QuerySnapshot.fromNative(ss));
+							onNext?.(QuerySnapshot.fromNative(ss));
 						}
 					}
 				} else {
 					if (error) {
-						onError?.(FirebaseError.fromNative(error));
+						//onError -> onNext
+						onNext?.(FirebaseError.fromNative(error));
 					} else {
-						onCompletion?.();
-						onNext?.(QuerySnapshot.fromNative(ss));
+						// onCompletion ->
+						onError?.();
+						// options -> onNext
+						options?.(QuerySnapshot.fromNative(ss));
 					}
 				}
 			} else {
 				if (typeof arguments[1] === 'function') {
+					// onNext -> options
 					if (!error) {
-						onNext?.(QuerySnapshot.fromNative(ss));
+						options?.(QuerySnapshot.fromNative(ss));
 					}
 				} else {
 					if (error) {
@@ -896,22 +899,28 @@ export class DocumentReference<T extends DocumentData = DocumentData> implements
 						if (error) {
 							onError?.(FirebaseError.fromNative(error));
 						} else {
+							// onError -> onCompletion
 							onCompletion?.();
+							// options -> onNext
 							onNext?.(DocumentSnapshot.fromNative(ss));
 						}
 					}
 				} else {
 					if (error) {
-						onError?.(FirebaseError.fromNative(error));
+						//onError -> onNext
+						onNext?.(FirebaseError.fromNative(error));
 					} else {
-						onCompletion?.();
-						onNext?.(DocumentSnapshot.fromNative(ss));
+						// onCompletion ->
+						onError?.();
+						// options -> onNext
+						options?.(DocumentSnapshot.fromNative(ss));
 					}
 				}
 			} else {
 				if (typeof arguments[1] === 'function') {
+					// onNext -> options
 					if (!error) {
-						onNext?.(DocumentSnapshot.fromNative(ss));
+						options?.(DocumentSnapshot.fromNative(ss));
 					}
 				} else {
 					if (error) {