@wix/headless-restaurants-olo 0.0.33 → 0.0.35

package/dist/utils/date-utils.js

@@ -0,0 +1,297 @@
+import { EntitiesDayOfWeek as DayOfWeek, } from '@wix/auto_sdk_restaurants_fulfillment-methods';
+import { i18n, settings } from '@wix/essentials';
+// Re-export types for convenience
+export { DayOfWeek };
+const dateConfig = {
+    timezone: settings.getTimezone(),
+    locale: i18n.getLocale(),
+};
+/**
+ * Get the current locale
+ * Uses the configured locale, falls back to i18n.getLocale()
+ *
+ * @returns The current locale string
+ */
+export const getLocale = () => {
+    return dateConfig.locale;
+};
+/**
+ * Get the current timezone
+ * Uses the configured timezone, falls back to undefined (browser default)
+ *
+ * @returns The current timezone string or undefined
+ */
+export const getTimezone = () => {
+    return dateConfig.timezone;
+};
+/**
+ * Mapping of day of week enum to numeric value (1-7, Monday-Sunday)
+ */
+export const DAY_OF_WEEK = {
+    [DayOfWeek.MON]: 1,
+    [DayOfWeek.TUE]: 2,
+    [DayOfWeek.WED]: 3,
+    [DayOfWeek.THU]: 4,
+    [DayOfWeek.FRI]: 5,
+    [DayOfWeek.SAT]: 6,
+    [DayOfWeek.SUN]: 7,
+};
+/**
+ * Extract date/time parts from a Date in a specific timezone
+ * @param date - The source Date object
+ * @param timezone - The target timezone (e.g., 'America/New_York'). Defaults to configured timezone.
+ * @param locale - The locale for formatting (e.g., 'en-US'). Defaults to configured locale.
+ * @param includeTime - Whether to include time parts (hour, minute, second)
+ * @returns Object containing the extracted date/time parts
+ */
+export const getDatePartsInTimezone = (date, timezone, locale, includeTime = false) => {
+    const tz = timezone ?? getTimezone();
+    const loc = locale ?? getLocale();
+    const options = {
+        timeZone: tz,
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
+        ...(includeTime && {
+            hour: '2-digit',
+            minute: '2-digit',
+            second: '2-digit',
+            hour12: false,
+        }),
+    };
+    const parts = new Intl.DateTimeFormat(loc, options).formatToParts(date);
+    return {
+        year: parts.find((p) => p.type === 'year')?.value ?? '1970',
+        month: parts.find((p) => p.type === 'month')?.value ?? '01',
+        day: parts.find((p) => p.type === 'day')?.value ?? '01',
+        ...(includeTime && {
+            hour: parts.find((p) => p.type === 'hour')?.value ?? '00',
+            minute: parts.find((p) => p.type === 'minute')?.value ?? '00',
+            second: parts.find((p) => p.type === 'second')?.value ?? '00',
+        }),
+    };
+};
+/**
+ * Build a Date from date/time parts
+ * @param year - Year string
+ * @param month - Month string (2-digit)
+ * @param day - Day string (2-digit)
+ * @param hour - Hour string (2-digit, optional)
+ * @param minute - Minute string (2-digit, optional)
+ * @param second - Second string (2-digit, optional)
+ * @returns A new Date object
+ */
+export const buildDateFromParts = (year, month, day, hour = '00', minute = '00', second = '00') => {
+    const isoString = `${year}-${month}-${day}T${hour}:${minute}:${second}.000`;
+    return new Date(isoString);
+};
+/**
+ * Convert a TimeOfDay object to a Date object
+ * Creates a Date for today with the specified time in the target timezone.
+ * Equivalent to: DateTime.fromObject({ hour, minute }).setZone(timezone, { keepLocalTime: true })
+ *
+ * @param time - TimeOfDay object with hours and minutes
+ * @param timezone - The target timezone (e.g., 'America/New_York'). Defaults to configured timezone.
+ * @returns A Date object representing the time in the specified timezone
+ */
+export const convertTimeOfDayToDateTime = (time, timezone) => {
+    console.log('timezone', timezone);
+    // const tz = timezone ?? getTimezone();
+    // Create today's date with the specified time in local timezone
+    // This mimics DateTime.fromObject({ hour, minute }) which uses local timezone
+    const localDate = new Date();
+    localDate.setHours(time.hours ?? 0, time.minutes ?? 0, 0, 0);
+    // If no timezone specified, return local time (no zone conversion)
+    // if (!tz) {
+    return localDate;
+    // }
+    // Apply setZone(timezone, { keepLocalTime: true })
+    // This keeps the wall clock time (e.g., "10:30") but changes the timezone
+    // We need to find the UTC time that, when displayed in the target timezone, shows the same wall clock time
+    // Get what localDate looks like in the target timezone
+    // const parts = getDatePartsInTimezone(localDate, tz, undefined, true);
+    // const inTargetTz = buildDateFromParts(
+    //   parts.year,
+    //   parts.month,
+    //   parts.day,
+    //   parts.hour!,
+    //   parts.minute!,
+    //   parts.second!,
+    // );
+    // The offset between localDate and its representation in target timezone
+    // Adding this offset gives us a Date that shows the same wall clock time in target timezone
+    // const offsetMs = localDate.getTime() - inTargetTz.getTime();
+    // return new Date(localDate.getTime() + offsetMs);
+};
+/**
+ * Convert a Date to a Date adjusted for a specific timezone
+ * This is useful when you need to display or compare dates in a specific timezone
+ *
+ * @param date - The source Date object
+ * @param timezone - The target timezone (e.g., 'America/New_York'). Defaults to configured timezone.
+ * @param locale - The locale for formatting (e.g., 'en-US'). Defaults to configured locale.
+ * @returns A new Date object adjusted to represent the same moment in the target timezone
+ */
+export const convertDateToTimezone = (date, timezone, locale) => {
+    const tz = timezone ?? getTimezone();
+    const loc = locale ?? getLocale();
+    if (!tz) {
+        return new Date(date);
+    }
+    const { year, month, day, hour, minute, second } = getDatePartsInTimezone(date, tz, loc, true);
+    return buildDateFromParts(year, month, day, hour, minute, second);
+};
+/**
+ * Format a Date as a localized string for a specific timezone and locale
+ *
+ * @param date - The source Date object
+ * @param timezone - The target timezone (e.g., 'America/New_York'). Defaults to configured timezone.
+ * @param locale - The locale for formatting (e.g., 'en-US'). Defaults to configured locale.
+ * @param options - Additional Intl.DateTimeFormatOptions
+ * @returns A formatted date string
+ */
+export const formatDateInTimezone = (date, timezone, locale, options) => {
+    const tz = timezone ?? getTimezone();
+    const loc = locale ?? getLocale();
+    const formatOptions = {
+        ...options,
+        timeZone: tz,
+    };
+    return date.toLocaleString(loc, formatOptions);
+};
+/**
+ * Check if a time falls within a time range
+ *
+ * @param time - The time to check
+ * @param range - The time range to check against
+ * @param timeZone - The timezone for conversion. Defaults to configured timezone.
+ * @param locale - The locale for formatting. Defaults to configured locale.
+ * @returns True if the time is within the range
+ */
+export const isInTimeRange = (time, range, timeZone) => {
+    const tz = timeZone ?? getTimezone();
+    const startTime = range.startTime
+        ? convertTimeOfDayToDateTime(range.startTime, tz)
+        : time;
+    const endTime = range.endTime
+        ? convertTimeOfDayToDateTime(range.endTime, tz)
+        : time;
+    return (time.getTime() >= startTime.getTime() && time.getTime() <= endTime.getTime());
+};
+/**
+ * Get the current day of week as a number (1-7, Monday-Sunday)
+ * JavaScript's getDay() returns 0 (Sunday) to 6 (Saturday),
+ * this function converts to 1 (Monday) to 7 (Sunday)
+ *
+ * @param date - The date to get the day of week from
+ * @returns The day of week as a number (1-7)
+ */
+export const getDayOfWeekNumber = (date) => {
+    const jsDay = date.getDay();
+    return jsDay === 0 ? 7 : jsDay;
+};
+/**
+ * Format a date as time only (e.g., "10:30 AM")
+ * Uses configured locale and timezone
+ *
+ * @param date - The date to format
+ * @param options - Additional Intl.DateTimeFormatOptions (defaults to hour:numeric, minute:numeric)
+ * @returns A formatted time string, or empty string if date is undefined
+ */
+export const formatTime = (date, options) => {
+    if (!date)
+        return '';
+    const tz = getTimezone();
+    const loc = getLocale();
+    const formatOptions = {
+        hour: 'numeric',
+        minute: 'numeric',
+        ...options,
+        timeZone: tz,
+    };
+    return date.toLocaleString(loc, formatOptions);
+};
+/**
+ * Format a time range as a localized string
+ * If start and end times are the same, returns just the time
+ * Otherwise returns "start - end" format
+ *
+ * @param startTime - The start time
+ * @param endTime - The end time
+ * @param options - Additional Intl.DateTimeFormatOptions (defaults to hour:numeric, minute:numeric, hour12:true)
+ * @returns A formatted time range string
+ */
+export const formatTimeRange = (startTime, endTime, options) => {
+    const tz = getTimezone();
+    const loc = getLocale();
+    const formatOptions = {
+        hour: 'numeric',
+        minute: 'numeric',
+        hour12: true,
+        ...options,
+        timeZone: tz,
+    };
+    const start = startTime.toLocaleString(loc, formatOptions);
+    const end = endTime.toLocaleString(loc, formatOptions);
+    return start === end ? start : `${start} - ${end}`;
+};
+/**
+ * Check if two dates are on the same calendar day
+ * Compares year, month, and day components
+ *
+ * @param date1 - The first date to compare
+ * @param date2 - The second date to compare
+ * @returns True if both dates are on the same calendar day
+ */
+export const isSameDay = (date1, date2) => {
+    return (date1.getFullYear() === date2.getFullYear() &&
+        date1.getMonth() === date2.getMonth() &&
+        date1.getDate() === date2.getDate());
+};
+/**
+ * Get today's date with time set to midnight (00:00:00.000)
+ *
+ * @returns A Date object representing the start of today
+ */
+export const getToday = () => {
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);
+    return today;
+};
+/**
+ * Get a future date with time set to 23:59:59.999
+ *
+ * @param days - The number of days to add to the current date
+ * @returns A Date object representing the end of the future date
+ */
+export const getFutureDate = (days) => {
+    const future = new Date();
+    future.setDate(future.getDate() + days);
+    future.setHours(23, 59, 59, 999);
+    return future;
+};
+/**
+ * Create a Date object from year, month, and day numbers
+ * Adjusts for timezone offset to ensure the date represents the correct local date
+ *
+ * @param year - The year (e.g., 2024)
+ * @param month - The month (1-12, where 1 is January)
+ * @param day - The day of the month (1-31)
+ * @returns A Date object representing midnight on the specified date in local time
+ */
+export const createDateFromYMD = (year, month, day) => {
+    const date = new Date(year, month - 1, day);
+    // Adjust for timezone offset to ensure the date is correct in local time
+    const timezoneOffset = date.getTimezoneOffset() * 60000;
+    return new Date(date.getTime() - timezoneOffset);
+};
+/**
+ * Format a Date as an ISO date string (YYYY-MM-DD)
+ * Useful for HTML date input values and attributes
+ *
+ * @param date - The date to format
+ * @returns A string in YYYY-MM-DD format
+ */
+export const toISODateString = (date) => {
+    return date.toISOString().split('T')[0];
+};

package/dist/utils/fulfillments-utils.d.ts

@@ -3,6 +3,7 @@ import { DispatchesInfo, TimeSlot } from '../types/fulfillments-types.js';
 import { Operation } from '../types/operation.js';
 import * as fulfillemtMethodsSDK from '@wix/auto_sdk_restaurants_fulfillment-methods';
 import { FulfillmentDetails } from '@wix/auto_sdk_restaurants_operations';
+export { convertTimeOfDayToDateTime, convertDateToTimezone, formatDateInTimezone, formatTime, formatTimeRange, getDatePartsInTimezone, buildDateFromParts, isInTimeRange, DAY_OF_WEEK, DayOfWeek, getDayOfWeekNumber, TimeOfDay, TimeOfDayRange, getLocale, getTimezone, } from './date-utils.js';
 /**
  * Format a string with placeholders like {0}, {1}, etc.
  * Similar to C#'s String.Format
@@ -49,8 +50,8 @@ export declare const createTimeRange: (arr: FulfillmentDetails[]) => {
     };
     maxTimeOptions?: undefined;
 };
-export declare const processFulfillments: (fulfillments: fulfillemtMethodsSDK.FulfillmentMethod[], timeSlots: TimeSlot[], operation: Operation) => Promise<{
+export declare const processFulfillments: (fulfillments: fulfillemtMethodsSDK.FulfillmentMethod[], timeSlots: TimeSlot[], operation: Operation) => {
     dispatchesInfo: DispatchesInfo;
     isPickupConfigured: boolean;
     isDeliveryConfigured: boolean;
-} | undefined>;
+} | undefined;

package/dist/utils/fulfillments-utils.js

@@ -1,7 +1,11 @@
 import * as operationsSDK from '@wix/auto_sdk_restaurants_operations';
 import { DispatchType, } from '../types/fulfillments-types.js';
-import { EntitiesDayOfWeek as DayOfWeek, } from '@wix/auto_sdk_restaurants_fulfillment-methods';
 import { FulfillmentTimeType, } from '@wix/auto_sdk_restaurants_operations';
+import { DAY_OF_WEEK, isInTimeRange, getDayOfWeekNumber, getLocale, convertDateToTimezone, } from './date-utils.js';
+// Re-export date utilities for convenience
+export { convertTimeOfDayToDateTime, convertDateToTimezone, formatDateInTimezone, formatTime, formatTimeRange, getDatePartsInTimezone, buildDateFromParts, isInTimeRange, DAY_OF_WEEK, DayOfWeek, getDayOfWeekNumber, 
+// Locale & timezone utilities
+getLocale, getTimezone, } from './date-utils.js';
 /**
  * Format a string with placeholders like {0}, {1}, etc.
  * Similar to C#'s String.Format
@@ -150,6 +154,8 @@ export const processFulfillmentTimeSlotByOperationList = (operationTimeSlot) =>
                 durationRangeOptions: selectedFulfillmentInfo?.durationRange,
                 ...selectedFulfillmentInfo,
             };
+            // const startTime = convertTimeOfDayToDateTime(startTime!, timezone);
+            // const endTime = convertTimeOfDayToDateTime(endTime!, timezone);
             return {
                 id: createTimeSlotId(startTime, endTime),
                 startTime: startTime,
@@ -163,71 +169,22 @@ export const processFulfillmentTimeSlotByOperationList = (operationTimeSlot) =>
         }),
     ];
 };
-const DAY_OF_WEEK = {
-    [DayOfWeek.MON]: 1,
-    [DayOfWeek.TUE]: 2,
-    [DayOfWeek.WED]: 3,
-    [DayOfWeek.THU]: 4,
-    [DayOfWeek.FRI]: 5,
-    [DayOfWeek.SAT]: 6,
-    [DayOfWeek.SUN]: 7,
-};
-const convertTimeOfDayToDateTime = (time, timezone) => {
-    const now = new Date();
-    if (timezone) {
-        // Get today's date components in the specified timezone
-        const options = {
-            timeZone: timezone,
-            year: 'numeric',
-            month: '2-digit',
-            day: '2-digit',
-        };
-        const parts = new Intl.DateTimeFormat('en-US', options).formatToParts(now);
-        const year = parts.find((p) => p.type === 'year')?.value;
-        const month = parts.find((p) => p.type === 'month')?.value;
-        const day = parts.find((p) => p.type === 'day')?.value;
-        // Create an ISO string with the date in the timezone and the specified time
-        const hours = String(time.hours ?? 0).padStart(2, '0');
-        const minutes = String(time.minutes ?? 0).padStart(2, '0');
-        const isoString = `${year}-${month}-${day}T${hours}:${minutes}:00.000`;
-        // Convert to Date - this will be interpreted as local time
-        const localDate = new Date(isoString);
-        // Get what this time would be formatted as in the target timezone
-        const formattedInTz = new Date(localDate.toLocaleString('en-US', { timeZone: timezone }));
-        // Calculate the difference and adjust
-        const offset = localDate.getTime() - formattedInTz.getTime();
-        return new Date(localDate.getTime() + offset);
-    }
-    // If no timezone specified, use local time
-    const date = new Date();
-    date.setHours(time.hours ?? 0, time.minutes ?? 0, 0, 0);
-    return date;
-};
-const isInTimeRange = (time, range, timeZone) => {
-    const startTime = range.startTime
-        ? convertTimeOfDayToDateTime(range.startTime, timeZone)
-        : time;
-    const endTime = range.endTime
-        ? convertTimeOfDayToDateTime(range.endTime, timeZone)
-        : time;
-    return (time.getTime() >= startTime.getTime() && time.getTime() <= endTime.getTime());
-};
 const isFulfillmentAvailable = (fulfillment, operation) => {
     const { availability: { timeZone, availableTimes } = {} } = fulfillment;
     const { asapOptions: { maxInMinutes, rangeInMinutes } = {} } = operation;
     const deliveryTime = fulfillment.deliveryOptions?.deliveryTimeInMinutes ?? 0;
-    const zone = timeZone;
-    const timeNow = new Date();
+    const timezone = timeZone;
+    const locale = getLocale();
+    const timeNow = convertDateToTimezone(new Date(), timezone, locale);
     timeNow.setMinutes(timeNow.getMinutes() +
         (maxInMinutes ?? rangeInMinutes?.min ?? 0) +
         deliveryTime);
-    // getDay() returns 0 (Sunday) to 6 (Saturday), but we need 1 (Monday) to 7 (Sunday)
-    const currentDayOfWeek = timeNow.getDay() === 0 ? 7 : timeNow.getDay();
+    const currentDayOfWeek = getDayOfWeekNumber(timeNow);
     return !!availableTimes?.some((availableTime) => {
         const { dayOfWeek, timeRanges } = availableTime;
         const dayOfWeekNumber = DAY_OF_WEEK[dayOfWeek];
         const isAvailable = dayOfWeekNumber === currentDayOfWeek &&
-            !!timeRanges?.some((range) => isInTimeRange(timeNow, range, zone));
+            !!timeRanges?.some((range) => isInTimeRange(timeNow, range, timezone));
         return isAvailable;
     });
 };
@@ -291,10 +248,9 @@ export const createTimeRange = (arr) => {
         return { durationRangeOptions: { minDuration, maxDuration } };
     }
 };
-export const processFulfillments = async (fulfillments, timeSlots, operation) => {
+export const processFulfillments = (fulfillments, timeSlots, operation) => {
     const shouldConsiderAvailability = timeSlots.length > 0;
     try {
-        console.log('fulfillments :>>', fulfillments);
         const pickupFulfillment = fulfillments.find((fulfillment) => fulfillment.type === 'PICKUP' && fulfillment.enabled);
         let deliveryFulfillments = fulfillments.filter((fulfillment) => fulfillment.type === 'DELIVERY' && fulfillment.enabled);
         const isPickupConfigured = !!pickupFulfillment;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/headless-restaurants-olo",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -56,6 +56,7 @@
     "@radix-ui/react-slot": "^1.1.0",
     "@wix/auto_sdk_restaurants_items": "^1.0.48",
     "@wix/ecom": "^1.0.1461",
+    "@wix/essentials": "^1.0.0",
     "@wix/headless-components": "0.0.33",
     "@wix/headless-media": "0.0.18",
     "@wix/headless-restaurants-menus": "0.0.22",
@@ -76,5 +77,5 @@
       "groupId": "com.wixpress.headless-components"
     }
   },
-  "falconPackageHash": "97aa9b4b1d42245862576a697ea8caa770e137558f7c9de093e568de"
+  "falconPackageHash": "8fef913fc66b2bade48d7c257f0f51bb8b909775971887e2af22001c"
 }