From 49a669c66f7a2922b6c78b99deb218ba675914d6 Mon Sep 17 00:00:00 2001 From: Tiffany Zheng <125598214+qtz1@users.noreply.github.com> Date: Wed, 1 Mar 2023 12:00:46 -0500 Subject: [PATCH 1/3] Surface the error for COUNT queries This is necessary for errors where an index needs to be created and the user needs the creation link --- packages/firestore-compat/src/index.console.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/firestore-compat/src/index.console.ts b/packages/firestore-compat/src/index.console.ts index 23d5da739db..e9b6363d408 100644 --- a/packages/firestore-compat/src/index.console.ts +++ b/packages/firestore-compat/src/index.console.ts @@ -107,7 +107,12 @@ export class Firestore extends FirestoreCompat { count: (query: Compat>) => { return getCountFromServer(query._delegate).then(response => { return response.data().count; - }); + }).catch(error => { + throw new FirestoreError( + error.code, + error.message, + ); + }); } }; } From 816a118d477bf125e1b8acc095f2a46e4cd6f224 Mon Sep 17 00:00:00 2001 From: Tiffany Zheng <125598214+qtz1@users.noreply.github.com> Date: Wed, 1 Mar 2023 13:58:11 -0500 Subject: [PATCH 2/3] Update index.console.ts --- packages/firestore-compat/src/index.console.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/firestore-compat/src/index.console.ts b/packages/firestore-compat/src/index.console.ts index e9b6363d408..88d9ecee616 100644 --- a/packages/firestore-compat/src/index.console.ts +++ b/packages/firestore-compat/src/index.console.ts @@ -105,13 +105,12 @@ export class Firestore extends FirestoreCompat { INTERNAL = { delete: () => this.terminate(), count: (query: Compat>) => { - return getCountFromServer(query._delegate).then(response => { + return getCountFromServer(query._delegate) + .then(response => { return response.data().count; - }).catch(error => { - throw new FirestoreError( - error.code, - error.message, - ); + }) + .catch(error => { + throw new FirestoreError(error.code, error.message); }); } }; From 5438a0ba356933f9746eb0d7def0175c818d2215 Mon Sep 17 00:00:00 2001 From: Tiffany Zheng <125598214+qtz1@users.noreply.github.com> Date: Mon, 6 Mar 2023 15:43:54 -0500 Subject: [PATCH 3/3] fix formatting --- packages/firestore-compat/src/index.console.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/firestore-compat/src/index.console.ts b/packages/firestore-compat/src/index.console.ts index 88d9ecee616..be93038063f 100644 --- a/packages/firestore-compat/src/index.console.ts +++ b/packages/firestore-compat/src/index.console.ts @@ -106,12 +106,12 @@ export class Firestore extends FirestoreCompat { delete: () => this.terminate(), count: (query: Compat>) => { return getCountFromServer(query._delegate) - .then(response => { - return response.data().count; - }) - .catch(error => { - throw new FirestoreError(error.code, error.message); - }); + .then(response => { + return response.data().count; + }) + .catch(error => { + throw new FirestoreError(error.code, error.message); + }); } }; }