@internationalized/date - npm Package Compare versions

Comparing version 3.6.0 to 3.7.0

dist/queries.main.js

@@ -81,7 +81,17 @@ var $4ae0260a69729f1d$exports = require("./conversion.main.js");
 }
-function $1f0f7ebf1ae6c530$export$2061056d06d7cdf7(date, locale) {
+const $1f0f7ebf1ae6c530$var$DAY_MAP = {
+    sun: 0,
+    mon: 1,
+    tue: 2,
+    wed: 3,
+    thu: 4,
+    fri: 5,
+    sat: 6
+};
+function $1f0f7ebf1ae6c530$export$2061056d06d7cdf7(date, locale, firstDayOfWeek) {
     let julian = date.calendar.toJulianDay(date);
     // If julian is negative, then julian % 7 will be negative, so we adjust
     // accordingly.  Julian day 0 is Monday.
-    let dayOfWeek = Math.ceil(julian + 1 - $1f0f7ebf1ae6c530$var$getWeekStart(locale)) % 7;
+    let weekStart = firstDayOfWeek ? $1f0f7ebf1ae6c530$var$DAY_MAP[firstDayOfWeek] : $1f0f7ebf1ae6c530$var$getWeekStart(locale);
+    let dayOfWeek = Math.ceil(julian + 1 - weekStart) % 7;
     if (dayOfWeek < 0) dayOfWeek += 7;
@@ -148,4 +158,4 @@ return dayOfWeek;
 }
-function $1f0f7ebf1ae6c530$export$42c81a444fbfb5d4(date, locale) {
-    let dayOfWeek = $1f0f7ebf1ae6c530$export$2061056d06d7cdf7(date, locale);
+function $1f0f7ebf1ae6c530$export$42c81a444fbfb5d4(date, locale, firstDayOfWeek) {
+    let dayOfWeek = $1f0f7ebf1ae6c530$export$2061056d06d7cdf7(date, locale, firstDayOfWeek);
     return date.subtract({
@@ -155,4 +165,4 @@ days: dayOfWeek
 }
-function $1f0f7ebf1ae6c530$export$ef8b6d9133084f4e(date, locale) {
-    return $1f0f7ebf1ae6c530$export$42c81a444fbfb5d4(date, locale).add({
+function $1f0f7ebf1ae6c530$export$ef8b6d9133084f4e(date, locale, firstDayOfWeek) {
+    return $1f0f7ebf1ae6c530$export$42c81a444fbfb5d4(date, locale, firstDayOfWeek).add({
         days: 6
@@ -188,5 +198,5 @@ });
 }
-function $1f0f7ebf1ae6c530$export$ccc1b2479e7dd654(date, locale) {
+function $1f0f7ebf1ae6c530$export$ccc1b2479e7dd654(date, locale, firstDayOfWeek) {
     let days = date.calendar.getDaysInMonth(date);
-    return Math.ceil(($1f0f7ebf1ae6c530$export$2061056d06d7cdf7($1f0f7ebf1ae6c530$export$a5a3b454ada2268e(date), locale) + days) / 7);
+    return Math.ceil(($1f0f7ebf1ae6c530$export$2061056d06d7cdf7($1f0f7ebf1ae6c530$export$a5a3b454ada2268e(date), locale, firstDayOfWeek) + days) / 7);
 }
@@ -193,0 +203,0 @@ function $1f0f7ebf1ae6c530$export$5c333a116e949cdd(a, b) {

dist/queries.module.js

@@ -49,7 +49,17 @@ import {fromAbsolute as $11d87f3f76e88657$export$1b96692a1ba042ac, toAbsolute as $11d87f3f76e88657$export$5107c82f94518f5c, toCalendar as $11d87f3f76e88657$export$b4a036af3fc0b032, toCalendarDate as $11d87f3f76e88657$export$93522d1a439f3617} from "./conversion.module.js";
 }
-function $14e0f24ef4ac5c92$export$2061056d06d7cdf7(date, locale) {
+const $14e0f24ef4ac5c92$var$DAY_MAP = {
+    sun: 0,
+    mon: 1,
+    tue: 2,
+    wed: 3,
+    thu: 4,
+    fri: 5,
+    sat: 6
+};
+function $14e0f24ef4ac5c92$export$2061056d06d7cdf7(date, locale, firstDayOfWeek) {
     let julian = date.calendar.toJulianDay(date);
     // If julian is negative, then julian % 7 will be negative, so we adjust
     // accordingly.  Julian day 0 is Monday.
-    let dayOfWeek = Math.ceil(julian + 1 - $14e0f24ef4ac5c92$var$getWeekStart(locale)) % 7;
+    let weekStart = firstDayOfWeek ? $14e0f24ef4ac5c92$var$DAY_MAP[firstDayOfWeek] : $14e0f24ef4ac5c92$var$getWeekStart(locale);
+    let dayOfWeek = Math.ceil(julian + 1 - weekStart) % 7;
     if (dayOfWeek < 0) dayOfWeek += 7;
@@ -116,4 +126,4 @@ return dayOfWeek;
 }
-function $14e0f24ef4ac5c92$export$42c81a444fbfb5d4(date, locale) {
-    let dayOfWeek = $14e0f24ef4ac5c92$export$2061056d06d7cdf7(date, locale);
+function $14e0f24ef4ac5c92$export$42c81a444fbfb5d4(date, locale, firstDayOfWeek) {
+    let dayOfWeek = $14e0f24ef4ac5c92$export$2061056d06d7cdf7(date, locale, firstDayOfWeek);
     return date.subtract({
@@ -123,4 +133,4 @@ days: dayOfWeek
 }
-function $14e0f24ef4ac5c92$export$ef8b6d9133084f4e(date, locale) {
-    return $14e0f24ef4ac5c92$export$42c81a444fbfb5d4(date, locale).add({
+function $14e0f24ef4ac5c92$export$ef8b6d9133084f4e(date, locale, firstDayOfWeek) {
+    return $14e0f24ef4ac5c92$export$42c81a444fbfb5d4(date, locale, firstDayOfWeek).add({
         days: 6
@@ -156,5 +166,5 @@ });
 }
-function $14e0f24ef4ac5c92$export$ccc1b2479e7dd654(date, locale) {
+function $14e0f24ef4ac5c92$export$ccc1b2479e7dd654(date, locale, firstDayOfWeek) {
     let days = date.calendar.getDaysInMonth(date);
-    return Math.ceil(($14e0f24ef4ac5c92$export$2061056d06d7cdf7($14e0f24ef4ac5c92$export$a5a3b454ada2268e(date), locale) + days) / 7);
+    return Math.ceil(($14e0f24ef4ac5c92$export$2061056d06d7cdf7($14e0f24ef4ac5c92$export$a5a3b454ada2268e(date), locale, firstDayOfWeek) + days) / 7);
 }
@@ -161,0 +171,0 @@ function $14e0f24ef4ac5c92$export$5c333a116e949cdd(a, b) {

dist/string.main.js

@@ -142,7 +142,7 @@ var $625ad1e1f4c43bc1$exports = require("./CalendarDate.main.js");
     if (!match) throw new Error(`Invalid ISO 8601 Duration string: ${value}`);
-    const parseDurationGroup = (group, isNegative, min, max)=>{
+    const parseDurationGroup = (group, isNegative)=>{
         if (!group) return 0;
         try {
             const sign = isNegative ? -1 : 1;
-            return sign * $4c32e2d98e5a5134$var$parseNumber(group.replace(',', '.'), min, max);
+            return sign * Number(group.replace(',', '.'));
         } catch  {
@@ -167,9 +167,9 @@ throw new Error(`Invalid ISO 8601 Duration string: ${value}`);
     const duration = {
-        years: parseDurationGroup((_match_groups2 = match.groups) === null || _match_groups2 === void 0 ? void 0 : _match_groups2.years, isNegative, 0, 9999),
-        months: parseDurationGroup((_match_groups3 = match.groups) === null || _match_groups3 === void 0 ? void 0 : _match_groups3.months, isNegative, 0, 12),
-        weeks: parseDurationGroup((_match_groups4 = match.groups) === null || _match_groups4 === void 0 ? void 0 : _match_groups4.weeks, isNegative, 0, Infinity),
-        days: parseDurationGroup((_match_groups5 = match.groups) === null || _match_groups5 === void 0 ? void 0 : _match_groups5.days, isNegative, 0, 31),
-        hours: parseDurationGroup((_match_groups6 = match.groups) === null || _match_groups6 === void 0 ? void 0 : _match_groups6.hours, isNegative, 0, 23),
-        minutes: parseDurationGroup((_match_groups7 = match.groups) === null || _match_groups7 === void 0 ? void 0 : _match_groups7.minutes, isNegative, 0, 59),
-        seconds: parseDurationGroup((_match_groups8 = match.groups) === null || _match_groups8 === void 0 ? void 0 : _match_groups8.seconds, isNegative, 0, 59)
+        years: parseDurationGroup((_match_groups2 = match.groups) === null || _match_groups2 === void 0 ? void 0 : _match_groups2.years, isNegative),
+        months: parseDurationGroup((_match_groups3 = match.groups) === null || _match_groups3 === void 0 ? void 0 : _match_groups3.months, isNegative),
+        weeks: parseDurationGroup((_match_groups4 = match.groups) === null || _match_groups4 === void 0 ? void 0 : _match_groups4.weeks, isNegative),
+        days: parseDurationGroup((_match_groups5 = match.groups) === null || _match_groups5 === void 0 ? void 0 : _match_groups5.days, isNegative),
+        hours: parseDurationGroup((_match_groups6 = match.groups) === null || _match_groups6 === void 0 ? void 0 : _match_groups6.hours, isNegative),
+        minutes: parseDurationGroup((_match_groups7 = match.groups) === null || _match_groups7 === void 0 ? void 0 : _match_groups7.minutes, isNegative),
+        seconds: parseDurationGroup((_match_groups8 = match.groups) === null || _match_groups8 === void 0 ? void 0 : _match_groups8.seconds, isNegative)
     };
@@ -176,0 +176,0 @@ if (duration.hours !== undefined && duration.hours % 1 !== 0 && (duration.minutes || duration.seconds)) throw new Error(`Invalid ISO 8601 Duration string: ${value} - only the smallest unit can be fractional`);

dist/string.module.js

@@ -126,7 +126,7 @@ import {CalendarDate as $35ea8db9cb2ccb90$export$99faa760c7908e4f, CalendarDateTime as $35ea8db9cb2ccb90$export$ca871e8dbb80966f, Time as $35ea8db9cb2ccb90$export$680ea196effce5f, ZonedDateTime as $35ea8db9cb2ccb90$export$d3b7288e7994edea} from "./CalendarDate.module.js";
     if (!match) throw new Error(`Invalid ISO 8601 Duration string: ${value}`);
-    const parseDurationGroup = (group, isNegative, min, max)=>{
+    const parseDurationGroup = (group, isNegative)=>{
         if (!group) return 0;
         try {
             const sign = isNegative ? -1 : 1;
-            return sign * $fae977aafc393c5c$var$parseNumber(group.replace(',', '.'), min, max);
+            return sign * Number(group.replace(',', '.'));
         } catch  {
@@ -151,9 +151,9 @@ throw new Error(`Invalid ISO 8601 Duration string: ${value}`);
     const duration = {
-        years: parseDurationGroup((_match_groups2 = match.groups) === null || _match_groups2 === void 0 ? void 0 : _match_groups2.years, isNegative, 0, 9999),
-        months: parseDurationGroup((_match_groups3 = match.groups) === null || _match_groups3 === void 0 ? void 0 : _match_groups3.months, isNegative, 0, 12),
-        weeks: parseDurationGroup((_match_groups4 = match.groups) === null || _match_groups4 === void 0 ? void 0 : _match_groups4.weeks, isNegative, 0, Infinity),
-        days: parseDurationGroup((_match_groups5 = match.groups) === null || _match_groups5 === void 0 ? void 0 : _match_groups5.days, isNegative, 0, 31),
-        hours: parseDurationGroup((_match_groups6 = match.groups) === null || _match_groups6 === void 0 ? void 0 : _match_groups6.hours, isNegative, 0, 23),
-        minutes: parseDurationGroup((_match_groups7 = match.groups) === null || _match_groups7 === void 0 ? void 0 : _match_groups7.minutes, isNegative, 0, 59),
-        seconds: parseDurationGroup((_match_groups8 = match.groups) === null || _match_groups8 === void 0 ? void 0 : _match_groups8.seconds, isNegative, 0, 59)
+        years: parseDurationGroup((_match_groups2 = match.groups) === null || _match_groups2 === void 0 ? void 0 : _match_groups2.years, isNegative),
+        months: parseDurationGroup((_match_groups3 = match.groups) === null || _match_groups3 === void 0 ? void 0 : _match_groups3.months, isNegative),
+        weeks: parseDurationGroup((_match_groups4 = match.groups) === null || _match_groups4 === void 0 ? void 0 : _match_groups4.weeks, isNegative),
+        days: parseDurationGroup((_match_groups5 = match.groups) === null || _match_groups5 === void 0 ? void 0 : _match_groups5.days, isNegative),
+        hours: parseDurationGroup((_match_groups6 = match.groups) === null || _match_groups6 === void 0 ? void 0 : _match_groups6.hours, isNegative),
+        minutes: parseDurationGroup((_match_groups7 = match.groups) === null || _match_groups7 === void 0 ? void 0 : _match_groups7.minutes, isNegative),
+        seconds: parseDurationGroup((_match_groups8 = match.groups) === null || _match_groups8 === void 0 ? void 0 : _match_groups8.seconds, isNegative)
     };
@@ -160,0 +160,0 @@ if (duration.hours !== undefined && duration.hours % 1 !== 0 && (duration.minutes || duration.seconds)) throw new Error(`Invalid ISO 8601 Duration string: ${value} - only the smallest unit can be fractional`);

dist/types.d.ts

@@ -35,2 +35,3 @@ type Mutable<T> = {
 export function isToday(date: DateValue, timeZone: string): boolean;
+type DayOfWeek = 'sun' | 'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat';
 /**
@@ -41,3 +42,3 @@ * Returns the day of week for the given date and locale. Days are numbered from zero to six,
  */
-export function getDayOfWeek(date: DateValue, locale: string): number;
+export function getDayOfWeek(date: DateValue, locale: string, firstDayOfWeek?: DayOfWeek): number;
 /** Returns the current time in the given time zone. */
@@ -77,13 +78,13 @@ export function now(timeZone: string): ZonedDateTime;
 /** Returns the first date of the week for the given date and locale. */
-export function startOfWeek(date: ZonedDateTime, locale: string): ZonedDateTime;
-export function startOfWeek(date: CalendarDateTime, locale: string): CalendarDateTime;
-export function startOfWeek(date: CalendarDate, locale: string): CalendarDate;
-export function startOfWeek(date: DateValue, locale: string): DateValue;
+export function startOfWeek(date: ZonedDateTime, locale: string, firstDayOfWeek?: DayOfWeek): ZonedDateTime;
+export function startOfWeek(date: CalendarDateTime, locale: string, firstDayOfWeek?: DayOfWeek): CalendarDateTime;
+export function startOfWeek(date: CalendarDate, locale: string, firstDayOfWeek?: DayOfWeek): CalendarDate;
+export function startOfWeek(date: DateValue, locale: string, firstDayOfWeek?: DayOfWeek): DateValue;
 /** Returns the last date of the week for the given date and locale. */
-export function endOfWeek(date: ZonedDateTime, locale: string): ZonedDateTime;
-export function endOfWeek(date: CalendarDateTime, locale: string): CalendarDateTime;
-export function endOfWeek(date: CalendarDate, locale: string): CalendarDate;
-export function endOfWeek(date: DateValue, locale: string): DateValue;
+export function endOfWeek(date: ZonedDateTime, locale: string, firstDayOfWeek?: DayOfWeek): ZonedDateTime;
+export function endOfWeek(date: CalendarDateTime, locale: string, firstDayOfWeek?: DayOfWeek): CalendarDateTime;
+export function endOfWeek(date: CalendarDate, locale: string, firstDayOfWeek?: DayOfWeek): CalendarDate;
+export function endOfWeek(date: DateValue, locale: string, firstDayOfWeek?: DayOfWeek): DateValue;
 /** Returns the number of weeks in the given month and locale. */
-export function getWeeksInMonth(date: DateValue, locale: string): number;
+export function getWeeksInMonth(date: DateValue, locale: string, firstDayOfWeek?: DayOfWeek): number;
 /** Returns the lesser of the two provider dates. */
@@ -90,0 +91,0 @@ export function minDate<A extends DateValue, B extends DateValue>(a?: A | null, b?: B | null): A | B | null | undefined;

package.json

 {
   "name": "@internationalized/date",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "Internationalized calendar, date, and time manipulation utilities",
@@ -30,3 +30,3 @@ "license": "Apache-2.0",
   },
-  "gitHead": "71f0ef23053f9e03ee7e97df736e8b083e006849"
+  "gitHead": "09e7f44bebdc9d89122926b2b439a0a38a2814ea"
 }

src/queries.ts

@@ -67,2 +67,14 @@ /*
 
+const DAY_MAP = {
+  sun: 0,
+  mon: 1,
+  tue: 2,
+  wed: 3,
+  thu: 4,
+  fri: 5,
+  sat: 6
+};
+
+type DayOfWeek = 'sun' | 'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat';
+
 /**
@@ -73,3 +85,3 @@ * Returns the day of week for the given date and locale. Days are numbered from zero to six,
  */
-export function getDayOfWeek(date: DateValue, locale: string): number {
+export function getDayOfWeek(date: DateValue, locale: string, firstDayOfWeek?: DayOfWeek): number {
   let julian = date.calendar.toJulianDay(date);
@@ -79,3 +91,4 @@
   // accordingly.  Julian day 0 is Monday.
-  let dayOfWeek = Math.ceil(julian + 1 - getWeekStart(locale)) % 7;
+  let weekStart = firstDayOfWeek ? DAY_MAP[firstDayOfWeek] : getWeekStart(locale);
+  let dayOfWeek = Math.ceil(julian + 1 - weekStart) % 7;
   if (dayOfWeek < 0) {
@@ -187,8 +200,8 @@ dayOfWeek += 7;
 /** Returns the first date of the week for the given date and locale. */
-export function startOfWeek(date: ZonedDateTime, locale: string): ZonedDateTime;
-export function startOfWeek(date: CalendarDateTime, locale: string): CalendarDateTime;
-export function startOfWeek(date: CalendarDate, locale: string): CalendarDate;
-export function startOfWeek(date: DateValue, locale: string): DateValue;
-export function startOfWeek(date: DateValue, locale: string): DateValue {
-  let dayOfWeek = getDayOfWeek(date, locale);
+export function startOfWeek(date: ZonedDateTime, locale: string, firstDayOfWeek?: DayOfWeek): ZonedDateTime;
+export function startOfWeek(date: CalendarDateTime, locale: string, firstDayOfWeek?: DayOfWeek): CalendarDateTime;
+export function startOfWeek(date: CalendarDate, locale: string, firstDayOfWeek?: DayOfWeek): CalendarDate;
+export function startOfWeek(date: DateValue, locale: string, firstDayOfWeek?: DayOfWeek): DateValue;
+export function startOfWeek(date: DateValue, locale: string, firstDayOfWeek?: DayOfWeek): DateValue {
+  let dayOfWeek = getDayOfWeek(date, locale, firstDayOfWeek);
   return date.subtract({days: dayOfWeek});
@@ -198,8 +211,8 @@ }
 /** Returns the last date of the week for the given date and locale. */
-export function endOfWeek(date: ZonedDateTime, locale: string): ZonedDateTime;
-export function endOfWeek(date: CalendarDateTime, locale: string): CalendarDateTime;
-export function endOfWeek(date: CalendarDate, locale: string): CalendarDate;
-export function endOfWeek(date: DateValue, locale: string): DateValue;
-export function endOfWeek(date: DateValue, locale: string): DateValue {
-  return startOfWeek(date, locale).add({days: 6});
+export function endOfWeek(date: ZonedDateTime, locale: string, firstDayOfWeek?: DayOfWeek): ZonedDateTime;
+export function endOfWeek(date: CalendarDateTime, locale: string, firstDayOfWeek?: DayOfWeek): CalendarDateTime;
+export function endOfWeek(date: CalendarDate, locale: string, firstDayOfWeek?: DayOfWeek): CalendarDate;
+export function endOfWeek(date: DateValue, locale: string, firstDayOfWeek?: DayOfWeek): DateValue;
+export function endOfWeek(date: DateValue, locale: string, firstDayOfWeek?: DayOfWeek): DateValue {
+  return startOfWeek(date, locale, firstDayOfWeek).add({days: 6});
 }
@@ -241,5 +254,5 @@
 /** Returns the number of weeks in the given month and locale. */
-export function getWeeksInMonth(date: DateValue, locale: string): number {
+export function getWeeksInMonth(date: DateValue, locale: string, firstDayOfWeek?: DayOfWeek): number {
   let days = date.calendar.getDaysInMonth(date);
-  return Math.ceil((getDayOfWeek(startOfMonth(date), locale) + days) / 7);
+  return Math.ceil((getDayOfWeek(startOfMonth(date), locale, firstDayOfWeek) + days) / 7);
 }
@@ -246,0 +259,0 @@

src/string.ts

@@ -237,5 +237,3 @@ /*
     group: string | undefined,
-    isNegative: boolean,
-    min: number,
-    max: number
+    isNegative: boolean
   ): number => {
@@ -247,3 +245,3 @@ if (!group) {
       const sign = isNegative ? -1 : 1;
-      return sign * parseNumber(group.replace(',', '.'), min, max);
+      return sign * Number(group.replace(',', '.'));
     } catch {
@@ -272,9 +270,9 @@ throw new Error(`Invalid ISO 8601 Duration string: ${value}`);
   const duration: Mutable<DateTimeDuration> = {
-    years: parseDurationGroup(match.groups?.years, isNegative, 0, 9999),
-    months: parseDurationGroup(match.groups?.months, isNegative, 0, 12),
-    weeks: parseDurationGroup(match.groups?.weeks, isNegative, 0, Infinity),
-    days: parseDurationGroup(match.groups?.days, isNegative, 0, 31),
-    hours: parseDurationGroup(match.groups?.hours, isNegative, 0, 23),
-    minutes: parseDurationGroup(match.groups?.minutes, isNegative, 0, 59),
-    seconds: parseDurationGroup(match.groups?.seconds, isNegative, 0, 59)
+    years: parseDurationGroup(match.groups?.years, isNegative),
+    months: parseDurationGroup(match.groups?.months, isNegative),
+    weeks: parseDurationGroup(match.groups?.weeks, isNegative),
+    days: parseDurationGroup(match.groups?.days, isNegative),
+    hours: parseDurationGroup(match.groups?.hours, isNegative),
+    minutes: parseDurationGroup(match.groups?.minutes, isNegative),
+    seconds: parseDurationGroup(match.groups?.seconds, isNegative)
   };
@@ -281,0 +279,0 @@

No alert changes

Improved metrics

Total package byte prevSize

1003021

increased by0.32%

Lines of code

11905

increased by0.34%

No dependency changes