@naturalcycles/firestore-lib 2.16.1 → 2.18.0

package/dist/firestoreShardedReadable.js

@@ -2,6 +2,7 @@ import { Readable } from 'node:stream';
 import { FieldPath } from '@google-cloud/firestore';
 import { localTime } from '@naturalcycles/js-lib/datetime';
 import { _ms } from '@naturalcycles/js-lib/datetime/time.util.js';
+import { _assert } from '@naturalcycles/js-lib/error/assert.js';
 import { createCommonLoggerAtLevel } from '@naturalcycles/js-lib/log';
 import { pRetry } from '@naturalcycles/js-lib/promise/pRetry.js';
 import { unescapeDocId } from './firestore.util.js';
@@ -37,6 +38,9 @@ export class FirestoreShardedReadable extends Readable {
             batchSize: 3000,
             ...opt,
         };
+        // Offset cannot be supported here: the query is split into concurrent per-shard queries,
+        // and a global offset would be (wrongly) re-applied to each of them.
+        _assert(!dbQuery._offsetValue, 'offset is not supported by experimentalShardedStream');
         this.originalLimit = dbQuery._limitValue;
         this.table = dbQuery.table;
         const logger = createCommonLoggerAtLevel(opt.logger, opt.logLevel);

package/dist/firestoreStreamReadable.js

@@ -80,7 +80,9 @@ export class FirestoreStreamReadable extends Readable {
         // We have to orderBy documentId, to be able to use id as a cursor
         let q = this.q.orderBy(FieldPath.documentId()).limit(limit);
         if (this.endCursor) {
-            q = q.startAfter(this.endCursor);
+            // Offset (if any) is already "consumed" by the first query,
+            // subsequent queries continue from the cursor and must not skip rows again.
+            q = q.startAfter(this.endCursor).offset(0);
         }
         // logger.log(`runNextQuery`, {
         //   rowsRetrieved: this.rowsRetrieved,

package/dist/query.util.js

@@ -32,6 +32,10 @@ export function dbQueryToFirestoreQuery(dbQuery, emptyQuery) {
     if (dbQuery._limitValue) {
         q = q.limit(dbQuery._limitValue);
     }
+    // offset
+    if (dbQuery._offsetValue) {
+        q = q.offset(dbQuery._offsetValue);
+    }
     // selectedFields
     if (dbQuery._selectedFieldNames) {
         // id is filtered out, because in Firestore it's not a "property",

package/package.json

@@ -2,17 +2,17 @@
   "name": "@naturalcycles/firestore-lib",
   "type": "module",
   "dependencies": {
-    "@google-cloud/firestore": "^8",
+    "@google-cloud/firestore": "^9",
     "@naturalcycles/db-lib": "^10",
     "@naturalcycles/js-lib": "^15",
     "@naturalcycles/nodejs-lib": "^15",
     "tslib": "^2"
   },
   "devDependencies": {
-    "@types/node": "^25",
-    "@typescript/native-preview": "beta",
-    "firebase-admin": "^14",
-    "@naturalcycles/dev-lib": "18.4.2"
+    "@naturalcycles/dev-lib": "0.0.0",
+    "@types/node": "^26",
+    "typescript": "^7",
+    "firebase-admin": "^14"
   },
   "exports": {
     ".": "./dist/index.js"
@@ -38,7 +38,7 @@
   "engines": {
     "node": ">=24.10.0"
   },
-  "version": "2.16.1",
+  "version": "2.18.0",
   "description": "Firestore implementation of CommonDB interface",
   "author": "Natural Cycles Team",
   "license": "MIT",

package/src/firestoreShardedReadable.ts

@@ -4,6 +4,7 @@ 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 { _assert } from '@naturalcycles/js-lib/error/assert.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'
@@ -58,6 +59,10 @@ export class FirestoreShardedReadable<T extends ObjectWithId = any>
       ...opt,
     }
 
+    // Offset cannot be supported here: the query is split into concurrent per-shard queries,
+    // and a global offset would be (wrongly) re-applied to each of them.
+    _assert(!dbQuery._offsetValue, 'offset is not supported by experimentalShardedStream')
+
     this.originalLimit = dbQuery._limitValue
     this.table = dbQuery.table
     const logger = createCommonLoggerAtLevel(opt.logger, opt.logLevel)

package/src/firestoreStreamReadable.ts

@@ -114,7 +114,9 @@ export class FirestoreStreamReadable<T extends ObjectWithId = any>
     // We have to orderBy documentId, to be able to use id as a cursor
     let q = this.q.orderBy(FieldPath.documentId()).limit(limit)
     if (this.endCursor) {
-      q = q.startAfter(this.endCursor)
+      // Offset (if any) is already "consumed" by the first query,
+      // subsequent queries continue from the cursor and must not skip rows again.
+      q = q.startAfter(this.endCursor).offset(0)
     }
 
     // logger.log(`runNextQuery`, {

package/src/query.util.ts

@@ -31,7 +31,7 @@ export function dbQueryToFirestoreQuery<ROW extends ObjectWithId>(
 
   // filter
   for (const f of dbQuery._filters) {
-    q = q.where(mapName(f.name), OP_MAP[f.op] || (f.op as WhereFilterOp), f.val)
+    q = q.where(mapName(f.name), OP_MAP[f.op] || f.op, f.val)
   }
 
   // order
@@ -46,6 +46,11 @@ export function dbQueryToFirestoreQuery<ROW extends ObjectWithId>(
     q = q.limit(dbQuery._limitValue)
   }
 
+  // offset
+  if (dbQuery._offsetValue) {
+    q = q.offset(dbQuery._offsetValue)
+  }
+
   // selectedFields
   if (dbQuery._selectedFieldNames) {
     // id is filtered out, because in Firestore it's not a "property",