@hebcal/core 5.0.9 → 5.1.1

package/dist/index.cjs

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.0.9 */
+/*! @hebcal/core v5.1.1 */
 'use strict';
 
 /** @private */
@@ -150,7 +150,7 @@ const IYYAR$1 = 2;
 // const SIVAN = 3;
 const TAMUZ$1 = 4;
 // const AV = 5;
-const ELUL$2 = 6;
+const ELUL$1 = 6;
 const TISHREI$2 = 7;
 const CHESHVAN$1 = 8;
 const KISLEV$2 = 9;
@@ -321,7 +321,7 @@ function daysInMonth(month, year) {
     switch (month) {
         case IYYAR$1:
         case TAMUZ$1:
-        case ELUL$2:
+        case ELUL$1:
         case TEVET$2:
         case ADAR_II$2:
             return 29;
@@ -1696,7 +1696,11 @@ function fixDate(date) {
       date.yy += 1;
     }
     date.dd -= daysInMonth(date.mm, date.yy);
-    date.mm += 1;
+    if (date.mm === monthsInYear(date.yy)) {
+      date.mm = 1; // rollover to NISAN
+    } else {
+      date.mm += 1;
+    }
     fix(date);
   }
   fixMonth(date);
@@ -3970,24 +3974,23 @@ function reformatTimeStr(timeStr, suffix, options) {
 }
 
 /* eslint-disable max-len */
-const FRI$3 = 5;
-const SAT$3 = 6;
 
 /**
  * @private
  * @param {Event} e
  * @param {HDate} hd
- * @param {number} dow
  * @param {CalOptions} options
+ * @param {boolean} isFriday
+ * @param {boolean} isSaturday
  * @return {Event}
  */
-function makeCandleEvent(e, hd, dow, options) {
+function makeCandleEvent(e, hd, options, isFriday, isSaturday) {
   let havdalahTitle = false;
-  let useHavdalahOffset = dow === SAT$3;
+  let useHavdalahOffset = isSaturday;
   let mask = e ? e.getFlags() : flags.LIGHT_CANDLES;
   if (typeof e !== 'undefined') {
     // if linked event && dow == FRI, use Candle lighting time & title
-    if (dow !== FRI$3) {
+    if (!isFriday) {
       if (mask & (flags.LIGHT_CANDLES_TZEIS | flags.CHANUKAH_CANDLES)) {
         useHavdalahOffset = true;
       } else if (mask & flags.YOM_TOV_ENDS) {
@@ -3995,7 +3998,7 @@ function makeCandleEvent(e, hd, dow, options) {
         useHavdalahOffset = true;
       }
     }
-  } else if (dow === SAT$3) {
+  } else if (isSaturday) {
     havdalahTitle = true;
     mask = flags.LIGHT_CANDLES_TZEIS;
   }
@@ -4307,7 +4310,11 @@ class Molad {
     const chalakimStr = Locale.gettext('chalakim', locale);
     if (isHebrewLocale) {
       const ampm = hour < 5 ? night : hour < 12 ? morning : hour < 17 ? afternoon : hour < 21 ? evening : night;
-      return `${moladStr} ${monthName} יִהְיֶה בַּיּוֹם ${dow} בשָׁבוּעַ, ` + `בְּשָׁעָה ${hour} ${ampm}, ` + `ו-${minutes} ${minutesStr} ` + `ו-${chalakim} ${chalakimStr}`;
+      const result = `${moladStr} ${monthName} יִהְיֶה בַּיּוֹם ${dow} בשָׁבוּעַ, ` + `בְּשָׁעָה ${hour} ${ampm}, ` + `ו-${minutes} ${minutesStr} ` + `ו-${chalakim} ${chalakimStr}`;
+      if (locale === 'he-x-nonikud') {
+        return Locale.hebrewStripNikkud(result);
+      }
+      return result;
     }
     const fmtTime = reformatTimeStr(`${hour}:00`, 'pm', options);
     const month = monthName.replace(/'/g, '’');
@@ -4943,6 +4950,7 @@ class Sedra {
       const hyphen = locale0 == 'he' ? '־' : '-';
       name += hyphen + Locale.gettext(parsha[1], locale0);
     }
+    name = name.replace(/'/g, '’');
     return Locale.gettext('Parashat', locale0) + ' ' + name;
   }
 
@@ -5934,17 +5942,22 @@ class MevarchimChodeshEvent extends Event {
    * Constructs Mevarchim haChodesh event
    * @param {HDate} date Hebrew date event occurs
    * @param {string} monthName Hebrew month name (not translated)
+   * @param {string} [memo]
    */
-  constructor(date, monthName) {
+  constructor(date, monthName, memo) {
     super(date, `${mevarchimChodeshStr} ${monthName}`, flags.SHABBAT_MEVARCHIM);
     this.monthName = monthName;
-    const hyear = date.getFullYear();
-    const hmonth = date.getMonth();
-    const monNext = hmonth == HDate.monthsInYear(hyear) ? NISAN$1 : hmonth + 1;
-    const molad = new Molad(hyear, monNext);
-    this.memo = molad.render('en', {
-      hour12: false
-    });
+    if (memo) {
+      this.memo = memo;
+    } else {
+      const hyear = date.getFullYear();
+      const hmonth = date.getMonth();
+      const monNext = hmonth == HDate.monthsInYear(hyear) ? NISAN$1 : hmonth + 1;
+      const molad = new Molad(hyear, monNext);
+      this.memo = molad.render('en', {
+        hour12: false
+      });
+    }
   }
   /** @return {string} */
   basename() {
@@ -6044,7 +6057,6 @@ const SAT$1 = 6;
 const NISAN$1 = months.NISAN;
 const TAMUZ = months.TAMUZ;
 const AV = months.AV;
-const ELUL$1 = months.ELUL;
 const TISHREI$1 = months.TISHREI;
 const KISLEV = months.KISLEV;
 const TEVET = months.TEVET;
@@ -6203,13 +6215,6 @@ function getHolidaysForYear_(year) {
     } else if (month !== TISHREI$1) {
       add(new RoshChodeshEvent(new HDate(1, month, year), monthName));
     }
-    if (month == ELUL$1) {
-      continue;
-    }
-
-    // Don't worry about month overrun; will get "Nisan" for month=14
-    const nextMonthName = HDate.getMonthName(month + 1, year);
-    add(new MevarchimChodeshEvent(new HDate(29, month, year).onOrBefore(SAT$1), nextMonthName));
   }
 
   // Begin: Yom Kippur Katan
@@ -6312,7 +6317,7 @@ class DailyLearning {
 }
 
 // DO NOT EDIT THIS AUTO-GENERATED FILE!
-const version = '5.0.9';
+const version = '5.1.1';
 
 const NONE$1 = 0;
 const HALF = 1;
@@ -7482,12 +7487,14 @@ class HebrewCalendar {
       }
       const prevEventsLength = evts.length;
       const dow = hd.getDay();
+      const isFriday = dow === FRI;
+      const isSaturday = dow === SAT;
       let candlesEv;
       const ev = holidaysYear.get(hd.toString()) || [];
       for (const e of ev) {
-        candlesEv = appendHolidayAndRelated(evts, e, options, candlesEv, dow);
+        candlesEv = appendHolidayAndRelated(candlesEv, evts, e, options, isFriday, isSaturday);
       }
-      if (options.sedrot && dow === SAT) {
+      if (options.sedrot && isSaturday) {
         const parsha0 = sedra.lookup(abs);
         if (!parsha0.chag) {
           evts.push(new ParshaEvent(hd, parsha0.parsha, il, parsha0.num));
@@ -7518,14 +7525,23 @@ class HebrewCalendar {
         evts.push(omerEv);
       }
       const hmonth = hd.getMonth();
-      if (options.molad && dow == SAT && hmonth != ELUL && hd.getDate() >= 23 && hd.getDate() <= 29) {
+      const hdate = hd.getDate();
+      if (isSaturday && (options.molad || options.shabbatMevarchim) && hmonth != ELUL && hdate >= 23 && hdate <= 29) {
         const monNext = hmonth == HDate.monthsInYear(hyear) ? NISAN : hmonth + 1;
-        evts.push(new MoladEvent(hd, hyear, monNext, options));
+        if (options.molad) {
+          evts.push(new MoladEvent(hd, hyear, monNext, options));
+        }
+        if (options.shabbatMevarchim) {
+          const nextMonthName = HDate.getMonthName(monNext, hyear);
+          const molad = new Molad(hyear, monNext);
+          const memo = molad.render(options.locale || 'en', options);
+          evts.push(new MevarchimChodeshEvent(hd, nextMonthName, memo));
+        }
       }
-      if (!candlesEv && options.candlelighting && (dow == FRI || dow == SAT)) {
-        candlesEv = makeCandleEvent(undefined, hd, dow, options);
-        if (dow === FRI && candlesEv && sedra) {
-          candlesEv.memo = sedra.getString(abs);
+      if (!candlesEv && options.candlelighting && (isFriday || isSaturday)) {
+        candlesEv = makeCandleEvent(undefined, hd, options, isFriday, isSaturday);
+        if (isFriday && candlesEv && sedra) {
+          candlesEv.memo = sedra.getString(abs, options.locale);
         }
       }
       // suppress Havdalah when options.havdalahMins=0 or options.havdalahDeg=0
@@ -7761,14 +7777,15 @@ class HebrewCalendar {
  * Appends the Event `ev` to the `events` array. Also may add related
  * timed events like candle-lighting or fast start/end
  * @private
+ * @param {Event} candlesEv
  * @param {Event[]} events
  * @param {Event} ev
  * @param {CalOptions} options
- * @param {Event} candlesEv
- * @param {number} dow
+ * @param {boolean} isFriday
+ * @param {boolean} isSaturday
  * @return {Event}
  */
-function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
+function appendHolidayAndRelated(candlesEv, events, ev, options, isFriday, isSaturday) {
   const il = options.il;
   if (!ev.observedIn(il)) {
     return candlesEv; // holiday isn't observed here; bail out early
@@ -7789,9 +7806,9 @@ function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
   if (eFlags & options.mask || !eFlags && !options.userMask) {
     if (options.candlelighting && eFlags & MASK_LIGHT_CANDLES) {
       const hd = ev.getDate();
-      candlesEv = makeCandleEvent(ev, hd, dow, options);
+      candlesEv = makeCandleEvent(ev, hd, options, isFriday, isSaturday);
       if (eFlags & CHANUKAH_CANDLES && candlesEv && !options.noHolidays) {
-        const chanukahEv = dow === FRI || dow === SAT ? candlesEv : makeWeekdayChanukahCandleLighting(ev, hd, options);
+        const chanukahEv = isFriday || isSaturday ? candlesEv : makeWeekdayChanukahCandleLighting(ev, hd, options);
         const attrs = {
           eventTime: chanukahEv.eventTime,
           eventTimeStr: chanukahEv.eventTimeStr,
@@ -7801,7 +7818,7 @@ function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
         if (ev.emoji) attrs.emoji = ev.emoji;
         // Replace Chanukah event with a clone that includes candle lighting time.
         // For clarity, allow a "duplicate" candle lighting event to remain for Shabbat
-        ev = new HolidayEvent(ev.getDate(), ev.getDesc(), eFlags, attrs);
+        ev = new HolidayEvent(hd, ev.getDesc(), eFlags, attrs);
         candlesEv = undefined;
       }
     }

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.0.9 */
+/*! @hebcal/core v5.1.1 */
 /** @private */
 const lengths = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 /** @private */
@@ -148,7 +148,7 @@ const IYYAR$1 = 2;
 // const SIVAN = 3;
 const TAMUZ$1 = 4;
 // const AV = 5;
-const ELUL$2 = 6;
+const ELUL$1 = 6;
 const TISHREI$2 = 7;
 const CHESHVAN$1 = 8;
 const KISLEV$2 = 9;
@@ -319,7 +319,7 @@ function daysInMonth(month, year) {
     switch (month) {
         case IYYAR$1:
         case TAMUZ$1:
-        case ELUL$2:
+        case ELUL$1:
         case TEVET$2:
         case ADAR_II$2:
             return 29;
@@ -1694,7 +1694,11 @@ function fixDate(date) {
       date.yy += 1;
     }
     date.dd -= daysInMonth(date.mm, date.yy);
-    date.mm += 1;
+    if (date.mm === monthsInYear(date.yy)) {
+      date.mm = 1; // rollover to NISAN
+    } else {
+      date.mm += 1;
+    }
     fix(date);
   }
   fixMonth(date);
@@ -3968,24 +3972,23 @@ function reformatTimeStr(timeStr, suffix, options) {
 }
 
 /* eslint-disable max-len */
-const FRI$3 = 5;
-const SAT$3 = 6;
 
 /**
  * @private
  * @param {Event} e
  * @param {HDate} hd
- * @param {number} dow
  * @param {CalOptions} options
+ * @param {boolean} isFriday
+ * @param {boolean} isSaturday
  * @return {Event}
  */
-function makeCandleEvent(e, hd, dow, options) {
+function makeCandleEvent(e, hd, options, isFriday, isSaturday) {
   let havdalahTitle = false;
-  let useHavdalahOffset = dow === SAT$3;
+  let useHavdalahOffset = isSaturday;
   let mask = e ? e.getFlags() : flags.LIGHT_CANDLES;
   if (typeof e !== 'undefined') {
     // if linked event && dow == FRI, use Candle lighting time & title
-    if (dow !== FRI$3) {
+    if (!isFriday) {
       if (mask & (flags.LIGHT_CANDLES_TZEIS | flags.CHANUKAH_CANDLES)) {
         useHavdalahOffset = true;
       } else if (mask & flags.YOM_TOV_ENDS) {
@@ -3993,7 +3996,7 @@ function makeCandleEvent(e, hd, dow, options) {
         useHavdalahOffset = true;
       }
     }
-  } else if (dow === SAT$3) {
+  } else if (isSaturday) {
     havdalahTitle = true;
     mask = flags.LIGHT_CANDLES_TZEIS;
   }
@@ -4305,7 +4308,11 @@ class Molad {
     const chalakimStr = Locale.gettext('chalakim', locale);
     if (isHebrewLocale) {
       const ampm = hour < 5 ? night : hour < 12 ? morning : hour < 17 ? afternoon : hour < 21 ? evening : night;
-      return `${moladStr} ${monthName} יִהְיֶה בַּיּוֹם ${dow} בשָׁבוּעַ, ` + `בְּשָׁעָה ${hour} ${ampm}, ` + `ו-${minutes} ${minutesStr} ` + `ו-${chalakim} ${chalakimStr}`;
+      const result = `${moladStr} ${monthName} יִהְיֶה בַּיּוֹם ${dow} בשָׁבוּעַ, ` + `בְּשָׁעָה ${hour} ${ampm}, ` + `ו-${minutes} ${minutesStr} ` + `ו-${chalakim} ${chalakimStr}`;
+      if (locale === 'he-x-nonikud') {
+        return Locale.hebrewStripNikkud(result);
+      }
+      return result;
     }
     const fmtTime = reformatTimeStr(`${hour}:00`, 'pm', options);
     const month = monthName.replace(/'/g, '’');
@@ -4941,6 +4948,7 @@ class Sedra {
       const hyphen = locale0 == 'he' ? '־' : '-';
       name += hyphen + Locale.gettext(parsha[1], locale0);
     }
+    name = name.replace(/'/g, '’');
     return Locale.gettext('Parashat', locale0) + ' ' + name;
   }
 
@@ -5932,17 +5940,22 @@ class MevarchimChodeshEvent extends Event {
    * Constructs Mevarchim haChodesh event
    * @param {HDate} date Hebrew date event occurs
    * @param {string} monthName Hebrew month name (not translated)
+   * @param {string} [memo]
    */
-  constructor(date, monthName) {
+  constructor(date, monthName, memo) {
     super(date, `${mevarchimChodeshStr} ${monthName}`, flags.SHABBAT_MEVARCHIM);
     this.monthName = monthName;
-    const hyear = date.getFullYear();
-    const hmonth = date.getMonth();
-    const monNext = hmonth == HDate.monthsInYear(hyear) ? NISAN$1 : hmonth + 1;
-    const molad = new Molad(hyear, monNext);
-    this.memo = molad.render('en', {
-      hour12: false
-    });
+    if (memo) {
+      this.memo = memo;
+    } else {
+      const hyear = date.getFullYear();
+      const hmonth = date.getMonth();
+      const monNext = hmonth == HDate.monthsInYear(hyear) ? NISAN$1 : hmonth + 1;
+      const molad = new Molad(hyear, monNext);
+      this.memo = molad.render('en', {
+        hour12: false
+      });
+    }
   }
   /** @return {string} */
   basename() {
@@ -6042,7 +6055,6 @@ const SAT$1 = 6;
 const NISAN$1 = months.NISAN;
 const TAMUZ = months.TAMUZ;
 const AV = months.AV;
-const ELUL$1 = months.ELUL;
 const TISHREI$1 = months.TISHREI;
 const KISLEV = months.KISLEV;
 const TEVET = months.TEVET;
@@ -6201,13 +6213,6 @@ function getHolidaysForYear_(year) {
     } else if (month !== TISHREI$1) {
       add(new RoshChodeshEvent(new HDate(1, month, year), monthName));
     }
-    if (month == ELUL$1) {
-      continue;
-    }
-
-    // Don't worry about month overrun; will get "Nisan" for month=14
-    const nextMonthName = HDate.getMonthName(month + 1, year);
-    add(new MevarchimChodeshEvent(new HDate(29, month, year).onOrBefore(SAT$1), nextMonthName));
   }
 
   // Begin: Yom Kippur Katan
@@ -6310,7 +6315,7 @@ class DailyLearning {
 }
 
 // DO NOT EDIT THIS AUTO-GENERATED FILE!
-const version = '5.0.9';
+const version = '5.1.1';
 
 const NONE$1 = 0;
 const HALF = 1;
@@ -7480,12 +7485,14 @@ class HebrewCalendar {
       }
       const prevEventsLength = evts.length;
       const dow = hd.getDay();
+      const isFriday = dow === FRI;
+      const isSaturday = dow === SAT;
       let candlesEv;
       const ev = holidaysYear.get(hd.toString()) || [];
       for (const e of ev) {
-        candlesEv = appendHolidayAndRelated(evts, e, options, candlesEv, dow);
+        candlesEv = appendHolidayAndRelated(candlesEv, evts, e, options, isFriday, isSaturday);
       }
-      if (options.sedrot && dow === SAT) {
+      if (options.sedrot && isSaturday) {
         const parsha0 = sedra.lookup(abs);
         if (!parsha0.chag) {
           evts.push(new ParshaEvent(hd, parsha0.parsha, il, parsha0.num));
@@ -7516,14 +7523,23 @@ class HebrewCalendar {
         evts.push(omerEv);
       }
       const hmonth = hd.getMonth();
-      if (options.molad && dow == SAT && hmonth != ELUL && hd.getDate() >= 23 && hd.getDate() <= 29) {
+      const hdate = hd.getDate();
+      if (isSaturday && (options.molad || options.shabbatMevarchim) && hmonth != ELUL && hdate >= 23 && hdate <= 29) {
         const monNext = hmonth == HDate.monthsInYear(hyear) ? NISAN : hmonth + 1;
-        evts.push(new MoladEvent(hd, hyear, monNext, options));
+        if (options.molad) {
+          evts.push(new MoladEvent(hd, hyear, monNext, options));
+        }
+        if (options.shabbatMevarchim) {
+          const nextMonthName = HDate.getMonthName(monNext, hyear);
+          const molad = new Molad(hyear, monNext);
+          const memo = molad.render(options.locale || 'en', options);
+          evts.push(new MevarchimChodeshEvent(hd, nextMonthName, memo));
+        }
       }
-      if (!candlesEv && options.candlelighting && (dow == FRI || dow == SAT)) {
-        candlesEv = makeCandleEvent(undefined, hd, dow, options);
-        if (dow === FRI && candlesEv && sedra) {
-          candlesEv.memo = sedra.getString(abs);
+      if (!candlesEv && options.candlelighting && (isFriday || isSaturday)) {
+        candlesEv = makeCandleEvent(undefined, hd, options, isFriday, isSaturday);
+        if (isFriday && candlesEv && sedra) {
+          candlesEv.memo = sedra.getString(abs, options.locale);
         }
       }
       // suppress Havdalah when options.havdalahMins=0 or options.havdalahDeg=0
@@ -7759,14 +7775,15 @@ class HebrewCalendar {
  * Appends the Event `ev` to the `events` array. Also may add related
  * timed events like candle-lighting or fast start/end
  * @private
+ * @param {Event} candlesEv
  * @param {Event[]} events
  * @param {Event} ev
  * @param {CalOptions} options
- * @param {Event} candlesEv
- * @param {number} dow
+ * @param {boolean} isFriday
+ * @param {boolean} isSaturday
  * @return {Event}
  */
-function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
+function appendHolidayAndRelated(candlesEv, events, ev, options, isFriday, isSaturday) {
   const il = options.il;
   if (!ev.observedIn(il)) {
     return candlesEv; // holiday isn't observed here; bail out early
@@ -7787,9 +7804,9 @@ function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
   if (eFlags & options.mask || !eFlags && !options.userMask) {
     if (options.candlelighting && eFlags & MASK_LIGHT_CANDLES) {
       const hd = ev.getDate();
-      candlesEv = makeCandleEvent(ev, hd, dow, options);
+      candlesEv = makeCandleEvent(ev, hd, options, isFriday, isSaturday);
       if (eFlags & CHANUKAH_CANDLES && candlesEv && !options.noHolidays) {
-        const chanukahEv = dow === FRI || dow === SAT ? candlesEv : makeWeekdayChanukahCandleLighting(ev, hd, options);
+        const chanukahEv = isFriday || isSaturday ? candlesEv : makeWeekdayChanukahCandleLighting(ev, hd, options);
         const attrs = {
           eventTime: chanukahEv.eventTime,
           eventTimeStr: chanukahEv.eventTimeStr,
@@ -7799,7 +7816,7 @@ function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
         if (ev.emoji) attrs.emoji = ev.emoji;
         // Replace Chanukah event with a clone that includes candle lighting time.
         // For clarity, allow a "duplicate" candle lighting event to remain for Shabbat
-        ev = new HolidayEvent(ev.getDate(), ev.getDesc(), eFlags, attrs);
+        ev = new HolidayEvent(hd, ev.getDesc(), eFlags, attrs);
         candlesEv = undefined;
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/core",
-  "version": "5.0.9",
+  "version": "5.1.1",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "contributors": [
     "Eyal Schachter (https://github.com/Scimonster)",
@@ -71,8 +71,8 @@
     "temporal-polyfill": "^0.1.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.7",
-    "@babel/preset-env": "^7.23.8",
+    "@babel/core": "^7.23.9",
+    "@babel/preset-env": "^7.23.9",
     "@babel/register": "^7.23.7",
     "@hebcal/hdate": "^0.9.1",
     "@hebcal/noaa": "^0.8.11",
@@ -81,15 +81,15 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "ava": "^6.0.1",
-    "core-js": "^3.35.0",
+    "ava": "^6.1.1",
+    "core-js": "^3.35.1",
     "eslint": "^8.56.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^4.0.2",
     "jsdoc-to-markdown": "^8.0.0",
     "nyc": "^15.1.0",
     "quick-lru": "^7.0.0",
-    "rollup": "^4.9.5",
+    "rollup": "^4.9.6",
     "ttag-cli": "^1.10.10"
   }
 }