@hebcal/icalendar 5.0.0 → 5.0.2

package/dist/{index.js → index.cjs}

@@ -1,4 +1,4 @@
-/*! @hebcal/icalendar v5.0.0 */
+/*! @hebcal/icalendar v5.0.2 */
 'use strict';
 
 var core = require('@hebcal/core');
@@ -6,7 +6,8 @@ var murmurhash3 = require('murmurhash3');
 var restApi = require('@hebcal/rest-api');
 var fs = require('fs');
 
-const version="5.0.0";
+// DO NOT EDIT THIS AUTO-GENERATED FILE!
+const version = '5.0.2';
 
 const VTIMEZONE = {};
 const CATEGORY = {
@@ -24,7 +25,7 @@ const CATEGORY = {
   parashat: 'Parsha',
   roshchodesh: 'Holiday',
   user: 'Personal',
-  zmanim: null
+  zmanim: null,
 };
 
 /**
@@ -53,8 +54,10 @@ function appendTrackingToUrl(url, options) {
   const utmSource = options.utmSource || 'js';
   const utmMedium = options.utmMedium || 'icalendar';
   const utmCampaign = options.utmCampaign;
-  return restApi.appendIsraelAndTracking(url, options.il, utmSource, utmMedium, utmCampaign);
+  return restApi.appendIsraelAndTracking(url,
+      options.il, utmSource, utmMedium, utmCampaign);
 }
+
 const encoder = new TextEncoder();
 const char74re = /(.{1,74})/g;
 
@@ -67,7 +70,7 @@ class IcalEvent {
    * @param {Event} ev
    * @param {CalOptions} options
    */
-  constructor(ev, options = {}) {
+  constructor(ev, options={}) {
     this.ev = ev;
     this.options = options;
     this.dtstamp = options.dtstamp || IcalEvent.makeDtstamp(new Date());
@@ -94,7 +97,7 @@ class IcalEvent {
       this.locationName = options.location.getShortName();
     }
     const date = IcalEvent.formatYYYYMMDD(ev.getDate().greg());
-    this.startDate = date;
+    this.startDate = this.isoDateOnly = date;
     this.dtargs = '';
     this.transp = 'TRANSPARENT';
     this.busyStatus = 'FREE';
@@ -118,6 +121,7 @@ class IcalEvent {
         this.busyStatus = 'OOF';
       }
     }
+
     if (options.emoji) {
       const prefix = ev.getEmoji();
       if (prefix) {
@@ -131,6 +135,7 @@ class IcalEvent {
 
     // make subject safe for iCalendar
     subj = IcalEvent.escape(subj);
+
     if (options.appendHebrewToSubject) {
       const hebrew = ev.renderBrief('he');
       if (hebrew) {
@@ -138,9 +143,10 @@ class IcalEvent {
       }
     }
     this.subj = subj;
-    this.category = ev.category || CATEGORY[restApi.getEventCategories(ev)[0]];
+    this.category = ev.category || CATEGORY[restApi.getEventCategories(ev)?.[0]];
   }
 
+
   /**
    * @return {string}
    */
@@ -171,7 +177,7 @@ class IcalEvent {
   getUid() {
     const options = this.options;
     const digest = murmurhash3.murmur32HexSync(this.ev.getDesc());
-    let uid = `hebcal-${this.startDate}-${digest}`;
+    let uid = `hebcal-${this.isoDateOnly}-${digest}`;
     if (this.timed && options.location) {
       const loc = options.location;
       if (loc.getGeoId()) {
@@ -193,16 +199,29 @@ class IcalEvent {
     if (this.sequence) {
       categoryLine.unshift(`SEQUENCE:${this.sequence}`);
     }
-    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}`]);
+    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 memo = createMemo(ev, options);
@@ -211,11 +230,20 @@ class IcalEvent {
     if (this.timed && options.location) {
       arr.push('GEO:' + options.location.getLatitude() + ';' + options.location.getLongitude());
     }
+
     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;
   }
 
@@ -295,7 +323,8 @@ class IcalEvent {
    * @return {string}
    */
   static formatYYYYMMDD(dt) {
-    return restApi.pad4(dt.getFullYear()) + restApi.pad2(dt.getMonth() + 1) + restApi.pad2(dt.getDate());
+    return restApi.pad4(dt.getFullYear()) +
+          restApi.pad2(dt.getMonth() + 1) + restApi.pad2(dt.getDate());
   }
 
   /**
@@ -305,7 +334,8 @@ class IcalEvent {
    */
   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 s.slice(0, 4) + s.slice(5, 7) + s.slice(8, 13) +
+              s.slice(14, 16) + s.slice(17, 19) + 'Z';
   }
 
   /** @return {string} */
@@ -324,8 +354,13 @@ 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.YERUSHALMI_YOMI | core.flags.NACH_YOMI | core.flags.HEBREW_DATE;
+
+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.YERUSHALMI_YOMI | core.flags.NACH_YOMI |
+  core.flags.HEBREW_DATE;
 
 /**
  * @private
@@ -334,7 +369,7 @@ const HOLIDAY_IGNORE_MASK = core.flags.DAF_YOMI | core.flags.OMER_COUNT | core.f
  * @return {string}
  */
 function makeTorahMemo(ev, il) {
-  if (ev.getFlags() & HOLIDAY_IGNORE_MASK || ev.eventTime) {
+  if ((ev.getFlags() & HOLIDAY_IGNORE_MASK) || ev.eventTime) {
     return '';
   }
   const hd = ev.getDate();
@@ -409,7 +444,7 @@ async function eventsToIcalendar(events, options) {
   if (!opts.title) {
     opts.title = restApi.getCalendarTitle(events, opts);
   }
-  const icals = events.map(ev => new IcalEvent(ev, opts));
+  const icals = events.map((ev) => new IcalEvent(ev, opts));
   return icalEventsToString(icals, opts);
 }
 
@@ -425,9 +460,19 @@ async function icalEventsToString(icals, options) {
   const opts = Object.assign({}, options);
   opts.dtstamp = opts.dtstamp || IcalEvent.makeDtstamp(new Date());
   const title = opts.title ? IcalEvent.escape(opts.title) : 'Untitled';
-  const caldesc = opts.caldesc ? IcalEvent.escape(opts.caldesc) : opts.yahrzeit ? 'Yahrzeits + Anniversaries from www.hebcal.com' : 'Jewish Holidays from www.hebcal.com';
+  const caldesc = opts.caldesc ? IcalEvent.escape(opts.caldesc) :
+    opts.yahrzeit ?
+    'Yahrzeits + Anniversaries from www.hebcal.com' :
+    'Jewish Holidays from www.hebcal.com';
   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'];
+  const preamble = [
+    'BEGIN:VCALENDAR',
+    'VERSION:2.0',
+    `PRODID:${prodid}`,
+    'CALSCALE:GREGORIAN',
+    'METHOD:PUBLISH',
+    'X-LOTUS-CHARSET:UTF-8',
+  ];
   if (opts.publishedTTL !== false) {
     const publishedTTL = opts.publishedTTL || 'PT7D';
     preamble.push(`X-PUBLISHED-TTL:${publishedTTL}`);
@@ -467,6 +512,7 @@ async function icalEventsToString(icals, options) {
       }
     }
   }
+
   for (const ical of icals) {
     const lines = ical.getLines();
     for (const line of lines) {

package/dist/index.mjs

@@ -1,10 +1,11 @@
-/*! @hebcal/icalendar v5.0.0 */
+/*! @hebcal/icalendar v5.0.2 */
 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="5.0.0";
+// DO NOT EDIT THIS AUTO-GENERATED FILE!
+const version = '5.0.2';
 
 const VTIMEZONE = {};
 const CATEGORY = {
@@ -22,7 +23,7 @@ const CATEGORY = {
   parashat: 'Parsha',
   roshchodesh: 'Holiday',
   user: 'Personal',
-  zmanim: null
+  zmanim: null,
 };
 
 /**
@@ -51,8 +52,10 @@ function appendTrackingToUrl(url, options) {
   const utmSource = options.utmSource || 'js';
   const utmMedium = options.utmMedium || 'icalendar';
   const utmCampaign = options.utmCampaign;
-  return appendIsraelAndTracking(url, options.il, utmSource, utmMedium, utmCampaign);
+  return appendIsraelAndTracking(url,
+      options.il, utmSource, utmMedium, utmCampaign);
 }
+
 const encoder = new TextEncoder();
 const char74re = /(.{1,74})/g;
 
@@ -65,7 +68,7 @@ class IcalEvent {
    * @param {Event} ev
    * @param {CalOptions} options
    */
-  constructor(ev, options = {}) {
+  constructor(ev, options={}) {
     this.ev = ev;
     this.options = options;
     this.dtstamp = options.dtstamp || IcalEvent.makeDtstamp(new Date());
@@ -92,7 +95,7 @@ class IcalEvent {
       this.locationName = options.location.getShortName();
     }
     const date = IcalEvent.formatYYYYMMDD(ev.getDate().greg());
-    this.startDate = date;
+    this.startDate = this.isoDateOnly = date;
     this.dtargs = '';
     this.transp = 'TRANSPARENT';
     this.busyStatus = 'FREE';
@@ -116,6 +119,7 @@ class IcalEvent {
         this.busyStatus = 'OOF';
       }
     }
+
     if (options.emoji) {
       const prefix = ev.getEmoji();
       if (prefix) {
@@ -129,6 +133,7 @@ class IcalEvent {
 
     // make subject safe for iCalendar
     subj = IcalEvent.escape(subj);
+
     if (options.appendHebrewToSubject) {
       const hebrew = ev.renderBrief('he');
       if (hebrew) {
@@ -136,9 +141,10 @@ class IcalEvent {
       }
     }
     this.subj = subj;
-    this.category = ev.category || CATEGORY[getEventCategories(ev)[0]];
+    this.category = ev.category || CATEGORY[getEventCategories(ev)?.[0]];
   }
 
+
   /**
    * @return {string}
    */
@@ -169,7 +175,7 @@ class IcalEvent {
   getUid() {
     const options = this.options;
     const digest = murmur32HexSync(this.ev.getDesc());
-    let uid = `hebcal-${this.startDate}-${digest}`;
+    let uid = `hebcal-${this.isoDateOnly}-${digest}`;
     if (this.timed && options.location) {
       const loc = options.location;
       if (loc.getGeoId()) {
@@ -191,16 +197,29 @@ class IcalEvent {
     if (this.sequence) {
       categoryLine.unshift(`SEQUENCE:${this.sequence}`);
     }
-    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}`]);
+    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 memo = createMemo(ev, options);
@@ -209,11 +228,20 @@ class IcalEvent {
     if (this.timed && options.location) {
       arr.push('GEO:' + options.location.getLatitude() + ';' + options.location.getLongitude());
     }
+
     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;
   }
 
@@ -293,7 +321,8 @@ class IcalEvent {
    * @return {string}
    */
   static formatYYYYMMDD(dt) {
-    return pad4(dt.getFullYear()) + pad2(dt.getMonth() + 1) + pad2(dt.getDate());
+    return pad4(dt.getFullYear()) +
+          pad2(dt.getMonth() + 1) + pad2(dt.getDate());
   }
 
   /**
@@ -303,7 +332,8 @@ class IcalEvent {
    */
   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 s.slice(0, 4) + s.slice(5, 7) + s.slice(8, 13) +
+              s.slice(14, 16) + s.slice(17, 19) + 'Z';
   }
 
   /** @return {string} */
@@ -322,8 +352,13 @@ 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.YERUSHALMI_YOMI | flags.NACH_YOMI | flags.HEBREW_DATE;
+
+const HOLIDAY_IGNORE_MASK = flags.DAF_YOMI | flags.OMER_COUNT |
+  flags.SHABBAT_MEVARCHIM | flags.MOLAD | flags.USER_EVENT |
+  flags.MISHNA_YOMI | flags.YERUSHALMI_YOMI | flags.NACH_YOMI |
+  flags.HEBREW_DATE;
 
 /**
  * @private
@@ -332,7 +367,7 @@ const HOLIDAY_IGNORE_MASK = flags.DAF_YOMI | flags.OMER_COUNT | flags.SHABBAT_ME
  * @return {string}
  */
 function makeTorahMemo(ev, il) {
-  if (ev.getFlags() & HOLIDAY_IGNORE_MASK || ev.eventTime) {
+  if ((ev.getFlags() & HOLIDAY_IGNORE_MASK) || ev.eventTime) {
     return '';
   }
   const hd = ev.getDate();
@@ -407,7 +442,7 @@ async function eventsToIcalendar(events, options) {
   if (!opts.title) {
     opts.title = getCalendarTitle(events, opts);
   }
-  const icals = events.map(ev => new IcalEvent(ev, opts));
+  const icals = events.map((ev) => new IcalEvent(ev, opts));
   return icalEventsToString(icals, opts);
 }
 
@@ -423,9 +458,19 @@ async function icalEventsToString(icals, options) {
   const opts = Object.assign({}, options);
   opts.dtstamp = opts.dtstamp || IcalEvent.makeDtstamp(new Date());
   const title = opts.title ? IcalEvent.escape(opts.title) : 'Untitled';
-  const caldesc = opts.caldesc ? IcalEvent.escape(opts.caldesc) : opts.yahrzeit ? 'Yahrzeits + Anniversaries from www.hebcal.com' : 'Jewish Holidays from www.hebcal.com';
+  const caldesc = opts.caldesc ? IcalEvent.escape(opts.caldesc) :
+    opts.yahrzeit ?
+    'Yahrzeits + Anniversaries from www.hebcal.com' :
+    'Jewish Holidays from www.hebcal.com';
   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'];
+  const preamble = [
+    'BEGIN:VCALENDAR',
+    'VERSION:2.0',
+    `PRODID:${prodid}`,
+    'CALSCALE:GREGORIAN',
+    'METHOD:PUBLISH',
+    'X-LOTUS-CHARSET:UTF-8',
+  ];
   if (opts.publishedTTL !== false) {
     const publishedTTL = opts.publishedTTL || 'PT7D';
     preamble.push(`X-PUBLISHED-TTL:${publishedTTL}`);
@@ -465,6 +510,7 @@ async function icalEventsToString(icals, options) {
       }
     }
   }
+
   for (const ical of icals) {
     const lines = ical.getLines();
     for (const line of lines) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/icalendar",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "ical",
@@ -9,8 +9,13 @@
     "hebcal"
   ],
   "description": "Jewish holidays and Hebrew calendar as iCalendar RFC 2445",
-  "main": "dist/index.js",
+  "main": "dist/index.cjs",
   "module": "dist/index.mjs",
+  "type": "module",
+  "exports": {
+    "import": "./dist/index.mjs",
+    "require": "./dist/index.cjs"
+  },
   "typings": "icalendar.d.ts",
   "files": [
     "dist",
@@ -24,36 +29,29 @@
     "url": "https://github.com/hebcal/hebcal-icalendar/issues"
   },
   "dependencies": {
-    "@hebcal/core": "^5.0.0-rc2",
-    "@hebcal/rest-api": "^5.0.0",
+    "@hebcal/core": "^5.0.3",
+    "@hebcal/rest-api": "^5.0.2",
     "murmurhash3": "^0.5.0"
   },
   "scripts": {
-    "build": "rollup -c",
+    "build:rollup": "rollup -c",
+    "build:version": "node ./version.cjs package.json src/pkgVersion.js",
+    "build": "npm run build:version && npm run build:rollup",
     "prepare": "npm run build",
     "pretest": "npm run build",
     "readme": "npx jsdoc2md dist/index.js",
     "test": "ava"
   },
   "license": "BSD-2-Clause",
-  "ava": {
-    "require": [
-      "@babel/register"
-    ]
-  },
   "devDependencies": {
-    "@babel/core": "^7.23.3",
-    "@babel/preset-env": "^7.23.3",
-    "@babel/register": "^7.22.15",
-    "@hebcal/learning": "^5.0.0",
-    "@rollup/plugin-babel": "^6.0.4",
+    "@hebcal/learning": "^5.0.2",
     "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-json": "^6.0.1",
-    "ava": "^5.3.1",
-    "eslint": "^8.54.0",
+    "@rollup/plugin-json": "^6.1.0",
+    "ava": "^6.0.1",
+    "eslint": "^8.56.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^4.0.2",
     "jsdoc-to-markdown": "^8.0.0",
-    "rollup": "^4.5.1"
+    "rollup": "^4.9.1"
   }
 }