@naturalcycles/firestore-lib 1.4.0 → 1.4.2

package/dist/firestore.db.d.ts

@@ -23,4 +23,5 @@ export declare class FirestoreDB extends BaseCommonDB implements CommonDB {
     private querySnapshotToArray;
     commitTransaction(tx: DBTransaction, _opt?: CommonDBSaveOptions): Promise<void>;
     ping(): Promise<void>;
+    getTables(): Promise<string[]>;
 }

package/dist/firestore.db.js

@@ -41,6 +41,13 @@ class FirestoreDB extends db_lib_1.BaseCommonDB {
     }
     // QUERY
     async runQuery(q, opt) {
+        const idFilter = q._filters.find(f => f.name === 'id');
+        if (idFilter) {
+            const ids = Array.isArray(idFilter.val) ? idFilter.val : [idFilter.val];
+            return {
+                rows: await this.getByIds(q.table, ids, opt),
+            };
+        }
         const firestoreQuery = (0, query_util_1.dbQueryToFirestoreQuery)(q, this.cfg.firestore.collection(q.table));
         let rows = await this.runFirestoreQuery(firestoreQuery, opt);
         // Special case when projection query didn't specify 'id'
@@ -59,12 +66,16 @@ class FirestoreDB extends db_lib_1.BaseCommonDB {
     }
     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 = {}) {
@@ -81,8 +92,15 @@ class FirestoreDB extends db_lib_1.BaseCommonDB {
     }
     // DELETE
     async deleteByQuery(q, opt) {
-        const firestoreQuery = (0, query_util_1.dbQueryToFirestoreQuery)(q.select([]), this.cfg.firestore.collection(q.table));
-        const ids = (await this.runFirestoreQuery(firestoreQuery)).map(obj => obj.id);
+        let ids;
+        const idFilter = q._filters.find(f => f.name === 'id');
+        if (idFilter) {
+            ids = Array.isArray(idFilter.val) ? idFilter.val : [idFilter.val];
+        }
+        else {
+            const firestoreQuery = (0, query_util_1.dbQueryToFirestoreQuery)(q.select([]), this.cfg.firestore.collection(q.table));
+            ids = (await this.runFirestoreQuery(firestoreQuery)).map(obj => obj.id);
+        }
         await this.deleteByIds(q.table, ids, opt);
         return ids.length;
     }
@@ -129,5 +147,8 @@ class FirestoreDB extends db_lib_1.BaseCommonDB {
     async ping() {
         // no-op now
     }
+    async getTables() {
+        return [];
+    }
 }
 exports.FirestoreDB = FirestoreDB;

package/package.json

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

package/src/firestore.db.ts

@@ -45,7 +45,7 @@ export class FirestoreDB extends BaseCommonDB implements CommonDB {
   }
 
   // GET
-  override async getByIds<ROW extends ObjectWithId>(
+  async getByIds<ROW extends ObjectWithId>(
     table: string,
     ids: ROW['id'][],
     _opt?: FirestoreDBOptions,
@@ -77,6 +77,14 @@ export class FirestoreDB extends BaseCommonDB implements CommonDB {
     q: DBQuery<ROW>,
     opt?: FirestoreDBOptions,
   ): Promise<RunQueryResult<ROW>> {
+    const idFilter = q._filters.find(f => f.name === 'id')
+    if (idFilter) {
+      const ids: string[] = Array.isArray(idFilter.val) ? idFilter.val : [idFilter.val]
+      return {
+        rows: await this.getByIds(q.table, ids, opt),
+      }
+    }
+
     const firestoreQuery = dbQueryToFirestoreQuery(q, this.cfg.firestore.collection(q.table))
 
     let rows = await this.runFirestoreQuery<ROW>(firestoreQuery, opt)
@@ -111,17 +119,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
@@ -160,18 +173,25 @@ export class FirestoreDB extends BaseCommonDB implements CommonDB {
     q: DBQuery<ROW>,
     opt?: FirestoreDBOptions,
   ): Promise<number> {
-    const firestoreQuery = dbQueryToFirestoreQuery(
-      q.select([]),
-      this.cfg.firestore.collection(q.table),
-    )
-    const ids = (await this.runFirestoreQuery<ROW>(firestoreQuery)).map(obj => obj.id)
+    let ids: ROW['id'][]
+
+    const idFilter = q._filters.find(f => f.name === 'id')
+    if (idFilter) {
+      ids = Array.isArray(idFilter.val) ? idFilter.val : [idFilter.val]
+    } else {
+      const firestoreQuery = dbQueryToFirestoreQuery(
+        q.select([]),
+        this.cfg.firestore.collection(q.table),
+      )
+      ids = (await this.runFirestoreQuery<ROW>(firestoreQuery)).map(obj => obj.id)
+    }
 
     await this.deleteByIds(q.table, ids, opt)
 
     return ids.length
   }
 
-  override async deleteByIds<ROW extends ObjectWithId>(
+  async deleteByIds<ROW extends ObjectWithId>(
     table: string,
     ids: ROW['id'][],
     _opt?: FirestoreDBOptions,
@@ -228,4 +248,8 @@ export class FirestoreDB extends BaseCommonDB implements CommonDB {
   override async ping(): Promise<void> {
     // no-op now
   }
+
+  override async getTables(): Promise<string[]> {
+    return []
+  }
 }