@naturalcycles/firestore-lib 1.3.0 → 1.4.1

package/dist/firestore.db.d.ts

@@ -15,7 +15,7 @@ export declare class FirestoreDB extends BaseCommonDB implements CommonDB {
     getByIds<ROW extends ObjectWithId>(table: string, ids: ROW['id'][], _opt?: FirestoreDBOptions): Promise<ROW[]>;
     runQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: FirestoreDBOptions): Promise<RunQueryResult<ROW>>;
     runFirestoreQuery<ROW extends ObjectWithId>(q: Query, _opt?: FirestoreDBOptions): Promise<ROW[]>;
-    runQueryCount<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: FirestoreDBOptions): Promise<number>;
+    runQueryCount<ROW extends ObjectWithId>(q: DBQuery<ROW>, _opt?: FirestoreDBOptions): Promise<number>;
     streamQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, _opt?: CommonDBStreamOptions): ReadableTyped<ROW>;
     saveBatch<ROW extends Partial<ObjectWithId>>(table: string, rows: ROW[], opt?: FirestoreDBSaveOptions<ROW>): Promise<void>;
     deleteByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: FirestoreDBOptions): Promise<number>;

package/dist/firestore.db.js

@@ -52,18 +52,23 @@ class FirestoreDB extends db_lib_1.BaseCommonDB {
     async runFirestoreQuery(q, _opt) {
         return this.querySnapshotToArray(await q.get());
     }
-    async runQueryCount(q, opt) {
-        const { rows } = await this.runQuery(q.select([]), opt);
-        return rows.length;
+    async runQueryCount(q, _opt) {
+        const firestoreQuery = (0, query_util_1.dbQueryToFirestoreQuery)(q, this.cfg.firestore.collection(q.table));
+        const r = await firestoreQuery.count().get();
+        return r.data().count;
     }
     streamQuery(q, _opt) {
         const firestoreQuery = (0, query_util_1.dbQueryToFirestoreQuery)(q, this.cfg.firestore.collection(q.table));
-        return firestoreQuery.stream().pipe((0, nodejs_lib_1.transformMapSimple)(doc => ({
+        const stream = firestoreQuery
+            .stream()
+            .on('error', err => stream.emit('error', err))
+            .pipe((0, nodejs_lib_1.transformMapSimple)(doc => ({
             id: (0, firestore_util_1.unescapeDocId)(doc.id),
             ...doc.data(),
         }), {
             errorMode: js_lib_1.ErrorMode.SUPPRESS, // because .pipe cannot propagate errors
         }));
+        return stream;
     }
     // SAVE
     async saveBatch(table, rows, opt = {}) {

package/package.json

@@ -37,7 +37,7 @@
   "engines": {
     "node": ">=14.15.0"
   },
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "Firestore implementation of CommonDB interface",
   "author": "Natural Cycles Team",
   "license": "MIT"

package/src/firestore.db.ts

@@ -98,10 +98,11 @@ export class FirestoreDB extends BaseCommonDB implements CommonDB {
 
   override async runQueryCount<ROW extends ObjectWithId>(
     q: DBQuery<ROW>,
-    opt?: FirestoreDBOptions,
+    _opt?: FirestoreDBOptions,
   ): Promise<number> {
-    const { rows } = await this.runQuery(q.select([]), opt)
-    return rows.length
+    const firestoreQuery = dbQueryToFirestoreQuery(q, this.cfg.firestore.collection(q.table))
+    const r = await firestoreQuery.count().get()
+    return r.data().count
   }
 
   override streamQuery<ROW extends ObjectWithId>(
@@ -110,17 +111,22 @@ export class FirestoreDB extends BaseCommonDB implements CommonDB {
   ): ReadableTyped<ROW> {
     const firestoreQuery = dbQueryToFirestoreQuery(q, this.cfg.firestore.collection(q.table))
 
-    return firestoreQuery.stream().pipe(
-      transformMapSimple<QueryDocumentSnapshot<any>, ROW>(
-        doc => ({
-          id: unescapeDocId(doc.id),
-          ...doc.data(),
-        }),
-        {
-          errorMode: ErrorMode.SUPPRESS, // because .pipe cannot propagate errors
-        },
-      ),
-    )
+    const stream: ReadableTyped<ROW> = firestoreQuery
+      .stream()
+      .on('error', err => stream.emit('error', err))
+      .pipe(
+        transformMapSimple<QueryDocumentSnapshot<any>, ROW>(
+          doc => ({
+            id: unescapeDocId(doc.id),
+            ...doc.data(),
+          }),
+          {
+            errorMode: ErrorMode.SUPPRESS, // because .pipe cannot propagate errors
+          },
+        ),
+      )
+
+    return stream
   }
 
   // SAVE