@wix/headless-bookings 0.0.62 → 0.0.64

package/dist/services/time-slot-list/time-slot-list.js

@@ -19,15 +19,12 @@ function getClientTimezone() {
 // Service Implementation
 // ============================================================================
 export const TimeSlotListService = implementService.withConfig()(TimeSlotListServiceDefinition, ({ getService, config }) => {
-    // Get dependent services
     const signalsService = getService(SignalsServiceDefinition);
     const bookingService = getService(BookingServiceDefinition);
-    // Initialize Signals
     const timeSlotsSignal = signalsService.signal(config.timeSlots || []);
     const isLoadingSignal = signalsService.signal(false);
     const errorSignal = signalsService.signal(null);
     const hasMoreSignal = signalsService.signal(false);
-    // Internal only - viewMode is auto-detected based on service types
     const viewModeSignal = signalsService.signal(ViewMode.CLASSIC);
     const dateRangeSignal = signalsService.signal({
         start: config.startDate,
@@ -201,8 +198,7 @@ export const TimeSlotListService = implementService.withConfig()(TimeSlotListSer
             : undefined;
     });
     let isFirstRun = true;
-    signalsService.effect(() => {
-        // Dependencies - trigger refetch when these change
+    const dispose = signalsService.effect(() => {
         dateRangeSignal.get();
         bookingService.timezone.get();
         bookingService.location.get();
@@ -215,16 +211,12 @@ export const TimeSlotListService = implementService.withConfig()(TimeSlotListSer
         }
         fetchTimeSlots();
     });
-    // Return service API
     return {
-        // State Signals
         timeSlots: timeSlotsSignal,
         isLoading: isLoadingSignal,
         error: errorSignal,
         hasMore: hasMoreSignal,
-        // Configuration Signals (viewMode is internal only)
         dateRange: dateRangeSignal,
-        // Actions
         actions: {
             selectSlot,
             selectStaffMember,
@@ -232,6 +224,7 @@ export const TimeSlotListService = implementService.withConfig()(TimeSlotListSer
             loadMore,
             setDateRange,
         },
+        dispose,
     };
 });
 /**

package/dist/utils/navigation.d.ts

@@ -1,7 +1,17 @@
 import type { ServiceSelectionTimeSlot } from '../services/booking/booking.js';
 import type { Service } from '@wix/auto_sdk_bookings_services';
 export declare function navigateToCheckout(checkoutId: string): Promise<void>;
-export declare function navigateToBookingForm({ timeSlot, service, }: {
+/**
+ * Cleans a redirect URL by extracting the redirectUrl param and removing:
+ * - The 'origin' query parameter
+ * - Any query parameters with empty values
+ *
+ * @param fullUrl - The full URL containing the redirectUrl query parameter
+ * @returns The cleaned redirect URL
+ */
+export declare function cleanRedirectUrl(fullUrl: string): string;
+export declare function navigateToBookingForm({ timeSlot, service, timezone, }: {
     timeSlot: ServiceSelectionTimeSlot;
     service: Service;
+    timezone?: string;
 }): Promise<void>;

package/dist/utils/navigation.js

@@ -27,7 +27,32 @@ function mapTimeSlotLocationToBookingLocation(timeSlotLocationType) {
             return BookingsLocationType.UNDEFINED;
     }
 }
-export async function navigateToBookingForm({ timeSlot, service, }) {
+/**
+ * Cleans a redirect URL by extracting the redirectUrl param and removing:
+ * - The 'origin' query parameter
+ * - Any query parameters with empty values
+ *
+ * @param fullUrl - The full URL containing the redirectUrl query parameter
+ * @returns The cleaned redirect URL
+ */
+export function cleanRedirectUrl(fullUrl) {
+    const url = new URL(fullUrl);
+    const redirectUrl = url.searchParams.get('redirectUrl');
+    if (!redirectUrl) {
+        return fullUrl;
+    }
+    const redirectParsed = new URL(redirectUrl);
+    // Remove origin param
+    redirectParsed.searchParams.delete('origin');
+    // Remove empty params
+    for (const [key, value] of [...redirectParsed.searchParams.entries()]) {
+        if (!value) {
+            redirectParsed.searchParams.delete(key);
+        }
+    }
+    return redirectParsed.toString();
+}
+export async function navigateToBookingForm({ timeSlot, service, timezone, }) {
     if (!timeSlot) {
         throw new Error('No time slot provided');
     }
@@ -36,30 +61,36 @@ export async function navigateToBookingForm({ timeSlot, service, }) {
     }
     // Get the first resource (staff member) if available
     const selectedResource = timeSlot.resources?.[0];
+    // Destructure to exclude properties we handle separately (location has incompatible types)
+    const { location: _location, resources: _resources, ...restTimeSlot } = timeSlot;
+    // Build slot object, only including optional properties when they have values
+    const slot = {
+        ...restTimeSlot,
+        scheduleId: timeSlot.scheduleId,
+        startDate: timeSlot.startDate,
+        endDate: timeSlot.endDate,
+        ...(service._id && { serviceId: service._id }),
+        ...(timezone && { timezone }),
+        ...(selectedResource && {
+            resource: {
+                _id: selectedResource._id,
+                name: selectedResource.name,
+            },
+        }),
+        ...(timeSlot.location && {
+            location: {
+                _id: timeSlot.location._id,
+                name: timeSlot.location.name,
+                formattedAddress: timeSlot.location.formattedAddress,
+                locationType: mapTimeSlotLocationToBookingLocation(timeSlot.location.locationType),
+            },
+        }),
+    };
     const { redirectSession } = await redirects.createRedirectSession({
         bookingsCheckout: {
             slotAvailability: {
                 bookable: true,
-                slot: {
-                    ...timeSlot,
-                    serviceId: service._id ?? undefined,
-                    scheduleId: timeSlot.scheduleId,
-                    startDate: timeSlot.startDate,
-                    endDate: timeSlot.endDate,
-                    timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-                    resource: selectedResource
-                        ? {
-                            _id: selectedResource._id,
-                            name: selectedResource.name,
-                        }
-                        : undefined,
-                    location: {
-                        _id: timeSlot.location?._id,
-                        name: timeSlot.location?.name,
-                        formattedAddress: timeSlot.location?.formattedAddress,
-                        locationType: mapTimeSlotLocationToBookingLocation(timeSlot.location?.locationType),
-                    },
-                },
+                slot,
             },
         },
         callbacks: {
@@ -67,7 +98,7 @@ export async function navigateToBookingForm({ timeSlot, service, }) {
         },
     });
     if (redirectSession?.fullUrl) {
-        window.location.href = redirectSession.fullUrl;
+        window.location.href = cleanRedirectUrl(redirectSession.fullUrl);
     }
     else {
         throw new Error('Failed to create redirect session');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/headless-bookings",
-  "version": "0.0.62",
+  "version": "0.0.64",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -72,5 +72,5 @@
       "groupId": "com.wixpress.headless-components"
     }
   },
-  "falconPackageHash": "a7ee3575b035403add534d60cde7f1bc57053324c9c08aa82811ca8b"
+  "falconPackageHash": "8011be143d4873e29873f1d8216f8638894a024f49336de8a215b152"
 }