@hebcal/icalendar 4.18.1 → 4.18.3

package/dist/index.js

@@ -1,14 +1,12 @@
-/*! @hebcal/icalendar v4.18.1 */
+/*! @hebcal/icalendar v4.18.3 */
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var core = require('@hebcal/core');
 var murmurhash3 = require('murmurhash3');
 var restApi = require('@hebcal/rest-api');
 var fs = require('fs');
 
-const version="4.18.1";
+const version="4.18.3";
 
 const VTIMEZONE = {};
 const CATEGORY = {
@@ -26,44 +24,41 @@ const CATEGORY = {
   user: 'Personal',
   zmanim: null
 };
+
 /**
  * @private
  * @param {string[]} arr
  * @param {string} key
  * @param {string} val
  */
-
 function addOptional(arr, key, val) {
   if (val) {
     const str = IcalEvent.escape(val);
     arr.push(key + ':' + str);
   }
 }
+
 /**
  * @private
  * @param {string} url
  * @param {HebrewCalendar.Options} options
  * @return {string}
  */
-
-
 function appendTrackingToUrl(url, options) {
   if (!url) {
     return null;
   }
-
   const utmSource = options.utmSource || 'js';
   const utmMedium = options.utmMedium || 'icalendar';
   const utmCampaign = options.utmCampaign;
   return restApi.appendIsraelAndTracking(url, options.il, utmSource, utmMedium, utmCampaign);
 }
-
 const encoder = new TextEncoder();
 const char74re = /(.{1,74})/g;
+
 /**
  * Represents an RFC 2445 iCalendar VEVENT
  */
-
 class IcalEvent {
   /**
    * Builds an IcalEvent object from a Hebcal Event
@@ -78,7 +73,6 @@ class IcalEvent {
     const locale = options.locale;
     let subj = restApi.shouldRenderBrief(ev) ? ev.renderBrief(locale) : ev.render(locale);
     const mask = ev.getFlags();
-
     if (ev.locationName) {
       this.locationName = ev.locationName;
     } else if (mask & core.flags.DAF_YOMI) {
@@ -89,39 +83,33 @@ class IcalEvent {
       const comma = options.location.name.indexOf(',');
       this.locationName = comma == -1 ? options.location.name : options.location.name.substring(0, comma);
     }
-
     const date = IcalEvent.formatYYYYMMDD(ev.getDate().greg());
     this.startDate = date;
     this.dtargs = '';
     this.transp = 'TRANSPARENT';
     this.busyStatus = 'FREE';
-
     if (timed) {
       let [hour, minute] = ev.eventTimeStr.split(':');
       hour = +hour;
       minute = +minute;
       this.startDate += 'T' + restApi.pad2(hour) + restApi.pad2(minute) + '00';
       this.endDate = this.startDate;
-
       if (options.location && options.location.tzid) {
         this.dtargs = `;TZID=${options.location.tzid}`;
       }
     } else {
-      this.endDate = IcalEvent.formatYYYYMMDD(ev.getDate().next().greg()); // for all-day untimed, use DTEND;VALUE=DATE intsead of DURATION:P1D.
+      this.endDate = IcalEvent.formatYYYYMMDD(ev.getDate().next().greg());
+      // for all-day untimed, use DTEND;VALUE=DATE intsead of DURATION:P1D.
       // It's more compatible with everthing except ancient versions of
       // Lotus Notes circa 2004
-
       this.dtargs = ';VALUE=DATE';
-
       if (mask & core.flags.CHAG) {
         this.transp = 'OPAQUE';
         this.busyStatus = 'OOF';
       }
     }
-
     if (options.emoji) {
       const prefix = ev.getEmoji();
-
       if (prefix) {
         if (mask & core.flags.OMER_COUNT) {
           subj = subj + ' ' + prefix;
@@ -129,32 +117,27 @@ class IcalEvent {
           subj = prefix + ' ' + subj;
         }
       }
-    } // make subject safe for iCalendar
-
+    }
 
+    // make subject safe for iCalendar
     subj = IcalEvent.escape(subj);
-
     if (options.appendHebrewToSubject) {
       const hebrew = ev.renderBrief('he');
-
       if (hebrew) {
         subj += ` / ${hebrew}`;
       }
     }
-
     this.subj = subj;
     this.category = ev.category || CATEGORY[restApi.getEventCategories(ev)[0]];
   }
+
   /**
    * @return {string}
    */
-
-
   getAlarm() {
     const ev = this.ev;
     const mask = ev.getFlags();
     const evAlarm = ev.alarm;
-
     if (typeof evAlarm === 'string') {
       return 'TRIGGER:' + evAlarm;
     } else if (core.greg.isDate(evAlarm)) {
@@ -167,19 +150,16 @@ class IcalEvent {
     } else if (this.timed && ev.getDesc().startsWith('Candle lighting')) {
       return 'TRIGGER:-P0DT0H10M0S';
     }
-
     return null;
   }
+
   /**
    * @return {string}
    */
-
-
   getUid() {
     const options = this.options;
     const digest = murmurhash3.murmur32HexSync(this.ev.getDesc());
     let uid = `hebcal-${this.startDate}-${digest}`;
-
     if (this.timed && options.location) {
       if (options.location.geoid) {
         uid += `-${options.location.geoid}`;
@@ -187,104 +167,85 @@ class IcalEvent {
         uid += '-' + restApi.makeAnchor(options.location.name);
       }
     }
-
     return uid;
   }
+
   /**
    * @return {string[]}
    */
-
-
   getLongLines() {
     if (this.lines) return this.lines;
     const categoryLine = this.category ? `CATEGORIES:${this.category}` : [];
     const uid = this.ev.uid || this.getUid();
     const arr = this.lines = ['BEGIN:VEVENT', `DTSTAMP:${this.dtstamp}`].concat(categoryLine).concat([`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 & core.flags.USER_EVENT);
-
     if (!isUserEvent) {
       arr.push('CLASS:PUBLIC');
     }
-
-    const options = this.options; // create memo (holiday descr, Torah, etc)
-
+    const options = this.options;
+    // create memo (holiday descr, Torah, etc)
     const memo = createMemo(ev, options);
     addOptional(arr, 'DESCRIPTION', memo);
     addOptional(arr, 'LOCATION', this.locationName);
-
     if (this.timed && options.location) {
       arr.push('GEO:' + options.location.latitude + ';' + options.location.longitude);
     }
-
     const trigger = this.getAlarm();
-
     if (trigger) {
       arr.push('BEGIN:VALARM', 'ACTION:DISPLAY', 'DESCRIPTION:Event reminder', `${trigger}`, 'END:VALARM');
     }
-
     arr.push('END:VEVENT');
     return arr;
   }
+
   /**
    * @return {string}
    */
-
-
   toString() {
     return this.getLines().join('\r\n');
   }
+
   /**
    * fold lines to 75 characters
    * @return {string[]}
    */
-
-
   getLines() {
     return this.getLongLines().map(IcalEvent.fold);
   }
+
   /**
    * fold line to 75 characters
    * @param {string} line
    * @return {string}
    */
-
-
   static fold(line) {
     let isASCII = true;
-
     for (let i = 0; i < line.length; i++) {
       if (line.charCodeAt(i) > 255) {
         isASCII = false;
         break;
       }
     }
-
     if (isASCII) {
       return line.length <= 74 ? line : line.match(char74re).join('\r\n ');
     }
-
     if (encoder.encode(line).length <= 74) {
       return line;
-    } // iterate unicode character by character, making sure
+    }
+    // iterate unicode character by character, making sure
     // that adding a new character would keep the line <= 75 octets
-
-
     let result = '';
     let current = '';
     let len = 0;
-
     for (let i = 0; i < line.length; i++) {
       const char = line[i];
       const octets = char.charCodeAt(0) < 256 ? 1 : encoder.encode(char).length;
       const newlen = len + octets;
-
       if (newlen < 75) {
         current += char;
         len = newlen;
@@ -296,176 +257,150 @@ class IcalEvent {
         i = -1;
       }
     }
-
     return result + current;
   }
+
   /**
    * @param {string} str
    * @return {string}
    */
-
-
   static escape(str) {
     if (str.indexOf(',') !== -1) {
       str = str.replace(/,/g, '\\,');
     }
-
     if (str.indexOf(';') !== -1) {
       str = str.replace(/;/g, '\\;');
     }
-
     return str;
   }
+
   /**
    * @param {Date} dt
    * @return {string}
    */
-
-
   static formatYYYYMMDD(dt) {
     return restApi.pad4(dt.getFullYear()) + restApi.pad2(dt.getMonth() + 1) + restApi.pad2(dt.getDate());
   }
+
   /**
    * Returns UTC string for iCalendar
    * @param {Date} dt
    * @return {string}
    */
-
-
   static makeDtstamp(dt) {
     const s = dt.toISOString();
     return s.slice(0, 4) + s.slice(5, 7) + s.slice(8, 13) + s.slice(14, 16) + s.slice(17, 19) + 'Z';
   }
-  /** @return {string} */
-
 
+  /** @return {string} */
   static version() {
     return version;
   }
-
 }
+
 /**
  * Transforms a single Event into a VEVENT string
  * @param {Event} ev
  * @param {HebrewCalendar.Options} options
  * @return {string} multi-line result, delimited by \r\n
  */
-
 function eventToIcal(ev, options) {
   const ical = new IcalEvent(ev, options);
   return ical.toString();
 }
 const torahMemoCache = new Map();
 const HOLIDAY_IGNORE_MASK = core.flags.DAF_YOMI | core.flags.OMER_COUNT | core.flags.SHABBAT_MEVARCHIM | core.flags.MOLAD | core.flags.USER_EVENT | core.flags.MISHNA_YOMI | core.flags.HEBREW_DATE;
+
 /**
  * @private
  * @param {Event} ev
  * @param {boolean} il
  * @return {string}
  */
-
 function makeTorahMemo(ev, il) {
-  if (ev.getFlags() & HOLIDAY_IGNORE_MASK) {
+  if (ev.getFlags() & HOLIDAY_IGNORE_MASK || ev.eventTime) {
     return '';
   }
-
   const hd = ev.getDate();
   const yy = hd.getFullYear();
   const mm = hd.getMonth();
   const dd = hd.getDate();
   const key = [yy, mm, dd, il ? '1' : '0', ev.getDesc()].join('-');
   let memo = torahMemoCache.get(key);
-
   if (typeof memo === 'string') {
     return memo;
   }
-
   memo = restApi.makeTorahMemoText(ev, il).replace(/\n/g, '\\n');
   torahMemoCache.set(key, memo);
   return memo;
 }
+
 /**
  * @private
  * @param {Event} e
  * @param {HebrewCalendar.Options} options
  * @return {string}
  */
-
-
 function createMemo(e, options) {
   const desc = e.getDesc();
   const candles = desc === 'Havdalah' || desc === 'Candle lighting';
-
   if (typeof e.memo === 'string' && e.memo.length && e.memo.indexOf('\n') !== -1) {
     e.memo = e.memo.replace(/\n/g, '\\n');
   }
-
   if (candles) {
     return e.memo || '';
   }
-
   const mask = e.getFlags();
-
   if (mask & core.flags.OMER_COUNT) {
     const sefira = [e.sefira('en'), e.sefira('he'), e.sefira('translit')].join('\\n');
     return e.getTodayIs('en') + '\\n\\n' + e.getTodayIs('he') + '\\n\\n' + sefira;
   }
-
   const url = appendTrackingToUrl(e.url(), options);
   const torahMemo = makeTorahMemo(e, options.il);
-
   if (mask & core.flags.PARSHA_HASHAVUA) {
     return torahMemo + '\\n\\n' + url;
   } else {
     let memo = e.memo || restApi.getHolidayDescription(e);
-
     if (!memo && typeof e.linkedEvent !== 'undefined') {
       memo = e.linkedEvent.render(options.locale);
     }
-
     if (torahMemo) {
       memo += '\\n\\n' + torahMemo;
     }
-
     if (url) {
       if (memo.length) {
         memo += '\\n\\n';
       }
-
       memo += url;
     }
-
     return memo;
   }
 }
+
 /**
  * Generates an RFC 2445 iCalendar string from an array of events
  * @param {Event[]} events
  * @param {HebrewCalendar.Options} options
  * @return {string}
  */
-
-
 async function eventsToIcalendar(events, options) {
   if (!events.length) throw new RangeError('Events can not be empty');
   if (!options) throw new TypeError('Invalid options object');
   const opts = Object.assign({}, options);
   opts.dtstamp = opts.dtstamp || IcalEvent.makeDtstamp(new Date());
-
   if (!opts.title) {
     opts.title = restApi.getCalendarTitle(events, opts);
   }
-
   const icals = events.map(ev => new IcalEvent(ev, opts));
   return icalEventsToString(icals, opts);
 }
+
 /**
  * Generates an RFC 2445 iCalendar string from an array of IcalEvents
  * @param {IcalEvent[]} icals
  * @param {HebrewCalendar.Options} options
  * @return {string}
  */
-
 async function icalEventsToString(icals, options) {
   const stream = [];
   const uclang = core.Locale.getLocaleName().toUpperCase();
@@ -476,55 +411,46 @@ async function icalEventsToString(icals, options) {
   const publishedTTL = opts.publishedTTL || 'PT7D';
   const prodid = opts.prodid || `-//hebcal.com/NONSGML Hebcal Calendar v1${version}//${uclang}`;
   const preamble = ['BEGIN:VCALENDAR', 'VERSION:2.0', `PRODID:${prodid}`, 'CALSCALE:GREGORIAN', 'METHOD:PUBLISH', 'X-LOTUS-CHARSET:UTF-8', `X-PUBLISHED-TTL:${publishedTTL}`, `X-WR-CALNAME:${title}`, `X-WR-CALDESC:${caldesc}`];
-
   for (const line of preamble.map(IcalEvent.fold)) {
     stream.push(line);
     stream.push('\r\n');
   }
-
   if (opts.relcalid) {
     stream.push(IcalEvent.fold(`X-WR-RELCALID:${opts.relcalid}`));
     stream.push('\r\n');
   }
-
   if (opts.calendarColor) {
     stream.push(`X-APPLE-CALENDAR-COLOR:${opts.calendarColor}\r\n`);
   }
-
   const location = opts.location;
-
   if (location && location.tzid) {
     const tzid = location.tzid;
     stream.push(`X-WR-TIMEZONE;VALUE=TEXT:${tzid}\r\n`);
-
     if (VTIMEZONE[tzid]) {
       stream.push(VTIMEZONE[tzid]);
       stream.push('\r\n');
     } else {
       const vtimezoneFilename = `./zoneinfo/${tzid}.ics`;
-
       try {
         const vtimezoneIcs = await fs.promises.readFile(vtimezoneFilename, 'utf-8');
-        const lines = vtimezoneIcs.split('\r\n'); // ignore first 3 and last 1 lines
-
+        const lines = vtimezoneIcs.split('\r\n');
+        // ignore first 3 and last 1 lines
         const str = lines.slice(3, lines.length - 2).join('\r\n');
         stream.push(str);
         stream.push('\r\n');
         VTIMEZONE[tzid] = str; // cache for later
-      } catch (error) {// ignore failure when no timezone definition to read
+      } catch (error) {
+        // ignore failure when no timezone definition to read
       }
     }
   }
-
   for (const ical of icals) {
     const lines = ical.getLines();
-
     for (const line of lines) {
       stream.push(line);
       stream.push('\r\n');
     }
   }
-
   stream.push('END:VCALENDAR\r\n');
   return stream.join('');
 }

package/dist/index.mjs

@@ -1,10 +1,10 @@
-/*! @hebcal/icalendar v4.18.1 */
+/*! @hebcal/icalendar v4.18.3 */
 import { flags, Locale, greg } from '@hebcal/core';
 import { murmur32HexSync } from 'murmurhash3';
 import { shouldRenderBrief, pad2, getEventCategories, makeAnchor, pad4, getHolidayDescription, getCalendarTitle, appendIsraelAndTracking, makeTorahMemoText } from '@hebcal/rest-api';
 import { promises } from 'fs';
 
-const version="4.18.1";
+const version="4.18.3";
 
 const VTIMEZONE = {};
 const CATEGORY = {
@@ -22,44 +22,41 @@ const CATEGORY = {
   user: 'Personal',
   zmanim: null
 };
+
 /**
  * @private
  * @param {string[]} arr
  * @param {string} key
  * @param {string} val
  */
-
 function addOptional(arr, key, val) {
   if (val) {
     const str = IcalEvent.escape(val);
     arr.push(key + ':' + str);
   }
 }
+
 /**
  * @private
  * @param {string} url
  * @param {HebrewCalendar.Options} options
  * @return {string}
  */
-
-
 function appendTrackingToUrl(url, options) {
   if (!url) {
     return null;
   }
-
   const utmSource = options.utmSource || 'js';
   const utmMedium = options.utmMedium || 'icalendar';
   const utmCampaign = options.utmCampaign;
   return appendIsraelAndTracking(url, options.il, utmSource, utmMedium, utmCampaign);
 }
-
 const encoder = new TextEncoder();
 const char74re = /(.{1,74})/g;
+
 /**
  * Represents an RFC 2445 iCalendar VEVENT
  */
-
 class IcalEvent {
   /**
    * Builds an IcalEvent object from a Hebcal Event
@@ -74,7 +71,6 @@ class IcalEvent {
     const locale = options.locale;
     let subj = shouldRenderBrief(ev) ? ev.renderBrief(locale) : ev.render(locale);
     const mask = ev.getFlags();
-
     if (ev.locationName) {
       this.locationName = ev.locationName;
     } else if (mask & flags.DAF_YOMI) {
@@ -85,39 +81,33 @@ class IcalEvent {
       const comma = options.location.name.indexOf(',');
       this.locationName = comma == -1 ? options.location.name : options.location.name.substring(0, comma);
     }
-
     const date = IcalEvent.formatYYYYMMDD(ev.getDate().greg());
     this.startDate = date;
     this.dtargs = '';
     this.transp = 'TRANSPARENT';
     this.busyStatus = 'FREE';
-
     if (timed) {
       let [hour, minute] = ev.eventTimeStr.split(':');
       hour = +hour;
       minute = +minute;
       this.startDate += 'T' + pad2(hour) + pad2(minute) + '00';
       this.endDate = this.startDate;
-
       if (options.location && options.location.tzid) {
         this.dtargs = `;TZID=${options.location.tzid}`;
       }
     } else {
-      this.endDate = IcalEvent.formatYYYYMMDD(ev.getDate().next().greg()); // for all-day untimed, use DTEND;VALUE=DATE intsead of DURATION:P1D.
+      this.endDate = IcalEvent.formatYYYYMMDD(ev.getDate().next().greg());
+      // for all-day untimed, use DTEND;VALUE=DATE intsead of DURATION:P1D.
       // It's more compatible with everthing except ancient versions of
       // Lotus Notes circa 2004
-
       this.dtargs = ';VALUE=DATE';
-
       if (mask & flags.CHAG) {
         this.transp = 'OPAQUE';
         this.busyStatus = 'OOF';
       }
     }
-
     if (options.emoji) {
       const prefix = ev.getEmoji();
-
       if (prefix) {
         if (mask & flags.OMER_COUNT) {
           subj = subj + ' ' + prefix;
@@ -125,32 +115,27 @@ class IcalEvent {
           subj = prefix + ' ' + subj;
         }
       }
-    } // make subject safe for iCalendar
-
+    }
 
+    // make subject safe for iCalendar
     subj = IcalEvent.escape(subj);
-
     if (options.appendHebrewToSubject) {
       const hebrew = ev.renderBrief('he');
-
       if (hebrew) {
         subj += ` / ${hebrew}`;
       }
     }
-
     this.subj = subj;
     this.category = ev.category || CATEGORY[getEventCategories(ev)[0]];
   }
+
   /**
    * @return {string}
    */
-
-
   getAlarm() {
     const ev = this.ev;
     const mask = ev.getFlags();
     const evAlarm = ev.alarm;
-
     if (typeof evAlarm === 'string') {
       return 'TRIGGER:' + evAlarm;
     } else if (greg.isDate(evAlarm)) {
@@ -163,19 +148,16 @@ class IcalEvent {
     } else if (this.timed && ev.getDesc().startsWith('Candle lighting')) {
       return 'TRIGGER:-P0DT0H10M0S';
     }
-
     return null;
   }
+
   /**
    * @return {string}
    */
-
-
   getUid() {
     const options = this.options;
     const digest = murmur32HexSync(this.ev.getDesc());
     let uid = `hebcal-${this.startDate}-${digest}`;
-
     if (this.timed && options.location) {
       if (options.location.geoid) {
         uid += `-${options.location.geoid}`;
@@ -183,104 +165,85 @@ class IcalEvent {
         uid += '-' + makeAnchor(options.location.name);
       }
     }
-
     return uid;
   }
+
   /**
    * @return {string[]}
    */
-
-
   getLongLines() {
     if (this.lines) return this.lines;
     const categoryLine = this.category ? `CATEGORIES:${this.category}` : [];
     const uid = this.ev.uid || this.getUid();
     const arr = this.lines = ['BEGIN:VEVENT', `DTSTAMP:${this.dtstamp}`].concat(categoryLine).concat([`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);
-
     if (!isUserEvent) {
       arr.push('CLASS:PUBLIC');
     }
-
-    const options = this.options; // create memo (holiday descr, Torah, etc)
-
+    const options = this.options;
+    // create memo (holiday descr, Torah, etc)
     const memo = createMemo(ev, options);
     addOptional(arr, 'DESCRIPTION', memo);
     addOptional(arr, 'LOCATION', this.locationName);
-
     if (this.timed && options.location) {
       arr.push('GEO:' + options.location.latitude + ';' + options.location.longitude);
     }
-
     const trigger = this.getAlarm();
-
     if (trigger) {
       arr.push('BEGIN:VALARM', 'ACTION:DISPLAY', 'DESCRIPTION:Event reminder', `${trigger}`, 'END:VALARM');
     }
-
     arr.push('END:VEVENT');
     return arr;
   }
+
   /**
    * @return {string}
    */
-
-
   toString() {
     return this.getLines().join('\r\n');
   }
+
   /**
    * fold lines to 75 characters
    * @return {string[]}
    */
-
-
   getLines() {
     return this.getLongLines().map(IcalEvent.fold);
   }
+
   /**
    * fold line to 75 characters
    * @param {string} line
    * @return {string}
    */
-
-
   static fold(line) {
     let isASCII = true;
-
     for (let i = 0; i < line.length; i++) {
       if (line.charCodeAt(i) > 255) {
         isASCII = false;
         break;
       }
     }
-
     if (isASCII) {
       return line.length <= 74 ? line : line.match(char74re).join('\r\n ');
     }
-
     if (encoder.encode(line).length <= 74) {
       return line;
-    } // iterate unicode character by character, making sure
+    }
+    // iterate unicode character by character, making sure
     // that adding a new character would keep the line <= 75 octets
-
-
     let result = '';
     let current = '';
     let len = 0;
-
     for (let i = 0; i < line.length; i++) {
       const char = line[i];
       const octets = char.charCodeAt(0) < 256 ? 1 : encoder.encode(char).length;
       const newlen = len + octets;
-
       if (newlen < 75) {
         current += char;
         len = newlen;
@@ -292,176 +255,150 @@ class IcalEvent {
         i = -1;
       }
     }
-
     return result + current;
   }
+
   /**
    * @param {string} str
    * @return {string}
    */
-
-
   static escape(str) {
     if (str.indexOf(',') !== -1) {
       str = str.replace(/,/g, '\\,');
     }
-
     if (str.indexOf(';') !== -1) {
       str = str.replace(/;/g, '\\;');
     }
-
     return str;
   }
+
   /**
    * @param {Date} dt
    * @return {string}
    */
-
-
   static formatYYYYMMDD(dt) {
     return pad4(dt.getFullYear()) + pad2(dt.getMonth() + 1) + pad2(dt.getDate());
   }
+
   /**
    * Returns UTC string for iCalendar
    * @param {Date} dt
    * @return {string}
    */
-
-
   static makeDtstamp(dt) {
     const s = dt.toISOString();
     return s.slice(0, 4) + s.slice(5, 7) + s.slice(8, 13) + s.slice(14, 16) + s.slice(17, 19) + 'Z';
   }
-  /** @return {string} */
-
 
+  /** @return {string} */
   static version() {
     return version;
   }
-
 }
+
 /**
  * Transforms a single Event into a VEVENT string
  * @param {Event} ev
  * @param {HebrewCalendar.Options} options
  * @return {string} multi-line result, delimited by \r\n
  */
-
 function eventToIcal(ev, options) {
   const ical = new IcalEvent(ev, options);
   return ical.toString();
 }
 const torahMemoCache = new Map();
 const HOLIDAY_IGNORE_MASK = flags.DAF_YOMI | flags.OMER_COUNT | flags.SHABBAT_MEVARCHIM | flags.MOLAD | flags.USER_EVENT | flags.MISHNA_YOMI | flags.HEBREW_DATE;
+
 /**
  * @private
  * @param {Event} ev
  * @param {boolean} il
  * @return {string}
  */
-
 function makeTorahMemo(ev, il) {
-  if (ev.getFlags() & HOLIDAY_IGNORE_MASK) {
+  if (ev.getFlags() & HOLIDAY_IGNORE_MASK || ev.eventTime) {
     return '';
   }
-
   const hd = ev.getDate();
   const yy = hd.getFullYear();
   const mm = hd.getMonth();
   const dd = hd.getDate();
   const key = [yy, mm, dd, il ? '1' : '0', ev.getDesc()].join('-');
   let memo = torahMemoCache.get(key);
-
   if (typeof memo === 'string') {
     return memo;
   }
-
   memo = makeTorahMemoText(ev, il).replace(/\n/g, '\\n');
   torahMemoCache.set(key, memo);
   return memo;
 }
+
 /**
  * @private
  * @param {Event} e
  * @param {HebrewCalendar.Options} options
  * @return {string}
  */
-
-
 function createMemo(e, options) {
   const desc = e.getDesc();
   const candles = desc === 'Havdalah' || desc === 'Candle lighting';
-
   if (typeof e.memo === 'string' && e.memo.length && e.memo.indexOf('\n') !== -1) {
     e.memo = e.memo.replace(/\n/g, '\\n');
   }
-
   if (candles) {
     return e.memo || '';
   }
-
   const mask = e.getFlags();
-
   if (mask & flags.OMER_COUNT) {
     const sefira = [e.sefira('en'), e.sefira('he'), e.sefira('translit')].join('\\n');
     return e.getTodayIs('en') + '\\n\\n' + e.getTodayIs('he') + '\\n\\n' + sefira;
   }
-
   const url = appendTrackingToUrl(e.url(), options);
   const torahMemo = makeTorahMemo(e, options.il);
-
   if (mask & flags.PARSHA_HASHAVUA) {
     return torahMemo + '\\n\\n' + url;
   } else {
     let memo = e.memo || getHolidayDescription(e);
-
     if (!memo && typeof e.linkedEvent !== 'undefined') {
       memo = e.linkedEvent.render(options.locale);
     }
-
     if (torahMemo) {
       memo += '\\n\\n' + torahMemo;
     }
-
     if (url) {
       if (memo.length) {
         memo += '\\n\\n';
       }
-
       memo += url;
     }
-
     return memo;
   }
 }
+
 /**
  * Generates an RFC 2445 iCalendar string from an array of events
  * @param {Event[]} events
  * @param {HebrewCalendar.Options} options
  * @return {string}
  */
-
-
 async function eventsToIcalendar(events, options) {
   if (!events.length) throw new RangeError('Events can not be empty');
   if (!options) throw new TypeError('Invalid options object');
   const opts = Object.assign({}, options);
   opts.dtstamp = opts.dtstamp || IcalEvent.makeDtstamp(new Date());
-
   if (!opts.title) {
     opts.title = getCalendarTitle(events, opts);
   }
-
   const icals = events.map(ev => new IcalEvent(ev, opts));
   return icalEventsToString(icals, opts);
 }
+
 /**
  * Generates an RFC 2445 iCalendar string from an array of IcalEvents
  * @param {IcalEvent[]} icals
  * @param {HebrewCalendar.Options} options
  * @return {string}
  */
-
 async function icalEventsToString(icals, options) {
   const stream = [];
   const uclang = Locale.getLocaleName().toUpperCase();
@@ -472,55 +409,46 @@ async function icalEventsToString(icals, options) {
   const publishedTTL = opts.publishedTTL || 'PT7D';
   const prodid = opts.prodid || `-//hebcal.com/NONSGML Hebcal Calendar v1${version}//${uclang}`;
   const preamble = ['BEGIN:VCALENDAR', 'VERSION:2.0', `PRODID:${prodid}`, 'CALSCALE:GREGORIAN', 'METHOD:PUBLISH', 'X-LOTUS-CHARSET:UTF-8', `X-PUBLISHED-TTL:${publishedTTL}`, `X-WR-CALNAME:${title}`, `X-WR-CALDESC:${caldesc}`];
-
   for (const line of preamble.map(IcalEvent.fold)) {
     stream.push(line);
     stream.push('\r\n');
   }
-
   if (opts.relcalid) {
     stream.push(IcalEvent.fold(`X-WR-RELCALID:${opts.relcalid}`));
     stream.push('\r\n');
   }
-
   if (opts.calendarColor) {
     stream.push(`X-APPLE-CALENDAR-COLOR:${opts.calendarColor}\r\n`);
   }
-
   const location = opts.location;
-
   if (location && location.tzid) {
     const tzid = location.tzid;
     stream.push(`X-WR-TIMEZONE;VALUE=TEXT:${tzid}\r\n`);
-
     if (VTIMEZONE[tzid]) {
       stream.push(VTIMEZONE[tzid]);
       stream.push('\r\n');
     } else {
       const vtimezoneFilename = `./zoneinfo/${tzid}.ics`;
-
       try {
         const vtimezoneIcs = await promises.readFile(vtimezoneFilename, 'utf-8');
-        const lines = vtimezoneIcs.split('\r\n'); // ignore first 3 and last 1 lines
-
+        const lines = vtimezoneIcs.split('\r\n');
+        // ignore first 3 and last 1 lines
         const str = lines.slice(3, lines.length - 2).join('\r\n');
         stream.push(str);
         stream.push('\r\n');
         VTIMEZONE[tzid] = str; // cache for later
-      } catch (error) {// ignore failure when no timezone definition to read
+      } catch (error) {
+        // ignore failure when no timezone definition to read
       }
     }
   }
-
   for (const ical of icals) {
     const lines = ical.getLines();
-
     for (const line of lines) {
       stream.push(line);
       stream.push('\r\n');
     }
   }
-
   stream.push('END:VCALENDAR\r\n');
   return stream.join('');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/icalendar",
-  "version": "4.18.1",
+  "version": "4.18.3",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "ical",
@@ -24,8 +24,8 @@
     "url": "https://github.com/hebcal/hebcal-icalendar/issues"
   },
   "dependencies": {
-    "@hebcal/core": "^3.42.2",
-    "@hebcal/rest-api": "^4.0.0",
+    "@hebcal/core": "^3.45.5",
+    "@hebcal/rest-api": "^4.3.6",
     "murmurhash3": "^0.5.0"
   },
   "scripts": {
@@ -48,17 +48,17 @@
     "verbose": true
   },
   "devDependencies": {
-    "@babel/core": "^7.18.13",
-    "@babel/preset-env": "^7.18.10",
+    "@babel/core": "^7.20.2",
+    "@babel/preset-env": "^7.20.2",
     "@babel/register": "^7.18.9",
-    "@rollup/plugin-babel": "^5.3.1",
-    "@rollup/plugin-commonjs": "^22.0.2",
-    "@rollup/plugin-json": "^4.1.0",
-    "ava": "^4.3.1",
-    "eslint": "^8.22.0",
+    "@rollup/plugin-babel": "^6.0.2",
+    "@rollup/plugin-commonjs": "^23.0.2",
+    "@rollup/plugin-json": "^5.0.1",
+    "ava": "^5.0.1",
+    "eslint": "^8.27.0",
     "eslint-config-google": "^0.14.0",
-    "jsdoc": "^3.6.11",
+    "jsdoc": "^4.0.0",
     "jsdoc-to-markdown": "^7.1.1",
-    "rollup": "^2.78.1"
+    "rollup": "^3.3.0"
   }
 }