@hebcal/core 3.33.1 → 3.33.4

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v3.33.1 */
+/*! @hebcal/core v3.33.4 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -553,7 +553,7 @@ Locale.useLocale('en');
     You should have received a copy of the GNU General Public License
     along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-const NISAN$2 = 1;
+const NISAN$3 = 1;
 const IYYAR$1 = 2;
 const SIVAN$2 = 3;
 const TAMUZ$1 = 4;
@@ -907,7 +907,7 @@ class HDate {
         tempabs += HDate.daysInMonth(m, year);
       }
 
-      for (let m = NISAN$2; m < month; m++) {
+      for (let m = NISAN$3; m < month; m++) {
         tempabs += HDate.daysInMonth(m, year);
       }
     } else {
@@ -1053,7 +1053,7 @@ class HDate {
    * @example
    * import {HDate, months} from '@hebcal/core';
    * const hd = new HDate(15, months.CHESHVAN, 5769);
-   * console.log(ev.renderGematriya()); // 'ט״ו חֶשְׁוָן תשס״ט'
+   * console.log(hd.renderGematriya()); // 'ט״ו חֶשְׁוָן תשס״ט'
    * @return {string}
    */
 
@@ -1453,7 +1453,7 @@ class HDate {
           /* this catches "november" */
         }
 
-        return NISAN$2;
+        return NISAN$3;
 
       case 'i':
         return IYYAR$1;
@@ -2827,9 +2827,20 @@ class Location {
 
 
   getShortName() {
-    if (!this.name) return this.name;
-    const comma = this.name.indexOf(',');
-    return comma == -1 ? this.name : this.name.substring(0, comma);
+    const name = this.name;
+    if (!name) return name;
+    const comma = name.indexOf(', ');
+    if (comma === -1) return name;
+
+    if (this.cc === 'US' && name[comma + 2] === 'D') {
+      if (name[comma + 3] === 'C') {
+        return name.substring(0, comma + 4);
+      } else if (name[comma + 3] === '.' && name[comma + 4] === 'C') {
+        return name.substring(0, comma + 6);
+      }
+    }
+
+    return name.substring(0, comma);
   }
   /** @return {string} */
 
@@ -4379,7 +4390,7 @@ const TUE = 2; // const WED = 3;
 const THU = 4;
 const FRI$1 = 5;
 const SAT$1 = 6;
-const NISAN$1 = months.NISAN;
+const NISAN$2 = months.NISAN;
 const IYYAR = months.IYYAR;
 const SIVAN$1 = months.SIVAN;
 const TAMUZ = months.TAMUZ;
@@ -4456,7 +4467,7 @@ const sedraCache = new SimpleMap();
  * @return {Sedra}
  */
 
-function getSedra(hyear, il) {
+function getSedra_(hyear, il) {
   const cacheKey = `${hyear}-${il ? 1 : 0}`;
   let sedra = sedraCache.get(cacheKey);
 
@@ -4481,7 +4492,7 @@ const yearCache = Object.create(null);
  * @return {Map<string,Event[]>}
  */
 
-function getHolidaysForYear(year) {
+function getHolidaysForYear_(year) {
   if (typeof year !== 'number') {
     throw new TypeError(`bad Hebrew year: ${year}`);
   } else if (year < 1 || year > 32658) {
@@ -4495,7 +4506,7 @@ function getHolidaysForYear(year) {
   }
 
   const RH = new HDate(1, TISHREI$1, year);
-  const pesach = new HDate(15, NISAN$1, year);
+  const pesach = new HDate(15, NISAN$2, year);
   const h = new SimpleMap(); // eslint-disable-next-line require-jsdoc
 
   function add(...events) {
@@ -4587,27 +4598,27 @@ function getHolidaysForYear(year) {
   add(new HolidayEvent(new HDate(pesachAbs - (pesach.getDay() == SUN ? 28 : 29)), 'Shushan Purim', MINOR_HOLIDAY$1, {
     emoji: '🎭️📜'
   }), new HolidayEvent(new HDate(HDate.dayOnOrBefore(SAT$1, pesachAbs - 14) - 7), 'Shabbat Parah', SPECIAL_SHABBAT$1), new HolidayEvent(new HDate(HDate.dayOnOrBefore(SAT$1, pesachAbs - 14)), 'Shabbat HaChodesh', SPECIAL_SHABBAT$1), new HolidayEvent(new HDate(HDate.dayOnOrBefore(SAT$1, pesachAbs - 1)), 'Shabbat HaGadol', SPECIAL_SHABBAT$1), new HolidayEvent( // if the fast falls on Shabbat, move to Thursday
-  pesach.prev().getDay() == SAT$1 ? pesach.onOrBefore(THU) : new HDate(14, NISAN$1, year), 'Ta\'anit Bechorot', MINOR_FAST$1));
-  addEvents(year, [[14, NISAN$1, 'Erev Pesach', EREV$1 | LIGHT_CANDLES$1], // Attributes for Israel and Diaspora are different
-  [15, NISAN$1, 'Pesach I', CHAG | YOM_TOV_ENDS$1 | IL_ONLY$1], [16, NISAN$1, 'Pesach II (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
+  pesach.prev().getDay() == SAT$1 ? pesach.onOrBefore(THU) : new HDate(14, NISAN$2, year), 'Ta\'anit Bechorot', MINOR_FAST$1));
+  addEvents(year, [[14, NISAN$2, 'Erev Pesach', EREV$1 | LIGHT_CANDLES$1], // Attributes for Israel and Diaspora are different
+  [15, NISAN$2, 'Pesach I', CHAG | YOM_TOV_ENDS$1 | IL_ONLY$1], [16, NISAN$2, 'Pesach II (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
     cholHaMoedDay: 1
-  }], [17, NISAN$1, 'Pesach III (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
+  }], [17, NISAN$2, 'Pesach III (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
     cholHaMoedDay: 2
-  }], [18, NISAN$1, 'Pesach IV (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
+  }], [18, NISAN$2, 'Pesach IV (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
     cholHaMoedDay: 3
-  }], [19, NISAN$1, 'Pesach V (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
+  }], [19, NISAN$2, 'Pesach V (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
     cholHaMoedDay: 4
-  }], [20, NISAN$1, 'Pesach VI (CH\'\'M)', LIGHT_CANDLES$1 | IL_ONLY$1 | CHOL_HAMOED$1, {
+  }], [20, NISAN$2, 'Pesach VI (CH\'\'M)', LIGHT_CANDLES$1 | IL_ONLY$1 | CHOL_HAMOED$1, {
     cholHaMoedDay: 5
-  }], [21, NISAN$1, 'Pesach VII', CHAG | YOM_TOV_ENDS$1 | IL_ONLY$1], [15, NISAN$1, 'Pesach I', CHAG | LIGHT_CANDLES_TZEIS$1 | CHUL_ONLY$1], [16, NISAN$1, 'Pesach II', CHAG | YOM_TOV_ENDS$1 | CHUL_ONLY$1], [17, NISAN$1, 'Pesach III (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
+  }], [21, NISAN$2, 'Pesach VII', CHAG | YOM_TOV_ENDS$1 | IL_ONLY$1], [15, NISAN$2, 'Pesach I', CHAG | LIGHT_CANDLES_TZEIS$1 | CHUL_ONLY$1], [16, NISAN$2, 'Pesach II', CHAG | YOM_TOV_ENDS$1 | CHUL_ONLY$1], [17, NISAN$2, 'Pesach III (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
     cholHaMoedDay: 1
-  }], [18, NISAN$1, 'Pesach IV (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
+  }], [18, NISAN$2, 'Pesach IV (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
     cholHaMoedDay: 2
-  }], [19, NISAN$1, 'Pesach V (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
+  }], [19, NISAN$2, 'Pesach V (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
     cholHaMoedDay: 3
-  }], [20, NISAN$1, 'Pesach VI (CH\'\'M)', LIGHT_CANDLES$1 | CHUL_ONLY$1 | CHOL_HAMOED$1, {
+  }], [20, NISAN$2, 'Pesach VI (CH\'\'M)', LIGHT_CANDLES$1 | CHUL_ONLY$1 | CHOL_HAMOED$1, {
     cholHaMoedDay: 4
-  }], [21, NISAN$1, 'Pesach VII', CHAG | LIGHT_CANDLES_TZEIS$1 | CHUL_ONLY$1], [22, NISAN$1, 'Pesach VIII', CHAG | YOM_TOV_ENDS$1 | CHUL_ONLY$1], [14, IYYAR, 'Pesach Sheni', MINOR_HOLIDAY$1], [18, IYYAR, 'Lag BaOmer', MINOR_HOLIDAY$1, {
+  }], [21, NISAN$2, 'Pesach VII', CHAG | LIGHT_CANDLES_TZEIS$1 | CHUL_ONLY$1], [22, NISAN$2, 'Pesach VIII', CHAG | YOM_TOV_ENDS$1 | CHUL_ONLY$1], [14, IYYAR, 'Pesach Sheni', MINOR_HOLIDAY$1], [18, IYYAR, 'Lag BaOmer', MINOR_HOLIDAY$1, {
     emoji: '🔥'
   }], [5, SIVAN$1, 'Erev Shavuot', EREV$1 | LIGHT_CANDLES$1, {
     emoji: '⛰️🌸'
@@ -4637,7 +4648,7 @@ function getHolidaysForYear(year) {
 
   if (year >= 5711) {
     // Yom HaShoah first observed in 1951
-    let nisan27dt = new HDate(27, NISAN$1, year);
+    let nisan27dt = new HDate(27, NISAN$2, year);
     /* When the actual date of Yom Hashoah falls on a Friday, the
        * state of Israel observes Yom Hashoah on the preceding
        * Thursday. When it falls on a Sunday, Yom Hashoah is observed
@@ -4646,9 +4657,9 @@ function getHolidaysForYear(year) {
        */
 
     if (nisan27dt.getDay() == FRI$1) {
-      nisan27dt = new HDate(26, NISAN$1, year);
+      nisan27dt = new HDate(26, NISAN$2, year);
     } else if (nisan27dt.getDay() == SUN) {
-      nisan27dt = new HDate(28, NISAN$1, year);
+      nisan27dt = new HDate(28, NISAN$2, year);
     }
 
     add(new HolidayEvent(nisan27dt, 'Yom HaShoah', MODERN_HOLIDAY$1));
@@ -4683,7 +4694,7 @@ function getHolidaysForYear(year) {
   }
 
   if (year >= 5777) {
-    add(new HolidayEvent(new HDate(7, CHESHVAN$1, year), 'Yom HaAliyah School Observance', MODERN_HOLIDAY$1, emojiIsraelFlag), new HolidayEvent(new HDate(10, NISAN$1, year), 'Yom HaAliyah', MODERN_HOLIDAY$1, emojiIsraelFlag));
+    add(new HolidayEvent(new HDate(7, CHESHVAN$1, year), 'Yom HaAliyah School Observance', MODERN_HOLIDAY$1, emojiIsraelFlag), new HolidayEvent(new HDate(10, NISAN$2, year), 'Yom HaAliyah', MODERN_HOLIDAY$1, emojiIsraelFlag));
   }
 
   let tamuz17 = new HDate(17, TAMUZ, year);
@@ -4716,7 +4727,7 @@ function getHolidaysForYear(year) {
   for (let month = 1; month <= monthsInYear; month++) {
     const monthName = HDate.getMonthName(month, year);
 
-    if ((month == NISAN$1 ? HDate.daysInMonth(HDate.monthsInYear(year - 1), year - 1) : HDate.daysInMonth(month - 1, year)) == 30) {
+    if ((month == NISAN$2 ? HDate.daysInMonth(HDate.monthsInYear(year - 1), year - 1) : HDate.daysInMonth(month - 1, year)) == 30) {
       add(new RoshChodeshEvent(new HDate(1, month, year), monthName));
       add(new RoshChodeshEvent(new HDate(30, month - 1, year), monthName));
     } else if (month !== TISHREI$1) {
@@ -4732,7 +4743,7 @@ function getHolidaysForYear(year) {
     add(new MevarchimChodeshEvent(new HDate(29, month, year).onOrBefore(SAT$1), nextMonthName));
   }
 
-  const sedra = getSedra(year, false);
+  const sedra = getSedra_(year, false);
   const beshalachHd = sedra.find(15);
   add(new HolidayEvent(beshalachHd, 'Shabbat Shirah', SPECIAL_SHABBAT$1));
   yearCache[year] = h;
@@ -4884,7 +4895,8 @@ class MishnaYomiEvent extends Event {
     const cv1 = mishnaYomi[0].v;
 
     if (k1 !== mishnaYomi[1].k) {
-      return `${prefix}.${cv1}?lang=bi`;
+      const verse1 = cv1.replace(':', '.');
+      return `${prefix}.${verse1}?lang=bi`;
     }
 
     const cv2 = mishnaYomi[1].v;
@@ -4897,7 +4909,100 @@ class MishnaYomiEvent extends Event {
 
 }
 
-var version="3.33.1";
+const NISAN$1 = months.NISAN;
+const CHESHVAN = months.CHESHVAN;
+const KISLEV = months.KISLEV;
+const TEVET = months.TEVET;
+const SHVAT = months.SHVAT;
+const ADAR_I = months.ADAR_I;
+const ADAR_II = months.ADAR_II;
+/**
+ * @private
+ * @param {number} hyear Hebrew year
+ * @param {Date|HDate} gdate Gregorian or Hebrew date of death
+ * @return {HDate} anniversary occurring in hyear
+ */
+
+function getYahrzeit_(hyear, gdate) {
+  const orig = HDate.isHDate(gdate) ? gdate : new HDate(gdate);
+  let hDeath = {
+    yy: orig.getFullYear(),
+    mm: orig.getMonth(),
+    dd: orig.getDate()
+  };
+
+  if (hyear <= hDeath.yy) {
+    // `Hebrew year ${hyear} occurs on or before original date in ${hDeath.yy}`
+    return undefined;
+  }
+
+  if (hDeath.mm == CHESHVAN && hDeath.dd == 30 && !HDate.longCheshvan(hDeath.yy + 1)) {
+    // If it's Heshvan 30 it depends on the first anniversary;
+    // if that was not Heshvan 30, use the day before Kislev 1.
+    hDeath = HDate.abs2hebrew(HDate.hebrew2abs(hyear, KISLEV, 1) - 1);
+  } else if (hDeath.mm == KISLEV && hDeath.dd == 30 && HDate.shortKislev(hDeath.yy + 1)) {
+    // If it's Kislev 30 it depends on the first anniversary;
+    // if that was not Kislev 30, use the day before Teveth 1.
+    hDeath = HDate.abs2hebrew(HDate.hebrew2abs(hyear, TEVET, 1) - 1);
+  } else if (hDeath.mm == ADAR_II) {
+    // If it's Adar II, use the same day in last month of year (Adar or Adar II).
+    hDeath.mm = HDate.monthsInYear(hyear);
+  } else if (hDeath.mm == ADAR_I && hDeath.dd == 30 && !HDate.isLeapYear(hyear)) {
+    // If it's the 30th in Adar I and year is not a leap year
+    // (so Adar has only 29 days), use the last day in Shevat.
+    hDeath.dd = 30;
+    hDeath.mm = SHVAT;
+  } // In all other cases, use the normal anniversary of the date of death.
+  // advance day to rosh chodesh if needed
+
+
+  if (hDeath.mm == CHESHVAN && hDeath.dd == 30 && !HDate.longCheshvan(hyear)) {
+    hDeath.mm = KISLEV;
+    hDeath.dd = 1;
+  } else if (hDeath.mm == KISLEV && hDeath.dd == 30 && HDate.shortKislev(hyear)) {
+    hDeath.mm = TEVET;
+    hDeath.dd = 1;
+  }
+
+  return new HDate(hDeath.dd, hDeath.mm, hyear);
+}
+/**
+ * @private
+ * @param {number} hyear Hebrew year
+ * @param {Date|HDate} gdate Gregorian or Hebrew date of event
+ * @return {HDate} anniversary occurring in `hyear`
+ */
+
+function getBirthdayOrAnniversary_(hyear, gdate) {
+  const orig = HDate.isHDate(gdate) ? gdate : new HDate(gdate);
+  const origYear = orig.getFullYear();
+
+  if (hyear <= origYear) {
+    // `Hebrew year ${hyear} occurs on or before original date in ${origYear}`
+    return undefined;
+  }
+
+  const isOrigLeap = HDate.isLeapYear(origYear);
+  let month = orig.getMonth();
+  let day = orig.getDate();
+
+  if (month == ADAR_I && !isOrigLeap || month == ADAR_II && isOrigLeap) {
+    month = HDate.monthsInYear(hyear);
+  } else if (month == CHESHVAN && day == 30 && !HDate.longCheshvan(hyear)) {
+    month = KISLEV;
+    day = 1;
+  } else if (month == KISLEV && day == 30 && HDate.shortKislev(hyear)) {
+    month = TEVET;
+    day = 1;
+  } else if (month == ADAR_I && day == 30 && isOrigLeap && !HDate.isLeapYear(hyear)) {
+    month = NISAN$1;
+    day = 1;
+  }
+
+  return new HDate(day, month, hyear);
+}
+
+var version="3.33.4";
 
 var headers$1={"plural-forms":"nplurals=2; plural=(n > 1);",language:"en_CA@ashkenazi"};var contexts$1={"":{Berachot:["Berachos"],Shabbat:["Shabbos"],Taanit:["Taanis"],Yevamot:["Yevamos"],Ketubot:["Kesubos"],"Baba Batra":["Baba Basra"],Makkot:["Makkos"],Shevuot:["Shevuos"],Horayot:["Horayos"],Menachot:["Menachos"],Bechorot:["Bechoros"],Keritot:["Kerisos"],Midot:["Midos"],"Achrei Mot":["Achrei Mos"],Bechukotai:["Bechukosai"],"Beha'alotcha":["Beha'aloscha"],Bereshit:["Bereshis"],Chukat:["Chukas"],"Erev Shavuot":["Erev Shavuos"],"Erev Sukkot":["Erev Sukkos"],"Ki Tavo":["Ki Savo"],"Ki Teitzei":["Ki Seitzei"],"Ki Tisa":["Ki Sisa"],Matot:["Matos"],"Purim Katan":["Purim Koton"],Tazria:["Sazria"],"Shabbat Chazon":["Shabbos Chazon"],"Shabbat HaChodesh":["Shabbos HaChodesh"],"Shabbat HaGadol":["Shabbos HaGadol"],"Shabbat Nachamu":["Shabbos Nachamu"],"Shabbat Parah":["Shabbos Parah"],"Shabbat Shekalim":["Shabbos Shekalim"],"Shabbat Shuva":["Shabbos Shuvah"],"Shabbat Zachor":["Shabbos Zachor"],Shavuot:["Shavuos"],"Shavuot I":["Shavuos I"],"Shavuot II":["Shavuos II"],Shemot:["Shemos"],"Shmini Atzeret":["Shmini Atzeres"],"Simchat Torah":["Simchas Torah"],Sukkot:["Sukkos"],"Sukkot I":["Sukkos I"],"Sukkot II":["Sukkos II"],"Sukkot II (CH''M)":["Sukkos II (CH''M)"],"Sukkot III (CH''M)":["Sukkos III (CH''M)"],"Sukkot IV (CH''M)":["Sukkos IV (CH''M)"],"Sukkot V (CH''M)":["Sukkos V (CH''M)"],"Sukkot VI (CH''M)":["Sukkos VI (CH''M)"],"Sukkot VII (Hoshana Raba)":["Sukkos VII (Hoshana Raba)"],"Ta'anit Bechorot":["Ta'anis Bechoros"],"Ta'anit Esther":["Ta'anis Esther"],Toldot:["Toldos"],Vaetchanan:["Vaeschanan"],Yitro:["Yisro"],"Vezot Haberakhah":["Vezos Haberakhah"],Parashat:["Parshas"],"Leil Selichot":["Leil Selichos"],"Shabbat Mevarchim Chodesh":["Shabbos Mevorchim Chodesh"],"Shabbat Shirah":["Shabbos Shirah"],Tevet:["Teves"],"Asara B'Tevet":["Asara B'Teves"],Berakhot:["Berakhos"],Sheviit:["Sheviis"],Terumot:["Terumos"],Maasrot:["Maasros"],Eduyot:["Eduyos"],Avot:["Avos"],Bekhorot:["Bekhoros"],Middot:["Middos"],Oholot:["Oholos"],Tahorot:["Tahoros"],Mikvaot:["Mikvaos"]}};var poAshkenazi = {headers:headers$1,contexts:contexts$1};
 
@@ -4954,12 +5059,6 @@ const SIVAN = months.SIVAN; // const TAMUZ = months.TAMUZ;
 
 const ELUL = months.ELUL;
 const TISHREI = months.TISHREI;
-const CHESHVAN = months.CHESHVAN;
-const KISLEV = months.KISLEV;
-const TEVET = months.TEVET;
-const SHVAT = months.SHVAT;
-const ADAR_I = months.ADAR_I;
-const ADAR_II = months.ADAR_II;
 const LIGHT_CANDLES = flags.LIGHT_CANDLES;
 const YOM_TOV_ENDS = flags.YOM_TOV_ENDS;
 const CHUL_ONLY = flags.CHUL_ONLY;
@@ -5288,18 +5387,49 @@ function getMaskFromOptions(options) {
 }
 
 const MASK_LIGHT_CANDLES = LIGHT_CANDLES | LIGHT_CANDLES_TZEIS | CHANUKAH_CANDLES | YOM_TOV_ENDS;
+const defaultLocation = new Location(0, 0, false, 'UTC');
+const hour12cc = {
+  US: 1,
+  CA: 1,
+  BR: 1,
+  AU: 1,
+  NZ: 1,
+  DO: 1,
+  PR: 1,
+  GR: 1,
+  IN: 1,
+  KR: 1,
+  NP: 1,
+  ZA: 1
+};
+/**
+ * @private
+ * @param {Event} ev
+ * @return {boolean}
+ */
+
+function observedInIsrael(ev) {
+  return ev.observedInIsrael();
+}
+/**
+ * @private
+ * @param {Event} ev
+ * @return {boolean}
+ */
+
+
+function observedInDiaspora(ev) {
+  return ev.observedInDiaspora();
+}
 /**
- * @namespace
  * HebrewCalendar is the main interface to the `@hebcal/core` library.
  * This namespace is used to calculate holidays, rosh chodesh, candle lighting & havdalah times,
  * Parashat HaShavua, Daf Yomi, days of the omer, and the molad.
  * Event names can be rendered in several languges using the `locale` option.
  */
 
-const HebrewCalendar = {
-  /** @private */
-  defaultLocation: new Location(0, 0, false, 'UTC'),
 
+class HebrewCalendar {
   /**
    * Calculates holidays and other Hebrew calendar events based on {@link HebrewCalendar.Options}.
    *
@@ -5400,11 +5530,11 @@ const HebrewCalendar = {
    * @param {HebrewCalendar.Options} [options={}]
    * @return {Event[]}
    */
-  calendar: function (options = {}) {
+  static calendar(options = {}) {
     options = shallowCopy({}, options); // so we can modify freely
 
     checkCandleOptions(options);
-    const location = options.location = options.location || this.defaultLocation;
+    const location = options.location = options.location || defaultLocation;
     const il = options.il = options.il || location.il || false;
     options.mask = getMaskFromOptions(options);
 
@@ -5454,7 +5584,7 @@ const HebrewCalendar = {
         holidaysYear = HebrewCalendar.getHolidaysForYear(currentYear);
 
         if (options.sedrot && currentYear >= 3762) {
-          sedra = getSedra(currentYear, il);
+          sedra = getSedra_(currentYear, il);
         }
 
         if (options.omer) {
@@ -5529,8 +5659,7 @@ const HebrewCalendar = {
     }
 
     return evts;
-  },
-
+  }
   /**
    * Calculates a birthday or anniversary (non-yahrzeit).
    * `hyear` must be after original `gdate` of anniversary.
@@ -5557,35 +5686,11 @@ const HebrewCalendar = {
    * @param {Date|HDate} gdate Gregorian or Hebrew date of event
    * @return {HDate} anniversary occurring in `hyear`
    */
-  getBirthdayOrAnniversary: function (hyear, gdate) {
-    const orig = HDate.isHDate(gdate) ? gdate : new HDate(gdate);
-    const origYear = orig.getFullYear();
-
-    if (hyear <= origYear) {
-      // `Hebrew year ${hyear} occurs on or before original date in ${origYear}`
-      return undefined;
-    }
-
-    const isOrigLeap = HDate.isLeapYear(origYear);
-    let month = orig.getMonth();
-    let day = orig.getDate();
-
-    if (month == ADAR_I && !isOrigLeap || month == ADAR_II && isOrigLeap) {
-      month = HDate.monthsInYear(hyear);
-    } else if (month == CHESHVAN && day == 30 && !HDate.longCheshvan(hyear)) {
-      month = KISLEV;
-      day = 1;
-    } else if (month == KISLEV && day == 30 && HDate.shortKislev(hyear)) {
-      month = TEVET;
-      day = 1;
-    } else if (month == ADAR_I && day == 30 && isOrigLeap && !HDate.isLeapYear(hyear)) {
-      month = NISAN;
-      day = 1;
-    }
 
-    return new HDate(day, month, hyear);
-  },
 
+  static getBirthdayOrAnniversary(hyear, gdate) {
+    return getBirthdayOrAnniversary_(hyear, gdate);
+  }
   /**
    * Calculates yahrzeit.
    * `hyear` must be after original `gdate` of death.
@@ -5620,50 +5725,11 @@ const HebrewCalendar = {
    * @param {Date|HDate} gdate Gregorian or Hebrew date of death
    * @return {HDate} anniversary occurring in hyear
    */
-  getYahrzeit: function (hyear, gdate) {
-    const orig = HDate.isHDate(gdate) ? gdate : new HDate(gdate);
-    let hDeath = {
-      yy: orig.getFullYear(),
-      mm: orig.getMonth(),
-      dd: orig.getDate()
-    };
 
-    if (hyear <= hDeath.yy) {
-      // `Hebrew year ${hyear} occurs on or before original date in ${hDeath.yy}`
-      return undefined;
-    }
-
-    if (hDeath.mm == CHESHVAN && hDeath.dd == 30 && !HDate.longCheshvan(hDeath.yy + 1)) {
-      // If it's Heshvan 30 it depends on the first anniversary;
-      // if that was not Heshvan 30, use the day before Kislev 1.
-      hDeath = HDate.abs2hebrew(HDate.hebrew2abs(hyear, KISLEV, 1) - 1);
-    } else if (hDeath.mm == KISLEV && hDeath.dd == 30 && HDate.shortKislev(hDeath.yy + 1)) {
-      // If it's Kislev 30 it depends on the first anniversary;
-      // if that was not Kislev 30, use the day before Teveth 1.
-      hDeath = HDate.abs2hebrew(HDate.hebrew2abs(hyear, TEVET, 1) - 1);
-    } else if (hDeath.mm == ADAR_II) {
-      // If it's Adar II, use the same day in last month of year (Adar or Adar II).
-      hDeath.mm = HDate.monthsInYear(hyear);
-    } else if (hDeath.mm == ADAR_I && hDeath.dd == 30 && !HDate.isLeapYear(hyear)) {
-      // If it's the 30th in Adar I and year is not a leap year
-      // (so Adar has only 29 days), use the last day in Shevat.
-      hDeath.dd = 30;
-      hDeath.mm = SHVAT;
-    } // In all other cases, use the normal anniversary of the date of death.
-    // advance day to rosh chodesh if needed
-
-
-    if (hDeath.mm == CHESHVAN && hDeath.dd == 30 && !HDate.longCheshvan(hyear)) {
-      hDeath.mm = KISLEV;
-      hDeath.dd = 1;
-    } else if (hDeath.mm == KISLEV && hDeath.dd == 30 && HDate.shortKislev(hyear)) {
-      hDeath.mm = TEVET;
-      hDeath.dd = 1;
-    }
-
-    return new HDate(hDeath.dd, hDeath.mm, hyear);
-  },
 
+  static getYahrzeit(hyear, gdate) {
+    return getYahrzeit_(hyear, gdate);
+  }
   /**
    * Lower-level holidays interface, which returns a `Map` of `Event`s indexed by
    * `HDate.toString()`. These events must filtered especially for `flags.IL_ONLY`
@@ -5672,65 +5738,58 @@ const HebrewCalendar = {
    * @param {number} year Hebrew year
    * @return {Map<string,Event[]>}
    */
-  getHolidaysForYear: getHolidaysForYear,
 
+
+  static getHolidaysForYear(year) {
+    return getHolidaysForYear_(year);
+  }
   /**
    * Returns an array of holidays for the year
    * @param {number} year Hebrew year
    * @param {boolean} il use the Israeli schedule for holidays
    * @return {Event[]}
    */
-  getHolidaysForYearArray: function (year, il) {
-    const yearMap = HebrewCalendar.getHolidaysForYear(year);
+
+
+  static getHolidaysForYearArray(year, il) {
+    const yearMap = getHolidaysForYear_(year);
     const startAbs = HDate.hebrew2abs(year, TISHREI, 1);
     const endAbs = HDate.hebrew2abs(year + 1, TISHREI, 1) - 1;
-    const events = [];
+    let events = [];
+    const myFilter = il ? observedInIsrael : observedInDiaspora;
 
     for (let absDt = startAbs; absDt <= endAbs; absDt++) {
       const hd = new HDate(absDt);
       const holidays = yearMap.get(hd.toString());
 
       if (holidays) {
-        const filtered = holidays.filter(ev => il && ev.observedInIsrael() || !il && ev.observedInDiaspora());
-        filtered.forEach(ev => events.push(ev));
+        const filtered = holidays.filter(myFilter);
+        events = events.concat(filtered);
       }
     }
 
     return events;
-  },
-
+  }
   /**
    * Returns an array of Events on this date (or undefined if no events)
    * @param {HDate|Date|number} date Hebrew Date, Gregorian date, or absolute R.D. day number
    * @param {boolean} [il] use the Israeli schedule for holidays
    * @return {Event[]}
    */
-  getHolidaysOnDate: function (date, il) {
+
+
+  static getHolidaysOnDate(date, il) {
     const hd = HDate.isHDate(date) ? date : new HDate(date);
-    const yearMap = HebrewCalendar.getHolidaysForYear(hd.getFullYear());
+    const yearMap = getHolidaysForYear_(hd.getFullYear());
     const events = yearMap.get(hd.toString());
 
     if (typeof il === 'undefined' || typeof events === 'undefined') {
       return events;
     }
 
-    return events.filter(ev => il && ev.observedInIsrael() || !il && ev.observedInDiaspora());
-  },
-  hour12cc: {
-    US: 1,
-    CA: 1,
-    BR: 1,
-    AU: 1,
-    NZ: 1,
-    DO: 1,
-    PR: 1,
-    GR: 1,
-    IN: 1,
-    KR: 1,
-    NP: 1,
-    ZA: 1
-  },
-
+    const myFilter = il ? observedInIsrael : observedInDiaspora;
+    return events.filter(myFilter);
+  }
   /**
    * Helper function to format a 23-hour (00:00-23:59) time in US format ("8:13pm") or
    * keep as "20:13" for any other locale/country. Uses `HebrewCalendar.Options` to determine
@@ -5740,11 +5799,13 @@ const HebrewCalendar = {
    * @param {HebrewCalendar.Options} options
    * @return {string}
    */
-  reformatTimeStr: function (timeStr, suffix, options) {
+
+
+  static reformatTimeStr(timeStr, suffix, options) {
     if (typeof timeStr !== 'string') throw new TypeError(`Bad timeStr: ${timeStr}`);
     const cc = options.location && options.location.cc || (options.il ? 'IL' : 'US');
 
-    if (typeof this.hour12cc[cc] === 'undefined') {
+    if (typeof hour12cc[cc] === 'undefined') {
       return timeStr;
     }
 
@@ -5758,13 +5819,13 @@ const HebrewCalendar = {
     }
 
     return `${hour}:${hm[1]}${suffix}`;
-  },
-
+  }
   /** @return {string} */
-  version: function () {
-    return version;
-  },
 
+
+  static version() {
+    return version;
+  }
   /**
    * Convenience function to create an instance of `Sedra` or reuse a previously
    * created and cached instance.
@@ -5773,8 +5834,13 @@ const HebrewCalendar = {
    * @param {boolean} il
    * @return {Sedra}
    */
-  getSedra: getSedra
-};
+
+
+  static getSedra(hyear, il) {
+    return getSedra_(hyear, il);
+  }
+
+}
 /**
  * Appends the Event `ev` to the `events` array. Also may add related
  * timed events like candle-lighting or fast start/end