@hebcal/icalendar 4.15.4 → 4.17.1

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/icalendar v4.15.4 */
+/*! @hebcal/icalendar v4.17.1 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -8,7 +8,7 @@ var murmurhash3 = require('murmurhash3');
 var restApi = require('@hebcal/rest-api');
 var fs = require('fs');
 
-var version="4.15.4";
+const version="4.17.1";
 
 const VTIMEZONE = {};
 const CATEGORY = {
@@ -123,7 +123,11 @@ class IcalEvent {
       const prefix = ev.getEmoji();
 
       if (prefix) {
-        subj = prefix + ' ' + subj;
+        if (mask & core.flags.OMER_COUNT) {
+          subj = subj + ' ' + prefix;
+        } else {
+          subj = prefix + ' ' + subj;
+        }
       }
     } // make subject safe for iCalendar
 
@@ -139,19 +143,32 @@ class IcalEvent {
     }
 
     this.subj = subj;
-    const isUserEvent = Boolean(mask & core.flags.USER_EVENT);
+    this.category = ev.category || CATEGORY[restApi.getEventCategories(ev)[0]];
+  }
+  /**
+   * @return {string}
+   */
 
-    if (ev.alarm) {
-      this.alarm = ev.alarm;
+
+  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)) {
+      evAlarm.setSeconds(0);
+      return 'TRIGGER;VALUE=DATE-TIME:' + IcalEvent.makeDtstamp(evAlarm);
     } else if (mask & core.flags.OMER_COUNT) {
-      this.alarm = '-P0DT3H30M0S'; // 8:30pm Omer alarm evening before
-    } else if (isUserEvent) {
-      this.alarm = '-P0DT12H0M0S'; // noon the day before
-    } else if (timed && ev.getDesc().startsWith('Candle lighting')) {
-      this.alarm = '-P0DT0H10M0S'; // ten minutes
+      return 'TRIGGER:-P0DT3H30M0S'; // 8:30pm Omer alarm evening before
+    } else if (mask & core.flags.USER_EVENT) {
+      return 'TRIGGER:-P0DT12H0M0S'; // noon the day before
+    } else if (this.timed && ev.getDesc().startsWith('Candle lighting')) {
+      return 'TRIGGER:-P0DT0H10M0S';
     }
 
-    this.category = ev.category || CATEGORY[restApi.getEventCategories(ev)[0]];
+    return null;
   }
   /**
    * @return {string}
@@ -206,8 +223,10 @@ class IcalEvent {
       arr.push('GEO:' + options.location.latitude + ';' + options.location.longitude);
     }
 
-    if (this.alarm) {
-      arr.push('BEGIN:VALARM', 'ACTION:DISPLAY', 'DESCRIPTION:This is an event reminder', `TRIGGER:${this.alarm}`, 'END:VALARM');
+    const trigger = this.getAlarm();
+
+    if (trigger) {
+      arr.push('BEGIN:VALARM', 'ACTION:DISPLAY', 'DESCRIPTION:Event reminder', `${trigger}`, 'END:VALARM');
     }
 
     arr.push('END:VEVENT');
@@ -377,6 +396,10 @@ 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 || '';
   }

package/dist/index.mjs

@@ -1,10 +1,10 @@
-/*! @hebcal/icalendar v4.15.4 */
-import { flags, Locale } from '@hebcal/core';
+/*! @hebcal/icalendar v4.17.1 */
+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';
 
-var version="4.15.4";
+const version="4.17.1";
 
 const VTIMEZONE = {};
 const CATEGORY = {
@@ -119,7 +119,11 @@ class IcalEvent {
       const prefix = ev.getEmoji();
 
       if (prefix) {
-        subj = prefix + ' ' + subj;
+        if (mask & flags.OMER_COUNT) {
+          subj = subj + ' ' + prefix;
+        } else {
+          subj = prefix + ' ' + subj;
+        }
       }
     } // make subject safe for iCalendar
 
@@ -135,19 +139,32 @@ class IcalEvent {
     }
 
     this.subj = subj;
-    const isUserEvent = Boolean(mask & flags.USER_EVENT);
+    this.category = ev.category || CATEGORY[getEventCategories(ev)[0]];
+  }
+  /**
+   * @return {string}
+   */
 
-    if (ev.alarm) {
-      this.alarm = ev.alarm;
+
+  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)) {
+      evAlarm.setSeconds(0);
+      return 'TRIGGER;VALUE=DATE-TIME:' + IcalEvent.makeDtstamp(evAlarm);
     } else if (mask & flags.OMER_COUNT) {
-      this.alarm = '-P0DT3H30M0S'; // 8:30pm Omer alarm evening before
-    } else if (isUserEvent) {
-      this.alarm = '-P0DT12H0M0S'; // noon the day before
-    } else if (timed && ev.getDesc().startsWith('Candle lighting')) {
-      this.alarm = '-P0DT0H10M0S'; // ten minutes
+      return 'TRIGGER:-P0DT3H30M0S'; // 8:30pm Omer alarm evening before
+    } else if (mask & flags.USER_EVENT) {
+      return 'TRIGGER:-P0DT12H0M0S'; // noon the day before
+    } else if (this.timed && ev.getDesc().startsWith('Candle lighting')) {
+      return 'TRIGGER:-P0DT0H10M0S';
     }
 
-    this.category = ev.category || CATEGORY[getEventCategories(ev)[0]];
+    return null;
   }
   /**
    * @return {string}
@@ -202,8 +219,10 @@ class IcalEvent {
       arr.push('GEO:' + options.location.latitude + ';' + options.location.longitude);
     }
 
-    if (this.alarm) {
-      arr.push('BEGIN:VALARM', 'ACTION:DISPLAY', 'DESCRIPTION:This is an event reminder', `TRIGGER:${this.alarm}`, 'END:VALARM');
+    const trigger = this.getAlarm();
+
+    if (trigger) {
+      arr.push('BEGIN:VALARM', 'ACTION:DISPLAY', 'DESCRIPTION:Event reminder', `${trigger}`, 'END:VALARM');
     }
 
     arr.push('END:VEVENT');
@@ -373,6 +392,10 @@ 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 || '';
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/icalendar",
-  "version": "4.15.4",
+  "version": "4.17.1",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "ical",
@@ -24,7 +24,7 @@
     "url": "https://github.com/hebcal/hebcal-icalendar/issues"
   },
   "dependencies": {
-    "@hebcal/core": "^3.33.3",
+    "@hebcal/core": "^3.36.0",
     "@hebcal/rest-api": "^3.13.0",
     "murmurhash3": "^0.5.0"
   },
@@ -48,18 +48,18 @@
     "verbose": true
   },
   "devDependencies": {
-    "@babel/core": "^7.17.5",
+    "@babel/core": "^7.17.9",
     "@babel/preset-env": "^7.16.11",
-    "@babel/register": "^7.17.0",
+    "@babel/register": "^7.17.7",
     "@rollup/plugin-babel": "^5.3.1",
-    "@rollup/plugin-commonjs": "^21.0.2",
+    "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.1.3",
-    "ava": "^4.1.0",
-    "eslint": "^8.10.0",
+    "@rollup/plugin-node-resolve": "^13.2.1",
+    "ava": "^4.2.0",
+    "eslint": "^8.14.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^3.6.10",
     "jsdoc-to-markdown": "^7.1.1",
-    "rollup": "^2.70.0"
+    "rollup": "^2.70.2"
   }
 }