@naturalcycles/firestore-lib 2.18.0 → 2.19.0

package/dist/firestore.db.d.ts

@@ -52,7 +52,7 @@ export interface FirestoreDBCfg {
      */
     streamOptions?: FirestoreDBStreamOptions;
     /**
-     * Default to `console`
+     * Default to `consoleLogger`
      */
     logger?: CommonLogger;
     logLevel?: CommonLogLevel;

package/dist/firestore.db.js

@@ -3,6 +3,7 @@ import { BaseCommonDB, commonDBFullSupport } from '@naturalcycles/db-lib';
 import { _isTruthy } from '@naturalcycles/js-lib';
 import { _chunk } from '@naturalcycles/js-lib/array/array.util.js';
 import { _assert } from '@naturalcycles/js-lib/error/assert.js';
+import { consoleLogger } from '@naturalcycles/js-lib/log';
 import { _filterUndefinedValues, _omit } from '@naturalcycles/js-lib/object/object.util.js';
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js';
 import { _stringMapEntries } from '@naturalcycles/js-lib/types';
@@ -15,7 +16,7 @@ export class FirestoreDB extends BaseCommonDB {
     constructor(cfg) {
         super();
         this.cfg = {
-            logger: console,
+            logger: consoleLogger,
             ...cfg,
         };
     }

package/dist/firestoreShardedReadable.js

@@ -67,7 +67,7 @@ export class FirestoreShardedReadable extends Readable {
             return;
         }
         void this.runNextQuery(shard).catch(err => {
-            this.logger.error('error in runNextQuery', err);
+            this.logger.error({ msg: 'error in runNextQuery', err });
             this.destroy(err);
         });
     }
@@ -85,7 +85,8 @@ export class FirestoreShardedReadable extends Readable {
         if (this.cursorByShard[shard]) {
             q = q.startAfter(this.cursorByShard[shard]);
         }
-        logger.debug(`runNextQuery[${shard}]`, {
+        logger.debug({
+            msg: `runNextQuery[${shard}]`,
             retrieved: this.rowsRetrieved,
         });
         const qs = await this.runQuery(q);
@@ -154,10 +155,12 @@ export class FirestoreShardedReadable extends Readable {
             });
         }
         catch (err) {
-            logger.error(`FirestoreStreamReadable error!\n`, {
+            logger.error({
+                msg: `FirestoreStreamReadable error!`,
                 table,
                 rowsRetrieved: this.rowsRetrieved,
-            }, err);
+                err,
+            });
             this.destroy(err);
         }
     }

package/dist/firestoreStreamReadable.js

@@ -41,7 +41,8 @@ export class FirestoreStreamReadable extends Readable {
         this.table = dbQuery.table;
         const logger = createCommonLoggerAtLevel(opt.logger, opt.logLevel);
         this.logger = logger;
-        logger.log(`!!! using experimentalCursorStream`, {
+        logger.log({
+            msg: `!!! using experimentalCursorStream`,
             table: this.table,
             batchSize,
             highWaterMark,
@@ -64,7 +65,7 @@ export class FirestoreStreamReadable extends Readable {
             return;
         }
         void this.runNextQuery().catch(err => {
-            this.logger.error('error in runNextQuery', err);
+            this.logger.error({ msg: 'error in runNextQuery', err });
             this.destroy(err);
         });
     }
@@ -159,10 +160,12 @@ export class FirestoreStreamReadable extends Readable {
         }
         catch (err) {
             // console.log((q as any)._queryOptions)
-            logger.error(`FirestoreStreamReadable error!\n`, {
+            logger.error({
+                msg: `FirestoreStreamReadable error!`,
                 table,
                 rowsRetrieved: this.rowsRetrieved,
-            }, err);
+                err,
+            });
             this.destroy(err);
         }
     }

package/package.json

@@ -9,7 +9,7 @@
     "tslib": "^2"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "0.0.0",
+    "@naturalcycles/dev-lib": "20.64.0",
     "@types/node": "^26",
     "typescript": "^7",
     "firebase-admin": "^14"
@@ -38,7 +38,7 @@
   "engines": {
     "node": ">=24.10.0"
   },
-  "version": "2.18.0",
+  "version": "2.19.0",
   "description": "Firestore implementation of CommonDB interface",
   "author": "Natural Cycles Team",
   "license": "MIT",

package/src/firestore.db.ts

@@ -25,6 +25,7 @@ import { BaseCommonDB, commonDBFullSupport } from '@naturalcycles/db-lib'
 import { _isTruthy } from '@naturalcycles/js-lib'
 import { _chunk } from '@naturalcycles/js-lib/array/array.util.js'
 import { _assert } from '@naturalcycles/js-lib/error/assert.js'
+import { consoleLogger } from '@naturalcycles/js-lib/log'
 import type { CommonLogger, CommonLogLevel } from '@naturalcycles/js-lib/log'
 import { _filterUndefinedValues, _omit } from '@naturalcycles/js-lib/object/object.util.js'
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
@@ -41,7 +42,7 @@ export class FirestoreDB extends BaseCommonDB implements CommonDB {
   constructor(cfg: FirestoreDBCfg) {
     super()
     this.cfg = {
-      logger: console,
+      logger: consoleLogger,
       ...cfg,
     }
   }
@@ -559,7 +560,7 @@ export interface FirestoreDBCfg {
   streamOptions?: FirestoreDBStreamOptions
 
   /**
-   * Default to `console`
+   * Default to `consoleLogger`
    */
   logger?: CommonLogger
 

package/src/firestoreShardedReadable.ts

@@ -97,7 +97,7 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
       return
     }
     void this.runNextQuery(shard).catch(err => {
-      this.logger.error('error in runNextQuery', err)
+      this.logger.error({ msg: 'error in runNextQuery', err })
       this.destroy(err)
     })
   }
@@ -121,7 +121,8 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
       q = q.startAfter(this.cursorByShard[shard])
     }
 
-    logger.debug(`runNextQuery[${shard}]`, {
+    logger.debug({
+      msg: `runNextQuery[${shard}]`,
       retrieved: this.rowsRetrieved,
     })
     const qs = await this.runQuery(q)
@@ -212,14 +213,12 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
         },
       )
     } catch (err) {
-      logger.error(
-        `FirestoreStreamReadable error!\n`,
-        {
-          table,
-          rowsRetrieved: this.rowsRetrieved,
-        },
+      logger.error({
+        msg: `FirestoreStreamReadable error!`,
+        table,
+        rowsRetrieved: this.rowsRetrieved,
         err,
-      )
+      })
       this.destroy(err as Error)
     }
   }

package/src/firestoreStreamReadable.ts

@@ -63,7 +63,8 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
     const logger = createCommonLoggerAtLevel(opt.logger, opt.logLevel)
     this.logger = logger
 
-    logger.log(`!!! using experimentalCursorStream`, {
+    logger.log({
+      msg: `!!! using experimentalCursorStream`,
       table: this.table,
       batchSize,
       highWaterMark,
@@ -94,7 +95,7 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
     }
 
     void this.runNextQuery().catch(err => {
-      this.logger.error('error in runNextQuery', err)
+      this.logger.error({ msg: 'error in runNextQuery', err })
       this.destroy(err)
     })
   }
@@ -207,14 +208,12 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
       )
     } catch (err) {
       // console.log((q as any)._queryOptions)
-      logger.error(
-        `FirestoreStreamReadable error!\n`,
-        {
-          table,
-          rowsRetrieved: this.rowsRetrieved,
-        },
+      logger.error({
+        msg: `FirestoreStreamReadable error!`,
+        table,
+        rowsRetrieved: this.rowsRetrieved,
         err,
-      )
+      })
       this.destroy(err as Error)
     }
   }