@hebcal/icalendar 7.0.3 → 7.0.5

package/dist/icalendar.js

@@ -1,4 +1,3 @@
-import { flags } from '@hebcal/core/dist/esm/event';
 import { Locale } from '@hebcal/core/dist/esm/locale';
 import { murmur32HexSync } from '@hebcal/murmurhash3';
 import { pad2, pad4, isDate } from '@hebcal/hdate';
@@ -54,11 +53,37 @@ function appendTrackingToUrl(url, options) {
     const utmCampaign = options.utmCampaign;
     return appendIsraelAndTracking(url, options.il, utmSource, utmMedium, utmCampaign);
 }
-const DAILY_LEARNING = flags.DAILY_LEARNING |
-    flags.DAF_YOMI |
-    flags.MISHNA_YOMI |
-    flags.YERUSHALMI_YOMI |
-    flags.NACH_YOMI;
+/** Formats a date-time string as `YYYYMMDDTHHMMSS` */
+function rfc5545DateTime(dt, hour, minute) {
+    return IcalEvent.formatYYYYMMDD(dt) + 'T' + pad2(hour) + pad2(minute) + '00';
+}
+/**
+ * Computes the DTSTART/DTEND date-time strings (in `YYYYMMDDTHHMMSS`
+ * format) for a timed event, adding `duration` minutes (if any) to the
+ * wall-clock start time. Adding to the wall clock (rather than to the
+ * underlying instant) keeps the result in the same timezone as DTSTART
+ * regardless of the host machine's own local timezone.
+ * @private
+ */
+function formatTimedStartEnd(ev) {
+    const [hourStr, minuteStr] = ev.eventTimeStr.split(':');
+    const hour = +hourStr;
+    const minute = +minuteStr;
+    const dt = ev.greg();
+    const startDate = rfc5545DateTime(dt, hour, minute);
+    if (!ev.duration) {
+        return { startDate, endDate: startDate };
+    }
+    const totalMinutes = hour * 60 + minute + ev.duration;
+    const endHour = Math.floor(totalMinutes / 60) % 24;
+    const endMinute = totalMinutes % 60;
+    const dayOffset = Math.floor(totalMinutes / 1440);
+    if (dayOffset) {
+        dt.setDate(dt.getDate() + dayOffset);
+    }
+    const endDate = rfc5545DateTime(dt, endHour, endMinute);
+    return { startDate, endDate };
+}
 /**
  * Represents an RFC 2445 iCalendar VEVENT
  */
@@ -100,14 +125,14 @@ export class IcalEvent {
         let subj = shouldRenderBrief(ev)
             ? ev.renderBrief(locale)
             : ev.render(locale);
-        const mask = ev.getFlags();
         if (ev0.locationName) {
             this.locationName = ev0.locationName;
         }
         else if (timed && location) {
             this.locationName = location.getShortName();
         }
-        else if (mask & DAILY_LEARNING && ev0.category) {
+        else if (ev.hasAnyFlag('DAILY_LEARNING', 'DAF_YOMI', 'MISHNA_YOMI', 'YERUSHALMI_YOMI', 'NACH_YOMI') &&
+            ev0.category) {
             this.locationName = Locale.gettext(ev0.category, locale);
         }
         const hd = ev.getDate();
@@ -117,11 +142,9 @@ export class IcalEvent {
         this.transp = 'TRANSPARENT';
         this.busyStatus = 'FREE';
         if (timed) {
-            let [hour, minute] = ev0.eventTimeStr.split(':');
-            hour = +hour;
-            minute = +minute;
-            this.startDate += 'T' + pad2(hour) + pad2(minute) + '00';
-            this.endDate = this.startDate;
+            const { startDate, endDate } = formatTimedStartEnd(ev);
+            this.startDate = startDate;
+            this.endDate = endDate;
             if (location?.getTzid()) {
                 this.dtargs = `;TZID=${location.getTzid()}`;
             }
@@ -132,7 +155,7 @@ export class IcalEvent {
             // It's more compatible with everthing except ancient versions of
             // Lotus Notes circa 2004
             this.dtargs = ';VALUE=DATE';
-            if (mask & flags.CHAG) {
+            if (ev.hasFlag('CHAG')) {
                 this.transp = 'OPAQUE';
                 this.busyStatus = 'OOF';
             }
@@ -140,7 +163,7 @@ export class IcalEvent {
         if (opts.emoji) {
             const prefix = ev.getEmoji();
             if (prefix) {
-                if (mask & flags.OMER_COUNT) {
+                if (ev.hasFlag('OMER_COUNT')) {
                     subj = subj + ' ' + prefix;
                 }
                 else {
@@ -163,7 +186,6 @@ export class IcalEvent {
     }
     getAlarm() {
         const ev = this.ev;
-        const mask = ev.getFlags();
         const evAlarm = ev.alarm;
         if (typeof evAlarm === 'string') {
             return 'TRIGGER:' + evAlarm;
@@ -176,10 +198,10 @@ export class IcalEvent {
             alarmDt.setSeconds(0);
             return 'TRIGGER;VALUE=DATE-TIME:' + IcalEvent.makeDtstamp(alarmDt);
         }
-        else if (mask & flags.OMER_COUNT) {
+        else if (ev.hasFlag('OMER_COUNT')) {
             return 'TRIGGER:-P0DT3H30M0S'; // 8:30pm Omer alarm evening before
         }
-        else if (mask & flags.USER_EVENT) {
+        else if (ev.hasFlag('USER_EVENT')) {
             return 'TRIGGER:-P0DT12H0M0S'; // noon the day before
         }
         else if (this.timed && ev.getDesc().startsWith('Candle lighting')) {
@@ -228,8 +250,7 @@ export class IcalEvent {
             arr.push('X-MICROSOFT-CDO-ALLDAYEVENT:TRUE');
         }
         const ev = this.ev;
-        const mask = ev.getFlags();
-        const isUserEvent = Boolean(mask & flags.USER_EVENT);
+        const isUserEvent = ev.hasFlag('USER_EVENT');
         if (!isUserEvent) {
             arr.push('CLASS:PUBLIC');
         }

package/dist/pkgVersion.d.ts

@@ -1 +1 @@
-export declare const version = "7.0.3";
+export declare const version = "7.0.5";

package/dist/pkgVersion.js

@@ -1,2 +1,2 @@
 // DO NOT EDIT THIS AUTO-GENERATED FILE!
-export const version = '7.0.3';
+export const version = '7.0.5';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/icalendar",
-  "version": "7.0.3",
+  "version": "7.0.5",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "ical",
@@ -30,8 +30,8 @@
   },
   "homepage": "https://hebcal.github.io/api/icalendar/",
   "dependencies": {
-    "@hebcal/core": "^6.9.1",
-    "@hebcal/hdate": "^0.22.7",
+    "@hebcal/core": "^6.10.0",
+    "@hebcal/hdate": "^0.22.8",
     "@hebcal/murmurhash3": "^1.0.0",
     "@hebcal/rest-api": "^7.1.3"
   },
@@ -40,7 +40,8 @@
     "build": "npm run build:version && tsc",
     "pretest": "npm run build",
     "docs": "npx -y typedoc",
-    "test": "vitest",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "lint": "oxlint && prettier --check .",
     "clean": "rm -rf dist",
     "compile": "tsc",
@@ -48,11 +49,11 @@
   },
   "license": "BSD-2-Clause",
   "devDependencies": {
-    "@hebcal/learning": "^6.9.7",
-    "@types/node": "26.2.0",
-    "oxlint": "^1.77.0",
-    "prettier": "^3.9.6",
+    "@hebcal/learning": "^6.11.3",
+    "@types/node": "26.6.3",
+    "oxlint": "^1.86.0",
+    "prettier": "^3.9.9",
     "typescript": "^7.0.2",
-    "vitest": "^4.1.10"
+    "vitest": "^5.0.2"
   }
 }