@naturalcycles/firestore-lib 2.2.0 → 2.4.0

package/dist/firestore.db.js

@@ -1,9 +1,10 @@
 import { FieldValue } from '@google-cloud/firestore';
 import { BaseCommonDB, commonDBFullSupport } from '@naturalcycles/db-lib';
-import { _chunk, _isTruthy } from '@naturalcycles/js-lib';
-import { _assert } from '@naturalcycles/js-lib/error';
-import { _filterUndefinedValues, _omit } from '@naturalcycles/js-lib/object';
-import { pMap } from '@naturalcycles/js-lib/promise';
+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 { _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';
 import { escapeDocId, unescapeDocId } from './firestore.util.js';
 import { dbQueryToFirestoreQuery } from './query.util.js';
@@ -87,19 +88,19 @@ export class FirestoreDB extends BaseCommonDB {
         const method = methodMap[opt.saveMethod] || 'set';
         if (opt.tx) {
             const { tx } = opt.tx;
-            rows.forEach(row => {
+            for (const row of rows) {
                 _assert(row.id, `firestore-db doesn't support id auto-generation, but empty id was provided in saveBatch`);
                 tx[method](col.doc(escapeDocId(row.id)), _filterUndefinedValues(row));
-            });
+            }
             return;
         }
         // Firestore allows max 500 items in one batch
         await pMap(_chunk(rows, 500), async (chunk) => {
             const batch = firestore.batch();
-            chunk.forEach(row => {
+            for (const row of chunk) {
                 _assert(row.id, `firestore-db doesn't support id auto-generation, but empty id was provided in saveBatch`);
                 batch[method](col.doc(escapeDocId(row.id)), _filterUndefinedValues(row));
-            });
+            }
             await batch.commit();
         }, { concurrency: 1 });
     }
@@ -122,16 +123,16 @@ export class FirestoreDB extends BaseCommonDB {
         const col = firestore.collection(table);
         if (opt.tx) {
             const { tx } = opt.tx;
-            ids.forEach(id => {
+            for (const id of ids) {
                 tx.delete(col.doc(escapeDocId(id)));
-            });
+            }
             return ids.length;
         }
         await pMap(_chunk(ids, 500), async (chunk) => {
             const batch = firestore.batch();
-            chunk.forEach(id => {
+            for (const id of chunk) {
                 batch.delete(col.doc(escapeDocId(id)));
-            });
+            }
             await batch.commit();
         });
         return ids.length;

package/package.json

@@ -9,10 +9,10 @@
     "tslib": "^2"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "*",
     "@types/node": "^24",
     "dotenv": "^17",
-    "firebase-admin": "^13"
+    "firebase-admin": "^13",
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {
     ".": "./dist/index.js"
@@ -38,7 +38,7 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "Firestore implementation of CommonDB interface",
   "author": "Natural Cycles Team",
   "license": "MIT",

package/src/firestore.db.ts

@@ -20,10 +20,11 @@ import type {
   RunQueryResult,
 } from '@naturalcycles/db-lib'
 import { BaseCommonDB, commonDBFullSupport } from '@naturalcycles/db-lib'
-import { _chunk, _isTruthy } from '@naturalcycles/js-lib'
-import { _assert } from '@naturalcycles/js-lib/error'
-import { _filterUndefinedValues, _omit } from '@naturalcycles/js-lib/object'
-import { pMap } from '@naturalcycles/js-lib/promise'
+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 { _filterUndefinedValues, _omit } from '@naturalcycles/js-lib/object/object.util.js'
+import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
 import type { ObjectWithId, StringMap } from '@naturalcycles/js-lib/types'
 import { _stringMapEntries } from '@naturalcycles/js-lib/types'
 import type { ReadableTyped } from '@naturalcycles/nodejs-lib/stream'
@@ -158,14 +159,14 @@ export class FirestoreDB extends BaseCommonDB implements CommonDB {
     if (opt.tx) {
       const { tx } = opt.tx as FirestoreDBTransaction
 
-      rows.forEach(row => {
+      for (const row of rows) {
         _assert(
           row.id,
           `firestore-db doesn't support id auto-generation, but empty id was provided in saveBatch`,
         )
 
         tx[method as 'set' | 'create'](col.doc(escapeDocId(row.id)), _filterUndefinedValues(row))
-      })
+      }
       return
     }
 
@@ -175,7 +176,7 @@ export class FirestoreDB extends BaseCommonDB implements CommonDB {
       async chunk => {
         const batch = firestore.batch()
 
-        chunk.forEach(row => {
+        for (const row of chunk) {
           _assert(
             row.id,
             `firestore-db doesn't support id auto-generation, but empty id was provided in saveBatch`,
@@ -184,7 +185,7 @@ export class FirestoreDB extends BaseCommonDB implements CommonDB {
             col.doc(escapeDocId(row.id)),
             _filterUndefinedValues(row),
           )
-        })
+        }
 
         await batch.commit()
       },
@@ -226,18 +227,18 @@ export class FirestoreDB extends BaseCommonDB implements CommonDB {
     if (opt.tx) {
       const { tx } = opt.tx as FirestoreDBTransaction
 
-      ids.forEach(id => {
+      for (const id of ids) {
         tx.delete(col.doc(escapeDocId(id)))
-      })
+      }
       return ids.length
     }
 
     await pMap(_chunk(ids, 500), async chunk => {
       const batch = firestore.batch()
 
-      chunk.forEach(id => {
+      for (const id of chunk) {
         batch.delete(col.doc(escapeDocId(id)))
-      })
+      }
 
       await batch.commit()
     })