@infrab4a/connect 4.9.7-beta.0 → 4.9.7-beta.1

package/index.cjs.js

@@ -2862,7 +2862,7 @@ const withFindFirestore = (MixinBase) => {
             const req = { collection: collectionName, data: find };
             try {
                 const intercepted = await ((_d = (_c = this.interceptors) === null || _c === void 0 ? void 0 : _c.request) === null || _d === void 0 ? void 0 : _d.call(_c, { find }));
-                const { filters, limits, orderBy } = (intercepted === null || intercepted === void 0 ? void 0 : intercepted.find) || find;
+                const { fields, filters, limits, orderBy } = (intercepted === null || intercepted === void 0 ? void 0 : intercepted.find) || find;
                 const queries = this.makeFirestoreWhere(filters || {});
                 const ordination = this.makeFirestoreOrderBy(filters, orderBy);
                 const offsets = await this.defineLimits(filters, limits);
@@ -2901,8 +2901,9 @@ const withFindFirestore = (MixinBase) => {
                             .getDoc((_a = Object.values(limits.offset.identifier).shift()) === null || _a === void 0 ? void 0 : _a.toString())
                             .get(),
                     ]);
-                else if (lodash.isNumber(limits.offset) || lodash.isString(limits.offset))
+                else if (lodash.isNumber(limits.offset) || lodash.isString(limits.offset)) {
                     queries.push(['fromStartAt', limits.offset]);
+                }
             }
             if (limits === null || limits === void 0 ? void 0 : limits.limit)
                 queries.push(['limit', limits.limit]);
@@ -2986,7 +2987,7 @@ const withUpdateFirestore = (MixinBase) => {
             const req = { collection: collectionName, data };
             try {
                 const identifiers = getValueFromParams(data, keyField);
-                const docRef = this.collection().getDoc(identifiers.toString());
+                const docRef = this.collection(collectionName).getDoc(identifiers.toString());
                 const plainFromData = this.model.toInstance(this.paramsToPlain(data));
                 const intercepted = await ((_b = (_a = this.interceptors) === null || _a === void 0 ? void 0 : _a.request) === null || _b === void 0 ? void 0 : _b.call(_a, { instance: plainFromData }));
                 const builded = (intercepted === null || intercepted === void 0 ? void 0 : intercepted.instance) || plainFromData;
@@ -3727,19 +3728,21 @@ class ConnectCollectionService {
         return new ConnectDocumentService(newDoc.path, this.firestore).withConverter(this.converter);
     }
     async getDocs() {
+        if (this.startingAt > 0)
+            this.limitBy += this.startingAt;
         const constraints = [
             ...this.wheres,
             ...this.orderBys,
-            ...(this.limitBy ? [this.limitBy] : []),
-            ...(this.offsetBy ? [this.offsetBy] : []),
-            ...(this.statingAt ? [this.statingAt] : []),
-            ...(this.startingAfter ? [this.startingAfter] : []),
+            ...(this.limitBy ? [firestore.limit(this.limitBy)] : []),
         ];
-        return firestore.getDocs(firestore.query(this.reference, ...constraints)).then((docs) => ({
-            empty: docs.empty,
-            size: docs.size,
-            docs: docs.docs.map((doc) => new ConnectBaseDocumentSnapshot(doc)),
-        }));
+        return firestore.getDocs(firestore.query(this.reference, ...constraints)).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);
@@ -3753,15 +3756,15 @@ class ConnectCollectionService {
         return this;
     }
     limit(quantity) {
-        this.limitBy = firestore.limit(quantity);
+        this.limitBy = quantity;
         return this;
     }
     offset(offsetBy) {
-        this.offsetBy = firestore.startAfter(offsetBy);
+        this.offsetBy = offsetBy;
         return this;
     }
     fromStartAt(startingAt) {
-        this.statingAt = firestore.startAt(startingAt);
+        this.startingAt = startingAt;
         return this;
     }
     fromStartAfter(startingAt) {

package/index.esm.js

@@ -9,7 +9,7 @@ import { debug } from 'debug';
 import { CustomError } from 'ts-custom-error';
 import axios from 'axios';
 import { signInWithEmailAndPassword, signInWithPopup, GoogleAuthProvider, signInAnonymously, sendPasswordResetEmail, createUserWithEmailAndPassword, sendEmailVerification } from 'firebase/auth';
-import { deleteField, arrayUnion, arrayRemove, Timestamp, doc, getDoc, updateDoc, setDoc, deleteDoc, collection, getDocs, query, where, orderBy, limit, startAfter, startAt, addDoc } from 'firebase/firestore';
+import { deleteField, arrayUnion, arrayRemove, Timestamp, doc, getDoc, updateDoc, setDoc, deleteDoc, collection, limit, getDocs, query, where, orderBy, startAfter, addDoc } from 'firebase/firestore';
 import { ref, uploadBytes } from 'firebase/storage';
 import { mutation, query as query$1 } from 'gql-query-builder';
 
@@ -2856,7 +2856,7 @@ const withFindFirestore = (MixinBase) => {
             const req = { collection: collectionName, data: find };
             try {
                 const intercepted = await ((_d = (_c = this.interceptors) === null || _c === void 0 ? void 0 : _c.request) === null || _d === void 0 ? void 0 : _d.call(_c, { find }));
-                const { filters, limits, orderBy } = (intercepted === null || intercepted === void 0 ? void 0 : intercepted.find) || find;
+                const { fields, filters, limits, orderBy } = (intercepted === null || intercepted === void 0 ? void 0 : intercepted.find) || find;
                 const queries = this.makeFirestoreWhere(filters || {});
                 const ordination = this.makeFirestoreOrderBy(filters, orderBy);
                 const offsets = await this.defineLimits(filters, limits);
@@ -2895,8 +2895,9 @@ const withFindFirestore = (MixinBase) => {
                             .getDoc((_a = Object.values(limits.offset.identifier).shift()) === null || _a === void 0 ? void 0 : _a.toString())
                             .get(),
                     ]);
-                else if (isNumber(limits.offset) || isString(limits.offset))
+                else if (isNumber(limits.offset) || isString(limits.offset)) {
                     queries.push(['fromStartAt', limits.offset]);
+                }
             }
             if (limits === null || limits === void 0 ? void 0 : limits.limit)
                 queries.push(['limit', limits.limit]);
@@ -2980,7 +2981,7 @@ const withUpdateFirestore = (MixinBase) => {
             const req = { collection: collectionName, data };
             try {
                 const identifiers = getValueFromParams(data, keyField);
-                const docRef = this.collection().getDoc(identifiers.toString());
+                const docRef = this.collection(collectionName).getDoc(identifiers.toString());
                 const plainFromData = this.model.toInstance(this.paramsToPlain(data));
                 const intercepted = await ((_b = (_a = this.interceptors) === null || _a === void 0 ? void 0 : _a.request) === null || _b === void 0 ? void 0 : _b.call(_a, { instance: plainFromData }));
                 const builded = (intercepted === null || intercepted === void 0 ? void 0 : intercepted.instance) || plainFromData;
@@ -3721,19 +3722,21 @@ class ConnectCollectionService {
         return new ConnectDocumentService(newDoc.path, this.firestore).withConverter(this.converter);
     }
     async getDocs() {
+        if (this.startingAt > 0)
+            this.limitBy += this.startingAt;
         const constraints = [
             ...this.wheres,
             ...this.orderBys,
-            ...(this.limitBy ? [this.limitBy] : []),
-            ...(this.offsetBy ? [this.offsetBy] : []),
-            ...(this.statingAt ? [this.statingAt] : []),
-            ...(this.startingAfter ? [this.startingAfter] : []),
+            ...(this.limitBy ? [limit(this.limitBy)] : []),
         ];
-        return getDocs(query(this.reference, ...constraints)).then((docs) => ({
-            empty: docs.empty,
-            size: docs.size,
-            docs: docs.docs.map((doc) => new ConnectBaseDocumentSnapshot(doc)),
-        }));
+        return getDocs(query(this.reference, ...constraints)).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);
@@ -3747,15 +3750,15 @@ class ConnectCollectionService {
         return this;
     }
     limit(quantity) {
-        this.limitBy = limit(quantity);
+        this.limitBy = quantity;
         return this;
     }
     offset(offsetBy) {
-        this.offsetBy = startAfter(offsetBy);
+        this.offsetBy = offsetBy;
         return this;
     }
     fromStartAt(startingAt) {
-        this.statingAt = startAt(startingAt);
+        this.startingAt = startingAt;
         return this;
     }
     fromStartAfter(startingAt) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infrab4a/connect",
-  "version": "4.9.7-beta.0",
+  "version": "4.9.7-beta.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },

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

@@ -9,12 +9,12 @@ export declare class ConnectCollectionService<T extends ConnectDocumentData> imp
     private orderBys;
     private limitBy;
     private offsetBy;
-    private statingAt;
+    private startingAt;
     private startingAfter;
     private converter;
     constructor(path: string, firestore: Firestore);
     add(data: T, id?: string): Promise<ConnectDocumentReference<T>>;
-    getDocs(): Promise<ConnectQuerySnapshot<T>>;
+    getDocs(): Promise<ConnectQuerySnapshot<T> | any>;
     getDoc(id?: string): ConnectDocumentReference<T>;
     where(attribute: string, operator: ConnectWhereOption, value: any): ConnectCollectionReference<T>;
     order(attribute: string, order: 'asc' | 'desc'): ConnectCollectionReference<T>;