add-to-calendar-button 2.12.8 → 2.12.10

package/assets/css/atcb-3d.css

@@ -5,7 +5,7 @@
  *
  * Style: 3D
  *
- * Version: 2.12.8
+ * Version: 2.12.10
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb-date.css

@@ -5,7 +5,7 @@
  *
  * Style: Date
  *
- * Version: 2.12.8
+ * Version: 2.12.10
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb-flat.css

@@ -5,7 +5,7 @@
  *
  * Style: Flat
  *
- * Version: 2.12.8
+ * Version: 2.12.10
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb-neumorphism.css

@@ -5,7 +5,7 @@
  *
  * Style: Neumorphism
  *
- * Version: 2.12.8
+ * Version: 2.12.10
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb-round.css

@@ -5,7 +5,7 @@
  *
  * Style: Round
  *
- * Version: 2.12.8
+ * Version: 2.12.10
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb-simple.css

@@ -5,7 +5,7 @@
  *
  * Style: Simple
  *
- * Version: 2.12.8
+ * Version: 2.12.10
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb-text.css

@@ -5,7 +5,7 @@
  *
  * Style: Text
  *
- * Version: 2.12.8
+ * Version: 2.12.10
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/assets/css/atcb.css

@@ -5,7 +5,7 @@
  *
  * Style: Default
  *
- * Version: 2.12.8
+ * Version: 2.12.10
  * Creator: Jens Kuerschner (https://jekuer.com)
  * Project: https://github.com/add2cal/add-to-calendar-button
  * License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)

package/dist/atcb-no-pro-unstyle.js

@@ -223,14 +223,14 @@ function tzlib_get_timezones(jsonType = false) {
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.12.8
+ *  Version: 2.12.10
  *  Creator: Jens Kuerschner (https://jekuer.com)
  *  Project: https://github.com/add2cal/add-to-calendar-button
  *  License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
  *  Note:    DO NOT REMOVE THE COPYRIGHT NOTICE ABOVE!
  *
  */
-const atcbVersion = '2.12.8';
+const atcbVersion = '2.12.10';
 const atcbCssTemplate = {};
 const atcbIsBrowser = () => {
   if (typeof window === 'undefined') {
@@ -595,9 +595,10 @@ function atcb_decorate_data_rrule(data) {
 function atcb_decorate_data_recurring_events(data) {
   const startDate = data.dates?.[0].startDate || data.startDate;
   const startTime = data.dates?.[0].startTime || data.startTime;
+  const tzid = data.dates?.[0].timeZone || data.timeZone || 'UTC';
+  const offset = startTime && startTime !== '' ? tzlib_get_offset(tzid, startDate, startTime) : '';
   const startDateTime = (function () {
     if (startTime && startTime !== '') {
-      const offset = tzlib_get_offset(data.dates?.[0].timeZone || data.timeZone, startDate, startTime);
       return new Date(startDate + ' ' + startTime + ':00 GMT' + offset);
     }
     return new Date(startDate + 'T00:00:00Z');
@@ -607,31 +608,28 @@ function atcb_decorate_data_recurring_events(data) {
   if (!occurenceData || !occurenceData.nextOccurrence) {
     return data;
   }
-  const nextOccurrence =
-    String(occurenceData.nextOccurrence.getFullYear()) +
-    '-' +
-    String(occurenceData.nextOccurrence.getMonth() + 1).padStart(2, '0') +
-    '-' +
-    String(occurenceData.nextOccurrence.getDate()).padStart(2, '0') +
-    (startTime && startTime !== '' ? 'T' + String(occurenceData.nextOccurrence.getHours()).padStart(2, '0') + ':' + String(occurenceData.nextOccurrence.getMinutes()).padStart(2, '0') : '');
-  data.startDate = nextOccurrence.slice(0, 10);
+  function formatInTz(dateObj, timeZone, includeTime) {
+    const opts = includeTime ? { timeZone, hour12: false, year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' } : { timeZone, hour12: false, year: 'numeric', month: '2-digit', day: '2-digit' };
+    const parts = new Intl.DateTimeFormat('en-CA', opts).formatToParts(dateObj);
+    const get = (t) => parts.find((p) => p.type === t)?.value || '';
+    return {
+      date: `${get('year')}-${get('month')}-${get('day')}`,
+      time: includeTime ? `${get('hour')}:${get('minute')}` : '',
+    };
+  }
+  const nextLocal = formatInTz(occurenceData.nextOccurrence, tzid, !!(startTime && startTime !== ''));
+  data.startDate = nextLocal.date;
   if (startTime && startTime !== '') {
-    data.startTime = nextOccurrence.slice(11, 16);
+    data.startTime = nextLocal.time; 
   }
   const endDate = data.dates?.[0].endDate || data.endDate || startDate;
   const endTime = data.dates?.[0].endTime || data.endTime || '';
   const diff = new Date(endDate + (endTime && endTime !== '' ? 'T' + endTime : '')).getTime() - new Date(startDate + (startTime && startTime !== '' ? 'T' + startTime : '')).getTime();
   const newEndDateTime = new Date(occurenceData.nextOccurrence.getTime() + diff);
-  const newEndDateTimeString =
-    String(newEndDateTime.getFullYear()) +
-    '-' +
-    String(newEndDateTime.getMonth() + 1).padStart(2, '0') +
-    '-' +
-    String(newEndDateTime.getDate()).padStart(2, '0') +
-    (endTime && endTime !== '' ? 'T' + String(newEndDateTime.getHours()).padStart(2, '0') + ':' + String(newEndDateTime.getMinutes()).padStart(2, '0') : '');
-  data.endDate = newEndDateTimeString.slice(0, 10);
+  const nextEndLocal = formatInTz(newEndDateTime, tzid, !!(endTime && endTime !== ''));
+  data.endDate = nextEndLocal.date;
   if (endTime && endTime !== '') {
-    data.endTime = newEndDateTimeString.slice(11, 16);
+    data.endTime = nextEndLocal.time;
   }
   if ((data.recurrence_count && data.recurrence_count !== '') || (data.recurrence_until && data.recurrence_until !== '')) {
     if (occurenceData.adjustedCount < 2) {
@@ -2916,7 +2914,7 @@ function atcb_determine_ical_filename(data, subEvent) {
       return filenamePart + filenameSuffix;
     }
   }
-  return 'event-to-save-in-my-calendar' + filenameSuffix;
+  return 'event' + filenameSuffix;
 }
 function atcb_ical_copy_note(host, dataUrl, data, keyboardTrigger) {
   atcb_copy_to_clipboard(dataUrl);
@@ -3505,6 +3503,65 @@ function atcb_apply_transformation(value, transform) {
       return value;
   }
 }
+function atcb_parseByWeekdayTokens(rawByDay) {
+  const tokens = rawByDay ? rawByDay.toString().split(',') : [];
+  const mapWeekdayCode = (wd) => {
+    switch (wd) {
+      case 'SU':
+        return 0;
+      case 'MO':
+        return 1;
+      case 'TU':
+        return 2;
+      case 'WE':
+        return 3;
+      case 'TH':
+        return 4;
+      case 'FR':
+        return 5;
+      case 'SA':
+        return 6;
+      default:
+        return undefined;
+    }
+  };
+  const plainWeekdays = [];
+  const ordinals = [];
+  for (const tok of tokens) {
+    const t = tok.trim().toUpperCase();
+    if (t.length < 2) continue;
+    const wd = t.slice(-2);
+    const day = mapWeekdayCode(wd);
+    if (day === undefined) continue;
+    const prefix = t.slice(0, t.length - 2);
+    if (prefix) {
+      let sign = 1;
+      let digits = prefix;
+      if (digits[0] === '+') {
+        digits = digits.slice(1);
+      } else if (digits[0] === '-') {
+        sign = -1;
+        digits = digits.slice(1);
+      }
+      if (!digits || digits.length > 2) continue;
+      let validDigits = true;
+      for (let i = 0; i < digits.length; i++) {
+        const code = digits.charCodeAt(i);
+        if (code < 48 || code > 57) {
+          validDigits = false;
+          break;
+        }
+      }
+      if (!validDigits) continue;
+      const abs = parseInt(digits, 10);
+      if (abs < 1 || abs > 53) continue; 
+      ordinals.push({ n: sign * abs, day });
+    } else {
+      plainWeekdays.push(day);
+    }
+  }
+  return { plainWeekdays, ordinals };
+}
 function atcb_parseRRule(rruleStr, deep = true) {
   const parts = rruleStr
     .replace('RRULE:', '')
@@ -3516,21 +3573,21 @@ function atcb_parseRRule(rruleStr, deep = true) {
     }, {});
   if (!parts.FREQ) throw new Error('RRULE must have FREQ');
   parts.FREQ = parts.FREQ.toUpperCase();
-  parts.INTERVAL = parseInt(parts.INTERVAL.toString() || '1', 10);
+  parts.INTERVAL = parts.INTERVAL ? parseInt(parts.INTERVAL.toString(), 10) : 1;
   parts.COUNT = parts.COUNT ? parseInt(parts.COUNT.toString(), 10) : null;
   if (parts.UNTIL) {
     const untilStr = parts.UNTIL.toString();
     parts.UNTIL = deep ? new Date(Date.UTC(parseInt(untilStr.slice(0, 4), 10), parseInt(untilStr.slice(4, 6), 10) - 1, parseInt(untilStr.slice(6, 8), 10), parseInt(untilStr.slice(9, 11) || '0', 10), parseInt(untilStr.slice(11, 13) || '0', 10))) : untilStr;
   }
   if (parts.BYWEEKDAY || parts.BYDAY) {
-    const dayMap = { SU: 0, MO: 1, TU: 2, WE: 3, TH: 4, FR: 5, SA: 6 };
-    parts.BYWEEKDAY = deep
-      ? (parts.BYWEEKDAY || parts.BYDAY)
-          ?.toString()
-          .split(',')
-          .map((day) => dayMap[day.trim().toUpperCase()])
-          .filter((n) => n !== undefined)
-      : parts.BYWEEKDAY || parts.BYDAY;
+    const rawByDay = (parts.BYWEEKDAY || parts.BYDAY)?.toString();
+    if (deep) {
+      const { plainWeekdays, ordinals } = atcb_parseByWeekdayTokens(rawByDay);
+      parts.BYWEEKDAY = plainWeekdays.length ? plainWeekdays : null;
+      parts.BYDAY_ORDINALS = ordinals.length ? ordinals : null;
+    } else {
+      parts.BYWEEKDAY = parts.BYWEEKDAY || parts.BYDAY;
+    }
   }
   parts.BYMONTH =
     deep && parts.BYMONTH
@@ -3606,16 +3663,73 @@ function matchesBYRules(date, rrule) {
   if (rrule.BYYEARDAY && !rrule.BYYEARDAY.includes(getDayOfYear(date))) return false;
   if (rrule.BYMONTHDAY && !rrule.BYMONTHDAY.includes(date.getUTCDate())) return false;
   if (rrule.BYWEEKNO && !rrule.BYWEEKNO.includes(getWeekNumber(date))) return false;
-  if (rrule.BYWEEKDAY && !rrule.BYWEEKDAY.includes(date.getUTCDay())) return false;
+  const hasPlainWeekday = !!(rrule.BYWEEKDAY && rrule.BYWEEKDAY.length);
+  const plainWeekdayOk = hasPlainWeekday ? rrule.BYWEEKDAY.includes(date.getUTCDay()) : null;
+  let ordinalOk = null;
+  if (rrule.BYDAY_ORDINALS && Array.isArray(rrule.BYDAY_ORDINALS) && rrule.BYDAY_ORDINALS.length > 0) {
+    const dow = date.getUTCDay(); 
+    const year = date.getUTCFullYear();
+    const month = date.getUTCMonth();
+    const dayOfYear = getDayOfYear(date);
+    const daysInMonth = new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
+    const daysInYear = getDayOfYear(new Date(Date.UTC(year, 11, 31)));
+    const isNthWeekdayOfMonth = (n, weekday) => {
+      if (n === 0) return false;
+      if (n > 0) {
+        const firstOfMonth = new Date(Date.UTC(year, month, 1));
+        const firstDow = firstOfMonth.getUTCDay();
+        const offset = (weekday - firstDow + 7) % 7;
+        const targetDay = 1 + offset + (n - 1) * 7;
+        return targetDay >= 1 && targetDay <= daysInMonth && date.getUTCDate() === targetDay;
+      } else {
+        const lastOfMonth = new Date(Date.UTC(year, month + 1, 0));
+        const lastDow = lastOfMonth.getUTCDay();
+        const backOffset = (lastDow - weekday + 7) % 7;
+        const targetDay = lastOfMonth.getUTCDate() - backOffset + (n + 1) * 7; 
+        return targetDay >= 1 && targetDay <= daysInMonth && date.getUTCDate() === targetDay;
+      }
+    };
+    const isNthWeekdayOfYear = (n, weekday) => {
+      if (n === 0) return false;
+      if (n > 0) {
+        const jan1 = new Date(Date.UTC(year, 0, 1));
+        const jan1Dow = jan1.getUTCDay();
+        const offset = (weekday - jan1Dow + 7) % 7;
+        const targetDoy = 1 + offset + (n - 1) * 7;
+        return targetDoy >= 1 && targetDoy <= daysInYear && dayOfYear === targetDoy;
+      } else {
+        const dec31 = new Date(Date.UTC(year, 11, 31));
+        const dec31Dow = dec31.getUTCDay();
+        const backOffset = (dec31Dow - weekday + 7) % 7;
+        const targetDoy = daysInYear - backOffset + (n + 1) * 7; 
+        return targetDoy >= 1 && targetDoy <= daysInYear && dayOfYear === targetDoy;
+      }
+    };
+    const anyOrdinalMatch = rrule.BYDAY_ORDINALS.some(({ n, day }) => {
+      if (day !== dow) return false;
+      if (rrule.FREQ === 'MONTHLY') return isNthWeekdayOfMonth(n, day);
+      if (rrule.FREQ === 'YEARLY') {
+        if (rrule.BYMONTH && rrule.BYMONTH.length > 0) return isNthWeekdayOfMonth(n, day);
+        if (!rrule.BYWEEKNO) return isNthWeekdayOfYear(n, day);
+        return false;
+      }
+      return false;
+    });
+    ordinalOk = anyOrdinalMatch;
+  }
+  if (plainWeekdayOk === false && ordinalOk === false) return false;
+  if (plainWeekdayOk === false && ordinalOk === null) return false;
+  if (ordinalOk === false && plainWeekdayOk === null) return false;
   if (rrule.BYHOUR && !rrule.BYHOUR.includes(date.getUTCHours())) return false;
   return true;
 }
 function matchesImplicitRules(date, rrule, startDate) {
   if (!rrule.BYHOUR && date.getUTCHours() !== startDate.getUTCHours()) return false;
-  if (rrule.FREQ === 'WEEKLY' && !rrule.BYWEEKDAY && date.getUTCDay() !== startDate.getUTCDay()) return false;
-  if (rrule.FREQ === 'MONTHLY' && !rrule.BYMONTHDAY && !rrule.BYWEEKDAY && date.getUTCDate() !== startDate.getUTCDate()) return false;
+  const hasByWeekdayAny = !!(rrule.BYWEEKDAY && rrule.BYWEEKDAY.length) || !!(rrule.BYDAY_ORDINALS && rrule.BYDAY_ORDINALS.length);
+  if (rrule.FREQ === 'WEEKLY' && !hasByWeekdayAny && date.getUTCDay() !== startDate.getUTCDay()) return false;
+  if (rrule.FREQ === 'MONTHLY' && !rrule.BYMONTHDAY && !hasByWeekdayAny && date.getUTCDate() !== startDate.getUTCDate()) return false;
   if (rrule.FREQ === 'YEARLY' && !rrule.BYMONTH && date.getUTCMonth() !== startDate.getUTCMonth()) return false;
-  if (rrule.FREQ === 'YEARLY' && !rrule.BYMONTHDAY && !rrule.BYWEEKDAY && !rrule.BYYEARDAY && !rrule.BYWEEKNO && date.getUTCDate() !== startDate.getUTCDate()) return false;
+  if (rrule.FREQ === 'YEARLY' && !rrule.BYMONTHDAY && !hasByWeekdayAny && !rrule.BYYEARDAY && !rrule.BYWEEKNO && date.getUTCDate() !== startDate.getUTCDate()) return false;
   return true;
 }
 function atcb_getNextOccurrence(rruleStr, startDateTime, allday) {
@@ -3634,16 +3748,17 @@ function atcb_getNextOccurrence(rruleStr, startDateTime, allday) {
   let maxIterations = 10000;
   while (true) {
     if (rrule.UNTIL && currentDate > rrule.UNTIL) break;
-    if (matchesFreq(currentDate, rrule, startDateTime) && matchesRRule(currentDate, rrule, startDateTime)) {
+    const isMatch = matchesFreq(currentDate, rrule, startDateTime) && matchesRRule(currentDate, rrule, startDateTime);
+    if (isMatch) {
       occurrences.push(currentDate);
       count++;
       if (rrule.COUNT && count >= rrule.COUNT) break;
-      if (!rrule.COUNT && !rrule.UNTIL && occurrences.length > 0 && (allday ? currentDate >= now : currentDate > now)) break;
+      if (!rrule.COUNT && !rrule.UNTIL && (allday ? currentDate >= now : currentDate > now)) break;
     }
-    currentDate = new Date(currentDate.getTime() + stepMs);
     if (--maxIterations <= 0) {
       break;
     }
+    currentDate = new Date(currentDate.getTime() + stepMs);
   }
   let nextDate = null;
   let countDate = 0;

package/dist/atcb-no-pro.js

@@ -223,14 +223,14 @@ function tzlib_get_timezones(jsonType = false) {
  *  Add to Calendar Button
  *  ++++++++++++++++++++++
  *
- *  Version: 2.12.8
+ *  Version: 2.12.10
  *  Creator: Jens Kuerschner (https://jekuer.com)
  *  Project: https://github.com/add2cal/add-to-calendar-button
  *  License: Elastic License 2.0 (ELv2) (https://github.com/add2cal/add-to-calendar-button/blob/main/LICENSE.txt)
  *  Note:    DO NOT REMOVE THE COPYRIGHT NOTICE ABOVE!
  *
  */
-const atcbVersion = '2.12.8';
+const atcbVersion = '2.12.10';
 const atcbCssTemplate = {
   if (typeof window === 'undefined') {
     return false;
@@ -594,9 +594,10 @@ function atcb_decorate_data_rrule(data) {
 function atcb_decorate_data_recurring_events(data) {
   const startDate = data.dates?.[0].startDate || data.startDate;
   const startTime = data.dates?.[0].startTime || data.startTime;
+  const tzid = data.dates?.[0].timeZone || data.timeZone || 'UTC';
+  const offset = startTime && startTime !== '' ? tzlib_get_offset(tzid, startDate, startTime) : '';
   const startDateTime = (function () {
     if (startTime && startTime !== '') {
-      const offset = tzlib_get_offset(data.dates?.[0].timeZone || data.timeZone, startDate, startTime);
       return new Date(startDate + ' ' + startTime + ':00 GMT' + offset);
     }
     return new Date(startDate + 'T00:00:00Z');
@@ -606,31 +607,28 @@ function atcb_decorate_data_recurring_events(data) {
   if (!occurenceData || !occurenceData.nextOccurrence) {
     return data;
   }
-  const nextOccurrence =
-    String(occurenceData.nextOccurrence.getFullYear()) +
-    '-' +
-    String(occurenceData.nextOccurrence.getMonth() + 1).padStart(2, '0') +
-    '-' +
-    String(occurenceData.nextOccurrence.getDate()).padStart(2, '0') +
-    (startTime && startTime !== '' ? 'T' + String(occurenceData.nextOccurrence.getHours()).padStart(2, '0') + ':' + String(occurenceData.nextOccurrence.getMinutes()).padStart(2, '0') : '');
-  data.startDate = nextOccurrence.slice(0, 10);
+  function formatInTz(dateObj, timeZone, includeTime) {
+    const opts = includeTime ? { timeZone, hour12: false, year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' } : { timeZone, hour12: false, year: 'numeric', month: '2-digit', day: '2-digit' };
+    const parts = new Intl.DateTimeFormat('en-CA', opts).formatToParts(dateObj);
+    const get = (t) => parts.find((p) => p.type === t)?.value || '';
+    return {
+      date: `${get('year')}-${get('month')}-${get('day')}`,
+      time: includeTime ? `${get('hour')}:${get('minute')}` : '',
+    };
+  }
+  const nextLocal = formatInTz(occurenceData.nextOccurrence, tzid, !!(startTime && startTime !== ''));
+  data.startDate = nextLocal.date;
   if (startTime && startTime !== '') {
-    data.startTime = nextOccurrence.slice(11, 16);
+    data.startTime = nextLocal.time; 
   }
   const endDate = data.dates?.[0].endDate || data.endDate || startDate;
   const endTime = data.dates?.[0].endTime || data.endTime || '';
   const diff = new Date(endDate + (endTime && endTime !== '' ? 'T' + endTime : '')).getTime() - new Date(startDate + (startTime && startTime !== '' ? 'T' + startTime : '')).getTime();
   const newEndDateTime = new Date(occurenceData.nextOccurrence.getTime() + diff);
-  const newEndDateTimeString =
-    String(newEndDateTime.getFullYear()) +
-    '-' +
-    String(newEndDateTime.getMonth() + 1).padStart(2, '0') +
-    '-' +
-    String(newEndDateTime.getDate()).padStart(2, '0') +
-    (endTime && endTime !== '' ? 'T' + String(newEndDateTime.getHours()).padStart(2, '0') + ':' + String(newEndDateTime.getMinutes()).padStart(2, '0') : '');
-  data.endDate = newEndDateTimeString.slice(0, 10);
+  const nextEndLocal = formatInTz(newEndDateTime, tzid, !!(endTime && endTime !== ''));
+  data.endDate = nextEndLocal.date;
   if (endTime && endTime !== '') {
-    data.endTime = newEndDateTimeString.slice(11, 16);
+    data.endTime = nextEndLocal.time;
   }
   if ((data.recurrence_count && data.recurrence_count !== '') || (data.recurrence_until && data.recurrence_until !== '')) {
     if (occurenceData.adjustedCount < 2) {
@@ -2915,7 +2913,7 @@ function atcb_determine_ical_filename(data, subEvent) {
       return filenamePart + filenameSuffix;
     }
   }
-  return 'event-to-save-in-my-calendar' + filenameSuffix;
+  return 'event' + filenameSuffix;
 }
 function atcb_ical_copy_note(host, dataUrl, data, keyboardTrigger) {
   atcb_copy_to_clipboard(dataUrl);
@@ -3504,6 +3502,65 @@ function atcb_apply_transformation(value, transform) {
       return value;
   }
 }
+function atcb_parseByWeekdayTokens(rawByDay) {
+  const tokens = rawByDay ? rawByDay.toString().split(',') : [];
+  const mapWeekdayCode = (wd) => {
+    switch (wd) {
+      case 'SU':
+        return 0;
+      case 'MO':
+        return 1;
+      case 'TU':
+        return 2;
+      case 'WE':
+        return 3;
+      case 'TH':
+        return 4;
+      case 'FR':
+        return 5;
+      case 'SA':
+        return 6;
+      default:
+        return undefined;
+    }
+  };
+  const plainWeekdays = [];
+  const ordinals = [];
+  for (const tok of tokens) {
+    const t = tok.trim().toUpperCase();
+    if (t.length < 2) continue;
+    const wd = t.slice(-2);
+    const day = mapWeekdayCode(wd);
+    if (day === undefined) continue;
+    const prefix = t.slice(0, t.length - 2);
+    if (prefix) {
+      let sign = 1;
+      let digits = prefix;
+      if (digits[0] === '+') {
+        digits = digits.slice(1);
+      } else if (digits[0] === '-') {
+        sign = -1;
+        digits = digits.slice(1);
+      }
+      if (!digits || digits.length > 2) continue;
+      let validDigits = true;
+      for (let i = 0; i < digits.length; i++) {
+        const code = digits.charCodeAt(i);
+        if (code < 48 || code > 57) {
+          validDigits = false;
+          break;
+        }
+      }
+      if (!validDigits) continue;
+      const abs = parseInt(digits, 10);
+      if (abs < 1 || abs > 53) continue; 
+      ordinals.push({ n: sign * abs, day });
+    } else {
+      plainWeekdays.push(day);
+    }
+  }
+  return { plainWeekdays, ordinals };
+}
 function atcb_parseRRule(rruleStr, deep = true) {
   const parts = rruleStr
     .replace('RRULE:', '')
@@ -3515,21 +3572,21 @@ function atcb_parseRRule(rruleStr, deep = true) {
     }, {});
   if (!parts.FREQ) throw new Error('RRULE must have FREQ');
   parts.FREQ = parts.FREQ.toUpperCase();
-  parts.INTERVAL = parseInt(parts.INTERVAL.toString() || '1', 10);
+  parts.INTERVAL = parts.INTERVAL ? parseInt(parts.INTERVAL.toString(), 10) : 1;
   parts.COUNT = parts.COUNT ? parseInt(parts.COUNT.toString(), 10) : null;
   if (parts.UNTIL) {
     const untilStr = parts.UNTIL.toString();
     parts.UNTIL = deep ? new Date(Date.UTC(parseInt(untilStr.slice(0, 4), 10), parseInt(untilStr.slice(4, 6), 10) - 1, parseInt(untilStr.slice(6, 8), 10), parseInt(untilStr.slice(9, 11) || '0', 10), parseInt(untilStr.slice(11, 13) || '0', 10))) : untilStr;
   }
   if (parts.BYWEEKDAY || parts.BYDAY) {
-    const dayMap = { SU: 0, MO: 1, TU: 2, WE: 3, TH: 4, FR: 5, SA: 6 };
-    parts.BYWEEKDAY = deep
-      ? (parts.BYWEEKDAY || parts.BYDAY)
-          ?.toString()
-          .split(',')
-          .map((day) => dayMap[day.trim().toUpperCase()])
-          .filter((n) => n !== undefined)
-      : parts.BYWEEKDAY || parts.BYDAY;
+    const rawByDay = (parts.BYWEEKDAY || parts.BYDAY)?.toString();
+    if (deep) {
+      const { plainWeekdays, ordinals } = atcb_parseByWeekdayTokens(rawByDay);
+      parts.BYWEEKDAY = plainWeekdays.length ? plainWeekdays : null;
+      parts.BYDAY_ORDINALS = ordinals.length ? ordinals : null;
+    } else {
+      parts.BYWEEKDAY = parts.BYWEEKDAY || parts.BYDAY;
+    }
   }
   parts.BYMONTH =
     deep && parts.BYMONTH
@@ -3605,16 +3662,73 @@ function matchesBYRules(date, rrule) {
   if (rrule.BYYEARDAY && !rrule.BYYEARDAY.includes(getDayOfYear(date))) return false;
   if (rrule.BYMONTHDAY && !rrule.BYMONTHDAY.includes(date.getUTCDate())) return false;
   if (rrule.BYWEEKNO && !rrule.BYWEEKNO.includes(getWeekNumber(date))) return false;
-  if (rrule.BYWEEKDAY && !rrule.BYWEEKDAY.includes(date.getUTCDay())) return false;
+  const hasPlainWeekday = !!(rrule.BYWEEKDAY && rrule.BYWEEKDAY.length);
+  const plainWeekdayOk = hasPlainWeekday ? rrule.BYWEEKDAY.includes(date.getUTCDay()) : null;
+  let ordinalOk = null;
+  if (rrule.BYDAY_ORDINALS && Array.isArray(rrule.BYDAY_ORDINALS) && rrule.BYDAY_ORDINALS.length > 0) {
+    const dow = date.getUTCDay(); 
+    const year = date.getUTCFullYear();
+    const month = date.getUTCMonth();
+    const dayOfYear = getDayOfYear(date);
+    const daysInMonth = new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
+    const daysInYear = getDayOfYear(new Date(Date.UTC(year, 11, 31)));
+    const isNthWeekdayOfMonth = (n, weekday) => {
+      if (n === 0) return false;
+      if (n > 0) {
+        const firstOfMonth = new Date(Date.UTC(year, month, 1));
+        const firstDow = firstOfMonth.getUTCDay();
+        const offset = (weekday - firstDow + 7) % 7;
+        const targetDay = 1 + offset + (n - 1) * 7;
+        return targetDay >= 1 && targetDay <= daysInMonth && date.getUTCDate() === targetDay;
+      } else {
+        const lastOfMonth = new Date(Date.UTC(year, month + 1, 0));
+        const lastDow = lastOfMonth.getUTCDay();
+        const backOffset = (lastDow - weekday + 7) % 7;
+        const targetDay = lastOfMonth.getUTCDate() - backOffset + (n + 1) * 7; 
+        return targetDay >= 1 && targetDay <= daysInMonth && date.getUTCDate() === targetDay;
+      }
+    };
+    const isNthWeekdayOfYear = (n, weekday) => {
+      if (n === 0) return false;
+      if (n > 0) {
+        const jan1 = new Date(Date.UTC(year, 0, 1));
+        const jan1Dow = jan1.getUTCDay();
+        const offset = (weekday - jan1Dow + 7) % 7;
+        const targetDoy = 1 + offset + (n - 1) * 7;
+        return targetDoy >= 1 && targetDoy <= daysInYear && dayOfYear === targetDoy;
+      } else {
+        const dec31 = new Date(Date.UTC(year, 11, 31));
+        const dec31Dow = dec31.getUTCDay();
+        const backOffset = (dec31Dow - weekday + 7) % 7;
+        const targetDoy = daysInYear - backOffset + (n + 1) * 7; 
+        return targetDoy >= 1 && targetDoy <= daysInYear && dayOfYear === targetDoy;
+      }
+    };
+    const anyOrdinalMatch = rrule.BYDAY_ORDINALS.some(({ n, day }) => {
+      if (day !== dow) return false;
+      if (rrule.FREQ === 'MONTHLY') return isNthWeekdayOfMonth(n, day);
+      if (rrule.FREQ === 'YEARLY') {
+        if (rrule.BYMONTH && rrule.BYMONTH.length > 0) return isNthWeekdayOfMonth(n, day);
+        if (!rrule.BYWEEKNO) return isNthWeekdayOfYear(n, day);
+        return false;
+      }
+      return false;
+    });
+    ordinalOk = anyOrdinalMatch;
+  }
+  if (plainWeekdayOk === false && ordinalOk === false) return false;
+  if (plainWeekdayOk === false && ordinalOk === null) return false;
+  if (ordinalOk === false && plainWeekdayOk === null) return false;
   if (rrule.BYHOUR && !rrule.BYHOUR.includes(date.getUTCHours())) return false;
   return true;
 }
 function matchesImplicitRules(date, rrule, startDate) {
   if (!rrule.BYHOUR && date.getUTCHours() !== startDate.getUTCHours()) return false;
-  if (rrule.FREQ === 'WEEKLY' && !rrule.BYWEEKDAY && date.getUTCDay() !== startDate.getUTCDay()) return false;
-  if (rrule.FREQ === 'MONTHLY' && !rrule.BYMONTHDAY && !rrule.BYWEEKDAY && date.getUTCDate() !== startDate.getUTCDate()) return false;
+  const hasByWeekdayAny = !!(rrule.BYWEEKDAY && rrule.BYWEEKDAY.length) || !!(rrule.BYDAY_ORDINALS && rrule.BYDAY_ORDINALS.length);
+  if (rrule.FREQ === 'WEEKLY' && !hasByWeekdayAny && date.getUTCDay() !== startDate.getUTCDay()) return false;
+  if (rrule.FREQ === 'MONTHLY' && !rrule.BYMONTHDAY && !hasByWeekdayAny && date.getUTCDate() !== startDate.getUTCDate()) return false;
   if (rrule.FREQ === 'YEARLY' && !rrule.BYMONTH && date.getUTCMonth() !== startDate.getUTCMonth()) return false;
-  if (rrule.FREQ === 'YEARLY' && !rrule.BYMONTHDAY && !rrule.BYWEEKDAY && !rrule.BYYEARDAY && !rrule.BYWEEKNO && date.getUTCDate() !== startDate.getUTCDate()) return false;
+  if (rrule.FREQ === 'YEARLY' && !rrule.BYMONTHDAY && !hasByWeekdayAny && !rrule.BYYEARDAY && !rrule.BYWEEKNO && date.getUTCDate() !== startDate.getUTCDate()) return false;
   return true;
 }
 function atcb_getNextOccurrence(rruleStr, startDateTime, allday) {
@@ -3633,16 +3747,17 @@ function atcb_getNextOccurrence(rruleStr, startDateTime, allday) {
   let maxIterations = 10000;
   while (true) {
     if (rrule.UNTIL && currentDate > rrule.UNTIL) break;
-    if (matchesFreq(currentDate, rrule, startDateTime) && matchesRRule(currentDate, rrule, startDateTime)) {
+    const isMatch = matchesFreq(currentDate, rrule, startDateTime) && matchesRRule(currentDate, rrule, startDateTime);
+    if (isMatch) {
       occurrences.push(currentDate);
       count++;
       if (rrule.COUNT && count >= rrule.COUNT) break;
-      if (!rrule.COUNT && !rrule.UNTIL && occurrences.length > 0 && (allday ? currentDate >= now : currentDate > now)) break;
+      if (!rrule.COUNT && !rrule.UNTIL && (allday ? currentDate >= now : currentDate > now)) break;
     }
-    currentDate = new Date(currentDate.getTime() + stepMs);
     if (--maxIterations <= 0) {
       break;
     }
+    currentDate = new Date(currentDate.getTime() + stepMs);
   }
   let nextDate = null;
   let countDate = 0;