@hebcal/core 3.33.3 → 3.33.6

package/dist/index.js

@@ -1,8 +1,23 @@
-/*! @hebcal/core v3.33.3 */
+/*! @hebcal/core v3.33.6 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+function _defineProperty(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
 /*
     Hebcal - A Jewish Calendar Generator
     Copyright (c) 1994-2020 Danny Sadinoff
@@ -46,53 +61,54 @@ function quotient(x, y) {
 }
 /**
  * Gregorian date helper functions.
- * @namespace
  */
 
 
-const greg = {
+class greg {
   /**
    * Long names of the Gregorian months (1='January', 12='December')
    * @readonly
    * @type {string[]}
    */
-  monthNames: ['', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
 
   /**
    * Returns true if the Gregorian year is a leap year
    * @param {number} year Gregorian year
    * @return {boolean}
    */
-  isLeapYear: function (year) {
+  static isLeapYear(year) {
     return !(year % 4) && (!!(year % 100) || !(year % 400));
-  },
-
+  }
   /**
    * Number of days in the Gregorian month for given year
    * @param {number} month Gregorian month (1=January, 12=December)
    * @param {number} year Gregorian year
    * @return {number}
    */
-  daysInMonth: function (month, year) {
+
+
+  static daysInMonth(month, year) {
     // 1 based months
     return monthLengths[+this.isLeapYear(year)][month];
-  },
-
+  }
   /**
    * Returns true if the object is a Javascript Date
    * @param {Object} obj
    * @return {boolean}
    */
-  isDate: function (obj) {
-    return typeof obj === 'object' && Date.prototype === obj.__proto__;
-  },
 
+
+  static isDate(obj) {
+    return typeof obj === 'object' && Date.prototype === obj.__proto__;
+  }
   /**
    * Returns number of days since January 1 of that year
    * @param {Date} date Gregorian date
    * @return {number}
    */
-  dayOfYear: function (date) {
+
+
+  static dayOfYear(date) {
     if (!this.isDate(date)) {
       throw new TypeError('Argument to greg.dayOfYear not a Date');
     }
@@ -109,14 +125,15 @@ const greg = {
     }
 
     return doy;
-  },
-
+  }
   /**
    * Converts Gregorian date to absolute R.D. (Rata Die) days
    * @param {Date} date Gregorian date
    * @return {number}
    */
-  greg2abs: function (date) {
+
+
+  static greg2abs(date) {
     if (!this.isDate(date)) {
       throw new TypeError('Argument to greg.greg2abs not a Date');
     }
@@ -127,14 +144,15 @@ const greg = {
     Math.floor(year / 4) - // + Julian Leap years
     Math.floor(year / 100) + // - century years
     Math.floor(year / 400)); // + Gregorian leap years
-  },
-
+  }
   /**
    * @private
    * @param {number} theDate - R.D. number of days
    * @return {number}
    */
-  yearFromFixed: function (theDate) {
+
+
+  static yearFromFixed(theDate) {
     const l0 = theDate - 1;
     const n400 = quotient(l0, 146097);
     const d1 = mod(l0, 146097);
@@ -145,8 +163,7 @@ const greg = {
     const n1 = quotient(d3, 365);
     const year = 400 * n400 + 100 * n100 + 4 * n4 + n1;
     return n100 != 4 && n1 != 4 ? year + 1 : year;
-  },
-
+  }
   /**
    * @private
    * @param {number} year
@@ -154,11 +171,12 @@ const greg = {
    * @param {number} day
    * @return {number}
    */
-  toFixed: function (year, month, day) {
+
+
+  static toFixed(year, month, day) {
     const py = year - 1;
     return 0 + 365 * py + quotient(py, 4) - quotient(py, 100) + quotient(py, 400) + quotient(367 * month - 362, 12) + Math.floor(month <= 2 ? 0 : this.isLeapYear(year) ? -1 : -2) + day;
-  },
-
+  }
   /**
    * Converts from Rata Die (R.D. number) to Gregorian date.
    * See the footnote on page 384 of ``Calendrical Calculations, Part II:
@@ -168,7 +186,9 @@ const greg = {
    * @param {number} theDate - R.D. number of days
    * @return {Date}
    */
-  abs2greg: function (theDate) {
+
+
+  static abs2greg(theDate) {
     if (typeof theDate !== 'number') {
       throw new TypeError('Argument to greg.abs2greg not a Number');
     }
@@ -187,7 +207,10 @@ const greg = {
 
     return dt;
   }
-};
+
+}
+
+_defineProperty(greg, "monthNames", ['', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']);
 
 const GERESH = '׳';
 const GERSHAYIM = '״';
@@ -375,18 +398,14 @@ const alias = {
  * * `ashkenazi` - Ashkenazi transliterations (e.g. "Shabbos")
  * * `he` - Hebrew (e.g. "שַׁבָּת")
  * * `he-x-NoNikud` - Hebrew without nikud (e.g. "שבת")
- * @namespace
  */
 
-const Locale = {
+class Locale {
   /** @private */
-  locales: Object.create(null),
 
   /** @private */
-  activeLocale: null,
 
   /** @private */
-  activeName: null,
 
   /**
    * Returns translation only if `locale` offers a non-empty translation for `id`.
@@ -395,7 +414,7 @@ const Locale = {
    * @param {string} [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.
    * @return {string}
    */
-  lookupTranslation: function lookupTranslation(id, locale) {
+  static lookupTranslation(id, locale) {
     const locale0 = locale && locale.toLowerCase();
     const loc = typeof locale == 'string' && this.locales[locale0] || this.activeLocale;
     const array = loc[id];
@@ -405,15 +424,16 @@ const Locale = {
     }
 
     return undefined;
-  },
-
+  }
   /**
    * By default, if no translation was found, returns `id`.
    * @param {string} id Message ID to translate
    * @param {string} [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.
    * @return {string}
    */
-  gettext: function gettext(id, locale) {
+
+
+  static gettext(id, locale) {
     const text = this.lookupTranslation(id, locale);
 
     if (typeof text == 'undefined') {
@@ -421,21 +441,21 @@ const Locale = {
     }
 
     return text;
-  },
-
+  }
   /**
    * Register locale translations.
    * @param {string} locale Locale name (i.e.: `'he'`, `'fr'`)
    * @param {LocaleDate} data parsed data from a `.po` file.
    */
-  addLocale: function addLocale(locale, data) {
+
+
+  static addLocale(locale, data) {
     if (typeof data.contexts !== 'object' || typeof data.contexts[''] !== 'object') {
       throw new TypeError(`Locale '${locale}' invalid compact format`);
     }
 
     this.locales[locale.toLowerCase()] = data.contexts[''];
-  },
-
+  }
   /**
    * Activates a locale. Throws an error if the locale has not been previously added.
    * After setting the locale to be used, all strings marked for translations
@@ -443,7 +463,9 @@ const Locale = {
    * @param {string} locale Locale name (i.e: `'he'`, `'fr'`)
    * @return {LocaleData}
    */
-  useLocale: function useLocale(locale) {
+
+
+  static useLocale(locale) {
     const locale0 = locale.toLowerCase();
     const obj = this.locales[locale0];
 
@@ -454,30 +476,33 @@ const Locale = {
     this.activeName = alias[locale0] || locale0;
     this.activeLocale = obj;
     return this.activeLocale;
-  },
-
+  }
   /**
    * Returns the name of the active locale (i.e. 'he', 'ashkenazi', 'fr')
    * @return {string}
    */
-  getLocaleName: function getLocaleName() {
-    return this.activeName;
-  },
 
+
+  static getLocaleName() {
+    return this.activeName;
+  }
   /**
    * Returns the names of registered locales
    * @return {string[]}
    */
-  getLocaleNames: function getLocaleNames() {
-    return Object.keys(this.locales).sort();
-  },
 
+
+  static getLocaleNames() {
+    return Object.keys(this.locales).sort();
+  }
   /**
    * @param {number} n
    * @param {string} [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.
    * @return {string}
    */
-  ordinal: function ordinal(n, locale) {
+
+
+  static ordinal(n, locale) {
     const locale1 = locale && locale.toLowerCase();
     const locale0 = locale1 || this.activeName;
 
@@ -506,28 +531,38 @@ const Locale = {
       default:
         return n + '.';
     }
-  },
-
+  }
   /**
    * @private
    * @param {number} n
    * @return {string}
    */
-  getEnOrdinal: function getEnOrdinal(n) {
+
+
+  static getEnOrdinal(n) {
     const s = ['th', 'st', 'nd', 'rd'];
     const v = n % 100;
     return n + (s[(v - 20) % 10] || s[v] || s[0]);
-  },
-
+  }
   /**
    * Removes nekudot from Hebrew string
    * @param {string} str
    * @return {string}
    */
-  hebrewStripNikkud: function hebrewStripNikkud(str) {
+
+
+  static hebrewStripNikkud(str) {
     return str.replace(/[\u0590-\u05bd]/g, '').replace(/[\u05bf-\u05c7]/g, '');
   }
-};
+
+}
+
+_defineProperty(Locale, "locales", Object.create(null));
+
+_defineProperty(Locale, "activeLocale", null);
+
+_defineProperty(Locale, "activeName", null);
+
 Locale.addLocale('en', noopLocale);
 Locale.addLocale('s', noopLocale);
 Locale.addLocale('', noopLocale);
@@ -553,7 +588,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 +942,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 +1088,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 +1488,7 @@ class HDate {
           /* this catches "november" */
         }
 
-        return NISAN$2;
+        return NISAN$3;
 
       case 'i':
         return IYYAR$1;
@@ -2778,18 +2813,20 @@ class Location {
    * @param {string} geoid - optional string or numeric geographic ID
    */
   constructor(latitude, longitude, il, tzid, cityName, countryCode, geoid) {
-    this.latitude = +latitude;
+    const lat = typeof latitude === 'number' ? latitude : parseFloat(latitude);
 
-    if (this.latitude < -90 || this.latitude > 90) {
-      throw new RangeError(`Latitude ${this.latitude} out of range [-90,90]`);
+    if (isNaN(lat) || lat < -90 || lat > 90) {
+      throw new RangeError(`Latitude ${latitude} out of range [-90,90]`);
     }
 
-    this.longitude = +longitude;
+    const long = typeof longitude === 'number' ? longitude : parseFloat(longitude);
 
-    if (this.longitude < -180 || this.longitude > 180) {
-      throw new RangeError(`Longitude ${this.longitude} out of range [-180,180]`);
+    if (isNaN(long) || long < -180 || long > 180) {
+      throw new RangeError(`Longitude ${longitude} out of range [-180,180]`);
     }
 
+    this.latitude = lat;
+    this.longitude = long;
     this.il = Boolean(il);
     this.tzid = tzid;
     this.name = cityName;
@@ -3056,7 +3093,7 @@ const TZEIT_3MEDIUM_STARS = 7.083;
  * @param {HDate} hd
  * @param {number} dow
  * @param {Location} location
- * @param {HebrewCalendar.Options} options
+ * @param {CalOptions} options
  * @return {Event}
  */
 
@@ -3467,7 +3504,7 @@ class OmerEvent extends Event {
 
 
   getEmoji() {
-    if (this.emoji) return this.emoji;
+    if (typeof this.emoji === 'string') return this.emoji;
     const number = this.omer;
     const ones = number % 10;
     const tens = Math.floor(number / 10);
@@ -3477,7 +3514,8 @@ class OmerEvent extends Event {
 
 
   getWeeks() {
-    return this.weekNumber;
+    const day7 = this.daysWithinWeeks === 7;
+    return day7 ? this.weekNumber : this.weekNumber - 1;
   }
   /** @return {number} */
 
@@ -4390,7 +4428,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;
@@ -4467,7 +4505,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);
 
@@ -4482,6 +4520,11 @@ const emojiIsraelFlag = {
   emoji: '🇮🇱'
 };
 const chanukahEmoji = '🕎';
+const emojiPesach = '🫓';
+const emojiShavuot = {
+  emoji: '⛰️🌸'
+};
+const emojiSukkot = '🌿🍋';
 const yearCache = Object.create(null);
 /**
  * Lower-level holidays interface, which returns a `Map` of `Event`s indexed by
@@ -4492,7 +4535,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) {
@@ -4506,7 +4549,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) {
@@ -4545,27 +4588,45 @@ function getHolidaysForYear(year) {
   add(new HolidayEvent(new HDate(HDate.dayOnOrBefore(SAT$1, 7 + RH.abs())), 'Shabbat Shuva', SPECIAL_SHABBAT$1));
   addEvents(year, [[10, TISHREI$1, 'Yom Kippur', CHAG | YOM_TOV_ENDS$1 | MAJOR_FAST$1, {
     emoji: '📖✍️'
-  }], [14, TISHREI$1, 'Erev Sukkot', EREV$1 | LIGHT_CANDLES$1], // Attributes for Israel and Diaspora are different
-  [15, TISHREI$1, 'Sukkot I', CHAG | LIGHT_CANDLES_TZEIS$1 | CHUL_ONLY$1], [16, TISHREI$1, 'Sukkot II', CHAG | YOM_TOV_ENDS$1 | CHUL_ONLY$1], [17, TISHREI$1, 'Sukkot III (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
-    cholHaMoedDay: 1
+  }], [14, TISHREI$1, 'Erev Sukkot', EREV$1 | LIGHT_CANDLES$1, {
+    emoji: emojiSukkot
+  }], // Attributes for Israel and Diaspora are different
+  [15, TISHREI$1, 'Sukkot I', CHAG | LIGHT_CANDLES_TZEIS$1 | CHUL_ONLY$1, {
+    emoji: emojiSukkot
+  }], [16, TISHREI$1, 'Sukkot II', CHAG | YOM_TOV_ENDS$1 | CHUL_ONLY$1, {
+    emoji: emojiSukkot
+  }], [17, TISHREI$1, 'Sukkot III (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
+    cholHaMoedDay: 1,
+    emoji: emojiSukkot
   }], [18, TISHREI$1, 'Sukkot IV (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
-    cholHaMoedDay: 2
+    cholHaMoedDay: 2,
+    emoji: emojiSukkot
   }], [19, TISHREI$1, 'Sukkot V (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
-    cholHaMoedDay: 3
+    cholHaMoedDay: 3,
+    emoji: emojiSukkot
   }], [20, TISHREI$1, 'Sukkot VI (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
-    cholHaMoedDay: 4
-  }], [15, TISHREI$1, 'Sukkot I', CHAG | YOM_TOV_ENDS$1 | IL_ONLY$1], [16, TISHREI$1, 'Sukkot II (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
-    cholHaMoedDay: 1
+    cholHaMoedDay: 4,
+    emoji: emojiSukkot
+  }], [15, TISHREI$1, 'Sukkot I', CHAG | YOM_TOV_ENDS$1 | IL_ONLY$1, {
+    emoji: emojiSukkot
+  }], [16, TISHREI$1, 'Sukkot II (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
+    cholHaMoedDay: 1,
+    emoji: emojiSukkot
   }], [17, TISHREI$1, 'Sukkot III (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
-    cholHaMoedDay: 2
+    cholHaMoedDay: 2,
+    emoji: emojiSukkot
   }], [18, TISHREI$1, 'Sukkot IV (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
-    cholHaMoedDay: 3
+    cholHaMoedDay: 3,
+    emoji: emojiSukkot
   }], [19, TISHREI$1, 'Sukkot V (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
-    cholHaMoedDay: 4
+    cholHaMoedDay: 4,
+    emoji: emojiSukkot
   }], [20, TISHREI$1, 'Sukkot VI (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
-    cholHaMoedDay: 5
+    cholHaMoedDay: 5,
+    emoji: emojiSukkot
   }], [21, TISHREI$1, 'Sukkot VII (Hoshana Raba)', LIGHT_CANDLES$1 | CHOL_HAMOED$1, {
-    cholHaMoedDay: -1
+    cholHaMoedDay: -1,
+    emoji: emojiSukkot
   }], [22, TISHREI$1, 'Shmini Atzeret', CHAG | LIGHT_CANDLES_TZEIS$1 | CHUL_ONLY$1], //    [22,  TISHREI,    "Shmini Atzeret / Simchat Torah", YOM_TOV_ENDS | IL_ONLY],
   [22, TISHREI$1, 'Shmini Atzeret', CHAG | YOM_TOV_ENDS$1 | IL_ONLY$1], [23, TISHREI$1, 'Simchat Torah', CHAG | YOM_TOV_ENDS$1 | CHUL_ONLY$1]]);
   add(new HolidayEvent(new HDate(24, KISLEV$1, year), 'Chanukah: 1 Candle', EREV$1 | MINOR_HOLIDAY$1 | CHANUKAH_CANDLES$1, {
@@ -4598,37 +4659,52 @@ 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, {
-    cholHaMoedDay: 1
-  }], [17, NISAN$1, '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, {
-    cholHaMoedDay: 3
-  }], [19, NISAN$1, '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, {
-    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, {
-    cholHaMoedDay: 1
-  }], [18, NISAN$1, '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, {
-    cholHaMoedDay: 3
-  }], [20, NISAN$1, '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, {
+  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, {
+    emoji: '🫓🍷'
+  }], // Attributes for Israel and Diaspora are different
+  [15, NISAN$2, 'Pesach I', CHAG | YOM_TOV_ENDS$1 | IL_ONLY$1, {
+    emoji: emojiPesach
+  }], [16, NISAN$2, 'Pesach II (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
+    cholHaMoedDay: 1,
+    emoji: emojiPesach
+  }], [17, NISAN$2, 'Pesach III (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
+    cholHaMoedDay: 2,
+    emoji: emojiPesach
+  }], [18, NISAN$2, 'Pesach IV (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
+    cholHaMoedDay: 3,
+    emoji: emojiPesach
+  }], [19, NISAN$2, 'Pesach V (CH\'\'M)', IL_ONLY$1 | CHOL_HAMOED$1, {
+    cholHaMoedDay: 4,
+    emoji: emojiPesach
+  }], [20, NISAN$2, 'Pesach VI (CH\'\'M)', LIGHT_CANDLES$1 | IL_ONLY$1 | CHOL_HAMOED$1, {
+    cholHaMoedDay: 5,
+    emoji: emojiPesach
+  }], [21, NISAN$2, 'Pesach VII', CHAG | YOM_TOV_ENDS$1 | IL_ONLY$1, {
+    emoji: emojiPesach
+  }], [15, NISAN$2, 'Pesach I', CHAG | LIGHT_CANDLES_TZEIS$1 | CHUL_ONLY$1, {
+    emoji: '🫓🍷'
+  }], [16, NISAN$2, 'Pesach II', CHAG | YOM_TOV_ENDS$1 | CHUL_ONLY$1, {
+    emoji: emojiPesach
+  }], [17, NISAN$2, 'Pesach III (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
+    cholHaMoedDay: 1,
+    emoji: emojiPesach
+  }], [18, NISAN$2, 'Pesach IV (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
+    cholHaMoedDay: 2,
+    emoji: emojiPesach
+  }], [19, NISAN$2, 'Pesach V (CH\'\'M)', CHUL_ONLY$1 | CHOL_HAMOED$1, {
+    cholHaMoedDay: 3,
+    emoji: emojiPesach
+  }], [20, NISAN$2, 'Pesach VI (CH\'\'M)', LIGHT_CANDLES$1 | CHUL_ONLY$1 | CHOL_HAMOED$1, {
+    cholHaMoedDay: 4,
+    emoji: emojiPesach
+  }], [21, NISAN$2, 'Pesach VII', CHAG | LIGHT_CANDLES_TZEIS$1 | CHUL_ONLY$1, {
+    emoji: emojiPesach
+  }], [22, NISAN$2, 'Pesach VIII', CHAG | YOM_TOV_ENDS$1 | CHUL_ONLY$1, {
+    emoji: emojiPesach
+  }], [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: '⛰️🌸'
-  }], [6, SIVAN$1, 'Shavuot', CHAG | YOM_TOV_ENDS$1 | IL_ONLY$1, {
-    emoji: '⛰️🌸'
-  }], [6, SIVAN$1, 'Shavuot I', CHAG | LIGHT_CANDLES_TZEIS$1 | CHUL_ONLY$1, {
-    emoji: '⛰️🌸'
-  }], [7, SIVAN$1, 'Shavuot II', CHAG | YOM_TOV_ENDS$1 | CHUL_ONLY$1, {
-    emoji: '⛰️🌸'
-  }], [15, AV, 'Tu B\'Av', MINOR_HOLIDAY$1, {
+  }], [5, SIVAN$1, 'Erev Shavuot', EREV$1 | LIGHT_CANDLES$1, emojiShavuot], [6, SIVAN$1, 'Shavuot', CHAG | YOM_TOV_ENDS$1 | IL_ONLY$1, emojiShavuot], [6, SIVAN$1, 'Shavuot I', CHAG | LIGHT_CANDLES_TZEIS$1 | CHUL_ONLY$1, emojiShavuot], [7, SIVAN$1, 'Shavuot II', CHAG | YOM_TOV_ENDS$1 | CHUL_ONLY$1, emojiShavuot], [15, AV, 'Tu B\'Av', MINOR_HOLIDAY$1, {
     emoji: '❤️'
   }], [1, ELUL$1, 'Rosh Hashana LaBehemot', MINOR_HOLIDAY$1, {
     emoji: '🐑'
@@ -4648,7 +4724,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
@@ -4657,9 +4733,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));
@@ -4694,7 +4770,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);
@@ -4727,7 +4803,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) {
@@ -4743,7 +4819,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;
@@ -4909,7 +4985,100 @@ class MishnaYomiEvent extends Event {
 
 }
 
-var version="3.33.3";
+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.6";
 
 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};
 
@@ -4966,12 +5135,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;
@@ -5025,7 +5188,7 @@ const RECOGNIZED_OPTIONS = {
 };
 /**
  * @private
- * @param {HebrewCalendar.Options} options
+ * @param {CalOptions} options
  */
 
 function warnUnrecognizedOptions(options) {
@@ -5052,7 +5215,7 @@ function shallowCopy(target, source) {
 /**
  * Modifies options in-place
  * @private
- * @param {HebrewCalendar.Options} options
+ * @param {CalOptions} options
  */
 
 
@@ -5087,7 +5250,7 @@ function checkCandleOptions(options) {
 }
 /**
  * Options to configure which events are returned
- * @typedef {Object} HebrewCalendar.Options
+ * @typedef {Object} CalOptions
  * @property {Location} location - latitude/longitude/tzid used for candle-lighting
  * @property {number} year - Gregorian or Hebrew year
  * @property {boolean} isHebrewYear - to interpret year as Hebrew year
@@ -5143,7 +5306,7 @@ function getAbs(d) {
 /**
  * Parse options object to determine start & end days
  * @private
- * @param {HebrewCalendar.Options} options
+ * @param {CalOptions} options
  * @return {number[]}
  */
 
@@ -5220,7 +5383,7 @@ function getStartAndEnd(options) {
 /**
  * Mask to filter Holiday array
  * @private
- * @param {HebrewCalendar.Options} options
+ * @param {CalOptions} options
  * @return {number}
  */
 
@@ -5300,20 +5463,51 @@ 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}.
+   * Calculates holidays and other Hebrew calendar events based on {@link CalOptions}.
    *
    * Each holiday is represented by an {@link Event} object which includes a date,
    * a description, flags and optional attributes.
@@ -5409,14 +5603,14 @@ const HebrewCalendar = {
    *   const date = hd.greg();
    *   console.log(date.toLocaleDateString(), ev.render(), hd.toString());
    * }
-   * @param {HebrewCalendar.Options} [options={}]
+   * @param {CalOptions} [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);
 
@@ -5466,7 +5660,7 @@ const HebrewCalendar = {
         holidaysYear = HebrewCalendar.getHolidaysForYear(currentYear);
 
         if (options.sedrot && currentYear >= 3762) {
-          sedra = getSedra(currentYear, il);
+          sedra = getSedra_(currentYear, il);
         }
 
         if (options.omer) {
@@ -5541,8 +5735,7 @@ const HebrewCalendar = {
     }
 
     return evts;
-  },
-
+  }
   /**
    * Calculates a birthday or anniversary (non-yahrzeit).
    * `hyear` must be after original `gdate` of anniversary.
@@ -5569,35 +5762,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.
@@ -5632,50 +5801,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`
@@ -5684,79 +5814,74 @@ 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
+   * keep as "20:13" for any other locale/country. Uses `CalOptions` to determine
    * locale.
    * @param {string} timeStr - original time like "20:30"
    * @param {string} suffix - "p" or "pm" or " P.M.". Add leading space if you want it
-   * @param {HebrewCalendar.Options} options
+   * @param {CalOptions} 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;
     }
 
@@ -5770,13 +5895,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.
@@ -5785,15 +5910,20 @@ 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
  * @private
  * @param {Event[]} events
  * @param {Event} ev
- * @param {HebrewCalendar.Options} options
+ * @param {CalOptions} options
  * @param {Event} candlesEv
  * @param {number} dow
  * @return {Event}