@hebcal/core 5.0.6 → 5.0.8

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.0.6 */
+/*! @hebcal/core v5.0.8 */
 /** @private */
 const lengths = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 /** @private */
@@ -1270,7 +1270,8 @@ class HDate {
   render(locale = null, showYear = true) {
     const locale0 = locale || Locale.getLocaleName();
     const day = this.getDate();
-    const monthName = Locale.gettext(this.getMonthName(), locale0);
+    const monthName0 = Locale.gettext(this.getMonthName(), locale0);
+    const monthName = monthName0.replace(/'/g, '’');
     const nth = Locale.ordinal(day, locale0);
     const dayOf = HDate.getDayOfTranslation(locale0);
     const dateStr = `${nth}${dayOf} ${monthName}`;
@@ -3704,27 +3705,68 @@ class Zmanim {
     return this.getShaahZmanisBasedZman(4);
   }
   /**
-   * Latest Shema (MGA); Sunrise plus 3 halachic hours, according to Magen Avraham
+   * Returns an array with alot (Date) and ms in hour (number)
+   * @private
+   * @return {any[]}
+   */
+  getTemporalHour72() {
+    const alot72 = this.sunriseOffset(-72, false, true);
+    const tzeit72 = this.sunsetOffset(72, false, true);
+    const temporalHour = (tzeit72 - alot72) / 12;
+    return [alot72, temporalHour];
+  }
+  /**
+   * Returns an array with alot (Date) and ms in hour (number)
+   * @private
+   * @return {any[]}
+   */
+  getTemporalHour16Point1() {
+    const alot16one = this.alotHaShachar();
+    const tzeit16one = this.tzeit(16.1);
+    const temporalHour = (tzeit16one - alot16one) / 12;
+    return [alot16one, temporalHour];
+  }
+  /**
+   * Latest Shema (MGA); Sunrise plus 3 halachic hours, according to Magen Avraham.
+   * Based on the opinion of the MGA that the day is calculated from
+   * dawn being fixed 72 minutes before sea-level sunrise, and nightfall is fixed
+   * 72 minutes after sea-level sunset.
    * @return {Date}
    */
   sofZmanShmaMGA() {
     // Magen Avraham
-    const alot72 = this.sunriseOffset(-72, false, true);
-    const tzeit72 = this.sunsetOffset(72, false, true);
-    const temporalHour = (tzeit72 - alot72) / 12; // ms in hour
+    const [alot72, temporalHour] = this.getTemporalHour72();
     return new Date(alot72.getTime() + 3 * temporalHour);
   }
+  /**
+   * Latest Shema (MGA); Sunrise plus 3 halachic hours, according to Magen Avraham.
+   * Based on the opinion of the MGA that the day is calculated from
+   * dawn to nightfall with both being 16.1° below the horizon.
+   * @return {Date}
+   */
+  sofZmanShmaMGA16Point1() {
+    const [alot, temporalHour] = this.getTemporalHour16Point1();
+    return new Date(alot.getTime() + 3 * temporalHour);
+  }
   /**
    * Latest Shacharit (MGA); Sunrise plus 4 halachic hours, according to Magen Avraham
    * @return {Date}
    */
   sofZmanTfillaMGA() {
     // Magen Avraham
-    const alot72 = this.sunriseOffset(-72, false, true);
-    const tzeit72 = this.sunsetOffset(72, false, true);
-    const temporalHour = (tzeit72 - alot72) / 12; // ms in hour
+    const [alot72, temporalHour] = this.getTemporalHour72();
     return new Date(alot72.getTime() + 4 * temporalHour);
   }
+  /**
+   * Latest Shacharit (MGA); Sunrise plus 4 halachic hours, according to Magen Avraham.
+   * Based on the opinion of the MGA that the day is calculated from
+   * dawn to nightfall with both being 16.1° below the horizon.
+   * @return {Date}
+   */
+  sofZmanTfillaMGA16Point1() {
+    const [alot, temporalHour] = this.getTemporalHour16Point1();
+    return new Date(alot.getTime() + 4 * temporalHour);
+  }
   /**
    * Earliest Mincha – Mincha Gedola; Sunrise plus 6.5 halachic hours
    * @return {Date}
@@ -3877,6 +3919,54 @@ class Zmanim {
   }
 }
 
+const hour12cc = {
+  US: 1,
+  CA: 1,
+  BR: 1,
+  AU: 1,
+  NZ: 1,
+  DO: 1,
+  PR: 1,
+  GR: 1,
+  IN: 1,
+  KR: 1,
+  NP: 1,
+  ZA: 1
+};
+
+/**
+ * @private
+ * @param {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}
+ */
+function reformatTimeStr(timeStr, suffix, options) {
+  var _options$location;
+  if (typeof timeStr !== 'string') throw new TypeError(`Bad timeStr: ${timeStr}`);
+  const cc = (options === null || options === void 0 || (_options$location = options.location) === null || _options$location === void 0 ? void 0 : _options$location.cc) || (options !== null && options !== void 0 && options.il ? 'IL' : 'US');
+  const hour12 = options === null || options === void 0 ? void 0 : options.hour12;
+  if (typeof hour12 !== 'undefined' && !hour12) {
+    return timeStr;
+  }
+  if (!hour12 && typeof hour12cc[cc] === 'undefined') {
+    return timeStr;
+  }
+  const hm = timeStr.split(':');
+  let hour = parseInt(hm[0], 10);
+  if (hour < 12 && suffix) {
+    suffix = suffix.replace('p', 'a').replace('P', 'A');
+    if (hour === 0) {
+      hour = 12;
+    }
+  } else if (hour > 12) {
+    hour = hour % 12;
+  } else if (hour === 0) {
+    hour = '00';
+  }
+  return `${hour}:${hm[1]}${suffix}`;
+}
+
 /* eslint-disable max-len */
 const FRI$3 = 5;
 const SAT$3 = 6;
@@ -3886,11 +3976,10 @@ const SAT$3 = 6;
  * @param {Event} e
  * @param {HDate} hd
  * @param {number} dow
- * @param {Location} location
  * @param {CalOptions} options
  * @return {Event}
  */
-function makeCandleEvent(e, hd, dow, location, options) {
+function makeCandleEvent(e, hd, dow, options) {
   let havdalahTitle = false;
   let useHavdalahOffset = dow === SAT$3;
   let mask = e ? e.getFlags() : flags.LIGHT_CANDLES;
@@ -3910,15 +3999,16 @@ function makeCandleEvent(e, hd, dow, location, options) {
   }
   // if offset is 0 or undefined, we'll use tzeit time
   const offset = useHavdalahOffset ? options.havdalahMins : options.candleLightingMins;
+  const location = options.location;
   const zmanim = new Zmanim(location, hd, options.useElevation);
   const time = offset ? zmanim.sunsetOffset(offset, true) : zmanim.tzeit(options.havdalahDeg);
   if (isNaN(time.getTime())) {
     return null; // no sunset
   }
   if (havdalahTitle) {
-    return new HavdalahEvent(hd, mask, time, location, options.havdalahMins, e);
+    return new HavdalahEvent(hd, mask, time, location, options.havdalahMins, e, options);
   } else {
-    return new CandleLightingEvent(hd, mask, time, location, e);
+    return new CandleLightingEvent(hd, mask, time, location, e, options);
   }
 }
 
@@ -3931,13 +4021,18 @@ class TimedEvent extends Event {
    * @param {Date} eventTime
    * @param {Location} location
    * @param {Event} linkedEvent
+   * @param {CalOptions} options
    */
-  constructor(date, desc, mask, eventTime, location, linkedEvent) {
+  constructor(date, desc, mask, eventTime, location, linkedEvent, options) {
     super(date, desc, mask);
     this.eventTime = Zmanim.roundTime(eventTime);
     this.location = location;
     const timeFormat = location.getTimeFormatter();
     this.eventTimeStr = Zmanim.formatTime(this.eventTime, timeFormat);
+    const opts = Object.assign({
+      location
+    }, options);
+    this.fmtTime = reformatTimeStr(this.eventTimeStr, 'pm', opts);
     if (typeof linkedEvent !== 'undefined') {
       this.linkedEvent = linkedEvent;
     }
@@ -3947,7 +4042,7 @@ class TimedEvent extends Event {
    * @return {string}
    */
   render(locale) {
-    return Locale.gettext(this.getDesc(), locale) + ': ' + this.eventTimeStr;
+    return Locale.gettext(this.getDesc(), locale) + ': ' + this.fmtTime;
   }
   /**
    * Returns translation of "Candle lighting" without the time.
@@ -3984,9 +4079,10 @@ class HavdalahEvent extends TimedEvent {
    * @param {Location} location
    * @param {number} havdalahMins
    * @param {Event} linkedEvent
+   * @param {CalOptions} options
    */
-  constructor(date, mask, eventTime, location, havdalahMins, linkedEvent) {
-    super(date, 'Havdalah', mask, eventTime, location, linkedEvent);
+  constructor(date, mask, eventTime, location, havdalahMins, linkedEvent, options) {
+    super(date, 'Havdalah', mask, eventTime, location, linkedEvent, options);
     if (havdalahMins) {
       this.havdalahMins = havdalahMins;
     }
@@ -3996,7 +4092,7 @@ class HavdalahEvent extends TimedEvent {
    * @return {string}
    */
   render(locale) {
-    return this.renderBrief(locale) + ': ' + this.eventTimeStr;
+    return this.renderBrief(locale) + ': ' + this.fmtTime;
   }
   /**
    * Returns translation of "Havdalah" without the time.
@@ -4025,9 +4121,10 @@ class CandleLightingEvent extends TimedEvent {
    * @param {Date} eventTime
    * @param {Location} location
    * @param {Event} linkedEvent
+   * @param {CalOptions} options
    */
-  constructor(date, mask, eventTime, location, linkedEvent) {
-    super(date, 'Candle lighting', mask, eventTime, location, linkedEvent);
+  constructor(date, mask, eventTime, location, linkedEvent, options) {
+    super(date, 'Candle lighting', mask, eventTime, location, linkedEvent, options);
   }
   /** @return {string} */
   getEmoji() {
@@ -4055,14 +4152,14 @@ function makeFastStartEnd(ev, options) {
   const zmanim = new Zmanim(location, dt, options.useElevation);
   if (desc === 'Erev Tish\'a B\'Av') {
     const sunset = zmanim.sunset();
-    ev.startEvent = makeTimedEvent(hd, sunset, 'Fast begins', ev, location);
+    ev.startEvent = makeTimedEvent(hd, sunset, 'Fast begins', ev, options);
   } else if (desc.startsWith('Tish\'a B\'Av')) {
-    ev.endEvent = makeTimedEvent(hd, zmanim.tzeit(fastEndDeg), 'Fast ends', ev, location);
+    ev.endEvent = makeTimedEvent(hd, zmanim.tzeit(fastEndDeg), 'Fast ends', ev, options);
   } else {
     const dawn = zmanim.alotHaShachar();
-    ev.startEvent = makeTimedEvent(hd, dawn, 'Fast begins', ev, location);
+    ev.startEvent = makeTimedEvent(hd, dawn, 'Fast begins', ev, options);
     if (dt.getDay() !== 5 && !(hd.getDate() === 14 && hd.getMonth() === months.NISAN)) {
-      ev.endEvent = makeTimedEvent(hd, zmanim.tzeit(fastEndDeg), 'Fast ends', ev, location);
+      ev.endEvent = makeTimedEvent(hd, zmanim.tzeit(fastEndDeg), 'Fast ends', ev, options);
     }
   }
   return ev;
@@ -4074,14 +4171,15 @@ function makeFastStartEnd(ev, options) {
  * @param {Date} time
  * @param {string} desc
  * @param {Event} ev
- * @param {Location} location
+ * @param {CalOptions} options
  * @return {TimedEvent}
  */
-function makeTimedEvent(hd, time, desc, ev, location) {
+function makeTimedEvent(hd, time, desc, ev, options) {
   if (isNaN(time.getTime())) {
     return null;
   }
-  return new TimedEvent(hd, desc, ev.getFlags(), time, location, ev);
+  const location = options.location;
+  return new TimedEvent(hd, desc, ev.getFlags(), time, location, ev, options);
 }
 
 /**
@@ -4097,7 +4195,7 @@ function makeWeekdayChanukahCandleLighting(ev, hd, options) {
   const zmanim = new Zmanim(location, hd.greg(), options.useElevation);
   const candleLightingTime = zmanim.dusk();
   // const candleLightingTime = zmanim.tzeit(4.6667);
-  return makeTimedEvent(hd, candleLightingTime, ev.getDesc(), ev, location);
+  return makeTimedEvent(hd, candleLightingTime, ev.getDesc(), ev, options);
 }
 
 /* eslint-disable camelcase */
@@ -4185,6 +4283,34 @@ class Molad {
   getChalakim() {
     return this.chalakim;
   }
+  /**
+   * @param {string} [locale] Optional locale name (defaults to active locale)
+   * @param {CalOptions} options
+   * @return {string}
+   */
+  render(locale, options) {
+    locale = locale || Locale.getLocaleName();
+    if (typeof locale === 'string') {
+      locale = locale.toLowerCase();
+    }
+    const isHebrewLocale = locale === 'he' || locale === 'he-x-nonikud' || locale === 'h';
+    const monthName = Locale.gettext(this.getMonthName(), locale);
+    const dayNames = isHebrewLocale ? heDayNames : shortDayNames;
+    const dow = dayNames[this.getDow()];
+    const minutes = this.getMinutes();
+    const hour = this.getHour();
+    const chalakim = this.getChalakim();
+    const moladStr = Locale.gettext('Molad', locale);
+    const minutesStr = Locale.lookupTranslation('min', locale) || 'minutes';
+    const chalakimStr = Locale.gettext('chalakim', locale);
+    if (isHebrewLocale) {
+      const ampm = hour < 5 ? night : hour < 12 ? morning : hour < 17 ? afternoon : hour < 21 ? evening : night;
+      return `${moladStr} ${monthName} יִהְיֶה בַּיּוֹם ${dow} בשָׁבוּעַ, ` + `בְּשָׁעָה ${hour} ${ampm}, ` + `ו-${minutes} ${minutesStr} ` + `ו-${chalakim} ${chalakimStr}`;
+    }
+    const fmtTime = reformatTimeStr(`${hour}:00`, 'pm', options);
+    const month = monthName.replace(/'/g, '’');
+    return `${moladStr} ${month}: ${dow}, ${minutes} ${minutesStr} and ${chalakim} ${chalakimStr} after ${fmtTime}`;
+  }
 }
 
 /** Represents a Molad announcement on Shabbat Mevarchim */
@@ -4193,38 +4319,21 @@ class MoladEvent extends Event {
    * @param {HDate} date Hebrew date event occurs
    * @param {number} hyear molad year
    * @param {number} hmonth molad month
+   * @param {CalOptions} options
    */
-  constructor(date, hyear, hmonth) {
+  constructor(date, hyear, hmonth, options) {
     const m = new Molad(hyear, hmonth);
     const monthName = m.getMonthName();
     super(date, `Molad ${monthName} ${hyear}`, flags.MOLAD);
     this.molad = m;
+    this.options = options;
   }
   /**
    * @param {string} [locale] Optional locale name (defaults to active locale).
    * @return {string}
    */
   render(locale) {
-    const m = this.molad;
-    locale = locale || Locale.getLocaleName();
-    if (typeof locale === 'string') {
-      locale = locale.toLowerCase();
-    }
-    const isHebrewLocale = locale === 'he' || locale === 'he-x-nonikud' || locale === 'h';
-    const monthName = Locale.gettext(m.getMonthName(), locale);
-    const dayNames = isHebrewLocale ? heDayNames : shortDayNames;
-    const dow = dayNames[m.getDow()];
-    const minutes = m.getMinutes();
-    const hour = m.getHour();
-    const chalakim = m.getChalakim();
-    const moladStr = Locale.gettext('Molad', locale);
-    const minutesStr = Locale.lookupTranslation('min', locale) || 'minutes';
-    const chalakimStr = Locale.gettext('chalakim', locale);
-    if (isHebrewLocale) {
-      const ampm = hour < 5 ? night : hour < 12 ? morning : hour < 17 ? afternoon : hour < 21 ? evening : night;
-      return `${moladStr} ${monthName} יִהְיֶה בַּיּוֹם ${dow} בשָׁבוּעַ, ` + `בְּשָׁעָה ${hour} ${ampm}, ` + `ו-${minutes} ${minutesStr} ` + `ו-${chalakim} ${chalakimStr}`;
-    }
-    return `${moladStr} ${monthName}: ${dow}, ${minutes} ${minutesStr} and ${chalakim} ${chalakimStr} after ${hour}:00`;
+    return this.molad.render(locale, this.options);
   }
 }
 
@@ -5748,6 +5857,26 @@ class HolidayEvent extends Event {
         return ['holiday', 'major'];
     }
   }
+  /**
+   * Returns (translated) description of this event
+   * @param {string} [locale] Optional locale name (defaults to active locale).
+   * @return {string}
+   */
+  render(locale) {
+    const str = super.render(locale);
+    return str.replace(/'/g, '’');
+  }
+  /**
+   * Returns a brief (translated) description of this event.
+   * For most events, this is the same as render(). For some events, it procudes
+   * a shorter text (e.g. without a time or added description).
+   * @param {string} [locale] Optional locale name (defaults to active locale).
+   * @return {string}
+   */
+  renderBrief(locale) {
+    const str = super.renderBrief(locale);
+    return str.replace(/'/g, '’');
+  }
 }
 const roshChodeshStr = 'Rosh Chodesh';
 
@@ -5768,7 +5897,9 @@ class RoshChodeshEvent extends HolidayEvent {
    */
   render(locale) {
     const monthName = this.getDesc().substring(roshChodeshStr.length + 1);
-    return Locale.gettext(roshChodeshStr, locale) + ' ' + Locale.gettext(monthName, locale);
+    const monthName0 = Locale.gettext(monthName, locale);
+    const monthName1 = monthName0.replace(/'/g, '’');
+    return Locale.gettext(roshChodeshStr, locale) + ' ' + monthName1;
   }
   /** @return {string} */
   basename() {
@@ -5807,8 +5938,10 @@ class MevarchimChodeshEvent extends Event {
     const hyear = date.getFullYear();
     const hmonth = date.getMonth();
     const monNext = hmonth == HDate.monthsInYear(hyear) ? NISAN$1 : hmonth + 1;
-    const molad = new MoladEvent(date, hyear, monNext);
-    this.memo = molad.render('en');
+    const molad = new Molad(hyear, monNext);
+    this.memo = molad.render('en', {
+      hour12: false
+    });
   }
   /** @return {string} */
   basename() {
@@ -5820,7 +5953,19 @@ class MevarchimChodeshEvent extends Event {
    * @return {string}
    */
   render(locale) {
-    return Locale.gettext(mevarchimChodeshStr, locale) + ' ' + Locale.gettext(this.monthName, locale);
+    const monthName0 = Locale.gettext(this.monthName, locale);
+    const monthName = monthName0.replace(/'/g, '’');
+    return Locale.gettext(mevarchimChodeshStr, locale) + ' ' + monthName;
+  }
+  /**
+   * Returns (translated) description of this event
+   * @param {string} [locale] Optional locale name (defaults to active locale).
+   * @return {string}
+   */
+  renderBrief(locale) {
+    const str = this.render(locale);
+    const space = str.indexOf(' ');
+    return str.substring(space + 1);
   }
 }
 
@@ -5872,7 +6017,9 @@ class YomKippurKatanEvent extends HolidayEvent {
    * @return {string}
    */
   render(locale) {
-    return Locale.gettext(ykk, locale) + ' ' + Locale.gettext(this.nextMonthName, locale);
+    const monthName0 = Locale.gettext(this.nextMonthName, locale);
+    const monthName = monthName0.replace(/'/g, '’');
+    return Locale.gettext(ykk, locale) + ' ' + monthName;
   }
   /**
    * @param {string} [locale] Optional locale name (defaults to active locale).
@@ -6162,7 +6309,7 @@ class DailyLearning {
 }
 
 // DO NOT EDIT THIS AUTO-GENERATED FILE!
-const version = '5.0.6';
+const version = '5.0.8';
 
 const NONE$1 = 0;
 const HALF = 1;
@@ -6213,7 +6360,7 @@ var poAshkenazi = {
       "Shabbat": ["Shabbos"],
       "Achrei Mot": ["Achrei Mos"],
       "Bechukotai": ["Bechukosai"],
-      "Beha'alotcha": ["Beha'aloscha"],
+      "Beha'alotcha": ["Beha’aloscha"],
       "Bereshit": ["Bereshis"],
       "Chukat": ["Chukas"],
       "Erev Shavuot": ["Erev Shavuos"],
@@ -6240,14 +6387,14 @@ var poAshkenazi = {
       "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 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"],
+      "Ta'anit Bechorot": ["Ta’anis Bechoros"],
+      "Ta'anit Esther": ["Ta’anis Esther"],
       "Toldot": ["Toldos"],
       "Vaetchanan": ["Vaeschanan"],
       "Yitro": ["Yisro"],
@@ -6257,7 +6404,7 @@ var poAshkenazi = {
       "Shabbat Mevarchim Chodesh": ["Shabbos Mevorchim Chodesh"],
       "Shabbat Shirah": ["Shabbos Shirah"],
       "Tevet": ["Teves"],
-      "Asara B'Tevet": ["Asara B'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"],
@@ -7116,20 +7263,6 @@ function getMaskFromOptions(options) {
 }
 const MASK_LIGHT_CANDLES = LIGHT_CANDLES | LIGHT_CANDLES_TZEIS | CHANUKAH_CANDLES | YOM_TOV_ENDS;
 const defaultLocation = new Location(0, 0, false, 'UTC');
-const hour12cc = {
-  US: 1,
-  CA: 1,
-  BR: 1,
-  AU: 1,
-  NZ: 1,
-  DO: 1,
-  PR: 1,
-  GR: 1,
-  IN: 1,
-  KR: 1,
-  NP: 1,
-  ZA: 1
-};
 
 /**
  * @private
@@ -7384,10 +7517,10 @@ class HebrewCalendar {
       const hmonth = hd.getMonth();
       if (options.molad && dow == SAT && hmonth != ELUL && hd.getDate() >= 23 && hd.getDate() <= 29) {
         const monNext = hmonth == HDate.monthsInYear(hyear) ? NISAN : hmonth + 1;
-        evts.push(new MoladEvent(hd, hyear, monNext));
+        evts.push(new MoladEvent(hd, hyear, monNext, options));
       }
       if (!candlesEv && options.candlelighting && (dow == FRI || dow == SAT)) {
-        candlesEv = makeCandleEvent(undefined, hd, dow, location, options);
+        candlesEv = makeCandleEvent(undefined, hd, dow, options);
         if (dow === FRI && candlesEv && sedra) {
           candlesEv.memo = sedra.getString(abs);
         }
@@ -7554,28 +7687,7 @@ 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$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;
-    }
-    if (!options.hour12 && typeof hour12cc[cc] === 'undefined') {
-      return timeStr;
-    }
-    const hm = timeStr.split(':');
-    let hour = parseInt(hm[0], 10);
-    if (hour < 12 && suffix) {
-      suffix = suffix.replace('p', 'a').replace('P', 'A');
-      if (hour === 0) {
-        hour = 12;
-      }
-    } else if (hour > 12) {
-      hour = hour % 12;
-    } else if (hour === 0) {
-      hour = '00';
-    }
-    return `${hour}:${hm[1]}${suffix}`;
+    return reformatTimeStr(timeStr, suffix, options);
   }
 
   /** @return {string} */
@@ -7674,7 +7786,7 @@ function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
   if (eFlags & options.mask || !eFlags && !options.userMask) {
     if (options.candlelighting && eFlags & MASK_LIGHT_CANDLES) {
       const hd = ev.getDate();
-      candlesEv = makeCandleEvent(ev, hd, dow, location, options);
+      candlesEv = makeCandleEvent(ev, hd, dow, options);
       if (eFlags & CHANUKAH_CANDLES && candlesEv && !options.noHolidays) {
         const chanukahEv = dow === FRI || dow === SAT ? candlesEv : makeWeekdayChanukahCandleLighting(ev, hd, options);
         const attrs = {

package/hebcal.d.ts

@@ -28,7 +28,7 @@ declare module '@hebcal/core' {
         observedIn(il: boolean): boolean;
         clone(): Event;
         getCategories(): string[];
-        readonly date: Date;
+        readonly date: HDate;
         readonly desc: string;
         readonly mask: number;
         readonly emoji?: string;
@@ -365,8 +365,13 @@ declare module '@hebcal/core' {
          * @param gloc GeoLocation including latitude, longitude, and timezone
          * @param date Regular or Hebrew Date. If `date` is a regular `Date`,
          *    hours, minutes, seconds and milliseconds are ignored
+         * @param useElevation use elevation for calculations (default `false`).
+         *    If `true`, use elevation to affect the calculation of all sunrise/sunset based
+         *    zmanim. Note: there are some zmanim such as degree-based zmanim that are driven
+         *    by the amount of light in the sky and are not impacted by elevation.
+         *    These zmanim intentionally do not support elevation adjustment.
          */
-        constructor(gloc: GeoLocation, date: Date | HDate);
+        constructor(gloc: GeoLocation, date: Date | HDate, useElevation?: boolean);
 
         /**
          * Returns a string like "2022-04-01T13:06:00-11:00"
@@ -414,11 +419,28 @@ declare module '@hebcal/core' {
         sofZmanShma(): Date;
         /** Latest Shacharit (Gra); Sunrise plus 4 halachic hours, according to the Gra */
         sofZmanTfilla(): Date;
-        /** Latest Shema (MGA); Sunrise plus 3 halachic hours, according to Magen Avraham */
+        /**
+         * Latest Shema (MGA); Sunrise plus 3 halachic hours, according to Magen Avraham.
+         * Based on the opinion of the MGA that the day is calculated from
+         * dawn being fixed 72 minutes before sea-level sunrise, and nightfall is fixed
+         * 72 minutes after sea-level sunset.
+         */
         sofZmanShmaMGA(): Date;
+        /**
+         * Latest Shema (MGA); Sunrise plus 3 halachic hours, according to Magen Avraham.
+         * Based on the opinion of the MGA that the day is calculated from
+         * dawn to nightfall with both being 16.1° below the horizon.
+         */
+        sofZmanShmaMGA16Point1(): Date;
         /** Latest Shacharit (MGA); Sunrise plus 4 halachic hours, according to Magen Avraham */
         sofZmanTfillaMGA(): Date;
         /** Earliest Mincha – Mincha Gedola; Sunrise plus 6.5 halachic hours */
+        /**
+         * Latest Shacharit (MGA); Sunrise plus 4 halachic hours, according to Magen Avraham.
+         * Based on the opinion of the MGA that the day is calculated from
+         * dawn to nightfall with both being 16.1° below the horizon.
+         */
+        sofZmanTfillaMGA16Point1(): Date;
         minchaGedola(): Date;
         /** Preferable earliest time to recite Minchah – Mincha Ketana; Sunrise plus 9.5 halachic hours */
         minchaKetana(): Date;
@@ -814,6 +836,7 @@ declare module '@hebcal/core' {
          * @return parts of a minute (0-17)
          */
         getChalakim(): number;
+        render(locale?: string, options?: CalOptions): string;
     }
 
     /**
@@ -989,7 +1012,7 @@ declare module '@hebcal/core' {
      * @param desc - Description (not translated)
      */
     export class TimedEvent extends Event {
-        constructor(date: HDate, desc: string, mask: number, eventTime: Date, location: Location, linkedEvent?: Event);
+        constructor(date: HDate, desc: string, mask: number, eventTime: Date, location: Location, linkedEvent?: Event, options?: CalOptions);
         render(locale?: string): string;
         renderBrief(locale?: string): string;
         getCategories(): string[];
@@ -999,11 +1022,11 @@ declare module '@hebcal/core' {
         readonly linkedEvent?: Event;
     }
     export class CandleLightingEvent extends TimedEvent {
-        constructor(date: HDate, mask: number, eventTime: Date, location: Location, linkedEvent?: Event);
+        constructor(date: HDate, mask: number, eventTime: Date, location: Location, linkedEvent?: Event, options?: CalOptions);
         getEmoji(): string;
     }
     export class HavdalahEvent extends TimedEvent {
-        constructor(date: HDate, mask: number, eventTime: Date, location: Location, havdalahMins?: number, linkedEvent?: Event);
+        constructor(date: HDate, mask: number, eventTime: Date, location: Location, havdalahMins?: number, linkedEvent?: Event, options?: CalOptions);
         render(locale?: string): string;
         renderBrief(locale?: string): string;
         getEmoji(): string;
@@ -1044,7 +1067,7 @@ declare module '@hebcal/core' {
         readonly monthName: string;
     }
     export class MoladEvent extends Event {
-        constructor(date: HDate, hyear: number, hmonth: number);
+        constructor(date: HDate, hyear: number, hmonth: number, options?: CalOptions);
         render(locale?: string): string;
         renderBrief(locale?: string): string;
         readonly molad: Molad;