@hebcal/core 3.33.3 → 3.33.6

package/dist/bundle.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v3.33.3 */
+/*! @hebcal/core v3.33.6 */
 var hebcal = (function (exports) {
 'use strict';
 
@@ -37,6 +37,21 @@ function _createClass(Constructor, protoProps, staticProps) {
   return Constructor;
 }
 
+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;
+}
+
 function _inherits(subClass, superClass) {
   if (typeof superClass !== "function" && superClass !== null) {
     throw new TypeError("Super expression must either be null or a function");
@@ -238,148 +253,172 @@ function quotient(x, y) {
 }
 /**
  * Gregorian date helper functions.
- * @namespace
  */
 
 
-var 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'],
+var greg = /*#__PURE__*/function () {
+  function greg() {
+    _classCallCheck(this, greg);
+  }
 
-  /**
-   * Returns true if the Gregorian year is a leap year
-   * @param {number} year Gregorian year
-   * @return {boolean}
-   */
-  isLeapYear: function isLeapYear(year) {
-    return !(year % 4) && (!!(year % 100) || !(year % 400));
-  },
+  _createClass(greg, null, [{
+    key: "isLeapYear",
+    value:
+    /**
+     * Long names of the Gregorian months (1='January', 12='December')
+     * @readonly
+     * @type {string[]}
+     */
 
-  /**
-   * 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 daysInMonth(month, year) {
-    // 1 based months
-    return monthLengths[+this.isLeapYear(year)][month];
-  },
+    /**
+     * Returns true if the Gregorian year is a leap year
+     * @param {number} year Gregorian year
+     * @return {boolean}
+     */
+    function 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}
+     */
 
-  /**
-   * Returns true if the object is a Javascript Date
-   * @param {Object} obj
-   * @return {boolean}
-   */
-  isDate: function isDate(obj) {
-    return _typeof(obj) === 'object' && Date.prototype === obj.__proto__;
-  },
+  }, {
+    key: "daysInMonth",
+    value: function 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}
+     */
 
-  /**
-   * Returns number of days since January 1 of that year
-   * @param {Date} date Gregorian date
-   * @return {number}
-   */
-  dayOfYear: function dayOfYear(date) {
-    if (!this.isDate(date)) {
-      throw new TypeError('Argument to greg.dayOfYear not a Date');
+  }, {
+    key: "isDate",
+    value: function 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}
+     */
+
+  }, {
+    key: "dayOfYear",
+    value: function dayOfYear(date) {
+      if (!this.isDate(date)) {
+        throw new TypeError('Argument to greg.dayOfYear not a Date');
+      }
 
-    var doy = date.getDate() + 31 * date.getMonth();
+      var doy = date.getDate() + 31 * date.getMonth();
 
-    if (date.getMonth() > 1) {
-      // FEB
-      doy -= Math.floor((4 * (date.getMonth() + 1) + 23) / 10);
+      if (date.getMonth() > 1) {
+        // FEB
+        doy -= Math.floor((4 * (date.getMonth() + 1) + 23) / 10);
 
-      if (this.isLeapYear(date.getFullYear())) {
-        doy++;
+        if (this.isLeapYear(date.getFullYear())) {
+          doy++;
+        }
       }
+
+      return doy;
     }
+    /**
+     * Converts Gregorian date to absolute R.D. (Rata Die) days
+     * @param {Date} date Gregorian date
+     * @return {number}
+     */
 
-    return doy;
-  },
+  }, {
+    key: "greg2abs",
+    value: function greg2abs(date) {
+      if (!this.isDate(date)) {
+        throw new TypeError('Argument to greg.greg2abs not a Date');
+      }
 
-  /**
-   * Converts Gregorian date to absolute R.D. (Rata Die) days
-   * @param {Date} date Gregorian date
-   * @return {number}
-   */
-  greg2abs: function greg2abs(date) {
-    if (!this.isDate(date)) {
-      throw new TypeError('Argument to greg.greg2abs not a Date');
+      var year = date.getFullYear() - 1;
+      return this.dayOfYear(date) + // days this year
+      365 * year + ( // + days in prior years
+      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}
+     */
 
-    var year = date.getFullYear() - 1;
-    return this.dayOfYear(date) + // days this year
-    365 * year + ( // + days in prior years
-    Math.floor(year / 4) - // + Julian Leap years
-    Math.floor(year / 100) + // - century years
-    Math.floor(year / 400)); // + Gregorian leap years
-  },
+  }, {
+    key: "yearFromFixed",
+    value: function yearFromFixed(theDate) {
+      var l0 = theDate - 1;
+      var n400 = quotient(l0, 146097);
+      var d1 = mod(l0, 146097);
+      var n100 = quotient(d1, 36524);
+      var d2 = mod(d1, 36524);
+      var n4 = quotient(d2, 1461);
+      var d3 = mod(d2, 1461);
+      var n1 = quotient(d3, 365);
+      var year = 400 * n400 + 100 * n100 + 4 * n4 + n1;
+      return n100 != 4 && n1 != 4 ? year + 1 : year;
+    }
+    /**
+     * @private
+     * @param {number} year
+     * @param {number} month
+     * @param {number} day
+     * @return {number}
+     */
 
-  /**
-   * @private
-   * @param {number} theDate - R.D. number of days
-   * @return {number}
-   */
-  yearFromFixed: function yearFromFixed(theDate) {
-    var l0 = theDate - 1;
-    var n400 = quotient(l0, 146097);
-    var d1 = mod(l0, 146097);
-    var n100 = quotient(d1, 36524);
-    var d2 = mod(d1, 36524);
-    var n4 = quotient(d2, 1461);
-    var d3 = mod(d2, 1461);
-    var n1 = quotient(d3, 365);
-    var year = 400 * n400 + 100 * n100 + 4 * n4 + n1;
-    return n100 != 4 && n1 != 4 ? year + 1 : year;
-  },
+  }, {
+    key: "toFixed",
+    value: function toFixed(year, month, day) {
+      var 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:
+     * Three Historical Calendars'' by E. M. Reingold,  N. Dershowitz, and S. M.
+     * Clamen, Software--Practice and Experience, Volume 23, Number 4
+     * (April, 1993), pages 383-404 for an explanation.
+     * @param {number} theDate - R.D. number of days
+     * @return {Date}
+     */
 
-  /**
-   * @private
-   * @param {number} year
-   * @param {number} month
-   * @param {number} day
-   * @return {number}
-   */
-  toFixed: function toFixed(year, month, day) {
-    var 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;
-  },
+  }, {
+    key: "abs2greg",
+    value: function abs2greg(theDate) {
+      if (typeof theDate !== 'number') {
+        throw new TypeError('Argument to greg.abs2greg not a Number');
+      }
 
-  /**
-   * Converts from Rata Die (R.D. number) to Gregorian date.
-   * See the footnote on page 384 of ``Calendrical Calculations, Part II:
-   * Three Historical Calendars'' by E. M. Reingold,  N. Dershowitz, and S. M.
-   * Clamen, Software--Practice and Experience, Volume 23, Number 4
-   * (April, 1993), pages 383-404 for an explanation.
-   * @param {number} theDate - R.D. number of days
-   * @return {Date}
-   */
-  abs2greg: function abs2greg(theDate) {
-    if (typeof theDate !== 'number') {
-      throw new TypeError('Argument to greg.abs2greg not a Number');
-    }
+      theDate = Math.trunc(theDate);
+      var year = this.yearFromFixed(theDate);
+      var priorDays = theDate - this.toFixed(year, 1, 1);
+      var correction = theDate < this.toFixed(year, 3, 1) ? 0 : this.isLeapYear(year) ? 1 : 2;
+      var month = quotient(12 * (priorDays + correction) + 373, 367);
+      var day = theDate - this.toFixed(year, month, 1) + 1;
+      var dt = new Date(year, month - 1, day);
 
-    theDate = Math.trunc(theDate);
-    var year = this.yearFromFixed(theDate);
-    var priorDays = theDate - this.toFixed(year, 1, 1);
-    var correction = theDate < this.toFixed(year, 3, 1) ? 0 : this.isLeapYear(year) ? 1 : 2;
-    var month = quotient(12 * (priorDays + correction) + 373, 367);
-    var day = theDate - this.toFixed(year, month, 1) + 1;
-    var dt = new Date(year, month - 1, day);
+      if (year < 100 && year >= 0) {
+        dt.setFullYear(year);
+      }
 
-    if (year < 100 && year >= 0) {
-      dt.setFullYear(year);
+      return dt;
     }
+  }]);
 
-    return dt;
-  }
-};
+  return greg;
+}();
+
+_defineProperty(greg, "monthNames", ['', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']);
 
 var GERESH = '׳';
 var GERSHAYIM = '״';
@@ -1770,165 +1809,194 @@ var alias = {
  * * `ashkenazi` - Ashkenazi transliterations (e.g. "Shabbos")
  * * `he` - Hebrew (e.g. "שַׁבָּת")
  * * `he-x-NoNikud` - Hebrew without nikud (e.g. "שבת")
- * @namespace
  */
 
-var Locale = {
-  /** @private */
-  locales: Object.create(null),
+var Locale = /*#__PURE__*/function () {
+  function Locale() {
+    _classCallCheck(this, Locale);
+  }
 
-  /** @private */
-  activeLocale: null,
+  _createClass(Locale, null, [{
+    key: "lookupTranslation",
+    value:
+    /** @private */
 
-  /** @private */
-  activeName: null,
+    /** @private */
 
-  /**
-   * Returns translation only if `locale` offers a non-empty translation for `id`.
-   * Otherwise, returns `undefined`.
-   * @param {string} id Message ID to translate
-   * @param {string} [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.
-   * @return {string}
-   */
-  lookupTranslation: function lookupTranslation(id, locale) {
-    var locale0 = locale && locale.toLowerCase();
-    var loc = typeof locale == 'string' && this.locales[locale0] || this.activeLocale;
-    var array = loc[id];
+    /** @private */
 
-    if (array && array.length && array[0].length) {
-      return array[0];
+    /**
+     * Returns translation only if `locale` offers a non-empty translation for `id`.
+     * Otherwise, returns `undefined`.
+     * @param {string} id Message ID to translate
+     * @param {string} [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.
+     * @return {string}
+     */
+    function lookupTranslation(id, locale) {
+      var locale0 = locale && locale.toLowerCase();
+      var loc = typeof locale == 'string' && this.locales[locale0] || this.activeLocale;
+      var array = loc[id];
+
+      if (array && array.length && array[0].length) {
+        return array[0];
+      }
+
+      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}
+     */
 
-    return undefined;
-  },
+  }, {
+    key: "gettext",
+    value: function gettext(id, locale) {
+      var text = this.lookupTranslation(id, locale);
 
-  /**
-   * 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) {
-    var text = this.lookupTranslation(id, locale);
+      if (typeof text == 'undefined') {
+        return id;
+      }
 
-    if (typeof text == 'undefined') {
-      return id;
+      return text;
     }
+    /**
+     * Register locale translations.
+     * @param {string} locale Locale name (i.e.: `'he'`, `'fr'`)
+     * @param {LocaleDate} data parsed data from a `.po` file.
+     */
 
-    return text;
-  },
+  }, {
+    key: "addLocale",
+    value: function addLocale(locale, data) {
+      if (_typeof(data.contexts) !== 'object' || _typeof(data.contexts['']) !== 'object') {
+        throw new TypeError("Locale '".concat(locale, "' invalid compact format"));
+      }
 
-  /**
-   * 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) {
-    if (_typeof(data.contexts) !== 'object' || _typeof(data.contexts['']) !== 'object') {
-      throw new TypeError("Locale '".concat(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
+     * will be represented by the corresponding translation in the specified locale.
+     * @param {string} locale Locale name (i.e: `'he'`, `'fr'`)
+     * @return {LocaleData}
+     */
 
-    this.locales[locale.toLowerCase()] = data.contexts[''];
-  },
+  }, {
+    key: "useLocale",
+    value: function useLocale(locale) {
+      var locale0 = locale.toLowerCase();
+      var obj = this.locales[locale0];
 
-  /**
-   * 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
-   * will be represented by the corresponding translation in the specified locale.
-   * @param {string} locale Locale name (i.e: `'he'`, `'fr'`)
-   * @return {LocaleData}
-   */
-  useLocale: function useLocale(locale) {
-    var locale0 = locale.toLowerCase();
-    var obj = this.locales[locale0];
+      if (!obj) {
+        throw new RangeError("Locale '".concat(locale, "' not found"));
+      }
 
-    if (!obj) {
-      throw new RangeError("Locale '".concat(locale, "' not found"));
+      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}
+     */
 
-    this.activeName = alias[locale0] || locale0;
-    this.activeLocale = obj;
-    return this.activeLocale;
-  },
+  }, {
+    key: "getLocaleName",
+    value: function getLocaleName() {
+      return this.activeName;
+    }
+    /**
+     * Returns the names of registered locales
+     * @return {string[]}
+     */
 
-  /**
-   * Returns the name of the active locale (i.e. 'he', 'ashkenazi', 'fr')
-   * @return {string}
-   */
-  getLocaleName: function getLocaleName() {
-    return this.activeName;
-  },
+  }, {
+    key: "getLocaleNames",
+    value: function 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}
+     */
 
-  /**
-   * Returns the names of registered locales
-   * @return {string[]}
-   */
-  getLocaleNames: function getLocaleNames() {
-    return Object.keys(this.locales).sort();
-  },
+  }, {
+    key: "ordinal",
+    value: function ordinal(n, locale) {
+      var locale1 = locale && locale.toLowerCase();
+      var locale0 = locale1 || this.activeName;
 
-  /**
-   * @param {number} n
-   * @param {string} [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.
-   * @return {string}
-   */
-  ordinal: function ordinal(n, locale) {
-    var locale1 = locale && locale.toLowerCase();
-    var locale0 = locale1 || this.activeName;
-
-    if (!locale0) {
-      return this.getEnOrdinal(n);
-    }
-
-    switch (locale0) {
-      case 'en':
-      case 's':
-      case 'a':
-      case 'ashkenazi':
-      case 'ashkenazi_litvish':
-      case 'ashkenazi_poylish':
-      case 'ashkenazi_standard':
+      if (!locale0) {
         return this.getEnOrdinal(n);
+      }
 
-      case 'es':
-        return n + 'º';
+      switch (locale0) {
+        case 'en':
+        case 's':
+        case 'a':
+        case 'ashkenazi':
+        case 'ashkenazi_litvish':
+        case 'ashkenazi_poylish':
+        case 'ashkenazi_standard':
+          return this.getEnOrdinal(n);
 
-      case 'h':
-      case 'he':
-      case 'he-x-nonikud':
-        return String(n);
+        case 'es':
+          return n + 'º';
 
-      default:
-        return n + '.';
+        case 'h':
+        case 'he':
+        case 'he-x-nonikud':
+          return String(n);
+
+        default:
+          return n + '.';
+      }
     }
-  },
+    /**
+     * @private
+     * @param {number} n
+     * @return {string}
+     */
 
-  /**
-   * @private
-   * @param {number} n
-   * @return {string}
-   */
-  getEnOrdinal: function getEnOrdinal(n) {
-    var s = ['th', 'st', 'nd', 'rd'];
-    var v = n % 100;
-    return n + (s[(v - 20) % 10] || s[v] || s[0]);
-  },
+  }, {
+    key: "getEnOrdinal",
+    value: function getEnOrdinal(n) {
+      var s = ['th', 'st', 'nd', 'rd'];
+      var v = n % 100;
+      return n + (s[(v - 20) % 10] || s[v] || s[0]);
+    }
+    /**
+     * Removes nekudot from Hebrew string
+     * @param {string} str
+     * @return {string}
+     */
+
+  }, {
+    key: "hebrewStripNikkud",
+    value: function hebrewStripNikkud(str) {
+      return str.replace(/[\u0590-\u05bd]/g, '').replace(/[\u05bf-\u05c7]/g, '');
+    }
+  }]);
+
+  return Locale;
+}();
+
+_defineProperty(Locale, "locales", Object.create(null));
+
+_defineProperty(Locale, "activeLocale", null);
+
+_defineProperty(Locale, "activeName", null);
 
-  /**
-   * Removes nekudot from Hebrew string
-   * @param {string} str
-   * @return {string}
-   */
-  hebrewStripNikkud: function hebrewStripNikkud(str) {
-    return str.replace(/[\u0590-\u05bd]/g, '').replace(/[\u05bf-\u05c7]/g, '');
-  }
-};
 Locale.addLocale('en', noopLocale);
 Locale.addLocale('s', noopLocale);
 Locale.addLocale('', noopLocale);
 Locale.useLocale('en');
 
-var NISAN$2 = 1;
+var NISAN$3 = 1;
 var IYYAR$1 = 2;
 var SIVAN$2 = 3;
 var TAMUZ$1 = 4;
@@ -2345,7 +2413,7 @@ var HDate = /*#__PURE__*/function () {
      * @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}
      */
     function renderGematriya() {
@@ -2601,7 +2669,7 @@ var HDate = /*#__PURE__*/function () {
           tempabs += HDate.daysInMonth(m, year);
         }
 
-        for (var _m = NISAN$2; _m < month; _m++) {
+        for (var _m = NISAN$3; _m < month; _m++) {
           tempabs += HDate.daysInMonth(_m, year);
         }
       } else {
@@ -2879,7 +2947,7 @@ var HDate = /*#__PURE__*/function () {
             /* this catches "november" */
           }
 
-          return NISAN$2;
+          return NISAN$3;
 
         case 'i':
           return IYYAR$1;
@@ -4267,18 +4335,20 @@ var Location = /*#__PURE__*/function () {
   function Location(latitude, longitude, il, tzid, cityName, countryCode, geoid) {
     _classCallCheck(this, Location);
 
-    this.latitude = +latitude;
+    var lat = typeof latitude === 'number' ? latitude : parseFloat(latitude);
 
-    if (this.latitude < -90 || this.latitude > 90) {
-      throw new RangeError("Latitude ".concat(this.latitude, " out of range [-90,90]"));
+    if (isNaN(lat) || lat < -90 || lat > 90) {
+      throw new RangeError("Latitude ".concat(latitude, " out of range [-90,90]"));
     }
 
-    this.longitude = +longitude;
+    var long = typeof longitude === 'number' ? longitude : parseFloat(longitude);
 
-    if (this.longitude < -180 || this.longitude > 180) {
-      throw new RangeError("Longitude ".concat(this.longitude, " out of range [-180,180]"));
+    if (isNaN(long) || long < -180 || long > 180) {
+      throw new RangeError("Longitude ".concat(longitude, " out of range [-180,180]"));
     }
 
+    this.latitude = lat;
+    this.longitude = long;
     this.il = Boolean(il);
     this.tzid = tzid;
     this.name = cityName;
@@ -4564,7 +4634,7 @@ var TZEIT_3MEDIUM_STARS = 7.083;
  * @param {HDate} hd
  * @param {number} dow
  * @param {Location} location
- * @param {HebrewCalendar.Options} options
+ * @param {CalOptions} options
  * @return {Event}
  */
 
@@ -5053,7 +5123,7 @@ var OmerEvent = /*#__PURE__*/function (_Event) {
   }, {
     key: "getEmoji",
     value: function getEmoji() {
-      if (this.emoji) return this.emoji;
+      if (typeof this.emoji === 'string') return this.emoji;
       var number = this.omer;
       var ones = number % 10;
       var tens = Math.floor(number / 10);
@@ -5064,7 +5134,8 @@ var OmerEvent = /*#__PURE__*/function (_Event) {
   }, {
     key: "getWeeks",
     value: function getWeeks() {
-      return this.weekNumber;
+      var day7 = this.daysWithinWeeks === 7;
+      return day7 ? this.weekNumber : this.weekNumber - 1;
     }
     /** @return {number} */
 
@@ -6316,7 +6387,7 @@ var TUE = 2; // const WED = 3;
 var THU = 4;
 var FRI$1 = 5;
 var SAT$1 = 6;
-var NISAN$1 = months.NISAN;
+var NISAN$2 = months.NISAN;
 var IYYAR = months.IYYAR;
 var SIVAN$1 = months.SIVAN;
 var TAMUZ = months.TAMUZ;
@@ -6405,7 +6476,7 @@ var sedraCache = new SimpleMap();
  * @return {Sedra}
  */
 
-function getSedra(hyear, il) {
+function getSedra_(hyear, il) {
   var cacheKey = "".concat(hyear, "-").concat(il ? 1 : 0);
   var sedra = sedraCache.get(cacheKey);
 
@@ -6420,6 +6491,11 @@ var emojiIsraelFlag = {
   emoji: '🇮🇱'
 };
 var chanukahEmoji = '🕎';
+var emojiPesach = '🫓';
+var emojiShavuot = {
+  emoji: '⛰️🌸'
+};
+var emojiSukkot = '🌿🍋';
 var yearCache = Object.create(null);
 /**
  * Lower-level holidays interface, which returns a `Map` of `Event`s indexed by
@@ -6430,7 +6506,7 @@ var yearCache = Object.create(null);
  * @return {Map<string,Event[]>}
  */
 
-function getHolidaysForYear(year) {
+function getHolidaysForYear_(year) {
   if (typeof year !== 'number') {
     throw new TypeError("bad Hebrew year: ".concat(year));
   } else if (year < 1 || year > 32658) {
@@ -6444,7 +6520,7 @@ function getHolidaysForYear(year) {
   }
 
   var RH = new HDate(1, TISHREI$1, year);
-  var pesach = new HDate(15, NISAN$1, year);
+  var pesach = new HDate(15, NISAN$2, year);
   var h = new SimpleMap(); // eslint-disable-next-line require-jsdoc
 
   function add() {
@@ -6487,27 +6563,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, {
@@ -6540,37 +6634,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: '🐑'
@@ -6590,7 +6699,7 @@ function getHolidaysForYear(year) {
 
   if (year >= 5711) {
     // Yom HaShoah first observed in 1951
-    var nisan27dt = new HDate(27, NISAN$1, year);
+    var 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
@@ -6599,9 +6708,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));
@@ -6636,7 +6745,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));
   }
 
   var tamuz17 = new HDate(17, TAMUZ, year);
@@ -6669,7 +6778,7 @@ function getHolidaysForYear(year) {
   for (var month = 1; month <= monthsInYear; month++) {
     var 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) {
@@ -6685,7 +6794,7 @@ function getHolidaysForYear(year) {
     add(new MevarchimChodeshEvent(new HDate(29, month, year).onOrBefore(SAT$1), nextMonthName));
   }
 
-  var sedra = getSedra(year, false);
+  var sedra = getSedra_(year, false);
   var beshalachHd = sedra.find(15);
   add(new HolidayEvent(beshalachHd, 'Shabbat Shirah', SPECIAL_SHABBAT$1));
   yearCache[year] = h;
@@ -6879,7 +6988,100 @@ var MishnaYomiEvent = /*#__PURE__*/function (_Event) {
   return MishnaYomiEvent;
 }(Event);
 
-var version="3.33.3";
+var NISAN$1 = months.NISAN;
+var CHESHVAN = months.CHESHVAN;
+var KISLEV = months.KISLEV;
+var TEVET = months.TEVET;
+var SHVAT = months.SHVAT;
+var ADAR_I = months.ADAR_I;
+var 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) {
+  var orig = HDate.isHDate(gdate) ? gdate : new HDate(gdate);
+  var 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) {
+  var orig = HDate.isHDate(gdate) ? gdate : new HDate(gdate);
+  var origYear = orig.getFullYear();
+
+  if (hyear <= origYear) {
+    // `Hebrew year ${hyear} occurs on or before original date in ${origYear}`
+    return undefined;
+  }
+
+  var isOrigLeap = HDate.isLeapYear(origYear);
+  var month = orig.getMonth();
+  var 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};
 
@@ -6907,26 +7109,6 @@ var poHeNoNikud = {
 };
 Locale.addLocale(localeName, poHeNoNikud);
 
-/*
-    Hebcal - A Jewish Calendar Generator
-    Copyright (c) 1994-2020 Danny Sadinoff
-    Portions copyright Eyal Schachter and Michael J. Radwin
-
-    https://github.com/hebcal/hebcal-es6
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
 var FRI = 5;
 var SAT = 6;
 var NISAN = months.NISAN; // const IYYAR = months.IYYAR;
@@ -6936,12 +7118,6 @@ var SIVAN = months.SIVAN; // const TAMUZ = months.TAMUZ;
 
 var ELUL = months.ELUL;
 var TISHREI = months.TISHREI;
-var CHESHVAN = months.CHESHVAN;
-var KISLEV = months.KISLEV;
-var TEVET = months.TEVET;
-var SHVAT = months.SHVAT;
-var ADAR_I = months.ADAR_I;
-var ADAR_II = months.ADAR_II;
 var LIGHT_CANDLES = flags.LIGHT_CANDLES;
 var YOM_TOV_ENDS = flags.YOM_TOV_ENDS;
 var CHUL_ONLY = flags.CHUL_ONLY;
@@ -6995,7 +7171,7 @@ var RECOGNIZED_OPTIONS = {
 };
 /**
  * @private
- * @param {HebrewCalendar.Options} options
+ * @param {CalOptions} options
  */
 
 function warnUnrecognizedOptions(options) {
@@ -7024,7 +7200,7 @@ function shallowCopy(target, source) {
 /**
  * Modifies options in-place
  * @private
- * @param {HebrewCalendar.Options} options
+ * @param {CalOptions} options
  */
 
 
@@ -7059,7 +7235,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
@@ -7115,7 +7291,7 @@ function getAbs(d) {
 /**
  * Parse options object to determine start & end days
  * @private
- * @param {HebrewCalendar.Options} options
+ * @param {CalOptions} options
  * @return {number[]}
  */
 
@@ -7193,7 +7369,7 @@ function getStartAndEnd(options) {
 /**
  * Mask to filter Holiday array
  * @private
- * @param {HebrewCalendar.Options} options
+ * @param {CalOptions} options
  * @return {number}
  */
 
@@ -7273,511 +7449,489 @@ function getMaskFromOptions(options) {
 }
 
 var MASK_LIGHT_CANDLES = LIGHT_CANDLES | LIGHT_CANDLES_TZEIS | CHANUKAH_CANDLES | YOM_TOV_ENDS;
+var defaultLocation = new Location(0, 0, false, 'UTC');
+var 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.
  */
 
-var HebrewCalendar = {
-  /** @private */
-  defaultLocation: new Location(0, 0, false, 'UTC'),
 
-  /**
-   * Calculates holidays and other Hebrew calendar events based on {@link HebrewCalendar.Options}.
-   *
-   * Each holiday is represented by an {@link Event} object which includes a date,
-   * a description, flags and optional attributes.
-   * If given no options, returns holidays for the Diaspora for the current Gregorian year.
-   *
-   * The date range returned by this function can be controlled by:
-   * * `options.year` - Gregorian (e.g. 1993) or Hebrew year (e.g. 5749)
-   * * `options.isHebrewYear` - to interpret `year` as Hebrew year
-   * * `options.numYears` - generate calendar for multiple years (default 1)
-   * * `options.month` - Gregorian or Hebrew month (to filter results to a single month)
-   *
-   * Alternatively, specify start and end days with `Date` or {@link HDate} instances:
-   * * `options.start` - use specific start date (requires `end` date)
-   * * `options.end` - use specific end date (requires `start` date)
-   *
-   * Unless `options.noHolidays == true`, default holidays include:
-   * * Major holidays - Rosh Hashana, Yom Kippur, Pesach, Sukkot, etc.
-   * * Minor holidays - Purim, Chanukah, Tu BiShvat, Lag BaOmer, etc.
-   * * Minor fasts - Ta'anit Esther, Tzom Gedaliah, etc. (unless `options.noMinorFast`)
-   * * Special Shabbatot - Shabbat Shekalim, Zachor, etc. (unless `options.noSpecialShabbat`)
-   * * Modern Holidays - Yom HaShoah, Yom HaAtzma'ut, etc. (unless `options.noModern`)
-   * * Rosh Chodesh (unless `options.noRoshChodesh`)
-   *
-   * Holiday and Torah reading schedules differ between Israel and the Disapora.
-   * Set `options.il=true` to use the Israeli schedule.
-   *
-   * Additional non-default event types can be specified:
-   * * Parashat HaShavua - weekly Torah Reading on Saturdays (`options.sedrot`)
-   * * Counting of the Omer (`options.omer`)
-   * * Daf Yomi (`options.dafyomi`)
-   * * Mishna Yomi (`options.mishnaYomi`)
-   * * Shabbat Mevarchim HaChodesh on Saturday before Rosh Chodesh (`options.shabbatMevarchim`)
-   * * Molad announcement on Saturday before Rosh Chodesh (`options.molad`)
-   *
-   * Candle-lighting and Havdalah times are approximated using latitude and longitude
-   * specified by the {@link Location} class. The `Location` class contains a small
-   * database of cities with their associated geographic information and time-zone information.
-   * If you ever have any doubts about Hebcal's times, consult your local halachic authority.
-   * If you enter geographic coordinates above the arctic circle or antarctic circle,
-   * the times are guaranteed to be wrong.
-   *
-   * To add candle-lighting options, set `options.candlelighting=true` and set
-   * `options.location` to an instance of `Location`. By default, candle lighting
-   * time is 18 minutes before sundown (40 minutes for Jerusalem) and Havdalah is
-   * calculated according to Tzeit Hakochavim - Nightfall (the point when 3 small stars
-   * are observable in the night time sky with the naked eye). The default Havdalah
-   * option (Tzeit Hakochavim) is calculated when the sun is 8.5° below the horizon.
-   * These defaults can be changed using these options:
-   * * `options.candleLightingMins` - minutes before sundown to light candles
-   * * `options.havdalahMins` - minutes after sundown for Havdalah (typical values are 42, 50, or 72).
-   *    Havdalah times are supressed when `options.havdalahMins=0`.
-   * * `options.havdalahDeg` - degrees for solar depression for Havdalah.
-   *    Default is 8.5 degrees for 3 small stars. Use 7.083 degress for 3 medium-sized stars.
-   *    Havdalah times are supressed when `options.havdalahDeg=0`.
-   *
-   * If both `options.candlelighting=true` and `options.location` is specified,
-   * Chanukah candle-lighting times and minor fast start/end times will also be generated.
-   * Chanukah candle-lighting is at dusk (when the sun is 6.0° below the horizon in the evening)
-   * on weekdays, at regular candle-lighting time on Fridays, and at regular Havdalah time on
-   * Saturday night (see above).
-   *
-   * Minor fasts begin at Alot HaShachar (sun is 16.1° below the horizon in the morning) and
-   * end when 3 medium-sized stars are observable in the night sky (sun is 7.083° below the horizon
-   * in the evening).
-   *
-   * Two options also exist for generating an Event with the Hebrew date:
-   * * `options.addHebrewDates` - print the Hebrew date for the entire date range
-   * * `options.addHebrewDatesForEvents` - print the Hebrew date for dates with some events
-   *
-   * Lastly, translation and transliteration of event titles is controlled by
-   * `options.locale` and the {@link Locale} API.
-   * `@hebcal/core` supports three locales by default:
-   * * `en` - default, Sephardic transliterations (e.g. "Shabbat")
-   * * `ashkenazi` - Ashkenazi transliterations (e.g. "Shabbos")
-   * * `he` - Hebrew (e.g. "שַׁבָּת")
-   *
-   * Additional locales (such as `ru` or `fr`) are supported by the
-   * {@link https://github.com/hebcal/hebcal-locales @hebcal/locales} package
-   *
-   * @example
-   * import {HebrewCalendar, HDate, Location, Event} from '@hebcal/core';
-   * const options = {
-   *   year: 1981,
-   *   isHebrewYear: false,
-   *   candlelighting: true,
-   *   location: Location.lookup('San Francisco'),
-   *   sedrot: true,
-   *   omer: true,
-   * };
-   * const events = HebrewCalendar.calendar(options);
-   * for (const ev of events) {
-   *   const hd = ev.getDate();
-   *   const date = hd.greg();
-   *   console.log(date.toLocaleDateString(), ev.render(), hd.toString());
-   * }
-   * @param {HebrewCalendar.Options} [options={}]
-   * @return {Event[]}
-   */
-  calendar: function calendar() {
-    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    options = shallowCopy({}, options); // so we can modify freely
-
-    checkCandleOptions(options);
-    var location = options.location = options.location || this.defaultLocation;
-    var il = options.il = options.il || location.il || false;
-    options.mask = getMaskFromOptions(options);
-
-    if (options.ashkenazi || options.locale) {
-      if (options.locale && typeof options.locale !== 'string') {
-        throw new TypeError("Invalid options.locale: ".concat(options.locale));
-      }
+var HebrewCalendar = /*#__PURE__*/function () {
+  function HebrewCalendar() {
+    _classCallCheck(this, HebrewCalendar);
+  }
+
+  _createClass(HebrewCalendar, null, [{
+    key: "calendar",
+    value:
+    /**
+     * 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.
+     * If given no options, returns holidays for the Diaspora for the current Gregorian year.
+     *
+     * The date range returned by this function can be controlled by:
+     * * `options.year` - Gregorian (e.g. 1993) or Hebrew year (e.g. 5749)
+     * * `options.isHebrewYear` - to interpret `year` as Hebrew year
+     * * `options.numYears` - generate calendar for multiple years (default 1)
+     * * `options.month` - Gregorian or Hebrew month (to filter results to a single month)
+     *
+     * Alternatively, specify start and end days with `Date` or {@link HDate} instances:
+     * * `options.start` - use specific start date (requires `end` date)
+     * * `options.end` - use specific end date (requires `start` date)
+     *
+     * Unless `options.noHolidays == true`, default holidays include:
+     * * Major holidays - Rosh Hashana, Yom Kippur, Pesach, Sukkot, etc.
+     * * Minor holidays - Purim, Chanukah, Tu BiShvat, Lag BaOmer, etc.
+     * * Minor fasts - Ta'anit Esther, Tzom Gedaliah, etc. (unless `options.noMinorFast`)
+     * * Special Shabbatot - Shabbat Shekalim, Zachor, etc. (unless `options.noSpecialShabbat`)
+     * * Modern Holidays - Yom HaShoah, Yom HaAtzma'ut, etc. (unless `options.noModern`)
+     * * Rosh Chodesh (unless `options.noRoshChodesh`)
+     *
+     * Holiday and Torah reading schedules differ between Israel and the Disapora.
+     * Set `options.il=true` to use the Israeli schedule.
+     *
+     * Additional non-default event types can be specified:
+     * * Parashat HaShavua - weekly Torah Reading on Saturdays (`options.sedrot`)
+     * * Counting of the Omer (`options.omer`)
+     * * Daf Yomi (`options.dafyomi`)
+     * * Mishna Yomi (`options.mishnaYomi`)
+     * * Shabbat Mevarchim HaChodesh on Saturday before Rosh Chodesh (`options.shabbatMevarchim`)
+     * * Molad announcement on Saturday before Rosh Chodesh (`options.molad`)
+     *
+     * Candle-lighting and Havdalah times are approximated using latitude and longitude
+     * specified by the {@link Location} class. The `Location` class contains a small
+     * database of cities with their associated geographic information and time-zone information.
+     * If you ever have any doubts about Hebcal's times, consult your local halachic authority.
+     * If you enter geographic coordinates above the arctic circle or antarctic circle,
+     * the times are guaranteed to be wrong.
+     *
+     * To add candle-lighting options, set `options.candlelighting=true` and set
+     * `options.location` to an instance of `Location`. By default, candle lighting
+     * time is 18 minutes before sundown (40 minutes for Jerusalem) and Havdalah is
+     * calculated according to Tzeit Hakochavim - Nightfall (the point when 3 small stars
+     * are observable in the night time sky with the naked eye). The default Havdalah
+     * option (Tzeit Hakochavim) is calculated when the sun is 8.5° below the horizon.
+     * These defaults can be changed using these options:
+     * * `options.candleLightingMins` - minutes before sundown to light candles
+     * * `options.havdalahMins` - minutes after sundown for Havdalah (typical values are 42, 50, or 72).
+     *    Havdalah times are supressed when `options.havdalahMins=0`.
+     * * `options.havdalahDeg` - degrees for solar depression for Havdalah.
+     *    Default is 8.5 degrees for 3 small stars. Use 7.083 degress for 3 medium-sized stars.
+     *    Havdalah times are supressed when `options.havdalahDeg=0`.
+     *
+     * If both `options.candlelighting=true` and `options.location` is specified,
+     * Chanukah candle-lighting times and minor fast start/end times will also be generated.
+     * Chanukah candle-lighting is at dusk (when the sun is 6.0° below the horizon in the evening)
+     * on weekdays, at regular candle-lighting time on Fridays, and at regular Havdalah time on
+     * Saturday night (see above).
+     *
+     * Minor fasts begin at Alot HaShachar (sun is 16.1° below the horizon in the morning) and
+     * end when 3 medium-sized stars are observable in the night sky (sun is 7.083° below the horizon
+     * in the evening).
+     *
+     * Two options also exist for generating an Event with the Hebrew date:
+     * * `options.addHebrewDates` - print the Hebrew date for the entire date range
+     * * `options.addHebrewDatesForEvents` - print the Hebrew date for dates with some events
+     *
+     * Lastly, translation and transliteration of event titles is controlled by
+     * `options.locale` and the {@link Locale} API.
+     * `@hebcal/core` supports three locales by default:
+     * * `en` - default, Sephardic transliterations (e.g. "Shabbat")
+     * * `ashkenazi` - Ashkenazi transliterations (e.g. "Shabbos")
+     * * `he` - Hebrew (e.g. "שַׁבָּת")
+     *
+     * Additional locales (such as `ru` or `fr`) are supported by the
+     * {@link https://github.com/hebcal/hebcal-locales @hebcal/locales} package
+     *
+     * @example
+     * import {HebrewCalendar, HDate, Location, Event} from '@hebcal/core';
+     * const options = {
+     *   year: 1981,
+     *   isHebrewYear: false,
+     *   candlelighting: true,
+     *   location: Location.lookup('San Francisco'),
+     *   sedrot: true,
+     *   omer: true,
+     * };
+     * const events = HebrewCalendar.calendar(options);
+     * for (const ev of events) {
+     *   const hd = ev.getDate();
+     *   const date = hd.greg();
+     *   console.log(date.toLocaleDateString(), ev.render(), hd.toString());
+     * }
+     * @param {CalOptions} [options={}]
+     * @return {Event[]}
+     */
+    function calendar() {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      options = shallowCopy({}, options); // so we can modify freely
+
+      checkCandleOptions(options);
+      var location = options.location = options.location || defaultLocation;
+      var il = options.il = options.il || location.il || false;
+      options.mask = getMaskFromOptions(options);
+
+      if (options.ashkenazi || options.locale) {
+        if (options.locale && typeof options.locale !== 'string') {
+          throw new TypeError("Invalid options.locale: ".concat(options.locale));
+        }
 
-      var locale = options.ashkenazi ? 'ashkenazi' : options.locale;
-      var translationObj = Locale.useLocale(locale);
+        var locale = options.ashkenazi ? 'ashkenazi' : options.locale;
+        var translationObj = Locale.useLocale(locale);
 
-      if (!translationObj) {
-        throw new TypeError("Locale '".concat(locale, "' not found; did you forget to import @hebcal/locales?"));
+        if (!translationObj) {
+          throw new TypeError("Locale '".concat(locale, "' not found; did you forget to import @hebcal/locales?"));
+        }
+      } else {
+        Locale.useLocale('en');
       }
-    } else {
-      Locale.useLocale('en');
-    }
 
-    var evts = [];
-    var sedra;
-    var holidaysYear;
-    var beginOmer;
-    var endOmer;
-    var currentYear = -1;
-    var startAndEnd = getStartAndEnd(options);
-    warnUnrecognizedOptions(options);
-    var startAbs = startAndEnd[0];
-    var endAbs = startAndEnd[1];
-    var startGreg = greg.abs2greg(startAbs);
-
-    if (startGreg.getFullYear() < 100) {
-      options.candlelighting = false;
-    }
+      var evts = [];
+      var sedra;
+      var holidaysYear;
+      var beginOmer;
+      var endOmer;
+      var currentYear = -1;
+      var startAndEnd = getStartAndEnd(options);
+      warnUnrecognizedOptions(options);
+      var startAbs = startAndEnd[0];
+      var endAbs = startAndEnd[1];
+      var startGreg = greg.abs2greg(startAbs);
+
+      if (startGreg.getFullYear() < 100) {
+        options.candlelighting = false;
+      }
 
-    var mishnaYomiIndex;
+      var mishnaYomiIndex;
 
-    if (options.mishnaYomi) {
-      mishnaYomiIndex = new MishnaYomiIndex();
-    }
+      if (options.mishnaYomi) {
+        mishnaYomiIndex = new MishnaYomiIndex();
+      }
 
-    var _loop = function _loop(abs) {
-      var hd = new HDate(abs);
-      var hyear = hd.getFullYear();
+      var _loop = function _loop(abs) {
+        var hd = new HDate(abs);
+        var hyear = hd.getFullYear();
 
-      if (hyear != currentYear) {
-        currentYear = hyear;
-        holidaysYear = HebrewCalendar.getHolidaysForYear(currentYear);
+        if (hyear != currentYear) {
+          currentYear = hyear;
+          holidaysYear = HebrewCalendar.getHolidaysForYear(currentYear);
 
-        if (options.sedrot && currentYear >= 3762) {
-          sedra = getSedra(currentYear, il);
-        }
+          if (options.sedrot && currentYear >= 3762) {
+            sedra = getSedra_(currentYear, il);
+          }
 
-        if (options.omer) {
-          beginOmer = HDate.hebrew2abs(currentYear, NISAN, 16);
-          endOmer = HDate.hebrew2abs(currentYear, SIVAN, 5);
+          if (options.omer) {
+            beginOmer = HDate.hebrew2abs(currentYear, NISAN, 16);
+            endOmer = HDate.hebrew2abs(currentYear, SIVAN, 5);
+          }
         }
-      }
 
-      var prevEventsLength = evts.length;
-      var dow = hd.getDay();
-      var candlesEv = undefined;
-      var ev = holidaysYear.get(hd.toString()) || [];
-      ev.forEach(function (e) {
-        candlesEv = appendHolidayAndRelated(evts, e, options, candlesEv, dow);
-      });
+        var prevEventsLength = evts.length;
+        var dow = hd.getDay();
+        var candlesEv = undefined;
+        var ev = holidaysYear.get(hd.toString()) || [];
+        ev.forEach(function (e) {
+          candlesEv = appendHolidayAndRelated(evts, e, options, candlesEv, dow);
+        });
 
-      if (options.sedrot && dow == SAT && hyear >= 3762) {
-        var parsha0 = sedra.lookup(abs);
+        if (options.sedrot && dow == SAT && hyear >= 3762) {
+          var parsha0 = sedra.lookup(abs);
 
-        if (!parsha0.chag) {
-          evts.push(new ParshaEvent(hd, parsha0.parsha, il));
+          if (!parsha0.chag) {
+            evts.push(new ParshaEvent(hd, parsha0.parsha, il));
+          }
         }
-      }
-
-      if (options.dafyomi && hyear >= 5684) {
-        evts.push(new DafYomiEvent(hd));
-      }
-
-      if (options.mishnaYomi && abs >= mishnaYomiStart) {
-        var mishnaYomi = mishnaYomiIndex.lookup(abs);
-        evts.push(new MishnaYomiEvent(hd, mishnaYomi));
-      }
 
-      if (options.omer && abs >= beginOmer && abs <= endOmer) {
-        var omer = abs - beginOmer + 1;
-        evts.push(new OmerEvent(hd, omer));
-      }
+        if (options.dafyomi && hyear >= 5684) {
+          evts.push(new DafYomiEvent(hd));
+        }
 
-      var hmonth = hd.getMonth();
+        if (options.mishnaYomi && abs >= mishnaYomiStart) {
+          var mishnaYomi = mishnaYomiIndex.lookup(abs);
+          evts.push(new MishnaYomiEvent(hd, mishnaYomi));
+        }
 
-      if (options.molad && dow == SAT && hmonth != ELUL && hd.getDate() >= 23 && hd.getDate() <= 29) {
-        var monNext = hmonth == HDate.monthsInYear(hyear) ? NISAN : hmonth + 1;
-        evts.push(new MoladEvent(hd, hyear, monNext));
-      }
+        if (options.omer && abs >= beginOmer && abs <= endOmer) {
+          var omer = abs - beginOmer + 1;
+          evts.push(new OmerEvent(hd, omer));
+        }
 
-      if (!candlesEv && options.candlelighting && (dow == FRI || dow == SAT)) {
-        candlesEv = makeCandleEvent(undefined, hd, dow, location, options);
+        var hmonth = hd.getMonth();
 
-        if (dow === FRI && candlesEv && sedra) {
-          candlesEv.memo = sedra.getString(abs);
+        if (options.molad && dow == SAT && hmonth != ELUL && hd.getDate() >= 23 && hd.getDate() <= 29) {
+          var monNext = hmonth == HDate.monthsInYear(hyear) ? NISAN : hmonth + 1;
+          evts.push(new MoladEvent(hd, hyear, monNext));
         }
-      } // suppress Havdalah when options.havdalahMins=0 or options.havdalahDeg=0
 
+        if (!candlesEv && options.candlelighting && (dow == FRI || dow == SAT)) {
+          candlesEv = makeCandleEvent(undefined, hd, dow, location, options);
 
-      if (candlesEv instanceof HavdalahEvent && (options.havdalahMins === 0 || options.havdalahDeg === 0)) {
-        candlesEv = null;
-      }
+          if (dow === FRI && candlesEv && sedra) {
+            candlesEv.memo = sedra.getString(abs);
+          }
+        } // suppress Havdalah when options.havdalahMins=0 or options.havdalahDeg=0
 
-      if (candlesEv) {
-        evts.push(candlesEv);
-      }
 
-      if (options.addHebrewDates || options.addHebrewDatesForEvents && prevEventsLength != evts.length) {
-        var e2 = new HebrewDateEvent(hd);
+        if (candlesEv instanceof HavdalahEvent && (options.havdalahMins === 0 || options.havdalahDeg === 0)) {
+          candlesEv = null;
+        }
 
-        if (prevEventsLength == evts.length) {
-          evts.push(e2);
-        } else {
-          evts.splice(prevEventsLength, 0, e2);
+        if (candlesEv) {
+          evts.push(candlesEv);
         }
-      }
-    };
 
-    for (var abs = startAbs; abs <= endAbs; abs++) {
-      _loop(abs);
-    }
+        if (options.addHebrewDates || options.addHebrewDatesForEvents && prevEventsLength != evts.length) {
+          var e2 = new HebrewDateEvent(hd);
 
-    return evts;
-  },
+          if (prevEventsLength == evts.length) {
+            evts.push(e2);
+          } else {
+            evts.splice(prevEventsLength, 0, e2);
+          }
+        }
+      };
 
-  /**
-   * Calculates a birthday or anniversary (non-yahrzeit).
-   * `hyear` must be after original `gdate` of anniversary.
-   * Returns `undefined` when requested year preceeds or is same as original year.
-   *
-   * Hebcal uses the algorithm defined in "Calendrical Calculations"
-   * by Edward M. Reingold and Nachum Dershowitz.
-   *
-   * The birthday of someone born in Adar of an ordinary year or Adar II of
-   * a leap year is also always in the last month of the year, be that Adar
-   * or Adar II. The birthday in an ordinary year of someone born during the
-   * first 29 days of Adar I in a leap year is on the corresponding day of Adar;
-   * in a leap year, the birthday occurs in Adar I, as expected.
-   *
-   * Someone born on the thirtieth day of Marcheshvan, Kislev, or Adar I
-   * has his birthday postponed until the first of the following month in
-   * years where that day does not occur. [Calendrical Calculations p. 111]
-   * @example
-   * import {HebrewCalendar} from '@hebcal/core';
-   * const dt = new Date(2014, 2, 2); // '2014-03-02' == '30 Adar I 5774'
-   * const hd = HebrewCalendar.getBirthdayOrAnniversary(5780, dt); // '1 Nisan 5780'
-   * console.log(hd.greg().toLocaleDateString('en-US')); // '3/26/2020'
-   * @param {number} hyear Hebrew year
-   * @param {Date|HDate} gdate Gregorian or Hebrew date of event
-   * @return {HDate} anniversary occurring in `hyear`
-   */
-  getBirthdayOrAnniversary: function getBirthdayOrAnniversary(hyear, gdate) {
-    var orig = HDate.isHDate(gdate) ? gdate : new HDate(gdate);
-    var origYear = orig.getFullYear();
+      for (var abs = startAbs; abs <= endAbs; abs++) {
+        _loop(abs);
+      }
 
-    if (hyear <= origYear) {
-      // `Hebrew year ${hyear} occurs on or before original date in ${origYear}`
-      return undefined;
+      return evts;
     }
+    /**
+     * Calculates a birthday or anniversary (non-yahrzeit).
+     * `hyear` must be after original `gdate` of anniversary.
+     * Returns `undefined` when requested year preceeds or is same as original year.
+     *
+     * Hebcal uses the algorithm defined in "Calendrical Calculations"
+     * by Edward M. Reingold and Nachum Dershowitz.
+     *
+     * The birthday of someone born in Adar of an ordinary year or Adar II of
+     * a leap year is also always in the last month of the year, be that Adar
+     * or Adar II. The birthday in an ordinary year of someone born during the
+     * first 29 days of Adar I in a leap year is on the corresponding day of Adar;
+     * in a leap year, the birthday occurs in Adar I, as expected.
+     *
+     * Someone born on the thirtieth day of Marcheshvan, Kislev, or Adar I
+     * has his birthday postponed until the first of the following month in
+     * years where that day does not occur. [Calendrical Calculations p. 111]
+     * @example
+     * import {HebrewCalendar} from '@hebcal/core';
+     * const dt = new Date(2014, 2, 2); // '2014-03-02' == '30 Adar I 5774'
+     * const hd = HebrewCalendar.getBirthdayOrAnniversary(5780, dt); // '1 Nisan 5780'
+     * console.log(hd.greg().toLocaleDateString('en-US')); // '3/26/2020'
+     * @param {number} hyear Hebrew year
+     * @param {Date|HDate} gdate Gregorian or Hebrew date of event
+     * @return {HDate} anniversary occurring in `hyear`
+     */
 
-    var isOrigLeap = HDate.isLeapYear(origYear);
-    var month = orig.getMonth();
-    var 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;
+  }, {
+    key: "getBirthdayOrAnniversary",
+    value: function getBirthdayOrAnniversary(hyear, gdate) {
+      return getBirthdayOrAnniversary_(hyear, gdate);
     }
+    /**
+     * Calculates yahrzeit.
+     * `hyear` must be after original `gdate` of death.
+     * Returns `undefined` when requested year preceeds or is same as original year.
+     *
+     * Hebcal uses the algorithm defined in "Calendrical Calculations"
+     * by Edward M. Reingold and Nachum Dershowitz.
+     *
+     * The customary anniversary date of a death is more complicated and depends
+     * also on the character of the year in which the first anniversary occurs.
+     * There are several cases:
+     *
+     * * If the date of death is Marcheshvan 30, the anniversary in general depends
+     *   on the first anniversary; if that first anniversary was not Marcheshvan 30,
+     *   use the day before Kislev 1.
+     * * If the date of death is Kislev 30, the anniversary in general again depends
+     *   on the first anniversary — if that was not Kislev 30, use the day before
+     *   Tevet 1.
+     * * If the date of death is Adar II, the anniversary is the same day in the
+     *   last month of the Hebrew year (Adar or Adar II).
+     * * If the date of death is Adar I 30, the anniversary in a Hebrew year that
+     *   is not a leap year (in which Adar only has 29 days) is the last day in
+     *   Shevat.
+     * * In all other cases, use the normal (that is, same month number) anniversary
+     *   of the date of death. [Calendrical Calculations p. 113]
+     * @example
+     * import {HebrewCalendar} from '@hebcal/core';
+     * const dt = new Date(2014, 2, 2); // '2014-03-02' == '30 Adar I 5774'
+     * const hd = HebrewCalendar.getYahrzeit(5780, dt); // '30 Sh\'vat 5780'
+     * console.log(hd.greg().toLocaleDateString('en-US')); // '2/25/2020'
+     * @param {number} hyear Hebrew year
+     * @param {Date|HDate} gdate Gregorian or Hebrew date of death
+     * @return {HDate} anniversary occurring in hyear
+     */
 
-    return new HDate(day, month, hyear);
-  },
-
-  /**
-   * Calculates yahrzeit.
-   * `hyear` must be after original `gdate` of death.
-   * Returns `undefined` when requested year preceeds or is same as original year.
-   *
-   * Hebcal uses the algorithm defined in "Calendrical Calculations"
-   * by Edward M. Reingold and Nachum Dershowitz.
-   *
-   * The customary anniversary date of a death is more complicated and depends
-   * also on the character of the year in which the first anniversary occurs.
-   * There are several cases:
-   *
-   * * If the date of death is Marcheshvan 30, the anniversary in general depends
-   *   on the first anniversary; if that first anniversary was not Marcheshvan 30,
-   *   use the day before Kislev 1.
-   * * If the date of death is Kislev 30, the anniversary in general again depends
-   *   on the first anniversary — if that was not Kislev 30, use the day before
-   *   Tevet 1.
-   * * If the date of death is Adar II, the anniversary is the same day in the
-   *   last month of the Hebrew year (Adar or Adar II).
-   * * If the date of death is Adar I 30, the anniversary in a Hebrew year that
-   *   is not a leap year (in which Adar only has 29 days) is the last day in
-   *   Shevat.
-   * * In all other cases, use the normal (that is, same month number) anniversary
-   *   of the date of death. [Calendrical Calculations p. 113]
-   * @example
-   * import {HebrewCalendar} from '@hebcal/core';
-   * const dt = new Date(2014, 2, 2); // '2014-03-02' == '30 Adar I 5774'
-   * const hd = HebrewCalendar.getYahrzeit(5780, dt); // '30 Sh\'vat 5780'
-   * console.log(hd.greg().toLocaleDateString('en-US')); // '2/25/2020'
-   * @param {number} hyear Hebrew year
-   * @param {Date|HDate} gdate Gregorian or Hebrew date of death
-   * @return {HDate} anniversary occurring in hyear
-   */
-  getYahrzeit: function getYahrzeit(hyear, gdate) {
-    var orig = HDate.isHDate(gdate) ? gdate : new HDate(gdate);
-    var hDeath = {
-      yy: orig.getFullYear(),
-      mm: orig.getMonth(),
-      dd: orig.getDate()
-    };
+  }, {
+    key: "getYahrzeit",
+    value: function 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`
+     * or `flags.CHUL_ONLY` depending on Israel vs. Diaspora holiday scheme.
+     * @function
+     * @param {number} year Hebrew year
+     * @return {Map<string,Event[]>}
+     */
 
-    if (hyear <= hDeath.yy) {
-      // `Hebrew year ${hyear} occurs on or before original date in ${hDeath.yy}`
-      return undefined;
+  }, {
+    key: "getHolidaysForYear",
+    value: function 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[]}
+     */
 
-    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);
-  },
+  }, {
+    key: "getHolidaysForYearArray",
+    value: function getHolidaysForYearArray(year, il) {
+      var yearMap = getHolidaysForYear_(year);
+      var startAbs = HDate.hebrew2abs(year, TISHREI, 1);
+      var endAbs = HDate.hebrew2abs(year + 1, TISHREI, 1) - 1;
+      var events = [];
+      var myFilter = il ? observedInIsrael : observedInDiaspora;
 
-  /**
-   * Lower-level holidays interface, which returns a `Map` of `Event`s indexed by
-   * `HDate.toString()`. These events must filtered especially for `flags.IL_ONLY`
-   * or `flags.CHUL_ONLY` depending on Israel vs. Diaspora holiday scheme.
-   * @function
-   * @param {number} year Hebrew year
-   * @return {Map<string,Event[]>}
-   */
-  getHolidaysForYear: getHolidaysForYear,
+      for (var absDt = startAbs; absDt <= endAbs; absDt++) {
+        var hd = new HDate(absDt);
+        var holidays = yearMap.get(hd.toString());
 
-  /**
-   * 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 getHolidaysForYearArray(year, il) {
-    var yearMap = HebrewCalendar.getHolidaysForYear(year);
-    var startAbs = HDate.hebrew2abs(year, TISHREI, 1);
-    var endAbs = HDate.hebrew2abs(year + 1, TISHREI, 1) - 1;
-    var events = [];
-
-    for (var absDt = startAbs; absDt <= endAbs; absDt++) {
-      var hd = new HDate(absDt);
-      var holidays = yearMap.get(hd.toString());
-
-      if (holidays) {
-        var filtered = holidays.filter(function (ev) {
-          return il && ev.observedInIsrael() || !il && ev.observedInDiaspora();
-        });
-        filtered.forEach(function (ev) {
-          return events.push(ev);
-        });
+        if (holidays) {
+          var 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[]}
+     */
 
-    return events;
-  },
+  }, {
+    key: "getHolidaysOnDate",
+    value: function getHolidaysOnDate(date, il) {
+      var hd = HDate.isHDate(date) ? date : new HDate(date);
+      var yearMap = getHolidaysForYear_(hd.getFullYear());
+      var events = yearMap.get(hd.toString());
 
-  /**
-   * 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 getHolidaysOnDate(date, il) {
-    var hd = HDate.isHDate(date) ? date : new HDate(date);
-    var yearMap = HebrewCalendar.getHolidaysForYear(hd.getFullYear());
-    var events = yearMap.get(hd.toString());
+      if (typeof il === 'undefined' || typeof events === 'undefined') {
+        return events;
+      }
 
-    if (typeof il === 'undefined' || typeof events === 'undefined') {
-      return events;
+      var 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 `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 {CalOptions} options
+     * @return {string}
+     */
 
-    return events.filter(function (ev) {
-      return 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
-  },
+  }, {
+    key: "reformatTimeStr",
+    value: function reformatTimeStr(timeStr, suffix, options) {
+      if (typeof timeStr !== 'string') throw new TypeError("Bad timeStr: ".concat(timeStr));
+      var cc = options.location && options.location.cc || (options.il ? 'IL' : 'US');
 
-  /**
-   * 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
-   * 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
-   * @return {string}
-   */
-  reformatTimeStr: function reformatTimeStr(timeStr, suffix, options) {
-    if (typeof timeStr !== 'string') throw new TypeError("Bad timeStr: ".concat(timeStr));
-    var cc = options.location && options.location.cc || (options.il ? 'IL' : 'US');
+      if (typeof hour12cc[cc] === 'undefined') {
+        return timeStr;
+      }
 
-    if (typeof this.hour12cc[cc] === 'undefined') {
-      return timeStr;
-    }
+      var hm = timeStr.split(':');
+      var hour = parseInt(hm[0], 10);
 
-    var hm = timeStr.split(':');
-    var hour = parseInt(hm[0], 10);
+      if (hour < 12 && suffix) {
+        suffix = suffix.replace('p', 'a').replace('P', 'A');
+      } else if (hour > 12) {
+        hour = hour % 12;
+      }
 
-    if (hour < 12 && suffix) {
-      suffix = suffix.replace('p', 'a').replace('P', 'A');
-    } else if (hour > 12) {
-      hour = hour % 12;
+      return "".concat(hour, ":").concat(hm[1]).concat(suffix);
     }
+    /** @return {string} */
 
-    return "".concat(hour, ":").concat(hm[1]).concat(suffix);
-  },
+  }, {
+    key: "version",
+    value: function version$1() {
+      return version;
+    }
+    /**
+     * Convenience function to create an instance of `Sedra` or reuse a previously
+     * created and cached instance.
+     * @function
+     * @param {number} hyear
+     * @param {boolean} il
+     * @return {Sedra}
+     */
 
-  /** @return {string} */
-  version: function version$1() {
-    return version;
-  },
+  }, {
+    key: "getSedra",
+    value: function getSedra(hyear, il) {
+      return getSedra_(hyear, il);
+    }
+  }]);
 
-  /**
-   * Convenience function to create an instance of `Sedra` or reuse a previously
-   * created and cached instance.
-   * @function
-   * @param {number} hyear
-   * @param {boolean} il
-   * @return {Sedra}
-   */
-  getSedra: getSedra
-};
+  return 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[]} events
  * @param {Event} ev
- * @param {HebrewCalendar.Options} options
+ * @param {CalOptions} options
  * @param {Event} candlesEv
  * @param {number} dow
  * @return {Event}