@hebcal/core 4.4.0 → 4.5.0

package/dist/bundle.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v4.4.0 */
+/*! @hebcal/core v4.5.0 */
 var hebcal = (function (exports) {
 'use strict';
 
@@ -326,8 +326,8 @@ function gematriya(number) {
   const thousands = Math.floor(num / 1000);
   if (thousands > 0 && thousands !== 5) {
     const tdigits = num2digits(thousands);
-    for (let i = 0; i < tdigits.length; i++) {
-      str += num2heb[tdigits[i]];
+    for (const tdig of tdigits) {
+      str += num2heb[tdig];
     }
     str += GERESH;
   }
@@ -362,8 +362,8 @@ function gematriyaStrToNum(str) {
     num += gematriyaStrToNum(thousands) * 1000;
     str = str.substring(gereshIdx);
   }
-  for (let i = 0; i < str.length; i++) {
-    const n = heb2num[str[i]];
+  for (const ch of str) {
+    const n = heb2num[ch];
     if (typeof n === 'number') {
       num += n;
     }
@@ -410,7 +410,7 @@ class Locale {
    * @return {string}
    */
   static lookupTranslation(id, locale) {
-    const locale0 = locale && locale.toLowerCase();
+    const locale0 = locale === null || locale === void 0 ? void 0 : locale.toLowerCase();
     const loc = typeof locale == 'string' && locales[locale0] || activeLocale;
     const array = loc[id];
     if (array && array.length && array[0].length) {
@@ -530,7 +530,7 @@ class Locale {
    * @return {string[]}
    */
   static getLocaleNames() {
-    return Object.keys(locales).sort();
+    return Object.keys(locales).sort((a, b) => a.localeCompare(b));
   }
 
   /**
@@ -539,7 +539,7 @@ class Locale {
    * @return {string}
    */
   static ordinal(n, locale) {
-    const locale1 = locale && locale.toLowerCase();
+    const locale1 = locale === null || locale === void 0 ? void 0 : locale.toLowerCase();
     const locale0 = locale1 || activeName;
     if (!locale0) {
       return this.getEnOrdinal(n);
@@ -1206,7 +1206,7 @@ class HDate {
     if (ofStr) {
       return ' ' + ofStr;
     }
-    if ('ashkenazi' === locale.substring(0, 9)) {
+    if (locale.startsWith('ashkenazi')) {
       return ' of';
     }
     return '';
@@ -1579,6 +1579,7 @@ class HDate {
           case 'h':
             return months.SHVAT;
         }
+        break;
       case 't':
         switch (c[1]) {
           case 'a':
@@ -1598,9 +1599,7 @@ class HDate {
               return months.ADAR_I;
             }
             return months.ADAR_II;
-          // else assume sheini
         }
-
         break;
       case 'ס':
         return months.SIVAN;
@@ -1960,8 +1959,7 @@ class Event {
    */
   getCategories() {
     const mask = this.getFlags();
-    for (let i = 0; i < flagToCategory.length; i++) {
-      const attrs = flagToCategory[i];
+    for (const attrs of flagToCategory) {
       if (mask & attrs[0]) {
         return attrs.slice(1);
       }
@@ -1990,7 +1988,7 @@ class HebrewDateEvent extends Event {
    * @return {string}
    */
   render(locale) {
-    const locale1 = locale && locale.toLowerCase();
+    const locale1 = locale === null || locale === void 0 ? void 0 : locale.toLowerCase();
     const locale0 = locale1 || Locale.getLocaleName();
     const hd = this.getDate();
     switch (locale0) {
@@ -2017,7 +2015,7 @@ class HebrewDateEvent extends Event {
    * @return {string}
    */
   renderBrief(locale) {
-    const locale1 = locale && locale.toLowerCase();
+    const locale1 = locale === null || locale === void 0 ? void 0 : locale.toLowerCase();
     const locale0 = locale1 || Locale.getLocaleName();
     const hd = this.getDate();
     if (hd.getMonth() === months.TISHREI && hd.getDate() === 1) {
@@ -2409,7 +2407,30 @@ function pad2(number) {
  * @property {Date} tzeit
 */
 
-/** Class representing halachic times */
+/**
+ * Calculate halachic times (zmanim / זְמַנִּים) for a given day and location.
+ * Calculations are available for tzeit / tzais (nightfall),
+ * shkiah (sunset) and more.
+ *
+ * Zmanim are estimated using an algorithm published by the US National Oceanic
+ * and Atmospheric Administration. The NOAA solar calculator is based on equations
+ * from _Astronomical Algorithms_ by Jean Meeus.
+ *
+ * The sunrise and sunset results are theoretically accurate to within a minute for
+ * locations between +/- 72° latitude, and within 10 minutes outside of those latitudes.
+ * However, due to variations in atmospheric composition, temperature, pressure and
+ * conditions, observed values may vary from calculations.
+ * https://gml.noaa.gov/grad/solcalc/calcdetails.html
+ *
+ * @example
+ * const {Zmanim} = require('@hebcal/core');
+ * const latitude = 41.822232;
+ * const longitude = -71.448292;
+ * const friday = new Date(2023, 8, 8);
+ * const zmanim = new Zmanim(friday, latitude, longitude);
+ * const candleLighting = zmanim.sunsetOffset(-18, true);
+ * const timeStr = Zmanim.formatISOWithTimeZone('America/New_York', candleLighting);
+ */
 class Zmanim {
   /**
      * Initialize a Zmanim instance.
@@ -2459,6 +2480,16 @@ class Zmanim {
       tzeit: this.tzeit()
     };
   }
+  /**
+   * Convenience function to get the time when sun is above or below the horizon
+   * for a certain angle (in degrees).
+   * @param {number} angle
+   * @param {boolean} rising
+   * @return {Date}
+   */
+  timeAtAngle(angle, rising) {
+    return this.sun.timeAtAngle(angle, rising);
+  }
   /**
    * Upper edge of the Sun appears over the eastern horizon in the morning (0.833° above horizon)
    * @return {Date}
@@ -2615,7 +2646,7 @@ class Zmanim {
   }
   /**
    * @param {number} [angle=8.5] optional time for solar depression.
-   *   Default is 8.5 degrees for 3 small stars, use 7.083 degress for 3 medium-sized stars.
+   *   Default is 8.5 degrees for 3 small stars, use 7.083 degrees for 3 medium-sized stars.
    * @return {Date}
    */
   tzeit() {
@@ -2765,7 +2796,7 @@ class Zmanim {
    * Returns an array with tzeit Date object and a 24-hour string formatted time.
    * @deprecated
    * @param {number} angle degrees for solar depression.
-   *   Default is 8.5 degrees for 3 small stars, use 7.083 degress for 3 medium-sized stars.
+   *   Default is 8.5 degrees for 3 small stars, use 7.083 degrees for 3 medium-sized stars.
    * @param {Intl.DateTimeFormat} timeFormat
    * @return {Object[]}
    */
@@ -3098,17 +3129,6 @@ const days = {
   SAT: 6
 };
 
-/**
- * @private
- * @constant
- * This method returns the tzais (nightfall) based on the opinion of the
- * Geonim calculated as 30 minutes after sunset during the equinox
- * (on March 16, about 4 days before the astronomical equinox, the day that
- * a solar hour is 60 minutes) in Yerushalayim.
- * @see {https://kosherjava.com/zmanim/docs/api/com/kosherjava/zmanim/ComplexZmanimCalendar.html#getTzaisGeonim7Point083Degrees()}
- */
-const TZEIT_3MEDIUM_STARS = 7.083;
-
 /**
  * @private
  * @param {Event} e
@@ -3268,10 +3288,10 @@ class CandleLightingEvent extends TimedEvent {
  * Makes a pair of events representing fast start and end times
  * @private
  * @param {Event} ev
- * @param {Location} location
+ * @param {CalOptions} options
  * @return {Event}
  */
-function makeFastStartEnd(ev, location) {
+function makeFastStartEnd(ev, options) {
   const desc = ev.getDesc();
   if (desc === 'Yom Kippur') {
     return ev;
@@ -3279,17 +3299,19 @@ function makeFastStartEnd(ev, location) {
   ev = ev.clone();
   const hd = ev.getDate();
   const dt = hd.greg();
+  const location = options.location;
+  const fastEndDeg = options.fastEndDeg;
   const zmanim = new Zmanim(dt, location.getLatitude(), location.getLongitude());
   if (desc === 'Erev Tish\'a B\'Av') {
     const sunset = zmanim.sunset();
     ev.startEvent = makeTimedEvent(hd, sunset, 'Fast begins', ev, location);
-  } else if (desc.substring(0, 11) === 'Tish\'a B\'Av') {
-    ev.endEvent = makeTimedEvent(hd, zmanim.tzeit(TZEIT_3MEDIUM_STARS), 'Fast ends', ev, location);
+  } else if (desc.startsWith('Tish\'a B\'Av')) {
+    ev.endEvent = makeTimedEvent(hd, zmanim.tzeit(fastEndDeg), 'Fast ends', ev, location);
   } else {
     const dawn = zmanim.alotHaShachar();
     ev.startEvent = makeTimedEvent(hd, dawn, 'Fast begins', ev, location);
     if (dt.getDay() !== 5 && !(hd.getDate() === 14 && hd.getMonth() === months.NISAN)) {
-      ev.endEvent = makeTimedEvent(hd, zmanim.tzeit(TZEIT_3MEDIUM_STARS), 'Fast ends', ev, location);
+      ev.endEvent = makeTimedEvent(hd, zmanim.tzeit(fastEndDeg), 'Fast ends', ev, location);
     }
   }
   return ev;
@@ -4481,10 +4503,10 @@ var store$1 = sharedStore;
 (shared$3.exports = function (key, value) {
   return store$1[key] || (store$1[key] = value !== undefined ? value : {});
 })('versions', []).push({
-  version: '3.33.0',
+  version: '3.33.2',
   mode: 'global',
   copyright: '© 2014-2023 Denis Pushkarev (zloirock.ru)',
-  license: 'https://github.com/zloirock/core-js/blob/v3.33.0/LICENSE',
+  license: 'https://github.com/zloirock/core-js/blob/v3.33.2/LICENSE',
   source: 'https://github.com/zloirock/core-js'
 });
 
@@ -5314,16 +5336,6 @@ const staticModernHolidays = [{
 
 /** Represents a built-in holiday like Pesach, Purim or Tu BiShvat */
 class HolidayEvent extends Event {
-  /**
-   * Constructs Holiday event
-   * @param {HDate} date Hebrew date event occurs
-   * @param {string} desc Description (not translated)
-   * @param {number} [mask=0] optional holiday flags
-   * @param {Object} [attrs={}]
-   */
-  constructor(date, desc, mask, attrs) {
-    super(date, desc, mask, attrs);
-  }
   /** @return {string} */
   basename() {
     return this.getDesc().replace(/ \d{4}$/, '').replace(/ \(CH''M\)$/, '').replace(/ \(observed\)$/, '').replace(/ \(Hoshana Raba\)$/, '').replace(/ [IV]+$/, '').replace(/: \d Candles?$/, '').replace(/: 8th Day$/, '').replace(/^Erev /, '');
@@ -5415,15 +5427,6 @@ class RoshChodeshEvent extends HolidayEvent {
  * we subclass HolidayEvent to override the `url()` method.
  */
 class AsaraBTevetEvent extends HolidayEvent {
-  /**
-   * Constructs AsaraBTevetEvent
-   * @param {HDate} date Hebrew date event occurs
-   * @param {string} desc Description (not translated)
-   * @param {number} [mask=0] optional holiday flags
-   */
-  constructor(date, desc, mask) {
-    super(date, desc, mask);
-  }
   /** @return {string} */
   urlDateSuffix() {
     const isoDateTime = this.getDate().greg().toISOString();
@@ -5962,7 +5965,7 @@ function getBirthdayOrAnniversary_(hyear, gdate) {
   return new HDate(day, month, hyear);
 }
 
-const version="4.4.0";
+const version="4.5.0";
 
 const headers$1={"plural-forms":"nplurals=2; plural=(n > 1);"};const contexts$1={"":{Shabbat:["Shabbos"],"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"],"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"],"Alot HaShachar":["Alos HaShachar"],"Kriat Shema, sof zeman":["Krias Shema, sof zman"],"Tefilah, sof zeman":["Tefilah, sof zman"],"Kriat Shema, sof zeman (MGA)":["Krias Shema, sof zman (MGA)"],"Tefilah, sof zeman (MGA)":["Tefilah, sof zman (MGA)"],"Chatzot HaLailah":["Chatzos HaLailah"],"Chatzot hayom":["Chatzos"],"Tzeit HaKochavim":["Tzeis HaKochavim"],"Birkat Hachamah":["Birkas Hachamah"],"Shushan Purim Katan":["Shushan Purim Koton"]}};var poAshkenazi = {headers:headers$1,contexts:contexts$1};
 
@@ -6669,9 +6672,9 @@ function tachanunYear(year, il) {
   );
 
   return {
-    none: none.map(hd => hd.abs()).sort(),
-    some: some.map(hd => hd.abs()).sort(),
-    yesPrev: yesPrev.map(hd => hd.abs()).sort()
+    none: none.map(hd => hd.abs()).sort((a, b) => a - b),
+    some: some.map(hd => hd.abs()).sort((a, b) => a - b),
+    yesPrev: yesPrev.map(hd => hd.abs()).sort((a, b) => a - b)
   };
 }
 
@@ -6717,11 +6720,15 @@ const MAJOR_FAST = flags.MAJOR_FAST;
 const ROSH_CHODESH = flags.ROSH_CHODESH;
 const PARSHA_HASHAVUA = flags.PARSHA_HASHAVUA;
 const DAF_YOMI = flags.DAF_YOMI;
+const MISHNA_YOMI = flags.MISHNA_YOMI;
+const NACH_YOMI = flags.NACH_YOMI;
+const YERUSHALMI_YOMI = flags.YERUSHALMI_YOMI;
 const OMER_COUNT = flags.OMER_COUNT;
 const SHABBAT_MEVARCHIM = flags.SHABBAT_MEVARCHIM;
 const MINOR_HOLIDAY = flags.MINOR_HOLIDAY;
 const EREV = flags.EREV;
 const CHOL_HAMOED = flags.CHOL_HAMOED;
+const YOM_KIPPUR_KATAN = flags.YOM_KIPPUR_KATAN;
 const unrecognizedAlreadyWarned = Object.create(null);
 const RECOGNIZED_OPTIONS = {
   location: 1,
@@ -6735,6 +6742,7 @@ const RECOGNIZED_OPTIONS = {
   candleLightingMins: 1,
   havdalahMins: 1,
   havdalahDeg: 1,
+  fastEndDeg: 1,
   sedrot: 1,
   il: 1,
   noMinorFast: 1,
@@ -6798,6 +6806,27 @@ const geoIdCandleOffset = {
   '293067': 30 // Zikhron Yaakov
 };
 
+/**
+ * @private
+ * @constant
+ * This calculation is based on the position of the sun 36 minutes after sunset in Jerusalem
+ * around the equinox / equilux, which is 8.5° below geometric zenith.
+ * The Ohr Meir considers this the time that 3 small stars are visible,
+ * which is later than the required 3 medium stars.
+ * @see {https://kosherjava.com/zmanim/docs/api/com/kosherjava/zmanim/ZmanimCalendar.html#ZENITH_8_POINT_5}
+ */
+const TZEIT_3SMALL_STARS = 8.5;
+
+/**
+ * @private
+ * @constant
+ * This calculation is based on observation of 3 medium sized stars by Dr. Baruch Cohen
+ * in his calendar published in in 1899 in Strasbourg, France.
+ * This calculates to 7.0833333° below geometric zenith.
+ * @see {https://kosherjava.com/zmanim/docs/api/com/kosherjava/zmanim/ComplexZmanimCalendar.html#ZENITH_7_POINT_083}
+ */
+const TZEIT_3MEDIUM_STARS = 7.0833333;
+
 /**
  * Modifies options in-place
  * @private
@@ -6808,7 +6837,7 @@ function checkCandleOptions(options) {
     return;
   }
   const location = options.location;
-  if (typeof location === 'undefined' || !location instanceof Location) {
+  if (typeof location === 'undefined' || !(location instanceof Location)) {
     throw new TypeError('options.candlelighting requires valid options.location');
   }
   if (typeof options.havdalahMins === 'number' && typeof options.havdalahDeg === 'number') {
@@ -6832,7 +6861,10 @@ function checkCandleOptions(options) {
   } else if (typeof options.havdalahDeg === 'number') {
     options.havdalahDeg = Math.abs(options.havdalahDeg);
   } else {
-    options.havdalahDeg = 8.5;
+    options.havdalahDeg = TZEIT_3SMALL_STARS;
+  }
+  if (typeof options.fastEndDeg !== 'number') {
+    options.fastEndDeg = TZEIT_3MEDIUM_STARS;
   }
 }
 
@@ -6851,10 +6883,14 @@ function checkCandleOptions(options) {
  * @property {number} havdalahMins - minutes after sundown for Havdalah (typical values are 42, 50, or 72).
  *      If `undefined` (the default), calculate Havdalah according to Tzeit Hakochavim -
  *      Nightfall (the point when 3 small stars are observable in the night time sky with
- *      the naked eye). If `0`, Havdalah times are supressed.
+ *      the naked eye). If `0`, Havdalah times are suppressed.
  * @property {number} 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.
- *      If `0`, Havdalah times are supressed.
+ *      Default is 8.5 degrees for 3 small stars. use 7.083 degrees for 3 medium-sized stars
+ *      (observed by Dr. Baruch (Berthold) Cohn in his luach published in France in 1899).
+ *      If `0`, Havdalah times are suppressed.
+ * @property {number} fastEndDeg - degrees for solar depression for end of fast days.
+ *      Default is 7.083 degrees for 3 medium-sized stars. Other commonly-used values include
+ *      6.45 degrees, as calculated by Rabbi Yechiel Michel Tucazinsky.
  * @property {boolean} sedrot - calculate parashah hashavua on Saturdays
  * @property {boolean} il - Israeli holiday and sedra schedule
  * @property {boolean} noMinorFast - suppress minor fasts
@@ -6975,36 +7011,11 @@ function getStartAndEnd(options) {
  * @return {number}
  */
 function getMaskFromOptions(options) {
+  var _options$location;
   if (typeof options.mask === 'number') {
-    const m = options.mask;
-    if (m & ROSH_CHODESH) delete options.noRoshChodesh;
-    if (m & MODERN_HOLIDAY) delete options.noModern;
-    if (m & MINOR_FAST) delete options.noMinorFast;
-    if (m & SPECIAL_SHABBAT) delete options.noSpecialShabbat;
-    if (m & PARSHA_HASHAVUA) options.sedrot = true;
-    if (m & DAF_YOMI) {
-      options.dailyLearning = options.dailyLearning || {};
-      options.dailyLearning.dafYomi = true;
-    }
-    if (m & OMER_COUNT) options.omer = true;
-    if (m & SHABBAT_MEVARCHIM) options.shabbatMevarchim = true;
-    if (m & flags.MISHNA_YOMI) {
-      options.dailyLearning = options.dailyLearning || {};
-      options.dailyLearning.mishnaYomi = true;
-    }
-    if (m & flags.NACH_YOMI) {
-      options.dailyLearning = options.dailyLearning || {};
-      options.dailyLearning.nachYomi = true;
-    }
-    if (m & flags.YOM_KIPPUR_KATAN) options.yomKippurKatan = true;
-    if (m & flags.YERUSHALMI_YOMI) {
-      options.dailyLearning = options.dailyLearning || {};
-      options.dailyLearning.yerushalmi = 1;
-    }
-    options.userMask = true;
-    return m;
+    return setOptionsFromMask(options);
   }
-  const il = options.il || options.location && options.location.il || false;
+  const il = options.il || ((_options$location = options.location) === null || _options$location === void 0 ? void 0 : _options$location.il) || false;
   let mask = 0;
 
   // default options
@@ -7044,7 +7055,7 @@ function getMaskFromOptions(options) {
     mask |= SHABBAT_MEVARCHIM;
   }
   if (options.yomKippurKatan) {
-    mask |= flags.YOM_KIPPUR_KATAN;
+    mask |= YOM_KIPPUR_KATAN;
   }
   if (options.dailyLearning) {
     const dailyLearning = options.dailyLearning;
@@ -7052,13 +7063,13 @@ function getMaskFromOptions(options) {
       mask |= DAF_YOMI;
     }
     if (dailyLearning.mishnaYomi) {
-      mask |= flags.MISHNA_YOMI;
+      mask |= MISHNA_YOMI;
     }
     if (dailyLearning.nachYomi) {
-      mask |= flags.NACH_YOMI;
+      mask |= NACH_YOMI;
     }
     if (dailyLearning.yerushalmi) {
-      mask |= flags.YERUSHALMI_YOMI;
+      mask |= YERUSHALMI_YOMI;
     }
   }
   return mask;
@@ -7080,6 +7091,40 @@ const hour12cc = {
   ZA: 1
 };
 
+/**
+ * @private
+ * @param {CalOptions} options
+ * @return {number}
+ */
+function setOptionsFromMask(options) {
+  const m = options.mask;
+  if (m & ROSH_CHODESH) delete options.noRoshChodesh;
+  if (m & MODERN_HOLIDAY) delete options.noModern;
+  if (m & MINOR_FAST) delete options.noMinorFast;
+  if (m & SPECIAL_SHABBAT) delete options.noSpecialShabbat;
+  if (m & PARSHA_HASHAVUA) options.sedrot = true;
+  if (m & (DAF_YOMI | MISHNA_YOMI | NACH_YOMI | YERUSHALMI_YOMI)) {
+    options.dailyLearning = options.dailyLearning || {};
+    if (m & DAF_YOMI) {
+      options.dailyLearning.dafYomi = true;
+    }
+    if (m & MISHNA_YOMI) {
+      options.dailyLearning.mishnaYomi = true;
+    }
+    if (m & NACH_YOMI) {
+      options.dailyLearning.nachYomi = true;
+    }
+    if (m & YERUSHALMI_YOMI) {
+      options.dailyLearning.yerushalmi = 1;
+    }
+  }
+  if (m & OMER_COUNT) options.omer = true;
+  if (m & SHABBAT_MEVARCHIM) options.shabbatMevarchim = true;
+  if (m & YOM_KIPPUR_KATAN) options.yomKippurKatan = true;
+  options.userMask = true;
+  return m;
+}
+
 /**
  * @private
  * @param {Event} ev
@@ -7166,10 +7211,10 @@ class HebrewCalendar {
    * 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`.
+   *    Havdalah times are suppressed 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`.
+   *    Default is 8.5 degrees for 3 small stars. Use 7.083 degrees for 3 medium-sized stars.
+   *    Havdalah times are suppressed 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.
@@ -7263,7 +7308,7 @@ class HebrewCalendar {
       }
       const prevEventsLength = evts.length;
       const dow = hd.getDay();
-      let candlesEv = undefined;
+      let candlesEv;
       const ev = holidaysYear.get(hd.toString()) || [];
       ev.forEach(e => {
         candlesEv = appendHolidayAndRelated(evts, e, options, candlesEv, dow);
@@ -7467,8 +7512,9 @@ class HebrewCalendar {
    * @return {string}
    */
   static reformatTimeStr(timeStr, suffix, options) {
+    var _options$location2;
     if (typeof timeStr !== 'string') throw new TypeError(`Bad timeStr: ${timeStr}`);
-    const cc = options.location && options.location.cc || (options.il ? 'IL' : 'US');
+    const cc = ((_options$location2 = options.location) === null || _options$location2 === void 0 ? void 0 : _options$location2.cc) || (options.il ? 'IL' : 'US');
     if (typeof options.hour12 !== 'undefined' && !options.hour12) {
       return timeStr;
     }
@@ -7572,7 +7618,7 @@ function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
   }
 
   const eFlags = ev.getFlags();
-  if (!options.yomKippurKatan && eFlags & flags.YOM_KIPPUR_KATAN || options.noModern && eFlags & MODERN_HOLIDAY) {
+  if (!options.yomKippurKatan && eFlags & YOM_KIPPUR_KATAN || options.noModern && eFlags & MODERN_HOLIDAY) {
     return candlesEv; // bail out early
   }
 
@@ -7580,7 +7626,7 @@ function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
   const isMajorFast = Boolean(eFlags & MAJOR_FAST);
   const isMinorFast = Boolean(eFlags & MINOR_FAST);
   if (options.candlelighting && (isMajorFast || isMinorFast)) {
-    ev = makeFastStartEnd(ev, location);
+    ev = makeFastStartEnd(ev, options);
     if (ev.startEvent && (isMajorFast || isMinorFast && !options.noMinorFast)) {
       events.push(ev.startEvent);
     }
@@ -7604,9 +7650,7 @@ function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
         candlesEv = undefined;
       }
     }
-    if (options.yomKippurKatan && eFlags & flags.YOM_KIPPUR_KATAN) {
-      events.push(ev);
-    } else if (!options.noHolidays) {
+    if (!options.noHolidays || options.yomKippurKatan && eFlags & YOM_KIPPUR_KATAN) {
       events.push(ev); // the original event itself
     }
   }