@infrab4a/connect-nestjs 1.1.3 → 1.1.6

package/index.cjs.js

@@ -216,17 +216,19 @@ class ConnectCollectionService {
         return new ConnectDocumentService(newDoc.path, this.firestore).withConverter(this.converter);
     }
     async getDocs() {
+        if (this.startingAt > 0)
+            this.limitBy += this.startingAt;
         let query = this.query ? this.query : this.reference;
         query = this.orderBy ? query.orderBy(this.orderBy.fieldPath, this.orderBy.directionStr) : query;
-        query = this.statingAt ? query.startAt(this.statingAt) : query;
-        query = this.startingAfter ? query.startAfter(this.startingAfter) : query;
-        query = this.offsetBy ? query.offset(this.offsetBy) : query;
         query = this.limitBy ? query.limit(this.limitBy) : query;
-        return query.get().then((docs) => ({
-            empty: docs.empty,
-            size: docs.size,
-            docs: docs.docs.map((doc) => new ConnectBaseDocumentSnapshot(doc)),
-        }));
+        return query.get().then((docs) => {
+            const docsPaginated = this.startingAt > 0 ? docs.docs.slice(this.startingAt, this.limitBy) : docs.docs;
+            return {
+                empty: Boolean(docsPaginated.length),
+                size: docsPaginated.length,
+                docs: docsPaginated.map((doc) => new ConnectBaseDocumentSnapshot(doc)),
+            };
+        });
     }
     getDoc(id) {
         return new ConnectDocumentService(`${this.reference.path}/${id}`, this.firestore).withConverter(this.converter);
@@ -248,7 +250,7 @@ class ConnectCollectionService {
         return this;
     }
     fromStartAt(startingAt) {
-        this.statingAt = startingAt;
+        this.startingAt = startingAt;
         return this;
     }
     fromStartAfter(startingAt) {

package/index.esm.js

@@ -212,17 +212,19 @@ class ConnectCollectionService {
         return new ConnectDocumentService(newDoc.path, this.firestore).withConverter(this.converter);
     }
     async getDocs() {
+        if (this.startingAt > 0)
+            this.limitBy += this.startingAt;
         let query = this.query ? this.query : this.reference;
         query = this.orderBy ? query.orderBy(this.orderBy.fieldPath, this.orderBy.directionStr) : query;
-        query = this.statingAt ? query.startAt(this.statingAt) : query;
-        query = this.startingAfter ? query.startAfter(this.startingAfter) : query;
-        query = this.offsetBy ? query.offset(this.offsetBy) : query;
         query = this.limitBy ? query.limit(this.limitBy) : query;
-        return query.get().then((docs) => ({
-            empty: docs.empty,
-            size: docs.size,
-            docs: docs.docs.map((doc) => new ConnectBaseDocumentSnapshot(doc)),
-        }));
+        return query.get().then((docs) => {
+            const docsPaginated = this.startingAt > 0 ? docs.docs.slice(this.startingAt, this.limitBy) : docs.docs;
+            return {
+                empty: Boolean(docsPaginated.length),
+                size: docsPaginated.length,
+                docs: docsPaginated.map((doc) => new ConnectBaseDocumentSnapshot(doc)),
+            };
+        });
     }
     getDoc(id) {
         return new ConnectDocumentService(`${this.reference.path}/${id}`, this.firestore).withConverter(this.converter);
@@ -244,7 +246,7 @@ class ConnectCollectionService {
         return this;
     }
     fromStartAt(startingAt) {
-        this.statingAt = startingAt;
+        this.startingAt = startingAt;
         return this;
     }
     fromStartAfter(startingAt) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infrab4a/connect-nestjs",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
@@ -9,7 +9,7 @@
     "url": "https://github.com/B4AGroup/b4a-firebase-libs"
   },
   "peerDependencies": {
-    "@infrab4a/connect": "^4.9.5",
+    "@infrab4a/connect": "^4.9.12",
     "@nestjs/common": "^10.3.3",
     "@nestjs/core": "^10.3.3",
     "firebase-admin": "^12.0.0"

package/src/infra/firebase/firestore/services/connect-collection.service.d.ts

@@ -9,7 +9,7 @@ export declare class ConnectCollectionService<T extends ConnectDocumentData> imp
     private orderBy;
     private limitBy;
     private offsetBy;
-    private statingAt;
+    private startingAt;
     private startingAfter;
     private converter;
     constructor(path: string, firestore: Firestore);