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

package/index.cjs.js

@@ -2602,21 +2602,37 @@ class ProductsIndex {
             _source: fields,
             query: {
                 bool: {
-                    must: {
-                        multi_match: {
-                            query: `${searchTerm}`,
-                            fields: ['name', 'name.folded', 'name.search', 'description', 'brand'],
-                            fuzziness: 2,
+                    should: [
+                        {
+                            multi_match: {
+                                query: `${searchTerm}`,
+                                fields: ['name', 'name.folded', 'name.search'],
+                                operator: 'AND',
+                            },
                         },
-                    },
-                    should: {
-                        match_phrase_prefix: {
-                            'name.search': {
+                        {
+                            match_phrase: {
+                                name: {
+                                    query: `${searchTerm}`,
+                                    boost: 2,
+                                },
+                            },
+                        },
+                        {
+                            match: {
+                                brand: {
+                                    query: `${searchTerm}`,
+                                },
+                            },
+                        },
+                        {
+                            multi_match: {
                                 query: `${searchTerm}`,
-                                slop: 10,
+                                fields: ['name', 'name.folded', 'name.search'],
+                                operator: 'OR',
                             },
                         },
-                    },
+                    ],
                     filter,
                 },
             },
@@ -3621,6 +3637,22 @@ class ShopSettingsFirestoreRepository extends withCrudFirestore(withHelpers(with
     }
 }
 
+class ConnectBaseDocumentSnapshot {
+    constructor(connectDocumentSnapshot) {
+        this.connectDocumentSnapshot = connectDocumentSnapshot;
+        this.id = connectDocumentSnapshot.id;
+    }
+    isNotEmpty() {
+        return this.connectDocumentSnapshot.exists();
+    }
+    data(options) {
+        return this.connectDocumentSnapshot.data(options);
+    }
+    get(fieldPath) {
+        return this.connectDocumentSnapshot.get(fieldPath);
+    }
+}
+
 class ConnectDocumentService {
     constructor(path, firestore$1) {
         this.path = path;
@@ -3633,13 +3665,12 @@ class ConnectDocumentService {
         });
     }
     async get() {
-        return await firestore.getDoc(this.reference);
+        return new ConnectBaseDocumentSnapshot(await firestore.getDoc(this.reference));
     }
     getId() {
         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 +3682,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(new ConnectBaseDocumentSnapshot(snapshot), options),
+        });
         return this;
     }
 }
@@ -3670,7 +3704,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 = [
@@ -3681,10 +3715,14 @@ class ConnectCollectionService {
             ...(this.statingAt ? [this.statingAt] : []),
             ...(this.startingAfter ? [this.startingAfter] : []),
         ];
-        return firestore.getDocs(firestore.query(this.reference, ...constraints));
+        return firestore.getDocs(firestore.query(this.reference, ...constraints)).then((docs) => ({
+            empty: docs.empty,
+            size: docs.size,
+            docs: docs.docs.map((doc) => new ConnectBaseDocumentSnapshot(doc)),
+        }));
     }
     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 +3749,14 @@ class ConnectCollectionService {
         return this;
     }
     withConverter(params) {
-        this.reference = this.reference.withConverter(params);
+        this.converter = params;
+        this.reference = this.reference.withConverter({
+            toFirestore: (data) => params.toFirestore(data),
+            fromFirestore: (snapshot, options) => params.fromFirestore(new ConnectBaseDocumentSnapshot(snapshot), options),
+        });
         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);
@@ -6002,6 +6043,7 @@ exports.CheckoutFirestoreRepository = CheckoutFirestoreRepository;
 exports.CheckoutSubscription = CheckoutSubscription;
 exports.CheckoutSubscriptionFirestoreRepository = CheckoutSubscriptionFirestoreRepository;
 exports.ClassNameHelper = ClassNameHelper;
+exports.ConnectBaseDocumentSnapshot = ConnectBaseDocumentSnapshot;
 exports.ConnectCollectionService = ConnectCollectionService;
 exports.ConnectDocumentService = ConnectDocumentService;
 exports.ConnectFirestoreService = ConnectFirestoreService;

package/index.esm.js

@@ -2578,21 +2578,37 @@ class ProductsIndex {
             _source: fields,
             query: {
                 bool: {
-                    must: {
-                        multi_match: {
-                            query: `${searchTerm}`,
-                            fields: ['name', 'name.folded', 'name.search', 'description', 'brand'],
-                            fuzziness: 2,
+                    should: [
+                        {
+                            multi_match: {
+                                query: `${searchTerm}`,
+                                fields: ['name', 'name.folded', 'name.search'],
+                                operator: 'AND',
+                            },
                         },
-                    },
-                    should: {
-                        match_phrase_prefix: {
-                            'name.search': {
+                        {
+                            match_phrase: {
+                                name: {
+                                    query: `${searchTerm}`,
+                                    boost: 2,
+                                },
+                            },
+                        },
+                        {
+                            match: {
+                                brand: {
+                                    query: `${searchTerm}`,
+                                },
+                            },
+                        },
+                        {
+                            multi_match: {
                                 query: `${searchTerm}`,
-                                slop: 10,
+                                fields: ['name', 'name.folded', 'name.search'],
+                                operator: 'OR',
                             },
                         },
-                    },
+                    ],
                     filter,
                 },
             },
@@ -3597,6 +3613,22 @@ class ShopSettingsFirestoreRepository extends withCrudFirestore(withHelpers(with
     }
 }
 
+class ConnectBaseDocumentSnapshot {
+    constructor(connectDocumentSnapshot) {
+        this.connectDocumentSnapshot = connectDocumentSnapshot;
+        this.id = connectDocumentSnapshot.id;
+    }
+    isNotEmpty() {
+        return this.connectDocumentSnapshot.exists();
+    }
+    data(options) {
+        return this.connectDocumentSnapshot.data(options);
+    }
+    get(fieldPath) {
+        return this.connectDocumentSnapshot.get(fieldPath);
+    }
+}
+
 class ConnectDocumentService {
     constructor(path, firestore) {
         this.path = path;
@@ -3609,13 +3641,12 @@ class ConnectDocumentService {
         });
     }
     async get() {
-        return await getDoc(this.reference);
+        return new ConnectBaseDocumentSnapshot(await getDoc(this.reference));
     }
     getId() {
         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 +3658,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(new ConnectBaseDocumentSnapshot(snapshot), options),
+        });
         return this;
     }
 }
@@ -3646,7 +3680,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 = [
@@ -3657,10 +3691,14 @@ class ConnectCollectionService {
             ...(this.statingAt ? [this.statingAt] : []),
             ...(this.startingAfter ? [this.startingAfter] : []),
         ];
-        return getDocs(query(this.reference, ...constraints));
+        return getDocs(query(this.reference, ...constraints)).then((docs) => ({
+            empty: docs.empty,
+            size: docs.size,
+            docs: docs.docs.map((doc) => new ConnectBaseDocumentSnapshot(doc)),
+        }));
     }
     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 +3725,14 @@ class ConnectCollectionService {
         return this;
     }
     withConverter(params) {
-        this.reference = this.reference.withConverter(params);
+        this.converter = params;
+        this.reference = this.reference.withConverter({
+            toFirestore: (data) => params.toFirestore(data),
+            fromFirestore: (snapshot, options) => params.fromFirestore(new ConnectBaseDocumentSnapshot(snapshot), options),
+        });
         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);
@@ -5833,4 +5874,4 @@ class WishlistHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGr
     }
 }
 
-export { AccessoryImportances, Address, Area, Authentication, AuthenticationFirebaseAuthService, AxiosAdapter, Base, BaseModel, BeardProblems, BeardSizes, BeautyProductImportances, BeautyProfile, BeautyQuestionsHelper, BillingStatus, BodyProblems, BodyShapes, BodyTattoos, Buy2Win, Buy2WinFirestoreRepository, Campaign, CampaignBanner, CampaignDashboard, CampaignDashboardFirestoreRepository, CampaignHashtag, CampaignHashtagFirestoreRepository, Category, CategoryCollectionChildren, CategoryCollectionChildrenHasuraGraphQLRepository, CategoryFilter, CategoryFilterHasuraGraphQLRepository, CategoryFirestoreRepository, CategoryHasuraGraphQL, CategoryHasuraGraphQLRepository, Checkout, CheckoutFirestoreRepository, CheckoutSubscription, CheckoutSubscriptionFirestoreRepository, CheckoutTypes, ClassNameHelper, ConnectCollectionService, ConnectDocumentService, ConnectFirestoreService, Coupon, CouponFirestoreRepository, CouponSubtypes, CouponTypes, Debug, DebugDecoratorHelper, DebugHelper, DebugNamespaces, DuplicatedResultsError, Edition, EditionStatus, Exclusivities, FaceSkinOilinesses, FaceSkinProblems, FaceSkinTones, FamilyIncomes, Filter, FilterHasuraGraphQLRepository, FilterOption, FilterOptionHasuraGraphQLRepository, FilterType, FirebaseFileUploaderService, FragranceImportances, GenderDestination, HairColors, HairProblems, HairStrands, HairTypes, Home, HomeFirestoreRepository, InvalidArgumentError, KitProduct, KitProductHasuraGraphQL, Lead, LeadFirestoreRepository, LegacyOrderFirestoreRepository, LineItem, Log, Logger, NotFoundError, OfficePosition, Order, OrderFirestoreRepository, OrderStatus, Payment, PaymentFirestoreRepository, PaymentType, Plans, Product, ProductFirestoreRepository, ProductHasuraGraphQL, ProductHasuraGraphQLRepository, ProductReviews, ProductReviewsHasuraGraphQLRepository, ProductSpents, ProductVariantFirestoreRepository, ProductsIndex, QuestionsFilters, RecoveryPassword, ReflectHelper, Register, RegisterFirebaseAuthService, RequiredArgumentError, RoundProductPricesHelper, ShippingMethod, ShopMenu, ShopMenuFirestoreRepository, ShopPageName, ShopSettings, ShopSettingsFirestoreRepository, Shops, SignInMethods, SignOut, Status, Subscription, SubscriptionEditionFirestoreRepository, SubscriptionFirestoreRepository, SubscriptionMaterialization, SubscriptionMaterializationFirestoreRepository, SubscriptionPayment, SubscriptionPaymentFirestoreRepository, SubscriptionPlan, SubscriptionPlanFirestoreRepository, SubscriptionProductFirestoreRepository, SubscriptionSummary, SubscriptionSummaryFirestoreRepository, Trace, UnauthorizedError, UpdateOptionActions, UpdateUserImage, User, UserAddress, UserAddressFirestoreRepository, UserAlreadyRegisteredError, UserBeautyProfileFirestoreRepository, UserFirestoreRepository, UserPaymentMethod, UserPaymentMethodFirestoreRepository, UserType, Variant, VariantHasuraGraphQL, VariantHasuraGraphQLRepository, WeakPasswordError, Where, Wishlist, WishlistHasuraGraphQLRepository, is, isDebuggable, isUUID, parseDateTime, withCreateFirestore, withCreateHasuraGraphQL, withCrudFirestore, withCrudHasuraGraphQL, withDeleteFirestore, withDeleteHasuraGraphQL, withFindFirestore, withFindHasuraGraphQL, withFirestore, withGetFirestore, withGetHasuraGraphQL, withHasuraGraphQL, withHelpers, withSubCollection, withUpdateFirestore, withUpdateHasuraGraphQL };
+export { AccessoryImportances, Address, Area, Authentication, AuthenticationFirebaseAuthService, AxiosAdapter, Base, BaseModel, BeardProblems, BeardSizes, BeautyProductImportances, BeautyProfile, BeautyQuestionsHelper, BillingStatus, BodyProblems, BodyShapes, BodyTattoos, Buy2Win, Buy2WinFirestoreRepository, Campaign, CampaignBanner, CampaignDashboard, CampaignDashboardFirestoreRepository, CampaignHashtag, CampaignHashtagFirestoreRepository, Category, CategoryCollectionChildren, CategoryCollectionChildrenHasuraGraphQLRepository, CategoryFilter, CategoryFilterHasuraGraphQLRepository, CategoryFirestoreRepository, CategoryHasuraGraphQL, CategoryHasuraGraphQLRepository, Checkout, CheckoutFirestoreRepository, CheckoutSubscription, CheckoutSubscriptionFirestoreRepository, CheckoutTypes, ClassNameHelper, ConnectBaseDocumentSnapshot, ConnectCollectionService, ConnectDocumentService, ConnectFirestoreService, Coupon, CouponFirestoreRepository, CouponSubtypes, CouponTypes, Debug, DebugDecoratorHelper, DebugHelper, DebugNamespaces, DuplicatedResultsError, Edition, EditionStatus, Exclusivities, FaceSkinOilinesses, FaceSkinProblems, FaceSkinTones, FamilyIncomes, Filter, FilterHasuraGraphQLRepository, FilterOption, FilterOptionHasuraGraphQLRepository, FilterType, FirebaseFileUploaderService, FragranceImportances, GenderDestination, HairColors, HairProblems, HairStrands, HairTypes, Home, HomeFirestoreRepository, InvalidArgumentError, KitProduct, KitProductHasuraGraphQL, Lead, LeadFirestoreRepository, LegacyOrderFirestoreRepository, LineItem, Log, Logger, NotFoundError, OfficePosition, Order, OrderFirestoreRepository, OrderStatus, Payment, PaymentFirestoreRepository, PaymentType, Plans, Product, ProductFirestoreRepository, ProductHasuraGraphQL, ProductHasuraGraphQLRepository, ProductReviews, ProductReviewsHasuraGraphQLRepository, ProductSpents, ProductVariantFirestoreRepository, ProductsIndex, QuestionsFilters, RecoveryPassword, ReflectHelper, Register, RegisterFirebaseAuthService, RequiredArgumentError, RoundProductPricesHelper, ShippingMethod, ShopMenu, ShopMenuFirestoreRepository, ShopPageName, ShopSettings, ShopSettingsFirestoreRepository, Shops, SignInMethods, SignOut, Status, Subscription, SubscriptionEditionFirestoreRepository, SubscriptionFirestoreRepository, SubscriptionMaterialization, SubscriptionMaterializationFirestoreRepository, SubscriptionPayment, SubscriptionPaymentFirestoreRepository, SubscriptionPlan, SubscriptionPlanFirestoreRepository, SubscriptionProductFirestoreRepository, SubscriptionSummary, SubscriptionSummaryFirestoreRepository, Trace, UnauthorizedError, UpdateOptionActions, UpdateUserImage, User, UserAddress, UserAddressFirestoreRepository, UserAlreadyRegisteredError, UserBeautyProfileFirestoreRepository, UserFirestoreRepository, UserPaymentMethod, UserPaymentMethodFirestoreRepository, UserType, Variant, VariantHasuraGraphQL, VariantHasuraGraphQLRepository, WeakPasswordError, Where, Wishlist, WishlistHasuraGraphQLRepository, is, isDebuggable, isUUID, parseDateTime, withCreateFirestore, withCreateHasuraGraphQL, withCrudFirestore, withCrudHasuraGraphQL, withDeleteFirestore, withDeleteHasuraGraphQL, withFindFirestore, withFindHasuraGraphQL, withFirestore, withGetFirestore, withGetHasuraGraphQL, withHasuraGraphQL, withHelpers, withSubCollection, withUpdateFirestore, withUpdateHasuraGraphQL };

package/package.json

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

package/src/domain/shop-settings/models/shop-settings.d.ts

@@ -9,5 +9,6 @@ export declare class ShopSettings extends BaseModel<ShopSettings> {
     descriptionMeta?: string;
     titleMeta?: string;
     imageMeta?: string;
+    hasMultiples?: boolean;
     static get identifiersFields(): GenericIdentifier[];
 }

package/src/domain/shopping/models/subscription/checkout.d.ts

@@ -11,6 +11,7 @@ export declare class CheckoutSubscription extends BaseModel<CheckoutSubscription
     userId?: string;
     discount?: number;
     subTotalPrice?: number;
+    shippingPrice?: number;
     totalPrice?: number;
     shippingAddress: UserAddress;
     billingAddress?: UserAddress;

package/src/infra/firebase/firestore/index.d.ts

@@ -2,3 +2,4 @@ export * from './mixins';
 export * from './repositories';
 export * from './services';
 export * from './types';
+export * from './vo';

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<T>, 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;
+    isNotEmpty(): boolean;
+    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/src/infra/firebase/firestore/vo/connectBaseDocumentSnapshot.vo.d.ts

@@ -0,0 +1,10 @@
+import { DocumentSnapshot } from 'firebase/firestore';
+import { ConnectDocumentData, ConnectDocumentSnapshot, ConnectSnapshotOptions } from '../types';
+export declare class ConnectBaseDocumentSnapshot<T extends ConnectDocumentData = ConnectDocumentData> implements ConnectDocumentSnapshot<T> {
+    private readonly connectDocumentSnapshot;
+    id: string;
+    constructor(connectDocumentSnapshot: DocumentSnapshot<T>);
+    isNotEmpty(): boolean;
+    data(options?: ConnectSnapshotOptions): T;
+    get(fieldPath: string): any;
+}

package/src/infra/firebase/firestore/vo/index.d.ts

@@ -0,0 +1 @@
+export * from './connectBaseDocumentSnapshot.vo';