@naturalcycles/firestore-lib 2.14.2 → 2.14.4

package/dist/firestore.db.js

@@ -128,7 +128,7 @@ export class FirestoreDB extends BaseCommonDB {
             }
             return;
         }
-        await pMap(_chunk(rows, MAX_ITEMS), async (chunk) => {
+        await pMap(_chunk(rows, MAX_ITEMS), async chunk => {
             // .batch is called "Atomic batch writer"
             // Executes multiple writes in a single atomic transaction-like commit — all succeed or all fail.
             // If any write in the batch fails (e.g., permission error, missing doc), the whole batch fails.
@@ -163,7 +163,7 @@ export class FirestoreDB extends BaseCommonDB {
                 tableRows.push([table, row]);
             }
         }
-        await pMap(_chunk(tableRows, MAX_ITEMS), async (chunk) => {
+        await pMap(_chunk(tableRows, MAX_ITEMS), async chunk => {
             const batch = firestore.batch();
             for (const [table, row] of chunk) {
                 _assert(row.id, `firestore-db doesn't support id auto-generation, but empty id was provided in multiSaveBatch`);
@@ -207,7 +207,7 @@ export class FirestoreDB extends BaseCommonDB {
             }
             return ids.length;
         }
-        await pMap(_chunk(ids, MAX_ITEMS), async (chunk) => {
+        await pMap(_chunk(ids, MAX_ITEMS), async chunk => {
             const batch = firestore.batch();
             for (const id of chunk) {
                 batch.delete(col.doc(escapeDocId(id)));
@@ -230,7 +230,7 @@ export class FirestoreDB extends BaseCommonDB {
             }
         }
         else {
-            await pMap(_chunk(refs, MAX_ITEMS), async (chunk) => {
+            await pMap(_chunk(refs, MAX_ITEMS), async chunk => {
                 const batch = firestore.batch();
                 for (const ref of chunk) {
                     batch.delete(ref);
@@ -249,7 +249,7 @@ export class FirestoreDB extends BaseCommonDB {
     async runInTransaction(fn, opt = {}) {
         const { readOnly } = opt;
         try {
-            await this.cfg.firestore.runTransaction(async (firestoreTx) => {
+            await this.cfg.firestore.runTransaction(async firestoreTx => {
                 const tx = new FirestoreDBTransaction(this, firestoreTx);
                 await fn(tx);
             }, {

package/dist/firestoreShardedReadable.d.ts

@@ -1,5 +1,5 @@
 import { Readable } from 'node:stream';
-import { type Query } from '@google-cloud/firestore';
+import type { Query } from '@google-cloud/firestore';
 import type { DBQuery } from '@naturalcycles/db-lib';
 import type { ObjectWithId } from '@naturalcycles/js-lib/types';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';

package/dist/firestoreStreamReadable.d.ts

@@ -1,5 +1,5 @@
 import { Readable } from 'node:stream';
-import { type Query } from '@google-cloud/firestore';
+import type { Query } from '@google-cloud/firestore';
 import type { DBQuery } from '@naturalcycles/db-lib';
 import type { ObjectWithId } from '@naturalcycles/js-lib/types';
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream';

package/dist/firestoreStreamReadable.js

@@ -1,7 +1,8 @@
 import { Readable } from 'node:stream';
-import { FieldPath, } from '@google-cloud/firestore';
+import { FieldPath } from '@google-cloud/firestore';
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js';
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js';
+import { TimeoutError } from '@naturalcycles/js-lib/error/error.util.js';
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log';
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js';
 import { unescapeDocId } from './firestore.util.js';
@@ -137,7 +138,8 @@ export class FirestoreStreamReadable extends Readable {
                 return await q.get();
             }, {
                 name: `FirestoreStreamReadable.query(${table})`,
-                predicate: err => RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
+                predicate: err => err instanceof TimeoutError ||
+                    RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
                 maxAttempts: 5,
                 delay: 5000,
                 delayMultiplier: 2,

package/dist/query.util.d.ts

@@ -1,4 +1,4 @@
-import { type Query } from '@google-cloud/firestore';
+import type { Query } from '@google-cloud/firestore';
 import type { DBQuery } from '@naturalcycles/db-lib';
 import type { ObjectWithId } from '@naturalcycles/js-lib/types';
 export declare function dbQueryToFirestoreQuery<ROW extends ObjectWithId>(dbQuery: DBQuery<ROW>, emptyQuery: Query): Query;

package/dist/query.util.js

@@ -1,10 +1,7 @@
 import { FieldPath } from '@google-cloud/firestore';
 // Map DBQueryFilterOp to WhereFilterOp
 // Currently it's fully aligned!
-const OP_MAP = {
-// '=': '==',
-// in: 'array-contains',
-};
+const OP_MAP = {};
 export function dbQueryToFirestoreQuery(dbQuery, emptyQuery) {
     let q = emptyQuery;
     // filter

package/package.json

@@ -2,7 +2,7 @@
   "name": "@naturalcycles/firestore-lib",
   "type": "module",
   "dependencies": {
-    "@google-cloud/firestore": "^8",
+    "@google-cloud/firestore": "^7",
     "@naturalcycles/db-lib": "^10",
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^15",
@@ -10,6 +10,7 @@
   },
   "devDependencies": {
     "@types/node": "^25",
+    "@typescript/native-preview": "7.0.0-dev.20260201.1",
     "dotenv": "^17",
     "firebase-admin": "^13",
     "@naturalcycles/dev-lib": "18.4.2"
@@ -38,7 +39,7 @@
   "engines": {
     "node": ">=24.10.0"
   },
-  "version": "2.14.2",
+  "version": "2.14.4",
   "description": "Firestore implementation of CommonDB interface",
   "author": "Natural Cycles Team",
   "license": "MIT",

package/src/firestore.db.ts

@@ -30,7 +30,8 @@ import { _filterUndefinedValues, _omit } from '@naturalcycles/js-lib/object/obje
 import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
 import type { ObjectWithId, PositiveInteger, StringMap } from '@naturalcycles/js-lib/types'
 import { _stringMapEntries } from '@naturalcycles/js-lib/types'
-import { Pipeline, type ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
+import { Pipeline } from '@naturalcycles/nodejs-lib/stream'
+import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
 import { escapeDocId, unescapeDocId } from './firestore.util.js'
 import { FirestoreShardedReadable } from './firestoreShardedReadable.js'
 import { FirestoreStreamReadable } from './firestoreStreamReadable.js'

package/src/firestoreShardedReadable.ts

@@ -1,9 +1,11 @@
 import { Readable } from 'node:stream'
-import { FieldPath, type Query, type QuerySnapshot } from '@google-cloud/firestore'
+import { FieldPath } from '@google-cloud/firestore'
+import type { Query, QuerySnapshot } from '@google-cloud/firestore'
 import type { DBQuery } from '@naturalcycles/db-lib'
 import { localTime } from '@naturalcycles/js-lib/datetime'
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
-import { type CommonLogger, createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
+import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js'
 import type {
   ObjectWithId,

package/src/firestoreStreamReadable.ts

@@ -1,14 +1,12 @@
 import { Readable } from 'node:stream'
-import {
-  FieldPath,
-  type Query,
-  type QueryDocumentSnapshot,
-  type QuerySnapshot,
-} from '@google-cloud/firestore'
+import { FieldPath } from '@google-cloud/firestore'
+import type { Query, QueryDocumentSnapshot, QuerySnapshot } from '@google-cloud/firestore'
 import type { DBQuery } from '@naturalcycles/db-lib'
 import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js'
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js'
-import { type CommonLogger, createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
+import { TimeoutError } from '@naturalcycles/js-lib/error/error.util.js'
+import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log'
+import type { CommonLogger } from '@naturalcycles/js-lib/log'
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js'
 import type { ObjectWithId } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
@@ -182,7 +180,9 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
         },
         {
           name: `FirestoreStreamReadable.query(${table})`,
-          predicate: err => RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
+          predicate: err =>
+            err instanceof TimeoutError ||
+            RETRY_ON.some(s => err?.message?.toLowerCase()?.includes(s)),
           maxAttempts: 5,
           delay: 5000,
           delayMultiplier: 2,

package/src/query.util.ts

@@ -1,4 +1,5 @@
-import { FieldPath, type Query, type WhereFilterOp } from '@google-cloud/firestore'
+import { FieldPath } from '@google-cloud/firestore'
+import type { Query, WhereFilterOp } from '@google-cloud/firestore'
 import type { DBQuery, DBQueryFilterOperator } from '@naturalcycles/db-lib'
 import type { ObjectWithId } from '@naturalcycles/js-lib/types'