@uxf/datepicker 11.111.0-canary.1 → 11.111.2

package/hooks/use-day.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useDay = useDay;
 const empty_array_1 = require("@uxf/core/constants/empty-array");
 const react_1 = require("react");
-const date_string_1 = require("../utils/date-string");
+const dayjs_utils_1 = require("../utils/dayjs-utils");
 const get_date_invervals_1 = require("../utils/get-date-invervals");
 function useDay({ date, datesConfig, dayRef, focusedDate, isDateBlocked, isDateFocused, isDateHovered, isDateInsideRange, isDateSelected, onDateFocus, onDateHover, onDateSelect, preventScroll, unavailableDates, }) {
     var _a;
@@ -12,7 +12,7 @@ function useDay({ date, datesConfig, dayRef, focusedDate, isDateBlocked, isDateF
     const disabledDates = [...unavailableDates, ...disabledDatesFromConfig].filter((day, index, self) => index === self.findIndex((d) => d.getTime() === day.getTime()));
     const onClick = (0, react_1.useCallback)(() => onDateSelect(date), [date, onDateSelect]);
     const onMouseEnter = (0, react_1.useCallback)(() => onDateHover(date), [date, onDateHover]);
-    const isToday = (0, date_string_1.todayDateString)() === (0, date_string_1.toDateString)(date);
+    const isToday = (0, dayjs_utils_1.dayjsEnWithTz)().isSame(date, "day");
     (0, react_1.useEffect)(() => {
         if (dayRef && dayRef.current && isDateFocused(date)) {
             dayRef.current.focus({
@@ -25,29 +25,28 @@ function useDay({ date, datesConfig, dayRef, focusedDate, isDateBlocked, isDateF
             e.preventDefault();
             switch (e.key) {
                 case "ArrowRight":
-                    onDateFocus((0, date_string_1.fromDateString)((0, date_string_1.addDays)((0, date_string_1.toDateString)(date), 1)));
+                    onDateFocus((0, dayjs_utils_1.dayjsEnRaw)(date).add(1, "day").toDate());
                     break;
                 case "ArrowLeft":
-                    onDateFocus((0, date_string_1.fromDateString)((0, date_string_1.addDays)((0, date_string_1.toDateString)(date), -1)));
+                    onDateFocus((0, dayjs_utils_1.dayjsEnRaw)(date).subtract(1, "day").toDate());
                     break;
                 case "ArrowUp":
-                    onDateFocus((0, date_string_1.fromDateString)((0, date_string_1.addDays)((0, date_string_1.toDateString)(date), -7)));
+                    onDateFocus((0, dayjs_utils_1.dayjsEnRaw)(date).subtract(7, "day").toDate());
                     break;
                 case "ArrowDown":
-                    onDateFocus((0, date_string_1.fromDateString)((0, date_string_1.addDays)((0, date_string_1.toDateString)(date), 7)));
+                    onDateFocus((0, dayjs_utils_1.dayjsEnRaw)(date).add(7, "day").toDate());
                     break;
             }
         }
     }, [date, onDateFocus]);
     const dateIntervals = (0, get_date_invervals_1.getDateIntervals)(disabledDates);
-    const dateStr = (0, date_string_1.toDateString)(date);
     const _isFirstUnavailableDate = () => {
-        return dateIntervals.some((interval) => (0, date_string_1.toDateString)(interval.start) === dateStr);
+        return dateIntervals.some((interval) => (0, dayjs_utils_1.dayjsEnRaw)(interval.start).isSame(date, "day"));
     };
     const _isLastUnavailableDate = () => {
-        return dateIntervals.some((interval) => (0, date_string_1.toDateString)(interval.end) === dateStr);
+        return dateIntervals.some((interval) => (0, dayjs_utils_1.dayjsEnRaw)(interval.end).isSame(date, "day"));
     };
-    const applicableDatesConfigs = datesConfig === null || datesConfig === void 0 ? void 0 : datesConfig.filter((config) => config.dates.some((configDay) => (0, date_string_1.toDateString)(configDay) === dateStr));
+    const applicableDatesConfigs = datesConfig === null || datesConfig === void 0 ? void 0 : datesConfig.filter((config) => config.dates.some((configDay) => (0, dayjs_utils_1.dayjsEnRaw)(configDay).isSame(date, "day")));
     const flags = applicableDatesConfigs === null || applicableDatesConfigs === void 0 ? void 0 : applicableDatesConfigs.reduce((acc, curr) => {
         if (!curr.flag) {
             return acc;
@@ -55,8 +54,8 @@ function useDay({ date, datesConfig, dayRef, focusedDate, isDateBlocked, isDateF
         const intervals = (0, get_date_invervals_1.getDateIntervals)(curr.dates);
         acc.push({
             flag: curr.flag,
-            isFirst: intervals.some((interval) => (0, date_string_1.toDateString)(interval.start) === dateStr),
-            isLast: intervals.some((interval) => (0, date_string_1.toDateString)(interval.end) === dateStr),
+            isFirst: intervals.some((interval) => (0, dayjs_utils_1.dayjsEnRaw)(interval.start).isSame(date, "day")),
+            isLast: intervals.some((interval) => (0, dayjs_utils_1.dayjsEnRaw)(interval.end).isSame(date, "day")),
         });
         return acc;
     }, []);

package/hooks/use-decade.js

@@ -11,13 +11,12 @@ exports.yearLabelFormatFn = yearLabelFormatFn;
 const decadeLabelFormatFn = (start, end) => `${(0, dayjs_utils_1.dayjsEnWithTz)(start).format("YYYY")} \u2013 ${(0, dayjs_utils_1.dayjsEnWithTz)(end).format("YYYY")}`;
 exports.decadeLabelFormatFn = decadeLabelFormatFn;
 function useDecade({ yearLabelFormat = exports.yearLabelFormatFn, decadeLabelFormat = exports.decadeLabelFormatFn, year, }) {
-    const { years, decadeLabel } = (0, react_1.useMemo)(() => {
-        const startYear = new Date((0, create_date_string_1.createDateString)(year - 4, 0));
-        const endYear = new Date((0, create_date_string_1.createDateString)(year + 4, 0));
-        return {
-            years: (0, get_years_1.getYears)({ startYear, endYear, yearLabelFormat }),
-            decadeLabel: decadeLabelFormat(startYear, endYear),
-        };
-    }, [year, yearLabelFormat, decadeLabelFormat]);
-    return { years, decadeLabel };
+    const currentYear = new Date((0, create_date_string_1.createDateString)(year, 0));
+    const startYear = (0, dayjs_utils_1.dayjsEnWithTz)(currentYear).subtract(4, "years").startOf("year").toDate();
+    const endYear = (0, dayjs_utils_1.dayjsEnWithTz)(currentYear).add(4, "years").endOf("year").toDate();
+    const years = (0, react_1.useMemo)(() => (0, get_years_1.getYears)({ startYear, endYear, yearLabelFormat }), [endYear, startYear, yearLabelFormat]);
+    return {
+        years,
+        decadeLabel: decadeLabelFormat(startYear, endYear),
+    };
 }

package/package.json

@@ -1,16 +1,11 @@
 {
     "name": "@uxf/datepicker",
-    "version": "11.111.0-canary.1",
+    "version": "11.111.2",
     "description": "A set of React hooks to create an awesome datepicker.",
     "main": "index.js",
     "scripts": {
         "build": "tsc -P tsconfig.json",
-        "typecheck": "tsc --noEmit --skipLibCheck",
-        "test:tz:prague": "TZ=Europe/Prague jest --config=jest.dst.config.js --no-coverage",
-        "test:tz:ny": "TZ=America/New_York jest --config=jest.dst.config.js --no-coverage",
-        "test:tz:tokyo": "TZ=Asia/Tokyo jest --config=jest.dst.config.js --no-coverage",
-        "test:dst": "TZ=America/New_York jest --config=jest.dst.config.js --no-coverage",
-        "test:tz": "npm run test:tz:prague && npm run test:tz:ny && npm run test:tz:tokyo"
+        "typecheck": "tsc --noEmit --skipLibCheck"
     },
     "publishConfig": {
         "access": "public"
@@ -26,7 +21,7 @@
     },
     "homepage": "https://gitlab.com/uxf-npm/datepicker#readme",
     "peerDependencies": {
-        "@uxf/core": "11.110.0",
+        "@uxf/core": "11.111.2",
         "dayjs": "^1.11.19",
         "react": ">=18.2.0",
         "react-dom": ">=18.2.0"
@@ -34,7 +29,7 @@
     "devDependencies": {
         "@types/react": "18.3.27",
         "@types/react-dom": "18.3.7",
-        "@uxf/core": "11.110.0",
+        "@uxf/core": "11.111.2",
         "dayjs": "^1.11.19",
         "react": "18.3.1",
         "react-dom": "18.3.1"

package/utils/can-select-range.d.ts

@@ -1,11 +1,10 @@
-import { DateString } from "@uxf/core/date";
 export interface CanSelectRangeProps {
-    startDate: DateString;
-    endDate: DateString | null;
-    isDateBlocked: ((date: DateString) => boolean) | null;
+    startDate: Date;
+    endDate: Date | null;
+    isDateBlocked: ((date: Date) => boolean) | null;
     minBookingDays: number;
     exactMinBookingDays?: boolean;
-    minBookingDate?: DateString;
-    maxBookingDate?: DateString;
+    minBookingDate?: Date;
+    maxBookingDate?: Date;
 }
 export declare function canSelectRange({ startDate, endDate, isDateBlocked, minBookingDays, exactMinBookingDays, minBookingDate, maxBookingDate, }: CanSelectRangeProps): boolean;

package/utils/can-select-range.js

@@ -1,15 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.canSelectRange = canSelectRange;
-const date_string_1 = require("./date-string");
+const dayjs_utils_1 = require("./dayjs-utils");
 const get_each_1 = require("./get-each");
 // eslint-disable-next-line complexity
 function canSelectRange({ startDate, endDate, isDateBlocked, minBookingDays, exactMinBookingDays, minBookingDate, maxBookingDate, }) {
-    const isStartDateAfterOrEqualMinDate = minBookingDate ? startDate >= (0, date_string_1.addDays)(minBookingDate, -1) : true;
+    const isStartDateAfterOrEqualMinDate = minBookingDate
+        ? !(0, dayjs_utils_1.dayjsEnRaw)(startDate).isBefore((0, dayjs_utils_1.dayjsEnRaw)(minBookingDate).subtract(1, "day"))
+        : true;
     const isStartDateBeforeOrEqualMaxDate = maxBookingDate
-        ? (0, date_string_1.addDays)(startDate, minBookingDays - 1) <= maxBookingDate
+        ? !(0, dayjs_utils_1.dayjsEnRaw)(startDate)
+            .add(minBookingDays - 1, "day")
+            .isAfter(maxBookingDate)
+        : true;
+    const isEndDatBeforeOrEqualMaxDate = maxBookingDate
+        ? !(0, dayjs_utils_1.dayjsEnRaw)(endDate)
+            .add(minBookingDays - 1, "day")
+            .isAfter(maxBookingDate)
         : true;
-    const isEndDatBeforeOrEqualMaxDate = maxBookingDate && endDate ? (0, date_string_1.addDays)(endDate, minBookingDays - 1) <= maxBookingDate : true;
     if (!isStartDateAfterOrEqualMinDate || !isStartDateBeforeOrEqualMaxDate || !isEndDatBeforeOrEqualMaxDate) {
         return false;
     }
@@ -22,11 +30,15 @@ function canSelectRange({ startDate, endDate, isDateBlocked, minBookingDays, exa
         if (!isDateBlocked) {
             return true;
         }
-        return !(0, get_each_1.getEach)(startDate, (0, date_string_1.addDays)(startDate, minBookingDays - 1), "day").some(isDateBlocked);
+        return !(0, get_each_1.getEach)(startDate, (0, dayjs_utils_1.dayjsEnRaw)(startDate)
+            .add(minBookingDays - 1, "day")
+            .toDate(), "day").some(isDateBlocked);
     }
     else if (endDate && !exactMinBookingDays) {
-        const minBookingDaysDate = (0, date_string_1.addDays)(startDate, minBookingDays - 1);
-        if (endDate < minBookingDaysDate) {
+        const minBookingDaysDate = (0, dayjs_utils_1.dayjsEnWithTz)(startDate)
+            .add(minBookingDays - 1, "day")
+            .toDate();
+        if ((0, dayjs_utils_1.dayjsEnWithTz)(endDate).isBefore(minBookingDaysDate)) {
             return false;
         }
         if (!isDateBlocked) {

package/utils/can-select-range.test.js

@@ -4,7 +4,7 @@ const can_select_range_1 = require("./can-select-range");
 test("canSelectRange", () => {
     // start day only
     expect((0, can_select_range_1.canSelectRange)({
-        startDate: "2021-08-08",
+        startDate: new Date("2021-08-08"),
         endDate: null,
         minBookingDays: 1,
         minBookingDate: undefined,
@@ -14,8 +14,8 @@ test("canSelectRange", () => {
     })).toBe(true);
     // start and end date
     expect((0, can_select_range_1.canSelectRange)({
-        startDate: "2021-08-08",
-        endDate: "2021-08-08",
+        startDate: new Date("2021-08-08"),
+        endDate: new Date("2021-08-08"),
         minBookingDays: 1,
         minBookingDate: undefined,
         maxBookingDate: undefined,
@@ -24,8 +24,18 @@ test("canSelectRange", () => {
     })).toBe(true);
     // minBookingDays longer than range
     expect((0, can_select_range_1.canSelectRange)({
-        startDate: "2021-08-08",
-        endDate: "2021-08-08",
+        startDate: new Date("2021-08-08"),
+        endDate: new Date("2021-08-08"),
+        minBookingDays: 2,
+        minBookingDate: undefined,
+        maxBookingDate: undefined,
+        exactMinBookingDays: false,
+        isDateBlocked: () => false,
+    })).toBe(false);
+    // minBookingDays longer than range
+    expect((0, can_select_range_1.canSelectRange)({
+        startDate: new Date("2021-08-08"),
+        endDate: new Date("2021-08-08"),
         minBookingDays: 2,
         minBookingDate: undefined,
         maxBookingDate: undefined,
@@ -34,8 +44,8 @@ test("canSelectRange", () => {
     })).toBe(false);
     // blocked date
     expect((0, can_select_range_1.canSelectRange)({
-        startDate: "2021-08-08",
-        endDate: "2021-08-08",
+        startDate: new Date("2021-08-08"),
+        endDate: new Date("2021-08-08"),
         minBookingDays: 1,
         minBookingDate: undefined,
         maxBookingDate: undefined,
@@ -44,50 +54,37 @@ test("canSelectRange", () => {
     })).toBe(false);
     // before minBookingDate
     expect((0, can_select_range_1.canSelectRange)({
-        startDate: "2021-08-05",
-        endDate: "2021-08-12",
+        startDate: new Date("2021-08-05"),
+        endDate: new Date("2021-08-12"),
         minBookingDays: 1,
-        minBookingDate: "2021-08-10",
+        minBookingDate: new Date("2021-08-10"),
         maxBookingDate: undefined,
         exactMinBookingDays: false,
         isDateBlocked: () => false,
     })).toBe(false);
     // after maxBookingDate
     expect((0, can_select_range_1.canSelectRange)({
-        startDate: "2021-08-01",
-        endDate: "2021-08-08",
+        startDate: new Date("2021-08-01"),
+        endDate: new Date("2021-08-08"),
         minBookingDays: 1,
         minBookingDate: undefined,
-        maxBookingDate: "2021-08-06",
+        maxBookingDate: new Date("2021-08-06"),
         exactMinBookingDays: false,
         isDateBlocked: () => false,
     })).toBe(false);
     // exactMinBookingDays
     expect((0, can_select_range_1.canSelectRange)({
-        startDate: "2021-08-01",
-        endDate: "2021-08-08",
+        startDate: new Date("2021-08-01"),
+        endDate: new Date("2021-08-08"),
         minBookingDays: 8,
         minBookingDate: undefined,
         maxBookingDate: undefined,
         exactMinBookingDays: true,
         isDateBlocked: () => false,
     })).toBe(true);
-});
-test("canSelectRange DST fall-back (Oct 25 2026)", () => {
-    expect((0, can_select_range_1.canSelectRange)({
-        startDate: "2026-10-25",
-        endDate: "2026-10-26",
-        minBookingDays: 2,
-        minBookingDate: undefined,
-        maxBookingDate: undefined,
-        exactMinBookingDays: false,
-        isDateBlocked: () => false,
-    })).toBe(true);
-});
-test("canSelectRange DST spring-forward (Mar 29 2026)", () => {
     expect((0, can_select_range_1.canSelectRange)({
-        startDate: "2026-03-29",
-        endDate: "2026-03-30",
+        startDate: new Date("2026-10-25"),
+        endDate: new Date("2026-10-26"),
         minBookingDays: 2,
         minBookingDate: undefined,
         maxBookingDate: undefined,

package/utils/dayjs-utils.d.ts

@@ -1,3 +1,4 @@
 import dayjs, { ConfigType } from "dayjs";
 import "dayjs/locale/en";
+export declare const dayjsEnRaw: (value?: ConfigType) => dayjs.Dayjs;
 export declare const dayjsEnWithTz: (value?: ConfigType, tz?: string) => dayjs.Dayjs;

package/utils/dayjs-utils.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dayjsEnWithTz = void 0;
+exports.dayjsEnWithTz = exports.dayjsEnRaw = void 0;
 const dayjs_1 = __importStar(require("dayjs"));
 require("dayjs/locale/en");
 const isBetween_1 = __importDefault(require("dayjs/plugin/isBetween"));
@@ -45,6 +45,10 @@ const utc_1 = __importDefault(require("dayjs/plugin/utc"));
 (0, dayjs_1.extend)(isBetween_1.default);
 (0, dayjs_1.extend)(timezone_1.default);
 (0, dayjs_1.extend)(utc_1.default);
+const dayjsEnRaw = (value) => {
+    return (0, dayjs_1.default)(value).locale("en");
+};
+exports.dayjsEnRaw = dayjsEnRaw;
 const dayjsEnWithTz = (value, tz = "UTC") => {
     return (0, dayjs_1.default)(value).tz(tz).locale("en");
 };

package/utils/get-current-year-month-and-date.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCurrentYearMonthAndDate = getCurrentYearMonthAndDate;
+const dayjs_utils_1 = require("./dayjs-utils");
 const get_date_month_and_year_1 = require("./get-date-month-and-year");
 function getCurrentYearMonthAndDate() {
-    return (0, get_date_month_and_year_1.getDateMonthAndYear)(new Date());
+    return (0, get_date_month_and_year_1.getDateMonthAndYear)((0, dayjs_utils_1.dayjsEnWithTz)().startOf("day").toDate());
 }

package/utils/get-date-invervals.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDateIntervals = getDateIntervals;
 const is_not_nil_1 = require("@uxf/core/utils/is-not-nil");
-const date_string_1 = require("./date-string");
+const dayjs_utils_1 = require("./dayjs-utils");
 function getDateIntervals(dates) {
     const sortedDates = dates.slice().sort((a, b) => a.getTime() - b.getTime());
     const intervals = [];
@@ -11,7 +11,9 @@ function getDateIntervals(dates) {
     let currentEnd = firstSortedDate !== null && firstSortedDate !== void 0 ? firstSortedDate : new Date();
     for (let i = 1; i < sortedDates.length; i++) {
         const currentDate = sortedDates[i];
-        if ((0, date_string_1.toDateString)(currentDate) === (0, date_string_1.addDays)((0, date_string_1.toDateString)(currentEnd), 1)) {
+        const nextDate = (0, dayjs_utils_1.dayjsEnRaw)(currentEnd).add(1, "day").toDate();
+        // If the current date matches the expected next date, it's contiguous
+        if ((0, dayjs_utils_1.dayjsEnRaw)(currentDate).isSame(nextDate, "day")) {
             currentEnd = currentDate;
         }
         else {
@@ -21,6 +23,7 @@ function getDateIntervals(dates) {
         }
     }
     if ((0, is_not_nil_1.isNotNil)(firstSortedDate)) {
+        // Push the last interval
         intervals.push({ start: currentStart, end: currentEnd });
     }
     return intervals;

package/utils/get-date-month-and-year.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDateMonthAndYear = getDateMonthAndYear;
-const create_date_string_1 = require("./create-date-string");
-const date_string_1 = require("./date-string");
+const dayjs_utils_1 = require("./dayjs-utils");
 function getDateMonthAndYear(date) {
-    const ds = (0, date_string_1.toDateString)(date);
-    const year = parseInt(ds.slice(0, 4), 10);
-    const month = parseInt(ds.slice(5, 7), 10) - 1; // 0-indexed, matching dayjs convention
+    const day = (0, dayjs_utils_1.dayjsEnWithTz)(date).startOf("month").toDate();
+    const year = (0, dayjs_utils_1.dayjsEnWithTz)(day).year();
+    const month = (0, dayjs_utils_1.dayjsEnWithTz)(day).month();
     return {
         year,
         month,
-        date: (0, date_string_1.fromDateString)((0, create_date_string_1.createDateString)(year, month)),
+        date: day,
     };
 }

package/utils/get-days.js

@@ -2,38 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDays = getDays;
 const create_date_string_1 = require("./create-date-string");
-const date_string_1 = require("./date-string");
 const dayjs_utils_1 = require("./dayjs-utils");
 const get_each_1 = require("./get-each");
 function getDays({ year, month, firstDayOfWeek = 0, dayLabelFormat = (date) => (0, dayjs_utils_1.dayjsEnWithTz)(date).format("DD"), }) {
     const date = new Date((0, create_date_string_1.createDateString)(year, month));
     const lastDayOfWeek = firstDayOfWeek + 7;
     const monthStart = (0, dayjs_utils_1.dayjsEnWithTz)(date).startOf("month");
-    const monthStartStr = monthStart.format("YYYY-MM-DD");
     const monthStartDay = monthStart.day();
     const monthEnd = (0, dayjs_utils_1.dayjsEnWithTz)(date).endOf("month");
-    const monthEndStr = monthEnd.format("YYYY-MM-DD");
     const monthEndDay = monthEnd.day();
     const prevMonthDaysCount = monthStartDay >= firstDayOfWeek ? monthStartDay - firstDayOfWeek : 6 - firstDayOfWeek + monthStartDay + 1;
     const prevMonthDays = prevMonthDaysCount > 0
-        ? (0, get_each_1.getEach)((0, date_string_1.addDays)(monthStartStr, -prevMonthDaysCount), (0, date_string_1.addDays)(monthStartStr, -1), "day").map((d) => ({
+        ? (0, get_each_1.getEach)(monthStart.subtract(prevMonthDaysCount, "days").toDate(), monthStart.subtract(1, "day").toDate(), "day").map((d) => ({
             currentMonth: false,
-            date: (0, date_string_1.fromDateString)(d),
-            dayLabel: dayLabelFormat((0, date_string_1.fromDateString)(d)),
+            date: d,
+            dayLabel: dayLabelFormat(d),
         }))
         : [];
     const nextMonthDaysCount = lastDayOfWeek - monthEndDay - 1;
     const nextMonthDays = nextMonthDaysCount > 0 && nextMonthDaysCount < 7
-        ? (0, get_each_1.getEach)((0, date_string_1.addDays)(monthEndStr, 1), (0, date_string_1.addDays)(monthEndStr, nextMonthDaysCount), "day").map((d) => ({
+        ? (0, get_each_1.getEach)(monthEnd.add(1, "day").toDate(), monthEnd.add(nextMonthDaysCount, "days").toDate(), "day").map((d) => ({
             currentMonth: false,
-            date: (0, date_string_1.fromDateString)(d),
-            dayLabel: dayLabelFormat((0, date_string_1.fromDateString)(d)),
+            date: d,
+            dayLabel: dayLabelFormat(d),
         }))
         : [];
-    const days = (0, get_each_1.getEach)(monthStartStr, monthEndStr, "day").map((d) => ({
+    const days = (0, get_each_1.getEach)(monthStart.toDate(), monthEnd.toDate(), "day").map((d) => ({
         currentMonth: true,
-        date: (0, date_string_1.fromDateString)(d),
-        dayLabel: dayLabelFormat((0, date_string_1.fromDateString)(d)),
+        date: d,
+        dayLabel: dayLabelFormat(d),
     }));
     return [...prevMonthDays, ...days, ...nextMonthDays];
 }

package/utils/get-each.d.ts

@@ -1,2 +1 @@
-import { DateString } from "@uxf/core/date";
-export declare function getEach(start: DateString, end: DateString, type: "day" | "month" | "year"): DateString[];
+export declare function getEach(start: Date, end: Date, type: "day" | "month" | "year"): Date[];

package/utils/get-each.js

@@ -1,46 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEach = getEach;
-const create_date_string_1 = require("./create-date-string");
-const date_string_1 = require("./date-string");
-const DAY_MS = 86400000;
+const dayjs_utils_1 = require("./dayjs-utils");
 function getEach(start, end, type) {
-    if (type === "day") {
-        const startMs = new Date(start).getTime();
-        const endMs = new Date(end).getTime();
-        if (startMs > endMs) {
-            throw new Error("start must precede end");
-        }
-        const count = Math.round((endMs - startMs) / DAY_MS) + 1;
-        const results = new Array(count);
-        for (let i = 0; i < count; i++) {
-            results[i] = (0, date_string_1.toDateString)(new Date(startMs + i * DAY_MS));
-        }
-        return results;
-    }
-    if (type === "month") {
-        const [sy, sm] = start.split("-").map(Number);
-        const [ey, em] = end.split("-").map(Number);
-        if (sy > ey || (sy === ey && sm > em)) {
-            throw new Error("start must precede end");
-        }
-        const count = (ey - sy) * 12 + (em - sm) + 1;
-        const results = new Array(count);
-        for (let i = 0; i < count; i++) {
-            const totalMonths = sm - 1 + i; // 0-indexed from start month
-            results[i] = (0, create_date_string_1.createDateString)(sy + Math.floor(totalMonths / 12), totalMonths % 12);
-        }
-        return results;
-    }
-    // type === "year"
-    const sy = parseInt(start.slice(0, 4), 10);
-    const ey = parseInt(end.slice(0, 4), 10);
-    if (sy > ey) {
+    const startOfStart = (0, dayjs_utils_1.dayjsEnWithTz)(start).startOf(type);
+    const startOfEnd = (0, dayjs_utils_1.dayjsEnWithTz)(end).startOf(type);
+    if (startOfStart.toDate().getTime() > startOfEnd.toDate().getTime()) {
         throw new Error("start must precede end");
     }
-    const results = new Array(ey - sy + 1);
-    for (let i = 0; i < results.length; i++) {
-        results[i] = (0, create_date_string_1.createDateString)(sy + i);
+    const results = [];
+    let current = startOfStart;
+    while (current.toDate().getTime() <= startOfEnd.toDate().getTime()) {
+        results.push(current.toDate());
+        current = current.add(1, type);
     }
     return results;
 }

package/utils/get-each.test.js

@@ -2,45 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const get_each_1 = require("./get-each");
 test("getEach day", () => {
-    expect((0, get_each_1.getEach)("2021-05-05", "2021-05-07", "day")).toStrictEqual(["2021-05-05", "2021-05-06", "2021-05-07"]);
-});
-test("getEach day — DST fall-back (Oct 25 2026)", () => {
-    expect((0, get_each_1.getEach)("2026-10-24", "2026-10-26", "day")).toStrictEqual(["2026-10-24", "2026-10-25", "2026-10-26"]);
-});
-test("getEach day — DST spring-forward (Mar 29 2026)", () => {
-    expect((0, get_each_1.getEach)("2026-03-28", "2026-03-30", "day")).toStrictEqual(["2026-03-28", "2026-03-29", "2026-03-30"]);
-});
-test("getEach month", () => {
-    expect((0, get_each_1.getEach)("2021-05-05", "2021-08-07", "month")).toStrictEqual([
-        "2021-05-01",
-        "2021-06-01",
-        "2021-07-01",
-        "2021-08-01",
+    expect((0, get_each_1.getEach)(new Date("2021-05-05"), new Date("2021-05-07"), "day")).toStrictEqual([
+        new Date("2021-05-05T00:00:00Z"),
+        new Date("2021-05-06T00:00:00Z"),
+        new Date("2021-05-07T00:00:00Z"),
     ]);
 });
-test("getEach month — year boundary", () => {
-    expect((0, get_each_1.getEach)("2021-11-01", "2022-02-01", "month")).toStrictEqual([
-        "2021-11-01",
-        "2021-12-01",
-        "2022-01-01",
-        "2022-02-01",
+test("getEach month", () => {
+    expect((0, get_each_1.getEach)(new Date("2021-05-05"), new Date("2021-08-07"), "month")).toStrictEqual([
+        new Date("2021-05-01T00:00:00Z"),
+        new Date("2021-06-01T00:00:00Z"),
+        new Date("2021-07-01T00:00:00Z"),
+        new Date("2021-08-01T00:00:00Z"),
     ]);
 });
 test("getEach year", () => {
-    expect((0, get_each_1.getEach)("2015-05-05", "2020-05-07", "year")).toStrictEqual([
-        "2015-01-01",
-        "2016-01-01",
-        "2017-01-01",
-        "2018-01-01",
-        "2019-01-01",
-        "2020-01-01",
+    expect((0, get_each_1.getEach)(new Date("2015-05-05"), new Date("2020-05-07"), "year")).toStrictEqual([
+        new Date("2015-01-01T00:00:00Z"),
+        new Date("2016-01-01T00:00:00Z"),
+        new Date("2017-01-01T00:00:00Z"),
+        new Date("2018-01-01T00:00:00Z"),
+        new Date("2019-01-01T00:00:00Z"),
+        new Date("2020-01-01T00:00:00Z"),
     ]);
 });
-test("getEach single day", () => {
-    expect((0, get_each_1.getEach)("2021-05-05", "2021-05-05", "day")).toStrictEqual(["2021-05-05"]);
-});
-test("getEach invalid input throws", () => {
-    expect(() => (0, get_each_1.getEach)("2015-05-05", "2014-05-07", "day")).toThrow("start must precede end");
-    expect(() => (0, get_each_1.getEach)("2021-06-01", "2021-05-01", "month")).toThrow("start must precede end");
-    expect(() => (0, get_each_1.getEach)("2020-01-01", "2019-01-01", "year")).toThrow("start must precede end");
+test("getEach invalid input", () => {
+    expect(() => (0, get_each_1.getEach)(new Date("2015-05-05"), new Date("2014-05-07T00:00:00Z"), "day")).toThrow();
 });

package/utils/get-initial-months.js

@@ -1,16 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInitialMonths = getInitialMonths;
-const date_string_1 = require("./date-string");
+const dayjs_utils_1 = require("./dayjs-utils");
 const get_current_year_month_and_date_1 = require("./get-current-year-month-and-date");
 const get_date_month_and_year_1 = require("./get-date-month-and-year");
 function getInitialMonths(numberOfMonths, startDate) {
     const firstMonth = startDate ? (0, get_date_month_and_year_1.getDateMonthAndYear)(startDate) : (0, get_current_year_month_and_date_1.getCurrentYearMonthAndDate)();
+    let prevMonthDate = firstMonth.date;
     let months = [firstMonth];
     if (numberOfMonths > 1) {
         months = Array.from(Array(numberOfMonths - 1).keys()).reduce((m) => {
-            const nextDate = (0, date_string_1.fromDateString)((0, date_string_1.addMonths)((0, date_string_1.toDateString)(m[m.length - 1].date), 1));
-            return m.concat([(0, get_date_month_and_year_1.getDateMonthAndYear)(nextDate)]);
+            prevMonthDate = (0, dayjs_utils_1.dayjsEnWithTz)(m[m.length - 1].date)
+                .add(1, "month")
+                .toDate();
+            return m.concat([(0, get_date_month_and_year_1.getDateMonthAndYear)(prevMonthDate)]);
         }, months);
     }
     return months;

package/utils/get-months.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMonths = getMonths;
 const create_date_string_1 = require("./create-date-string");
-const date_string_1 = require("./date-string");
 const dayjs_utils_1 = require("./dayjs-utils");
 const get_each_1 = require("./get-each");
 function getMonths({ year, monthLabelFormat = (date) => (0, dayjs_utils_1.dayjsEnWithTz)(date).format("MMMM"), }) {
-    const yearStart = (0, create_date_string_1.createDateString)(year, 0);
-    const yearEnd = (0, create_date_string_1.createDateString)(year, 11);
-    return (0, get_each_1.getEach)(yearStart, yearEnd, "month").map((d) => {
-        const date = (0, date_string_1.fromDateString)(d);
-        return { date, monthLabel: monthLabelFormat(date) };
-    });
+    const date = new Date((0, create_date_string_1.createDateString)(year, 0));
+    const yearStart = (0, dayjs_utils_1.dayjsEnWithTz)(date).startOf("year").toDate();
+    const yearEnd = (0, dayjs_utils_1.dayjsEnWithTz)(date).endOf("year").toDate();
+    return (0, get_each_1.getEach)(yearStart, yearEnd, "month").map((d) => ({
+        date: d,
+        monthLabel: monthLabelFormat(d),
+    }));
 }