@hebcal/icalendar 7.0.4 → 7.0.6

package/dist/foldLine.js

@@ -49,9 +49,7 @@ export function foldLine(line) {
     // lineBytes/74 of them, so we ask it about those offsets via
     // `containing()` rather than iterating every cluster in the line --
     // the same fold points for a fraction of the work.
-    if (!foldSegmenter) {
-        foldSegmenter = new Intl.Segmenter('en', { granularity: 'grapheme' });
-    }
+    foldSegmenter ??= new Intl.Segmenter('en', { granularity: 'grapheme' });
     const segments = foldSegmenter.segment(line);
     const parts = [];
     const n = line.length;

package/dist/icalendar.d.ts

@@ -1,5 +1,5 @@
-import { Event } from '@hebcal/core/dist/esm/event';
-import { CalOptions } from '@hebcal/core/dist/esm/CalOptions';
+import type { Event } from '@hebcal/core/dist/esm/event';
+import type { CalOptions } from '@hebcal/core/dist/esm/CalOptions';
 export type ICalEventOptions = {
     dtstamp?: string;
     sequence?: number;

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';
@@ -27,6 +26,14 @@ const CATEGORY = {
     user: 'Personal',
     zmanim: null,
 };
+/**
+ * Narrows `isDate()` from `@hebcal/hdate` (which returns a plain boolean)
+ * into a type guard.
+ * @private
+ */
+function isDateObj(obj) {
+    return isDate(obj);
+}
 /**
  * @private
  */
@@ -52,13 +59,8 @@ function appendTrackingToUrl(url, options) {
     }
     const utmMedium = options.utmMedium || 'icalendar';
     const utmCampaign = options.utmCampaign;
-    return appendIsraelAndTracking(url, options.il, utmSource, utmMedium, utmCampaign);
+    return appendIsraelAndTracking(url, Boolean(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';
@@ -117,7 +119,6 @@ export class IcalEvent {
         const opts = { ...options };
         this.options = opts;
         this.dtstamp = opts.dtstamp || IcalEvent.makeDtstamp(new Date());
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const ev0 = ev;
         if (typeof ev0.sequence === 'number') {
             this.sequence = ev0.sequence;
@@ -131,14 +132,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();
@@ -161,7 +162,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';
             }
@@ -169,7 +170,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 {
@@ -187,28 +188,27 @@ export class IcalEvent {
         }
         this.subj = subj;
         this.category =
-            ev0.category ||
-                (CATEGORY[getEventCategories(ev)?.[0]] ?? null);
+            ev0.category || (CATEGORY[getEventCategories(ev)[0]] ?? null);
     }
     getAlarm() {
         const ev = this.ev;
-        const mask = ev.getFlags();
         const evAlarm = ev.alarm;
         if (typeof evAlarm === 'string') {
             return 'TRIGGER:' + evAlarm;
         }
-        else if (typeof evAlarm === 'boolean' && !evAlarm) {
+        else if (evAlarm === false) {
             return null;
         }
-        else if (isDate(evAlarm)) {
-            const alarmDt = evAlarm;
+        else if (isDateObj(evAlarm)) {
+            // copy so we don't mutate the caller's Date
+            const alarmDt = new Date(evAlarm);
             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')) {
@@ -217,20 +217,21 @@ export class IcalEvent {
         return null;
     }
     getUid() {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        let uid = this.ev.uid;
-        if (uid) {
-            return uid;
+        const ev = this.ev;
+        if (ev.uid) {
+            return ev.uid;
         }
-        const digest = murmur32HexSync(this.ev.getDesc());
-        uid = `hebcal-${this.isoDateOnly}-${digest}`;
+        const digest = murmur32HexSync(ev.getDesc());
+        let uid = `hebcal-${this.isoDateOnly}-${digest}`;
         const loc = this.options.location;
         if (this.timed && loc) {
-            if (loc.getGeoId()) {
-                uid += `-${loc.getGeoId()}`;
+            const geoId = loc.getGeoId();
+            const name = loc.getName();
+            if (geoId) {
+                uid += `-${geoId}`;
             }
-            else if (loc.getName()) {
-                uid += '-' + makeAnchor(loc.getName());
+            else if (name) {
+                uid += '-' + makeAnchor(name);
             }
         }
         return uid;
@@ -238,27 +239,24 @@ export class IcalEvent {
     getLongLines() {
         if (this.lines)
             return this.lines;
-        const categoryLine = this.category ? [`CATEGORIES:${this.category}`] : [];
         const uid = this.getUid();
-        if (this.sequence) {
-            categoryLine.unshift(`SEQUENCE:${this.sequence}`);
-        }
-        const arr = (this.lines = ['BEGIN:VEVENT', `DTSTAMP:${this.dtstamp}`]
-            .concat(categoryLine)
-            .concat([
+        const arr = (this.lines = [
+            'BEGIN:VEVENT',
+            `DTSTAMP:${this.dtstamp}`,
+            ...(this.sequence ? [`SEQUENCE:${this.sequence}`] : []),
+            ...(this.category ? [`CATEGORIES:${this.category}`] : []),
             `SUMMARY:${this.subj}`,
             `DTSTART${this.dtargs}:${this.startDate}`,
             `DTEND${this.dtargs}:${this.endDate}`,
             `UID:${uid}`,
             `TRANSP:${this.transp}`,
             `X-MICROSOFT-CDO-BUSYSTATUS:${this.busyStatus}`,
-        ]));
+        ]);
         if (!this.timed) {
             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');
         }
@@ -285,7 +283,7 @@ export class IcalEvent {
         }
         const trigger = this.getAlarm();
         if (trigger) {
-            arr.push('BEGIN:VALARM', 'ACTION:DISPLAY', 'DESCRIPTION:Event reminder', `${trigger}`, 'END:VALARM');
+            arr.push('BEGIN:VALARM', 'ACTION:DISPLAY', 'DESCRIPTION:Event reminder', trigger, 'END:VALARM');
         }
         arr.push('END:VEVENT');
         return arr;

package/dist/pkgVersion.d.ts

@@ -1 +1 @@
-export declare const version = "7.0.4";
+export declare const version = "7.0.6";

package/dist/pkgVersion.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/icalendar",
-  "version": "7.0.4",
+  "version": "7.0.6",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "ical",
@@ -30,17 +30,18 @@
   },
   "homepage": "https://hebcal.github.io/api/icalendar/",
   "dependencies": {
-    "@hebcal/core": "^6.9.3",
-    "@hebcal/hdate": "^0.22.8",
+    "@hebcal/core": "^6.13.0",
+    "@hebcal/hdate": "^0.23.0",
     "@hebcal/murmurhash3": "^1.0.0",
-    "@hebcal/rest-api": "^7.1.3"
+    "@hebcal/rest-api": "^7.2.1"
   },
   "scripts": {
     "build:version": "node ./version.js package.json src/pkgVersion.ts",
     "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.11.3",
-    "@types/node": "26.6.2",
-    "oxlint": "^1.83.0",
-    "prettier": "^3.9.8",
+    "@hebcal/learning": "^6.12.0",
+    "@types/node": "26.6.4",
+    "oxlint": "^1.86.0",
+    "prettier": "^3.9.9",
     "typescript": "^7.0.2",
-    "vitest": "^5.0.1"
+    "vitest": "^5.0.3"
   }
 }