@infrab4a/connect 4.4.0-beta.8 → 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,7 +3665,7 @@ class ConnectDocumentService {
         });
     }
     async get() {
-        return await firestore.getDoc(this.reference);
+        return new ConnectBaseDocumentSnapshot(await firestore.getDoc(this.reference));
     }
     getId() {
         return this.reference.id;
@@ -3652,7 +3684,7 @@ class ConnectDocumentService {
     withConverter(params) {
         this.reference = this.reference.withConverter({
             toFirestore: (data) => params.toFirestore(data),
-            fromFirestore: (snapshot, options) => params.fromFirestore(snapshot, options),
+            fromFirestore: (snapshot, options) => params.fromFirestore(new ConnectBaseDocumentSnapshot(snapshot), options),
         });
         return this;
     }
@@ -3683,7 +3715,11 @@ 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.converter);
@@ -3713,11 +3749,11 @@ class ConnectCollectionService {
         return this;
     }
     withConverter(params) {
-        this.converter = {
+        this.converter = params;
+        this.reference = this.reference.withConverter({
             toFirestore: (data) => params.toFirestore(data),
-            fromFirestore: (snapshot, options) => params.fromFirestore(snapshot, options),
-        };
-        this.reference = this.reference.withConverter(this.converter);
+            fromFirestore: (snapshot, options) => params.fromFirestore(new ConnectBaseDocumentSnapshot(snapshot), options),
+        });
         return this;
     }
     async save(data, id) {
@@ -6007,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,7 +3641,7 @@ class ConnectDocumentService {
         });
     }
     async get() {
-        return await getDoc(this.reference);
+        return new ConnectBaseDocumentSnapshot(await getDoc(this.reference));
     }
     getId() {
         return this.reference.id;
@@ -3628,7 +3660,7 @@ class ConnectDocumentService {
     withConverter(params) {
         this.reference = this.reference.withConverter({
             toFirestore: (data) => params.toFirestore(data),
-            fromFirestore: (snapshot, options) => params.fromFirestore(snapshot, options),
+            fromFirestore: (snapshot, options) => params.fromFirestore(new ConnectBaseDocumentSnapshot(snapshot), options),
         });
         return this;
     }
@@ -3659,7 +3691,11 @@ 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.converter);
@@ -3689,11 +3725,11 @@ class ConnectCollectionService {
         return this;
     }
     withConverter(params) {
-        this.converter = {
+        this.converter = params;
+        this.reference = this.reference.withConverter({
             toFirestore: (data) => params.toFirestore(data),
-            fromFirestore: (snapshot, options) => params.fromFirestore(snapshot, options),
-        };
-        this.reference = this.reference.withConverter(this.converter);
+            fromFirestore: (snapshot, options) => params.fromFirestore(new ConnectBaseDocumentSnapshot(snapshot), options),
+        });
         return this;
     }
     async save(data, id) {
@@ -5838,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.8",
+  "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.service.d.ts

@@ -26,7 +26,7 @@ export declare class ConnectCollectionService<T extends ConnectDocumentData> imp
     fromStartAfter(startingAt: ConnectDocumentReference<T>): ConnectCollectionReference<T>;
     withConverter(params: {
         toFirestore: (data: T) => ConnectDocumentData<T>;
-        fromFirestore: (snapshot: ConnectDocumentSnapshot, options?: ConnectSnapshotOptions) => T;
+        fromFirestore: (snapshot: ConnectDocumentSnapshot<T>, options?: ConnectSnapshotOptions) => T;
     }): ConnectCollectionReference<T>;
     private save;
 }

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

@@ -3,7 +3,7 @@ export type ConnectSnapshotOptions = {
     serverTimestamps?: 'estimate' | 'previous' | 'none';
 };
 export type ConnectDocumentSnapshot<T extends ConnectDocumentData = ConnectDocumentData> = {
-    exists(): boolean;
+    isNotEmpty(): boolean;
     data(options?: ConnectSnapshotOptions): T;
     get(fieldPath: string): any;
     id: string;

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';

package/teste2.d.ts

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