@naturalcycles/firestore-lib 1.1.5 → 1.1.6

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.1.6](https://github.com/NaturalCycles/firestore-lib/compare/v1.1.5...v1.1.6) (2021-10-17)
+
+
+### Bug Fixes
+
+* db-lib compat ([ad28580](https://github.com/NaturalCycles/firestore-lib/commit/ad28580cf772b9ff05d07cc89e6ee19be52981e3))
+
 ## [1.1.5](https://github.com/NaturalCycles/firestore-lib/compare/v1.1.4...v1.1.5) (2021-10-17)
 
 

package/dist/firestore.db.d.ts

@@ -1,5 +1,5 @@
 import { Query } from '@google-cloud/firestore';
-import { BaseCommonDB, CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, DBQuery, DBTransaction, ObjectWithId, RunQueryResult } from '@naturalcycles/db-lib';
+import { BaseCommonDB, CommonDB, CommonDBOptions, CommonDBSaveOptions, CommonDBStreamOptions, DBQuery, DBTransaction, ObjectWithId, RunQueryResult, AnyObjectWithId } from '@naturalcycles/db-lib';
 import { ReadableTyped } from '@naturalcycles/nodejs-lib';
 import * as firebaseAdmin from 'firebase-admin';
 export interface FirestoreDBCfg {
@@ -7,7 +7,7 @@ export interface FirestoreDBCfg {
 }
 export interface FirestoreDBOptions extends CommonDBOptions {
 }
-export interface FirestoreDBSaveOptions extends CommonDBSaveOptions {
+export interface FirestoreDBSaveOptions<ROW extends ObjectWithId = AnyObjectWithId> extends CommonDBSaveOptions<ROW> {
 }
 export declare class FirestoreDB extends BaseCommonDB implements CommonDB {
     cfg: FirestoreDBCfg;
@@ -18,7 +18,7 @@ export declare class FirestoreDB extends BaseCommonDB implements CommonDB {
     runFirestoreQuery<ROW extends ObjectWithId>(q: Query, _opt?: FirestoreDBOptions): Promise<ROW[]>;
     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 ObjectWithId>(table: string, rows: ROW[], _opt?: FirestoreDBSaveOptions): Promise<void>;
+    saveBatch<ROW extends ObjectWithId>(table: string, rows: ROW[], _opt?: FirestoreDBSaveOptions<ROW>): Promise<void>;
     deleteByQuery<ROW extends ObjectWithId>(q: DBQuery<ROW>, opt?: FirestoreDBOptions): Promise<number>;
     deleteByIds(table: string, ids: string[], _opt?: FirestoreDBOptions): Promise<number>;
     private querySnapshotToArray;

package/package.json

@@ -39,7 +39,7 @@
   "engines": {
     "node": ">=12.13"
   },
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Firestore implementation of CommonDB interface",
   "author": "Natural Cycles Team",
   "license": "MIT"

package/src/firestore.db.ts

@@ -9,6 +9,7 @@ import {
   DBTransaction,
   ObjectWithId,
   RunQueryResult,
+  AnyObjectWithId,
 } from '@naturalcycles/db-lib'
 import { ErrorMode, pMap, _chunk, _filterNullishValues, _omit } from '@naturalcycles/js-lib'
 import { ReadableTyped, transformMapSimple } from '@naturalcycles/nodejs-lib'
@@ -21,7 +22,8 @@ export interface FirestoreDBCfg {
 }
 
 export interface FirestoreDBOptions extends CommonDBOptions {}
-export interface FirestoreDBSaveOptions extends CommonDBSaveOptions {}
+export interface FirestoreDBSaveOptions<ROW extends ObjectWithId = AnyObjectWithId>
+  extends CommonDBSaveOptions<ROW> {}
 
 export class FirestoreDB extends BaseCommonDB implements CommonDB {
   constructor(public cfg: FirestoreDBCfg) {
@@ -112,7 +114,7 @@ export class FirestoreDB extends BaseCommonDB implements CommonDB {
   override async saveBatch<ROW extends ObjectWithId>(
     table: string,
     rows: ROW[],
-    _opt?: FirestoreDBSaveOptions,
+    _opt?: FirestoreDBSaveOptions<ROW>,
   ): Promise<void> {
     // Firestore allows max 500 items in one batch
     await pMap(