@infrab4a/connect 4.4.0-beta.7 → 4.4.0-beta.8

package/index.cjs.js

@@ -3639,7 +3639,6 @@ class ConnectDocumentService {
         return this.reference.id;
     }
     async save(data) {
-        console.log('save ConnectDocumentService', data);
         const doc = await firestore.getDoc(this.reference);
         if (doc.exists())
             await firestore.updateDoc(this.reference, data);
@@ -3651,7 +3650,10 @@ class ConnectDocumentService {
         await firestore.deleteDoc(this.reference);
     }
     withConverter(params) {
-        this.reference = this.reference.withConverter(params);
+        this.reference = this.reference.withConverter({
+            toFirestore: (data) => params.toFirestore(data),
+            fromFirestore: (snapshot, options) => params.fromFirestore(snapshot, options),
+        });
         return this;
     }
 }
@@ -3670,7 +3672,7 @@ class ConnectCollectionService {
     }
     async add(data, id) {
         const newDoc = await this.save(data, id);
-        return new ConnectDocumentService(newDoc.path, this.firestore);
+        return new ConnectDocumentService(newDoc.path, this.firestore).withConverter(this.converter);
     }
     async getDocs() {
         const constraints = [
@@ -3684,7 +3686,7 @@ class ConnectCollectionService {
         return firestore.getDocs(firestore.query(this.reference, ...constraints));
     }
     getDoc(id) {
-        return new ConnectDocumentService(`${this.reference.path}/${id}`, this.firestore).withConverter(this.reference.converter);
+        return new ConnectDocumentService(`${this.reference.path}/${id}`, this.firestore).withConverter(this.converter);
     }
     where(attribute, operator, value) {
         this.wheres.push(firestore.where(attribute, operator, value));
@@ -3711,11 +3713,14 @@ class ConnectCollectionService {
         return this;
     }
     withConverter(params) {
-        this.reference = this.reference.withConverter(params);
+        this.converter = {
+            toFirestore: (data) => params.toFirestore(data),
+            fromFirestore: (snapshot, options) => params.fromFirestore(snapshot, options),
+        };
+        this.reference = this.reference.withConverter(this.converter);
         return this;
     }
     async save(data, id) {
-        console.log('save ConnectCollectionService', data, id);
         if (lodash.isEmpty(id))
             return firestore.addDoc(this.reference, data);
         const docRef = firestore.doc(this.reference, id);

package/index.esm.js

@@ -3615,7 +3615,6 @@ class ConnectDocumentService {
         return this.reference.id;
     }
     async save(data) {
-        console.log('save ConnectDocumentService', data);
         const doc = await getDoc(this.reference);
         if (doc.exists())
             await updateDoc(this.reference, data);
@@ -3627,7 +3626,10 @@ class ConnectDocumentService {
         await deleteDoc(this.reference);
     }
     withConverter(params) {
-        this.reference = this.reference.withConverter(params);
+        this.reference = this.reference.withConverter({
+            toFirestore: (data) => params.toFirestore(data),
+            fromFirestore: (snapshot, options) => params.fromFirestore(snapshot, options),
+        });
         return this;
     }
 }
@@ -3646,7 +3648,7 @@ class ConnectCollectionService {
     }
     async add(data, id) {
         const newDoc = await this.save(data, id);
-        return new ConnectDocumentService(newDoc.path, this.firestore);
+        return new ConnectDocumentService(newDoc.path, this.firestore).withConverter(this.converter);
     }
     async getDocs() {
         const constraints = [
@@ -3660,7 +3662,7 @@ class ConnectCollectionService {
         return getDocs(query(this.reference, ...constraints));
     }
     getDoc(id) {
-        return new ConnectDocumentService(`${this.reference.path}/${id}`, this.firestore).withConverter(this.reference.converter);
+        return new ConnectDocumentService(`${this.reference.path}/${id}`, this.firestore).withConverter(this.converter);
     }
     where(attribute, operator, value) {
         this.wheres.push(where(attribute, operator, value));
@@ -3687,11 +3689,14 @@ class ConnectCollectionService {
         return this;
     }
     withConverter(params) {
-        this.reference = this.reference.withConverter(params);
+        this.converter = {
+            toFirestore: (data) => params.toFirestore(data),
+            fromFirestore: (snapshot, options) => params.fromFirestore(snapshot, options),
+        };
+        this.reference = this.reference.withConverter(this.converter);
         return this;
     }
     async save(data, id) {
-        console.log('save ConnectCollectionService', data, id);
         if (isEmpty(id))
             return addDoc(this.reference, data);
         const docRef = doc(this.reference, id);

package/package.json

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

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

@@ -1,6 +1,6 @@
-import { ConnectQuerySnapshop, ConnectWhereOption } from '../types';
+import { ConnectQuerySnapshot, ConnectWhereOption } from '../types';
 import { ConnectDocumentData } from '../types/connect-firestore/connect-document-data.type';
-import { ConnectDocumentSnapshot } from '../types/connect-firestore/connect-document-snapshop.type';
+import { ConnectDocumentSnapshot, ConnectSnapshotOptions } from '../types/connect-firestore/connect-document-snapshot.type';
 import { ConnectDocumentReference } from './connect-document-reference';
 export interface ConnectCollectionReference<T extends ConnectDocumentData> {
     add(data: Partial<T>, id?: string): Promise<ConnectDocumentReference<T>>;
@@ -14,8 +14,8 @@ export interface ConnectCollectionReference<T extends ConnectDocumentData> {
     fromStartAfter(startAt: ConnectDocumentReference<T>): ConnectCollectionReference<T>;
     withConverter(converter: {
         toFirestore: (data: T) => ConnectDocumentData<T>;
-        fromFirestore: (snap: ConnectDocumentSnapshot<T>) => T;
+        fromFirestore: (snapshot: ConnectDocumentSnapshot<T>, options?: ConnectSnapshotOptions) => T;
     }): ConnectCollectionReference<T>;
     getDoc(id?: string): ConnectDocumentReference<T>;
-    getDocs(): Promise<ConnectQuerySnapshop<T>>;
+    getDocs(): Promise<ConnectQuerySnapshot<T>>;
 }

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

@@ -1,6 +1,5 @@
 import { Firestore } from 'firebase/firestore';
-import { ConnectDocumentData, ConnectQuerySnapshop, ConnectWhereOption } from '../types';
-import { ConnectDocumentSnapshot } from '../types/connect-firestore/connect-document-snapshop.type';
+import { ConnectDocumentData, ConnectDocumentSnapshot, ConnectQuerySnapshot, ConnectSnapshotOptions, ConnectWhereOption } from '../types';
 import { ConnectCollectionReference } from './connect-collection-reference';
 import { ConnectDocumentReference } from './connect-document-reference';
 export declare class ConnectCollectionService<T extends ConnectDocumentData> implements ConnectCollectionReference<T> {
@@ -12,9 +11,10 @@ export declare class ConnectCollectionService<T extends ConnectDocumentData> imp
     private offsetBy;
     private statingAt;
     private startingAfter;
+    private converter;
     constructor(path: string, firestore: Firestore);
     add(data: T, id?: string): Promise<ConnectDocumentReference<T>>;
-    getDocs(): Promise<ConnectQuerySnapshop<T>>;
+    getDocs(): Promise<ConnectQuerySnapshot<T>>;
     getDoc(id?: string): ConnectDocumentReference<T>;
     where(attribute: string, operator: ConnectWhereOption, value: any): ConnectCollectionReference<T>;
     order(attribute: string, order: 'asc' | 'desc'): ConnectCollectionReference<T>;
@@ -25,8 +25,8 @@ export declare class ConnectCollectionService<T extends ConnectDocumentData> imp
     fromStartAfter(startingAt: number): ConnectCollectionReference<T>;
     fromStartAfter(startingAt: ConnectDocumentReference<T>): ConnectCollectionReference<T>;
     withConverter(params: {
-        toFirestore: (data: T) => T;
-        fromFirestore: (snapshot: ConnectDocumentSnapshot<T>) => T;
+        toFirestore: (data: T) => ConnectDocumentData<T>;
+        fromFirestore: (snapshot: ConnectDocumentSnapshot, options?: ConnectSnapshotOptions) => T;
     }): ConnectCollectionReference<T>;
     private save;
 }

package/src/infra/firebase/firestore/services/connect-document-reference.d.ts

@@ -1,12 +1,12 @@
 import { ConnectDocumentData } from '../types/connect-firestore/connect-document-data.type';
-import { ConnectDocumentSnapshot } from '../types/connect-firestore/connect-document-snapshop.type';
+import { ConnectDocumentSnapshot, ConnectSnapshotOptions } from '../types/connect-firestore/connect-document-snapshot.type';
 export interface ConnectDocumentReference<T extends ConnectDocumentData> {
     get(): Promise<ConnectDocumentSnapshot<T>>;
     getId(): string;
     save(data: T): Promise<ConnectDocumentReference<T>>;
     delete(): Promise<void>;
     withConverter(converter: {
-        toFirestore: (data: T) => T;
-        fromFirestore: (snap: ConnectDocumentSnapshot<T>) => T;
+        toFirestore: (data: T) => ConnectDocumentData<T>;
+        fromFirestore: (snapshot: ConnectDocumentSnapshot<T>, options?: ConnectSnapshotOptions) => T;
     }): ConnectDocumentReference<T>;
 }

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

@@ -1,5 +1,5 @@
 import { Firestore } from 'firebase/firestore';
-import { ConnectDocumentData, ConnectDocumentSnapshot } from '../types';
+import { ConnectDocumentData, ConnectDocumentSnapshot, ConnectSnapshotOptions } from '../types';
 import { ConnectDocumentReference } from './connect-document-reference';
 export declare class ConnectDocumentService<T extends ConnectDocumentData> implements ConnectDocumentReference<T> {
     private path;
@@ -11,7 +11,7 @@ export declare class ConnectDocumentService<T extends ConnectDocumentData> imple
     save(data: T): Promise<ConnectDocumentReference<T>>;
     delete(): Promise<void>;
     withConverter(params: {
-        toFirestore: (data: T) => T;
-        fromFirestore: (snapshot: ConnectDocumentSnapshot<T>) => T;
+        toFirestore: (data: T) => ConnectDocumentData<T>;
+        fromFirestore: (snapshot: ConnectDocumentSnapshot<T>, options?: ConnectSnapshotOptions) => T;
     }): ConnectDocumentReference<T>;
 }

package/src/infra/firebase/firestore/types/connect-firestore/{connect-document-snapshop.type.d.ts → connect-document-snapshot.type.d.ts}

@@ -1,7 +1,10 @@
 import { ConnectDocumentData } from './connect-document-data.type';
+export type ConnectSnapshotOptions = {
+    serverTimestamps?: 'estimate' | 'previous' | 'none';
+};
 export type ConnectDocumentSnapshot<T extends ConnectDocumentData = ConnectDocumentData> = {
     exists(): boolean;
-    data(): T | undefined;
+    data(options?: ConnectSnapshotOptions): T;
     get(fieldPath: string): any;
     id: string;
 };

package/src/infra/firebase/firestore/types/connect-firestore/connect-query-snapshot.type.d.ts

@@ -1,6 +1,6 @@
 import { ConnectDocumentData } from './connect-document-data.type';
-import { ConnectDocumentSnapshot } from './connect-document-snapshop.type';
-export type ConnectQuerySnapshop<T extends ConnectDocumentData> = {
+import { ConnectDocumentSnapshot } from './connect-document-snapshot.type';
+export type ConnectQuerySnapshot<T extends ConnectDocumentData> = {
     docs: ConnectDocumentSnapshot<T>[];
     size: number;
     empty: boolean;

package/src/infra/firebase/firestore/types/connect-firestore/index.d.ts

@@ -1,4 +1,4 @@
 export * from './connect-document-data.type';
-export * from './connect-document-snapshop.type';
+export * from './connect-document-snapshot.type';
 export * from './connect-query-snapshot.type';
 export * from './connect-where-option.type';

package/teste2.d.ts

@@ -0,0 +1 @@
+export {};